diff --git a/.gitignore b/.gitignore
index ef3b6a9bcc..5336b2fe9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 **/.DS_Store
+**/.vscode
 *.o
 *.tmp
 *.d
@@ -16,13 +17,18 @@
 composite_new
 *.out
 tags
+src/kernel/include/chal/shared/cpu_ghz.h
+src/platform/x86_64/gdb*
+src/platform/x86_64/grub.cfg
+src/platform/x86_64/qemu.sh
 src/components/lib/libc/musl-1.1.11/bin/musl-gcc
-src/kernel/include/shared/cpu_ghz.h
 src/Makefile.cosconfig
+src/Makefile.arch
 src/.PLATFORM_ID
 modules.order
 .depend
 *.img
+*.bin
 transfer/
 GPATH
 GRTAGS
@@ -35,6 +41,20 @@ provision.sh
 src/components/lib/ck/include
 src/components/lib/ck/lib
 src/components/lib/ck/share
+src/kernel/include/chal
+src/platform/*/chal/shared/cpu_ghz.h
+src/components/lib/libc/libc.READY
 doc/dev_manual/composite_dev_manual.pdf
 doc/dev_manual/resources/*.pdf
 system_binaries/cos_build-*
+src/components/lib/libc/musl-1.2.0/include/bits/
+src/components/lib/libc/musl-1.2.0/bin/
+constructor
+kernel.iso
+grub.cfg
+gdbinit
+src/components/lib/libc/musl-1.2.0/include/asm/
+src/components/lib/libc/musl-1.2.0/include/asm-generic/
+src/components/lib/libc/musl-1.2.0/include/linux/
+src/components/lib/libc/musl-1.2.0/include/sys/queue.h
+src/kernel/include/shared/cpu_ghz.h
diff --git a/.gitmodules b/.gitmodules
index b5d218ff5b..83fdd087ff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,16 @@
 [submodule "src/components/lib/ps/ps"]
 	path = src/components/lib/ps/ps
 	url = https://github.com/gwsystems/ps.git
+	branch = master
 [submodule "src/components/lib/ck/ck"]
 	path = src/components/lib/ck/ck
 	url = https://github.com/gwsystems/ck.git
+	branch = cos_profile
+[submodule "src/components/lib/dpdk/dpdk"]
+	path = src/components/lib/dpdk/dpdk
+	url = https://github.com/gwsystems/dpdk.git
+	branch = cos_dpdk
+[submodule "src/components/lib/lwip/lwip"]
+	path = src/components/lib/lwip/lwip
+	url = https://github.com/gwsystems/lwip.git
+	branch = cos_stable_2_1_x
diff --git a/README.md b/README.md
index 4702eaa38a..d0258d998f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ more information.
 Branches
 --------
 
-- `master` is the original system with a full user-level set of components.
+- `main` is the original system with a full user-level set of components.
 - `ppos` is the Speck kernel emphasizing scalable predictability.
 - `tcaps` has mainly been integrated into `ppos`, but a few unrelated pieces remain.
 
@@ -37,7 +37,8 @@ _Composite_ system support
 --------------------------
 
 - x86-32
-- Qemu with 32 bit, x86 support
+- x86-64
+- Qemu with 32/64 bit, x86 support
 
 Important note
 --------------
diff --git a/composition_scripts/bench_chan_crt.toml b/composition_scripts/bench_chan_crt.toml
new file mode 100644
index 0000000000..3a973c5127
--- /dev/null
+++ b/composition_scripts/bench_chan_crt.toml
@@ -0,0 +1,31 @@
+[system]
+description = "Crt channel benchmarking test."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "tests"
+img  = "tests.bench_chan_crt"
+implements = [{interface = "init"}]
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/bench_chan_inter.toml b/composition_scripts/bench_chan_inter.toml
new file mode 100644
index 0000000000..1cfe456aae
--- /dev/null
+++ b/composition_scripts/bench_chan_inter.toml
@@ -0,0 +1,51 @@
+[system]
+description = "Inter-process channel benchmarking."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "chanmgr"
+img  = "chanmgr.simple"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "capmgr", interface = "capmgr"}]
+implements = [{interface = "chanmgr"}, {interface = "chanmgr_evt"}]
+constructor = "booter"
+
+[[components]]
+name = "evtmgr"
+img  = "evt.evtmgr"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}]
+implements = [{interface = "evt"}]
+constructor = "booter"
+
+[[components]]
+name = "chanhi"
+img  = "tests.bench_chan_inter_send"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "chanmgr", interface = "chanmgr"}, {srv = "chanmgr", interface = "chanmgr_evt"}, {srv = "evtmgr", interface = "evt"}]
+baseaddr = "0x1600000"
+constructor = "booter"
+
+[[components]]
+name = "chanlo"
+img  = "tests.bench_chan_inter_recv"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "chanmgr", interface = "chanmgr"}, {srv = "chanmgr", interface = "chanmgr_evt"}, {srv = "evtmgr", interface = "evt"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/bench_dpdk.toml b/composition_scripts/bench_dpdk.toml
new file mode 100644
index 0000000000..a30f331021
--- /dev/null
+++ b/composition_scripts/bench_dpdk.toml
@@ -0,0 +1,30 @@
+[system]
+description = "Simple DPDK component: test if it can drive NIC and sent/receive packets"
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "dpdk"
+img  = "tests.bench_dpdk"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
\ No newline at end of file
diff --git a/composition_scripts/bench_lock.toml b/composition_scripts/bench_lock.toml
new file mode 100644
index 0000000000..5633ce5dc6
--- /dev/null
+++ b/composition_scripts/bench_lock.toml
@@ -0,0 +1,31 @@
+[system]
+description = "Crt lock benchmarking test."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "tests"
+img  = "tests.bench_lock"
+implements = [{interface = "init"}]
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/bench_sched_yield.toml b/composition_scripts/bench_sched_yield.toml
new file mode 100644
index 0000000000..4e0ef0013b
--- /dev/null
+++ b/composition_scripts/bench_sched_yield.toml
@@ -0,0 +1,30 @@
+[system]
+description = "Sched interface context switch benchmarking."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "bench_sched_yield"
+img  = "tests.bench_sched_yield"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/bench_sem.toml b/composition_scripts/bench_sem.toml
new file mode 100644
index 0000000000..0c32d1db83
--- /dev/null
+++ b/composition_scripts/bench_sem.toml
@@ -0,0 +1,31 @@
+[system]
+description = "Crt semaphore benchmarking test."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "tests"
+img  = "tests.bench_sem"
+implements = [{interface = "init"}]
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/bench_sl_yield.toml b/composition_scripts/bench_sl_yield.toml
new file mode 100644
index 0000000000..3fbfe94117
--- /dev/null
+++ b/composition_scripts/bench_sl_yield.toml
@@ -0,0 +1,8 @@
+[system]
+description = "Sl library context switch benchmarking."
+
+[[components]]
+name = "bench_sl_yield"
+img  = "tests.bench_sl_yield"
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
diff --git a/composition_scripts/bench_tmr.toml b/composition_scripts/bench_tmr.toml
new file mode 100644
index 0000000000..24d32ec276
--- /dev/null
+++ b/composition_scripts/bench_tmr.toml
@@ -0,0 +1,44 @@
+[system]
+description = "Crt timer benchmarking test."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "evtmgr"
+img  = "evt.evtmgr"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}]
+implements = [{interface = "evt"}]
+constructor = "booter"
+
+[[components]]
+name = "tmrmgr"
+img  = "tmrmgr.simple"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "evtmgr", interface = "evt"}]
+implements = [{interface = "tmrmgr"}]
+constructor = "booter"
+
+[[components]]
+name = "bench_tmr"
+img  = "tests.bench_tmr"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "evtmgr", interface = "evt"}, {srv = "tmrmgr", interface = "tmrmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/chan_tests.toml b/composition_scripts/chan_tests.toml
new file mode 100644
index 0000000000..1a1b74cde6
--- /dev/null
+++ b/composition_scripts/chan_tests.toml
@@ -0,0 +1,44 @@
+[system]
+description = "Simple test of channels and events."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "chanmgr"
+img  = "chanmgr.simple"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "capmgr", interface = "capmgr"}]
+implements = [{interface = "chanmgr"}, {interface = "chanmgr_evt"}]
+constructor = "booter"
+
+[[components]]
+name = "evtmgr"
+img  = "evt.evtmgr"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}]
+implements = [{interface = "evt"}]
+constructor = "booter"
+
+[[components]]
+name = "chantest"
+img  = "tests.chan"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "chanmgr", interface = "chanmgr"}, {srv = "chanmgr", interface = "chanmgr_evt"}, {srv = "evtmgr", interface = "evt"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/crt_test.toml b/composition_scripts/crt_tests.toml
similarity index 100%
rename from composition_scripts/crt_test.toml
rename to composition_scripts/crt_tests.toml
diff --git a/composition_scripts/multi_processor_simple.toml b/composition_scripts/multi_processor_simple.toml
new file mode 100644
index 0000000000..b5596adaf6
--- /dev/null
+++ b/composition_scripts/multi_processor_simple.toml
@@ -0,0 +1,9 @@
+[system]
+description = "Simple system: the multiprocessor, and initialization ordering"
+
+[[components]]
+name = "multiprocessor_simple"
+img  = "tests.multi_processor_simple"
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+baseaddr = "0x1600000"
+constructor = "kernel"
diff --git a/composition_scripts/ping_pong_shared_vas.toml b/composition_scripts/ping_pong_shared_vas.toml
new file mode 100644
index 0000000000..4004f17263
--- /dev/null
+++ b/composition_scripts/ping_pong_shared_vas.toml
@@ -0,0 +1,25 @@
+[system]
+description = "Simple system: the ping pong test for IPC and shared VAS"
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter_shvas"
+implements = [{interface = "init"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "ping"
+img  = "tests.unit_pingshvas"
+deps = [{srv = "pongshvas", interface = "pongshvas"},
+        {srv = "booter", interface = "init"}]
+baseaddr = "0x40000000"
+constructor = "booter"
+
+[[components]]
+name = "pongshvas"
+img  = "tests.unit_pongshvas"
+deps = [{srv = "booter", interface = "init"}]
+implements = [{interface = "pongshvas"}]
+baseaddr = "0x10000000000"
+constructor = "booter"
\ No newline at end of file
diff --git a/composition_scripts/ping_pong_shmem.toml b/composition_scripts/ping_pong_shmem.toml
new file mode 100644
index 0000000000..d6a092e285
--- /dev/null
+++ b/composition_scripts/ping_pong_shmem.toml
@@ -0,0 +1,36 @@
+[system]
+description = "Simplest system with both capability manager and scheduler to test shared memory implementation"
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "pingshmem"
+img  = "tests.unit_pingshmem"
+deps = [{srv = "pongshmem", interface = "pongshmem"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+constructor = "booter"
+
+[[components]]
+name = "pongshmem"
+img  = "tests.unit_pongshmem"
+deps = [{srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "pongshmem"}]
+constructor = "booter"
\ No newline at end of file
diff --git a/composition_scripts/sched.toml b/composition_scripts/sched.toml
index 2e6d05e6b2..75310f9566 100644
--- a/composition_scripts/sched.toml
+++ b/composition_scripts/sched.toml
@@ -17,7 +17,7 @@ constructor = "booter"
 
 [[components]]
 name = "sched"
-img  = "sched.root_fprr"
+img  = "sched.pfprr_quantum_static"
 deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
 implements = [{interface = "sched"}, {interface = "init"}]
 constructor = "booter"
diff --git a/composition_scripts/sched_crt_tests.toml b/composition_scripts/sched_crt_tests.toml
new file mode 100644
index 0000000000..d2296ecb41
--- /dev/null
+++ b/composition_scripts/sched_crt_tests.toml
@@ -0,0 +1,31 @@
+[system]
+description = "Simplest system with crt tests."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "tests"
+img  = "tests.crt_tests"
+implements = [{interface = "init"}]
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/slm_test.toml b/composition_scripts/slm_test.toml
new file mode 100644
index 0000000000..bbcf3a6d69
--- /dev/null
+++ b/composition_scripts/slm_test.toml
@@ -0,0 +1,9 @@
+[system]
+description = "Unit tests for the slm scheduling library."
+
+[[components]]
+name = "slm"
+img  = "tests.slm"
+implements = [{interface = "init"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
diff --git a/composition_scripts/unit_chan_evt.toml b/composition_scripts/unit_chan_evt.toml
new file mode 100644
index 0000000000..b2b6e1189d
--- /dev/null
+++ b/composition_scripts/unit_chan_evt.toml
@@ -0,0 +1,44 @@
+[system]
+description = "Simple test of channels and events, both sender and receiver in the same component."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "chanmgr"
+img  = "chanmgr.simple"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "capmgr", interface = "capmgr"}]
+implements = [{interface = "chanmgr"}, {interface = "chanmgr_evt"}]
+constructor = "booter"
+
+[[components]]
+name = "evtmgr"
+img  = "evt.evtmgr"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}]
+implements = [{interface = "evt"}]
+constructor = "booter"
+
+[[components]]
+name = "chanevt"
+img  = "tests.chan_evt"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "chanmgr", interface = "chanmgr"}, {srv = "chanmgr", interface = "chanmgr_evt"}, {srv = "evtmgr", interface = "evt"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/unit_memmgr.toml b/composition_scripts/unit_memmgr.toml
new file mode 100644
index 0000000000..d62d529952
--- /dev/null
+++ b/composition_scripts/unit_memmgr.toml
@@ -0,0 +1,29 @@
+[system]
+description = "Simplest system with both capability manager and scheduler to test shared memory implementation"
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "unit_memmgr"
+img  = "tests.unit_memmgr"
+deps = [{srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}]
+constructor = "booter"
\ No newline at end of file
diff --git a/composition_scripts/unit_tmr.toml b/composition_scripts/unit_tmr.toml
new file mode 100644
index 0000000000..83f1b5355a
--- /dev/null
+++ b/composition_scripts/unit_tmr.toml
@@ -0,0 +1,44 @@
+[system]
+description = "Simple test of timers only (with event manager of course)."
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "evtmgr"
+img  = "evt.evtmgr"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}]
+implements = [{interface = "evt"}]
+constructor = "booter"
+
+[[components]]
+name = "tmrmgr"
+img  = "tmrmgr.simple"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "evtmgr", interface = "evt"}]
+implements = [{interface = "tmrmgr"}]
+constructor = "booter"
+
+[[components]]
+name = "unit_tmr"
+img  = "tests.unit_tmr"
+deps = [{srv = "sched", interface = "sched"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}, {srv = "capmgr", interface = "memmgr"}, {srv = "evtmgr", interface = "evt"}, {srv = "tmrmgr", interface = "tmrmgr"}]
+baseaddr = "0x1600000"
+constructor = "booter"
diff --git a/composition_scripts/vas_tests.toml b/composition_scripts/vas_tests.toml
new file mode 100644
index 0000000000..bf766f6ba9
--- /dev/null
+++ b/composition_scripts/vas_tests.toml
@@ -0,0 +1,57 @@
+[system]
+description = "Simplest system with both capability manager and scheduler, from unit_schedcomp.sh"
+
+[[components]]
+name = "booter"
+img  = "no_interface.llbooter"
+implements = [{interface = "init"}, {interface = "addr"}]
+deps = [{srv = "kernel", interface = "init", variant = "kernel"}]
+constructor = "kernel"
+
+[[components]]
+name = "capmgr"
+img  = "capmgr.simple"
+deps = [{srv = "booter", interface = "init"}, {srv = "booter", interface = "addr"}]
+implements = [{interface = "capmgr"}, {interface = "init"}, {interface = "memmgr"}, {interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "sched"
+img  = "sched.root_fprr"
+deps = [{srv = "capmgr", interface = "init"}, {srv = "capmgr", interface = "capmgr"}, {srv = "capmgr", interface = "memmgr"}]
+implements = [{interface = "sched"}, {interface = "init"}]
+constructor = "booter"
+
+[[components]]
+name = "schedtest"
+img  = "tests.unit_schedcomp"
+deps = [{srv = "sched", interface = "init"}, {srv = "sched", interface = "sched"}, {srv = "capmgr", interface = "capmgr_create"}]
+constructor = "booter"
+
+[[components]]
+name = "ping"
+img  = "tests.unit_pingpong"
+deps = [{srv = "pong", interface = "pong"}, {srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}]
+baseaddr = "0x1600000"
+constructor = "booter"
+
+[[components]]
+name = "pong"
+img  = "pong.pingpong"
+deps = [{srv = "sched", interface = "init"}, {srv = "capmgr", interface = "capmgr_create"}]
+implements = [{interface = "pong"}]
+constructor = "booter"
+
+[[address_spaces]]
+name = "system"
+components = ["capmgr", "sched"]
+
+[[address_spaces]]
+name = "pong"
+components = ["pong"]
+parent = "system"
+
+[[address_spaces]]
+name = "ping"
+components = ["ping"]
+parent = "pong"
diff --git a/cos b/cos
index a831a7b3b7..b9e5037af2 100755
--- a/cos
+++ b/cos
@@ -1,74 +1,181 @@
-#!/bin/sh
+#!/bin/bash
+
+set -e
 
 script=
 name=
 binary=
+arch=
 
-build()
+initialize()
 {
-    if ! [ -r "src/.PLATFORM_ID" ]; then
-	echo "Must \"cos init\" before \"cos build\"."
-	exit 2
-    fi
+	case ${arch} in
+		x86_64 )
+		;;
+		i386 )
+		;;
+		armv7a )
+		;;
+		* )
+		echo "Unsupported architecture"
+		exit 1
+	esac
+
+	echo "[cos setting arch] make -C src config-${arch}"
+	make -C src config-${arch}
 
-    echo "[cos executing] make -C src all"
-    make -C src all
+	echo "[cos executing] make -C src config init"
+	make -C src init
 }
 
-clean()
+build()
 {
-    echo "[cos executing] make -C clean"
-    make -C src clean
+	if ! [ -r "src/.PLATFORM_ID" ]; then
+		echo "Must \"cos init\" before \"cos build\"."
+		exit 1
+	fi
+
+	echo "[cos executing] make -C src all"
+	make -C src all
 }
 
-initialize()
+clean()
 {
-    echo "[cos executing] make -C src config init"
-    make -C src config init
+	echo "[cos executing] make -C src clean"
+	make -C src clean
 }
 
-usage()
+distclean()
 {
-    echo "Usage: " $0 " init|build|reset|compose <script> <output name>|run <binary>"
-    exit 2
+	echo "[cos executing] make -C src clean"
+	make -C src distclean
 }
 
 compose()
 {
-    if [ -z "$script" ] || [ -z "$name" ]; then
-	usage
-    fi
-    if ! [ -e "src/composer/target/debug/compose" ]; then
-	echo "Must \"cos build\" before composition. Could not find src/composer/target/debug/compose"
-	exit 2
-    fi
-    echo "[cos executing] src/composer/target/debug/compose $script $name"
-    src/composer/target/debug/compose $script $name
+	if [ -z "$script" ] || [ -z "$name" ]; then
+		usage
+	fi
+
+	if ! [ -e "src/composer/target/debug/compose" ]; then
+		echo "Must \"cos build\" before composition. Could not find src/composer/target/debug/compose"
+	exit 1
+	fi
+
+	echo "[cos executing] src/composer/target/debug/compose $script $name"
+	src/composer/target/debug/compose $script $name
+
+	local dir="system_binaries/cos_build-${name}"
+
+	tools/build_iso.sh ${dir}/cos.img
 }
 
 run()
 {
-    if [ -z "$binary" ]; then
-	usage
-    fi
+	local dir="./system_binaries/cos_build-${name}"
+
+	if [ ! -f ${dir}/cos.iso ]
+	then
+		echo "Cannot find cos.iso, please do compose first"
+		exit 1
+	fi
+
+	local elf_type=$(readelf -h ${dir}/cos.img | grep "Class:" | awk '{print $2}')
+	local machine=$(readelf -h ${dir}/cos.img | grep "Machine:" | awk '{print $2}')
 
-    echo "[cos executing] tools/run.sh $binary"
-    tools/run.sh $binary
+	if [ "${machine}" == "ARM" ]
+	then
+		./tools/arm_qemurun.sh all ${dir}
+		exit 0
+	fi
+
+	if [ "${elf_type}" == "ELF64" ]
+	then
+		tools/run.sh ${dir}/cos.iso x86_64 ${enable_nic}
+	elif [ "${elf_type}" == "ELF32" ]
+	then
+		tools/run.sh ${dir}/cos.iso i386 ${enable_nic}
+	else
+		echo "Unsupported image type: ${elf_type} !"
+	fi
+}
+
+debug_run()
+{
+	local dir="system_binaries/cos_build-${name}"
+	local gdbinit="system_binaries/gdbinit"
+
+	if [ ! -f ${dir}/cos.iso ]
+	then
+		echo "Cannot find cos.iso, please do compose first and check its name"
+		exit 1
+	fi
+
+	if [ ! -f ${gdbinit} ]
+	then
+		echo "set confirm off" > ${gdbinit}
+		echo "#file ${dir}/global.booter/no_interface.llbooter.global.booter" >> ${gdbinit}
+		echo "file ${dir}/cos.img" >> ${gdbinit}
+		echo "target remote:1234" >> ${gdbinit}
+	fi
+
+	local elf_type=$(readelf -h ${dir}/cos.img | grep "Class:" | awk '{print $2}')
+
+	if [ "${elf_type}" == "ELF64" ]
+	then
+		tools/run.sh ${dir}/cos.iso x86_64 debug ${enable_nic}
+	elif [ "${elf_type}" == "ELF32" ]
+	then
+		tools/run.sh ${dir}/cos.iso i386 debug ${enable_nic}
+	else
+		echo "Unsupported image type!"
+	fi
+}
+
+gdb()
+{
+	command gdb -x ./system_binaries/gdbinit
+}
+
+usage()
+{
+	echo "Usage: " $0 " init <arch: [x86_64|i386|armv7a]>|build|clean|compose <script> <output name>|run <composite name> [enable-nic]|debug_run <composite name> [enable_nic]|gdb | distclean"
+	exit 1
 }
 
 case $1 in
-    init )    initialize
-	      ;;
-    build )   build
-	      ;;
-    reset )   clean
-	      ;;
-    compose ) script=$2
-	      name=$3
-	      compose
-	      ;;
-    run )     binary=$2
-	      run
-	      ;;
-    * )       usage
+	init )
+		arch=$2
+		initialize
+		;;
+	build )
+		build
+		;;
+	clean )
+		clean
+		;;
+	compose )
+		script=$2
+		name=$3
+		compose
+		;;
+	run )
+		binary=$2
+		name=$2
+		enable_nic=$3
+		run
+		;;
+	debug_run )
+		name=$2
+		enable_nic=$3
+		debug_run
+		;;
+	gdb )
+		gdb
+		;;
+	distclean )
+		distclean
+		;;
+	* )
+		usage
 esac
diff --git a/doc/Xilinx_ZYNQ_ZC702_Bootup.md b/doc/Xilinx_ZYNQ_ZC702_Bootup.md
new file mode 100644
index 0000000000..6c9630595f
--- /dev/null
+++ b/doc/Xilinx_ZYNQ_ZC702_Bootup.md
@@ -0,0 +1,264 @@
+# Xilinx Zynq Zc702 Board
+
+This document should spell out the details for how to bootup Composite on that board.
+
+## Prerequisites
+
+### Packages
+
+You need arm-none-eabi-gcc installed, git, qemu-system-arm, etc.
+```
+sudo apt install gcc-arm-none-eabi qemu git build-essential binutils-dev bison flex minicom libssl-dev
+```
+Also need rust installed. Follow [this](https://doc.rust-lang.org/cargo/getting-started/installation.html)
+
+## Environment
+
+Environment variables expected/safe to set:
+
+```
+REALGCC=arm-none-eabi-gcc		#used by musl-gcc
+CROSS_COMPILE=arm-none-eabi-		#used by u-boot and composite build
+CC=arm-none-eabi-gcc			#not sure you need this but no harm
+ARCH=arm				#used in u-boot
+```
+Commands to set those:
+```
+export REALGCC=arm-none-eabi-gcc
+export CROSS_COMPILE=arm-none-eabi-
+export CC=arm-none-eabi-gcc
+export ARCH=arm
+```
+Or, use the script to set the above environment variables for the current session:
+```
+. tools/arm_setenv
+```
+(this is in <composite_clone>/ directory)
+
+Verify, if you'd like:
+```
+echo $REALGCC
+echo $CROSS_COMPILE
+echo $CC
+echo $ARCH
+```
+
+## Repositories
+
+### u-boot and composite for qemu
+
+When following the below instructions for cloning, make sure you have the directories something like this:
+```
+<workspace>/<composite> #it doesn't matter what you name the composite clone
+<workspace>/cos_u-boot-xlnx  # this is more important, as the qemu script in <composite>/tools/ directory expects this..
+```
+<workspace> can be anything, ex: `/home/<user>`.. Most important thing is that, both composite and uboot be at the same level in the directory hierarchy and follow specific name for uboot directory!! Keep this in mind while cloning things below..
+        
+### u-boot
+
+**This is not working for now**
+Get this:https://github.com/gwsystems/u-boot.git
+Branch: cos_armv7a_v2020.07
+
+**use this**
+https://github.com/gwsystems/u-boot-xlnx.git
+Branch: for_cos
+        (unfortunately I have no idea what version they based it on)
+
+#### Steps to build
+
+- Set the environment variables.
+- `make zynq_zc702_defconfig` from the cloned uboot-xlnx directory
+- `make` after that
+
+### Composite 
+
+Get this: https://github.com/gwsystems/composite.git
+Branch: loaderarm
+
+#### Steps to build
+
+- Make sure those environment variables are set
+- Go into <composite_clone>/src/ directory, simply because a lot of the config and env is not integrated into the `cos` tool for armv7a.
+- `make config-armv7a`
+- `make init`
+- `make all`
+- Go back to <composite_clone> directory
+- `./cos compose composition_scripts/kernel_test.toml kernel_test_1`
+
+This generates `cos.img.bin` in `system_binaries/cos_build-kernel_test_1/` directory, which we will boot from u-boot built in the previous step.
+
+If you made changes in the libs or components, you can also compile them from the composite root directory:
+- `./cos reset`
+- `./cos build`
+- finally, compose the script!
+
+## Qemu execution
+
+**Before you proceed**
+It looks like Qemu 2.11 (on Ubuntu 18.04) doesn't seem to work correctly, it hangs for me at `Loading Environment from SPI Flash...`. So I upgraded my qemu package following the below instructions from [this](https://mathiashueber.com/manually-update-qemu-on-ubuntu-18-04/)
+```
+For the sake of completeness and beginner friendliness this is how you use it.
+
+Open a terminal and run:
+sudo add-apt-repository ppa:jacob/virtualisation
+
+When the repository is added successfully, you can update QEMU and libvirt.
+sudo apt-get update
+sudo apt-get upgrade
+```
+It gives me qemu 2.12 on ubuntu 18.04, and that goes straight to the uboot prompt and boots Cos kernel, so sufficient I guess.
+
+1. Make sure the paths in `./tools/arm_qemurun.sh` are correct. Mainly, the uboot.elf is expected to be in `<composite_clone>/../cos_u-boot-xlnx/`. 
+1. `./tools/arm_qemurun.sh all system_binaries/cos_build-kernel_test_1/`
+1. Key in this command:
+   ```
+   load mmc 0:1 00100000 cos.img.bin && go 00100000
+   ```
+   you may execute those commands in two steps. like
+   ```
+   load mmc 0:1 00100000 cos.img.bin
+   go 00100000
+   ```
+   I added an environment variable through uboot source, `cosboot` that does the above for you.
+   This environment variable is added in this commit:https://github.com/gwsystems/u-boot-xlnx/commit/9f8ef4503ed63f2029bdf5deb7438ec9514bb784, so make sure you pull the latest for this to work!
+   So, instead of the above steps, you may just do this to boot composite:
+   ```
+   run cosboot
+   ```
+   **if this doesn't work, do printenv and confirm if `cosboot` exists in the environment**
+   
+1. This should ideally boot your system up, if you've a working Composite kernel and user-level, you'll see the output for kernel_test running some benchmarks!
+
+## HW execution
+
+### Zynq mkbootimage
+
+Follow the instructions here to be able to build and boot it. This is required for the baremetal boot, I believe if you're modifying uboot in anyway.
+NOTE: **The board must come with the boot image including uboot flashed, so this step is not required in that case.**
+**When I booted up, it had a working uboot, so I didn't follow any of the mkbootimage steps!**
+
+This: https://github.com/antmicro/zynq-mkbootimage.git
+Forking is taking too long.
+
+#### Steps I think are,
+
+- clone and go to the project directory
+- You should have access to the zynq board files: fsbl.elf, system.bit, boot.bif
+- Copy the u-boot.elf from your earlier step, and these 3 files in to the same directory as zynq-mkbootimage cloned directory.
+- `mkbootimage boot.bif boot.bin`
+
+- Again, I did not build a custom uboot image, instead used what was on the Xilinx board, so skipping mkbootimage steps here.
+
+### Prerequisites
+
+**serial communication**
+- I used `minicom` on ubuntu. 
+   - To install `sudo apt install minicom`
+   - To setup, `sudo minicom -s`
+   - The serial cable is connected to USB, unless you have more than one such connection, you will see `/dev/ttyUSB0` as your serial USB device. so
+   - In "serial port settings", change serial device to be `/dev/ttyUSB0`, change "Hardware flow control" to `No`, keep all other defaults.
+   - (optional) I normally change the "History buffer size" to be maximum, which is `5000`. 
+   - If you haven't run it with sudo, you'd not be able to save these settings as "save setup as dfl", so it is just an inconvenience but if you prefer saving and loading a non-default config, you may go ahead and run without sudo and choose "save setup as.." option instead.
+   - In my case, the default config after these changes is in `/etc/minicom/minirc.dfl` and as below:
+   ```
+   # Machine-generated file - use "minicom -s" to change parameters.
+   pu port             /dev/ttyUSB0
+   pu rtscts           No
+   pu histlines        5000
+   ```
+
+**This is for TFTP boot**
+
+- For TFTP boot to work, your host and the board must be connected to the same local network. Have the tftp server installed on the host. I followed [this](https://linuxhint.com/install_tftp_server_ubuntu/)
+
+- This creates `/srv/tftp` directory on the host. All you need to do after building `Composite` is to copy the `cos.img.bin` to that directory.
+  Ex: 
+  ```
+  cp <workspace>/<composite>/system_binaries/cos_build-kernel_test_1/cos.img.bin /srv/tftp
+  ```
+
+- On the board, stop at u-boot prompt:
+  - in my setup, i have both the board and host machine connected to the router which provides dhcp IP addresses. so I'm not setting static ip for the board.
+  - so all I change is the `serverip` to match my host machine IP, the board acquires its DHCP IP and connects to the host when you do tftp.
+  - after you change the environment you need, do a saveenv, so it saves that for consequent boots!
+  - read [this](https://www.denx.de/wiki/view/DULG/UBootCmdGroupEnvironment) for how to print, set, save environment on uboot.
+ 
+### Steps to boot Composite on H/W
+
+ 
+- Once that's done and you're are ready to boot Composite, enter the following command:
+  ```
+  tftp 00100000 cos.img.bin && go 00100000
+  ```
+  To make your life easy, you can save that as an env (works only on HW though, saveenv saves it in the persistent memory!), like:
+  ```
+  setenv cosboot "tftp 00100000 cos.img.bin && go 00100000"
+  saveenv
+  ```
+  From then on, just do: `run cosboot` from the uboot prompt! 
+
+
+## What works!
+
+### kernel_tests
+To compile: `./cos compose composition_scripts/kernel_test.toml kernel_test_arm`
+This generates binaries in `<composite>/system_binaries/cos_build-kernel_test_arm/` directory.
+
+To run on Qemu: 
+1. `./tools/arm_qemurun.sh all system_binaries/cos_build-kernel_test_arm/`
+2. Follow the steps from the Qemu section
+
+To run on HW: 
+1. `cp system_binaries/cos_build-kernel_test_arm/cos.img.bin /srv/tftp`
+2. follow tftp boot from the HW section
+
+
+### ping_pong
+To compile: `./cos compose composition_scripts/ping_pong.toml ping_pong_arm`
+This generates binaries in `<composite>/system_binaries/cos_build-ping_pong_arm/` directory.
+
+To run on Qemu: 
+1. `./tools/arm_qemurun.sh all system_binaries/cos_build-ping_pong_arm/`
+2. Follow the steps from the Qemu section
+
+To run on HW: 
+1. `cp system_binaries/cos_build-ping_pong_arm/cos.img.bin /srv/tftp`
+2. follow tftp boot from the HW section
+
+### sched
+
+To compile: `./cos compose composition_scripts/sched.toml sched_arm`
+This generates binaries in `<composite>/system_binaries/cos_build-sched_arm/` directory.
+
+To run on Qemu: 
+1. `./tools/arm_qemurun.sh all system_binaries/cos_build-sched_arm/`
+2. Follow the steps from the Qemu section
+
+To run on HW: 
+1. `cp system_binaries/cos_build-sched_arm/cos.img.bin /srv/tftp`
+2. follow tftp boot from the HW section
+
+### sched_ping_pong
+
+To compile: `./cos compose composition_scripts/sched_ping_pong.toml sched_ping_pong_arm`
+This generates binaries in `<composite>/system_binaries/cos_build-sched_ping_pong_arm/` directory.
+
+To run on Qemu: `./tools/arm_qemurun.sh all system_binaries/cos_build-sched_ping_pong_arm/`
+
+To run on HW: 
+1. `cp system_binaries/cos_build-sched_ping_pong_arm/cos.img.bin /srv/tftp`
+2. follow tftp boot from the HW section
+
+### chan_evt
+
+To compile: `./cos compose composition_scripts/chan_evt.toml chan_evt_arm`
+This generates binaries in `<composite>/system_binaries/cos_build-chan_evt_arm/` directory.
+
+To run on Qemu: 
+1. `./tools/arm_qemurun.sh all system_binaries/cos_build-chan_evt_arm/`
+2. Follow the steps from the Qemu section
+
+To run on HW: 
+1. `cp system_binaries/cos_build-chan_evt_arm/cos.img.bin /srv/tftp`
+2. follow tftp boot from the HW section
diff --git a/doc/crt_namespaces.md b/doc/crt_namespaces.md
new file mode 100644
index 0000000000..9a51b15e45
--- /dev/null
+++ b/doc/crt_namespaces.md
@@ -0,0 +1,133 @@
+CRT Namespace API Documentation
+=============================
+
+Why?
+-----------------------
+We want to allow components to share shared virtual address spaces (VAS), while using MPK for protection.
+Abstractions are required to reasonably share VASes, and control inter-component interactions accordingly.
+Some components may not share a VAS with any other components for maximum security.
+Others, like a scheduler or networking subsystem, should share a VAS with each other component that depends on them to enable fast interactions, while still mutually protecting their memory from each other.
+This emphasizes an important point: address spaces and protection are *orthogonal* -- sharing a VAS does *not* imply access to each other's memory.
+The latter use case crucially requires "disjoint-ness" between certain components, which will be discussed later.
+We require an API to facilitate this control.
+
+How?
+-----------------------
+This API uses and *manages* three *namespaces*.
+While only two are accessed directly by the API (the third is implicitly managed), it is worth presenting all three to fully understand the code.
+These are:
+
+1. Virtual Address Space Namespace
+
+    The key functionality is to enable multiple components to exist in the same virtual address space.
+	Hence we need VAS namespaces to track which components share which VAS.
+
+2. ASID namespace
+
+    ASIDs, or Address Space Identifiers, are for TLB tagging.
+	Each page table has an ASID, and its entries in the TLB are tagged as such.
+	This allows for the TLB to not be completely flushed when the page table changes.
+	As there are a finite number of ASIDs, the system must be able to control between which components switching causes TLB flushes.
+	For example, if two page-tables share an ASID namespace, they have different ASIDs, thus avoid switching.
+	However, if two page-tables use ASIDs from different namespaces, switching between them *might* require TLB flushes.
+	The API enables explicitly controlling this mapping of page-tables into ASID namespaces, thus limiting when TLB flushes are required.
+
+3. MPK namespace
+
+	Memory Protection Keys (MPKs) can be used to enable memory protection between components that can interact without kernel mediation.
+	Carefully switching protection domains (active MPK keys) can be done at user-level, thus speeding up inter-component communication.
+	MPK is not managed explicitly by this API, as without the VAS sharing, MPK is not useful.
+	Thus, in managing VASes, the implementation transparently manages MPKs.
+
+
+Relationships between namespaces
+-----------------------
+It's useful to understand the mappings between these namespaces and components to understand the API.
+
+- 1 component -> 1 VAS range -- Each component is assigned as VAS "name", or range of allowed virtual addresses.
+- 1 component -> 1 MPK name -- Each component is assigned a single MPK key.
+- 1 component -> many VASes -- A single component with a single name (VAS range + MPK key) can be mapped into many VASes only if no other component with the same name exists in any of those VASes.
+- 1 VAS -> 1 ASID name -- In the current implementation, each page-table corresponds to a VAS, and each is assigned an ASID name.
+- 1 VAS -> many components -- Each VAS contains potentially many components, each with separate names (MPK keys and virtual address ranges).
+- Namespaces (of any type) can be disjoint from one another, in which case we know their names never conflict.
+
+Names
+-----------------------
+- Properties of names within a namespace
+    We must track the state of all names within a namespace. The possible states are:
+
+    1. reserved
+        - Reserved names are potentially available to be used by that namespace. If a name is not reserved, it cannot be used (become allocated) within that namespace; however it may be possible for that name to be used for aliasing a component within a VAS namespace.
+    2. allocated
+        - Allocated names are used up within that namespace.
+    3. aliased
+        - This state is only for VAS namespaces, ASID namespaces can not be aliased.
+        - For a component to be aliased into a name, it must already be allocated within an ancestor namespace of this namespace and the name in question must be unreserved (and therefore unallocated).
+
+- How names are assigned
+    - In ASID NSs, names are assigned by first available, and the API user shouldn't know nor care which name is used.
+    - In VAS NSs, names are assigned by the addresses that a component is linked into (identified using its entry address).
+	    The API user will implicitly set which name a component will have by setting the component's `baseaddr` in the composition script.
+
+- Number of names
+    - ASID NSs: 1024 on x86-32
+    - VAS NSs: 512 (in 32 bit)
+    - MPK names: 15 (again, this is implicit and not exposed to the user, but direct allocations into the same VAS namespace will fail beyond 15 components for this reason; use the split functions to make beyond 15 allocations possible via the aliased state)
+
+
+The API and terminology
+-----------------------
+- Namespace creation
+    - These functions do a basic initialization of a namespace, and sets all names to be reserved and unallocated.
+        - `int crt_ns_asids_init(struct crt_ns_asid *asids)`
+        - `int crt_ns_vas_init(struct crt_ns_vas *new, struct crt_ns_asid *asids)`
+            - Assigns an ASID name within an existing ASID NS to the new VAS namespace
+    - These functions initialize a new namespace with the unallocated names left over from an existing namespace
+        - Leads to two disjoint namespaces
+        - Importantly, once a namespace is used to create a split, it is impossible to make any more allocations within it
+        - `int crt_ns_asids_split(struct crt_ns_asid *new, struct crt_ns_asid *existing)`
+        - `int crt_ns_vas_split(struct crt_ns_vas *new, struct crt_ns_vas *existing, struct crt_ns_asid *asids)`
+            - This aliases all the components that were allocated in existing into the new namespace
+
+- Namespace allocation
+    - Allocate an existing component into an existing namespace
+        - `int crt_ns_vas_alloc_in(struct crt_ns_vas *vas, struct crt_comp *c)`
+    - **Not yet implemented\** Create a component directly within a VAS namespace
+        - `int crt_comp_create_in_vas(struct crt_comp *c, struct crt_ns_vas *vas, struct crt_ns_asid * asids)`
+
+Example of use
+-----------------------
+For now, the booter must be modified directly to use this API. In the future this will be specifiable via the composition scripts.
+
+4 component system (one booter). Components 2 and 3 are in the same namespace, and component 4 is in a disjoint namespace
+
+```
+/* Assume:
+ * Namespaces have been allocated via slab allocator
+ *      Not shown, but it looks like:
+ *      ns_asid1 = ss_ns_asid_alloc();
+ *      ss_ns_asid_activate(ns_asid1);
+ * Components have been allocated and initialized as normal
+ */
+
+struct crt_ns_asid *ns_asid1;
+struct crt_ns_vas *ns_vas1;
+struct crt_ns_vas *ns_vas2;
+
+/* initialize ASID NS, VAS NS, allocate components 2 and 3 within it */
+if (crt_ns_asids_init(ns_asid1) != 0) BUG();
+
+if (crt_ns_vas_init(ns_vas1, ns_asid1) != 0) BUG();
+
+if (crt_ns_vas_alloc_in(ns_vas1, boot_comp_get(3)) != 0) BUG();
+if (crt_ns_vas_alloc_in(ns_vas1, boot_comp_get(2)) != 0) BUG();
+
+/* Create new ASID NS and VAS NS via split */
+if (ss_ns_asid_split(ns_asid2, ns_asid1) != 0) BUG();
+if (ss_ns_vas_split(ns_vas2, ns_vas1, ns_asid2) != 0) BUG();
+
+/* Allocate component 4 as normal, within ns_vas2 */
+if (crt_ns_vas_alloc_in(ns_vas1, boot_comp_get(4)) != 0) BUG();
+
+
+```
\ No newline at end of file
diff --git a/doc/dev_manual/07_system_composition.md b/doc/dev_manual/07_system_composition.md
index f76cbf2161..d646357700 100644
--- a/doc/dev_manual/07_system_composition.md
+++ b/doc/dev_manual/07_system_composition.md
@@ -1,5 +1,240 @@
 # System Composition
 
+To create an executable system, it requires
 
+1. each component to be compiled with their depended-on libraries, and interfaces (including all of those that are transitively depended on),
+1. each of those components must be configured with information about the resources they must manage, and other components to which they must provide service,
+1. components in charge of creating other components, must be given access to their elf objects,
+1. the components must be configured into a DAG of synchronous invocations, and
+1. they are be compiled into the kernel to create a bootable image.
+
+This process is implemented by the `composer` which is guided by a composition script.
+The composition script provides information about component inter-dependencies so that abstractions and layers are *designed*, while specializing the services to exactly those needed by your system's goals.
+A single component (in the future, multiple components) is charged with creating the other components, called the `constructor`.
+The `constructor` solves the problem of how to boot up a system with many different components in a system with a simple kernel.
+The kernel is charged with booting a *single* component (the `constructor`), and the `constructor`'s job is to build the rest of the system's components.
+To understand the fundamental mechanisms involved in system composition, lets them one at a time.
+
+## Component Compilation
+
+The build system enables the compilation of a *single* component using the `component` directive (`make component...`).
+The compilation can be driven by the ease-of-use wrapper: `./cos build <composition script> test`.
+The build system compiles the component and links into it all its libraries, the client-side code of interfaces it depends on, and the server-side code of interfaces it implements^[Library code is linked in from the `src/components/lib/*/*.a` file and, in rare cases, the object file identified by `grep OBJECT_OUTPUT src/components/lib/*/Makefile`.
+The latter is only used when it includes code that must be compiled into the component, but that might not include symbols that are undefined in the component, for example, for the library that provides the `_start`-equivalent function (`component`).
+The client interface code is found in `src/components/interface/*/stubs/cosrt_c_stub.o` which is derived from `src/components/interface/*/stubs/{c_stub.c,stubs.S}`.
+The server interface code is found in `src/components/interface/*/stubs/cosrt_s_stub.o` which is derived from `src/components/interface/*/stubs/{s_stub.c,stubs.S}`.].
+This includes the transitive closure of all depended-on interfaces and libraries.
+Only after this is done, it links the `libc` into the object.
+
+At this point, we have a `.o` file that includes all of the code for the component, and all of the library and interface code for it to interact with the surrounding system.
+However, this is not sufficient.
+Each component should know meta-data about itself (e.g. its heap-pointer, its component id), and about components it is responsible for exporting services to (e.g. the other component's capability-table frontier, their component id, if they require initialization, etc...).
+Only after the `composer` generates all of this information and compiles it into the component can we create an executable.
+
+## Synchronous Invocations and Inter-Component Dependencies
+
+A key part of system creation is the generation of the synchronous invocation (`sinv`) callgates between components that encode their functional dependencies.
+The `composer` derives these dependencies from the graph provided in the composition script.
+It then parses the component's elf files and determines which functions are depended on and which are exported (by looking at the `__cosrt_c_*` and `__cosrt_s_*` symbols).
+Looking at a client *c* that depends on server *s* for the *name* interface, it will match up all of the symbols in *c* matching `__cosrt_c_name_*` with those in *s* matching `__cosrt_s_name_*`.
+If any client functions do not find a *s* with corresponding server interfaces, an error will be reported.
+
+Once it finds such matches, it will track which clients have which functions (at which addresses) mapping to which server functions (at which addresses).
+The `composer` cannot create the `sinv` resources itself as it is part of the build system, and must instead add configuration information for the `constructor` to query.
+When the `constructor` starts executing (remember, it is loaded by the kernel), it loads this information, and creates the corresponding `sinv` resources after creating the components.
+
+But how does the `composer` convey this meta-data to the `constructor`?
+The initial arguments (`initargs` library) provides a means to query a hierarchical key-value store that is used by components to retrieve meta-data.
+The `composer` generates the `initargs` data-structure for the constructor that encodes all of the `sinv` information for it to create the appropriate functional dependencies.
+`initargs` can contain values that are large blobs, and indeed this is how the elf objects of the rest of the components are passed into the `constructor`.
+
+## Service Resources and Information
+
+Certain interfaces are special an imply that the server providing that interface requires some special access to the resources of their clients.
+For example,
+
+- A server that provides the `init` interface requires access to the `comp` capability of each of its clients (that use it for the `init` interface).
+- The `capmgr` interface implies that the server requires access to the capability table and page-table of the client.
+- The `capmgr_create` is identical.
+    Some components do not explicitly ask for service from the `capmgr`, but still require capability services for initialization and creation of the initial thread.
+- The `kernel` *variant* of an interface means that the client depending on it depends only on the kernel, and not another component to provide the implementation of the interface.
+	In this case, only the client libraries are compiled with the component.
+
+Similar to the `sinv` interface, the `composer` must orchestrate different components having access to the `comp`, `captbl`, and `pgtbl` capabilities.
+Also similarly, it uses the `initargs` to convey which capabilities, in which components, the `constructor` should place into the capability tables when booting up.
+
+## Making a Bootable Image
+
+To create a bootable image, we need to
+
+1. make the final executable binary for each component by combining it with its `initarg` meta-data,
+2. create a tarball containing each of the component's executables (except for the `constructor`),
+3. compile that tarball, and all of the `initargs` metadata into the `constructor` executable binary, and
+4. compile the `constructor` into the kernel.
+
+And we're done!
+
+- Boot into the kernel,
+- it creates the `constructor`,
+- which creates the rest of the components, and
+- follows the instructions in its metadata to give appropriate access to `comp`, `captbl`, and `pgtbl` resources.
+
+## Investigating a Composed System
+
+The results of the build procedure are ultimately the kernel in `cos.img`.
+In the following, I'll use the following as an example: `./cos build composition_scripts/capmgr_ping_pong.toml example`.
+Lets check out some of the artifacts of the build procedure.
+
+```
+$ ./cos compose composition_scripts/capmgr_ping_pong.toml example
+[cos executing] src/composer/target/debug/compose composition_scripts/capmgr_ping_pong.toml example
+Compiling component global.ping with the following command line:
+        make -C src COMP_INTERFACES="" COMP_IFDEPS="pong/stubs+init/stubs+capmgr_create/stubs" COMP_LIBDEPS="" COMP_INTERFACE=tests COMP_NAME=unit_pingpong COMP_VARNAME=global.ping COMP_OUTPUT=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.ping/tests.unit_pingpong.global.ping COMP_BASEADDR=0x1600000 COMP_INITARGS_FILE=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.ping/initargs.c  component
+Compiling component global.pong with the following command line:
+        make -C src COMP_INTERFACES="pong/stubs" COMP_IFDEPS="init/stubs+capmgr_create/stubs" COMP_LIBDEPS="" COMP_INTERFACE=pong COMP_NAME=pingpong COMP_VARNAME=global.pong COMP_OUTPUT=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.pong/pong.pingpong.global.pong COMP_BASEADDR=0x00400000 COMP_INITARGS_FILE=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.pong/initargs.c  component
+Compiling component global.capmgr with the following command line:
+        make -C src COMP_INTERFACES="capmgr/stubs+init/stubs+memmgr/stubs+capmgr_create/stubs" COMP_IFDEPS="init/stubs+addr/stubs" COMP_LIBDEPS="" COMP_INTERFACE=capmgr COMP_NAME=simple COMP_VARNAME=global.capmgr COMP_OUTPUT=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.capmgr/capmgr.simple.global.capmgr COMP_BASEADDR=0x00400000 COMP_INITARGS_FILE=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.capmgr/initargs.c  component
+Compiling component global.booter with the following command line:
+        make -C src COMP_INTERFACES="init/stubs+addr/stubs" COMP_IFDEPS="init/kernel" COMP_LIBDEPS="" COMP_INTERFACE=no_interface COMP_NAME=llbooter COMP_VARNAME=global.booter COMP_OUTPUT=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.booter/no_interface.llbooter.global.booter COMP_BASEADDR=0x00400000 COMP_INITARGS_FILE=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.booter/initargs.c  component
+Compiling component global.booter with the following command line:
+        make -C src COMP_INTERFACES="init/stubs+addr/stubs" COMP_IFDEPS="init/kernel" COMP_LIBDEPS="" COMP_INTERFACE=no_interface COMP_NAME=llbooter COMP_VARNAME=global.booter COMP_OUTPUT=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.booter/no_interface.llbooter.global.booter COMP_BASEADDR=0x00400000 COMP_INITARGS_FILE=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.booter/initargs_constructor.c COMP_TAR_FILE=/home/ycombinator/repos/composite/system_binaries/cos_build-example/global.booter/initfs_constructor.tar  component
+Compiling the kernel the following command line:
+        make -C src KERNEL_OUTPUT="/home/ycombinator/repos/composite/system_binaries/cos_build-example/cos.img" CONSTRUCTOR_COMP="/home/ycombinator/repos/composite/system_binaries/cos_build-example/constructor" plat
+System object generated:
+        /home/ycombinator/repos/composite/system_binaries/cos_build-example/cos.img
+```
+
+Lets check it out!
+
+`$ cd system_binaries/cos_build-example/`
+
+The kernel is `cos.img`, so lets look for the `constructor`.
+
+```
+$ nm cos.img | grep _binary_constructor
+c24292dc D _binary_constructor_end
+0017f2dc A _binary_constructor_size
+c22aa000 D _binary_constructor_start
+```
+
+We can see that the elf binary for the constructor (which includes all other components in a tarball) is *0x4292dc - 0x2aa000*, or about 1.5 MB.
+
+If we look around a little more, we can see:
+
+```
+$ ls
+constructor  cos.img  global.booter  global.capmgr  global.ping  global.pong  kernel_compilation.log
+```
+
+The `global.*` part of each of these is just the scope, and we only support global scopes in the current composition scripts.
+The `booter` component is the `constructor`, `capmgr` is the capability manager, and then we have both `ping` and `pong`.
+The `kernel_compilation.log` is, of course, the compilation log from building the kernel.
+
+### Client Component `ping`
+
+The `ping` component is the client-side of the functional invocation of `pong`.
+
+```
+$ ls global.ping/
+compilation.log  initargs.c  initargs.o  tests.unit_pingpong.global.ping
+```
+
+We have the compilation log for the build system's compilation of the component, the initial arguments metadata and the final binary.
+
+```c
+$ cat global.ping/initargs.c
+#include <initargs.h>
+static struct kv_entry *__initargs_autogen_3[] = {};
+static struct kv_entry __initargs_autogen_2 = { key: "execute", vtype: VTYPE_ARR, val: { arr: { sz: 0, kvs: __initargs_autogen_3 } } };
+static struct kv_entry __initargs_autogen_4 = { key: "captbl_end", vtype: VTYPE_STR, val: { str: "44" } };
+static struct kv_entry __initargs_autogen_5 = { key: "compid", vtype: VTYPE_STR, val: { str: "4" } };
+static struct kv_entry *__initargs_autogen_1[] = {&__initargs_autogen_5, &__initargs_autogen_4, &__initargs_autogen_2};
+static struct kv_entry __initargs_autogen_0 = { key: "_", vtype: VTYPE_ARR, val: { arr: { sz: 3, kvs: __initargs_autogen_1 } } };
+
+struct initargs __initargs_root = { type: ARGS_IMPL_KV, d: { kv_ent: &__initargs_autogen_0 } };
+```
+
+Here we can get a sense of the data-structure behind the hierarchical key-value store for the initial arguments.
+The `pong` component doesn't have much interesting information here, but we can see that the last used slot in the capability table is at capability `44`, and that the component id is `4`.
+
+Lets see `ping`'s relevant client symbols used for the functional coordination between ping and pong.
+
+```
+$ nm global.ping/tests.unit_pingpong.global.ping | grep __cosrt_c
+01600a90 T __cosrt_c_cosrtdefault
+01600ab0 T __cosrt_c_cosrtretdefault
+01600370 T __cosrt_c_init_done
+01610000 D __cosrt_comp_info
+016002b0 T __cosrt_c_pong_argsrets
+01600310 T __cosrt_c_pong_ids
+016002e0 T __cosrt_c_pong_subset
+```
+
+We can see that some of the main functions we depend on for execution that are provided by other components appear here.
+
+- `__cosrt_c_init_done` is part of the `init` interface and specifies that we want to have a thread that initializes us, often provided by the scheduler.
+- `__cosrt_c_pong_ids` is the `pong_ids` function that we're calling from ping to pong.
+
+Also included is the user-level capability structure that provides a level of indirection like the PLT upon the client calling `pong_ids`.
+
+```
+nm global.ping/tests.unit_pingpong.global.ping | grep __cosrt_ucap_pong_ids
+161108c D __cosrt_ucap_pong_ids
+```
+
+where this `ucap` structure is used in `pong_ids` (aliased to `__cosrt_extern_pong_ids`)
+
+```
+1600368 <pong_ids>:
+ 1600368:       b8 8c 10 61 01          mov    $0x161108c,%eax
+ 160036d:       ff 20                   jmp    *(%eax)
+ 160036f:       90                      nop
+ ```
+
+You can see that this address here matches the `ucap`.
+The `ucap` holds a function pointer that is invoked via the `jmp` that most often directly points to `__cosrt_c_pong_ids`.
+
+Lets back up a little bit.
+When the client calls `pong_ids`, it gets redirected to this small little assembly stub that accesses the `ucap` structure and calls a function pointer that holds the client stub.
+It also passes the address of the `ucap` to the stub.
+Within this `ucap` structure, we hold the capability id to the `sinv` that we need to invoke to properly call the `pong_ids` function in the server.
+
+### Server Component `pong`
+
+On the server side, in `pong`, we see
+
+```
+$ nm global.pong/pong.pingpong.global.pong | grep __cosrt_s
+...
+00400560 T __cosrt_s_cstub_pong_ids
+...
+004004f0 T __cosrt_s_pong_ids
+...
+```
+
+We can see where the `pong_ids` function starts its execution in this component with `__cosrt_s_pong_ids`.
+That assembly code calls the C function that performs any argument manipulation (deserialization) necessary in `__cosrt_s_cstub_pong_ids`.
+
+### `constructor` Component
+
+```
+$ ls global.booter/
+compilation.log              initargs.c              initargs_constructor.o  initfs_constructor.tar    no_interface.llbooter.global.booter
+constructor_compilation.log  initargs_constructor.c  initargs.o              initfs_constructor.tar.o
+```
+
+Here we additionally see the tarball, the tarball compiled into an object file, and multiple initargs files and compilation logs.
+I won't go into why there are two of each of these here, and we'll just look at the `constructor` versions.
+
+The `initargs_constructor.c` file is large, so I won't show it here, but it includes each of the components, each synchronous invocation callgate that must be created, and the set of resources each component should have access to.
+
+We can see the tarball that includes all other components in the final binary as
+
+```
+$ nm global.booter/no_interface.llbooter.global.booter | grep binary
+00535000 D _binary_crt_init_tar_end
+0011c400 A _binary_crt_init_tar_size
+00418c00 D _binary_crt_init_tar_start
+```
 
 ## Composition Scripts
diff --git a/doc/dev_manual/08_debugging.md b/doc/dev_manual/08_debugging.md
index f7621d6dd9..c252b1b03b 100644
--- a/doc/dev_manual/08_debugging.md
+++ b/doc/dev_manual/08_debugging.md
@@ -131,8 +131,8 @@ Using GDB with QEMU, we can step through the kernel code line by line and check
 To start to use GDB, we should add `-S` and `-s` options to QEMU, `-S` make QEMU stop when startup,
 and `-s` open the `gdbserver` for QEMU on TCP port 1234. After that, we then can start GDB by typing `gdb` in the command line to open it.
 
-After GDB starts, it will prompt the banner and gdb command line:
-
+After GDB starts, it will prompt the banner and gdb command line:  
+(Hint: steps below have been automatically done by our `cos` command, you can use `./cos debug_run $your_build_name` and `./cos gdb` to bgein gdb debug in Qemu)
 ```bash
 GNU gdb (Ubuntu 8.1.1-0ubuntu1) 8.1.1
 Copyright (C) 2018 Free Software Foundation, Inc.
diff --git a/doc/installation_usage_summary.md b/doc/installation_usage_summary.md
new file mode 100644
index 0000000000..cbebb75a1d
--- /dev/null
+++ b/doc/installation_usage_summary.md
@@ -0,0 +1,31 @@
+Installation and Usage Summary
+==============================
+
+Example
+-------
+
+```bash
+# $ARCH can be x86_64 or i386
+# $SYS_ENV can be ubuntu-64 or fedora-64
+# $YOUR_TOML_SCRIPT is the script to specify how to compsose your components, we have examples under the `composition_scripts` folder
+
+1. git clone https://github.com/gwsystems/composite.git
+
+2. cd composite
+3. tools/init_env.sh $SYS_ENV # only need to do this step once when you download the system first time
+4. ./cos init $ARCH
+5. ./cos build
+6. ./cos compose composition_scripts/$YOUR_TOML_SCRIPT $YOUR_OUTPUT_NAME
+7. ./cos run $YOUR_OUTPUT_NAME
+```
+
+Recompile Steps
+---------------
+
+The following steps will need to be run every time you write some code and want to recompile and test. 
+
+```bash
+1. ./cos build
+2. ./cos compose composition_scripts/$YOUR_TOML_SCRIPT $YOUR_OUTPUT_NAME
+3. ./cos run $YOUR_OUTPUT_NAME
+```
diff --git a/src/Makefile b/src/Makefile
index afb83cba4a..8ccee4cba1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,9 +7,14 @@ PLAT_FILE=.PLATFORM_ID
 
 default: | all
 
-all: composer comps plat
+all: comps plat composer
 
 composer:
+	@CAP_FREE=`gdb platform/$(shell cat $(PLAT_FILE))/boot_comp.o --eval-command="p /d BOOT_CAPTBL_FREE" --eval-command="quit" | grep "$\\$$1" | awk -F "= " '{print $$2}'`; \
+	LINE_NUM=`cat -n composer/src/resources.rs | grep "const BOOT_CAPTBL_FREE" | awk -F " " '{print $$1}'`; \
+	LINE_NUM=`echo $$LINE_NUM`; \
+	CAP_FREE=`echo $$CAP_FREE`; \
+	sed -i "$${LINE_NUM}cconst BOOT_CAPTBL_FREE: u32 = $${CAP_FREE}$\;" composer/src/resources.rs
 	cd composer/ ; cargo build
 
 component:
@@ -26,10 +31,10 @@ comps:
 platclean:
 	$(MAKE) $(MAKEOPTIONS) PLATFORM=$(shell cat $(PLAT_FILE)) -C platform clean
 
-plat: platclean
+plat:
 	$(info )
 	$(info ***********************************************)
-	$(info ***** Building $(shell cat $(PLAT_FILE)) Platform and Kernel *******)
+	$(info ***** Building $(shell cat $(PLAT_FILE)) Platform and Kernel *****)
 	$(info ***********************************************)
 	$(info )
 	$(MAKE) $(MAKEOPTIONS) PLATFORM=$(shell cat $(PLAT_FILE)) -C platform
@@ -44,24 +49,19 @@ clean: platclean
 distclean: clean
 	$(MAKE) $(MAKEOPTIONS) -C components distclean
 	@rm -f `pwd`/../transfer/*
+	@rm Makefile.arch Makefile.cosconfig $(PLAT_FILE)
 
 init:
-	test -f $(PLAT_FILE) || $(MAKE) $(MAKEOPTIONS) config
 	$(MAKE) $(MAKEOPTIONS) -C components init
 	$(MAKE) $(MAKEOPTIONS) PLATFORM=$(shell cat $(PLAT_FILE)) -C platform init
 
 update:
-	git submodule update --init --recursive
+	git submodule update --init --recursive --progress
 
 submod_fastforward:
 	git submodule update --remote --merge
 
 config-gen: update
-	@echo "Configuring the system with clock speed and directory structure."
-	@echo "Please view Makefile.cosconfig and kernel/include/shared/cpu_ghz.h to make sure they're accurate."
-	@echo "Do _not_ 'git add' either of these files."
-	@cat /proc/cpuinfo | grep "model name" -m 1 | sed 's/.*\([0-9]\.[0-9]*\).*/\#define CPU_GHZ \1/' > ./kernel/include/shared/cpu_ghz.h
-	@if [ -z "`cat /proc/cpuinfo | grep \"physical id\"`" ]; then echo "#define NUM_CPU_SOCKETS 1" >> ./kernel/include/shared/cpu_ghz.h; else cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l | sed 's/.*\([0-9]\).*/\#define NUM_CPU_SOCKETS \1/' >> ./kernel/include/shared/cpu_ghz.h; fi
 	@pwd | sed 's/\(\/[a-zA-Z0-9]*\/[a-zA-Z0-9]*\/\).*/HOME_DIR=\1/' > Makefile.cosconfig
 	@echo "CODE_DIR=`pwd`" >> Makefile.cosconfig
 	@echo "TRANS_DIR=\$$(CODE_DIR)/../transfer" >> Makefile.cosconfig
@@ -69,20 +69,48 @@ config-gen: update
 	@echo "LDIR=\$$(CODE_DIR)/linux-2.6.36/" >> Makefile.cosconfig
 	@echo "TEST_DIR=/root/experiments/" >> Makefile.cosconfig
 
-# default platform is i386
-config: config-i386
-
-config-linux: config-gen
-	@echo "#define COS_PLATFORM LINUX" >> ./kernel/include/shared/cpu_ghz.h
-	@echo "#define COS_LINUX" >> ./kernel/include/shared/cpu_ghz.h
-	@cd kernel/include/ ; rm -f chal ; ln -s ../../platform/linux/module/chal/ chal
-	@echo "linux" > $(PLAT_FILE)
+# default platform is x86_64
+config: config-x86_64
 
 # override the default linux chal link
 config-i386: config-gen
-	@echo "#define COS_PLATFORM I386" >> ./kernel/include/shared/cpu_ghz.h
 	@cd kernel/include/ ; rm -f chal ; ln -s ../../platform/i386/chal/ chal
 	@echo "i386" > $(PLAT_FILE)
+	@echo "ARCH_CFLAGS = -m32 -march=i686 -D__x86__ -D__WORD_SIZE_32__" >  Makefile.arch
+	@echo "ARCH_ASFLAGS= -m32 -D__x86__ -D__WORD_SIZE_32__ -D__ASM__" >> Makefile.arch
+	@echo "ARCH_LDFLAGS=-melf_i386"      >> Makefile.arch
+	@echo "Configuring the system with clock speed and directory structure."
+	@cpu_freq=`cat /var/log/dmesg | grep  "MHz processor" | awk -F ] '{print $$2}' | awk -F . '{print $$1}' |grep -o '[[:digit:]]*'`;cpu_freq=`awk 'BEGIN{printf "%.2f\n",'$$cpu_freq'/'1000'}'`;echo "#define CPU_GHZ $$cpu_freq" > ./kernel/include/chal/shared/cpu_ghz.h
+	@if [ -z "`cat /proc/cpuinfo | grep \"physical id\"`" ]; then echo "#define NUM_CPU_SOCKETS 1" >> ./kernel/include/chal/shared/cpu_ghz.h; else cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l | sed 's/.*\([0-9]\).*/\#define NUM_CPU_SOCKETS \1/' >> ./kernel/include/chal/shared/cpu_ghz.h; fi
+	@echo "Please view Makefile.cosconfig and kernel/include/chal/shared/cpu_ghz.h to make sure they're accurate."
+	@echo "Do _not_ 'git add' either of these files."
+	@echo "#define COS_PLATFORM I386" >> ./kernel/include/chal/shared/cpu_ghz.h
+
+config-armv7a: config-gen
+	@cd kernel/include/ ; rm -f chal ; ln -s ../../platform/armv7a/chal/ chal
+	@echo "armv7a" > $(PLAT_FILE)
+	@echo "ARCH_CFLAGS = -march=armv7-a -D__arm__ -D__WORD_SIZE_32__" >  Makefile.arch
+	@echo "ARCH_ASFLAGS= -march=armv7-a -D__arm__ -D__WORD_SIZE_32__ -D__ASM__" >> Makefile.arch
+	@echo "ARCH_LDFLAGS="                          >> Makefile.arch
+	@echo "Configuring the system with clock speed and directory structure."
+	@cat /proc/cpuinfo | grep "model name" -m 1 | sed 's/.*\([0-9]\.[0-9]*\).*/\#define CPU_GHZ \1/' > ./kernel/include/chal/shared/cpu_ghz.h
+	@if [ -z "`cat /proc/cpuinfo | grep \"physical id\"`" ]; then echo "#define NUM_CPU_SOCKETS 1" >> ./kernel/include/chal/shared/cpu_ghz.h; else cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l | sed 's/.*\([0-9]\).*/\#define NUM_CPU_SOCKETS \1/' >> ./kernel/include/chal/shared/cpu_ghz.h; fi
+	@echo "Please view Makefile.cosconfig and kernel/include/chal/shared/cpu_ghz.h to make sure they're accurate."
+	@echo "Do _not_ 'git add' either of these files."
+	@echo "#define COS_PLATFORM ARMV7A" >> ./kernel/include/chal/shared/cpu_ghz.h
+
+config-x86_64: config-gen
+	@cd kernel/include/ ; rm -f chal ; ln -s ../../platform/x86_64/chal/ chal
+	@echo "x86_64" > $(PLAT_FILE)
+	@echo "ARCH_CFLAGS = -m64 -D__x86_64__ -D__WORD_SIZE_64__ -mcmodel=large" >  Makefile.arch
+	@echo "ARCH_ASFLAGS= -m64 -D__x86_64__ -D__WORD_SIZE_64__ -D__ASM__ -mcmodel=large" >> Makefile.arch
+	@echo "ARCH_LDFLAGS= -melf_x86_64"      >> Makefile.arch
+	@echo "Configuring the system with clock speed and directory structure."
+	@cpu_freq=`cat /var/log/dmesg | grep  "MHz processor" | awk -F ] '{print $$2}' | awk -F . '{print $$1}' |grep -o '[[:digit:]]*'`;cpu_freq=`awk 'BEGIN{printf "%.2f\n",'$$cpu_freq'/'1000'}'`;echo "#define CPU_GHZ $$cpu_freq" > ./kernel/include/chal/shared/cpu_ghz.h
+	@if [ -z "`cat /proc/cpuinfo | grep \"physical id\"`" ]; then echo "#define NUM_CPU_SOCKETS 1" >> ./kernel/include/chal/shared/cpu_ghz.h; else cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l | sed 's/.*\([0-9]\).*/\#define NUM_CPU_SOCKETS \1/' >> ./kernel/include/chal/shared/cpu_ghz.h; fi
+	@echo "Please view Makefile.cosconfig and kernel/include/chal/shared/cpu_ghz.h to make sure they're accurate."
+	@echo "Do _not_ 'git add' either of these files."
+	@echo "#define COS_PLATFORM x86_64" >> ./kernel/include/chal/shared/cpu_ghz.h
 
 run:
 ifeq ($(RUNSCRIPT),)
diff --git a/src/Makefile.src b/src/Makefile.src
index 1a02ae1c47..56badc076b 100644
--- a/src/Makefile.src
+++ b/src/Makefile.src
@@ -9,14 +9,19 @@ TOP_DIR=$(CODE_DIR)
 KDIR=$(TOP_DIR)/kernel/
 KINC=$(TOP_DIR)/kernel/include/
 SHAREDINC=$(TOP_DIR)/kernel/include/shared/
+CHALSHAREDINC=$(TOP_DIR)/kernel/include/chal/shared/
 CDIR=$(TOP_DIR)/components/
 
 # tools
 MAKE=make
-CC=gcc
-AR=ar
-LD=ld
+CC=$(CROSS_COMPILE)gcc
+CPP=$(CROSS_COMPILE)g++
+CXX=$(CROSS_COMPILE)g++
+AR=$(CROSS_COMPILE)ar
+LD=$(CROSS_COMPILE)ld
 AS=$(CC)
 MV=mv
 CP=cp
 RM=rm
+PLAT_FILE=$(TOP_DIR)/.PLATFORM_ID
+PLATFORM=$(shell cat $(PLAT_FILE))
diff --git a/src/components/Makefile b/src/components/Makefile
index 08d26cf2c5..9aa6d489f8 100644
--- a/src/components/Makefile
+++ b/src/components/Makefile
@@ -10,9 +10,9 @@ all:
 	$(MAKE) $(MAKEOPTIONS) -C implementation
 
 clean:
-	$(MAKE) $(MAKEOPTIONS) -C lib clean
 	$(MAKE) $(MAKEOPTIONS) -C interface clean
 	$(MAKE) $(MAKEOPTIONS) -C implementation clean
+	$(MAKE) $(MAKEOPTIONS) -C lib clean
 
 distclean:
 	$(MAKE) $(MAKEOPTIONS) -C lib distclean
diff --git a/src/components/Makefile.comp b/src/components/Makefile.comp
index ccf12c33d0..a4cf3713c7 100644
--- a/src/components/Makefile.comp
+++ b/src/components/Makefile.comp
@@ -1,25 +1,24 @@
 # include ../../../Makefile.inc first!
-
-ARCH_CFLAGS =-m32 -D__x86__ -march=i686
-ARCH_ASFLAGS=$(ARCH_CFLAGS)
-ARCH_LDFLAGS=-melf_i386
+include ../Makefile.arch
 
 IMPLDIR=$(CDIR)/implementation/
 INTERDIR=$(CDIR)/interface/
 LIBDIR=$(CDIR)/lib/
 
-MUSLDIR=$(CDIR)/lib/libc/musl-1.1.11
-MUSLBIN=$(MUSLDIR)/bin
-MUSLCC=$(MUSLBIN)/musl-$(CC)
+MUSLDIR=$(CDIR)/lib/libc/musl-1.2.0
+MUSLBIN=$(MUSLDIR)/obj/
+MUSLCC=$(MUSLBIN)/musl-gcc
 MUSLINC=-isystem$(MUSLDIR)/include
 
-CINC=-I. -I$(SHAREDINC)
+CINC=-I. -I$(SHAREDINC) -I$(CHALSHAREDINC)
 
 SHARED_FLAGS=-fno-merge-constants -nostdinc -nostdlib -fno-pic -fno-pie
-#OPT= -g -fvar-tracking
-OPT= -O3
+OPT= -g -fvar-tracking
+OPT+= -O3
 
-CFLAGS=$(ARCH_CFLAGS) -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-unused-function -fno-stack-protector -fno-omit-frame-pointer -Wno-unused-variable $(CINC) $(MUSLINC) $(OPT) $(SHARED_FLAGS)
+# This removes warnings from Ubuntu 20 (gcc 9.3), but should likely be removed by fixing the issue
+TMPFLGS := -Wno-address-of-packed-member
+CFLAGS=$(ARCH_CFLAGS) -Wall -Wextra $(TMPFLGS) -Wno-unused-parameter -Wno-type-limits -Wno-unused-function -fno-stack-protector -fno-omit-frame-pointer -Wno-unused-variable $(CINC) $(MUSLINC) $(OPT) $(SHARED_FLAGS)
 CXXFLAGS=-fno-exceptions -fno-threadsafe-statics -Wno-write-strings $(CFLAGS)
 LDFLAGS=$(ARCH_LDFLAGS)
 MUSLCFLAGS=$(CFLAGS) -lc -lgcc -Xlinker -r
@@ -28,6 +27,7 @@ ASFLAGS=$(ARCH_ASFLAGS) $(CINC) $(SHARED_FLAGS)
 GCC_PIE=$(shell gcc -v 2>&1 | grep -c "\--enable-default-pie")
 ifeq ($(GCC_PIE),1)
 MUSLCFLAGS+=-no-pie
+LDFLAGS+=
 CFLAGS+=-fno-pie
 CXXFLAGS+=-fno-pie
 endif
diff --git a/src/components/Makefile.dependencies b/src/components/Makefile.dependencies
index 54cf1b9f52..179035422a 100644
--- a/src/components/Makefile.dependencies
+++ b/src/components/Makefile.dependencies
@@ -1,6 +1,6 @@
 include Makefile.src Makefile.comp
 
-CALC_DEPS_SCRIPT   = python $(CDIR)cidl/calculate_dependencies.py $(shell pwd)/ $(CDIR)
+CALC_DEPS_SCRIPT   = python2.7 $(CDIR)cidl/calculate_dependencies.py $(shell pwd)/ $(CDIR)
 LIBRARY_DEP_LIST   =$(strip $(shell $(CALC_DEPS_SCRIPT) libdeps))
 INTERFACE_DEP_LIST =$(strip $(shell $(CALC_DEPS_SCRIPT) ifdeps))
 # List of -L library paths
diff --git a/src/components/cidl/calculate_dependencies.py b/src/components/cidl/calculate_dependencies.py
index 531bda7aee..ab128d2e89 100644
--- a/src/components/cidl/calculate_dependencies.py
+++ b/src/components/cidl/calculate_dependencies.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.7
 
 import re
 import sys
diff --git a/src/components/implementation/Makefile.subdir b/src/components/implementation/Makefile.subdir
index 8bd73fc235..659f4c340c 100644
--- a/src/components/implementation/Makefile.subdir
+++ b/src/components/implementation/Makefile.subdir
@@ -9,7 +9,7 @@ INCLUDES=$(DEPENDENCY_INCPATH) $(CINC)
 OBJS=$(patsubst %.c,%.o,$(wildcard *.c)) $(patsubst %.S,%.o,$(wildcard *.S)) $(patsubst %.cc,%.o,$(wildcard *.cc))
 
 #NOTE: assembly files don't have dependencies generated for them
-SOURCE_DEPENDENCIES=$($(wildcard *.c):%.c=%.d) $($(wildcard *.cc):%.cc=%.d)
+SOURCE_DEPENDENCIES=$(OBJS:%.o=%.d)
 
 .PHONY: all
 all: print $(SOURCE_DEPENDENCIES) $(CLIB) subdirs
@@ -44,11 +44,25 @@ endif
 
 # see the make manual: create the .d dependencies from include
 # statements.
+# redirect error output to /dev/null so that it will not display
+# errors when cleaning, this does not affect gcc's error output when 
+# building the system because that is in a different target path
 %.d:%.c
+	$(info |     [DEP]  Creating dependency file for $@)
+	@set +e; rm -f $@; \
+	$(CC) -M $(INCLUDES) $(CFLAGS) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
+	rm -f $@.$$$$
+
+%.d:%.cc
 #	$(info |     [DEP]  Creating dependency file for $<)
-	@set -e; rm -f $@; \
-	$(CC) -M $(INCLUDE) $(CFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	@set +e; rm -f $@; \
+	$(CXX) -M $(INCLUDES) $(LIBSTDCXXINC) $(CXXFLAGS) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
 	rm -f $@.$$$$
 
 .PHONY: clean
diff --git a/src/components/implementation/Makefile.subsubdir b/src/components/implementation/Makefile.subsubdir
index 708bb75c73..888f909918 100644
--- a/src/components/implementation/Makefile.subsubdir
+++ b/src/components/implementation/Makefile.subsubdir
@@ -34,9 +34,19 @@ LIB_MANDATORY=$(DEPENDENCY_LIBOBJS)
 # references
 LIB_FLAGS    =$(LIB_MANDATORY) $(if $(wildcard ../*.a), -L.. -linterfacelib) $(DEPENDENCY_LIBPATH) $(DEPENDENCY_LIBS) $(DEPENDENCY_LIBS)
 
-COMP_LD_SCRIPT=$(IMPLDIR)/comp.ld
 TAR_SYMBOL_NAME=crt_init.tar
 
+ifeq ($(PLATFORM), i386)
+LINKFLAG=-Xlinker -melf_i386
+COMP_LD_SCRIPT=$(IMPLDIR)/comp_i386.ld
+else ifeq ($(PLATFORM), x86_64)
+LINKFLAG=-Xlinker -melf_x86_64 
+COMP_LD_SCRIPT=$(IMPLDIR)/comp_x86_64.ld
+else ifeq ($(PLATFORM), armv7a)
+LINKFLAG=-Xlinker -marmelf
+COMP_LD_SCRIPT=$(IMPLDIR)/comp_armv7a.ld
+endif
+
 .PHONY: all
 all: print $(SOURCE_DEPENDENCIES) $(COMPOBJ)
 
@@ -84,7 +94,7 @@ component: clean comp_header $(COMPOBJ)
 	$(if $(COMP_TAR_FILE), cp $(COMP_TAR_FILE) $(TAR_SYMBOL_NAME))
 	$(if $(COMP_TAR_FILE), $(LD) $(LDFLAGS) -r -b binary $(TAR_SYMBOL_NAME) -o $(COMP_TAR_FILE).o; rm $(TAR_SYMBOL_NAME))
 	$(LD) $(LDFLAGS) -r -o $(COMPNAME).linked_libs_ifs.o $(COMPOBJ) $(COMP_EXPIF_OBJS) $(COMP_DEP_OBJS) $(if $(COMP_INITARGS_FILE), $(COMP_INITARGS_FILE:%.c=%.o)) $(if $(COMP_TAR_FILE), $(COMP_TAR_FILE).o) $(COMP_DEPLIBDIRS_CLEAN) $(COMP_DEPLIBS_CLEAN) $(LIB_FLAGS)
-	$(MUSLCC) $(COMPNAME).linked_libs_ifs.o $(MUSLCFLAGS) -Xlinker -melf_i386 -o $(COMPNAME).linked_musl.o
+	$(MUSLCC) $(COMPNAME).linked_libs_ifs.o $(MUSLCFLAGS) $(LINKFLAG) -o $(COMPNAME).linked_musl.o
 	$(LD) $(LDFLAGS) -Ttext=$(COMP_BASEADDR) -T $(COMP_LD_SCRIPT) -o $(COMP_OUTPUT) $(COMPNAME).linked_musl.o
 
 %.o:%.c
@@ -101,16 +111,23 @@ component: clean comp_header $(COMPOBJ)
 
 # see the make manual: create the .d dependencies from include
 # statements.
+# redirect error output to /dev/null so that it will not display
+# errors when cleaning, this does not affect gcc's error output when 
+# building the system because that is in a different target path
 %.d:%.c
-	@set -e; rm -f $@; \
-	$(CC) -M $(INCLUDE) $(CFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	@set +e; rm -f $@; \
+	$(CC) -M $(INCLUDE) $(CFLAGS) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
 	rm -f $@.$$$$
 
 %.d:%.cc
-	@set -e; rm -f $@; \
-	$(CXX) -M $(INCLUDE) $(LIBSTDCXXINC) $(CXXFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	@set +e; rm -f $@; \
+	$(CXX) -M $(INCLUDE) $(LIBSTDCXXINC) $(CXXFLAGS) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
 	rm -f $@.$$$$
 
 .PHONY: clean
diff --git a/src/components/implementation/capmgr/simple/capmgr.c b/src/components/implementation/capmgr/simple/capmgr.c
index 17fd7a6556..2299e848b2 100644
--- a/src/components/implementation/capmgr/simple/capmgr.c
+++ b/src/components/implementation/capmgr/simple/capmgr.c
@@ -72,7 +72,7 @@ SS_STATIC_SLAB(asnd, struct cm_asnd, MAX_NUM_THREADS);
 
 /* 64 MiB */
 #define MB2PAGES(mb) (round_up_to_page(mb * 1024 * 1024) / PAGE_SIZE)
-#define MM_NPAGES (MB2PAGES(64))
+#define MM_NPAGES (MB2PAGES(256))
 SS_STATIC_SLAB(page, struct mm_page, MM_NPAGES);
 SS_STATIC_SLAB(span, struct mm_span, MM_NPAGES);
 
@@ -113,7 +113,6 @@ cm_comp_alloc_with(char *name, compid_t id, struct crt_comp_resources *resources
 	return c;
 }
 
-
 struct cm_rcv *
 cm_rcv_alloc_in(struct crt_comp *c, struct crt_rcv *sched, thdclosure_index_t closure_id, crt_rcv_flags_t flags)
 {
@@ -163,7 +162,7 @@ cm_thd_alloc_in(struct cm_comp *c, struct cm_comp *sched, thdclosure_index_t clo
  *   page is available.
  */
 static struct mm_page *
-mm_page_alloc(struct cm_comp *c)
+mm_page_alloc(struct cm_comp *c, unsigned long align)
 {
 	struct mm_mapping *m;
 	struct mm_page    *ret = NULL, *p;
@@ -178,7 +177,7 @@ mm_page_alloc(struct cm_comp *c)
 	/* Allocate page, map page */
 	p->page = crt_page_allocn(&cm_self()->comp, 1);
 	if (!p->page) ERR_THROW(NULL, free_p);
-	if (crt_page_aliasn_in(p->page, 1, &cm_self()->comp, &c->comp, &m->addr)) BUG();
+	if (crt_page_aliasn_aligned_in(p->page, align, 1, &cm_self()->comp, &c->comp, &m->addr)) BUG();
 
 	ss_state_activate_with(&m->comp, (word_t)c);
 	ss_page_activate(p);
@@ -191,15 +190,15 @@ mm_page_alloc(struct cm_comp *c)
 }
 
 static struct mm_page *
-mm_page_allocn(struct cm_comp *c, unsigned long num_pages)
+mm_page_allocn(struct cm_comp *c, unsigned long num_pages, unsigned long align)
 {
 	struct mm_page *p, *prev, *initial;
 	unsigned long i;
 
-	initial = prev = p = mm_page_alloc(c);
+	initial = prev = p = mm_page_alloc(c, align);
 	if (!p) return 0;
 	for (i = 1; i < num_pages; i++) {
-		p = mm_page_alloc(c);
+		p = mm_page_alloc(c, PAGE_SIZE);
 		if (!p) return NULL;
 		if ((prev->page + 4096) != p->page) {
 			BUG(); /* FIXME: handle concurrency */
@@ -211,21 +210,49 @@ mm_page_allocn(struct cm_comp *c, unsigned long num_pages)
 }
 
 vaddr_t
-memmgr_heap_page_allocn(unsigned long num_pages)
+memmgr_heap_page_allocn_aligned(unsigned long num_pages, unsigned long align)
 {
 	struct cm_comp *c;
 	struct mm_page *p;
 
 	c = ss_comp_get(cos_inv_token());
 	if (!c) return 0;
-	p = mm_page_allocn(c, num_pages);
+	p = mm_page_allocn(c, num_pages, align);
 	if (!p) return 0;
 
 	return (vaddr_t)p->mappings[0].addr;
 }
 
+vaddr_t
+memmgr_virt_to_phys(vaddr_t vaddr)
+{
+	struct cm_comp *c;
+
+	c = ss_comp_get(cos_inv_token());
+	if (!c) return 0;
+	
+	return call_cap_op(c->comp.comp_res->ci.pgtbl_cap, CAPTBL_OP_INTROSPECT, (vaddr_t)vaddr, 0, 0, 0);
+}
+
+vaddr_t
+memmgr_map_phys_to_virt(paddr_t paddr, size_t size)
+{
+	struct cm_comp *c;
+
+	c = ss_comp_get(cos_inv_token());
+	if (!c) return 0;
+
+	return (vaddr_t)cos_hw_map(&c->comp.comp_res->ci, BOOT_CAPTBL_SELF_INITHW_BASE, paddr, size);
+}
+
+vaddr_t
+memmgr_heap_page_allocn(unsigned long num_pages)
+{
+	return memmgr_heap_page_allocn_aligned(num_pages, PAGE_SIZE);
+}
+
 cbuf_t
-memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr)
+memmgr_shared_page_allocn_aligned(unsigned long num_pages, unsigned long align, vaddr_t *pgaddr)
 {
 	struct cm_comp *c;
 	struct mm_page *p;
@@ -236,7 +263,7 @@ memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr)
 	if (!c) return 0;
 	s = ss_span_alloc();
 	if (!s) return 0;
-	p = mm_page_allocn(c, num_pages);
+	p = mm_page_allocn(c, num_pages, align);
 	if (!p) ERR_THROW(0, cleanup);
 
 	s->page_off = ss_page_id(p);
@@ -244,6 +271,8 @@ memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr)
 	ss_span_activate(s);
 
 	ret = ss_span_id(s);
+
+	*pgaddr = p->mappings[0].addr;
 done:
 	return ret;
 cleanup:
@@ -251,6 +280,13 @@ memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr)
 	goto done;
 }
 
+cbuf_t
+memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr)
+{
+	return memmgr_shared_page_allocn_aligned(num_pages, PAGE_SIZE, pgaddr);
+}
+
+
 /**
  * Alias a page of memory into another component (i.e., create shared
  * memory). The number of mappings are limited by `MM_MAPPINGS_MAX`.
@@ -261,7 +297,7 @@ memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr)
  * @return - `0` = success, `<0` = error
  */
 static int
-mm_page_alias(struct mm_page *p, struct cm_comp *c, vaddr_t *addr)
+mm_page_alias(struct mm_page *p, struct cm_comp *c, vaddr_t *addr, unsigned long align)
 {
 	struct mm_mapping *m;
 	int i;
@@ -271,7 +307,7 @@ mm_page_alias(struct mm_page *p, struct cm_comp *c, vaddr_t *addr)
 		m = &p->mappings[i];
 
 		if (ss_state_alloc(&m->comp)) continue;
-		if (crt_page_aliasn_in(p->page, 1, &cm_self()->comp, &c->comp, &m->addr)) BUG();
+		if (crt_page_aliasn_aligned_in(p->page, align, 1, &cm_self()->comp, &c->comp, &m->addr)) BUG();
 		assert(m->addr);
 		*addr = m->addr;
 		ss_state_activate_with(&m->comp, (word_t)c);
@@ -284,7 +320,7 @@ mm_page_alias(struct mm_page *p, struct cm_comp *c, vaddr_t *addr)
 }
 
 unsigned long
-memmgr_shared_page_map(cbuf_t id, vaddr_t *pgaddr)
+memmgr_shared_page_map_aligned(cbuf_t id, unsigned long align, vaddr_t *pgaddr)
 {
 	struct cm_comp *c;
 	struct mm_span *s;
@@ -304,13 +340,20 @@ memmgr_shared_page_map(cbuf_t id, vaddr_t *pgaddr)
 		p = ss_page_get(s->page_off + i);
 		if (!p) return 0;
 
-		if (mm_page_alias(p, c, &addr)) BUG();
+		if (mm_page_alias(p, c, &addr, align)) BUG();
 		if (*pgaddr == 0) *pgaddr = addr;
+		align = PAGE_SIZE; // only the first page can have special alignment
 	}
 
 	return s->n_pages;
 }
 
+unsigned long
+memmgr_shared_page_map(cbuf_t id, vaddr_t *pgaddr)
+{
+	return memmgr_shared_page_map_aligned(id, PAGE_SIZE, pgaddr);
+}
+
 static compid_t
 capmgr_comp_sched_hier_get(compid_t cid)
 {
@@ -464,6 +507,15 @@ execute(void)
 	crt_compinit_execute(crtcomp_get);
 }
 
+void
+capmgr_set_tls(thdcap_t cap, void* tls_addr)
+{
+	compid_t cid = (compid_t)cos_inv_token();
+	struct crt_comp* c = crtcomp_get(cid);
+
+	cos_thd_mod(&c->comp_res->ci, cap, tls_addr);
+}
+
 void
 init_done(int parallel_init, init_main_t main_type)
 {
diff --git a/src/components/implementation/chanmgr/simple/chanmgr.c b/src/components/implementation/chanmgr/simple/chanmgr.c
index cae8b24008..324c157716 100644
--- a/src/components/implementation/chanmgr/simple/chanmgr.c
+++ b/src/components/implementation/chanmgr/simple/chanmgr.c
@@ -94,6 +94,7 @@ chanmgr_mem_resources(chan_id_t id, cbuf_t *cb_id, void **mem)
 	chinfo = ss_channel_get(id);
 	if (!chinfo) return -1;
 
+	*mem   = (void *)chinfo->mem;
 	*cb_id = chinfo->buf_id;
 
 	return 0;
@@ -149,9 +150,12 @@ struct init_info {
 	        .itemsz = _sz				\
 	}
 
+/* These are the initial channels - do not modify parameters! */
 struct init_info init_chan[] = {
 	CHAN_INIT(1, 128, sizeof(u64_t)),
 	CHAN_INIT(2, 128, sizeof(u64_t)),
+	CHAN_INIT(3, 2, sizeof(u32_t)),
+	CHAN_INIT(4, 2, sizeof(u32_t)),
 	CHAN_INIT(0, 0, 0),
 };
 
@@ -160,7 +164,7 @@ cos_init(void)
 {
 	int i;
 
-	printc("Chanmgr (%ld): creating static, initial channels\n", cos_compid());
+	printc("Chanmgr (%ld): creating static, initial channels.\n", cos_compid());
 
 	for (i = 0; init_chan[i].id > 0; i++) {
 		struct init_info *ch = &init_chan[i];
diff --git a/src/components/implementation/comp.ld b/src/components/implementation/comp.ld
deleted file mode 100644
index 3ab9216a51..0000000000
--- a/src/components/implementation/comp.ld
+++ /dev/null
@@ -1,74 +0,0 @@
-PHDRS
-{
-	text PT_LOAD ;
-	data PT_LOAD ;
-}
-
-SECTIONS
-{
-	ENTRY(__cosrt_upcall_entry)
-
-	. = SIZEOF_HEADERS;
-
-	.interp : { *(.interp) } :interp
-
-	/* start the text/read-only sections */
-	.text : ALIGN(4096) { *(.text*) } :text
-	.rodata : { *(.rodata*) }
-	.eh_frame : { *(.eh_frame*) }
-
-	. = ALIGN(4096);
-	/* start the data sections */
-	.ctors : {
-		__CTOR_LIST__ = .;
-		LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
-		*(.ctors)
-		LONG(0)
-		__CTOR_END__ = .;
-	} :data
-	.dtors : {
-		__DTOR_LIST__ = .;
-		LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
-		*(.dtors)
-		LONG(0)
-		__DTOR_END__ = .;
-	}
-	.init_array : {
-		__init_array_start = .;
-		__INIT_ARRAY_LIST__ = .;
-		LONG((__INIT_ARRAY_END__ - __INIT_ARRAY_LIST__) / 4 - 2)
-		KEEP (*(SORT(.init_array.*)))
-		KEEP (*(.init_array))
-		LONG(0)
-		__INIT_ARRAY_END__ = .;
-		__init_array_end = .;
-	}
-	.fini_array : {
-		__fini_array_start = .;
-		__FINI_ARRAY_LIST__ = .;
-		LONG((__FINI_ARRAY_END__ - __FINI_ARRAY_LIST__) / 4 - 2)
-		KEEP (*(.fini_array))
-		KEEP (*(SORT(.fini_array.*)))
-		LONG(0)
-		__FINI_ARRAY_END__ = .;
-		__fini_array_end = .;
-	}
-	.crecov : {
-		__CRECOV_LIST__ = .;
-		LONG((__CRECOV_END__ - __CRECOV_LIST__) / 4 - 2)
-		*(.crecov)
-		LONG(0)
-		__CRECOV_END__ = .;
-	}
-	.data : {
-	      *(.data*);
-	      *(.ucap*);
-	      *(.initonce*);
-	      *(.initfile*);
-	}
-	.bss : { *(.bss*) }
-
-	__crt_static_heap_ptr = .;
-
-	/DISCARD/ : { *(.note.gnu.property) }
-}
diff --git a/src/components/implementation/comp_armv7a.ld b/src/components/implementation/comp_armv7a.ld
new file mode 100644
index 0000000000..d2e64a3863
--- /dev/null
+++ b/src/components/implementation/comp_armv7a.ld
@@ -0,0 +1,70 @@
+PHDRS
+{
+	text PT_LOAD ;
+	data PT_LOAD ;
+}
+
+SECTIONS
+{
+	ENTRY(__cosrt_upcall_entry)
+
+	. = SIZEOF_HEADERS;
+
+	/* start the text/read-only sections */
+	.text : ALIGN(4096) { *(.text*) } :text
+	.rodata : { *(.rodata*) }
+	.eh_frame : { *(.eh_frame*) }
+
+	. = ALIGN(4096);
+	/* start the data sections */
+	.ctors : {
+		__CTOR_LIST__ = .;
+		LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
+		*(.ctors)
+		LONG(0)
+		__CTOR_END__ = .;
+	} :data
+	.dtors : {
+		__DTOR_LIST__ = .;
+		LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
+		*(.dtors)
+		LONG(0)
+		__DTOR_END__ = .;
+	}
+	.init_array : {
+		__init_array_start = .;
+		__INIT_ARRAY_LIST__ = .;
+		LONG((__INIT_ARRAY_END__ - __INIT_ARRAY_LIST__) / 4 - 2)
+		KEEP (*(SORT(.init_array.*)))
+		KEEP (*(.init_array))
+		LONG(0)
+		__INIT_ARRAY_END__ = .;
+		__init_array_end = .;
+	}
+	.fini_array : {
+		__fini_array_start = .;
+		__FINI_ARRAY_LIST__ = .;
+		LONG((__FINI_ARRAY_END__ - __FINI_ARRAY_LIST__) / 4 - 2)
+		KEEP (*(.fini_array))
+		KEEP (*(SORT(.fini_array.*)))
+		LONG(0)
+		__FINI_ARRAY_END__ = .;
+		__fini_array_end = .;
+	}
+	.crecov : {
+		__CRECOV_LIST__ = .;
+		LONG((__CRECOV_END__ - __CRECOV_LIST__) / 4 - 2)
+		*(.crecov)
+		LONG(0)
+		__CRECOV_END__ = .;
+	}
+	.data : {
+	      *(.data*);
+	      *(.ucap*);
+	      *(.initonce*);
+	      *(.initfile*);
+	}
+	.bss : { *(.bss*) }
+
+	__crt_static_heap_ptr = .;
+}
diff --git a/src/components/implementation/comp_i386.ld b/src/components/implementation/comp_i386.ld
new file mode 100644
index 0000000000..d2e64a3863
--- /dev/null
+++ b/src/components/implementation/comp_i386.ld
@@ -0,0 +1,70 @@
+PHDRS
+{
+	text PT_LOAD ;
+	data PT_LOAD ;
+}
+
+SECTIONS
+{
+	ENTRY(__cosrt_upcall_entry)
+
+	. = SIZEOF_HEADERS;
+
+	/* start the text/read-only sections */
+	.text : ALIGN(4096) { *(.text*) } :text
+	.rodata : { *(.rodata*) }
+	.eh_frame : { *(.eh_frame*) }
+
+	. = ALIGN(4096);
+	/* start the data sections */
+	.ctors : {
+		__CTOR_LIST__ = .;
+		LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
+		*(.ctors)
+		LONG(0)
+		__CTOR_END__ = .;
+	} :data
+	.dtors : {
+		__DTOR_LIST__ = .;
+		LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
+		*(.dtors)
+		LONG(0)
+		__DTOR_END__ = .;
+	}
+	.init_array : {
+		__init_array_start = .;
+		__INIT_ARRAY_LIST__ = .;
+		LONG((__INIT_ARRAY_END__ - __INIT_ARRAY_LIST__) / 4 - 2)
+		KEEP (*(SORT(.init_array.*)))
+		KEEP (*(.init_array))
+		LONG(0)
+		__INIT_ARRAY_END__ = .;
+		__init_array_end = .;
+	}
+	.fini_array : {
+		__fini_array_start = .;
+		__FINI_ARRAY_LIST__ = .;
+		LONG((__FINI_ARRAY_END__ - __FINI_ARRAY_LIST__) / 4 - 2)
+		KEEP (*(.fini_array))
+		KEEP (*(SORT(.fini_array.*)))
+		LONG(0)
+		__FINI_ARRAY_END__ = .;
+		__fini_array_end = .;
+	}
+	.crecov : {
+		__CRECOV_LIST__ = .;
+		LONG((__CRECOV_END__ - __CRECOV_LIST__) / 4 - 2)
+		*(.crecov)
+		LONG(0)
+		__CRECOV_END__ = .;
+	}
+	.data : {
+	      *(.data*);
+	      *(.ucap*);
+	      *(.initonce*);
+	      *(.initfile*);
+	}
+	.bss : { *(.bss*) }
+
+	__crt_static_heap_ptr = .;
+}
diff --git a/src/components/implementation/comp_x86_64.ld b/src/components/implementation/comp_x86_64.ld
new file mode 100644
index 0000000000..02ce2e6365
--- /dev/null
+++ b/src/components/implementation/comp_x86_64.ld
@@ -0,0 +1,76 @@
+PHDRS
+{
+	text PT_LOAD ;
+	data PT_LOAD ;
+}
+
+SECTIONS
+{
+	ENTRY(__cosrt_upcall_entry)
+
+	. = SIZEOF_HEADERS;
+
+	/* start the text/read-only sections */
+	.text : ALIGN(4096) { *(.text*) } :text
+	.rodata : { *(.rodata*) }
+	.eh_frame : { *(.eh_frame*) }
+
+	. = ALIGN(4096);
+	/* start the data sections */
+	.ctors : {
+
+		__CTOR_LIST__ = .;
+		QUAD((__CTOR_END__ - __CTOR_LIST__) / 8 - 2)
+		*(.ctors)
+		QUAD(0)
+		__CTOR_END__ = .;
+	} :data
+	.dtors : {
+
+		__DTOR_LIST__ = .;
+		QUAD((__DTOR_END__ - __DTOR_LIST__) / 8 - 2)
+		*(.dtors)
+		QUAD(0)
+		__DTOR_END__ = .;
+	}
+	.init_array : {
+
+		__init_array_start = .;
+		__INIT_ARRAY_LIST__ = .;
+		QUAD((__INIT_ARRAY_END__ - __INIT_ARRAY_LIST__) / 8 - 2)
+		KEEP (*(SORT(.init_array.*)))
+		KEEP (*(.init_array))
+		QUAD(0)
+		__INIT_ARRAY_END__ = .;
+		__init_array_end = .;
+	}
+	.fini_array : {
+
+		__fini_array_start = .;
+		__FINI_ARRAY_LIST__ = .;
+		QUAD((__FINI_ARRAY_END__ - __FINI_ARRAY_LIST__) / 8 - 2)
+		KEEP (*(.fini_array))
+		KEEP (*(SORT(.fini_array.*)))
+		QUAD(0)
+		__FINI_ARRAY_END__ = .;
+		__fini_array_end = .;
+	}
+	.crecov : {
+
+		__CRECOV_LIST__ = .;
+		QUAD((__CRECOV_END__ - __CRECOV_LIST__) / 8 - 2)
+		*(.crecov)
+		QUAD(0)
+		__CRECOV_END__ = .;
+
+	}
+	.data : {
+	      *(.data*);
+	      *(.ucap*);
+	      *(.initonce*);
+	      *(.initfile*);
+	}
+	.bss : { *(.bss*) }
+
+	__crt_static_heap_ptr = .;
+}
diff --git a/src/components/implementation/nicmgr/Makefile b/src/components/implementation/nicmgr/Makefile
new file mode 100644
index 0000000000..84e4b4e9d4
--- /dev/null
+++ b/src/components/implementation/nicmgr/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = 
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = 
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component 
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subdir
diff --git a/src/components/implementation/nicmgr/dpdk/Makefile b/src/components/implementation/nicmgr/dpdk/Makefile
new file mode 100644
index 0000000000..0126bfbe9d
--- /dev/null
+++ b/src/components/implementation/nicmgr/dpdk/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = nic
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = 
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component dpdk lwip
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/nicmgr/dpdk/init.c b/src/components/implementation/nicmgr/dpdk/init.c
new file mode 100644
index 0000000000..994372d7e3
--- /dev/null
+++ b/src/components/implementation/nicmgr/dpdk/init.c
@@ -0,0 +1,135 @@
+#include <llprint.h>
+#include <cos_dpdk.h>
+#include <nic.h>
+
+#define NB_RX_DESC_DEFAULT 1024
+#define NB_TX_DESC_DEFAULT 1024
+#define MAX_PKT_BURST 512
+
+static u16_t nic_ports = 0;
+
+static void
+process_packets(cos_portid_t port_id, char** rx_pkts, uint16_t nb_pkts)
+{
+	int i;
+
+	for (i = 0; i < nb_pkts; i++) {
+		char * pkt = cos_get_packet(rx_pkts[i]);
+	}
+}
+
+static void
+cos_nic_start(){
+	int i;
+	uint16_t nb_pkts = 0;
+
+	char* rx_packets[MAX_PKT_BURST];
+
+	while (1)
+	{
+		/* infinite loop to process packets */
+		for (i = 0; i < nic_ports; i++) {
+			/* process rx */
+			nb_pkts = cos_dev_port_rx_burst(i, 0, rx_packets, MAX_PKT_BURST);
+			if (nb_pkts != 0) {
+				process_packets(i, rx_packets, nb_pkts);
+			}
+		}
+	}
+}
+
+static char* g_mp = NULL;
+static void
+cos_nic_init(void)
+{
+	int argc, ret, nb_pkts;
+
+	#define MAX_PKT_BURST 512
+
+	const char *mpool_name = "cos_app_pool";
+	uint16_t i;
+	uint16_t nb_rx_desc = NB_RX_DESC_DEFAULT;
+	uint16_t nb_tx_desc = NB_TX_DESC_DEFAULT;
+
+	/*
+	 * set max_mbufs 2 times than nb_rx_desc, so that there is enough room
+	 * to store packets, or this will fail if nb_rx_desc <= max_mbufs.
+	 */
+	const size_t max_mbufs = 8 * nb_rx_desc;
+
+	char *argv[] =	{
+			"COS_DPDK_BOOTER", /* single core, the first argument has to be the program name */
+			"-l", 
+			"0",
+			"--no-shconf", 
+			"--no-huge",
+			"--iova-mode=pa",
+			"--log-level",
+			"*:info", /* log level can be changed to *debug* if needed, this will print lots of information */
+			"-m",
+			"64", /* total memory used by dpdk memory subsystem, such as mempool */
+			};
+
+	argc = ARRAY_SIZE(argv);
+
+	/* 1. do initialization of dpdk */
+	ret = cos_dpdk_init(argc, argv);
+
+	assert(ret == argc - 1); /* program name is excluded */
+
+	/* 2. init all Ether ports */
+	nic_ports = cos_eth_ports_init();
+
+	assert(nic_ports > 0);
+
+	/* 3. create mbuf pool where packets will be stored, user can create multiple pools */
+	char* mp = cos_create_pkt_mbuf_pool(mpool_name, max_mbufs);
+	g_mp = mp;
+
+	assert(mp != NULL);
+
+	/* 4. config each port */
+	for (i = 0; i < nic_ports; i++) {
+		cos_config_dev_port_queue(i, 1, 1);
+		cos_dev_port_adjust_rx_tx_desc(i, &nb_rx_desc, &nb_tx_desc);
+		cos_dev_port_rx_queue_setup(i, 0, nb_rx_desc, mp);
+		cos_dev_port_tx_queue_setup(i, 0, nb_tx_desc);
+	}
+
+	/* 5. start each port, this will enable rx/tx */
+	for (i = 0; i < nic_ports; i++) {
+		cos_dev_port_start(i);
+		cos_dev_port_set_promiscuous_mode(i, COS_DPDK_SWITCH_ON);
+	}
+}
+
+int
+nic_send_packet(char* pkt, size_t pkt_size)
+{
+	/* TODO: implement this interface */
+	return 0;
+}
+
+int
+nic_bind_port(u32_t ip_addr, u16_t port, void* share_mem, size_t share_mem_sz)
+{
+	/* TODO: implement this interface */
+	return 0;
+}
+
+void
+cos_init(void)
+{
+	printc("nicmgr init...\n");
+	cos_nic_init();
+}
+
+int
+main(void)
+{
+	printc("NIC started\n");
+
+	cos_nic_start();
+
+	return 0;
+}
diff --git a/src/components/implementation/no_interface/llbooter/llbooter.c b/src/components/implementation/no_interface/llbooter/llbooter.c
index ea38e90792..74526e615b 100644
--- a/src/components/implementation/no_interface/llbooter/llbooter.c
+++ b/src/components/implementation/no_interface/llbooter/llbooter.c
@@ -31,11 +31,17 @@
 #define INITARGS_MAX_PATHNAME 512
 #endif
 #ifndef BOOTER_CAPMGR_MB
-#define BOOTER_CAPMGR_MB 64
+#define BOOTER_CAPMGR_MB 256
 #endif
 #ifndef BOOTER_MAX_CHKPT
 #define BOOTER_MAX_CHKPT 64
 #endif
+#ifndef BOOTER_MAX_NS_ASID
+#define BOOTER_MAX_NS_ASID 64
+#endif
+#ifndef BOOTER_MAX_NS_VAS
+#define BOOTER_MAX_NS_VAS 64
+#endif
 
 /* UNCOMMENT HERE FOR CHECKPOINT FUNCTIONALITY */
 /* #ifndef ENABLE_CHKPT
@@ -47,10 +53,12 @@ static struct crt_comp boot_comps[MAX_NUM_COMPS];
 static const  compid_t sched_root_id  = 2;
 static        long     boot_id_offset = -1;
 
-SS_STATIC_SLAB(sinv,   struct crt_sinv,   BOOTER_MAX_SINV);
-SS_STATIC_SLAB(thd,    struct crt_thd,    BOOTER_MAX_INITTHD);
-SS_STATIC_SLAB(rcv,    struct crt_rcv,    BOOTER_MAX_SCHED);
-SS_STATIC_SLAB(chkpt,  struct crt_chkpt,  BOOTER_MAX_CHKPT);
+SS_STATIC_SLAB(sinv,   struct crt_sinv,         BOOTER_MAX_SINV);
+SS_STATIC_SLAB(thd,    struct crt_thd,          BOOTER_MAX_INITTHD);
+SS_STATIC_SLAB(rcv,    struct crt_rcv,          BOOTER_MAX_SCHED);
+SS_STATIC_SLAB(chkpt,  struct crt_chkpt,        BOOTER_MAX_CHKPT);
+SS_STATIC_SLAB_GLOBAL_ID(ns_asid, struct crt_ns_asid, BOOTER_MAX_NS_ASID, 0);
+SS_STATIC_SLAB_GLOBAL_ID(ns_vas, struct crt_ns_vas, BOOTER_MAX_NS_VAS, 0);
 
 /*
  * Assumptions: the component with the lowest id *must* be the one
@@ -88,10 +96,11 @@ boot_comp_set_idoffset(int off)
 static void
 comps_init(void)
 {
-	struct initargs comps, curr;
+	struct initargs ases, curr, comps, curr_comp;
 	struct initargs_iter i;
 	int cont, ret, j;
 	int comp_idx = 0;
+	struct crt_ns_asid *ns_asid;
 
 	/*
 	 * Assume: our component id is the lowest of the ids for all
@@ -106,34 +115,120 @@ comps_init(void)
 	}
 	boot_comp_set_idoffset(cos_compid());
 
-	ret = args_get_entry("components", &comps);
+	/*
+	 * FIXME: the asid namespace is shared between all components,
+	 * so we can only create a # of components up to the number of
+	 * ASIDs (e.g. 1024 for x86-64).
+	 */
+	ns_asid = ss_ns_asid_alloc();
+	assert(ns_asid);
+	if (crt_ns_asids_init(ns_asid) != 0) BUG();
+	ss_ns_asid_activate(ns_asid);
+
+	ret = args_get_entry("addrspc_shared", &ases);
 	assert(!ret);
-	printc("Components (%d):\n", args_len(&comps));
-	for (cont = args_iter(&comps, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+	printc("Creating address spaces & components:\n");
+	for (cont = args_iter(&ases, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+		/* Component-centric inner iteration */
+		struct initargs comps, curr_comp;
+		int comp_cont;
+		struct initargs_iter j;
+		int keylen;
+		int as_id = atoi(args_key(&curr, &keylen));
+		char *parent = args_get_from("parent", &curr);
+
+		/* allocate, initialize initial namespaces */
+		struct crt_ns_vas *ns_vas = ss_ns_vas_alloc_at_id(as_id);
+		assert(ns_vas);
+		if (!parent) {
+			printc("Creating virtual address space %s (%d):\n", args_get_from("name", &curr), as_id);
+			if (crt_ns_vas_init(ns_vas, ns_asid) != 0) BUG();
+		} else {
+			int parent_id = atoi(parent);
+			struct crt_ns_vas *parent_vas = ss_ns_vas_get(parent_id);
+			/*
+			 * This must be true as the order of VASes
+			 * places parents before children
+			 */
+			assert(parent_vas);
+
+			printc("Creating virtual address space %s (%d) split from VAS %d:\n", args_get_from("name", &curr), as_id, parent_id);
+			if (crt_ns_vas_split(ns_vas, parent_vas, ns_asid) != 0) BUG();
+		}
+		ss_ns_vas_activate(ns_vas);
+
+		/* Sequence of component ids within an address space... */
+		ret = args_get_entry_from("components", &curr, &comps);
+		assert(!ret);
+		for (comp_cont = args_iter(&comps, &j, &curr_comp) ; comp_cont ; comp_cont = args_iter_next(&j, &curr_comp)) {
+			struct crt_comp *comp;
+			void *elf_hdr;
+			compid_t id  = atoi(args_value(&curr_comp));
+			struct initargs comp_data;
+			char  comppath[INITARGS_MAX_PATHNAME + 1];
+
+			comppath[0] = '\0';
+			snprintf(comppath, INITARGS_MAX_PATHNAME, "components/%lu", id);
+			args_get_entry(comppath, &comp_data);
+
+			char *name   = args_get_from("img", &comp_data);
+			vaddr_t info = atol(args_get_from("info", &comp_data));
+			char  imgpath[INITARGS_MAX_PATHNAME + 1];
+
+			printc("\tComponent %s: %lu\n", name, id);
+
+			assert(id < MAX_NUM_COMPS && id > 0 && name);
+
+			imgpath[0] = '\0';
+			snprintf(imgpath, INITARGS_MAX_PATHNAME, "binaries/%s", name);
+
+			comp = boot_comp_get(id);
+			assert(comp);
+			elf_hdr = (void *)args_get(imgpath);
+
+			/*
+			 * We assume, for now, that the
+			 * constructor/booter is *not* part of a
+			 * shared VAS.
+			 */
+			if (id == cos_compid()) BUG();
+			assert(elf_hdr);
+			if (crt_comp_create_in_vas(comp, name, id, elf_hdr, info, ns_vas)) BUG();
+			assert(comp->refcnt != 0);
+		}
+	}
+
+	/* Create all of the components in their own address spaces */
+	ret = args_get_entry("addrspc_exclusive", &comps);
+	assert(!ret);
+	for (cont = args_iter(&comps, &i, &curr_comp) ; cont ; cont = args_iter_next(&i, &curr_comp)) {
 		struct crt_comp *comp;
 		void *elf_hdr;
-		int   keylen;
-		compid_t id = atoi(args_key(&curr, &keylen));
-		char *name  = args_get_from("img", &curr);
-		vaddr_t info = atol(args_get_from("info", &curr));
-		const char *root = "binaries/";
-		int   len  = strlen(root);
-		char  path[INITARGS_MAX_PATHNAME];
+		compid_t id = atoi(args_value(&curr_comp));
+		struct initargs comp_data;
+		char  comppath[INITARGS_MAX_PATHNAME + 1];
 
-		printc("%s: %lu\n", name, id);
+		comppath[0] = '\0';
+		snprintf(comppath, INITARGS_MAX_PATHNAME, "components/%lu", id);
+		args_get_entry(comppath, &comp_data);
+
+		char *name   = args_get_from("img", &comp_data);
+		vaddr_t info = atol(args_get_from("info", &comp_data));
+		char  imgpath[INITARGS_MAX_PATHNAME + 1];
+
+		printc("Component %s: %lu (in an exclusive address space)\n", name, id);
 
 		assert(id < MAX_NUM_COMPS && id > 0 && name);
 
-		memset(path, 0, INITARGS_MAX_PATHNAME);
-		strncat(path, root, len);
-		assert(path[len] == '\0');
-		strncat(path, name, INITARGS_MAX_PATHNAME - len);
-		assert(path[INITARGS_MAX_PATHNAME - 1] == '\0'); /* no truncation allowed */
+		imgpath[0] = '\0';
+		snprintf(imgpath, INITARGS_MAX_PATHNAME, "binaries/%s", name);
 
 		comp = boot_comp_get(id);
 		assert(comp);
-		elf_hdr = (void *)args_get(path);
+		elf_hdr = (void *)args_get(imgpath);
 
+		/* We assume, for now, that the composer is
+		 * *not* part of a shared VAS. */
 		if (id == cos_compid()) {
 			int ret;
 
@@ -143,14 +238,15 @@ comps_init(void)
 			assert(ret == 0);
 		} else {
 			assert(elf_hdr);
-			if (crt_comp_create(comp, name, id, elf_hdr, info)) {
-				printc("Error constructing the resource tables and image of component %s.\n", comp->name);
-				BUG();
-			}	
+			if (crt_comp_create(comp, name, id, elf_hdr, info)) BUG();
+			assert(comp->refcnt != 0);
 		}
-		assert(comp->refcnt != 0);
 	}
 
+	/*
+	 * Actually create the threads for eventual execution in the
+	 * components.
+	 */
 	ret = args_get_entry("execute", &comps);
 	assert(!ret);
 	printc("Execution schedule:\n");
@@ -291,7 +387,7 @@ comps_init(void)
 		cli->n_sinvs++;
 	#endif /* ENABLE_CHKPT */
 	}
-	
+
 	/*
 	 * Delegate the untyped memory to the capmgr. This should go
 	 * *after* all allocations that use untyped memory, so that we
@@ -323,7 +419,7 @@ comps_init(void)
  * We only support a single checkpoint directly above the existing components.
  * At this point we assume capability managers and schedulers will not be checkpointed
  */
-void 
+void
 chkpt_comp_init(struct crt_comp *comp, struct crt_chkpt *chkpt, char *name)
 {
 #ifdef ENABLE_CHKPT
@@ -377,7 +473,7 @@ chkpt_comp_init(struct crt_comp *comp, struct crt_chkpt *chkpt, char *name)
 			comp->sinvs[i].c_fn_addr, comp->sinvs[i].c_ucap_addr, comp->sinvs[i].s_fn_addr);
 		ss_sinv_activate(sinv);
 		printc("\t(chkpt) sinv: %s (%lu->%lu):\tclient_fn @ 0x%lx, client_ucap @ 0x%lx, server_fn @ 0x%lx\n",
-			sinv->name, sinv->client->id, sinv->server->id, sinv->c_fn_addr, sinv->c_ucap_addr, sinv->s_fn_addr);	
+			sinv->name, sinv->client->id, sinv->server->id, sinv->c_fn_addr, sinv->c_ucap_addr, sinv->s_fn_addr);
 	}
 #endif /* ENABLE_CHKPT */
 
@@ -446,9 +542,9 @@ init_done_chkpt(struct crt_comp *c)
 
 	assert(INITARGS_MAX_PATHNAME > prefix_sz + strlen(c->name));
 	memcpy(name, prefix, prefix_sz + 1);
-	strncat(name, c->name, INITARGS_MAX_PATHNAME - prefix_sz - 1); 
+	strncat(name, c->name, INITARGS_MAX_PATHNAME - prefix_sz - 1);
 	c->name[INITARGS_MAX_PATHNAME - 1] = '\0';
-	
+
 	/* completed all initialization */
 	if (c->init_state >= CRT_COMP_INIT_MAIN) {
 		if (crt_nchkpt() > BOOTER_MAX_CHKPT) {
diff --git a/src/components/implementation/no_interface/llbooter_shvas/Makefile b/src/components/implementation/no_interface/llbooter_shvas/Makefile
new file mode 100644
index 0000000000..4ea23edb09
--- /dev/null
+++ b/src/components/implementation/no_interface/llbooter_shvas/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = init addr
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component crt
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/no_interface/llbooter_shvas/doc.md b/src/components/implementation/no_interface/llbooter_shvas/doc.md
new file mode 100644
index 0000000000..38363a0b65
--- /dev/null
+++ b/src/components/implementation/no_interface/llbooter_shvas/doc.md
@@ -0,0 +1,19 @@
+## no_interface.llbooter_shvas
+
+A *constructor* implementation that is as simple as possible, and pushes most complexity to shared (and better tested) libraries such as `kernel` and `crt`.
+
+Includes calling CRT Namespace API functions in order to allocate components within namespaces.
+
+### Description
+
+Creates a set of components as provided by the `composer`.
+Takes a tarball of these components (accessed through `initargs`), and an `initargs` specification of those components to be booted.
+This will FIFO schedule initialization through the components that depend on it for `init`.
+
+First draft of checkpointing, such that a component can create a checkpoint of itself once initialized (in `init_done`). Then a new component can be created and executed from the checkpoint. 
+
+### Usage and Assumptions
+
+- Strongly assumes that the `composer` is used to provide all necessary metadata to construct the rest of the system.
+- We currently define the `addr` interface that is a hack to provide frontier (heap pointer) information.
+	This should be replaced with additional `composer` information being passed by `initargs` eventually.
diff --git a/src/components/implementation/no_interface/llbooter_shvas/llbooter_shvas.c b/src/components/implementation/no_interface/llbooter_shvas/llbooter_shvas.c
new file mode 100644
index 0000000000..0f189a0bab
--- /dev/null
+++ b/src/components/implementation/no_interface/llbooter_shvas/llbooter_shvas.c
@@ -0,0 +1,560 @@
+/**
+ * Redistribution of this file is permitted under the BSD two clause license.
+ *
+ * Copyright 2019, The George Washington University
+ * Author: Gabriel Parmer, gparmer@gwu.edu
+ */
+
+#include <stdlib.h>
+#include <limits.h>
+
+#include <initargs.h>
+#include <barrier.h>
+#include <cos_kernel_api.h>
+#include <cos_defkernel_api.h>
+#include <crt.h>
+#include <static_slab.h>
+
+#include <init.h>
+#include <addr.h>
+
+#ifndef BOOTER_MAX_SINV
+#define BOOTER_MAX_SINV 256
+#endif
+#ifndef BOOTER_MAX_SCHED
+#define BOOTER_MAX_SCHED 1
+#endif
+#ifndef BOOTER_MAX_INITTHD
+#define BOOTER_MAX_INITTHD (MAX_NUM_COMPS - BOOTER_MAX_SCHED)
+#endif
+#ifndef INITARGS_MAX_PATHNAME
+#define INITARGS_MAX_PATHNAME 512
+#endif
+#ifndef BOOTER_CAPMGR_MB
+#define BOOTER_CAPMGR_MB 64
+#endif
+#ifndef BOOTER_MAX_CHKPT
+#define BOOTER_MAX_CHKPT 64
+#endif
+
+#ifndef BOOTER_MAX_NS_ASID
+#define BOOTER_MAX_NS_ASID 64
+#endif
+
+#ifndef BOOTER_MAX_NS_VAS
+#define BOOTER_MAX_NS_VAS 64
+#endif
+
+/* UNCOMMENT HERE FOR CHECKPOINT FUNCTIONALITY */
+/* #ifndef ENABLE_CHKPT
+ * #define ENABLE_CHKPT 1
+ * #endif
+ */
+
+static struct crt_comp boot_comps[MAX_NUM_COMPS];
+static const  compid_t sched_root_id  = 2;
+static        long     boot_id_offset = -1;
+
+SS_STATIC_SLAB(sinv,   	struct crt_sinv,   	BOOTER_MAX_SINV);
+SS_STATIC_SLAB(thd,    	struct crt_thd,    	BOOTER_MAX_INITTHD);
+SS_STATIC_SLAB(rcv,    	struct crt_rcv,    	BOOTER_MAX_SCHED);
+SS_STATIC_SLAB(chkpt,  	struct crt_chkpt,  	BOOTER_MAX_CHKPT);
+SS_STATIC_SLAB(ns_asid,	struct crt_ns_asid,	BOOTER_MAX_NS_ASID);
+SS_STATIC_SLAB(ns_vas,	struct crt_ns_vas, 	BOOTER_MAX_NS_VAS);
+
+/*
+ * Assumptions: the component with the lowest id *must* be the one
+ * that is passed into this function first. You *can* pass in an id
+ * that is higher than we have components. In that case, this will
+ * return NULL.
+ */
+static struct crt_comp *
+boot_comp_get(compid_t id)
+{
+	assert(id > 0 && id <= MAX_NUM_COMPS);
+
+	if (boot_id_offset == -1) {
+		boot_id_offset = id;
+	}
+	/* casts are OK as we know that boot_id_offset is > 0 now */
+	assert((compid_t)boot_id_offset <= id);
+	assert(boot_id_offset >= 0 && id >= (compid_t)boot_id_offset);
+
+	return &boot_comps[id - boot_id_offset];
+}
+
+static struct crt_comp *
+boot_comp_self(void)
+{
+	return boot_comp_get(cos_compid());
+}
+
+static void
+boot_comp_set_idoffset(int off)
+{
+	boot_id_offset = off;
+}
+
+static void
+comps_init(void)
+{
+	struct initargs comps, curr;
+	struct initargs_iter i;
+	int cont, ret, j;
+	int comp_idx = 0;
+
+	/* allocate, initialize initial namespaces */
+	struct crt_ns_asid *ns_asid = ss_ns_asid_alloc();
+	assert(ns_asid);
+
+	if (crt_ns_asids_init(ns_asid) != 0) BUG();
+	ss_ns_asid_activate(ns_asid);
+
+	struct crt_ns_vas *ns_vas1 = ss_ns_vas_alloc();
+	assert(ns_vas1);
+
+	if (crt_ns_vas_init(ns_vas1, ns_asid) != 0) BUG();
+	ss_ns_vas_activate(ns_vas1);
+
+	/*
+	 * Assume: our component id is the lowest of the ids for all
+	 * components we are set to create, and that we get it from
+	 * mkimg.
+	 */
+	if (cos_compid_uninitialized()) {
+		int booter_id;
+
+		booter_id = atoi(args_get("compid"));
+		cos_compid_set(booter_id);
+	}
+	boot_comp_set_idoffset(cos_compid());
+
+	ret = args_get_entry("components", &comps);
+	assert(!ret);
+	printc("Components (%d):\n", args_len(&comps));
+	for (cont = args_iter(&comps, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+		struct crt_comp *comp;
+		void *elf_hdr;
+		int   keylen;
+		compid_t id = atoi(args_key(&curr, &keylen));
+		char *name  = args_get_from("img", &curr);
+		vaddr_t info = atol(args_get_from("info", &curr));
+		const char *root = "binaries/";
+		int   len  = strlen(root);
+		char  path[INITARGS_MAX_PATHNAME + 1];
+
+		printc("%s: %lu\n", name, id);
+
+		assert(id < MAX_NUM_COMPS && id > 0 && name);
+
+		memset(path, 0, INITARGS_MAX_PATHNAME + 1);
+		strncat(path, root, len + 1);
+		assert(path[len] == '\0');
+		strncat(path, name, INITARGS_MAX_PATHNAME - len);
+		assert(path[INITARGS_MAX_PATHNAME] == '\0'); /* no truncation allowed */
+
+		comp = boot_comp_get(id);
+		assert(comp);
+		elf_hdr = (void *)args_get(path);
+
+		if (id == cos_compid()) {
+			int ret;
+
+			/* booter should not have an elf object */
+			assert(!elf_hdr);
+			ret = crt_booter_create(comp, name, id, info);
+			assert(ret == 0);
+		} else {
+			assert(elf_hdr);
+			/* FIXME: hardcoded for pingpong_shared_vas.toml test */
+			if (id == 3) {
+				struct crt_ns_vas *ns_vas2 = ss_ns_vas_alloc();
+				assert(ns_vas2);
+
+				if (crt_ns_vas_split(ns_vas2, ns_vas1, ns_asid) != 0) {
+					BUG();
+				}
+				if (crt_comp_create_in_vas(comp, name, id, elf_hdr, info, ns_vas2)) {
+					BUG();
+				}
+				ss_ns_vas_activate(ns_vas2);
+			}
+			if (id == 2) {
+				if (crt_comp_create_in_vas(comp, name, id, elf_hdr, info, ns_vas1)) {
+					BUG();
+				}
+			}
+		}
+		assert(comp->refcnt != 0);
+	}
+
+	ret = args_get_entry("execute", &comps);
+	assert(!ret);
+	printc("Execution schedule:\n");
+	for (cont = args_iter(&comps, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+		struct crt_comp     *comp;
+		int      keylen;
+		compid_t id        = atoi(args_key(&curr, &keylen));
+		char    *exec_type = args_value(&curr);
+		struct crt_comp_exec_context ctxt = { 0 };
+
+		assert(exec_type);
+		assert(id != cos_compid());
+		comp = boot_comp_get(id);
+		assert(comp);
+
+		if (!strcmp(exec_type, "sched")) {
+			struct crt_rcv *r = ss_rcv_alloc();
+
+			assert(r);
+			if (crt_comp_exec(comp, crt_comp_exec_sched_init(&ctxt, r))) BUG();
+			ss_rcv_activate(r);
+			printc("\tCreated scheduling execution for %ld\n", id);
+		} else if (!strcmp(exec_type, "init")) {
+			struct crt_thd *t = ss_thd_alloc();
+
+			assert(t);
+			if (crt_comp_exec(comp, crt_comp_exec_thd_init(&ctxt, t))) BUG();
+			ss_thd_activate(t);
+			printc("\tCreated thread for %ld\n", id);
+		} else {
+			printc("Error: Found unknown execution schedule type %s.\n", exec_type);
+			BUG();
+		}
+
+		comp->init_state = CRT_COMP_INIT_COS_INIT;
+	}
+
+	/* perform any necessary captbl delegations */
+	ret = args_get_entry("captbl_delegations", &comps);
+	assert(!ret);
+	printc("Capability table delegations (%d capability managers):\n", args_len(&comps));
+	/*
+	 * for now, assume only one capmgr (allocating untyped memory
+	 * gets complex here otherwise)
+	 */
+	for (cont = args_iter(&comps, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+		struct crt_comp *c;
+		struct initargs curr_inner;
+		struct initargs_iter i_inner;
+		int keylen, cont2;
+		compid_t capmgr_id;
+		struct crt_comp_resources comp_res = { 0 };
+		crt_comp_alias_t alias_flags = 0;
+		struct crt_comp *target = NULL;
+
+		capmgr_id = atoi(args_key(&curr, &keylen));
+		c = boot_comp_get(capmgr_id);
+		assert(c);
+
+		printc("\tCapmgr %ld:\n", capmgr_id);
+		/* This assumes that all capabilities for a given component are *contiguous* */
+		for (cont2 = args_iter(&curr, &i_inner, &curr_inner) ; cont2 ; cont2 = args_iter_next(&i_inner, &curr_inner)) {
+			char    *type      = args_get_from("type", &curr_inner);
+			capid_t  capno     = atoi(args_key(&curr_inner, &keylen));
+			compid_t target_id = atoi(args_get_from("target", &curr_inner));
+
+			/* If we've moved on to the next component, commit the changes for the previous */
+			if (target && target != boot_comp_get(target_id)) {
+				if (crt_comp_alias_in(target, c, &comp_res, alias_flags)) BUG();
+
+				memset(&comp_res, 0, sizeof(struct crt_comp_resources));
+				alias_flags = 0;
+			}
+			target = boot_comp_get(target_id);
+			assert(target);
+
+			printc("\t\tCapability #%ld: %s for component %ld\n", capno, type, target_id);
+			if (!strcmp(type, "pgtbl")) {
+				comp_res.ptc = capno;
+				alias_flags |= CRT_COMP_ALIAS_PGTBL;
+			} else if (!strcmp(type, "captbl")) {
+				comp_res.ctc = capno;
+				alias_flags |= CRT_COMP_ALIAS_CAPTBL;
+			} else if (!strcmp(type, "comp")) {
+				comp_res.compc = capno;
+				alias_flags |= CRT_COMP_ALIAS_COMP;
+			} else {
+				BUG();
+			}
+		}
+		if (crt_comp_alias_in(target, c, &comp_res, alias_flags)) BUG();
+	}
+
+	/*
+	 * *No static capability slot allocations after this point.*
+	 *
+	 * Past this point, dynamic allocations are made into the
+	 * capability tables of the components. Thus any statically
+	 * allocated capability ids can be disrupted by these
+	 * bump-pointer allocations if they are used past this
+	 * point. All of the capability manager static capabilities
+	 * should be done already.
+	 *
+	 * The exception is that capability ids under BOOT_CAPTLB_FREE
+	 * are reserved as is, so they can be allocated to regardless.
+	 */
+
+	/*
+	 * Create the synchronous invocations for the component. This
+	 * has to go *after* the updating of the capability frontier
+	 * for the hard-coded capabilities as we don't want to use up
+	 * those slots for the synchronous invocations.
+	 */
+	ret = args_get_entry("sinvs", &comps);
+	assert(!ret);
+	printc("Synchronous invocations (%d):\n", args_len(&comps));
+	for (cont = args_iter(&comps, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+		struct crt_sinv *sinv;
+		int serv_id = atoi(args_get_from("server", &curr));
+		int cli_id  = atoi(args_get_from("client", &curr));
+		struct crt_comp *serv = boot_comp_get(serv_id);
+		struct crt_comp *cli = boot_comp_get(cli_id);
+
+		sinv = ss_sinv_alloc();
+		assert(sinv);
+		crt_sinv_create(sinv, args_get_from("name", &curr), boot_comp_get(serv_id), boot_comp_get(cli_id),
+					strtoul(args_get_from("c_fn_addr", &curr), NULL, 10), strtoul(args_get_from("c_ucap_addr", &curr), NULL, 10),
+					strtoul(args_get_from("s_fn_addr", &curr), NULL, 10));
+		ss_sinv_activate(sinv);
+		printc("\t%s (%lu->%lu):\tclient_fn @ 0x%lx, client_ucap @ 0x%lx, server_fn @ 0x%lx\n",
+		       sinv->name, sinv->client->id, sinv->server->id, sinv->c_fn_addr, sinv->c_ucap_addr, sinv->s_fn_addr);
+	#ifdef ENABLE_CHKPT
+		assert(serv->n_sinvs < CRT_COMP_SINVS_LEN);
+		serv->sinvs[serv->n_sinvs] = *sinv;
+		serv->n_sinvs++;
+		assert(cli->n_sinvs < CRT_COMP_SINVS_LEN);
+		cli->sinvs[cli->n_sinvs] = *sinv;
+		cli->n_sinvs++;
+	#endif /* ENABLE_CHKPT */
+	}
+
+	/*
+	 * Delegate the untyped memory to the capmgr. This should go
+	 * *after* all allocations that use untyped memory, so that we
+	 * can delegate away the rest of our memory. FIXME: this might
+	 * not be the cause currently, and we rely on a few untyped
+	 * regions (after the ones we delegate to the capmgr) for the
+	 * parallel thread allocations.
+	 */
+	ret = args_get_entry("captbl_delegations", &comps);
+	assert(!ret);
+	for (cont = args_iter(&comps, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+		struct crt_comp *c;
+		int keylen;
+		struct crt_comp_exec_context ctxt = { 0 };
+
+		c = boot_comp_get(atoi(args_key(&curr, &keylen)));
+		assert(c);
+
+		/* TODO: generalize. Give the capmgr 64MB for now. */
+		if (crt_comp_exec(c, crt_comp_exec_capmgr_init(&ctxt, BOOTER_CAPMGR_MB * 1024 * 1024))) BUG();
+	}
+
+	printc("Kernel resources created, booting components!\n");
+
+	return;
+}
+
+/*
+ * We only support a single checkpoint directly above the existing components.
+ * At this point we assume capability managers and schedulers will not be checkpointed
+ */
+void 
+chkpt_comp_init(struct crt_comp *comp, struct crt_chkpt *chkpt, char *name)
+{
+#ifdef ENABLE_CHKPT
+	/* create the component */
+	void *elf_hdr;
+	int   keylen;
+	compid_t id;
+	const char *root = "binaries/";
+	int   len  = strlen(root);
+	char  path[INITARGS_MAX_PATHNAME];
+	struct crt_comp_exec_context ctxt = { 0 };
+	struct crt_thd *t;
+
+	id = crt_ncomp() + 1;
+	assert(id < MAX_NUM_COMPS && id > 0 && name);
+
+	assert(len < INITARGS_MAX_PATHNAME);
+	memset(path, 0, INITARGS_MAX_PATHNAME);
+	strncat(path, root, len);
+	assert(path[len] == '\0');
+	strncat(path, name, INITARGS_MAX_PATHNAME - len);
+	assert(path[INITARGS_MAX_PATHNAME - 1] == '\0'); /* no truncation allowed */
+
+	if (id == cos_compid()) {
+		/* this should never happen */
+		assert(0);
+	} else {
+		if (crt_comp_create_from(comp, name, id, chkpt)) {
+			printc("Error constructing the resource tables and image of component %s.\n", comp->name);
+			BUG();
+		}
+	}
+	assert(comp->refcnt != 0);
+
+	t = ss_thd_alloc();
+	assert(t);
+
+	if (crt_comp_exec(comp, crt_comp_exec_thd_init(&ctxt, t))) BUG();
+	ss_thd_activate(t);
+	comp->init_state = CRT_COMP_INIT_COS_INIT;
+
+	/* create the sinvs */
+	for (u32_t i = 0 ; i < comp->n_sinvs ; i++) {
+		struct crt_sinv *sinv;
+		int serv_id = comp->sinvs[i].server->id;
+		int cli_id  = comp->sinvs[i].client->id;
+
+		sinv = ss_sinv_alloc();
+		assert(sinv);
+		crt_sinv_create(sinv, comp->sinvs[i].name, comp->sinvs[i].server, comp->sinvs[i].client,
+			comp->sinvs[i].c_fn_addr, comp->sinvs[i].c_ucap_addr, comp->sinvs[i].s_fn_addr);
+		ss_sinv_activate(sinv);
+		printc("\t(chkpt) sinv: %s (%lu->%lu):\tclient_fn @ 0x%lx, client_ucap @ 0x%lx, server_fn @ 0x%lx\n",
+			sinv->name, sinv->client->id, sinv->server->id, sinv->c_fn_addr, sinv->c_ucap_addr, sinv->s_fn_addr);	
+	}
+#endif /* ENABLE_CHKPT */
+
+}
+
+unsigned long
+addr_get(compid_t id, addr_t type)
+{
+	compid_t client = (compid_t)cos_inv_token();
+	struct crt_comp *c, *target;
+	struct cos_compinfo *ci;
+
+	c = boot_comp_get(client);
+	/* only capmgrs should be allowed to call this... */
+	assert(c);
+	if (!(c->flags & CRT_COMP_CAPMGR)) return 0;
+
+	if (id <= 0 || client > MAX_NUM_COMPS) return 0;
+	target = boot_comp_get(id);
+	assert(target);
+
+	ci = cos_compinfo_get(target->comp_res);
+
+	switch (type) {
+	case ADDR_CAPTBL_FRONTIER:
+		return ci->cap_frontier;
+	case ADDR_HEAP_FRONTIER:
+		return ci->vas_frontier;
+	default:
+		return 0;
+	}
+}
+
+static void
+booter_init(void)
+{
+	struct cos_compinfo *boot_info = cos_compinfo_get(cos_defcompinfo_curr_get());
+
+	cos_meminfo_init(&(boot_info->mi), BOOT_MEM_KM_BASE, COS_MEM_KERN_PA_SZ, BOOT_CAPTBL_SELF_UNTYPED_PT);
+	cos_defcompinfo_init();
+
+	cos_hw_cycles_per_usec(BOOT_CAPTBL_SELF_INITHW_BASE);
+}
+
+void
+execute(void)
+{
+	crt_compinit_execute(boot_comp_get);
+}
+
+void
+init_done_chkpt(struct crt_comp *c)
+{
+	struct crt_comp  *new_comp = boot_comp_get(crt_ncomp() + 1);
+	struct crt_chkpt *chkpt;
+	thdcap_t          thdcap;
+	int               ret;
+	char              name[INITARGS_MAX_PATHNAME];
+	char             *prefix = "chkpt_";
+	int               prefix_sz = strlen("chkpt_");
+
+	if (c->id == cos_compid()) {
+	 	/* don't allow chkpnts of the booter */
+	 	BUG();
+	}
+
+	assert(INITARGS_MAX_PATHNAME > prefix_sz + strlen(c->name));
+	memcpy(name, prefix, prefix_sz + 1);
+	strncat(name, c->name, INITARGS_MAX_PATHNAME - prefix_sz - 1); 
+	c->name[INITARGS_MAX_PATHNAME - 1] = '\0';
+	
+	/* completed all initialization */
+	if (c->init_state >= CRT_COMP_INIT_MAIN) {
+		if (crt_nchkpt() > BOOTER_MAX_CHKPT) {
+			BUG();
+		}
+
+		chkpt = ss_chkpt_alloc();
+		if (crt_chkpt_create(chkpt, c) != 0) {
+			BUG();
+		}
+
+		ss_chkpt_activate(chkpt);
+		chkpt_comp_init(new_comp, chkpt, name);
+		thdcap = crt_comp_thdcap_get(new_comp);
+		assert(thdcap);
+		if ((ret = cos_defswitch(thdcap, TCAP_PRIO_MAX, TCAP_RES_INF, cos_sched_sync()))) {
+			printc("Switch failure on thdcap %ld, with ret %d\n", thdcap, ret);
+			BUG();
+		}
+	}
+
+	return;
+}
+
+void
+init_done(int parallel_init, init_main_t main_type)
+{
+	compid_t client = (compid_t)cos_inv_token();
+	struct crt_comp    *c;
+
+	assert(client > 0 && client <= MAX_NUM_COMPS);
+	c = boot_comp_get(client);
+
+	crt_compinit_done(c, parallel_init, main_type);
+
+#ifdef ENABLE_CHKPT
+	init_done_chkpt(c);
+#endif /* ENABLE_CHKPT */
+	return;
+
+}
+
+
+void
+init_exit(int retval)
+{
+	compid_t client = (compid_t)cos_inv_token();
+	struct crt_comp *c;
+
+	assert(client > 0 && client <= MAX_NUM_COMPS);
+	c = boot_comp_get(client);
+	assert(c);
+
+	crt_compinit_exit(c, retval);
+
+	/* TODO: recycle back to a chkpt via chkpt_restore() */
+
+	while (1) ;
+}
+
+void
+cos_init(void)
+{
+	booter_init();
+	comps_init();
+}
+
+void
+parallel_main(coreid_t cid)
+{
+	execute();
+}
\ No newline at end of file
diff --git a/src/components/implementation/pong/pingpong/pong.c b/src/components/implementation/pong/pingpong/pong.c
index 36ec8eb161..3479b05ca8 100644
--- a/src/components/implementation/pong/pingpong/pong.c
+++ b/src/components/implementation/pong/pingpong/pong.c
@@ -77,7 +77,15 @@ pong_args(int p1, int p2, int p3, int p4)
 }
 
 int
-pong_argsrets(int p0, int p1, int p2, int p3, int *r0, int *r1)
+pong_wideargs(long long p0, long long p1)
+{
+	if (p0 <= ((long long)1 << 31) && p1 <= ((long long)1 << 31)) return p0 + p1;
+
+	return p0 < p1 ? -1 : (p0 == p1 ? 0 : 1);
+}
+
+int
+pong_argsrets(int p0, int p1, int p2, int p3, word_t *r0, word_t *r1)
 {
 	*r0 = p0;
 	*r1 = p1;
@@ -85,6 +93,12 @@ pong_argsrets(int p0, int p1, int p2, int p3, int *r0, int *r1)
 	return p2 + p3;
 }
 
+long long
+pong_widerets(long long p0, long long p1)
+{
+	return p0 + p1;
+}
+
 int
 pong_subset(unsigned long p0, unsigned long p1, unsigned long *r0)
 {
diff --git a/src/components/implementation/sched/Makefile b/src/components/implementation/sched/Makefile
index 940db8c7c7..308e3774a8 100644
--- a/src/components/implementation/sched/Makefile
+++ b/src/components/implementation/sched/Makefile
@@ -6,10 +6,10 @@
 INTERFACE_EXPORTS =
 # The interfaces this component is dependent on for compilation (this
 # is a list of directory names in interface/)
-INTERFACE_DEPENDENCIES = sched
+INTERFACE_DEPENDENCIES =
 # The library dependencies this component is reliant on for
 # compilation/linking (this is a list of directory names in lib/)
-LIBRARY_DEPENDENCIES = kernel crt sl
+LIBRARY_DEPENDENCIES =
 # Note: Both the interface and library dependencies should be
 # *minimal*. That is to say that removing a dependency should cause
 # the build to fail. The build system does not validate this
diff --git a/src/components/implementation/sched/pfprr_quantum_static/Makefile b/src/components/implementation/sched/pfprr_quantum_static/Makefile
new file mode 100644
index 0000000000..f7afdc95d2
--- /dev/null
+++ b/src/components/implementation/sched/pfprr_quantum_static/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = sched
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init capmgr
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component slm ps util crt initargs
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/sched/pfprr_quantum_static/doc.md b/src/components/implementation/sched/pfprr_quantum_static/doc.md
new file mode 100644
index 0000000000..cdeb501436
--- /dev/null
+++ b/src/components/implementation/sched/pfprr_quantum_static/doc.md
@@ -0,0 +1,17 @@
+## sched.pfprr_quantum_static
+
+A minimal scheduling libary implementation of a scheduler based on
+
+- preemptive, fixed-priority, round-robin scheduling,
+- periodic, quantum-based timers, and
+- static memory allocation for the threads.
+
+### Description
+
+Export mainly the scheduling and blockpoint APIs as a general-purpose scheduler.
+
+### Usage and Assumptions
+
+See the scheduler API.
+This assumes that the macros for the maximum number of threads and the quantum size are properly configured.
+Does not yet support hierarchy.
diff --git a/src/components/implementation/sched/pfprr_quantum_static/init.c b/src/components/implementation/sched/pfprr_quantum_static/init.c
new file mode 100644
index 0000000000..1a36d897f7
--- /dev/null
+++ b/src/components/implementation/sched/pfprr_quantum_static/init.c
@@ -0,0 +1,269 @@
+/**
+ * Redistribution of this file is permitted under the BSD two clause license.
+ *
+ * Copyright 2018, The George Washington University
+ * Author: Phani Gadepalli, phanikishoreg@gwu.edu & Gabe Parmer, gparmer@gwu.edu
+ */
+
+/**
+ * Initialization of the scheduler, and all of the components the
+ * scheduler is responsible for initializing. Note that the `init`
+ * interface is what encodes which components are dependent on the
+ * scheduler for initialization. If the scheduler is managed by the
+ * capmgr, then the capmgr must have access to the captbl/pgtbl/comp
+ * capabilities for the component, thus it must also depend on the
+ * capmgr for the capmgr_create interface.
+ *
+ * The current implementation is not ideal in multiple ways.
+ *
+ * 1. It does not provide parallel execution.
+ * 2. It executes the initialization of the client components during
+ *    the *main* execution of this scheduler. That means that
+ *    initialization does *not* compose correctly. For example,
+ *    consider a component, `a`, that relies on another initialization
+ *    component, and also depends on a component, `b`, that depends on
+ *    us for initialization. We will finish initialization, and allow
+ *    initialization to proceed in `a`, *before* we actually
+ *    initialize `b`. This breaks the initialization ordering
+ *    requirements. It doesn't make much sense to have such
+ *    cross-scheduler dependencies, so this is less of an issue than
+ *    it seems.
+ *
+ * The former is simple because it is TBD. The latter is because the
+ * scheduler loop executes in `main`, and we orchestrate
+ * initialization within the normal scheduling loop. To fix this, we'd
+ * have to move a version of the scheduling loop (that returns
+ * sporadically) to `parallel_init`.
+ */
+
+#include <slm.h>
+#include <barrier.h>
+#include <init.h>
+#include <initargs.h>
+
+typedef enum {
+	SCHEDINIT_FREE,
+	SCHEDINIT_INITING,
+	SCHEDINIT_PARINIT,
+	SCHEDINIT_MAIN,	/* main, or parallel_main depending on main_type */
+} schedinit_t;
+
+struct schedinit_status {
+	struct simple_barrier barrier;
+	schedinit_t status;
+	init_main_t  main_type;
+};
+
+static struct schedinit_status initialization_state[MAX_NUM_COMPS] = { 0 };
+/* This schedule is used by the initializer_thd to ascertain order */
+static unsigned long init_schedule_off = 0;
+static compid_t init_schedule[MAX_NUM_COMPS] = { 0 };
+
+static void
+component_initialize_next(compid_t cid)
+{
+	struct schedinit_status *s;
+
+	printc("\tSched %ld: %ld is the %ldth component to initialize\n", cos_compid(), cid, init_schedule_off);
+	init_schedule[init_schedule_off] = cid;
+	init_schedule_off++;
+	s = &initialization_state[cid];
+	assert(s->status == SCHEDINIT_FREE);
+	*s = (struct schedinit_status) {
+		.status = SCHEDINIT_INITING,
+		.main_type = INIT_MAIN_NONE,
+	};
+	simple_barrier(&s->barrier);
+
+	return;
+}
+
+static void
+calculate_initialization_schedule(void)
+{
+	struct initargs exec_entries, curr;
+	struct initargs_iter i;
+	int ret, cont;
+
+	ret = args_get_entry("execute", &exec_entries);
+	assert(!ret);
+	printc("\tSched %ld: %d components that need execution\n", cos_compid(), args_len(&exec_entries));
+	for (cont = args_iter(&exec_entries, &i, &curr) ; cont ; cont = args_iter_next(&i, &curr)) {
+		int      keylen;
+		compid_t id        = atoi(args_key(&curr, &keylen));
+		char    *exec_type = args_value(&curr);
+
+		assert(exec_type);
+		assert(id != cos_compid());
+
+		/* Only init threads allowed */
+		if (strcmp(exec_type, "init")) BUG();	/* TODO: no support for hierarchical scheduling yet */
+
+		component_initialize_next(id);
+	}
+
+	return;
+}
+
+struct slm_thd *slm_thd_current_extern(void);
+
+void
+init_done(int parallel_init, init_main_t cont)
+{
+	compid_t client = (compid_t)cos_inv_token();
+	struct schedinit_status *s;
+
+	s = &initialization_state[client];
+	assert(s->status != SCHEDINIT_FREE);
+
+	/* Currently we don't do parallel initialization */
+	if (parallel_init) {
+		ps_store(&s->status, SCHEDINIT_PARINIT);
+
+		return;
+	}
+
+	switch (cont) {
+	case INIT_MAIN_SINGLE:
+		ps_store(&s->main_type, INIT_MAIN_SINGLE);
+		break;
+	case INIT_MAIN_PARALLEL:
+		ps_store(&s->main_type, INIT_MAIN_PARALLEL);
+		break;
+	case INIT_MAIN_NONE:
+		break;
+	}
+
+	/* This is the sync value for the initialization thread */
+	ps_store(&s->status, SCHEDINIT_MAIN);
+	if (s->main_type != INIT_MAIN_NONE) return; /* FIXME: no parallel main currently */
+
+	if (cont == INIT_MAIN_NONE) {
+		struct slm_thd *current = slm_thd_current_extern();
+
+		printc("\tScheduler %ld: Exiting thread %ld from component %ld\n", cos_compid(), cos_thdid(), client);
+		slm_cs_enter(current, SLM_CS_NONE);
+		slm_thd_deinit(current);		/* I'm out! */
+		slm_cs_exit_reschedule(current, SLM_CS_NONE);
+		BUG();
+	}
+
+	/* TODO: parallel init and main */
+
+	return;
+}
+
+void
+init_exit(int retval)
+{
+	compid_t client = (compid_t)cos_inv_token();
+	struct slm_thd *current = slm_thd_current_extern();
+
+	printc("\tScheduler %ld: Exiting thread %ld from component %ld\n", cos_compid(), cos_thdid(), client);
+	slm_cs_enter(current, SLM_CS_NONE);
+	slm_thd_deinit(current);		/* I'm out! */
+	slm_cs_exit_reschedule(current, SLM_CS_NONE);
+	BUG();
+	while (1) ;
+}
+
+/**
+ * A new thread, at the highest priority executes this function. This
+ * thread collaborates with
+ * 1. sched_childinfo_init_intern which parses through the components
+ *    we are supposed to initialize, and
+ * 2. the init_* interface that captures the initialization status of
+ *    component's threads
+ * to orchestrate the initialization of all components we're
+ * responsible for scheduling.
+ *
+ * *Assumptions and simplifications:* We make a number of
+ * simplifications here. Currently, we don't support parallel
+ * initialization. We also assume that the initialization thread can
+ * either be executed at the highest priority (which might be
+ * difficult with some scheduling policies), or will at least not
+ * starve due to the initialization thread execution.
+ */
+static void
+slm_comp_init_loop(void *d)
+{
+	unsigned long init_schedule_current = 0;
+	struct slm_thd *current;
+
+	printc("Scheduler %ld: Running initialization thread.\n", cos_compid());
+	/* If there are more components to initialize */
+	while (init_schedule_current != ps_load(&init_schedule_off)) {
+		/* Which is the next component to initialize? */
+		compid_t client = init_schedule[init_schedule_current];
+		struct schedinit_status *n;
+		struct slm_thd *t;
+		sched_param_t param[2];
+
+		param[0] = sched_param_pack(SCHEDP_INIT, 0);
+		param[1] = 0;
+
+		extern struct slm_thd *thd_alloc_in(compid_t id, thdclosure_index_t idx, sched_param_t *parameters, int reschedule);
+
+		/* Create the thread for initialization of the next component */
+		t = thd_alloc_in(client, 0, param, 0);
+		assert(t);
+
+		n = &initialization_state[client];
+		init_schedule_current++;
+
+		/*
+		 * This waits till init_done effective runs before
+		 * moving on. We need to be highest-priority, so that
+		 * we can direct switch to the initialization thread
+		 * here.
+		 *
+		 * FIXME: if the initialization thread blocks, this
+		 * will test the awkward code paths around waking on a
+		 * block *before* the actual impulse you're blocking
+		 * on is true. Always recheck your block conditions,
+		 * kids!
+		 */
+		printc("\tScheduler %ld: initializing component %ld with thread %ld.\n", cos_compid(), client, t->tid);
+		while (ps_load(&n->status) != SCHEDINIT_MAIN) {
+			sched_tok_t             tok;
+
+			assert(ps_load(&n->status) != SCHEDINIT_FREE);
+			tok  = cos_sched_sync();
+			slm_switch_to(slm_thd_current_extern(), t, tok, 0);
+		}
+	}
+
+	current = slm_thd_current_extern();
+	printc("Scheduler %ld, initialization completed.\n", cos_compid());
+	slm_cs_enter(current, SLM_CS_NONE);
+	slm_thd_deinit(current);		/* I'm out! */
+	slm_cs_exit_reschedule(current, SLM_CS_NONE);
+	BUG();
+}
+
+/**
+ * If the scheduler is supposed to initialize other components, this
+ * should be called directly before the scheduler loop. Will create
+ * threads to actuate the initialization process, and then the actual
+ * threads to execute in the initializing components.
+ */
+int
+slm_start_component_init(void)
+{
+	struct slm_thd_container *t;
+	sched_param_t param[2];
+
+	calculate_initialization_schedule();
+
+	/* Note that the initialization protocol thread runs at the highest priority */
+	param[0] = sched_param_pack(SCHEDP_INIT_PROTO, 0);
+	param[1] = 0;
+
+	typedef void (*thd_fn_t)(void *);
+	struct slm_thd_container *thd_alloc(thd_fn_t fn, void *data, sched_param_t *parameters, int reschedule);
+
+	t = thd_alloc(slm_comp_init_loop, NULL, param, 0);
+	assert(t);
+
+	return 0;
+}
diff --git a/src/components/implementation/sched/pfprr_quantum_static/main.c b/src/components/implementation/sched/pfprr_quantum_static/main.c
new file mode 100644
index 0000000000..7b2f1b495f
--- /dev/null
+++ b/src/components/implementation/sched/pfprr_quantum_static/main.c
@@ -0,0 +1,397 @@
+#include <cos_component.h>
+#include <llprint.h>
+#include <capmgr.h>
+
+#include <static_slab.h>
+#include <ps_list.h>
+#include <ps.h>
+#include <crt.h>
+
+/***
+ * A version of scheduling using a simple periodic timeout,
+ * preemptive, fixed priority, round-robin scheduling, and uses the
+ * capability manager to allocate threads, with local thread memory
+ * tracked in static (allocate-only, finite) memory.
+ */
+
+#include <slm.h>
+#include <quantum.h>
+#include <fprr.h>
+#include <slm_blkpt.c>
+
+struct slm_resources_thd {
+	thdcap_t cap;
+	thdid_t  tid;
+	compid_t comp;
+};
+
+struct slm_thd *slm_thd_static_cm_lookup(thdid_t id);
+
+SLM_MODULES_COMPOSE_DATA();
+SLM_MODULES_COMPOSE_FNS(quantum, fprr, static_cm);
+
+struct crt_comp self;
+
+SS_STATIC_SLAB(thd, struct slm_thd_container, MAX_NUM_THREADS);
+
+/* Implementation for use by the other parts of the slm */
+struct slm_thd *
+slm_thd_static_cm_lookup(thdid_t id)
+{
+	return &ss_thd_get(id)->thd;
+}
+
+static inline struct slm_thd *
+slm_thd_current(void)
+{
+	return &ss_thd_get(cos_thdid())->thd;
+}
+
+struct slm_thd *
+slm_thd_current_extern(void)
+{
+	return slm_thd_current();
+}
+
+static struct slm_thd_container *
+slm_thd_mem_alloc(thdcap_t _cap, thdid_t _tid, thdcap_t *thd, thdid_t *tid)
+{
+	struct slm_thd_container *t   = NULL;
+	struct slm_thd_container *ret = NULL;
+
+	ret = t = ss_thd_alloc_at_id(_tid);
+	if (!t) assert(0);
+
+	assert(_cap != 0 && _tid != 0);
+	t->resources = (struct slm_resources_thd) {
+		.cap  = _cap,
+		.tid  = _tid,
+		.comp = cos_compid()
+	};
+
+	*thd = _cap;
+	*tid = _tid;
+
+	return ret;
+}
+
+struct slm_thd_container *
+slm_thd_alloc(thd_fn_t fn, void *data, thdcap_t *thd, thdid_t *tid)
+{
+	thdid_t _tid;
+	thdcap_t _cap;
+	struct slm_thd_container *ret = NULL;
+
+	_cap = capmgr_thd_create(fn, data, &_tid);
+	if (_cap <= 0) return NULL;
+
+	return slm_thd_mem_alloc(_cap, _tid, thd, tid);
+}
+
+struct slm_thd_container *
+slm_thd_alloc_in(compid_t cid, thdclosure_index_t idx, thdcap_t *thd, thdid_t *tid)
+{
+	struct slm_thd_container *ret = NULL;
+	thdid_t _tid;
+	thdcap_t _cap;
+
+	_cap = capmgr_thd_create_ext(cid, idx, &_tid);
+	if (_cap <= 0) return NULL;
+
+	return slm_thd_mem_alloc(_cap, _tid, thd, tid);
+}
+
+void slm_mem_activate(struct slm_thd_container *t) { ss_thd_activate(t); }
+void slm_mem_free(struct slm_thd_container *t) { return; }
+
+struct slm_thd *
+thd_alloc(thd_fn_t fn, void *data, sched_param_t *parameters, int reschedule)
+{
+	struct slm_thd_container *t;
+	struct slm_thd *ret     = NULL;
+	struct slm_thd *current = slm_thd_current();
+	thdcap_t thdcap;
+	thdid_t tid;
+	int i;
+
+	/*
+	 * If this condition is true, we are likely in the
+	 * initialization sequence in the idle or scheduler threads...
+	 */
+	if (!current) {
+		current = slm_thd_special();
+		assert(current);
+	}
+
+	t = slm_thd_alloc(fn, data, &thdcap, &tid);
+	if (!t) ERR_THROW(NULL, done);
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	if (slm_thd_init(&t->thd, thdcap, tid)) ERR_THROW(NULL, free);
+
+	for (i = 0; parameters[i] != 0; i++) {
+		sched_param_type_t type;
+		unsigned int value;
+
+		sched_param_get(parameters[i], &type, &value);
+		if (slm_sched_thd_update(&t->thd, type, value)) ERR_THROW(NULL, free);
+	}
+	slm_mem_activate(t);
+
+	if (reschedule) {
+		if (slm_cs_exit_reschedule(current, SLM_CS_NONE)) ERR_THROW(NULL, free);
+	} else {
+		slm_cs_exit(NULL, SLM_CS_NONE);
+	}
+
+	ret = &t->thd;
+done:
+	return ret;
+free:
+	slm_mem_free(t);
+	ret = NULL;
+	goto done;
+}
+
+struct slm_thd *
+thd_alloc_in(compid_t id, thdclosure_index_t idx, sched_param_t *parameters, int reschedule)
+{
+	struct slm_thd_container *t;
+	struct slm_thd *ret     = NULL;
+	struct slm_thd *current = slm_thd_current();
+	thdcap_t thdcap;
+	thdid_t tid;
+	int i;
+
+	/*
+	 * If this condition is true, we are likely in the
+	 * initialization sequence in the idle or scheduler threads...
+	 */
+	if (!current) {
+		current = slm_thd_special();
+		assert(current);
+	}
+
+	t = slm_thd_alloc_in(id, idx, &thdcap, &tid);
+	if (!t) ERR_THROW(NULL, done);
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	if (slm_thd_init(&t->thd, thdcap, tid)) ERR_THROW(NULL, free);
+
+	for (i = 0; parameters[i] != 0; i++) {
+		sched_param_type_t type;
+		unsigned int value;
+
+		sched_param_get(parameters[i], &type, &value);
+		if (slm_sched_thd_update(&t->thd, type, value)) ERR_THROW(NULL, free);
+	}
+	slm_mem_activate(t);
+
+	if (reschedule) {
+		if (slm_cs_exit_reschedule(current, SLM_CS_NONE)) ERR_THROW(NULL, done);
+	} else {
+		slm_cs_exit(NULL, SLM_CS_NONE);
+	}
+
+	ret = &t->thd;
+done:
+	return ret;
+free:
+	slm_mem_free(t);
+	ret = NULL;
+	goto done;
+}
+
+thdid_t
+sched_thd_create_closure(thdclosure_index_t idx)
+{
+	sched_param_t p = 0;
+	struct slm_thd *t = thd_alloc_in(cos_inv_token(), idx, &p, 0);
+
+	if (!t) return 0;
+
+	return t->tid;
+}
+
+int
+sched_thd_param_set(thdid_t tid, sched_param_t p)
+{
+	struct slm_thd *t = slm_thd_lookup(tid);
+	sched_param_type_t type;
+	unsigned int value;
+
+	sched_param_get(p, &type, &value);
+
+	if (!t) return -1;
+
+	return slm_sched_thd_update(t, type, value);
+}
+
+int
+sched_thd_delete(thdid_t tid)
+{
+	return 0;
+}
+
+int
+sched_thd_exit(void)
+{
+	struct slm_thd *current = slm_thd_current();
+	int i;
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	slm_thd_deinit(current);
+	for (i = 0; slm_cs_exit_reschedule(current, SLM_CS_NONE) && i < 16; i++) ;
+
+	/* If we got here, something went wrong */
+	BUG();
+
+	return 0;
+}
+
+int
+thd_block(void)
+{
+	struct slm_thd *current = slm_thd_current();
+	int ret;
+
+	slm_cs_enter(current, SLM_CS_NONE);
+        ret = slm_thd_block(current);
+	if (!ret) ret = slm_cs_exit_reschedule(current, SLM_CS_NONE);
+	else      slm_cs_exit(NULL, SLM_CS_NONE);
+
+	return ret;
+}
+
+int
+sched_thd_block(thdid_t dep_id)
+{
+	if (dep_id) return -1;
+
+	return thd_block();
+}
+
+int
+thd_wakeup(struct slm_thd *t)
+{
+	int ret;
+	struct slm_thd *current = slm_thd_current();
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	ret = slm_thd_wakeup(t, 0);
+	if (ret < 0) {
+		slm_cs_exit(NULL, SLM_CS_NONE);
+		return ret;
+	}
+
+	return slm_cs_exit_reschedule(current, SLM_CS_NONE);
+}
+
+int
+sched_thd_wakeup(thdid_t tid)
+{
+	struct slm_thd *t = slm_thd_lookup(tid);
+
+	if (!t) return -1;
+
+	return thd_wakeup(t);
+}
+
+static int
+thd_block_until(cycles_t timeout)
+{
+	struct slm_thd *current = slm_thd_current();
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	if (slm_timer_add(current, timeout)) goto done;
+	if (slm_thd_block(current)) {
+		slm_timer_cancel(current);
+	}
+done:
+	return slm_cs_exit_reschedule(current, SLM_CS_NONE);
+}
+
+cycles_t
+sched_thd_block_timeout(thdid_t dep_id, cycles_t abs_timeout)
+{
+	cycles_t elapsed;
+
+	if (dep_id) return 0;
+
+	if (thd_block_until(abs_timeout)) {
+		return 0;
+	}
+
+	return ps_tsc();
+}
+
+sched_blkpt_id_t
+sched_blkpt_alloc(void)
+{
+	struct slm_thd *current = slm_thd_current();
+
+	return slm_blkpt_alloc(current);
+}
+
+int
+sched_blkpt_free(sched_blkpt_id_t id)
+{
+	return slm_blkpt_free(id);
+}
+
+int
+sched_blkpt_trigger(sched_blkpt_id_t blkpt, sched_blkpt_epoch_t epoch, int single)
+{
+	struct slm_thd *current = slm_thd_current();
+
+	return slm_blkpt_trigger(blkpt, current, epoch, single);
+}
+
+int
+sched_blkpt_block(sched_blkpt_id_t blkpt, sched_blkpt_epoch_t epoch, thdid_t dependency)
+{
+	struct slm_thd *current = slm_thd_current();
+
+	return slm_blkpt_block(blkpt, current, epoch, dependency);
+}
+
+int
+thd_sleep(cycles_t c)
+{
+	cycles_t timeout = c + slm_now();
+
+	return thd_block_until(timeout);
+}
+
+thdid_t
+sched_aep_create_closure(thdclosure_index_t id, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax, arcvcap_t *rcv)
+{
+	return 0;
+}
+
+int
+main(void)
+{
+	extern int slm_start_component_init(void);
+
+	slm_start_component_init();
+	slm_sched_loop();
+}
+
+void
+cos_init(void)
+{
+	struct slm_thd_container *t;
+	struct cos_compinfo *boot_info = cos_compinfo_get(cos_defcompinfo_curr_get());
+	thdcap_t thdcap;
+	thdid_t tid;
+
+	cos_meminfo_init(&(boot_info->mi), BOOT_MEM_KM_BASE, COS_MEM_KERN_PA_SZ, BOOT_CAPTBL_SELF_UNTYPED_PT);
+	cos_defcompinfo_init();
+	cos_defcompinfo_sched_init();
+
+	t = slm_thd_alloc(slm_idle, NULL, &thdcap, &tid);
+	if (!t) BUG();
+
+	slm_init(thdcap, tid);
+}
diff --git a/src/components/implementation/sched/root_fprr/Makefile b/src/components/implementation/sched/root_fprr/Makefile
index ad4a79925a..783cceaf7f 100644
--- a/src/components/implementation/sched/root_fprr/Makefile
+++ b/src/components/implementation/sched/root_fprr/Makefile
@@ -9,7 +9,7 @@ INTERFACE_EXPORTS = sched init
 INTERFACE_DEPENDENCIES = capmgr
 # The library dependencies this component is reliant on for
 # compilation/linking (this is a list of directory names in lib/)
-LIBRARY_DEPENDENCIES = component sl_capmgr
+LIBRARY_DEPENDENCIES = component sl_capmgr kernel crt sl
 # Note: Both the interface and library dependencies should be
 # *minimal*. That is to say that removing a dependency should cause
 # the build to fail. The build system does not validate this
diff --git a/src/components/implementation/sched/root_fprr/init.c b/src/components/implementation/sched/root_fprr/init.c
index db98616b61..d5d47d8058 100644
--- a/src/components/implementation/sched/root_fprr/init.c
+++ b/src/components/implementation/sched/root_fprr/init.c
@@ -221,6 +221,12 @@ sched_child_init(struct sched_childinfo *schedci)
 
 static u32_t cpubmp[NUM_CPU_BMP_WORDS] = { 0 };
 
+unsigned long
+sched_get_cpu_freq(void)
+{
+	return cycs_per_usec;
+}
+
 void
 cos_init(void)
 {
diff --git a/src/components/implementation/sched/sched.c b/src/components/implementation/sched/root_fprr/sched.c
similarity index 94%
rename from src/components/implementation/sched/sched.c
rename to src/components/implementation/sched/root_fprr/sched.c
index 70ce5c856b..dbb4028ff9 100644
--- a/src/components/implementation/sched/sched.c
+++ b/src/components/implementation/sched/root_fprr/sched.c
@@ -11,6 +11,17 @@
 #include <sched_info.h>
 #include <sl_blkpt.h>
 
+int
+sched_thd_yield_to(thdid_t t)
+{
+	spdid_t c = cos_inv_token();
+
+	if (!c || !sched_childinfo_find(c)) return -1;
+	sl_thd_yield(t);
+
+	return 0;
+}
+
 int
 sched_thd_wakeup(thdid_t t)
 {
diff --git a/src/components/implementation/sched/sched_info.c b/src/components/implementation/sched/root_fprr/sched_info.c
similarity index 100%
rename from src/components/implementation/sched/sched_info.c
rename to src/components/implementation/sched/root_fprr/sched_info.c
diff --git a/src/components/implementation/sched/sched_info.h b/src/components/implementation/sched/root_fprr/sched_info.h
similarity index 100%
rename from src/components/implementation/sched/sched_info.h
rename to src/components/implementation/sched/root_fprr/sched_info.h
diff --git a/src/components/implementation/sched/sched_init.c b/src/components/implementation/sched/sched_init.c
deleted file mode 100644
index 32403ba23e..0000000000
--- a/src/components/implementation/sched/sched_init.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Redistribution of this file is permitted under the BSD two clause license.
- *
- * Copyright 2018, The George Washington University
- * Author: Phani Gadepalli, phanikishoreg@gwu.edu
- */
-
-#include <cos_kernel_api.h>
-#include <cos_defkernel_api.h>
-#include <sl.h>
-#include <sched_info.h>
-#include <sl_child.h>
-
-extern unsigned int num_child_init[];
-extern thdcap_t capmgr_thd_retrieve_next(spdid_t child, thdid_t *tid);
-
-cbuf_t
-schedinit_child(void)
-{
-	spdid_t c = cos_inv_token();
-	thdid_t thdid  = 0;
-	struct cos_defcompinfo *dci;
-	struct sched_childinfo *ci;
-	struct sl_thd *init;
-	cbuf_t id = 0;
-	struct sl_thd *tcur;
-
-	if (!c) return 0;
-	ci  = sched_childinfo_find(c);
-	/* is a child sched? */
-	if (!ci || !(ci->flags & COMP_FLAG_SCHED)) return 0;
-	dci = sched_child_defci_get(ci);
-	if (!dci) return 0;
-
-	init = sched_child_initthd_get(ci);
-	if (!init) return 0;
-	tcur = sl_thd_curr();
-	if (!tcur) return 0;
-	assert(tcur->schedthd == init);
-
-	/* thd retrieve */
-	do {
-		struct sl_thd *t = NULL;
-		struct cos_aep_info aep;
-
-		memset(&aep, 0, sizeof(struct cos_aep_info));
-		aep.thd = capmgr_thd_retrieve_next(c, &thdid);
-		if (!thdid) break;
-		t = sl_thd_try_lkup(thdid);
-		/* already in? only init thd, coz it's created by this sched! */
-		if (unlikely(t)) continue;
-
-		aep.tid = thdid;
-		aep.tc  = sl_thd_tcap(sl__globals_cpu()->sched_thd);
-		t = sl_thd_init_ext(&aep, init);
-		if (!t) return 0;
-	} while (thdid);
-
-	/* create a shared-mem region, initialize it with ck_ring and pass it to the child! */
-	id = sl_parent_notif_alloc(init);
-
-	num_child_init[cos_cpuid()]++;
-
-	return id;
-}
diff --git a/src/components/implementation/tests/bench_chan_crt/Makefile b/src/components/implementation/tests/bench_chan_crt/Makefile
new file mode 100644
index 0000000000..867a138cbb
--- /dev/null
+++ b/src/components/implementation/tests/bench_chan_crt/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = sched
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component crt ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_chan_crt/bench_chan_crt.c b/src/components/implementation/tests/bench_chan_crt/bench_chan_crt.c
new file mode 100644
index 0000000000..bc71474d87
--- /dev/null
+++ b/src/components/implementation/tests/bench_chan_crt/bench_chan_crt.c
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2016, Runyu Pan and Gabriel Parmer, GWU, gparmer@gwu.edu.
+ *
+ * This uses a two clause BSD License.
+ */
+
+#include <llprint.h>
+#include <sched.h>
+
+#include <crt_static_chan.h>
+#include <perfdata.h>
+
+#undef CHAN_TRACE_DEBUG
+#ifdef CHAN_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+/* One low-priority thread and one high-priority thread contends on the lock */
+#define ITERATION 10000
+/* #define PRINT_ALL */
+
+/* Two options are available: Sender at low/high prio, data words 4 */
+#define READER_HIGH
+#define DATA_WORDS		2
+
+thdid_t chan_reader = 0, chan_writer = 0;
+
+typedef unsigned int cycles_32_t;
+
+cycles_32_t tmp[DATA_WORDS] = {0, };
+cycles_32_t ts1[DATA_WORDS] = {0, };
+cycles_32_t ts2[DATA_WORDS] = {0, };
+cycles_32_t ts3[DATA_WORDS] = {0, };
+
+struct perfdata perf1, perf2, perf3;
+cycles_t result1[ITERATION] = {0, };
+cycles_t result2[ITERATION] = {0, };
+cycles_t result3[ITERATION] = {0, };
+
+CRT_STATIC_CHAN_STATIC_ALLOC(chan1, cycles_32_t, DATA_WORDS);
+CRT_STATIC_CHAN_STATIC_ALLOC(chan2, cycles_32_t, DATA_WORDS);
+CRT_STATIC_CHAN_TYPE_PROTOTYPES(bench, cycles_32_t, DATA_WORDS);
+
+/***
+ * The two threads reciprocally sends and receives.
+ */
+void
+chan_reader_thd(void *d)
+{
+	/* Never stops running; writer controls how many iters to run. */
+	while(1) {
+		debug("r1,");
+		crt_static_chan_recv_bench(chan1, tmp);
+		debug("tsr1: %d,", tmp[0]);
+		debug("r2,");
+		tmp[0] = time_now();
+		debug("tsr2: %d,", tmp[0]);
+		debug("r3,");
+		crt_static_chan_send_bench(chan2, tmp);
+		debug("r4,");
+	}
+}
+
+void
+chan_writer_thd(void *d)
+{
+	int i;
+	int first = 0;
+
+	for (int i = 0; i < ITERATION + 1; i++) {
+		debug("w1,");
+		ts1[0] = time_now();
+		debug("ts1: %d,", ts1[0]);
+		debug("w2,");
+		crt_static_chan_send_bench(chan1, ts1);
+		debug("w3,");
+		crt_static_chan_recv_bench(chan2, ts2);
+		debug("ts2: %d,", ts2[0]);
+		debug("w4,");
+		ts3[0] = time_now();
+		debug("w5,");
+		
+		if (first == 0) first = 1;
+		else {
+			if (ts2[0] > ts1[0] && ts3[0] > ts2[0]) {
+				perfdata_add(&perf1, ts2[0] - ts1[0]);
+				perfdata_add(&perf2, ts3[0] - ts2[0]);
+				perfdata_add(&perf3, ts3[0] - ts1[0]);
+			}
+		}
+	}
+	
+	perfdata_calc(&perf1);
+	perfdata_calc(&perf2);
+	perfdata_calc(&perf3);
+#ifdef PRINT_ALL
+#ifdef READER_HIGH
+	perfdata_all(&perf1);
+#else
+	perfdata_all(&perf2);
+#endif
+	perfdata_all(&perf3);
+#else
+#ifdef READER_HIGH
+	perfdata_print(&perf1);
+#else
+	perfdata_print(&perf2);
+#endif
+	perfdata_print(&perf3);
+#endif
+
+	while (1) ;
+}
+
+void
+test_chan(void)
+{
+	int i;
+	int first = 0;
+	cycles_t begin, end;
+
+#ifdef READER_HIGH
+	sched_param_t sps[] = {
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 4),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6)
+	};
+#else
+	sched_param_t sps[] = {
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 4)
+	};
+#endif
+
+	crt_static_chan_init_bench(chan1);
+	
+	/* Uncontended lock taking/releasing */
+	perfdata_init(&perf1, "Uncontended channel - selfloop", result1, ITERATION);
+	for (i = 0; i < ITERATION + 1; i++) {
+		begin = time_now();
+
+		crt_static_chan_send_bench(chan1, tmp);
+		crt_static_chan_recv_bench(chan1, tmp);
+
+		end = time_now();
+		if (first == 0) first = 1;
+		else perfdata_add(&perf1, end - begin);
+	}
+	perfdata_calc(&perf1);
+#ifdef PRINT_ALL
+	perfdata_all(&perf1);
+#else
+	perfdata_print(&perf1);
+#endif
+
+	crt_static_chan_init_bench(chan1);
+	crt_static_chan_init_bench(chan2);
+
+	perfdata_init(&perf1, "Contended channel - reader high use this", result1, ITERATION);
+	perfdata_init(&perf2, "Contended channel - writer high use this", result2, ITERATION);
+	perfdata_init(&perf3, "Contended channel - roundtrip", result3, ITERATION);
+	
+	printc("Create threads:\n");
+	
+	chan_reader = sched_thd_create(chan_reader_thd, NULL);
+	printc("\tcreating reader thread %lu at prio %d\n", chan_reader, sps[0]);
+	sched_thd_param_set(chan_reader, sps[0]);
+	
+	chan_writer = sched_thd_create(chan_writer_thd, NULL);
+	printc("\tcreating writer thread %lu at prio %d\n", chan_writer, sps[1]);
+	sched_thd_param_set(chan_writer, sps[1]);
+}
+
+void
+cos_init(void)
+{
+	printc("Benchmark for the crt_chan (w/sched interface).\n");
+}
+
+int
+main(void)
+{
+	test_chan();
+
+	printc("Running benchmark, exiting main thread...\n");
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/bench_chan_inter_recv/Makefile b/src/components/implementation/tests/bench_chan_inter_recv/Makefile
new file mode 100644
index 0000000000..99cc9d67db
--- /dev/null
+++ b/src/components/implementation/tests/bench_chan_inter_recv/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = chanmgr chanmgr_evt evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component chan ps ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_chan_inter_recv/chan_inter_recv.c b/src/components/implementation/tests/bench_chan_inter_recv/chan_inter_recv.c
new file mode 100644
index 0000000000..38e1485389
--- /dev/null
+++ b/src/components/implementation/tests/bench_chan_inter_recv/chan_inter_recv.c
@@ -0,0 +1,111 @@
+#include <cos_component.h>
+#include <llprint.h>
+#include <chan.h>
+#include <ps.h>
+#include <perfdata.h>
+
+#undef CHAN_TRACE_DEBUG
+#ifdef CHAN_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+struct chan_snd s;
+struct chan_rcv r;
+struct evt e;
+
+/* Keep these settings below consistent with the sender side */
+#define READER_HIGH
+#define USE_EVTMGR
+
+#define TEST_CHAN_ITEM_SZ   sizeof(u32_t)
+#define TEST_CHAN_NSLOTS    2
+#define TEST_CHAN_SEND_ID   3
+#define TEST_CHAN_RECV_ID   4
+/* We are the receiver, and we don't care about data gathering */
+#ifdef READER_HIGH
+#define TEST_CHAN_PRIO_SELF 4
+#else
+#define TEST_CHAN_PRIO_SELF 5
+#endif
+
+typedef unsigned int cycles_32_t;
+
+int
+main(void)
+{
+	cycles_t wakeup;
+	cycles_32_t tmp;
+#ifdef USE_EVTMGR
+	evt_res_id_t evt_id;
+	evt_res_data_t evtdata;
+	evt_res_type_t  evtsrc;
+#endif
+
+	printc("Component chan receiver: executing main.\n");
+	
+	/* See if event manager is in use. If yes, log the receiver channel into it */
+#ifdef USE_EVTMGR
+	assert(evt_init(&e, 2) == 0);
+	evt_id = evt_add(&e, 0, (evt_res_data_t)&r);
+	assert(evt_id != 0);
+	assert(chan_rcv_evt_associate(&r, evt_id) == 0);
+	printc("Receiver side event created.\n");
+#endif
+
+	/* 
+	 * This sleep in both hi and lo comps lets the benchmark run
+	 * more predictably on HW and on Qemu.
+	 *
+	 * Likely because this helps the priority change in cos_init take effect!
+	 * Or because this lets the initialization of both ends of channels complete before tests start!
+	 */
+	wakeup = time_now() + time_usec2cyc(100 * 1000);
+	sched_thd_block_timeout(0, wakeup);
+
+	/* Never stops running; sender controls how many iters to run. */
+	while(1) {
+		debug("r1,");
+#ifdef USE_EVTMGR
+		/* Receive from the events then the channel */
+		while (chan_recv(&r, &tmp, CHAN_NONBLOCKING) == CHAN_TRY_AGAIN) evt_get(&e, EVT_WAIT_DEFAULT, &evtsrc, &evtdata);
+#else
+		chan_recv(&r, &tmp, 0);
+#endif
+		debug("tsr1: %d,", tmp);
+		debug("r2,");
+		tmp = time_now();
+		debug("tsr2: %d,", tmp);
+		debug("r3,");
+		chan_send(&s, &tmp, 0);
+		debug("r4,");
+	}
+}
+
+
+/* We initialize channel and threads before executing main - here the scheduler doesn't even work so we guarantee good init */
+void
+cos_init(void)
+{
+	memset(&s, 0, sizeof(struct chan_snd));
+	memset(&r, 0, sizeof(struct chan_rcv));
+	printc("Component chan receiver initializing:\n\tCreate channel %d\n", TEST_CHAN_SEND_ID);
+	if (chan_snd_init_with(&s, TEST_CHAN_SEND_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
+		printc("Chan test 1 (%ld): Could not initialize send.\n", cos_compid());
+		BUG();
+	}
+	printc("\tCreate channel %d\n", TEST_CHAN_RECV_ID);
+	if (chan_rcv_init_with(&r, TEST_CHAN_RECV_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
+		printc("Chan test 1 (%ld): Could not initialize recv.\n", cos_compid());
+		BUG();
+	}
+
+	printc("Recv: smem %p, rmem %p.\n", s.meta.mem, r.meta.mem);
+
+	printc("\tPriority %d for self!\n", TEST_CHAN_PRIO_SELF);
+	if (sched_thd_param_set(cos_thdid(), sched_param_pack(SCHEDP_PRIO, TEST_CHAN_PRIO_SELF))) {
+		printc("sched_thd_param_set failed.\n");
+		assert(0);
+	}
+}
diff --git a/src/components/implementation/tests/bench_chan_inter_send/Makefile b/src/components/implementation/tests/bench_chan_inter_send/Makefile
new file mode 100644
index 0000000000..99cc9d67db
--- /dev/null
+++ b/src/components/implementation/tests/bench_chan_inter_send/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = chanmgr chanmgr_evt evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component chan ps ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_chan_inter_send/chan_inter_send.c b/src/components/implementation/tests/bench_chan_inter_send/chan_inter_send.c
new file mode 100644
index 0000000000..815fb02db1
--- /dev/null
+++ b/src/components/implementation/tests/bench_chan_inter_send/chan_inter_send.c
@@ -0,0 +1,154 @@
+#include <cos_component.h>
+#include <llprint.h>
+#include <chan.h>
+#include <ps.h>
+#include <perfdata.h>
+
+#undef CHAN_TRACE_DEBUG
+#ifdef CHAN_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+struct chan sc, rc;
+struct chan_snd init_s;
+struct chan_snd s;
+struct chan_rcv r;
+struct evt e;
+
+#define ITERATION 	10000
+#define READER_HIGH
+#define USE_EVTMGR
+/* #define PRINT_ALL */
+
+#define TEST_CHAN_ITEM_SZ   sizeof(u32_t)
+#define TEST_CHAN_NSLOTS    2
+#define TEST_CHAN_SEND_ID   4
+#define TEST_CHAN_RECV_ID   3
+/* We are the sender, and we will be responsible for collecting resulting data */
+#ifdef READER_HIGH
+#define TEST_CHAN_PRIO_SELF 5
+#else
+#define TEST_CHAN_PRIO_SELF 4
+#endif
+
+typedef unsigned int cycles_32_t;
+
+struct perfdata perf1, perf2, perf3;
+cycles_t result1[ITERATION] = {0, };
+cycles_t result2[ITERATION] = {0, };
+cycles_t result3[ITERATION] = {0, };
+
+int
+main(void)
+{
+	int i;
+	cycles_t wakeup;
+	cycles_32_t ts1, ts2, ts3;
+	int first = 0;
+#ifdef USE_EVTMGR
+	evt_res_id_t evt_id;
+	evt_res_data_t evtdata;
+	evt_res_type_t  evtsrc;
+#endif
+
+	printc("Component chan sender: executing main.\n");
+	
+	/* Send data to receiver so it can register for channels */
+	
+#ifdef USE_EVTMGR
+	assert(evt_init(&e, 2) == 0);
+	evt_id = evt_add(&e, 0, (evt_res_data_t)&r);
+	assert(evt_id != 0);
+	assert(chan_rcv_evt_associate(&r, evt_id) == 0);
+	printc("Sender side event created.\n");
+#endif
+
+	/* 
+	 * This sleep in both hi and lo comps lets the benchmark run
+	 * more predictably on HW and on Qemu.
+	 *
+	 * Likely because this helps the priority change in cos_init take effect!
+	 * Or because this lets the initialization of both ends of channels complete before tests start!
+	 */
+	wakeup = time_now() + time_usec2cyc(100 * 1000);
+	sched_thd_block_timeout(0, wakeup);
+
+	for (int i = 0; i < ITERATION + 1; i++) {
+		debug("w1,");
+		ts1 = time_now();
+		debug("ts1: %d,", ts1);
+		debug("w2,");
+		chan_send(&s, &ts1, 0);
+		debug("w3,");
+#ifdef USE_EVTMGR
+		/* Receive from the events then the channel */
+		while (chan_recv(&r, &ts2, CHAN_NONBLOCKING) == CHAN_TRY_AGAIN) evt_get(&e, EVT_WAIT_DEFAULT, &evtsrc, &evtdata);
+#else
+		chan_recv(&r, &ts2, 0);
+#endif
+		debug("ts2: %d,", ts2);
+		debug("w4,");
+		ts3 = time_now();
+		debug("w5,");
+		
+		if (first == 0) first = 1;
+		else {
+			if (ts2 > ts1 && ts3 > ts2) {
+				perfdata_add(&perf1, ts2 - ts1);
+				perfdata_add(&perf2, ts3 - ts2);
+				perfdata_add(&perf3, ts3 - ts1);
+			}
+		}
+	}
+	
+	perfdata_calc(&perf1);
+	perfdata_calc(&perf2);
+	perfdata_calc(&perf3);
+#ifdef PRINT_ALL
+#ifdef READER_HIGH
+	perfdata_all(&perf1);
+#else
+	perfdata_all(&perf2);
+#endif
+	perfdata_all(&perf3);
+#else
+#ifdef READER_HIGH
+	perfdata_print(&perf1);
+#else
+	perfdata_print(&perf2);
+#endif
+	perfdata_print(&perf3);
+#endif
+
+	while(1);
+}
+
+void
+cos_init(void)
+{
+	/* Initialize performance data */
+	perfdata_init(&perf1, "IPC channel - reader high use this", result1, ITERATION);
+	perfdata_init(&perf2, "IPC channel - writer high use this", result2, ITERATION);
+	perfdata_init(&perf3, "IPC channel - roundtrip", result3, ITERATION);
+
+	printc("Component chan sender initializing:\n\tJoin channel %d\n", TEST_CHAN_SEND_ID);
+	if (chan_snd_init_with(&s, TEST_CHAN_SEND_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
+		printc("Chan test 2 (%ld): Could not initialize send.\n", cos_compid());
+		BUG();
+	}
+	printc("\tJoin channel %d\n", TEST_CHAN_RECV_ID);
+	if (chan_rcv_init_with(&r, TEST_CHAN_RECV_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
+		printc("Chan test 2 (%ld): Could not initialize recv.\n", cos_compid());
+		BUG();
+	}
+
+	printc("Send: smem %p, rmem %p.\n", s.meta.mem, r.meta.mem);
+
+	printc("\tPriority %d for self!\n", TEST_CHAN_PRIO_SELF);
+	if (sched_thd_param_set(cos_thdid(), sched_param_pack(SCHEDP_PRIO, TEST_CHAN_PRIO_SELF))) {
+		printc("sched_thd_param_set failed.\n");
+		BUG();
+	}
+}
diff --git a/src/components/implementation/tests/bench_dpdk/Makefile b/src/components/implementation/tests/bench_dpdk/Makefile
new file mode 100644
index 0000000000..092f7bd0a7
--- /dev/null
+++ b/src/components/implementation/tests/bench_dpdk/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = 
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component dpdk lwip
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_dpdk/doc.md b/src/components/implementation/tests/bench_dpdk/doc.md
new file mode 100644
index 0000000000..7d7a54ef92
--- /dev/null
+++ b/src/components/implementation/tests/bench_dpdk/doc.md
@@ -0,0 +1,53 @@
+## How to perform this DPDK test?
+
+### Install test utilities
+```shell
+sudo apt install -y python3-scapy netsniff-ng
+```
+`scapy` is a python-based packect manipulation tool. You can use it to generate any kind of packets you want. `netsniff-ng` is a network analyzer tool set. We will only use its `trafgen` to generate traffic and `ifpps` to watch the traffic's speed.
+
+### Create a tap device to connect DPDK port
+```shell
+sudo ip tuntap add dev tap0 mode tap
+sudo ip link set tap0 up
+```
+This will create a `tap` device called `tap0` within your system. You can use `ip a` to check it. After test, you can use this command to delete the `tap0` device:
+```shell
+sudo ip tuntap del dev tap0 mode tap
+```
+
+### Begin the bench test
+1. Compile this test program
+```shell
+./cos compose composition_scripts/bench_dpdk.toml bench_dpdk_test
+```
+2. Open a separate terminal and then use `ifpps` to monitor the `tap0` deivce
+```shell
+sudo ifpps --dev tap0 --promisc
+```
+3. Use `trafgen` to generate traffic before running the program
+Open another terminal to run this command:
+```shell
+sudo trafgen --cpp --out tap0 --conf ./src/components/implementation/tests/bench_dpdk/traffic_template.trafgen --verbose --cpu 1 -b 1000MiB
+```
+4. Start the Composite networking system
+```shell
+sudo ./cos run bench_dpdk_test enable-nic
+```
+5. Watch the `ifpps` monitor
+Now you will see in the terminal the rx/tx speed of the `tap0` device. Then you can use `Ctrl+C` to stop the `trafgen`. (At this pointed, If the `trafgen` cannot be stoped, you need to start again the Composite dpdk system and then stop it to make sure the `trafgen` is stopped.) Finally, use `Ctrl+C` to stop the `ifpps`.
+
+6. Watch DPDK stats
+After you stop `trafgen`, wait a few seconds, the DPDK test will prints out stats including `rx bytes`, `rx packets`, `tx bytes`, `tx packets`. You can use these stats to compare the traffic stats above.
+
+
+### Simple ping-pong test
+1. Start the program
+```shell
+sudo ./cos run bench_dpdk_test enable-nic
+```
+
+2. After DPDK is ready, start the scapy script and then it will print out if the ping-pong test succeed
+```shell
+sudo python3 ./src/components/implementation/tests/bench_dpdk/ping-pong.py
+```
\ No newline at end of file
diff --git a/src/components/implementation/tests/bench_dpdk/init.c b/src/components/implementation/tests/bench_dpdk/init.c
new file mode 100644
index 0000000000..120004e19c
--- /dev/null
+++ b/src/components/implementation/tests/bench_dpdk/init.c
@@ -0,0 +1,118 @@
+#include <llprint.h>
+#include <cos_dpdk.h>
+
+#define NB_RX_DESC_DEFAULT 1024
+#define NB_TX_DESC_DEFAULT 1024
+#define MAX_PKT_BURST 512
+
+static u16_t nic_ports = 0;
+
+static void
+process_packets(cos_portid_t port_id, char** rx_pkts, uint16_t nb_pkts)
+{
+	/* sent this group of packets out */
+	cos_dev_port_tx_burst(port_id, 0, rx_pkts, nb_pkts);
+}
+
+static void
+cos_nic_start(){
+	int i, loop = 1000000000;
+	uint16_t nb_pkts = 0;
+
+	char* rx_packets[MAX_PKT_BURST];
+
+	/* only burst for a little time */
+	while (--loop)
+	{
+		/* infinite loop to process packets */
+		for (i = 0; i < nic_ports; i++) {
+			/* process rx */
+			nb_pkts = cos_dev_port_rx_burst(i, 0, rx_packets, MAX_PKT_BURST);
+			if (nb_pkts != 0) {
+				process_packets(i, rx_packets, nb_pkts);
+			}
+		}
+	}
+	/* print stats */
+	cos_get_port_stats(0);
+}
+
+static void
+cos_nic_init(void)
+{
+	int argc, ret, nb_pkts;
+
+	#define MAX_PKT_BURST 512
+
+	const char *mpool_name = "cos_app_pool";
+	uint16_t i;
+	uint16_t nb_rx_desc = NB_RX_DESC_DEFAULT;
+	uint16_t nb_tx_desc = NB_TX_DESC_DEFAULT;
+
+	/*
+	 * set max_mbufs 2 times than nb_rx_desc, so that there is enough room
+	 * to store packets, or this will fail if nb_rx_desc <= max_mbufs.
+	 */
+	const size_t max_mbufs = 8 * nb_rx_desc;
+
+	char *argv[] =	{
+			"COS_DPDK_BOOTER", /* single core, the first argument has to be the program name */
+			"-l", 
+			"0",
+			"--no-shconf", 
+			"--no-huge",
+			"--iova-mode=pa",
+			"--log-level",
+			"*:info", /* log level can be changed to *debug* if needed, this will print lots of information */
+			"-m",
+			"64", /* total memory used by dpdk memory subsystem, such as mempool */
+			};
+
+	argc = ARRAY_SIZE(argv);
+
+	/* 1. do initialization of dpdk */
+	ret = cos_dpdk_init(argc, argv);
+
+	assert(ret == argc - 1); /* program name is excluded */
+
+	/* 2. init all Ether ports */
+	nic_ports = cos_eth_ports_init();
+
+	assert(nic_ports > 0);
+
+	/* 3. create mbuf pool where packets will be stored, user can create multiple pools */
+	char* mp = cos_create_pkt_mbuf_pool(mpool_name, max_mbufs);
+
+	assert(mp != NULL);
+
+	/* 4. config each port */
+	for (i = 0; i < nic_ports; i++) {
+		cos_config_dev_port_queue(i, 1, 1);
+		cos_dev_port_adjust_rx_tx_desc(i, &nb_rx_desc, &nb_tx_desc);
+		cos_dev_port_rx_queue_setup(i, 0, nb_rx_desc, mp);
+		cos_dev_port_tx_queue_setup(i, 0, nb_tx_desc);
+	}
+
+	/* 5. start each port, this will enable rx/tx */
+	for (i = 0; i < nic_ports; i++) {
+		cos_dev_port_start(i);
+		cos_dev_port_set_promiscuous_mode(i, COS_DPDK_SWITCH_ON);
+	}
+}
+
+void
+cos_init(void)
+{
+	printc("nicmgr init...\n");
+	cos_nic_init();
+}
+
+int
+main(void)
+{
+	printc("NIC started\n");
+
+	cos_nic_start();
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/bench_dpdk/ping-pong.py b/src/components/implementation/tests/bench_dpdk/ping-pong.py
new file mode 100644
index 0000000000..9fa5cbdb53
--- /dev/null
+++ b/src/components/implementation/tests/bench_dpdk/ping-pong.py
@@ -0,0 +1,31 @@
+#!/usr/bin/python3
+
+from scapy.all import *
+import time
+import _thread
+import os
+import signal
+
+def show_packet(packet):
+	print ('Test Success!')
+	os.kill(os.getpid(), signal.SIGTERM)
+
+def send_pkt():
+	sent_pkt = Ether(dst='66:66:66:66:66:66')/IP(src='10.10.1.1', dst='10.10.1.2')/ICMP()
+	sendp(sent_pkt,iface='tap0',filter='inbound and ether dst 66:66:66:66:66:66')
+
+def dump_packet():
+	rx = sniff(iface='tap0', prn=show_packet, timeout=5)
+	npackets = len(rx)
+	if npackets == 0 :
+		print ('Test Fail!')
+		os.kill(os.getpid(), signal.SIGTERM)
+try:
+	_thread.start_new_thread(dump_packet, ())
+	time.sleep(2)
+	_thread.start_new_thread(send_pkt, ())
+except:
+	print ("Error: failed to start packet thread!")
+
+while 1:
+	pass
diff --git a/src/components/implementation/tests/bench_dpdk/traffic_template.trafgen b/src/components/implementation/tests/bench_dpdk/traffic_template.trafgen
new file mode 100644
index 0000000000..fed7378c05
--- /dev/null
+++ b/src/components/implementation/tests/bench_dpdk/traffic_template.trafgen
@@ -0,0 +1,59 @@
+#define ETH_P_IP    0x0800
+
+#define SYN     (1 << 1)
+#define ACK     (1 << 4)
+#define ECN     (1 << 6)
+
+{
+  /* --- Ethernet Header --- */
+  /* NEED ADJUST */
+  0x66, 0x66, 0x66, 0x66, 0x66, 0x66, # MAC Destination
+  0x22, 0x22, 0x22, 0x22, 0x22, 0x22, # MAC Source
+  
+  const16(ETH_P_IP),
+  /* IPv4 Version, IHL, TOS */
+  0b01000101, 0,
+  /* IPv4 Total Len */
+  const16(46),
+  /* IPv4 Ident */
+  //drnd(2),
+  const16(2),
+
+  /* IPv4 Flags, Frag Off */
+  0b01000000, 0,
+  /* IPv4 TTL */
+  64,
+  /* Proto TCP */
+  0x06,
+  /* IPv4 Checksum (IP header from, to) */
+  csumip(14, 33),
+
+  /* NEED ADJUST */
+  // 10, 10, 88, drnd(1), # Source IP
+  10, 10, 88, 171,  # Source IP
+  10, 10, 88, 172, # Dest IP
+
+  /* TCP Source Port */
+  8080,
+  /* TCP Dest Port */
+  const16(80),
+  /* TCP Sequence Number */
+  1,
+  /* TCP Ackn. Number */
+  const32(0), /* NOTICE ACK==zero with SYN packets */
+
+  /* TCP Header length + Flags */
+  //const16((0x5 << 12) | SYN | ECN)  /* TCP SYN+ECN Flag */
+  //const16((0x5 << 12) | SYN | ACK)  /* TCP SYN+ACK Flag */
+  const16((0x5 << 12) | SYN)      /* TCP SYN Flag */
+  //const16((0x5 << 12) | ACK)        /* TCP ACK Flag */
+
+  /* Window Size */
+  const16(16),
+  /* TCP Checksum (offset IP, offset TCP) */
+  csumtcp(14, 34),
+  const16(0), /*PAD*/
+  
+  /* Data */
+  "Hello"
+}
diff --git a/src/components/implementation/tests/bench_lock/Makefile b/src/components/implementation/tests/bench_lock/Makefile
new file mode 100644
index 0000000000..867a138cbb
--- /dev/null
+++ b/src/components/implementation/tests/bench_lock/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = sched
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component crt ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_lock/bench_lock.c b/src/components/implementation/tests/bench_lock/bench_lock.c
new file mode 100644
index 0000000000..7e2b54dab7
--- /dev/null
+++ b/src/components/implementation/tests/bench_lock/bench_lock.c
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2016, Runyu Pan and Gabriel Parmer, GWU, gparmer@gwu.edu.
+ *
+ * This uses a two clause BSD License.
+ */
+
+#include <llprint.h>
+#include <sched.h>
+
+#include <crt_lock.h>
+#include <perfdata.h>
+
+#undef LOCK_TRACE_DEBUG
+#ifdef LOCK_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+/* One low-priority thread and one high-priority thread contends on the lock */
+#define ITERATION 10000
+#define PRINT_ALL
+
+struct crt_lock lock;
+thdid_t lock_hi = 0, lock_lo = 0;
+volatile int flag = 0;
+
+volatile cycles_t start;
+volatile cycles_t end;
+
+struct perfdata perf;
+cycles_t result[ITERATION] = {0, };
+
+/***
+ * The high priority thread periodically challenges the lock while the low priority thread keeps spinning.
+ * When the low-priority thread detects that the flag is changed, it knows that the lock is challenged.
+ * Execution: hi take -> lo release -> hi release, there is 1 contended take, 1 release, and 2 ctxsws. 
+ */
+void
+lock_hi_thd(void *d)
+{
+	/* Never stops running; low priority controls how many iters to run. */
+	while (1) {
+		debug("h1,");
+		sched_thd_block(0);
+		sched_thd_block_timeout(0, time_now() + time_usec2cyc(1000));
+		
+		debug("h2,");
+		flag = 1;
+		start = time_now();
+		crt_lock_take(&lock);
+		crt_lock_release(&lock);
+
+		end = time_now();
+		debug("h3,");
+	}
+}
+
+void
+lock_lo_thd(void *d)
+{
+	int i;
+	int first = 0;
+
+	for (i = 0; i < ITERATION + 1; i++) {
+		debug("l1,");
+		sched_thd_wakeup(lock_hi);
+
+		debug("l2,");
+		flag = 0;
+		crt_lock_take(&lock);
+		
+		debug("l3,");
+		while (flag != 1) {}
+		crt_lock_release(&lock);
+		
+		if (first == 0) first = 1;
+		else perfdata_add(&perf, end - start);
+		debug("l4,");
+	}
+	
+	perfdata_calc(&perf);
+#ifdef PRINT_ALL
+	perfdata_all(&perf);
+#else
+	perfdata_print(&perf);
+#endif
+
+	while (1) ;
+}
+
+void
+test_lock(void)
+{
+	int i;
+	int first = 0;
+	
+	sched_param_t sps[] = {
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 4),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6)
+	};
+
+	crt_lock_init(&lock);
+	
+	/* Uncontended lock taking/releasing */
+	perfdata_init(&perf, "Uncontended lock - take+release", result, ITERATION);
+	for (i = 0; i < ITERATION + 1; i++) {
+		start = time_now();
+
+		crt_lock_take(&lock);
+		crt_lock_release(&lock);
+
+		end = time_now();
+		if (first == 0) first = 1;
+		else perfdata_add(&perf, end - start);
+	}
+	perfdata_calc(&perf);
+#ifdef PRINT_ALL
+	perfdata_all(&perf);
+#else
+	perfdata_print(&perf);
+#endif
+
+	perfdata_init(&perf, "Contended lock - take+release", result, ITERATION);
+	
+	printc("Create threads:\n");
+	
+	lock_lo = sched_thd_create(lock_lo_thd, NULL);
+	printc("\tcreating lo thread %lu at prio %d\n", lock_lo, sps[1]);
+	sched_thd_param_set(lock_lo, sps[1]);
+	
+	lock_hi = sched_thd_create(lock_hi_thd, NULL);
+	printc("\tcreating hi thread %lu at prio %d\n", lock_hi, sps[0]);
+	sched_thd_param_set(lock_hi, sps[0]);
+	
+	
+}
+
+void
+cos_init(void)
+{
+	printc("Benchmark for the crt_lock (w/sched interface).\n");
+}
+
+int
+main(void)
+{
+	test_lock();
+
+	printc("Running benchmark, exiting main thread...\n");
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/bench_sched_yield/Makefile b/src/components/implementation/tests/bench_sched_yield/Makefile
new file mode 100644
index 0000000000..aa8ff2ba23
--- /dev/null
+++ b/src/components/implementation/tests/bench_sched_yield/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = sched
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_sched_yield/bench_sched_yield.c b/src/components/implementation/tests/bench_sched_yield/bench_sched_yield.c
new file mode 100644
index 0000000000..94adc5d943
--- /dev/null
+++ b/src/components/implementation/tests/bench_sched_yield/bench_sched_yield.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2016, Runyu Pan and Gabriel Parmer, GWU, gparmer@gwu.edu.
+ *
+ * This uses a two clause BSD License.
+ */
+
+#include <llprint.h>
+#include <sched.h>
+#include <perfdata.h>
+
+#undef YIELD_TRACE_DEBUG
+#ifdef YIELD_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+/* lo and hi is actually running at the same prio */
+#define ITERATION 10000
+/* #define PRINT_ALL */
+
+thdid_t yield_hi = 0, yield_lo = 0;
+volatile cycles_t start;
+volatile cycles_t end;
+
+struct perfdata perf;
+cycles_t result[ITERATION] = {0, };
+
+/***
+ * We're measuring 2-way context switch time. 
+ */
+void
+yield_hi_thd(void *d)
+{
+	/* Never stops running; low priority controls how many iters to run. */
+	while (1) {
+		debug("h1,");
+		sched_thd_yield_to(yield_lo);
+		debug("h2,");
+	}
+}
+
+void
+yield_lo_thd(void *d)
+{
+	int i;
+	int first = 0;
+
+	for (i = 0; i < ITERATION + 1; i++) {
+		debug("l1,");
+
+		start = time_now();
+		sched_thd_yield_to(yield_hi);
+		end = time_now();
+
+		debug("l2,");
+		
+		if (first == 0) first = 1;
+		else perfdata_add(&perf, end - start);
+	}
+	
+	perfdata_calc(&perf);
+#ifdef PRINT_ALL
+	perfdata_all(&perf);
+#else
+	perfdata_print(&perf);
+#endif
+
+	while (1) ;
+}
+
+void
+test_yield(void)
+{	
+	sched_param_t sps[] = {
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6)
+	};
+
+	perfdata_init(&perf, "Context switch time", result, ITERATION);
+	
+	printc("Create threads:\n");
+	
+	yield_lo = sched_thd_create(yield_lo_thd, NULL);
+	printc("\tcreating lo thread %ld at prio %d\n", yield_lo, sps[1]);
+	sched_thd_param_set(yield_lo, sps[1]);
+	
+	yield_hi = sched_thd_create(yield_hi_thd, NULL);
+	printc("\tcreating hi thread %ld at prio %d\n", yield_hi, sps[0]);
+	sched_thd_param_set(yield_hi, sps[0]);
+}
+
+void
+cos_init(void)
+{
+	printc("Benchmark for the sched_thd_yield (w/sched interface).\n");
+}
+
+int
+main(void)
+{
+	test_yield();
+
+	printc("Running benchmark, exiting main thread...\n");
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/bench_sem/Makefile b/src/components/implementation/tests/bench_sem/Makefile
new file mode 100644
index 0000000000..867a138cbb
--- /dev/null
+++ b/src/components/implementation/tests/bench_sem/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = sched
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component crt ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_sem/bench_sem.c b/src/components/implementation/tests/bench_sem/bench_sem.c
new file mode 100644
index 0000000000..f10462ee8a
--- /dev/null
+++ b/src/components/implementation/tests/bench_sem/bench_sem.c
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2016, Runyu Pan and Gabriel Parmer, GWU, gparmer@gwu.edu.
+ *
+ * This uses a two clause BSD License.
+ */
+
+#include <llprint.h>
+#include <sched.h>
+
+#include <crt_sem.h>
+#include <perfdata.h>
+
+#undef SEM_TRACE_DEBUG
+#ifdef SEM_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+/* One low-priority thread and one high-priority thread contends on the semaphore */
+#define ITERATION 10000
+#define PRINT_ALL
+
+struct crt_sem sem;
+thdid_t sem_hi = 0, sem_lo = 0;
+volatile int flag = 0;
+
+volatile cycles_t start;
+volatile cycles_t end;
+
+struct perfdata perf;
+cycles_t result[ITERATION] = {0, };
+
+/***
+ * The high priority thread periodically challenges the sem while the low priority thread keeps spinning.
+ * When the low-priority thread detects that the flag is changed, it knows that the sem is challenged.
+ * Execution: hi take -> lo release -> hi release, there is 1 contended take, 1 give, and 2 ctxsws. 
+ */
+void
+sem_hi_thd(void *d)
+{
+	/* Never stops running; low priority controls how many iters to run. */
+	while (1) {
+		debug("h1");
+		sched_thd_block(0);
+		sched_thd_block_timeout(0, time_now() + time_usec2cyc(1000));
+		
+		debug("h2");
+		flag = 1;
+		start = time_now();
+		
+		crt_sem_take(&sem);
+		crt_sem_give(&sem);
+
+		end = time_now();
+		debug("h3");
+	}
+}
+
+void
+sem_lo_thd(void *d)
+{
+	int i;
+	int first = 0;
+
+	for (i = 0; i < ITERATION + 1; i++) {
+		debug("l1");
+		sched_thd_wakeup(sem_hi);
+
+		debug("l2");
+		flag = 0;
+		crt_sem_take(&sem);
+		
+		debug("l3");
+		while (flag != 1) {}
+		
+		crt_sem_give(&sem);
+		
+		if (first == 0) first = 1;
+		else perfdata_add(&perf, end - start);
+		debug("l4");
+	}
+	
+	perfdata_calc(&perf);
+#ifdef PRINT_ALL
+	perfdata_all(&perf);
+#else
+	perfdata_print(&perf);
+#endif
+
+	while (1) ;
+}
+
+void
+test_sem(void)
+{
+	int i;
+	int first = 0;
+	cycles_t start, end;
+	
+	sched_param_t sps[] = {
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 4),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6)
+	};
+
+	crt_sem_init(&sem, 1);
+	
+	/* Uncontended semaphore taking/releasing */
+	perfdata_init(&perf, "Uncontended semaphore - take+give", result, ITERATION);
+	for (i = 0; i < ITERATION + 1; i++) {
+		start = time_now();
+		
+		crt_sem_take(&sem);
+		crt_sem_give(&sem);
+
+		end = time_now();
+		if (first == 0) first = 1;
+		else perfdata_add(&perf, end - start);
+	}
+	perfdata_calc(&perf);
+#ifdef PRINT_ALL
+	perfdata_all(&perf);
+#else
+	perfdata_print(&perf);
+#endif
+
+	perfdata_init(&perf, "Contended semaphore - take+give", result, ITERATION);
+	
+	printc("Create threads:\n");
+	
+	sem_lo = sched_thd_create(sem_lo_thd, NULL);
+	printc("\tcreating lo thread %ld at prio %d\n", sem_lo, sps[1]);
+	sched_thd_param_set(sem_lo, sps[1]);
+	
+	sem_hi = sched_thd_create(sem_hi_thd, NULL);
+	printc("\tcreating hi thread %ld at prio %d\n", sem_hi, sps[0]);
+	sched_thd_param_set(sem_hi, sps[0]);
+}
+
+void
+cos_init(void)
+{
+	printc("Benchmark for the crt_sem (w/sched interface).\n");
+}
+
+int
+main(void)
+{
+	test_sem();
+
+	printc("Running benchmark, exiting main thread...\n");
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/bench_sl_yield/Makefile b/src/components/implementation/tests/bench_sl_yield/Makefile
new file mode 100644
index 0000000000..6069e8b10f
--- /dev/null
+++ b/src/components/implementation/tests/bench_sl_yield/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES =
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = kernel sl sl_kernel component ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_sl_yield/bench_sl_yield.c b/src/components/implementation/tests/bench_sl_yield/bench_sl_yield.c
new file mode 100644
index 0000000000..75a27832bc
--- /dev/null
+++ b/src/components/implementation/tests/bench_sl_yield/bench_sl_yield.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2016, Phani Gadepalli, Runyu Pan and Gabriel Parmer, GWU, gparmer@gwu.edu.
+ *
+ * This uses a two clause BSD License.
+ */
+
+#include <cos_defkernel_api.h>
+#include <llprint.h>
+#include <res_spec.h>
+#include <sl.h>
+#include <perfdata.h>
+
+#undef YIELD_TRACE_DEBUG
+#ifdef YIELD_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+/* lo and hi is actually running at the same prio */
+#define ITERATION 10000
+/* #define PRINT_ALL */
+
+/* Ensure this is the same as what is in sl_mod_fprr.c */
+#define SL_FPRR_NPRIOS 32
+
+#define PRIORITY (SL_FPRR_NPRIOS - 5)
+#define HIGH_PRIORITY (SL_FPRR_NPRIOS - 6)
+#define LOW_PRIORITY (SL_FPRR_NPRIOS - 4)
+
+struct sl_thd *testing_thread;
+thdid_t thdid1, thdid2;
+
+volatile cycles_t start;
+volatile cycles_t end;
+
+struct perfdata perf;
+cycles_t result[ITERATION] = {0, };
+
+static void
+thd1_fn()
+{
+	/* Never stops running; low priority controls how many iters to run. */
+	while (1) {
+		debug("h1,");
+		sl_thd_yield(thdid2);
+		debug("h2,");
+	}
+}
+
+static void
+thd2_fn()
+{
+	int i;
+	int first = 0;
+
+	for (i = 0; i < ITERATION + 1; i++) {
+		debug("l1,");
+
+		start = time_now();
+		sl_thd_yield(thdid1);
+		end = time_now();
+
+		debug("l2,");
+		
+		if (first == 0) first = 1;
+		else perfdata_add(&perf, end - start);
+	}
+	
+	perfdata_calc(&perf);
+#ifdef PRINT_ALL
+	perfdata_all(&perf);
+#else
+	perfdata_print(&perf);
+#endif
+
+	while (1) ;
+}
+
+static void
+run_tests()
+{
+	struct sl_thd *thd1, *thd2;
+
+	thd1 = sl_thd_alloc(thd1_fn, NULL);
+	sl_thd_param_set(thd1, sched_param_pack(SCHEDP_PRIO, PRIORITY));
+	thdid1 = sl_thd_thdid(thd1);
+
+	thd2 = sl_thd_alloc(thd2_fn, NULL);
+	sl_thd_param_set(thd2, sched_param_pack(SCHEDP_PRIO, PRIORITY));
+	thdid2 = sl_thd_thdid(thd2);
+	
+	PRINTC("Thread creation done!\n");
+	perfdata_init(&perf, "Context switch time", result, ITERATION);
+
+	sl_thd_param_set(testing_thread, sched_param_pack(SCHEDP_PRIO, LOW_PRIORITY));
+	PRINTC("Lowering priority...\n");
+	while(1);
+}
+
+void
+cos_init(void)
+{
+	struct cos_defcompinfo *defci = cos_defcompinfo_curr_get();
+	struct cos_compinfo    *ci    = cos_compinfo_get(defci);
+
+	PRINTC("Thread switch benchmark for the scheduling library (sl)\n");
+	cos_meminfo_init(&(ci->mi), BOOT_MEM_KM_BASE, COS_MEM_KERN_PA_SZ, BOOT_CAPTBL_SELF_UNTYPED_PT);
+	cos_defcompinfo_init();
+
+	sl_init(SL_MIN_PERIOD_US);
+
+	testing_thread = sl_thd_alloc(run_tests, NULL);
+	sl_thd_param_set(testing_thread, sched_param_pack(SCHEDP_PRIO, HIGH_PRIORITY));
+	
+	PRINTC("Now running sl\n");
+
+	sl_sched_loop();
+
+	assert(0);
+
+	return;
+}
diff --git a/src/components/implementation/tests/bench_tmr/Makefile b/src/components/implementation/tests/bench_tmr/Makefile
new file mode 100644
index 0000000000..ec47058108
--- /dev/null
+++ b/src/components/implementation/tests/bench_tmr/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = tmrmgr evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component ps tmr ubench
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/bench_tmr/bench_tmr.c b/src/components/implementation/tests/bench_tmr/bench_tmr.c
new file mode 100644
index 0000000000..cfbacc251e
--- /dev/null
+++ b/src/components/implementation/tests/bench_tmr/bench_tmr.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2016, Runyu Pan and Gabriel Parmer, GWU, gparmer@gwu.edu.
+ *
+ * This uses a two clause BSD License.
+ */
+
+#include <llprint.h>
+#include <sched.h>
+
+#include <evt.h>
+#include <tmr.h>
+#include <perfdata.h>
+
+#undef TMR_TRACE_DEBUG
+#ifdef TMR_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+/* High-priority thread interrupts the low-priority thread by timer ticks */
+#define ITERATION		10000
+#define TMR_PERIODIC_TIME	10000
+/* #define DROP_THRESHOLD		0x1000000U */
+
+#define PRINT_ALL
+
+thdid_t tmr_hi = 0, tmr_lo = 0;
+
+typedef unsigned int cycles_32_t;
+volatile cycles_32_t start;
+volatile cycles_32_t end;
+
+struct perfdata perf;
+cycles_t result[ITERATION] = {0, };
+
+/***
+ * The high priority thread sets up a periodic timer while the low priority thread keeps looping and updating
+ * the timing value variable. The variable is a 32-bit one so that it can be updated atomically. We always
+ * drop values larger than DROP_THRESHOLD (clearly impossible; appears due to counter overflow).
+ */
+void
+tmr_hi_thd(void *d)
+{
+	int i;
+	struct tmr t;
+	struct evt e;
+	evt_res_id_t evt_id;
+	evt_res_data_t evtdata;
+	evt_res_type_t  evtsrc;
+	int first = 0;
+	
+	printc("Call into timer manager to make a timer.\n");
+	assert(tmr_init(&t, TMR_PERIODIC_TIME, TMR_PERIODIC) == 0);
+
+	printc("Call into event manager to make a event.\n");
+	assert(evt_init(&e, 2) == 0);
+	
+	/*
+	 * Add the timer event to the event set, the associate the timer with that event ID so
+	 * the timer manager knows which event to trigger when the timer expires. 
+	 */
+	evt_id = evt_add(&e, 1, (evt_res_data_t)&t);
+	assert(evt_id !=0);
+	assert(tmr_evt_associate(&t, evt_id) == 0);
+	
+	/* Start the timer */
+	assert(tmr_start(&t) == 0);
+
+	/* Event loop */
+	i = 0;
+ 	while (i < ITERATION + 1) {
+		evt_get(&e, EVT_WAIT_DEFAULT, &evtsrc, &evtdata);
+		end = (cycles_32_t)time_now();
+
+		/* Drop not used; we're dealing with unsigned ints */
+		/* if ((end - start) > DROP_THRESHOLD) continue; */
+		
+		if (first == 0) first = 1;
+		else perfdata_add(&perf, end - start);
+		debug("%lld.\n", end - start);
+		
+		i++;
+	}
+
+	perfdata_calc(&perf);
+#ifdef PRINT_ALL
+	perfdata_all(&perf);
+#else
+	perfdata_print(&perf);
+#endif
+
+	while (1) ;
+}
+
+void
+tmr_lo_thd(void *d)
+{
+	/* Runs indefinitely */
+	while (1) {
+		start = (cycles_32_t)time_now();
+	}
+}
+
+void
+test_tmr(void)
+{
+	int i;
+	
+	sched_param_t sps[] = {
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 4),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6)
+	};
+	
+	
+	perfdata_init(&perf, "Timer latency - total", result, ITERATION);
+
+	printc("Create threads:\n");
+	
+	tmr_lo = sched_thd_create(tmr_lo_thd, NULL);
+	printc("\tcreating lo thread %ld at prio %d\n", tmr_lo, sps[1]);
+	sched_thd_param_set(tmr_lo, sps[1]);
+	
+	tmr_hi = sched_thd_create(tmr_hi_thd, NULL);
+	printc("\tcreating hi thread %ld at prio %d\n", tmr_hi, sps[0]);
+	sched_thd_param_set(tmr_hi, sps[0]);
+}
+
+void
+cos_init(void)
+{
+	printc("Benchmark for the tmrmgr (w/sched & evt interface).\n");
+}
+
+int
+main(void)
+{
+	test_tmr();
+
+	printc("Running benchmark, exiting main thread...\n");
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/chan_evt/Makefile b/src/components/implementation/tests/chan_evt/Makefile
new file mode 100644
index 0000000000..c825cfcf30
--- /dev/null
+++ b/src/components/implementation/tests/chan_evt/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = chanmgr
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component chan ps
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/chan_evt/chan_evt.c b/src/components/implementation/tests/chan_evt/chan_evt.c
new file mode 100644
index 0000000000..faac00dac5
--- /dev/null
+++ b/src/components/implementation/tests/chan_evt/chan_evt.c
@@ -0,0 +1,163 @@
+#include <cos_component.h>
+#include <llprint.h>
+#include <chan.h>
+#include <ps.h>
+
+/***
+ * There will be three threads. Only one is a receiver, and two will be senders. The receiver have a
+ * higher priority, and all senders have a low priority. The senders will compete and send data two
+ * their corresponding channels a fixed number. The receiver receives on the event and detects whatever
+ * the data is.
+ */
+
+#define COMM_AMNT       (10000)
+#define SEND_THD_NUM    (4)
+
+
+struct chan_test
+{
+	int idx;
+	thdid_t s_id;
+	evt_res_id_t evt_id;
+	struct chan c;
+	struct chan_snd s;
+	struct chan_rcv r;
+};
+
+struct chan_test test[SEND_THD_NUM];
+thdid_t init_thd;
+thdid_t r_id;
+struct evt e;
+
+void
+sender(void *d)
+{
+	int i;
+	word_t idx;
+	
+	idx = (word_t)d;
+
+	for (i = 0; i < COMM_AMNT; i++) {
+		thdid_t tid = cos_thdid();
+		assert(tid == test[idx].s_id);
+
+		/* Send to our TID to our own respective channels */
+		if (chan_send(&(test[idx].s), &tid, 0)) {
+			printc("chan_send error\n");
+			assert(0);
+		}
+	}
+
+	printc("Sender %lu finished\n", idx);
+	sched_thd_block(0);
+	assert(0);
+}
+
+void
+receiver(void *d)
+{
+	int i;
+
+	for (i = 0; i < COMM_AMNT*SEND_THD_NUM; i++) {
+		thdid_t snd;
+		evt_res_data_t evtdata;
+		evt_res_type_t  evtsrc;
+		struct chan_rcv *r;
+		
+		/* Receive from the events */
+		if (evt_get(&e, EVT_WAIT_DEFAULT, &evtsrc, &evtdata))  {
+			printc("evt_get error\n");
+			assert(0);
+		}
+
+		/* Then the channel */
+		r = (struct chan_rcv*)evtdata;
+		if (chan_recv(r, &snd, CHAN_NONBLOCKING)) {
+			printc("chan_recv error\n");
+			assert(0);
+		}
+
+		/* Must be equal or we messed up something */
+		if (test[evtsrc].s_id != snd)  {
+			printc("chan_recv value error - recv %lu, should be %lu\n", snd, test[evtsrc].s_id);
+			assert(0);
+		}
+	}
+
+	printc("Receiver finished\n");
+
+	sched_thd_wakeup(init_thd);
+	sched_thd_block(0);
+	assert(0);
+}
+
+int
+main(void)
+{	
+	/* Create channels */
+	for (int i = 0; i < SEND_THD_NUM; i++) {
+		test[i].idx = i;
+		
+		if (chan_init(&(test[i].c), sizeof(thdid_t), 16, CHAN_DEFAULT)) {
+			printc("chan_init failure %d.\n", i);
+			assert(0);
+		}
+
+		if (chan_snd_init(&(test[i].s), (struct chan *)&(test[i].c))) {
+			printc("chan_snd_init failure %d.\n", i);
+			assert(0);
+		}
+
+		if (chan_rcv_init(&(test[i].r), (struct chan *)&(test[i].c))) {
+			printc("chan_rcv_init failure %d.\n", i);
+			assert(0);
+		}
+	}
+
+	printc("Chan tests: created channel, send/receive end-points. Proceeding with child thread creation.\n");
+	
+	/* Create threads */
+	init_thd = cos_thdid();
+	r_id = sched_thd_create(receiver, NULL);
+	if (r_id == 0) {
+		printc("sched_thd_create error.\n");
+		assert(0);
+	}
+	
+	for (word_t i = 0; i < SEND_THD_NUM; i++) {
+		thdid_t s_id = sched_thd_create(sender, (void*)i);
+
+		if (s_id == 0) {
+			printc("sched_thd_create error.\n");
+			assert(0);
+		}
+
+		test[i].s_id = s_id;
+
+		if (sched_thd_param_set(s_id, sched_param_pack(SCHEDP_PRIO, 5))) {
+			printc("sched_thd_param_set failed.\n");
+			assert(0);
+		}
+	}
+	
+	if (sched_thd_param_set(r_id, sched_param_pack(SCHEDP_PRIO, 4))) {
+		printc("sched_thd_param_set failed.\n");
+		assert(0);
+	}
+	
+	/* Bind all to an event */
+	printc("Chan tests: created child threads. Proceeding with event creation.\n");
+	assert(evt_init(&e, SEND_THD_NUM) == 0);
+	
+	for (int i = 0; i < SEND_THD_NUM; i++) {
+		test[i].evt_id = evt_add(&e, i, (evt_res_data_t)&(test[i].r));
+		assert(test[i].evt_id != 0);
+		assert(chan_evt_associate(&(test[i].c), test[i].evt_id) == 0);
+	}
+	
+	printc("Chan tests: created child threads. Proceeding with tests.\n");
+	sched_thd_block(0);
+	printc("Chan evt test: SUCCESS.\n");
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/chan_evt/doc.md b/src/components/implementation/tests/chan_evt/doc.md
new file mode 100644
index 0000000000..6c48740e7f
--- /dev/null
+++ b/src/components/implementation/tests/chan_evt/doc.md
@@ -0,0 +1,7 @@
+## tests
+
+Channel tests mixed with the event manager.
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/implementation/tests/chan_hi/chan1.c b/src/components/implementation/tests/chan_hi/chan1.c
index b1713428a1..2208e78b13 100644
--- a/src/components/implementation/tests/chan_hi/chan1.c
+++ b/src/components/implementation/tests/chan_hi/chan1.c
@@ -8,12 +8,40 @@ struct chan_rcv r;
 
 #define COMM_AMNT (2^10 * 16)
 
+/*
+ * the Receiver and sender tests could run at different times,
+ * causing the numbers to blow up! 
+ *
+ * Another issue is, when the high priority thread here is printing,
+ * the test on the low prio side is not done yet!
+ *
+ * So, this routine syncs up between chan_hi and chan_lo wherever required!
+ * Because this (chan_hi) is high priority thread, send first and wait on rcv!
+ * The chan_lo would receive first and then send, that should immediately switch over to here!
+ */
+void
+rendezvous(void)
+{
+	ps_tsc_t rcv = 0, snd = 0;
+	snd = ps_tsc();
+	if (chan_send(&s, &snd, 0)) {
+		printc("chan_send error\n");
+		assert(0);
+	}
+
+	if (chan_recv(&r, &rcv, 0)) {
+		printc("chan_recv error\n");
+		assert(0);
+	}
+}
+
 void
 receiver(void)
 {
 	int i;
 	ps_tsc_t tot = 0;
 
+	rendezvous();
 	for (i = 0; i < COMM_AMNT; i++) {
 		ps_tsc_t now, snd;
 
@@ -32,7 +60,7 @@ void
 ipc(void)
 {
 	int i;
-	ps_tsc_t rcv = 0, prev_rcv, snd = 0, tmp;
+	ps_tsc_t rcv = 0, prev_rcv = 0, snd = 0, tmp;
 	ps_tsc_t rcvcost = 0, sendcost = 0, rtt = 0, l2h = 0;
 
 	for (i = 0; i < COMM_AMNT; i++) {
@@ -50,12 +78,14 @@ ipc(void)
 		l2h += rcv - tmp;
 
 		rcvcost += rcv - snd;
-		rtt     += rcv - prev_rcv;
+		if (prev_rcv != 0) rtt += rcv - prev_rcv;
 		if (chan_send(&s, &rcv, 0)) {
 			printc("chan_send error\n");
 			assert(0);
 		}
 	}
+	/* Sync up here before printing. Chan_lo is *very likely* not done with its measurements yet! */
+	rendezvous();
 
 	printc("Thread with high priority (4):\n\trcv  %lld\n\tsend %lld\n\trtt  %lld\n\tlow->high %lld\n",
 	       rcvcost/COMM_AMNT, sendcost/COMM_AMNT, rtt/COMM_AMNT, l2h/COMM_AMNT);
@@ -64,29 +94,50 @@ ipc(void)
 int
 main(void)
 {
+	cycles_t wakeup;
+
 	printc("Component chan hi: executing main.\n");
+
+	/* 
+	 * This sleep in both hi and lo comps lets the benchmark run
+	 * more predictably on HW and on Qemu.
+	 *
+	 * Likely because this helps the priority change in cos_init take effect!
+	 * Or because this lets the initialization of both ends of channels complete before tests start!
+	 */
+	wakeup = time_now() + time_usec2cyc(10 * 1000);
+	sched_thd_block_timeout(0, wakeup);
+
 	receiver();
 	ipc();
 
 	return 0;
 }
 
+#define TEST_CHAN_ITEM_SZ   sizeof(u64_t)
+#define TEST_CHAN_NSLOTS    128
+#define TEST_CHAN_SEND_ID   1
+#define TEST_CHAN_RECV_ID   2
+#define TEST_CHAN_PRIO_SELF 4 /* chan_hi == high priority */
+
 void
 cos_init(void)
 {
-	printc("Component chan hi initializing:\n\tCreate channel 1\n");
-	if (chan_snd_init_with(&s, 1, sizeof(u64_t), 128, CHAN_DEFAULT)) {
+	memset(&s, 0, sizeof(struct chan_snd));
+	memset(&r, 0, sizeof(struct chan_rcv));
+	printc("Component chan hi initializing:\n\tCreate channel %d\n", TEST_CHAN_SEND_ID);
+	if (chan_snd_init_with(&s, TEST_CHAN_SEND_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
 		printc("Chan test 1 (%ld): Could not initialize send.\n", cos_compid());
 		BUG();
 	}
-	printc("\tCreate channel 2\n");
-	if (chan_rcv_init_with(&r, 2, sizeof(u64_t), 128, CHAN_DEFAULT)) {
+	printc("\tCreate channel %d\n", TEST_CHAN_RECV_ID);
+	if (chan_rcv_init_with(&r, TEST_CHAN_RECV_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
 		printc("Chan test 1 (%ld): Could not initialize recv.\n", cos_compid());
 		BUG();
 	}
 
-	printc("\tCreate channel 2\n");
-	if (sched_thd_param_set(cos_thdid(), sched_param_pack(SCHEDP_PRIO, 4))) {
+	printc("\tPriority %d for self!\n", TEST_CHAN_PRIO_SELF);
+	if (sched_thd_param_set(cos_thdid(), sched_param_pack(SCHEDP_PRIO, TEST_CHAN_PRIO_SELF))) {
 		printc("sched_thd_param_set failed.\n");
 		assert(0);
 	}
diff --git a/src/components/implementation/tests/chan_lo/chan2.c b/src/components/implementation/tests/chan_lo/chan2.c
index 0ba44977cb..1bfc56e227 100644
--- a/src/components/implementation/tests/chan_lo/chan2.c
+++ b/src/components/implementation/tests/chan_lo/chan2.c
@@ -8,11 +8,32 @@ struct chan_rcv r;
 
 #define COMM_AMNT (2^10 * 16)
 
+/*
+ * Sync up chan_hi and chan_lo for benchmarks! 
+ * Because this is chan_lo, recv first, and when it wakes up from rcv, send which immediately should yield to chan_hi
+ */
+void
+rendezvous(void)
+{
+	ps_tsc_t rcv = 0, snd = 0;
+	if (chan_recv(&r, &rcv, 0)) {
+		printc("chan_recv error\n");
+		assert(0);
+	}
+
+	snd = ps_tsc();
+	if (chan_send(&s, &snd, 0)) {
+		printc("chan_send error\n");
+		assert(0);
+	}
+}
+
 void
 sender(void)
 {
 	int i;
 
+	rendezvous();
 	for (i = 0; i < COMM_AMNT; i++) {
 		ps_tsc_t tsc = ps_tsc();
 
@@ -52,6 +73,8 @@ ipc(void)
 			assert(0);
 		}
 	}
+	/* Sync up with chan_hi here..*/
+	rendezvous();
 
 	printc("Thread with low priority (5):\n\trcv  %lld\n\tsend %lld\n\trtt  %lld\n\thigh->low %lld\n",
 	       rcvcost/COMM_AMNT, sendcost/COMM_AMNT, rtt/COMM_AMNT, h2l/COMM_AMNT);
@@ -60,27 +83,51 @@ ipc(void)
 int
 main(void)
 {
+	cycles_t wakeup;
+
+	printc("Component chan lo: executing main.\n");
+
+	/* 
+	 * This sleep in both hi and lo comps lets the benchmark run
+	 * more predictably on HW and on Qemu.
+	 *
+	 * Likely because this helps the priority change in cos_init take effect!
+	 * Or because this lets the initialization of both ends of channels complete before tests start!
+	 */
+	wakeup = time_now() + time_usec2cyc(10 * 1000);
+	sched_thd_block_timeout(0, wakeup);
+
 	sender();
 	ipc();
 
 	return 0;
 }
 
+#define TEST_CHAN_ITEM_SZ   sizeof(u64_t)
+#define TEST_CHAN_NSLOTS    128
+#define TEST_CHAN_SEND_ID   2
+#define TEST_CHAN_RECV_ID   1
+#define TEST_CHAN_PRIO_SELF 5 /* chan_lo == low priority */
+
 void
 cos_init(void)
 {
-	if (chan_snd_init_with(&s, 2, sizeof(u64_t), 128, CHAN_DEFAULT)) {
+	memset(&s, 0, sizeof(struct chan_snd));
+	memset(&r, 0, sizeof(struct chan_rcv));
+	printc("Component chan lo initializing:\n\tJoin channel %d\n", TEST_CHAN_SEND_ID);
+	if (chan_snd_init_with(&s, TEST_CHAN_SEND_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
 		printc("Chan test 2 (%ld): Could not initialize send.\n", cos_compid());
 		BUG();
 	}
-	if (chan_rcv_init_with(&r, 1, sizeof(u64_t), 128, CHAN_DEFAULT)) {
+	printc("\tJoin channel %d\n", TEST_CHAN_RECV_ID);
+	if (chan_rcv_init_with(&r, TEST_CHAN_RECV_ID, TEST_CHAN_ITEM_SZ, TEST_CHAN_NSLOTS, CHAN_DEFAULT)) {
 		printc("Chan test 2 (%ld): Could not initialize recv.\n", cos_compid());
 		BUG();
 	}
 
-	if (sched_thd_param_set(cos_thdid(), sched_param_pack(SCHEDP_PRIO, 5))) {
+	printc("\tPriority %d for self!\n", TEST_CHAN_PRIO_SELF);
+	if (sched_thd_param_set(cos_thdid(), sched_param_pack(SCHEDP_PRIO, TEST_CHAN_PRIO_SELF))) {
 		printc("sched_thd_param_set failed.\n");
 		BUG();
 	}
-
 }
diff --git a/src/components/implementation/tests/crt_tests/Makefile b/src/components/implementation/tests/crt_tests/Makefile
index a807d41848..bdcb5c3502 100644
--- a/src/components/implementation/tests/crt_tests/Makefile
+++ b/src/components/implementation/tests/crt_tests/Makefile
@@ -6,10 +6,10 @@
 INTERFACE_EXPORTS =
 # The interfaces this component is dependent on for compilation (this
 # is a list of directory names in interface/)
-INTERFACE_DEPENDENCIES =
+INTERFACE_DEPENDENCIES = sched
 # The library dependencies this component is reliant on for
 # compilation/linking (this is a list of directory names in lib/)
-LIBRARY_DEPENDENCIES = component crt sl
+LIBRARY_DEPENDENCIES = component crt
 # Note: Both the interface and library dependencies should be
 # *minimal*. That is to say that removing a dependency should cause
 # the build to fail. The build system does not validate this
diff --git a/src/components/implementation/tests/crt_tests/crttests.c b/src/components/implementation/tests/crt_tests/crttests.c
index d49add0262..de5efd2788 100644
--- a/src/components/implementation/tests/crt_tests/crttests.c
+++ b/src/components/implementation/tests/crt_tests/crttests.c
@@ -1,23 +1,24 @@
 /*
- * Copyright 2016, Phani Gadepalli and Gabriel Parmer, GWU, gparmer@gwu.edu.
+ * Copyright 2016, Phani Gadepalli, Runyu Pan and Gabriel Parmer, GWU, gparmer@gwu.edu.
  *
  * This uses a two clause BSD License.
+ * Care should be taken when running this: may not finish on an embedded board. 
+ * To finish, reduce iterations to 100.
  */
 
-#include <cos_component.h>
-#include <cos_defkernel_api.h>
 #include <llprint.h>
-#include <sl.h>
+#include <sched.h>
 
 #include <crt_lock.h>
+#include <crt_sem.h>
 #include <crt_static_chan.h>
 
-struct cos_compinfo *ci;
-
-#define CHAN_ITER  1000000
+#define CHAN_ITER  10000
 #define NCHANTHDS  5
 #define CHAN_BATCH 3
 
+#define SWITCH_TO sched_thd_yield_to
+
 CRT_STATIC_CHAN_STATIC_ALLOC(c0, int, 4);
 CRT_STATIC_CHAN_STATIC_ALLOC(c1, int, 4);
 CRT_STATIC_CHAN_STATIC_ALLOC(c2, int, 4);
@@ -26,7 +27,7 @@ CRT_STATIC_CHAN_STATIC_ALLOC(c4, int, 4);
 
 CRT_STATIC_CHAN_TYPE_PROTOTYPES(test, int, 4);
 struct crt_static_chan *chans[NCHANTHDS + 1];
-struct sl_thd  *chan_thds[NCHANTHDS] = {NULL, };
+thdid_t chan_thds[NCHANTHDS] = {0, };
 
 typedef enum { CHILLING = 0, RECVING, SENDING } actions_t;
 unsigned long status[NCHANTHDS];
@@ -76,7 +77,7 @@ chantest_recv(int thd_off, struct crt_static_chan *c)
 void
 chan_thd(void *d)
 {
-	int thd_off = (int)d;
+	int thd_off = (unsigned long)d;
 	struct crt_static_chan **chan_pair = &chans[thd_off];
 	int recv;
 	int i;
@@ -113,8 +114,8 @@ idle_thd(void *d)
 void
 test_chan(void)
 {
-	int i;
-	struct sl_thd *idle;
+	unsigned long i;
+	thdid_t idle;
 	sched_param_t idle_param = SCHED_PARAM_CONS(SCHEDP_PRIO, 10);
 
 	sched_param_t sps[] = {
@@ -139,30 +140,30 @@ test_chan(void)
 
 	printc("Create threads:\n");
 	for (i = 0; i < NCHANTHDS; i++) {
-		chan_thds[i] = sl_thd_alloc(chan_thd, (void *)i);
+		chan_thds[i] = sched_thd_create(chan_thd, (void *)i);
 		assert(chan_thds[i]);
 		sched_param_get(sps[i], NULL, &p);
-		printc("\tcreating thread %ld at prio %d\n", sl_thd_thdid(chan_thds[i]), p);
-		sl_thd_param_set(chan_thds[i], sps[i]);
+		printc("\tcreating thread %lu at prio %d\n", chan_thds[i], p);
+		sched_thd_param_set(chan_thds[i], sps[i]);
 	}
-	idle = sl_thd_alloc(idle_thd, NULL);
+	idle = sched_thd_create(idle_thd, NULL);
 	sched_param_get(idle_param, NULL, &p);
-	printc("\tcreating IDLE %ld at prio %d\n", sl_thd_thdid(idle), p);
-	sl_thd_param_set(idle, idle_param);
+	printc("\tcreating IDLE %lu at prio %d\n", idle, p);
+	sched_thd_param_set(idle, idle_param);
 
 }
 
-#define LOCK_ITER 1000000
+#define LOCK_ITER 10000
 #define NLOCKTHDS 4
 struct crt_lock lock;
-struct sl_thd  *lock_thds[NLOCKTHDS] = {NULL, };
-unsigned int    progress[NLOCKTHDS] = {0, };
+thdid_t lock_thds[NLOCKTHDS] = {0, };
+unsigned int lock_progress[NLOCKTHDS] = {0, };
 volatile thdid_t holder;
 
 thdid_t
-next_thd(void)
+next_lock_thd(void)
 {
-	return sl_thd_thdid(lock_thds[(unsigned int)(ps_tsc() % NLOCKTHDS)]);
+	return lock_thds[(unsigned int)(time_now() % NLOCKTHDS)];
 }
 
 void
@@ -171,35 +172,35 @@ lock_thd(void *d)
 	int i, cnt, me = -1;
 
 	for (i = 0; i < NLOCKTHDS; i++) {
-		if (sl_thd_thdid(lock_thds[i]) != cos_thdid()) continue;
+		if (lock_thds[i] != cos_thdid()) continue;
 
 		me = i;
 	}
 	assert(me != -1);
-
-	sl_thd_yield(sl_thd_thdid(lock_thds[1]));
+	
+	SWITCH_TO(lock_thds[1]);
 
 	for (i = 0; i < LOCK_ITER; i++) {
 		crt_lock_take(&lock);
 
-		progress[me]++;
+		lock_progress[me]++;
 		holder = cos_thdid();
-
-		sl_thd_yield(next_thd());
+	
+		SWITCH_TO(next_lock_thd());
 
 		if (holder != cos_thdid()) {
 			printc("FAILURE\n");
 			BUG();
 		}
 		crt_lock_release(&lock);
-		sl_thd_yield(next_thd());
+		SWITCH_TO(next_lock_thd());
 	}
 
 	for (i = 0; i < NLOCKTHDS; i++) {
 		if (i == me) continue;
 
-		if (progress[i] < LOCK_ITER) {
-			sl_thd_yield(sl_thd_thdid(lock_thds[i]));
+		if (lock_progress[i] < LOCK_ITER) {
+			SWITCH_TO(lock_thds[i]);
 		}
 	}
 
@@ -212,44 +213,113 @@ test_lock(void)
 {
 	int i;
 	sched_param_t sps[] = {
-		SCHED_PARAM_CONS(SCHEDP_PRIO, 5),
 		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
 		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
-		SCHED_PARAM_CONS(SCHEDP_PRIO, 7)
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6)
 	};
 
 	crt_lock_init(&lock);
 
 	printc("Create threads:\n");
 	for (i = 0; i < NLOCKTHDS; i++) {
-		lock_thds[i] = sl_thd_alloc(lock_thd, NULL);
-		printc("\tcreating thread %ld at prio %d\n", sl_thd_thdid(lock_thds[i]), sps[i]);
-		sl_thd_param_set(lock_thds[i], sps[i]);
+		lock_thds[i] = sched_thd_create(lock_thd, NULL);
+		printc("\tcreating thread %lu at prio %d\n", lock_thds[i], sps[i]);
+		sched_thd_param_set(lock_thds[i], sps[i]);
 	}
 }
 
+#define SEM_ITER 10000
+#define NSEMTHDS 4
+struct crt_sem sem;
+thdid_t sem_thds[NSEMTHDS] = {0, };
+unsigned int sem_progress[NSEMTHDS] = {0, };
+volatile thdid_t poster;
+
+thdid_t
+next_sem_thd(void)
+{
+	return sem_thds[(unsigned int)(time_now() % NSEMTHDS)];
+}
+
 void
-cos_init(void)
+sem_thd(void *d)
 {
-	struct cos_defcompinfo *defci = cos_defcompinfo_curr_get();
-	ci = cos_compinfo_get(defci);
+	int i, cnt, me = -1;
+
+	for (i = 0; i < NSEMTHDS; i++) {
+		if (sem_thds[i] != cos_thdid()) continue;
+
+		me = i;
+	}
+	assert(me != -1);
+
+	SWITCH_TO(sem_thds[1]);
+
+	for (i = 0; i < SEM_ITER; i++) {
+		crt_sem_take(&sem);
+
+		sem_progress[me]++;
+		poster = cos_thdid();
+
+		SWITCH_TO(next_sem_thd());
+
+		if (poster != cos_thdid()) {
+			printc("FAILURE\n");
+			BUG();
+		}
+		crt_sem_give(&sem);
+		SWITCH_TO(next_sem_thd());
+	}
 
-	printc("Unit-test for the crt (sl)\n");
-	cos_meminfo_init(&(ci->mi), BOOT_MEM_KM_BASE, COS_MEM_KERN_PA_SZ, BOOT_CAPTBL_SELF_UNTYPED_PT);
-	cos_defcompinfo_init();
-	sl_init(SL_MIN_PERIOD_US);
+	for (i = 0; i < NSEMTHDS; i++) {
+		if (i == me) continue;
+
+		if (sem_progress[i] < SEM_ITER) {
+			SWITCH_TO(sem_thds[i]);
+		}
+	}
+
+	printc("SUCCESS!");
+	while (1) ;
+}
+
+void
+test_sem(void)
+{
+	int i;
+	sched_param_t sps[] = {
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6),
+		SCHED_PARAM_CONS(SCHEDP_PRIO, 6)
+	};
+
+	crt_sem_init(&sem, 1);
+
+	printc("Create threads:\n");
+	for (i = 0; i < NSEMTHDS; i++) {
+		sem_thds[i] = sched_thd_create(sem_thd, NULL);
+		printc("\tcreating thread %lu at prio %d\n", sem_thds[i], sps[i]);
+		sched_thd_param_set(sem_thds[i], sps[i]);
+	}
+}
+
+void
+cos_init(void)
+{
+	printc("Unit-test for the crt (w/sched interface).\n");
 }
 
 int
 main(void)
 {
+	/* Run the uncommented test - one at a time */
 //	test_lock();
+//	test_sem();
 	test_chan();
 
-	printc("Running benchmark...\n");
-	sl_sched_loop_nonblock();
-
-	assert(0);
+	printc("Running benchmark, exiting main thread...\n");
 
 	return 0;
 }
diff --git a/src/components/implementation/tests/kernel_tests/inv.S b/src/components/implementation/tests/kernel_tests/inv.S
index c57fac2871..bdcb0b07ad 100644
--- a/src/components/implementation/tests/kernel_tests/inv.S
+++ b/src/components/implementation/tests/kernel_tests/inv.S
@@ -1,18 +1,6 @@
 /* Use the passed in stack in arg4 */
 
 #define RET_CAP (1 << 16)
+#include <test_inv.h>
 
-.text
-.globl __inv_test_serverfn
-.type  __inv_test_serverfn, @function
-__inv_test_serverfn:
-	    movl %ebp, %esp
-        xor %ebp, %ebp
-                pushl %edi
-                pushl %esi
-                pushl %ebx
-                call test_serverfn
-                addl $12, %esp
-                movl %eax, %ecx
-                movl $RET_CAP, %eax
-                sysenter;
+INV_TEST_SERVERFN
diff --git a/src/components/implementation/tests/kernel_tests/k_perf_tests.c b/src/components/implementation/tests/kernel_tests/k_perf_tests.c
index a49d4af3ff..6696a8714b 100644
--- a/src/components/implementation/tests/kernel_tests/k_perf_tests.c
+++ b/src/components/implementation/tests/kernel_tests/k_perf_tests.c
@@ -5,6 +5,8 @@ static struct perfdata pd[NUM_CPU] CACHE_ALIGNED;
 extern struct results  result_test_timer;
 extern struct results  result_budgets_single;
 extern struct results  result_sinv;
+struct results  result_switch, result_thd_switch;
+struct results  result_async_roundtrip, result_async_oneway;
 
 #define ARRAY_SIZE 10000
 static cycles_t test_results[ARRAY_SIZE] = { 0 };
@@ -24,7 +26,7 @@ static void
 bounceback(void *d)
 {
         while (1) {
-                rdtscll(side_thd);
+                side_thd = ps_tsc();
                 cos_thd_switch(BOOT_CAPTBL_SELF_INITTHD_CPU_BASE);
         }
 }
@@ -42,8 +44,9 @@ test_thds_create_switch(void)
                 return;
         }
 
+	perfcntr_init(); /* 32bit counter, so resetting before every benchmark */
         for (i = 0; i < ITER; i++) {
-                rdtscll(main_thd);
+                main_thd = ps_tsc();
                 ret = cos_thd_switch(ts);
                 EXPECT_LL_NEQ(0, ret, "COS Switch Error");
 
@@ -51,17 +54,13 @@ test_thds_create_switch(void)
         }
 
         perfdata_calc(&pd[cos_cpuid()]);
-
-        PRINTC("\tCOS THD => COS_THD_SWITCH:\t\tAVG:%llu, MAX:%llu, MIN:%llu, ITER:%d\n",
-                        perfdata_avg(&pd[cos_cpuid()]), perfdata_max(&pd[cos_cpuid()]), perfdata_min(&pd[cos_cpuid()]), perfdata_sz(&pd[cos_cpuid()]));
-
-        printc("\t\t\t\t\t\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n",
-                        perfdata_sd(&pd[cos_cpuid()]),perfdata_90ptile(&pd[cos_cpuid()]), perfdata_95ptile(&pd[cos_cpuid()]), perfdata_99ptile(&pd[cos_cpuid()]));
+	results_save(&result_thd_switch, &pd[cos_cpuid()]);
 
         perfdata_init(&pd[cos_cpuid()], "COS THD => COS_SWITCH", test_results, ARRAY_SIZE);
 
+	perfcntr_init(); /* 32bit counter, so resetting before every benchmark */
         for (i = 0; i < ITER; i++) {
-                rdtscll(main_thd);
+                main_thd = ps_tsc();
                 ret = cos_switch(ts, BOOT_CAPTBL_SELF_INITTCAP_CPU_BASE, 0, 0, 0, 0);
                 EXPECT_LL_NEQ(0, ret, "COS Switch Error");
 
@@ -69,12 +68,7 @@ test_thds_create_switch(void)
         }
 
         perfdata_calc(&pd[cos_cpuid()]);
-
-        PRINTC("\tCOS THD => COS_SWITCH:\t\t\tAVG:%llu, MAX:%llu, MIN:%llu, ITER:%d\n",
-                        perfdata_avg(&pd[cos_cpuid()]), perfdata_max(&pd[cos_cpuid()]), perfdata_min(&pd[cos_cpuid()]), perfdata_sz(&pd[cos_cpuid()]));
-
-        printc("\t\t\t\t\t\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n",
-                        perfdata_sd(&pd[cos_cpuid()]),perfdata_90ptile(&pd[cos_cpuid()]), perfdata_95ptile(&pd[cos_cpuid()]), perfdata_99ptile(&pd[cos_cpuid()]));
+	results_save(&result_switch, &pd[cos_cpuid()]);
 }
 
 /*
@@ -82,6 +76,7 @@ test_thds_create_switch(void)
  *   * Roundtrip: 2 Thd that bounce between eachother through cos_rcv() and cos_asnd()
  *   * One way: 1 thd send and 1 thd receives. When the receivers block the sender will be enqueue
  */
+static cycles_t end_oneway = 0;
 
 static void
 async_thd_fn_perf(void *thdcap)
@@ -96,15 +91,11 @@ async_thd_fn_perf(void *thdcap)
                 cos_asnd(sc, 1);
         }
 
-        cos_thd_switch(tc);
-
         for (i = 0; i < ITER + 1; i++) {
                 cos_rcv(rc, 0, NULL);
+		end_oneway = ps_tsc();
         }
 
-        ret = cos_thd_switch(tc);
-        EXPECT_LL_NEQ(0, ret, "COS Switch Error");
-
         EXPECT_LL_NEQ(1, 0, "Error, shouldn't get here!\n");
         assert(0);
 }
@@ -119,45 +110,34 @@ async_thd_parent_perf(void *thdcap)
         int           i, pending = 0;
 
         perfdata_init(&pd[cos_cpuid()], "Async Endpoints => Roundtrip", test_results, ARRAY_SIZE);
-
+	perfcntr_init(); /* 32bit counter, so resetting before every benchmark */
         for (i = 0; i < ITER; i++) {
-                rdtscll(s);
+                s = ps_tsc();
                 cos_asnd(sc, 1);
                 cos_rcv(rc, 0, NULL);
-                rdtscll(e);
+                e = ps_tsc();
 
                 perfdata_add(&pd[cos_cpuid()], (e - s));
         }
 
         perfdata_calc(&pd[cos_cpuid()]);
-
-        PRINTC("\tAsync Endpoints => Roundtrip:\t\tAVG:%llu, MAX:%llu, MIN:%llu, ITER:%d\n",
-                        perfdata_avg(&pd[cos_cpuid()]), perfdata_max(&pd[cos_cpuid()]), perfdata_min(&pd[cos_cpuid()]),
-                        perfdata_sz(&pd[cos_cpuid()]));
-
-        printc("\t\t\t\t\t\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n",
-                        perfdata_sd(&pd[cos_cpuid()]),perfdata_90ptile(&pd[cos_cpuid()]), perfdata_95ptile(&pd[cos_cpuid()]),
-                        perfdata_99ptile(&pd[cos_cpuid()]));
+	results_save(&result_async_roundtrip, &pd[cos_cpuid()]);
 
         perfdata_init(&pd[cos_cpuid()], "Async Endpoints => One Way", test_results, ARRAY_SIZE);
-
-        for (i = 0; i < ITER; i++) {
-                rdtscll(s);
+	perfcntr_init(); /* 32bit counter, so resetting before every benchmark */
+	i = 0;
+	while (i < ITER) {
+		end_oneway = 0;
+                s = ps_tsc();
                 cos_asnd(sc, 1);
-                rdtscll(e);
-
+		e = end_oneway;
+		i++;
+		if (unlikely(e == 0)) continue;
                 perfdata_add(&pd[cos_cpuid()], (e - s));
         }
 
         perfdata_calc(&pd[cos_cpuid()]);
-
-        PRINTC("\tAsync Endpoints => One Way:\t\tAVG:%llu, MAX:%llu, MIN:%llu, ITER:%d\n",
-                        perfdata_avg(&pd[cos_cpuid()]), perfdata_max(&pd[cos_cpuid()]), perfdata_min(&pd[cos_cpuid()]),
-                        perfdata_sz(&pd[cos_cpuid()]));
-
-        printc("\t\t\t\t\t\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n",
-                        perfdata_sd(&pd[cos_cpuid()]),perfdata_90ptile(&pd[cos_cpuid()]), perfdata_95ptile(&pd[cos_cpuid()]),
-                        perfdata_99ptile(&pd[cos_cpuid()]));
+	results_save(&result_async_oneway, &pd[cos_cpuid()]);
 
         async_test_flag_[cos_cpuid()] = 0;
         while (1) cos_thd_switch(tc);
@@ -212,34 +192,20 @@ test_async_endpoints_perf(void)
 void
 test_print_ubench(void)
 {
-        PRINTC("\tSINV:\t\t\t\t\tAVG:%llu, MAX:%llu, MIN:%llu, ITER:%d\n",
-                        result_sinv.avg, result_sinv.max, result_sinv.max,
-                        result_sinv.sz);
-
-        printc("\t\t\t\t\t\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n",
-                        result_sinv.sd, result_sinv.p90tile, result_sinv.p95tile,
-                        result_sinv.p99tile);
-
-        PRINTC("\tTimer => Timeout Overhead: \t\tAVG:%llu, MAX:%llu, MIN:%llu, ITER:%d\n",
-                        result_test_timer.avg, result_test_timer.max, result_test_timer.min,
-                        result_test_timer.sz);
-
-        printc("\t\t\t\t\t\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n",
-                        result_test_timer.sd, result_test_timer.p90tile, result_test_timer.p95tile,
-                        result_test_timer.p99tile);
-
-        PRINTC("\tTimer => Budget based: \t\t\tAVG:%llu, MAX:%llu, MIN:%llu, ITER:%d\n",
-                        result_budgets_single.avg, result_budgets_single.max, result_budgets_single.min,
-                        result_budgets_single.sz);
-
-        printc("\t\t\t\t\t\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n",
-                        result_budgets_single.sd, result_budgets_single.p90tile, result_budgets_single.p95tile,
-                        result_budgets_single.p99tile);
+	results_print(&result_thd_switch, "Threads => cos_thd_switch:");
+	results_print(&result_switch, "Threads => cos_switch:");
+	results_print(&result_async_roundtrip, "Async => Roundtrip:");
+	results_print(&result_async_oneway, "Async => Oneway:");
+	results_print(&result_sinv, "Synchronous Invocations:");
+	results_print(&result_test_timer, "Timer => Timeout Overhead:");
+	results_print(&result_budgets_single, "Timer => Budget Based:");
 }
 
 void
 test_run_perf_kernel(void)
 {
+	printc("\n");
+	PRINTC("uBenchamarks Started:\n\n");
         cyc_per_usec = cos_hw_cycles_per_usec(BOOT_CAPTBL_SELF_INITHW_BASE);
         test_thds_create_switch();
         test_async_endpoints_perf();
diff --git a/src/components/implementation/tests/kernel_tests/k_test_async.c b/src/components/implementation/tests/kernel_tests/k_test_async.c
index 19d155f2c6..27203b6504 100644
--- a/src/components/implementation/tests/kernel_tests/k_test_async.c
+++ b/src/components/implementation/tests/kernel_tests/k_test_async.c
@@ -63,7 +63,7 @@ async_thd_parent(void *thdcap)
         int         ret;
         thdid_t     tid;
         int         blocked, rcvd;
-        cycles_t    cycles, now;
+        cycles_t    cycles;
         tcap_time_t thd_timeout;
 
         /* NON_BLOCKING ASND with 0 as arg*/
@@ -86,8 +86,6 @@ async_thd_parent(void *thdcap)
 
         /* switch */
         cos_sched_rcv(rc, RCV_ALL_PENDING, 0, &rcvd, &tid, &blocked, &cycles, &thd_timeout);
-        rdtscll(now);
-
         async_test_flag_[cos_cpuid()] = 0;
         while (1) cos_thd_switch(tc);
 }
diff --git a/src/components/implementation/tests/kernel_tests/k_test_inv.c b/src/components/implementation/tests/kernel_tests/k_test_inv.c
index fcb9fa132a..fe40eb2c5c 100644
--- a/src/components/implementation/tests/kernel_tests/k_test_inv.c
+++ b/src/components/implementation/tests/kernel_tests/k_test_inv.c
@@ -7,7 +7,7 @@
 #include "kernel_tests.h"
 
 static int      failure = 0;
-struct perfdata result;
+static struct perfdata result;
 struct results  result_sinv;
 
 #define ARRAY_SIZE 10000
@@ -34,6 +34,7 @@ call_cap_mb(u32_t cap_no, int arg1, int arg2, int arg3)
          */
         cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
 
+#if defined(__x86__)
         __asm__ __volatile__("pushl %%ebp\n\t"
                              "movl %%esp, %%ebp\n\t"
                              "movl %%esp, %%edx\n\t"
@@ -45,6 +46,34 @@ call_cap_mb(u32_t cap_no, int arg1, int arg2, int arg3)
                              : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3)
                              : "memory", "cc", "ecx", "edx");
 
+#elif defined(__x86_64__)
+        __asm__ __volatile__("pushq %%rbp\n\t"
+                             "mov %%rsp, %%rbp\n\t"
+                             "mov %%rsp, %%rdx\n\t"
+                             "mov $1f, %%r8\n\t"
+                             "syscall\n\t"
+                             "1:\n\t"
+                             "pop %%rbp"
+                             : "=a"(ret)
+                             : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3)
+                             : "memory", "cc", "rcx", "rdx", "r8", "r9", "r11", "r12");
+
+#elif defined(__arm__)
+
+	__asm__ __volatile__("ldr r1,%[_cap_no]\n\t"
+			     "ldr r2,%[_arg1]\n\t"
+			     "ldr r3,%[_arg2]\n\t"
+			     "ldr r4,%[_arg3]\n\t"
+			     "mov r5, #0\n\t"
+			     "svc #0x00\n\t"
+			     "str r0, %[_ret]\n\t"
+			     : [ _ret ] "=m"(ret)
+			     : [ _cap_no ] "m"(cap_no), [ _arg1 ] "m"(arg1), [ _arg2 ] "m"(arg2), [ _arg3 ] "m"(arg3)
+			     : "memory", "cc", "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "lr");
+
+#else 
+	assert(0);
+#endif
         return ret;
 }
 
@@ -61,29 +90,23 @@ test_inv(void)
 
         cc = cos_comp_alloc(&booter_info, booter_info.captbl_cap, booter_info.pgtbl_cap, (vaddr_t)NULL);
         if (EXPECT_LL_LT(1, cc, "Invocation: Cannot Allocate")) return;
-        ic = cos_sinv_alloc(&booter_info, cc, (vaddr_t)__inv_test_serverfn, 0);
+        ic = cos_sinv_alloc(&booter_info, cc, (vaddr_t)__inv_test_serverfn, 0xdead);
         if (EXPECT_LL_LT(1, ic, "Invocation: Cannot Allocate")) return;
 
         r = call_cap_mb(ic, 1, 2, 3);
         if (EXPECT_LLU_NEQ(0xDEADBEEF, r, "Test Invocation")) return;
+	perfcntr_init(); /* 32bit counter, so resetting before every benchmark */
 
         for (i = 0; i < ITER; i++) {
-                rdtscll(start_cycles);
+                start_cycles = ps_tsc();
                 call_cap_mb(ic, 1, 2, 3);
-                rdtscll(end_cycles);
+                end_cycles = ps_tsc();
 
                 perfdata_add(&result, end_cycles - start_cycles);
         }
 
         perfdata_calc(&result);
-        result_sinv.avg = perfdata_avg(&result);
-        result_sinv.max = perfdata_avg(&result);
-        result_sinv.min = perfdata_avg(&result);
-        result_sinv.sz = perfdata_avg(&result);
-        result_sinv.sd = perfdata_avg(&result);
-        result_sinv.p90tile = perfdata_avg(&result);
-        result_sinv.p95tile = perfdata_avg(&result);
-        result_sinv.p99tile = perfdata_avg(&result);
+	results_save(&result_sinv, &result);
 
         CHECK_STATUS_FLAG();
         PRINTC("\t%s: \t\tSuccess\n", "Synchronous Invocations");
diff --git a/src/components/implementation/tests/kernel_tests/k_test_tcap.c b/src/components/implementation/tests/kernel_tests/k_test_tcap.c
index f69dfa5fed..817302c6a8 100644
--- a/src/components/implementation/tests/kernel_tests/k_test_tcap.c
+++ b/src/components/implementation/tests/kernel_tests/k_test_tcap.c
@@ -11,7 +11,7 @@
 
 struct results result_test_timer;
 struct results result_budgets_single;
-struct perfdata result;
+static struct perfdata result;
 
 #define ARRAY_SIZE 10000
 static cycles_t test_results[ARRAY_SIZE] = { 0 };
@@ -77,14 +77,7 @@ test_timer(void)
         }
 
         perfdata_calc(&result);
-        result_test_timer.avg = perfdata_avg(&result);
-        result_test_timer.max = perfdata_avg(&result);
-        result_test_timer.min = perfdata_avg(&result);
-        result_test_timer.sz = perfdata_avg(&result);
-        result_test_timer.sd = perfdata_avg(&result);
-        result_test_timer.p90tile = perfdata_avg(&result);
-        result_test_timer.p95tile = perfdata_avg(&result);
-        result_test_timer.p99tile = perfdata_avg(&result);
+        results_save(&result_test_timer, &result);	
 
         /* Timer in past */
         c = 0, p = 0;
@@ -296,14 +289,7 @@ test_tcap_budgets_single(void)
         }
 
         perfdata_calc(&result);
-        result_budgets_single.avg = perfdata_avg(&result);
-        result_budgets_single.max = perfdata_avg(&result);
-        result_budgets_single.min = perfdata_avg(&result);
-        result_budgets_single.sz = perfdata_avg(&result);
-        result_budgets_single.sd = perfdata_avg(&result);
-        result_budgets_single.p90tile = perfdata_avg(&result);
-        result_budgets_single.p95tile = perfdata_avg(&result);
-        result_budgets_single.p99tile = perfdata_avg(&result);
+        results_save(&result_budgets_single, &result);	
 
         PRINTC("\t%s: \t\t\tSuccess\n", "Timer => Budget based");
 }
@@ -332,6 +318,7 @@ test_tcap_budgets_multi(void)
                 cycles_t    cycles, s, e;
                 tcap_time_t thd_timeout;
 
+		(void)e;
                                         /* test both increasing budgets and constant budgets */
                 if (i > (TEST_ITER/2))
                         res = GRANULARITY * RATE_1;
diff --git a/src/components/implementation/tests/kernel_tests/k_test_thd.c b/src/components/implementation/tests/kernel_tests/k_test_thd.c
index 90483b39fb..38fb99a749 100644
--- a/src/components/implementation/tests/kernel_tests/k_test_thd.c
+++ b/src/components/implementation/tests/kernel_tests/k_test_thd.c
@@ -13,7 +13,7 @@ test_thd_arg(void *d)
 {
         int ret = 0;
 
-        if (EXPECT_LL_NEQ((int)d, THD_ARG, "Thread Creation: Argument Incorrect")) failure = 1;
+        if (EXPECT_LL_NEQ((word_t)d, THD_ARG, "Thread Creation: Argument Incorrect")) failure = 1;
         while (1) cos_thd_switch(BOOT_CAPTBL_SELF_INITTHD_CPU_BASE);
         PRINTC("Error, shouldn't get here!\n");
 }
@@ -42,7 +42,7 @@ thd_fn_mthds_ring(void *d)
 {
         int ret;
 
-        if (count != (int) d) cos_thd_switch(BOOT_CAPTBL_SELF_INITTHD_CPU_BASE);
+        if (count != (word_t)d) cos_thd_switch(BOOT_CAPTBL_SELF_INITTHD_CPU_BASE);
 
         int next = (++count) % TEST_NTHDS;
         if (!next) cos_thd_switch(BOOT_CAPTBL_SELF_INITTHD_CPU_BASE);
@@ -66,9 +66,10 @@ thd_fn_mthds_ring(void *d)
 static void
 test_mthds_ring(void)
 {
-        int   i, ret;
+        word_t	i;
+        int	ret;
 
-        count = 0;
+        count	= 0;
 
         for (i = 0; i < TEST_NTHDS; i++) {
                 thd_test[i] = cos_thd_alloc(&booter_info, booter_info.comp_cap, thd_fn_mthds_ring, (void *)i);
@@ -129,11 +130,13 @@ test_mthds_classic(void)
 static void
 thd_tls(void *d)
 {
+#if defined(__x86__)
         if (EXPECT_LLU_NEQ((long unsigned)tls_get(0), (long unsigned)tls_test[cos_cpuid()][(int)d],
                             "Thread TLS: ARG not correct")) failure = 1;
         while (1) cos_thd_switch(BOOT_CAPTBL_SELF_INITTHD_CPU_BASE);
         EXPECT_LL_NEQ(1, 0, "Error, shouldn't get here!\n");
         assert(0);
+#endif
 }
 
 /* Test the TLS support
@@ -142,6 +145,7 @@ thd_tls(void *d)
 static void
 test_thds_tls(void)
 {
+#if defined(__x86__)
         thdcap_t ts[TEST_NTHDS];
         intptr_t i;
         int      ret;
@@ -160,6 +164,7 @@ test_thds_tls(void)
         CHECK_STATUS_FLAG();
         PRINTC("\t%s: \t\t\tSuccess\n", "THD => Creation & TLS");
         EXIT_FN();
+#endif
 }
 
 void
diff --git a/src/components/implementation/tests/kernel_tests/kernel_test_booter.c b/src/components/implementation/tests/kernel_tests/kernel_test_booter.c
index fb51b2abd4..d1bf38345d 100644
--- a/src/components/implementation/tests/kernel_tests/kernel_test_booter.c
+++ b/src/components/implementation/tests/kernel_tests/kernel_test_booter.c
@@ -1,5 +1,6 @@
 #include "kernel_tests.h"
 #include <init.h>
+#include <ps_plat.h>
 
 struct cos_compinfo booter_info;
 thdcap_t            termthd[NUM_CPU] = { 0 }; /* switch to this to shutdown */
@@ -10,7 +11,7 @@ unsigned long       thd_test[TEST_NTHDS];
 
 /* For Div-by-zero test */
 int num = 1, den = 0;
-int count = 0;
+word_t count = 0;
 
 void
 term_fn(void *d)
@@ -30,20 +31,12 @@ cos_init(void)
 			  (vaddr_t)cos_get_heap_ptr(), BOOT_CAPTBL_FREE, &booter_info);
 }
 
-int
-main(void)
+void
+test_run_unit_kernel(void)
 {
-        int i;
-
-        termthd[cos_cpuid()] = cos_thd_alloc(&booter_info, booter_info.comp_cap, term_fn, NULL);
-        assert(termthd[cos_cpuid()]);
-        PRINTC("Kernel Tests\n");
-
-        cyc_per_usec = cos_hw_cycles_per_usec(BOOT_CAPTBL_SELF_INITHW_BASE);
-	printc("\tTiming: %d cycles per microsecond\n", cyc_per_usec);
-
         /* Kernel Tests */
-        printc("\nUnit Test Started:\n\n");
+	printc("\n");
+        PRINTC("Unit Test Started:\n\n");
         test_timer();
         test_tcap_budgets();
         test_2timers();
@@ -52,9 +45,23 @@ main(void)
         test_async_endpoints();
         test_inv();
         test_captbl_expands();
+}
+
+int
+main(void)
+{
+        int i;
 
-        printc("\nuBenchamarks Started:\n\n");
+        PRINTC("Kernel Tests\n");
+        termthd[cos_cpuid()] = cos_thd_alloc(&booter_info, booter_info.comp_cap, term_fn, NULL);
+        assert(termthd[cos_cpuid()]);
+
+        cyc_per_usec = cos_hw_cycles_per_usec(BOOT_CAPTBL_SELF_INITHW_BASE);
+	printc("\tTiming: %d cycles per microsecond\n", cyc_per_usec);
+	perfcntr_init();
+	printc("\tPerformance Counter: %llu\n", ps_tsc());
 
+	test_run_unit_kernel();
         test_run_perf_kernel();
 
         /* NOTE: This is just to make sense of the output on HW! To understand that microbooter runs to completion on all cores! */
@@ -64,7 +71,7 @@ main(void)
         }
 
         printc("\n");
-        PRINTC("Kernel Tests done.\n");
+        PRINTC("Kernel Tests done.\n\n");
 
         cos_thd_switch(termthd[cos_cpuid()]);
 
diff --git a/src/components/implementation/tests/kernel_tests/kernel_tests.h b/src/components/implementation/tests/kernel_tests/kernel_tests.h
index 21bae9fb45..8464d52d93 100644
--- a/src/components/implementation/tests/kernel_tests/kernel_tests.h
+++ b/src/components/implementation/tests/kernel_tests/kernel_tests.h
@@ -46,13 +46,14 @@
 
 #define TEST_NPAGES (1024 * 2)  /* Testing with 8MB for now */
 
-unsigned int cyc_per_usec;
+extern unsigned int cyc_per_usec;
 
 extern struct cos_compinfo booter_info;
 extern thdcap_t         termthd[]; /* switch to this to shutdown */
 extern unsigned long    tls_test[][TEST_NTHDS];
 extern unsigned long    thd_test[TEST_NTHDS];
-extern int              num, den, count;
+extern int              num, den;
+extern word_t           count;
 
 struct results {
         long long unsigned avg;
@@ -65,6 +66,61 @@ struct results {
         long long unsigned p99tile;
 };
 
+static inline void
+results_save(struct results *r, struct perfdata *p)
+{
+        r->avg = perfdata_avg(p);
+        r->max = perfdata_max(p);
+        r->min = perfdata_min(p);
+        r->sz = perfdata_sz(p);
+        r->sd = perfdata_sd(p);
+        r->p90tile = perfdata_90ptile(p);
+        r->p95tile = perfdata_95ptile(p);
+        r->p99tile = perfdata_99ptile(p);
+}
+
+static inline void
+results_split_print(struct results *r, const char *testname)
+{
+        long unsigned avg, avg_h;
+        long unsigned max, max_h;
+        long unsigned min, min_h;
+        long unsigned sd, sd_h;
+        int           sz;
+        long unsigned p90tile, p90_h;
+        long unsigned p95tile, p95_h;
+        long unsigned p99tile, p99_h;	
+
+	avg = r->avg & 0xffffffff;
+	avg_h = r->avg >> 32;
+	max = r->max & 0xffffffff;
+	max_h = r->max >> 32;
+	min = r->min & 0xffffffff;
+	min_h = r->min >> 32;
+	sd = r->sd & 0xffffffff;
+	sd_h = r->sd >> 32;
+	sz = r->sz;
+	p90tile = r->p90tile & 0xffffffff;
+	p90_h = r->p90tile >> 32;
+	p95tile = r->p95tile & 0xffffffff;
+	p95_h = r->p95tile >> 32;
+	p99tile = r->p99tile & 0xffffffff;
+	p99_h = r->p99tile >> 32;
+	
+	PRINTC("%s\n", testname);
+	PRINTC("\t\tAvg:%lu (%lu), Max:%lu (%lu), Min:%lu (%lu), Iters: %d\n", avg, avg_h, max, max_h, min, min_h, sz);
+	PRINTC("\t\tSD:%lu (%lu), 90%%:%lu (%lu), 95%%:%lu (%lu), 99%%:%lu (%lu)\n", sd, sd_h, p90tile, p90_h, p95tile, p95_h, p99tile, p99_h);
+}
+
+static inline void
+results_print(struct results *r, const char *testname)
+{
+	PRINTC("%s\n", testname);
+	PRINTC("\t\tAvg:%llu, Max:%llu, Min:%llu, Iters: %d\n", r->avg, r->max, r->min, r->sz);
+	PRINTC("\t\tSD:%llu, 90%%:%llu, 95%%:%llu, 99%%:%llu\n", r->sd, r->p90tile, r->p95tile, r->p99tile);
+}
+
+#if defined(__x86__)
 static unsigned long
 tls_get(size_t off)
 {
@@ -80,6 +136,7 @@ tls_set(size_t off, unsigned long val)
 {
         __asm__ __volatile__("movl %0, %%gs:(%1)" : : "r"(val), "r"(off) : "memory");
 }
+#endif
 
 extern void test_run_perf_kernel(void);
 extern void test_timer(void);
diff --git a/src/components/implementation/tests/kernel_tests/test_inv.h b/src/components/implementation/tests/kernel_tests/test_inv.h
new file mode 100644
index 0000000000..9089403d15
--- /dev/null
+++ b/src/components/implementation/tests/kernel_tests/test_inv.h
@@ -0,0 +1,50 @@
+
+#if defined(__x86__)
+#define INV_TEST_SERVERFN			\
+.text;						\
+.globl __inv_test_serverfn;			\
+.type __inv_test_serverfn, @function;		\
+__inv_test_serverfn:				\
+		movl %ebp, %esp;		\
+		xor %ebp, %ebp;			\
+		pushl %edi;			\
+		pushl %esi;			\
+		pushl %ebx;			\
+		call test_serverfn;		\
+		addl $12, %esp;			\
+		movl %eax, %ecx;		\
+		movl $RET_CAP, %eax;		\
+		sysenter;
+
+#elif defined(__x86_64__)
+#define INV_TEST_SERVERFN			\
+.text;						\
+.globl __inv_test_serverfn;			\
+.type __inv_test_serverfn, @function;		\
+__inv_test_serverfn:				\
+		mov %rdx, %rsp;			\
+		xor %rbp, %rbp;			\
+		mov %rdi, %rax;			\
+		mov %rbx, %rdi;			\
+		mov %rax, %rdx;			\
+		call test_serverfn;		\
+		mov %rax, %r8;			\
+		mov $RET_CAP, %rax;		\
+		syscall;
+
+#elif defined(__arm__)
+#define INV_TEST_SERVERFN			\
+.text;						\
+.globl __inv_test_serverfn;			\
+.type __inv_test_serverfn, %function;		\
+__inv_test_serverfn:				\
+	mov r0, r2;				\
+	mov r1, r3;				\
+	mov r2, r4;				\
+	ldr r6, =test_serverfn;			\
+	blx r6;					\
+	ldr  r1, =RET_CAP;			\
+	svc #0x00;				\
+	.ltorg;
+
+#endif
diff --git a/src/components/implementation/tests/micro_ipi/micro_ipi.c b/src/components/implementation/tests/micro_ipi/micro_ipi.c
index 7a8e4e7fa3..d87b4f33ea 100644
--- a/src/components/implementation/tests/micro_ipi/micro_ipi.c
+++ b/src/components/implementation/tests/micro_ipi/micro_ipi.c
@@ -43,13 +43,14 @@ static volatile int testing = 0;
 static void
 hiprio_c0_lat_fn(arcvcap_t r, void *d)
 {
-	asndcap_t snd = c0_cn_asnd[(int)d];
+	asndcap_t snd = c0_cn_asnd[(unsigned long)d];
 
 	assert(snd);
 
 	while (1) {
 		int pending = 0, rcvd = 0, ret = 0;
 		cycles_t now;
+		(void)now;
 
 		if (unlikely(testing == 0)) break;
 
@@ -84,7 +85,7 @@ hiprio_c0_lat_fn(arcvcap_t r, void *d)
 static void
 hiprio_cn_lat_fn(arcvcap_t r, void *d)
 {
-	asndcap_t snd = cn_c0_asnd[(int)d];
+	asndcap_t snd = cn_c0_asnd[(unsigned long)d];
 	cycles_t sndtot = 0, sndwc = 0, sndpwc = 0;
 	cycles_t rpctot = 0, rpcwc = 0, rpcpwc = 0;
 	unsigned long iters = 0;
@@ -95,6 +96,9 @@ hiprio_cn_lat_fn(arcvcap_t r, void *d)
 		cycles_t st, en, rpcen;
 		int pending = 0, rcvd = 0, ret = 0;
 
+		(void)st;
+		(void)en;
+		(void)rpcen;
 		if (unlikely(testing == 0)) break;
 
 		rdtscll(st);
@@ -290,7 +294,7 @@ hiprio_rate_c0_fn(arcvcap_t r, void *d)
 static void
 loprio_rate_c0_fn(arcvcap_t r, void *d)
 {
-	asndcap_t snd = c0_cn_asnd[(int)d];
+	asndcap_t snd = c0_cn_asnd[(unsigned long)d];
 
 	assert(snd);
 	while (testing == 0) ;
@@ -313,7 +317,7 @@ loprio_rate_c0_fn(arcvcap_t r, void *d)
 static void
 hiprio_rate_cn_fn(arcvcap_t r, void *d)
 {
-	asndcap_t snd = cn_c0_asnd[(int)d];
+	asndcap_t snd = cn_c0_asnd[(unsigned long)d];
 
 	assert(snd);
 	while (testing == 0) ;
diff --git a/src/components/implementation/tests/micro_xcores/test_ipi_n_n.c b/src/components/implementation/tests/micro_xcores/test_ipi_n_n.c
index a8d9c9bfb9..73d57ec9e0 100644
--- a/src/components/implementation/tests/micro_xcores/test_ipi_n_n.c
+++ b/src/components/implementation/tests/micro_xcores/test_ipi_n_n.c
@@ -17,8 +17,8 @@ static volatile int       test_thd_blkd[NUM_CPU][NUM_CPU];
 static void
 test_ipi_fn(void *d)
 {
-        asndcap_t snd = test_asnds[cos_cpuid()][(int)d];
-        arcvcap_t rcv = test_rcvs[cos_cpuid()][(int)d];
+        asndcap_t snd = test_asnds[cos_cpuid()][(word_t)d];
+        arcvcap_t rcv = test_rcvs[cos_cpuid()][(word_t)d];
 
         assert(snd && rcv);
         while (1) {
@@ -34,7 +34,7 @@ test_ipi_fn(void *d)
 static void
 test_rcv_crt(void)
 {
-        int i;
+        word_t i;
         static volatile int rcv_crt[NUM_CPU] = { 0 };
 
         memset((void *)test_rcvs[cos_cpuid()], 0, NUM_CPU * sizeof(arcvcap_t));
@@ -48,7 +48,7 @@ test_rcv_crt(void)
                 arcvcap_t rcv = 0;
                 asndcap_t snd = 0;
 
-                if (cos_cpuid() == i) continue;
+                if ((word_t)cos_cpuid() == i) continue;
                 thd = cos_thd_alloc(&booter_info, booter_info.comp_cap, test_ipi_fn, (void *)i);
                 assert(thd);
 
diff --git a/src/components/implementation/tests/multi_processor_simple/Makefile b/src/components/implementation/tests/multi_processor_simple/Makefile
new file mode 100644
index 0000000000..65dca3d6b0
--- /dev/null
+++ b/src/components/implementation/tests/multi_processor_simple/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component crt
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/multi_processor_simple/multiprocessor_simple.c b/src/components/implementation/tests/multi_processor_simple/multiprocessor_simple.c
new file mode 100644
index 0000000000..eb581e6d2f
--- /dev/null
+++ b/src/components/implementation/tests/multi_processor_simple/multiprocessor_simple.c
@@ -0,0 +1,45 @@
+#include <cos_kernel_api.h>
+#include <cos_types.h>
+#include <ps.h>
+
+static word_t counter_cos_parallel = 0;
+static word_t counter_parallel_main = 0;
+
+void
+cos_init(void)
+{
+	printc("cos_init, init core id :%ld\n",cos_cpuid());
+	return;
+}
+
+void
+cos_parallel_init(coreid_t cid, int init_core, int ncores)
+{
+	ps_faa(&counter_cos_parallel, 1);
+
+	return;
+}
+
+void
+parallel_main(coreid_t cid, int init_core, int ncores)
+{
+	ps_faa(&counter_parallel_main, 1);
+
+	while (ps_load(&counter_parallel_main) < (word_t)ncores);
+
+	assert(counter_cos_parallel == (word_t)ncores && counter_parallel_main == (word_t)ncores);
+
+	if(init_core) {
+		printc("Multi processor test, total core num %d: SUCCESS\n",ncores);
+	}
+
+	return;
+}
+
+int
+main(void)
+{
+	/* It should never come here*/
+	assert(0); 
+	return 0;
+}
diff --git a/src/components/implementation/tests/slm/Makefile b/src/components/implementation/tests/slm/Makefile
new file mode 100644
index 0000000000..47fac58566
--- /dev/null
+++ b/src/components/implementation/tests/slm/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES =
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component slm util crt
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/slm/doc.md b/src/components/implementation/tests/slm/doc.md
new file mode 100644
index 0000000000..2952f7405b
--- /dev/null
+++ b/src/components/implementation/tests/slm/doc.md
@@ -0,0 +1,19 @@
+## `slm` Tests
+
+The simple scheduler with unit tests for the `slm` library.
+
+### Description
+
+This is a simple example of putting together the facilities of the minimal scheduling library (`slm`) into a scheduler.
+Currently uses static allocation, fixed priority round-robin, and quantum-based timeouts.
+
+### Usage and Assumptions
+
+The `slm_test.toml` runscript can be used to run the unit tests.
+
+Some assumptions/TODOs:
+
+- single core only
+- add tests for asynchronous invocations and activations
+- assumes quantums of 10ms
+- likely will not work in multiplexing virtual environments (due to timing irregularities)
diff --git a/src/components/implementation/tests/slm/main.c b/src/components/implementation/tests/slm/main.c
new file mode 100644
index 0000000000..2c476ae4b9
--- /dev/null
+++ b/src/components/implementation/tests/slm/main.c
@@ -0,0 +1,426 @@
+#include <cos_component.h>
+#include <llprint.h>
+#include <static_slab.h>
+#include <ps_list.h>
+#include <crt.h>
+
+/***
+ * A version of scheduling using a simple periodic timeout, and fixed
+ * priority, round-robin scheduling.
+ */
+
+#include <slm.h>
+#include <quantum.h>
+#include <fprr.h>
+
+/* Quick hack at the thread memory operations */
+
+struct crt_comp self;
+
+struct slm_resources_thd {
+	struct crt_thd crt_res;
+};
+
+SLM_MODULES_COMPOSE_DATA();
+
+SS_STATIC_SLAB(thd, struct slm_thd_container, MAX_NUM_THREADS);
+
+/* Implementation for use by the other parts of the slm */
+struct slm_thd *
+slm_thd_preallocslab_lookup(thdid_t id)
+{
+	return &ss_thd_get(id)->thd;
+}
+
+static inline struct slm_thd *
+slm_thd_current(void)
+{
+	return slm_thd_lookup(cos_thdid());
+}
+
+SLM_MODULES_COMPOSE_FNS(quantum, fprr, preallocslab);
+
+typedef void (*thd_fn_t)(void *);
+
+struct slm_thd_container *
+slm_mem_crtstatic_alloc(thd_fn_t fn, void *data, thdcap_t *thd, thdid_t *tid)
+{
+	struct slm_thd_container *t   = NULL;
+	struct slm_thd_container *ret = NULL;
+	struct crt_thd crt_thd        = { 0 };
+	int i;
+
+	if (crt_thd_create(&crt_thd, &self, fn, data) < 0) ERR_THROW(NULL, done);
+	ret = t = ss_thd_alloc_at_id(crt_thd.tid);
+	if (!t) assert(0);
+
+	assert(crt_thd.cap != 0 && crt_thd.tid);
+	t->resources.crt_res = crt_thd; /* copy the resources! */
+
+	*thd = crt_thd.cap;
+	*tid = crt_thd.tid;
+done:
+	return ret;
+}
+
+static inline struct slm_thd *
+slm_current(void)
+{
+	return slm_thd_lookup(cos_thdid());
+}
+
+void
+slm_mem_crtstatic_activate(struct slm_thd_container *t)
+{
+	ss_thd_activate(t);
+}
+
+struct slm_thd_container *
+slm_mem_alloc(thd_fn_t fn, void *data, thdcap_t *cap, thdid_t *tid)
+{
+	return slm_mem_crtstatic_alloc(fn, data, cap, tid);
+}
+
+void slm_mem_activate(struct slm_thd_container *t) { slm_mem_crtstatic_activate(t); }
+void slm_mem_free(struct slm_thd_container *t) { return; }
+
+struct slm_thd_container *
+thd_alloc(thd_fn_t fn, void *data, sched_param_t *parameters, int reschedule)
+{
+	struct slm_thd_container *t;
+	struct slm_thd_container *ret = NULL;
+	struct slm_thd *current       = slm_thd_current();
+	thdcap_t thdcap;
+	thdid_t tid;
+	int i;
+
+	/*
+	 * If this condition is true, we are likely in the
+	 * initialization sequence in the idle or scheduler threads...
+	 */
+	if (!current) {
+		current = slm_thd_special();
+		assert(current);
+	}
+
+	ret = t = slm_mem_alloc(fn, data, &thdcap, &tid);
+	if (!t) ERR_THROW(NULL, done);
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	if (slm_thd_init(&t->thd, thdcap, tid)) ERR_THROW(NULL, free);
+
+	for (i = 0; parameters[i] != 0; i++) {
+		sched_param_type_t type;
+		unsigned int value;
+
+		sched_param_get(parameters[i], &type, &value);
+		if (slm_sched_thd_update(&t->thd, type, value)) ERR_THROW(NULL, free);
+	}
+	slm_mem_activate(t);
+
+	if (reschedule) {
+		if (slm_cs_exit_reschedule(current, SLM_CS_NONE)) ERR_THROW(NULL, done);
+	} else {
+		slm_cs_exit(NULL, SLM_CS_NONE);
+	}
+done:
+	return ret;
+free:
+	slm_mem_free(t);
+	ret = NULL;
+	goto done;
+}
+
+int
+thd_block(void)
+{
+	struct slm_thd *current = slm_thd_current();
+	int ret;
+
+	slm_cs_enter(current, SLM_CS_NONE);
+        ret = slm_thd_block(current);
+	if (!ret) ret = slm_cs_exit_reschedule(current, SLM_CS_NONE);
+	else      slm_cs_exit(NULL, SLM_CS_NONE);
+
+	return ret;
+}
+
+int
+thd_wakeup(struct slm_thd_container *t)
+{
+	int ret;
+	struct slm_thd *current = slm_thd_current();
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	ret = slm_thd_wakeup(&t->thd, 0);
+	if (ret < 0) {
+		slm_cs_exit(NULL, SLM_CS_NONE);
+		return ret;
+	}
+
+	return slm_cs_exit_reschedule(current, SLM_CS_NONE);
+}
+
+static int
+thd_block_until(cycles_t timeout)
+{
+	struct slm_thd *current = slm_thd_current();
+
+	slm_cs_enter(current, SLM_CS_NONE);
+	if (slm_timer_add(current, timeout)) goto done;
+	if (slm_thd_block(current)) {
+		slm_timer_cancel(current);
+	}
+done:
+	return slm_cs_exit_reschedule(current, SLM_CS_NONE);
+}
+
+int
+thd_sleep(cycles_t c)
+{
+	cycles_t timeout = c + slm_now();
+
+	return thd_block_until(timeout);
+}
+
+unsigned long num_success = 0;
+struct slm_thd_container *done_thd;
+
+#define TIMER_TEST_LEN     5000000	        /* run the test for 5 seconds */
+#define TIMER_ERROR_BOUND  (10000+10000)	/* number of microseconds in a quantum + a fudge factor*/
+#define NTIMERS            4
+unsigned long timers[NTIMERS + 1] = { 60000, 90000, 130000, 170000, 0 };
+unsigned long success_cnt_down = NTIMERS;
+
+void
+timer_fn(void *data)
+{
+	int i;
+	cycles_t period = slm_usec2cyc((unsigned long)data);
+	cycles_t next, prev, curr, start, end;
+
+	start = curr = prev = slm_now();
+	end = start + slm_usec2cyc(TIMER_TEST_LEN);
+
+	for (i = 0; cycles_greater_than(end, curr); i++) {
+		next = curr + period;
+		if (thd_block_until(next)) BUG();
+		curr = slm_now();
+
+		if (!cycles_greater_than(curr, prev)) {
+			printc("FAILURE: cycles progress backwards (from %lld to %lld)\n", prev, curr);
+			BUG();
+		}
+		if (cycles_greater_than(next, curr)) {
+			printc("FAILURE: woke up @ %lld before timeout @ %lld\n", curr, next);
+			BUG();
+		}
+		if (curr - prev > period + (slm_usec2cyc(TIMER_ERROR_BOUND))) {
+			printc("FAILURE: woke up more than a timer tick + 50 microseconds later than anticipated (%lld vs. %lld).\n",
+			       curr, prev + period + slm_usec2cyc(TIMER_ERROR_BOUND));
+			BUG();
+		}
+		prev = curr;
+	}
+
+	if (ps_faa(&success_cnt_down, -1) == 1) {
+		printc("SUCCESS: timers within the expected tolerances.\n");
+		ps_faa(&num_success, 1);
+		thd_wakeup(done_thd);
+	}
+	thd_block();
+}
+
+/*
+ * Test the accuracy of the timer logic. Multiple threads wait for
+ * timeouts of varying lengths, and validate that they woke after
+ * there were supposed to, and not too late.
+ */
+void
+timer_test(unsigned int prio_base)
+{
+	int i;
+	sched_param_t param[2];
+
+	param[0] = sched_param_pack(SCHEDP_PRIO, prio_base + 1);
+	param[1] = 0;
+
+	for (i = 0; timers[i] != 0; i++) {
+		if (!thd_alloc(timer_fn, (void *)timers[i], param, 0)) assert(0);
+	}
+}
+
+#define NPING_PONG 2
+#define PING_PONG_ITER 100
+struct pingpong_data {
+	unsigned long block_first;
+ 	struct slm_thd_container *other_thd;
+};
+volatile struct pingpong_data ppdata[NPING_PONG];
+
+void
+pingpong_fn(void *data)
+{
+	struct pingpong_data *d = data;
+	int i;
+
+	while (!d->other_thd) ;
+
+	if (d->block_first) {
+		thd_block();
+	}
+	for (i = 0; i < PING_PONG_ITER; i++) {
+		thd_wakeup(d->other_thd);
+		thd_block();
+	}
+
+	printc("SUCCESS: Ping-pong complete.\n");
+	ps_faa(&num_success, 1);
+
+	thd_block();
+	BUG();
+}
+
+/*
+ * Lets set up a ring of block/wakeup similar to the lmbench ring
+ * test. a wakes b wakes c wakes ... wakes a.
+ */
+void
+pingpong_block_test(unsigned int prio_base)
+{
+	int i;
+	sched_param_t param[2];
+
+	param[0] = sched_param_pack(SCHEDP_PRIO, prio_base);
+	param[1] = 0;
+
+	for (i = 0; i < NPING_PONG; i++) {
+		struct slm_thd_container *t;
+
+		t = thd_alloc(pingpong_fn, (void *)&ppdata[i], param, 0);
+		if (!t) BUG();
+		ppdata[(i+1) % NPING_PONG] = (struct pingpong_data) {
+			.other_thd = t,
+			.block_first = (i != 0)
+		};
+	}
+}
+
+#define INTERLEAVE_ITER 16
+#define NINTERLEAVE 2
+unsigned long off = 0;
+struct interleave_cnt {
+	unsigned long long cnt;
+	thdid_t id;
+};
+struct interleave_cnt cnts[INTERLEAVE_ITER] = { 0 };
+
+void
+interleave_fn(void *d)
+{
+	int i;
+	thdid_t previd;
+	unsigned long long tot, avgcnt;
+
+	while (off < INTERLEAVE_ITER) {
+		unsigned long localoff = ps_load(&off);
+		struct interleave_cnt *c = &cnts[off];
+
+		if (c->id == 0) {
+			ps_store(&c->id, cos_thdid());
+		}
+		if (c->id != cos_thdid()) {
+			ps_store(&off, ps_load(&off) + 1);
+			continue;
+		}
+		while (localoff == ps_load(&off)) {
+			int spin = 1 << 22;
+
+			assert(c->id == cos_thdid());
+			while (spin) {
+				ps_store(&spin, ps_load(&spin) - 1);
+			}
+			c->cnt++;
+		}
+	}
+
+	tot = 0;
+	previd = cnts[0].id;
+	for (i = 1; i < INTERLEAVE_ITER - 1; i++) {
+		tot += cnts[i].cnt;
+		assert(cnts[i].id != previd);
+		previd = cnts[i].id;
+	}
+	avgcnt = tot / (INTERLEAVE_ITER - 2);
+	for (i = 1; i < INTERLEAVE_ITER - 1; i++) {
+		long long diff = avgcnt - cnts[i].cnt;
+		unsigned long posdiff = diff < 0 ? -diff : diff;
+		/* allow 10% variation across ticks */
+		assert(posdiff <= (avgcnt / 10) + 1);
+	}
+	if (previd == cos_thdid()) {
+		printc("SUCCESS: Interleaving correct.\n");
+		ps_faa(&num_success, 1);
+	}
+
+	thd_block();
+	BUG();
+}
+
+/*
+ * Will timer ticks cause us to properly switch back and forth? When
+ * we do, will we use roughly the same amount of CPU time?
+ */
+void
+interleave_test(unsigned int prio_base)
+{
+	int i;
+	sched_param_t param[2];
+
+	param[0] = sched_param_pack(SCHEDP_PRIO, prio_base);
+	param[1] = 0;
+
+	for (i = 0; i < NINTERLEAVE; i++) {
+		if (!thd_alloc(interleave_fn, NULL, param, 0)) BUG();
+	}
+}
+
+void
+done_fn(void *d)
+{
+	thd_block();
+	printc("SUCCESS for %ld / 3. Tests complete.\n", num_success);
+	thd_block();
+}
+
+int
+main(void)
+{
+	sched_param_t param[2];
+
+	param[0] = sched_param_pack(SCHEDP_PRIO, 10);
+	param[1] = 0;
+
+	pingpong_block_test(2);
+	interleave_test(4);
+	timer_test(6);
+	done_thd = thd_alloc(done_fn, NULL, param, 0);
+	if (!done_thd) BUG();
+	slm_sched_loop();
+}
+
+void
+cos_init(void)
+{
+	struct crt_thd t;
+	struct cos_compinfo *boot_info = cos_compinfo_get(cos_defcompinfo_curr_get());
+
+	cos_meminfo_init(&(boot_info->mi), BOOT_MEM_KM_BASE, COS_MEM_KERN_PA_SZ, BOOT_CAPTBL_SELF_UNTYPED_PT);
+	cos_defcompinfo_init();
+	cos_defcompinfo_sched_init();
+
+	if (crt_booter_create(&self, "self", cos_compid(), 0)) assert(0);
+	if (crt_thd_create(&t, &self, slm_idle, NULL)) assert(0);
+
+	slm_init(t.cap, t.tid);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/io.h b/src/components/implementation/tests/slm/slm.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/io.h
rename to src/components/implementation/tests/slm/slm.c
diff --git a/src/components/implementation/tests/unit_capmgr/Makefile b/src/components/implementation/tests/unit_capmgr/Makefile
index e07d893724..4eb5bd6f83 100644
--- a/src/components/implementation/tests/unit_capmgr/Makefile
+++ b/src/components/implementation/tests/unit_capmgr/Makefile
@@ -6,7 +6,7 @@
 INTERFACE_EXPORTS =
 # The interfaces this component is dependent on for compilation (this
 # is a list of directory names in interface/)
-INTERFACE_DEPENDENCIES = capmgr
+INTERFACE_DEPENDENCIES = capmgr memmgr
 # The library dependencies this component is reliant on for
 # compilation/linking (this is a list of directory names in lib/)
 LIBRARY_DEPENDENCIES = component kernel
diff --git a/src/components/implementation/tests/unit_capmgr/unit_capmgr.c b/src/components/implementation/tests/unit_capmgr/unit_capmgr.c
index b016fc94af..5da92baeb4 100644
--- a/src/components/implementation/tests/unit_capmgr/unit_capmgr.c
+++ b/src/components/implementation/tests/unit_capmgr/unit_capmgr.c
@@ -27,7 +27,7 @@ __test_thd_fn(void *d)
 static void
 test_thds(void)
 {
-	int i = 0;
+	word_t i = 0;
 	thdid_t tid;
 	int failure = 0;
 
diff --git a/src/components/implementation/tests/unit_defcompinfo/unit_defcompinfo.c b/src/components/implementation/tests/unit_defcompinfo/unit_defcompinfo.c
index bd77eefc55..e9b14c89e8 100644
--- a/src/components/implementation/tests/unit_defcompinfo/unit_defcompinfo.c
+++ b/src/components/implementation/tests/unit_defcompinfo/unit_defcompinfo.c
@@ -32,7 +32,7 @@ struct cos_aep_info test_aep[TEST_NAEPS];
 static void
 aep_thd_fn(arcvcap_t rcv, void *data)
 {
-	printc("\tSwitched to aep %d\n", (int)data);
+	printc("\tSwitched to aep %lu\n", (word_t)data);
 	while (1) {
 		cos_rcv(rcv, 0, NULL);
 	}
@@ -41,7 +41,8 @@ aep_thd_fn(arcvcap_t rcv, void *data)
 static void
 test_aeps(void)
 {
-	int                  i, ret;
+	word_t               i;
+	int                  ret;
 	int                  blocked;
 	cycles_t             cycs;
 	thdid_t              tid;
@@ -54,7 +55,7 @@ test_aeps(void)
 	for (i = 0; i < TEST_NAEPS; i++) {
 		asndcap_t snd;
 
-		printc("\tCreating AEP [%d]\n", i);
+		printc("\tCreating AEP [%lu]\n", i);
 		ret = cos_aep_tcap_alloc(&(test_aep[i]), BOOT_CAPTBL_SELF_INITTCAP_BASE, aep_thd_fn, (void *)i);
 		assert(ret == 0);
 
@@ -176,7 +177,7 @@ cos_init(void)
 				assert(src_pg);
 				memcpy((void *)src_pg, (void *)(BOOT_MEM_VM_BASE + addr), PAGE_SIZE);
 
-				dst_pg = cos_mem_alias(child_ci, ci, src_pg);
+				dst_pg = cos_mem_alias(child_ci, ci, src_pg, COS_PAGE_READABLE | COS_PAGE_WRITABLE);
 				assert(dst_pg);
 			}
 
diff --git a/src/components/implementation/tests/unit_memmgr/Makefile b/src/components/implementation/tests/unit_memmgr/Makefile
new file mode 100644
index 0000000000..e16cc22296
--- /dev/null
+++ b/src/components/implementation/tests/unit_memmgr/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init memmgr
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES =
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/unit_memmgr/unit_memmgr.c b/src/components/implementation/tests/unit_memmgr/unit_memmgr.c
new file mode 100644
index 0000000000..100681b772
--- /dev/null
+++ b/src/components/implementation/tests/unit_memmgr/unit_memmgr.c
@@ -0,0 +1,52 @@
+#include <cos_types.h>
+#include <memmgr.h>
+
+
+static void
+test_alignment()
+{
+	void *ptr;
+	int   i;
+	int   failure = 0;
+
+	for (i = 12; i < 22; i++) {
+		ptr = (void *)memmgr_heap_page_allocn_aligned(3, 1 << i);
+		if ((unsigned long)ptr % 1 << i != 0) {
+			failure = 1;
+			break;
+		}
+		
+	}
+
+	printc("%s: Aligned memory allocation is properly aligned\n", (failure) ? "FAILURE" : "SUCCESS");
+}
+
+static void
+test_aligned_allocation_continuity()
+{
+	int   i;
+	int   n = 5;
+	char *ptr;
+
+	/*
+	 * making sure we dont fault between pages 
+	 *(that pages are still contiguous with the alignment)
+	 */
+	for (i = 12; i < 22; i++) {
+		ptr = (char *)memmgr_heap_page_allocn_aligned(n, 1 << i);
+		for (i = 0; i < n*4096; i++) {
+			ptr[i] = '\1';
+		}
+	}	
+
+	printc("SUCCESS: Aligned memory allocation is continguous across pages\n");
+
+}
+
+int
+main(void)
+{
+	test_alignment();
+	test_aligned_allocation_continuity();
+	return 0;
+}
diff --git a/src/components/implementation/tests/unit_pingpong/ping.c b/src/components/implementation/tests/unit_pingpong/ping.c
index dd28ad3626..b3c94c0d5c 100644
--- a/src/components/implementation/tests/unit_pingpong/ping.c
+++ b/src/components/implementation/tests/unit_pingpong/ping.c
@@ -10,22 +10,41 @@ volatile ps_tsc_t fast_path, all_args;
 void
 cos_init(void)
 {
-	int r0 = 0, r1 = 0;
+	word_t r0 = 0, r1 = 0;
 	unsigned long r3 = 0;
 	compid_t us, them;
 	thdid_t tid;
 	int i;
 	ps_tsc_t begin, end;
+	long long a = (long long)3 << 32 | (long long)1;
+	long long b = (long long)4 << 32 | (long long)2;
+	int ret;
+	long long ret_ll;
 
 	printc("Ping component %ld: cos_init execution\n", cos_compid());
 
 	pong_call();
-	assert(pong_ret() == 42);
-	assert(pong_arg(1024) == 1024);
-	assert(pong_args(1, 2, 3, 4) == 10);
-	assert(pong_argsrets(4, 3, 2, 1, &r0, &r1) == 3);
+	ret = pong_ret();
+	assert(ret == 42);
+	ret = pong_arg(1024);
+	assert(ret == 1024);
+	ret = pong_args(1, 2, 3, 4);
+	assert(ret == 10);
+	ret = pong_argsrets(4, 3, 2, 1, &r0, &r1);
+	assert(ret == 3);
 	assert(r0 == 4 && r1 == 3);
-	assert(pong_subset(8, 16, &r3) == -24 && r3 == 24);
+	ret = pong_wideargs(a, b);
+	assert(ret == -1);
+	ret_ll = pong_widerets(a, b);
+	assert(ret_ll == (a + b));
+	a = 1;
+	b = 2;
+	ret = pong_wideargs(a, b);
+	assert(ret == (int)(a + b));
+	ret_ll = pong_widerets(a, b);
+	assert(ret_ll == (a + b));
+	ret = pong_subset(8, 16, &r3);
+	assert(ret == -24 && r3 == 24);
 	tid = pong_ids(&us, &them);
 	assert(cos_thdid() == tid && us != them && us == cos_compid());
 
diff --git a/src/components/implementation/tests/unit_pingshmem/Makefile b/src/components/implementation/tests/unit_pingshmem/Makefile
new file mode 100644
index 0000000000..9a36bafe1f
--- /dev/null
+++ b/src/components/implementation/tests/unit_pingshmem/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init memmgr pongshmem
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = shm_bm
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/unit_pingshmem/ping.c b/src/components/implementation/tests/unit_pingshmem/ping.c
new file mode 100644
index 0000000000..fe3b3048b1
--- /dev/null
+++ b/src/components/implementation/tests/unit_pingshmem/ping.c
@@ -0,0 +1,310 @@
+#include <cos_types.h>
+#include <pongshmem.h>
+#include <shm_bm.h>
+#include <string.h>
+
+char *ping_test_strings[] = {
+	"PING TEST 1",
+	"PING TEST 2",
+	"PING TEST 3",
+	"PING TEST 4",
+};
+
+char *pong_test_strings[] = {
+	"PONG TEST 1",
+	"PONG TEST 2",
+	"PONG TEST 3",
+	"PONG TEST 4",
+};
+
+shm_bm_t shm;
+
+void 
+ping_test_objread(void)
+{
+	struct obj_test *obj;
+	shm_bm_objid_t   objid = 0;
+	int              i, failure; 
+
+	/* reset memory for test */
+	shm_bm_init_testobj(shm);
+
+	for (i = 0; i < 4; i++) {
+		/* allocate an object from shared mem buffer */
+		obj = (struct obj_test *)shm_bm_alloc_testobj(shm, &objid);
+		printc("%s: (%d) Ping can allocate object from shared buffer\n", (obj == NULL) ? "FAILURE" : "SUCCESS", i+1);
+		
+		/* send the obj to pong */
+		strcpy(obj->string, ping_test_strings[i]);
+		pongshmem_test_objread(objid, i);
+
+		/* pong should have read and changed the object data */
+		failure = strcmp(obj->string, pong_test_strings[i]) != 0;
+		printc("%s: (%d) Ping can read data from pong\n", (failure) ? "FAILURE" : "SUCCESS", i+1);
+	}
+}
+
+void
+ping_test_bigalloc(void)
+{
+	struct obj_test *obj;
+	shm_bm_objid_t   objid;
+	int              i;
+	int              failure = 0;
+
+	/* reset memory for test */
+	shm_bm_init_testobj(shm);
+
+	for (i = 0; i < BENCH_ITER; i++) {
+		if ((obj = shm_bm_alloc_testobj(shm, &objid)) == NULL) {
+			failure = 1;
+			goto done;
+		}
+		obj->id = i;
+	}
+
+	for (i = 0; i < BENCH_ITER; i++) {
+		pongshmem_bench_objread((shm_bm_objid_t)i); 	
+	}
+
+done:
+	printc("%s: Ping can allocate from big shared buffer\n", (failure) ? "FAILURE" : "SUCCESS");
+	
+	failure = shm_bm_alloc_testobj(shm, &objid) != NULL;
+	printc("%s: Ping can't allocate from full big shared buffer\n", (failure) ? "FAILURE" : "SUCCESS");
+}
+
+void
+ping_test_objfree(void)
+{
+	shm_bm_objid_t   objid;
+	const char      *teststr = "test string";
+	struct obj_test *obj1, *obj2;
+	int              failure, i;
+
+	/* reset memory for test */
+	shm_bm_init_testobj(shm);
+
+	/* sanity check, allocate and free an object */
+	obj1 = shm_bm_alloc_testobj(shm, &objid);
+	shm_bm_free_testobj(obj1);
+	/* we should get the same object in the buffer */
+	obj2 = shm_bm_alloc_testobj(shm, &objid);
+	failure = obj1 != obj2 && obj1 != NULL;
+
+	printc("%s: Ping can free an allocated obj from the buffer\n", (failure) ? "FAILURE" : "SUCCESS");
+	shm_bm_free_testobj(obj2);
+
+	/* allocate the whole buffer */
+	failure = 0;
+	for (i = 0; i < BENCH_ITER-2; i++) {
+		if (shm_bm_alloc_testobj(shm, &objid) == NULL) {
+			failure = 1;
+			goto done;
+		}
+	}
+
+	obj1 = shm_bm_alloc_testobj(shm, &objid);
+	obj2 = shm_bm_alloc_testobj(shm, &objid);
+
+	/* buffer should be full */
+	if (shm_bm_alloc_testobj(shm, &objid) != NULL) {
+		failure = 1;
+		goto done;
+	}
+
+	shm_bm_free_testobj(obj1);
+	shm_bm_free_testobj(obj2);
+
+	/* should be 2 more free objects now */
+	if (shm_bm_alloc_testobj(shm, &objid) == NULL) {
+		failure = 1;
+		goto done;
+	}
+	if (shm_bm_alloc_testobj(shm, &objid) == NULL) {
+		failure = 1;
+		goto done;
+	}
+
+	/* buffer should be full */
+	if (shm_bm_alloc_testobj(shm, &objid) != NULL) {
+		failure = 1;
+		goto done;
+	}
+
+done:
+	printc("%s: Ping can free objects in the buffer and reuse them\n", (failure) ? "FAILURE" : "SUCCESS");
+}
+
+void
+ping_test_bigfree(void)
+{
+	struct obj_test **obj_ptrs;
+	shm_bm_objid_t    objid;
+	int               i, npages;
+	int               failure = 0;
+
+	/* 
+	 * need some heap space to store all the pointer
+	 * we are about to create (too big for the stack)
+	 */
+	npages = (sizeof(void *) * BENCH_ITER) / PAGE_SIZE + 1; 
+	obj_ptrs = (struct obj_test **)memmgr_heap_page_allocn(npages);
+
+	/* reset memory for test */
+	shm_bm_init_testobj(shm);
+
+	/* allocate whole buffer */
+	for (i = 0; i < BENCH_ITER; i++) {
+		if ((obj_ptrs[i] = shm_bm_alloc_testobj(shm, &objid)) == NULL) {
+			failure = 1;
+			goto done;
+		}
+		obj_ptrs[i]->id = i;
+	}
+
+	/* check the whole buffer */
+	for (i = 0; i < BENCH_ITER; i++) {
+		pongshmem_bench_objread((shm_bm_objid_t)i); 	
+	}
+	/* free the whole buffer */
+	for (i = 0; i < BENCH_ITER; i++) {
+		shm_bm_free_testobj(obj_ptrs[i]);
+	}
+
+	/* reallocate whole buffer */
+	for (i = 0; i < BENCH_ITER; i++) {
+		if ((obj_ptrs[i] = shm_bm_alloc_testobj(shm, &objid)) == NULL) {
+			failure = 1;
+			goto done;
+		}
+		obj_ptrs[i]->id = i;
+	}
+
+	/* recheck the whole buffer */
+	for (i = 0; i < BENCH_ITER; i++) {
+		pongshmem_bench_objread((shm_bm_objid_t)i); 	
+	}
+
+
+done:
+	printc("%s: Ping can allocate and reallocate from big shared buffer\n", (failure) ? "FAILURE" : "SUCCESS");
+	
+}
+
+void 
+ping_test_refcnt(void)
+{
+	shm_bm_objid_t   objid = 0;
+	struct obj_test *obj, *obj2;
+	int              i, failure; 
+	const char      *teststr = "test string";
+
+	/* reset memory for test */
+	shm_bm_init_testobj(shm);
+
+	failure = 0;
+
+	/* allocate an object from the buffer */
+	obj = shm_bm_alloc_testobj(shm, &objid); 
+	strcpy(obj->string, teststr);
+
+	/*
+	 * pong gets a reference to object and frees it
+	 * but the object should not be deallocated bc we 
+	 * still hold a reference
+	 */ 
+	pongshmem_test_refcnt(objid);
+
+	/*
+	 * we still hold a reference to obj, so we should not
+	 * should not get a reference to it when we allocate
+	 * a new object
+	 */
+	obj2 = shm_bm_alloc_testobj(shm, &objid); 
+	if (obj2 == obj) {
+		failure = 1;
+		goto done;
+	}
+
+	shm_bm_free_testobj(obj);
+
+	/*
+	 * now that we have also freed the object, we should 
+	 * get a reference to the same object if we realloc
+	 */
+	obj2 = shm_bm_alloc_testobj(shm, &objid); 
+	if (obj2 != obj) failure = 1;
+
+done:
+	printc("%s: Reference counts prevent freeing object in-use\n", (failure) ? "FAILURE" : "SUCCESS");
+}
+
+void
+ping_bench_syncinv(void)
+{
+	ps_tsc_t         begin, end, bench;
+	int              i;
+
+	begin = ps_tsc();
+	for (i = 0; i < BENCH_ITER; i++) {
+		pongshmem_bench_syncinv((unsigned long) i);
+	}
+	end = ps_tsc();
+	bench = (end - begin) / BENCH_ITER;
+	printc("BENCHMARK Regular syncronous invocation: %llu cycles\n", bench);
+}
+
+void
+ping_bench_msgpassing(void)
+{
+	shm_bm_objid_t   objid = 0;
+	struct obj_test *obj;
+	ps_tsc_t         begin, end, bench;
+	int              i;
+
+	/* reset memory for test */
+	shm_bm_init_testobj(shm);
+
+	begin = ps_tsc();
+	for (i = 0; i < BENCH_ITER; i++) {
+		/* allocate an obj from shared mem */
+		obj = shm_bm_alloc_testobj(shm, &objid);
+		/* send obj to server, server borrows it */
+		obj->id = objid;
+		pongshmem_bench_objread(objid);
+	}
+	end = ps_tsc();
+	bench = (end - begin) / BENCH_ITER;
+	printc("BENCHMARK Message passing: %llu cycles\n", bench);
+}
+
+int
+main(void)
+{
+	void  *mem;
+	cbuf_t id;
+	size_t shmsz;
+
+	shmsz = round_up_to_page(shm_bm_size_testobj());
+	id = memmgr_shared_page_allocn_aligned(shmsz/PAGE_SIZE, SHM_BM_ALIGN, (vaddr_t *)&mem);
+	shm = shm_bm_create_testobj(mem, shmsz);
+	if (!shm) {
+		printc("FAILURE: could not create shm from allocated memory\n");
+		return 1;
+	}
+	shm_bm_init_testobj(shm);
+	pongshmem_test_map(id);
+
+	ping_test_objread();
+	ping_test_bigalloc();
+	ping_test_objfree();
+	ping_test_bigfree();
+	ping_test_refcnt();
+
+	ping_bench_syncinv();
+	ping_bench_msgpassing();
+
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/unit_pingshvas/Makefile b/src/components/implementation/tests/unit_pingshvas/Makefile
new file mode 100644
index 0000000000..1fb31ee092
--- /dev/null
+++ b/src/components/implementation/tests/unit_pingshvas/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = 
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init pongshvas
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES =
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/unit_pingshvas/doc.md b/src/components/implementation/tests/unit_pingshvas/doc.md
new file mode 100644
index 0000000000..293a058143
--- /dev/null
+++ b/src/components/implementation/tests/unit_pingshvas/doc.md
@@ -0,0 +1,7 @@
+## tests
+
+Basic ping pong test for shared namespaces. Includes a call to `pongshvas_send` which has the server send the value of a shared variable to the client (useful for testing if the alias functionality works) and `pongshvas_rcv_and_update`, which has the client send a pointer variable to the server, which the server then deferences and updates (useful for testing with servers and clients that are in the same shared namespace)
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/implementation/tests/unit_pingshvas/ping.c b/src/components/implementation/tests/unit_pingshvas/ping.c
new file mode 100644
index 0000000000..5ed4d8f2e6
--- /dev/null
+++ b/src/components/implementation/tests/unit_pingshvas/ping.c
@@ -0,0 +1,42 @@
+#include <cos_kernel_api.h>
+#include <cos_types.h>
+#include <pongshvas.h>
+
+#define ITER 1024
+
+volatile ps_tsc_t fast_path, all_args;
+
+void
+cos_init(void)
+{
+	word_t r0 = 0, r1 = 0;
+	unsigned long r3 = 0;
+	compid_t us, them;
+	thdid_t tid;
+	int i;
+	ps_tsc_t begin, end;
+	long long a = (long long)3 << 32 | (long long)1;
+	long long b = (long long)4 << 32 | (long long)2;
+	int ret;
+	long long ret_ll;
+	unsigned long * shared;
+
+	printc("Shared VAS Ping component %ld: cos_init execution\n", cos_compid());
+
+	shared = pongshvas_send();
+	assert(*shared == 42);
+	/* this is left commented out bc in the current booter format client and server aren't in shared VAS (so rcv_and_update would crash)
+	 * pongshvas_rcv_and_update(shared);
+	 * assert(*shared == 52);
+	 */
+	
+	return;
+}
+
+int
+main(void)
+{
+	printc("Shared VAS Ping component %ld: main execution\n", cos_compid());
+
+	return 0;
+}
diff --git a/src/components/implementation/tests/unit_pongshmem/Makefile b/src/components/implementation/tests/unit_pongshmem/Makefile
new file mode 100644
index 0000000000..01f0a0760a
--- /dev/null
+++ b/src/components/implementation/tests/unit_pongshmem/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = pongshmem
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init memmgr
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = shm_bm
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/unit_pongshmem/pong.c b/src/components/implementation/tests/unit_pongshmem/pong.c
new file mode 100644
index 0000000000..4234a7c22d
--- /dev/null
+++ b/src/components/implementation/tests/unit_pongshmem/pong.c
@@ -0,0 +1,87 @@
+#include <cos_types.h>
+#include <memmgr.h>
+#include <pongshmem.h>
+#include <shm_bm.h>
+#include <string.h>
+
+shm_bm_t shm;
+
+char *ping_test_strings[] = {
+	"PING TEST 1",
+	"PING TEST 2",
+	"PING TEST 3",
+	"PING TEST 4",
+};
+
+char *pong_test_strings[] = {
+	"PONG TEST 1",
+	"PONG TEST 2",
+	"PONG TEST 3",
+	"PONG TEST 4",
+};
+
+void 
+pongshmem_test_map(cbuf_t shmid)
+{
+	unsigned long npages;
+	void         *mem;
+
+	npages = memmgr_shared_page_map_aligned(shmid, SHM_BM_ALIGN, (vaddr_t *)&mem);
+
+	shm = shm_bm_create_testobj(mem, npages * PAGE_SIZE);
+
+	printc("%s: Shared memory mapped in pong\n", (shm == 0) ? "FAILURE" : "SUCCESS");
+}
+
+void
+pongshmem_test_objread(shm_bm_objid_t objid, int test_string)
+{
+	struct obj_test *obj;
+	int              failure; 
+
+	/* get a reference to shared object sent from ping */
+	obj = (struct obj_test *)shm_bm_take_testobj(shm, objid);
+	printc("%s: (%d) Pong can get shared object from buffer\n", (obj == 0) ? "FAILURE" : "SUCCESS", test_string+1);
+	
+	/* verify that we can read data from ping */
+	failure = strcmp(obj->string, ping_test_strings[test_string]) != 0;
+	printc("%s: (%d) Pong can read data from ping\n", (failure) ? "FAILURE" : "SUCCESS", test_string+1);
+
+	/* send new data to ping */
+	strcpy(obj->string, pong_test_strings[test_string]);
+}
+
+void
+pongshmem_test_refcnt(shm_bm_objid_t objid)
+{
+	struct obj_test *obj;
+	int              failure; 
+
+	/* get a reference to shared object sent from ping */
+	obj = (struct obj_test *)shm_bm_take_testobj(shm, objid);
+	if (obj == 0) {
+		printc("FAILURE: Pong can get shared object from buffer\n");
+		return;
+	}
+
+	shm_bm_free_testobj(obj);
+}
+
+unsigned long global_word;
+
+void
+pongshmem_bench_syncinv(unsigned long word) 
+{
+	global_word = word;
+}
+
+void
+pongshmem_bench_objread(shm_bm_objid_t objid)
+{
+	struct obj_test *obj;
+
+	/* get a reference to shared object sent from ping */
+	obj = (struct obj_test *)shm_bm_borrow_testobj(shm, objid);
+	assert(obj->id == (signed int)objid);
+}
+
diff --git a/src/components/implementation/tests/unit_pongshvas/Makefile b/src/components/implementation/tests/unit_pongshvas/Makefile
new file mode 100644
index 0000000000..79b47d749f
--- /dev/null
+++ b/src/components/implementation/tests/unit_pongshvas/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = pongshvas
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = init
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = 
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/unit_pongshvas/doc.md b/src/components/implementation/tests/unit_pongshvas/doc.md
new file mode 100644
index 0000000000..68560c8d20
--- /dev/null
+++ b/src/components/implementation/tests/unit_pongshvas/doc.md
@@ -0,0 +1,9 @@
+## tests
+
+This is the skeleton interface used by the `mkcomponent.sh` script to aid in the creation of a new component.
+It provides no functionality, and should never be depended on!
+This documentation should be *replaced* in the documentation for a new component.
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/implementation/tests/unit_pongshvas/pong.c b/src/components/implementation/tests/unit_pongshvas/pong.c
new file mode 100644
index 0000000000..352f17f72a
--- /dev/null
+++ b/src/components/implementation/tests/unit_pongshvas/pong.c
@@ -0,0 +1,59 @@
+#include <cos_types.h>
+#include <pongshvas.h>
+#include <barrier.h>
+
+/* Test the initialization order, and its relationship to ping */
+typedef enum {
+	PONG_UNINIT,
+	PONG_INIT,
+	PONG_PARINIT,
+	PONG_PARMAIN
+} pong_init_state_t;
+
+volatile pong_init_state_t state = PONG_UNINIT;
+struct simple_barrier init_barrier = SIMPLE_BARRIER_INITVAL;
+volatile coreid_t initcore;
+struct simple_barrier main_barrier = SIMPLE_BARRIER_INITVAL;
+unsigned long shared = 42;
+
+void
+cos_init(void)
+{
+	assert(state == PONG_UNINIT);
+	printc("Pong Shared VAS component %ld: cos_init\n", cos_compid());
+	state = PONG_INIT;
+}
+
+void
+cos_parallel_init(coreid_t cid, int init_core, int ncores)
+{
+	assert(state == PONG_INIT);
+	simple_barrier(&init_barrier);
+	if (init_core) {
+		printc("Pong Shared VAS component %ld: cos_parallel_init on core %d (of %d)\n", cos_compid(), cid, ncores);
+		initcore = cid;
+	}
+
+	state = PONG_PARINIT;
+}
+
+void
+parallel_main(coreid_t cid)
+{
+	assert(state == PONG_PARINIT);
+	simple_barrier(&main_barrier);
+	if (cos_coreid() == initcore) printc("Pong Shared VAS component %ld: parallel main\n", cos_compid());
+	state = PONG_PARMAIN;
+}
+
+unsigned long *
+pongshvas_send(void) 
+{
+	return &shared;
+}
+
+void
+pongshvas_rcv_and_update(unsigned long *shared)
+{
+	*shared += 10;
+}
\ No newline at end of file
diff --git a/src/components/implementation/tests/unit_schedtests/unit_schedlib.c b/src/components/implementation/tests/unit_schedtests/unit_schedlib.c
index a72b54228c..4b063d5e82 100644
--- a/src/components/implementation/tests/unit_schedtests/unit_schedlib.c
+++ b/src/components/implementation/tests/unit_schedtests/unit_schedlib.c
@@ -34,9 +34,9 @@ void
 test_thd_fn(void *data)
 {
 	while (1) {
-		int workiters = WORKITERS * ((int)data);
+		int workiters = WORKITERS * ((word_t)data);
 
-		printc("%d", (int)data);
+		printc("%lu", (word_t)data);
 		SPIN(workiters);
 		sl_thd_yield(0);
 	}
diff --git a/src/components/implementation/tests/unit_tmr/Makefile b/src/components/implementation/tests/unit_tmr/Makefile
new file mode 100644
index 0000000000..19f493c41a
--- /dev/null
+++ b/src/components/implementation/tests/unit_tmr/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS =
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = tmrmgr evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component ps tmr
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tests/unit_tmr/doc.md b/src/components/implementation/tests/unit_tmr/doc.md
new file mode 100644
index 0000000000..b6de024ffd
--- /dev/null
+++ b/src/components/implementation/tests/unit_tmr/doc.md
@@ -0,0 +1,7 @@
+## tests
+
+Unit test for timer.
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/implementation/tests/unit_tmr/unit_tmr.c b/src/components/implementation/tests/unit_tmr/unit_tmr.c
new file mode 100644
index 0000000000..3d315c9777
--- /dev/null
+++ b/src/components/implementation/tests/unit_tmr/unit_tmr.c
@@ -0,0 +1,60 @@
+#include <cos_component.h>
+#include <llprint.h>
+#include <evt.h>
+#include <tmr.h>
+
+/***
+ * The timer test. You can set up periodic and one-shot timers here.
+ */
+
+#define TMR_ONESHOT_TIME	(5000000U)
+#define TMR_PERIODIC_TIME	(2000000U)
+
+/**
+ * The timer event source. Here we'd only have one type of event.
+ */
+enum {
+	MY_TIMER_SRC_T  = 1
+};
+
+int
+main(void)
+{
+	struct tmr t;
+	struct evt e;
+	evt_res_id_t evt_id;
+	
+	printc("Call into timer manager to make a timer.\n");
+	assert(tmr_init(&t, TMR_PERIODIC_TIME, TMR_PERIODIC) == 0);
+
+	printc("Call into event manager to make a event.\n");
+	assert(evt_init(&e, 2) == 0);
+	
+	/*
+	 * Add the timer event to the event set, the associate the timer with that event ID so
+	 * the timer manager knows which event to trigger when the timer expires. 
+	 */
+	evt_id = evt_add(&e, MY_TIMER_SRC_T, (evt_res_data_t)&t);
+	assert(evt_id !=0);
+	assert(tmr_evt_associate(&t, evt_id) == 0);
+	
+	/* Start the timer */
+	assert(tmr_start(&t) == 0);
+
+	/* Event loop */
+ 	while (1) {
+		evt_res_data_t evtdata;
+		evt_res_type_t  evtsrc;
+		if (evt_get(&e, EVT_WAIT_DEFAULT, &evtsrc, &evtdata)) return -EINVAL;
+		assert(evtsrc == MY_TIMER_SRC_T);
+		printc("Periodic timer fired.\n");
+	}
+
+	return 0;
+}
+
+void
+cos_init(void)
+{
+	printc("Timer testbench init.\n");
+}
diff --git a/src/components/implementation/tmrmgr/Makefile b/src/components/implementation/tmrmgr/Makefile
new file mode 100644
index 0000000000..85f5416a88
--- /dev/null
+++ b/src/components/implementation/tmrmgr/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = tmrmgr
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = memmgr sched evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component kernel crt tmr
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subdir
diff --git a/src/components/implementation/tmrmgr/simple/Makefile b/src/components/implementation/tmrmgr/simple/Makefile
new file mode 100644
index 0000000000..b2042a9792
--- /dev/null
+++ b/src/components/implementation/tmrmgr/simple/Makefile
@@ -0,0 +1,18 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The set of interfaces that this component exports for use by other
+# components. This is a list of the interface names.
+INTERFACE_EXPORTS = tmrmgr
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = sched evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component kernel crt tmr
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subsubdir
diff --git a/src/components/implementation/tmrmgr/simple/doc.md b/src/components/implementation/tmrmgr/simple/doc.md
new file mode 100644
index 0000000000..a157c7e115
--- /dev/null
+++ b/src/components/implementation/tmrmgr/simple/doc.md
@@ -0,0 +1,9 @@
+## tmr
+
+This is the skeleton interface used by the `mkcomponent.sh` script to aid in the creation of a new component.
+It provides no functionality, and should never be depended on!
+This documentation should be *replaced* in the documentation for a new component.
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/implementation/tmrmgr/simple/tmrmgr.c b/src/components/implementation/tmrmgr/simple/tmrmgr.c
new file mode 100644
index 0000000000..67dc68e426
--- /dev/null
+++ b/src/components/implementation/tmrmgr/simple/tmrmgr.c
@@ -0,0 +1,232 @@
+#include <cos_component.h>
+#include <llprint.h>
+#include <consts.h>
+#include <ps.h>
+#include <sched.h>
+
+#include <tmr.h>
+#include <tmrmgr.h>
+#include <static_slab.h>
+#include <heap.h>
+
+#define MAX_NUM_TMR 32
+#define MIN_USECS_LIMIT 1000
+
+#undef TMR_TRACE_DEBUG
+#ifdef TMR_TRACE_DEBUG
+#define debug(format, ...) printc(format, ##__VA_ARGS__)
+#else
+#define debug(format, ...)
+#endif
+
+struct tmr_info {
+	unsigned int index;
+	cycles_t timeout_cyc;
+	unsigned int usecs;
+	tmr_flags_t flags;
+	evt_res_id_t evt_id;
+};
+
+SS_STATIC_SLAB(timer, struct tmr_info, MAX_NUM_TMR);
+struct heap* timer_active;
+unsigned int timer_heap[sizeof(struct heap) / sizeof(unsigned int) + MAX_NUM_TMR];
+thdid_t main_thdid;
+unsigned long modifying;
+
+tmr_id_t
+tmrmgr_create(unsigned int usecs, tmr_flags_t flags)
+{
+	tmr_id_t id;
+	struct tmr_info* t;
+	
+	t = ss_timer_alloc();
+	if (!t) return 0;
+	
+	id = ss_timer_id(t);
+	
+	t->usecs = usecs;
+	t->flags = flags;
+	t->timeout_cyc = 0;
+	t->evt_id = 0;
+	
+	if (t->usecs < MIN_USECS_LIMIT) t->usecs = MIN_USECS_LIMIT;
+	
+	debug("Timer manager: timer created, id %d, usecs %d, flags %d\n", id, usecs, flags);
+	
+	ss_timer_activate(t);
+	
+	return id;
+}
+
+/**
+ * Start the timer. The timer must be manually started after creation, no matter if it is
+ * periodic or one-shot. One-shot timers can be started over and over again. Also, we may
+ * not start a timer if it is not associated with a event.
+ */
+int
+tmrmgr_start(tmr_id_t id)
+{
+	cycles_t wakeup;
+	struct tmr_info *t;
+	unsigned int lock;
+
+	debug("Timer manager: timer start, id %d\n", id);
+	t = ss_timer_get(id);
+	if (!t) return -1;
+	if (t->evt_id == 0) return -1;
+	if (t->timeout_cyc != 0) return -1;
+
+	lock = ps_faa(&modifying, 1);
+	if (lock == 0) {
+		t->timeout_cyc = time_now() + time_usec2cyc(t->usecs);
+		assert(heap_add(timer_active, t) == 0);
+		ps_faa(&modifying, -1);
+	} else return -2;
+
+	sched_thd_wakeup(main_thdid);
+
+	return 0;
+}
+
+/**
+ * Stop the timer. Nothing will happen if we try to stop a timer that is already stopped.
+ */
+int
+tmrmgr_stop(tmr_id_t id)
+{
+	cycles_t wakeup;
+	struct tmr_info *t;
+	unsigned int lock;
+
+	debug("Timer manager: timer stop, id %d\n", id);
+	t = ss_timer_get(id);
+	if (!t) return -1;
+	if (t->timeout_cyc == 0) return -1;
+
+	lock = ps_faa(&modifying, 1);
+	if (lock == 0) {
+		heap_remove(timer_active, t->index);
+		t->timeout_cyc = 0;
+		ps_faa(&modifying, -1);
+	} else return -2;
+
+	sched_thd_wakeup(main_thdid);
+
+	return 0;
+}
+
+int
+tmrmgr_delete(tmr_id_t id)
+{
+	/* TODO */
+	return -1;
+}
+
+int
+tmrmgr_evt_set(tmr_id_t id, evt_res_id_t rid)
+{
+	struct tmr_info *t;
+
+	debug("Timer manager: timer event set, id %d, event %d\n", id, rid);
+	t = ss_timer_get(id);
+	if (!t) return -1;
+	if (t->evt_id && rid != 0) return -1;
+
+	t->evt_id = rid;
+
+	return 0;
+}
+
+evt_res_id_t
+tmrmgr_evt_get(tmr_id_t id)
+{
+	struct tmr_info *t;
+
+	t = ss_timer_get(id);
+	if (!t) return -1;
+
+	return t->evt_id;
+}
+
+int
+main(void)
+{
+	cycles_t wakeup;
+	struct tmr_info *t;
+	
+	main_thdid=sl_thdid();
+	printc("Timer manager: executing main with thread ID %lu.\n", main_thdid);
+	
+	/* Now we do a test around sched_thd_block_timeout and see... */
+	while(1) {
+		/*
+		 * Are there any timers in queue? If there's none, we block indefinitely
+		 * until someone registers a new timer. That guy will wake us up, so we can check
+		 * whatever have happened. By default, we wakeup at least a once per second. The
+		 * accuracy of the timer is at about a millisecond. If we got a periodic timer,
+		 * we insert that guy into the queue repeatedly after its expire.
+		 */
+		if (modifying != 0) {
+			wakeup = time_now() + time_usec2cyc(1000 * 1000);
+			sched_thd_block_timeout(0, wakeup);
+			continue;
+		}
+		
+		wakeup = time_now();
+		t = heap_peek((struct heap *)timer_heap);
+		
+		if (t != NULL) {
+			/* At least one timer expired. Process all of them. */
+			while(t->timeout_cyc <= (wakeup + time_usec2cyc(MIN_USECS_LIMIT))) {
+				debug("Timer manager: id %d expired.\n", ss_timer_id(t));
+				evt_trigger(t->evt_id);
+				t = heap_highest((struct heap *)timer_heap);
+				
+				if (t->flags == TMR_PERIODIC) {
+					debug("Timer manager: added back id %d to heap.\n", ss_timer_id(t));
+					t->timeout_cyc = time_now() + time_usec2cyc(t->usecs);
+					assert(heap_add((struct heap *)timer_heap, t) == 0);
+				} else {
+					t->timeout_cyc = 0;
+				}
+				
+				t = heap_peek((struct heap *)timer_heap);
+				if (t == NULL) break;
+			}
+		}
+		
+		if (t == NULL) {
+			wakeup = time_now() + time_usec2cyc(1000 * 1000);
+			sched_thd_block_timeout(0, wakeup);
+			debug("Timer manager: idle-wakeup.\n");
+		} else {
+			wakeup = t->timeout_cyc;
+			sched_thd_block_timeout(0, wakeup);
+		}
+	}
+
+	return 0;
+}
+
+int
+timer_cmp_fn(void* a, void* b)
+{
+	return ((struct tmr_info*)a)->timeout_cyc <= ((struct tmr_info*)b)->timeout_cyc;
+}
+
+void
+timer_update_fn(void* e, int pos)
+{
+	((struct tmr_info*)e)->index = pos;
+}
+
+void
+cos_init(void)
+{
+	printc("Timer manager: init.\n");
+	
+	/* Initialize active timer heap */
+	modifying = 0;
+	timer_active = (struct heap*)timer_heap;
+	heap_init(timer_active, MAX_NUM_TMR, timer_cmp_fn, timer_update_fn);
+}
diff --git a/src/components/interface/Makefile.subdir b/src/components/interface/Makefile.subdir
index 0e89150928..5aa11b3013 100644
--- a/src/components/interface/Makefile.subdir
+++ b/src/components/interface/Makefile.subdir
@@ -23,7 +23,7 @@ $(IFLIB):$(C_OBJS)
 	@$(if $(C_OBJS), @$(AR) cr $@ $^)
 
 %.o:%.c
-	$(info |     [CC]   Compiling c file $^ into $@)
+	$(info |     [CC]   Compiling c file $< into $@)
 	@$(CC) $(CFLAGS) $(CINC) $(DEP_INC) -c -o $(@) $<
 
 variants:
@@ -38,12 +38,17 @@ clean:
 	done
 	@$(RM) -f a.out *.o *.a *.d *~
 
+# redirect error output to /dev/null so that it will not display
+# errors when cleaning, this does not affect gcc's error output when 
+# building the system because that is in a different target path
 %.d:%.c
-	@set -e; rm -f $@; \
-	$(CC) -M $(INCLUDE) $(CFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	@set +e; rm -f $@; \
+	$(CC) -M $(CFLAGS) $(CINC) $(DEP_INC) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
 	rm -f $@.$$$$
 
-SOURCE_DEPENDENCIES=$($(wildcard *.c):%.c=%.d)
+SOURCE_DEPENDENCIES=$(C_OBJS:%.o=%.d)
 
 -include $(SOURCE_DEPENDENCIES)
diff --git a/src/components/interface/Makefile.subsubdir b/src/components/interface/Makefile.subsubdir
index af02052a47..cd05db91b2 100644
--- a/src/components/interface/Makefile.subsubdir
+++ b/src/components/interface/Makefile.subsubdir
@@ -37,7 +37,7 @@ print:
 	@$(info Compiling stubs for interface: $(IFNAME), variant: $(VARIANTNAME))
 
 %.o:%.c
-	$(info |     [CC]   Compiling c file $^ into $@)
+	$(info |     [CC]   Compiling c file $< into $@)
 	@$(CC) $(CFLAGS) $(DEP_INC) -c -o $(@) $<
 
 $(S_SSTUB_OBJ):$(SSTUB_FILE)
@@ -62,12 +62,17 @@ clean:
 
 fresh: clean all
 
+# redirect error output to /dev/null so that it will not display
+# errors when cleaning, this does not affect gcc's error output when 
+# building the system because that is in a different target path
 %.d:%.c
-	@set -e; rm -f $@; \
-	@$(CC) -M $(INCLUDE) $(CFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	@set +e; rm -f $@; \
+	$(CC) -M $(CFLAGS) $(DEP_INC) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
 	rm -f $@.$$$$
 
-SOURCE_DEPENDENCIES=$($(wildcard *.c):%.c=%.d)
+SOURCE_DEPENDENCIES=$(S_CSTUBS:%.c=%.d) $(C_CSTUBS:%.c=%.d)
 
 -include $(SOURCE_DEPENDENCIES)
diff --git a/src/components/interface/capmgr/capmgr.h b/src/components/interface/capmgr/capmgr.h
index 268ec4d43e..1a5c4f8d08 100644
--- a/src/components/interface/capmgr/capmgr.h
+++ b/src/components/interface/capmgr/capmgr.h
@@ -22,6 +22,8 @@
 #include <cos_defkernel_api.h>
 #include <cos_stubs.h>
 
+void capmgr_set_tls(thdcap_t cap, void* tls_addr);
+
 thdcap_t  capmgr_initthd_create(spdid_t child, thdid_t *tid);
 thdcap_t  COS_STUB_DECL(capmgr_initthd_create)(spdid_t child, thdid_t *tid);
 
diff --git a/src/components/interface/capmgr/memmgr.h b/src/components/interface/capmgr/memmgr.h
deleted file mode 100644
index e90dfcf6a6..0000000000
--- a/src/components/interface/capmgr/memmgr.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Redistribution of this file is permitted under the BSD two clause license.
- *
- * Copyright 2018, The George Washington University
- * Author: Phani Gadepalli, phanikishoreg@gwu.edu
- */
-
-#ifndef MEMMGR_H
-#define MEMMGR_H
-
-#include <cos_types.h>
-#include <cos_component.h>
-#include <cos_stubs.h>
-
-vaddr_t memmgr_heap_page_alloc(void);
-
-vaddr_t memmgr_heap_page_allocn(unsigned long num_pages);
-vaddr_t COS_STUB_DECL(memmgr_heap_page_allocn)(unsigned long num_pages);
-
-cbuf_t  memmgr_shared_page_alloc(vaddr_t *pgaddr);
-cbuf_t  memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr);
-cbuf_t  COS_STUB_DECL(memmgr_shared_page_allocn)(unsigned long num_pages, vaddr_t *pgaddr);
-
-unsigned long memmgr_shared_page_map(cbuf_t id, vaddr_t *pgaddr);
-unsigned long COS_STUB_DECL(memmgr_shared_page_map)(cbuf_t id, vaddr_t *pgaddr);
-
-#endif /* MEMMGR_H */
diff --git a/src/components/interface/capmgr/stubs/c_stub.c b/src/components/interface/capmgr/stubs/c_stub.c
index 11676594b0..1196f543bc 100644
--- a/src/components/interface/capmgr/stubs/c_stub.c
+++ b/src/components/interface/capmgr/stubs/c_stub.c
@@ -5,14 +5,14 @@
  * Author: Phani Gadepalli, phanikishoreg@gwu.edu
  */
 
-#include <memmgr.h>
 #include <capmgr.h>
 #include <cos_thd_init.h>
 #include <cos_defkernel_api.h>
 #include <cos_stubs.h>
 
-COS_CLIENT_STUB(arcvcap_t, capmgr_rcv_create)(struct usr_inv_cap *uc, spdid_t child, thdid_t tid, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax)
+COS_CLIENT_STUB(arcvcap_t, capmgr_rcv_create, spdid_t child, thdid_t tid, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax)
 {
+	COS_CLIENT_INVCAP;
 	word_t spd_tid    = (child << 16) | tid;
 	word_t key_ipimax = (key << 16) | ipimax;
 	word_t ipiwin32b  = (u32_t)ipiwin;
@@ -20,8 +20,9 @@ COS_CLIENT_STUB(arcvcap_t, capmgr_rcv_create)(struct usr_inv_cap *uc, spdid_t ch
 	return cos_sinv(uc->cap_no, spd_tid, key_ipimax, ipiwin32b, 0);
 }
 
-COS_CLIENT_STUB(thdcap_t, capmgr_initthd_create)(struct usr_inv_cap *uc, spdid_t child, thdid_t *tid)
+COS_CLIENT_STUB(thdcap_t, capmgr_initthd_create, spdid_t child, thdid_t *tid)
 {
+	COS_CLIENT_INVCAP;
 	word_t unused, tid_ret;
 	thdcap_t ret;
 
@@ -31,8 +32,9 @@ COS_CLIENT_STUB(thdcap_t, capmgr_initthd_create)(struct usr_inv_cap *uc, spdid_t
 	return ret;
 }
 
-COS_CLIENT_STUB(thdcap_t, capmgr_thd_create_thunk)(struct usr_inv_cap *uc, thdclosure_index_t id, thdid_t *tid)
+COS_CLIENT_STUB(thdcap_t, capmgr_thd_create_thunk, thdclosure_index_t id, thdid_t *tid)
 {
+	COS_CLIENT_INVCAP;
 	word_t unused, tid_ret;
 	thdcap_t ret;
 
@@ -42,8 +44,9 @@ COS_CLIENT_STUB(thdcap_t, capmgr_thd_create_thunk)(struct usr_inv_cap *uc, thdcl
 	return ret;
 }
 
-COS_CLIENT_STUB(thdcap_t, capmgr_thd_create_ext)(struct usr_inv_cap *uc, spdid_t child, thdclosure_index_t idx, thdid_t *tid)
+COS_CLIENT_STUB(thdcap_t, capmgr_thd_create_ext, spdid_t child, thdclosure_index_t idx, thdid_t *tid)
 {
+	COS_CLIENT_INVCAP;
 	word_t unused, tid_ret;
 	thdcap_t ret;
 
@@ -53,8 +56,9 @@ COS_CLIENT_STUB(thdcap_t, capmgr_thd_create_ext)(struct usr_inv_cap *uc, spdid_t
 	return ret;
 }
 
-COS_CLIENT_STUB(thdcap_t, capmgr_aep_create_thunk)(struct usr_inv_cap *uc, struct cos_aep_info *aep, thdclosure_index_t idx, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax)
+COS_CLIENT_STUB(thdcap_t, capmgr_aep_create_thunk, struct cos_aep_info *aep, thdclosure_index_t idx, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax)
 {
+	COS_CLIENT_INVCAP;
 	word_t tcrcvret   = 0;
 	thdcap_t thd     = 0;
 	thdid_t tid      = 0;
@@ -75,8 +79,9 @@ COS_CLIENT_STUB(thdcap_t, capmgr_aep_create_thunk)(struct usr_inv_cap *uc, struc
 	return thd;
 }
 
-COS_CLIENT_STUB(thdcap_t, capmgr_aep_create_ext)(struct usr_inv_cap *uc, spdid_t child, struct cos_aep_info *aep, thdclosure_index_t idx, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax, arcvcap_t *extrcv)
+COS_CLIENT_STUB(thdcap_t, capmgr_aep_create_ext, spdid_t child, struct cos_aep_info *aep, thdclosure_index_t idx, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax, arcvcap_t *extrcv)
 {
+	COS_CLIENT_INVCAP;
 	word_t drcvtidret  = 0;
 	word_t tcrcvret    = 0;
 	thdcap_t thd       = 0;
@@ -98,8 +103,9 @@ COS_CLIENT_STUB(thdcap_t, capmgr_aep_create_ext)(struct usr_inv_cap *uc, spdid_t
 	return thd;
 }
 
-COS_CLIENT_STUB(thdcap_t, capmgr_initaep_create)(struct usr_inv_cap *uc, spdid_t child, struct cos_aep_info *aep, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax, asndcap_t *snd)
+COS_CLIENT_STUB(thdcap_t, capmgr_initaep_create, spdid_t child, struct cos_aep_info *aep, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax, asndcap_t *snd)
 {
+	COS_CLIENT_INVCAP;
 	u32_t child_owntc = (child << 16) | owntc;
 	u32_t key_ipimax  = (key << 16) >> ipimax;
 	u32_t ipiwin32b   = (u32_t)ipiwin;
diff --git a/src/components/interface/capmgr/stubs/s_stub.c b/src/components/interface/capmgr/stubs/s_stub.c
index a71bf74033..00a172801c 100644
--- a/src/components/interface/capmgr/stubs/s_stub.c
+++ b/src/components/interface/capmgr/stubs/s_stub.c
@@ -1,6 +1,5 @@
 #include <cos_stubs.h>
 #include <capmgr.h>
-#include <memmgr.h>
 
 COS_SERVER_3RET_STUB(arcvcap_t, capmgr_rcv_create)
 {
diff --git a/src/components/interface/capmgr/stubs/stubs.S b/src/components/interface/capmgr/stubs/stubs.S
index 6af692eec4..ee9fef8b34 100644
--- a/src/components/interface/capmgr/stubs/stubs.S
+++ b/src/components/interface/capmgr/stubs/stubs.S
@@ -17,6 +17,7 @@ cos_asm_stub_indirect(capmgr_aep_create_ext)
 
 cos_asm_stub_indirect(capmgr_rcv_create)
 
+cos_asm_stub(capmgr_set_tls)
 cos_asm_stub(capmgr_asnd_create)
 cos_asm_stub(capmgr_asnd_rcv_create)
 cos_asm_stub(capmgr_asnd_key_create)
diff --git a/src/components/interface/chanmgr/stubs/c_stub.c b/src/components/interface/chanmgr/stubs/c_stub.c
index 69c6f08701..8800596220 100644
--- a/src/components/interface/chanmgr/stubs/c_stub.c
+++ b/src/components/interface/chanmgr/stubs/c_stub.c
@@ -3,8 +3,9 @@
 #include <chanmgr.h>
 #include <memmgr.h>
 
-COS_CLIENT_STUB(int, chanmgr_sync_resources)(struct usr_inv_cap *uc, chan_id_t id, sched_blkpt_id_t *full, sched_blkpt_id_t *empty)
+COS_CLIENT_STUB(int, chanmgr_sync_resources, chan_id_t id, sched_blkpt_id_t *full, sched_blkpt_id_t *empty)
 {
+	COS_CLIENT_INVCAP;
 	word_t f, e;
 	int ret;
 
@@ -15,8 +16,9 @@ COS_CLIENT_STUB(int, chanmgr_sync_resources)(struct usr_inv_cap *uc, chan_id_t i
 	return ret;
 }
 
-COS_CLIENT_STUB(int, chanmgr_mem_resources)(struct usr_inv_cap *uc, chan_id_t id, cbuf_t *cb, void **mem)
+COS_CLIENT_STUB(int, chanmgr_mem_resources, chan_id_t id, cbuf_t *cb, void **mem)
 {
+	COS_CLIENT_INVCAP;
 	word_t c, _tmp;
 	int ret;
 
diff --git a/src/components/interface/evt/stubs/c_stubs.c b/src/components/interface/evt/stubs/c_stubs.c
index 1238b50abf..06a9f256fe 100644
--- a/src/components/interface/evt/stubs/c_stubs.c
+++ b/src/components/interface/evt/stubs/c_stubs.c
@@ -1,8 +1,9 @@
 #include <evt.h>
 #include <cos_stubs.h>
 
-COS_CLIENT_STUB(int, __evt_get)(struct usr_inv_cap *uc, evt_id_t id, evt_wait_flags_t flags, evt_res_type_t *src, evt_res_data_t *ret_data)
+COS_CLIENT_STUB(int, __evt_get, evt_id_t id, evt_wait_flags_t flags, evt_res_type_t *src, evt_res_data_t *ret_data)
 {
+	COS_CLIENT_INVCAP;
 	word_t s = 0, d = 0;
 	int ret;
 
diff --git a/src/components/interface/init/stubs/c_stub.c b/src/components/interface/init/stubs/c_stub.c
index 2f8f541512..ff63b7000b 100644
--- a/src/components/interface/init/stubs/c_stub.c
+++ b/src/components/interface/init/stubs/c_stub.c
@@ -15,8 +15,9 @@ static int awaiting_init = 1;
  * doesn't have a corresponding client-side stub as it only
  * orchestrates the coordination with the await_init function.
  */
-COS_CLIENT_STUB(int, init_done)(struct usr_inv_cap *uc, int parallel_init, init_main_t cont)
+COS_CLIENT_STUB(int, init_done, int parallel_init, init_main_t cont)
 {
+	COS_CLIENT_INVCAP;
 	int ret;
 
 	ret = cos_sinv(uc->cap_no, parallel_init, cont, 0, 0);
diff --git a/src/components/interface/memmgr/memmgr.h b/src/components/interface/memmgr/memmgr.h
index ed61b8e40e..9735fe75df 100644
--- a/src/components/interface/memmgr/memmgr.h
+++ b/src/components/interface/memmgr/memmgr.h
@@ -12,16 +12,29 @@
 #include <cos_component.h>
 #include <cos_stubs.h>
 
-vaddr_t memmgr_heap_page_alloc(void);
+vaddr_t       memmgr_heap_page_alloc(void);
+vaddr_t       memmgr_virt_to_phys(vaddr_t vaddr);
+vaddr_t       memmgr_map_phys_to_virt(paddr_t paddr, size_t size);
 
-vaddr_t memmgr_heap_page_allocn(unsigned long num_pages);
-vaddr_t COS_STUB_DECL(memmgr_heap_page_allocn)(unsigned long num_pages);
+vaddr_t       memmgr_heap_page_allocn(unsigned long num_pages);
+vaddr_t       COS_STUB_DECL(memmgr_heap_page_allocn)(unsigned long num_pages);
+
+vaddr_t       memmgr_heap_page_allocn_aligned(unsigned long num_pages, unsigned long align);
+vaddr_t       COS_STUB_DECL(memmgr_heap_page_allocn_aligned)(unsigned long num_pages, unsigned long align);
 
 cbuf_t        memmgr_shared_page_alloc(vaddr_t *pgaddr);
 
 cbuf_t        memmgr_shared_page_allocn(unsigned long num_pages, vaddr_t *pgaddr);
 cbuf_t        COS_STUB_DECL(memmgr_shared_page_allocn)(unsigned long num_pages, vaddr_t *pgaddr);
+
+cbuf_t        memmgr_shared_page_allocn_aligned(unsigned long num_pages, unsigned long align, vaddr_t *pgaddr);
+cbuf_t        COS_STUB_DECL(memmgr_shared_page_allocn_aligned)(unsigned long num_pages, unsigned long align, vaddr_t *pgaddr);
+
 unsigned long memmgr_shared_page_map(cbuf_t id, vaddr_t *pgaddr);
 unsigned long COS_STUB_DECL(memmgr_shared_page_map)(cbuf_t id, vaddr_t *pgaddr);
 
+unsigned long memmgr_shared_page_map_aligned(cbuf_t id, unsigned long align, vaddr_t *pgaddr);
+unsigned long COS_STUB_DECL(memmgr_shared_page_map_aligned)(cbuf_t id, unsigned long align, vaddr_t *pgaddr);
+
+
 #endif /* MEMMGR_H */
diff --git a/src/components/interface/memmgr/stubs/c_stub.c b/src/components/interface/memmgr/stubs/c_stub.c
index 23ab3fce62..86b361533c 100644
--- a/src/components/interface/memmgr/stubs/c_stub.c
+++ b/src/components/interface/memmgr/stubs/c_stub.c
@@ -2,8 +2,9 @@
 #include <cos_stubs.h>
 #include <memmgr.h>
 
-COS_CLIENT_STUB(cbuf_t, memmgr_shared_page_allocn)(struct usr_inv_cap *uc, unsigned long num_pages, vaddr_t *pgaddr)
+COS_CLIENT_STUB(cbuf_t, memmgr_shared_page_allocn, unsigned long num_pages, vaddr_t *pgaddr)
 {
+	COS_CLIENT_INVCAP;
 	word_t unused, addrret;
 	cbuf_t ret;
 
@@ -13,8 +14,9 @@ COS_CLIENT_STUB(cbuf_t, memmgr_shared_page_allocn)(struct usr_inv_cap *uc, unsig
 	return ret;
 }
 
-COS_CLIENT_STUB(unsigned long, memmgr_shared_page_map)(struct usr_inv_cap *uc, cbuf_t id, vaddr_t *pgaddr)
+COS_CLIENT_STUB(unsigned long, memmgr_shared_page_map, cbuf_t id, vaddr_t *pgaddr)
 {
+	COS_CLIENT_INVCAP;
 	word_t unused, addrret;
 	unsigned long ret;
 
@@ -23,3 +25,27 @@ COS_CLIENT_STUB(unsigned long, memmgr_shared_page_map)(struct usr_inv_cap *uc, c
 
 	return ret;
 }
+
+COS_CLIENT_STUB(cbuf_t, memmgr_shared_page_allocn_aligned, unsigned long num_pages, unsigned long align, vaddr_t *pgaddr)
+{
+	COS_CLIENT_INVCAP;
+	word_t unused, addrret;
+	cbuf_t ret;
+
+	ret = cos_sinv_2rets(uc->cap_no, num_pages, align, 0, 0, &addrret, &unused);
+	*pgaddr = addrret;
+
+	return ret;
+}
+
+COS_CLIENT_STUB(unsigned long, memmgr_shared_page_map_aligned, cbuf_t id, unsigned long align, vaddr_t *pgaddr)
+{
+	COS_CLIENT_INVCAP;
+	word_t unused, addrret;
+	unsigned long ret;
+
+	ret = cos_sinv_2rets(uc->cap_no, id, align, 0, 0, &addrret, &unused);
+	*pgaddr = addrret;
+
+	return ret;
+}
diff --git a/src/components/interface/memmgr/stubs/s_stub.c b/src/components/interface/memmgr/stubs/s_stub.c
index 08b2e38e65..b11921338a 100644
--- a/src/components/interface/memmgr/stubs/s_stub.c
+++ b/src/components/interface/memmgr/stubs/s_stub.c
@@ -6,7 +6,19 @@ COS_SERVER_3RET_STUB(cbuf_t, memmgr_shared_page_allocn)
 	return memmgr_shared_page_allocn(p0, r1);
 }
 
+COS_SERVER_3RET_STUB(cbuf_t, memmgr_shared_page_allocn_aligned)
+{
+	return memmgr_shared_page_allocn_aligned(p0, p1, r1);
+}
+
 COS_SERVER_3RET_STUB(unsigned long, memmgr_shared_page_map)
 {
 	return memmgr_shared_page_map(p0, r1);
 }
+
+COS_SERVER_3RET_STUB(unsigned long, memmgr_shared_page_map_aligned)
+{
+	return memmgr_shared_page_map_aligned(p0, p1, r1);
+}
+
+
diff --git a/src/components/interface/memmgr/stubs/stubs.S b/src/components/interface/memmgr/stubs/stubs.S
index e42e06913d..b79f44a15f 100644
--- a/src/components/interface/memmgr/stubs/stubs.S
+++ b/src/components/interface/memmgr/stubs/stubs.S
@@ -1,5 +1,10 @@
 #include <cos_asm_stubs.h>
 
 cos_asm_stub(memmgr_heap_page_allocn)
+cos_asm_stub(memmgr_heap_page_allocn_aligned)
+cos_asm_stub(memmgr_virt_to_phys)
+cos_asm_stub(memmgr_map_phys_to_virt)
 cos_asm_stub_indirect(memmgr_shared_page_allocn)
+cos_asm_stub_indirect(memmgr_shared_page_allocn_aligned)
 cos_asm_stub_indirect(memmgr_shared_page_map)
+cos_asm_stub_indirect(memmgr_shared_page_map_aligned)
diff --git a/src/components/interface/nic/Makefile b/src/components/interface/nic/Makefile
new file mode 100644
index 0000000000..62c98b7279
--- /dev/null
+++ b/src/components/interface/nic/Makefile
@@ -0,0 +1,30 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lmemmgr) into dependents. This list should be
+# "memmgr" for output files such as libmemmgr.a.
+LIBRARY_OUTPUT = 
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# memmgr) which will generate memmgr.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT = 
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments. It is unlikely you want to change this.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES =
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = stubs component
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include ../Makefile.subdir
diff --git a/src/components/interface/nic/nic.h b/src/components/interface/nic/nic.h
new file mode 100644
index 0000000000..701bb0fff2
--- /dev/null
+++ b/src/components/interface/nic/nic.h
@@ -0,0 +1,11 @@
+#ifndef NIC_H
+#define NIC_H
+
+#include <cos_types.h>
+#include <cos_component.h>
+#include <cos_stubs.h>
+
+int nic_send_packet(char* pkt, size_t pkt_size);
+int nic_bind_port(u32_t ip_addr, u16_t port, void* share_mem, size_t share_mem_sz);
+
+#endif /* NIC_H */
diff --git a/src/components/interface/nic/stubs/Makefile b/src/components/interface/nic/stubs/Makefile
new file mode 100644
index 0000000000..eaee12b7fb
--- /dev/null
+++ b/src/components/interface/nic/stubs/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.subsubdir
diff --git a/src/components/interface/nic/stubs/stubs.S b/src/components/interface/nic/stubs/stubs.S
new file mode 100644
index 0000000000..78798eac30
--- /dev/null
+++ b/src/components/interface/nic/stubs/stubs.S
@@ -0,0 +1,4 @@
+#include <cos_asm_stubs.h>
+
+cos_asm_stub(nic_send_packet)
+cos_asm_stub(nic_bind_port)
diff --git a/src/components/interface/pong/pong.h b/src/components/interface/pong/pong.h
index 7c104d0fa9..45eb44bd5f 100644
--- a/src/components/interface/pong/pong.h
+++ b/src/components/interface/pong/pong.h
@@ -7,7 +7,9 @@ void pong_call(void);
 int pong_ret(void);
 int pong_arg(int p1);
 int pong_args(int p1, int p2, int p3, int p4);
-int pong_argsrets(int p0, int p1, int p2, int p3, int *r0, int *r1);
+int pong_wideargs(long long p0, long long p1);
+int pong_argsrets(int p0, int p1, int p2, int p3, word_t *r0, word_t *r1);
+long long pong_widerets(long long p1, long long p3);
 int pong_subset(unsigned long p0, unsigned long p1, unsigned long *r0);
 thdid_t pong_ids(compid_t *client, compid_t *serv);
 
diff --git a/src/components/interface/pong/stubs/c_stub.c b/src/components/interface/pong/stubs/c_stub.c
index d38859cf7b..e4a9513c6b 100644
--- a/src/components/interface/pong/stubs/c_stub.c
+++ b/src/components/interface/pong/stubs/c_stub.c
@@ -1,18 +1,56 @@
 #include <cos_component.h>
 #include <cos_stubs.h>
 
-COS_CLIENT_STUB(int, pong_argsrets)(struct usr_inv_cap *uc, word_t p0, word_t p1, word_t p2, word_t p3, word_t *r1, word_t *r2)
+COS_CLIENT_STUB(int, pong_wideargs, long long p0, long long p1)
 {
+	COS_CLIENT_INVCAP;
+#if defined(__WORD_SIZE_64__)
+	return cos_sinv(uc->cap_no, p0, p1, 0, 0);
+#else
+	long p0h, p0l, p1h, p1l;
+
+	COS_ARG_DWORD_TO_WORD(p0, p0h, p0l);
+	COS_ARG_DWORD_TO_WORD(p1, p1h, p1l);
+
+
+	return cos_sinv(uc->cap_no, p0h, p0l, p1h, p1l);
+#endif
+}
+
+COS_CLIENT_STUB(int, pong_argsrets, word_t p0, word_t p1, word_t p2, word_t p3, word_t *r1, word_t *r2)
+{
+	COS_CLIENT_INVCAP;
+
 	return cos_sinv_2rets(uc->cap_no, p0, p1, p2, p3, r1, r2);
 }
 
-COS_CLIENT_STUB(int, pong_subset)(struct usr_inv_cap *uc, word_t p0, word_t p1, word_t *r1)
+COS_CLIENT_STUB(long long, pong_widerets, long long p0, long long p1)
 {
+	COS_CLIENT_INVCAP;
+	word_t r1 = 0, r2 = 0;
+	long long ret = 0;
+	long p0h, p0l, p1h, p1l;
+	
+	COS_ARG_DWORD_TO_WORD(p0, p0h, p0l);
+	COS_ARG_DWORD_TO_WORD(p1, p1h, p1l);
+
+	cos_sinv_2rets(uc->cap_no, p0h, p0l, p1h, p1l, &r1, &r2);
+	ret = ((long long)r1 << 32) | (long long)r2;
+
+	return ret;
+}
+
+COS_CLIENT_STUB(int, pong_subset, word_t p0, word_t p1, word_t *r1)
+{
+	COS_CLIENT_INVCAP;
 	word_t r2;
+
 	return cos_sinv_2rets(uc->cap_no, p0, p1, 0, 0, r1, &r2);
 }
 
-COS_CLIENT_STUB(word_t, pong_ids)(struct usr_inv_cap *uc, word_t *r1, word_t *r2)
+COS_CLIENT_STUB(word_t, pong_ids, word_t *r1, word_t *r2)
 {
+	COS_CLIENT_INVCAP;
+
 	return cos_sinv_2rets(uc->cap_no, 0, 0, 0, 0, r1, r2);
 }
diff --git a/src/components/interface/pong/stubs/s_stub.c b/src/components/interface/pong/stubs/s_stub.c
index 0cbca6deb2..39e017389b 100644
--- a/src/components/interface/pong/stubs/s_stub.c
+++ b/src/components/interface/pong/stubs/s_stub.c
@@ -3,7 +3,21 @@
 
 COS_SERVER_3RET_STUB(int, pong_argsrets)
 {
-	return pong_argsrets((int)p0, (int)p1, (int)p2, (int)p3, (int *)r1, (int *)r2);
+	return pong_argsrets((int)p0, (int)p1, (int)p2, (int)p3, (word_t *)r1, (word_t *)r2);
+}
+
+COS_SERVER_3RET_STUB(long long, pong_widerets)
+{
+	long long p0d, p1d;
+	long long ret;
+
+	COS_ARG_WORDS_TO_DWORD(p0, p1, p0d);
+	COS_ARG_WORDS_TO_DWORD(p2, p3, p1d);
+	ret = pong_widerets(p0d, p1d);
+	*r1 = (ret >> 32);
+	*r2 = (ret << 32) >> 32;
+
+	return 0;
 }
 
 COS_SERVER_3RET_STUB(int, pong_subset)
@@ -15,3 +29,16 @@ COS_SERVER_3RET_STUB(thdid_t, pong_ids)
 {
 	return pong_ids((compid_t *)r1, (compid_t *)r2);
 }
+
+COS_SERVER_STUB(int, pong_wideargs)
+{
+#if defined(__WORD_SIZE_64__)
+	return pong_wideargs(p0, p1);
+#else
+	long long p0d, p1d;
+
+	COS_ARG_WORDS_TO_DWORD(p0, p1, p0d);
+	COS_ARG_WORDS_TO_DWORD(p2, p3, p1d);
+	return pong_wideargs(p0d, p1d);
+#endif
+}
\ No newline at end of file
diff --git a/src/components/interface/pong/stubs/stubs.S b/src/components/interface/pong/stubs/stubs.S
index c26f809fea..9cd8e0f3ac 100644
--- a/src/components/interface/pong/stubs/stubs.S
+++ b/src/components/interface/pong/stubs/stubs.S
@@ -12,6 +12,8 @@ cos_asm_stub(pong_ret)
 cos_asm_stub(pong_arg)
 cos_asm_stub(pong_args)
 
+cos_asm_stub_indirect(pong_wideargs)
 cos_asm_stub_indirect(pong_argsrets)
+cos_asm_stub_indirect(pong_widerets)
 cos_asm_stub_indirect(pong_subset)
 cos_asm_stub_indirect(pong_ids)
diff --git a/src/components/interface/pongshmem/Makefile b/src/components/interface/pongshmem/Makefile
new file mode 100644
index 0000000000..750c353d52
--- /dev/null
+++ b/src/components/interface/pongshmem/Makefile
@@ -0,0 +1,30 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lpongshmem) into dependents. This list should be
+# "pongshmem" for output files such as libpongshmem.a.
+LIBRARY_OUTPUT = 
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# pongshmem) which will generate pongshmem.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT =
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments. It is unlikely you want to change this.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES =
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = stubs shm_bm
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subdir
diff --git a/src/components/interface/pongshmem/doc.md b/src/components/interface/pongshmem/doc.md
new file mode 100644
index 0000000000..0d2ff6419b
--- /dev/null
+++ b/src/components/interface/pongshmem/doc.md
@@ -0,0 +1,10 @@
+## pongshmem
+
+### Description
+
+This interface provides a simple way to test shared memory between two components, allowing one to pass a reference to a shared memory region to the component that implements this interface. 
+
+
+### Usage and Assumptions
+
+A component can use this interface to allocate a shared memory region and pass the cbuf_t to the component that implements this interface, which should map the region to its address space using the cbuf identifier. This should be used to varify that shared memory can be used to communicate between two components.
\ No newline at end of file
diff --git a/src/components/interface/pongshmem/pongshmem.h b/src/components/interface/pongshmem/pongshmem.h
new file mode 100644
index 0000000000..35e2f2d6d0
--- /dev/null
+++ b/src/components/interface/pongshmem/pongshmem.h
@@ -0,0 +1,23 @@
+#ifndef PONGSHMEM_H
+#define PONGSHMEM_H
+
+#include <cos_component.h>
+#include <shm_bm.h>
+
+#define BENCH_ITER 2048
+
+struct obj_test {
+	int  id;
+	char string[12];
+};
+
+SHM_BM_INTERFACE_CREATE(testobj, sizeof (struct obj_test), BENCH_ITER);
+
+void     pongshmem_test_map(cbuf_t shmid);
+void     pongshmem_test_objread(shm_bm_objid_t objid, int test_string);
+void     pongshmem_test_refcnt(shm_bm_objid_t objid);
+
+void     pongshmem_bench_syncinv(unsigned long word);
+void     pongshmem_bench_objread(shm_bm_objid_t objid);
+
+#endif
diff --git a/src/components/interface/pongshmem/stubs/Makefile b/src/components/interface/pongshmem/stubs/Makefile
new file mode 100644
index 0000000000..169aa4a0c8
--- /dev/null
+++ b/src/components/interface/pongshmem/stubs/Makefile
@@ -0,0 +1 @@
+include Makefile.subsubdir
diff --git a/src/components/interface/pongshmem/stubs/stubs.S b/src/components/interface/pongshmem/stubs/stubs.S
new file mode 100644
index 0000000000..67c19b5714
--- /dev/null
+++ b/src/components/interface/pongshmem/stubs/stubs.S
@@ -0,0 +1,10 @@
+#include <cos_asm_stubs.h>
+
+cos_asm_stub(pongshmem_test_map)
+cos_asm_stub(pongshmem_test_objread)
+cos_asm_stub(pongshmem_test_refcnt)
+
+cos_asm_stub(pongshmem_bench_syncinv)
+cos_asm_stub(pongshmem_bench_objread)
+
+
diff --git a/src/components/interface/pongshvas/Makefile b/src/components/interface/pongshvas/Makefile
new file mode 100644
index 0000000000..a751f9b7a9
--- /dev/null
+++ b/src/components/interface/pongshvas/Makefile
@@ -0,0 +1,30 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lpongshvas) into dependents. This list should be
+# "pongshvas" for output files such as libpongshvas.a.
+LIBRARY_OUTPUT = 
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# pongshvas) which will generate pongshvas.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT =
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments. It is unlikely you want to change this.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = 
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = stubs
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subdir
diff --git a/src/components/interface/pongshvas/doc.md b/src/components/interface/pongshvas/doc.md
new file mode 100644
index 0000000000..5c057dab1e
--- /dev/null
+++ b/src/components/interface/pongshvas/doc.md
@@ -0,0 +1,9 @@
+## pongshvas
+
+This is the skeleton interface used by the `mkinterface.sh` script to aid in the creation of a new interface.
+It provides no functionality, and should never be depended on!
+This documentation should be *replaced* in the documentation for a new interface.
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/interface/pongshvas/pongshvas.h b/src/components/interface/pongshvas/pongshvas.h
new file mode 100644
index 0000000000..e962481c71
--- /dev/null
+++ b/src/components/interface/pongshvas/pongshvas.h
@@ -0,0 +1,9 @@
+#ifndef PONGSHVAS_H
+#define PONGSHVAS_H
+
+#include <cos_component.h>
+
+unsigned long  *pongshvas_send(void);
+void            pongshvas_rcv_and_update(unsigned long *shared);
+
+#endif /* PONGSHVAS_H */
diff --git a/src/components/interface/pongshvas/stubs/Makefile b/src/components/interface/pongshvas/stubs/Makefile
new file mode 100644
index 0000000000..169aa4a0c8
--- /dev/null
+++ b/src/components/interface/pongshvas/stubs/Makefile
@@ -0,0 +1 @@
+include Makefile.subsubdir
diff --git a/src/components/interface/pongshvas/stubs/c_stub.c b/src/components/interface/pongshvas/stubs/c_stub.c
new file mode 100644
index 0000000000..98abaafccc
--- /dev/null
+++ b/src/components/interface/pongshvas/stubs/c_stub.c
@@ -0,0 +1,2 @@
+#include <cos_component.h>
+#include <cos_stubs.h>
diff --git a/src/components/interface/pongshvas/stubs/s_stub.c b/src/components/interface/pongshvas/stubs/s_stub.c
new file mode 100644
index 0000000000..8d9aff552c
--- /dev/null
+++ b/src/components/interface/pongshvas/stubs/s_stub.c
@@ -0,0 +1 @@
+#include <cos_stubs.h>
diff --git a/src/components/interface/pongshvas/stubs/stubs.S b/src/components/interface/pongshvas/stubs/stubs.S
new file mode 100644
index 0000000000..b8b33a40e7
--- /dev/null
+++ b/src/components/interface/pongshvas/stubs/stubs.S
@@ -0,0 +1,4 @@
+#include <cos_asm_stubs.h>
+
+cos_asm_stub(pongshvas_send)
+cos_asm_stub(pongshvas_rcv_and_update)
diff --git a/src/components/interface/sched/sched.h b/src/components/interface/sched/sched.h
index 281f931466..00b14cdd32 100644
--- a/src/components/interface/sched/sched.h
+++ b/src/components/interface/sched/sched.h
@@ -21,6 +21,8 @@
 
 #include <cos_stubs.h>
 
+int      sched_thd_yield_to(thdid_t t);
+int      COS_STUB_DECL(sched_thd_yield_to)(thdid_t t);
 int      sched_thd_wakeup(thdid_t t);
 int      COS_STUB_DECL(sched_thd_wakeup)(thdid_t t);
 int      sched_thd_block(thdid_t dep_id);
@@ -28,6 +30,9 @@ int      COS_STUB_DECL(sched_thd_block)(thdid_t dep_id);
 cycles_t sched_thd_block_timeout(thdid_t dep_id, cycles_t abs_timeout);
 cycles_t COS_STUB_DECL(sched_thd_block_timeout)(thdid_t dep_id, cycles_t abs_timeout);
 
+void     sched_set_tls(void* tls_addr);
+unsigned long sched_get_cpu_freq(void);
+
 thdid_t sched_thd_create(cos_thd_fn_t fn, void *data); /* lib.c */
 thdid_t sched_thd_create_closure(thdclosure_index_t idx);
 thdid_t COS_STUB_DECL(sched_thd_create_closure)(cos_thd_fn_t fn, void *data);
diff --git a/src/components/interface/sched/stubs/c_stub.c b/src/components/interface/sched/stubs/c_stub.c
index 5bde6a35f3..4cbdb1574a 100644
--- a/src/components/interface/sched/stubs/c_stub.c
+++ b/src/components/interface/sched/stubs/c_stub.c
@@ -9,19 +9,23 @@
 #include <cos_thd_init.h>
 #include <cos_stubs.h>
 
-COS_CLIENT_STUB(cycles_t, sched_thd_block_timeout)(struct usr_inv_cap *uc, thdid_t dep_id, cycles_t abs_timeout)
+COS_CLIENT_STUB(cycles_t, sched_thd_block_timeout, thdid_t dep_id, cycles_t abs_timeout)
 {
+	COS_CLIENT_INVCAP;
 	word_t elapsed_hi = 0, elapsed_lo = 0;
 	cycles_t elapsed_cycles = 0;
+	word_t abs_hi, abs_lo;
 
-	cos_sinv_2rets(uc->cap_no, dep_id, (u32_t)(abs_timeout >> 32), (u32_t)((abs_timeout << 32) >> 32), 0, &elapsed_hi, &elapsed_lo);
+	COS_ARG_DWORD_TO_WORD(abs_timeout, abs_hi, abs_lo);
+	cos_sinv_2rets(uc->cap_no, dep_id, abs_hi, abs_lo, 0, &elapsed_hi, &elapsed_lo);
 	elapsed_cycles = ((cycles_t)elapsed_hi << 32) | (cycles_t)elapsed_lo;
 
 	return elapsed_cycles;
 }
 
-COS_CLIENT_STUB(thdid_t, sched_aep_create_closure)(struct usr_inv_cap *uc, thdclosure_index_t id, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax, arcvcap_t *rcv)
+COS_CLIENT_STUB(thdid_t, sched_aep_create_closure, thdclosure_index_t id, int owntc, cos_channelkey_t key, microsec_t ipiwin, u32_t ipimax, arcvcap_t *rcv)
 {
+	COS_CLIENT_INVCAP;
 	u32_t idx_owntc = (id << 16) | owntc;
 	u32_t key_ipimax = (key << 16) | ipimax;
 	u32_t ipiwin32b = ipiwin;
@@ -46,9 +50,10 @@ sched_thd_block_timeout(thdid_t deptid, cycles_t abs_timeout)
 	u32_t elapsed_hi = 0, elapsed_lo = 0;
 	cycles_t elapsed_cycles = 0;
 	int ret = 0;
+	word_t abs_hi, abs_lo;
 
-	ret = sched_thd_block_timeout_cserialized(&elapsed_hi, &elapsed_lo, deptid,
-					     (u32_t)(abs_timeout >> 32), (u32_t)((abs_timeout << 32) >> 32));
+	COS_ARG_DWORD_TO_WORD(abs_timeout, abs_hi, abs_lo);
+	ret = sched_thd_block_timeout_cserialized(&elapsed_hi, &elapsed_lo, deptid, abs_hi, abs_hi);
 	if (!ret) elapsed_cycles = ((cycles_t)elapsed_hi << 32) | (cycles_t)elapsed_lo;
 
 	return elapsed_cycles;
diff --git a/src/components/interface/sched/stubs/s_stub.c b/src/components/interface/sched/stubs/s_stub.c
index 23d3633e32..cc22627721 100644
--- a/src/components/interface/sched/stubs/s_stub.c
+++ b/src/components/interface/sched/stubs/s_stub.c
@@ -3,9 +3,11 @@
 
 COS_SERVER_3RET_STUB(int, sched_thd_block_timeout)
 {
-	cycles_t elapsed = 0;
+	cycles_t elapsed = 0, abs_timeout;
 
-	elapsed = sched_thd_block_timeout((thdid_t)p0, ((cycles_t)p1 << 32 | (cycles_t)p2));
+	/* works on armv7a too, as we control where hi and lo are passed for timeout */
+	COS_ARG_WORDS_TO_DWORD(p1, p2, abs_timeout);
+	elapsed = sched_thd_block_timeout((thdid_t)p0, abs_timeout);
 	*r1 = (elapsed >> 32);
 	*r2 = (elapsed << 32) >> 32;
 
diff --git a/src/components/interface/sched/stubs/stubs.S b/src/components/interface/sched/stubs/stubs.S
index 4461c958a2..65d31d6a23 100644
--- a/src/components/interface/sched/stubs/stubs.S
+++ b/src/components/interface/sched/stubs/stubs.S
@@ -7,10 +7,12 @@
 
 #include <cos_asm_stubs.h>
 
+cos_asm_stub(sched_get_cpu_freq);
+cos_asm_stub(sched_thd_yield_to);
 cos_asm_stub(sched_thd_wakeup);
 cos_asm_stub(sched_thd_block);
-cos_asm_stub(sched_blkpt_alloc)	;
-cos_asm_stub(sched_blkpt_free)	;
+cos_asm_stub(sched_blkpt_alloc);
+cos_asm_stub(sched_blkpt_free);
 cos_asm_stub(sched_blkpt_trigger) ;
 cos_asm_stub(sched_blkpt_block) ;
 cos_asm_stub_indirect(sched_thd_block_timeout);
@@ -19,3 +21,4 @@ cos_asm_stub_indirect(sched_aep_create_closure);
 cos_asm_stub(sched_thd_param_set);
 cos_asm_stub(sched_thd_exit);
 cos_asm_stub(sched_thd_delete);
+cos_asm_stub(sched_set_tls);
diff --git a/src/components/interface/tmrmgr/Makefile b/src/components/interface/tmrmgr/Makefile
new file mode 100644
index 0000000000..43fac1b87d
--- /dev/null
+++ b/src/components/interface/tmrmgr/Makefile
@@ -0,0 +1,30 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -ltmrmgr) into dependents. This list should be
+# "tmr" for output files such as libtmrmgr.a.
+LIBRARY_OUTPUT =
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# tmrmgr) which will generate tmrmgr.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT =
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments. It is unlikely you want to change this.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = memmgr sched evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = stubs component kernel crt tmr
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+include Makefile.subdir
diff --git a/src/components/interface/tmrmgr/doc.md b/src/components/interface/tmrmgr/doc.md
new file mode 100644
index 0000000000..3308f1b3dd
--- /dev/null
+++ b/src/components/interface/tmrmgr/doc.md
@@ -0,0 +1,7 @@
+## tmrmgr
+
+The interface of timer manager. Not intended to be directly called; please call from the timer library, that will provide a wrapper around this so things are easier.
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/interface/tmrmgr/stubs/Makefile b/src/components/interface/tmrmgr/stubs/Makefile
new file mode 100644
index 0000000000..169aa4a0c8
--- /dev/null
+++ b/src/components/interface/tmrmgr/stubs/Makefile
@@ -0,0 +1 @@
+include Makefile.subsubdir
diff --git a/src/components/interface/tmrmgr/stubs/stubs.S b/src/components/interface/tmrmgr/stubs/stubs.S
new file mode 100644
index 0000000000..62f1cec979
--- /dev/null
+++ b/src/components/interface/tmrmgr/stubs/stubs.S
@@ -0,0 +1,10 @@
+#include <cos_asm_stubs.h>
+
+cos_asm_stub(tmrmgr_create)
+cos_asm_stub(tmrmgr_delete)
+
+cos_asm_stub(tmrmgr_start)
+cos_asm_stub(tmrmgr_stop)
+
+cos_asm_stub(tmrmgr_evt_set)
+cos_asm_stub(tmrmgr_evt_get)
diff --git a/src/components/interface/tmrmgr/tmrmgr.h b/src/components/interface/tmrmgr/tmrmgr.h
new file mode 100644
index 0000000000..3c0e757e78
--- /dev/null
+++ b/src/components/interface/tmrmgr/tmrmgr.h
@@ -0,0 +1,90 @@
+#ifndef TMRMGR_H
+#define TMRMGR_H
+
+/***
+ * The timer API is like these found in FreeRTOS. Simply create a timer
+ * (one-shot or periodic), associate it with an event, and wait on that
+ * event. That's all.
+ */
+
+#include <cos_component.h>
+
+/* All of these are the size of a word */
+/**
+ * The ID of the timer.
+ */
+typedef word_t tmr_id_t;
+
+/**
+ * The type of the timer. Set to 0 for periodic, set to 1 for one-shot.
+ */
+typedef enum {
+	TMR_ONESHOT     = 0,
+	TMR_PERIODIC 	= 1
+} tmr_flags_t;
+
+/**
+ * Register a timer.
+ *
+ * - @usecs - The time to timeout in microseconds.
+ * - @tmr_flags_t flags - The type of the timer.
+ * - @return - The ID of the timer that have been created.
+ *
+ *     - `0` on success, and
+ *     - `!0` if a timer cannot be created.
+ */
+ tmr_id_t tmrmgr_create(unsigned int usecs, tmr_flags_t flags);
+
+/**
+ * Teardown a timer.
+ *
+ * - @tmr_id_t id - The ID of the timer to teardown.
+ * - @return - Unimplemented, always -1.
+ *
+ *     - `0` on success, and
+ *     - `!0` if a timer cannot be deleted.
+ */
+ int tmrmgr_delete(tmr_id_t id);
+ 
+ /**
+ * Start a timer.
+ *
+ * - @tmr_id_t id - The ID of the timer to start.
+ * - @return - Whether the operation is successful.
+ *
+ *     - `0` on success, and
+ *     - `!0` if a timer cannot be started.
+ */
+ int tmrmgr_start(tmr_id_t id);
+ 
+ /**
+ * Stop a timer.
+ *
+ * - @tmr_id_t id - The ID of the timer to stop.
+ * - @return - Unimplemented, always -1.
+ *
+ *     - `0` on success, and
+ *     - `!0` if a timer cannot be stopped.
+ */
+ int tmrmgr_stop(tmr_id_t id);
+ 
+/***
+ * This is a simple "add-on" API to the timer API (chan). The timer API
+ * is basically useless without this.
+ */
+
+/**
+ * Set and get the event resource id associated with a timer. Only one ID
+ * can be associated with the timer, and when the timer expires, the event 
+ * will be fired.
+ *
+ * - @id  - the timer
+ * - @rid - the timer resource id to add to the timer.
+ * - @return - `tmrmgr_evt_set`: `0` on success, `-n` for error
+ *     `n`. `tmrmgr_evt_get`: `n` is the timer resource id, or `0` is
+ *     error.
+ */
+int tmrmgr_evt_set(tmr_id_t id, evt_res_id_t rid);
+evt_res_id_t tmrmgr_evt_get(tmr_id_t id);
+
+#endif /* TMRMGR_H */
diff --git a/src/components/lib/Makefile b/src/components/lib/Makefile
index 0092b1882d..7fc8aaf146 100644
--- a/src/components/lib/Makefile
+++ b/src/components/lib/Makefile
@@ -79,29 +79,49 @@ MAKEOPTIONS=-I$(shell pwd)
 .PHONY: all clean init distclean
 
 all:
-	$(info ***********************************************)
-	$(info ************[ Building Libraries ]*************)
-	$(info ***********************************************)
+	$(info **************************************************)
+	$(info **************[ Building Libraries ]**************)
+	$(info **************************************************)
 	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) $(MAKEOPTIONS) -C $$dir ; \
+		echo "*************************[TASK START]*************************";\
+		echo "                    [ Building $$dir ]";\
+		$(MAKE) PLATFORM=$(PLATFORM) $(MAKEOPTIONS) -C $$dir  || exit $$?; \
+		echo "*************************[TASK  STOP]*************************";\
+		echo ""; \
 	done
 
 clean:
 	$(info |     [RM]   Cleaning up library directories)
 	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) $(MAKEOPTIONS) -C $$dir clean ; \
+		echo "*************************[TASK START]*************************";\
+		echo "                    [ Cleaning $$dir ]";\
+		$(MAKE) PLATFORM=$(PLATFORM) $(MAKEOPTIONS) -C $$dir clean || exit $$?; \
+		echo "*************************[TASK  STOP]*************************";\
+		echo ""; \
 	done
 
 init: clean
-	$(info ***********************************************)
-	$(info **********[ Initializing Libraries ]***********)
-	$(info ***********************************************)
+	$(info **************************************************)
+	$(info **********[Explicit libc initialization]**********)
+	$(info **************************************************)
+	$(MAKE) $(MAKEOPTIONS) -C libc init
+	$(info **************************************************)
+	$(info ************[ Initializing Libraries ]************)
+	$(info **************************************************)
 	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) $(MAKEOPTIONS) -C $$dir init ; \
+		echo "*************************[TASK START]*************************";\
+		echo "                    [ Initializing $$dir ]";\
+		$(MAKE) PLATFORM=$(PLATFORM) $(MAKEOPTIONS) -C $$dir init || exit $$?; \
+		echo "*************************[TASK  STOP]*************************";\
+		echo ""; \
 	done
 
 distclean:
 	$(info |     [RM]   Distribution cleaning up library directories)
 	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) $(MAKEOPTIONS) -C $$dir distclean ; \
+		echo "*************************[TASK START]*************************";\
+		echo "                    [ Distcleaning $$dir ]";\
+		$(MAKE) PLATFORM=$(PLATFORM) $(MAKEOPTIONS) -C $$dir distclean ; \
+		echo "*************************[TASK  STOP]*************************";\
+		echo ""; \
 	done
diff --git a/src/components/lib/Makefile.lib b/src/components/lib/Makefile.lib
index 85e89bd883..6af19c1443 100644
--- a/src/components/lib/Makefile.lib
+++ b/src/components/lib/Makefile.lib
@@ -1,7 +1,7 @@
 include Makefile.src Makefile.comp Makefile.dependencies
 
-CFILES=$(wildcard *.c)
-SFILES=$(wildcard *.S)
+CFILES+=$(wildcard *.c)
+SFILES+=$(wildcard *.S)
 OBJS=$(CFILES:%.c=%.o) $(SFILES:%.S=%.o)
 
 CINC+=$(foreach I, $(FINAL_DEPS), -I$(LIBDIR)/$(I))
@@ -11,6 +11,9 @@ SHLIB_BIN=$(if $(OBJECT_OUTPUT), $(OBJECT_OUTPUT).lib.o)
 
 LIBNAME=$(lastword $(subst /, ,$(shell pwd)))
 
+#NOTE: assembly files don't have dependencies generated for them
+SOURCE_DEPENDENCIES +=$(CFILES:%.c=%.d)
+
 .PHONY: all clean init distclean print
 
 all: print $(SHLIB_FILE) $(SHLIB_BIN)
@@ -23,20 +26,33 @@ $(SHLIB_BIN): $(OBJS)
 	@$(LD) $(LDFLAGS) -r -o $@ $^
 
 $(SHLIB_FILE): $(OBJS)
-	$(info |     [AR]   Creating library file $@ from $^)
-	@$(AR) cr $@ $^
+	$(info |     [AR]   Creating library file $@ from $(OBJS))
+	@$(AR) crT $@ $(OBJS)
 
 %.o:%.S
 	$(info |     [AS]   Compiling assembly file $^ into $@)
 	@$(AS) $(ASFLAGS) $(CINC) $(DEPENDENCY_INCPATH) -c -o $@ $^
 
 %.o:%.c
-	$(info |     [CC]   Compiling C file $^ into $@)
-	@$(CC) $(CFLAGS) $(CINC) $(DEPENDENCY_INCPATH) -c -o $@ $^
+	$(info |     [CC]   Compiling C file $< into $@)
+	@$(CC) $(CFLAGS) $(CINC) $(DEPENDENCY_INCPATH) -c -o $@ $<
+
+# redirect error output to /dev/null so that it will not display
+# errors when cleaning, this does not affect gcc's error output when 
+# building the system because that is in a different target path
+%.d:%.c
+	@set +e; rm -f $@ $@.*; \
+	$(CC) -M $(CFLAGS) $(CINC) $(DEPENDENCY_INCPATH) $< > $@.$$$$ 2>/dev/null ; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
+	rm -f $@.$$$$
 
 clean:
 	$(info |     [RM]   Cleaning up library $(LIBNAME)'s directory)
-	@rm -f *.o *.a *.d *~
+	@rm -f *.a *.d.* *.d *~ $(OBJS) $(SOURCE_DEPENDENCIES) $(SOURCE_DEPENDENCIES:%.d=%.d.*)
 
 init:
 distclean: clean
+
+-include $(SOURCE_DEPENDENCIES)
diff --git a/src/components/lib/chan/chan.c b/src/components/lib/chan/chan.c
index 2d7ffbd057..9489806451 100644
--- a/src/components/lib/chan/chan.c
+++ b/src/components/lib/chan/chan.c
@@ -36,8 +36,8 @@ static int
 __chan_gather_resources(struct __chan_meta *m, chan_id_t id, unsigned int item_sz, unsigned int nslots, chan_flags_t flags)
 {
 	cbuf_t cb;
-	void *mem;
-	sched_blkpt_id_t full, empty;
+	void *mem = NULL;
+	sched_blkpt_id_t full = 0, empty = 0;
 	int ret;
 
 	if ((ret = chanmgr_mem_resources(id, &cb, &mem)))      return ret;
@@ -151,40 +151,99 @@ chan_mem_sz(unsigned int item_sz, unsigned int slots)
 	return sizeof(struct __chan_mem) + item_sz * slots;
 }
 
-int
-chan_evt_associate(struct chan *c, evt_res_id_t eid)
+inline unsigned int
+__chan_meta_evt_associate(struct __chan_meta *meta, evt_res_id_t eid)
 {
 	int ret;
 
-	if (c->meta.evt_id != 0) return -1;
-	c->meta.evt_id = eid;
+	if (meta->evt_id != 0) return -1;
+	meta->evt_id = eid;
 
-	ret = chanmgr_evt_set(c->meta.id, c->meta.evt_id, 1);
+	ret = chanmgr_evt_set(meta->id, meta->evt_id, 1);
 	/* signal to the communicating pair to update their event resource id. */
-	c->meta.mem->producer_update = 1;
+	meta->mem->producer_update = 1;
 
 	return ret;
 }
 
+int
+chan_evt_associate(struct chan *c, evt_res_id_t eid)
+{
+	return __chan_meta_evt_associate(&c->meta, eid);
+}
+
+int
+chan_rcv_evt_associate(struct chan_rcv *r, evt_res_id_t eid)
+{
+	return __chan_meta_evt_associate(&r->meta, eid);
+}
+
+int
+chan_snd_evt_associate(struct chan_snd *s, evt_res_id_t eid)
+{
+	return __chan_meta_evt_associate(&s->meta, eid);
+}
+
+void
+__chan_meta_evt_update(struct __chan_meta *meta)
+{
+	if (meta->evt_id == 0) {
+		meta->evt_id = chanmgr_evt_get(meta->id, 1);
+	}
+}
+
 evt_res_id_t
 chan_evt_associated(struct chan *c)
 {
-	if (c->meta.evt_id == 0) {
-		c->meta.evt_id = chanmgr_evt_get(c->meta.id, 1);
-	}
+	__chan_meta_evt_update(&c->meta);
 
 	return c->meta.evt_id;
 }
 
-int
-chan_evt_disassociate(struct chan *c)
+evt_res_id_t
+chan_rcv_evt_associated(struct chan_rcv *r)
+{
+	__chan_meta_evt_update(&r->meta);
+
+	return r->meta.evt_id;
+}
+
+evt_res_id_t
+chan_snd_evt_associated(struct chan_snd *s)
+{
+	__chan_meta_evt_update(&s->meta);
+
+	return s->meta.evt_id;
+}
+
+inline int
+__chan_meta_evt_disassociate(struct __chan_meta *meta)
 {
 	evt_res_id_t eid = 0;
 
-	if (c->meta.evt_id == 0) return -1;
-	chanmgr_evt_set(c->meta.id, 0, 1);
-	c->meta.mem->producer_update = 1;
-	c->meta.evt_id = 0;
+	if (meta->evt_id == 0) return -1;
+	chanmgr_evt_set(meta->id, 0, 1);
+	meta->mem->producer_update = 1;
+	meta->evt_id = 0;
 
 	return 0;
 }
+
+int
+chan_evt_disassociate(struct chan *c)
+{
+	return __chan_meta_evt_disassociate(&c->meta);
+}
+
+int
+chan_rcv_evt_disassociate(struct chan_rcv *r)
+{
+	return __chan_meta_evt_disassociate(&r->meta);
+}
+
+int
+chan_snd_evt_disassociate(struct chan_snd *s)
+{
+	return __chan_meta_evt_disassociate(&s->meta);
+}
+
diff --git a/src/components/lib/chan/chan.h b/src/components/lib/chan/chan.h
index 3ffa1eebcf..68dc3a9012 100644
--- a/src/components/lib/chan/chan.h
+++ b/src/components/lib/chan/chan.h
@@ -154,6 +154,9 @@ unsigned int chan_mem_sz(unsigned int item_sz, unsigned int slots);
  * be called on the receiver side as we only currently support adding
  * receivers into an event set. `disassociate` removes the previous
  * association.
+ * All associations are for the receiver endpoint, even if the sender
+ * did this with chan_snd_evt_associate (in which case it helps the
+ * receiver to set up the association).
  *
  * - @c      - channel to add to the event set
  * - @eid    - the event resource id to be triggered
@@ -163,8 +166,16 @@ unsigned int chan_mem_sz(unsigned int item_sz, unsigned int slots);
  *     - `-n` for error with `n` being an errno value
  */
 int chan_evt_associate(struct chan *c, evt_res_id_t eid);
+int chan_rcv_evt_associate(struct chan_rcv *r, evt_res_id_t eid);
+int chan_snd_evt_associate(struct chan_snd *s, evt_res_id_t eid);
+
 evt_res_id_t chan_evt_associated(struct chan *c);
+evt_res_id_t chan_rcv_evt_associated(struct chan_rcv *r);
+evt_res_id_t chan_snd_evt_associated(struct chan_snd *s);
+
 int chan_evt_disassociate(struct chan *c);
+int chan_rcv_evt_disassociate(struct chan_rcv *r);
+int chan_snd_evt_disassociate(struct chan_snd *s);
 
 /**
  * The following are the APIs for dynamic memory allocation of
diff --git a/src/components/lib/chan/chan_private.h b/src/components/lib/chan/chan_private.h
index eb2efa6ade..544c555b23 100644
--- a/src/components/lib/chan/chan_private.h
+++ b/src/components/lib/chan/chan_private.h
@@ -122,7 +122,7 @@ __chan_consume_pow2(struct __chan_mem *m, void *d, u32_t wraparound_mask, u32_t
 	return 0;
 }
 
-evt_res_id_t chan_evt_associated(struct chan *c);
+void __chan_meta_evt_update(struct __chan_meta *meta);
 
 /**
  * The next two functions pass all of the variables in via arguments,
@@ -151,7 +151,7 @@ __chan_send_pow2(struct chan_snd *s, void *item, u32_t wraparound_mask, u32_t it
 			crt_blkpt_id_trigger(&m->empty, s->meta.blkpt_empty_id, 0);
 			if (unlikely(meta->mem->producer_update)) {
 				meta->mem->producer_update = 0;
-				meta->evt_id = chan_evt_associated(s->c);
+				__chan_meta_evt_update(meta);
 			}
 			if (meta->evt_id) {
 				if (evt_trigger(meta->evt_id)) return -1;
diff --git a/src/components/lib/ck/Makefile b/src/components/lib/ck/Makefile
index 9dae06277b..be0599eb89 100644
--- a/src/components/lib/ck/Makefile
+++ b/src/components/lib/ck/Makefile
@@ -66,9 +66,18 @@ include Makefile.src Makefile.comp Makefile.dependencies
 
 NCORES=1
 LIBWD = $(shell pwd)
+ifeq ($(PLATFORM), armv7a)
+MUSLLIB=$(LIBWD)/../libc/
+export AR = arm-none-eabi-ar
+export CC = arm-none-eabi-gcc
+export LD = arm-none-eabi-ld
+export CFLAGS = $(CINC) $(DEPENDENCY_INCPATH) -march=armv7-a
+export LDFLAGS = -L$(MUSLLIB) -specs=nano.specs -specs=nosys.specs
+else
 export CFLAGS = $(CINC) $(DEPENDENCY_INCPATH)
+endif
 
-.PHONY: all ck install clean distclean init
+.PHONY: all config install clean distclean init i386_config armv7a_config
 all:
 clean:
 
@@ -76,10 +85,24 @@ install:
 	cd ck; make install; cd ..
 	cp lib/libck.a .
 
-ck:
+i386_config:
+	$(info Configuring the ck library)
 	cd ck; ./configure --platform=i586 --disable-double --without-pic --cores=$(NCORES) --prefix=$(LIBWD); cd ..
+
+armv7a_config:
+	$(info Configuring the ck library)
+	cd ck; ./configure --profile=arm --platform=arm --disable-option-checking --disable-double --without-pic --cores=$(NCORES) --prefix=$(LIBWD); cd ..
+
+x86_64_config:
+	$(info Configuring the ck library)
+	cd ck; ./configure --platform=x86_64 --disable-double --without-pic --cores=$(NCORES) --prefix=$(LIBWD); cd ..
+
+
+config: $(PLATFORM)_config
+
+ck: config
 	make -C ck all
 
 init: ck install
 distclean:
-	cd ck; make uninstall; cd ..
+	cd ck; make clean; make uninstall; cd ..
diff --git a/src/components/lib/ck/ck b/src/components/lib/ck/ck
index c2bdf2926f..26bb45af4c 160000
--- a/src/components/lib/ck/ck
+++ b/src/components/lib/ck/ck
@@ -1 +1 @@
-Subproject commit c2bdf2926fd14f9868c82d0b59fd842e4718379a
+Subproject commit 26bb45af4cbbf6eea488cd2804957100ab7bb1d0
diff --git a/src/components/lib/component/arch/arm/c_stub.h b/src/components/lib/component/arch/arm/c_stub.h
new file mode 100644
index 0000000000..b69e8b5c9d
--- /dev/null
+++ b/src/components/lib/component/arch/arm/c_stub.h
@@ -0,0 +1,37 @@
+#ifndef COS_STUB_ARM_H
+#define COS_STUB_ARM_H
+
+/*
+ * Macros for defining C stubs for the client and server. These
+ * functions are called through the PLT-like level of indirection on
+ * interface functions that ensure the the invocation information
+ * (struct usr_inv_cap) which includes the capability id.
+ */
+#define COS_CLIENT_STUB(_type, _client_fn, ...) _type __cosrt_c_##_client_fn(__VA_ARGS__)
+
+#define COS_CLIENT_INVCAP struct usr_inv_cap *uc = cos_inv_cap();
+
+/*
+ * It looks like ARM DWORD representation in registers (and on stack):
+ * DWORD -> rE = DWORDLO, rO = DWORDHI
+ * rE -> even numbered register, rO -> odd numbered register
+ *
+ * ex: x = (1<<32) | 2;
+ *     fn (x);
+ *     register layout inside fn will be: r0 <- 2, r1 <- 1
+ * 
+ * - For server side (without stubs), ABI takes care of it if we marshal 
+ *    that dword in the registers correctly.. 
+ * - For the server stubs we have, we demarshal ourselves, so the macros here takes
+ *    good care of that.. 
+ * - For some arguments, we don't rely on ABI in anyway, in such cases, we should not use these macros, instead have generic macros for dword to word conversions..
+ */
+
+#define COS_ARG_DWORD_TO_WORD(dw, wh, wl)		\
+		wh = (dw << 32) >> 32;			\
+		wl = (dw >> 32)	
+
+#define COS_ARG_WORDS_TO_DWORD(wa, wb, dw)		\
+		dw = ((dword_t)wb << 32) | (dword_t)wa
+
+#endif /* COS_STUB_ARM_H */
diff --git a/src/components/lib/component/arch/arm/cos_asm_ainv.h b/src/components/lib/component/arch/arm/cos_asm_ainv.h
new file mode 100644
index 0000000000..b53180d33d
--- /dev/null
+++ b/src/components/lib/component/arch/arm/cos_asm_ainv.h
@@ -0,0 +1,5 @@
+#define COS_AINV_ENTRY		\
+	nop;
+
+#define COS_AINV_RET		\
+	nop;
diff --git a/src/components/lib/component/arch/arm/cos_asm_simple_stacks.h b/src/components/lib/component/arch/arm/cos_asm_simple_stacks.h
new file mode 100644
index 0000000000..8c61e6a0bc
--- /dev/null
+++ b/src/components/lib/component/arch/arm/cos_asm_simple_stacks.h
@@ -0,0 +1,57 @@
+#ifndef COS_ASM_SIMPLE_STACKS_ARM_H
+#define COS_ASM_SIMPLE_STACKS_ARM_H
+
+/* 
+ * r0 contains thdid+cpuid in sinv or upcall
+ * r1 contains token for sinv.
+ * r2 - r5 are also used in calling conventions.
+ * avoid clobbering those registers here.
+ *
+ * see platform/armv7/chal/call_convention.h for more details.
+ */
+/*
+ * NOTE: stack will be aligned to 8byte boundary
+ * we pushed cpuid, thdid, invtoken and a placeholder for invcap, that's 16B
+ * so, do nothing more to align!
+ */
+#define COS_ASM_ALIGN_8B_SP
+
+/* Placeholder for INVCAP */
+#define COS_ASM_INVCAP_SLOT			\
+	mov r6, #0;				\
+	push {r6};
+
+/* clang-format off */
+#define COS_ASM_GET_STACK_BASIC			\
+	ldr r6, =cos_static_stack;		\
+	add r6, r6, #COS_STACK_SZ;		\
+	mov r12, r6;				\
+	mov r6, r0;				\
+	and r6, r6, #0xff;			\
+	lsl r6, r6, #MAX_STACK_SZ_BYTE_ORDER;	\
+	add sp, r12, r6;			\
+	lsr r6, r6, #MAX_STACK_SZ_BYTE_ORDER;	\
+	lsr r0, r0, #16;			\
+	push {r0};				\
+	push {r6};
+
+#define COS_ASM_GET_STACK			\
+	COS_ASM_GET_STACK_BASIC			\
+	mov r6, #0;				\
+	push {r6};				\
+	COS_ASM_INVCAP_SLOT			\
+	COS_ASM_ALIGN_8B_SP
+
+#define COS_ASM_GET_STACK_INVTOKEN		\
+	COS_ASM_GET_STACK_BASIC			\
+	push {r1};				\
+	COS_ASM_INVCAP_SLOT			\
+	COS_ASM_ALIGN_8B_SP
+
+#define COS_ASM_RET_STACK
+
+#define COS_ASM_REQUEST_STACK
+
+/* clang-format on */
+
+#endif
diff --git a/src/components/lib/component/arch/arm/cos_asm_upcall_simple_stacks.h b/src/components/lib/component/arch/arm/cos_asm_upcall_simple_stacks.h
new file mode 100644
index 0000000000..14ba1f6195
--- /dev/null
+++ b/src/components/lib/component/arch/arm/cos_asm_upcall_simple_stacks.h
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2020 by Phani Kishore Gadepalli, phanikishoreg@gwu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+
+#include "cos_asm_simple_stacks.h"
+
+#define COS_STATIC_STACK                \
+.bss;					\
+.align 16;                              \
+.globl cos_static_stack;		\
+cos_static_stack:			\
+	.rept ALL_STACK_SZ_FLAT;	\
+	.4byte 0;			\
+	.endr;				\
+.globl cos_static_stack_end;            \
+cos_static_stack_end:
+
+#define COS_UPCALL_ENTRY                \
+.text;                                  \
+.globl __cosrt_upcall_entry;            \
+.type __cosrt_upcall_entry, %function;  \
+.align 16;                              \
+__cosrt_upcall_entry:                   \
+	COS_ASM_GET_STACK		\
+	mov r0, #0;			\
+	mov r1, r2;			\
+	mov r2, r3;			\
+	mov r3, r4;			\
+	ldr r12, =cos_upcall_fn;	\
+	blx r12;			\
+	mov r0, #0;			\
+	.ltorg;
+
+#define COS_ATOMIC_CMPXCHG	\
+	nop;
+
+#define COS_ATOMIC_CMPXCHG_END	\
+	nop;
+
+#define COS_ATOMIC_USER4_END	\
+	nop;
diff --git a/src/components/lib/component/arch/arm/cos_component.h b/src/components/lib/component/arch/arm/cos_component.h
new file mode 100644
index 0000000000..315d3ef5d9
--- /dev/null
+++ b/src/components/lib/component/arch/arm/cos_component.h
@@ -0,0 +1,580 @@
+/**
+ * Copyright 2007 by Gabriel Parmer, gabep1@cs.bu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+
+#ifndef COS_COMPONENT_ARM_H
+#define COS_COMPONENT_ARM_H
+
+#include <consts.h>
+#include <cos_types.h>
+#include <util.h>
+#include <string.h>
+#include <bitmap.h>
+#include <ps_plat.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <cos_serial.h>
+
+static int  __attribute__((format(printf, 1, 2)))
+llprintc(char *fmt, ...)
+{
+        char    s[128] = { '\0' };
+        va_list arg_ptr;
+        size_t  ret, len = 128;
+
+        va_start(arg_ptr, fmt);
+        ret = vsnprintf(s, len, fmt, arg_ptr);
+        va_end(arg_ptr);
+	cos_serial_putb(s, len);
+
+        return ret;
+}
+
+/*
+ * dewarn: strtok_r()
+ * reference: feature_test_macro() requirement: _SVID_SOURCE || _BSD_SOURCE || _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE
+ */
+extern char *strtok_r(char *str, const char *delim, char **saveptr);
+void libc_init();
+char *cos_initargs_tar();
+
+/* temporary */
+static inline int
+call_cap_asm(u32_t cap_no, u32_t op, int arg1, int arg2, int arg3, int arg4)
+{
+	int  ret;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	/* Pass parameters: r1,r2,r3,r4,r5, return in r0, r2, r3, r4 */
+	__asm__ __volatile__("ldr r1,%[_cap_no] \n\t"
+	                     "ldr r2,%[_arg1] \n\t"
+	                     "ldr r3,%[_arg2] \n\t"
+	                     "ldr r4,%[_arg3] \n\t"
+	                     "ldr r5,%[_arg4] \n\t"
+	                     "svc #0x00 \n\t"
+	                     "str r0,%[_ret] \n\t"
+	                     : [ _ret ] "=m"(ret)
+	                     : [ _cap_no ] "m"(cap_no), [ _arg1 ] "m"(arg1), [ _arg2 ] "m"(arg2), [ _arg3 ] "m"(arg3),
+	                       [ _arg4 ] "m"(arg4)
+	                     : "memory", "cc", "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "ip", "lr");
+
+	return ret;
+}
+
+static inline int
+call_cap_retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2, word_t *r3)
+{
+	int  ret;
+	word_t ret2, ret3, ret4;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	/* Pass parameters: r1,r2,r3,r4,r5, return in r0, r2, r3, r4 */
+	__asm__ __volatile__("ldr r1,%[_cap_no] \n\t"
+	                     "ldr r2,%[_arg1] \n\t"
+	                     "ldr r3,%[_arg2] \n\t"
+	                     "ldr r4,%[_arg3] \n\t"
+	                     "ldr r5,%[_arg4] \n\t"
+	                     "svc #0x00 \n\t"
+	                     "str r0,%[_ret] \n\t"
+	                     "str r2,%[_r2] \n\t"
+	                     "str r3,%[_r3] \n\t"
+	                     "str r4,%[_r4] \n\t"
+	                     : [ _ret ] "=m"(ret), [ _r2 ] "=m"(ret2), [ _r3 ] "=m"(ret3), [ _r4 ] "=m"(ret4)
+	                     : [ _cap_no ] "m"(cap_no), [ _arg1 ] "m"(arg1), [ _arg2 ] "m"(arg2), [ _arg3 ] "m"(arg3),
+	                       [ _arg4 ] "m"(arg4)
+	                     : "memory", "cc", "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "ip", "lr");
+
+	if (r1) *r1 = ret2;
+	if (r2) *r2 = ret3;
+	if (r3) *r3 = ret4;
+
+	return ret;
+}
+
+static inline word_t
+call_cap_2retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2)
+{
+	word_t ret, ret2, ret3;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	/* Pass parameters: r1,r2,r3,r4,r5, return in r0, r2, r3, r4 */
+	__asm__ __volatile__("ldr r1,%[_cap_no] \n\t"
+	                     "ldr r2,%[_arg1] \n\t"
+	                     "ldr r3,%[_arg2] \n\t"
+	                     "ldr r4,%[_arg3] \n\t"
+	                     "ldr r5,%[_arg4] \n\t"
+	                     "svc #0x00 \n\t"
+	                     "str r0,%[_ret] \n\t"
+	                     "str r2,%[_r2] \n\t"
+	                     "str r3,%[_r3] \n\t"
+	                     : [ _ret ] "=m"(ret), [ _r2 ] "=m"(ret2), [ _r3 ] "=m"(ret3)
+	                     : [ _cap_no ] "m"(cap_no), [ _arg1 ] "m"(arg1), [ _arg2 ] "m"(arg2), [ _arg3 ] "m"(arg3),
+	                       [ _arg4 ] "m"(arg4)
+	                     : "memory", "cc", "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "ip", "lr");
+
+	if (r1) *r1 = ret2;
+	if (r2) *r2 = ret3;
+
+	return ret;
+}
+
+static inline int
+cap_switch_thd(u32_t cap_no)
+{
+	return call_cap_asm(cap_no, 0, 0, 0, 0, 0);
+}
+
+static inline int
+call_cap(u32_t cap_no, int arg1, int arg2, int arg3, int arg4)
+{
+	return call_cap_asm(cap_no, 0, arg1, arg2, arg3, arg4);
+}
+
+static inline int
+call_cap_op(u32_t cap_no, u32_t op_code, int arg1, int arg2, int arg3, int arg4)
+{
+	return call_cap_asm(cap_no, op_code, arg1, arg2, arg3, arg4);
+}
+
+static void
+cos_print(char *s, int len)
+{
+	// FIXME: casting from a pointer to an int can be lossy
+	call_cap(PRINT_CAP_TEMP, (int) s, len, 0, 0);
+}
+
+static inline int
+cos_sinv(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4)
+{
+	return call_cap_op(sinv, 0, arg1, arg2, arg3, arg4);
+}
+
+static inline int
+cos_sinv_rets(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2, word_t *ret3)
+{
+	return call_cap_retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2, ret3);
+}
+
+static inline int
+cos_sinv_2rets(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2)
+{
+	return call_cap_2retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2);
+}
+
+/**
+ * FIXME: Please remove this since it is no longer needed
+ */
+
+extern long stkmgr_stack_space[ALL_TMP_STACKS_SZ];
+extern struct cos_component_information __cosrt_comp_info;
+
+static inline long
+get_stk_data(int offset)
+{
+	unsigned long curr_stk_pointer;
+
+	curr_stk_pointer = (unsigned long)&curr_stk_pointer;
+	/*
+	 * We save the CPU_ID and thread id in the stack for fast
+	 * access.  We want to find the struct cos_stk (see the stkmgr
+	 * interface) so that we can then offset into it and get the
+	 * cpu_id.  This struct is at the _top_ of the current stack,
+	 * and cpu_id is at the top of the struct (it is a u32_t).
+	 */
+	return *(long *)((curr_stk_pointer & ~(COS_STACK_SZ - 1)) + COS_STACK_SZ - offset * sizeof(u32_t));
+}
+
+static inline void
+set_stk_data(int offset, long value)
+{
+	unsigned long curr_stk_pointer;
+
+	curr_stk_pointer = (unsigned long)&curr_stk_pointer;
+	/*
+	 * We save the CPU_ID and thread id in the stack for fast
+	 * access.  We want to find the struct cos_stk (see the stkmgr
+	 * interface) so that we can then offset into it and get the
+	 * cpu_id.  This struct is at the _top_ of the current stack,
+	 * and cpu_id is at the top of the struct (it is a u32_t).
+	 */
+	*(long *)((curr_stk_pointer & ~(COS_STACK_SZ - 1)) + COS_STACK_SZ - offset * sizeof(u32_t)) = value;
+}
+
+
+#define GET_CURR_CPU cos_cpuid()
+
+static inline long
+cos_cpuid(void)
+{
+#if NUM_CPU == 1
+	return 0;
+#endif
+	/*
+	 * see comments in the get_stk_data above.
+	 */
+	return get_stk_data(CPUID_OFFSET);
+}
+
+static inline coreid_t
+cos_coreid(void)
+{
+	return (coreid_t)cos_cpuid();
+}
+
+static inline unsigned short int
+cos_get_thd_id(void)
+{
+	/*
+	 * see comments in the get_stk_data above.
+	 */
+	return get_stk_data(THDID_OFFSET);
+}
+
+static inline invtoken_t
+cos_inv_token(void)
+{
+	return get_stk_data(INVTOKEN_OFFSET);
+}
+
+static inline struct usr_inv_cap *
+cos_inv_cap(void)
+{
+	 return (struct usr_inv_cap *)get_stk_data(INVCAP_OFFSET);
+}
+
+typedef u16_t cos_thdid_t;
+
+static thdid_t
+cos_thdid(void)
+{
+	return cos_get_thd_id();
+}
+
+#define ERR_THROW(errval, label) \
+	do {                     \
+		ret = errval;    \
+		goto label;      \
+	} while (0)
+
+static inline long
+cos_spd_id(void)
+{
+	return __cosrt_comp_info.cos_this_spd_id;
+}
+
+static inline compid_t
+cos_compid(void)
+{
+	return cos_spd_id();
+}
+
+static inline int
+cos_compid_uninitialized(void)
+{
+	return cos_compid() == 0;
+}
+
+static inline void
+cos_compid_set(compid_t cid)
+{
+	__cosrt_comp_info.cos_this_spd_id = cid;
+}
+
+static inline void *
+cos_get_heap_ptr(void)
+{
+	return (void *)__cosrt_comp_info.cos_heap_ptr;
+}
+
+static inline void
+cos_set_heap_ptr(void *addr)
+{
+	__cosrt_comp_info.cos_heap_ptr = (vaddr_t)addr;
+}
+
+static inline char *
+cos_init_args(void)
+{
+	return __cosrt_comp_info.init_string;
+}
+
+#define COS_CPUBITMAP_STARTTOK 'c'
+#define COS_CPUBITMAP_ENDTOK   ","
+#define COS_CPUBITMAP_LEN      (NUM_CPU)
+
+static inline int
+cos_args_cpubmp(u32_t *cpubmp, char *arg)
+{
+	char *tok1 = NULL, *tok2 = NULL;
+	char res[COMP_INFO_INIT_STR_LEN] = { '\0' }, *rs = res;
+	int i, len = 0;
+
+	if (!arg || !cpubmp) return -EINVAL;
+	strncpy(rs, arg, COMP_INFO_INIT_STR_LEN);
+	if (!strlen(arg)) goto allset;
+	while ((tok1 = strtok_r(rs, COS_CPUBITMAP_ENDTOK, &rs)) != NULL) {
+		if (tok1[0] == COS_CPUBITMAP_STARTTOK) break;
+	}
+	/* if "c" tag is not present.. set the component to be runnable on all cores */
+	if (!tok1) goto allset;
+	if (strlen(tok1) != (COS_CPUBITMAP_LEN + 1)) return -EINVAL;
+
+	tok2 = tok1 + 1;
+	len = strlen(tok2);
+	for (i = 0; i < len; i++) {
+		if (tok2[i] == '1') bitmap_set(cpubmp, (len - 1 - i));
+	}
+
+	return 0;
+
+allset:
+	bitmap_set_contig(cpubmp, 0, NUM_CPU, 1);
+
+	return 0;
+}
+
+static inline int
+cos_init_args_cpubmp(u32_t *cpubmp)
+{
+	return cos_args_cpubmp(cpubmp, cos_init_args());
+}
+
+/* Basic assembly for Cortex-A */
+/*
+static inline unsigned long
+cos_ldrexw(volatile unsigned long *addr)
+{
+        unsigned long result;
+        __asm__ __volatile__ ("ldrex %0, %1" : "=r" (result) : "Q" (*addr) );
+        return(result);
+}
+
+static inline unsigned long
+cos_strexw(unsigned long value, volatile unsigned long *addr)
+{
+        unsigned long result;
+        __asm__ __volatile__ ("strex %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" (value) );
+        return(result);
+}
+
+
+static inline void
+cos_clrex(void)
+{
+        __asm__ __volatile__ ("clrex" ::: "memory");
+}
+*/
+
+static inline long
+cos_cmpxchg(unsigned long *target, unsigned long old, unsigned long updated)
+{
+	unsigned long oldval, res;
+
+	do {
+		oldval = cos_ldrexw(target);
+
+		if (oldval == old) /* 0=succeeded, 1=failed */
+			res = cos_strexw(updated, target);
+		else {
+			cos_clrex();
+			return 0;
+		}
+	} while (res);
+
+	return 1;
+}
+
+/* A uni-processor variant with less overhead but that doesn't
+ * guarantee atomicity across cores. */
+static inline int
+cos_cas_up(unsigned long *target, unsigned long old, unsigned long updated)
+{
+	unsigned long oldval, res;
+
+	do {
+		oldval = cos_ldrexw(target);
+
+		if (oldval == old) /* 0=succeeded, 1=failed */
+			res = cos_strexw(updated, target);
+		else {
+			cos_clrex();
+			return 0;
+		}
+	} while (res);
+
+	return 1;
+}
+
+static inline void *
+cos_get_prealloc_page(void)
+{
+	char *h;
+	long  r;
+	do {
+		h = (char *)__cosrt_comp_info.cos_heap_alloc_extent;
+		if (!h || (char *)__cosrt_comp_info.cos_heap_allocated >= h) return NULL;
+		r = (long)h + PAGE_SIZE;
+	} while (cos_cmpxchg(&__cosrt_comp_info.cos_heap_allocated, (long)h, r) != r);
+
+	return h;
+}
+
+/* allocate and release a page in the vas */
+extern void *cos_get_vas_page(void);
+extern void  cos_release_vas_page(void *p);
+
+/* only if the heap pointer is pre_addr, set it to post_addr */
+static inline void
+cos_set_heap_ptr_conditional(void *pre_addr, void *post_addr)
+{
+	cos_cmpxchg(&__cosrt_comp_info.cos_heap_ptr, (long)pre_addr, (long)post_addr);
+}
+
+/* from linux source in string.h */
+static inline void *
+cos_memcpy(void *to, const void *from, int n)
+{
+	memcpy(to, from, n);
+
+	return (to);
+}
+
+static inline void *
+cos_memset(void *s, char c, int count)
+{
+	memset(s, c, count);
+	return s;
+}
+
+/* compiler branch prediction hints */
+#ifndef likely
+#define likely(x) __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#endif
+
+#define CREGPARM(r) 
+#define CFORCEINLINE __attribute__((always_inline))
+#define CWEAKSYMB __attribute__((weak))
+/*
+ * Create a weak function alias called "aliasn" which aliases the
+ * existing function "name".  Example: COS_FN_WEAKALIAS(read,
+ * __my_read) will take your "__my_read" function and create "read" as
+ * an a weak alias to it.
+ */
+#define COS_FN_WEAKALIAS(weak_alias, name)					\
+	__typeof__(name) weak_alias __attribute__((weak, alias(STR(name))))
+
+/*
+ * A composite constructor (deconstructor): will be executed before
+ * other component execution (after component execution).  CRECOV is a
+ * function that should be called if one of the depended-on components
+ * has failed (e.g. the function serves as a callback notification).
+ */
+#define CCTOR __attribute__((constructor))
+#define CDTOR __attribute__((destructor)) /* currently unused! */
+#define CRECOV(fnname) long crecov_##fnname##_ptr __attribute__((section(".crecov"))) = (long)fnname
+
+static inline void
+section_fnptrs_execute(long *list)
+{
+	int i;
+
+	for (i = 0; i < list[0]; i++) {
+		typedef void (*ctors_t)(void);
+		ctors_t ctors = (ctors_t)list[i + 1];
+		ctors();
+	}
+}
+
+static void
+constructors_execute(void)
+{
+	extern long __CTOR_LIST__;
+	extern long __INIT_ARRAY_LIST__;
+	section_fnptrs_execute(&__CTOR_LIST__);
+	section_fnptrs_execute(&__INIT_ARRAY_LIST__);
+}
+static void
+destructors_execute(void)
+{
+	extern long __DTOR_LIST__;
+	extern long __FINI_ARRAY_LIST__;
+	section_fnptrs_execute(&__DTOR_LIST__);
+	section_fnptrs_execute(&__FINI_ARRAY_LIST__);
+}
+static void
+recoveryfns_execute(void)
+{
+	extern long __CRECOV_LIST__;
+	section_fnptrs_execute(&__CRECOV_LIST__);
+}
+
+#define FAIL() *(int *)NULL = 0
+
+struct cos_array {
+	char *mem;
+	int   sz;
+}; /* TODO: remove */
+#define prevent_tail_call(ret) __asm__("" : "=r"(ret) : "m"(ret))
+
+#ifndef STR
+#define STRX(x) #x
+#define STR(x) STRX(x)
+#endif
+
+struct __thd_init_data {
+	void *fn;
+	void *data;
+};
+
+typedef u32_t cbuf_t; /* TODO: remove when we have cbuf.h */
+
+/*
+ * NOTE: Only works if performance counter reading is enabled for user-level!
+ *     If not enabled, this leads to Undefined exception in Cos kernel!
+ */
+#define pmccntr(v) __asm__ __volatile__ ("mrc p15, 0, %0, c9, c13, 0\t\n": "=r"(v))
+#define perfcntr(v) pmccntr(v)
+
+/*
+ * http://wiki.dreamrunner.org/public_html/Embedded-System/Cortex-A8/PerformanceMonitorControlRegister.html
+ * Following init_perfcounters() here
+ */
+static inline void
+pmccntr_init(void)
+{
+	unsigned int value = 0;
+
+	//__asm__ __volatile__ ("mrc p15, 0, %0, c9, c12, 0\t\n" : "=r"(value));
+	//value  = value & ~(1 << 3); /* disable "by 64" divider */
+
+	value |= (1 << 0); /* enable counters */
+	value |= (1 << 1); /* reset all other counters */
+	value |= (1 << 2); /* reset cycle counter */
+	value |= (1 << 4); /* export events to external monitoring */
+
+	// program the performance-counter control-register:
+	__asm__ __volatile__ ("mcr p15, 0, %0, c9, c12, 0\t\n" :: "r"(value));
+
+	// enable all counters:  
+	__asm__ __volatile__ ("mcr p15, 0, %0, c9, c12, 1\t\n" :: "r"(0x8000000f));
+
+	// clear overflows:
+	__asm__ __volatile__ ("mcr p15, 0, %0, c9, c12, 3\t\n" :: "r"(0x8000000f));
+}
+
+#define perfcntr_init pmccntr_init
+
+#endif
diff --git a/src/components/lib/component/arch/arm/cos_serial.h b/src/components/lib/component/arch/arm/cos_serial.h
new file mode 100644
index 0000000000..cf05840986
--- /dev/null
+++ b/src/components/lib/component/arch/arm/cos_serial.h
@@ -0,0 +1,44 @@
+#ifndef COS_SERIAL_CAV7_H
+#define COS_SERIAL_CAV7_H
+
+/* Phani: Not sure if this is accessible at userlevel! */
+/* UART peripheral address */
+#define CAV7_UART_CONTROL (*((volatile unsigned long *)(0xE0001000)))
+#define CAV7_UART_MODE (*((volatile unsigned long *)(0xE0001004)))
+#define CAV7_UART_BRGEN (*((volatile unsigned long *)(0xE0001018)))
+#define CAV7_UART_STATUS (*((volatile unsigned long *)(0xE000102C)))
+#define CAV7_UART_FIFO (*((volatile unsigned long *)(0xE0001030)))
+#define CAV7_UART_BRDIV (*((volatile unsigned long *)(0xE0001034)))
+#define CAV7_UART_STATUS_TXE (1U << 3)
+
+static inline void
+cos_serial_putc(char out)
+{
+        if (out == '\n') {
+                while ((CAV7_UART_STATUS & CAV7_UART_STATUS_TXE) == 0)
+                        ;
+                CAV7_UART_FIFO = '\r';
+        }
+
+        while ((CAV7_UART_STATUS & CAV7_UART_STATUS_TXE) == 0)
+                ;
+        CAV7_UART_FIFO = (out);
+}
+
+/* NOTE: can be interleaved & the output could just look like garbage. */
+static inline void
+cos_serial_puts(const char *s)
+{
+	for (; *s != '\0'; s++) cos_serial_putc(*s);
+}
+
+/* for binary printing */
+static inline void
+cos_serial_putb(const char *s, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len; i++) cos_serial_putc(*(s + i));
+}
+
+#endif /* COS_SERIAL_CAV7_H */
diff --git a/src/components/lib/component/arch/x86/c_stub.h b/src/components/lib/component/arch/x86/c_stub.h
new file mode 100644
index 0000000000..732a3a966b
--- /dev/null
+++ b/src/components/lib/component/arch/x86/c_stub.h
@@ -0,0 +1,25 @@
+#ifndef COS_STUB_X86_H
+#define COS_STUB_X86_H
+
+/*
+ * Macros for defining C stubs for the client and server. These
+ * functions are called through the PLT-like level of indirection on
+ * interface functions that ensure the the invocation information
+ * (struct usr_inv_cap) which includes the capability id.
+ */
+#define COS_CLIENT_STUB(_type, _client_fn, ...) CREGPARM(1) _type __cosrt_c_##_client_fn(struct usr_inv_cap *uc, __VA_ARGS__)
+
+#define COS_CLIENT_INVCAP
+
+/*
+ * We marshal and demarshal double word arguments..
+ * Nothing special to do for this architecture.
+ */
+#define COS_ARG_DWORD_TO_WORD(dw, wh, wl)               \
+                wl = (dw << 32) >> 32;                  \
+                wh = (dw >> 32)
+
+#define COS_ARG_WORDS_TO_DWORD(wa, wb, dw)              \
+                dw = ((dword_t)wa << 32) | (dword_t)wb
+
+#endif /* COS_STUB_X86_H */
diff --git a/src/components/lib/component/arch/x86/cos_asm_ainv.h b/src/components/lib/component/arch/x86/cos_asm_ainv.h
new file mode 100644
index 0000000000..92fa335ff8
--- /dev/null
+++ b/src/components/lib/component/arch/x86/cos_asm_ainv.h
@@ -0,0 +1,29 @@
+#define COS_AINV_ENTRY		\
+	pushl %ebx;		\
+	pushl %esi;		\
+	pushl %edi;		\
+	pushl %edx;		\
+	pushl %ebp;		\
+	movl %esp, %ebx;	\
+	addl $24, %ebx;		\
+	push %ebx;		\
+	push %eax;		\
+	call cos_async_inv;	\
+	addl $8, %esp;		\
+	cmpl $0, %eax;		\
+	je ainv_ret;		\
+	movl 24(%esp), %ebx;	\
+	movl 28(%esp), %esi;	\
+	movl 32(%esp), %edi;	\
+	movl 36(%esp), %edx;	\
+	movl %esp, %ebp;	\
+	movl $ainv_ret, %ecx;	\
+	sysenter;
+
+#define COS_AINV_RET		\
+	popl %ebp;		\
+	popl %edx;		\
+	popl %edi;		\
+	popl %esi;		\
+	popl %ebx;		\
+	ret;
diff --git a/src/components/lib/component/arch/x86/cos_asm_simple_stacks.h b/src/components/lib/component/arch/x86/cos_asm_simple_stacks.h
new file mode 100644
index 0000000000..484535567c
--- /dev/null
+++ b/src/components/lib/component/arch/x86/cos_asm_simple_stacks.h
@@ -0,0 +1,30 @@
+#ifndef COS_ASM_SIMPLE_STACKS_X86_H
+#define COS_ASM_SIMPLE_STACKS_X86_H
+
+/* clang-format off */
+#define COS_ASM_GET_STACK_BASIC             \
+	movl $cos_static_stack, %esp;	    \
+	movl %eax, %edx;		    \
+	andl $0xffff, %eax;		    \
+	shl $MAX_STACK_SZ_BYTE_ORDER, %eax; \
+	addl %eax, %esp;		    \
+	shr $MAX_STACK_SZ_BYTE_ORDER, %eax; \
+	shr $16, %edx;			    \
+	pushl %edx;			    \
+	pushl %eax;
+
+#define COS_ASM_GET_STACK       \
+	COS_ASM_GET_STACK_BASIC \
+	pushl $0;
+
+#define COS_ASM_GET_STACK_INVTOKEN \
+	COS_ASM_GET_STACK_BASIC    \
+	pushl %ecx;
+
+#define COS_ASM_RET_STACK
+
+#define COS_ASM_REQUEST_STACK
+
+/* clang-format on */
+
+#endif
diff --git a/src/components/lib/component/arch/x86/cos_asm_upcall_simple_stacks.h b/src/components/lib/component/arch/x86/cos_asm_upcall_simple_stacks.h
new file mode 100644
index 0000000000..878012a57b
--- /dev/null
+++ b/src/components/lib/component/arch/x86/cos_asm_upcall_simple_stacks.h
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2007 by Gabriel Parmer, gabep1@cs.bu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+
+#define COS_STATIC_STACK		\
+.align COS_STACK_SZ;			\
+.globl cos_static_stack;		\
+cos_static_stack:			\
+	.rep ALL_STACK_SZ_FLAT;		\
+	.long 0	;			\
+	.endr ;				\
+.globl cos_static_stack_end;		\
+cos_static_stack_end:
+
+#define COS_UPCALL_ENTRY 		\
+.text;					\
+.globl __cosrt_upcall_entry;		\
+.type __cosrt_upcall_entry, @function;	\
+.align 16;				\
+__cosrt_upcall_entry:			\
+	COS_ASM_GET_STACK		\
+	pushl $0;			\
+	movl %esp, -8(%esp);		\
+	pushl $0;			\
+	movl %esp, -8(%esp);		\
+	subl $8, %esp;			\
+	pushl %esi;			\
+	pushl %edi;			\
+	pushl %ebx;			\
+	xor %ebp, %ebp;			\
+	pushl %ecx;			\
+	call cos_upcall_fn;		\
+	addl $24, %esp;			\
+	popl %esi;			\
+	popl %edi;			\
+	movl %eax, %ecx;		\
+	movl $RET_CAP, %eax;		\
+	COS_ASM_RET_STACK		\
+	sysenter;
+
+#define COS_ATOMIC_CMPXCHG 		\
+	movl %eax, %edx;		\
+	cmpl (%ebx), %eax;		\
+	jne cos_atomic_cmpxchg_end;	\
+	movl %ecx, %edx;		\
+	movl %ecx, (%ebx);
+
+#define COS_ATOMIC_CMPXCHG_END		\
+	ret;
+
+#define COS_ATOMIC_USER4_END		\
+	movl $0, %eax;			\
+	movl (%eax), %eax;
diff --git a/src/components/lib/component/arch/x86/cos_component.h b/src/components/lib/component/arch/x86/cos_component.h
new file mode 100644
index 0000000000..ac4431c22d
--- /dev/null
+++ b/src/components/lib/component/arch/x86/cos_component.h
@@ -0,0 +1,490 @@
+/**
+ * Copyright 2007 by Gabriel Parmer, gabep1@cs.bu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+
+#ifndef COS_COMPONENT_X86_H
+#define COS_COMPONENT_X86_H
+
+#include <consts.h>
+#include <cos_types.h>
+#include <util.h>
+#include <string.h>
+#include <bitmap.h>
+#include <ps_plat.h>
+
+/*
+ * dewarn: strtok_r()
+ * reference: feature_test_macro() requirement: _SVID_SOURCE || _BSD_SOURCE || _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE
+ */
+extern char *strtok_r(char *str, const char *delim, char **saveptr);
+void libc_init();
+char *cos_initargs_tar();
+
+/* temporary */
+static inline int
+call_cap_asm(u32_t cap_no, u32_t op, int arg1, int arg2, int arg3, int arg4)
+{
+	long fault = 0;
+	int  ret;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	__asm__ __volatile__("pushl %%ebp\n\t"		\
+	                     "movl %%esp, %%ebp\n\t"	\
+	                     "movl $1f, %%ecx\n\t"	\
+	                     "sysenter\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "jmp 2f\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "1:\n\t"			\
+	                     "movl $0, %%ecx\n\t"	\
+	                     "jmp 3f\n\t"		\
+	                     "2:\n\t"			\
+	                     "movl $1, %%ecx\n\t"	\
+	                     "3:\n\t"			\
+	                     "popl %%ebp"		\
+	                     : "=a"(ret), "=c"(fault), "+d"(arg4)
+	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3)
+	                     : "memory", "cc");
+
+	return ret;
+}
+
+static inline int
+call_cap_retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2, word_t *r3)
+{
+	long fault = 0;
+	int  ret;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	__asm__ __volatile__("pushl %%ebp\n\t"		\
+	                     "movl %%esp, %%ebp\n\t"	\
+	                     "movl $1f, %%ecx\n\t"	\
+	                     "sysenter\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "jmp 2f\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "1:\n\t"			\
+	                     "movl $0, %%ecx\n\t"	\
+	                     "jmp 3f\n\t"		\
+	                     "2:\n\t"			\
+	                     "movl $1, %%ecx\n\t"	\
+	                     "3:\n\t"			\
+	                     "popl %%ebp\n\t"		\
+	                     : "=a"(ret), "=c"(fault), "=S"(*r1), "=D"(*r2), "=b" (*r3), "+d"(arg4)
+	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3)
+	                     : "memory", "cc");
+
+	return ret;
+}
+
+static inline word_t
+call_cap_2retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2)
+{
+	long   fault = 0;
+	word_t ret;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	__asm__ __volatile__("pushl %%ebp\n\t"		\
+	                     "movl %%esp, %%ebp\n\t"	\
+	                     "movl $1f, %%ecx\n\t"	\
+	                     "sysenter\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "jmp 2f\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "1:\n\t"			\
+	                     "movl $0, %%ecx\n\t"	\
+	                     "jmp 3f\n\t"		\
+	                     "2:\n\t"			\
+	                     "movl $1, %%ecx\n\t"	\
+	                     "3:\n\t"			\
+	                     "popl %%ebp\n\t"		\
+	                     : "=a"(ret), "=c"(fault), "=S"(*r1), "=D"(*r2), "+d"(arg4)
+	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3)
+	                     : "memory", "cc");
+
+	return ret;
+}
+
+static inline int
+cap_switch_thd(u32_t cap_no)
+{
+	return call_cap_asm(cap_no, 0, 0, 0, 0, 0);
+}
+
+static inline int
+call_cap(u32_t cap_no, int arg1, int arg2, int arg3, int arg4)
+{
+	return call_cap_asm(cap_no, 0, arg1, arg2, arg3, arg4);
+}
+
+static inline int
+call_cap_op(u32_t cap_no, u32_t op_code, int arg1, int arg2, int arg3, int arg4)
+{
+	return call_cap_asm(cap_no, op_code, arg1, arg2, arg3, arg4);
+}
+
+static void
+cos_print(char *s, int len)
+{
+	// FIXME: casting from a pointer to an int can be lossy
+	call_cap(PRINT_CAP_TEMP, (int) s, len, 0, 0);
+}
+
+static inline int
+cos_sinv(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4)
+{
+	return call_cap_op(sinv, 0, arg1, arg2, arg3, arg4);
+}
+
+static inline int
+cos_sinv_rets(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2, word_t *ret3)
+{
+	return call_cap_retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2, ret3);
+}
+
+static inline int
+cos_sinv_2rets(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2)
+{
+	return call_cap_2retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2);
+}
+
+/**
+ * FIXME: Please remove this since it is no longer needed
+ */
+
+extern long stkmgr_stack_space[ALL_TMP_STACKS_SZ];
+extern struct cos_component_information __cosrt_comp_info;
+
+static inline long
+get_stk_data(int offset)
+{
+	unsigned long curr_stk_pointer;
+
+	__asm__("movl %%esp, %0;" : "=r"(curr_stk_pointer));
+	/*
+	 * We save the CPU_ID and thread id in the stack for fast
+	 * access.  We want to find the struct cos_stk (see the stkmgr
+	 * interface) so that we can then offset into it and get the
+	 * cpu_id.  This struct is at the _top_ of the current stack,
+	 * and cpu_id is at the top of the struct (it is a u32_t).
+	 */
+	return *(long *)((curr_stk_pointer & ~(COS_STACK_SZ - 1)) + COS_STACK_SZ - offset * sizeof(u32_t));
+}
+
+#define GET_CURR_CPU cos_cpuid()
+
+static inline long
+cos_cpuid(void)
+{
+#if NUM_CPU == 1
+	return 0;
+#endif
+	/*
+	 * see comments in the get_stk_data above.
+	 */
+	return get_stk_data(CPUID_OFFSET);
+}
+
+static inline coreid_t
+cos_coreid(void)
+{
+	return (coreid_t)cos_cpuid();
+}
+
+static inline unsigned short int
+cos_get_thd_id(void)
+{
+	/*
+	 * see comments in the get_stk_data above.
+	 */
+	return get_stk_data(THDID_OFFSET);
+}
+
+static inline invtoken_t
+cos_inv_token(void)
+{
+	return get_stk_data(INVTOKEN_OFFSET);
+}
+
+typedef u16_t cos_thdid_t;
+
+static thdid_t
+cos_thdid(void)
+{
+	return cos_get_thd_id();
+}
+
+#define ERR_THROW(errval, label) \
+	do {                     \
+		ret = errval;    \
+		goto label;      \
+	} while (0)
+
+static inline long
+cos_spd_id(void)
+{
+	return __cosrt_comp_info.cos_this_spd_id;
+}
+
+static inline compid_t
+cos_compid(void)
+{
+	return cos_spd_id();
+}
+
+static inline int
+cos_compid_uninitialized(void)
+{
+	return cos_compid() == 0;
+}
+
+static inline void
+cos_compid_set(compid_t cid)
+{
+	__cosrt_comp_info.cos_this_spd_id = cid;
+}
+
+static inline void *
+cos_get_heap_ptr(void)
+{
+	return (void *)__cosrt_comp_info.cos_heap_ptr;
+}
+
+static inline void
+cos_set_heap_ptr(void *addr)
+{
+	__cosrt_comp_info.cos_heap_ptr = (vaddr_t)addr;
+}
+
+static inline char *
+cos_init_args(void)
+{
+	return __cosrt_comp_info.init_string;
+}
+
+#define COS_CPUBITMAP_STARTTOK 'c'
+#define COS_CPUBITMAP_ENDTOK   ","
+#define COS_CPUBITMAP_LEN      (NUM_CPU)
+
+static inline int
+cos_args_cpubmp(u32_t *cpubmp, char *arg)
+{
+	char *tok1 = NULL, *tok2 = NULL;
+	char res[COMP_INFO_INIT_STR_LEN] = { '\0' }, *rs = res;
+	int i, len = 0;
+
+	if (!arg || !cpubmp) return -EINVAL;
+	strncpy(rs, arg, COMP_INFO_INIT_STR_LEN);
+	if (!strlen(arg)) goto allset;
+	while ((tok1 = strtok_r(rs, COS_CPUBITMAP_ENDTOK, &rs)) != NULL) {
+		if (tok1[0] == COS_CPUBITMAP_STARTTOK) break;
+	}
+	/* if "c" tag is not present.. set the component to be runnable on all cores */
+	if (!tok1) goto allset;
+	if (strlen(tok1) != (COS_CPUBITMAP_LEN + 1)) return -EINVAL;
+
+	tok2 = tok1 + 1;
+	len = strlen(tok2);
+	for (i = 0; i < len; i++) {
+		if (tok2[i] == '1') bitmap_set(cpubmp, (len - 1 - i));
+	}
+
+	return 0;
+
+allset:
+	bitmap_set_contig(cpubmp, 0, NUM_CPU, 1);
+
+	return 0;
+}
+
+static inline int
+cos_init_args_cpubmp(u32_t *cpubmp)
+{
+	return cos_args_cpubmp(cpubmp, cos_init_args());
+}
+
+static inline long
+cos_cmpxchg(volatile void *memory, long anticipated, long result)
+{
+	long ret;
+
+	__asm__ __volatile__("call cos_atomic_cmpxchg"
+	                     : "=d"(ret)
+	                     : "a"(anticipated), "b"(memory), "c"(result)
+	                     : "cc", "memory");
+
+	return ret;
+}
+
+/* A uni-processor variant with less overhead but that doesn't
+ * guarantee atomicity across cores. */
+static inline int
+cos_cas_up(unsigned long *target, unsigned long cmp, unsigned long updated)
+{
+	char z;
+	__asm__ __volatile__("cmpxchgl %2, %0; setz %1"
+	                     : "+m"(*target), "=a"(z)
+	                     : "q"(updated), "a"(cmp)
+	                     : "memory", "cc");
+	return (int)z;
+}
+
+static inline void *
+cos_get_prealloc_page(void)
+{
+	char *h;
+	long  r;
+	do {
+		h = (char *)__cosrt_comp_info.cos_heap_alloc_extent;
+		if (!h || (char *)__cosrt_comp_info.cos_heap_allocated >= h) return NULL;
+		r = (long)h + PAGE_SIZE;
+	} while (cos_cmpxchg(&__cosrt_comp_info.cos_heap_allocated, (long)h, r) != r);
+
+	return h;
+}
+
+/* allocate and release a page in the vas */
+extern void *cos_get_vas_page(void);
+extern void  cos_release_vas_page(void *p);
+
+/* only if the heap pointer is pre_addr, set it to post_addr */
+static inline void
+cos_set_heap_ptr_conditional(void *pre_addr, void *post_addr)
+{
+	cos_cmpxchg(&__cosrt_comp_info.cos_heap_ptr, (long)pre_addr, (long)post_addr);
+}
+
+/* from linux source in string.h */
+static inline void *
+cos_memcpy(void *to, const void *from, int n)
+{
+	int d0, d1, d2;
+
+	__asm__ __volatile__("rep ; movsl\n\t"
+	                     "movl %4,%%ecx\n\t"
+	                     "andl $3,%%ecx\n\t"
+#if 1 /* want to pay 2 byte penalty for a chance to skip microcoded rep? */
+	                     "jz 1f\n\t"
+#endif
+	                     "rep ; movsb\n\t"
+	                     "1:"
+	                     : "=&c"(d0), "=&D"(d1), "=&S"(d2)
+	                     : "0"(n / 4), "g"(n), "1"((long)to), "2"((long)from)
+	                     : "memory");
+
+	return (to);
+}
+
+static inline void *
+cos_memset(void *s, char c, int count)
+{
+	int d0, d1;
+	__asm__ __volatile__("rep\n\t"
+	                     "stosb"
+	                     : "=&c"(d0), "=&D"(d1)
+	                     : "a"(c), "1"(s), "0"(count)
+	                     : "memory");
+	return s;
+}
+
+/* compiler branch prediction hints */
+#ifndef likely
+#define likely(x) __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#endif
+
+#define CREGPARM(r) __attribute__((regparm(r)))
+#define CFORCEINLINE __attribute__((always_inline))
+#define CWEAKSYMB __attribute__((weak))
+/*
+ * Create a weak function alias called "aliasn" which aliases the
+ * existing function "name".  Example: COS_FN_WEAKALIAS(read,
+ * __my_read) will take your "__my_read" function and create "read" as
+ * an a weak alias to it.
+ */
+#define COS_FN_WEAKALIAS(weak_alias, name)					\
+	__typeof__(name) weak_alias __attribute__((weak, alias(STR(name))))
+
+/*
+ * A composite constructor (deconstructor): will be executed before
+ * other component execution (after component execution).  CRECOV is a
+ * function that should be called if one of the depended-on components
+ * has failed (e.g. the function serves as a callback notification).
+ */
+#define CCTOR __attribute__((constructor))
+#define CDTOR __attribute__((destructor)) /* currently unused! */
+#define CRECOV(fnname) long crecov_##fnname##_ptr __attribute__((section(".crecov"))) = (long)fnname
+
+static inline void
+section_fnptrs_execute(long *list)
+{
+	int i;
+
+	for (i = 0; i < list[0]; i++) {
+		typedef void (*ctors_t)(void);
+		ctors_t ctors = (ctors_t)list[i + 1];
+		ctors();
+	}
+}
+
+static void
+constructors_execute(void)
+{
+	extern long __CTOR_LIST__;
+	extern long __INIT_ARRAY_LIST__;
+	section_fnptrs_execute(&__CTOR_LIST__);
+	section_fnptrs_execute(&__INIT_ARRAY_LIST__);
+}
+static void
+destructors_execute(void)
+{
+	extern long __DTOR_LIST__;
+	extern long __FINI_ARRAY_LIST__;
+	section_fnptrs_execute(&__DTOR_LIST__);
+	section_fnptrs_execute(&__FINI_ARRAY_LIST__);
+}
+static void
+recoveryfns_execute(void)
+{
+	extern long __CRECOV_LIST__;
+	section_fnptrs_execute(&__CRECOV_LIST__);
+}
+
+#define FAIL() *(int *)NULL = 0
+
+struct cos_array {
+	char *mem;
+	int   sz;
+}; /* TODO: remove */
+#define prevent_tail_call(ret) __asm__("" : "=r"(ret) : "m"(ret))
+#define rdtscll(val) __asm__ __volatile__("rdtsc" : "=A"(val))
+
+#ifndef STR
+#define STRX(x) #x
+#define STR(x) STRX(x)
+#endif
+
+struct __thd_init_data {
+	void *fn;
+	void *data;
+};
+
+typedef u32_t cbuf_t; /* TODO: remove when we have cbuf.h */
+
+#define perfcntr(v) rdtscll(v)
+static inline void pmccntr_init(void) {}
+
+#define perfcntr_init pmccntr_init
+
+#endif
diff --git a/src/components/lib/component/arch/x86/cos_serial.h b/src/components/lib/component/arch/x86/cos_serial.h
new file mode 100644
index 0000000000..c0d8134654
--- /dev/null
+++ b/src/components/lib/component/arch/x86/cos_serial.h
@@ -0,0 +1,40 @@
+#ifndef COS_SERIAL_X86_H
+#define COS_SERIAL_X86_H
+
+#include <cos_io.h>
+
+/* code duplicated from platform/i386/serial.c */
+enum cos_serial_ports
+{
+	COS_SERIAL_PORT_A = 0x3F8,
+	COS_SERIAL_PORT_B = 0x2F8,
+	COS_SERIAL_PORT_C = 0x3E8,
+	COS_SERIAL_PORT_D = 0x2E8
+};
+
+static inline void
+cos_serial_putc(char out)
+{
+	while ((inb(COS_SERIAL_PORT_A + 5) & 0x20) == 0) {
+		/* wait for port to be ready to send */
+	}
+	outb(COS_SERIAL_PORT_A, out);
+}
+
+/* NOTE: can be interleaved & the output could just look like garbage. */
+static inline void
+cos_serial_puts(const char *s)
+{
+	for (; *s != '\0'; s++) cos_serial_putc(*s);
+}
+
+/* for binary printing */
+static inline void
+cos_serial_putb(const char *s, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len; i++) cos_serial_putc(*(s + i));
+}
+
+#endif /* COS_SERIAL_X86_H */
diff --git a/src/components/lib/component/arch/x86_64/c_stub.h b/src/components/lib/component/arch/x86_64/c_stub.h
new file mode 100644
index 0000000000..73f0876275
--- /dev/null
+++ b/src/components/lib/component/arch/x86_64/c_stub.h
@@ -0,0 +1,25 @@
+#ifndef COS_STUB_X86_64_H
+#define COS_STUB_X86_64_H
+
+/*
+ * Macros for defining C stubs for the client and server. These
+ * functions are called through the PLT-like level of indirection on
+ * interface functions that ensure the the invocation information
+ * (struct usr_inv_cap) which includes the capability id.
+ */
+#define COS_CLIENT_STUB(_type, _client_fn, ...) _type __cosrt_c_##_client_fn(__VA_ARGS__)
+
+#define COS_CLIENT_INVCAP register struct usr_inv_cap *uc asm ("rax");
+
+/*
+ * We marshal and demarshal double word arguments..
+ * Nothing special to do for this architecture.
+ */
+#define COS_ARG_DWORD_TO_WORD(dw, wh, wl)               \
+                wl = 0;                  \
+                wh = dw
+
+#define COS_ARG_WORDS_TO_DWORD(wa, wb, dw)              \
+                dw = wa
+
+#endif /* COS_STUB_X86_H */
diff --git a/src/components/lib/component/arch/x86_64/cos_asm_ainv.h b/src/components/lib/component/arch/x86_64/cos_asm_ainv.h
new file mode 100644
index 0000000000..437838a429
--- /dev/null
+++ b/src/components/lib/component/arch/x86_64/cos_asm_ainv.h
@@ -0,0 +1,29 @@
+#define COS_AINV_ENTRY		\
+	push %rbx;		\
+	push %rsi;		\
+	push %rdi;		\
+	push %rdx;		\
+	push %rbp;		\
+	movl %esp, %ebx;	\
+	addl $24, %ebx;		\
+	push %rbx;		\
+	push %rax;		\
+	call cos_async_inv;	\
+	addl $8, %esp;		\
+	cmpl $0, %eax;		\
+	je ainv_ret;		\
+	movl 24(%esp), %ebx;	\
+	movl 28(%esp), %esi;	\
+	movl 32(%esp), %edi;	\
+	movl 36(%esp), %edx;	\
+	movl %esp, %ebp;	\
+	movabs $ainv_ret, %rcx;	\
+	sysenter;
+
+#define COS_AINV_RET		\
+	pop %rbp;		\
+	pop %rdx;		\
+	pop %rdi;		\
+	pop %rsi;		\
+	pop %rbx;		\
+	ret;
diff --git a/src/components/lib/component/arch/x86_64/cos_asm_simple_stacks.h b/src/components/lib/component/arch/x86_64/cos_asm_simple_stacks.h
new file mode 100644
index 0000000000..8259ddd690
--- /dev/null
+++ b/src/components/lib/component/arch/x86_64/cos_asm_simple_stacks.h
@@ -0,0 +1,30 @@
+#ifndef COS_ASM_SIMPLE_STACKS_X86_64_H
+#define COS_ASM_SIMPLE_STACKS_X86_64_H
+
+/* clang-format off */
+#define COS_ASM_GET_STACK_BASIC             \
+	movabs $cos_static_stack, %rsp;	    \
+	mov %rax, %rdx;		    \
+	andq $0xffff, %rax;		    \
+	shl $MAX_STACK_SZ_BYTE_ORDER, %rax; \
+	add %rax, %rsp;		    \
+	shr $MAX_STACK_SZ_BYTE_ORDER, %rax; \
+	shr $16, %rdx;			    \
+	pushq %rdx;			    \
+	pushq %rax;
+
+#define COS_ASM_GET_STACK       \
+	COS_ASM_GET_STACK_BASIC \
+	push $0;
+
+#define COS_ASM_GET_STACK_INVTOKEN \
+	COS_ASM_GET_STACK_BASIC    \
+	push %rbp;
+
+#define COS_ASM_RET_STACK
+
+#define COS_ASM_REQUEST_STACK
+
+/* clang-format on */
+
+#endif
diff --git a/src/components/lib/component/arch/x86_64/cos_asm_upcall_simple_stacks.h b/src/components/lib/component/arch/x86_64/cos_asm_upcall_simple_stacks.h
new file mode 100644
index 0000000000..8a1b21e75b
--- /dev/null
+++ b/src/components/lib/component/arch/x86_64/cos_asm_upcall_simple_stacks.h
@@ -0,0 +1,58 @@
+/**
+ * Copyright 2007 by Gabriel Parmer, gabep1@cs.bu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+
+#define COS_STATIC_STACK		\
+.align COS_STACK_SZ;			\
+.globl cos_static_stack;		\
+cos_static_stack:			\
+	.rep ALL_STACK_SZ_FLAT;		\
+	.long 0	;			\
+	.endr ;				\
+.globl cos_static_stack_end;		\
+cos_static_stack_end:
+
+#define COS_UPCALL_ENTRY 		\
+.text;					\
+.globl __cosrt_upcall_entry;		\
+.type __cosrt_upcall_entry, @function;	\
+.align 16;				\
+__cosrt_upcall_entry:			\
+	COS_ASM_GET_STACK		\
+	push $0;			\
+	mov %rsp, -16(%rsp);		\
+	push $0;			\
+	mov %rsp, -16(%rsp);		\
+	sub $16, %rsp;			\
+	mov %rsi, %rcx;			\
+	mov %rdi, %rdx;			\
+	mov %rbx, %rsi;			\
+	xor %rbp, %rbp;			\
+	mov %r12, %rdi;			\
+	/* ABI mandate a 16-byte alignment stack pointer*/ \
+	and $~0xf, %rsp;		\
+	call cos_upcall_fn;		\
+	addl $24, %esp;			\
+	pop %rsi;			\
+	pop %rdi;			\
+	movl %eax, %ecx;		\
+	movl $RET_CAP, %eax;		\
+	COS_ASM_RET_STACK		\
+	sysenter;
+
+#define COS_ATOMIC_CMPXCHG 		\
+	movl %eax, %edx;		\
+	cmpl (%ebx), %eax;		\
+	jne cos_atomic_cmpxchg_end;	\
+	movl %ecx, %edx;		\
+	movl %ecx, (%ebx);
+
+#define COS_ATOMIC_CMPXCHG_END		\
+	ret;
+
+#define COS_ATOMIC_USER4_END		\
+	movl $0, %eax;			\
+	movl (%eax), %eax;
diff --git a/src/components/lib/component/arch/x86_64/cos_component.h b/src/components/lib/component/arch/x86_64/cos_component.h
new file mode 100644
index 0000000000..8edee8be09
--- /dev/null
+++ b/src/components/lib/component/arch/x86_64/cos_component.h
@@ -0,0 +1,496 @@
+/**
+ * Copyright 2007 by Gabriel Parmer, gabep1@cs.bu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+
+#ifndef COS_COMPONENT_X86_64_H
+#define COS_COMPONENT_X86_64_H
+
+#include <consts.h>
+#include <cos_types.h>
+#include <util.h>
+#include <string.h>
+#include <bitmap.h>
+#include <ps_plat.h>
+
+/*
+ * dewarn: strtok_r()
+ * reference: feature_test_macro() requirement: _SVID_SOURCE || _BSD_SOURCE || _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE
+ */
+extern char *strtok_r(char *str, const char *delim, char **saveptr);
+void libc_init();
+char *cos_initargs_tar();
+
+/* temporary */
+static inline int
+call_cap_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4)
+{
+	long fault = 0;
+	int  ret;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	__asm__ __volatile__("pushq %%rbp\n\t"		\
+	                     "mov %%rsp, %%rbp\n\t"	\
+	                     "movabs $1f, %%r8\n\t"	\
+	                     "syscall\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "jmp 2f\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "1:\n\t"			\
+	                     "movl $0, %%ecx\n\t"	\
+	                     "jmp 3f\n\t"		\
+	                     "2:\n\t"			\
+	                     "movl $1, %%ecx\n\t"	\
+	                     "3:\n\t"			\
+	                     "popq %%rbp"		\
+	                     : "=a"(ret), "=c"(fault)
+	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3), "d"(arg4)
+	                     : "memory", "cc", "r8", "r9", "r11","r12");
+
+	return ret;
+}
+
+static inline int
+call_cap_retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2, word_t *r3)
+{
+	long fault = 0;
+	int  ret;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	__asm__ __volatile__("pushq %%rbp\n\t"		\
+	                     "mov %%rsp, %%rbp\n\t"	\
+	                     "movabs $1f, %%r8\n\t"	\
+	                     "syscall\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "jmp 2f\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "1:\n\t"			\
+	                     "mov $0, %%rcx\n\t"	\
+	                     "jmp 3f\n\t"		\
+	                     "2:\n\t"			\
+	                     "mov $1, %%rcx\n\t"	\
+	                     "3:\n\t"			\
+	                     "popq %%rbp\n\t"		\
+	                     : "=a"(ret), "=c"(fault), "=S"(*r1), "=D"(*r2), "=b" (*r3)
+	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3), "d"(arg4)
+	                     : "memory", "cc", "r8", "r9", "r11", "r12");
+
+	return ret;
+}
+
+static inline word_t
+call_cap_2retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2)
+{
+	long   fault = 0;
+	word_t ret;
+
+	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
+	cap_no += op;
+
+	__asm__ __volatile__("pushq %%rbp\n\t"		\
+	                     "mov %%rsp, %%rbp\n\t"	\
+	                     "movabs $1f, %%r8\n\t"	\
+	                     "syscall\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "jmp 2f\n\t"		\
+	                     ".align 8\n\t"		\
+	                     "1:\n\t"			\
+	                     "mov $0, %%rcx\n\t"	\
+	                     "jmp 3f\n\t"		\
+	                     "2:\n\t"			\
+	                     "mov $1, %%rcx\n\t"	\
+	                     "3:\n\t"			\
+	                     "popq %%rbp\n\t"		\
+	                     : "=a"(ret), "=c"(fault), "=S"(*r1), "=D"(*r2)
+	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3), "d"(arg4)
+	                     : "memory", "cc", "r8","r9","r10", "r11", "r12");
+
+	return ret;
+}
+
+static inline int
+cap_switch_thd(u32_t cap_no)
+{
+	return call_cap_asm(cap_no, 0, 0, 0, 0, 0);
+}
+
+static inline int
+call_cap(u32_t cap_no, word_t arg1, word_t arg2, word_t arg3, word_t arg4)
+{
+	return call_cap_asm(cap_no, 0, arg1, arg2, arg3, arg4);
+}
+
+static inline int
+call_cap_op(u32_t cap_no, u32_t op_code, word_t arg1, word_t arg2, word_t arg3, word_t arg4)
+{
+	return call_cap_asm(cap_no, op_code, arg1, arg2, arg3, arg4);
+}
+
+static void
+cos_print(char *s, int len)
+{
+	// FIXME: casting from a pointer to an int can be lossy
+	call_cap(PRINT_CAP_TEMP, (word_t) s, len, 0, 0);
+}
+
+static inline int
+cos_sinv(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4)
+{
+	return call_cap_op(sinv, 0, arg1, arg2, arg3, arg4);
+}
+
+static inline int
+cos_sinv_rets(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2, word_t *ret3)
+{
+	return call_cap_retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2, ret3);
+}
+
+static inline int
+cos_sinv_2rets(u32_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2)
+{
+	return call_cap_2retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2);
+}
+
+/**
+ * FIXME: Please remove this since it is no longer needed
+ */
+
+extern long stkmgr_stack_space[ALL_TMP_STACKS_SZ];
+extern struct cos_component_information __cosrt_comp_info;
+
+static inline long
+get_stk_data(int offset)
+{
+	unsigned long curr_stk_pointer;
+
+	__asm__("mov %%rsp, %0;" : "=r"(curr_stk_pointer));
+	/*
+	 * We save the CPU_ID and thread id in the stack for fast
+	 * access.  We want to find the struct cos_stk (see the stkmgr
+	 * interface) so that we can then offset into it and get the
+	 * cpu_id.  This struct is at the _top_ of the current stack,
+	 * and cpu_id is at the top of the struct (it is a u32_t).
+	 */
+	return *(long *)((curr_stk_pointer & ~(COS_STACK_SZ - 1)) + COS_STACK_SZ - offset * sizeof(unsigned long));
+}
+
+#define GET_CURR_CPU cos_cpuid()
+
+static inline long
+cos_cpuid(void)
+{
+#if NUM_CPU == 1
+	return 0;
+#endif
+	/*
+	 * see comments in the get_stk_data above.
+	 */
+	return get_stk_data(CPUID_OFFSET);
+}
+
+static inline coreid_t
+cos_coreid(void)
+{
+	return (coreid_t)cos_cpuid();
+}
+
+static inline unsigned short int
+cos_get_thd_id(void)
+{
+	/*
+	 * see comments in the get_stk_data above.
+	 */
+	return get_stk_data(THDID_OFFSET);
+}
+
+static inline invtoken_t
+cos_inv_token(void)
+{
+	return get_stk_data(INVTOKEN_OFFSET);
+}
+
+typedef u16_t cos_thdid_t;
+
+static thdid_t
+cos_thdid(void)
+{
+	return cos_get_thd_id();
+}
+
+#define ERR_THROW(errval, label) \
+	do {                     \
+		ret = errval;    \
+		goto label;      \
+	} while (0)
+
+static inline long
+cos_spd_id(void)
+{
+	return __cosrt_comp_info.cos_this_spd_id;
+}
+
+static inline compid_t
+cos_compid(void)
+{
+	return cos_spd_id();
+}
+
+static inline int
+cos_compid_uninitialized(void)
+{
+	return cos_compid() == 0;
+}
+
+static inline void
+cos_compid_set(compid_t cid)
+{
+	__cosrt_comp_info.cos_this_spd_id = cid;
+}
+
+static inline void *
+cos_get_heap_ptr(void)
+{
+	return (void *)__cosrt_comp_info.cos_heap_ptr;
+}
+
+static inline void
+cos_set_heap_ptr(void *addr)
+{
+	__cosrt_comp_info.cos_heap_ptr = (vaddr_t)addr;
+}
+
+static inline char *
+cos_init_args(void)
+{
+	return __cosrt_comp_info.init_string;
+}
+
+#define COS_CPUBITMAP_STARTTOK 'c'
+#define COS_CPUBITMAP_ENDTOK   ","
+#define COS_CPUBITMAP_LEN      (NUM_CPU)
+
+static inline int
+cos_args_cpubmp(u32_t *cpubmp, char *arg)
+{
+	char *tok1 = NULL, *tok2 = NULL;
+	char res[COMP_INFO_INIT_STR_LEN] = { '\0' }, *rs = res;
+	int i, len = 0;
+
+	if (!arg || !cpubmp) return -EINVAL;
+	strncpy(rs, arg, COMP_INFO_INIT_STR_LEN);
+	if (!strlen(arg)) goto allset;
+	while ((tok1 = strtok_r(rs, COS_CPUBITMAP_ENDTOK, &rs)) != NULL) {
+		if (tok1[0] == COS_CPUBITMAP_STARTTOK) break;
+	}
+	/* if "c" tag is not present.. set the component to be runnable on all cores */
+	if (!tok1) goto allset;
+	if (strlen(tok1) != (COS_CPUBITMAP_LEN + 1)) return -EINVAL;
+
+	tok2 = tok1 + 1;
+	len = strlen(tok2);
+	for (i = 0; i < len; i++) {
+		if (tok2[i] == '1') bitmap_set(cpubmp, (len - 1 - i));
+	}
+
+	return 0;
+
+allset:
+	bitmap_set_contig(cpubmp, 0, NUM_CPU, 1);
+
+	return 0;
+}
+
+static inline int
+cos_init_args_cpubmp(u32_t *cpubmp)
+{
+	return cos_args_cpubmp(cpubmp, cos_init_args());
+}
+
+static inline long
+cos_cmpxchg(volatile void *memory, long anticipated, long result)
+{
+	long ret;
+
+	__asm__ __volatile__("call cos_atomic_cmpxchg"
+	                     : "=d"(ret)
+	                     : "a"(anticipated), "b"(memory), "c"(result)
+	                     : "cc", "memory");
+
+	return ret;
+}
+
+/* A uni-processor variant with less overhead but that doesn't
+ * guarantee atomicity across cores. */
+static inline int
+cos_cas_up(unsigned long *target, unsigned long cmp, unsigned long updated)
+{
+	char z;
+	__asm__ __volatile__("cmpxchgl %2, %0; setz %1"
+	                     : "+m"(*target), "=a"(z)
+	                     : "q"(updated), "a"(cmp)
+	                     : "memory", "cc");
+	return (int)z;
+}
+
+static inline void *
+cos_get_prealloc_page(void)
+{
+	char *h;
+	long  r;
+	do {
+		h = (char *)__cosrt_comp_info.cos_heap_alloc_extent;
+		if (!h || (char *)__cosrt_comp_info.cos_heap_allocated >= h) return NULL;
+		r = (long)h + PAGE_SIZE;
+	} while (cos_cmpxchg(&__cosrt_comp_info.cos_heap_allocated, (long)h, r) != r);
+
+	return h;
+}
+
+/* allocate and release a page in the vas */
+extern void *cos_get_vas_page(void);
+extern void  cos_release_vas_page(void *p);
+
+/* only if the heap pointer is pre_addr, set it to post_addr */
+static inline void
+cos_set_heap_ptr_conditional(void *pre_addr, void *post_addr)
+{
+	cos_cmpxchg(&__cosrt_comp_info.cos_heap_ptr, (long)pre_addr, (long)post_addr);
+}
+
+/* from linux source in string.h */
+static inline void *
+cos_memcpy(void *to, const void *from, int n)
+{
+	int d0, d1, d2;
+
+	__asm__ __volatile__("rep ; movsl\n\t"
+	                     "movl %4,%%ecx\n\t"
+	                     "andl $3,%%ecx\n\t"
+#if 1 /* want to pay 2 byte penalty for a chance to skip microcoded rep? */
+	                     "jz 1f\n\t"
+#endif
+	                     "rep ; movsb\n\t"
+	                     "1:"
+	                     : "=&c"(d0), "=&D"(d1), "=&S"(d2)
+	                     : "0"(n / 4), "g"(n), "1"((long)to), "2"((long)from)
+	                     : "memory");
+
+	return (to);
+}
+
+static inline void *
+cos_memset(void *s, char c, int count)
+{
+	int d0, d1;
+	__asm__ __volatile__("rep\n\t"
+	                     "stosb"
+	                     : "=&c"(d0), "=&D"(d1)
+	                     : "a"(c), "1"(s), "0"(count)
+	                     : "memory");
+	return s;
+}
+
+/* compiler branch prediction hints */
+#ifndef likely
+#define likely(x) __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#endif
+
+#define CREGPARM(r) __attribute__((regparm(r)))
+#define CFORCEINLINE __attribute__((always_inline))
+#define CWEAKSYMB __attribute__((weak))
+/*
+ * Create a weak function alias called "aliasn" which aliases the
+ * existing function "name".  Example: COS_FN_WEAKALIAS(read,
+ * __my_read) will take your "__my_read" function and create "read" as
+ * an a weak alias to it.
+ */
+#define COS_FN_WEAKALIAS(weak_alias, name)					\
+	__typeof__(name) weak_alias __attribute__((weak, alias(STR(name))))
+
+/*
+ * A composite constructor (deconstructor): will be executed before
+ * other component execution (after component execution).  CRECOV is a
+ * function that should be called if one of the depended-on components
+ * has failed (e.g. the function serves as a callback notification).
+ */
+#define CCTOR __attribute__((constructor))
+#define CDTOR __attribute__((destructor)) /* currently unused! */
+#define CRECOV(fnname) long crecov_##fnname##_ptr __attribute__((section(".crecov"))) = (long)fnname
+
+static inline void
+section_fnptrs_execute(long *list)
+{
+	int i;
+
+	for (i = 0; i < list[0]; i++) {
+		typedef void (*ctors_t)(void);
+		ctors_t ctors = (ctors_t)list[i + 1];
+		ctors();
+	}
+}
+
+static void
+constructors_execute(void)
+{
+	extern void * __CTOR_LIST__;
+	extern void * __INIT_ARRAY_LIST__;
+	section_fnptrs_execute((long *)&__CTOR_LIST__);
+	section_fnptrs_execute((long *)&__INIT_ARRAY_LIST__);
+}
+static void
+destructors_execute(void)
+{
+	extern long __DTOR_LIST__;
+	extern long __FINI_ARRAY_LIST__;
+	section_fnptrs_execute(&__DTOR_LIST__);
+	section_fnptrs_execute(&__FINI_ARRAY_LIST__);
+}
+static void
+recoveryfns_execute(void)
+{
+	extern long __CRECOV_LIST__;
+	section_fnptrs_execute(&__CRECOV_LIST__);
+}
+
+#define FAIL() *(int *)NULL = 0
+
+struct cos_array {
+	char *mem;
+	int   sz;
+}; /* TODO: remove */
+#define prevent_tail_call(ret) __asm__("" : "=r"(ret) : "m"(ret))
+
+#if defined(__x86_64__)
+		#define rdtscll(val) __asm__ __volatile__("rdtsc; shl $32, %%rdx; or %%rdx, %0" : "=a"(val)::"rdx")
+#elif defined(__i386__)
+		#define rdtscll(val) __asm__ __volatile__("rdtsc" : "=A"(val))
+#endif
+
+
+#ifndef STR
+#define STRX(x) #x
+#define STR(x) STRX(x)
+#endif
+
+struct __thd_init_data {
+	void *fn;
+	void *data;
+};
+
+typedef u32_t cbuf_t; /* TODO: remove when we have cbuf.h */
+
+#define perfcntr(v) rdtscll(v)
+static inline void pmccntr_init(void) {}
+
+#define perfcntr_init pmccntr_init
+
+#endif
diff --git a/src/components/lib/component/arch/x86_64/cos_serial.h b/src/components/lib/component/arch/x86_64/cos_serial.h
new file mode 100644
index 0000000000..94e8fafb4a
--- /dev/null
+++ b/src/components/lib/component/arch/x86_64/cos_serial.h
@@ -0,0 +1,40 @@
+#ifndef COS_SERIAL_X86_64_H
+#define COS_SERIAL_X86_64_H
+
+#include <cos_io.h>
+
+/* code duplicated from platform/i386/serial.c */
+enum cos_serial_ports
+{
+	COS_SERIAL_PORT_A = 0x3F8,
+	COS_SERIAL_PORT_B = 0x2F8,
+	COS_SERIAL_PORT_C = 0x3E8,
+	COS_SERIAL_PORT_D = 0x2E8
+};
+
+static inline void
+cos_serial_putc(char out)
+{
+	while ((inb(COS_SERIAL_PORT_A + 5) & 0x20) == 0) {
+		/* wait for port to be ready to send */
+	}
+	outb(COS_SERIAL_PORT_A, out);
+}
+
+/* NOTE: can be interleaved & the output could just look like garbage. */
+static inline void
+cos_serial_puts(const char *s)
+{
+	for (; *s != '\0'; s++) cos_serial_putc(*s);
+}
+
+/* for binary printing */
+static inline void
+cos_serial_putb(const char *s, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len; i++) cos_serial_putc(*(s + i));
+}
+
+#endif /* COS_SERIAL_X86_H */
diff --git a/src/components/lib/component/c_stub.c b/src/components/lib/component/c_stub.c
index 94c344f493..02b3f8ed89 100644
--- a/src/components/lib/component/c_stub.c
+++ b/src/components/lib/component/c_stub.c
@@ -1,15 +1,18 @@
 #include <cos_component.h>
 #include <cos_kernel_api.h>
 #include <cos_types.h>
+#include <c_stub.h>
 
-__attribute__((regparm(1))) int
-__cosrt_c_cosrtdefault(struct usr_inv_cap *uc, long p0, long p1, long p2, long p3)
+COS_CLIENT_STUB(int, cosrtdefault, word_t p0, word_t p1, word_t p2, word_t p3)
 {
+	COS_CLIENT_INVCAP;
+
 	return cos_sinv(uc->cap_no, p0, p1, p2, p3);
 }
 
-__attribute__((regparm(1))) int
-__cosrt_c_cosrtretdefault(struct usr_inv_cap *uc, word_t p0, word_t p1, word_t p2, word_t p3, word_t *r1, word_t *r2)
+COS_CLIENT_STUB(int, cosrtretdefault, word_t p0, word_t p1, word_t p2, word_t p3, word_t *r1, word_t *r2)
 {
+	COS_CLIENT_INVCAP;
+
 	return cos_sinv_2rets(uc->cap_no, p0, p1, p2, p3, r1, r2);
 }
diff --git a/src/components/lib/component/c_stub.h b/src/components/lib/component/c_stub.h
new file mode 100644
index 0000000000..7ef144b5af
--- /dev/null
+++ b/src/components/lib/component/c_stub.h
@@ -0,0 +1,14 @@
+#ifndef C_STUB_H
+#define C_STUB_H
+
+#if defined(__x86__)
+#include "arch/x86/c_stub.h"
+#elif defined(__x86_64__)
+#include "arch/x86_64/c_stub.h"
+#elif defined(__arm__)
+#include "arch/arm/c_stub.h"
+#else
+#error "Undefined architecture!"
+#endif
+
+#endif /* C_STUB_H */
diff --git a/src/components/lib/component/cos_asm_ainv.S b/src/components/lib/component/cos_asm_ainv.S
index 6047d7a3dd..bfb6a6113d 100644
--- a/src/components/lib/component/cos_asm_ainv.S
+++ b/src/components/lib/component/cos_asm_ainv.S
@@ -1,49 +1,19 @@
+#if defined(__x86__)
+#include "arch/x86/cos_asm_ainv.h"
+#elif defined(__x86_64__)
+#include "arch/x86_64/cos_asm_ainv.h"
+#elif defined(__arm__)
+#include "arch/arm/cos_asm_ainv.h"
+#endif
+
 /* Async inv stub. */
 	
 .globl cos_ainv_entry
-.type  cos_ainv_entry, @function
+.type  cos_ainv_entry, %function
 .align 16
 cos_ainv_entry:
-	/* save regs */
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-	pushl %edx
-	pushl %ebp
-
-	/* arguments */
-	movl %esp, %ebx
-	addl $24, %ebx
-	push %ebx // second arg: params
-
-	/* typeof(%eax) = (usr_inv_cap*) */
-	push %eax // first arg: usr_inv_cap
-
-	call cos_async_inv
-	addl $8, %esp
-
-	/* Return value is the acap we want to invoke. 0 means no need
-	to invoke. (i.e. server upcall thread active) */
-	cmpl $0, %eax // invoke acap to send ipi or not?
-	je ainv_ret
-
-	/* Load the arguments. We need them if static cap is returned. */
-	movl 24(%esp), %ebx
-	movl 28(%esp), %esi
-	movl 32(%esp), %edi
-	movl 36(%esp), %edx
-
-	/* invoke acap %eax */
-	movl %esp, %ebp /* save the stack */
-	movl $ainv_ret, %ecx /* save the return ip */
-
-	sysenter 
+	COS_AINV_ENTRY
 
 ainv_ret:
-	popl %ebp
-	popl %edx
-	popl %edi
-	popl %esi
-	popl %ebx
+	COS_AINV_RET
 
-	ret
diff --git a/src/components/lib/component/cos_asm_simple_stacks.h b/src/components/lib/component/cos_asm_simple_stacks.h
index f8b3437ea2..083a5e8f74 100644
--- a/src/components/lib/component/cos_asm_simple_stacks.h
+++ b/src/components/lib/component/cos_asm_simple_stacks.h
@@ -1,37 +1,20 @@
 #ifndef COS_ASM_SIMPLE_STACKS_H
 #define COS_ASM_SIMPLE_STACKS_H
 
-#define MAX_STACK_SZ_BYTE_ORDER 12
+#include <consts.h>
 
 #ifndef MAX_STACK_SZ_BYTE_ORDER
 #error "Missing MAX_STACK_SZ_BYTE_ORDER, try including consts.h"
 #endif
 
-/* clang-format off */
-
-#define COS_ASM_GET_STACK_BASIC             \
-	movl $cos_static_stack, %esp;	    \
-	movl %eax, %edx;		    \
-	andl $0xffff, %eax;		    \
-	shl $MAX_STACK_SZ_BYTE_ORDER, %eax; \
-	addl %eax, %esp;		    \
-	shr $MAX_STACK_SZ_BYTE_ORDER, %eax; \
-	shr $16, %edx;			    \
-	pushl %edx;			    \
-	pushl %eax;
-
-#define COS_ASM_GET_STACK       \
-	COS_ASM_GET_STACK_BASIC \
-	pushl $0;
-
-#define COS_ASM_GET_STACK_INVTOKEN \
-	COS_ASM_GET_STACK_BASIC    \
-	pushl %ecx;
-
-#define COS_ASM_RET_STACK
-
-#define COS_ASM_REQUEST_STACK
-
-/* clang-format on */
+#if defined(__x86__)
+#include "arch/x86/cos_asm_simple_stacks.h"
+#elif defined(__x86_64__)
+#include "arch/x86_64/cos_asm_simple_stacks.h"
+#elif defined(__arm__)
+#include "arch/arm/cos_asm_simple_stacks.h"
+#else
+#error "Undefined architecture!"
+#endif
 
 #endif
diff --git a/src/components/lib/component/cos_asm_upcall_simple_stacks.S b/src/components/lib/component/cos_asm_upcall_simple_stacks.S
index 8d2b902f87..7b48d326f3 100644
--- a/src/components/lib/component/cos_asm_upcall_simple_stacks.S
+++ b/src/components/lib/component/cos_asm_upcall_simple_stacks.S
@@ -5,99 +5,67 @@
  * Public License v2.
  */
 
-#define __ASM__
+//#define __ASM__
 #include <consts.h>
 #include <cos_asm_simple_stacks.h>
 #include "../../../kernel/include/asm_ipc_defs.h"
+#if defined(__x86__)
+#include "arch/x86/cos_asm_upcall_simple_stacks.h"
+#elif defined(__x86_64__)
+#include "arch/x86_64/cos_asm_upcall_simple_stacks.h"
+#elif defined(__arm__)
+#include "arch/arm/cos_asm_upcall_simple_stacks.h"
+#endif
 
 #define IPRETURN 4
 
 .section .initonce
-.align 32
+.align 16
 .globl nil
 nil:
 	.rep 1024
 	.long 0
 	.endr
 
-.align COS_STACK_SZ
-.globl cos_static_stack
-cos_static_stack:
-	.rep ALL_STACK_SZ
-	.long 0
-	.endr
-.globl cos_static_stack_end
-cos_static_stack_end:
-
-.text
-.globl __cosrt_upcall_entry
-.type  __cosrt_upcall_entry, @function
-.align 16
-__cosrt_upcall_entry:
-	COS_ASM_GET_STACK
-
-	pushl $0
-	movl %esp, -8(%esp)
-	pushl $0
-	movl %esp, -8(%esp)
-	subl $8, %esp
-	pushl %esi
-	pushl %edi
-	pushl %ebx
-	xor %ebp, %ebp
-	pushl %ecx /* option */
-	call cos_upcall_fn
-	addl $24, %esp
-
-	popl %esi
-	popl %edi
-
-	movl %eax, %ecx
-	movl $RET_CAP, %eax /* return capability */
-	COS_ASM_RET_STACK
+COS_STATIC_STACK
 
-	sysenter
+COS_UPCALL_ENTRY
 
 /*
  * %eax = cmpval, %ebx = memaddr, %ecx = newval
  * output %edx, either cmpval: fail, or newval:	success
  */
 .weak cos_atomic_cmpxchg
-.type cos_atomic_cmpxchg, @function
+.type cos_atomic_cmpxchg, %function
 .align 16
 cos_atomic_cmpxchg:
-	movl %eax, %edx   /* this resets edx if we rollback after XXX */
-	cmpl (%ebx), %eax
-	jne cos_atomic_cmpxchg_end
-	movl %ecx, %edx   /* XXX */
-	movl %ecx, (%ebx)
 .weak cos_atomic_cmpxchg_end
 cos_atomic_cmpxchg_end:
-	ret
+	COS_ATOMIC_CMPXCHG_END
 
 /*
  * %eax = semaphore_addr, %ebx = thread_id, %ecx = count
  */
 .weak cos_atomic_user1
-.type cos_atomic_user1, @function
+.type cos_atomic_user1, %function
 cos_atomic_user1:
 .weak cos_atomic_user1_end
 cos_atomic_user1_end:
 .weak cos_atomic_user2
-.type cos_atomic_user2, @function
+.type cos_atomic_user2, %function
 cos_atomic_user2:
 .weak cos_atomic_user2_end
 cos_atomic_user2_end:
 .weak cos_atomic_user3
-.type cos_atomic_user3, @function
+.type cos_atomic_user3, %function
 cos_atomic_user3:
 .weak cos_atomic_user3_end
 cos_atomic_user3_end:
 .weak cos_atomic_user4
-.type cos_atomic_user4, @function
+.type cos_atomic_user4, %function
 cos_atomic_user4:
 .weak cos_atomic_user4_end
 cos_atomic_user4_end:
 	/* crash out as something's wrong */
-	movl $0, %eax
-	movl (%eax), %eax
+	COS_ATOMIC_USER4_END
+	
\ No newline at end of file
diff --git a/src/components/lib/component/cos_component.c b/src/components/lib/component/cos_component.c
index 60e2f38259..64e085c7b9 100644
--- a/src/components/lib/component/cos_component.c
+++ b/src/components/lib/component/cos_component.c
@@ -90,12 +90,12 @@ syscall_emulation_setup()
 CWEAKSYMB long
 cos_syscall_handler(int syscall_num, long a, long b, long c, long d, long e, long f, long g)
 {
-	printc("Default syscall handler callled (syscall: %d), faulting!", syscall_num);
+	printc("Default syscall handler called (syscall: %d, first arg: %ld), faulting!", syscall_num, a);
 	assert(0);
 	return 0;
 }
 
-__attribute__((regparm(1))) long
+CREGPARM(1) long
 __cos_syscall(int syscall_num, long a, long b, long c, long d, long e, long f, long g)
 {
 	return cos_syscall_handler(syscall_num, a, b, c, d, e, f, g);
@@ -106,6 +106,16 @@ libc_initialization_handler()
 {
 }
 
+CWEAKSYMB void
+libc_posixcap_initialization_handler()
+{
+}
+
+CWEAKSYMB void
+libc_posixsched_initialization_handler()
+{
+}
+
 /* TODO: Make this a weak symbol (currently doing so makes this fail) */
 void __init_libc(char **envp, char *pn);
 
@@ -164,8 +174,8 @@ const char *cos_print_str[PRINT_LEVEL_MAX] = {
 	"DBG:",
 };
 
-cos_print_level_t cos_print_level   = PRINT_ERROR;
-int               cos_print_lvl_str = 0;
+int cos_print_level   = PRINT_ERROR;
+int cos_print_lvl_str = 0;
 
 CWEAKSYMB void
 cos_print_level_set(cos_print_level_t lvl, int print_str)
@@ -227,8 +237,8 @@ start_execution(coreid_t cid, int init_core, int ncores)
 			cos_parallel_init(cid, init_core, init_parallelism());
 		}
 		/* All initialization completed here, go onto main execution */
-		initialization_completed = 1;
 		COS_EXTERN_INV(init_done)(0, main_type);
+		initialization_completed = 1;
 	}
 	/* No main? we shouldn't have continued here... */
 	assert(main_type != INIT_MAIN_NONE);
@@ -248,6 +258,16 @@ start_execution(coreid_t cid, int init_core, int ncores)
 	BUG();
 }
 
+#if defined(__arm__)
+CWEAKSYMB vaddr_t
+cos_inv_cap_set(struct usr_inv_cap *uc)
+{
+	set_stk_data(INVCAP_OFFSET, (long)uc);
+
+	return uc->invocation_fn;
+}
+#endif
+
 CWEAKSYMB void
 cos_upcall_fn(upcall_type_t t, void *arg1, void *arg2, void *arg3)
 {
@@ -279,6 +299,10 @@ cos_upcall_fn(upcall_type_t t, void *arg1, void *arg2, void *arg3)
 		syscall_emulation_setup();
 		/* With all that setup, we can invoke the libc_initialization_handler */
 		libc_initialization_handler();
+		/* init lib posix variants */
+		libc_posixcap_initialization_handler();
+		libc_posixsched_initialization_handler();
+
 
 		constructors_execute();
 	}
@@ -289,6 +313,7 @@ cos_upcall_fn(upcall_type_t t, void *arg1, void *arg2, void *arg3)
 	 */
 	if (cos_compid_uninitialized()) { /* we must be in the initial booter! */
 		cos_hw_cycles_per_usec(BOOT_CAPTBL_SELF_INITHW_BASE);
+		perfcntr_init();
 	}
 
 	switch (t) {
@@ -305,7 +330,7 @@ cos_upcall_fn(upcall_type_t t, void *arg1, void *arg2, void *arg3)
 			start_execution(cos_coreid(), ps_cas(&first_core, 1, 0), init_parallelism());
 
 		} else {
-			u32_t idx = (int)arg1 - 1;
+			word_t idx = (word_t)arg1 - 1;
 			if (idx >= COS_THD_INIT_REGION_SIZE) {
 				/* This means static defined entry */
 				cos_thd_entry_static(idx - COS_THD_INIT_REGION_SIZE);
diff --git a/src/components/lib/component/cos_component.h b/src/components/lib/component/cos_component.h
index 01c09bdc3f..366ccb900d 100644
--- a/src/components/lib/component/cos_component.h
+++ b/src/components/lib/component/cos_component.h
@@ -1,467 +1,14 @@
-/**
- * Copyright 2007 by Gabriel Parmer, gabep1@cs.bu.edu
- *
- * Redistribution of this file is permitted under the GNU General
- * Public License v2.
- */
-
 #ifndef COS_COMPONENT_H
 #define COS_COMPONENT_H
 
-#include <consts.h>
-#include <cos_types.h>
-#include <errno.h>
-#include <util.h>
-#include <string.h>
-#include <bitmap.h>
-#include <ps_plat.h>
-
-/*
- * dewarn: strtok_r()
- * reference: feature_test_macro() requirement: _SVID_SOURCE || _BSD_SOURCE || _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE
- */
-extern char *strtok_r(char *str, const char *delim, char **saveptr);
-void libc_init();
-char *cos_initargs_tar();
-
-/* temporary */
-static inline int
-call_cap_asm(u32_t cap_no, u32_t op, int arg1, int arg2, int arg3, int arg4)
-{
-	long fault = 0;
-	int  ret;
-
-	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
-	cap_no += op;
-
-	__asm__ __volatile__("pushl %%ebp\n\t"		\
-	                     "movl %%esp, %%ebp\n\t"	\
-	                     "movl $1f, %%ecx\n\t"	\
-	                     "sysenter\n\t"		\
-	                     ".align 8\n\t"		\
-	                     "jmp 2f\n\t"		\
-	                     ".align 8\n\t"		\
-	                     "1:\n\t"			\
-	                     "movl $0, %%ecx\n\t"	\
-	                     "jmp 3f\n\t"		\
-	                     "2:\n\t"			\
-	                     "movl $1, %%ecx\n\t"	\
-	                     "3:\n\t"			\
-	                     "popl %%ebp"		\
-	                     : "=a"(ret), "=c"(fault)
-	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3), "d"(arg4)
-	                     : "memory", "cc");
-
-	return ret;
-}
-
-static inline int
-call_cap_retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2, word_t *r3)
-{
-	long fault = 0;
-	int  ret;
-
-	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
-	cap_no += op;
-
-	__asm__ __volatile__("pushl %%ebp\n\t"		\
-	                     "movl %%esp, %%ebp\n\t"	\
-	                     "movl $1f, %%ecx\n\t"	\
-	                     "sysenter\n\t"		\
-	                     ".align 8\n\t"		\
-	                     "jmp 2f\n\t"		\
-	                     ".align 8\n\t"		\
-	                     "1:\n\t"			\
-	                     "movl $0, %%ecx\n\t"	\
-	                     "jmp 3f\n\t"		\
-	                     "2:\n\t"			\
-	                     "movl $1, %%ecx\n\t"	\
-	                     "3:\n\t"			\
-	                     "popl %%ebp\n\t"		\
-	                     : "=a"(ret), "=c"(fault), "=S"(*r1), "=D"(*r2), "=b" (*r3)
-	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3), "d"(arg4)
-	                     : "memory", "cc");
-
-	return ret;
-}
-
-static inline word_t
-call_cap_2retvals_asm(u32_t cap_no, u32_t op, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *r1, word_t *r2)
-{
-	long   fault = 0;
-	word_t ret;
-
-	cap_no = (cap_no + 1) << COS_CAPABILITY_OFFSET;
-	cap_no += op;
-
-	__asm__ __volatile__("pushl %%ebp\n\t"		\
-	                     "movl %%esp, %%ebp\n\t"	\
-	                     "movl $1f, %%ecx\n\t"	\
-	                     "sysenter\n\t"		\
-	                     ".align 8\n\t"		\
-	                     "jmp 2f\n\t"		\
-	                     ".align 8\n\t"		\
-	                     "1:\n\t"			\
-	                     "movl $0, %%ecx\n\t"	\
-	                     "jmp 3f\n\t"		\
-	                     "2:\n\t"			\
-	                     "movl $1, %%ecx\n\t"	\
-	                     "3:\n\t"			\
-	                     "popl %%ebp\n\t"		\
-	                     : "=a"(ret), "=c"(fault), "=S"(*r1), "=D"(*r2)
-	                     : "a"(cap_no), "b"(arg1), "S"(arg2), "D"(arg3), "d"(arg4)
-	                     : "memory", "cc");
-
-	return ret;
-}
-
-static inline int
-cap_switch_thd(u32_t cap_no)
-{
-	return call_cap_asm(cap_no, 0, 0, 0, 0, 0);
-}
-
-static inline int
-call_cap(u32_t cap_no, int arg1, int arg2, int arg3, int arg4)
-{
-	return call_cap_asm(cap_no, 0, arg1, arg2, arg3, arg4);
-}
-
-static inline int
-call_cap_op(u32_t cap_no, u32_t op_code, int arg1, int arg2, int arg3, int arg4)
-{
-	return call_cap_asm(cap_no, op_code, arg1, arg2, arg3, arg4);
-}
-
-static void
-cos_print(char *s, int len)
-{
-	// FIXME: casting from a pointer to an int can be lossy
-	call_cap(PRINT_CAP_TEMP, (int) s, len, 0, 0);
-}
-
-/**
- * FIXME: Please remove this since it is no longer needed
- */
-
-extern long stkmgr_stack_space[ALL_TMP_STACKS_SZ];
-extern struct cos_component_information __cosrt_comp_info;
-
-static inline long
-get_stk_data(int offset)
-{
-	unsigned long curr_stk_pointer;
-
-	__asm__("movl %%esp, %0;" : "=r"(curr_stk_pointer));
-	/*
-	 * We save the CPU_ID and thread id in the stack for fast
-	 * access.  We want to find the struct cos_stk (see the stkmgr
-	 * interface) so that we can then offset into it and get the
-	 * cpu_id.  This struct is at the _top_ of the current stack,
-	 * and cpu_id is at the top of the struct (it is a u32_t).
-	 */
-	return *(long *)((curr_stk_pointer & ~(COS_STACK_SZ - 1)) + COS_STACK_SZ - offset * sizeof(u32_t));
-}
-
-#define GET_CURR_CPU cos_cpuid()
-
-static inline long
-cos_cpuid(void)
-{
-#if NUM_CPU == 1
-	return 0;
+#if defined(__arm__)
+#include "arch/arm/cos_component.h"
+#elif defined(__x86__)
+#include "arch/x86/cos_component.h"
+#elif defined(__x86_64__)
+#include "arch/x86_64/cos_component.h"
+#else
+#error "Undefined architecture!"
 #endif
-	/*
-	 * see comments in the get_stk_data above.
-	 */
-	return get_stk_data(CPUID_OFFSET);
-}
-
-static inline coreid_t
-cos_coreid(void)
-{
-	return (coreid_t)cos_cpuid();
-}
-
-static inline unsigned short int
-cos_get_thd_id(void)
-{
-	/*
-	 * see comments in the get_stk_data above.
-	 */
-	return get_stk_data(THDID_OFFSET);
-}
-
-static inline invtoken_t
-cos_inv_token(void)
-{
-	return get_stk_data(INVTOKEN_OFFSET);
-}
-
-typedef u16_t cos_thdid_t;
-
-static thdid_t
-cos_thdid(void)
-{
-	return cos_get_thd_id();
-}
-
-#define ERR_THROW(errval, label) \
-	do {                     \
-		ret = errval;    \
-		goto label;      \
-	} while (0)
-
-static inline long
-cos_spd_id(void)
-{
-	return __cosrt_comp_info.cos_this_spd_id;
-}
-
-static inline compid_t
-cos_compid(void)
-{
-	return cos_spd_id();
-}
-
-static inline int
-cos_compid_uninitialized(void)
-{
-	return cos_compid() == 0;
-}
-
-static inline void
-cos_compid_set(compid_t cid)
-{
-	__cosrt_comp_info.cos_this_spd_id = cid;
-}
-
-static inline void *
-cos_get_heap_ptr(void)
-{
-	return (void *)__cosrt_comp_info.cos_heap_ptr;
-}
-
-static inline void
-cos_set_heap_ptr(void *addr)
-{
-	__cosrt_comp_info.cos_heap_ptr = (vaddr_t)addr;
-}
-
-static inline char *
-cos_init_args(void)
-{
-	return __cosrt_comp_info.init_string;
-}
 
-#define COS_CPUBITMAP_STARTTOK 'c'
-#define COS_CPUBITMAP_ENDTOK   ","
-#define COS_CPUBITMAP_LEN      (NUM_CPU)
-
-static inline int
-cos_args_cpubmp(u32_t *cpubmp, char *arg)
-{
-	char *tok1 = NULL, *tok2 = NULL;
-	char res[COMP_INFO_INIT_STR_LEN] = { '\0' }, *rs = res;
-	int i, len = 0;
-
-	if (!arg || !cpubmp) return -EINVAL;
-	strncpy(rs, arg, COMP_INFO_INIT_STR_LEN);
-	if (!strlen(arg)) goto allset;
-	while ((tok1 = strtok_r(rs, COS_CPUBITMAP_ENDTOK, &rs)) != NULL) {
-		if (tok1[0] == COS_CPUBITMAP_STARTTOK) break;
-	}
-	/* if "c" tag is not present.. set the component to be runnable on all cores */
-	if (!tok1) goto allset;
-	if (strlen(tok1) != (COS_CPUBITMAP_LEN + 1)) return -EINVAL;
-
-	tok2 = tok1 + 1;
-	len = strlen(tok2);
-	for (i = 0; i < len; i++) {
-		if (tok2[i] == '1') bitmap_set(cpubmp, (len - 1 - i));
-	}
-
-	return 0;
-
-allset:
-	bitmap_set_contig(cpubmp, 0, NUM_CPU, 1);
-
-	return 0;
-}
-
-static inline int
-cos_init_args_cpubmp(u32_t *cpubmp)
-{
-	return cos_args_cpubmp(cpubmp, cos_init_args());
-}
-
-static inline long
-cos_cmpxchg(volatile void *memory, long anticipated, long result)
-{
-	long ret;
-
-	__asm__ __volatile__("call cos_atomic_cmpxchg"
-	                     : "=d"(ret)
-	                     : "a"(anticipated), "b"(memory), "c"(result)
-	                     : "cc", "memory");
-
-	return ret;
-}
-
-/* A uni-processor variant with less overhead but that doesn't
- * guarantee atomicity across cores. */
-static inline int
-cos_cas_up(unsigned long *target, unsigned long cmp, unsigned long updated)
-{
-	char z;
-	__asm__ __volatile__("cmpxchgl %2, %0; setz %1"
-	                     : "+m"(*target), "=a"(z)
-	                     : "q"(updated), "a"(cmp)
-	                     : "memory", "cc");
-	return (int)z;
-}
-
-static inline void *
-cos_get_prealloc_page(void)
-{
-	char *h;
-	long  r;
-	do {
-		h = (char *)__cosrt_comp_info.cos_heap_alloc_extent;
-		if (!h || (char *)__cosrt_comp_info.cos_heap_allocated >= h) return NULL;
-		r = (long)h + PAGE_SIZE;
-	} while (cos_cmpxchg(&__cosrt_comp_info.cos_heap_allocated, (long)h, r) != r);
-
-	return h;
-}
-
-/* allocate and release a page in the vas */
-extern void *cos_get_vas_page(void);
-extern void  cos_release_vas_page(void *p);
-
-/* only if the heap pointer is pre_addr, set it to post_addr */
-static inline void
-cos_set_heap_ptr_conditional(void *pre_addr, void *post_addr)
-{
-	cos_cmpxchg(&__cosrt_comp_info.cos_heap_ptr, (long)pre_addr, (long)post_addr);
-}
-
-/* from linux source in string.h */
-static inline void *
-cos_memcpy(void *to, const void *from, int n)
-{
-	int d0, d1, d2;
-
-	__asm__ __volatile__("rep ; movsl\n\t"
-	                     "movl %4,%%ecx\n\t"
-	                     "andl $3,%%ecx\n\t"
-#if 1 /* want to pay 2 byte penalty for a chance to skip microcoded rep? */
-	                     "jz 1f\n\t"
-#endif
-	                     "rep ; movsb\n\t"
-	                     "1:"
-	                     : "=&c"(d0), "=&D"(d1), "=&S"(d2)
-	                     : "0"(n / 4), "g"(n), "1"((long)to), "2"((long)from)
-	                     : "memory");
-
-	return (to);
-}
-
-static inline void *
-cos_memset(void *s, char c, int count)
-{
-	int d0, d1;
-	__asm__ __volatile__("rep\n\t"
-	                     "stosb"
-	                     : "=&c"(d0), "=&D"(d1)
-	                     : "a"(c), "1"(s), "0"(count)
-	                     : "memory");
-	return s;
-}
-
-/* compiler branch prediction hints */
-#ifndef likely
-#define likely(x) __builtin_expect(!!(x), 1)
-#endif
-#ifndef unlikely
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#endif
-
-#define CFORCEINLINE __attribute__((always_inline))
-#define CWEAKSYMB __attribute__((weak))
-/*
- * Create a weak function alias called "aliasn" which aliases the
- * existing function "name".  Example: COS_FN_WEAKALIAS(read,
- * __my_read) will take your "__my_read" function and create "read" as
- * an a weak alias to it.
- */
-#define COS_FN_WEAKALIAS(weak_alias, name)					\
-	__typeof__(name) weak_alias __attribute__((weak, alias(STR(name))))
-
-/*
- * A composite constructor (deconstructor): will be executed before
- * other component execution (after component execution).  CRECOV is a
- * function that should be called if one of the depended-on components
- * has failed (e.g. the function serves as a callback notification).
- */
-#define CCTOR __attribute__((constructor))
-#define CDTOR __attribute__((destructor)) /* currently unused! */
-#define CRECOV(fnname) long crecov_##fnname##_ptr __attribute__((section(".crecov"))) = (long)fnname
-
-static inline void
-section_fnptrs_execute(long *list)
-{
-	int i;
-
-	for (i = 0; i < list[0]; i++) {
-		typedef void (*ctors_t)(void);
-		ctors_t ctors = (ctors_t)list[i + 1];
-		ctors();
-	}
-}
-
-static void
-constructors_execute(void)
-{
-	extern long __CTOR_LIST__;
-	extern long __INIT_ARRAY_LIST__;
-	section_fnptrs_execute(&__CTOR_LIST__);
-	section_fnptrs_execute(&__INIT_ARRAY_LIST__);
-}
-static void
-destructors_execute(void)
-{
-	extern long __DTOR_LIST__;
-	extern long __FINI_ARRAY_LIST__;
-	section_fnptrs_execute(&__DTOR_LIST__);
-	section_fnptrs_execute(&__FINI_ARRAY_LIST__);
-}
-static void
-recoveryfns_execute(void)
-{
-	extern long __CRECOV_LIST__;
-	section_fnptrs_execute(&__CRECOV_LIST__);
-}
-
-#define FAIL() *(int *)NULL = 0
-
-struct cos_array {
-	char *mem;
-	int   sz;
-}; /* TODO: remove */
-#define prevent_tail_call(ret) __asm__("" : "=r"(ret) : "m"(ret))
-#define rdtscll(val) __asm__ __volatile__("rdtsc" : "=A"(val))
-
-#ifndef STR
-#define STRX(x) #x
-#define STR(x) STRX(x)
-#endif
-
-struct __thd_init_data {
-	void *fn;
-	void *data;
-};
-
-typedef u32_t cbuf_t; /* TODO: remove when we have cbuf.h */
-
-#endif
+#endif /* COS_COMPONENT_H */
diff --git a/src/components/lib/component/cos_serial.h b/src/components/lib/component/cos_serial.h
index 71d0535307..f0eb552646 100644
--- a/src/components/lib/component/cos_serial.h
+++ b/src/components/lib/component/cos_serial.h
@@ -1,40 +1,15 @@
 #ifndef COS_SERIAL_H
 #define COS_SERIAL_H
 
-#include <cos_io.h>
+#if defined(__arm__)
+#include "arch/arm/cos_serial.h"
+#elif defined(__x86__)
+#include "arch/x86/cos_serial.h"
+#elif defined(__x86_64__)
+#include "arch/x86_64/cos_serial.h"
+#else
+#error "Undefined architecture!"
+#endif
 
-/* code duplicated from platform/i386/serial.c */
-enum cos_serial_ports
-{
-	COS_SERIAL_PORT_A = 0x3F8,
-	COS_SERIAL_PORT_B = 0x2F8,
-	COS_SERIAL_PORT_C = 0x3E8,
-	COS_SERIAL_PORT_D = 0x2E8
-};
-
-static inline void
-cos_serial_putc(char out)
-{
-	while ((inb(COS_SERIAL_PORT_A + 5) & 0x20) == 0) {
-		/* wait for port to be ready to send */
-	}
-	outb(COS_SERIAL_PORT_A, out);
-}
-
-/* NOTE: can be interleaved & the output could just look like garbage. */
-static inline void
-cos_serial_puts(const char *s)
-{
-	for (; *s != '\0'; s++) cos_serial_putc(*s);
-}
-
-/* for binary printing */
-static inline void
-cos_serial_putb(const char *s, size_t len)
-{
-	size_t i;
-
-	for (i = 0; i < len; i++) cos_serial_putc(*(s + i));
-}
 
 #endif /* COS_SERIAL_H */
diff --git a/src/components/lib/component/llprint.h b/src/components/lib/component/llprint.h
index db7637eafb..d64663dad1 100644
--- a/src/components/lib/component/llprint.h
+++ b/src/components/lib/component/llprint.h
@@ -45,16 +45,13 @@ printc(char *fmt, ...)
 typedef enum {
 	PRINT_ERROR = 0, /* print only error messages */
 	PRINT_WARN,	 /* print errors and warnings */
-	PRINT_DEBUG	 /* print errors, warnings and debug messages */
+	PRINT_DEBUG,	 /* print errors, warnings and debug messages */
+	PRINT_LEVEL_MAX
 } cos_print_level_t;
 
-#ifndef PRINT_LEVEL_MAX
-#define PRINT_LEVEL_MAX 3
-#endif
-
-extern cos_print_level_t  cos_print_level;
-extern int                cos_print_lvl_str;
-extern const char        *cos_print_str[];
+extern int         cos_print_level;
+extern int         cos_print_lvl_str;
+extern const char *cos_print_str[];
 
 /* Prints with current (cpuid, thdid, spdid) */
 #define PRINTC(format, ...) printc("(%ld,%lu,%lu) " format, cos_cpuid(), cos_thdid(), cos_compid(), ## __VA_ARGS__)
diff --git a/src/components/lib/crt/Makefile b/src/components/lib/crt/Makefile
index 716a0f91bb..ed9c4027f8 100644
--- a/src/components/lib/crt/Makefile
+++ b/src/components/lib/crt/Makefile
@@ -21,7 +21,7 @@ INCLUDE_PATHS = .
 INTERFACE_DEPENDENCIES = sched memmgr
 # The library dependencies this component is reliant on for
 # compilation/linking (this is a list of directory names in lib/)
-LIBRARY_DEPENDENCIES = component kernel initargs
+LIBRARY_DEPENDENCIES = component kernel initargs sl
 # Note: Both the interface and library dependencies should be
 # *minimal*. That is to say that removing a dependency should cause
 # the build to fail. The build system does not validate this
diff --git a/src/components/lib/crt/crt.c b/src/components/lib/crt/crt.c
index 8b78855f3b..157914eee7 100644
--- a/src/components/lib/crt/crt.c
+++ b/src/components/lib/crt/crt.c
@@ -87,10 +87,10 @@ crt_chkpt_create(struct crt_chkpt *chkpt, struct crt_comp *c)
 	chkpt->mem = mem;
 	chkpt->tot_sz_mem = c->tot_sz_mem;
 
-	memcpy(mem, c->mem, c->tot_sz_mem);	
-	/* 
+	memcpy(mem, c->mem, c->tot_sz_mem);
+	/*
 	 * TODO: capabilities aren't copied, so components that could modify their capabilities
-	 * while running (schedulers/cap mgrs) shouldn't be checkpointed 
+	 * while running (schedulers/cap mgrs) shouldn't be checkpointed
 	 * TODO: copy dynamically allocated memory into the checkpoint
 	 */
 
@@ -105,6 +105,265 @@ crt_chkpt_restore(struct crt_chkpt *chkpt, struct crt_comp *c)
 	return 0;
 }
 
+/* Create a new asids namespace */
+int
+crt_ns_asids_init(struct crt_ns_asid *asids)
+{
+	int i;
+
+	for (i = 0 ; i < CRT_ASID_NUM_NAMES ; i++) {
+		/* set reserved = 1, allocated = 0 */
+		asids->names[i].state = CRT_NS_STATE_RESERVED;
+	}
+
+	asids->parent = NULL;
+
+	return 0;
+}
+
+/*
+ * Create a asid namespace from the names "left over" in `existing`,
+ * i.e. those that have not been marked allocated.
+ *
+ * Return values:
+ *    0: success
+ *   -1: new is unallocated/null or initialization fails
+ *   -2: new already has allocations
+ */
+int
+crt_ns_asids_split(struct crt_ns_asid *new, struct crt_ns_asid *existing)
+{
+	int i;
+
+	for (i = 0 ; i < CRT_ASID_NUM_NAMES ; i++) {
+		if ((new->names[i].state & CRT_NS_STATE_ALLOCATED) == CRT_NS_STATE_ALLOCATED) return -2;
+	}
+
+	if (crt_ns_asids_init(new)) return -1;
+
+	for (i = 0 ; i < CRT_ASID_NUM_NAMES ; i++) {
+		/* if a name is allocated in existing, it should not be reserved in new */
+		/* by default via init everything else will go to:
+		 *	reserved  = 1
+		 *	allocated = 0
+		 *	aliased   = 0
+		 */
+		if ((existing->names[i].state & CRT_NS_STATE_ALLOCATED) == CRT_NS_STATE_ALLOCATED) {
+			new->names[i].state &= ~CRT_NS_STATE_RESERVED;
+		}
+		/* if a name is reserved (but not allocated) in existing, it should no longer be reserved in existing
+		 * NOTE: this means no further allocations can be made in existing
+		 */
+		if ((existing->names[i].state & CRT_NS_STATE_RESERVED) == CRT_NS_STATE_RESERVED) {
+			existing->names[i].state &= ~CRT_NS_STATE_RESERVED;
+		}
+	}
+
+	return 0;
+}
+
+/*
+ * Return the index of the first available ASID name
+ * Return -1 if there are none available
+ */
+static int
+crt_asid_available_name(struct crt_ns_asid *asids)
+{
+	int i;
+
+	for (i = 0 ; i < CRT_ASID_NUM_NAMES ; i++) {
+		if ((asids->names[i].state & (CRT_NS_STATE_RESERVED | CRT_NS_STATE_ALLOCATED)) == CRT_NS_STATE_RESERVED) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+/*
+ * Initialize a new vas namespace, pulling a name from the `asids`
+ * Return values:
+ *   0: success
+ *  -1: new/asids not set up correctly, or no available ASID names, or pgtbl node allocation failed
+ */
+int
+crt_ns_vas_init(struct crt_ns_vas *new, struct crt_ns_asid *asids)
+{
+	int asid_index = 0;
+	int i = 0;
+	pgtblcap_t top_lvl_pgtbl;
+	struct cos_compinfo *ci = cos_compinfo_get(cos_defcompinfo_curr_get());
+
+	/* find an asid name for new */
+	asid_index = crt_asid_available_name(asids);
+	if (asid_index == -1) return -1;
+
+	if ((top_lvl_pgtbl = cos_pgtbl_alloc(ci)) == 0) return -1;
+
+	new->asid_name = asid_index;
+	asids->names[asid_index].state |= CRT_NS_STATE_ALLOCATED;
+
+	new->top_lvl_pgtbl = top_lvl_pgtbl;
+	new->parent = NULL;
+
+	/* initialize the names in new */
+	for (i = 0 ; i < CRT_VAS_NUM_NAMES ; i++) {
+		new->names[i].state = CRT_NS_STATE_RESERVED;
+		new->names[i].comp = NULL;
+	}
+
+	/* initialize an MPK NS for new */
+	for (i = 0 ; i < CRT_VAS_NUM_NAMES ; i++) {
+		new->mpk_names[i].state = CRT_NS_STATE_RESERVED;
+	}
+
+	return 0;
+
+}
+
+/*
+ * Create a new vas namespace from the names "left over" in
+ * `existing`, i.e. those that have not been allocated
+ * and automatically alias all names from existing into new
+ *
+ * Return values:
+ *   0: success
+ *  -1: new is null/not allocated correctly, or initialization fails
+ *  -2: new already has allocations
+ *
+ * NOTE: after this call, no further allocations can be made in existing
+ */
+int
+crt_ns_vas_split(struct crt_ns_vas *new, struct crt_ns_vas *existing, struct crt_ns_asid *asids)
+{
+	int i;
+	int cons_ret;
+
+	/* verify that `new` has no existing allocations */
+	for (i = 0 ; i < CRT_VAS_NUM_NAMES ; i++) {
+		if ((new->names[i].state & CRT_NS_STATE_ALLOCATED) == CRT_NS_STATE_ALLOCATED) return -2;
+	}
+
+	if (crt_ns_vas_init(new, asids)) return -1;
+
+	for (i = 0 ; i < CRT_VAS_NUM_NAMES ; i++) {
+		/*
+		 * If a name is allocated or aliased in existing, the component there should automatically be aliased into new */
+		/* by default via init everything else will go to:
+		 * 		reserved  = 1
+		 *      allocated = 0
+		 *      aliased   = 0
+		 */
+		if (existing->names[i].state & (CRT_NS_STATE_ALLOCATED | CRT_NS_STATE_ALIASED)) {
+			new->names[i].state = (new->names[i].state & ~CRT_NS_STATE_RESERVED) | CRT_NS_STATE_ALIASED;
+			new->names[i].comp = existing->names[i].comp;
+
+			cons_ret = cos_cons_into_shared_pgtbl(cos_compinfo_get(new->names[i].comp->comp_res), new->top_lvl_pgtbl);
+			if (cons_ret != 0) {
+				printc("cons failed: %d\n", cons_ret);
+				assert(0);
+			}
+
+		}
+		/*
+		 * If a name is reserved (but not allocated) in existing, it should no longer be reserved in existing
+		 * NOTE: this means no further allocations can be made in existing
+		 */
+		if ((existing->names[i].state & (CRT_NS_STATE_RESERVED | CRT_NS_STATE_ALLOCATED)) == CRT_NS_STATE_RESERVED) {
+			existing->names[i].state &= ~CRT_NS_STATE_RESERVED;
+		}
+	}
+
+	/* initialize the mpk namespace within new */
+	for (i = 0 ; i < CRT_MPK_NUM_NAMES ; i++) {
+		if ((existing->mpk_names[i].state & CRT_NS_STATE_ALLOCATED) == CRT_NS_STATE_ALLOCATED) {
+			new->mpk_names[i].state &= ~CRT_NS_STATE_RESERVED;
+		}
+		else if ((existing->mpk_names[i].state & (CRT_NS_STATE_RESERVED | CRT_NS_STATE_ALLOCATED)) == CRT_NS_STATE_RESERVED) {
+			existing->mpk_names[i].state &= ~CRT_NS_STATE_RESERVED;
+		}
+	}
+	new->parent = existing;
+
+	return 0;
+}
+
+
+/*
+ * helper function:
+ * returns the first available MPK name within vas, or -1 if none available
+ */
+static int
+crt_mpk_available_name(struct crt_ns_vas *vas)
+{
+	int i;
+
+	for (i = 0 ; i < CRT_MPK_NUM_NAMES ; i++) {
+		if ((vas->mpk_names[i].state & (CRT_NS_STATE_RESERVED | CRT_NS_STATE_ALLOCATED)) == CRT_NS_STATE_RESERVED) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+/*
+ * A `crt_comp_create` replacement if you want to create a component
+ * in a vas directly.
+ */
+int
+crt_comp_create_in_vas(struct crt_comp *c, char *name, compid_t id, void *elf_hdr, vaddr_t info, struct crt_ns_vas *vas)
+{
+	/*
+	 * find the name at the entry addr for the elf object for c
+	 * is it reserved but unallocated? --> make allocated & assign MPK key w same properties
+	 * else --> not possible
+	 */
+	int name_index =  (elf_hdr ? elf_entry_addr(elf_hdr) : 0) / CRT_VAS_NAME_SZ;
+	int mpk_key = 0;
+	int cons_ret;
+
+	assert(name_index < CRT_VAS_NUM_NAMES);
+
+	if (!vas->names[name_index].state) return -1;
+	if ((mpk_key = crt_mpk_available_name(vas)) == -1) return -1;
+
+	crt_comp_create(c, name, id, elf_hdr, info);
+
+	if (cos_comp_alloc_shared(cos_compinfo_get(c->comp_res), vas->top_lvl_pgtbl, c->entry_addr, cos_compinfo_get(cos_defcompinfo_curr_get())) != 0) {
+		printc("allocate comp cap/cap table cap failed\n");
+		assert(0);
+	}
+
+	cons_ret = cos_cons_into_shared_pgtbl(cos_compinfo_get(c->comp_res), vas->top_lvl_pgtbl);
+	if (cons_ret != 0) {
+		printc("cons failed: %d\n", cons_ret);
+		assert(0);
+	}
+
+	vas->names[name_index].state |= CRT_NS_STATE_ALLOCATED;
+	vas->mpk_names[mpk_key].state |= CRT_NS_STATE_ALLOCATED;
+	vas->names[name_index].comp = c;
+
+	c->mpk_key = mpk_key;
+	c->ns_vas = vas;
+
+	return 0;
+}
+
+/*
+ * helper function to check if two components exist within a shared VAS Namespace
+ */
+static int
+crt_ns_vas_shared(struct crt_comp *c1, struct crt_comp *c2)
+{
+	if (c1->ns_vas == NULL || c2->ns_vas == NULL) return 0;
+
+	if (c1->ns_vas == c2->ns_vas) return 1;
+
+	return 0;
+}
+
 static inline int
 crt_refcnt_alive(crt_refcnt_t *r)
 {
@@ -233,7 +492,7 @@ crt_comp_create_with(struct crt_comp *c, char *name, compid_t id, struct crt_com
  *
  * @return: 0 on success, != 0 on error.
  */
-int 
+int
 crt_comp_create_from(struct crt_comp *c, char *name, compid_t id, struct crt_chkpt *chkpt)
 {
 	struct cos_compinfo *ci, *root_ci;
@@ -258,7 +517,7 @@ crt_comp_create_from(struct crt_comp *c, char *name, compid_t id, struct crt_chk
 	/* re-work the sinvs with the right IDs */
 	memcpy(c->sinvs, chkpt->c->sinvs, sizeof(c->sinvs));
 	c->n_sinvs = chkpt->c->n_sinvs;
-	for(u32_t i = 0; i < c->n_sinvs; i++) {
+	for (u32_t i = 0; i < c->n_sinvs; i++) {
 		struct crt_sinv inv = chkpt->c->sinvs[i];
 
 		assert(inv.client->id == chkpt->c->id);
@@ -283,8 +542,8 @@ crt_comp_create_from(struct crt_comp *c, char *name, compid_t id, struct crt_chk
 	assert(comp_info->cos_this_spd_id == 0);
 	comp_info->cos_this_spd_id = id;
 
-	/* FIXME: separate map of RO and RW */
-	if (c->ro_addr != cos_mem_aliasn(ci, root_ci, (vaddr_t)mem, c->tot_sz_mem)) return -ENOMEM;
+	if (c->ro_addr != cos_mem_aliasn(ci, root_ci, (vaddr_t)mem, round_up_to_page(c->ro_sz), COS_PAGE_READABLE)) return -ENOMEM;
+	if (c->rw_addr != cos_mem_aliasn(ci, root_ci, (vaddr_t)mem + round_up_to_page(c->ro_sz), c->tot_sz_mem - round_to_page(c->ro_sz), COS_PAGE_READABLE | COS_PAGE_WRITABLE)) return -ENOMEM;
 
 	/* FIXME: cos_time.h assumes we have access to this... */
 	ret = cos_cap_cpy_at(ci, BOOT_CAPTBL_SELF_INITHW_BASE, root_ci, BOOT_CAPTBL_SELF_INITHW_BASE);
@@ -356,8 +615,8 @@ crt_comp_create(struct crt_comp *c, char *name, compid_t id, void *elf_hdr, vadd
 	c->n_sinvs = 0;
 	memset(c->sinvs, 0, sizeof(c->sinvs));
 
-	/* FIXME: separate map of RO and RW */
-	if (c->ro_addr != cos_mem_aliasn(ci, root_ci, (vaddr_t)mem, tot_sz)) return -ENOMEM;
+	if (c->ro_addr != cos_mem_aliasn(ci, root_ci, (vaddr_t)mem, round_up_to_page(ro_sz), COS_PAGE_READABLE)) return -ENOMEM;
+	if (c->rw_addr != cos_mem_aliasn(ci, root_ci, (vaddr_t)mem + round_up_to_page(ro_sz), round_up_to_page(data_sz + bss_sz), COS_PAGE_READABLE | COS_PAGE_WRITABLE)) return -ENOMEM;
 
 	/* FIXME: cos_time.h assumes we have access to this... */
 	ret = cos_cap_cpy_at(ci, BOOT_CAPTBL_SELF_INITHW_BASE, root_ci, BOOT_CAPTBL_SELF_INITHW_BASE);
@@ -482,6 +741,7 @@ crt_sinv_create(struct crt_sinv *sinv, char *name, struct crt_comp *server, stru
 	cli = cos_compinfo_get(client->comp_res);
 	srv = cos_compinfo_get(server->comp_res);
 
+
 	assert(crt_refcnt_alive(&server->refcnt) && crt_refcnt_alive(&client->refcnt));
 	crt_refcnt_take(&client->refcnt);
 	crt_refcnt_take(&server->refcnt);
@@ -498,7 +758,11 @@ crt_sinv_create(struct crt_sinv *sinv, char *name, struct crt_comp *server, stru
 		.s_fn_addr   = s_fn_addr
 	};
 
-	sinv->sinv_cap = cos_sinv_alloc(cli, srv->comp_cap, sinv->s_fn_addr, client->id);
+	if (crt_ns_vas_shared(client, server))
+		sinv->sinv_cap = cos_sinv_alloc(cli, srv->comp_cap_shared, sinv->s_fn_addr, client->id);
+	else
+		sinv->sinv_cap = cos_sinv_alloc(cli, srv->comp_cap, sinv->s_fn_addr, client->id);
+
 	assert(sinv->sinv_cap);
 	printc("sinv %s cap %ld\n", name, sinv->sinv_cap);
 
@@ -652,11 +916,17 @@ crt_thd_create_in(struct crt_thd *t, struct crt_comp *c, thdclosure_index_t clos
 
 	assert(target_ci->comp_cap);
 	if (closure_id == 0) {
-		if(target_aep->thd != 0) return -1; /* should not allow double initialization */
+		if (target_aep->thd != 0) return -1; /* should not allow double initialization */
 
 		crt_refcnt_take(&c->refcnt);
 		assert(target_ci->comp_cap);
-		thdcap = target_aep->thd = cos_initthd_alloc(ci, target_ci->comp_cap);
+
+		if (target_ci->comp_cap_shared != 0) {
+			thdcap = target_aep->thd = cos_initthd_alloc(ci, target_ci->comp_cap_shared);
+		}
+		else {
+			thdcap = target_aep->thd = cos_initthd_alloc(ci, target_ci->comp_cap);
+		}
 		assert(target_aep->thd);
 	} else {
 		crt_refcnt_take(&c->refcnt);
@@ -678,6 +948,7 @@ crt_thd_create_in(struct crt_thd *t, struct crt_comp *c, thdclosure_index_t clos
  * - @t the thread structure to be populated
  * - @self the crt_comp that represents us
  * - @fn/@data the function to be invoked, passed specific data.
+ * - @return `0` if successful, `<0` otherwise
  */
 int
 crt_thd_create(struct crt_thd *t, struct crt_comp *self, crt_thd_fn_t fn, void *data)
@@ -688,7 +959,7 @@ crt_thd_create(struct crt_thd *t, struct crt_comp *self, crt_thd_fn_t fn, void *
 	assert(t && self);
 	if (idx < 1) return 0;
 	ret = crt_thd_create_in(t, self, idx);
-	if (!ret) cos_thd_init_free(idx);
+	if (ret < 0) cos_thd_init_free(idx);
 
 	return ret;
 }
@@ -1105,14 +1376,20 @@ crt_page_allocn(struct crt_comp *c, u32_t n_pages)
 }
 
 int
-crt_page_aliasn_in(void *pages, u32_t n_pages, struct crt_comp *self, struct crt_comp *c_in, vaddr_t *map_addr)
+crt_page_aliasn_aligned_in(void *pages, unsigned long align, u32_t n_pages, struct crt_comp *self, struct crt_comp *c_in, vaddr_t *map_addr)
 {
-	*map_addr = cos_mem_aliasn(cos_compinfo_get(c_in->comp_res), cos_compinfo_get(self->comp_res), (vaddr_t)pages, n_pages * PAGE_SIZE);
+	*map_addr = cos_mem_aliasn_aligned(cos_compinfo_get(c_in->comp_res), cos_compinfo_get(self->comp_res), (vaddr_t)pages, n_pages * PAGE_SIZE, align, COS_PAGE_READABLE | COS_PAGE_WRITABLE);
 	if (!*map_addr) return -EINVAL;
 
 	return 0;
 }
 
+int
+crt_page_aliasn_in(void *pages, u32_t n_pages, struct crt_comp *self, struct crt_comp *c_in, vaddr_t *map_addr)
+{
+	return crt_page_aliasn_aligned_in(pages, PAGE_SIZE, n_pages, self, c_in, map_addr);
+}
+
 /*
  * The functions to automate much of the component initialization
  * logic follow.
@@ -1162,7 +1439,7 @@ crt_compinit_execute(comp_get_fn_t comp_get)
 		if (comp->flags & CRT_COMP_SCHED) {
 			if (crt_comp_sched_delegate(comp, comp_get(cos_compid()), TCAP_PRIO_MAX, TCAP_RES_INF)) BUG();
 		} else {
-			if ((ret = cos_defswitch(thdcap, TCAP_PRIO_MAX, TCAP_RES_INF, cos_sched_sync()))) {
+			if ((ret = cos_defswitch(thdcap, TCAP_PRIO_MAX, TCAP_TIME_NIL, cos_sched_sync()))) {
 				printc("Switch failure on thdcap %ld, with ret %d\n", thdcap, ret);
 				BUG();
 			}
@@ -1211,12 +1488,13 @@ crt_compinit_execute(comp_get_fn_t comp_get)
 			struct cos_defcompinfo *defci     = comp->comp_res;
 			struct cos_aep_info    *child_aep = cos_sched_aep_get(defci);
 
-			if (cos_switch(thdcap, child_aep->tc, TCAP_PRIO_MAX, TCAP_RES_INF, child_aep->rcv, cos_sched_sync())) BUG();
+			if (cos_switch(thdcap, child_aep->tc, TCAP_PRIO_MAX, TCAP_TIME_NIL, child_aep->rcv, cos_sched_sync())) BUG();
 		} else {
-			if (cos_defswitch(thdcap, TCAP_PRIO_MAX, TCAP_RES_INF, cos_sched_sync())) BUG();
+			if (cos_defswitch(thdcap, TCAP_PRIO_MAX, TCAP_TIME_NIL, cos_sched_sync())) BUG();
 		}
 	}
 
+	printc("BUG, shutting down...");
 	cos_hw_shutdown(BOOT_CAPTBL_SELF_INITHW_BASE);
 	while (1) ;
 
@@ -1301,4 +1579,3 @@ crt_compinit_exit(struct crt_comp *c, int retval)
 	BUG();
 	while (1) ;
 }
-
diff --git a/src/components/lib/crt/crt.h b/src/components/lib/crt/crt.h
index 6877ed59cc..9394c8c217 100644
--- a/src/components/lib/crt/crt.h
+++ b/src/components/lib/crt/crt.h
@@ -86,6 +86,10 @@ struct crt_comp {
 	size_t ro_sz;
 	struct crt_sinv sinvs[CRT_COMP_SINVS_LEN];
 	u32_t  n_sinvs;
+
+	u32_t mpk_key;
+	capid_t second_lvl_pgtbl_cap;
+	struct crt_ns_vas *ns_vas;
 	
 };
 
@@ -181,6 +185,8 @@ struct crt_rcv *crt_comp_exec_rcv(struct crt_comp *comp);
 struct crt_thd *crt_comp_exec_thd(struct crt_comp *comp);
 
 int crt_sinv_create(struct crt_sinv *sinv, char *name, struct crt_comp *server, struct crt_comp *client, vaddr_t c_fn_addr, vaddr_t c_ucap_addr, vaddr_t s_fn_addr);
+int crt_sinv_create_shared(struct crt_sinv *sinv, char *name, struct crt_comp *server, struct crt_comp *client, vaddr_t c_fn_addr, vaddr_t c_ucap_addr, vaddr_t s_fn_addr);
+
 int crt_sinv_alias_in(struct crt_sinv *s, struct crt_comp *c, struct crt_sinv_resources *res);
 
 int crt_asnd_create(struct crt_asnd *s, struct crt_rcv *r);
@@ -199,6 +205,7 @@ int crt_thd_alias_in(struct crt_thd *t, struct crt_comp *c, struct crt_thd_resou
 
 void *crt_page_allocn(struct crt_comp *c, u32_t n_pages);
 int crt_page_aliasn_in(void *pages, u32_t n_pages, struct crt_comp *self, struct crt_comp *c_in, vaddr_t *map_addr);
+int crt_page_aliasn_aligned_in(void *pages, unsigned long align, u32_t n_pages, struct crt_comp *self, struct crt_comp *c_in, vaddr_t *map_addr);
 
 /**
  * Initialization API to automate the coordination necessary for
@@ -214,4 +221,104 @@ int crt_chkpt_create(struct crt_chkpt *chkpt, struct crt_comp *c);
 int crt_chkpt_restore(struct crt_chkpt *chkpt, struct crt_comp *c);
 
 
+/*
+ * - The VAS structure will be an array of pointers to `struct
+ *   crt_comp`s, and "reserved" bits. The reserved bits are used to
+ *   notate which names to *split* off, and the `crt_comp` is which
+ *   component has been `alloc_in`ed at that name. Each NS maintains a
+ *   pointer to its parent (it split off from).
+ *
+ * - We also need a similar structure like this to track the MPK
+ *   namespace and the ASID namespace.
+ */
+
+/* for 32 bit:
+ * name sz = 2^22
+ * 2^32 / 2^22 = 2^10 = 1024 names
+ * 2^10 / 2 to ensure the array fits into a page = 512 names
+ * #define CRT_VAS_NAME_SZ (1 << 22)
+ * #define CRT_VAS_NUM_NAMES 512
+ * #define CRT_MPK_NUM_NAMES 16
+ * #define CRT_ASID_NUM_NAMES 1024
+ * 
+ * for 64 bit:
+ * name sz = 2^39 
+ * 2^48 / 2^39 = 2^9 = 512 names
+ * 2^9 / 2 to ensure the array fits into a page = 256 names
+ * also: more ASIDs available in 64 bit
+ */
+
+#define CRT_VAS_NAME_SZ 	(1ULL << 39)
+#define CRT_VAS_NUM_NAMES 	256
+#define CRT_MPK_NUM_NAMES 	14
+#define CRT_ASID_NUM_NAMES 	4096
+
+#define CRT_NS_STATE_RESERVED 	1
+#define CRT_NS_STATE_ALLOCATED 1 << 1
+#define CRT_NS_STATE_ALIASED 	1 << 2
+
+struct crt_vas_name {
+	u32_t state : 3;
+	struct crt_comp *comp;
+};
+
+struct crt_asid_mpk_name {
+	u32_t state : 3;
+};
+
+struct crt_ns_vas {
+	pgtblcap_t top_lvl_pgtbl;
+	struct crt_vas_name names[CRT_VAS_NUM_NAMES];
+	struct crt_ns_vas *parent;
+	u32_t asid_name;
+	struct crt_asid_mpk_name mpk_names[CRT_MPK_NUM_NAMES];
+};
+
+
+struct crt_ns_asid {
+	struct crt_asid_mpk_name names[CRT_ASID_NUM_NAMES];
+	struct crt_ns_asid *parent;
+};
+
+/**
+ * NS creation:
+ *
+ * - create functions that simply create a new ns with all of the
+ *   names available, and
+ * - split functions that simply make a new ns from the unallocated
+ *   names left over in an existing namespace.
+ */
+
+/* Create a new asids namespace */
+int crt_ns_asids_init(struct crt_ns_asid *asids);
+/*
+ * Create a asid namespace from the names "left over" in `existing`,
+ * i.e. those that have not been `crt_ns_vas_alloc_in`ed.
+ */
+int crt_ns_asids_split(struct crt_ns_asid *new, struct crt_ns_asid *existing);
+/*
+ * Initialize a new vas namespace, pulling a name from the `asids`
+ */
+int crt_ns_vas_init(struct crt_ns_vas *new, struct crt_ns_asid *asids);
+/*
+ * Create a new vas namespace from the names "left over" in
+ * `existing`, i.e. those that have not been `crt_ns_vas_alloc_in`ed
+ */
+int crt_ns_vas_split(struct crt_ns_vas *new, struct crt_ns_vas *existing, struct crt_ns_asid *asids);
+
+/*
+ * A `crt_comp_create` replacement if you want to create a component
+ * in a vas directly. Note that, the
+ * `crt_comp_create` likely needs to take the asid namespace as well.
+ */
+int crt_comp_create_in_vas(struct crt_comp *c, char *name, compid_t id, void *elf_hdr, vaddr_t info, struct crt_ns_vas *vas);
+
+/*
+ * VAS name mapping/allocation. 
+ * This function became no longer necessary due to the above, but an implementation of it is here:
+ * https://github.com/ldierksheide/composite/blob/shared_pgtbl/src/components/lib/crt/crt.c#L322-L364
+ * 
+ * int crt_ns_vas_alloc_in(struct crt_ns_vas *vas, struct crt_comp *c);
+ */
+
 #endif /* CRT_H */
diff --git a/src/components/lib/crt/crt_blkpt.h b/src/components/lib/crt/crt_blkpt.h
index 4c9a60e273..5d7f1bc4d3 100644
--- a/src/components/lib/crt/crt_blkpt.h
+++ b/src/components/lib/crt/crt_blkpt.h
@@ -131,7 +131,7 @@ typedef enum {
 } crt_blkpt_flags_t;
 
 #define CRT_BLKPT_EPOCH_BLKED_BITS (sizeof(sched_blkpt_epoch_t) * 8)
-#define CRT_BLKPT_BLKED_MASK       (1 << (CRT_BLKPT_EPOCH_BLKED_BITS - 2))
+#define CRT_BLKPT_BLKED_MASK       (1UL << (CRT_BLKPT_EPOCH_BLKED_BITS - 2))
 #define CRT_BLKPT_BLKED(e)         ((e) &  CRT_BLKPT_BLKED_MASK)
 #define CRT_BLKPT_EPOCH(e)         ((e) & ~CRT_BLKPT_BLKED_MASK)
 
diff --git a/src/components/lib/crt/crt_lock.h b/src/components/lib/crt/crt_lock.h
index 9bdeb9661d..af96787d92 100644
--- a/src/components/lib/crt/crt_lock.h
+++ b/src/components/lib/crt/crt_lock.h
@@ -21,7 +21,7 @@ struct crt_lock {
 };
 
 #define CRT_LOCK_OWNER_BLKED_BITS (sizeof(unsigned long) * 8)
-#define CRT_LOCK_BLKED_MASK       (1 << (CRT_LOCK_OWNER_BLKED_BITS - 2))
+#define CRT_LOCK_BLKED_MASK       (1UL << (CRT_LOCK_OWNER_BLKED_BITS - 2))
 #define CRT_LOCK_BLKED(e)         ((e) &  CRT_LOCK_BLKED_MASK)
 #define CRT_LOCK_OWNER(e)         ((e) & ~CRT_LOCK_BLKED_MASK)
 
diff --git a/src/components/lib/crt/crt_sem.h b/src/components/lib/crt/crt_sem.h
new file mode 100644
index 0000000000..55e5ca9e2d
--- /dev/null
+++ b/src/components/lib/crt/crt_sem.h
@@ -0,0 +1,151 @@
+#ifndef CRT_SEM_H
+#define CRT_SEM_H
+
+/***
+ * Counting semaphore. Uses blockpoints to enable the blocking and
+ * waking of contending threads for counting resources.
+ *
+ * **TODO**:
+ *
+ * - Add dependency specification for PI.
+ * - Add optional adaptive spinning and non-preemptivity -- generally, multicore awareness
+ * - Thorough testing.
+ */
+
+#include <cos_component.h>
+#include <crt_blkpt.h>
+
+#define MAX_SEMS		10000000
+#define CONCURRENT_TAKES	1000
+
+struct crt_sem {
+	unsigned long rescnt_blked;
+	struct crt_blkpt blkpt;
+};
+
+#define CRT_SEM_OWNER_BLKED_BITS  (sizeof(unsigned long) * 8)
+#define CRT_SEM_BLKED_MASK        (1UL << (CRT_SEM_OWNER_BLKED_BITS - 2))
+#define CRT_SEM_BLKED(e)          ((e) &  CRT_SEM_BLKED_MASK)
+#define CRT_SEM_RESCNT(e)         ((e) & ~CRT_SEM_BLKED_MASK)
+
+/**
+ * Initialize a semaphore. Does *not* allocate memory for it, and assumes
+ * that you pass that memory in as an argument.
+ *
+ * - @s - the semaphore
+ * - @resnum - the number of the resources
+ * - @return - `0` on successful initialization,
+ *             `!0` if the backing blockpoint cannot be allocated
+ */
+static inline int
+crt_sem_init(struct crt_sem *s, unsigned long resnum)
+{
+	if (resnum >= MAX_SEMS) return -1;
+
+	s->rescnt_blked = resnum + CONCURRENT_TAKES;
+
+	return crt_blkpt_init(&s->blkpt);
+}
+
+/**
+ * Teardown and delete the semaphore. Note that this does *not* manipulate
+ * or free the semaphore's memory. This API is high-level and general, and
+ * must allow locks to be embedded in structures, or defined globally.
+ *
+ * @precondition - None, can be directly tear down. All open handles are
+ *                 invalidated at once.
+ *
+ * - @s - the semaphore
+ * - @return - `0` on success; always successful.
+ */
+static inline int
+crt_sem_teardown(struct crt_sem *s)
+{
+	unsigned long cached;
+	
+	cached = ps_load(&s->rescnt_blked);
+	assert(CRT_SEM_BLKED(s->rescnt_blked) == 0);
+	if (!ps_cas(&s->rescnt_blked, cached, ~0)) return 1;
+
+	return crt_blkpt_teardown(&s->blkpt);
+}
+
+/**
+ * Take a semaphore. You may only take one at a time.
+ *
+ * @precondition - none.
+ *
+ * - @s - the semaphore
+ */
+static inline void
+crt_sem_take(struct crt_sem *s)
+{
+	struct crt_blkpt_checkpoint chkpt;
+
+	while (1) {
+		unsigned long rescnt_blked;
+
+		crt_blkpt_checkpoint(&s->blkpt, &chkpt);
+
+		/* Can we take the semaphore? If the number of semaphores are not zero, we try to take it */
+		if (CRT_SEM_RESCNT(ps_faa(&s->rescnt_blked, -1)) > CONCURRENT_TAKES) {
+			return;	/* success! */
+		}
+
+		/* slowpath: we're blocking! Set the blocked bit, or try again */
+		ps_faa(&s->rescnt_blked, 1);
+		rescnt_blked = ps_load(&s->rescnt_blked);
+		if (!ps_cas(&s->rescnt_blked, rescnt_blked, rescnt_blked | CRT_SEM_BLKED_MASK)) continue;
+
+		/* We can't take the semaphore, have set the block bit, and await release */
+		crt_blkpt_wait(&s->blkpt, 0, &chkpt);
+	}
+}
+
+/**
+ * Attempts to take the semaphore, and returns a value depending on if it
+ * takes it, or not.
+ *
+ * - @s - the `crt_sem`
+ * - @return - `0` on successful semaphore acquisition,
+ *             '1' if there are no semaphores anymore.
+ */
+static inline int
+crt_sem_try_take(struct crt_sem *s)
+{
+	if (CRT_SEM_RESCNT(ps_faa(&s->rescnt_blked, -1)) > CONCURRENT_TAKES) {
+		return 0;	/* success! */
+	}
+	ps_faa(&s->rescnt_blked, 1);
+	return 1;
+}
+
+/**
+ * Give a semaphore. You may only give one at a time.
+ *
+ * @precondition: None.
+ *
+ * - @s - the semaphore
+ */
+static inline void
+crt_sem_give(struct crt_sem *s)
+{
+	while (1) {
+		unsigned long o_b = ps_load(&s->rescnt_blked);
+		int blked = unlikely(CRT_SEM_BLKED(o_b) == CRT_SEM_BLKED_MASK);
+		int rescnt = CRT_SEM_RESCNT(o_b);
+
+		/* If we'd have enough number of semaphores, saturate it */
+		if (rescnt < (CONCURRENT_TAKES + MAX_SEMS)) rescnt++;
+
+		/* Give semaphore back and clear the blocked bit, with CAS */
+		if (unlikely(!ps_cas(&s->rescnt_blked, o_b, rescnt))) continue;
+
+		/* if there are blocked threads, wake 'em up! */
+		if (unlikely(blked)) crt_blkpt_wake(&s->blkpt, 0);
+
+		return;
+	}
+}
+
+#endif /* CRT_SEM_H */
diff --git a/src/components/lib/dpdk/Makefile b/src/components/lib/dpdk/Makefile
new file mode 100644
index 0000000000..199192a18d
--- /dev/null
+++ b/src/components/lib/dpdk/Makefile
@@ -0,0 +1,100 @@
+DPDK_DIR		= dpdk
+DPDK_BUILD_DIR		= $(DPDK_DIR)/build
+DPDK_INSTALL_DIR	= $(DPDK_BUILD_DIR)/install
+DPDK_INC_DIR		= $(DPDK_INSTALL_DIR)/include
+DPDK_LIBS_DIR		= $(DPDK_INSTALL_DIR)/lib
+
+LIBRARY_OUTPUT = dpdk
+
+OBJECT_OUTPUT =
+
+INCLUDE_PATHS = . adapter dpdk/build/install/include
+
+INTERFACE_DEPENDENCIES =
+
+LIBRARY_DEPENDENCIES = component pci posix_cap posix_sched
+
+# this is to stop non supported build target
+# this will override $(OBJS) so that compiler will not compile target files under unsupported cases
+ifneq ($(PLATFORM),x86_64)
+override OBJS =
+endif
+
+CFILES+=$(wildcard adapter/*.c)
+SFILES+=$(wildcard adapter/*.S)
+
+include Makefile.lib
+
+OBJS+=$(DPDK_LIBS_DIR)/*.a
+
+CINC+=$(foreach I, $(INCLUDE_PATHS), -I$(I))
+
+.PHONY: all config install clean distclean init build 
+
+# This adapter include path is needed because meson build needs a absolute path name
+DPDK_ADAPTER_INC = -I$(shell pwd)/adapter
+
+DISABLED_DRIVERS=-Ddisable_drivers=common/mvep,common/mlx5,af_xdp,net/ipn3ke,net/mlx4,net/mlx5,net/mvneta,net/mvpp2,$\
+	net/nfb,net/szedata2,raw/ifpga,crypto/aesni_gcm,crypto/aesni_mb,crypto/ccp,crypto/kasumi,crypto/mvsam,$\
+	crypto/openssl,crypto/snow3g,crypto/zuc,compress/isal,crypto/bcmfs,crypto/caam_jr,crypto/cnxk,crypto/dpaa_sec,$\
+	crypto/dpaa2_sec,crypto/nitrox,crypto/null,crypto/octeontx,crypto/octeontx2,crypto/scheduler,crypto/virtio,$\
+	compress/octeontx,compress/zlib,regex/octeontx2,vdpa/ifc,event/cnxk,event/dlb2,event/dsw,event/opdl,event/skeleton,$\
+	event/sw,baseband/acc100,baseband/fpga_5gnr_fec,baseband/fpga_lte_fec,baseband/null,baseband/turbo_sw,raw/cnxk_bphy,$\
+	raw/dpaa2_cmdif,raw/dpaa2_qdma,raw/ioat,raw/ntb,raw/octeontx2_dma,raw/octeontx2_ep,raw/skeleton,common/cpt,common/dpaax,$\
+	common/iavf,common/octeontx,common/octeontx2,common/cnxk,common/qat,common/sfc_efx,bus/auxiliary,bus/dpaa,bus/fslmc,$\
+	bus/ifpga,net/af_packet,net/ark,net/atlantic,net/avp,net/axgbe,net/bnx2x,net/bnxt,net/bond,net/cxgbe,net/ena,net/enic,$\
+	net/failsafe,net/fm10k,net/hinic,net/hns3,net/i40e,net/igc,net/ionic,net/ixgbe,net/kni,net/liquidio,net/memif,net/nfp,$\
+	net/ngbe,net/null,net/pcap,net/qede,net/softnic,net/thunderx,net/txgbe,net/vdev_netvsc,baseband/la12xx,dma/idxd,dma/ioat,$\
+	dma/skeleton,net/octeontx_ep,
+
+MUSL_BIN_PATH = PATH=$(shell pwd)/../libc/musl-1.2.0/bin/:$(PATH)
+config: 
+	$(info Configing DPDK)
+#	TODO: make this copy more generic so that it can be applied to different OS platforms like Fedora
+	@mkdir -p $(DPDK_INC_DIR);
+#	Even though we have MUSL, DPDK still rely on some definitions from the GNU lib
+	@find /usr/lib/gcc/x86_64-linux-gnu/$(shell gcc --version | grep ^gcc | sed 's/^.* //g' | awk -F. '{print $$1}')/include/ -iname "*.h" | grep -v "std.*" | xargs cp -rft $(DPDK_INC_DIR)
+	@cd ../libc/musl-1.2.0/include; \
+	cp -rf /usr/include/linux/ ./; \
+	cp -rf /usr/include/asm-generic/ ./; \
+	cp -rf /usr/include/x86_64-linux-gnu/asm/ ./; \
+	cp -rf /usr/include/x86_64-linux-gnu/sys/queue.h ./sys
+
+	@cd $(DPDK_DIR);\
+	$(MUSL_BIN_PATH) meson build \
+	--cross-file $(shell pwd)/cross_x86_64_composite_with_musl \
+	-Dmachine=default -Dc_args="-nostdlib -nostdinc -mcmodel=large -DCOMPOSITE_EXISTS $(DPDK_ADAPTER_INC)" \
+	-Ddefault_library=static -Ddebug=true \
+	-Doptimization=0 -Dincludedir=$(shell pwd)/$(DPDK_INC_DIR) \
+	-Dprefix=$(shell pwd)/$(DPDK_INSTALL_DIR) $(DISABLED_DRIVERS) >> /dev/null
+	
+build:
+	$(info Building DPDK)
+ifneq ($(PLATFORM),x86_64)
+	@echo "Platform: $(PLATFORM) is not supported in DPDK"
+else
+	@cd $(DPDK_BUILD_DIR);\
+	$(MUSL_BIN_PATH) ninja -j3;\
+	meson install >> /dev/null;
+	@rm -f libdpdk.a || true
+endif
+
+$(SHLIB_FILE): build $(OBJS)
+CFLAGS+=-mfma
+
+armv7a_init:
+
+i386_init:
+
+x86_64_init: config build
+
+platform_init:
+	make $(PLATFORM)_init
+
+init: platform_init
+
+distclean:
+	cd $(DPDK_BUILD_DIR) ninja clean
+	cd $(DPDK_DIR); rm -rf build
+clean:
+	$(info cleaning DPDK)
diff --git a/src/components/lib/dpdk/adapter/cos_dpdk_adapter.c b/src/components/lib/dpdk/adapter/cos_dpdk_adapter.c
new file mode 100644
index 0000000000..f23ad11237
--- /dev/null
+++ b/src/components/lib/dpdk/adapter/cos_dpdk_adapter.c
@@ -0,0 +1,194 @@
+#include <llprint.h>
+#include <pci.h>
+#include <io.h>
+#include <cos_kernel_api.h>
+#include <cos_defkernel_api.h>
+#include <memmgr.h>
+
+#include <rte_bus_pci.h>
+
+#include "cos_dpdk_adapter.h"
+
+static struct pci_dev cos_pci_devices[PCI_DEVICE_MAX];
+static int pci_dev_nb = 0;
+
+#define PRINT_BUF_SZ 512
+
+int
+cos_printc(const char *fmt, va_list ap)
+{
+	size_t  ret;
+	char print_buffer[PRINT_BUF_SZ];
+
+	ret = vsnprintf(print_buffer, PRINT_BUF_SZ, fmt, ap);
+	cos_llprint(print_buffer, ret);
+
+	return ret;
+}
+
+int
+cos_printf(const char *fmt,...)
+{
+	va_list ap;
+	int ret;
+
+	va_start(ap, fmt);
+	ret = cos_printc(fmt, ap);
+	va_end(ap);
+	return ret;
+}
+
+int
+cos_bus_scan(void)
+{
+	int ret;
+
+	pci_dev_nb	= pci_dev_count();
+	ret		= pci_scan(cos_pci_devices, pci_dev_nb);
+
+	pci_dev_print(cos_pci_devices, pci_dev_nb);
+
+	return ret;
+}
+
+/* Write PCI config space. */
+int
+cos_pci_write_config(const struct rte_pci_device *device,
+		const void *buf, size_t len, off_t offset)
+{
+	uint32_t buffer = 0, w = 0, w_once;
+	int _len = (int)len;
+
+	if (!buf) return -1;
+
+	do
+	{
+		buffer = pci_config_read(device->addr.bus, device->addr.devid,
+				device->addr.function, offset);
+
+		w_once = _len > COS_PCI_IO_SIZE ? COS_PCI_IO_SIZE:_len;
+		memcpy(&buffer, buf, w_once);
+
+		pci_config_write(device->addr.bus, device->addr.devid,
+				device->addr.function, offset, buffer);
+
+		w	+= w_once;
+		offset	+= COS_PCI_IO_SIZE;
+		_len	-= COS_PCI_IO_SIZE;
+		buf	+= w_once;
+	} while (_len > 0);
+
+	return w;
+}
+
+int
+cos_pci_read_config(const struct rte_pci_device *device,
+		void *buf, size_t len, off_t offset)
+{
+	uint32_t buffer, r = 0, r_once;
+	int _len = (int)len;
+
+	if (!buf) return -1;
+
+	do
+	{
+		buffer = pci_config_read(device->addr.bus, device->addr.devid,
+				device->addr.function, (uint32_t)offset);
+		r_once = _len > COS_PCI_IO_SIZE ? COS_PCI_IO_SIZE:_len;
+		memcpy(buf, &buffer, r_once);
+
+		r +=	r_once;
+		offset	+= COS_PCI_IO_SIZE;
+		_len	-= COS_PCI_IO_SIZE;
+	} while (_len > 0);
+	
+	return r;
+}
+/* declare dpdk private functions to avoid compiler warnings */
+void rte_pci_add_device(struct rte_pci_device *pci_dev);
+void pci_name_set(struct rte_pci_device *dev);
+
+int
+cos_pci_scan(void)
+{
+	int i, j;
+	struct rte_pci_device *pci_device_list, *rte_dev;
+	struct pci_dev *cos_dev;
+
+	cos_bus_scan();
+
+	pci_device_list = malloc(sizeof(*rte_dev) * pci_dev_nb);
+
+	if (!pci_device_list) return -1;
+
+	memset(pci_device_list, 0, sizeof(*rte_dev) * pci_dev_nb);
+
+	cos_printf("cos pci sanning\n");
+
+	for (i = 0; i < pci_dev_nb; i++) {
+		rte_dev = &pci_device_list[i];
+		cos_dev = &cos_pci_devices[i];
+		/* rte_dev->device = NULL; */
+		rte_dev->addr.bus = cos_dev->bus;
+		rte_dev->addr.devid = cos_dev->dev;
+		rte_dev->addr.function = cos_dev->func;
+		rte_dev->id.class_id = cos_dev->classcode;
+		rte_dev->id.vendor_id = cos_dev->vendor;
+		rte_dev->id.device_id = cos_dev->device;
+		rte_dev->id.subsystem_vendor_id = RTE_PCI_ANY_ID;
+		rte_dev->id.subsystem_device_id = RTE_PCI_ANY_ID;
+		for (j = 0; j < PCI_MAX_RESOURCE; j++) {
+			rte_dev->mem_resource[j].phys_addr = cos_dev->bar[j].raw & 0xFFFFFFF0;
+			if (!cos_dev->bar[j].raw) continue;
+
+			uint32_t buf = 0;
+			uint8_t offset;
+			buf = 0xFFFFFFFF;
+			offset = (j + 4) << 2;
+			cos_pci_write_config(rte_dev, &buf, sizeof(buf), offset);
+			cos_pci_read_config(rte_dev, &buf, sizeof(buf), offset);
+			buf = ~(buf & ~0xF) + 1;
+			rte_dev->mem_resource[j].len = buf;
+			buf = cos_dev->bar[j].raw;
+			cos_pci_write_config(rte_dev, &buf, sizeof(buf), offset);
+			rte_dev->mem_resource[j].addr = NULL; /* Has yet to be mapped */
+		}
+		rte_dev->max_vfs = 0;
+		rte_dev->kdrv = RTE_PCI_KDRV_UIO_GENERIC;
+		pci_name_set(rte_dev);
+		rte_pci_add_device(rte_dev);
+	}
+
+	return 0;
+}
+
+cos_vaddr_t
+cos_map_phys_to_virt(paddr_t paddr, size_t size)
+{
+	return memmgr_map_phys_to_virt(paddr, size);
+}
+
+cos_paddr_t
+cos_map_virt_to_phys(cos_vaddr_t addr)
+{
+	#define USER_ADDR_SPACE_MASK 0x00007ffffffff000
+
+	unsigned long ret;
+	cos_vaddr_t vaddr = addr;
+
+	assert((vaddr & 0xfff) == 0);
+
+	ret = memmgr_virt_to_phys((vaddr_t)vaddr);
+
+	return ret & USER_ADDR_SPACE_MASK;
+}
+
+/* Fixme: need to replace this later because a normal compoent with DPDK does not have hw capability */
+unsigned long
+cos_get_tsc_freq(void)
+{
+	return sched_get_cpu_freq() * 1000000;
+}
+
+COS_DPDK_DECLARE_NIC_MODULE(net_e1000_em);
+COS_DPDK_DECLARE_NIC_MODULE(mempool_ring);
diff --git a/src/components/lib/dpdk/adapter/cos_dpdk_adapter.h b/src/components/lib/dpdk/adapter/cos_dpdk_adapter.h
new file mode 100644
index 0000000000..23ff6faa88
--- /dev/null
+++ b/src/components/lib/dpdk/adapter/cos_dpdk_adapter.h
@@ -0,0 +1,37 @@
+#ifndef COS_DPDK_ADAPTER_H
+#define COS_DPDK_ADAPTER_H
+
+#define COS_DPDK_NUM_CPU 1
+#define COS_PCI_IO_SIZE 4
+
+typedef unsigned long cos_paddr_t; /* physical address */
+typedef unsigned long cos_vaddr_t; /* virtual address */
+
+/* Declare DPDK data structures used within adapter to avoid compiler warnings */
+struct rte_pci_device;
+
+
+/*
+ * Since some libs/drivers cannot be linked automatically within by the linker through libdpdk.a,
+ * these two macros are used to force link these modules into the ourput program binaries, users
+ * need to first *define* the module within a target module's .c file, and then *declare* that
+ * module name in cos_dpdk_adapter.c
+ */
+#define COS_DPDK_DECLARE_NIC_MODULE(module_name) extern char cos_dpdk_##module_name##_nic_module;static const char* cos_dpdk_##module_name##_ptr __attribute__((used)) = &cos_dpdk_##module_name##_nic_module;
+#define COS_DPDK_DEFINE_NIC_MODULE(module_name) char cos_dpdk_##module_name##_nic_module;
+
+/* Adapters definitions */
+int cos_printc(const char *fmt,va_list ap);
+int cos_printf(const char *fmt,...);
+
+int cos_bus_scan(void);
+int cos_pci_scan(void);
+
+int cos_pci_write_config(const struct rte_pci_device *device, const void *buf, size_t len, off_t offset);
+int cos_pci_read_config(const struct rte_pci_device *device, void *buf, size_t len, off_t offset);
+
+cos_vaddr_t cos_map_phys_to_virt(cos_paddr_t paddr, size_t size);
+cos_paddr_t cos_map_virt_to_phys(cos_vaddr_t addr);
+
+unsigned long cos_get_tsc_freq(void);
+#endif /* COS_DPDK_ADAPTER_H */
\ No newline at end of file
diff --git a/src/components/lib/dpdk/cos_dpdk.c b/src/components/lib/dpdk/cos_dpdk.c
new file mode 100644
index 0000000000..fd39c9650e
--- /dev/null
+++ b/src/components/lib/dpdk/cos_dpdk.c
@@ -0,0 +1,529 @@
+#include <rte_eal.h>
+#include <rte_bus_pci.h>
+#include <rte_ethdev.h>
+#include <rte_mempool.h>
+#include <rte_ethdev.h>
+#include <rte_ether.h>
+#include <rte_log.h>
+#include <rte_config.h>
+#include <rte_mbuf.h>
+
+#include <arpa/inet.h>
+
+#include "adapter/cos_dpdk_adapter.h"
+#include "cos_dpdk.h"
+extern struct rte_pci_bus rte_pci_bus;
+
+struct rte_port *ports;
+
+static int cos_dpdk_log_type;
+#define COS_DPDK_APP_LOG(level, fmt, args...) \
+	rte_log(RTE_LOG_ ## level, cos_dpdk_log_type, "COD_DPDK_APP: " fmt, ## args)
+
+static cos_portid_t ports_ids[RTE_MAX_ETHPORTS];
+static uint16_t nb_ports = 0;
+
+#define IP_PROTOCOL_TCP 6
+#define IP_PROTOCOL_UDP 17
+
+static void
+cos_eth_info_print(cos_portid_t port_id)
+{
+	int ret;
+	char dev_name[COS_ETH_NAME_SZ];
+	char link_status_text[RTE_ETH_LINK_MAX_STR_LEN];
+
+	struct rte_eth_dev_info dev_info;
+	struct rte_ether_addr mac_addr;
+	struct rte_eth_link link;
+
+	memset(dev_name, 0, COS_ETH_NAME_SZ);
+	rte_eth_dev_get_name_by_port(port_id, dev_name);
+	rte_eth_dev_info_get(port_id, &dev_info);
+	rte_eth_macaddr_get(port_id, &mac_addr);
+
+	ret = rte_eth_link_get(port_id, &link);
+	if (ret < 0) {
+			cos_printf("Link get failed (port %u): %s\n",
+			port_id, rte_strerror(-ret));
+	} else {
+			rte_eth_link_to_str(link_status_text,
+					sizeof(link_status_text),
+					&link);
+	}
+
+	COS_DPDK_APP_LOG(NOTICE,
+			"\n\tDEV_INFO:\n"
+			"\t\tport_id: %d\n"
+			"\t\tdev_name:%s\n"
+			"\t\tdev_mac_addr: "NMACHEX_FMT"\n"
+			"\t\tdev_min_mtu: %d\n"
+			"\t\tdev_max_mtu: %d\n"
+			"\t\tdev_min_rx_bufsize: %d\n"
+			"\t\tdev_max_rx_pktlen: %d\n"
+			"\t\tdev_max_rx_quques: %d\n"
+			"\t\tdev_max_tx_queues: %d\n"
+			"\t\tdev_min_rx_desc: %d\n"
+			"\t\tdev_max_rx_desc: %d\n"
+			"\t\tdev_min_tx_desc: %d\n"
+			"\t\tdev_min_tx_desc: %d\n"
+			"\t\tlink_status: %s\n",
+			port_id,
+			dev_name, 
+			NMACHEX(mac_addr),
+			dev_info.min_mtu,
+			dev_info.max_mtu,
+			dev_info.min_rx_bufsize,
+			dev_info.max_rx_pktlen,
+			dev_info.max_rx_queues,
+			dev_info.max_tx_queues,
+			dev_info.rx_desc_lim.nb_min,
+			dev_info.rx_desc_lim.nb_max,
+			dev_info.tx_desc_lim.nb_min,
+			dev_info.tx_desc_lim.nb_max,
+			link_status_text
+			);
+
+	return;
+}
+
+/*
+ * cos_eth_ports_init: find and init all ether ports that are available
+ *
+ * @return: nb_ports: 0 no port found
+ * 
+ * note: each port repesents an Ether NIC, and ports whose link status is down will be ignored
+ */
+uint16_t
+cos_eth_ports_init(void)
+{
+	cos_portid_t port_id;
+	uint16_t i;
+
+	memset(ports_ids, 0, sizeof(ports_ids));
+
+	RTE_ETH_FOREACH_DEV(port_id) {
+		ports_ids[nb_ports] = port_id;
+		nb_ports++;
+	}
+
+	COS_DPDK_APP_LOG(NOTICE, "cos_eth_ports_init success, find %d ports\n", nb_ports);
+
+	for(i = 0; i < nb_ports; i++) {
+		cos_eth_info_print(ports_ids[i]);
+	}
+
+	return nb_ports;
+}
+
+static struct rte_mempool * cos_dpdk_pktmbuf_pool = NULL;
+static struct rte_eth_conf default_port_conf = {
+	.rxmode = {
+		.mq_mode = RTE_ETH_MQ_RX_NONE,
+	},
+	.txmode = {
+		.mq_mode = RTE_ETH_MQ_TX_NONE,
+	},
+};
+
+/*
+ * cos_create_pkt_mbuf: wrapper function for rte_pktmbuf_pool_create
+ *
+ * @name: pkt pool name
+ * @nb_mbufs: number of mbufs within this pool, thus the maximum packets
+ *            that can be stored in this single mem pool.
+ * 
+ * @return: NULL on allocate failure, others on success
+ * 
+ * note: this function assumes that the size of each mbuf is COS_MBUF_DEFAULT_BUF_SIZE.
+ *       this setting should be enough for most use cases and thus is intended to simplify
+ *       users' programming overhead.
+ */
+char*
+cos_create_pkt_mbuf_pool(const char *name, size_t nb_mbufs)
+{
+	#define MEMPOOL_CACHE_SIZE 256
+	return (char *)rte_pktmbuf_pool_create(name, nb_mbufs,
+		MEMPOOL_CACHE_SIZE, 0, COS_MBUF_DEFAULT_BUF_SIZE,
+		rte_socket_id());
+}
+
+/*
+ * cos_free_packet: wrapper function for rte_pktmbuf_free
+ *
+ * @packet: mbuf packet
+ * 
+ * @return: 0 on success, others on failure
+ * 
+ * note: this function will free the mbuf used by this packet
+ */
+int
+cos_free_packet(char* packet)
+{
+	/* TODO: add free logic */
+	rte_pktmbuf_free((struct rte_mbuf *)packet);
+	return 0;
+}
+
+/*
+ * cos_config_dev_port_queue: wrapper function for rte_eth_dev_configure
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @nb_rx_q: number of rx queues used with this port
+ * @nb_tx_q: number of tx queues used with this port
+ * 
+ * return: 0 on success, others will cause panic
+ * 
+ * note: this function gives users ability to config a port's rx/tx queues
+ */
+int
+cos_config_dev_port_queue(cos_portid_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q)
+{
+	int ret;
+	struct rte_eth_conf local_port_conf = default_port_conf;
+
+	ret = rte_eth_dev_configure(ports_ids[port_id], nb_rx_q, nb_tx_q, &local_port_conf);
+	if (ret < 0) {
+		rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
+			ret, port_id);
+	}
+	
+	COS_DPDK_APP_LOG(NOTICE, "cos_config_dev_port_queue success, with "
+			"%d rx_queue, %d tx_queues\n", nb_tx_q, nb_tx_q);
+
+	return ret;
+}
+
+/*
+ * cos_dev_port_adjust_rx_tx_desc: wrapper function for rte_eth_dev_adjust_nb_rx_tx_desc
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @nb_rx_desc: number of rx descriptors used by this port
+ * @nb_tx_desc: number of tx descriptors used with this port
+ * 
+ * @return: 0 on success, others will cause panic
+ * 
+ * note: this function will check if nb_rx_desc/nb_tx_desc set by user is valid, if not, 
+ *       system default values will be set to them
+ */
+int
+cos_dev_port_adjust_rx_tx_desc(cos_portid_t port_id, uint16_t *nb_rx_desc, uint16_t *nb_tx_desc)
+{
+	int ret;
+
+	ret = rte_eth_dev_adjust_nb_rx_tx_desc(ports_ids[port_id], nb_rx_desc, nb_tx_desc);
+	if (ret < 0) {
+		rte_exit(EXIT_FAILURE,
+				"Cannot adjust number of descriptors: err=%d, port=%u\n",
+				ret, port_id);
+	}
+	
+	COS_DPDK_APP_LOG(NOTICE, "cos_dev_port_adjust_rx_tx_desc success, with "
+			"%d rx_desc, %d tx_desc\n", *nb_rx_desc, *nb_tx_desc);
+
+	return ret;
+}
+
+/*
+ * cos_dev_port_rx_queue_setup: wrapper function for rte_eth_rx_queue_setup
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @rx_queue_id: queue idx setup by user
+ * @nb_rx_desc: number of rx descriptors used with this queue
+ * 
+ * @return: 0 on success, others will cause panic
+ * 
+ * note: this function gives users ability to config a rx queue
+ */
+int
+cos_dev_port_rx_queue_setup(cos_portid_t port_id, uint16_t rx_queue_id, 
+			uint16_t nb_rx_desc, char* mp)
+{
+	int ret;
+	cos_portid_t real_port_id = ports_ids[port_id];
+	struct rte_eth_dev_info dev_info;
+	struct rte_eth_rxconf rxq_conf;
+
+	ret = rte_eth_dev_info_get(real_port_id, &dev_info);
+	rxq_conf = dev_info.default_rxconf;
+
+	ret = rte_eth_rx_queue_setup(real_port_id, 0, nb_rx_desc,
+					rte_eth_dev_socket_id(real_port_id),
+					&rxq_conf,
+					(struct rte_mempool *)mp);
+	if (ret < 0) {
+		rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n",
+				ret, port_id);
+	}
+
+	COS_DPDK_APP_LOG(NOTICE, "cos_dev_port_rx_queue_setup success, with "
+			"%d rx_desc in rx_queue_%d\n", nb_rx_desc, rx_queue_id);
+
+	return ret;
+}
+
+/*
+ * cos_dev_port_tx_queue_setup: wrapper function for rte_eth_tx_queue_setup
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @tx_queue_id: queue idx setup by user
+ * @nb_tx_desc: number of tx descriptors used with this queue
+ * 
+ * @return: 0 on success, others will cause panic
+ * 
+ * note: this function gives users ability to config a tx queue
+ */
+int
+cos_dev_port_tx_queue_setup(cos_portid_t port_id, uint16_t tx_queue_id, 
+			uint16_t nb_tx_desc)
+{
+	int ret;
+	cos_portid_t real_port_id = ports_ids[port_id];
+
+	struct rte_eth_dev_info dev_info;
+	struct rte_eth_txconf txq_conf;
+
+	ret = rte_eth_dev_info_get(real_port_id, &dev_info);
+	txq_conf = dev_info.default_txconf;
+
+	ret = rte_eth_tx_queue_setup(real_port_id, tx_queue_id, nb_tx_desc,
+				rte_eth_dev_socket_id(real_port_id),
+				&txq_conf);
+	if (ret < 0) {
+		rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
+			ret, port_id);
+	}
+
+	COS_DPDK_APP_LOG(NOTICE, "cos_dev_port_tx_queue_setup success, with "
+			"%d tx_desc in tx_queue_%d\n", nb_tx_desc, tx_queue_id);
+
+	return ret;
+}
+
+/*
+ * cos_dev_port_start: wrapper function for rte_eth_dev_start
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @return: 0 on success, others will cause panic
+ * 
+ * note: this function will let the NIC begin to rx/tx packets
+ */
+int
+cos_dev_port_start(cos_portid_t port_id)
+{
+	int ret;
+
+	ret = rte_eth_dev_start(ports_ids[port_id]);
+	if (ret < 0) {
+		rte_exit(EXIT_FAILURE, "rte_eth_dev_start:err=%d, port=%u\n",
+				ret, port_id);
+	}
+	
+	COS_DPDK_APP_LOG(NOTICE, "cos_dev_port_start success, with port %d\n", port_id);
+
+	return ret;
+}
+
+/*
+ * cos_dev_port_stop: wrapper function for rte_eth_dev_stop
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @return: 0 on success, others will cause panic
+ * 
+ * note: this function will stop the NIC
+ */
+int
+cos_dev_port_stop(cos_portid_t port_id)
+{
+	int ret;
+	ret = rte_eth_dev_stop(ports_ids[port_id]);
+	if (ret != 0)
+		printf("rte_eth_dev_stop: err=%d, port=%d\n",
+			ret, port_id);
+
+	COS_DPDK_APP_LOG(NOTICE, "cos_dev_port_stop success, with port %d\n", port_id);
+
+	return ret;
+}
+
+/*
+ * cos_dev_port_set_promiscuous_mode: wrapper function for rte_eth_promiscuous_enable
+ * and rte_eth_promiscuous_disable
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @mode: ON will enable promiscuous mode, OFF will disable it
+ * 
+ * @return: 0 on success, others will cause panic
+ */
+int
+cos_dev_port_set_promiscuous_mode(cos_portid_t port_id, bool mode)
+{
+	int ret;
+	cos_portid_t real_port_id = ports_ids[port_id];
+	if(mode == COS_DPDK_SWITCH_ON) {
+		ret = rte_eth_promiscuous_enable(real_port_id);
+		if (ret != 0) {
+			rte_exit(EXIT_FAILURE,
+				"rte_eth_promiscuous_enable:err=%s, port=%u\n",
+				rte_strerror(-ret), port_id);
+		}
+	} else if (mode == COS_DPDK_SWITCH_OFF){
+		ret = rte_eth_promiscuous_disable(real_port_id);
+		if (ret != 0) {
+			rte_exit(EXIT_FAILURE,
+				"rte_eth_promiscuous_disable:err=%s, port=%u\n",
+				rte_strerror(-ret), port_id);
+		}
+	} else {
+		rte_exit(EXIT_FAILURE, "invalid mode\n");
+	}
+
+	COS_DPDK_APP_LOG(NOTICE, "cos_dev_port_set_promiscuous_mode success, "
+			"with port %d, mode: %s\n", port_id,
+			(mode == COS_DPDK_SWITCH_ON) ? "COS_DPDK_SWITCH_ON":"COS_DPDK_SWITCH_OFF");
+
+	return ret;
+}
+
+/*
+ * cos_dev_port_rx_burst: wrapper function for rte_eth_rx_burst
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @queue_id: queue idx setup by user
+ * @rx_pkts: pointer array, this will be filled with packets received
+ * @nb_pkts: maximum packets bursted at this time
+ * 
+ * @return: number of packets received at this burst
+ */
+uint16_t
+cos_dev_port_rx_burst(cos_portid_t port_id, uint16_t queue_id,
+		 char**rx_pkts, const uint16_t nb_pkts)
+{
+	return rte_eth_rx_burst(ports_ids[port_id], queue_id, (struct rte_mbuf **)rx_pkts, nb_pkts);
+}
+
+/*
+ * cos_dev_port_tx_burst: wrapper function for rte_eth_tx_burst
+ *
+ * @port_id: eth port id, from user's perspective, the maximum id is get
+ *           from cos_eth_ports_init
+ * @queue_id: queue idx setup by user
+ * @tx_pkts: pointer array, this will be filled with packets to be sent
+ * @nb_pkts: maximum packets bursted at this time
+ * 
+ * @return: number of acutal packets sent at this burst
+ */
+uint16_t
+cos_dev_port_tx_burst(cos_portid_t port_id, uint16_t queue_id,
+		 char**tx_pkts, const uint16_t nb_pkts)
+{
+	return rte_eth_tx_burst(ports_ids[port_id], queue_id, (struct rte_mbuf **)tx_pkts, nb_pkts);
+}
+
+/*
+ * cos_parse_pkts: return data pointer of this packet
+ */
+char*
+cos_get_packet(char* mbuf)
+{
+	return (char *)rte_pktmbuf_mtod((struct rte_mbuf*)mbuf, struct rte_ether_hdr *);
+}
+
+/*
+ * cos_get_port_stats: get a port's NIC stats
+ *
+ * @return: null
+ * 
+ */
+void
+cos_get_port_stats(cos_portid_t port_id)
+{
+	struct rte_eth_stats stats;
+
+	rte_eth_stats_get(port_id, &stats);
+
+	COS_DPDK_APP_LOG(NOTICE, 
+		"PORT STATS(%d):\n"
+		"\t\t rx bytes: %lu\n"
+		"\t\t rx packets: %lu\n"
+		"\t\t tx bytes: %lu\n"
+		"\t\t tx packets: %lu\n"
+		"\t\t imssied: %lu\n"
+		"\t\t ierrors: %lu\n"
+		"\t\t oerrors: %lu\n"
+		"\t\t no_buf: %lu\n",
+		ports_ids[port_id],
+		stats.ibytes,
+		stats.ipackets,
+		stats.obytes,
+		stats.opackets,
+		stats.imissed,
+		stats.ierrors,
+		stats.oerrors,
+		stats.rx_nombuf);
+}
+
+/*
+ * On success: return the number of parsed arguments (can be zero)
+ * On failure: return -1
+ */
+int
+cos_dpdk_init(int argc, char **argv)
+{	
+	int ret;
+
+	/* override the dpdk's default pci scan function */
+	rte_pci_bus.bus.scan = cos_pci_scan;
+
+	/* register a log type for cos dpdk application */
+	cos_dpdk_log_type = rte_log_register("cos_dpdk_app");
+	if (cos_dpdk_log_type < 0) {
+		rte_exit(EXIT_FAILURE, "Cannot register log type");
+	}
+
+	rte_log_set_level(cos_dpdk_log_type, RTE_LOG_INFO);
+
+	ret = rte_eal_init(argc, argv);
+
+	if (ret >= 0) {
+		COS_DPDK_APP_LOG(NOTICE, "cos_dpdk_init success.\n");
+	}
+
+	return ret;
+}
+
+uint16_t cos_send_a_packet(char * pkt, uint32_t pkt_size, char* mp)
+{
+	struct rte_mbuf * mbuf;
+	struct rte_ether_hdr *eth_hdr;
+	struct rte_ether_addr s_addr = {{0x66,0x66,0x66,0x66,0x66,0x66}};
+	struct rte_ether_addr d_addr = {{0x11,0x11,0x11,0x11,0x11,0x11}};
+
+	mbuf = rte_pktmbuf_alloc((struct rte_mempool *)mp);
+	eth_hdr = rte_pktmbuf_mtod(mbuf,struct rte_ether_hdr*);
+
+	eth_hdr->dst_addr = d_addr;
+	eth_hdr->src_addr = s_addr;
+	eth_hdr->ether_type = 0x0008;
+
+	char* ip_data = (char*)eth_hdr + sizeof(struct rte_ether_hdr);
+	memcpy(ip_data, pkt, pkt_size);
+	
+	mbuf->data_len = pkt_size + sizeof(struct rte_ether_hdr);
+	mbuf->pkt_len = pkt_size + sizeof(struct rte_ether_hdr);
+
+	return cos_dev_port_tx_burst(0, 0, (char**)&mbuf, 1);
+}
+
+char*
+cos_allocate_mbuf(char* mp) {
+	return (char*)rte_pktmbuf_alloc((struct rte_mempool *)mp);
+}
\ No newline at end of file
diff --git a/src/components/lib/dpdk/cos_dpdk.h b/src/components/lib/dpdk/cos_dpdk.h
new file mode 100644
index 0000000000..fec4711290
--- /dev/null
+++ b/src/components/lib/dpdk/cos_dpdk.h
@@ -0,0 +1,79 @@
+#ifndef COS_DPDK_H
+#define COS_DPDK_H
+
+#include <stdint.h> 
+#include <stdbool.h>
+
+#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
+
+#define COS_ETH_NAME_SZ 16
+
+#define	COS_MBUF_DEFAULT_DATAROOM	2048
+#define COS_PKTMBUF_HEADROOM 128
+#define	COS_MBUF_DEFAULT_BUF_SIZE	\
+	(COS_MBUF_DEFAULT_DATAROOM + COS_PKTMBUF_HEADROOM)
+
+#define NIPQUAD(addr) \
+((unsigned char *)&addr)[0], \
+((unsigned char *)&addr)[1], \
+((unsigned char *)&addr)[2], \
+((unsigned char *)&addr)[3]
+
+#define NIPQUAD_FMT "%u.%u.%u.%u"
+
+#define NMACHEX(addr) \
+((unsigned char *)&addr)[0], \
+((unsigned char *)&addr)[1], \
+((unsigned char *)&addr)[2], \
+((unsigned char *)&addr)[3], \
+((unsigned char *)&addr)[4], \
+((unsigned char *)&addr)[5]
+
+#define NMACHEX_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
+
+typedef uint8_t  cos_coreid_t;
+typedef uint16_t cos_portid_t;
+typedef uint16_t cos_queueid_t;
+
+/* use opeaque pointer to hide details from DPDK to Composite app */
+
+enum cos_dpdk_status_t {
+	COS_DPDK_SUCCESS = 0,
+	COS_DPDK_FALIURE = 1,
+};
+
+enum cos_dpdk_switch_t {
+	COS_DPDK_SWITCH_OFF = 0,
+	COS_DPDK_SWITCH_ON = 1,
+};
+
+int cos_dpdk_init(int argc, char **argv);
+uint16_t cos_eth_ports_init(void);
+
+char* cos_create_pkt_mbuf_pool(const char *name, size_t nb_mbufs);
+int cos_free_packet(char* packet);
+
+int cos_config_dev_port_queue(cos_portid_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q);
+int cos_dev_port_adjust_rx_tx_desc(cos_portid_t port_id, uint16_t *nb_rx_desc, uint16_t *nb_tx_desc);
+
+int cos_dev_port_rx_queue_setup(cos_portid_t port_id, uint16_t rx_queue_id, 
+			uint16_t nb_rx_desc, char* mp);
+int cos_dev_port_tx_queue_setup(cos_portid_t port_id, uint16_t tx_queue_id, 
+			uint16_t nb_tx_desc);
+
+int cos_dev_port_start(cos_portid_t port_id);
+int cos_dev_port_stop(cos_portid_t port_id);
+int cos_dev_port_set_promiscuous_mode(cos_portid_t port_id, bool mode);
+
+uint16_t cos_dev_port_rx_burst(cos_portid_t port_id, uint16_t queue_id,
+		 char**rx_pkts, const uint16_t nb_pkts);
+uint16_t cos_dev_port_tx_burst(cos_portid_t port_id, uint16_t queue_id,
+		 char**tx_pkts, const uint16_t nb_pkts);
+
+void cos_get_port_stats(cos_portid_t port_id);
+
+char* cos_get_packet(char* mbuf);
+uint16_t cos_send_a_packet(char * pkt, uint32_t pkt_size, char* mp);
+char* cos_allocate_mbuf(char* mp);
+
+#endif /* COS_DPDK_H */
\ No newline at end of file
diff --git a/src/components/lib/dpdk/cross_x86_64_composite_with_musl b/src/components/lib/dpdk/cross_x86_64_composite_with_musl
new file mode 100644
index 0000000000..3b3a8ce6a0
--- /dev/null
+++ b/src/components/lib/dpdk/cross_x86_64_composite_with_musl
@@ -0,0 +1,14 @@
+[binaries]
+c = 'musl-gcc'
+strip = 'strip'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86_64'
+cpu = 'native'
+endian = 'little'
+
+[properties]
+skip_sanity_check = false
+#c_args = ['-target', 'aarch64-linux-gnu', '--sysroot', '/usr/aarch64-linux-gnu']
+#c_link_args = ['-target', 'aarch64-linux-gnu', '-fuse-ld=lld', '--gcc-toolchain=/usr']
\ No newline at end of file
diff --git a/src/components/lib/dpdk/doc.md b/src/components/lib/dpdk/doc.md
new file mode 100644
index 0000000000..ed930a7fe5
--- /dev/null
+++ b/src/components/lib/dpdk/doc.md
@@ -0,0 +1,41 @@
+## DPDK
+
+### Description
+This is Composite's version DPDK port, used as a NIC manager.
+### Usage and Assumptions
+Composite does some hacks within DPDK, currently it only supports single thread, without interrupts and huge page capabilities.
+
+## How to compile DPDK with Musl libc in Composite?
+
+### Remove shared library support in DPDK meson build system
+- The DPDK library config file is: `dpdk/lib/meson.build`
+- We need to remove shared lib support in this muson.build file, by just deleting lines with keywords related with "shared". 
+- Notice we cannot delete this line : `dpdk_libraries = [shared_lib] + dpdk_libraries`, we need to change it to `dpdk_libraries = dpdk_libraries`
+- The reason behind this is: DPDK meson build system will try to build share libraries (those `.so` files) which will link syscall function objects. However, in Composite, we have modified the syscall functions in Musl so that they are pointed to `__cos_syscall`. Thus, when linking the shared libraries, linker cannot find the object files contained `__cos_syscall`.
+- Also, we don't need share libraries in Composite DPDK, remove them in the meson.build file could save a lot compiling time.
+
+### Use a cross compile config file 
+- Use this cross compile config file : `src/components/lib/dpdk/cross_x86_64_composite_with_musl`
+- Reason: Before the real configure and compiling process, the meson build system will try to do a compiler sanity check which tries to compile a simple C application to test if compiling toolchain could work as expected. However, based on the `__cos_syscall` problem above, it is not possible to build a linux application as the linker cannot find the `__cos_syscall`. There is no way to avoid this if you are using native build (Meson automatically does this). Thus, you have to use a cross compiling config file, in which you can specify `skip_sanity_check = false` to skip the sanity check (This function is supported in **Meson 0.56.0** and higher). Also, in this file you could specify the c compiler to `musl-gcc`.
+
+
+### Modify another meson.build file in DPDK
+- Location: `dpdk/config/meson.build`
+- Remove the `meson.is_cross_build()` if condition statement.
+- Reason: Because we are using the cross compile config, the DPDK meson build configuration refused to accept the `-Dmachine=default` config if we don't do this modification. It will throw build error like this: `ERROR: Could not get define '__SSE4_2__'`. I believe this is a bug of the DPDK meson build configuration code. Thus, to avoid this, we have to make the `-Dmachine=default` config work as mentioned above.
+
+
+### Remove the DPDK `RTE_BACKTRACE` config
+- Commented the `#define RTE_BACKTRACE 1` in `config/rte_config.h`
+- Reason: this will avoid comping some linux specific headers, as we don't need them in Composite.
+
+### Copy necessary header files to the Musl libc include path
+- cd src/components/lib/libc/musl-1.2.0/include
+- cp -r /usr/include/linux/ ./
+- cp -r /usr/include/asm-generic/ ./
+- cp -r /usr/include/x86_64-linux-gnu/asm/ ./
+- cp -r /usr/include/x86_64-linux-gnu/sys/queue.h ./sys
+- Reason: DPDK meson build system does not support a standfree compiling configuration, there are only three platform options: `linux`, `fresbsd` and `windows`. Thus we have to choose `linux` here. Many code in DPDK rely on some linux system headers. We copy them here into the Musl libc path because 1. We use `-nostdinc -nostdlib` flags so `musl-gcc` will not search the system libc headers but search the Musl libc includ path. 2. Putting those files inside Musl libc include path can reslove compiling warnings and some other definition problems in those header files. 
+
+### Small tips
+- If you are just compiling DPDK with Musl libc in Linux system rather than Composite, you don't need do the steps above except the last one (You always need to copy necessary linux system header files to the Musl libc include path).
\ No newline at end of file
diff --git a/src/components/lib/dpdk/dpdk b/src/components/lib/dpdk/dpdk
new file mode 160000
index 0000000000..bba968cad2
--- /dev/null
+++ b/src/components/lib/dpdk/dpdk
@@ -0,0 +1 @@
+Subproject commit bba968cad297b5c42a98ee5e2e23e60ae0f5c760
diff --git a/src/components/lib/initargs/initargs.h b/src/components/lib/initargs/initargs.h
index ff82cd2684..a6f9f97cfc 100644
--- a/src/components/lib/initargs/initargs.h
+++ b/src/components/lib/initargs/initargs.h
@@ -3,7 +3,7 @@
 
 #include <tar.h>
 
-/*
+/***
  * A very simple nested K/V representation for retrieving initial
  * arguments to components.
  *
diff --git a/src/components/lib/kernel/cos_kernel_api.c b/src/components/lib/kernel/cos_kernel_api.c
index b93afb96d8..80ddcc19ee 100644
--- a/src/components/lib/kernel/cos_kernel_api.c
+++ b/src/components/lib/kernel/cos_kernel_api.c
@@ -17,6 +17,75 @@
 #define printd(...)
 #endif
 
+struct pgtbl_lvl_info {
+	unsigned long range;
+	vaddr_t (* round_to_pg)(vaddr_t );
+	vaddr_t (* round_up_to_pg)(vaddr_t );
+};
+
+vaddr_t __round_to_pgt0_page(vaddr_t vaddr) { return round_to_pgt0_page(vaddr); }
+vaddr_t __round_up_to_pgt0_page(vaddr_t vaddr) { return round_up_to_pgt0_page(vaddr); }
+
+vaddr_t __round_to_pgt1_page(vaddr_t vaddr) { return round_to_pgt1_page(vaddr); }
+vaddr_t __round_up_to_pgt1_page(vaddr_t vaddr) { return round_up_to_pgt1_page(vaddr); }
+
+vaddr_t __round_to_pgt2_page(vaddr_t vaddr) { return round_to_pgt2_page(vaddr); }
+vaddr_t __round_up_to_pgt2_page(vaddr_t vaddr) { return round_up_to_pgt2_page(vaddr); }
+
+unsigned long
+cos_pgtbl_get_range(int pgtbl_lvl)
+{
+	switch (pgtbl_lvl)
+	{
+	case 0:
+		return PGD_RANGE;
+	case 1:
+		return PGT1_RANGE;
+	case 2:
+		return PGT2_RANGE;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+vaddr_t
+cos_pgtbl_round_to_page(int pgtbl_lvl, vaddr_t vaddr)
+{
+	switch (pgtbl_lvl)
+	{
+	case 0:
+		return round_to_pgt0_page(vaddr);
+	case 1:
+		return round_to_pgt1_page(vaddr);
+	case 2:
+		return round_to_pgt2_page(vaddr);
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+vaddr_t
+cos_pgtbl_round_up_to_page(int pgtbl_lvl, vaddr_t vaddr)
+{
+	switch (pgtbl_lvl)
+	{
+	case 0:
+		return round_up_to_pgt0_page(vaddr);
+	case 1:
+		return round_up_to_pgt1_page(vaddr);
+	case 2:
+		return round_up_to_pgt2_page(vaddr);
+	default:
+		break;
+	}
+
+	return 0;
+}
+
 void
 cos_meminfo_init(struct cos_meminfo *mi, vaddr_t untyped_ptr, unsigned long untyped_sz, pgtblcap_t pgtbl_cap)
 {
@@ -34,13 +103,38 @@ __compinfo_metacap(struct cos_compinfo *ci)
 static inline void
 cos_vasfrontier_init(struct cos_compinfo *ci, vaddr_t heap_ptr)
 {
+	int pgtbl_lvl;
 	ci->vas_frontier = heap_ptr;
+
+#if defined(__x86_64__)
+	/*
+	 * The asumption here is that the last 4-k page lower than heap_ptr has been mapped ,
+	 * because loader loads the components into memory region lower than heap_ptr, so initially,
+	 * heap_ptr is set to be round_up_to_page(virtual address of component's binary frontier),
+	 * thus we can calculate which pate tables have been allocated, thus set corresponding page 
+	 * table frontiers.
+	 */
+	vaddr_t last_page = round_to_page(heap_ptr - 1);	
+
+	for (pgtbl_lvl = 0; pgtbl_lvl < COS_PGTBL_DEPTH - 1; pgtbl_lvl++) {
+		ci->vasrange_frontier[pgtbl_lvl] = cos_pgtbl_round_up_to_page(pgtbl_lvl, last_page);
+	}
+
+#else
 	/*
 	 * The first allocation should trigger PTE allocation, thus we
 	 * always round down to a PGD.
+	 *
+	 * FIXME: first allocation should if the heap_ptr is not contiguous with the
+	 *        component's allocated segments I'd think.
+	 *        I believe best would be to round up the heap_ptr? So you always start at
+	 *        a new PGD range, which means first allocation would trigger PTE allocation?
 	 */
-	ci->vasrange_frontier = round_to_pgd_page(heap_ptr);
-	assert(ci->vasrange_frontier == round_to_pgd_page(ci->vasrange_frontier));
+	for (pgtbl_lvl = 0; pgtbl_lvl < COS_PGTBL_DEPTH - 1; pgtbl_lvl++) {
+		ci->vasrange_frontier[pgtbl_lvl] = cos_pgtbl_round_up_to_page(pgtbl_lvl, heap_ptr);
+		assert(ci->vasrange_frontier[pgtbl_lvl] == round_to_pgd_page(ci->vasrange_frontier[pgtbl_lvl]));
+	}
+#endif
 }
 
 static inline void
@@ -61,10 +155,9 @@ cos_capfrontier_init(struct cos_compinfo *ci, capid_t cap_frontier)
 		/* caprange_frontier should be rounded up to CAPTBL_EXPAND_SZ * 2 */
 		ci->caprange_frontier = round_up_to_pow2(cap_frontier + CAPTBL_EXPAND_SZ, CAPTBL_EXPAND_SZ * 2) - CAPTBL_EXPAND_SZ;
 	}
-	ci->cap64_frontier = cap_frontier;
 
 	for (i = 0; i < NUM_CPU; i++) {
-		ci->cap16_frontier[i] = ci->cap32_frontier[i] = cap_frontier;
+		ci->cap16_frontier[i] = ci->cap32_frontier[i] = ci->cap64_frontier[i] = cap_frontier;
 	}
 }
 
@@ -84,10 +177,12 @@ cos_compinfo_init(struct cos_compinfo *ci, pgtblcap_t pgtbl_cap, captblcap_t cap
 	ci->memsrc = ci_resources;
 	assert(ci_resources->memsrc == ci_resources); /* prevent infinite data-structs */
 
-	ci->pgtbl_cap    = pgtbl_cap;
-	ci->captbl_cap   = captbl_cap;
-	ci->comp_cap     = comp_cap;
-	ci->cap_frontier = 0;
+	ci->pgtbl_cap    		= pgtbl_cap;
+	ci->captbl_cap   		= captbl_cap;
+	ci->comp_cap     		= comp_cap;
+	ci->cap_frontier 		= 0;
+	ci->comp_cap_shared 	= 0;
+	ci->pgtbl_cap_shared 	= 0;
 	cos_vasfrontier_init(ci, heap_ptr);
 	cos_capfrontier_init(ci, cap_frontier);
 
@@ -315,7 +410,7 @@ __capid_bump_alloc(struct cos_compinfo *ci, cap_t cap)
 		frontier = &ci->cap32_frontier[cos_cpuid()];
 		break;
 	case CAP64B_IDSZ:
-		frontier = &ci->cap64_frontier;
+		frontier = &ci->cap64_frontier[cos_cpuid()];
 		break;
 	default:
 		return -1;
@@ -326,7 +421,7 @@ __capid_bump_alloc(struct cos_compinfo *ci, cap_t cap)
 /**************** [User Virtual Memory Allocation Functions] ****************/
 
 static pgtblcap_t
-__bump_mem_expand_intern(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t mem_ptr, pgtblcap_t intern)
+__bump_mem_expand_intern(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t mem_ptr, pgtblcap_t intern, int lvl)
 {
 	struct cos_compinfo *meta = __compinfo_metacap(ci);
 	capid_t              pte_cap;
@@ -336,6 +431,7 @@ __bump_mem_expand_intern(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t me
 	assert(meta == __compinfo_metacap(meta)); /* prevent unbounded structures */
 
 	if (!intern) {
+		/* if no pte cap, we activate here, and then we hook/cos this new allocated page table into its parent */
 		pte_cap    = __capid_bump_alloc(meta, CAP_PGTBL);
 		ptemem_cap = __kmem_bump_alloc(meta);
 		/* TODO: handle the case of running out of memory */
@@ -344,11 +440,11 @@ __bump_mem_expand_intern(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t me
 			return 0;
 		}
 
-		/* PTE */
+		/* Current pgtbl is lvl-th, we would like to activate its next lvl page, so we use lvl + 1 */
 		if (call_cap_op(meta->captbl_cap, CAPTBL_OP_PGTBLACTIVATE, pte_cap, meta->mi.pgtbl_cap, ptemem_cap,
-		                1)) {
-			assert(0); /* race? */
-			return 0;
+		                lvl + 1)) {
+				assert(0); /* race? */
+				return 0;
 		}
 	} else {
 		pte_cap = intern;
@@ -368,20 +464,38 @@ __bump_mem_expand_intern(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t me
 	 */
 	call_cap_op(cipgtbl, CAPTBL_OP_CONS, pte_cap, mem_ptr, 0, 0);
 
+	/* second level was allocated (implies current level = 0) */
+	if(lvl == 0) {
+		ci->mi.second_lvl_pgtbl_cap = pte_cap;
+		ci->mi.second_lvl_pgtbl_addr = mem_ptr;
+	}
+
 	return pte_cap;
 }
 
 static vaddr_t
-__bump_mem_expand_range(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t mem_ptr, unsigned long mem_sz)
+__bump_mem_expand_range(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t mem_ptr, unsigned long mem_sz, int pgtbl_lvl)
 {
-	vaddr_t addr;
+	vaddr_t addr, range;
+	assert(pgtbl_lvl >=0 && pgtbl_lvl < COS_PGTBL_DEPTH - 1);
+
+
+#if defined(__x86_64__)
+	vaddr_t tmp_frontier;
+	range		= cos_pgtbl_get_range(pgtbl_lvl);;
+	tmp_frontier	= cos_pgtbl_round_up_to_page(pgtbl_lvl, mem_ptr + mem_sz);
 
+	for (addr = mem_ptr; addr < tmp_frontier; addr += range) {
+		if (__bump_mem_expand_intern(ci, cipgtbl, addr, 0, pgtbl_lvl) == 0) return 0;
+	}
+
+#else
 	for (addr = mem_ptr; addr < mem_ptr + mem_sz; addr += PGD_RANGE) {
 		/* ignore errors likely due to races here as we want to keep expanding regardless */
-		if (__bump_mem_expand_intern(ci, cipgtbl, addr, 0) == 0) return 0;
+		if (__bump_mem_expand_intern(ci, cipgtbl, addr, 0, 0) == 0) return 0;
 	}
-
 	assert(round_up_to_pgd_page(addr) == round_up_to_pgd_page(mem_ptr + mem_sz));
+#endif
 
 	return mem_ptr;
 }
@@ -389,7 +503,7 @@ __bump_mem_expand_range(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t mem
 vaddr_t
 cos_pgtbl_intern_alloc(struct cos_compinfo *ci, pgtblcap_t cipgtbl, vaddr_t mem_ptr, unsigned long mem_sz)
 {
-	return __bump_mem_expand_range(ci, cipgtbl, mem_ptr, mem_sz);
+	return __bump_mem_expand_range(ci, cipgtbl, mem_ptr, mem_sz, 0);
 }
 
 pgtblcap_t
@@ -397,20 +511,22 @@ cos_pgtbl_intern_expand(struct cos_compinfo *ci, vaddr_t mem_ptr, int lvl)
 {
 	pgtblcap_t cap;
 
+#if defined(__x86_64__)
 	assert(lvl > 0);
+#endif
 
 	ps_lock_take(&ci->va_lock);
-	if (ci->vasrange_frontier != round_to_pgd_page(mem_ptr)) goto error;
+	if (ci->vasrange_frontier[lvl] != round_to_pgd_page(mem_ptr)) goto error;
 
-	cap = __bump_mem_expand_intern(ci, ci->pgtbl_cap, mem_ptr, 0);
+	cap = __bump_mem_expand_intern(ci, ci->pgtbl_cap, mem_ptr, 0, 0);
 	if (!cap) goto error;
 
 	while (1) {
-		vaddr_t tmp = ps_load(&ci->vasrange_frontier);
+		vaddr_t tmp = ps_load(&ci->vasrange_frontier[lvl]);
 
 		if (tmp >= mem_ptr + PGD_RANGE) break;
 		/* If someone else beats us to this, then the range has been extended anyway */
-		ps_cas(&ci->vasrange_frontier, tmp, tmp + PGD_RANGE);
+		ps_cas(&ci->vasrange_frontier[lvl], tmp, tmp + PGD_RANGE);
 	}
 
 	ps_lock_release(&ci->va_lock);
@@ -425,12 +541,12 @@ int
 cos_pgtbl_intern_expandwith(struct cos_compinfo *ci, pgtblcap_t intern, vaddr_t mem)
 {
 	ps_lock_take(&ci->va_lock);
-	if (ci->vasrange_frontier != round_to_pgd_page(mem)) goto error;
+	if (ci->vasrange_frontier[0] != round_to_pgd_page(mem)) goto error;
 
-	if ((unsigned long)ps_faa(&ci->vasrange_frontier, PGD_RANGE) > round_to_pgd_page(mem)) goto error;
+	if ((unsigned long)ps_faa(&ci->vasrange_frontier[0], PGD_RANGE) > round_to_pgd_page(mem)) goto error;
 	if ((unsigned long)ps_faa(&ci->vas_frontier, PGD_RANGE) > round_to_pgd_page(mem)) goto error;
 
-	if (__bump_mem_expand_intern(ci, ci->pgtbl_cap, mem, intern) != intern) {
+	if (__bump_mem_expand_intern(ci, ci->pgtbl_cap, mem, intern, 0) != intern) {
 		ps_lock_release(&ci->va_lock);
 		return 1;
 	}
@@ -446,13 +562,22 @@ cos_pgtbl_intern_expandwith(struct cos_compinfo *ci, pgtblcap_t intern, vaddr_t
 static void
 __cos_meminfo_populate(struct cos_compinfo *ci, vaddr_t untyped_ptr, unsigned long untyped_sz)
 {
-	vaddr_t              addr, start_addr, retaddr;
+	vaddr_t		addr, start_addr, retaddr;
+	size_t		pgtbl_lvl;
 	struct cos_compinfo *meta = __compinfo_metacap(ci);
 
 	assert(untyped_ptr == round_up_to_pgd_page(untyped_ptr));
-	assert(untyped_sz == round_up_to_pgd_page(untyped_sz));
 
-	retaddr = __bump_mem_expand_range(ci, ci->mi.pgtbl_cap, untyped_ptr, untyped_sz);
+#if defined(__x86_64__)
+	for(pgtbl_lvl = 0; pgtbl_lvl < COS_PGTBL_DEPTH - 1; pgtbl_lvl++) {
+		retaddr = __bump_mem_expand_range(ci, ci->mi.pgtbl_cap, untyped_ptr, untyped_sz, pgtbl_lvl);
+		assert(retaddr);
+	}
+#else
+
+	assert(untyped_sz == round_up_to_pgd_page(untyped_sz));
+	retaddr = __bump_mem_expand_range(ci, ci->mi.pgtbl_cap, untyped_ptr, untyped_sz, 0);
+#endif
 	assert(retaddr == untyped_ptr);
 
 	ps_lock_take(&ci->mem_lock);
@@ -481,19 +606,42 @@ __page_bump_mem_alloc(struct cos_compinfo *ci, vaddr_t *mem_addr, vaddr_t *mem_f
 {
 	vaddr_t              heap_vaddr, retaddr;
 	struct cos_compinfo *meta = __compinfo_metacap(ci);
-	size_t               rounded;
+	size_t               rounded, pgtbl_lvl;
 
-	printd("__page_bump_alloc\n");
+	printd("__page_bump_mem_alloc\n");
 
 	assert(sz % PAGE_SIZE == 0);
 	assert(meta == __compinfo_metacap(meta)); /* prevent unbounded structures */
-	heap_vaddr = ps_faa(mem_addr, sz);        /* allocate our memory addresses */
+	heap_vaddr = ps_faa(mem_addr, sz);        /* allocate our memory addresses */	
+
+#if defined(__x86_64__)
+	/* Just need to map COS_PGTBL_DEPTH - 1 levels page tables, assuming root page table is already there */
+	for(pgtbl_lvl = 0; pgtbl_lvl < COS_PGTBL_DEPTH - 1; pgtbl_lvl++) {
+		if (heap_vaddr + sz > ci->vasrange_frontier[pgtbl_lvl]) {
+			retaddr = __bump_mem_expand_range(ci, ci->pgtbl_cap, heap_vaddr, sz, pgtbl_lvl);
+			assert(retaddr);
+
+			while (1) {
+				vaddr_t tmp = ps_load(&ci->vasrange_frontier[pgtbl_lvl]);
+				vaddr_t tmp_frontier;
+
+				tmp_frontier = cos_pgtbl_round_up_to_page(pgtbl_lvl, heap_vaddr + sz);;
+
+				/* perhaps another thread already advanced the frontier? */
+				if (tmp >= heap_vaddr + sz) break;
+				/* If this fails, then someone else already expanded for us...win! */
+				ps_cas(&ci->vasrange_frontier[pgtbl_lvl], tmp, tmp_frontier);
+			}
+		}
+	}
+	
+#else
 	rounded    = sz + (heap_vaddr - round_to_pgd_page(heap_vaddr));
 
 	/* Do we not need to allocate PTEs? */
 	if (heap_vaddr + sz <= *mem_frontier) return heap_vaddr;
+	retaddr = __bump_mem_expand_range(ci, ci->pgtbl_cap, round_up_to_pgd_page(heap_vaddr), rounded, 0);
 
-	retaddr = __bump_mem_expand_range(ci, ci->pgtbl_cap, round_to_pgd_page(heap_vaddr), rounded);
 	assert(retaddr);
 
 	while (1) {
@@ -506,23 +654,29 @@ __page_bump_mem_alloc(struct cos_compinfo *ci, vaddr_t *mem_addr, vaddr_t *mem_f
 	}
 	assert(*mem_frontier > heap_vaddr);
 
+#endif
 	return heap_vaddr;
 }
 
 static vaddr_t
-__page_bump_valloc(struct cos_compinfo *ci, size_t sz)
+__page_bump_valloc(struct cos_compinfo *ci, size_t sz, size_t align)
 {
 	vaddr_t ret_addr = 0;
+	vaddr_t rounding; // how much we need to round up sz to handle alignment
 
 	ps_lock_take(&ci->va_lock);
-	ret_addr = __page_bump_mem_alloc(ci, &ci->vas_frontier, &ci->vasrange_frontier, sz);
+	rounding = round_up_to_pow2(ci->vas_frontier, align) - ci->vas_frontier;
+	sz += rounding;
+	ret_addr = __page_bump_mem_alloc(ci, &ci->vas_frontier, &ci->vasrange_frontier[0], sz);
+	ret_addr += rounding;
 	ps_lock_release(&ci->va_lock);
+	assert(ret_addr % align == 0);
 
 	return ret_addr;
 }
 
 static vaddr_t
-__page_bump_alloc(struct cos_compinfo *ci, size_t sz)
+__page_bump_alloc(struct cos_compinfo *ci, size_t sz, size_t align)
 {
 	struct cos_compinfo *meta = __compinfo_metacap(ci);
 	vaddr_t              heap_vaddr, heap_cursor, heap_limit;
@@ -531,7 +685,7 @@ __page_bump_alloc(struct cos_compinfo *ci, size_t sz)
 	 * Allocate the virtual address range to map into.  This is
 	 * atomic, so we will get a contiguous range of sz.
 	 */
-	heap_vaddr = __page_bump_valloc(ci, sz);
+	heap_vaddr = __page_bump_valloc(ci, sz, align);
 	if (unlikely(!heap_vaddr)) return 0;
 	heap_limit = heap_vaddr + sz;
 	assert(heap_limit > heap_vaddr);
@@ -551,7 +705,7 @@ __page_bump_alloc(struct cos_compinfo *ci, size_t sz)
 		if (!umem) return 0;
 
 		/* Actually map in the memory. */
-		if (call_cap_op(meta->mi.pgtbl_cap, CAPTBL_OP_MEMACTIVATE, umem, ci->pgtbl_cap, heap_cursor, 0)) {
+		if (call_cap_op(meta->mi.pgtbl_cap, CAPTBL_OP_MEMACTIVATE, umem, ci->pgtbl_cap, heap_cursor, PAGE_ORDER)) {
 			assert(0);
 			return 0;
 		}
@@ -697,6 +851,25 @@ cos_comp_alloc(struct cos_compinfo *ci, captblcap_t ctc, pgtblcap_t ptc, vaddr_t
 	return cap;
 }
 
+int
+cos_comp_alloc_shared(struct cos_compinfo *ci, pgtblcap_t ptc, vaddr_t entry, struct cos_compinfo *ci_resources)
+{
+	compcap_t   compc;
+	captblcap_t ctc = ci->captbl_cap;
+
+	printd("cos_compinfo_alloc_shared\n");
+	assert(ptc);
+	assert(ctc);
+	compc = cos_comp_alloc(ci_resources, ctc, ptc, entry);
+	assert(compc);
+
+	ci->comp_cap_shared = compc;
+	ci->pgtbl_cap_shared = ptc;
+
+	return 0;
+}
+
+
 int
 cos_compinfo_alloc(struct cos_compinfo *ci, vaddr_t heap_ptr, capid_t cap_frontier, vaddr_t entry,
                    struct cos_compinfo *ci_resources)
@@ -704,6 +877,7 @@ cos_compinfo_alloc(struct cos_compinfo *ci, vaddr_t heap_ptr, capid_t cap_fronti
 	pgtblcap_t  ptc;
 	captblcap_t ctc;
 	compcap_t   compc;
+	int pgtbl_lvl;
 
 	printd("cos_compinfo_alloc\n");
 
@@ -716,6 +890,11 @@ cos_compinfo_alloc(struct cos_compinfo *ci, vaddr_t heap_ptr, capid_t cap_fronti
 
 	cos_compinfo_init(ci, ptc, ctc, compc, heap_ptr, cap_frontier, ci_resources);
 
+	/* This is to make sure that "the address below vas_frontier has been allocated, follow the assumption we put in cos_vasfrontier_init()"*/
+	for (pgtbl_lvl = 0; pgtbl_lvl < COS_PGTBL_DEPTH - 1; pgtbl_lvl++) {
+		__bump_mem_expand_intern(ci, ptc, round_to_page(ci->vas_frontier - 1), 0, pgtbl_lvl);
+	}
+
 	return 0;
 }
 
@@ -735,24 +914,6 @@ cos_sinv_alloc(struct cos_compinfo *srcci, compcap_t dstcomp, vaddr_t entry, inv
 	return cap;
 }
 
-int
-cos_sinv(sinvcap_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4)
-{
-	return call_cap_op(sinv, 0, arg1, arg2, arg3, arg4);
-}
-
-int
-cos_sinv_rets(sinvcap_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2, word_t *ret3)
-{
-	return call_cap_retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2, ret3);
-}
-
-int
-cos_sinv_2rets(sinvcap_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2)
-{
-	return call_cap_2retvals_asm(sinv, 0, arg1, arg2, arg3, arg4, ret1, ret2);
-}
-
 /*
  * Arguments:
  * thdcap:  the thread to activate on snds to the rcv endpoint.
@@ -810,17 +971,26 @@ cos_hw_alloc(struct cos_compinfo *ci, u32_t bitmap)
 }
 
 void *
-cos_page_bump_alloc(struct cos_compinfo *ci)
+cos_page_bump_allocn(struct cos_compinfo *ci, size_t sz)
 {
-	return (void *)__page_bump_alloc(ci, PAGE_SIZE);
+	assert(sz % PAGE_SIZE == 0);
+	return (void *)__page_bump_alloc(ci, sz, PAGE_SIZE);
 }
 
 void *
-cos_page_bump_allocn(struct cos_compinfo *ci, size_t sz)
+cos_page_bump_allocn_aligned(struct cos_compinfo *ci, size_t sz, size_t align)
 {
 	assert(sz % PAGE_SIZE == 0);
+	assert(align % PAGE_SIZE == 0);
+
+	return (void *)__page_bump_alloc(ci, sz, align);
+}
+
+void *
+cos_page_bump_alloc(struct cos_compinfo *ci)
+{
+	return cos_page_bump_allocn(ci, PAGE_SIZE);
 
-	return (void *)__page_bump_alloc(ci, sz);
 }
 
 capid_t
@@ -875,8 +1045,12 @@ cos_sched_sync(void)
 int
 cos_switch(thdcap_t c, tcap_t tc, tcap_prio_t prio, tcap_time_t timeout, arcvcap_t rcv, sched_tok_t stok)
 {
+#if defined(__x86_64__)
+	return call_cap_op(c, tc, stok, prio, rcv, timeout);
+#else
 	return call_cap_op(c, (stok >> 16), tc << 16 | rcv, (prio << 32) >> 32,
 	                   (((prio << 16) >> 48) << 16) | ((stok << 16) >> 16), timeout);
+#endif
 }
 
 int
@@ -929,37 +1103,61 @@ cos_rcv(arcvcap_t rcv, rcv_flags_t flags, int *rcvd)
 }
 
 vaddr_t
-cos_mem_aliasn(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, size_t sz)
+cos_mem_aliasn_aligned(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, size_t sz, size_t align, unsigned long perm_flags)
 {
 	size_t i;
 	vaddr_t dst, first_dst;
 
 	assert(srcci && dstci);
 	assert(sz && (sz % PAGE_SIZE == 0));
+	assert(align % PAGE_SIZE == 0);
 
-	dst = __page_bump_valloc(dstci, sz);
+	dst = __page_bump_valloc(dstci, sz, align);
 	if (unlikely(!dst)) return 0;
 	first_dst = dst;
 
 	for (i = 0; i < sz; i += PAGE_SIZE, src += PAGE_SIZE, dst += PAGE_SIZE) {
-		if (call_cap_op(srcci->pgtbl_cap, CAPTBL_OP_CPY, src, dstci->pgtbl_cap, dst, 0)) return 0;
+		if (call_cap_op(srcci->pgtbl_cap, CAPTBL_OP_CPY, src, dstci->pgtbl_cap, dst, perm_flags)) return 0;
 	}
 
 	return first_dst;
 }
 
 vaddr_t
-cos_mem_alias(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src)
+cos_mem_aliasn(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, size_t sz, unsigned long perm_flags)
+{
+	return cos_mem_aliasn_aligned(dstci, srcci, src, sz, PAGE_SIZE, perm_flags);
+}
+
+vaddr_t
+cos_mem_alias(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, unsigned long perm_flags)
 {
-	return cos_mem_aliasn(dstci, srcci, src, PAGE_SIZE);
+	return cos_mem_aliasn(dstci, srcci, src, PAGE_SIZE, perm_flags);
 }
 
 int
-cos_mem_alias_at(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *srcci, vaddr_t src)
+cos_mem_alias_at(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *srcci, vaddr_t src, unsigned long perm_flags)
 {
 	assert(srcci && dstci);
 
-	if (call_cap_op(srcci->pgtbl_cap, CAPTBL_OP_CPY, src, dstci->pgtbl_cap, dst, 0)) BUG();
+	if (call_cap_op(srcci->pgtbl_cap, CAPTBL_OP_CPY, src, dstci->pgtbl_cap, dst, perm_flags)) BUG();
+
+	return 0;
+}
+
+int
+cos_mem_alias_atn(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *srcci, vaddr_t src, size_t sz, unsigned long perm_flags)
+{
+	size_t i;
+	size_t npages;
+
+	assert(srcci && dstci);
+	assert(sz % PAGE_SIZE == 0);
+
+	npages = sz / PAGE_SIZE;
+	for (i=0; i < npages; i++) {
+		if (call_cap_op(srcci->pgtbl_cap, CAPTBL_OP_CPY, src + i * PAGE_SIZE, dstci->pgtbl_cap, dst + i * PAGE_SIZE, perm_flags)) BUG();
+	}
 
 	return 0;
 }
@@ -978,7 +1176,7 @@ cos_mem_move(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src
 
 	assert(srcci && dstci);
 
-	dst = __page_bump_valloc(dstci, PAGE_SIZE);
+	dst = __page_bump_valloc(dstci, PAGE_SIZE, PAGE_SIZE);
 	if (unlikely(!dst)) return 0;
 
 	if (call_cap_op(srcci->pgtbl_cap, CAPTBL_OP_MEMMOVE, src, dstci->pgtbl_cap, dst, 0)) BUG();
@@ -1001,7 +1199,7 @@ cos_mem_move_at(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *sr
 int
 cos_thd_mod(struct cos_compinfo *ci, thdcap_t tc, void *tlsaddr)
 {
-	return call_cap_op(ci->captbl_cap, CAPTBL_OP_THDTLSSET, tc, (int)tlsaddr, 0, 0);
+	return call_cap_op(ci->captbl_cap, CAPTBL_OP_THDTLSSET, tc, (word_t)tlsaddr, 0, 0);
 }
 
 /* FIXME: problems when we got to 64 bit systems with the return value */
@@ -1079,6 +1277,36 @@ cos_hw_cycles_per_usec(hwcap_t hwc)
 	return cycs;
 }
 
+int
+cos_hw_tlb_lockdown(hwcap_t hwc, unsigned long entryid, unsigned long vaddr, unsigned long paddr)
+{
+	return call_cap_op(hwc, CAPTBL_OP_HW_TLB_LOCKDOWN, entryid, vaddr, paddr, 0);
+}
+
+int
+cos_hw_l1flush(hwcap_t hwc)
+{
+	return call_cap_op(hwc, CAPTBL_OP_HW_L1FLUSH, 0, 0, 0, 0);
+}
+
+int
+cos_hw_tlbflush(hwcap_t hwc)
+{
+	return call_cap_op(hwc, CAPTBL_OP_HW_TLBFLUSH, 0, 0, 0, 0);
+}
+
+int
+cos_hw_tlbstall(hwcap_t hwc)
+{
+	return call_cap_op(hwc, CAPTBL_OP_HW_TLBSTALL, 0, 0, 0, 0);
+}
+
+int
+cos_hw_tlbstall_recount(hwcap_t hwc)
+{
+	return call_cap_op(hwc, CAPTBL_OP_HW_TLBSTALL_RECOUNT, 0, 0, 0, 0);
+}
+
 int
 cos_hw_cycles_thresh(hwcap_t hwc)
 {
@@ -1100,7 +1328,7 @@ cos_hw_map(struct cos_compinfo *ci, hwcap_t hwc, paddr_t pa, unsigned int len)
 	assert(ci && hwc && pa && len);
 
 	sz = round_up_to_page(len);
-	va = __page_bump_valloc(ci, sz);
+	va = __page_bump_valloc(ci, sz, PAGE_SIZE);
 	if (unlikely(!va)) return NULL;
 
 	for (i = 0; i < sz; i += PAGE_SIZE) {
@@ -1109,3 +1337,37 @@ cos_hw_map(struct cos_compinfo *ci, hwcap_t hwc, paddr_t pa, unsigned int len)
 
 	return (void *)va;
 }
+
+
+/* ----- Shared Pgtbl ------ */
+int
+cos_get_second_lvl(struct cos_compinfo *ci, capid_t *pgtbl_cap, vaddr_t *pgtbl_addr)
+{
+	if(ci->mi.second_lvl_pgtbl_cap == 0) {
+		return -1;
+	}
+	*pgtbl_cap = ci->mi.second_lvl_pgtbl_cap;
+	*pgtbl_addr = ci->mi.second_lvl_pgtbl_addr;
+
+	return 0;
+}
+
+u32_t
+cos_cons_into_shared_pgtbl(struct cos_compinfo *ci, pgtblcap_t top_lvl)
+{
+	capid_t pte_cap;
+	vaddr_t pgtbl_addr;
+	int ret;
+
+	if(cos_get_second_lvl(ci, &pte_cap, &pgtbl_addr) != 0) {
+		return -1;
+	}
+
+	if (call_cap_op(top_lvl, CAPTBL_OP_CONS, pte_cap, pgtbl_addr, 0, 0)) {
+		assert(0); /* race? */
+		return -1;
+	}
+
+	return 0;
+
+}
\ No newline at end of file
diff --git a/src/components/lib/kernel/cos_kernel_api.h b/src/components/lib/kernel/cos_kernel_api.h
index 78a1b732e2..328b39e838 100644
--- a/src/components/lib/kernel/cos_kernel_api.h
+++ b/src/components/lib/kernel/cos_kernel_api.h
@@ -60,6 +60,9 @@ struct cos_meminfo {
 	vaddr_t    untyped_ptr, umem_ptr, kmem_ptr;
 	vaddr_t    untyped_frontier, umem_frontier, kmem_frontier;
 	pgtblcap_t pgtbl_cap;
+
+	capid_t	   second_lvl_pgtbl_cap;
+	vaddr_t	   second_lvl_pgtbl_addr;
 };
 
 /* Component captbl/pgtbl allocation information */
@@ -69,15 +72,19 @@ struct cos_compinfo {
 	/* the frontier of unallocated caps, and the allocated captbl range */
 	capid_t cap_frontier, caprange_frontier;
 	/* the frontier for each of the various sizes of capability per core! */
-	capid_t cap16_frontier[NUM_CPU], cap32_frontier[NUM_CPU], cap64_frontier;
+	capid_t cap16_frontier[NUM_CPU], cap32_frontier[NUM_CPU], cap64_frontier[NUM_CPU];
 	/* heap pointer equivalent, and range of allocated PTEs */
-	vaddr_t vas_frontier, vasrange_frontier;
+	vaddr_t vas_frontier;
+	vaddr_t vasrange_frontier[COS_PGTBL_DEPTH - 1]; 
 	/* the source of memory */
 	struct cos_compinfo *memsrc; /* might be self-referential */
 	struct cos_meminfo   mi;     /* only populated for the component with real memory */
 
 	struct ps_lock cap_lock, mem_lock; /* locks to make the cap frontier and mem frontier updates and expands atomic */
 	struct ps_lock va_lock; /* lock to make the vas frontier and bump expands for vas atomic */
+	/* shared comp cap */
+	capid_t comp_cap_shared;
+	capid_t pgtbl_cap_shared;
 };
 
 void cos_compinfo_init(struct cos_compinfo *ci, pgtblcap_t pgtbl_cap, captblcap_t captbl_cap, compcap_t comp_cap,
@@ -102,6 +109,8 @@ pgtblcap_t cos_pgtbl_intern_expand(struct cos_compinfo *ci, vaddr_t mem_ptr, int
  */
 int cos_pgtbl_intern_expandwith(struct cos_compinfo *ci, pgtblcap_t intern, vaddr_t mem);
 
+int cos_comp_alloc_shared(struct cos_compinfo *ci_og, pgtblcap_t ptc, vaddr_t entry, struct cos_compinfo *ci_resources);
+
 /*
  * This uses the next three functions to allocate a new component and
  * correctly populate ci (allocating all resources from ci_resources).
@@ -124,6 +133,8 @@ asndcap_t cos_asnd_alloc(struct cos_compinfo *ci, arcvcap_t arcvcap, captblcap_t
 
 void *cos_page_bump_alloc(struct cos_compinfo *ci);
 void *cos_page_bump_allocn(struct cos_compinfo *ci, size_t sz);
+void *cos_page_bump_allocn_aligned(struct cos_compinfo *ci, size_t sz, size_t align);
+
 
 capid_t cos_cap_cpy(struct cos_compinfo *dstci, struct cos_compinfo *srcci, cap_t srcctype, capid_t srccap);
 int     cos_cap_cpy_at(struct cos_compinfo *dstci, capid_t dstcap, struct cos_compinfo *srcci, capid_t srccap);
@@ -159,13 +170,11 @@ int cos_sched_rcv(arcvcap_t rcv, rcv_flags_t flags, tcap_time_t timeout, int *rc
 
 int cos_introspect(struct cos_compinfo *ci, capid_t cap, unsigned long op);
 
-int cos_sinv(sinvcap_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4);
-int cos_sinv_rets(sinvcap_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2, word_t *ret3);
-int cos_sinv_2rets(sinvcap_t sinv, word_t arg1, word_t arg2, word_t arg3, word_t arg4, word_t *ret1, word_t *ret2);
-
-vaddr_t cos_mem_alias(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src);
-vaddr_t cos_mem_aliasn(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, size_t sz);
-int     cos_mem_alias_at(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *srcci, vaddr_t src);
+vaddr_t cos_mem_alias(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, unsigned long perm_flags);
+vaddr_t cos_mem_aliasn(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, size_t sz, unsigned long perm_flags);
+vaddr_t cos_mem_aliasn_aligned(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src, size_t sz, size_t align, unsigned long perm_flags);
+int     cos_mem_alias_at(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *srcci, vaddr_t src, unsigned long perm_flags);
+int     cos_mem_alias_atn(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *srcci, vaddr_t src, size_t sz, unsigned long perm_flags);
 vaddr_t cos_mem_move(struct cos_compinfo *dstci, struct cos_compinfo *srcci, vaddr_t src);
 int     cos_mem_move_at(struct cos_compinfo *dstci, vaddr_t dst, struct cos_compinfo *srcci, vaddr_t src);
 int     cos_mem_remove(pgtblcap_t pt, vaddr_t addr);
@@ -193,9 +202,17 @@ int     cos_hw_detach(hwcap_t hwc, hwid_t hwid);
 void   *cos_hw_map(struct cos_compinfo *ci, hwcap_t hwc, paddr_t pa, unsigned int len);
 int     cos_hw_cycles_per_usec(hwcap_t hwc);
 int     cos_hw_cycles_thresh(hwcap_t hwc);
+int     cos_hw_tlb_lockdown(hwcap_t hwc, unsigned long entryid, unsigned long vaddr, unsigned long paddr);
+int     cos_hw_l1flush(hwcap_t hwc);
+int     cos_hw_tlbflush(hwcap_t hwc);
+int     cos_hw_tlbstall(hwcap_t hwc);
+int     cos_hw_tlbstall_recount(hwcap_t hwc);
 void    cos_hw_shutdown(hwcap_t hwc);
 
 
 capid_t cos_capid_bump_alloc(struct cos_compinfo *ci, cap_t cap);
 
+pgtblcap_t cos_shared_pgtbl_alloc(void);
+u32_t cos_cons_into_shared_pgtbl(struct cos_compinfo *ci, pgtblcap_t top_lvl);
+
 #endif /* COS_KERNEL_API_H */
diff --git a/src/components/lib/libc/Makefile b/src/components/lib/libc/Makefile
index e8830767e4..2fcedf0db5 100644
--- a/src/components/lib/libc/Makefile
+++ b/src/components/lib/libc/Makefile
@@ -18,7 +18,7 @@ OBJECT_OUTPUT =
 # The path within this directory that holds the .h files for
 # dependents to compile with (./ by default). Will be fed into the -I
 # compiler arguments.
-INCLUDE_PATHS = musl-1.1.11/include/
+INCLUDE_PATHS = musl-1.2.0/include/
 # The interfaces this component is dependent on for compilation (this
 # is a list of directory names in interface/)
 INTERFACE_DEPENDENCIES =
@@ -65,24 +65,40 @@ LIBRARY_DEPENDENCIES =
 # init: clean all
 # distclean: clean
 
-MUSLDIR=musl-1.1.11/
+MUSLDIR=musl-1.2.0/
 MUSLINC=$(MUSLDIR)/include/
 MUSLLIB=$(MUSLDIR)/lib/
 
 include Makefile.src Makefile.comp Makefile.dependencies
 
-.PHONY: all clean init distclean
+.PHONY: all clean init distclean armv7a_init i386_init x86_64_init
 all:
 clean:
 
-init:
-	$(info Building libc (musl)...)
+armv7a_init:
+	$(info Building libc (musl) for arm...)
+	cd $(MUSLDIR); ./configure "CC=arm-none-eabi-gcc" "CFLAGS=-march=armv7-a -g -O3" "LDFLAGS=" --disable-shared --target=arm; cd ..
+
+i386_init:
+	$(info Building libc (musl) for i386...)
 	cd $(MUSLDIR); ./configure "CFLAGS=-m32 -march=i686 -O3 -fno-stack-protector" "LDFLAGS=-Wl,-melf_i386" --disable-shared --target=i386; cd ..
-	make -C $(MUSLDIR)
-	make -C $(MUSLDIR) install
+
+x86_64_init:
+	$(info Building libc (musl) for x86_64)
+	cd $(MUSLDIR); ./configure "CFLAGS=-m64 -O3 -mcmodel=large -g" "LDFLAGS=-Wl,-melf_x86_64" --disable-shared --target=x86_64; cd ..
+
+libc.READY:
+	make $(PLATFORM)_init
+	make -j -C $(MUSLDIR)
+	make -j -C $(MUSLDIR) install
 	cp $(MUSLLIB)*.a .
+	touch libc.READY
 	rm libutil.a
 
+init: libc.READY
+
 distclean:
 	make -C $(MUSLDIR) distclean
+	rm -rf $(MUSLDIR)/bin/
 	rm -rf *.a
+	rm -f libc.READY
diff --git a/src/components/lib/libc/musl-1.1.11/.gitignore b/src/components/lib/libc/musl-1.1.11/.gitignore
deleted file mode 100644
index c5d5c4628d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.o
-*.lo
-*.a
-*.so
-*.so.1
-arch/*/bits/alltypes.h
-config.mak
-include/bits
-tools/musl-gcc
-tools/musl-clang
-tools/ld.musl-clang
-lib/musl-gcc.specs
-src/internal/version.h
diff --git a/src/components/lib/libc/musl-1.1.11/COPYRIGHT b/src/components/lib/libc/musl-1.1.11/COPYRIGHT
deleted file mode 100644
index b1e6217288..0000000000
--- a/src/components/lib/libc/musl-1.1.11/COPYRIGHT
+++ /dev/null
@@ -1,140 +0,0 @@
-musl as a whole is licensed under the following standard MIT license:
-
-----------------------------------------------------------------------
-Copyright © 2005-2014 Rich Felker, et al.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------
-
-Authors/contributors include:
-
-Alexander Monakov
-Anthony G. Basile
-Arvid Picciani
-Bobby Bingham
-Boris Brezillon
-Brent Cook
-Chris Spiegel
-Clément Vasseur
-Denys Vlasenko
-Emil Renner Berthing
-Felix Fietkau
-Felix Janda
-Gianluca Anzolin
-Hiltjo Posthuma
-Isaac Dunham
-Jens Gustedt
-Jeremy Huntwork
-Joakim Sindholt
-John Spencer
-Josiah Worcester
-Justin Cormack
-Luca Barbato
-Luka Perkov
-M Farkas-Dyck (Strake)
-Michael Forney
-Nicholas J. Kain
-orc
-Pascal Cuoq
-Pierre Carrier
-Rich Felker
-Richard Pennington
-sin
-Solar Designer
-Stefan Kristiansson
-Szabolcs Nagy
-Timo Teräs
-Trutz Behn
-Valentin Ochs
-William Haddon
-
-Portions of this software are derived from third-party works licensed
-under terms compatible with the above MIT license:
-
-The TRE regular expression implementation (src/regex/reg* and
-src/regex/tre*) is Copyright © 2001-2008 Ville Laurikari and licensed
-under a 2-clause BSD license (license text in the source files). The
-included version has been heavily modified by Rich Felker in 2012, in
-the interests of size, simplicity, and namespace cleanliness.
-
-Much of the math library code (src/math/* and src/complex/*) is
-Copyright © 1993,2004 Sun Microsystems or
-Copyright © 2003-2011 David Schultz or
-Copyright © 2003-2009 Steven G. Kargl or
-Copyright © 2003-2009 Bruce D. Evans or
-Copyright © 2008 Stephen L. Moshier
-and labelled as such in comments in the individual source files. All
-have been licensed under extremely permissive terms.
-
-The ARM memcpy code (src/string/armel/memcpy.s) is Copyright © 2008
-The Android Open Source Project and is licensed under a two-clause BSD
-license. It was taken from Bionic libc, used on Android.
-
-The implementation of DES for crypt (src/misc/crypt_des.c) is
-Copyright © 1994 David Burren. It is licensed under a BSD license.
-
-The implementation of blowfish crypt (src/misc/crypt_blowfish.c) was
-originally written by Solar Designer and placed into the public
-domain. The code also comes with a fallback permissive license for use
-in jurisdictions that may not recognize the public domain.
-
-The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
-Valentin Ochs and is licensed under an MIT-style license.
-
-The BSD PRNG implementation (src/prng/random.c) and XSI search API
-(src/search/*.c) functions are Copyright © 2011 Szabolcs Nagy and
-licensed under following terms: "Permission to use, copy, modify,
-and/or distribute this code for any purpose with or without fee is
-hereby granted. There is no warranty."
-
-The x86_64 port was written by Nicholas J. Kain. Several files (crt)
-were released into the public domain; others are licensed under the
-standard MIT license terms at the top of this file. See individual
-files for their copyright status.
-
-The mips and microblaze ports were originally written by Richard
-Pennington for use in the ellcc project. The original code was adapted
-by Rich Felker for build system and code conventions during upstream
-integration. It is licensed under the standard MIT terms.
-
-The powerpc port was also originally written by Richard Pennington,
-and later supplemented and integrated by John Spencer. It is licensed
-under the standard MIT terms.
-
-All other files which have no copyright comments are original works
-produced specifically for use as part of this library, written either
-by Rich Felker, the main author of the library, or by one or more
-contibutors listed above. Details on authorship of individual files
-can be found in the git version control history of the project. The
-omission of copyright and license comments in each file is in the
-interest of source tree size.
-
-All public header files (include/* and arch/*/bits/*) should be
-treated as Public Domain as they intentionally contain no content
-which can be covered by copyright. Some source modules may fall in
-this category as well. If you believe that a file is so trivial that
-it should be in the Public Domain, please contact the authors and
-request an explicit statement releasing it from copyright.
-
-The following files are trivial, believed not to be copyrightable in
-the first place, and hereby explicitly released to the Public Domain:
-
-All public headers: include/*, arch/*/bits/*
-Startup files: crt/*
diff --git a/src/components/lib/libc/musl-1.1.11/Makefile b/src/components/lib/libc/musl-1.1.11/Makefile
deleted file mode 100644
index 07336d27f0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/Makefile
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# Makefile for musl (requires GNU make)
-#
-# This is how simple every makefile should be...
-# No, I take that back - actually most should be less than half this size.
-#
-# Use config.mak to override any of the following variables.
-# Do not make changes here.
-#
-
-exec_prefix = /usr/local
-bindir = $(exec_prefix)/bin
-
-prefix = /usr/local/musl
-includedir = $(prefix)/include
-libdir = $(prefix)/lib
-syslibdir = /lib
-
-SRCS = $(sort $(wildcard src/*/*.c arch/$(ARCH)/src/*.c))
-OBJS = $(SRCS:.c=.o)
-LOBJS = $(OBJS:.o=.lo)
-GENH = include/bits/alltypes.h
-GENH_INT = src/internal/version.h
-IMPH = src/internal/stdio_impl.h src/internal/pthread_impl.h src/internal/libc.h
-
-LDFLAGS = 
-LIBCC = -lgcc
-CPPFLAGS =
-CFLAGS = -Os -pipe
-CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc 
-
-CFLAGS_ALL = $(CFLAGS_C99FSE)
-CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I./arch/$(ARCH) -I./src/internal -I./include
-CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS)
-CFLAGS_ALL_STATIC = $(CFLAGS_ALL)
-CFLAGS_ALL_SHARED = $(CFLAGS_ALL) -fPIC -DSHARED
-
-AR      = $(CROSS_COMPILE)ar
-RANLIB  = $(CROSS_COMPILE)ranlib
-INSTALL = ./tools/install.sh
-
-ARCH_INCLUDES = $(wildcard arch/$(ARCH)/bits/*.h)
-ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH) $(ARCH_INCLUDES:arch/$(ARCH)/%=include/%))
-
-EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl
-EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
-CRT_LIBS = lib/crt1.o lib/Scrt1.o lib/rcrt1.o lib/crti.o lib/crtn.o
-STATIC_LIBS = lib/libc.a
-SHARED_LIBS = lib/libc.so
-TOOL_LIBS = lib/musl-gcc.specs
-ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS)
-ALL_TOOLS = tools/musl-gcc
-
-WRAPCC_GCC = gcc
-WRAPCC_CLANG = clang
-
-LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1
-
--include config.mak
-
-all: $(ALL_LIBS) $(ALL_TOOLS)
-
-install: install-libs install-headers install-tools
-
-clean:
-	rm -f crt/*.o
-	rm -f $(OBJS)
-	rm -f $(LOBJS)
-	rm -f $(ALL_LIBS) lib/*.[ao] lib/*.so
-	rm -f $(ALL_TOOLS)
-	rm -f $(GENH) $(GENH_INT)
-	rm -f include/bits
-
-distclean: clean
-	rm -f config.mak
-
-include/bits:
-	@test "$(ARCH)" || { echo "Please set ARCH in config.mak before running make." ; exit 1 ; }
-	ln -sf ../arch/$(ARCH)/bits $@
-
-include/bits/alltypes.h.in: include/bits
-
-include/bits/alltypes.h: include/bits/alltypes.h.in include/alltypes.h.in tools/mkalltypes.sed
-	sed -f tools/mkalltypes.sed include/bits/alltypes.h.in include/alltypes.h.in > $@
-
-src/internal/version.h: $(wildcard VERSION .git)
-	printf '#define VERSION "%s"\n' "$$(sh tools/version.sh)" > $@
-
-src/internal/version.lo: src/internal/version.h
-
-crt/rcrt1.o src/ldso/dlstart.lo src/ldso/dynlink.lo: src/internal/dynlink.h arch/$(ARCH)/reloc.h
-
-crt/crt1.o crt/Scrt1.o crt/rcrt1.o src/ldso/dlstart.lo: $(wildcard arch/$(ARCH)/crt_arch.h)
-
-crt/rcrt1.o: src/ldso/dlstart.c
-
-crt/Scrt1.o crt/rcrt1.o: CFLAGS += -fPIC
-
-OPTIMIZE_SRCS = $(wildcard $(OPTIMIZE_GLOBS:%=src/%))
-$(OPTIMIZE_SRCS:%.c=%.o) $(OPTIMIZE_SRCS:%.c=%.lo): CFLAGS += -O3
-
-MEMOPS_SRCS = src/string/memcpy.c src/string/memmove.c src/string/memcmp.c src/string/memset.c
-$(MEMOPS_SRCS:%.c=%.o) $(MEMOPS_SRCS:%.c=%.lo): CFLAGS += $(CFLAGS_MEMOPS)
-
-NOSSP_SRCS = $(wildcard crt/*.c) \
-	src/env/__libc_start_main.c src/env/__init_tls.c \
-	src/thread/__set_thread_area.c src/env/__stack_chk_fail.c \
-	src/string/memset.c src/string/memcpy.c \
-	src/ldso/dlstart.c src/ldso/dynlink.c
-$(NOSSP_SRCS:%.c=%.o) $(NOSSP_SRCS:%.c=%.lo): CFLAGS += $(CFLAGS_NOSSP)
-
-$(CRT_LIBS:lib/%=crt/%): CFLAGS += -DCRT
-
-# This incantation ensures that changes to any subarch asm files will
-# force the corresponding object file to be rebuilt, even if the implicit
-# rule below goes indirectly through a .sub file.
-define mkasmdep
-$(dir $(patsubst %/,%,$(dir $(1))))$(notdir $(1:.s=.o)): $(1)
-endef
-$(foreach s,$(wildcard src/*/$(ARCH)*/*.s),$(eval $(call mkasmdep,$(s))))
-
-# Choose invocation of assembler to be used
-# $(1) is input file, $(2) is output file, $(3) is assembler flags
-ifeq ($(ADD_CFI),yes)
-	AS_CMD = LC_ALL=C awk -f tools/add-cfi.$(ARCH).awk $< | $(CC) -x assembler -c -o $@ -
-else
-	AS_CMD = $(CC) -c -o $@ $<
-endif
-
-%.o: $(ARCH)$(ASMSUBARCH)/%.sub
-	$(CC) $(CFLAGS_ALL_STATIC) -c -o $@ $(dir $<)$(shell cat $<)
-
-%.o: $(ARCH)/%.s
-	$(AS_CMD) $(CFLAGS_ALL_STATIC)
-
-%.o: %.c $(GENH) $(IMPH)
-	$(CC) $(CFLAGS_ALL_STATIC) -c -o $@ $<
-
-%.lo: $(ARCH)$(ASMSUBARCH)/%.sub
-	$(CC) $(CFLAGS_ALL_SHARED) -c -o $@ $(dir $<)$(shell cat $<)
-
-%.lo: $(ARCH)/%.s
-	$(AS_CMD) $(CFLAGS_ALL_SHARED)
-
-%.lo: %.c $(GENH) $(IMPH)
-	$(CC) $(CFLAGS_ALL_SHARED) -c -o $@ $<
-
-lib/libc.so: $(LOBJS)
-	$(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -nostdlib -shared \
-	-Wl,-e,_dlstart -Wl,-Bsymbolic-functions \
-	-o $@ $(LOBJS) $(LIBCC)
-
-lib/libc.a: $(OBJS)
-	rm -f $@
-	$(AR) rc $@ $(OBJS)
-	$(RANLIB) $@
-
-$(EMPTY_LIBS):
-	rm -f $@
-	$(AR) rc $@
-
-lib/%.o: crt/%.o
-	cp $< $@
-
-lib/musl-gcc.specs: tools/musl-gcc.specs.sh config.mak
-	sh $< "$(includedir)" "$(libdir)" "$(LDSO_PATHNAME)" > $@
-
-tools/musl-gcc: config.mak
-	printf '#!/bin/sh\nexec "$${REALGCC:-$(WRAPCC_GCC)}" "$$@" -specs "%s/musl-gcc.specs"\n' "$(libdir)" > $@
-	chmod +x $@
-
-tools/%-clang: tools/%-clang.in config.mak
-	sed -e 's!@CC@!$(WRAPCC_CLANG)!g' -e 's!@PREFIX@!$(prefix)!g' -e 's!@INCDIR@!$(includedir)!g' -e 's!@LIBDIR@!$(libdir)!g' -e 's!@LDSO@!$(LDSO_PATHNAME)!g' $< > $@
-	chmod +x $@
-
-$(DESTDIR)$(bindir)/%: tools/%
-	$(INSTALL) -D $< $@
-
-$(DESTDIR)$(libdir)/%.so: lib/%.so
-	$(INSTALL) -D -m 755 $< $@
-
-$(DESTDIR)$(libdir)/%: lib/%
-	$(INSTALL) -D -m 644 $< $@
-
-$(DESTDIR)$(includedir)/bits/%: arch/$(ARCH)/bits/%
-	$(INSTALL) -D -m 644 $< $@
-
-$(DESTDIR)$(includedir)/%: include/%
-	$(INSTALL) -D -m 644 $< $@
-
-$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
-	$(INSTALL) -D -l $(libdir)/libc.so $@ || true
-
-install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
-
-install-headers: $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%)
-
-install-tools: $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%)
-
-musl-git-%.tar.gz: .git
-	 git archive --format=tar.gz --prefix=$(patsubst %.tar.gz,%,$@)/ -o $@ $(patsubst musl-git-%.tar.gz,%,$@)
-
-musl-%.tar.gz: .git
-	 git archive --format=tar.gz --prefix=$(patsubst %.tar.gz,%,$@)/ -o $@ v$(patsubst musl-%.tar.gz,%,$@)
-
-.SECONDARY:
-
-.PHONY: all clean install install-libs install-headers install-tools
diff --git a/src/components/lib/libc/musl-1.1.11/VERSION b/src/components/lib/libc/musl-1.1.11/VERSION
deleted file mode 100644
index 9ee1f786d5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.1.11
diff --git a/src/components/lib/libc/musl-1.1.11/WHATSNEW b/src/components/lib/libc/musl-1.1.11/WHATSNEW
deleted file mode 100644
index 07554c5e94..0000000000
--- a/src/components/lib/libc/musl-1.1.11/WHATSNEW
+++ /dev/null
@@ -1,1585 +0,0 @@
-0.5.0 - initial release
-
-
-
-0.5.9 - signal ABI bugfix, various cleanup and fixes:
-
-sigset_t was wrongly defined as 1024 bytes instead of 1024 bits,
-breaking the intended ABI compatibility with the LSB/glibc sigaction
-structure. users should upgrade immediately and rebuild any libraries
-or object files that might be using the incorrect definitions.
-
-improved security against DoS with tcb shadow passwords by checking
-that the file opened was really an ordinary file.
-
-fixed a bug in the implementation of atomic ops that could have
-allowed the compiler to incorrectly reorder them (in practice, gcc
-with the default settings on i386 was not reordering them).
-
-greatly improved conformance to the C and POSIX standards regarding
-what the standard header files make visible. _POSIX_C_SOURCE is now
-needed to get POSIX functions in standard C headers, and _XOPEN_SOURCE
-or _GNU_SOURCE are required to get XSI interfaces or GNU extensions,
-respectively.
-
-many internal improvements have been made to the syscall-related code
-in preparation for porting to x86_64 and other archs.
-
-
-
-0.6.0 - x86_64 port, various important bugs fixed
-
-new x86_64 (amd64) architecture port, contributed by Nicholas J. Kain,
-along with PORTING guide. source tree layout and build system have
-been improved to accommodate further ports.
-
-various bugs that were introduced while making the headers respect C
-and POSIX namespace standards have been fixed. conformance to the
-standards has been improved.
-
-fixed an inefficiency in qsort that triggered a bug (occasionaly
-internal compiler error) in some versions of gcc.
-
-fixed a major bug in the printf %n specifier that prevented it from
-working and caused memory corruption.
-
-
-
-0.7.0 - major improvements to posix conformance and completeness
-
-implemented posix shared memory and semaphore interfaces.
-
-implemented all remaining required pthread and clock interfaces.
-
-major fixes to signal semantics.
-
-greatly improved temporary file name generation for safety against
-denial of service due to intentional name collisions.
-
-added syscall wrappers for the linux inotify interface.
-
-malloc(0) now returns a non-null pointer.
-
-fixed printf %n specifier (again), pthread_once (it was always
-hanging), and non-default-type mutex behavior.
-
-added ucontext/sigcontext support in headers to facilitate building
-libgcc with dwarf2 unwind support, and possibly other low-level tools.
-
-improved musl-gcc compiler wrapper.
-
-implemented many small missing functions here and there, minor header
-fixes, etc.
-
-
-
-0.7.1 - improvements to completeness, bug fixes
-
-implemented flockfile, wprintf, and robust mutex functions.
-
-fixed stack corruption bug in times(), minor header bugs, and some
-error return value bugs in thread interfaces.
-
-
-
-0.7.5 - new features, major optimization, and robustness
-
-implemented POSIX timers.
-
-optimized and simplified many thread-related functions.
-
-eliminated resource leak races in thread cancellation. (almost all
-existing implementations, including glibc, have these leaks.)
-
-overhauled stdio implementation to take advantage of readv/writev for
-reduced syscall load, and improved stdio's handling of error status.
-
-added syscall header and interface for applications to use and
-greatly simplified internal system for making syscalls.
-
-strangthened tmpnam/tempnam/tmpfile filename generation and made the
-straight C functions not depend on POSIX symbols.
-
-fixed pthread cancellation ABI on i386 to match the LSB/glibc ABI
-
-better double-free handling in malloc
-
-various minor bug fixes
-
-
-
-0.7.6 - major bug fixes
-
-fixed rare but serious under-allocation bug in malloc.
-
-fixed signedness bug in strchr that prevented finding high bytes.
-
-fixed serious parsing bugs in strtold.
-
-fixed statvfs syscall (it was always failing with EINVAL).
-
-fixed race condition in set*id() functions with threads (possible
-deadlock). further audit still needed though.
-
-fseek no longer sets the stream error flag on failed seeks (this was
-wrong and broke some programs, notably GNU m4).
-
-nl_langinfo is no longer a dummy function. (the functionality was
-previously implemented but accidentally left unused).
-
-various small fixes have been made to the implementations and
-prototypes for nonstandard and obsolete functions
-
-
-
-0.7.7 - more bug fixes and program-compatibility improvements
-
-fixed floating point formatting and rounding bugs in printf.
-
-fixed broken %N$ positional argument specifiers in printf.
-
-fixed misaligned read/overread bug in strchr which could lead to
-crashes scanning tiny strings at the end of a page when the next page
-is not readable, or on archs (not yet supported) that forbid
-misaligned reads.
-
-fixed breakage of statvfs on x86_64
-
-fixed crash in getmntent_r
-
-fixed bug in POSIX timers created with NULL sigevent argument
-
-improved semaphore performance, and sem_wait is now interruptable by
-signals, as required by POSIX.
-
-added many compatibility and system-level interfaces, increasing the
-proportion of busybox that works with musl.
-
-
-
-0.7.8 - more bug fixes and compatibility improvements
-
-fixed problems with ipv6 dns and address printing code that made ipv6
-support practically unusable, and some other getaddrinfo bugs.
-
-fixed broken sendmsg/recvmsg functions on x86_64 (caused by incorrect
-msghdr structure).
-
-fixed broken sigsetjmp asm on x86_64.
-
-worked around a problem with input buffering on terminals reblocking
-after getting a blank line, due to a bug in the linux readv syscall.
-
-various improvements to the "rsyscall" system used to implement
-threaded setuid, setgid, etc.
-
-exiting/cancelling the a timer handler thread no longer kills the
-timer.
-
-fixed incorrect trailing zeros on some %g conversions in printf.
-
-fixed buggy byte-swapping functions and moved them to inlines in
-byteswap.h.
-
-many small improvements to header/application compatibility, support
-for nonstandard macros, etc.
-
-
-
-0.7.9 release notes
-
-new pthread cancellation implementation:
-- safe against resource-leak/side-effect-leak race conditions
-- safe against interruption by signal handlers
-- reduced bloat in all cancellable functions
-- reduced bloat for blocking cancellation
-
-new interfaces implemented:
-- realpath (limited functionality)
-- wordexp (limited functionality)
-- flock (nonstandard)
-- forkpty (nonstandard)
-- posix_fadvise
-- posix_fallocate
-
-general bug fixes:
-- syslog function failure to communicate with syslogd
-- bug in siginfo_t definition if wait.h was included before signal.h
-- incorrect struct definitions for most of sysv ipc
-- pthread_exit/cancel on timer handler wrongly destroying the timer
-- linux dup2 ebusy workaround
-- obscure issues in non-threaded programs using some pthread functions
-- getopt_long allowed mismatch in last char of option name
-- incorrect parsing of obscure ip address forms
-- initgroups not working reliably (uninitialized var)
-- shadow pass treating empty expiry field as pass-expired-in-1970
-- bogus longjmp if pthread_exit was called from cancellation handlers
-
-x86_64-specific bug fixes:
-- fcntl file locking
-- thread stack alignment
-- broken select timeouts due to incorrect timeval definition
-
-
-
-0.7.10 release notes
-
-new features:
-- ipv6 numeric string parsing
-- eventfd syscall wrappers
-
-optimizations:
-- new qsort implementation using the smoothsort algorithm
-- much smaller/faster sigset_t handling functions
-- lowered spin count before futex wait in synchronization functions
-
-general bug fixes:
-- incorrect floating point round-to-even behavior in printf
-- major bugs in pthread barrier implementation
-- off-by-one error in scanf %n results
-- scanf failure to report EOF when scanning for literal text
-- minor missing/incorrect prototype issues
-- dependency on undefined call order in fclose
-
-compiler issue workarounds:
-- incorrect inlining of variadic functions on recent gcc versions
-- pcc preprocessor bug with recursive macro expansion
-
-
-
-0.7.11 release notes
-
-new features:
-- integrated dynamic linker
-- dynamic loading (dlopen/dlsym) (for dynamic-linked programs only)
-- XSI search.h API
-- POSIX message queues
-- POSIX spawn interfaces
-- BSD pseudo-random number generator API (random/srandom/initstate/etc.)
-- floating point environment (limited usefulness due to gcc bugs)
-
-general bug fixes:
-- possible crashes with wordexp due to uninitialized variable
-- race condition in pthread_kill (also present and unfixed in glibc/nptl)
-- pthread exit destructors called too late
-- dangerous unbounded vla in glob
-- brk/sbrk legacy functions mismatching legacy semantics
-- wcsncpy dest buffer overflow
-- strncat and wcsncat possible overflows due to double-termination
-
-
-
-0.7.12 release notes
-
-new features:
-- support for textrels in shared objects
-- rpath support in dynamic linker
-- stdio_ext.h functions (for better gnu software compatibility)
-
-bug fixes:
-- some compilers miscompiling dlopen due to misuse of longjmp
-- safe handling of invalid long-double bit patterns (affects printf)
-- workaround for bugs in linux mprotect syscall
-- thread-safety for random() functions
-- various minor issues
-
-
-
-0.8.0 release notes
-
-new features:
-- chinese and japanese legacy charset support in iconv
-- zero-syscall clock_gettime support (dynamic-linked x86_64 only)
-- futex-based locking for stdio (previously used spinlocks)
-- LD_PRELOAD and RTLD_NEXT support in dynamic linker
-- strptime (mostly working but incomplete)
-- posix aio (mostly working but not entirely conformant)
-- memory streams (fmemopen, open_memstream, ...)
-- stub/dummy implementations for various useless legacy functions
-- if_nameindex
-
-security hardening:
-- setuid, etc. should not longer be able to "partially fail" with threads
-- ensure suid programs start with fd 0,1,2 open
-- improved openpty/forkpty failure checks
-
-threads/synchronization bug fixes:
-- dangerous spurious wakeup in pthread_join lead to early return
-- race condition enabling async cancellation (delayed/lost cancellation)
-- destruction/unmapping race conditions in semaphores, mutexes, rwlocks
-- recursive rwlock_rdlock deadlock when a writer is waiting
-- race condition in sigqueue with fork
-- timer expiration thread exit wasn't running dtors
-- timer threads weren't blocking signals
-- close was wrongly cancellable after succeeding on some devices
-- robust mutex list was not reset on fork
-
-general bug fixes:
-- incorrect logic in fread (spurious blocking; crash on write-only files)
-- many corner cases and overflow cases for strtol-family functions
-- various printf integer formatting issues with flags/width/precision
-- incorrect iconv return value on failure
-- broken FD_* macros on 64-bit targets
-- clock function returning wrong value (real time not cpu time)
-- siglongjmp signal mask clobbering (off-by-one pointer error)
-- dynamic linker weak symbol resolution issues
-- fdopendir failure to set errno
-- various minor header fixes
-
-
-
-0.8.1 release notes
-
-bug fixes:
-- mismatching prototypes caused build failure on 64-bit
-- other minor prototype errors in the headers have been fixed
-- various other small omissions fixed
-
-
-
-0.8.2 release notes
-
-new features:
-- ptrace syscall support
-
-bug fixes:
-- const error (only a warning with many compilers) in lio_listio
-- minor portability fixes aimed at supporting new arch targets
-
-
-
-0.8.3 release notes
-
-new features:
-- arm port (experimental)
-- better musl-gcc wrapper script for building against musl
-- added clone system call
-
-bug fixes:
-- numerous header file typos, copy/paste errors, omissions
-- statfs and statvfs ABI are now LSB-conformant (and actually work)
-
-
-
-0.8.4 release notes
-
-new features: 
-- arm dynamic linker support
-- process-shared pthread barriers now work
-- efficient futex-requeue-based cond var broadcast
-- more optional cancellation points are now cancellable
-- printf accepts null pointers with %s, prints as "(null)"
-- recursive mutexes are now fully reentrant
-- __cxa_atexit support
-- real vfork
-- dynamic linker now gold-compatible
-- prlimit syscall
-- support for large limits with setrlimit/getrlimit (even on 32-bit)
-- glob now supports GLOB_PERIOD option (GNU extension)
-
-bug fixes:
-- many serious issues in condition variables
-- rwlock failure-to-wake deadlock issues
-- various small header files bugs/omissions
-- wrong failure return for pthread_create
-- path handling issues on execvp
-- lock count corruption with robust recursive mutexes on owner death
-- integer overflows in atoi, etc. reading most-negative value
-- spurious mremaps on every realloc of large memory chunks
-- pthread cancellation failure in single-threaded programs
-
-security:
-- avoid fd_set overflow in dns lookups
-
-
-
-0.8.5 release notes
-
-new features:
-- stdio operations are now cancellable (only when low-level io happens)
-- global ctor/dtor support in main program start code and shared libs
-- dynamic linker support for PIE executables (but missing startup code)
-- vfork support on x86_64
-- complete set of locale_t functions (all ignore the locale argument)
-- provide define float_t and double_t in math.h
-- lighter/faster cancellation cleanup handler register/unregister
-
-bug fixes:
-- gcc wrapper now supports -shared, -nostdlib, -nostartfiles
-- removed one wrongly-classified character from iswspace set (zwsp)
-- fixed crashes in dns lookup on some errors, e.g. resolv.conf missing
-- "make install" no longer tries to build shared libc if disabled
-- ptrace argument handling bugs fixed
-- work around visibility-hidden bugs in gcc 3.x
-- fix thread-pointer-loss issue when it's initialized in signal handlers
-- various minor typo/misc fixes in headers
-
-compatibility:
-- glob behaves more like traditional implementations w.r.t. GLOB_MARK
-- added legacy futimes, lutimes functions
-- more compatibility macros in sys/param.h (nonstandard header)
-- setfs[ug]id syscall wrappers (linux specific)
-- fgetpwent function (nonstandard)
-- utmp.h matches traditional version more closely
-- caddr_t now matches glibc type (void * instead of long)
-- dummy (always-fail) dlopen and dlsym functions for static linked programs
-- [efg]cvt functions (previously posix, removed from standard)
-- get_current_dir_name function (nonstandard)
-
-
-
-0.8.6 release notes
-
-bug fixes:
-- fix crash in dns lookups for all static-linked, non-threaded programs
-
-
-
-0.8.7 release notes
-
-new features:
-- c++ support with g++'s libstdc++
-- c99 math library (float, long double, complex, etc.)
-- numerous wchar_t functions
-- a64l, l64a functions
-- getdate function
-
-compatibility:
-- c89 compatibility in math.h
-- syscall.h alias for sys/syscall.h
-- memory.h alias for string.h
-- getcwd supports null buffer argument (auto-allocation)
-
-bug fixes:
-- major fenv (floating point environment) fixes and optimizations
-- strptime mishandling of day/month names
-- strtoull wrongly rejecting the highest 16 possible values as overflow
-- math.h constant expression fixes for INFINITY/NAN/etc.
-- scanf mishandling of "0" with "%x"
-
-
-
-0.8.8 release notes
-
-new feature:
-- major math correctness and performance improvements
-- many math functions implemented in asm for i386
-- some math functions (mostly long double) in asm for x86_64
-- new floating point parser/converter with correct rounding
-- implement wcstod, wcstof, and wcstold
-- new scanf implementation - cleaner, faster, more correct
-- minimal/incomplete strfmon implementation
-
-compatibility:
-- header fixes for c++
-- regex code resync with TRE; support common regex extensions
-- support for compiling apps with gcc's -funsigned-char
-- sysconf now returns dynamic limits for open files, processes
-- give dlerror proper error status stickiness
-- make alloca work even with -fno-builtin
-
-critical security fixes:
-- stack-based buffer overflow in fprintf on unbuffered files
-
-other bug fixes:
-- rare gcc register allocation (miscompilation) bug in syscall wrappers
-- printf was rejecting the valid (but redundant) %lf format specifier
-- fixed big data bloat (missing const) in math functions
-- many math fixes related to floating point exceptions and rounding
-- corrected DECIMAL_DIG definitions
-- tgammal was wrongly setting global signgam
-- crash in wordfree with uninitialized we_offs
-- fix wordexp not null-initializing the we_offs initial slots
-
-
-
-0.8.9 release notes
-
-bug fixes:
-- major breakage in strtol and family: failure to accept leading spaces
-- incorrect name for MATH_ERREXCEPT in math.h
-
-compatibility:
-- prototypes for a few additional nonstandard functions
-
-
-
-0.8.10 release notes
-
-new features:
-- correct over/underflow detection (ERANGE setting) for strtod
-- new musl-gcc wrapper, specfile based, faster and more robust
-- meaningful return strings for dlerror
-- new iswalpha, iswpunct, and wcwidth; sync'd to Unicode 6.1
-- towupper/towlower sync'd with Unicode 6.1
-- new futex-based libc-internal locks instead of spinlocks
-- experimental stack protector support (minimal; no random canary)
-- experimental gdb shared library tracking support
-
-compatibility:
-- getusershell family functions
-- getresuid and getresgid syscall wrappers
-- byte swapping macros in endian.h
-- getdtablesize was wrongly declared in unistd.h for _XOPEN_SOURCE
-
-bug fixes:
-- iconv_open wrongly rejecting most dest charsets (broken in 0.8.0)
-- sysconf failure when correct value is -1 (broken in 0.8.8)
-- scanf and strtod family functions overreading past NAN (4 bytes vs 3)
-- scanf and strtod wrongly treating "0.00000000001", etc. as 0
-- many bugs in towupper/towlower (never seriously tested before)
-- int8_t definition was wrong when gcc -funsigned-char was used
-
-
-
-0.9.0 release notes
-
-license change: MIT
-
-new features:
-- configure script, improved build system
-- full stack protector support
-- PIE support on x86 and x86_64
-- new O(1) space, O(nm) time implementation of fnmatch
-- improved support for sse2 floating point mode on x86
-
-compatibility:
-- added linux unshare syscall
-- exp10/pow10 function
-- sqrtl support on arm (previously missing)
-- removed minimal linux/*.h headers that could conflict with real ones
-- support for _LARGEFILE64_SOURCE (mapped to standard fcns with #define)
-- better c89 compatibility in headers
-- stub versions of sched_* functions (previously missing)
-- pthread stacks no longer executable (compat with hardened kernels)
-- new ar.h and lastlog.h (legacy junk)
-- various other header improvements
-
-optimization:
-- additional x86_64 math asm
-- better formula for acos use in i386 asm
-
-bug fixes:
-- large (up to a few %) errors in strtod for certain values due to bug
-- mbsnrtowcs and wcsnrtombs were completely broken (bad exit logic)
-- wide printf %.0s could fail due to uninitialized variable
-- missing dlerror strings for dlsym in some cases
-
-
-
-0.9.1 release notes
-
-new features:
-- dynamic linker can be used as a program to explicitly load/run executables
-- ldd command, usable by making a symlink to the dynamic linker named ldd
-
-bug fixes:
-- major bugs in POSIX BRE parsing inherited from TRE regex code
-- character matching bug in regex on ARM: WCHAR_MAX was assumed to be signed
-- various obscure fixes related to signals and pthread cancellation
-- remquot subnormal remainder bug
-- buggy macros in (nonstandard) sys/param.h
-- major bug in pthread barriers on x86_64 (out of bounds write)
-- utimes (legacy) function was making wrong syscall (utime instead of utimes)
-- avoid using "old" syscalls that don't exist on arm eabi linux
-- broken strrchr(str, 0)
-- broken mbsinit(0)
-- broken wcsncmp
-- syntax error in nextafter macro in tgmath.h
-- missing support for -pie in musl-gcc wrapper
-- abort could wrongly fail to terminate the program in some cases
-
-compatibility:
-- increase default thread stack size to 80k
-- support _BSD_SOURCE feature test macro
-- support _LARGEFILE64_SOURCE feature test macro (merely exposes alt names)
-- lots of legacy-compatibility improvements in headers
-- various minor GNU extension functions
-- sysconf reporting number of available CPUs/cores
-- various LSB/glibc ABI interfaces aimed at compatibility with some binaries
-- use fistpll asm mnemonic instead of fistpq for compat with clang
-
-
-
-0.9.2 release notes
-
-bug fixes:
-- pointer overflow in printf (crash on 32bit userspace, 64bit kernel)
-- printf %ls over-read bug
-- strtod failure to read -0x as negative zero
-- flush stdio after dtors, not before
-- wrong file position for buffered input streams on exit
-- popen was broken when stdin/out were already closed
-- broken wcwidth tables (missing many characters)
-- fwrite: wrong return value of partial/failed write
-- broken utf-16 conversions
-- bad buffer length check in getlogin_r
-- bad perror("") behavior; did not match perror(0)
-- broken sysinfo syscall/structure
-- stdint.h const macro signedness bugs
-- broken include guards in some headers
-- bogus localeconv values
-- cancellation-safety for popen and pclose
-- fma corner cases wrong on i386
-- fcntl F_GETOWN errno missing on failure.
-- char signedness bug in dynamic linker broke dlopen on arm
-- mprotect failure in dynamic linker caused crash instead of error
-
-build system:
-- configure check to work around hacked-up gcc versions
-- test for old binutils that can't support musl dynamic linker
-
-compatibility:
-- make _GNU_SOURCE imply _LARGEFILE64_SOURCE
-- syscall wrapper for lots of nonstandard and/or legacy linux syscalls
-- versionsort stub
-- timegm function (inverse of gmtime)
-- various minor header tweaks
-- make __freading/__fwriting semantics match traditional ones
-- added gnulib-compatibility stdio interfaces
-- added pthread_attr_setstack interface
-- make strerror_r return partial string when buffer is too small
-- duplocale should accept LC_GLOBAL_LOCALE
-- align ptsname_r to upcoming posix requirements
-- support invalid ld80 bit patterns as extra nans.
-
-
-
-0.9.3 release notes
-
-new features:
-- mips (32-bit, o32 abi) port, currently static-linked only
-- newly overhauled crypt implementation
-- improved library pathname info for debugger from the dynamic linker
-- getaddrinfo (and getservbyname) now support /etc/services lookups
-- pipe2 syscall wrapper
-- splice and vmsplice syscall wrappers
-- syscall wrappers for extended attribute interfaces
-- ioperm/iopl syscall wrappers on archs that support these operations
-
-bug fixes:
-- dlsym RTLD_NEXT library search order was wrong
-- multiple dlopen pathname and library name handling errors
-- potential race condition in detached thread exit
-- broken internal-lock-handling code not updated for futex-based __lock
-- sem_trywait spurious EAGAIN errors arising from CAS failures
-- workaround kernel bug in cmsghdr size_t vs socklen_t issue (64-bit)
-- getservby* crash on null protocol argument
-- logic error skipping failed interfaces in if_nameindex
-- various minor header/declaration related issues
-
-arm-specific bug fixes:
-- broken crti/crtn startup code when gcc crtbegin/end files are linked
-- sigsetjmp tail call optimization failure broke the function
-- incorrect little-endian assumptions in atomic.h functions
-- use of blx instruction in asm (not supported on pre-v5 arm)
-
-build system:
-- only use expensive -ffloat-store cflag on archs/compilers that need it
-- make musl-gcc wrapper support -lgcc (mainly for self-hosting)
-
-
-
-0.9.4 release notes
-
-new features:
-- blowfish crypt
-- dynamic linking on mips
-- arm hard float support
-- BSD fgetln function in stdio
-- minor header improvements for compatibility
-- support for CROSS_COMPILE variable to configure
-- legacy significand function
-- better support for SUSv3-targeted programs
-
-performance:
-- assembly (string ops based) memcpy for i386 and x86_64
-- reduce printf overhead
-
-bug fixes:
-- failure of strtod, etc. to process extremely long strings correctly
-- read overrun in wcsstr for short needles
-- various major mips issues that prevented most software from working
-- erroneous floating point exception behavior in i386/x86_64 exp asm
-- crashes on null arguments to legacy err.h functions
-- various header file/type issues
-- extremely rare/obscure race condition with robust mutexes
-- crypt now never returns null (most programs don't check, then crash)
-- missing xattr remove functions
-
-
-
-0.9.5 release notes
-
-compatibility and headers:
-- POSIX+XSI+BSD features enabled by default with no macros defined
-- most programs can now be built without adding -D_GNU_SOURCE
-- added C99 restrict keyword where required in all prototypes
-- greater C89 compatibility
-- cleaner, more-compatible public syscall.h
-- many other header fixes
-- support for compiling musl with clang/llvm
-
-new features:
-- sha 256/512 password hash functions in crypt
-- GNU hash support in dynamic linker
-- partial C11 coverage
-- dladdr function added
-- dynamic linker reports all errors instead of exiting on first error
-- syscall wrappers added for most remaining linux syscalls
-- provide POSIX O_SEARCH open mode using linux O_PATH
-
-bug fixes:
-- most atexit functions were being skipped when exiting
-- some BSD functions were not being exposed under _BSD_SOURCE
-- issues loading ssp-protected DSO into non-ssp program with dlopen
-
-debloating:
-- eliminate .eh_frame (10-15% loaded size bloat)
-- optimal inline syscall asm for ARM and MIPS
-- no longer force -O3 for shared libs
-
-
-
-0.9.6 release notes
-
-bug fixes:
-- serious breakage in definition of O_ACCMODE mask (missing a bit)
-
-new features:
-- O_EXEC open mode
-- md5 crypt hash function
-
-
-
-0.9.7 release notes
-
-new features:
-- thread-local storage (__thread/_Thread_local)
-- microblaze port
-- getopt option parsing reset support
-- vsyscall (sysenter, etc.) support on i386 (faster syscalls)
-- memmem function (GNU extension)
-- mips fenv support
-- accept "nan(n-char-sequence)" in strtod/scanf family functions
-- configure now supports compiling with pcc
-
-quality and correctness improvements:
-- close-on-exec flag for all library-internal file descriptors
-- cancellation-safety and corner-case overhaul in shm_open/sem_open
-- close EINTR vs EINPROGRESS issue
-- mark binaries as not requiring executable stack
-- better gdb compatibility in dynamic linker
-- support recursive dlopen (dlopen called from constructors)
-- posix_spawn/system/popen no longer momentarily double commit charge
-- all stdio functions wait for locks
-
-bug fixes:
-- broken sysvipc *ctl functions on 64-bit archs
-- broken shmdt on some archs
-- getaddrinfo failure with port "0"
-- dirname handling of trailing slash
-- vfork race in posix_spawn
-
-
-
-0.9.8 release notes
-
-new features:
-- powerpc port
-- dl_iterate_phdr interface
-- added mips-specific syscalls
-- thread priority scheduling
-- C11 CMPLX macro in complex.h
-- x86 port io functions in sys/io.h
-
-compatibility:
-- improved headers for trace/debugging/machine-access
-- stub functions for unsupported thread-related functionality
-
-bug fixes:
-- numerous math bugs (mostly exception flags and excess-precision issues)
-- register clobber error in i386 vsyscall asm (did not affect most callers)
-- various incorrect definitions in mips headers
-- broken dlsym asm on mips
-- empty prefix handling in configure script (--prefix="")
-- ldso search path logic issues
-- lock handling for stdio memory streams at exit time
-- invalid SO_REUSEPORT definition in socket.h (not supported by Linux)
-- broken redirection attempt to /dev/null in configure script
-
-
-
-0.9.9 release notes
-
-new features:
-- tgamma implementation (no longer lgamma wrapper with low precision)
-- various gnu extensions: sigandset, sigorset, etc.
-- futimesat function (obsolete)
-- various linux syscalls: arch_prctl, personality, etc.
-
-optimizations:
-- hyperbolic, inverse hyperbolic, and inverse trig, bessel functions
-- is* comparison macros in math.h now expand inline properly
-
-library bugs fixed:
-- calling getenv from shared library ctors was broken
-- invalid read in mmap-serviced aligned_alloc/memalign (possible crash)
-- wrong errno result in fallback path of pipe2 
-- various math functions raising spurious exceptions
-- mmap errno value on invalid offsets
-- backwards alignment logic in strlcpy
-- integer overflows in bessel functions
-- large (up to 60ulp) error in erfcf
-- dlsym/dlclose crashing on invalid library handles
-- failure to handle arch variations for cloexec/nonblock flags
-- lio_listio wrong return value for LIO_WAIT mode
-- dladdr failure to resolve PLT addresses
-- time_t/struct tm conversion off-by-one-day in december
-- malloc corruption on nonstandard kernels with non-page-aligned brk
-
-arch-specific bugs fixed:
-- arm ctors/dtors were not working with recent gcc versions
-- arm and mips setjmp/longjmp wrongly saved/restored fenv state
-- loss of precision in i386/x86_64 expl
-
-header bugs fixed:
-- incorrect PRI/SCN macros in inttypes.h for some types
-- arm sys/user.h regressions
-- failure of offsetof() to be an integer constant expression
-- tgmath return value type problems
-
-header compatibility improvements:
-- _GNU_SOURCE now enables everything; _ALL_SOURCE also works
-- scsi/scsi.h and scsi/sg.h are now provided
-- additional MAP_* flags for mmap
-- additional F_* commands and flags for fcntl
-- additional socket option, IPPROTO_* values, and multicase macros
-- thread-related waitpid flags
-- EHWPOISON added to errno.h
-- additional macros for mount, swap, and reboot operations
-- expose additional link.h structures
-- always ensure sizeof(NULL)==sizeof(void *), even in c++
-- additional flags for poll, epoll, inotify, timerfd, timex, dlfcn
-- register names in signal.h/ucontext.h for x86
-- ipc.h ipc_perm nonstandard struct field name compatibility improve
-
-
-
-0.9.10 release notes
-
-new features:
-- getifaddrs 
-- pthread_getattr_np (widely used by garbage collectors)
-- mkostemps, mkostemp, mkstemps functions (mkostemp is future-POSIX)
-- strcasestr and strverscmp (previously stubs)
-
-improvements:
-- major performance improvements in mbtowc
-- avoid filling caller-provided thread stacks with large TLS
-- debloat unnecessary static buffers
-- robust posix_spawn based on CLONE_VM instead of vfork
-- new system() and popen() based on posix_spawn
-- better strerror strings
-- further emulation of atomic close-on-exec/nonblock options for old kernels
-- provide macro constants for new-ish kernel features
-
-compatibility:
-- several nonstandard but widely-available pwd/grp/shadow functions
-- program_invocation_[short_]name
-- re-added useconds_t type used by some programs
-- some legacy arpa headers
-- dn_skipname function (legacy resolver API)
-- additional ABI aliases for supporting glibc-linked libraries/binaries
-
-general bugs fixed:
-- stale locks and bogus munmap call when pthread_create fails
-- uninitialized argument to munmap when dynlink load_library fails
-- incorrect error returns in gethostby*_r
-- memory leak in gethostbyname family
-- blank ai_canonname in getaddrinfo for non-CNAME records
-- undefined HZ macro in scsi/sg.h
-- wrong return value for wmemmove on forward-copy
-- namespace conformance in strings.h
-- various utmp.h bugs
-- unnecessary DT_SONAME in libc.so caused problems on some systems
-- multiple bugs in syslog, some possibly dangerous
-- non-functional setpriority function
-- slight mishandling of 0xf5 byte in UTF-8 decoder
-- misaligned memory accesses in mbsrtowcs
-
-arch-specific bugs fixed:
-- crash in shared library loading on arm
-- missing __aeabi_atexit needed by arm eabi
-- wrong float_t definition on x86_64
-- various low-impact type size/alignment mismatches in some headers
-- epoll struct alignment wrong on non-x86[_64] archs
-- broken pipe2 fallback code on mips with old kernels
-
-
-
-0.9.11 release notes
-
-new features:
-- %m allocation modifier for scanf
-- week number and ISO week-based-year functionality in strftime
-- per-process and per-thread cputime clocks
-- ethernet address conversion interfaces
-- legacy classful ipv4 network address interfaces
-- minimal dlinfo function (nonstandard)
-
-other improvements:
-- dynamic linker path file can now use newlines to separate paths
-- math optimizations for archs with extended precision (i386)
-- musl-gcc wrapper now exposes gcc's intrinsic headers
-- quality of rand and rand_r pseudo-random sequences
-- support for large device minor numbers (greater than 8 bits)
-- various header conformance and compatibility fixes
-
-directly user-visible bugs fixed:
-- scanf losing characters on unbuffered streams and fmemopen streams
-- failure of mbsrtowcs to record stop position when dest is full
-- failure of iconv to convert to legacy codepages
-- non-working pthread_[sg]etschedparam functions (wrong syscall arguments)
-
-other potentially-serious bugs fixed:
-- resource leaks in sem_open
-- various bugs in thread exit synchronization
-- invalid access in aio notification after aiocb free/reuse
-- synchronization in dynamic linker when new thread dlopens during ctors
-- lack of error handling for failure to read dynamic linker path file
-- creation by mmap or shmget of objects larger than PTRDIFF_MAX
-
-minor conformance bugs fixed:
-- overflow handling for the clock function
-- workaround for incorrect exceptions in fma due to compiler bugs
-- workaround wrong kernel type for sem_nsems field in struct semid_ds
-
-arch-specific bugs fixed:
-- x86_64 sigsetjmp clobbered the signal mask rather than saving it
-- misaligned stack when calling ctors/dtors (crashing on x86_64)
-
-
-
-0.9.12 release notes
-
-new features:
-- zoneinfo time zone support
-- PIE support on all supported archs
-- named sub-archs for endian and float ABI variants
-- improved support for non-root installs of the dynamic linker
-- ability to selectively build only performance-critical modules with -O3
-- simple buffer overflow detection in free/realloc
-- inet_ntop now presents v4-mapped addresses in ::ffff:a.b.c.d form
-- ldd now reports libc and the dynamic linker in its output
-
-compatibility:
-- support for new init/fini array (needed for ctors/dtors on newer gcc)
-- C++ ABI fully matches glibc/LSB, at least on x86
-- many added ABI compatibility symbols for using glibc-linked libs
-- support for STB_GNU_UNIQUE symbol bindings (found in some C++ libs)
-- macros/types for new Linux kernel features in headers
-
-bugs fixed:
-- crashes in scanf on literal mismatches (regression from adding %m)
-- dl_iterate_phdr was passing invalid phdr pointers to its callback
-- getaddrinfo with null host and AF_UNSPEC was failing to report IPv6
-- integer overflows in date/time conversion code
-- misinterpretation of pre-1930s dates as post-2038 on 32-bit archs
-- make install failed to install bits headers if make was not run first
-- shm_open was wrongly cancellable
-- low- or no-impact heap corruption in memalign
-- explicitly running the dynamic linker on PIE programs did not work
-- missing macros and sysconf for some supported POSIX option groups
-- missing close-on-exec flags for several internal fd uses
-
-arch-specific bugs:
-- wrong SIG_ATOMIC_MIN/MAX macros on x86_64
-- erfcl was missing on archs where long double is same as double
-- broken dynamic-model TLS in static-linked arm/mips/powerpc programs
-
-
-
-0.9.13 release notes
-
-new features:
-- iconv support for EUC-KR and Big5 (including HKSCS) encodings
-- field widths (POSIX 2008 feature) in strftime
-- recursive rpath and $ORIGIN support in dynamic linker
-- cpu affinity interfaces
-- support for armhf (hardfloat) floating point environment (fenv)
-- support for SSE fenv on i386 (for apps using -mfpmath=sse -msse2)
-- strftime %s format (seconds since the epoch, future POSIX requirement)
-- configure script now saves its command line as a comment in config.mak
-- legacy functions valloc and euidaccess
-
-performance:
-- optimized asm memcpy for arm
-- optimized asm memset for i386 and x86_64
-- optimized C versions of memcpy and memset for all archs
-- eliminated major spurious syscalls from posix_spawn
-- some math asm for armhf (hardfloat)
-
-workarounds for:
-- qemu-user's rt_sigaction syscall does not allow old to alias new
-- qemu-user's madvise always succeeds (broke pthread_getattr_np)
-- passing PT_INTERP to dlopen attempted to double-load libc
-- gcc 4.8.x generating self-referential (infinite recursion) memcpy/memset
-- linux's lack of support for fchdir, fchmod, fchown, fstat on O_PATH fds
-
-bugs fixed:
-- failure to honor flags for fchmodat and faccessat (linux syscall api flaws)
-- SIGEV_THREAD timer id corruption and race condition issues
-- timer thread TLS incorrectly keeping values from previous expiry run
-- ecvt/fcvt decimal position off-by-one
-- in symbol-versioned libs, symbol resolved to oldest instead of newest
-- posix_spawn not correctly reporting errno from exec failure
-- "make install" was not atomic (overwrote files rather than replacing)
-- integer overflows in strftime
-- unset/empty TZ variable was mishandled
-- strftime could crash if the struct tm did not have valid tm_zone field
-- failure of fenv functions to handle invalid arguments (required by ISO C)
-- failure of some math functions (C and i386 asm) to raise underflow flag
-- broken dn_expand function (previously not used internally)
-- race conditions with signals during fork
-- incorrect access check in mktemp (obsolete function)
-- unnecessary arbitrary limits on size of program headers in dynamic loader
-- text formatting bugs in output of err.h functions
-
-arch-specific bugs:
-- fesetenv(FE_DFL_ENV) crashed on i386
-- breakage of arm crt code when libc is compiled as thumb
-- arm/armhf (hardfloat) misidentified by configure
-- ambiguity of wait (exit status) macros on mips with signal number 127
-- wrong value of _NSIG and SIGRTMAX on mips
-
-
-
-0.9.14 release notes
-
-bugs fixed:
-- failure to properly install dynamic linker with DESTDIR set (symlink wrong)
-- rare deadlock in libc-internal locking routines
-- dynamic linker used fallback paths wrongly on (possibly transient) errors
-- popen broken when stdin or stdout was already closed in parent
-- deadlock/memory-corruption in multithreaded set*id and setrlimit functions
-- realpath failed when file was not readable
-- readpath mistakenly had cancellation points in it
-- crashes in scanf with invalid %m conversion specifiers
-- misclassificiation of some invalid ld80 float representation in fpclassify
-- various overflow and underflow flag issues in math functions
-- domain handling errors for acoshf and acoshl
-- wrong values for some sysconf properties
-- lack of proper memory barriers on arm
-
-mips-specific bugs:
-- broken sysv ipc structures
-- multiple stack-related bugs in clone, leading to crashes in parent or child
-- overflow writing sigset_t in multithreaded set*id and setrlimit functions
-
-other improvements:
-- size and performance improvements to various math functions
-- wait.h as a compatibility alias for sys/wait.h
-- various header improvements
-- support for runtime-variable page size on archs that need it (mainly mips)
-
-
-
-0.9.15 release notes
-
-new features:
-- support for mixing IPv4 and v6 nameserver addresses in resolv.conf
-- RFC 3678 multicast structures/macros in netinet/in.h
-- putspent and fgetspent functions (shadow password API)
-- timef function (obsolete, removed in POSIX 2008)
-- fanotify syscalls (Linux-specific feature)
-- semtimedop syscall (Linux-specific sysvipc extension)
-- quotactl syscall and header (filesystem quotas support)
-- drem and finite functions (obsolete BSD functions)
-- getloadavg function (non-standard)
-- herror function (non-standard and obsolete)
-- libc.so now stores and prints its version information
-- expose constants for new Linux features including O_TMPFILE
-- implement FNM_LEADING_DIR option to fnmatch (GNU extension)
-- posix_close function (accepted for inclusion in next POSIX issue)
-
-bugs fixed:
-- buffer overflow in mbsrtowcs
-- clobbering of gr_name in getgrnam_r and getgrgid_r
-- execle ignoring the environment argument
-- setenv crash on malloc failure
-- out-of-bounds access in fnmatch with FNM_PATHNAME and certain patterns
-- failure of malloc to set errno when failing to extend heap
-- incorrect errno value from getcwd with zero size
-- spurious failure in faccessat with AT_EACCESS flag with suid/sgid programs
-- several fd leaks due to missing close-on-exec flag
-- misspellings/typos in macro names in several headers
-- incorrect failure return value in inet_pton
-- various numeric ip address parsing and validation fixes
-- namespace conformance issues in several headers
-- minor header issues
-- zombie processes left by faccessat with AT_EACCESS
-- timezone file parser failing/crashing on 64-bit archs
-- hang in localtime with near-overflowing time_t values on 64-bit archs
-- timezone path search was only trying first path
-- incorrect handling of excessive-length TZ environment strings
-- timezone file loading was wrongly enforcing O_NOFOLLOW/rejecting symlinks
-- iswspace was wrongly returning true for the null character
-- various bugs in wordexp
-- putgrent could write corrupt lines after write failures
-- dn_expand misinterpreted in-packet offsets greater than 255
-- spurious strftime/wcsftime failure on len+1==bufsize case
-- incorrect underflow flag in fma corner cases
-- log*(0) wrongly returned +inf in downward-rounding mode
-- failure of fchmod, fstat, fchdir, and fchown to produce EBADF
-
-arch-specific bugs fixed:
-- i386: failure of fesetround to set sse rounding mode
-- i386: floating point limit constants misinterpreted due to excess precision
-- powerpc: broken thread pointer access when compiled with clang
-- microblaze: dynamic linker entry point code possibly clobbering argv
-
-strict conformance issues:
-- NULL definition re-aligned with POSIX (requires (void *) cast)
-- alignment of math.h is* comparison functions with C11 annex F requirements
-
-
-
-1.0.0 release notes
-
-new features:
-- support for mips softfloat ABI variant
-- legacy setkey and encrypt API for DES
-- support for BSD version of struct tcphdr in addition to GNU version
-- added ipv6 and icmpv6 protocol lookups to getprotoent-family functions
-
-new experimental ports:
-- sh (SuperH)
-- x32 (ILP32 ABI for x86_64)
-
-compatibility:
-- improved c89 compiler support in math.h
-- eliminate some compiler warnings in public headers
-- added some missing things for LFS64 APIs
-- added fallback emulation of accept4 for older kernels
-
-bugs fixed:
-- buffer overflow in printf when printing smallest denormal exactly
-- rounding errors in printf in some just-over-halfway cases
-- posix_spawn did not accept null pid pointer (crashed)
-- ftello gave incorrect result for unflushed append-mode streams
-- mishandling of n=0 case in wcsxfrm (wild buffer overrun)
-- possible system breakage during libc upgrade due to install.sh bugs
-- nftw FTW_MOUNT flag prevented walking any directories at all
-- ptsname/ptsname_r returned negated error codes
-- getprotoent function returned junk after listing valid protocols
-- wrong error code from readdir when the directory has been deleted
-- various prototype/argument-type fixes, mostly to legacy functions
-- various header namespace violations
-
-arch-specific bugs fixed:
-- fesetenv(FE_DFL_ENV) was broken on i386 and x86_64
-- strerror(EDQUOT) did not work on mips
-- recvmsg/sendmsg were broken on powerpc
-- sysv ipc was broken on powerpc and mips
-- statfs/statvfs were broken on mips
-- sigaltstack was broken on mips
-
-
-
-1.1.0 release notes
-
-new features:
-- relro memory protection in dynamic linker
-- malloc can now extend heap with mmap if brk fails
-- vdso clock_gettime/gettimeofday/time acceleration on x86_64
-- thread/library-safe versions of search.h functions (nonstandard)
-- getauxval function (nonstandard)
-- sysconf extensions to query physical memory size
-
-bugs fixed:
-- floating point printf output corruption from carry into uninitialized slot
-- possible runaway carry overflow in printf floating point
-- printf %g failure to strip trailing zeros in some cases
-- search past end of haystack in memmem
-- off-by-one error in confstr return value
-- crashes in some near-empty static programs that use stack protector
-- deadlock race in pthread_once
-- non-working clock_gettime fallback for old kernels
-
-arch-specific bugs fixed:
-- crash from missing syscall asm register clobbers on real microblaze kernel
-- crash in all nontrivial dynamic linker use on microblaze
-- incorrect rlimit constants on mips
-- broken, possibly dangerous, use of getrlimit syscall on x32 in sysconf
-
-
-
-1.1.1 release notes
-
-new features:
-- new options --preload and --library-path to dynamic linker
-- public execvpe function (nonstandard extension)
-- iconv support for cp437 and cp850
-
-bugs fixed:
-- false negatives with some periodic needles in strstr, wcsstr, and memmem
-- crash on invalid zoneinfo files
-- incorrect zero-padding of some outputs for strftime %s specifier
-- misreporting of errors in configure script when $CC does not work at all
-- treating not-yet-implemented strptime specifiers as errors
-
-compatibility:
-- configure now detects serious constant-folding bug in gcc 4.9.0
-- removed __yield symbol (unused) that clashed with some compilers
-- improvements to sysconf's handling of unsupported/invalid arguments
-
-arch-specific bugs fixed:
-- misdetection of superh ABI variant by configure on gcc 3.x
-- missing SO_RCVBUFFORCE and SO_SNDBUFFORCE in mips socket.h
-- build regression on armv6 and later with -mthumb
-
-
-
-1.1.2 release notes
-
-new features:
-- multi-protocol matches (tcp and udp) in getaddrinfo
-- support for AI_V4MAPPED and AI_ALL flags to getaddrinfo
-- reverse name lookups from /etc/hosts
-- reverse service lookups from /etc/services
-- support for service aliases in /etc/services
-- ipsec and tunneling protocols to getprotoent-family functions
-- res_send, res_mkquery, res_querydomain, and dn_comp functions
-- ipv6 scope id handling for link-local scope addresses
-- previously-unimplemented %C and %y in strptime now work
-- vdso clock_gettime acceleration on i386 (new kernel feature)
-- better O_CLOEXEC/SOCK_CLOEXEC fallbacks for old kernels
-
-bugs fixed:
-- buffer overflow in dns response parsing (CVE-2014-3484)
-- possible infinite loop in dns response parsing
-- sendfile off_t 32/64-bit size mismatch
-- incorrect end pointer in some cases when wcsrtombs stops early
-- incorrect if_nametoindex return value when interface does not exist
-- dummy "ent" function aliases that possibly shadowed real ones
-- tmpfile fd leak on memory exhaustion
-- getaddrinfo returning EAI_NONAME for some transient failures
-
-arch-specific bugs fixed:
-- broken kernel side RLIM_INFINITY on mips
-- incorrect syscall argument 6/7 types for pselect on x32
-
-
-
-1.1.3 release notes
-
-new features:
-- address sorting in getaddrinfo, etc. modeled on rfc 3484/6724
-- default timezone taken from /etc/localtime when $TZ is unset
-- getopt double-colon extension for optional arguments
-- support for TLSDESC-based (gnu2) TLS dialect on i386 and x86_64
-- sendmmsg/recvmmsg (linux-specific)
-- fmtmsg (last mandatory XSI function that was missing)
-
-compatibility:
-- treat dns rcode=2 as temporary failure, not negative result
-- working thread-pointer for pre-2.6 kernels on i386
-- further ABI-compat symbols: __xmknod[at], __sysv_signal
-
-bugs fixed:
-- memmem false positives/false negatives/crashes from invalid logic
-- gethostby*_r not setting result pointer to null on failure
-- aliasing violations in syscall.h SYSLOG_NAMES feature
-- fanotify_mark syscall arguments wrong
-
-arch-specific bugs fixed:
-- various subtle relocation bugs in powerpc and sh dynamic linker
-
-
-
-1.1.4 release notes
-
-new features:
-- experimental locale support for LC_MESSAGES and LC_TIME
-- non-stub gettext family functions for message translation
-- or1k (OpenRISC 1000) port
-- syslog options LOG_CONS and LOG_PERROR
-- issetugid function (from OpenBSD)
-- improved if_nameindex and getifaddrs functions
-
-compatibility:
-- work around bug #61144 in gcc 4.9.0 and 4.9.1
-- support getauxval(AT_SECURE) even on kernels without AT_SECURE
-
-bugs fixed:
-- empty dynamic linker error messages (regression in 1.1.3)
-- if_nameindex omitted unconfigured and ipv6-only interfaces
-- incorrect return value for fwide function
-- failure of wide printf/scanf functions to set wide orientation
-- multiple issues in legacy function getpass
-- dynamic linker did not accept colon as a separator for LD_PRELOAD
-- errno clobber in syslog caused wrong output for %m specifier
-- crash in regexec for nonzero nmatch argument with REG_NOSUB
-- minor bugs in rarely-used nl_langinfo item lookups
-
-arch-specific bugs fixed:
-- broken relocations in mips dynamic linker (regression in 1.1.3)
-- register state corruption in setjmp asm for microblaze
-- broken struct stat st_ino field on microblaze
-- broken struct stat st_dev field on big endian mips
-- broken asm register constraints in atomics on powerpc
-- missing barriers in atomics on mips, powerpc, microblaze, and sh
-
-
-
-1.1.5 release notes
-
-new features:
-- full C11 coverage (threads, UTF-16/32 API, timespec_get, etc.)
-- malloc_usable_size function (nonstandard)
-- support for new F_OFD_* fcntl operations (linux 3.15, POSIX-future)
-- new _DEFAULT_SOURCE feature test macro to request default profile
-
-performance:
-- private-futex support
-- redesigned cond var implementation with major performance improvement
-- tweaked spinning in userspace before performing futex waits
-
-bugs fixed:
-- failure of dn_expand to null-terminate name for crafted DNS packets
-- corruption of cond var mutex state when switching mutexes
-- use of uninitialized memory with application-provided thread stacks
-- false ownership of orphaned mutexes due to tid reuse
-- possible failure-to-wake for robust mutexes on owner death
-- subtle errors in robust mutex unrecoverable status handling
-- missing memory/compiler barrier spinning to obtain locks
-- wrong behavior in various zero-length stdio operations
-- buffer overflow in swab with odd argument
-- incorrect sequence generation in the rand48 family of prng functions
-- missing cancellation check in non-wait paths of sem_wait, pthread_join
-- missing barrier in pthread_once fast path
-- memory leak in regexec when input contains illegal sequence
-- various parser bugs in regcomp
-- wrong return value on overflow in some strtoul-family functions
-- broken CPU_EQUAL macro in sched.h
-- dlerror not working in static-linked programs
-- mishandling of negative non-whole-hour TZ offsets
-- incorrect case mappings for U+00DF
-- namespace pollution via accidentally-non-static function named "dummy"
-- missing __fpclassifyl and __signbitl definitions for ld64 archs
-
-
-
-1.1.6 release notes
-
-new features:
-- getopt '-' flag for processing non-option arguments
-- getopt_long argument permutation extension
-- getopt_long abbreviated options
-- ns_parserr and related DNS-packet-parsing functions
-- fnmatch FNM_CASEFOLD extension
-- support for translation of getopt error messages
-- login_tty function (legacy)
-
-performance:
-- efficient atomics on armv7+ targets
-- pthread_once shrink-wrapping of fast path
-
-compatibility:
-- baseline arm binaries now work on new cpus/kernels without kuser_helper
-- dynamic linker now honors DT_RUNPATH without DT_RPATH (new binutils)
-- arm asm is now compatible with clang's internal assembler
-- suppress macro implementations of functions when headers are used in C++
-- increased message length limit for syslog
-
-bugs fixed:
-- open ignored file creation mode argument for O_TMPFILE
-- wrong printf formatting for %#.0o with value zero
-- missing private state for uchar.h functions (null ps pointer)
-- sched_getaffinity left uninitialized data in output bit array
-- wrong return values for pthread_getaffinity_np and pthread_setaffinity_np
-- buggy handling of multibyte option chars with arguments in getopt
-- printf failed to report or stop on write errors
-- printf failed to honor '+' modifier when printing NANs
-- wcsnrtombs returned the wrong value in one code path
-- syslog failed to check for connect error
-- multi-threaded set*id() had spurious failures from ugly workaround code
-- various minor header conformance bugs (signedness, constant expressions, ...)
-
-arch-specific bugs fixed:
-- on or1k, some syscalls with 64-bit arguments were broken (misaligned)
-- usage of sahf instruction on x86_64 crashed on some early cpu models
-
-
-
-1.1.7 release notes
-
-new features:
-- alternate passwd/group backend support via nscd protocol
-- masked cancellation mode extension (experimental)
-- aio cancellation
-- aarch64 port (experimental)
-
-performance:
-- significant memset asm optimizations on i386 and x86_64
-
-compatibility:
-- suppress EINTR in semaphores for old kernels where futex restart is broken
-- always set optarg in getopt_long
-- support SOCK_RAW socket type in getaddrinfo
-- report success instead of EINPROGRESS when close is interrupted
-
-bugs fixed:
-- multithreaded set*id() was not async-signal safe, had various race bugs
-- getspnam_r returned results for partial username matches
-- wordexp bad character checker mis-counted parentheses
-- close on fd with pending aio could lead to file corruption
-- old aio implementation had numerous conformance bugs
-- malloc init code could deadlock due to race condition
-- pthread_exit did not disable cancellation
-- pthread_cond_wait could wrongly consume signal on cancellation
-- execvp wrongly stopped path search on EACCESS
-- fsync, fdatasync, and msync were not honored as cancellation points
-- fchmodat was subject to fd leak race (missing O_CLOEXEC)
-- fchmodat failed to report EOPNOTSUPP in race path
-- passwd/group lookup functions had various minor error-reporting bugs
-- isatty had false-positives/device-state-corruption for OSS sound devices
-- configure script failed to detect gcc with translated messages
-- FLT_ROUNDS macro failed to reflect rounding mode changes in fenv
-
-arch-specific bugs fixed:
-- mips fesetenv did not handle FE_DFL_ENV
-- mips POLLWRNORM and POLLWRBAND macros had wrong values
-- x32 pthread synchronization object type definitions were wrong
-- powerpc minimum signal stack size was insufficient
-
-
-
-1.1.8 release notes
-
-bugs fixed:
-- stack-based buffer overflow in inet_pton (CVE-2015-1817)
-- regcomp crash/mem-corruption with illegal bytes after backslash
-- regcomp wrongly allowed backrefs in ER
-- regcomp miscompiled character class brace-repetitions
-- regcomp wrongly processed \0 as an unmatchable backref
-- new FLT_ROUNDS definition failed to work in C++ code
-
-arch-specific bugs fixed:
-- aarch64 was missing max_align_t definition
-
-
-
-1.1.9 release notes
-
-new features:
-- ability to protect libc code itself with stack protector
-- sigsetjmp now restores signal mask after restoring context, not before
-- thread-local dlerror status/messages
-- dlerror messages are no longer truncated
-- diagnostics for constraint violations with ctype.h macros
-
-optimizations:
-- reduce cost of PIC on archs where PLT calls need a fixed GOT register
-- spin locks no longer constantly invalidate cache lines while spinning
-- code size reduction in static-linked TLS init
-
-bugs fixed:
-- failure to process robust mutexes on detached-thread exit
-- possible memory corruption due to robust mutex list on detached-thread exit
-- crash on memory exhaustion in getgr* internals
-- misaligned memory accesses in static binaries with low-alignment TLS blocks
-- multiple cases of wrongful path search continuation after transient failure
-- small memory leak on failure of dlopen with RPATH $ORIGIN
-- several small math bugs related to exception flags with non-finite args
-- mmap leak in sem_open failure path for link call
-- duplocale clobbered new locale struct with memcpy of old
-- futimes crashed with null timeval argument
-
-arch-specific bugs fixed:
-- stack protector spuriously aborted after forking on x32
-- stack protector spuriously aborted with flockfile on powerpc
-- theoretically-possible clobbering of syscall return value on mips
-- random thread-pointer setup failure on sh (uninitialized return value)
-- possible crash in dlsym on sh due to incorrectly-computed branch target
-- broken fesetenv(FE_DFL_ENV) on mips
-- dynamic linker name for sh ignored fpu/nofpu and endianness
-- various minor aarch64 bugs
-- dangling pointers in x32 syscall timespec fixup code
-
-
-
-1.1.10 release notes
-
-new features:
-- fail-safe (allocation-free) C locale for newlocale to return
-- all locale categories track requested locale name
-- rcrt1.o start file for static PIE
-
-optimizations:
-- inline atomics for sh4a
-- removed heavy atomics from locale-related code paths
-- removed global data accesses from CURRENT_LOCALE macro & callers
-- dynamic linker stage 1 size reduction
-
-compatibility:
-- better configure detection of unsupported compiler options
-- support for more relocation types in libc.so, not currently used
-- iconv_open accepts "" and "CHAR" as aliases for native (UTF-8)
-- additional LFS64 macros in sys/resource.h
-
-regressions fixed:
-- dynamic linker crash on NONE-type relocations (only mips affected)
-- inability to build as thumb2 on arm
-- failure to run under qemu-i386 user-level emulation
-- inability to access globals from libc on powerpc
-- PIE link errors in Scrt1.o under unusual usage on some archs
-
-other bugs fixed:
-- failure of ungetc/ungetwc to work on FILE streams in EOF state
-- possible null pointer dereference in gettext
-- possible initial stack misalignment on mips with PIE
-
-
-
-1.1.11 release notes
-
-new features:
-- byte-based C locale
-- vdso clock_gettime on arm
-- musl-clang wrapper
-- sh2 nommu target support
-
-performance:
-- major speed-up for dynamic linker symbol lookups with GNU hash
-
-compatibility:
-- strverscmp now matches GNU behavior in corner cases
-- empty TZ environment variable gives GMT rather than system default
-- reconnection on syslog server socket loss (syslogd restart)
-- mmap fallback in simple_malloc when brk fails
-- support for %m and %s with null pointers in wide printf variants
-- call frame information in i386 asm for improved debugger support
-
-bugs fixed:
-- spurious errors from pwd/grp functions when nscd backend is absent
-- possible invalid access on calloc with simple_malloc
-- null pointer dereferences after calling uselocale((locale_t)0)
-- erroneous support for cancellation in stdio caused data loss
-- inconsistent handling of atexit called from atexit handler
-- missing locking in error paths for ungetwc
-- btowc mishandling of out-of-range non-EOF inputs
-- negated return value of ns_skiprr, failure in related functions
-- incorrect void return type for syncfs, missing error status
-- possible failure of tempnam due to missing null termination
-- negated tm_gmtoff field in struct tm
-- off-by-one error in getsubopt leaving equals sign in value result
-
-arch-specific bugs fixed:
-- soft deadlocks on i386/x86_64 due to missing barrier in internal locks
-- regression in arm pre-v7 support for kernels with kuser helper removed
-- runaway PC on mips detached thread exit (due to kernel regression)
-- mismatched ABI for local-dynamic model TLS on mips and powerpc
-- incorrect value of some SO_* constants on mips
-- broken 64-bit syscall argument passing on aarch64
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/atomic.h
deleted file mode 100644
index e7c82c2e26..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/atomic.h
+++ /dev/null
@@ -1,206 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_64(uint64_t x)
-{
-	__asm__(
-		"	rbit %0, %1\n"
-		"	clz %0, %0\n"
-		: "=r"(x) : "r"(x));
-	return x;
-}
-
-static inline int a_ctz_l(unsigned long x)
-{
-	return a_ctz_64(x);
-}
-
-static inline void a_barrier()
-{
-	__asm__ __volatile__("dmb ish");
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	void *old;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %0,%3\n"
-		"	cmp %0,%1\n"
-		"	b.ne 1f\n"
-		"	stxr %w0,%2,%3\n"
-		"	cbnz %w0,1b\n"
-		"	mov %0,%1\n"
-		"1:	dmb ish\n"
-		: "=&r"(old)
-		: "r"(t), "r"(s), "Q"(*(long*)p)
-		: "memory", "cc");
-	return old;
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	int old;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %w0,%3\n"
-		"	cmp %w0,%w1\n"
-		"	b.ne 1f\n"
-		"	stxr %w0,%w2,%3\n"
-		"	cbnz %w0,1b\n"
-		"	mov %w0,%w1\n"
-		"1:	dmb ish\n"
-		: "=&r"(old)
-		: "r"(t), "r"(s), "Q"(*p)
-		: "memory", "cc");
-	return old;
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	int old, tmp;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %w0,%3\n"
-		"	stxr %w1,%w2,%3\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(old), "=&r"(tmp)
-		: "r"(v), "Q"(*x)
-		: "memory", "cc" );
-	return old;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	int old, tmp;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %w0,%3\n"
-		"	add %w0,%w0,%w2\n"
-		"	stxr %w1,%w0,%3\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(old), "=&r"(tmp)
-		: "r"(v), "Q"(*x)
-		: "memory", "cc" );
-	return old-v;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %w0,%2\n"
-		"	add %w0,%w0,#1\n"
-		"	stxr %w1,%w0,%2\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "Q"(*x)
-		: "memory", "cc" );
-}
-
-static inline void a_dec(volatile int *x)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %w0,%2\n"
-		"	sub %w0,%w0,#1\n"
-		"	stxr %w1,%w0,%2\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "Q"(*x)
-		: "memory", "cc" );
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %0,%3\n"
-		"	and %0,%0,%2\n"
-		"	stxr %w1,%0,%3\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "r"(v), "Q"(*p)
-		: "memory", "cc" );
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %w0,%3\n"
-		"	and %w0,%w0,%w2\n"
-		"	stxr %w1,%w0,%3\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "r"(v), "Q"(*p)
-		: "memory", "cc" );
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %0,%3\n"
-		"	orr %0,%0,%2\n"
-		"	stxr %w1,%0,%3\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "r"(v), "Q"(*p)
-		: "memory", "cc" );
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	return a_or_64(p, v);
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldxr %w0,%3\n"
-		"	orr %w0,%w0,%w2\n"
-		"	stxr %w1,%w0,%3\n"
-		"	cbnz %w1,1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "r"(v), "Q"(*p)
-		: "memory", "cc" );
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"	str %w1,%0\n"
-		"	dmb ish\n"
-		: "=m"(*p)
-		: "r"(x)
-		: "memory", "cc" );
-}
-
-#define a_spin a_barrier
-
-static inline void a_crash()
-{
-	*(volatile char *)0=0;
-}
-
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/alltypes.h.in
deleted file mode 100644
index d56abdac96..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/alltypes.h.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#define _Addr long
-#define _Int64 long
-#define _Reg long
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF unsigned wchar_t;
-#endif
-TYPEDEF unsigned wint_t;
-
-TYPEDEF int blksize_t;
-TYPEDEF unsigned int nlink_t;
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/endian.h
deleted file mode 100644
index 7a74d2febc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/endian.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#if __AARCH64EB__
-#define __BYTE_ORDER __BIG_ENDIAN
-#else
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/ioctl.h
deleted file mode 100644
index 0345077fee..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/ioctl.h
+++ /dev/null
@@ -1,213 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGRS485      0x542E
-#define TIOCSRS485      0x542F
-#define TIOCGPTN        _IOR('T', 0x30, unsigned int)
-#define TIOCSPTLCK      _IOW('T', 0x31, int)
-#define TIOCGDEV        _IOR('T', 0x32, unsigned int)
-#define TCGETX		0x5432
-#define TCSETX		0x5433
-#define TCSETXF		0x5434
-#define TCSETXW		0x5435
-#define TIOCSIG         0x40045436
-#define TIOCVHANGUP     0x5437
-#define TIOCGPKT        0x80045438
-#define TIOCGPTLCK      0x80045439
-#define TIOCGEXCL       0x80045440
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR   0x5459
-#define TIOCSERGETMULTI 0x545A
-#define TIOCSERSETMULTI 0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-#define FIOQSIZE	0x5460
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-#define N_GIGASET_M101  16
-#define N_SLCAN         17
-#define N_PPS           18
-#define N_V253          19
-#define N_CAIF          20
-#define N_GSM0710       21
-#define N_TI_WL         22
-#define N_TRACESINK     23
-#define N_TRACEROUTER   24
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-#define SIOCGSTAMPNS	0x8907
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE		0x89F0
-#define SIOCPROTOPRIVATE	0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/ipc.h
deleted file mode 100644
index 9a47bc7a78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/ipc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	unsigned short __ipc_perm_seq;
-
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/limits.h
deleted file mode 100644
index 0226588c3d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/limits.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define LONG_BIT 64
-#endif
-
-#define LONG_MAX  0x7fffffffffffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/mman.h
deleted file mode 100644
index ce5519f274..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/mman.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define PROT_GROWSDOWN  0x01000000
-#define PROT_GROWSUP    0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/msg.h
deleted file mode 100644
index 0135a08dc1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/msg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	time_t msg_rtime;
-	time_t msg_ctime;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/sem.h
deleted file mode 100644
index e46ced95d2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/sem.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t sem_ctime;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/shm.h
deleted file mode 100644
index 4c3c9fb75d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/shm.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	time_t shm_dtime;
-	time_t shm_ctime;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/signal.h
deleted file mode 100644
index ef07cc9f0c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/signal.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 6144
-#define SIGSTKSZ 12288
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-typedef unsigned long greg_t;
-typedef unsigned long gregset_t[34];
-
-typedef struct {
-	long double vregs[32];
-	unsigned int fpsr;
-	unsigned int fpcr;
-} fpregset_t;
-typedef struct sigcontext
-{
-	unsigned long fault_address;
-	unsigned long regs[31];
-	unsigned long sp, pc, pstate;
-	long double __reserved[256];
-} mcontext_t;
-
-#define FPSIMD_MAGIC 0x46508001
-#define ESR_MAGIC 0x45535201
-struct _aarch64_ctx {
-	unsigned int magic;
-	unsigned int size;
-};
-struct fpsimd_context {
-	struct _aarch64_ctx head;
-	unsigned int fpsr;
-	unsigned int fpcr;
-	long double vregs[32];
-};
-struct esr_context {
-	struct _aarch64_ctx head;
-	unsigned long esr;
-};
-#else
-typedef struct {
-	long double __regs[18+256];
-} mcontext_t;
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct ucontext *uc_link;
-	stack_t uc_stack;
-	sigset_t uc_sigmask;
-	mcontext_t uc_mcontext;
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  2
-#define SA_SIGINFO    4
-#define SA_ONSTACK    0x08000000
-#define SA_RESTART    0x10000000
-#define SA_NODEFER    0x40000000
-#define SA_RESETHAND  0x80000000
-#define SA_RESTORER   0x04000000
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGBUS    7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGUSR1   10
-#define SIGSEGV   11
-#define SIGUSR2   12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGSTKFLT 16
-#define SIGCHLD   17
-#define SIGCONT   18
-#define SIGSTOP   19
-#define SIGTSTP   20
-#define SIGTTIN   21
-#define SIGTTOU   22
-#define SIGURG    23
-#define SIGXCPU   24
-#define SIGXFSZ   25
-#define SIGVTALRM 26
-#define SIGPROF   27
-#define SIGWINCH  28
-#define SIGIO     29
-#define SIGPOLL   29
-#define SIGPWR    30
-#define SIGSYS    31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/socket.h
deleted file mode 100644
index b3fe643ad8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/socket.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <endian.h>
-
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-#if __BYTE_ORDER == __BIG_ENDIAN
-	int __pad1, msg_iovlen;
-#else
-	int msg_iovlen, __pad1;
-#endif
-	void *msg_control;
-#if __BYTE_ORDER == __BIG_ENDIAN
-	int __pad2;
-	socklen_t msg_controllen;
-#else
-	socklen_t msg_controllen;
-	int __pad2;
-#endif
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-#if __BYTE_ORDER == __BIG_ENDIAN
-	int __pad1;
-	socklen_t cmsg_len;
-#else
-	socklen_t cmsg_len;
-	int __pad1;
-#endif
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/syscall.h
deleted file mode 100644
index d7a1420aaf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/syscall.h
+++ /dev/null
@@ -1,535 +0,0 @@
-#define __NR_io_setup 0
-#define __NR_io_destroy 1
-#define __NR_io_submit 2
-#define __NR_io_cancel 3
-#define __NR_io_getevents 4
-#define __NR_setxattr 5
-#define __NR_lsetxattr 6
-#define __NR_fsetxattr 7
-#define __NR_getxattr 8
-#define __NR_lgetxattr 9
-#define __NR_fgetxattr 10
-#define __NR_listxattr 11
-#define __NR_llistxattr 12
-#define __NR_flistxattr 13
-#define __NR_removexattr 14
-#define __NR_lremovexattr 15
-#define __NR_fremovexattr 16
-#define __NR_getcwd 17
-#define __NR_lookup_dcookie 18
-#define __NR_eventfd2 19
-#define __NR_epoll_create1 20
-#define __NR_epoll_ctl 21
-#define __NR_epoll_pwait 22
-#define __NR_dup 23
-#define __NR_dup3 24
-#define __NR_fcntl 25
-#define __NR_inotify_init1 26
-#define __NR_inotify_add_watch 27
-#define __NR_inotify_rm_watch 28
-#define __NR_ioctl 29
-#define __NR_ioprio_set 30
-#define __NR_ioprio_get 31
-#define __NR_flock 32
-#define __NR_mknodat 33
-#define __NR_mkdirat 34
-#define __NR_unlinkat 35
-#define __NR_symlinkat 36
-#define __NR_linkat 37
-#define __NR_renameat 38
-#define __NR_umount2 39
-#define __NR_mount 40
-#define __NR_pivot_root 41
-#define __NR_nfsservctl 42
-#define __NR_statfs 43
-#define __NR_fstatfs 44
-#define __NR_truncate 45
-#define __NR_ftruncate 46
-#define __NR_fallocate 47
-#define __NR_faccessat 48
-#define __NR_chdir 49
-#define __NR_fchdir 50
-#define __NR_chroot 51
-#define __NR_fchmod 52
-#define __NR_fchmodat 53
-#define __NR_fchownat 54
-#define __NR_fchown 55
-#define __NR_openat 56
-#define __NR_close 57
-#define __NR_vhangup 58
-#define __NR_pipe2 59
-#define __NR_quotactl 60
-#define __NR_getdents64 61
-#define __NR_lseek 62
-#define __NR_read 63
-#define __NR_write 64
-#define __NR_readv 65
-#define __NR_writev 66
-#define __NR_pread64 67
-#define __NR_pwrite64 68
-#define __NR_preadv 69
-#define __NR_pwritev 70
-#define __NR_sendfile 71
-#define __NR_pselect6 72
-#define __NR_ppoll 73
-#define __NR_signalfd4 74
-#define __NR_vmsplice 75
-#define __NR_splice 76
-#define __NR_tee 77
-#define __NR_readlinkat 78
-#define __NR_fstatat 79
-#define __NR_fstat 80
-#define __NR_sync 81
-#define __NR_fsync 82
-#define __NR_fdatasync 83
-#define __NR_sync_file_range 84
-#define __NR_timerfd_create 85
-#define __NR_timerfd_settime 86
-#define __NR_timerfd_gettime 87
-#define __NR_utimensat 88
-#define __NR_acct 89
-#define __NR_capget 90
-#define __NR_capset 91
-#define __NR_personality 92
-#define __NR_exit 93
-#define __NR_exit_group 94
-#define __NR_waitid 95
-#define __NR_set_tid_address 96
-#define __NR_unshare 97
-#define __NR_futex 98
-#define __NR_set_robust_list 99
-#define __NR_get_robust_list 100
-#define __NR_nanosleep 101
-#define __NR_getitimer 102
-#define __NR_setitimer 103
-#define __NR_kexec_load 104
-#define __NR_init_module 105
-#define __NR_delete_module 106
-#define __NR_timer_create 107
-#define __NR_timer_gettime 108
-#define __NR_timer_getoverrun 109
-#define __NR_timer_settime 110
-#define __NR_timer_delete 111
-#define __NR_clock_settime 112
-#define __NR_clock_gettime 113
-#define __NR_clock_getres 114
-#define __NR_clock_nanosleep 115
-#define __NR_syslog 116
-#define __NR_ptrace 117
-#define __NR_sched_setparam 118
-#define __NR_sched_setscheduler 119
-#define __NR_sched_getscheduler 120
-#define __NR_sched_getparam 121
-#define __NR_sched_setaffinity 122
-#define __NR_sched_getaffinity 123
-#define __NR_sched_yield 124
-#define __NR_sched_get_priority_max 125
-#define __NR_sched_get_priority_min 126
-#define __NR_sched_rr_get_interval 127
-#define __NR_restart_syscall 128
-#define __NR_kill 129
-#define __NR_tkill 130
-#define __NR_tgkill 131
-#define __NR_sigaltstack 132
-#define __NR_rt_sigsuspend 133
-#define __NR_rt_sigaction 134
-#define __NR_rt_sigprocmask 135
-#define __NR_rt_sigpending 136
-#define __NR_rt_sigtimedwait 137
-#define __NR_rt_sigqueueinfo 138
-#define __NR_rt_sigreturn 139
-#define __NR_setpriority 140
-#define __NR_getpriority 141
-#define __NR_reboot 142
-#define __NR_setregid 143
-#define __NR_setgid 144
-#define __NR_setreuid 145
-#define __NR_setuid 146
-#define __NR_setresuid 147
-#define __NR_getresuid 148
-#define __NR_setresgid 149
-#define __NR_getresgid 150
-#define __NR_setfsuid 151
-#define __NR_setfsgid 152
-#define __NR_times 153
-#define __NR_setpgid 154
-#define __NR_getpgid 155
-#define __NR_getsid 156
-#define __NR_setsid 157
-#define __NR_getgroups 158
-#define __NR_setgroups 159
-#define __NR_uname 160
-#define __NR_sethostname 161
-#define __NR_setdomainname 162
-#define __NR_getrlimit 163
-#define __NR_setrlimit 164
-#define __NR_getrusage 165
-#define __NR_umask 166
-#define __NR_prctl 167
-#define __NR_getcpu 168
-#define __NR_gettimeofday 169
-#define __NR_settimeofday 170
-#define __NR_adjtimex 171
-#define __NR_getpid 172
-#define __NR_getppid 173
-#define __NR_getuid 174
-#define __NR_geteuid 175
-#define __NR_getgid 176
-#define __NR_getegid 177
-#define __NR_gettid 178
-#define __NR_sysinfo 179
-#define __NR_mq_open 180
-#define __NR_mq_unlink 181
-#define __NR_mq_timedsend 182
-#define __NR_mq_timedreceive 183
-#define __NR_mq_notify 184
-#define __NR_mq_getsetattr 185
-#define __NR_msgget 186
-#define __NR_msgctl 187
-#define __NR_msgrcv 188
-#define __NR_msgsnd 189
-#define __NR_semget 190
-#define __NR_semctl 191
-#define __NR_semtimedop 192
-#define __NR_semop 193
-#define __NR_shmget 194
-#define __NR_shmctl 195
-#define __NR_shmat 196
-#define __NR_shmdt 197
-#define __NR_socket 198
-#define __NR_socketpair 199
-#define __NR_bind 200
-#define __NR_listen 201
-#define __NR_accept 202
-#define __NR_connect 203
-#define __NR_getsockname 204
-#define __NR_getpeername 205
-#define __NR_sendto 206
-#define __NR_recvfrom 207
-#define __NR_setsockopt 208
-#define __NR_getsockopt 209
-#define __NR_shutdown 210
-#define __NR_sendmsg 211
-#define __NR_recvmsg 212
-#define __NR_readahead 213
-#define __NR_brk 214
-#define __NR_munmap 215
-#define __NR_mremap 216
-#define __NR_add_key 217
-#define __NR_request_key 218
-#define __NR_keyctl 219
-#define __NR_clone 220
-#define __NR_execve 221
-#define __NR_mmap 222
-#define __NR_fadvise64 223
-#define __NR_swapon 224
-#define __NR_swapoff 225
-#define __NR_mprotect 226
-#define __NR_msync 227
-#define __NR_mlock 228
-#define __NR_munlock 229
-#define __NR_mlockall 230
-#define __NR_munlockall 231
-#define __NR_mincore 232
-#define __NR_madvise 233
-#define __NR_remap_file_pages 234
-#define __NR_mbind 235
-#define __NR_get_mempolicy 236
-#define __NR_set_mempolicy 237
-#define __NR_migrate_pages 238
-#define __NR_move_pages 239
-#define __NR_rt_tgsigqueueinfo 240
-#define __NR_perf_event_open 241
-#define __NR_accept4 242
-#define __NR_recvmmsg 243
-#define __NR_or1k_atomic 244
-#define __NR_wait4 260
-#define __NR_prlimit64 261
-#define __NR_fanotify_init 262
-#define __NR_fanotify_mark 263
-#define __NR_name_to_handle_at 264
-#define __NR_open_by_handle_at 265
-#define __NR_clock_adjtime 266
-#define __NR_syncfs 267
-#define __NR_setns 268
-#define __NR_sendmmsg 269
-#define __NR_process_vm_readv 270
-#define __NR_process_vm_writev 271
-#define __NR_kcmp 272
-#define __NR_finit_module 273
-#define __NR_sched_setattr 274
-#define __NR_sched_getattr 275
-#define __NR_renameat2 276
-#define __NR_seccomp 277
-#define __NR_getrandom 278
-#define __NR_memfd_create 279
-#define __NR_bpf 280
-#define __NR_execveat 281
-
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_submit __NR_io_submit
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_setxattr __NR_setxattr
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_getxattr __NR_getxattr
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_removexattr __NR_removexattr
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_getcwd __NR_getcwd
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_dup __NR_dup
-#define SYS_dup3 __NR_dup3
-#define SYS_fcntl __NR_fcntl
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_ioctl __NR_ioctl
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_flock __NR_flock
-#define SYS_mknodat __NR_mknodat
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_linkat __NR_linkat
-#define SYS_renameat __NR_renameat
-#define SYS_umount2 __NR_umount2
-#define SYS_mount __NR_mount
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_nfsservctl __NR_nfsservctl
-#define SYS_statfs __NR_statfs
-#define SYS_fstatfs __NR_fstatfs
-#define SYS_truncate __NR_truncate
-#define SYS_ftruncate __NR_ftruncate
-#define SYS_fallocate __NR_fallocate
-#define SYS_faccessat __NR_faccessat
-#define SYS_chdir __NR_chdir
-#define SYS_fchdir __NR_fchdir
-#define SYS_chroot __NR_chroot
-#define SYS_fchmod __NR_fchmod
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_fchownat __NR_fchownat
-#define SYS_fchown __NR_fchown
-#define SYS_openat __NR_openat
-#define SYS_close __NR_close
-#define SYS_vhangup __NR_vhangup
-#define SYS_pipe2 __NR_pipe2
-#define SYS_quotactl __NR_quotactl
-#define SYS_getdents64 __NR_getdents64
-#define SYS_lseek __NR_lseek
-#define SYS_read __NR_read
-#define SYS_write __NR_write
-#define SYS_readv __NR_readv
-#define SYS_writev __NR_writev
-#define SYS_pread64 __NR_pread64
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_preadv __NR_preadv
-#define SYS_pwritev __NR_pwritev
-#define SYS_sendfile __NR_sendfile
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ppoll __NR_ppoll
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_splice __NR_splice
-#define SYS_tee __NR_tee
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_fstatat __NR_fstatat
-#define SYS_fstat __NR_fstat
-#define SYS_sync __NR_sync
-#define SYS_fsync __NR_fsync
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_sync_file_range __NR_sync_file_range
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_utimensat __NR_utimensat
-#define SYS_acct __NR_acct
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_personality __NR_personality
-#define SYS_exit __NR_exit
-#define SYS_exit_group __NR_exit_group
-#define SYS_waitid __NR_waitid
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_unshare __NR_unshare
-#define SYS_futex __NR_futex
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_getitimer __NR_getitimer
-#define SYS_setitimer __NR_setitimer
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_init_module __NR_init_module
-#define SYS_delete_module __NR_delete_module
-#define SYS_timer_create __NR_timer_create
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_syslog __NR_syslog
-#define SYS_ptrace __NR_ptrace
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_kill __NR_kill
-#define SYS_tkill __NR_tkill
-#define SYS_tgkill __NR_tgkill
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_setpriority __NR_setpriority
-#define SYS_getpriority __NR_getpriority
-#define SYS_reboot __NR_reboot
-#define SYS_setregid __NR_setregid
-#define SYS_setgid __NR_setgid
-#define SYS_setreuid __NR_setreuid
-#define SYS_setuid __NR_setuid
-#define SYS_setresuid __NR_setresuid
-#define SYS_getresuid __NR_getresuid
-#define SYS_setresgid __NR_setresgid
-#define SYS_getresgid __NR_getresgid
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_times __NR_times
-#define SYS_setpgid __NR_setpgid
-#define SYS_getpgid __NR_getpgid
-#define SYS_getsid __NR_getsid
-#define SYS_setsid __NR_setsid
-#define SYS_getgroups __NR_getgroups
-#define SYS_setgroups __NR_setgroups
-#define SYS_uname __NR_uname
-#define SYS_sethostname __NR_sethostname
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_getrlimit __NR_getrlimit
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_getrusage __NR_getrusage
-#define SYS_umask __NR_umask
-#define SYS_prctl __NR_prctl
-#define SYS_getcpu __NR_getcpu
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_getpid __NR_getpid
-#define SYS_getppid __NR_getppid
-#define SYS_getuid __NR_getuid
-#define SYS_geteuid __NR_geteuid
-#define SYS_getgid __NR_getgid
-#define SYS_getegid __NR_getegid
-#define SYS_gettid __NR_gettid
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_msgget __NR_msgget
-#define SYS_msgctl __NR_msgctl
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_semget __NR_semget
-#define SYS_semctl __NR_semctl
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_semop __NR_semop
-#define SYS_shmget __NR_shmget
-#define SYS_shmctl __NR_shmctl
-#define SYS_shmat __NR_shmat
-#define SYS_shmdt __NR_shmdt
-#define SYS_socket __NR_socket
-#define SYS_socketpair __NR_socketpair
-#define SYS_bind __NR_bind
-#define SYS_listen __NR_listen
-#define SYS_accept __NR_accept
-#define SYS_connect __NR_connect
-#define SYS_getsockname __NR_getsockname
-#define SYS_getpeername __NR_getpeername
-#define SYS_sendto __NR_sendto
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_shutdown __NR_shutdown
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_readahead __NR_readahead
-#define SYS_brk __NR_brk
-#define SYS_munmap __NR_munmap
-#define SYS_mremap __NR_mremap
-#define SYS_add_key __NR_add_key
-#define SYS_request_key __NR_request_key
-#define SYS_keyctl __NR_keyctl
-#define SYS_clone __NR_clone
-#define SYS_execve __NR_execve
-#define SYS_mmap __NR_mmap
-#define SYS_fadvise64 __NR_fadvise64
-#define SYS_swapon __NR_swapon
-#define SYS_swapoff __NR_swapoff
-#define SYS_mprotect __NR_mprotect
-#define SYS_msync __NR_msync
-#define SYS_mlock __NR_mlock
-#define SYS_munlock __NR_munlock
-#define SYS_mlockall __NR_mlockall
-#define SYS_munlockall __NR_munlockall
-#define SYS_mincore __NR_mincore
-#define SYS_madvise __NR_madvise
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_mbind __NR_mbind
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_migrate_pages __NR_migrate_pages
-#define SYS_move_pages __NR_move_pages
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_accept4 __NR_accept4
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_or1k_atomic __NR_or1k_atomic
-#define SYS_wait4 __NR_wait4
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_syncfs __NR_syncfs
-#define SYS_setns __NR_setns
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_kcmp __NR_kcmp
-#define SYS_finit_module __NR_finit_module
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_renameat2 __NR_renameat2
-#define SYS_seccomp __NR_seccomp
-#define SYS_getrandom __NR_getrandom
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_bpf __NR_bpf
-#define SYS_execveat __NR_execveat
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/termios.h
deleted file mode 100644
index 9265d6fcd4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/termios.h
+++ /dev/null
@@ -1,160 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define XTABS  0014000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define CRTSCTS  020000000000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-/* Extensions? */
-#define CBAUDEX 0010000
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-#define EXTPROC 0200000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/pthread_arch.h
deleted file mode 100644
index 74276f4c61..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/pthread_arch.h
+++ /dev/null
@@ -1,11 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-	char *self;
-	__asm__ __volatile__ ("mrs %0,tpidr_el0" : "=r"(self));
-	return (void*)(self + 16 - sizeof(struct pthread));
-}
-
-#define TLS_ABOVE_TP
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 16)
-
-#define CANCEL_REG_IP 33
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/reloc.h
deleted file mode 100644
index 51b66e2385..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/reloc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <endian.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define ENDIAN_SUFFIX "_be"
-#else
-#define ENDIAN_SUFFIX ""
-#endif
-
-#define LDSO_ARCH "aarch64" ENDIAN_SUFFIX
-
-#define NO_LEGACY_INITFINI
-
-#define TPOFF_K 16
-
-#define REL_SYMBOLIC    R_AARCH64_ABS64
-#define REL_GOT         R_AARCH64_GLOB_DAT
-#define REL_PLT         R_AARCH64_JUMP_SLOT
-#define REL_RELATIVE    R_AARCH64_RELATIVE
-#define REL_COPY        R_AARCH64_COPY
-#define REL_DTPMOD      R_AARCH64_TLS_DTPMOD64
-#define REL_DTPOFF      R_AARCH64_TLS_DTPREL64
-#define REL_TPOFF       R_AARCH64_TLS_TPREL64
-#define REL_TLSDESC     R_AARCH64_TLSDESC
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"mov sp,%1 ; br %0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/aarch64/syscall_arch.h
deleted file mode 100644
index 25f5ce670f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/aarch64/syscall_arch.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#define __SYSCALL_LL_E(x) (x)
-#define __SYSCALL_LL_O(x) (x)
-
-#define __asm_syscall(...) do { \
-	__asm__ __volatile__ ( "svc 0" \
-	: "=r"(x0) : __VA_ARGS__ : "memory", "cc"); \
-	return x0; \
-	} while (0)
-
-static inline long __syscall0(long n)
-{
-	register long x8 __asm__("x8") = n;
-	register long x0 __asm__("x0");
-	__asm_syscall("r"(x8));
-}
-
-static inline long __syscall1(long n, long a)
-{
-	register long x8 __asm__("x8") = n;
-	register long x0 __asm__("x0") = a;
-	__asm_syscall("r"(x8), "0"(x0));
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-	register long x8 __asm__("x8") = n;
-	register long x0 __asm__("x0") = a;
-	register long x1 __asm__("x1") = b;
-	__asm_syscall("r"(x8), "0"(x0), "r"(x1));
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-	register long x8 __asm__("x8") = n;
-	register long x0 __asm__("x0") = a;
-	register long x1 __asm__("x1") = b;
-	register long x2 __asm__("x2") = c;
-	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2));
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-	register long x8 __asm__("x8") = n;
-	register long x0 __asm__("x0") = a;
-	register long x1 __asm__("x1") = b;
-	register long x2 __asm__("x2") = c;
-	register long x3 __asm__("x3") = d;
-	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3));
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
-	register long x8 __asm__("x8") = n;
-	register long x0 __asm__("x0") = a;
-	register long x1 __asm__("x1") = b;
-	register long x2 __asm__("x2") = c;
-	register long x3 __asm__("x3") = d;
-	register long x4 __asm__("x4") = e;
-	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4));
-}
-
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
-	register long x8 __asm__("x8") = n;
-	register long x0 __asm__("x0") = a;
-	register long x1 __asm__("x1") = b;
-	register long x2 __asm__("x2") = c;
-	register long x3 __asm__("x3") = d;
-	register long x4 __asm__("x4") = e;
-	register long x5 __asm__("x5") = f;
-	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5));
-}
-
-#define VDSO_USEFUL
-#define VDSO_CGT_SYM "__kernel_clock_gettime"
-#define VDSO_CGT_VER "LINUX_2.6.39"
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/arm/atomic.h
deleted file mode 100644
index 8ae35bb713..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/atomic.h
+++ /dev/null
@@ -1,261 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_l(unsigned long x)
-{
-	static const char debruijn32[32] = {
-		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-	};
-	return debruijn32[(x&-x)*0x076be629 >> 27];
-}
-
-static inline int a_ctz_64(uint64_t x)
-{
-	uint32_t y = x;
-	if (!y) {
-		y = x>>32;
-		return 32 + a_ctz_l(y);
-	}
-	return a_ctz_l(y);
-}
-
-#if __ARM_ARCH_7A__ || __ARM_ARCH_7R__ ||  __ARM_ARCH >= 7
-
-static inline void a_barrier()
-{
-	__asm__ __volatile__("dmb ish");
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	int old;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldrex %0,%3\n"
-		"	cmp %0,%1\n"
-		"	bne 1f\n"
-		"	strex %0,%2,%3\n"
-		"	cmp %0, #0\n"
-		"	bne 1b\n"
-		"	mov %0, %1\n"
-		"1:	dmb ish\n"
-		: "=&r"(old)
-		: "r"(t), "r"(s), "Q"(*p)
-		: "memory", "cc" );
-	return old;
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	int old, tmp;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldrex %0,%3\n"
-		"	strex %1,%2,%3\n"
-		"	cmp %1, #0\n"
-		"	bne 1b\n"
-		"	dmb ish\n"
-		: "=&r"(old), "=&r"(tmp)
-		: "r"(v), "Q"(*x)
-		: "memory", "cc" );
-	return old;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	int old, tmp;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldrex %0,%3\n"
-		"	add %0,%0,%2\n"
-		"	strex %1,%0,%3\n"
-		"	cmp %1, #0\n"
-		"	bne 1b\n"
-		"	dmb ish\n"
-		: "=&r"(old), "=&r"(tmp)
-		: "r"(v), "Q"(*x)
-		: "memory", "cc" );
-	return old-v;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldrex %0,%2\n"
-		"	add %0,%0,#1\n"
-		"	strex %1,%0,%2\n"
-		"	cmp %1, #0\n"
-		"	bne 1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "Q"(*x)
-		: "memory", "cc" );
-}
-
-static inline void a_dec(volatile int *x)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldrex %0,%2\n"
-		"	sub %0,%0,#1\n"
-		"	strex %1,%0,%2\n"
-		"	cmp %1, #0\n"
-		"	bne 1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "Q"(*x)
-		: "memory", "cc" );
-}
-
-static inline void a_and(volatile int *x, int v)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldrex %0,%3\n"
-		"	and %0,%0,%2\n"
-		"	strex %1,%0,%3\n"
-		"	cmp %1, #0\n"
-		"	bne 1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "r"(v), "Q"(*x)
-		: "memory", "cc" );
-}
-
-static inline void a_or(volatile int *x, int v)
-{
-	int tmp, tmp2;
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"1:	ldrex %0,%3\n"
-		"	orr %0,%0,%2\n"
-		"	strex %1,%0,%3\n"
-		"	cmp %1, #0\n"
-		"	bne 1b\n"
-		"	dmb ish\n"
-		: "=&r"(tmp), "=&r"(tmp2)
-		: "r"(v), "Q"(*x)
-		: "memory", "cc" );
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__ __volatile__(
-		"	dmb ish\n"
-		"	str %1,%0\n"
-		"	dmb ish\n"
-		: "=m"(*p)
-		: "r"(x)
-		: "memory", "cc" );
-}
-
-#else
-
-int __a_cas(int, int, volatile int *) __attribute__((__visibility__("hidden")));
-#define __k_cas __a_cas
-
-static inline void a_barrier()
-{
-	__asm__ __volatile__("bl __a_barrier"
-		: : : "memory", "cc", "ip", "lr" );
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	int old;
-	for (;;) {
-		if (!__k_cas(t, s, p))
-			return t;
-		if ((old=*p) != t)
-			return old;
-	}
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	int old;
-	do old = *x;
-	while (__k_cas(old, v, x));
-	return old;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	int old;
-	do old = *x;
-	while (__k_cas(old, old+v, x));
-	return old;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	a_fetch_add(x, 1);
-}
-
-static inline void a_dec(volatile int *x)
-{
-	a_fetch_add(x, -1);
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	a_barrier();
-	*p = x;
-	a_barrier();
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (__k_cas(old, old&v, p));
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (__k_cas(old, old|v, p));
-}
-
-#endif
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	return (void *)a_cas(p, (int)t, (int)s);
-}
-
-#define a_spin a_barrier
-
-static inline void a_crash()
-{
-	*(volatile char *)0=0;
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	a_or(p, v);
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_and((int *)p, u.r[0]);
-	a_and((int *)p+1, u.r[1]);
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_or((int *)p, u.r[0]);
-	a_or((int *)p+1, u.r[1]);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/alltypes.h.in
deleted file mode 100644
index 667963c7e1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/alltypes.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg int
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF unsigned wchar_t;
-#endif
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/endian.h
deleted file mode 100644
index 5953724a0b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/endian.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#if __ARMEB__
-#define __BYTE_ORDER __BIG_ENDIAN
-#else
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/errno.h
deleted file mode 100644
index d2e1eeee05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/ioctl.h
deleted file mode 100644
index 9d75118e0e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/ioctl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGPTN	0x80045430
-#define TIOCSPTLCK	0x40045431
-#define TCGETX		0x5432
-#define TCSETX		0x5433
-#define TCSETXF		0x5434
-#define TCSETXW		0x5435
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR   0x5459
-#define TIOCSERGETMULTI 0x545A
-#define TIOCSERSETMULTI 0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-#define FIOQSIZE	0x5460
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE		0x89F0
-#define SIOCPROTOPRIVATE	0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/ipc.h
deleted file mode 100644
index b748d3b742..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/ipc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long __pad1;
-	long __pad2;
-};
-
-#define IPC_64 0x100
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/limits.h
deleted file mode 100644
index 65a3dd6477..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/limits.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/mman.h
deleted file mode 100644
index cc854aaee8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/mman.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define	PROT_GROWSDOWN 0x01000000
-#define	PROT_GROWSUP   0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/msg.h
deleted file mode 100644
index 3db8576b78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/msg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	int __unused1;
-	time_t msg_rtime;
-	int __unused2;
-	time_t msg_ctime;
-	int __unused3;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/sem.h
deleted file mode 100644
index c629b81ebb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/sem.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t __unused1;
-	time_t sem_ctime;
-	time_t __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/shm.h
deleted file mode 100644
index 547581f1a7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/shm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	int __unused1;
-	time_t shm_dtime;
-	int __unused2;
-	time_t shm_ctime;
-	int __unused3;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/signal.h
deleted file mode 100644
index 9d19eeb2fb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/signal.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 2048
-#define SIGSTKSZ 8192
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-typedef int greg_t, gregset_t[18];
-typedef struct sigcontext
-{
-	unsigned long trap_no, error_code, oldmask;
-	unsigned long arm_r0, arm_r1, arm_r2, arm_r3;
-	unsigned long arm_r4, arm_r5, arm_r6, arm_r7;
-	unsigned long arm_r8, arm_r9, arm_r10, arm_fp;
-	unsigned long arm_ip, arm_sp, arm_lr, arm_pc;
-	unsigned long arm_cpsr, fault_address;
-} mcontext_t;
-#else
-typedef struct {
-	unsigned long __regs[21];
-} mcontext_t;
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct __ucontext *uc_link;
-	stack_t uc_stack;
-	mcontext_t uc_mcontext;
-	sigset_t uc_sigmask;
-	unsigned long long uc_regspace[64];
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  2
-#define SA_SIGINFO    4
-#define SA_ONSTACK    0x08000000
-#define SA_RESTART    0x10000000
-#define SA_NODEFER    0x40000000
-#define SA_RESETHAND  0x80000000
-#define SA_RESTORER   0x04000000
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGBUS    7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGUSR1   10
-#define SIGSEGV   11
-#define SIGUSR2   12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGSTKFLT 16
-#define SIGCHLD   17
-#define SIGCONT   18
-#define SIGSTOP   19
-#define SIGTSTP   20
-#define SIGTTIN   21
-#define SIGTTOU   22
-#define SIGURG    23
-#define SIGXCPU   24
-#define SIGXFSZ   25
-#define SIGVTALRM 26
-#define SIGPROF   27
-#define SIGWINCH  28
-#define SIGIO     29
-#define SIGPOLL   29
-#define SIGPWR    30
-#define SIGSYS    31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/socket.h
deleted file mode 100644
index 36febbc222..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/socket.h
+++ /dev/null
@@ -1,17 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen;
-	void *msg_control;
-	socklen_t msg_controllen;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/stat.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/stat.h
deleted file mode 100644
index bb9314a5dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/stat.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* copied from kernel definition, but with padding replaced
- * by the corresponding correctly-sized userspace types. */
-
-struct stat
-{
-	dev_t st_dev;
-	int __st_dev_padding;
-	long __st_ino_truncated;
-	mode_t st_mode;
-	nlink_t st_nlink;
-	uid_t st_uid;
-	gid_t st_gid;
-	dev_t st_rdev;
-	int __st_rdev_padding;
-	off_t st_size;
-	blksize_t st_blksize;
-	blkcnt_t st_blocks;
-	struct timespec st_atim;
-	struct timespec st_mtim;
-	struct timespec st_ctim;
-	ino_t st_ino;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/statfs.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/statfs.h
deleted file mode 100644
index f103f4e4f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct statfs {
-	unsigned long f_type, f_bsize;
-	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-	fsfilcnt_t f_files, f_ffree;
-	fsid_t f_fsid;
-	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/syscall.h
deleted file mode 100644
index df6cda0163..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/syscall.h
+++ /dev/null
@@ -1,695 +0,0 @@
-#define __NR_restart_syscall	0
-#define __NR_exit	1
-#define __NR_fork	2
-#define __NR_read	3
-#define __NR_write	4
-#define __NR_open	5
-#define __NR_close	6
-#define __NR_creat	8
-#define __NR_link	9
-#define __NR_unlink	10
-#define __NR_execve	11
-#define __NR_chdir	12
-#define __NR_mknod	14
-#define __NR_chmod	15
-#define __NR_lchown	16
-#define __NR_lseek	19
-#define __NR_getpid	20
-#define __NR_mount	21
-#define __NR_setuid	23
-#define __NR_getuid	24
-#define __NR_ptrace	26
-#define __NR_pause	29
-#define __NR_access	33
-#define __NR_nice	34
-#define __NR_sync	36
-#define __NR_kill	37
-#define __NR_rename	38
-#define __NR_mkdir	39
-#define __NR_rmdir	40
-#define __NR_dup	41
-#define __NR_pipe	42
-#define __NR_times	43
-#define __NR_brk	45
-#define __NR_setgid	46
-#define __NR_getgid	47
-#define __NR_geteuid	49
-#define __NR_getegid	50
-#define __NR_acct	51
-#define __NR_umount2	52
-#define __NR_ioctl	54
-#define __NR_fcntl	55
-#define __NR_setpgid	57
-#define __NR_umask	60
-#define __NR_chroot	61
-#define __NR_ustat	62
-#define __NR_dup2	63
-#define __NR_getppid	64
-#define __NR_getpgrp	65
-#define __NR_setsid	66
-#define __NR_sigaction	67
-#define __NR_setreuid	70
-#define __NR_setregid	71
-#define __NR_sigsuspend	72
-#define __NR_sigpending	73
-#define __NR_sethostname	74
-#define __NR_setrlimit	75
-#define __NR_getrusage	77
-#define __NR_gettimeofday	78
-#define __NR_settimeofday	79
-#define __NR_getgroups	80
-#define __NR_setgroups	81
-#define __NR_symlink	83
-#define __NR_readlink	85
-#define __NR_uselib	86
-#define __NR_swapon	87
-#define __NR_reboot	88
-#define __NR_munmap	91
-#define __NR_truncate	92
-#define __NR_ftruncate	93
-#define __NR_fchmod	94
-#define __NR_fchown	95
-#define __NR_getpriority	96
-#define __NR_setpriority	97
-#define __NR_statfs	99
-#define __NR_fstatfs	100
-#define __NR_syslog	103
-#define __NR_setitimer	104
-#define __NR_getitimer	105
-#define __NR_stat	106
-#define __NR_lstat	107
-#define __NR_fstat	108
-#define __NR_vhangup	111
-#define __NR_wait4	114
-#define __NR_swapoff	115
-#define __NR_sysinfo	116
-#define __NR_fsync	118
-#define __NR_sigreturn	119
-#define __NR_clone	120
-#define __NR_setdomainname	121
-#define __NR_uname	122
-#define __NR_adjtimex	124
-#define __NR_mprotect	125
-#define __NR_sigprocmask	126
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_quotactl	131
-#define __NR_getpgid	132
-#define __NR_fchdir	133
-#define __NR_bdflush	134
-#define __NR_sysfs	135
-#define __NR_personality	136
-#define __NR_setfsuid	138
-#define __NR_setfsgid	139
-#define __NR__llseek	140
-#define __NR_getdents	141
-#define __NR__newselect	142
-#define __NR_flock	143
-#define __NR_msync	144
-#define __NR_readv	145
-#define __NR_writev	146
-#define __NR_getsid	147
-#define __NR_fdatasync	148
-#define __NR__sysctl	149
-#define __NR_mlock	150
-#define __NR_munlock	151
-#define __NR_mlockall	152
-#define __NR_munlockall	153
-#define __NR_sched_setparam	154
-#define __NR_sched_getparam	155
-#define __NR_sched_setscheduler	156
-#define __NR_sched_getscheduler	157
-#define __NR_sched_yield	158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep	162
-#define __NR_mremap	163
-#define __NR_setresuid	164
-#define __NR_getresuid	165
-#define __NR_poll	168
-#define __NR_nfsservctl	169
-#define __NR_setresgid	170
-#define __NR_getresgid	171
-#define __NR_prctl	172
-#define __NR_rt_sigreturn	173
-#define __NR_rt_sigaction	174
-#define __NR_rt_sigprocmask	175
-#define __NR_rt_sigpending	176
-#define __NR_rt_sigtimedwait	177
-#define __NR_rt_sigqueueinfo	178
-#define __NR_rt_sigsuspend	179
-#define __NR_pread64	180
-#define __NR_pwrite64	181
-#define __NR_chown	182
-#define __NR_getcwd	183
-#define __NR_capget	184
-#define __NR_capset	185
-#define __NR_sigaltstack	186
-#define __NR_sendfile	187
-#define __NR_vfork	190
-#define __NR_ugetrlimit	191
-#define __NR_mmap2	192
-#define __NR_truncate64	193
-#define __NR_ftruncate64	194
-#define __NR_stat64	195
-#define __NR_lstat64	196
-#define __NR_fstat64	197
-#define __NR_lchown32	198
-#define __NR_getuid32	199
-#define __NR_getgid32	200
-#define __NR_geteuid32	201
-#define __NR_getegid32	202
-#define __NR_setreuid32	203
-#define __NR_setregid32	204
-#define __NR_getgroups32	205
-#define __NR_setgroups32	206
-#define __NR_fchown32	207
-#define __NR_setresuid32	208
-#define __NR_getresuid32	209
-#define __NR_setresgid32	210
-#define __NR_getresgid32	211
-#define __NR_chown32	212
-#define __NR_setuid32	213
-#define __NR_setgid32	214
-#define __NR_setfsuid32	215
-#define __NR_setfsgid32	216
-#define __NR_getdents64	217
-#define __NR_pivot_root	218
-#define __NR_mincore	219
-#define __NR_madvise	220
-#define __NR_fcntl64	221
-#define __NR_gettid	224
-#define __NR_readahead	225
-#define __NR_setxattr	226
-#define __NR_lsetxattr	227
-#define __NR_fsetxattr	228
-#define __NR_getxattr	229
-#define __NR_lgetxattr	230
-#define __NR_fgetxattr	231
-#define __NR_listxattr	232
-#define __NR_llistxattr	233
-#define __NR_flistxattr	234
-#define __NR_removexattr	235
-#define __NR_lremovexattr	236
-#define __NR_fremovexattr	237
-#define __NR_tkill	238
-#define __NR_sendfile64	239
-#define __NR_futex	240
-#define __NR_sched_setaffinity	241
-#define __NR_sched_getaffinity	242
-#define __NR_io_setup	243
-#define __NR_io_destroy	244
-#define __NR_io_getevents	245
-#define __NR_io_submit	246
-#define __NR_io_cancel	247
-#define __NR_exit_group	248
-#define __NR_lookup_dcookie	249
-#define __NR_epoll_create	250
-#define __NR_epoll_ctl	251
-#define __NR_epoll_wait	252
-#define __NR_remap_file_pages	253
-#define __NR_set_tid_address	256
-#define __NR_timer_create	257
-#define __NR_timer_settime	258
-#define __NR_timer_gettime	259
-#define __NR_timer_getoverrun	260
-#define __NR_timer_delete	261
-#define __NR_clock_settime	262
-#define __NR_clock_gettime	263
-#define __NR_clock_getres	264
-#define __NR_clock_nanosleep	265
-#define __NR_statfs64	266
-#define __NR_fstatfs64	267
-#define __NR_tgkill	268
-#define __NR_utimes	269
-#define __NR_fadvise64_64	270
-#define __NR_pciconfig_iobase	271
-#define __NR_pciconfig_read	272
-#define __NR_pciconfig_write	273
-#define __NR_mq_open	274
-#define __NR_mq_unlink	275
-#define __NR_mq_timedsend	276
-#define __NR_mq_timedreceive	277
-#define __NR_mq_notify	278
-#define __NR_mq_getsetattr	279
-#define __NR_waitid	280
-#define __NR_socket	281
-#define __NR_bind	282
-#define __NR_connect	283
-#define __NR_listen	284
-#define __NR_accept	285
-#define __NR_getsockname	286
-#define __NR_getpeername	287
-#define __NR_socketpair	288
-#define __NR_send	289
-#define __NR_sendto	290
-#define __NR_recv	291
-#define __NR_recvfrom	292
-#define __NR_shutdown	293
-#define __NR_setsockopt	294
-#define __NR_getsockopt	295
-#define __NR_sendmsg	296
-#define __NR_recvmsg	297
-#define __NR_semop	298
-#define __NR_semget	299
-#define __NR_semctl	300
-#define __NR_msgsnd	301
-#define __NR_msgrcv	302
-#define __NR_msgget	303
-#define __NR_msgctl	304
-#define __NR_shmat	305
-#define __NR_shmdt	306
-#define __NR_shmget	307
-#define __NR_shmctl	308
-#define __NR_add_key	309
-#define __NR_request_key	310
-#define __NR_keyctl	311
-#define __NR_semtimedop	312
-#define __NR_vserver	313
-#define __NR_ioprio_set	314
-#define __NR_ioprio_get	315
-#define __NR_inotify_init	316
-#define __NR_inotify_add_watch	317
-#define __NR_inotify_rm_watch	318
-#define __NR_mbind	319
-#define __NR_get_mempolicy	320
-#define __NR_set_mempolicy	321
-#define __NR_openat	322
-#define __NR_mkdirat	323
-#define __NR_mknodat	324
-#define __NR_fchownat	325
-#define __NR_futimesat	326
-#define __NR_fstatat64	327
-#define __NR_unlinkat	328
-#define __NR_renameat	329
-#define __NR_linkat	330
-#define __NR_symlinkat	331
-#define __NR_readlinkat	332
-#define __NR_fchmodat	333
-#define __NR_faccessat	334
-#define __NR_pselect6	335
-#define __NR_ppoll	336
-#define __NR_unshare	337
-#define __NR_set_robust_list	338
-#define __NR_get_robust_list	339
-#define __NR_splice	340
-#define __NR_sync_file_range2	341
-#define __NR_tee	342
-#define __NR_vmsplice	343
-#define __NR_move_pages	344
-#define __NR_getcpu	345
-#define __NR_epoll_pwait	346
-#define __NR_kexec_load	347
-#define __NR_utimensat	348
-#define __NR_signalfd	349
-#define __NR_timerfd_create	350
-#define __NR_eventfd	351
-#define __NR_fallocate	352
-#define __NR_timerfd_settime	353
-#define __NR_timerfd_gettime	354
-#define __NR_signalfd4	355
-#define __NR_eventfd2	356
-#define __NR_epoll_create1	357
-#define __NR_dup3	358
-#define __NR_pipe2	359
-#define __NR_inotify_init1	360
-#define __NR_preadv	361
-#define __NR_pwritev	362
-#define __NR_rt_tgsigqueueinfo	363
-#define __NR_perf_event_open	364
-#define __NR_recvmmsg	365
-#define __NR_accept4	366
-#define __NR_fanotify_init	367
-#define __NR_fanotify_mark	368
-#define __NR_prlimit64	369
-#define __NR_name_to_handle_at	370
-#define __NR_open_by_handle_at	371
-#define __NR_clock_adjtime	372
-#define __NR_syncfs	373
-#define __NR_sendmmsg	374
-#define __NR_setns	375
-#define __NR_process_vm_readv	376
-#define __NR_process_vm_writev	377
-#define __NR_kcmp		378
-#define __NR_finit_module	379
-#define __NR_sched_setattr	380
-#define __NR_sched_getattr	381
-#define __NR_renameat2	382
-#define __NR_seccomp	383
-#define __NR_getrandom	384
-#define __NR_memfd_create	385
-#define __NR_bpf	386
-#define __NR_execveat	387
-
-#define __ARM_NR_breakpoint	0x0f0001
-#define __ARM_NR_cacheflush	0x0f0002
-#define __ARM_NR_usr26		0x0f0003
-#define __ARM_NR_usr32		0x0f0004
-#define __ARM_NR_set_tls	0x0f0005
-
-/* Repeated with SYS_ prefix */
-
-#define SYS_restart_syscall	0
-#define SYS_exit	1
-#define SYS_fork	2
-#define SYS_read	3
-#define SYS_write	4
-#define SYS_open	5
-#define SYS_close	6
-#define SYS_creat	8
-#define SYS_link	9
-#define SYS_unlink	10
-#define SYS_execve	11
-#define SYS_chdir	12
-#define SYS_mknod	14
-#define SYS_chmod	15
-#define SYS_lchown	16
-#define SYS_lseek	19
-#define SYS_getpid	20
-#define SYS_mount	21
-#define SYS_setuid	23
-#define SYS_getuid	24
-#define SYS_ptrace	26
-#define SYS_pause	29
-#define SYS_access	33
-#define SYS_nice	34
-#define SYS_sync	36
-#define SYS_kill	37
-#define SYS_rename	38
-#define SYS_mkdir	39
-#define SYS_rmdir	40
-#define SYS_dup	41
-#define SYS_pipe	42
-#define SYS_times	43
-#define SYS_brk	45
-#define SYS_setgid	46
-#define SYS_getgid	47
-#define SYS_geteuid	49
-#define SYS_getegid	50
-#define SYS_acct	51
-#define SYS_umount2	52
-#define SYS_ioctl	54
-#define SYS_fcntl	55
-#define SYS_setpgid	57
-#define SYS_umask	60
-#define SYS_chroot	61
-#define SYS_ustat	62
-#define SYS_dup2	63
-#define SYS_getppid	64
-#define SYS_getpgrp	65
-#define SYS_setsid	66
-#define SYS_sigaction	67
-#define SYS_setreuid	70
-#define SYS_setregid	71
-#define SYS_sigsuspend	72
-#define SYS_sigpending	73
-#define SYS_sethostname	74
-#define SYS_setrlimit	75
-#define SYS_getrusage	77
-#define SYS_gettimeofday	78
-#define SYS_settimeofday	79
-#define SYS_getgroups	80
-#define SYS_setgroups	81
-#define SYS_symlink	83
-#define SYS_readlink	85
-#define SYS_uselib	86
-#define SYS_swapon	87
-#define SYS_reboot	88
-#define SYS_munmap	91
-#define SYS_truncate	92
-#define SYS_ftruncate	93
-#define SYS_fchmod	94
-#define SYS_fchown	95
-#define SYS_getpriority	96
-#define SYS_setpriority	97
-#define SYS_statfs	99
-#define SYS_fstatfs	100
-#define SYS_syslog	103
-#define SYS_setitimer	104
-#define SYS_getitimer	105
-#define SYS_stat	106
-#define SYS_lstat	107
-#define SYS_fstat	108
-#define SYS_vhangup	111
-#define SYS_wait4	114
-#define SYS_swapoff	115
-#define SYS_sysinfo	116
-#define SYS_fsync	118
-#define SYS_sigreturn	119
-#define SYS_clone	120
-#define SYS_setdomainname	121
-#define SYS_uname	122
-#define SYS_adjtimex	124
-#define SYS_mprotect	125
-#define SYS_sigprocmask	126
-#define SYS_init_module	128
-#define SYS_delete_module	129
-#define SYS_quotactl	131
-#define SYS_getpgid	132
-#define SYS_fchdir	133
-#define SYS_bdflush	134
-#define SYS_sysfs	135
-#define SYS_personality	136
-#define SYS_setfsuid	138
-#define SYS_setfsgid	139
-#define SYS__llseek	140
-#define SYS_getdents	141
-#define SYS__newselect	142
-#define SYS_flock	143
-#define SYS_msync	144
-#define SYS_readv	145
-#define SYS_writev	146
-#define SYS_getsid	147
-#define SYS_fdatasync	148
-#define SYS__sysctl	149
-#define SYS_mlock	150
-#define SYS_munlock	151
-#define SYS_mlockall	152
-#define SYS_munlockall	153
-#define SYS_sched_setparam	154
-#define SYS_sched_getparam	155
-#define SYS_sched_setscheduler	156
-#define SYS_sched_getscheduler	157
-#define SYS_sched_yield	158
-#define SYS_sched_get_priority_max	159
-#define SYS_sched_get_priority_min	160
-#define SYS_sched_rr_get_interval	161
-#define SYS_nanosleep	162
-#define SYS_mremap	163
-#define SYS_setresuid	164
-#define SYS_getresuid	165
-#define SYS_poll	168
-#define SYS_nfsservctl	169
-#define SYS_setresgid	170
-#define SYS_getresgid	171
-#define SYS_prctl	172
-#define SYS_rt_sigreturn	173
-#define SYS_rt_sigaction	174
-#define SYS_rt_sigprocmask	175
-#define SYS_rt_sigpending	176
-#define SYS_rt_sigtimedwait	177
-#define SYS_rt_sigqueueinfo	178
-#define SYS_rt_sigsuspend	179
-#define SYS_pread64	180
-#define SYS_pwrite64	181
-#define SYS_chown	182
-#define SYS_getcwd	183
-#define SYS_capget	184
-#define SYS_capset	185
-#define SYS_sigaltstack	186
-#define SYS_sendfile	187
-#define SYS_vfork	190
-#define SYS_ugetrlimit	191
-#define SYS_mmap2	192
-#define SYS_truncate64	193
-#define SYS_ftruncate64	194
-#define SYS_stat64	195
-#define SYS_lstat64	196
-#define SYS_fstat64	197
-#define SYS_lchown32	198
-#define SYS_getuid32	199
-#define SYS_getgid32	200
-#define SYS_geteuid32	201
-#define SYS_getegid32	202
-#define SYS_setreuid32	203
-#define SYS_setregid32	204
-#define SYS_getgroups32	205
-#define SYS_setgroups32	206
-#define SYS_fchown32	207
-#define SYS_setresuid32	208
-#define SYS_getresuid32	209
-#define SYS_setresgid32	210
-#define SYS_getresgid32	211
-#define SYS_chown32	212
-#define SYS_setuid32	213
-#define SYS_setgid32	214
-#define SYS_setfsuid32	215
-#define SYS_setfsgid32	216
-#define SYS_getdents64	217
-#define SYS_pivot_root	218
-#define SYS_mincore	219
-#define SYS_madvise	220
-#define SYS_fcntl64	221
-#define SYS_gettid	224
-#define SYS_readahead	225
-#define SYS_setxattr	226
-#define SYS_lsetxattr	227
-#define SYS_fsetxattr	228
-#define SYS_getxattr	229
-#define SYS_lgetxattr	230
-#define SYS_fgetxattr	231
-#define SYS_listxattr	232
-#define SYS_llistxattr	233
-#define SYS_flistxattr	234
-#define SYS_removexattr	235
-#define SYS_lremovexattr	236
-#define SYS_fremovexattr	237
-#define SYS_tkill	238
-#define SYS_sendfile64	239
-#define SYS_futex	240
-#define SYS_sched_setaffinity	241
-#define SYS_sched_getaffinity	242
-#define SYS_io_setup	243
-#define SYS_io_destroy	244
-#define SYS_io_getevents	245
-#define SYS_io_submit	246
-#define SYS_io_cancel	247
-#define SYS_exit_group	248
-#define SYS_lookup_dcookie	249
-#define SYS_epoll_create	250
-#define SYS_epoll_ctl	251
-#define SYS_epoll_wait	252
-#define SYS_remap_file_pages	253
-#define SYS_set_tid_address	256
-#define SYS_timer_create	257
-#define SYS_timer_settime	258
-#define SYS_timer_gettime	259
-#define SYS_timer_getoverrun	260
-#define SYS_timer_delete	261
-#define SYS_clock_settime	262
-#define SYS_clock_gettime	263
-#define SYS_clock_getres	264
-#define SYS_clock_nanosleep	265
-#define SYS_statfs64	266
-#define SYS_fstatfs64	267
-#define SYS_tgkill	268
-#define SYS_utimes	269
-#define SYS_fadvise64_64	270
-#define SYS_pciconfig_iobase	271
-#define SYS_pciconfig_read	272
-#define SYS_pciconfig_write	273
-#define SYS_mq_open	274
-#define SYS_mq_unlink	275
-#define SYS_mq_timedsend	276
-#define SYS_mq_timedreceive	277
-#define SYS_mq_notify	278
-#define SYS_mq_getsetattr	279
-#define SYS_waitid	280
-#define SYS_socket	281
-#define SYS_bind	282
-#define SYS_connect	283
-#define SYS_listen	284
-#define SYS_accept	285
-#define SYS_getsockname	286
-#define SYS_getpeername	287
-#define SYS_socketpair	288
-#define SYS_send	289
-#define SYS_sendto	290
-#define SYS_recv	291
-#define SYS_recvfrom	292
-#define SYS_shutdown	293
-#define SYS_setsockopt	294
-#define SYS_getsockopt	295
-#define SYS_sendmsg	296
-#define SYS_recvmsg	297
-#define SYS_semop	298
-#define SYS_semget	299
-#define SYS_semctl	300
-#define SYS_msgsnd	301
-#define SYS_msgrcv	302
-#define SYS_msgget	303
-#define SYS_msgctl	304
-#define SYS_shmat	305
-#define SYS_shmdt	306
-#define SYS_shmget	307
-#define SYS_shmctl	308
-#define SYS_add_key	309
-#define SYS_request_key	310
-#define SYS_keyctl	311
-#define SYS_semtimedop	312
-#define SYS_vserver	313
-#define SYS_ioprio_set	314
-#define SYS_ioprio_get	315
-#define SYS_inotify_init	316
-#define SYS_inotify_add_watch	317
-#define SYS_inotify_rm_watch	318
-#define SYS_mbind	319
-#define SYS_get_mempolicy	320
-#define SYS_set_mempolicy	321
-#define SYS_openat	322
-#define SYS_mkdirat	323
-#define SYS_mknodat	324
-#define SYS_fchownat	325
-#define SYS_futimesat	326
-#define SYS_fstatat64	327
-#define SYS_unlinkat	328
-#define SYS_renameat	329
-#define SYS_linkat	330
-#define SYS_symlinkat	331
-#define SYS_readlinkat	332
-#define SYS_fchmodat	333
-#define SYS_faccessat	334
-#define SYS_pselect6	335
-#define SYS_ppoll	336
-#define SYS_unshare	337
-#define SYS_set_robust_list	338
-#define SYS_get_robust_list	339
-#define SYS_splice	340
-#define SYS_sync_file_range2	341
-#define SYS_tee	342
-#define SYS_vmsplice	343
-#define SYS_move_pages	344
-#define SYS_getcpu	345
-#define SYS_epoll_pwait	346
-#define SYS_kexec_load	347
-#define SYS_utimensat	348
-#define SYS_signalfd	349
-#define SYS_timerfd_create	350
-#define SYS_eventfd	351
-#define SYS_fallocate	352
-#define SYS_timerfd_settime	353
-#define SYS_timerfd_gettime	354
-#define SYS_signalfd4	355
-#define SYS_eventfd2	356
-#define SYS_epoll_create1	357
-#define SYS_dup3	358
-#define SYS_pipe2	359
-#define SYS_inotify_init1	360
-#define SYS_preadv	361
-#define SYS_pwritev	362
-#define SYS_rt_tgsigqueueinfo	363
-#define SYS_perf_event_open	364
-#define SYS_recvmmsg	365
-#define SYS_accept4	366
-#define SYS_fanotify_init	367
-#define SYS_fanotify_mark	368
-#define SYS_prlimit64	369
-#define SYS_name_to_handle_at	370
-#define SYS_open_by_handle_at	371
-#define SYS_clock_adjtime	372
-#define SYS_syncfs	373
-#define SYS_sendmmsg	374
-#define SYS_setns	375
-#define SYS_process_vm_readv	376
-#define SYS_process_vm_writev	377
-#define SYS_kcmp		378
-#define SYS_finit_module	379
-#define SYS_sched_setattr	380
-#define SYS_sched_getattr	381
-#define SYS_renameat2	382
-#define SYS_seccomp	383
-#define SYS_getrandom	384
-#define SYS_memfd_create	385
-#define SYS_bpf	386
-#define SYS_execveat	387
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/arm/bits/termios.h
deleted file mode 100644
index f0d81b138f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/termios.h
+++ /dev/null
@@ -1,160 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/arm/pthread_arch.h
deleted file mode 100644
index 7ab905806e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/pthread_arch.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6ZK__) && !__thumb__) \
- || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
-
-static inline __attribute__((const)) pthread_t __pthread_self()
-{
-	char *p;
-	__asm__( "mrc p15,0,%0,c13,c0,3" : "=r"(p) );
-	return (void *)(p+8-sizeof(struct pthread));
-}
-
-#else
-
-static inline __attribute__((const)) pthread_t __pthread_self()
-{
-#ifdef __clang__
-	char *p;
-	__asm__( "bl __a_gettp\n\tmov %0,r0" : "=r"(p) : : "cc", "r0", "lr" );
-#else
-	register char *p __asm__("r0");
-	__asm__( "bl __a_gettp" : "=r"(p) : : "cc", "lr" );
-#endif
-	return (void *)(p+8-sizeof(struct pthread));
-}
-
-#endif
-
-#define TLS_ABOVE_TP
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8)
-
-#define CANCEL_REG_IP 18
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/arm/reloc.h
deleted file mode 100644
index e1ef3506e0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/reloc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <endian.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define ENDIAN_SUFFIX "eb"
-#else
-#define ENDIAN_SUFFIX ""
-#endif
-
-#if __SOFTFP__
-#define FP_SUFFIX ""
-#else
-#define FP_SUFFIX "hf"
-#endif
-
-#define LDSO_ARCH "arm" ENDIAN_SUFFIX FP_SUFFIX
-
-#define NO_LEGACY_INITFINI
-
-#define TPOFF_K 8
-
-#define REL_SYMBOLIC    R_ARM_ABS32
-#define REL_GOT         R_ARM_GLOB_DAT
-#define REL_PLT         R_ARM_JUMP_SLOT
-#define REL_RELATIVE    R_ARM_RELATIVE
-#define REL_COPY        R_ARM_COPY
-#define REL_DTPMOD      R_ARM_TLS_DTPMOD32
-#define REL_DTPOFF      R_ARM_TLS_DTPOFF32
-#define REL_TPOFF       R_ARM_TLS_TPOFF32
-//#define REL_TLSDESC     R_ARM_TLS_DESC
-
-#ifdef __thumb__
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"mov sp,%1 ; bx %0" : : "r"(pc), "r"(sp) : "memory" )
-#else
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"mov sp,%1 ; tst %0,#1 ; moveq pc,%0 ; bx %0" : : "r"(pc), "r"(sp) : "memory" )
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/src/__set_thread_area.c b/src/components/lib/libc/musl-1.1.11/arch/arm/src/__set_thread_area.c
deleted file mode 100644
index 61d02827b5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/src/__set_thread_area.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <stdint.h>
-#include <elf.h>
-#include "pthread_impl.h"
-#include "libc.h"
-
-#define HWCAP_TLS (1 << 15)
-
-extern const unsigned char __attribute__((__visibility__("hidden")))
-	__a_barrier_dummy[], __a_barrier_oldkuser[],
-	__a_barrier_v6[], __a_barrier_v7[],
-	__a_cas_dummy[], __a_cas_v6[], __a_cas_v7[],
-	__a_gettp_dummy[];
-
-#define __a_barrier_kuser 0xffff0fa0
-#define __a_cas_kuser 0xffff0fc0
-#define __a_gettp_kuser 0xffff0fe0
-
-extern uintptr_t __attribute__((__visibility__("hidden")))
-	__a_barrier_ptr, __a_cas_ptr, __a_gettp_ptr;
-
-#define SET(op,ver) (__a_##op##_ptr = \
-	(uintptr_t)__a_##op##_##ver - (uintptr_t)__a_##op##_dummy)
-
-int __set_thread_area(void *p)
-{
-#if !__ARM_ARCH_7A__ && !__ARM_ARCH_7R__ && __ARM_ARCH < 7
-	if (__hwcap & HWCAP_TLS) {
-		size_t *aux;
-		SET(cas, v7);
-		SET(barrier, v7);
-		for (aux=libc.auxv; *aux; aux+=2) {
-			if (*aux != AT_PLATFORM) continue;
-			const char *s = (void *)aux[1];
-			if (s[0]!='v' || s[1]!='6' || s[2]-'0'<10u) break;
-			SET(cas, v6);
-			SET(barrier, v6);
-			break;
-		}
-	} else {
-		int ver = *(int *)0xffff0ffc;
-		SET(gettp, kuser);
-		SET(cas, kuser);
-		SET(barrier, kuser);
-		if (ver < 2) a_crash();
-		if (ver < 3) SET(barrier, oldkuser);
-	}
-#endif
-	return __syscall(0xf0005, p);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/src/arm/atomics.s b/src/components/lib/libc/musl-1.1.11/arch/arm/src/arm/atomics.s
deleted file mode 100644
index f241cc027c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/src/arm/atomics.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.text
-
-.global __a_barrier
-.hidden __a_barrier
-.type __a_barrier,%function
-__a_barrier:
-	ldr ip,1f
-	ldr ip,[pc,ip]
-	add pc,pc,ip
-1:	.word __a_barrier_ptr-1b
-.global __a_barrier_dummy
-.hidden __a_barrier_dummy
-__a_barrier_dummy:
-	tst lr,#1
-	moveq pc,lr
-	bx lr
-.global __a_barrier_oldkuser
-.hidden __a_barrier_oldkuser
-__a_barrier_oldkuser:
-	push {r0,r1,r2,r3,ip,lr}
-	mov r1,r0
-	mov r2,sp
-	ldr ip,=0xffff0fc0
-	mov lr,pc
-	mov pc,ip
-	pop {r0,r1,r2,r3,ip,lr}
-	tst lr,#1
-	moveq pc,lr
-	bx lr
-.global __a_barrier_v6
-.hidden __a_barrier_v6
-__a_barrier_v6:
-	mcr p15,0,r0,c7,c10,5
-	bx lr
-.global __a_barrier_v7
-.hidden __a_barrier_v7
-__a_barrier_v7:
-	.word 0xf57ff05b        /* dmb ish */
-	bx lr
-
-.global __a_cas
-.hidden __a_cas
-.type __a_cas,%function
-__a_cas:
-	ldr ip,1f
-	ldr ip,[pc,ip]
-	add pc,pc,ip
-1:	.word __a_cas_ptr-1b
-.global __a_cas_dummy
-.hidden __a_cas_dummy
-__a_cas_dummy:
-	mov r3,r0
-	ldr r0,[r2]
-	subs r0,r3,r0
-	streq r1,[r2]
-	tst lr,#1
-	moveq pc,lr
-	bx lr
-.global __a_cas_v6
-.hidden __a_cas_v6
-__a_cas_v6:
-	mov r3,r0
-	mcr p15,0,r0,c7,c10,5
-1:	.word 0xe1920f9f        /* ldrex r0,[r2] */
-	subs r0,r3,r0
-	.word 0x01820f91        /* strexeq r0,r1,[r2] */
-	teqeq r0,#1
-	beq 1b
-	mcr p15,0,r0,c7,c10,5
-	bx lr
-.global __a_cas_v7
-.hidden __a_cas_v7
-__a_cas_v7:
-	mov r3,r0
-	.word 0xf57ff05b        /* dmb ish */
-1:	.word 0xe1920f9f        /* ldrex r0,[r2] */
-	subs r0,r3,r0
-	.word 0x01820f91        /* strexeq r0,r1,[r2] */
-	teqeq r0,#1
-	beq 1b
-	.word 0xf57ff05b        /* dmb ish */
-	bx lr
-
-.global __aeabi_read_tp
-.type __aeabi_read_tp,%function
-__aeabi_read_tp:
-
-.global __a_gettp
-.hidden __a_gettp
-.type __a_gettp,%function
-__a_gettp:
-	ldr r0,1f
-	ldr r0,[pc,r0]
-	add pc,pc,r0
-1:	.word __a_gettp_ptr-1b
-.global __a_gettp_dummy
-.hidden __a_gettp_dummy
-__a_gettp_dummy:
-	mrc p15,0,r0,c13,c0,3
-	bx lr
-
-.data
-.global __a_barrier_ptr
-.hidden __a_barrier_ptr
-__a_barrier_ptr:
-	.word 0
-
-.global __a_cas_ptr
-.hidden __a_cas_ptr
-__a_cas_ptr:
-	.word 0
-
-.global __a_gettp_ptr
-.hidden __a_gettp_ptr
-__a_gettp_ptr:
-	.word 0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/arm/syscall_arch.h
deleted file mode 100644
index 64461ec8f5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/arm/syscall_arch.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
-
-#define __asm_syscall(...) do { \
-	__asm__ __volatile__ ( "svc 0" \
-	: "=r"(r0) : __VA_ARGS__ : "memory"); \
-	return r0; \
-	} while (0)
-
-static inline long __syscall0(long n)
-{
-	register long r7 __asm__("r7") = n;
-	register long r0 __asm__("r0");
-	__asm_syscall("r"(r7));
-}
-
-static inline long __syscall1(long n, long a)
-{
-	register long r7 __asm__("r7") = n;
-	register long r0 __asm__("r0") = a;
-	__asm_syscall("r"(r7), "0"(r0));
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-	register long r7 __asm__("r7") = n;
-	register long r0 __asm__("r0") = a;
-	register long r1 __asm__("r1") = b;
-	__asm_syscall("r"(r7), "0"(r0), "r"(r1));
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-	register long r7 __asm__("r7") = n;
-	register long r0 __asm__("r0") = a;
-	register long r1 __asm__("r1") = b;
-	register long r2 __asm__("r2") = c;
-	__asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2));
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-	register long r7 __asm__("r7") = n;
-	register long r0 __asm__("r0") = a;
-	register long r1 __asm__("r1") = b;
-	register long r2 __asm__("r2") = c;
-	register long r3 __asm__("r3") = d;
-	__asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3));
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
-	register long r7 __asm__("r7") = n;
-	register long r0 __asm__("r0") = a;
-	register long r1 __asm__("r1") = b;
-	register long r2 __asm__("r2") = c;
-	register long r3 __asm__("r3") = d;
-	register long r4 __asm__("r4") = e;
-	__asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4));
-}
-
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
-	register long r7 __asm__("r7") = n;
-	register long r0 __asm__("r0") = a;
-	register long r1 __asm__("r1") = b;
-	register long r2 __asm__("r2") = c;
-	register long r3 __asm__("r3") = d;
-	register long r4 __asm__("r4") = e;
-	register long r5 __asm__("r5") = f;
-	__asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4), "r"(r5));
-}
-
-#define VDSO_USEFUL
-#define VDSO_CGT_SYM "__vdso_clock_gettime"
-#define VDSO_CGT_VER "LINUX_2.6"
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/i386/atomic.h
deleted file mode 100644
index 25441df234..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/atomic.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_64(uint64_t x)
-{
-	int r;
-	__asm__( "bsf %1,%0 ; jnz 1f ; bsf %2,%0 ; addl $32,%0\n1:"
-		: "=r"(r) : "r"((unsigned)x), "r"((unsigned)(x>>32)) );
-	return r;
-}
-
-static inline int a_ctz_l(unsigned long x)
-{
-	long r;
-	__asm__( "bsf %1,%0" : "=r"(r) : "r"(x) );
-	return r;
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	__asm__( "lock ; andl %1, (%0) ; lock ; andl %2, 4(%0)"
-		: : "r"((long *)p), "r"((unsigned)v), "r"((unsigned)(v>>32)) : "memory" );
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	__asm__( "lock ; orl %1, (%0) ; lock ; orl %2, 4(%0)"
-		: : "r"((long *)p), "r"((unsigned)v), "r"((unsigned)(v>>32)) : "memory" );
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	__asm__( "lock ; orl %1, %0"
-		: "=m"(*(long *)p) : "r"(v) : "memory" );
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	__asm__( "lock ; cmpxchg %3, %1"
-		: "=a"(t), "=m"(*(long *)p) : "a"(t), "r"(s) : "memory" );
-	return t;
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	__asm__( "lock ; cmpxchg %3, %1"
-		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
-	return t;
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	__asm__( "lock ; orl %1, %0"
-		: "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	__asm__( "lock ; andl %1, %0"
-		: "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	__asm__( "xchg %0, %1" : "=r"(v), "=m"(*x) : "0"(v) : "memory" );
-	return v;
-}
-
-#define a_xchg a_swap
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	__asm__( "lock ; xadd %0, %1" : "=r"(v), "=m"(*x) : "0"(v) : "memory" );
-	return v;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	__asm__( "lock ; incl %0" : "=m"(*x) : "m"(*x) : "memory" );
-}
-
-static inline void a_dec(volatile int *x)
-{
-	__asm__( "lock ; decl %0" : "=m"(*x) : "m"(*x) : "memory" );
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__( "movl %1, %0 ; lock ; orl $0,(%%esp)" : "=m"(*p) : "r"(x) : "memory" );
-}
-
-static inline void a_spin()
-{
-	__asm__ __volatile__( "pause" : : : "memory" );
-}
-
-static inline void a_barrier()
-{
-	__asm__ __volatile__( "" : : : "memory" );
-}
-
-static inline void a_crash()
-{
-	__asm__ __volatile__( "hlt" : : : "memory" );
-}
-
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/alltypes.h.in
deleted file mode 100644
index b8902db7a7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/alltypes.h.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg int
-
-#if __GNUC__ >= 3
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-#else
-TYPEDEF struct __va_list * va_list;
-TYPEDEF struct __va_list * __isoc_va_list;
-#endif
-
-#ifndef __cplusplus
-#ifdef __WCHAR_TYPE__
-TYPEDEF __WCHAR_TYPE__ wchar_t;
-#else
-TYPEDEF long wchar_t;
-#endif
-#endif
-
-#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-#else
-TYPEDEF long double float_t;
-TYPEDEF long double double_t;
-#endif
-
-#ifdef __cplusplus
-TYPEDEF struct { alignas(8) long long __ll; long double __ld; } max_align_t;
-#else
-TYPEDEF struct { _Alignas(8) long long __ll; long double __ld; } max_align_t;
-#endif
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/endian.h
deleted file mode 100644
index 172c338f50..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/endian.h
+++ /dev/null
@@ -1 +0,0 @@
-#define __BYTE_ORDER __LITTLE_ENDIAN
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/errno.h
deleted file mode 100644
index d2e1eeee05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/ioctl.h
deleted file mode 100644
index 9d75118e0e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/ioctl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGPTN	0x80045430
-#define TIOCSPTLCK	0x40045431
-#define TCGETX		0x5432
-#define TCSETX		0x5433
-#define TCSETXF		0x5434
-#define TCSETXW		0x5435
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR   0x5459
-#define TIOCSERGETMULTI 0x545A
-#define TIOCSERSETMULTI 0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-#define FIOQSIZE	0x5460
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE		0x89F0
-#define SIOCPROTOPRIVATE	0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/ipc.h
deleted file mode 100644
index b748d3b742..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/ipc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long __pad1;
-	long __pad2;
-};
-
-#define IPC_64 0x100
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/limits.h
deleted file mode 100644
index 752e2ea215..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/limits.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#ifndef PAGE_SIZE
-#define PAGE_SIZE 4096
-#endif
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/mman.h
deleted file mode 100644
index 0f53acb7ab..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/mman.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define	PROT_GROWSDOWN 0x01000000
-#define	PROT_GROWSUP   0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/msg.h
deleted file mode 100644
index 3db8576b78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/msg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	int __unused1;
-	time_t msg_rtime;
-	int __unused2;
-	time_t msg_ctime;
-	int __unused3;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/sem.h
deleted file mode 100644
index c629b81ebb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/sem.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t __unused1;
-	time_t sem_ctime;
-	time_t __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/shm.h
deleted file mode 100644
index 547581f1a7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/shm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	int __unused1;
-	time_t shm_dtime;
-	int __unused2;
-	time_t shm_ctime;
-	int __unused3;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/signal.h
deleted file mode 100644
index 1f9085a553..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/signal.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 2048
-#define SIGSTKSZ 8192
-#endif
-
-#ifdef _GNU_SOURCE
-#define REG_GS          0
-#define REG_FS          1
-#define REG_ES          2
-#define REG_DS          3
-#define REG_EDI         4
-#define REG_ESI         5
-#define REG_EBP         6
-#define REG_ESP         7
-#define REG_EBX         8
-#define REG_EDX         9
-#define REG_ECX         10
-#define REG_EAX         11
-#define REG_TRAPNO      12
-#define REG_ERR         13
-#define REG_EIP         14
-#define REG_CS          15
-#define REG_EFL         16
-#define REG_UESP        17
-#define REG_SS          18
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-typedef int greg_t, gregset_t[19];
-typedef struct _fpstate {
-	unsigned long cw, sw, tag, ipoff, cssel, dataoff, datasel;
-	struct {
-		unsigned short significand[4], exponent;
-	} _st[8];
-	unsigned long status;
-} *fpregset_t;
-struct sigcontext {
-	unsigned short gs, __gsh, fs, __fsh, es, __esh, ds, __dsh;
-	unsigned long edi, esi, ebp, esp, ebx, edx, ecx, eax;
-	unsigned long trapno, err, eip;
-	unsigned short cs, __csh;
-	unsigned long eflags, esp_at_signal;
-	unsigned short ss, __ssh;
-	struct _fpstate *fpstate;
-	unsigned long oldmask, cr2;
-};
-typedef struct {
-	gregset_t gregs;
-	fpregset_t fpregs;
-	unsigned long oldmask, cr2;
-} mcontext_t;
-#else
-typedef struct {
-	unsigned __space[22];
-} mcontext_t;
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct __ucontext *uc_link;
-	stack_t uc_stack;
-	mcontext_t uc_mcontext;
-	sigset_t uc_sigmask;
-	unsigned long __fpregs_mem[28];
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  2
-#define SA_SIGINFO    4
-#define SA_ONSTACK    0x08000000
-#define SA_RESTART    0x10000000
-#define SA_NODEFER    0x40000000
-#define SA_RESETHAND  0x80000000
-#define SA_RESTORER   0x04000000
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGBUS    7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGUSR1   10
-#define SIGSEGV   11
-#define SIGUSR2   12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGSTKFLT 16
-#define SIGCHLD   17
-#define SIGCONT   18
-#define SIGSTOP   19
-#define SIGTSTP   20
-#define SIGTTIN   21
-#define SIGTTOU   22
-#define SIGURG    23
-#define SIGXCPU   24
-#define SIGXFSZ   25
-#define SIGVTALRM 26
-#define SIGPROF   27
-#define SIGWINCH  28
-#define SIGIO     29
-#define SIGPOLL   29
-#define SIGPWR    30
-#define SIGSYS    31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 65
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/socket.h
deleted file mode 100644
index 36febbc222..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/socket.h
+++ /dev/null
@@ -1,17 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen;
-	void *msg_control;
-	socklen_t msg_controllen;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/stat.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/stat.h
deleted file mode 100644
index bb9314a5dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/stat.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* copied from kernel definition, but with padding replaced
- * by the corresponding correctly-sized userspace types. */
-
-struct stat
-{
-	dev_t st_dev;
-	int __st_dev_padding;
-	long __st_ino_truncated;
-	mode_t st_mode;
-	nlink_t st_nlink;
-	uid_t st_uid;
-	gid_t st_gid;
-	dev_t st_rdev;
-	int __st_rdev_padding;
-	off_t st_size;
-	blksize_t st_blksize;
-	blkcnt_t st_blocks;
-	struct timespec st_atim;
-	struct timespec st_mtim;
-	struct timespec st_ctim;
-	ino_t st_ino;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/statfs.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/statfs.h
deleted file mode 100644
index f103f4e4f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct statfs {
-	unsigned long f_type, f_bsize;
-	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-	fsfilcnt_t f_files, f_ffree;
-	fsid_t f_fsid;
-	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/stdarg.h
deleted file mode 100644
index 6b1830d210..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/stdarg.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define __VA_ALIGNED_SIZE(x) ((sizeof(x) + sizeof(int) - 1) & ~(sizeof(int) - 1))
-
-#define va_start(ap, last) ((ap) = (void *)(((char *)&(last)) + __VA_ALIGNED_SIZE(last)))
-#define va_end(ap) ((void)0)
-#define va_copy(dest, src) ((dest) = (src))
-
-#define va_arg(ap, type) \
-	( ((ap) = (va_list)((char *)(ap) + __VA_ALIGNED_SIZE(type))), \
-	*(type *)(void *)((char *)(ap) - __VA_ALIGNED_SIZE(type)) )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/syscall.h
deleted file mode 100644
index 4f9865da47..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/syscall.h
+++ /dev/null
@@ -1,722 +0,0 @@
-#define __NR_restart_syscall      0
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_lchown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_umount2		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76   /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86old		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-//#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-#define __NR_setresuid		164
-#define __NR_getresuid		165
-#define __NR_vm86		166
-#define __NR_query_module	167
-#define __NR_poll		168
-#define __NR_nfsservctl		169
-#define __NR_setresgid		170
-#define __NR_getresgid		171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn	173
-#define __NR_rt_sigaction	174
-#define __NR_rt_sigprocmask	175
-#define __NR_rt_sigpending	176
-#define __NR_rt_sigtimedwait	177
-#define __NR_rt_sigqueueinfo	178
-#define __NR_rt_sigsuspend	179
-#define __NR_pread64		180
-#define __NR_pwrite64		181
-#define __NR_chown		182
-#define __NR_getcwd		183
-#define __NR_capget		184
-#define __NR_capset		185
-#define __NR_sigaltstack	186
-#define __NR_sendfile		187
-#define __NR_getpmsg		188
-#define __NR_putpmsg		189
-#define __NR_vfork		190
-#define __NR_ugetrlimit		191
-#define __NR_mmap2		192
-#define __NR_truncate64		193
-#define __NR_ftruncate64	194
-#define __NR_stat64		195
-#define __NR_lstat64		196
-#define __NR_fstat64		197
-#define __NR_lchown32		198
-#define __NR_getuid32		199
-#define __NR_getgid32		200
-#define __NR_geteuid32		201
-#define __NR_getegid32		202
-#define __NR_setreuid32		203
-#define __NR_setregid32		204
-#define __NR_getgroups32	205
-#define __NR_setgroups32	206
-#define __NR_fchown32		207
-#define __NR_setresuid32	208
-#define __NR_getresuid32	209
-#define __NR_setresgid32	210
-#define __NR_getresgid32	211
-#define __NR_chown32		212
-#define __NR_setuid32		213
-#define __NR_setgid32		214
-#define __NR_setfsuid32		215
-#define __NR_setfsgid32		216
-#define __NR_pivot_root		217
-#define __NR_mincore		218
-#define __NR_madvise		219
-#define __NR_madvise1		219
-#define __NR_getdents64		220
-#define __NR_fcntl64		221
-/* 223 is unused */
-#define __NR_gettid		224
-#define __NR_readahead		225
-#define __NR_setxattr		226
-#define __NR_lsetxattr		227
-#define __NR_fsetxattr		228
-#define __NR_getxattr		229
-#define __NR_lgetxattr		230
-#define __NR_fgetxattr		231
-#define __NR_listxattr		232
-#define __NR_llistxattr		233
-#define __NR_flistxattr		234
-#define __NR_removexattr	235
-#define __NR_lremovexattr	236
-#define __NR_fremovexattr	237
-#define __NR_tkill		238
-#define __NR_sendfile64		239
-#define __NR_futex		240
-#define __NR_sched_setaffinity	241
-#define __NR_sched_getaffinity	242
-#define __NR_set_thread_area	243
-#define __NR_get_thread_area	244
-#define __NR_io_setup		245
-#define __NR_io_destroy		246
-#define __NR_io_getevents	247
-#define __NR_io_submit		248
-#define __NR_io_cancel		249
-#define __NR_fadvise64		250
-/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
-#define __NR_exit_group		252
-#define __NR_lookup_dcookie	253
-#define __NR_epoll_create	254
-#define __NR_epoll_ctl		255
-#define __NR_epoll_wait		256
-#define __NR_remap_file_pages	257
-#define __NR_set_tid_address	258
-#define __NR_timer_create	259
-#define __NR_timer_settime	(__NR_timer_create+1)
-#define __NR_timer_gettime	(__NR_timer_create+2)
-#define __NR_timer_getoverrun	(__NR_timer_create+3)
-#define __NR_timer_delete	(__NR_timer_create+4)
-#define __NR_clock_settime	(__NR_timer_create+5)
-#define __NR_clock_gettime	(__NR_timer_create+6)
-#define __NR_clock_getres	(__NR_timer_create+7)
-#define __NR_clock_nanosleep	(__NR_timer_create+8)
-#define __NR_statfs64		268
-#define __NR_fstatfs64		269
-#define __NR_tgkill		270
-#define __NR_utimes		271
-#define __NR_fadvise64_64	272
-#define __NR_vserver		273
-#define __NR_mbind		274
-#define __NR_get_mempolicy	275
-#define __NR_set_mempolicy	276
-#define __NR_mq_open 		277
-#define __NR_mq_unlink		(__NR_mq_open+1)
-#define __NR_mq_timedsend	(__NR_mq_open+2)
-#define __NR_mq_timedreceive	(__NR_mq_open+3)
-#define __NR_mq_notify		(__NR_mq_open+4)
-#define __NR_mq_getsetattr	(__NR_mq_open+5)
-#define __NR_kexec_load		283
-#define __NR_waitid		284
-/* #define __NR_sys_setaltroot	285 */
-#define __NR_add_key		286
-#define __NR_request_key	287
-#define __NR_keyctl		288
-#define __NR_ioprio_set		289
-#define __NR_ioprio_get		290
-#define __NR_inotify_init	291
-#define __NR_inotify_add_watch	292
-#define __NR_inotify_rm_watch	293
-#define __NR_migrate_pages	294
-#define __NR_openat		295
-#define __NR_mkdirat		296
-#define __NR_mknodat		297
-#define __NR_fchownat		298
-#define __NR_futimesat		299
-#define __NR_fstatat64		300
-#define __NR_unlinkat		301
-#define __NR_renameat		302
-#define __NR_linkat		303
-#define __NR_symlinkat		304
-#define __NR_readlinkat		305
-#define __NR_fchmodat		306
-#define __NR_faccessat		307
-#define __NR_pselect6		308
-#define __NR_ppoll		309
-#define __NR_unshare		310
-#define __NR_set_robust_list	311
-#define __NR_get_robust_list	312
-#define __NR_splice		313
-#define __NR_sync_file_range	314
-#define __NR_tee		315
-#define __NR_vmsplice		316
-#define __NR_move_pages		317
-#define __NR_getcpu		318
-#define __NR_epoll_pwait	319
-#define __NR_utimensat		320
-#define __NR_signalfd		321
-#define __NR_timerfd_create	322
-#define __NR_eventfd		323
-#define __NR_fallocate		324
-#define __NR_timerfd_settime	325
-#define __NR_timerfd_gettime	326
-#define __NR_signalfd4		327
-#define __NR_eventfd2		328
-#define __NR_epoll_create1	329
-#define __NR_dup3		330
-#define __NR_pipe2		331
-#define __NR_inotify_init1	332
-#define __NR_preadv		333
-#define __NR_pwritev		334
-#define __NR_rt_tgsigqueueinfo	335
-#define __NR_perf_event_open	336
-#define __NR_recvmmsg		337
-#define __NR_fanotify_init	338
-#define __NR_fanotify_mark	339
-#define __NR_prlimit64		340
-#define __NR_name_to_handle_at	341
-#define __NR_open_by_handle_at	342
-#define __NR_clock_adjtime	343
-#define __NR_syncfs		344
-#define __NR_sendmmsg		345
-#define __NR_setns		346
-#define __NR_process_vm_readv	347
-#define __NR_process_vm_writev	348
-#define __NR_kcmp		349
-#define __NR_finit_module	350
-#define __NR_sched_setattr	351
-#define __NR_sched_getattr	352
-#define __NR_renameat2		353
-#define __NR_seccomp		354
-#define __NR_getrandom		355
-#define __NR_memfd_create	356
-#define __NR_bpf		357
-#define __NR_execveat		358
-
-
-/* Repeated with SYS_ prefix */
-
-#define SYS_restart_syscall      0
-#define SYS_exit		  1
-#define SYS_fork		  2
-#define SYS_read		  3
-#define SYS_write		  4
-#define SYS_open		  5
-#define SYS_close		  6
-#define SYS_waitpid		  7
-#define SYS_creat		  8
-#define SYS_link		  9
-#define SYS_unlink		 10
-#define SYS_execve		 11
-#define SYS_chdir		 12
-#define SYS_time		 13
-#define SYS_mknod		 14
-#define SYS_chmod		 15
-#define SYS_lchown		 16
-#define SYS_break		 17
-#define SYS_oldstat		 18
-#define SYS_lseek		 19
-#define SYS_getpid		 20
-#define SYS_mount		 21
-#define SYS_umount		 22
-#define SYS_setuid		 23
-#define SYS_getuid		 24
-#define SYS_stime		 25
-#define SYS_ptrace		 26
-#define SYS_alarm		 27
-#define SYS_oldfstat		 28
-#define SYS_pause		 29
-#define SYS_utime		 30
-#define SYS_stty		 31
-#define SYS_gtty		 32
-#define SYS_access		 33
-#define SYS_nice		 34
-#define SYS_ftime		 35
-#define SYS_sync		 36
-#define SYS_kill		 37
-#define SYS_rename		 38
-#define SYS_mkdir		 39
-#define SYS_rmdir		 40
-#define SYS_dup		 41
-#define SYS_pipe		 42
-#define SYS_times		 43
-#define SYS_prof		 44
-#define SYS_brk		 45
-#define SYS_setgid		 46
-#define SYS_getgid		 47
-#define SYS_signal		 48
-#define SYS_geteuid		 49
-#define SYS_getegid		 50
-#define SYS_acct		 51
-#define SYS_umount2		 52
-#define SYS_lock		 53
-#define SYS_ioctl		 54
-#define SYS_fcntl		 55
-#define SYS_mpx		 56
-#define SYS_setpgid		 57
-#define SYS_ulimit		 58
-#define SYS_oldolduname	 59
-#define SYS_umask		 60
-#define SYS_chroot		 61
-#define SYS_ustat		 62
-#define SYS_dup2		 63
-#define SYS_getppid		 64
-#define SYS_getpgrp		 65
-#define SYS_setsid		 66
-#define SYS_sigaction		 67
-#define SYS_sgetmask		 68
-#define SYS_ssetmask		 69
-#define SYS_setreuid		 70
-#define SYS_setregid		 71
-#define SYS_sigsuspend		 72
-#define SYS_sigpending		 73
-#define SYS_sethostname	 74
-#define SYS_setrlimit		 75
-#define SYS_getrlimit		 76   /* Back compatible 2Gig limited rlimit */
-#define SYS_getrusage		 77
-#define SYS_gettimeofday	 78
-#define SYS_settimeofday	 79
-#define SYS_getgroups		 80
-#define SYS_setgroups		 81
-#define SYS_select		 82
-#define SYS_symlink		 83
-#define SYS_oldlstat		 84
-#define SYS_readlink		 85
-#define SYS_uselib		 86
-#define SYS_swapon		 87
-#define SYS_reboot		 88
-#define SYS_readdir		 89
-#define SYS_mmap		 90
-#define SYS_munmap		 91
-#define SYS_truncate		 92
-#define SYS_ftruncate		 93
-#define SYS_fchmod		 94
-#define SYS_fchown		 95
-#define SYS_getpriority	 96
-#define SYS_setpriority	 97
-#define SYS_profil		 98
-#define SYS_statfs		99
-#define SYS_fstatfs		100
-#define SYS_ioperm		101
-#define SYS_socketcall		102
-#define SYS_syslog		103
-#define SYS_setitimer		104
-#define SYS_getitimer		105
-#define SYS_stat		106
-#define SYS_lstat		107
-#define SYS_fstat		108
-#define SYS_olduname		109
-#define SYS_iopl		110
-#define SYS_vhangup		111
-#define SYS_idle		112
-#define SYS_vm86old		113
-#define SYS_wait4		114
-#define SYS_swapoff		115
-#define SYS_sysinfo		116
-#define SYS_ipc		117
-#define SYS_fsync		118
-#define SYS_sigreturn		119
-#define SYS_clone		120
-#define SYS_setdomainname	121
-#define SYS_uname		122
-#define SYS_modify_ldt		123
-#define SYS_adjtimex		124
-#define SYS_mprotect		125
-#define SYS_sigprocmask	126
-#define SYS_create_module	127
-#define SYS_init_module	128
-#define SYS_delete_module	129
-#define SYS_get_kernel_syms	130
-#define SYS_quotactl		131
-#define SYS_getpgid		132
-#define SYS_fchdir		133
-#define SYS_bdflush		134
-#define SYS_sysfs		135
-#define SYS_personality	136
-#define SYS_afs_syscall	137
-#define SYS_setfsuid		138
-#define SYS_setfsgid		139
-//#define SYS__llseek		140
-#define SYS_getdents		141
-#define SYS__newselect		142
-#define SYS_flock		143
-#define SYS_msync		144
-#define SYS_readv		145
-#define SYS_writev		146
-#define SYS_getsid		147
-#define SYS_fdatasync		148
-#define SYS__sysctl		149
-#define SYS_mlock		150
-#define SYS_munlock		151
-#define SYS_mlockall		152
-#define SYS_munlockall		153
-#define SYS_sched_setparam		154
-#define SYS_sched_getparam		155
-#define SYS_sched_setscheduler		156
-#define SYS_sched_getscheduler		157
-#define SYS_sched_yield		158
-#define SYS_sched_get_priority_max	159
-#define SYS_sched_get_priority_min	160
-#define SYS_sched_rr_get_interval	161
-#define SYS_nanosleep		162
-#define SYS_mremap		163
-#define SYS_setresuid		164
-#define SYS_getresuid		165
-#define SYS_vm86		166
-#define SYS_query_module	167
-#define SYS_poll		168
-#define SYS_nfsservctl		169
-#define SYS_setresgid		170
-#define SYS_getresgid		171
-#define SYS_prctl              172
-#define SYS_rt_sigreturn	173
-#define SYS_rt_sigaction	174
-#define SYS_rt_sigprocmask	175
-#define SYS_rt_sigpending	176
-#define SYS_rt_sigtimedwait	177
-#define SYS_rt_sigqueueinfo	178
-#define SYS_rt_sigsuspend	179
-#define SYS_pread64		180
-#define SYS_pwrite64		181
-#define SYS_chown		182
-#define SYS_getcwd		183
-#define SYS_capget		184
-#define SYS_capset		185
-#define SYS_sigaltstack	186
-#define SYS_sendfile		187
-#define SYS_getpmsg		188
-#define SYS_putpmsg		189
-#define SYS_vfork		190
-#define SYS_ugetrlimit		191
-#define SYS_mmap2		192
-#define SYS_truncate64		193
-#define SYS_ftruncate64	194
-#define SYS_stat64		195
-#define SYS_lstat64		196
-#define SYS_fstat64		197
-#define SYS_lchown32		198
-#define SYS_getuid32		199
-#define SYS_getgid32		200
-#define SYS_geteuid32		201
-#define SYS_getegid32		202
-#define SYS_setreuid32		203
-#define SYS_setregid32		204
-#define SYS_getgroups32	205
-#define SYS_setgroups32	206
-#define SYS_fchown32		207
-#define SYS_setresuid32	208
-#define SYS_getresuid32	209
-#define SYS_setresgid32	210
-#define SYS_getresgid32	211
-#define SYS_chown32		212
-#define SYS_setuid32		213
-#define SYS_setgid32		214
-#define SYS_setfsuid32		215
-#define SYS_setfsgid32		216
-#define SYS_pivot_root		217
-#define SYS_mincore		218
-#define SYS_madvise		219
-#define SYS_madvise1		219
-#define SYS_getdents64		220
-#define SYS_fcntl64		221
-/* 223 is unused */
-#define SYS_gettid		224
-#define SYS_readahead		225
-#define SYS_setxattr		226
-#define SYS_lsetxattr		227
-#define SYS_fsetxattr		228
-#define SYS_getxattr		229
-#define SYS_lgetxattr		230
-#define SYS_fgetxattr		231
-#define SYS_listxattr		232
-#define SYS_llistxattr		233
-#define SYS_flistxattr		234
-#define SYS_removexattr	235
-#define SYS_lremovexattr	236
-#define SYS_fremovexattr	237
-#define SYS_tkill		238
-#define SYS_sendfile64		239
-#define SYS_futex		240
-#define SYS_sched_setaffinity	241
-#define SYS_sched_getaffinity	242
-#define SYS_set_thread_area	243
-#define SYS_get_thread_area	244
-#define SYS_io_setup		245
-#define SYS_io_destroy		246
-#define SYS_io_getevents	247
-#define SYS_io_submit		248
-#define SYS_io_cancel		249
-#define SYS_fadvise64		250
-/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
-#define SYS_exit_group		252
-#define SYS_lookup_dcookie	253
-#define SYS_epoll_create	254
-#define SYS_epoll_ctl		255
-#define SYS_epoll_wait		256
-#define SYS_remap_file_pages	257
-#define SYS_set_tid_address	258
-#define SYS_timer_create	259
-#define SYS_timer_settime	(SYS_timer_create+1)
-#define SYS_timer_gettime	(SYS_timer_create+2)
-#define SYS_timer_getoverrun	(SYS_timer_create+3)
-#define SYS_timer_delete	(SYS_timer_create+4)
-#define SYS_clock_settime	(SYS_timer_create+5)
-#define SYS_clock_gettime	(SYS_timer_create+6)
-#define SYS_clock_getres	(SYS_timer_create+7)
-#define SYS_clock_nanosleep	(SYS_timer_create+8)
-#define SYS_statfs64		268
-#define SYS_fstatfs64		269
-#define SYS_tgkill		270
-#define SYS_utimes		271
-#define SYS_fadvise64_64	272
-#define SYS_vserver		273
-#define SYS_mbind		274
-#define SYS_get_mempolicy	275
-#define SYS_set_mempolicy	276
-#define SYS_mq_open 		277
-#define SYS_mq_unlink		(SYS_mq_open+1)
-#define SYS_mq_timedsend	(SYS_mq_open+2)
-#define SYS_mq_timedreceive	(SYS_mq_open+3)
-#define SYS_mq_notify		(SYS_mq_open+4)
-#define SYS_mq_getsetattr	(SYS_mq_open+5)
-#define SYS_kexec_load		283
-#define SYS_waitid		284
-/* #define SYS_sys_setaltroot	285 */
-#define SYS_add_key		286
-#define SYS_request_key	287
-#define SYS_keyctl		288
-#define SYS_ioprio_set		289
-#define SYS_ioprio_get		290
-#define SYS_inotify_init	291
-#define SYS_inotify_add_watch	292
-#define SYS_inotify_rm_watch	293
-#define SYS_migrate_pages	294
-#define SYS_openat		295
-#define SYS_mkdirat		296
-#define SYS_mknodat		297
-#define SYS_fchownat		298
-#define SYS_futimesat		299
-#define SYS_fstatat64		300
-#define SYS_unlinkat		301
-#define SYS_renameat		302
-#define SYS_linkat		303
-#define SYS_symlinkat		304
-#define SYS_readlinkat		305
-#define SYS_fchmodat		306
-#define SYS_faccessat		307
-#define SYS_pselect6		308
-#define SYS_ppoll		309
-#define SYS_unshare		310
-#define SYS_set_robust_list	311
-#define SYS_get_robust_list	312
-#define SYS_splice		313
-#define SYS_sync_file_range	314
-#define SYS_tee		315
-#define SYS_vmsplice		316
-#define SYS_move_pages		317
-#define SYS_getcpu		318
-#define SYS_epoll_pwait	319
-#define SYS_utimensat		320
-#define SYS_signalfd		321
-#define SYS_timerfd_create	322
-#define SYS_eventfd		323
-#define SYS_fallocate		324
-#define SYS_timerfd_settime	325
-#define SYS_timerfd_gettime	326
-#define SYS_signalfd4		327
-#define SYS_eventfd2		328
-#define SYS_epoll_create1	329
-#define SYS_dup3		330
-#define SYS_pipe2		331
-#define SYS_inotify_init1	332
-#define SYS_preadv		333
-#define SYS_pwritev		334
-#define SYS_rt_tgsigqueueinfo	335
-#define SYS_perf_event_open	336
-#define SYS_recvmmsg		337
-#define SYS_fanotify_init	338
-#define SYS_fanotify_mark	339
-#define SYS_prlimit64		340
-#define SYS_name_to_handle_at	341
-#define SYS_open_by_handle_at	342
-#define SYS_clock_adjtime	343
-#define SYS_syncfs		344
-#define SYS_sendmmsg		345
-#define SYS_setns		346
-#define SYS_process_vm_readv	347
-#define SYS_process_vm_writev	348
-#define SYS_kcmp		349
-#define SYS_finit_module	350
-#define SYS_sched_setattr	351
-#define SYS_sched_getattr	352
-#define SYS_renameat2		353
-#define SYS_seccomp		354
-#define SYS_getrandom		355
-#define SYS_memfd_create	356
-#define SYS_bpf			357
-#define SYS_execveat		358
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/termios.h
deleted file mode 100644
index f0d81b138f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/termios.h
+++ /dev/null
@@ -1,160 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/user.h b/src/components/lib/libc/musl-1.1.11/arch/i386/bits/user.h
deleted file mode 100644
index fa623621ee..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/user.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
-
-typedef struct user_fpregs_struct
-{
-	long cwd, swd, twd, fip, fcs, foo, fos, st_space[20];
-} elf_fpregset_t;
-
-typedef struct user_fpxregs_struct
-{
-	unsigned short cwd, swd, twd, fop;
-	long fip, fcs, foo, fos, mxcsr, reserved;
-	long st_space[32], xmm_space[32], padding[56];
-} elf_fpxregset_t;
-
-struct user_regs_struct
-{
-	long ebx, ecx, edx, esi, edi, ebp, eax, xds, xes, xfs, xgs;
-	long orig_eax, eip, xcs, eflags, esp, xss;
-};
-
-#define ELF_NGREG 17
-typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
-
-struct user
-{
-	struct user_regs_struct		regs;
-	int				u_fpvalid;
-	struct user_fpregs_struct	i387;
-	unsigned long			u_tsize;
-	unsigned long			u_dsize;
-	unsigned long			u_ssize;
-	unsigned long			start_code;
-	unsigned long			start_stack;
-	long				signal;
-	int				reserved;
-	struct user_regs_struct		*u_ar0;
-	struct user_fpregs_struct	*u_fpstate;
-	unsigned long			magic;
-	char				u_comm[32];
-	int				u_debugreg[8];
-};
-
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
-#define UPAGES			1
-#define HOST_TEXT_START_ADDR	(u.start_code)
-#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/i386/pthread_arch.h
deleted file mode 100644
index 1c06c7641d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/pthread_arch.h
+++ /dev/null
@@ -1,10 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-	struct pthread *self;
-	__asm__ __volatile__ ("movl %%gs:0,%0" : "=r" (self) );
-	return self;
-}
-
-#define TP_ADJ(p) (p)
-
-#define CANCEL_REG_IP 14
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/i386/reloc.h
deleted file mode 100644
index b52ef4024e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/reloc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#define LDSO_ARCH "i386"
-
-#define REL_SYMBOLIC    R_386_32
-#define REL_OFFSET      R_386_PC32
-#define REL_GOT         R_386_GLOB_DAT
-#define REL_PLT         R_386_JMP_SLOT
-#define REL_RELATIVE    R_386_RELATIVE
-#define REL_COPY        R_386_COPY
-#define REL_DTPMOD      R_386_TLS_DTPMOD32
-#define REL_DTPOFF      R_386_TLS_DTPOFF32
-#define REL_TPOFF       R_386_TLS_TPOFF
-#define REL_TPOFF_NEG   R_386_TLS_TPOFF32
-#define REL_TLSDESC     R_386_TLS_DESC
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"mov %1,%%esp ; jmp *%0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/i386/syscall_arch.h
deleted file mode 100644
index 11df647fea..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/i386/syscall_arch.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
-
-extern __attribute__((regparm(1))) long
-__cos_syscall(int, long, long, long, long, long, long, long);
-
-static inline long __syscall0(long n)
-{
-	return __cos_syscall(n, 0, 0, 0, 0, 0, 0, 0);
-	/*unsigned long __ret;
-	__asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n) : "memory");
-	return __ret;*/
-}
-
-static inline long __syscall1(long n, long a1)
-{
-	return __cos_syscall(n, a1, 0, 0, 0, 0, 0, 0);
-	/*unsigned long __ret;
-	__asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1) : "memory");
-	return __ret;*/
-}
-
-static inline long __syscall2(long n, long a1, long a2)
-{
-	return __cos_syscall(n, a1, a2, 0, 0, 0, 0, 0);
-	/*unsigned long __ret;
-	__asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2) : "memory");
-	return __ret;*/
-}
-
-static inline long __syscall3(long n, long a1, long a2, long a3)
-{
-	return __cos_syscall(n, a1, a2, a3, 0, 0, 0, 0);
-	/*unsigned long __ret;
-	__asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3) : "memory");
-	return __ret;*/
-}
-
-static inline long __syscall4(long n, long a1, long a2, long a3, long a4)
-{
-	return __cos_syscall(n, a1, a2, a3, a4, 0, 0, 0);
-	/*unsigned long __ret;
-	__asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4) : "memory");
-	return __ret;*/
-}
-
-static inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5)
-{
-	return __cos_syscall(n, a1, a2, a3, a4, a5, 0, 0);
-	/*unsigned long __ret;
-	__asm__ __volatile__ ("push %6 ; .hidden __vsyscall ; call __vsyscall ; add $4,%%esp" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4), "g"(a5) : "memory");
-	return __ret;*/
-}
-
-static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6)
-{
-	return __cos_syscall(n, a1, a2, a3, a4, a5, a6, 0);
-	/*unsigned long __ret;
-	__asm__ __volatile__ ("push %6 ; .hidden __vsyscall6 ; call __vsyscall6 ; add $4,%%esp" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4), "g"(0+(long[]){a5, a6}) : "memory");
-	return __ret;*/
-}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/atomic.h
deleted file mode 100644
index 93404b9484..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/atomic.h
+++ /dev/null
@@ -1,143 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_l(unsigned long x)
-{
-	static const char debruijn32[32] = {
-		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-	};
-	return debruijn32[(x&-x)*0x076be629 >> 27];
-}
-
-static inline int a_ctz_64(uint64_t x)
-{
-	uint32_t y = x;
-	if (!y) {
-		y = x>>32;
-		return 32 + a_ctz_l(y);
-	}
-	return a_ctz_l(y);
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	register int old, tmp;
-	__asm__ __volatile__ (
-		"	addi %0, r0, 0\n"
-		"1:	lwx %0, %2, r0\n"
-		"	rsubk %1, %0, %3\n"
-		"	bnei %1, 1f\n"
-		"	swx %4, %2, r0\n"
-		"	addic %1, r0, 0\n"
-		"	bnei %1, 1b\n"
-		"1:	"
-		: "=&r"(old), "=&r"(tmp)
-		: "r"(p), "r"(t), "r"(s)
-		: "cc", "memory" );
-	return old;
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	return (void *)a_cas(p, (int)t, (int)s);
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	register int old, tmp;
-	__asm__ __volatile__ (
-		"	addi %0, r0, 0\n"
-		"1:	lwx %0, %2, r0\n"
-		"	swx %3, %2, r0\n"
-		"	addic %1, r0, 0\n"
-		"	bnei %1, 1b\n"
-		"1:	"
-		: "=&r"(old), "=&r"(tmp)
-		: "r"(x), "r"(v)
-		: "cc", "memory" );
-	return old;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	register int new, tmp;
-	__asm__ __volatile__ (
-		"	addi %0, r0, 0\n"
-		"1:	lwx %0, %2, r0\n"
-		"	addk %0, %0, %3\n"
-		"	swx %0, %2, r0\n"
-		"	addic %1, r0, 0\n"
-		"	bnei %1, 1b\n"
-		"1:	"
-		: "=&r"(new), "=&r"(tmp)
-		: "r"(x), "r"(v)
-		: "cc", "memory" );
-	return new-v;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	a_fetch_add(x, 1);
-}
-
-static inline void a_dec(volatile int *x)
-{
-	a_fetch_add(x, -1);
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__ __volatile__ (
-		"swi %1, %0"
-		: "=m"(*p) : "r"(x) : "memory" );
-}
-
-#define a_spin a_barrier
-
-static inline void a_barrier()
-{
-	a_cas(&(int){0}, 0, 0);
-}
-
-static inline void a_crash()
-{
-	*(volatile char *)0=0;
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (a_cas(p, old, old&v) != old);
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (a_cas(p, old, old|v) != old);
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	a_or(p, v);
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_and((int *)p, u.r[0]);
-	a_and((int *)p+1, u.r[1]);
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_or((int *)p, u.r[0]);
-	a_or((int *)p+1, u.r[1]);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/alltypes.h.in
deleted file mode 100644
index 66ca18ad61..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/alltypes.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg int
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF int wchar_t;
-#endif
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/endian.h
deleted file mode 100644
index d82a92acc7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/endian.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#if __MICROBLAZEEL__
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#else
-#define __BYTE_ORDER __BIG_ENDIAN
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/errno.h
deleted file mode 100644
index d2e1eeee05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/fcntl.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/fcntl.h
deleted file mode 100644
index ae233cc003..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/fcntl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#define O_CREAT        0100
-#define O_EXCL         0200
-#define O_NOCTTY       0400
-#define O_TRUNC       01000
-#define O_APPEND      02000
-#define O_NONBLOCK    04000
-#define O_DSYNC      010000
-#define O_SYNC     04010000
-#define O_RSYNC    04010000
-#define O_DIRECTORY 0200000
-#define O_NOFOLLOW  0400000
-#define O_CLOEXEC  02000000
-
-#define O_ASYNC      020000
-#define O_DIRECT     040000
-#define O_LARGEFILE 0100000
-#define O_NOATIME  01000000
-#define O_PATH    010000000
-#define O_TMPFILE 020200000
-#define O_NDELAY O_NONBLOCK
-
-#define F_DUPFD  0
-#define F_GETFD  1
-#define F_SETFD  2
-#define F_GETFL  3
-#define F_SETFL  4
-
-#define F_SETOWN 8
-#define F_GETOWN 9
-#define F_SETSIG 10
-#define F_GETSIG 11
-
-#define F_GETLK 12
-#define F_SETLK 13
-#define F_SETLKW 14
-
-#define F_SETOWN_EX 15
-#define F_GETOWN_EX 16
-
-#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/ioctl.h
deleted file mode 100644
index 9d75118e0e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/ioctl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGPTN	0x80045430
-#define TIOCSPTLCK	0x40045431
-#define TCGETX		0x5432
-#define TCSETX		0x5433
-#define TCSETXF		0x5434
-#define TCSETXW		0x5435
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR   0x5459
-#define TIOCSERGETMULTI 0x545A
-#define TIOCSERSETMULTI 0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-#define FIOQSIZE	0x5460
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE		0x89F0
-#define SIOCPROTOPRIVATE	0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/ipc.h
deleted file mode 100644
index b748d3b742..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/ipc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long __pad1;
-	long __pad2;
-};
-
-#define IPC_64 0x100
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/limits.h
deleted file mode 100644
index fbc6d238dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/limits.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/mman.h
deleted file mode 100644
index cc854aaee8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/mman.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define	PROT_GROWSDOWN 0x01000000
-#define	PROT_GROWSUP   0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/msg.h
deleted file mode 100644
index 3db8576b78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/msg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	int __unused1;
-	time_t msg_rtime;
-	int __unused2;
-	time_t msg_ctime;
-	int __unused3;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/sem.h
deleted file mode 100644
index c629b81ebb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/sem.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t __unused1;
-	time_t sem_ctime;
-	time_t __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/shm.h
deleted file mode 100644
index 547581f1a7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/shm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	int __unused1;
-	time_t shm_dtime;
-	int __unused2;
-	time_t shm_ctime;
-	int __unused3;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/signal.h
deleted file mode 100644
index 4aa231a2f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/signal.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 2048
-#define SIGSTKSZ 8192
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-typedef unsigned long greg_t, gregset_t[38];
-typedef struct sigcontext
-{
-	struct {
-		unsigned long r0, r1, r2, r3, r4, r5, r6, r7;
-		unsigned long r8, r9, r10, r11, r12, r13, r14, r15;
-		unsigned long r16, r17, r18, r19, r20, r21, r22, r23;
-		unsigned long r24, r25, r26, r27, r28, r29, r30, r31;
-		unsigned long pc, msr, ear, esr, fsr;
-		int pt_mode;
-	} regs;
-	unsigned long oldmask;
-} mcontext_t;
-#else
-typedef struct {
-	unsigned long __regs[39];
-} mcontext_t;
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct __ucontext *uc_link;
-	stack_t uc_stack;
-	mcontext_t uc_mcontext;
-	sigset_t uc_sigmask;
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  2
-#define SA_SIGINFO    4
-#define SA_ONSTACK    0x08000000
-#define SA_RESTART    0x10000000
-#define SA_NODEFER    0x40000000
-#define SA_RESETHAND  0x80000000
-#define SA_RESTORER   0x04000000
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGBUS    7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGUSR1   10
-#define SIGSEGV   11
-#define SIGUSR2   12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGSTKFLT 16
-#define SIGCHLD   17
-#define SIGCONT   18
-#define SIGSTOP   19
-#define SIGTSTP   20
-#define SIGTTIN   21
-#define SIGTTOU   22
-#define SIGURG    23
-#define SIGXCPU   24
-#define SIGXFSZ   25
-#define SIGVTALRM 26
-#define SIGPROF   27
-#define SIGWINCH  28
-#define SIGIO     29
-#define SIGPOLL   29
-#define SIGPWR    30
-#define SIGSYS    31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/socket.h
deleted file mode 100644
index 36febbc222..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/socket.h
+++ /dev/null
@@ -1,17 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen;
-	void *msg_control;
-	socklen_t msg_controllen;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stat.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stat.h
deleted file mode 100644
index a8c0283ddf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stat.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* copied from kernel definition, but with padding replaced
- * by the corresponding correctly-sized userspace types. */
-
-struct stat
-{
-	dev_t st_dev;
-	ino_t st_ino;
-	mode_t st_mode;
-	nlink_t st_nlink;
-	uid_t st_uid;
-	gid_t st_gid;
-	dev_t st_rdev;
-	long long __st_rdev_padding;
-	off_t st_size;
-	blksize_t st_blksize;
-	int __st_blksize_padding;
-	blkcnt_t st_blocks;
-	struct timespec st_atim;
-	struct timespec st_mtim;
-	struct timespec st_ctim;
-	unsigned __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/statfs.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/statfs.h
deleted file mode 100644
index f103f4e4f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct statfs {
-	unsigned long f_type, f_bsize;
-	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-	fsfilcnt_t f_files, f_ffree;
-	fsid_t f_fsid;
-	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/syscall.h
deleted file mode 100644
index e386d73caf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/syscall.h
+++ /dev/null
@@ -1,774 +0,0 @@
-#define __NR_restart_syscall 0
-#define __NR_exit 1
-#define __NR_fork 2
-#define __NR_read 3
-#define __NR_write 4
-#define __NR_open 5
-#define __NR_close 6
-#define __NR_waitpid 7
-#define __NR_creat 8
-#define __NR_link 9
-#define __NR_unlink 10
-#define __NR_execve 11
-#define __NR_chdir 12
-#define __NR_time 13
-#define __NR_mknod 14
-#define __NR_chmod 15
-#define __NR_lchown 16
-#define __NR_break 17
-#define __NR_oldstat 18
-#define __NR_lseek 19
-#define __NR_getpid 20
-#define __NR_mount 21
-#define __NR_umount 22
-#define __NR_setuid 23
-#define __NR_getuid 24
-#define __NR_stime 25
-#define __NR_ptrace 26
-#define __NR_alarm 27
-#define __NR_oldfstat 28
-#define __NR_pause 29
-#define __NR_utime 30
-#define __NR_stty 31
-#define __NR_gtty 32
-#define __NR_access 33
-#define __NR_nice 34
-#define __NR_ftime 35
-#define __NR_sync 36
-#define __NR_kill 37
-#define __NR_rename 38
-#define __NR_mkdir 39
-#define __NR_rmdir 40
-#define __NR_dup 41
-#define __NR_pipe 42
-#define __NR_times 43
-#define __NR_prof 44
-#define __NR_brk 45
-#define __NR_setgid 46
-#define __NR_getgid 47
-#define __NR_signal 48
-#define __NR_geteuid 49
-#define __NR_getegid 50
-#define __NR_acct 51
-#define __NR_umount2 52
-#define __NR_lock 53
-#define __NR_ioctl 54
-#define __NR_fcntl 55
-#define __NR_mpx 56
-#define __NR_setpgid 57
-#define __NR_ulimit 58
-#define __NR_oldolduname 59
-#define __NR_umask 60
-#define __NR_chroot 61
-#define __NR_ustat 62
-#define __NR_dup2 63
-#define __NR_getppid 64
-#define __NR_getpgrp 65
-#define __NR_setsid 66
-#define __NR_sigaction 67
-#define __NR_sgetmask 68
-#define __NR_ssetmask 69
-#define __NR_setreuid 70
-#define __NR_setregid 71
-#define __NR_sigsuspend 72
-#define __NR_sigpending 73
-#define __NR_sethostname 74
-#define __NR_setrlimit 75
-#define __NR_getrlimit 76
-#define __NR_getrusage 77
-#define __NR_gettimeofday 78
-#define __NR_settimeofday 79
-#define __NR_getgroups 80
-#define __NR_setgroups 81
-#define __NR_select 82
-#define __NR_symlink 83
-#define __NR_oldlstat 84
-#define __NR_readlink 85
-#define __NR_uselib 86
-#define __NR_swapon 87
-#define __NR_reboot 88
-#define __NR_readdir 89
-#define __NR_mmap 90
-#define __NR_munmap 91
-#define __NR_truncate 92
-#define __NR_ftruncate 93
-#define __NR_fchmod 94
-#define __NR_fchown 95
-#define __NR_getpriority 96
-#define __NR_setpriority 97
-#define __NR_profil 98
-#define __NR_statfs 99
-#define __NR_fstatfs 100
-#define __NR_ioperm 101
-#define __NR_socketcall 102
-#define __NR_syslog 103
-#define __NR_setitimer 104
-#define __NR_getitimer 105
-#define __NR_stat 106
-#define __NR_lstat 107
-#define __NR_fstat 108
-#define __NR_olduname 109
-#define __NR_iopl 110
-#define __NR_vhangup 111
-#define __NR_idle 112
-#define __NR_vm86old 113
-#define __NR_wait4 114
-#define __NR_swapoff 115
-#define __NR_sysinfo 116
-#define __NR_ipc 117
-#define __NR_fsync 118
-#define __NR_sigreturn 119
-#define __NR_clone 120
-#define __NR_setdomainname 121
-#define __NR_uname 122
-#define __NR_modify_ldt 123
-#define __NR_adjtimex 124
-#define __NR_mprotect 125
-#define __NR_sigprocmask 126
-#define __NR_create_module 127
-#define __NR_init_module 128
-#define __NR_delete_module 129
-#define __NR_get_kernel_syms 130
-#define __NR_quotactl 131
-#define __NR_getpgid 132
-#define __NR_fchdir 133
-#define __NR_bdflush 134
-#define __NR_sysfs 135
-#define __NR_personality 136
-#define __NR_afs_syscall 137
-#define __NR_setfsuid 138
-#define __NR_setfsgid 139
-#define __NR__llseek 140
-#define __NR_getdents 141
-#define __NR__newselect 142
-#define __NR_flock 143
-#define __NR_msync 144
-#define __NR_readv 145
-#define __NR_writev 146
-#define __NR_getsid 147
-#define __NR_fdatasync 148
-#define __NR__sysctl 149
-#define __NR_mlock 150
-#define __NR_munlock 151
-#define __NR_mlockall 152
-#define __NR_munlockall 153
-#define __NR_sched_setparam 154
-#define __NR_sched_getparam 155
-#define __NR_sched_setscheduler 156
-#define __NR_sched_getscheduler 157
-#define __NR_sched_yield 158
-#define __NR_sched_get_priority_max 159
-#define __NR_sched_get_priority_min 160
-#define __NR_sched_rr_get_interval 161
-#define __NR_nanosleep 162
-#define __NR_mremap 163
-#define __NR_setresuid 164
-#define __NR_getresuid 165
-#define __NR_vm86 166
-#define __NR_query_module 167
-#define __NR_poll 168
-#define __NR_nfsservctl 169
-#define __NR_setresgid 170
-#define __NR_getresgid 171
-#define __NR_prctl 172
-#define __NR_rt_sigreturn 173
-#define __NR_rt_sigaction 174
-#define __NR_rt_sigprocmask 175
-#define __NR_rt_sigpending 176
-#define __NR_rt_sigtimedwait 177
-#define __NR_rt_sigqueueinfo 178
-#define __NR_rt_sigsuspend 179
-#define __NR_pread 180
-#define __NR_pwrite 181
-#define __NR_chown 182
-#define __NR_getcwd 183
-#define __NR_capget 184
-#define __NR_capset 185
-#define __NR_sigaltstack 186
-#define __NR_sendfile 187
-#define __NR_getpmsg 188
-#define __NR_putpmsg 189
-#define __NR_vfork 190
-#define __NR_ugetrlimit 191
-#define __NR_mmap2 192
-#define __NR_truncate64 193
-#define __NR_ftruncate64 194
-#define __NR_stat64 195
-#define __NR_lstat64 196
-#define __NR_fstat64 197
-#define __NR_lchown32 198
-#define __NR_getuid32 199
-#define __NR_getgid32 200
-#define __NR_geteuid32 201
-#define __NR_getegid32 202
-#define __NR_setreuid32 203
-#define __NR_setregid32 204
-#define __NR_getgroups32 205
-#define __NR_setgroups32 206
-#define __NR_fchown32 207
-#define __NR_setresuid32 208
-#define __NR_getresuid32 209
-#define __NR_setresgid32 210
-#define __NR_getresgid32 211
-#define __NR_chown32 212
-#define __NR_setuid32 213
-#define __NR_setgid32 214
-#define __NR_setfsuid32 215
-#define __NR_setfsgid32 216
-#define __NR_pivot_root 217
-#define __NR_mincore 218
-#define __NR_madvise 219
-#define __NR_getdents64 220
-#define __NR_fcntl64 221
-#define __NR_gettid 224
-#define __NR_readahead 225
-#define __NR_setxattr 226
-#define __NR_lsetxattr 227
-#define __NR_fsetxattr 228
-#define __NR_getxattr 229
-#define __NR_lgetxattr 230
-#define __NR_fgetxattr 231
-#define __NR_listxattr 232
-#define __NR_llistxattr 233
-#define __NR_flistxattr 234
-#define __NR_removexattr 235
-#define __NR_lremovexattr 236
-#define __NR_fremovexattr 237
-#define __NR_tkill 238
-#define __NR_sendfile64 239
-#define __NR_futex 240
-#define __NR_sched_setaffinity 241
-#define __NR_sched_getaffinity 242
-#define __NR_set_thread_area 243
-#define __NR_get_thread_area 244
-#define __NR_io_setup 245
-#define __NR_io_destroy 246
-#define __NR_io_getevents 247
-#define __NR_io_submit 248
-#define __NR_io_cancel 249
-#define __NR_fadvise 250
-#define __NR_exit_group 252
-#define __NR_lookup_dcookie 253
-#define __NR_epoll_create 254
-#define __NR_epoll_ctl 255
-#define __NR_epoll_wait 256
-#define __NR_remap_file_pages 257
-#define __NR_set_tid_address 258
-#define __NR_timer_create 259
-#define __NR_timer_settime 260
-#define __NR_timer_gettime 261
-#define __NR_timer_getoverrun 262
-#define __NR_timer_delete 263
-#define __NR_clock_settime 264
-#define __NR_clock_gettime 265
-#define __NR_clock_getres 266
-#define __NR_clock_nanosleep 267
-#define __NR_statfs64 268
-#define __NR_fstatfs64 269
-#define __NR_tgkill 270
-#define __NR_utimes 271
-#define __NR_fadvise64_64 272
-#define __NR_vserver 273
-#define __NR_mbind 274
-#define __NR_get_mempolicy 275
-#define __NR_set_mempolicy 276
-#define __NR_mq_open 277
-#define __NR_mq_unlink 278
-#define __NR_mq_timedsend 279
-#define __NR_mq_timedreceive 280
-#define __NR_mq_notify 281
-#define __NR_mq_getsetattr 282
-#define __NR_kexec_load 283
-#define __NR_waitid 284
-#define __NR_add_key 286
-#define __NR_request_key 287
-#define __NR_keyctl 288
-#define __NR_ioprio_set 289
-#define __NR_ioprio_get 290
-#define __NR_inotify_init 291
-#define __NR_inotify_add_watch 292
-#define __NR_inotify_rm_watch 293
-#define __NR_migrate_pages 294
-#define __NR_openat 295
-#define __NR_mkdirat 296
-#define __NR_mknodat 297
-#define __NR_fchownat 298
-#define __NR_futimesat 299
-#define __NR_fstatat 300
-#define __NR_unlinkat 301
-#define __NR_renameat 302
-#define __NR_linkat 303
-#define __NR_symlinkat 304
-#define __NR_readlinkat 305
-#define __NR_fchmodat 306
-#define __NR_faccessat 307
-#define __NR_pselect6 308
-#define __NR_ppoll 309
-#define __NR_unshare 310
-#define __NR_set_robust_list 311
-#define __NR_get_robust_list 312
-#define __NR_splice 313
-#define __NR_sync_file_range 314
-#define __NR_tee 315
-#define __NR_vmsplice 316
-#define __NR_move_pages 317
-#define __NR_getcpu 318
-#define __NR_epoll_pwait 319
-#define __NR_utimensat 320
-#define __NR_signalfd 321
-#define __NR_timerfd_create 322
-#define __NR_eventfd 323
-#define __NR_fallocate 324
-#define __NR_semtimedop 325
-#define __NR_timerfd_settime 326
-#define __NR_timerfd_gettime 327
-#define __NR_semctl 328
-#define __NR_semget 329
-#define __NR_semop 330
-#define __NR_msgctl 331
-#define __NR_msgget 332
-#define __NR_msgrcv 333
-#define __NR_msgsnd 334
-#define __NR_shmat 335
-#define __NR_shmctl 336
-#define __NR_shmdt 337
-#define __NR_shmget 338
-#define __NR_signalfd4 339
-#define __NR_eventfd2 340
-#define __NR_epoll_create1 341
-#define __NR_dup3 342
-#define __NR_pipe2 343
-#define __NR_inotify_init1 344
-#define __NR_socket 345
-#define __NR_socketpair 346
-#define __NR_bind 347
-#define __NR_listen 348
-#define __NR_accept 349
-#define __NR_connect 350
-#define __NR_getsockname 351
-#define __NR_getpeername 352
-#define __NR_sendto 353
-#define __NR_send 354
-#define __NR_recvfrom 355
-#define __NR_recv 356
-#define __NR_setsockopt 357
-#define __NR_getsockopt 358
-#define __NR_shutdown 359
-#define __NR_sendmsg 360
-#define __NR_recvmsg 361
-#define __NR_accept4 362
-#define __NR_preadv 363
-#define __NR_pwritev 364
-#define __NR_rt_tgsigqueueinfo 365
-#define __NR_perf_event_open 366
-#define __NR_recvmmsg 367
-#define __NR_fanotify_init 368
-#define __NR_fanotify_mark 369
-#define __NR_prlimit64 370
-#define __NR_name_to_handle_at 371
-#define __NR_open_by_handle_at 372
-#define __NR_clock_adjtime 373
-#define __NR_syncfs 374
-#define __NR_setns 375
-#define __NR_sendmmsg 376
-#define __NR_process_vm_readv 377
-#define __NR_process_vm_writev 378
-#define __NR_kcmp 379
-#define __NR_finit_module 380
-#define __NR_sched_setattr 381
-#define __NR_sched_getattr 382
-#define __NR_renameat2 383
-#define __NR_seccomp 384
-#define __NR_getrandom 385
-#define __NR_memfd_create 386
-#define __NR_bpf 387
-#define __NR_execveat 388
-
-/* Repeated with SYS_ prefix */
-
-#define SYS_SYSCALL_BASE 0
-#define SYS_restart_syscall 0
-#define SYS_exit 1
-#define SYS_fork 2
-#define SYS_read 3
-#define SYS_write 4
-#define SYS_open 5
-#define SYS_close 6
-#define SYS_waitpid 7
-#define SYS_creat 8
-#define SYS_link 9
-#define SYS_unlink 10
-#define SYS_execve 11
-#define SYS_chdir 12
-#define SYS_time 13
-#define SYS_mknod 14
-#define SYS_chmod 15
-#define SYS_lchown 16
-#define SYS_break 17
-#define SYS_oldstat 18
-#define SYS_lseek 19
-#define SYS_getpid 20
-#define SYS_mount 21
-#define SYS_umount 22
-#define SYS_setuid 23
-#define SYS_getuid 24
-#define SYS_stime 25
-#define SYS_ptrace 26
-#define SYS_alarm 27
-#define SYS_oldfstat 28
-#define SYS_pause 29
-#define SYS_utime 30
-#define SYS_stty 31
-#define SYS_gtty 32
-#define SYS_access 33
-#define SYS_nice 34
-#define SYS_ftime 35
-#define SYS_sync 36
-#define SYS_kill 37
-#define SYS_rename 38
-#define SYS_mkdir 39
-#define SYS_rmdir 40
-#define SYS_dup 41
-#define SYS_pipe 42
-#define SYS_times 43
-#define SYS_prof 44
-#define SYS_brk 45
-#define SYS_setgid 46
-#define SYS_getgid 47
-#define SYS_signal 48
-#define SYS_geteuid 49
-#define SYS_getegid 50
-#define SYS_acct 51
-#define SYS_umount2 52
-#define SYS_lock 53
-#define SYS_ioctl 54
-#define SYS_fcntl 55
-#define SYS_mpx 56
-#define SYS_setpgid 57
-#define SYS_ulimit 58
-#define SYS_oldolduname 59
-#define SYS_umask 60
-#define SYS_chroot 61
-#define SYS_ustat 62
-#define SYS_dup2 63
-#define SYS_getppid 64
-#define SYS_getpgrp 65
-#define SYS_setsid 66
-#define SYS_sigaction 67
-#define SYS_sgetmask 68
-#define SYS_ssetmask 69
-#define SYS_setreuid 70
-#define SYS_setregid 71
-#define SYS_sigsuspend 72
-#define SYS_sigpending 73
-#define SYS_sethostname 74
-#define SYS_setrlimit 75
-#define SYS_getrlimit 76
-#define SYS_getrusage 77
-#define SYS_gettimeofday 78
-#define SYS_settimeofday 79
-#define SYS_getgroups 80
-#define SYS_setgroups 81
-#define SYS_select 82
-#define SYS_symlink 83
-#define SYS_oldlstat 84
-#define SYS_readlink 85
-#define SYS_uselib 86
-#define SYS_swapon 87
-#define SYS_reboot 88
-#define SYS_readdir 89
-#define SYS_mmap 90
-#define SYS_munmap 91
-#define SYS_truncate 92
-#define SYS_ftruncate 93
-#define SYS_fchmod 94
-#define SYS_fchown 95
-#define SYS_getpriority 96
-#define SYS_setpriority 97
-#define SYS_profil 98
-#define SYS_statfs 99
-#define SYS_fstatfs 100
-#define SYS_ioperm 101
-#define SYS_socketcall 102
-#define SYS_syslog 103
-#define SYS_setitimer 104
-#define SYS_getitimer 105
-#define SYS_stat 106
-#define SYS_lstat 107
-#define SYS_fstat 108
-#define SYS_olduname 109
-#define SYS_iopl 110
-#define SYS_vhangup 111
-#define SYS_idle 112
-#define SYS_vm86old 113
-#define SYS_wait4 114
-#define SYS_swapoff 115
-#define SYS_sysinfo 116
-#define SYS_ipc 117
-#define SYS_fsync 118
-#define SYS_sigreturn 119
-#define SYS_clone 120
-#define SYS_setdomainname 121
-#define SYS_uname 122
-#define SYS_modify_ldt 123
-#define SYS_adjtimex 124
-#define SYS_mprotect 125
-#define SYS_sigprocmask 126
-#define SYS_create_module 127
-#define SYS_init_module 128
-#define SYS_delete_module 129
-#define SYS_get_kernel_syms 130
-#define SYS_quotactl 131
-#define SYS_getpgid 132
-#define SYS_fchdir 133
-#define SYS_bdflush 134
-#define SYS_sysfs 135
-#define SYS_personality 136
-#define SYS_afs_syscall 137
-#define SYS_setfsuid 138
-#define SYS_setfsgid 139
-#define SYS__llseek 140
-#define SYS_getdents 141
-#define SYS__newselect 142
-#define SYS_flock 143
-#define SYS_msync 144
-#define SYS_readv 145
-#define SYS_writev 146
-#define SYS_getsid 147
-#define SYS_fdatasync 148
-#define SYS__sysctl 149
-#define SYS_mlock 150
-#define SYS_munlock 151
-#define SYS_mlockall 152
-#define SYS_munlockall 153
-#define SYS_sched_setparam 154
-#define SYS_sched_getparam 155
-#define SYS_sched_setscheduler 156
-#define SYS_sched_getscheduler 157
-#define SYS_sched_yield 158
-#define SYS_sched_get_priority_max 159
-#define SYS_sched_get_priority_min 160
-#define SYS_sched_rr_get_interval 161
-#define SYS_nanosleep 162
-#define SYS_mremap 163
-#define SYS_setresuid 164
-#define SYS_getresuid 165
-#define SYS_vm86 166
-#define SYS_query_module 167
-#define SYS_poll 168
-#define SYS_nfsservctl 169
-#define SYS_setresgid 170
-#define SYS_getresgid 171
-#define SYS_prctl 172
-#define SYS_rt_sigreturn 173
-#define SYS_rt_sigaction 174
-#define SYS_rt_sigprocmask 175
-#define SYS_rt_sigpending 176
-#define SYS_rt_sigtimedwait 177
-#define SYS_rt_sigqueueinfo 178
-#define SYS_rt_sigsuspend 179
-#define SYS_pread 180
-#define SYS_pwrite 181
-#define SYS_chown 182
-#define SYS_getcwd 183
-#define SYS_capget 184
-#define SYS_capset 185
-#define SYS_sigaltstack 186
-#define SYS_sendfile 187
-#define SYS_getpmsg 188
-#define SYS_putpmsg 189
-#define SYS_vfork 190
-#define SYS_ugetrlimit 191
-#define SYS_mmap2 192
-#define SYS_truncate64 193
-#define SYS_ftruncate64 194
-#define SYS_stat64 195
-#define SYS_lstat64 196
-#define SYS_fstat64 197
-#define SYS_lchown32 198
-#define SYS_getuid32 199
-#define SYS_getgid32 200
-#define SYS_geteuid32 201
-#define SYS_getegid32 202
-#define SYS_setreuid32 203
-#define SYS_setregid32 204
-#define SYS_getgroups32 205
-#define SYS_setgroups32 206
-#define SYS_fchown32 207
-#define SYS_setresuid32 208
-#define SYS_getresuid32 209
-#define SYS_setresgid32 210
-#define SYS_getresgid32 211
-#define SYS_chown32 212
-#define SYS_setuid32 213
-#define SYS_setgid32 214
-#define SYS_setfsuid32 215
-#define SYS_setfsgid32 216
-#define SYS_pivot_root 217
-#define SYS_mincore 218
-#define SYS_madvise 219
-#define SYS_getdents64 220
-#define SYS_fcntl64 221
-#define SYS_gettid 224
-#define SYS_readahead 225
-#define SYS_setxattr 226
-#define SYS_lsetxattr 227
-#define SYS_fsetxattr 228
-#define SYS_getxattr 229
-#define SYS_lgetxattr 230
-#define SYS_fgetxattr 231
-#define SYS_listxattr 232
-#define SYS_llistxattr 233
-#define SYS_flistxattr 234
-#define SYS_removexattr 235
-#define SYS_lremovexattr 236
-#define SYS_fremovexattr 237
-#define SYS_tkill 238
-#define SYS_sendfile64 239
-#define SYS_futex 240
-#define SYS_sched_setaffinity 241
-#define SYS_sched_getaffinity 242
-#define SYS_set_thread_area 243
-#define SYS_get_thread_area 244
-#define SYS_io_setup 245
-#define SYS_io_destroy 246
-#define SYS_io_getevents 247
-#define SYS_io_submit 248
-#define SYS_io_cancel 249
-#define SYS_fadvise 250
-#define SYS_exit_group 252
-#define SYS_lookup_dcookie 253
-#define SYS_epoll_create 254
-#define SYS_epoll_ctl 255
-#define SYS_epoll_wait 256
-#define SYS_remap_file_pages 257
-#define SYS_set_tid_address 258
-#define SYS_timer_create 259
-#define SYS_timer_settime 260
-#define SYS_timer_gettime 261
-#define SYS_timer_getoverrun 262
-#define SYS_timer_delete 263
-#define SYS_clock_settime 264
-#define SYS_clock_gettime 265
-#define SYS_clock_getres 266
-#define SYS_clock_nanosleep 267
-#define SYS_statfs64 268
-#define SYS_fstatfs64 269
-#define SYS_tgkill 270
-#define SYS_utimes 271
-#define SYS_fadvise64_64 272
-#define SYS_vserver 273
-#define SYS_mbind 274
-#define SYS_get_mempolicy 275
-#define SYS_set_mempolicy 276
-#define SYS_mq_open 277
-#define SYS_mq_unlink 278
-#define SYS_mq_timedsend 279
-#define SYS_mq_timedreceive 280
-#define SYS_mq_notify 281
-#define SYS_mq_getsetattr 282
-#define SYS_kexec_load 283
-#define SYS_waitid 284
-#define SYS_add_key 286
-#define SYS_request_key 287
-#define SYS_keyctl 288
-#define SYS_ioprio_set 289
-#define SYS_ioprio_get 290
-#define SYS_inotify_init 291
-#define SYS_inotify_add_watch 292
-#define SYS_inotify_rm_watch 293
-#define SYS_migrate_pages 294
-#define SYS_openat 295
-#define SYS_mkdirat 296
-#define SYS_mknodat 297
-#define SYS_fchownat 298
-#define SYS_futimesat 299
-#define SYS_fstatat 300
-#define SYS_unlinkat 301
-#define SYS_renameat 302
-#define SYS_linkat 303
-#define SYS_symlinkat 304
-#define SYS_readlinkat 305
-#define SYS_fchmodat 306
-#define SYS_faccessat 307
-#define SYS_pselect6 308
-#define SYS_ppoll 309
-#define SYS_unshare 310
-#define SYS_set_robust_list 311
-#define SYS_get_robust_list 312
-#define SYS_splice 313
-#define SYS_sync_file_range 314
-#define SYS_tee 315
-#define SYS_vmsplice 316
-#define SYS_move_pages 317
-#define SYS_getcpu 318
-#define SYS_epoll_pwait 319
-#define SYS_utimensat 320
-#define SYS_signalfd 321
-#define SYS_timerfd_create 322
-#define SYS_eventfd 323
-#define SYS_fallocate 324
-#define SYS_semtimedop 325
-#define SYS_timerfd_settime 326
-#define SYS_timerfd_gettime 327
-#define SYS_semctl 328
-#define SYS_semget 329
-#define SYS_semop 330
-#define SYS_msgctl 331
-#define SYS_msgget 332
-#define SYS_msgrcv 333
-#define SYS_msgsnd 334
-#define SYS_shmat 335
-#define SYS_shmctl 336
-#define SYS_shmdt 337
-#define SYS_shmget 338
-#define SYS_signalfd4 339
-#define SYS_eventfd2 340
-#define SYS_epoll_create1 341
-#define SYS_dup3 342
-#define SYS_pipe2 343
-#define SYS_inotify_init1 344
-#define SYS_socket 345
-#define SYS_socketpair 346
-#define SYS_bind 347
-#define SYS_listen 348
-#define SYS_accept 349
-#define SYS_connect 350
-#define SYS_getsockname 351
-#define SYS_getpeername 352
-#define SYS_sendto 353
-#define SYS_send 354
-#define SYS_recvfrom 355
-#define SYS_recv 356
-#define SYS_setsockopt 357
-#define SYS_getsockopt 358
-#define SYS_shutdown 359
-#define SYS_sendmsg 360
-#define SYS_recvmsg 361
-#define SYS_accept4 362
-#define SYS_preadv 363
-#define SYS_pwritev 364
-#define SYS_rt_tgsigqueueinfo 365
-#define SYS_perf_event_open 366
-#define SYS_recvmmsg 367
-#define SYS_fanotify_init 368
-#define SYS_fanotify_mark 369
-#define SYS_prlimit64 370
-#define SYS_name_to_handle_at 371
-#define SYS_open_by_handle_at 372
-#define SYS_clock_adjtime 373
-#define SYS_syncfs 374
-#define SYS_setns 375
-#define SYS_sendmmsg 376
-#define SYS_process_vm_readv 377
-#define SYS_process_vm_writev 378
-#define SYS_kcmp 379
-#define SYS_finit_module 380
-#define SYS_sched_setattr 381
-#define SYS_sched_getattr 382
-#define SYS_renameat2 383
-#define SYS_seccomp 384
-#define SYS_getrandom 385
-#define SYS_memfd_create 386
-#define SYS_bpf 387
-#define SYS_execveat 388
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/termios.h
deleted file mode 100644
index f0d81b138f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/termios.h
+++ /dev/null
@@ -1,160 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/user.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/user.h
deleted file mode 100644
index c4e3b82b45..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/user.h
+++ /dev/null
@@ -1 +0,0 @@
-/* FIXME: missing in kernel? */
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/pthread_arch.h
deleted file mode 100644
index 259d3d615a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/pthread_arch.h
+++ /dev/null
@@ -1,10 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-	struct pthread *self;
-	__asm__ __volatile__ ("ori %0, r21, 0" : "=r" (self) );
-	return self;
-}
-
-#define TP_ADJ(p) (p)
-
-#define CANCEL_REG_IP 32
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/reloc.h
deleted file mode 100644
index 611db46542..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/reloc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <endian.h>
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define ENDIAN_SUFFIX "el"
-#else
-#define ENDIAN_SUFFIX ""
-#endif
-
-#define LDSO_ARCH "microblaze" ENDIAN_SUFFIX
-
-#define TPOFF_K 0
-
-#define REL_SYMBOLIC    R_MICROBLAZE_32
-#define REL_GOT         R_MICROBLAZE_GLOB_DAT
-#define REL_PLT         R_MICROBLAZE_JUMP_SLOT
-#define REL_RELATIVE    R_MICROBLAZE_REL
-#define REL_COPY        R_MICROBLAZE_COPY
-#define REL_DTPMOD      R_MICROBLAZE_TLSDTPMOD32
-#define REL_DTPOFF      R_MICROBLAZE_TLSDTPREL32
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"addik r1,%1,0 ; bra %0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/microblaze/syscall_arch.h
deleted file mode 100644
index 8e2de7eacc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/microblaze/syscall_arch.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
-
-#ifndef __clang__
-
-static __inline long __syscall0(long n)
-{
-	register unsigned long r12 __asm__("r12") = n;
-	register unsigned long r3 __asm__("r3");
-	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
-		: "r"(r12)
-		: "memory", "r4");
-	return r3;
-}
-
-static inline long __syscall1(long n, long a)
-{
-	register unsigned long r12 __asm__("r12") = n;
-	register unsigned long r3 __asm__("r3");
-	register unsigned long r5 __asm__("r5") = a;
-	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
-		: "r"(r12), "r"(r5)
-		: "memory", "r4");
-	return r3;
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-	register unsigned long r12 __asm__("r12") = n;
-	register unsigned long r3 __asm__("r3");
-	register unsigned long r5 __asm__("r5") = a;
-	register unsigned long r6 __asm__("r6") = b;
-	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
-		: "r"(r12), "r"(r5), "r"(r6)
-		: "memory", "r4");
-	return r3;
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-	register unsigned long r12 __asm__("r12") = n;
-	register unsigned long r3 __asm__("r3");
-	register unsigned long r5 __asm__("r5") = a;
-	register unsigned long r6 __asm__("r6") = b;
-	register unsigned long r7 __asm__("r7") = c;
-	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
-		: "r"(r12), "r"(r5), "r"(r6), "r"(r7)
-		: "memory", "r4");
-	return r3;
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-	register unsigned long r12 __asm__("r12") = n;
-	register unsigned long r3 __asm__("r3");
-	register unsigned long r5 __asm__("r5") = a;
-	register unsigned long r6 __asm__("r6") = b;
-	register unsigned long r7 __asm__("r7") = c;
-	register unsigned long r8 __asm__("r8") = d;
-	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
-		: "r"(r12), "r"(r5), "r"(r6), "r"(r7), "r"(r8)
-		: "memory", "r4");
-	return r3;
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
-	register unsigned long r12 __asm__("r12") = n;
-	register unsigned long r3 __asm__("r3");
-	register unsigned long r5 __asm__("r5") = a;
-	register unsigned long r6 __asm__("r6") = b;
-	register unsigned long r7 __asm__("r7") = c;
-	register unsigned long r8 __asm__("r8") = d;
-	register unsigned long r9 __asm__("r9") = e;
-	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
-		: "r"(r12), "r"(r5), "r"(r6), "r"(r7), "r"(r8), "r"(r9)
-		: "memory", "r4");
-	return r3;
-}
-
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
-	register unsigned long r12 __asm__("r12") = n;
-	register unsigned long r3 __asm__("r3");
-	register unsigned long r5 __asm__("r5") = a;
-	register unsigned long r6 __asm__("r6") = b;
-	register unsigned long r7 __asm__("r7") = c;
-	register unsigned long r8 __asm__("r8") = d;
-	register unsigned long r9 __asm__("r9") = e;
-	register unsigned long r10 __asm__("r10") = f;
-	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
-		: "r"(r12), "r"(r5), "r"(r6), "r"(r7), "r"(r8), "r"(r9), "r"(r10)
-		: "memory", "r4");
-	return r3;
-}
-
-#else
-
-#undef SYSCALL_NO_INLINE
-#define SYSCALL_NO_INLINE
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/mips/atomic.h
deleted file mode 100644
index c82046a81a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/atomic.h
+++ /dev/null
@@ -1,205 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_l(unsigned long x)
-{
-	static const char debruijn32[32] = {
-		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-	};
-	return debruijn32[(x&-x)*0x076be629 >> 27];
-}
-
-static inline int a_ctz_64(uint64_t x)
-{
-	uint32_t y = x;
-	if (!y) {
-		y = x>>32;
-		return 32 + a_ctz_l(y);
-	}
-	return a_ctz_l(y);
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	int dummy;
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"1:	ll %0, %2\n"
-		"	bne %0, %3, 1f\n"
-		"	addu %1, %4, $0\n"
-		"	sc %1, %2\n"
-		"	beq %1, $0, 1b\n"
-		"	nop\n"
-		"	sync\n"
-		"1:	\n"
-		".set pop\n"
-		: "=&r"(t), "=&r"(dummy), "+m"(*p) : "r"(t), "r"(s) : "memory" );
-        return t;
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	return (void *)a_cas(p, (int)t, (int)s);
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	int old, dummy;
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"1:	ll %0, %2\n"
-		"	addu %1, %3, $0\n"
-		"	sc %1, %2\n"
-		"	beq %1, $0, 1b\n"
-		"	nop\n"
-		"	sync\n"
-		".set pop\n"
-		: "=&r"(old), "=&r"(dummy), "+m"(*x) : "r"(v) : "memory" );
-        return old;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	int old, dummy;
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"1:	ll %0, %2\n"
-		"	addu %1, %0, %3\n"
-		"	sc %1, %2\n"
-		"	beq %1, $0, 1b\n"
-		"	nop\n"
-		"	sync\n"
-		".set pop\n"
-		: "=&r"(old), "=&r"(dummy), "+m"(*x) : "r"(v) : "memory" );
-        return old;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	int dummy;
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"1:	ll %0, %1\n"
-		"	addu %0, %0, 1\n"
-		"	sc %0, %1\n"
-		"	beq %0, $0, 1b\n"
-		"	nop\n"
-		"	sync\n"
-		".set pop\n"
-		: "=&r"(dummy), "+m"(*x) : : "memory" );
-}
-
-static inline void a_dec(volatile int *x)
-{
-	int dummy;
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"1:	ll %0, %1\n"
-		"	subu %0, %0, 1\n"
-		"	sc %0, %1\n"
-		"	beq %0, $0, 1b\n"
-		"	nop\n"
-		"	sync\n"
-		".set pop\n"
-		: "=&r"(dummy), "+m"(*x) : : "memory" );
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"	sw %1, %0\n"
-		"	sync\n"
-		".set pop\n"
-		: "+m"(*p) : "r"(x) : "memory" );
-}
-
-#define a_spin a_barrier
-
-static inline void a_barrier()
-{
-	a_cas(&(int){0}, 0, 0);
-}
-
-static inline void a_crash()
-{
-	*(volatile char *)0=0;
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	int dummy;
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"1:	ll %0, %1\n"
-		"	and %0, %0, %2\n"
-		"	sc %0, %1\n"
-		"	beq %0, $0, 1b\n"
-		"	nop\n"
-		"	sync\n"
-		".set pop\n"
-		: "=&r"(dummy), "+m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	int dummy;
-	__asm__ __volatile__(
-		".set push\n"
-		".set mips2\n"
-		".set noreorder\n"
-		"	sync\n"
-		"1:	ll %0, %1\n"
-		"	or %0, %0, %2\n"
-		"	sc %0, %1\n"
-		"	beq %0, $0, 1b\n"
-		"	nop\n"
-		"	sync\n"
-		".set pop\n"
-		: "=&r"(dummy), "+m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	a_or(p, v);
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_and((int *)p, u.r[0]);
-	a_and((int *)p+1, u.r[1]);
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_or((int *)p, u.r[0]);
-	a_or((int *)p+1, u.r[1]);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/alltypes.h.in
deleted file mode 100644
index 66ca18ad61..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/alltypes.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg int
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF int wchar_t;
-#endif
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/endian.h
deleted file mode 100644
index 5399dcb544..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/endian.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#if _MIPSEL || __MIPSEL || __MIPSEL__
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#else
-#define __BYTE_ORDER __BIG_ENDIAN
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/io.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/io.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/ioctl.h
deleted file mode 100644
index 83fb16785b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/ioctl.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  1U
-#define _IOC_READ  2U
-#define _IOC_WRITE 4U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETA		0x5401
-#define TCSETA		0x5402
-#define TCSETAW		0x5403
-#define TCSETAF		0x5404
-#define TCSBRK		0x5405
-#define TCXONC		0x5406
-#define TCFLSH		0x5407
-#define TCGETS		0x540D
-#define TCSETS		0x540E
-#define TCSETSW		0x540F
-#define TCSETSF		0x5410
-
-#define TIOCEXCL	0x740D
-#define TIOCNXCL	0x740E
-#define TIOCOUTQ	0x7472
-#define TIOCSTI		0x5472
-#define TIOCMGET	0x741D
-#define TIOCMBIS	0x741B
-#define TIOCMBIC	0x741C
-#define TIOCMSET	0x741D
-
-#define TIOCPKT		0x5470
-#define TIOCSWINSZ	_IOW('t', 103, struct winsize)
-#define TIOCGWINSZ	_IOR('t', 104, struct winsize)
-#define TIOCNOTTY	0x5471
-#define TIOCSETD	0x7401
-#define TIOCGETD	0x7400
-
-#define FIOCLEX		0x6601
-#define FIONCLEX	0x6602
-#define FIOASYNC	0x667D
-#define FIONBIO		0x667E
-#define FIOQSIZE	0x667F
-
-#define TIOCGLTC        0x7474
-#define TIOCSLTC        0x7475
-#define TIOCSPGRP	_IOW('t', 118, int)
-#define TIOCGPGRP	_IOR('t', 119, int)
-#define TIOCCONS	_IOW('t', 120, int)
-
-#define FIONREAD	0x467F
-#define TIOCINQ		FIONREAD
-
-#define TIOCGETP        0x7408
-#define TIOCSETP        0x7409
-#define TIOCSETN        0x740A
-
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x7416
-#define TIOCGPTN	_IOR('T', 0x30, unsigned int)
-#define TIOCSPTLCK	_IOW('T', 0x31, int)
-
-#define TIOCSCTTY	0x5480
-#define TIOCGSOFTCAR	0x5481
-#define TIOCSSOFTCAR	0x5482
-#define TIOCLINUX	0x5483
-#define TIOCGSERIAL	0x5484
-#define TIOCSSERIAL	0x5485
-#define TCSBRKP		0x5486
-
-#define TIOCSERCONFIG	0x5488
-#define TIOCSERGWILD	0x5489
-#define TIOCSERSWILD	0x548A
-#define TIOCGLCKTRMIOS	0x548B
-#define TIOCSLCKTRMIOS	0x548C
-#define TIOCSERGSTRUCT	0x548D
-#define TIOCSERGETLSR   0x548E
-#define TIOCSERGETMULTI 0x548F
-#define TIOCSERSETMULTI 0x5490
-#define TIOCMIWAIT	0x5491
-#define TIOCGICOUNT	0x5492
-#define TIOCGHAYESESP   0x5493
-#define TIOCSHAYESESP   0x5494
-
-#define TIOCTTYGSTRUCT	0x5426          // RICH: Not sure about these.
-#define TCGETX		0x5432          // RICH: Not sure about these.
-#define TCSETX		0x5433          // RICH: Not sure about these.
-#define TCSETXF		0x5434          // RICH: Not sure about these.
-#define TCSETXW		0x5435          // RICH: Not sure about these.
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE		0x89F0
-#define SIOCPROTOPRIVATE	0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/ipc.h
deleted file mode 100644
index b748d3b742..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/ipc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long __pad1;
-	long __pad2;
-};
-
-#define IPC_64 0x100
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/limits.h
deleted file mode 100644
index fbc6d238dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/limits.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/mman.h
deleted file mode 100644
index 3125fc2b30..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/mman.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define	PROT_GROWSDOWN 0x01000000
-#define	PROT_GROWSUP   0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x800
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x0400
-#define MAP_GROWSDOWN  0x1000
-#define MAP_DENYWRITE  0x2000
-#define MAP_EXECUTABLE 0x4000
-#define MAP_LOCKED     0x8000
-#define MAP_POPULATE   0x10000
-#define MAP_NONBLOCK   0x20000
-#define MAP_STACK      0x40000
-#define MAP_HUGETLB    0x80000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/msg.h
deleted file mode 100644
index bfe2b3a755..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/msg.h
+++ /dev/null
@@ -1,25 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-#if _MIPSEL || __MIPSEL || __MIPSEL__
-	time_t msg_stime;
-	int __unused1;
-	time_t msg_rtime;
-	int __unused2;
-	time_t msg_ctime;
-	int __unused3;
-#else
-	int __unused1;
-	time_t msg_stime;
-	int __unused2;
-	time_t msg_rtime;
-	int __unused3;
-	time_t msg_ctime;
-#endif
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/sem.h
deleted file mode 100644
index e46ced95d2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/sem.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t sem_ctime;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/shm.h
deleted file mode 100644
index f4b8712618..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/shm.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	time_t shm_dtime;
-	time_t shm_ctime;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/signal.h
deleted file mode 100644
index 818e0a7b30..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/signal.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 2048
-#define SIGSTKSZ 8192
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-typedef unsigned long long greg_t, gregset_t[32];
-typedef struct {
-	union {
-		double fp_dregs[32];
-		struct {
-			float _fp_fregs;
-			unsigned _fp_pad;
-		} fp_fregs[32];
-	} fp_r;
-} fpregset_t;
-struct sigcontext
-{
-	unsigned sc_regmask, sc_status;
-	unsigned long long sc_pc, sc_regs[32], sc_fpregs[32];
-	unsigned sc_ownedfp, sc_fpc_csr, sc_fpc_eir, sc_used_math, sc_dsp;
-	unsigned long long sc_mdhi, sc_mdlo;
-	unsigned long sc_hi1, sc_lo1, sc_hi2, sc_lo2, sc_hi3, sc_lo3;
-};
-typedef struct
-{
-	unsigned regmask, status;
-	unsigned long long pc, gregs[32], fpregs[32];
-	unsigned ownedfp, fpc_csr, fpc_eir, used_math, dsp;
-	unsigned long long mdhi, mdlo;
-	unsigned long hi1, lo1, hi2, lo2, hi3, lo3;
-} mcontext_t;
-#else
-typedef struct {
-	unsigned __mc1[2];
-	unsigned long long __mc2[65];
-	unsigned __mc3[5];
-	unsigned long long __mc4[2];
-	unsigned __mc5[6];
-} mcontext_t;
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	size_t ss_size;
-	int ss_flags;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct __ucontext *uc_link;
-	stack_t uc_stack;
-	mcontext_t uc_mcontext;
-	sigset_t uc_sigmask;
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  0x10000
-#define SA_SIGINFO    8
-#define SA_ONSTACK    0x08000000
-#define SA_RESTART    0x10000000
-#define SA_NODEFER    0x40000000
-#define SA_RESETHAND  0x80000000
-#define SA_RESTORER   0x04000000
-
-#undef SIG_BLOCK
-#undef SIG_UNBLOCK
-#undef SIG_SETMASK
-#define SIG_BLOCK     1
-#define SIG_UNBLOCK   2
-#define SIG_SETMASK   3
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGSTKFLT 7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGBUS    10
-#define SIGSEGV   11
-#define SIGSYS    12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGUSR1   16
-#define SIGUSR2   17
-#define SIGCHLD   18
-#define SIGPWR    19
-#define SIGWINCH  20
-#define SIGURG    21
-#define SIGIO     22
-#define SIGPOLL   SIGIO
-#define SIGSTOP   23
-#define SIGTSTP   24
-#define SIGCONT   25
-#define SIGTTIN   26
-#define SIGTTOU   27
-#define SIGVTALRM 28
-#define SIGPROF   29
-#define SIGXCPU   30
-#define SIGXFSZ   31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 128
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/socket.h
deleted file mode 100644
index cc72dcf9bb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/socket.h
+++ /dev/null
@@ -1,54 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen;
-	void *msg_control;
-	socklen_t msg_controllen;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
-
-#define SOCK_STREAM    2
-#define SOCK_DGRAM     1
-
-#define SOL_SOCKET     65535
-
-#define SO_DEBUG        1
-
-#define SO_REUSEADDR    0x0004
-#define SO_KEEPALIVE    0x0008
-#define SO_DONTROUTE    0x0010
-#define SO_BROADCAST    0x0020
-#define SO_LINGER       0x0080
-#define SO_OOBINLINE    0x0100
-#define SO_REUSEPORT    0x0200
-#define SO_SNDBUF       0x1001
-#define SO_RCVBUF       0x1002
-#define SO_SNDLOWAT     0x1003
-#define SO_RCVLOWAT     0x1004
-#define SO_RCVTIMEO     0x1006
-#define SO_SNDTIMEO     0x1005
-#define SO_ERROR        0x1007
-#define SO_TYPE         0x1008
-#define SO_ACCEPTCONN   0x1009
-#define SO_PROTOCOL     0x1028
-#define SO_DOMAIN       0x1029
-
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_BSDCOMPAT    14
-#define SO_PASSCRED     17
-#define SO_PEERCRED     18
-#define SO_SNDBUFFORCE  31
-#define SO_RCVBUFFORCE  33
-
-#define SOCK_NONBLOCK     0200
-#define SOCK_CLOEXEC  02000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/stat.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/stat.h
deleted file mode 100644
index c8f9b469ab..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/stat.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* copied from kernel definition, but with padding replaced
- * by the corresponding correctly-sized userspace types. */
-
-struct stat
-{
-	dev_t st_dev;
-	long __st_padding1[2];
-	ino_t st_ino;
-	mode_t st_mode;
-	nlink_t st_nlink;
-	uid_t st_uid;
-	gid_t st_gid;
-	dev_t st_rdev;
-	long __st_padding2[2];
-	off_t st_size;
-	struct timespec st_atim;
-	struct timespec st_mtim;
-	struct timespec st_ctim;
-	blksize_t st_blksize;
-	long __st_padding3;
-	blkcnt_t st_blocks;
-        long __st_padding4[14];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/syscall.h
deleted file mode 100644
index 06761ed4b6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/syscall.h
+++ /dev/null
@@ -1,715 +0,0 @@
-#define __NR_syscall                 4000
-#define __NR_exit                    4001
-#define __NR_fork                    4002
-#define __NR_read                    4003
-#define __NR_write                   4004
-#define __NR_open                    4005
-#define __NR_close                   4006
-#define __NR_waitpid                 4007
-#define __NR_creat                   4008
-#define __NR_link                    4009
-#define __NR_unlink                  4010
-#define __NR_execve                  4011
-#define __NR_chdir                   4012
-#define __NR_time                    4013
-#define __NR_mknod                   4014
-#define __NR_chmod                   4015
-#define __NR_lchown                  4016
-#define __NR_break                   4017
-#define __NR_unused18                4018
-#define __NR_lseek                   4019
-#define __NR_getpid                  4020
-#define __NR_mount                   4021
-#define __NR_umount                  4022
-#define __NR_setuid                  4023
-#define __NR_getuid                  4024
-#define __NR_stime                   4025
-#define __NR_ptrace                  4026
-#define __NR_alarm                   4027
-#define __NR_unused28                4028
-#define __NR_pause                   4029
-#define __NR_utime                   4030
-#define __NR_stty                    4031
-#define __NR_gtty                    4032
-#define __NR_access                  4033
-#define __NR_nice                    4034
-#define __NR_ftime                   4035
-#define __NR_sync                    4036
-#define __NR_kill                    4037
-#define __NR_rename                  4038
-#define __NR_mkdir                   4039
-#define __NR_rmdir                   4040
-#define __NR_dup                     4041
-#define __NR_pipe                    4042
-#define __NR_times                   4043
-#define __NR_prof                    4044
-#define __NR_brk                     4045
-#define __NR_setgid                  4046
-#define __NR_getgid                  4047
-#define __NR_signal                  4048
-#define __NR_geteuid                 4049
-#define __NR_getegid                 4050
-#define __NR_acct                    4051
-#define __NR_umount2                 4052
-#define __NR_lock                    4053
-#define __NR_ioctl                   4054
-#define __NR_fcntl                   4055
-#define __NR_mpx                     4056
-#define __NR_setpgid                 4057
-#define __NR_ulimit                  4058
-#define __NR_unused59                4059
-#define __NR_umask                   4060
-#define __NR_chroot                  4061
-#define __NR_ustat                   4062
-#define __NR_dup2                    4063
-#define __NR_getppid                 4064
-#define __NR_getpgrp                 4065
-#define __NR_setsid                  4066
-#define __NR_sigaction               4067
-#define __NR_sgetmask                4068
-#define __NR_ssetmask                4069
-#define __NR_setreuid                4070
-#define __NR_setregid                4071
-#define __NR_sigsuspend              4072
-#define __NR_sigpending              4073
-#define __NR_sethostname             4074
-#define __NR_setrlimit               4075
-#define __NR_getrlimit               4076
-#define __NR_getrusage               4077
-#define __NR_gettimeofday            4078
-#define __NR_settimeofday            4079
-#define __NR_getgroups               4080
-#define __NR_setgroups               4081
-#define __NR_reserved82              4082
-#define __NR_symlink                 4083
-#define __NR_unused84                4084
-#define __NR_readlink                4085
-#define __NR_uselib                  4086
-#define __NR_swapon                  4087
-#define __NR_reboot                  4088
-#define __NR_readdir                 4089
-#define __NR_mmap                    4090
-#define __NR_munmap                  4091
-#define __NR_truncate                4092
-#define __NR_ftruncate               4093
-#define __NR_fchmod                  4094
-#define __NR_fchown                  4095
-#define __NR_getpriority             4096
-#define __NR_setpriority             4097
-#define __NR_profil                  4098
-#define __NR_statfs                  4099
-#define __NR_fstatfs                 4100
-#define __NR_ioperm                  4101
-#define __NR_socketcall              4102
-#define __NR_syslog                  4103
-#define __NR_setitimer               4104
-#define __NR_getitimer               4105
-#define __NR_stat                    4106
-#define __NR_lstat                   4107
-#define __NR_fstat                   4108
-#define __NR_unused109               4109
-#define __NR_iopl                    4110
-#define __NR_vhangup                 4111
-#define __NR_idle                    4112
-#define __NR_vm86                    4113
-#define __NR_wait4                   4114
-#define __NR_swapoff                 4115
-#define __NR_sysinfo                 4116
-#define __NR_ipc                     4117
-#define __NR_fsync                   4118
-#define __NR_sigreturn               4119
-#define __NR_clone                   4120
-#define __NR_setdomainname           4121
-#define __NR_uname                   4122
-#define __NR_modify_ldt              4123
-#define __NR_adjtimex                4124
-#define __NR_mprotect                4125
-#define __NR_sigprocmask             4126
-#define __NR_create_module           4127
-#define __NR_init_module             4128
-#define __NR_delete_module           4129
-#define __NR_get_kernel_syms         4130
-#define __NR_quotactl                4131
-#define __NR_getpgid                 4132
-#define __NR_fchdir                  4133
-#define __NR_bdflush                 4134
-#define __NR_sysfs                   4135
-#define __NR_personality             4136
-#define __NR_afs_syscall             4137
-#define __NR_setfsuid                4138
-#define __NR_setfsgid                4139
-#define __NR__llseek                 4140
-#define __NR_getdents                4141
-#define __NR_select                  4142
-#define __NR_flock                   4143
-#define __NR_msync                   4144
-#define __NR_readv                   4145
-#define __NR_writev                  4146
-#define __NR_cacheflush              4147
-#define __NR_cachectl                4148
-#define __NR_sysmips                 4149
-#define __NR_unused150               4150
-#define __NR_getsid                  4151
-#define __NR_fdatasync               4152
-#define __NR__sysctl                 4153
-#define __NR_mlock                   4154
-#define __NR_munlock                 4155
-#define __NR_mlockall                4156
-#define __NR_munlockall              4157
-#define __NR_sched_setparam          4158
-#define __NR_sched_getparam          4159
-#define __NR_sched_setscheduler      4160
-#define __NR_sched_getscheduler      4161
-#define __NR_sched_yield             4162
-#define __NR_sched_get_priority_max  4163
-#define __NR_sched_get_priority_min  4164
-#define __NR_sched_rr_get_interval   4165
-#define __NR_nanosleep               4166
-#define __NR_mremap                  4167
-#define __NR_accept                  4168
-#define __NR_bind                    4169
-#define __NR_connect                 4170
-#define __NR_getpeername             4171
-#define __NR_getsockname             4172
-#define __NR_getsockopt              4173
-#define __NR_listen                  4174
-#define __NR_recv                    4175
-#define __NR_recvfrom                4176
-#define __NR_recvmsg                 4177
-#define __NR_send                    4178
-#define __NR_sendmsg                 4179
-#define __NR_sendto                  4180
-#define __NR_setsockopt              4181
-#define __NR_shutdown                4182
-#define __NR_socket                  4183
-#define __NR_socketpair              4184
-#define __NR_setresuid               4185
-#define __NR_getresuid               4186
-#define __NR_query_module            4187
-#define __NR_poll                    4188
-#define __NR_nfsservctl              4189
-#define __NR_setresgid               4190
-#define __NR_getresgid               4191
-#define __NR_prctl                   4192
-#define __NR_rt_sigreturn            4193
-#define __NR_rt_sigaction            4194
-#define __NR_rt_sigprocmask          4195
-#define __NR_rt_sigpending           4196
-#define __NR_rt_sigtimedwait         4197
-#define __NR_rt_sigqueueinfo         4198
-#define __NR_rt_sigsuspend           4199
-#define __NR_pread                   4200
-#define __NR_pwrite                  4201
-#define __NR_chown                   4202
-#define __NR_getcwd                  4203
-#define __NR_capget                  4204
-#define __NR_capset                  4205
-#define __NR_sigaltstack             4206
-#define __NR_sendfile                4207
-#define __NR_getpmsg                 4208
-#define __NR_putpmsg                 4209
-#define __NR_mmap2                   4210
-#define __NR_truncate64              4211
-#define __NR_ftruncate64             4212
-#define __NR_stat64                  4213
-#define __NR_lstat64                 4214
-#define __NR_fstat64                 4215
-#define __NR_pivot_root              4216
-#define __NR_mincore                 4217
-#define __NR_madvise                 4218
-#define __NR_getdents64              4219
-#define __NR_fcntl64                 4220
-#define __NR_reserved221             4221
-#define __NR_gettid                  4222
-#define __NR_readahead               4223
-#define __NR_setxattr                4224
-#define __NR_lsetxattr               4225
-#define __NR_fsetxattr               4226
-#define __NR_getxattr                4227
-#define __NR_lgetxattr               4228
-#define __NR_fgetxattr               4229
-#define __NR_listxattr               4230
-#define __NR_llistxattr              4231
-#define __NR_flistxattr              4232
-#define __NR_removexattr             4233
-#define __NR_lremovexattr            4234
-#define __NR_fremovexattr            4235
-#define __NR_tkill                   4236
-#define __NR_sendfile64              4237
-#define __NR_futex                   4238
-#define __NR_sched_setaffinity       4239
-#define __NR_sched_getaffinity       4240
-#define __NR_io_setup                4241
-#define __NR_io_destroy              4242
-#define __NR_io_getevents            4243
-#define __NR_io_submit               4244
-#define __NR_io_cancel               4245
-#define __NR_exit_group              4246
-#define __NR_lookup_dcookie          4247
-#define __NR_epoll_create            4248
-#define __NR_epoll_ctl               4249
-#define __NR_epoll_wait              4250
-#define __NR_remap_file_pages        4251
-#define __NR_set_tid_address         4252
-#define __NR_restart_syscall         4253
-#define __NR_fadvise                 4254
-#define __NR_statfs64                4255
-#define __NR_fstatfs64               4256
-#define __NR_timer_create            4257
-#define __NR_timer_settime           4258
-#define __NR_timer_gettime           4259
-#define __NR_timer_getoverrun        4260
-#define __NR_timer_delete            4261
-#define __NR_clock_settime           4262
-#define __NR_clock_gettime           4263
-#define __NR_clock_getres            4264
-#define __NR_clock_nanosleep         4265
-#define __NR_tgkill                  4266
-#define __NR_utimes                  4267
-#define __NR_mbind                   4268
-#define __NR_get_mempolicy           4269
-#define __NR_set_mempolicy           4270
-#define __NR_mq_open                 4271
-#define __NR_mq_unlink               4272
-#define __NR_mq_timedsend            4273
-#define __NR_mq_timedreceive         4274
-#define __NR_mq_notify               4275
-#define __NR_mq_getsetattr           4276
-#define __NR_vserver                 4277
-#define __NR_waitid                  4278
-#define __NR_add_key                 4280
-#define __NR_request_key             4281
-#define __NR_keyctl                  4282
-#define __NR_set_thread_area         4283
-#define __NR_inotify_init            4284
-#define __NR_inotify_add_watch       4285
-#define __NR_inotify_rm_watch        4286
-#define __NR_migrate_pages           4287
-#define __NR_openat                  4288
-#define __NR_mkdirat                 4289
-#define __NR_mknodat                 4290
-#define __NR_fchownat                4291
-#define __NR_futimesat               4292
-#define __NR_fstatat                 4293
-#define __NR_unlinkat                4294
-#define __NR_renameat                4295
-#define __NR_linkat                  4296
-#define __NR_symlinkat               4297
-#define __NR_readlinkat              4298
-#define __NR_fchmodat                4299
-#define __NR_faccessat               4300
-#define __NR_pselect6                4301
-#define __NR_ppoll                   4302
-#define __NR_unshare                 4303
-#define __NR_splice                  4304
-#define __NR_sync_file_range         4305
-#define __NR_tee                     4306
-#define __NR_vmsplice                4307
-#define __NR_move_pages              4308
-#define __NR_set_robust_list         4309
-#define __NR_get_robust_list         4310
-#define __NR_kexec_load              4311
-#define __NR_getcpu                  4312
-#define __NR_epoll_pwait             4313
-#define __NR_ioprio_set              4314
-#define __NR_ioprio_get              4315
-#define __NR_utimensat               4316
-#define __NR_signalfd                4317
-#define __NR_timerfd                 4318
-#define __NR_eventfd                 4319
-#define __NR_fallocate               4320
-#define __NR_timerfd_create          4321
-#define __NR_timerfd_gettime         4322
-#define __NR_timerfd_settime         4323
-#define __NR_signalfd4               4324
-#define __NR_eventfd2                4325
-#define __NR_epoll_create1           4326
-#define __NR_dup3                    4327
-#define __NR_pipe2                   4328
-#define __NR_inotify_init1           4329
-#define __NR_preadv                  4330
-#define __NR_pwritev                 4331
-#define __NR_rt_tgsigqueueinfo       4332
-#define __NR_perf_event_open         4333
-#define __NR_accept4                 4334
-#define __NR_recvmmsg                4335
-#define __NR_fanotify_init           4336
-#define __NR_fanotify_mark           4337
-#define __NR_prlimit64               4338
-#define __NR_name_to_handle_at       4339
-#define __NR_open_by_handle_at       4340
-#define __NR_clock_adjtime           4341
-#define __NR_syncfs                  4342
-#define __NR_sendmmsg                4343
-#define __NR_setns                   4344
-#define __NR_process_vm_readv        4345
-#define __NR_process_vm_writev       4346
-#define __NR_kcmp                    4347
-#define __NR_finit_module            4348
-#define __NR_sched_setattr           4349
-#define __NR_sched_getattr           4350
-#define __NR_renameat2               4351
-#define __NR_seccomp                 4352
-#define __NR_getrandom               4353
-#define __NR_memfd_create            4354
-#define __NR_bpf                     4355
-#define __NR_execveat                4356
-
-
-/* Repeated with SYS_ prefix */
-#define SYS_syscall                 4000
-#define SYS_exit                    4001
-#define SYS_fork                    4002
-#define SYS_read                    4003
-#define SYS_write                   4004
-#define SYS_open                    4005
-#define SYS_close                   4006
-#define SYS_waitpid                 4007
-#define SYS_creat                   4008
-#define SYS_link                    4009
-#define SYS_unlink                  4010
-#define SYS_execve                  4011
-#define SYS_chdir                   4012
-#define SYS_time                    4013
-#define SYS_mknod                   4014
-#define SYS_chmod                   4015
-#define SYS_lchown                  4016
-#define SYS_break                   4017
-#define SYS_unused18                4018
-#define SYS_lseek                   4019
-#define SYS_getpid                  4020
-#define SYS_mount                   4021
-#define SYS_umount                  4022
-#define SYS_setuid                  4023
-#define SYS_getuid                  4024
-#define SYS_stime                   4025
-#define SYS_ptrace                  4026
-#define SYS_alarm                   4027
-#define SYS_unused28                4028
-#define SYS_pause                   4029
-#define SYS_utime                   4030
-#define SYS_stty                    4031
-#define SYS_gtty                    4032
-#define SYS_access                  4033
-#define SYS_nice                    4034
-#define SYS_ftime                   4035
-#define SYS_sync                    4036
-#define SYS_kill                    4037
-#define SYS_rename                  4038
-#define SYS_mkdir                   4039
-#define SYS_rmdir                   4040
-#define SYS_dup                     4041
-#define SYS_pipe                    4042
-#define SYS_times                   4043
-#define SYS_prof                    4044
-#define SYS_brk                     4045
-#define SYS_setgid                  4046
-#define SYS_getgid                  4047
-#define SYS_signal                  4048
-#define SYS_geteuid                 4049
-#define SYS_getegid                 4050
-#define SYS_acct                    4051
-#define SYS_umount2                 4052
-#define SYS_lock                    4053
-#define SYS_ioctl                   4054
-#define SYS_fcntl                   4055
-#define SYS_mpx                     4056
-#define SYS_setpgid                 4057
-#define SYS_ulimit                  4058
-#define SYS_unused59                4059
-#define SYS_umask                   4060
-#define SYS_chroot                  4061
-#define SYS_ustat                   4062
-#define SYS_dup2                    4063
-#define SYS_getppid                 4064
-#define SYS_getpgrp                 4065
-#define SYS_setsid                  4066
-#define SYS_sigaction               4067
-#define SYS_sgetmask                4068
-#define SYS_ssetmask                4069
-#define SYS_setreuid                4070
-#define SYS_setregid                4071
-#define SYS_sigsuspend              4072
-#define SYS_sigpending              4073
-#define SYS_sethostname             4074
-#define SYS_setrlimit               4075
-#define SYS_getrlimit               4076
-#define SYS_getrusage               4077
-#define SYS_gettimeofday            4078
-#define SYS_settimeofday            4079
-#define SYS_getgroups               4080
-#define SYS_setgroups               4081
-#define SYS_reserved82              4082
-#define SYS_symlink                 4083
-#define SYS_unused84                4084
-#define SYS_readlink                4085
-#define SYS_uselib                  4086
-#define SYS_swapon                  4087
-#define SYS_reboot                  4088
-#define SYS_readdir                 4089
-#define SYS_mmap                    4090
-#define SYS_munmap                  4091
-#define SYS_truncate                4092
-#define SYS_ftruncate               4093
-#define SYS_fchmod                  4094
-#define SYS_fchown                  4095
-#define SYS_getpriority             4096
-#define SYS_setpriority             4097
-#define SYS_profil                  4098
-#define SYS_statfs                  4099
-#define SYS_fstatfs                 4100
-#define SYS_ioperm                  4101
-#define SYS_socketcall              4102
-#define SYS_syslog                  4103
-#define SYS_setitimer               4104
-#define SYS_getitimer               4105
-#define SYS_stat                    4106
-#define SYS_lstat                   4107
-#define SYS_fstat                   4108
-#define SYS_unused109               4109
-#define SYS_iopl                    4110
-#define SYS_vhangup                 4111
-#define SYS_idle                    4112
-#define SYS_vm86                    4113
-#define SYS_wait4                   4114
-#define SYS_swapoff                 4115
-#define SYS_sysinfo                 4116
-#define SYS_ipc                     4117
-#define SYS_fsync                   4118
-#define SYS_sigreturn               4119
-#define SYS_clone                   4120
-#define SYS_setdomainname           4121
-#define SYS_uname                   4122
-#define SYS_modify_ldt              4123
-#define SYS_adjtimex                4124
-#define SYS_mprotect                4125
-#define SYS_sigprocmask             4126
-#define SYS_create_module           4127
-#define SYS_init_module             4128
-#define SYS_delete_module           4129
-#define SYS_get_kernel_syms         4130
-#define SYS_quotactl                4131
-#define SYS_getpgid                 4132
-#define SYS_fchdir                  4133
-#define SYS_bdflush                 4134
-#define SYS_sysfs                   4135
-#define SYS_personality             4136
-#define SYS_afs_syscall             4137
-#define SYS_setfsuid                4138
-#define SYS_setfsgid                4139
-#define SYS__llseek                 4140
-#define SYS_getdents                4141
-#define SYS_select                  4142
-#define SYS_flock                   4143
-#define SYS_msync                   4144
-#define SYS_readv                   4145
-#define SYS_writev                  4146
-#define SYS_cacheflush              4147
-#define SYS_cachectl                4148
-#define SYS_sysmips                 4149
-#define SYS_unused150               4150
-#define SYS_getsid                  4151
-#define SYS_fdatasync               4152
-#define SYS__sysctl                 4153
-#define SYS_mlock                   4154
-#define SYS_munlock                 4155
-#define SYS_mlockall                4156
-#define SYS_munlockall              4157
-#define SYS_sched_setparam          4158
-#define SYS_sched_getparam          4159
-#define SYS_sched_setscheduler      4160
-#define SYS_sched_getscheduler      4161
-#define SYS_sched_yield             4162
-#define SYS_sched_get_priority_max  4163
-#define SYS_sched_get_priority_min  4164
-#define SYS_sched_rr_get_interval   4165
-#define SYS_nanosleep               4166
-#define SYS_mremap                  4167
-#define SYS_accept                  4168
-#define SYS_bind                    4169
-#define SYS_connect                 4170
-#define SYS_getpeername             4171
-#define SYS_getsockname             4172
-#define SYS_getsockopt              4173
-#define SYS_listen                  4174
-#define SYS_recv                    4175
-#define SYS_recvfrom                4176
-#define SYS_recvmsg                 4177
-#define SYS_send                    4178
-#define SYS_sendmsg                 4179
-#define SYS_sendto                  4180
-#define SYS_setsockopt              4181
-#define SYS_shutdown                4182
-#define SYS_socket                  4183
-#define SYS_socketpair              4184
-#define SYS_setresuid               4185
-#define SYS_getresuid               4186
-#define SYS_query_module            4187
-#define SYS_poll                    4188
-#define SYS_nfsservctl              4189
-#define SYS_setresgid               4190
-#define SYS_getresgid               4191
-#define SYS_prctl                   4192
-#define SYS_rt_sigreturn            4193
-#define SYS_rt_sigaction            4194
-#define SYS_rt_sigprocmask          4195
-#define SYS_rt_sigpending           4196
-#define SYS_rt_sigtimedwait         4197
-#define SYS_rt_sigqueueinfo         4198
-#define SYS_rt_sigsuspend           4199
-#define SYS_pread                   4200
-#define SYS_pwrite                  4201
-#define SYS_chown                   4202
-#define SYS_getcwd                  4203
-#define SYS_capget                  4204
-#define SYS_capset                  4205
-#define SYS_sigaltstack             4206
-#define SYS_sendfile                4207
-#define SYS_getpmsg                 4208
-#define SYS_putpmsg                 4209
-#define SYS_mmap2                   4210
-#define SYS_truncate64              4211
-#define SYS_ftruncate64             4212
-#define SYS_stat64                  4213
-#define SYS_lstat64                 4214
-#define SYS_fstat64                 4215
-#define SYS_pivot_root              4216
-#define SYS_mincore                 4217
-#define SYS_madvise                 4218
-#define SYS_getdents64              4219
-#define SYS_fcntl64                 4220
-#define SYS_reserved221             4221
-#define SYS_gettid                  4222
-#define SYS_readahead               4223
-#define SYS_setxattr                4224
-#define SYS_lsetxattr               4225
-#define SYS_fsetxattr               4226
-#define SYS_getxattr                4227
-#define SYS_lgetxattr               4228
-#define SYS_fgetxattr               4229
-#define SYS_listxattr               4230
-#define SYS_llistxattr              4231
-#define SYS_flistxattr              4232
-#define SYS_removexattr             4233
-#define SYS_lremovexattr            4234
-#define SYS_fremovexattr            4235
-#define SYS_tkill                   4236
-#define SYS_sendfile64              4237
-#define SYS_futex                   4238
-#define SYS_sched_setaffinity       4239
-#define SYS_sched_getaffinity       4240
-#define SYS_io_setup                4241
-#define SYS_io_destroy              4242
-#define SYS_io_getevents            4243
-#define SYS_io_submit               4244
-#define SYS_io_cancel               4245
-#define SYS_exit_group              4246
-#define SYS_lookup_dcookie          4247
-#define SYS_epoll_create            4248
-#define SYS_epoll_ctl               4249
-#define SYS_epoll_wait              4250
-#define SYS_remap_file_pages        4251
-#define SYS_set_tid_address         4252
-#define SYS_restart_syscall         4253
-#define SYS_fadvise                 4254
-#define SYS_statfs64                4255
-#define SYS_fstatfs64               4256
-#define SYS_timer_create            4257
-#define SYS_timer_settime           4258
-#define SYS_timer_gettime           4259
-#define SYS_timer_getoverrun        4260
-#define SYS_timer_delete            4261
-#define SYS_clock_settime           4262
-#define SYS_clock_gettime           4263
-#define SYS_clock_getres            4264
-#define SYS_clock_nanosleep         4265
-#define SYS_tgkill                  4266
-#define SYS_utimes                  4267
-#define SYS_mbind                   4268
-#define SYS_get_mempolicy           4269
-#define SYS_set_mempolicy           4270
-#define SYS_mq_open                 4271
-#define SYS_mq_unlink               4272
-#define SYS_mq_timedsend            4273
-#define SYS_mq_timedreceive         4274
-#define SYS_mq_notify               4275
-#define SYS_mq_getsetattr           4276
-#define SYS_vserver                 4277
-#define SYS_waitid                  4278
-#define SYS_add_key                 4280
-#define SYS_request_key             4281
-#define SYS_keyctl                  4282
-#define SYS_set_thread_area         4283
-#define SYS_inotify_init            4284
-#define SYS_inotify_add_watch       4285
-#define SYS_inotify_rm_watch        4286
-#define SYS_migrate_pages           4287
-#define SYS_openat                  4288
-#define SYS_mkdirat                 4289
-#define SYS_mknodat                 4290
-#define SYS_fchownat                4291
-#define SYS_futimesat               4292
-#define SYS_fstatat                 4293
-#define SYS_unlinkat                4294
-#define SYS_renameat                4295
-#define SYS_linkat                  4296
-#define SYS_symlinkat               4297
-#define SYS_readlinkat              4298
-#define SYS_fchmodat                4299
-#define SYS_faccessat               4300
-#define SYS_pselect6                4301
-#define SYS_ppoll                   4302
-#define SYS_unshare                 4303
-#define SYS_splice                  4304
-#define SYS_sync_file_range         4305
-#define SYS_tee                     4306
-#define SYS_vmsplice                4307
-#define SYS_move_pages              4308
-#define SYS_set_robust_list         4309
-#define SYS_get_robust_list         4310
-#define SYS_kexec_load              4311
-#define SYS_getcpu                  4312
-#define SYS_epoll_pwait             4313
-#define SYS_ioprio_set              4314
-#define SYS_ioprio_get              4315
-#define SYS_utimensat               4316
-#define SYS_signalfd                4317
-#define SYS_timerfd                 4318
-#define SYS_eventfd                 4319
-#define SYS_fallocate               4320
-#define SYS_timerfd_create          4321
-#define SYS_timerfd_gettime         4322
-#define SYS_timerfd_settime         4323
-#define SYS_signalfd4               4324
-#define SYS_eventfd2                4325
-#define SYS_epoll_create1           4326
-#define SYS_dup3                    4327
-#define SYS_pipe2                   4328
-#define SYS_inotify_init1           4329
-#define SYS_preadv                  4330
-#define SYS_pwritev                 4331
-#define SYS_rt_tgsigqueueinfo       4332
-#define SYS_perf_event_open         4333
-#define SYS_accept4                 4334
-#define SYS_recvmmsg                4335
-#define SYS_fanotify_init           4336
-#define SYS_fanotify_mark           4337
-#define SYS_prlimit64               4338
-#define SYS_name_to_handle_at       4339
-#define SYS_open_by_handle_at       4340
-#define SYS_clock_adjtime           4341
-#define SYS_syncfs                  4342
-#define SYS_sendmmsg                4343
-#define SYS_setns                   4344
-#define SYS_process_vm_readv        4345
-#define SYS_process_vm_writev       4346
-#define SYS_kcmp                    4347
-#define SYS_finit_module            4348
-#define SYS_sched_setattr           4349
-#define SYS_sched_getattr           4350
-#define SYS_renameat2               4351
-#define SYS_seccomp                 4352
-#define SYS_getrandom               4353
-#define SYS_memfd_create            4354
-#define SYS_bpf                     4355
-#define SYS_execveat                4356
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/mips/bits/termios.h
deleted file mode 100644
index 487c1d4529..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/termios.h
+++ /dev/null
@@ -1,169 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VMIN      4
-#define VTIME     5
-#define VEOL2     6
-#define VSWTC     7
-#define VSWTCH    7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOF     16
-#define VEOL     17
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-#define EXTA     0000016
-#define EXTB     0000017
-
-#define BOTHER   0010000
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define XCASE  0000004
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define IEXTEN 0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0020000
-#define PENDIN 0040000
-#define TOSTOP 0100000
-#define ITOSTOP 0100000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CIBAUD   002003600000
-#define IBSHIFT 16
-#define CMSPAR   010000000000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#define TIOCSER_TEMT 1
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/crt_arch.h b/src/components/lib/libc/musl-1.1.11/arch/mips/crt_arch.h
deleted file mode 100644
index 21e139b931..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/crt_arch.h
+++ /dev/null
@@ -1,29 +0,0 @@
-__asm__(
-".set push\n"
-".set noreorder\n"
-".text \n"
-".global _" START "\n"
-".global " START "\n"
-".type   _" START ", @function\n"
-".type   " START ", @function\n"
-"_" START ":\n"
-"" START ":\n"
-"	bal 1f \n"
-"	 move $fp, $0 \n"
-"2:	.gpword 2b \n"
-"	.gpword " START "_c \n"
-".weak _DYNAMIC \n"
-".hidden _DYNAMIC \n"
-"	.gpword _DYNAMIC \n"
-"1:	lw $gp, 0($ra) \n"
-"	subu $gp, $ra, $gp \n"
-"	move $4, $sp \n"
-"	lw $5, 8($ra) \n"
-"	addu $5, $5, $gp \n"
-"	lw $25, 4($ra) \n"
-"	addu $25, $25, $gp \n"
-"	and $sp, $sp, -8 \n"
-"	jalr $25 \n"
-"	 subu $sp, $sp, 16 \n"
-".set pop \n"
-);
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/ksigaction.h b/src/components/lib/libc/musl-1.1.11/arch/mips/ksigaction.h
deleted file mode 100644
index 6d731646c1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/ksigaction.h
+++ /dev/null
@@ -1,9 +0,0 @@
-struct k_sigaction {
-	unsigned flags;
-	void (*handler)(int);
-	unsigned long mask[4];
-	/* The following field is past the end of the structure the
-	 * kernel will read or write, and exists only to avoid having
-	 * mips-specific preprocessor conditionals in sigaction.c. */
-	void (*restorer)();
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/mips/pthread_arch.h
deleted file mode 100644
index 904a248901..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/pthread_arch.h
+++ /dev/null
@@ -1,18 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-#ifdef __clang__
-	char *tp;
-	__asm__ __volatile__ (".word 0x7c03e83b ; move %0, $3" : "=r" (tp) : : "$3" );
-#else
-	register char *tp __asm__("$3");
-	__asm__ __volatile__ (".word 0x7c03e83b" : "=r" (tp) );
-#endif
-	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
-}
-
-#define TLS_ABOVE_TP
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
-
-#define DTP_OFFSET 0x8000
-
-#define CANCEL_REG_IP (3-(union {int __i; char __b;}){1}.__b)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/mips/reloc.h
deleted file mode 100644
index 8aa0285290..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/reloc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <endian.h>
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define ENDIAN_SUFFIX "el"
-#else
-#define ENDIAN_SUFFIX ""
-#endif
-
-#ifdef __mips_soft_float
-#define FP_SUFFIX "-sf"
-#else
-#define FP_SUFFIX ""
-#endif
-
-#define LDSO_ARCH "mips" ENDIAN_SUFFIX FP_SUFFIX
-
-#define TPOFF_K (-0x7000)
-
-#define REL_SYM_OR_REL  R_MIPS_REL32
-#define REL_PLT         R_MIPS_JUMP_SLOT
-#define REL_COPY        R_MIPS_COPY
-#define REL_DTPMOD      R_MIPS_TLS_DTPMOD32
-#define REL_DTPOFF      R_MIPS_TLS_DTPREL32
-#define REL_TPOFF       R_MIPS_TLS_TPREL32
-
-#define NEED_MIPS_GOT_RELOCS 1
-#define DYNAMIC_IS_RO 1
-#define ARCH_SYM_REJECT_UND(s) (!((s)->st_other & STO_MIPS_PLT))
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"move $sp,%1 ; jr %0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/mips/syscall_arch.h
deleted file mode 100644
index 1b1179c467..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/mips/syscall_arch.h
+++ /dev/null
@@ -1,165 +0,0 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
-
-#ifdef SHARED
-__attribute__((visibility("hidden")))
-#endif
-long (__syscall)(long, ...);
-
-#define SYSCALL_RLIM_INFINITY (-1UL/2)
-
-#if _MIPSEL || __MIPSEL || __MIPSEL__
-#define __stat_fix(st) ((st),(void)0)
-#else
-#include <sys/stat.h>
-static inline void __stat_fix(long p)
-{
-	struct stat *st = (struct stat *)p;
-	st->st_dev >>= 32;
-	st->st_rdev >>= 32;
-}
-#endif
-
-#ifndef __clang__
-
-static inline long __syscall0(long n)
-{
-	register long r7 __asm__("$7");
-	register long r2 __asm__("$2");
-	__asm__ __volatile__ (
-		"addu $2,$0,%2 ; syscall"
-		: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7)
-		: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-		  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-	return r7 ? -r2 : r2;
-}
-
-static inline long __syscall1(long n, long a)
-{
-	register long r4 __asm__("$4") = a;
-	register long r7 __asm__("$7");
-	register long r2 __asm__("$2");
-	__asm__ __volatile__ (
-		"addu $2,$0,%2 ; syscall"
-		: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-		  "r"(r4)
-		: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-		  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-	return r7 ? -r2 : r2;
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r7 __asm__("$7");
-	register long r2 __asm__("$2");
-	__asm__ __volatile__ (
-		"addu $2,$0,%2 ; syscall"
-		: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-		  "r"(r4), "r"(r5)
-		: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-		  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-	if (r7) return -r2;
-	long ret = r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	return ret;
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r6 __asm__("$6") = c;
-	register long r7 __asm__("$7");
-	register long r2 __asm__("$2");
-	__asm__ __volatile__ (
-		"addu $2,$0,%2 ; syscall"
-		: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-		  "r"(r4), "r"(r5), "r"(r6)
-		: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-		  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-	if (r7) return -r2;
-	long ret = r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	return ret;
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r6 __asm__("$6") = c;
-	register long r7 __asm__("$7") = d;
-	register long r2 __asm__("$2");
-	__asm__ __volatile__ (
-		"addu $2,$0,%2 ; syscall"
-		: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-		  "r"(r4), "r"(r5), "r"(r6)
-		: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-		  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-	if (r7) return -r2;
-	long ret = r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	if (n == SYS_fstatat) __stat_fix(c);
-	return ret;
-}
-
-#else
-
-static inline long __syscall0(long n)
-{
-	return (__syscall)(n);
-}
-
-static inline long __syscall1(long n, long a)
-{
-	return (__syscall)(n, a);
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-	long r2 = (__syscall)(n, a, b);
-	if (r2 > -4096UL) return r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	return r2;
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-	long r2 = (__syscall)(n, a, b, c);
-	if (r2 > -4096UL) return r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	return r2;
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-	long r2 = (__syscall)(n, a, b, c, d);
-	if (r2 > -4096UL) return r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	if (n == SYS_fstatat) __stat_fix(c);
-	return r2;
-}
-
-#endif
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
-	long r2 = (__syscall)(n, a, b, c, d, e);
-	if (r2 > -4096UL) return r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	if (n == SYS_fstatat) __stat_fix(c);
-	return r2;
-}
-
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
-	long r2 = (__syscall)(n, a, b, c, d, e, f);
-	if (r2 > -4096UL) return r2;
-	if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-	if (n == SYS_fstatat) __stat_fix(c);
-	return r2;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/atomic.h
deleted file mode 100644
index 640ff4307a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/atomic.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_l(unsigned long x)
-{
-	static const char debruijn32[32] = {
-		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-	};
-	return debruijn32[(x&-x)*0x076be629 >> 27];
-}
-
-static inline int a_ctz_64(uint64_t x)
-{
-	uint32_t y = x;
-	if (!y) {
-		y = x>>32;
-		return 32 + a_ctz_l(y);
-	}
-	return a_ctz_l(y);
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	__asm__("1:	l.lwa %0, %1\n"
-		"	l.sfeq %0, %2\n"
-		"	l.bnf 1f\n"
-		"	 l.nop\n"
-		"	l.swa %1, %3\n"
-		"	l.bnf 1b\n"
-		"	 l.nop\n"
-		"1:	\n"
-		: "=&r"(t), "+m"(*p) : "r"(t), "r"(s) : "cc", "memory" );
-        return t;
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	return (void *)a_cas(p, (int)t, (int)s);
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	int old;
-	do old = *x;
-	while (a_cas(x, old, v) != old);
-	return old;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	int old;
-	do old = *x;
-	while (a_cas(x, old, old+v) != old);
-	return old;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	a_fetch_add(x, 1);
-}
-
-static inline void a_dec(volatile int *x)
-{
-	a_fetch_add(x, -1);
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	a_swap(p, x);
-}
-
-#define a_spin a_barrier
-
-static inline void a_barrier()
-{
-	a_cas(&(int){0}, 0, 0);
-}
-
-static inline void a_crash()
-{
-	*(volatile char *)0=0;
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (a_cas(p, old, old&v) != old);
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (a_cas(p, old, old|v) != old);
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	a_or(p, v);
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_and((int *)p, u.r[0]);
-	a_and((int *)p+1, u.r[1]);
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_or((int *)p, u.r[0]);
-	a_or((int *)p+1, u.r[1]);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/alltypes.h.in
deleted file mode 100644
index 667963c7e1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/alltypes.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg int
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF unsigned wchar_t;
-#endif
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/endian.h
deleted file mode 100644
index ef074b776e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/endian.h
+++ /dev/null
@@ -1 +0,0 @@
-#define __BYTE_ORDER __BIG_ENDIAN
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/errno.h
deleted file mode 100644
index d2e1eeee05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/fcntl.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/fcntl.h
deleted file mode 100644
index ae233cc003..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/fcntl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#define O_CREAT        0100
-#define O_EXCL         0200
-#define O_NOCTTY       0400
-#define O_TRUNC       01000
-#define O_APPEND      02000
-#define O_NONBLOCK    04000
-#define O_DSYNC      010000
-#define O_SYNC     04010000
-#define O_RSYNC    04010000
-#define O_DIRECTORY 0200000
-#define O_NOFOLLOW  0400000
-#define O_CLOEXEC  02000000
-
-#define O_ASYNC      020000
-#define O_DIRECT     040000
-#define O_LARGEFILE 0100000
-#define O_NOATIME  01000000
-#define O_PATH    010000000
-#define O_TMPFILE 020200000
-#define O_NDELAY O_NONBLOCK
-
-#define F_DUPFD  0
-#define F_GETFD  1
-#define F_SETFD  2
-#define F_GETFL  3
-#define F_SETFL  4
-
-#define F_SETOWN 8
-#define F_GETOWN 9
-#define F_SETSIG 10
-#define F_GETSIG 11
-
-#define F_GETLK 12
-#define F_SETLK 13
-#define F_SETLKW 14
-
-#define F_SETOWN_EX 15
-#define F_GETOWN_EX 16
-
-#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/fenv.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/fenv.h
deleted file mode 100644
index edbdea2a5e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/fenv.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define FE_ALL_EXCEPT 0
-#define FE_TONEAREST  0
-
-typedef unsigned long fexcept_t;
-
-typedef struct {
-	unsigned long __cw;
-} fenv_t;
-
-#define FE_DFL_ENV      ((const fenv_t *) -1)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/io.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/io.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/ioctl.h
deleted file mode 100644
index 9d75118e0e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/ioctl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGPTN	0x80045430
-#define TIOCSPTLCK	0x40045431
-#define TCGETX		0x5432
-#define TCSETX		0x5433
-#define TCSETXF		0x5434
-#define TCSETXW		0x5435
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR   0x5459
-#define TIOCSERGETMULTI 0x545A
-#define TIOCSERSETMULTI 0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-#define FIOQSIZE	0x5460
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE		0x89F0
-#define SIOCPROTOPRIVATE	0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/ipc.h
deleted file mode 100644
index 3d894e3003..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/ipc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-struct ipc_perm {
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long __pad1;
-	long __pad2;
-};
-
-#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/limits.h
deleted file mode 100644
index 483b6749b1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/limits.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 8192
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/mman.h
deleted file mode 100644
index cc854aaee8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/mman.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define	PROT_GROWSDOWN 0x01000000
-#define	PROT_GROWSUP   0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/msg.h
deleted file mode 100644
index bc8436c4ad..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/msg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-struct msqid_ds {
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	int __unused1;
-	time_t msg_rtime;
-	int __unused2;
-	time_t msg_ctime;
-	int __unused3;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/poll.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/poll.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/resource.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/resource.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/sem.h
deleted file mode 100644
index 0d91648415..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/sem.h
+++ /dev/null
@@ -1,11 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t __unused1;
-	time_t sem_ctime;
-	time_t __unused2;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/shm.h
deleted file mode 100644
index 81b2a29abb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/shm.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds {
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	int __unused1;
-	time_t shm_dtime;
-	int __unused2;
-	time_t shm_ctime;
-	int __unused3;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/socket.h
deleted file mode 100644
index 1f73b995c6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/socket.h
+++ /dev/null
@@ -1,15 +0,0 @@
-struct msghdr {
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen;
-	void *msg_control;
-	socklen_t msg_controllen;
-	int msg_flags;
-};
-
-struct cmsghdr {
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stat.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stat.h
deleted file mode 100644
index ce6a6bd0ea..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stat.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* copied from kernel definition, but with padding replaced
- * by the corresponding correctly-sized userspace types. */
-
-struct stat {
-	dev_t st_dev;
-	ino_t st_ino;
-	mode_t st_mode;
-	nlink_t st_nlink;
-	uid_t st_uid;
-	gid_t st_gid;
-	dev_t st_rdev;
-	long long __st_rdev_padding;
-	off_t st_size;
-	blksize_t st_blksize;
-	int __st_blksize_padding;
-	blkcnt_t st_blocks;
-	struct timespec st_atim;
-	struct timespec st_mtim;
-	struct timespec st_ctim;
-	unsigned __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/statfs.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/statfs.h
deleted file mode 100644
index f103f4e4f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct statfs {
-	unsigned long f_type, f_bsize;
-	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-	fsfilcnt_t f_files, f_ffree;
-	fsid_t f_fsid;
-	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/syscall.h
deleted file mode 100644
index 967db72814..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/syscall.h
+++ /dev/null
@@ -1,535 +0,0 @@
-#define __NR_io_setup 0
-#define __NR_io_destroy 1
-#define __NR_io_submit 2
-#define __NR_io_cancel 3
-#define __NR_io_getevents 4
-#define __NR_setxattr 5
-#define __NR_lsetxattr 6
-#define __NR_fsetxattr 7
-#define __NR_getxattr 8
-#define __NR_lgetxattr 9
-#define __NR_fgetxattr 10
-#define __NR_listxattr 11
-#define __NR_llistxattr 12
-#define __NR_flistxattr 13
-#define __NR_removexattr 14
-#define __NR_lremovexattr 15
-#define __NR_fremovexattr 16
-#define __NR_getcwd 17
-#define __NR_lookup_dcookie 18
-#define __NR_eventfd2 19
-#define __NR_epoll_create1 20
-#define __NR_epoll_ctl 21
-#define __NR_epoll_pwait 22
-#define __NR_dup 23
-#define __NR_dup3 24
-#define __NR_fcntl64 25
-#define __NR_inotify_init1 26
-#define __NR_inotify_add_watch 27
-#define __NR_inotify_rm_watch 28
-#define __NR_ioctl 29
-#define __NR_ioprio_set 30
-#define __NR_ioprio_get 31
-#define __NR_flock 32
-#define __NR_mknodat 33
-#define __NR_mkdirat 34
-#define __NR_unlinkat 35
-#define __NR_symlinkat 36
-#define __NR_linkat 37
-#define __NR_renameat 38
-#define __NR_umount2 39
-#define __NR_mount 40
-#define __NR_pivot_root 41
-#define __NR_nfsservctl 42
-#define __NR_statfs64 43
-#define __NR_fstatfs64 44
-#define __NR_truncate64 45
-#define __NR_ftruncate64 46
-#define __NR_fallocate 47
-#define __NR_faccessat 48
-#define __NR_chdir 49
-#define __NR_fchdir 50
-#define __NR_chroot 51
-#define __NR_fchmod 52
-#define __NR_fchmodat 53
-#define __NR_fchownat 54
-#define __NR_fchown 55
-#define __NR_openat 56
-#define __NR_close 57
-#define __NR_vhangup 58
-#define __NR_pipe2 59
-#define __NR_quotactl 60
-#define __NR_getdents64 61
-#define __NR__llseek 62
-#define __NR_read 63
-#define __NR_write 64
-#define __NR_readv 65
-#define __NR_writev 66
-#define __NR_pread64 67
-#define __NR_pwrite64 68
-#define __NR_preadv 69
-#define __NR_pwritev 70
-#define __NR_sendfile64 71
-#define __NR_pselect6 72
-#define __NR_ppoll 73
-#define __NR_signalfd4 74
-#define __NR_vmsplice 75
-#define __NR_splice 76
-#define __NR_tee 77
-#define __NR_readlinkat 78
-#define __NR_fstatat64 79
-#define __NR_fstat64 80
-#define __NR_sync 81
-#define __NR_fsync 82
-#define __NR_fdatasync 83
-#define __NR_sync_file_range 84
-#define __NR_timerfd_create 85
-#define __NR_timerfd_settime 86
-#define __NR_timerfd_gettime 87
-#define __NR_utimensat 88
-#define __NR_acct 89
-#define __NR_capget 90
-#define __NR_capset 91
-#define __NR_personality 92
-#define __NR_exit 93
-#define __NR_exit_group 94
-#define __NR_waitid 95
-#define __NR_set_tid_address 96
-#define __NR_unshare 97
-#define __NR_futex 98
-#define __NR_set_robust_list 99
-#define __NR_get_robust_list 100
-#define __NR_nanosleep 101
-#define __NR_getitimer 102
-#define __NR_setitimer 103
-#define __NR_kexec_load 104
-#define __NR_init_module 105
-#define __NR_delete_module 106
-#define __NR_timer_create 107
-#define __NR_timer_gettime 108
-#define __NR_timer_getoverrun 109
-#define __NR_timer_settime 110
-#define __NR_timer_delete 111
-#define __NR_clock_settime 112
-#define __NR_clock_gettime 113
-#define __NR_clock_getres 114
-#define __NR_clock_nanosleep 115
-#define __NR_syslog 116
-#define __NR_ptrace 117
-#define __NR_sched_setparam 118
-#define __NR_sched_setscheduler 119
-#define __NR_sched_getscheduler 120
-#define __NR_sched_getparam 121
-#define __NR_sched_setaffinity 122
-#define __NR_sched_getaffinity 123
-#define __NR_sched_yield 124
-#define __NR_sched_get_priority_max 125
-#define __NR_sched_get_priority_min 126
-#define __NR_sched_rr_get_interval 127
-#define __NR_restart_syscall 128
-#define __NR_kill 129
-#define __NR_tkill 130
-#define __NR_tgkill 131
-#define __NR_sigaltstack 132
-#define __NR_rt_sigsuspend 133
-#define __NR_rt_sigaction 134
-#define __NR_rt_sigprocmask 135
-#define __NR_rt_sigpending 136
-#define __NR_rt_sigtimedwait 137
-#define __NR_rt_sigqueueinfo 138
-#define __NR_rt_sigreturn 139
-#define __NR_setpriority 140
-#define __NR_getpriority 141
-#define __NR_reboot 142
-#define __NR_setregid 143
-#define __NR_setgid 144
-#define __NR_setreuid 145
-#define __NR_setuid 146
-#define __NR_setresuid 147
-#define __NR_getresuid 148
-#define __NR_setresgid 149
-#define __NR_getresgid 150
-#define __NR_setfsuid 151
-#define __NR_setfsgid 152
-#define __NR_times 153
-#define __NR_setpgid 154
-#define __NR_getpgid 155
-#define __NR_getsid 156
-#define __NR_setsid 157
-#define __NR_getgroups 158
-#define __NR_setgroups 159
-#define __NR_uname 160
-#define __NR_sethostname 161
-#define __NR_setdomainname 162
-#define __NR_getrlimit 163
-#define __NR_setrlimit 164
-#define __NR_getrusage 165
-#define __NR_umask 166
-#define __NR_prctl 167
-#define __NR_getcpu 168
-#define __NR_gettimeofday 169
-#define __NR_settimeofday 170
-#define __NR_adjtimex 171
-#define __NR_getpid 172
-#define __NR_getppid 173
-#define __NR_getuid 174
-#define __NR_geteuid 175
-#define __NR_getgid 176
-#define __NR_getegid 177
-#define __NR_gettid 178
-#define __NR_sysinfo 179
-#define __NR_mq_open 180
-#define __NR_mq_unlink 181
-#define __NR_mq_timedsend 182
-#define __NR_mq_timedreceive 183
-#define __NR_mq_notify 184
-#define __NR_mq_getsetattr 185
-#define __NR_msgget 186
-#define __NR_msgctl 187
-#define __NR_msgrcv 188
-#define __NR_msgsnd 189
-#define __NR_semget 190
-#define __NR_semctl 191
-#define __NR_semtimedop 192
-#define __NR_semop 193
-#define __NR_shmget 194
-#define __NR_shmctl 195
-#define __NR_shmat 196
-#define __NR_shmdt 197
-#define __NR_socket 198
-#define __NR_socketpair 199
-#define __NR_bind 200
-#define __NR_listen 201
-#define __NR_accept 202
-#define __NR_connect 203
-#define __NR_getsockname 204
-#define __NR_getpeername 205
-#define __NR_sendto 206
-#define __NR_recvfrom 207
-#define __NR_setsockopt 208
-#define __NR_getsockopt 209
-#define __NR_shutdown 210
-#define __NR_sendmsg 211
-#define __NR_recvmsg 212
-#define __NR_readahead 213
-#define __NR_brk 214
-#define __NR_munmap 215
-#define __NR_mremap 216
-#define __NR_add_key 217
-#define __NR_request_key 218
-#define __NR_keyctl 219
-#define __NR_clone 220
-#define __NR_execve 221
-#define __NR_mmap2 222
-#define __NR_fadvise64_64 223
-#define __NR_swapon 224
-#define __NR_swapoff 225
-#define __NR_mprotect 226
-#define __NR_msync 227
-#define __NR_mlock 228
-#define __NR_munlock 229
-#define __NR_mlockall 230
-#define __NR_munlockall 231
-#define __NR_mincore 232
-#define __NR_madvise 233
-#define __NR_remap_file_pages 234
-#define __NR_mbind 235
-#define __NR_get_mempolicy 236
-#define __NR_set_mempolicy 237
-#define __NR_migrate_pages 238
-#define __NR_move_pages 239
-#define __NR_rt_tgsigqueueinfo 240
-#define __NR_perf_event_open 241
-#define __NR_accept4 242
-#define __NR_recvmmsg 243
-#define __NR_or1k_atomic 244
-#define __NR_wait4 260
-#define __NR_prlimit64 261
-#define __NR_fanotify_init 262
-#define __NR_fanotify_mark 263
-#define __NR_name_to_handle_at 264
-#define __NR_open_by_handle_at 265
-#define __NR_clock_adjtime 266
-#define __NR_syncfs 267
-#define __NR_setns 268
-#define __NR_sendmmsg 269
-#define __NR_process_vm_readv 270
-#define __NR_process_vm_writev 271
-#define __NR_kcmp 272
-#define __NR_finit_module 273
-#define __NR_sched_setattr 274
-#define __NR_sched_getattr 275
-#define __NR_renameat2 276
-#define __NR_seccomp 277
-#define __NR_getrandom 278
-#define __NR_memfd_create 279
-#define __NR_bpf 280
-#define __NR_execveat 281
-
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_submit __NR_io_submit
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_setxattr __NR_setxattr
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_getxattr __NR_getxattr
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_removexattr __NR_removexattr
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_getcwd __NR_getcwd
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_dup __NR_dup
-#define SYS_dup3 __NR_dup3
-#define SYS_fcntl64 __NR_fcntl64
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_ioctl __NR_ioctl
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_flock __NR_flock
-#define SYS_mknodat __NR_mknodat
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_linkat __NR_linkat
-#define SYS_renameat __NR_renameat
-#define SYS_umount2 __NR_umount2
-#define SYS_mount __NR_mount
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_nfsservctl __NR_nfsservctl
-#define SYS_statfs64 __NR_statfs64
-#define SYS_fstatfs64 __NR_fstatfs64
-#define SYS_truncate64 __NR_truncate64
-#define SYS_ftruncate64 __NR_ftruncate64
-#define SYS_fallocate __NR_fallocate
-#define SYS_faccessat __NR_faccessat
-#define SYS_chdir __NR_chdir
-#define SYS_fchdir __NR_fchdir
-#define SYS_chroot __NR_chroot
-#define SYS_fchmod __NR_fchmod
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_fchownat __NR_fchownat
-#define SYS_fchown __NR_fchown
-#define SYS_openat __NR_openat
-#define SYS_close __NR_close
-#define SYS_vhangup __NR_vhangup
-#define SYS_pipe2 __NR_pipe2
-#define SYS_quotactl __NR_quotactl
-#define SYS_getdents64 __NR_getdents64
-#define SYS__llseek __NR__llseek
-#define SYS_read __NR_read
-#define SYS_write __NR_write
-#define SYS_readv __NR_readv
-#define SYS_writev __NR_writev
-#define SYS_pread64 __NR_pread64
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_preadv __NR_preadv
-#define SYS_pwritev __NR_pwritev
-#define SYS_sendfile64 __NR_sendfile64
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ppoll __NR_ppoll
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_splice __NR_splice
-#define SYS_tee __NR_tee
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_fstatat64 __NR_fstatat64
-#define SYS_fstat64 __NR_fstat64
-#define SYS_sync __NR_sync
-#define SYS_fsync __NR_fsync
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_sync_file_range __NR_sync_file_range
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_utimensat __NR_utimensat
-#define SYS_acct __NR_acct
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_personality __NR_personality
-#define SYS_exit __NR_exit
-#define SYS_exit_group __NR_exit_group
-#define SYS_waitid __NR_waitid
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_unshare __NR_unshare
-#define SYS_futex __NR_futex
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_getitimer __NR_getitimer
-#define SYS_setitimer __NR_setitimer
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_init_module __NR_init_module
-#define SYS_delete_module __NR_delete_module
-#define SYS_timer_create __NR_timer_create
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_syslog __NR_syslog
-#define SYS_ptrace __NR_ptrace
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_kill __NR_kill
-#define SYS_tkill __NR_tkill
-#define SYS_tgkill __NR_tgkill
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_setpriority __NR_setpriority
-#define SYS_getpriority __NR_getpriority
-#define SYS_reboot __NR_reboot
-#define SYS_setregid __NR_setregid
-#define SYS_setgid __NR_setgid
-#define SYS_setreuid __NR_setreuid
-#define SYS_setuid __NR_setuid
-#define SYS_setresuid __NR_setresuid
-#define SYS_getresuid __NR_getresuid
-#define SYS_setresgid __NR_setresgid
-#define SYS_getresgid __NR_getresgid
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_times __NR_times
-#define SYS_setpgid __NR_setpgid
-#define SYS_getpgid __NR_getpgid
-#define SYS_getsid __NR_getsid
-#define SYS_setsid __NR_setsid
-#define SYS_getgroups __NR_getgroups
-#define SYS_setgroups __NR_setgroups
-#define SYS_uname __NR_uname
-#define SYS_sethostname __NR_sethostname
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_getrlimit __NR_getrlimit
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_getrusage __NR_getrusage
-#define SYS_umask __NR_umask
-#define SYS_prctl __NR_prctl
-#define SYS_getcpu __NR_getcpu
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_getpid __NR_getpid
-#define SYS_getppid __NR_getppid
-#define SYS_getuid __NR_getuid
-#define SYS_geteuid __NR_geteuid
-#define SYS_getgid __NR_getgid
-#define SYS_getegid __NR_getegid
-#define SYS_gettid __NR_gettid
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_msgget __NR_msgget
-#define SYS_msgctl __NR_msgctl
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_semget __NR_semget
-#define SYS_semctl __NR_semctl
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_semop __NR_semop
-#define SYS_shmget __NR_shmget
-#define SYS_shmctl __NR_shmctl
-#define SYS_shmat __NR_shmat
-#define SYS_shmdt __NR_shmdt
-#define SYS_socket __NR_socket
-#define SYS_socketpair __NR_socketpair
-#define SYS_bind __NR_bind
-#define SYS_listen __NR_listen
-#define SYS_accept __NR_accept
-#define SYS_connect __NR_connect
-#define SYS_getsockname __NR_getsockname
-#define SYS_getpeername __NR_getpeername
-#define SYS_sendto __NR_sendto
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_shutdown __NR_shutdown
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_readahead __NR_readahead
-#define SYS_brk __NR_brk
-#define SYS_munmap __NR_munmap
-#define SYS_mremap __NR_mremap
-#define SYS_add_key __NR_add_key
-#define SYS_request_key __NR_request_key
-#define SYS_keyctl __NR_keyctl
-#define SYS_clone __NR_clone
-#define SYS_execve __NR_execve
-#define SYS_mmap2 __NR_mmap2
-#define SYS_fadvise64_64 __NR_fadvise64_64
-#define SYS_swapon __NR_swapon
-#define SYS_swapoff __NR_swapoff
-#define SYS_mprotect __NR_mprotect
-#define SYS_msync __NR_msync
-#define SYS_mlock __NR_mlock
-#define SYS_munlock __NR_munlock
-#define SYS_mlockall __NR_mlockall
-#define SYS_munlockall __NR_munlockall
-#define SYS_mincore __NR_mincore
-#define SYS_madvise __NR_madvise
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_mbind __NR_mbind
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_migrate_pages __NR_migrate_pages
-#define SYS_move_pages __NR_move_pages
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_accept4 __NR_accept4
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_or1k_atomic __NR_or1k_atomic
-#define SYS_wait4 __NR_wait4
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_syncfs __NR_syncfs
-#define SYS_setns __NR_setns
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_kcmp __NR_kcmp
-#define SYS_finit_module __NR_finit_module
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_renameat2 __NR_renameat2
-#define SYS_seccomp __NR_seccomp
-#define SYS_getrandom __NR_getrandom
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_bpf __NR_bpf
-#define SYS_execveat __NR_execveat
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/termios.h
deleted file mode 100644
index da2664496d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/termios.h
+++ /dev/null
@@ -1,159 +0,0 @@
-struct termios {
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/pthread_arch.h
deleted file mode 100644
index e826997e6b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/pthread_arch.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* or1k use variant I, but with the twist that tp points to the end of TCB */
-static inline struct pthread *__pthread_self()
-{
-#ifdef __clang__
-	char *tp;
-	__asm__ __volatile__ ("l.ori %0, r10, 0" : "=r" (tp) );
-#else
-	register char *tp __asm__("r10");
-#endif
-	return (struct pthread *) (tp - sizeof(struct pthread));
-}
-
-#define TLS_ABOVE_TP
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
-
-/* word-offset to 'pc' in mcontext_t */
-#define CANCEL_REG_IP 32
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/reloc.h
deleted file mode 100644
index ddee45c53d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/reloc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#define LDSO_ARCH "or1k"
-
-#define TPOFF_K 0
-
-#define REL_SYMBOLIC    R_OR1K_32
-#define REL_GOT         R_OR1K_GLOB_DAT
-#define REL_PLT         R_OR1K_JMP_SLOT
-#define REL_RELATIVE    R_OR1K_RELATIVE
-#define REL_COPY        R_OR1K_COPY
-#define REL_DTPMOD      R_OR1K_TLS_DTPMOD
-#define REL_DTPOFF      R_OR1K_TLS_DTPOFF
-#define REL_TPOFF       R_OR1K_TLS_TPOFF
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"l.jr %0 ; l.ori r1,%1,0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/or1k/syscall_arch.h
deleted file mode 100644
index caff7ece45..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/or1k/syscall_arch.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
-
-#define SYSCALL_MMAP2_UNIT 8192ULL
-
-#ifndef __clang__
-
-static __inline long __syscall0(long n)
-{
-	register unsigned long r11 __asm__("r11") = n;
-	__asm__ __volatile__ ("l.sys 1"
-			      : "=r"(r11)
-			      : "r"(r11)
-			      : "memory", "r3", "r4", "r5", "r6", "r7", "r8",
-				"r12", "r13", "r15", "r17", "r19", "r21",
-				"r23", "r25", "r27", "r29", "r31");
-	return r11;
-}
-
-static inline long __syscall1(long n, long a)
-{
-	register unsigned long r11 __asm__("r11") = n;
-	register unsigned long r3 __asm__("r3") = a;
-	__asm__ __volatile__ ("l.sys 1"
-			      : "=r"(r11)
-			      : "r"(r11), "r"(r3)
-			      : "memory", "r4", "r5", "r6", "r7", "r8",
-				"r12", "r13", "r15", "r17", "r19", "r21",
-				"r23", "r25", "r27", "r29", "r31");
-	return r11;
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-	register unsigned long r11 __asm__("r11") = n;
-	register unsigned long r3 __asm__("r3") = a;
-	register unsigned long r4 __asm__("r4") = b;
-	__asm__ __volatile__ ("l.sys 1"
-			      : "=r"(r11)
-			      : "r"(r11), "r"(r3), "r"(r4)
-			      : "memory", "r5", "r6", "r7", "r8",
-				"r12", "r13", "r15", "r17", "r19", "r21",
-				"r23", "r25", "r27", "r29", "r31");
-	return r11;
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-	register unsigned long r11 __asm__("r11") = n;
-	register unsigned long r3 __asm__("r3") = a;
-	register unsigned long r4 __asm__("r4") = b;
-	register unsigned long r5 __asm__("r5") = c;
-	__asm__ __volatile__ ("l.sys 1"
-			      : "=r"(r11)
-			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5)
-			      : "memory", "r6", "r7", "r8",
-				"r12", "r13", "r15", "r17", "r19", "r21",
-				"r23", "r25", "r27", "r29", "r31");
-	return r11;
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-	register unsigned long r11 __asm__("r11") = n;
-	register unsigned long r3 __asm__("r3") = a;
-	register unsigned long r4 __asm__("r4") = b;
-	register unsigned long r5 __asm__("r5") = c;
-	register unsigned long r6 __asm__("r6") = d;
-	__asm__ __volatile__ ("l.sys 1"
-			      : "=r"(r11)
-			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5), "r"(r6)
-			      : "memory", "r7", "r8",
-				"r12", "r13", "r15", "r17", "r19", "r21",
-				"r23", "r25", "r27", "r29", "r31");
-	return r11;
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
-	register unsigned long r11 __asm__("r11") = n;
-	register unsigned long r3 __asm__("r3") = a;
-	register unsigned long r4 __asm__("r4") = b;
-	register unsigned long r5 __asm__("r5") = c;
-	register unsigned long r6 __asm__("r6") = d;
-	register unsigned long r7 __asm__("r7") = e;
-	__asm__ __volatile__ ("l.sys 1"
-			      : "=r"(r11)
-			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5), "r"(r6),
-				"r"(r7)
-			      : "memory", "r8",
-				"r12", "r13", "r15", "r17", "r19", "r21",
-				"r23", "r25", "r27", "r29", "r31");
-	return r11;
-}
-
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
-	register unsigned long r11 __asm__("r11") = n;
-	register unsigned long r3 __asm__("r3") = a;
-	register unsigned long r4 __asm__("r4") = b;
-	register unsigned long r5 __asm__("r5") = c;
-	register unsigned long r6 __asm__("r6") = d;
-	register unsigned long r7 __asm__("r7") = e;
-	register unsigned long r8 __asm__("r8") = f;
-	__asm__ __volatile__ ("l.sys 1"
-			      : "=r"(r11)
-			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5), "r"(r6),
-				"r"(r7), "r"(r8)
-			      : "memory",
-				"r12", "r13", "r15", "r17", "r19", "r21",
-				"r23", "r25", "r27", "r29", "r31");
-	return r11;
-}
-
-#else
-
-#undef SYSCALL_NO_INLINE
-#define SYSCALL_NO_INLINE
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/atomic.h
deleted file mode 100644
index f706543a7f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/atomic.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-#include <endian.h>
-
-static inline int a_ctz_l(unsigned long x)
-{
-	static const char debruijn32[32] = {
-		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-	};
-	return debruijn32[(x&-x)*0x076be629 >> 27];
-}
-
-static inline int a_ctz_64(uint64_t x)
-{
-	uint32_t y = x;
-	if (!y) {
-		y = x>>32;
-		return 32 + a_ctz_l(y);
-	}
-	return a_ctz_l(y);
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	__asm__("\n"
-		"	sync\n"
-		"1:	lwarx %0, 0, %4\n"
-		"	cmpw %0, %2\n"
-		"	bne 1f\n"
-		"	stwcx. %3, 0, %4\n"
-		"	bne- 1b\n"
-		"	isync\n"
-		"1:	\n"
-		: "=&r"(t), "+m"(*p) : "r"(t), "r"(s), "r"(p) : "cc", "memory" );
-        return t;
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	return (void *)a_cas(p, (int)t, (int)s);
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	int old;
-	do old = *x;
-	while (a_cas(x, old, v) != old);
-	return old;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	int old;
-	do old = *x;
-	while (a_cas(x, old, old+v) != old);
-	return old;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	a_fetch_add(x, 1);
-}
-
-static inline void a_dec(volatile int *x)
-{
-	a_fetch_add(x, -1);
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__ __volatile__ ("\n"
-		"	sync\n"
-		"	stw %1, %0\n"
-		"	isync\n"
-		: "=m"(*p) : "r"(x) : "memory" );
-}
-
-#define a_spin a_barrier
-
-static inline void a_barrier()
-{
-	a_cas(&(int){0}, 0, 0);
-}
-
-static inline void a_crash()
-{
-	*(volatile char *)0=0;
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (a_cas(p, old, old&v) != old);
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	int old;
-	do old = *p;
-	while (a_cas(p, old, old|v) != old);
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	a_or(p, v);
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_and((int *)p, u.r[0]);
-	a_and((int *)p+1, u.r[1]);
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_or((int *)p, u.r[0]);
-	a_or((int *)p+1, u.r[1]);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/alltypes.h.in
deleted file mode 100644
index 37f27d6f4d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/alltypes.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg int
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF long wchar_t;
-#endif
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/endian.h
deleted file mode 100644
index 4442abf4eb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/endian.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef __BIG_ENDIAN__
-  #if __BIG_ENDIAN__
-    #define __BYTE_ORDER __BIG_ENDIAN
-  #endif
-#endif /* __BIG_ENDIAN__ */
-
-#ifdef __LITTLE_ENDIAN__
-  #if __LITTLE_ENDIAN__
-    #define __BYTE_ORDER __LITTLE_ENDIAN
-  #endif
-#endif /* __LITTLE_ENDIAN__ */
-
-#ifndef __BYTE_ORDER
-  #define __BYTE_ORDER __BIG_ENDIAN
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/errno.h
deleted file mode 100644
index 36ad2f90c9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       58 
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/io.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/io.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/ioctl.h
deleted file mode 100644
index 0c903dcbdb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/ioctl.h
+++ /dev/null
@@ -1,226 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  1U
-#define _IOC_WRITE 4U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define FIONCLEX	_IO('f', 2)
-#define FIOCLEX		_IO('f', 1)
-#define FIOASYNC	_IOW('f', 125, int)
-#define FIONBIO		_IOW('f', 126, int)
-#define FIONREAD	_IOR('f', 127, int)
-#define TIOCINQ		FIONREAD
-#define FIOQSIZE	_IOR('f', 128, char[8])
-#define TIOCGETP	_IOR('t', 8, char[6])
-#define TIOCSETP	_IOW('t', 9, char[6])
-#define TIOCSETN	_IOW('t', 10, char[6])
-
-#define TIOCSETC	_IOW('t', 17, char[6])
-#define TIOCGETC	_IOR('t', 18, char[6])
-#define TCGETS		_IOR('t', 19, char[44])
-#define TCSETS		_IOW('t', 20, char[44])
-#define TCSETSW		_IOW('t', 21, char[44])
-#define TCSETSF		_IOW('t', 22, char[44])
-
-#define TCGETA		_IOR('t', 23, char[20])
-#define TCSETA		_IOW('t', 24, char[20])
-#define TCSETAW		_IOW('t', 25, char[20])
-#define TCSETAF		_IOW('t', 28, char[20])
-
-#define TCSBRK		_IO('t', 29)
-#define TCXONC		_IO('t', 30)
-#define TCFLSH		_IO('t', 31)
-
-#define TIOCSWINSZ	_IOW('t', 103, char[8])
-#define TIOCGWINSZ	_IOR('t', 104, char[8])
-#define TIOCSTART	_IO('t', 110)
-#define TIOCSTOP	_IO('t', 111)
-
-#define TIOCOUTQ	_IOR('t', 115, int)
-
-#define TIOCGLTC	_IOR('t', 116, char[6])
-#define TIOCSLTC	_IOW('t', 117, char[6])
-#define TIOCSPGRP	_IOW('t', 118, int)
-#define TIOCGPGRP	_IOR('t', 119, int)
-
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-
-#define TIOCSTI		0x5412
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCM_LE	0x001
-#define TIOCM_DTR	0x002
-#define TIOCM_RTS	0x004
-#define TIOCM_ST	0x008
-#define TIOCM_SR	0x010
-#define TIOCM_CTS	0x020
-#define TIOCM_CAR	0x040
-#define TIOCM_RNG	0x080
-#define TIOCM_DSR	0x100
-#define TIOCM_CD	TIOCM_CAR
-#define TIOCM_RI	TIOCM_RNG
-#define TIOCM_OUT1	0x2000
-#define TIOCM_OUT2	0x4000
-#define TIOCM_LOOP	0x8000
-
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT	0x5420
-#define TIOCPKT_DATA		0
-#define TIOCPKT_FLUSHREAD	1
-#define TIOCPKT_FLUSHWRITE	2
-#define TIOCPKT_STOP		4
-#define TIOCPKT_START		8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGRS485	0x542e
-#define TIOCSRS485	0x542f
-#define TIOCGPTN	_IOR('T',0x30, unsigned int)
-#define TIOCSPTLCK	_IOW('T',0x31, int)
-#define TIOCGDEV	_IOR('T',0x32, unsigned int)
-#define TIOCSIG		_IOW('T',0x36, int)
-#define TIOCVHANGUP	0x5437
-
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR	0x5459
-#define TIOCSER_TEMT	0x01
-#define TIOCSERGETMULTI	0x545A
-#define TIOCSERSETMULTI	0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-
-
-/* end kernel header ioctls.h */
-
-
-#define TIOCTTYGSTRUCT	0x5426
-
-#define TCGETX		0x5432
-#define TCSETX		0x5433
-#define TCSETXF		0x5434
-#define TCSETXW		0x5435
-
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE		0x89F0
-#define SIOCPROTOPRIVATE	0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/ipc.h
deleted file mode 100644
index e1bfe2f554..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/ipc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	int __pad1;
-	long long __pad2;
-	long long __pad3;
-};
-
-#define IPC_64 0x100
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/limits.h
deleted file mode 100644
index fbc6d238dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/limits.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/mman.h
deleted file mode 100644
index fe8de2b9d6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/mman.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define	PROT_GROWSDOWN 0x01000000
-#define	PROT_GROWSUP   0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x40
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x80
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/msg.h
deleted file mode 100644
index a6b9ad5bad..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/msg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	int __unused1;
-	time_t msg_stime;
-	int __unused2;
-	time_t msg_rtime;
-	int __unused3;
-	time_t msg_ctime;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/poll.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/poll.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/resource.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/resource.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/sem.h
deleted file mode 100644
index bc2d6d1f51..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/sem.h
+++ /dev/null
@@ -1,10 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	int __unused1;
-	time_t sem_otime;
-	int  __unused2;
-	time_t sem_ctime;
-	unsigned short __sem_nsems_pad, sem_nsems;
-	long __unused3;
-	long __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/shm.h
deleted file mode 100644
index c698ef3455..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/shm.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	int __unused1;
-	time_t shm_atime;
-	int __unused2;
-	time_t shm_dtime;
-	int __unused3;
-	time_t shm_ctime;
-	int __unused4;
-	size_t shm_segsz;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/signal.h
deleted file mode 100644
index 17a7354f8d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/signal.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 4096
-#define SIGSTKSZ 10240
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-typedef unsigned long greg_t, gregset_t[48];
-
-typedef struct {
-	double fpregs[32];
-	double fpscr;
-	unsigned _pad[2];
-} fpregset_t;
-
-typedef struct {
-	unsigned vrregs[32][4];
-	unsigned vrsave;
-	unsigned _pad[2];
-	unsigned vscr;
-} vrregset_t;
-
-struct sigcontext
-{
-	unsigned long _unused[4];
-	int signal;
-	unsigned long handler;
-	unsigned long oldmask;
-	void *regs;
-};
-
-typedef struct {
-	gregset_t gregs;
-	fpregset_t fpregs;
-	vrregset_t vrregs
-#ifdef __GNUC__
-	__attribute__((__aligned__(16)))
-#endif
-	;
-} mcontext_t;
-
-#else
-
-typedef struct {
-	long __regs[48+68+4*32+4]
-#ifdef __GNUC__
-	__attribute__((__aligned__(16)))
-#endif
-	;
-} mcontext_t;
-
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct __ucontext *uc_link;
-	stack_t uc_stack;
-	int uc_pad[7];
-	mcontext_t *uc_regs;
-	sigset_t uc_sigmask;
-        int             uc_pad2[3];
-	mcontext_t uc_mcontext;
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1U
-#define SA_NOCLDWAIT  2U
-#define SA_SIGINFO    4U
-#define SA_ONSTACK    0x08000000U
-#define SA_RESTART    0x10000000U
-#define SA_NODEFER    0x40000000U
-#define SA_RESETHAND  0x80000000U
-#define SA_RESTORER   0x04000000U
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGBUS    7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGUSR1   10
-#define SIGSEGV   11
-#define SIGUSR2   12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGSTKFLT 16
-#define SIGCHLD   17
-#define SIGCONT   18
-#define SIGSTOP   19
-#define SIGTSTP   20
-#define SIGTTIN   21
-#define SIGTTOU   22
-#define SIGURG    23
-#define SIGXCPU   24
-#define SIGXFSZ   25
-#define SIGVTALRM 26
-#define SIGPROF   27
-#define SIGWINCH  28
-#define SIGIO     29
-#define SIGPOLL   29
-#define SIGPWR    30
-#define SIGSYS    31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/socket.h
deleted file mode 100644
index 18087919be..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/socket.h
+++ /dev/null
@@ -1,44 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen;
-	void *msg_control;
-	socklen_t msg_controllen;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
-
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-#define SO_REUSEPORT    15
-#define SO_RCVLOWAT     16
-#define SO_SNDLOWAT     17
-#define SO_RCVTIMEO     18
-#define SO_SNDTIMEO     19
-#define SO_PASSCRED     20
-#define SO_PEERCRED     21
-#define SO_ACCEPTCONN   30
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_PROTOCOL     38
-#define SO_DOMAIN       39
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stat.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stat.h
deleted file mode 100644
index bd524a1a94..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stat.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* copied from kernel definition, but with padding replaced
- * by the corresponding correctly-sized userspace types. */
-
-struct stat
-{
-	dev_t st_dev;
-	ino_t st_ino;
-	mode_t st_mode;
-	nlink_t st_nlink;
-	uid_t st_uid;
-	gid_t st_gid;
-	dev_t st_rdev;
-	short __st_rdev_padding;
-	off_t st_size;
-	blksize_t st_blksize;
-	blkcnt_t st_blocks;
-	struct timespec st_atim;
-	struct timespec st_mtim;
-	struct timespec st_ctim;
-	unsigned __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/statfs.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/statfs.h
deleted file mode 100644
index f103f4e4f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct statfs {
-	unsigned long f_type, f_bsize;
-	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-	fsfilcnt_t f_files, f_ffree;
-	fsid_t f_fsid;
-	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/syscall.h
deleted file mode 100644
index acd825ad8b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/syscall.h
+++ /dev/null
@@ -1,760 +0,0 @@
-#define __NR_restart_syscall          0
-#define __NR_exit                     1
-#define __NR_fork                     2
-#define __NR_read                     3
-#define __NR_write                    4
-#define __NR_open                     5
-#define __NR_close                    6
-#define __NR_waitpid                  7
-#define __NR_creat                    8
-#define __NR_link                     9
-#define __NR_unlink                  10
-#define __NR_execve                  11
-#define __NR_chdir                   12
-#define __NR_time                    13
-#define __NR_mknod                   14
-#define __NR_chmod                   15
-#define __NR_lchown                  16
-#define __NR_break                   17
-#define __NR_oldstat                 18
-#define __NR_lseek                   19
-#define __NR_getpid                  20
-#define __NR_mount                   21
-#define __NR_umount                  22
-#define __NR_setuid                  23
-#define __NR_getuid                  24
-#define __NR_stime                   25
-#define __NR_ptrace                  26
-#define __NR_alarm                   27
-#define __NR_oldfstat                28
-#define __NR_pause                   29
-#define __NR_utime                   30
-#define __NR_stty                    31
-#define __NR_gtty                    32
-#define __NR_access                  33
-#define __NR_nice                    34
-#define __NR_ftime                   35
-#define __NR_sync                    36
-#define __NR_kill                    37
-#define __NR_rename                  38
-#define __NR_mkdir                   39
-#define __NR_rmdir                   40
-#define __NR_dup                     41
-#define __NR_pipe                    42
-#define __NR_times                   43
-#define __NR_prof                    44
-#define __NR_brk                     45
-#define __NR_setgid                  46
-#define __NR_getgid                  47
-#define __NR_signal                  48
-#define __NR_geteuid                 49
-#define __NR_getegid                 50
-#define __NR_acct                    51
-#define __NR_umount2                 52
-#define __NR_lock                    53
-#define __NR_ioctl                   54
-#define __NR_fcntl                   55
-#define __NR_mpx                     56
-#define __NR_setpgid                 57
-#define __NR_ulimit                  58
-#define __NR_oldolduname             59
-#define __NR_umask                   60
-#define __NR_chroot                  61
-#define __NR_ustat                   62
-#define __NR_dup2                    63
-#define __NR_getppid                 64
-#define __NR_getpgrp                 65
-#define __NR_setsid                  66
-#define __NR_sigaction               67
-#define __NR_sgetmask                68
-#define __NR_ssetmask                69
-#define __NR_setreuid                70
-#define __NR_setregid                71
-#define __NR_sigsuspend              72
-#define __NR_sigpending              73
-#define __NR_sethostname             74
-#define __NR_setrlimit               75
-#define __NR_getrlimit               76
-#define __NR_getrusage               77
-#define __NR_gettimeofday            78
-#define __NR_settimeofday            79
-#define __NR_getgroups               80
-#define __NR_setgroups               81
-#define __NR_select                  82
-#define __NR_symlink                 83
-#define __NR_oldlstat                84
-#define __NR_readlink                85
-#define __NR_uselib                  86
-#define __NR_swapon                  87
-#define __NR_reboot                  88
-#define __NR_readdir                 89
-#define __NR_mmap                    90
-#define __NR_munmap                  91
-#define __NR_truncate                92
-#define __NR_ftruncate               93
-#define __NR_fchmod                  94
-#define __NR_fchown                  95
-#define __NR_getpriority             96
-#define __NR_setpriority             97
-#define __NR_profil                  98
-#define __NR_statfs                  99
-#define __NR_fstatfs                100
-#define __NR_ioperm                 101
-#define __NR_socketcall             102
-#define __NR_syslog                 103
-#define __NR_setitimer              104
-#define __NR_getitimer              105
-#define __NR_stat                   106
-#define __NR_lstat                  107
-#define __NR_fstat                  108
-#define __NR_olduname               109
-#define __NR_iopl                   110
-#define __NR_vhangup                111
-#define __NR_idle                   112
-#define __NR_vm86                   113
-#define __NR_wait4                  114
-#define __NR_swapoff                115
-#define __NR_sysinfo                116
-#define __NR_ipc                    117
-#define __NR_fsync                  118
-#define __NR_sigreturn              119
-#define __NR_clone                  120
-#define __NR_setdomainname          121
-#define __NR_uname                  122
-#define __NR_modify_ldt             123
-#define __NR_adjtimex               124
-#define __NR_mprotect               125
-#define __NR_sigprocmask            126
-#define __NR_create_module          127
-#define __NR_init_module            128
-#define __NR_delete_module          129
-#define __NR_get_kernel_syms        130
-#define __NR_quotactl               131
-#define __NR_getpgid                132
-#define __NR_fchdir                 133
-#define __NR_bdflush                134
-#define __NR_sysfs                  135
-#define __NR_personality            136
-#define __NR_afs_syscall            137
-#define __NR_setfsuid               138
-#define __NR_setfsgid               139
-#define __NR__llseek                140
-#define __NR_getdents               141
-#define __NR__newselect             142
-#define __NR_flock                  143
-#define __NR_msync                  144
-#define __NR_readv                  145
-#define __NR_writev                 146
-#define __NR_getsid                 147
-#define __NR_fdatasync              148
-#define __NR__sysctl                149
-#define __NR_mlock                  150
-#define __NR_munlock                151
-#define __NR_mlockall               152
-#define __NR_munlockall             153
-#define __NR_sched_setparam         154
-#define __NR_sched_getparam         155
-#define __NR_sched_setscheduler     156
-#define __NR_sched_getscheduler     157
-#define __NR_sched_yield            158
-#define __NR_sched_get_priority_max 159
-#define __NR_sched_get_priority_min 160
-#define __NR_sched_rr_get_interval  161
-#define __NR_nanosleep              162
-#define __NR_mremap                 163
-#define __NR_setresuid32            164
-#define __NR_setresuid              164
-#define __NR_getresuid32            165
-#define __NR_getresuid              165
-#define __NR_query_module           166
-#define __NR_poll                   167
-#define __NR_nfsservctl             168
-#define __NR_setresgid32            169
-#define __NR_setresgid              169
-#define __NR_getresgid32            170
-#define __NR_getresgid              170
-#define __NR_prctl                  171
-#define __NR_rt_sigreturn           172
-#define __NR_rt_sigaction           173
-#define __NR_rt_sigprocmask         174
-#define __NR_rt_sigpending          175
-#define __NR_rt_sigtimedwait        176
-#define __NR_rt_sigqueueinfo        177
-#define __NR_rt_sigsuspend          178
-#define __NR_pread64                179
-#define __NR_pwrite64               180
-#define __NR_chown                  181
-#define __NR_getcwd                 182
-#define __NR_capget                 183
-#define __NR_capset                 184
-#define __NR_sigaltstack            185
-#define __NR_sendfile               186
-#define __NR_getpmsg                187
-#define __NR_putpmsg                188
-#define __NR_vfork                  189
-#define __NR_ugetrlimit             190
-#define __NR_readahead              191
-#if !defined(__PPC64) || defined(__ABI32)
-#define __NR_mmap2                  192
-#define __NR_truncate64             193
-#define __NR_ftruncate64            194
-#define __NR_stat64                 195
-#define __NR_lstat64                196
-#define __NR_fstat64                197
-#endif
-#define __NR_pciconfig_read         198
-#define __NR_pciconfig_write        199
-#define __NR_pciconfig_iobase       200
-#define __NR_multiplexer            201
-#define __NR_getdents64             202
-#define __NR_pivot_root             203
-#if !defined(__PPC64) || defined(__ABI32)
-#define __NR_fcntl64                204
-#endif
-#define __NR_madvise                205
-#define __NR_mincore                206
-#define __NR_gettid                 207
-#define __NR_tkill                  208
-#define __NR_setxattr               209
-#define __NR_lsetxattr              210
-#define __NR_fsetxattr              211
-#define __NR_getxattr               212
-#define __NR_lgetxattr              213
-#define __NR_fgetxattr              214
-#define __NR_listxattr              215
-#define __NR_llistxattr             216
-#define __NR_flistxattr             217
-#define __NR_removexattr            218
-#define __NR_lremovexattr           219
-#define __NR_fremovexattr           220
-#define __NR_futex                  221
-#define __NR_sched_setaffinity      222
-#define __NR_sched_getaffinity      223
-#define __NR_tuxcall                225
-#if !defined(__PPC64) || defined(__ABI32)
-#define __NR_sendfile64             226
-#endif
-#define __NR_io_setup               227
-#define __NR_io_destroy             228
-#define __NR_io_getevents           229
-#define __NR_io_submit              230
-#define __NR_io_cancel              231
-#define __NR_set_tid_address        232
-#define __NR_fadvise64              233
-#define __NR_exit_group             234
-#define __NR_lookup_dcookie         235
-#define __NR_epoll_create           236
-#define __NR_epoll_ctl              237
-#define __NR_epoll_wait             238
-#define __NR_remap_file_pages       239
-#define __NR_timer_create           240
-#define __NR_timer_settime          241
-#define __NR_timer_gettime          242
-#define __NR_timer_getoverrun       243
-#define __NR_timer_delete           244
-#define __NR_clock_settime          245
-#define __NR_clock_gettime          246
-#define __NR_clock_getres           247
-#define __NR_clock_nanosleep        248
-#define __NR_swapcontext            249
-#define __NR_tgkill                 250
-#define __NR_utimes                 251
-#define __NR_statfs64               252
-#define __NR_fstatfs64              253
-#if !defined(__PPC64) || defined(__ABI32)
-#define __NR_fadvise64_64           254
-#endif
-#define __NR_rtas		255
-#define __NR_sys_debug_setcontext 256
-#define __NR_migrate_pages	258
-#define __NR_mbind		259
-#define __NR_get_mempolicy	260
-#define __NR_set_mempolicy	261
-#define __NR_mq_open		262
-#define __NR_mq_unlink		263
-#define __NR_mq_timedsend	264
-#define __NR_mq_timedreceive	265
-#define __NR_mq_notify		266
-#define __NR_mq_getsetattr	267
-#define __NR_kexec_load		268
-#define __NR_add_key		269
-#define __NR_request_key	270
-#define __NR_keyctl		271
-#define __NR_waitid		272
-#define __NR_ioprio_set		273
-#define __NR_ioprio_get		274
-#define __NR_inotify_init	275
-#define __NR_inotify_add_watch	276
-#define __NR_inotify_rm_watch	277
-#define __NR_spu_run		278
-#define __NR_spu_create		279
-#define __NR_pselect6		280
-#define __NR_ppoll		281
-#define __NR_unshare		282
-#define __NR_splice		283
-#define __NR_tee		284
-#define __NR_vmsplice		285
-#define __NR_openat		286
-#define __NR_mkdirat		287
-#define __NR_mknodat		288
-#define __NR_fchownat		289
-#define __NR_futimesat		290
-#if defined(__PPC64) && !defined(__ABI32)
-#define __NR_newfstatat		291
-#else
-#define __NR_fstatat64		291
-#endif
-#define __NR_unlinkat		292
-#define __NR_renameat		293
-#define __NR_linkat		294
-#define __NR_symlinkat		295
-#define __NR_readlinkat		296
-#define __NR_fchmodat		297
-#define __NR_faccessat		298
-#define __NR_get_robust_list	299
-#define __NR_set_robust_list	300
-#define __NR_move_pages		301
-#define __NR_getcpu		302
-#define __NR_epoll_pwait	303
-#define __NR_utimensat		304
-#define __NR_signalfd		305
-#define __NR_timerfd		306
-#define __NR_timerfd_create     306
-#define __NR_eventfd		307
-#define __NR_sync_file_range2	308
-#define __NR_fallocate		309
-#define __NR_subpage_prot		310
-#define __NR_timerfd_settime	311
-#define __NR_timerfd_gettime	312
-#define __NR_signalfd4		313
-#define __NR_eventfd2		314
-#define __NR_epoll_create1	315
-#define __NR_dup3			316
-#define __NR_pipe2		317
-#define __NR_inotify_init1	318
-#define __NR_perf_event_open       319
-#define __NR_preadv                320
-#define __NR_pwritev               321
-#define __NR_rt_tgsigqueueinfo     322
-#define __NR_fanotify_init         323
-#define __NR_fanotify_mark         324
-#define __NR_prlimit64             325
-#define __NR_socket                326
-#define __NR_bind                  327
-#define __NR_connect               328
-#define __NR_listen                329
-#define __NR_accept                330
-#define __NR_getsockname           331
-#define __NR_getpeername           332
-#define __NR_socketpair            333
-#define __NR_send                  334
-#define __NR_sendto                335
-#define __NR_recv                  336
-#define __NR_recvfrom              337
-#define __NR_shutdown              338
-#define __NR_setsockopt            339
-#define __NR_getsockopt            340
-#define __NR_sendmsg               341
-#define __NR_recvmsg               342
-#define __NR_recvmmsg              343
-#define __NR_accept4               344
-#define __NR_name_to_handle_at     345
-#define __NR_open_by_handle_at     346
-#define __NR_clock_adjtime         347
-#define __NR_syncfs                348
-#define __NR_sendmmsg              349
-#define __NR_setns                 350
-#define __NR_process_vm_readv      351
-#define __NR_process_vm_writev     352
-#define __NR_finit_module          353
-#define __NR_kcmp                  354
-#define __NR_sched_setattr         355
-#define __NR_sched_getattr         356
-#define __NR_renameat2             357
-#define __NR_seccomp               358
-#define __NR_getrandom             359
-#define __NR_memfd_create          360
-#define __NR_bpf                   361
-#define __NR_execveat              362
-
-/*
- * repeated with SYS prefix
- */
-#define SYS_restart_syscall          0
-#define SYS_exit                     1
-#define SYS_fork                     2
-#define SYS_read                     3
-#define SYS_write                    4
-#define SYS_open                     5
-#define SYS_close                    6
-#define SYS_waitpid                  7
-#define SYS_creat                    8
-#define SYS_link                     9
-#define SYS_unlink                  10
-#define SYS_execve                  11
-#define SYS_chdir                   12
-#define SYS_time                    13
-#define SYS_mknod                   14
-#define SYS_chmod                   15
-#define SYS_lchown                  16
-#define SYS_break                   17
-#define SYS_oldstat                 18
-#define SYS_lseek                   19
-#define SYS_getpid                  20
-#define SYS_mount                   21
-#define SYS_umount                  22
-#define SYS_setuid                  23
-#define SYS_getuid                  24
-#define SYS_stime                   25
-#define SYS_ptrace                  26
-#define SYS_alarm                   27
-#define SYS_oldfstat                28
-#define SYS_pause                   29
-#define SYS_utime                   30
-#define SYS_stty                    31
-#define SYS_gtty                    32
-#define SYS_access                  33
-#define SYS_nice                    34
-#define SYS_ftime                   35
-#define SYS_sync                    36
-#define SYS_kill                    37
-#define SYS_rename                  38
-#define SYS_mkdir                   39
-#define SYS_rmdir                   40
-#define SYS_dup                     41
-#define SYS_pipe                    42
-#define SYS_times                   43
-#define SYS_prof                    44
-#define SYS_brk                     45
-#define SYS_setgid                  46
-#define SYS_getgid                  47
-#define SYS_signal                  48
-#define SYS_geteuid                 49
-#define SYS_getegid                 50
-#define SYS_acct                    51
-#define SYS_umount2                 52
-#define SYS_lock                    53
-#define SYS_ioctl                   54
-#define SYS_fcntl                   55
-#define SYS_mpx                     56
-#define SYS_setpgid                 57
-#define SYS_ulimit                  58
-#define SYS_oldolduname             59
-#define SYS_umask                   60
-#define SYS_chroot                  61
-#define SYS_ustat                   62
-#define SYS_dup2                    63
-#define SYS_getppid                 64
-#define SYS_getpgrp                 65
-#define SYS_setsid                  66
-#define SYS_sigaction               67
-#define SYS_sgetmask                68
-#define SYS_ssetmask                69
-#define SYS_setreuid                70
-#define SYS_setregid                71
-#define SYS_sigsuspend              72
-#define SYS_sigpending              73
-#define SYS_sethostname             74
-#define SYS_setrlimit               75
-#define SYS_getrlimit               76
-#define SYS_getrusage               77
-#define SYS_gettimeofday            78
-#define SYS_settimeofday            79
-#define SYS_getgroups               80
-#define SYS_setgroups               81
-#define SYS_select                  82
-#define SYS_symlink                 83
-#define SYS_oldlstat                84
-#define SYS_readlink                85
-#define SYS_uselib                  86
-#define SYS_swapon                  87
-#define SYS_reboot                  88
-#define SYS_readdir                 89
-#define SYS_mmap                    90
-#define SYS_munmap                  91
-#define SYS_truncate                92
-#define SYS_ftruncate               93
-#define SYS_fchmod                  94
-#define SYS_fchown                  95
-#define SYS_getpriority             96
-#define SYS_setpriority             97
-#define SYS_profil                  98
-#define SYS_statfs                  99
-#define SYS_fstatfs                100
-#define SYS_ioperm                 101
-#define SYS_socketcall             102
-#define SYS_syslog                 103
-#define SYS_setitimer              104
-#define SYS_getitimer              105
-#define SYS_stat                   106
-#define SYS_lstat                  107
-#define SYS_fstat                  108
-#define SYS_olduname               109
-#define SYS_iopl                   110
-#define SYS_vhangup                111
-#define SYS_idle                   112
-#define SYS_vm86                   113
-#define SYS_wait4                  114
-#define SYS_swapoff                115
-#define SYS_sysinfo                116
-#define SYS_ipc                    117
-#define SYS_fsync                  118
-#define SYS_sigreturn              119
-#define SYS_clone                  120
-#define SYS_setdomainname          121
-#define SYS_uname                  122
-#define SYS_modify_ldt             123
-#define SYS_adjtimex               124
-#define SYS_mprotect               125
-#define SYS_sigprocmask            126
-#define SYS_create_module          127
-#define SYS_init_module            128
-#define SYS_delete_module          129
-#define SYS_get_kernel_syms        130
-#define SYS_quotactl               131
-#define SYS_getpgid                132
-#define SYS_fchdir                 133
-#define SYS_bdflush                134
-#define SYS_sysfs                  135
-#define SYS_personality            136
-#define SYS_afs_syscall            137
-#define SYS_setfsuid               138
-#define SYS_setfsgid               139
-#define SYS__llseek                140
-#define SYS_getdents               141
-#define SYS__newselect             142
-#define SYS_flock                  143
-#define SYS_msync                  144
-#define SYS_readv                  145
-#define SYS_writev                 146
-#define SYS_getsid                 147
-#define SYS_fdatasync              148
-#define SYS__sysctl                149
-#define SYS_mlock                  150
-#define SYS_munlock                151
-#define SYS_mlockall               152
-#define SYS_munlockall             153
-#define SYS_sched_setparam         154
-#define SYS_sched_getparam         155
-#define SYS_sched_setscheduler     156
-#define SYS_sched_getscheduler     157
-#define SYS_sched_yield            158
-#define SYS_sched_get_priority_max 159
-#define SYS_sched_get_priority_min 160
-#define SYS_sched_rr_get_interval  161
-#define SYS_nanosleep              162
-#define SYS_mremap                 163
-#define SYS_setresuid32            164
-#define SYS_setresuid              164
-#define SYS_getresuid32            165
-#define SYS_getresuid              165
-#define SYS_query_module           166
-#define SYS_poll                   167
-#define SYS_nfsservctl             168
-#define SYS_setresgid32            169
-#define SYS_setresgid              169
-#define SYS_getresgid32            170
-#define SYS_getresgid              170
-#define SYS_prctl                  171
-#define SYS_rt_sigreturn           172
-#define SYS_rt_sigaction           173
-#define SYS_rt_sigprocmask         174
-#define SYS_rt_sigpending          175
-#define SYS_rt_sigtimedwait        176
-#define SYS_rt_sigqueueinfo        177
-#define SYS_rt_sigsuspend          178
-#define SYS_pread64                179
-#define SYS_pwrite64               180
-#define SYS_chown                  181
-#define SYS_getcwd                 182
-#define SYS_capget                 183
-#define SYS_capset                 184
-#define SYS_sigaltstack            185
-#define SYS_sendfile               186
-#define SYS_getpmsg                187
-#define SYS_putpmsg                188
-#define SYS_vfork                  189
-#define SYS_ugetrlimit             190
-#define SYS_readahead              191
-#if !defined(__PPC64) || defined(__ABI32)
-#define SYS_mmap2                  192
-#define SYS_truncate64             193
-#define SYS_ftruncate64            194
-#define SYS_stat64                 195
-#define SYS_lstat64                196
-#define SYS_fstat64                197
-#endif
-#define SYS_pciconfig_read         198
-#define SYS_pciconfig_write        199
-#define SYS_pciconfig_iobase       200
-#define SYS_multiplexer            201
-#define SYS_getdents64             202
-#define SYS_pivot_root             203
-#if !defined(__PPC64) || defined(__ABI32)
-#define SYS_fcntl64                204
-#endif
-#define SYS_madvise                205
-#define SYS_mincore                206
-#define SYS_gettid                 207
-#define SYS_tkill                  208
-#define SYS_setxattr               209
-#define SYS_lsetxattr              210
-#define SYS_fsetxattr              211
-#define SYS_getxattr               212
-#define SYS_lgetxattr              213
-#define SYS_fgetxattr              214
-#define SYS_listxattr              215
-#define SYS_llistxattr             216
-#define SYS_flistxattr             217
-#define SYS_removexattr            218
-#define SYS_lremovexattr           219
-#define SYS_fremovexattr           220
-#define SYS_futex                  221
-#define SYS_sched_setaffinity      222
-#define SYS_sched_getaffinity      223
-#define SYS_tuxcall                225
-#if !defined(__PPC64) || defined(__ABI32)
-#define SYS_sendfile64             226
-#endif
-#define SYS_io_setup               227
-#define SYS_io_destroy             228
-#define SYS_io_getevents           229
-#define SYS_io_submit              230
-#define SYS_io_cancel              231
-#define SYS_set_tid_address        232
-#define SYS_fadvise64              233
-#define SYS_exit_group             234
-#define SYS_lookup_dcookie         235
-#define SYS_epoll_create           236
-#define SYS_epoll_ctl              237
-#define SYS_epoll_wait             238
-#define SYS_remap_file_pages       239
-#define SYS_timer_create           240
-#define SYS_timer_settime          241
-#define SYS_timer_gettime          242
-#define SYS_timer_getoverrun       243
-#define SYS_timer_delete           244
-#define SYS_clock_settime          245
-#define SYS_clock_gettime          246
-#define SYS_clock_getres           247
-#define SYS_clock_nanosleep        248
-#define SYS_swapcontext            249
-#define SYS_tgkill                 250
-#define SYS_utimes                 251
-#define SYS_statfs64               252
-#define SYS_fstatfs64              253
-#if !defined(__PPC64) || defined(__ABI32)
-#define SYS_fadvise64_64           254
-#endif
-#define SYS_rtas		255
-#define SYS_sys_debug_setcontext 256
-#define SYS_migrate_pages	258
-#define SYS_mbind		259
-#define SYS_get_mempolicy	260
-#define SYS_set_mempolicy	261
-#define SYS_mq_open		262
-#define SYS_mq_unlink		263
-#define SYS_mq_timedsend	264
-#define SYS_mq_timedreceive	265
-#define SYS_mq_notify		266
-#define SYS_mq_getsetattr	267
-#define SYS_kexec_load		268
-#define SYS_add_key		269
-#define SYS_request_key	270
-#define SYS_keyctl		271
-#define SYS_waitid		272
-#define SYS_ioprio_set		273
-#define SYS_ioprio_get		274
-#define SYS_inotify_init	275
-#define SYS_inotify_add_watch	276
-#define SYS_inotify_rm_watch	277
-#define SYS_spu_run		278
-#define SYS_spu_create		279
-#define SYS_pselect6		280
-#define SYS_ppoll		281
-#define SYS_unshare		282
-#define SYS_splice		283
-#define SYS_tee		284
-#define SYS_vmsplice		285
-#define SYS_openat		286
-#define SYS_mkdirat		287
-#define SYS_mknodat		288
-#define SYS_fchownat		289
-#define SYS_futimesat		290
-#if defined(__PPC64) && !defined(__ABI32)
-#define SYS_newfstatat		291
-#else
-#define SYS_fstatat64		291
-#endif
-#define SYS_unlinkat		292
-#define SYS_renameat		293
-#define SYS_linkat		294
-#define SYS_symlinkat		295
-#define SYS_readlinkat		296
-#define SYS_fchmodat		297
-#define SYS_faccessat		298
-#define SYS_get_robust_list	299
-#define SYS_set_robust_list	300
-#define SYS_move_pages		301
-#define SYS_getcpu		302
-#define SYS_epoll_pwait	303
-#define SYS_utimensat		304
-#define SYS_signalfd		305
-#define SYS_timerfd		306
-#define SYS_timerfd_create      306
-#define SYS_eventfd		307
-#define SYS_sync_file_range2	308
-#define SYS_fallocate		309
-#define SYS_subpage_prot		310
-#define SYS_timerfd_settime	311
-#define SYS_timerfd_gettime	312
-#define SYS_signalfd4		313
-#define SYS_eventfd2		314
-#define SYS_epoll_create1	315
-#define SYS_dup3			316
-#define SYS_pipe2		317
-#define SYS_inotify_init1	318
-#define SYS_perf_event_open       319
-#define SYS_preadv                320
-#define SYS_pwritev               321
-#define SYS_rt_tgsigqueueinfo     322
-#define SYS_fanotify_init         323
-#define SYS_fanotify_mark         324
-#define SYS_prlimit64             325
-#define SYS_socket                326
-#define SYS_bind                  327
-#define SYS_connect               328
-#define SYS_listen                329
-#define SYS_accept                330
-#define SYS_getsockname           331
-#define SYS_getpeername           332
-#define SYS_socketpair            333
-#define SYS_send                  334
-#define SYS_sendto                335
-#define SYS_recv                  336
-#define SYS_recvfrom              337
-#define SYS_shutdown              338
-#define SYS_setsockopt            339
-#define SYS_getsockopt            340
-#define SYS_sendmsg               341
-#define SYS_recvmsg               342
-#define SYS_recvmmsg              343
-#define SYS_accept4               344
-#define SYS_name_to_handle_at     345
-#define SYS_open_by_handle_at     346
-#define SYS_clock_adjtime         347
-#define SYS_syncfs                348
-#define SYS_sendmmsg              349
-#define SYS_setns                 350
-#define SYS_process_vm_readv      351
-#define SYS_process_vm_writev     352
-#define SYS_finit_module          353
-#define SYS_kcmp                  354
-#define SYS_sched_setattr         355
-#define SYS_sched_getattr         356
-#define SYS_renameat2             357
-#define SYS_seccomp               358
-#define SYS_getrandom             359
-#define SYS_memfd_create          360
-#define SYS_bpf                   361
-#define SYS_execveat              362
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/termios.h
deleted file mode 100644
index 9f8016c937..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/termios.h
+++ /dev/null
@@ -1,172 +0,0 @@
-#undef NCCS
-#define NCCS 19
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_cc[NCCS];
-	cc_t c_line;
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR		0
-#define VQUIT		1
-#define VERASE		2
-#define VKILL		3
-#define VEOF		4
-#define VMIN		5
-#define VEOL		6
-#define VTIME		7
-#define VEOL2		8
-#define VSWTC		9
-#define VWERASE		10
-#define VREPRINT	11
-#define VSUSP		12
-#define VSTART		13
-#define VSTOP		14
-#define VLNEXT		15
-#define VDISCARD	16
-
-#define IGNBRK	0000001
-#define BRKINT	0000002
-#define IGNPAR	0000004
-#define PARMRK	0000010
-#define INPCK	0000020
-#define ISTRIP	0000040
-#define INLCR	0000100
-#define IGNCR	0000200
-#define ICRNL	0000400
-#define IXON	0001000
-#define IXOFF	0002000
-#define IXANY	0004000
-#define IUCLC	0010000
-#define IMAXBEL 0020000
-#define IUTF8	0040000
-
-#define OPOST	0000001
-#define ONLCR	0000002
-#define OLCUC	0000004
-
-#define OCRNL	0000010
-#define ONOCR	0000020
-#define ONLRET	0000040
-
-#define OFILL	00000100
-#define OFDEL	00000200
-#define NLDLY	00001400
-#define NL0	00000000
-#define NL1	00000400
-#define NL2	00001000
-#define NL3	00001400
-#define TABDLY	00006000
-#define TAB0	00000000
-#define TAB1	00002000
-#define TAB2	00004000
-#define TAB3	00006000
-#define CRDLY	00030000
-#define CR0	00000000
-#define CR1	00010000
-#define CR2	00020000
-#define CR3	00030000
-#define FFDLY	00040000
-#define FF0	00000000
-#define FF1	00040000
-#define BSDLY	00100000
-#define BS0	00000000
-#define BS1	00100000
-#define VTDLY	00200000
-#define VT0	00000000
-#define VT1	00200000
-
-#define CBAUD	0000377
-#define B0	0000000
-#define B50	0000001
-#define B75	0000002
-#define B110	0000003
-#define B134	0000004
-#define B150	0000005
-#define B200	0000006
-#define B300	0000007
-#define B600	0000010
-#define B1200	0000011
-#define B1800	0000012
-#define B2400	0000013
-#define B4800	0000014
-#define B9600	0000015
-#define B19200	0000016
-#define B38400	0000017
-#define EXTA	B19200
-#define EXTB	B38400
-#define B57600	00020
-#define B115200	00021
-#define B230400	00022
-#define B460800	00023
-#define B500000	00024
-#define B576000	00025
-#define B921600	00026
-
-#define B1000000	00027
-#define B1152000	00030
-#define B1500000	00031
-#define B2000000	00032
-#define B2500000	00033
-#define B3000000	00034
-#define B3500000	00035
-#define B4000000	00036
-#define BOTHER	00037
-
-#define CSIZE	00001400
-#define CS5	00000000
-#define CS6	00000400
-#define CS7	00001000
-#define CS8	00001400
-
-#define CSTOPB	00002000
-#define CREAD	00004000
-#define PARENB	00010000
-#define PARODD	00020000
-#define HUPCL	00040000
-
-#define CLOCAL	00100000
-
-#define ISIG	0x00000080
-#define ICANON	0x00000100
-#define XCASE	0x00004000
-#define ECHO	0x00000008
-#define ECHOE	0x00000002
-#define ECHOK	0x00000004
-#define ECHONL	0x00000010
-#define NOFLSH	0x80000000
-#define TOSTOP	0x00400000
-#define ECHOCTL 0x00000040
-#define ECHOPRT 0x00000020
-#define ECHOKE	0x00000001
-#define FLUSHO	0x00800000
-#define PENDIN	0x20000000
-#define IEXTEN	0x00000400
-
-#define TCOOFF	0
-#define TCOON	1
-#define TCIOFF	2
-#define TCION	3
-
-#define TCIFLUSH	0
-#define TCOFLUSH	1
-#define TCIOFLUSH	2
-
-#define TCSANOW		0
-#define TCSADRAIN	1
-#define TCSAFLUSH	2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX	0000000
-#define CIBAUD	077600000
-#define IBSHIFT 16
-#define CMSPAR	010000000000
-#define CRTSCTS	020000000000
-#define EXTPROC 0x10000000
-#define XTABS	00006000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/user.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/user.h
deleted file mode 100644
index 6cc8aaf722..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/user.h
+++ /dev/null
@@ -1,25 +0,0 @@
-struct pt_regs {
-	unsigned long gpr[32], nip, msr, orig_gpr3, ctr, link, xer, ccr, mq;
-	unsigned long trap, dar, dsisr, result;
-};
-
-struct user {
-	struct pt_regs regs;
-	unsigned long u_tsize, u_dsize, u_ssize;
-	unsigned long start_code, start_data, start_stack;
-	long signal;
-	void *u_ar0;
-	unsigned long magic;
-	char u_comm[32];
-};
-
-#define ELF_NGREG 48
-#define ELF_NFPREG 33
-#define ELF_NVRREG 33
-typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
-typedef double elf_fpreg_t, elf_fpregset_t[ELF_NFPREG];
-typedef struct { unsigned u[4]; }
-#ifdef __GNUC__
-__attribute__((__aligned__(16)))
-#endif
-	elf_vrreg_t, elf_vrregset_t[ELF_NVRREG];
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/pthread_arch.h
deleted file mode 100644
index 1cbfc223ad..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/pthread_arch.h
+++ /dev/null
@@ -1,22 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-#ifdef __clang__
-	char *tp;
-	__asm__ __volatile__ ("mr %0, 2" : "=r"(tp) : : );
-#else
-	register char *tp __asm__("r2");
-#endif
-	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
-}
-                        
-#define TLS_ABOVE_TP
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
-
-#define DTP_OFFSET 0x8000
-
-// offset of the PC register in mcontext_t, divided by the system wordsize
-// the kernel calls the ip "nip", it's the first saved value after the 32
-// GPRs.
-#define CANCEL_REG_IP 32
-
-#define CANARY canary_at_end
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/reloc.h
deleted file mode 100644
index aa5f8c936e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/reloc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#define LDSO_ARCH "powerpc"
-
-#define TPOFF_K (-0x7000)
-
-#define REL_SYMBOLIC    R_PPC_ADDR32
-#define REL_GOT         R_PPC_GLOB_DAT
-#define REL_PLT         R_PPC_JMP_SLOT
-#define REL_RELATIVE    R_PPC_RELATIVE
-#define REL_COPY        R_PPC_COPY
-#define REL_DTPMOD      R_PPC_DTPMOD32
-#define REL_DTPOFF      R_PPC_DTPREL32
-#define REL_TPOFF       R_PPC_TPREL32
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"mr 1,%1 ; mtlr %0 ; blr" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/powerpc/syscall_arch.h
deleted file mode 100644
index e7cb1a26d6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/powerpc/syscall_arch.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
-
-#undef SYSCALL_NO_INLINE
-#define SYSCALL_NO_INLINE
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/sh/atomic.h
deleted file mode 100644
index f2e6dacbee..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/atomic.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_l(unsigned long x)
-{
-	static const char debruijn32[32] = {
-		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-	};
-	return debruijn32[(x&-x)*0x076be629 >> 27];
-}
-
-static inline int a_ctz_64(uint64_t x)
-{
-	uint32_t y = x;
-	if (!y) {
-		y = x>>32;
-		return 32 + a_ctz_l(y);
-	}
-	return a_ctz_l(y);
-}
-
-#define LLSC_CLOBBERS "r0", "t", "memory"
-#define LLSC_START(mem) "synco\n"  \
-	"0:	movli.l @" mem ", r0\n"
-#define LLSC_END(mem)              \
-	"1:	movco.l r0, @" mem "\n"    \
-	"	bf 0b\n"                   \
-	"	synco\n"
-
-static inline int __sh_cas_llsc(volatile int *p, int t, int s)
-{
-	int old;
-	__asm__ __volatile__(
-		LLSC_START("%1")
-		"	mov r0, %0\n"
-		"	cmp/eq %0, %2\n"
-		"	bf 1f\n"
-		"	mov %3, r0\n"
-		LLSC_END("%1")
-		: "=&r"(old) : "r"(p), "r"(t), "r"(s) : LLSC_CLOBBERS);
-	return old;
-}
-
-static inline int __sh_swap_llsc(volatile int *x, int v)
-{
-	int old;
-	__asm__ __volatile__(
-		LLSC_START("%1")
-		"	mov r0, %0\n"
-		"	mov %2, r0\n"
-		LLSC_END("%1")
-		: "=&r"(old) : "r"(x), "r"(v) : LLSC_CLOBBERS);
-	return old;
-}
-
-static inline int __sh_fetch_add_llsc(volatile int *x, int v)
-{
-	int old;
-	__asm__ __volatile__(
-		LLSC_START("%1")
-		"	mov r0, %0\n"
-		"	add %2, r0\n"
-		LLSC_END("%1")
-		: "=&r"(old) : "r"(x), "r"(v) : LLSC_CLOBBERS);
-	return old;
-}
-
-static inline void __sh_store_llsc(volatile int *p, int x)
-{
-	__asm__ __volatile__(
-		"	synco\n"
-		"	mov.l %1, @%0\n"
-		"	synco\n"
-		: : "r"(p), "r"(x) : "memory");
-}
-
-static inline void __sh_and_llsc(volatile int *x, int v)
-{
-	__asm__ __volatile__(
-		LLSC_START("%0")
-		"	and %1, r0\n"
-		LLSC_END("%0")
-		: : "r"(x), "r"(v) : LLSC_CLOBBERS);
-}
-
-static inline void __sh_or_llsc(volatile int *x, int v)
-{
-	__asm__ __volatile__(
-		LLSC_START("%0")
-		"	or %1, r0\n"
-		LLSC_END("%0")
-		: : "r"(x), "r"(v) : LLSC_CLOBBERS);
-}
-
-#ifdef __SH4A__
-#define a_cas(p,t,s)     __sh_cas_llsc(p,t,s)
-#define a_swap(x,v)      __sh_swap_llsc(x,v)
-#define a_fetch_add(x,v) __sh_fetch_add_llsc(x, v)
-#define a_store(x,v)     __sh_store_llsc(x, v)
-#define a_and(x,v)       __sh_and_llsc(x, v)
-#define a_or(x,v)        __sh_or_llsc(x, v)
-#else
-
-int  __sh_cas(volatile int *, int, int);
-int  __sh_swap(volatile int *, int);
-int  __sh_fetch_add(volatile int *, int);
-void __sh_store(volatile int *, int);
-void __sh_and(volatile int *, int);
-void __sh_or(volatile int *, int);
-
-#define a_cas(p,t,s)     __sh_cas(p,t,s)
-#define a_swap(x,v)      __sh_swap(x,v)
-#define a_fetch_add(x,v) __sh_fetch_add(x, v)
-#define a_store(x,v)     __sh_store(x, v)
-#define a_and(x,v)       __sh_and(x, v)
-#define a_or(x,v)        __sh_or(x, v)
-#endif
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	return (void *)a_cas(p, (int)t, (int)s);
-}
-
-static inline void a_inc(volatile int *x)
-{
-	a_fetch_add(x, 1);
-}
-
-static inline void a_dec(volatile int *x)
-{
-	a_fetch_add(x, -1);
-}
-
-#define a_spin a_barrier
-
-static inline void a_barrier()
-{
-	a_cas(&(int){0}, 0, 0);
-}
-
-static inline void a_crash()
-{
-	*(volatile char *)0=0;
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	a_or(p, v);
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_and((int *)p,   u.r[0]);
-	a_and((int *)p+1, u.r[1]);
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	union { uint64_t v; uint32_t r[2]; } u = { v };
-	a_or((int *)p,   u.r[0]);
-	a_or((int *)p+1, u.r[1]);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/alltypes.h.in
deleted file mode 100644
index 37f27d6f4d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/alltypes.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg int
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF long wchar_t;
-#endif
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/endian.h
deleted file mode 100644
index 2016cb2074..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/endian.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#if __BIG_ENDIAN__
-#define __BYTE_ORDER __BIG_ENDIAN
-#else
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/errno.h
deleted file mode 100644
index d2e1eeee05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/fcntl.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/fcntl.h
deleted file mode 100644
index ae233cc003..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/fcntl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#define O_CREAT        0100
-#define O_EXCL         0200
-#define O_NOCTTY       0400
-#define O_TRUNC       01000
-#define O_APPEND      02000
-#define O_NONBLOCK    04000
-#define O_DSYNC      010000
-#define O_SYNC     04010000
-#define O_RSYNC    04010000
-#define O_DIRECTORY 0200000
-#define O_NOFOLLOW  0400000
-#define O_CLOEXEC  02000000
-
-#define O_ASYNC      020000
-#define O_DIRECT     040000
-#define O_LARGEFILE 0100000
-#define O_NOATIME  01000000
-#define O_PATH    010000000
-#define O_TMPFILE 020200000
-#define O_NDELAY O_NONBLOCK
-
-#define F_DUPFD  0
-#define F_GETFD  1
-#define F_SETFD  2
-#define F_GETFL  3
-#define F_SETFL  4
-
-#define F_SETOWN 8
-#define F_GETOWN 9
-#define F_SETSIG 10
-#define F_GETSIG 11
-
-#define F_GETLK 12
-#define F_SETLK 13
-#define F_SETLKW 14
-
-#define F_SETOWN_EX 15
-#define F_GETOWN_EX 16
-
-#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/io.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/io.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/ioctl.h
deleted file mode 100644
index 2f63d06fc1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/ioctl.h
+++ /dev/null
@@ -1,209 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define FIOCLEX             _IO('f',  1)
-#define FIONCLEX            _IO('f',  2)
-#define FIOASYNC            _IOW('f', 125, int)
-#define FIONBIO             _IOW('f', 126, int)
-#define FIONREAD            _IOR('f', 127, int)
-#define TIOCINQ             FIONREAD
-#define FIOQSIZE            _IOR('f', 128, char[8])
-
-#define TCGETA              _IOR('t', 23, char[18])
-#define TCSETA              _IOW('t', 24, char[18])
-#define TCSETAW             _IOW('t', 25, char[18])
-#define TCSETAF             _IOW('t', 28, char[18])
-
-#define TCSBRK              _IO('t', 29)
-#define TCXONC              _IO('t', 30)
-#define TCFLSH              _IO('t', 31)
-
-#define TIOCSWINSZ          _IOW('t', 103, char[8])
-#define TIOCGWINSZ          _IOR('t', 104, char[8])
-#define TIOCSTART           _IO('t',  110)
-#define TIOCSTOP            _IO('t',  111)
-#define TIOCOUTQ            _IOR('t', 115, int)
-
-#define TIOCSPGRP           _IOW('t', 118, int)
-#define TIOCGPGRP           _IOR('t', 119, int)
-
-#define TIOCEXCL            _IO('T', 12)
-#define TIOCNXCL            _IO('T', 13)
-#define TIOCSCTTY           _IO('T', 14)
-
-#define TIOCSTI             _IOW('T', 18, char)
-#define TIOCMGET            _IOR('T', 21, unsigned int)
-#define TIOCMBIS            _IOW('T', 22, unsigned int)
-#define TIOCMBIC            _IOW('T', 23, unsigned int)
-#define TIOCMSET            _IOW('T', 24, unsigned int)
-#define TIOCM_LE            0x001
-#define TIOCM_DTR           0x002
-#define TIOCM_RTS           0x004
-#define TIOCM_ST            0x008
-#define TIOCM_SR            0x010
-#define TIOCM_CTS           0x020
-#define TIOCM_CAR           0x040
-#define TIOCM_RNG           0x080
-#define TIOCM_DSR           0x100
-#define TIOCM_CD            TIOCM_CAR
-#define TIOCM_RI            TIOCM_RNG
-#define TIOCM_OUT1          0x2000
-#define TIOCM_OUT2          0x4000
-#define TIOCM_LOOP          0x8000
-
-#define TIOCGSOFTCAR        _IOR('T', 25, unsigned int)
-#define TIOCSSOFTCAR        _IOW('T', 26, unsigned int)
-#define TIOCLINUX           _IOW('T', 28, char)
-#define TIOCCONS            _IO('T',  29)
-#define TIOCGSERIAL         _IOR('T', 30, char[60])
-#define TIOCSSERIAL         _IOW('T', 31, char[60])
-#define TIOCPKT             _IOW('T', 32, int)
-#define TIOCPKT_DATA        0
-#define TIOCPKT_FLUSHREAD   1
-#define TIOCPKT_FLUSHWRITE  2
-#define TIOCPKT_STOP        4
-#define TIOCPKT_START       8
-#define TIOCPKT_NOSTOP      16
-#define TIOCPKT_DOSTOP      32
-#define TIOCPKT_IOCTL       64
-
-#define TIOCNOTTY           _IO('T',  34)
-#define TIOCSETD            _IOW('T', 35, int)
-#define TIOCGETD            _IOR('T', 36, int)
-#define TCSBRKP             _IOW('T', 37, int)
-#define TIOCSBRK            _IO('T',  39)
-#define TIOCCBRK            _IO('T',  40)
-#define TIOCGSID            _IOR('T', 41, int)
-#define TCGETS              _IO('T', 1)
-#define TCSETS              _IO('T', 2)
-#define TCSETSW             _IO('T', 3)
-#define TCSETSF             _IO('T', 4)
-#define TCGETS2             _IOR('T', 42, char[44])
-#define TCSETS2             _IOW('T', 43, char[44])
-#define TCSETSW2            _IOW('T', 44, char[44])
-#define TCSETSF2            _IOW('T', 45, char[44])
-#define TIOCGPTN            _IOR('T', 48, unsigned int)
-#define TIOCSPTLCK          _IOW('T', 49, int)
-#define TIOCGDEV            _IOR('T', 50, unsigned int)
-#define TIOCSIG             _IOW('T', 54, int)
-#define TIOCVHANGUP         _IO('T',  55)
-#define TIOCGPKT            _IOR('T', 56, int)
-#define TIOCGPTLCK          _IOR('T', 57, int)
-#define TIOCGEXCL           _IOR('T', 64, int)
-
-#define TIOCSERCONFIG       _IO('T',  83)
-#define TIOCSERGWILD        _IOR('T', 84, int)
-#define TIOCSERSWILD        _IOW('T', 85, int)
-#define TIOCGLCKTRMIOS      _IO('T',  86)
-#define TIOCSLCKTRMIOS      _IO('T',  87)
-#define TIOCSERGSTRUCT      _IOR('T', 88, char[216])
-#define TIOCSERGETLSR       _IOR('T', 89, unsigned int)
-#define TIOCSER_TEMT        0x01
-#define TIOCSERGETMULTI     _IOR('T', 90, char[168])
-#define TIOCSERSETMULTI     _IOW('T', 91, char[168])
-
-#define TIOCMIWAIT          _IO('T', 92)
-#define TIOCGICOUNT         _IO('T', 93)
-
-struct winsize {
-    unsigned short ws_row;
-    unsigned short ws_col;
-    unsigned short ws_xpixel;
-    unsigned short ws_ypixel;
-};
-
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOGETOWN       _IOR('f', 123, int)
-#define FIOSETOWN       _IOW('f', 124, int)
-
-#define SIOCATMARK      _IOR('s', 7, int)
-#define SIOCSPGRP       _IOW('s', 8, int)
-#define SIOCGPGRP       _IOW('s', 9, int)
-#define SIOCGSTAMP      _IOR('s', 100, char[8])
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE      0x89F0
-#define SIOCPROTOPRIVATE    0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/ipc.h
deleted file mode 100644
index b748d3b742..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/ipc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long __pad1;
-	long __pad2;
-};
-
-#define IPC_64 0x100
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/limits.h
deleted file mode 100644
index 65a3dd6477..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/limits.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/mman.h
deleted file mode 100644
index f6fc98f045..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/mman.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define	PROT_GROWSDOWN 0x01000000
-#define	PROT_GROWSUP   0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     4
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/msg.h
deleted file mode 100644
index 3db8576b78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/msg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	int __unused1;
-	time_t msg_rtime;
-	int __unused2;
-	time_t msg_ctime;
-	int __unused3;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/poll.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/poll.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/resource.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/resource.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/sem.h
deleted file mode 100644
index c629b81ebb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/sem.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t __unused1;
-	time_t sem_ctime;
-	time_t __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/shm.h
deleted file mode 100644
index a210fd4af7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/shm.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#define SHMLBA 16384
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	int __unused1;
-	time_t shm_dtime;
-	int __unused2;
-	time_t shm_ctime;
-	int __unused3;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/socket.h
deleted file mode 100644
index 36febbc222..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/socket.h
+++ /dev/null
@@ -1,17 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen;
-	void *msg_control;
-	socklen_t msg_controllen;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/stat.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/stat.h
deleted file mode 100644
index bb9314a5dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/stat.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* copied from kernel definition, but with padding replaced
- * by the corresponding correctly-sized userspace types. */
-
-struct stat
-{
-	dev_t st_dev;
-	int __st_dev_padding;
-	long __st_ino_truncated;
-	mode_t st_mode;
-	nlink_t st_nlink;
-	uid_t st_uid;
-	gid_t st_gid;
-	dev_t st_rdev;
-	int __st_rdev_padding;
-	off_t st_size;
-	blksize_t st_blksize;
-	blkcnt_t st_blocks;
-	struct timespec st_atim;
-	struct timespec st_mtim;
-	struct timespec st_ctim;
-	ino_t st_ino;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/statfs.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/statfs.h
deleted file mode 100644
index f103f4e4f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct statfs {
-	unsigned long f_type, f_bsize;
-	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-	fsfilcnt_t f_files, f_ffree;
-	fsid_t f_fsid;
-	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/syscall.h
deleted file mode 100644
index 4b363bf25e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/syscall.h
+++ /dev/null
@@ -1,684 +0,0 @@
-#define __NR_restart_syscall        0
-#define __NR_exit                   1
-#define __NR_fork                   2
-#define __NR_read                   3
-#define __NR_write                  4
-#define __NR_open                   5
-#define __NR_close                  6
-#define __NR_waitpid                7
-#define __NR_creat                  8
-#define __NR_link                   9
-#define __NR_unlink                 10
-#define __NR_execve                 11
-#define __NR_chdir                  12
-#define __NR_time                   13
-#define __NR_mknod                  14
-#define __NR_chmod                  15
-#define __NR_lchown                 16
-#define __NR_oldstat                18
-#define __NR_lseek                  19
-#define __NR_getpid                 20
-#define __NR_mount                  21
-#define __NR_umount                 22
-#define __NR_setuid                 23
-#define __NR_getuid                 24
-#define __NR_stime                  25
-#define __NR_ptrace                 26
-#define __NR_alarm                  27
-#define __NR_oldfstat               28
-#define __NR_pause                  29
-#define __NR_utime                  30
-#define __NR_access                 33
-#define __NR_nice                   34
-#define __NR_sync                   36
-#define __NR_kill                   37
-#define __NR_rename                 38
-#define __NR_mkdir                  39
-#define __NR_rmdir                  40
-#define __NR_dup                    41
-#define __NR_pipe                   42
-#define __NR_times                  43
-#define __NR_brk                    45
-#define __NR_setgid                 46
-#define __NR_getgid                 47
-#define __NR_signal                 48
-#define __NR_geteuid                49
-#define __NR_getegid                50
-#define __NR_acct                   51
-#define __NR_umount2                52
-#define __NR_ioctl                  54
-#define __NR_fcntl                  55
-#define __NR_setpgid                57
-#define __NR_umask                  60
-#define __NR_chroot                 61
-#define __NR_ustat                  62
-#define __NR_dup2                   63
-#define __NR_getppid                64
-#define __NR_getpgrp                65
-#define __NR_setsid                 66
-#define __NR_sigaction              67
-#define __NR_sgetmask               68
-#define __NR_ssetmask               69
-#define __NR_setreuid               70
-#define __NR_setregid               71
-#define __NR_sigsuspend             72
-#define __NR_sigpending             73
-#define __NR_sethostname            74
-#define __NR_setrlimit              75
-#define __NR_getrlimit              76
-#define __NR_getrusage              77
-#define __NR_gettimeofday           78
-#define __NR_settimeofday           79
-#define __NR_getgroups              80
-#define __NR_setgroups              81
-#define __NR_symlink                83
-#define __NR_oldlstat               84
-#define __NR_readlink               85
-#define __NR_uselib                 86
-#define __NR_swapon                 87
-#define __NR_reboot                 88
-#define __NR_readdir                89
-#define __NR_mmap                   90
-#define __NR_munmap                 91
-#define __NR_truncate               92
-#define __NR_ftruncate              93
-#define __NR_fchmod                 94
-#define __NR_fchown                 95
-#define __NR_getpriority            96
-#define __NR_setpriority            97
-#define __NR_statfs                 99
-#define __NR_fstatfs                100
-#define __NR_socketcall             102
-#define __NR_syslog                 103
-#define __NR_setitimer              104
-#define __NR_getitimer              105
-#define __NR_stat                   106
-#define __NR_lstat                  107
-#define __NR_fstat                  108
-#define __NR_olduname               109
-#define __NR_vhangup                111
-#define __NR_wait4                  114
-#define __NR_swapoff                115
-#define __NR_sysinfo                116
-#define __NR_ipc                    117
-#define __NR_fsync                  118
-#define __NR_sigreturn              119
-#define __NR_clone                  120
-#define __NR_setdomainname          121
-#define __NR_uname                  122
-#define __NR_cacheflush             123
-#define __NR_adjtimex               124
-#define __NR_mprotect               125
-#define __NR_sigprocmask            126
-#define __NR_init_module            128
-#define __NR_delete_module          129
-#define __NR_quotactl               131
-#define __NR_getpgid                132
-#define __NR_fchdir                 133
-#define __NR_bdflush                134
-#define __NR_sysfs                  135
-#define __NR_personality            136
-#define __NR_setfsuid               138
-#define __NR_setfsgid               139
-#define __NR__llseek                140
-#define __NR_getdents               141
-#define __NR__newselect             142
-#define __NR_flock                  143
-#define __NR_msync                  144
-#define __NR_readv                  145
-#define __NR_writev                 146
-#define __NR_getsid                 147
-#define __NR_fdatasync              148
-#define __NR__sysctl                149
-#define __NR_mlock                  150
-#define __NR_munlock                151
-#define __NR_mlockall               152
-#define __NR_munlockall             153
-#define __NR_sched_setparam         154
-#define __NR_sched_getparam         155
-#define __NR_sched_setscheduler     156
-#define __NR_sched_getscheduler     157
-#define __NR_sched_yield            158
-#define __NR_sched_get_priority_max 159
-#define __NR_sched_get_priority_min 160
-#define __NR_sched_rr_get_interval  161
-#define __NR_nanosleep              162
-#define __NR_mremap                 163
-#define __NR_setresuid              164
-#define __NR_getresuid              165
-#define __NR_poll                   168
-#define __NR_nfsservctl             169
-#define __NR_setresgid              170
-#define __NR_getresgid              171
-#define __NR_prctl                  172
-#define __NR_rt_sigreturn           173
-#define __NR_rt_sigaction           174
-#define __NR_rt_sigprocmask         175
-#define __NR_rt_sigpending          176
-#define __NR_rt_sigtimedwait        177
-#define __NR_rt_sigqueueinfo        178
-#define __NR_rt_sigsuspend          179
-#define __NR_pread64                180
-#define __NR_pwrite64               181
-#define __NR_chown                  182
-#define __NR_getcwd                 183
-#define __NR_capget                 184
-#define __NR_capset                 185
-#define __NR_sigaltstack            186
-#define __NR_sendfile               187
-#define __NR_vfork                  190
-#define __NR_ugetrlimit             191
-#define __NR_mmap2                  192
-#define __NR_truncate64             193
-#define __NR_ftruncate64            194
-#define __NR_stat64                 195
-#define __NR_lstat64                196
-#define __NR_fstat64                197
-#define __NR_lchown32               198
-#define __NR_getuid32               199
-#define __NR_getgid32               200
-#define __NR_geteuid32              201
-#define __NR_getegid32              202
-#define __NR_setreuid32             203
-#define __NR_setregid32             204
-#define __NR_getgroups32            205
-#define __NR_setgroups32            206
-#define __NR_fchown32               207
-#define __NR_setresuid32            208
-#define __NR_getresuid32            209
-#define __NR_setresgid32            210
-#define __NR_getresgid32            211
-#define __NR_chown32                212
-#define __NR_setuid32               213
-#define __NR_setgid32               214
-#define __NR_setfsuid32             215
-#define __NR_setfsgid32             216
-#define __NR_pivot_root             217
-#define __NR_mincore                218
-#define __NR_madvise                219
-#define __NR_getdents64             220
-#define __NR_fcntl64                221
-#define __NR_gettid                 224
-#define __NR_readahead              225
-#define __NR_setxattr               226
-#define __NR_lsetxattr              227
-#define __NR_fsetxattr              228
-#define __NR_getxattr               229
-#define __NR_lgetxattr              230
-#define __NR_fgetxattr              231
-#define __NR_listxattr              232
-#define __NR_llistxattr             233
-#define __NR_flistxattr             234
-#define __NR_removexattr            235
-#define __NR_lremovexattr           236
-#define __NR_fremovexattr           237
-#define __NR_tkill                  238
-#define __NR_sendfile64             239
-#define __NR_futex                  240
-#define __NR_sched_setaffinity      241
-#define __NR_sched_getaffinity      242
-#define __NR_io_setup               245
-#define __NR_io_destroy             246
-#define __NR_io_getevents           247
-#define __NR_io_submit              248
-#define __NR_io_cancel              249
-#define __NR_fadvise64              250
-#define __NR_exit_group             252
-#define __NR_lookup_dcookie         253
-#define __NR_epoll_create           254
-#define __NR_epoll_ctl              255
-#define __NR_epoll_wait             256
-#define __NR_remap_file_pages       257
-#define __NR_set_tid_address        258
-#define __NR_timer_create           259
-#define __NR_timer_settime          260
-#define __NR_timer_gettime          261
-#define __NR_timer_getoverrun       262
-#define __NR_timer_delete           263
-#define __NR_clock_settime          264
-#define __NR_clock_gettime          265
-#define __NR_clock_getres           266
-#define __NR_clock_nanosleep        267
-#define __NR_statfs64               268
-#define __NR_fstatfs64              269
-#define __NR_tgkill                 270
-#define __NR_utimes                 271
-#define __NR_fadvise64_64           272
-#define __NR_mbind                  274
-#define __NR_get_mempolicy          275
-#define __NR_set_mempolicy          276
-#define __NR_mq_open                277
-#define __NR_mq_unlink              278
-#define __NR_mq_timedsend           279
-#define __NR_mq_timedreceive        280
-#define __NR_mq_notify              281
-#define __NR_mq_getsetattr          282
-#define __NR_kexec_load             283
-#define __NR_waitid                 284
-#define __NR_add_key                285
-#define __NR_request_key            286
-#define __NR_keyctl                 287
-#define __NR_ioprio_set             288
-#define __NR_ioprio_get             289
-#define __NR_inotify_init           290
-#define __NR_inotify_add_watch      291
-#define __NR_inotify_rm_watch       292
-#define __NR_migrate_pages          294
-#define __NR_openat                 295
-#define __NR_mkdirat                296
-#define __NR_mknodat                297
-#define __NR_fchownat               298
-#define __NR_futimesat              299
-#define __NR_fstatat64              300
-#define __NR_unlinkat               301
-#define __NR_renameat               302
-#define __NR_linkat                 303
-#define __NR_symlinkat              304
-#define __NR_readlinkat             305
-#define __NR_fchmodat               306
-#define __NR_faccessat              307
-#define __NR_pselect6               308
-#define __NR_ppoll                  309
-#define __NR_unshare                310
-#define __NR_set_robust_list        311
-#define __NR_get_robust_list        312
-#define __NR_splice                 313
-#define __NR_sync_file_range        314
-#define __NR_tee                    315
-#define __NR_vmsplice               316
-#define __NR_move_pages             317
-#define __NR_getcpu                 318
-#define __NR_epoll_pwait            319
-#define __NR_utimensat              320
-#define __NR_signalfd               321
-#define __NR_timerfd_create         322
-#define __NR_eventfd                323
-#define __NR_fallocate              324
-#define __NR_timerfd_settime        325
-#define __NR_timerfd_gettime        326
-#define __NR_signalfd4              327
-#define __NR_eventfd2               328
-#define __NR_epoll_create1          329
-#define __NR_dup3                   330
-#define __NR_pipe2                  331
-#define __NR_inotify_init1          332
-#define __NR_preadv                 333
-#define __NR_pwritev                334
-#define __NR_rt_tgsigqueueinfo      335
-#define __NR_perf_event_open        336
-#define __NR_fanotify_init          337
-#define __NR_fanotify_mark          338
-#define __NR_prlimit64              339
-#define __NR_socket                 340
-#define __NR_bind                   341
-#define __NR_connect                342
-#define __NR_listen                 343
-#define __NR_accept                 344
-#define __NR_getsockname            345
-#define __NR_getpeername            346
-#define __NR_socketpair             347
-#define __NR_send                   348
-#define __NR_sendto                 349
-#define __NR_recv                   350
-#define __NR_recvfrom               351
-#define __NR_shutdown               352
-#define __NR_setsockopt             353
-#define __NR_getsockopt             354
-#define __NR_sendmsg                355
-#define __NR_recvmsg                356
-#define __NR_recvmmsg               357
-#define __NR_accept4                358
-#define __NR_name_to_handle_at      359
-#define __NR_open_by_handle_at      360
-#define __NR_clock_adjtime          361
-#define __NR_syncfs                 362
-#define __NR_sendmmsg               363
-#define __NR_setns                  364
-#define __NR_process_vm_readv       365
-#define __NR_process_vm_writev      366
-#define __NR_kcmp                   367
-#define __NR_finit_module           368
-
-
-/* Repeated with SYS_ prefix */
-
-#define SYS_restart_syscall         0
-#define SYS_exit                    1
-#define SYS_fork                    2
-#define SYS_read                    3
-#define SYS_write                   4
-#define SYS_open                    5
-#define SYS_close                   6
-#define SYS_waitpid                 7
-#define SYS_creat                   8
-#define SYS_link                    9
-#define SYS_unlink                  10
-#define SYS_execve                  11
-#define SYS_chdir                   12
-#define SYS_time                    13
-#define SYS_mknod                   14
-#define SYS_chmod                   15
-#define SYS_lchown                  16
-#define SYS_oldstat                 18
-#define SYS_lseek                   19
-#define SYS_getpid                  20
-#define SYS_mount                   21
-#define SYS_umount                  22
-#define SYS_setuid                  23
-#define SYS_getuid                  24
-#define SYS_stime                   25
-#define SYS_ptrace                  26
-#define SYS_alarm                   27
-#define SYS_oldfstat                28
-#define SYS_pause                   29
-#define SYS_utime                   30
-#define SYS_access                  33
-#define SYS_nice                    34
-#define SYS_sync                    36
-#define SYS_kill                    37
-#define SYS_rename                  38
-#define SYS_mkdir                   39
-#define SYS_rmdir                   40
-#define SYS_dup                     41
-#define SYS_pipe                    42
-#define SYS_times                   43
-#define SYS_brk                     45
-#define SYS_setgid                  46
-#define SYS_getgid                  47
-#define SYS_signal                  48
-#define SYS_geteuid                 49
-#define SYS_getegid                 50
-#define SYS_acct                    51
-#define SYS_umount2                 52
-#define SYS_ioctl                   54
-#define SYS_fcntl                   55
-#define SYS_setpgid                 57
-#define SYS_umask                   60
-#define SYS_chroot                  61
-#define SYS_ustat                   62
-#define SYS_dup2                    63
-#define SYS_getppid                 64
-#define SYS_getpgrp                 65
-#define SYS_setsid                  66
-#define SYS_sigaction               67
-#define SYS_sgetmask                68
-#define SYS_ssetmask                69
-#define SYS_setreuid                70
-#define SYS_setregid                71
-#define SYS_sigsuspend              72
-#define SYS_sigpending              73
-#define SYS_sethostname             74
-#define SYS_setrlimit               75
-#define SYS_getrlimit               76
-#define SYS_getrusage               77
-#define SYS_gettimeofday            78
-#define SYS_settimeofday            79
-#define SYS_getgroups               80
-#define SYS_setgroups               81
-#define SYS_symlink                 83
-#define SYS_oldlstat                84
-#define SYS_readlink                85
-#define SYS_uselib                  86
-#define SYS_swapon                  87
-#define SYS_reboot                  88
-#define SYS_readdir                 89
-#define SYS_mmap                    90
-#define SYS_munmap                  91
-#define SYS_truncate                92
-#define SYS_ftruncate               93
-#define SYS_fchmod                  94
-#define SYS_fchown                  95
-#define SYS_getpriority             96
-#define SYS_setpriority             97
-#define SYS_statfs                  99
-#define SYS_fstatfs                 100
-#define SYS_socketcall              102
-#define SYS_syslog                  103
-#define SYS_setitimer               104
-#define SYS_getitimer               105
-#define SYS_stat                    106
-#define SYS_lstat                   107
-#define SYS_fstat                   108
-#define SYS_olduname                109
-#define SYS_vhangup                 111
-#define SYS_wait4                   114
-#define SYS_swapoff                 115
-#define SYS_sysinfo                 116
-#define SYS_ipc                     117
-#define SYS_fsync                   118
-#define SYS_sigreturn               119
-#define SYS_clone                   120
-#define SYS_setdomainname           121
-#define SYS_uname                   122
-#define SYS_cacheflush              123
-#define SYS_adjtimex                124
-#define SYS_mprotect                125
-#define SYS_sigprocmask             126
-#define SYS_init_module             128
-#define SYS_delete_module           129
-#define SYS_quotactl                131
-#define SYS_getpgid                 132
-#define SYS_fchdir                  133
-#define SYS_bdflush                 134
-#define SYS_sysfs                   135
-#define SYS_personality             136
-#define SYS_setfsuid                138
-#define SYS_setfsgid                139
-#define SYS__llseek                 140
-#define SYS_getdents                141
-#define SYS__newselect              142
-#define SYS_flock                   143
-#define SYS_msync                   144
-#define SYS_readv                   145
-#define SYS_writev                  146
-#define SYS_getsid                  147
-#define SYS_fdatasync               148
-#define SYS__sysctl                 149
-#define SYS_mlock                   150
-#define SYS_munlock                 151
-#define SYS_mlockall                152
-#define SYS_munlockall              153
-#define SYS_sched_setparam          154
-#define SYS_sched_getparam          155
-#define SYS_sched_setscheduler      156
-#define SYS_sched_getscheduler      157
-#define SYS_sched_yield             158
-#define SYS_sched_get_priority_max  159
-#define SYS_sched_get_priority_min  160
-#define SYS_sched_rr_get_interval   161
-#define SYS_nanosleep               162
-#define SYS_mremap                  163
-#define SYS_setresuid               164
-#define SYS_getresuid               165
-#define SYS_poll                    168
-#define SYS_nfsservctl              169
-#define SYS_setresgid               170
-#define SYS_getresgid               171
-#define SYS_prctl                   172
-#define SYS_rt_sigreturn            173
-#define SYS_rt_sigaction            174
-#define SYS_rt_sigprocmask          175
-#define SYS_rt_sigpending           176
-#define SYS_rt_sigtimedwait         177
-#define SYS_rt_sigqueueinfo         178
-#define SYS_rt_sigsuspend           179
-#define SYS_pread64                 180
-#define SYS_pwrite64                181
-#define SYS_chown                   182
-#define SYS_getcwd                  183
-#define SYS_capget                  184
-#define SYS_capset                  185
-#define SYS_sigaltstack             186
-#define SYS_sendfile                187
-#define SYS_vfork                   190
-#define SYS_ugetrlimit              191
-#define SYS_mmap2                   192
-#define SYS_truncate64              193
-#define SYS_ftruncate64             194
-#define SYS_stat64                  195
-#define SYS_lstat64                 196
-#define SYS_fstat64                 197
-#define SYS_lchown32                198
-#define SYS_getuid32                199
-#define SYS_getgid32                200
-#define SYS_geteuid32               201
-#define SYS_getegid32               202
-#define SYS_setreuid32              203
-#define SYS_setregid32              204
-#define SYS_getgroups32             205
-#define SYS_setgroups32             206
-#define SYS_fchown32                207
-#define SYS_setresuid32             208
-#define SYS_getresuid32             209
-#define SYS_setresgid32             210
-#define SYS_getresgid32             211
-#define SYS_chown32                 212
-#define SYS_setuid32                213
-#define SYS_setgid32                214
-#define SYS_setfsuid32              215
-#define SYS_setfsgid32              216
-#define SYS_pivot_root              217
-#define SYS_mincore                 218
-#define SYS_madvise                 219
-#define SYS_getdents64              220
-#define SYS_fcntl64                 221
-#define SYS_gettid                  224
-#define SYS_readahead               225
-#define SYS_setxattr                226
-#define SYS_lsetxattr               227
-#define SYS_fsetxattr               228
-#define SYS_getxattr                229
-#define SYS_lgetxattr               230
-#define SYS_fgetxattr               231
-#define SYS_listxattr               232
-#define SYS_llistxattr              233
-#define SYS_flistxattr              234
-#define SYS_removexattr             235
-#define SYS_lremovexattr            236
-#define SYS_fremovexattr            237
-#define SYS_tkill                   238
-#define SYS_sendfile64              239
-#define SYS_futex                   240
-#define SYS_sched_setaffinity       241
-#define SYS_sched_getaffinity       242
-#define SYS_io_setup                245
-#define SYS_io_destroy              246
-#define SYS_io_getevents            247
-#define SYS_io_submit               248
-#define SYS_io_cancel               249
-#define SYS_fadvise64               250
-#define SYS_exit_group              252
-#define SYS_lookup_dcookie          253
-#define SYS_epoll_create            254
-#define SYS_epoll_ctl               255
-#define SYS_epoll_wait              256
-#define SYS_remap_file_pages        257
-#define SYS_set_tid_address         258
-#define SYS_timer_create            259
-#define SYS_timer_settime           260
-#define SYS_timer_gettime           261
-#define SYS_timer_getoverrun        262
-#define SYS_timer_delete            263
-#define SYS_clock_settime           264
-#define SYS_clock_gettime           265
-#define SYS_clock_getres            266
-#define SYS_clock_nanosleep         267
-#define SYS_statfs64                268
-#define SYS_fstatfs64               269
-#define SYS_tgkill                  270
-#define SYS_utimes                  271
-#define SYS_fadvise64_64            272
-#define SYS_mbind                   274
-#define SYS_get_mempolicy           275
-#define SYS_set_mempolicy           276
-#define SYS_mq_open                 277
-#define SYS_mq_unlink               278
-#define SYS_mq_timedsend            279
-#define SYS_mq_timedreceive         280
-#define SYS_mq_notify               281
-#define SYS_mq_getsetattr           282
-#define SYS_kexec_load              283
-#define SYS_waitid                  284
-#define SYS_add_key                 285
-#define SYS_request_key             286
-#define SYS_keyctl                  287
-#define SYS_ioprio_set              288
-#define SYS_ioprio_get              289
-#define SYS_inotify_init            290
-#define SYS_inotify_add_watch       291
-#define SYS_inotify_rm_watch        292
-#define SYS_migrate_pages           294
-#define SYS_openat                  295
-#define SYS_mkdirat                 296
-#define SYS_mknodat                 297
-#define SYS_fchownat                298
-#define SYS_futimesat               299
-#define SYS_fstatat64               300
-#define SYS_unlinkat                301
-#define SYS_renameat                302
-#define SYS_linkat                  303
-#define SYS_symlinkat               304
-#define SYS_readlinkat              305
-#define SYS_fchmodat                306
-#define SYS_faccessat               307
-#define SYS_pselect6                308
-#define SYS_ppoll                   309
-#define SYS_unshare                 310
-#define SYS_set_robust_list         311
-#define SYS_get_robust_list         312
-#define SYS_splice                  313
-#define SYS_sync_file_range         314
-#define SYS_tee                     315
-#define SYS_vmsplice                316
-#define SYS_move_pages              317
-#define SYS_getcpu                  318
-#define SYS_epoll_pwait             319
-#define SYS_utimensat               320
-#define SYS_signalfd                321
-#define SYS_timerfd_create          322
-#define SYS_eventfd                 323
-#define SYS_fallocate               324
-#define SYS_timerfd_settime         325
-#define SYS_timerfd_gettime         326
-#define SYS_signalfd4               327
-#define SYS_eventfd2                328
-#define SYS_epoll_create1           329
-#define SYS_dup3                    330
-#define SYS_pipe2                   331
-#define SYS_inotify_init1           332
-#define SYS_preadv                  333
-#define SYS_pwritev                 334
-#define SYS_rt_tgsigqueueinfo       335
-#define SYS_perf_event_open         336
-#define SYS_fanotify_init           337
-#define SYS_fanotify_mark           338
-#define SYS_prlimit64               339
-#define SYS_socket                  340
-#define SYS_bind                    341
-#define SYS_connect                 342
-#define SYS_listen                  343
-#define SYS_accept                  344
-#define SYS_getsockname             345
-#define SYS_getpeername             346
-#define SYS_socketpair              347
-#define SYS_send                    348
-#define SYS_sendto                  349
-#define SYS_recv                    350
-#define SYS_recvfrom                351
-#define SYS_shutdown                352
-#define SYS_setsockopt              353
-#define SYS_getsockopt              354
-#define SYS_sendmsg                 355
-#define SYS_recvmsg                 356
-#define SYS_recvmmsg                357
-#define SYS_accept4                 358
-#define SYS_name_to_handle_at       359
-#define SYS_open_by_handle_at       360
-#define SYS_clock_adjtime           361
-#define SYS_syncfs                  362
-#define SYS_sendmmsg                363
-#define SYS_setns                   364
-#define SYS_process_vm_readv        365
-#define SYS_process_vm_writev       366
-#define SYS_kcmp                    367
-#define SYS_finit_module            368
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/termios.h
deleted file mode 100644
index f0d81b138f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/termios.h
+++ /dev/null
@@ -1,160 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/user.h b/src/components/lib/libc/musl-1.1.11/arch/sh/bits/user.h
deleted file mode 100644
index d7363f74a9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/user.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 32
-
-#define REG_REG0	 0
-#define REG_REG15	15
-#define REG_PC		16
-#define REG_PR		17
-#define REG_SR		18
-#define REG_GBR		19
-#define REG_MACH	20
-#define REG_MACL	21
-#define REG_SYSCALL	22
-#define REG_FPREG0	23
-#define REG_FPREG15	38
-#define REG_XFREG0	39
-#define REG_XFREG15	54
-#define REG_FPSCR	55
-#define REG_FPUL	56
-
-struct pt_regs {
-	unsigned long regs[16];
-	unsigned long pc;
-	unsigned long pr;
-	unsigned long sr;
-	unsigned long gbr;
-	unsigned long mach;
-	unsigned long macl;
-	long tra;
-};
-
-struct pt_dspregs {
-	unsigned long a1;
-	unsigned long a0g;
-	unsigned long a1g;
-	unsigned long m0;
-	unsigned long m1;
-	unsigned long a0;
-	unsigned long x0;
-	unsigned long x1;
-	unsigned long y0;
-	unsigned long y1;
-	unsigned long dsr;
-	unsigned long rs;
-	unsigned long re;
-	unsigned long mod;
-};
-
-struct user_fpu_struct {
-	unsigned long fp_regs[16];
-	unsigned long xfp_regs[16];
-	unsigned long fpscr;
-	unsigned long fpul;
-};
-
-#define ELF_NGREG 23
-typedef unsigned long elf_greg_t;
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-typedef struct user_fpu_struct elf_fpregset_t;
-
-struct user {
-	struct pt_regs regs;
-	struct user_fpu_struct fpu;
-	int u_fpvalid;
-	unsigned long u_tsize;
-	unsigned long u_dsize;
-	unsigned long u_ssize;
-	unsigned long start_code;
-	unsigned long start_data;
-	unsigned long start_stack;
-	long int signal;
-	unsigned long u_ar0;
-	struct user_fpu_struct *u_fpstate;
-	unsigned long magic;
-	char u_comm[32];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/crt_arch.h b/src/components/lib/libc/musl-1.1.11/arch/sh/crt_arch.h
deleted file mode 100644
index f8907108b6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/crt_arch.h
+++ /dev/null
@@ -1,23 +0,0 @@
-__asm__(
-".text \n"
-".global " START " \n"
-START ": \n"
-"	mova 1f, r0 \n"
-"	mov.l 1f, r5 \n"
-"	add r0, r5 \n"
-"	mov r15, r4 \n"
-"	mov #-16, r0 \n"
-"	and r0, r15 \n"
-"	bsr " START "_c \n"
-"	nop \n"
-".align 2 \n"
-".weak _DYNAMIC \n"
-".hidden _DYNAMIC \n"
-"1:	.long _DYNAMIC-. \n"
-);
-
-/* used by gcc for switching the FPU between single and double precision */
-#ifdef SHARED
-__attribute__((__visibility__("hidden")))
-#endif
-const unsigned long __fpscr_values[2] = { 0, 0x80000 };
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/sh/pthread_arch.h
deleted file mode 100644
index 65c389ff46..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/pthread_arch.h
+++ /dev/null
@@ -1,11 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-	char *self;
-	__asm__ __volatile__ ("stc gbr,%0" : "=r" (self) );
-	return (struct pthread *) (self + 8 - sizeof(struct pthread));
-}
-
-#define TLS_ABOVE_TP
-#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8)
-
-#define CANCEL_REG_IP 17
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/sh/reloc.h
deleted file mode 100644
index 77da65080e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/reloc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <endian.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define ENDIAN_SUFFIX "eb"
-#else
-#define ENDIAN_SUFFIX ""
-#endif
-
-#if __SH_FPU_ANY__ || __SH4__
-#define FP_SUFFIX ""
-#else
-#define FP_SUFFIX "-nofpu"
-#endif
-
-#define LDSO_ARCH "sh" ENDIAN_SUFFIX FP_SUFFIX
-
-#define TPOFF_K 8
-
-#define REL_SYMBOLIC    R_SH_DIR32
-#define REL_OFFSET      R_SH_REL32
-#define REL_GOT         R_SH_GLOB_DAT
-#define REL_PLT         R_SH_JMP_SLOT
-#define REL_RELATIVE    R_SH_RELATIVE
-#define REL_COPY        R_SH_COPY
-#define REL_DTPMOD      R_SH_TLS_DTPMOD32
-#define REL_DTPOFF      R_SH_TLS_DTPOFF32
-#define REL_TPOFF       R_SH_TLS_TPOFF32
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"jmp @%0 ; mov %1,r15" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/src/__fpscr_values.c b/src/components/lib/libc/musl-1.1.11/arch/sh/src/__fpscr_values.c
deleted file mode 100644
index 374df30efe..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/src/__fpscr_values.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "libc.h"
-
-/* used by gcc for switching the FPU between single and double precision */
-//const unsigned long __fpscr_values[2] ATTR_LIBC_VISIBILITY = { 0, 0x80000 };
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/src/__set_thread_area.c b/src/components/lib/libc/musl-1.1.11/arch/sh/src/__set_thread_area.c
deleted file mode 100644
index 1d3e02258b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/src/__set_thread_area.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "pthread_impl.h"
-#include "libc.h"
-#include "sh_atomic.h"
-#include <elf.h>
-
-/* Also perform sh-specific init */
-
-#define CPU_HAS_LLSC 0x0040
-
-__attribute__((__visibility__("hidden"))) unsigned __sh_atomic_model, __sh_nommu;
-
-int __set_thread_area(void *p)
-{
-	size_t *aux;
-	__asm__ __volatile__ ( "ldc %0, gbr" : : "r"(p) : "memory" );
-#ifndef __SH4A__
-	if (__hwcap & CPU_HAS_LLSC) {
-		__sh_atomic_model = SH_A_LLSC;
-		return 0;
-	}
-#if !defined(__SH3__) && !defined(__SH4__)
-	for (aux=libc.auxv; *aux; aux+=2) {
-		if (*aux != AT_PLATFORM) continue;
-		const char *s = (void *)aux[1];
-		if (s[0]!='s' || s[1]!='h' || s[2]!='2' || s[3]-'0'<10u) break;
-		__sh_atomic_model = SH_A_IMASK;
-		__sh_nommu = 1;
-		return 0;
-	}
-#endif
-	/* __sh_atomic_model = SH_A_GUSA; */ /* 0, default */
-#endif
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/src/__unmapself.c b/src/components/lib/libc/musl-1.1.11/arch/sh/src/__unmapself.c
deleted file mode 100644
index 4df9e7bf5a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/src/__unmapself.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "pthread_impl.h"
-
-void __unmapself_sh_mmu(void *, size_t);
-void __unmapself_sh_nommu(void *, size_t);
-
-#if !defined(__SH3__) && !defined(__SH4__)
-#define __unmapself __unmapself_sh_nommu
-#include "../../../src/thread/__unmapself.c"
-#undef __unmapself
-extern __attribute__((__visibility__("hidden"))) unsigned __sh_nommu;
-#else
-#define __sh_nommu 0
-#endif
-
-void __unmapself(void *base, size_t size)
-{
-	if (__sh_nommu) __unmapself_sh_nommu(base, size);
-	else __unmapself_sh_mmu(base, size);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/src/atomic.c b/src/components/lib/libc/musl-1.1.11/arch/sh/src/atomic.c
deleted file mode 100644
index 7fd7307408..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/src/atomic.c
+++ /dev/null
@@ -1,158 +0,0 @@
-#ifndef __SH4A__
-
-#include "sh_atomic.h"
-#include "atomic.h"
-#include "libc.h"
-
-static inline unsigned mask()
-{
-	unsigned sr;
-	__asm__ __volatile__ ( "\n"
-	"	stc sr,r0 \n"
-	"	mov r0,%0 \n"
-	"	or #0xf0,r0 \n"
-	"	ldc r0,sr \n"
-	: "=&r"(sr) : : "memory", "r0" );
-	return sr;
-}
-
-static inline void unmask(unsigned sr)
-{
-	__asm__ __volatile__ ( "ldc %0,sr" : : "r"(sr) : "memory" );
-}
-
-/* gusa is a hack in the kernel which lets you create a sequence of instructions
- * which will be restarted if the process is preempted in the middle of the
- * sequence. It will do for implementing atomics on non-smp systems. ABI is:
- * r0  = address of first instruction after the atomic sequence
- * r1  = original stack pointer
- * r15 = -1 * length of atomic sequence in bytes
- */
-#define GUSA_CLOBBERS   "r0", "r1", "memory"
-#define GUSA_START(mem,old,nop)    \
-	"	.align 2\n"                \
-	"	mova 1f, r0\n"             \
-	nop                            \
-	"	mov r15, r1\n"             \
-	"	mov #(0f-1f), r15\n"       \
-	"0:	mov.l @" mem ", " old "\n"
-/* the target of mova must be 4 byte aligned, so we may need a nop */
-#define GUSA_START_ODD(mem,old)  GUSA_START(mem,old,"")
-#define GUSA_START_EVEN(mem,old) GUSA_START(mem,old,"\tnop\n")
-#define GUSA_END(mem,new)          \
-	"	mov.l " new ", @" mem "\n" \
-	"1:	mov r1, r15\n"
-
-int __sh_cas(volatile int *p, int t, int s)
-{
-	if (__sh_atomic_model == SH_A_LLSC) return __sh_cas_llsc(p, t, s);
-
-	if (__sh_atomic_model == SH_A_IMASK) {
-		unsigned sr = mask();
-		int old = *p;
-		if (old==t) *p = s;
-		unmask(sr);
-		return old;
-	}
-
-	int old;
-	__asm__ __volatile__(
-		GUSA_START_EVEN("%1", "%0")
-		"	cmp/eq %0, %2\n"
-		"	bf 1f\n"
-		GUSA_END("%1", "%3")
-		: "=&r"(old) : "r"(p), "r"(t), "r"(s) : GUSA_CLOBBERS, "t");
-	return old;
-}
-
-int __sh_swap(volatile int *x, int v)
-{
-	if (__sh_atomic_model == SH_A_LLSC) return __sh_swap_llsc(x, v);
-
-	if (__sh_atomic_model == SH_A_IMASK) {
-		unsigned sr = mask();
-		int old = *x;
-		*x = v;
-		unmask(sr);
-		return old;
-	}
-
-	int old;
-	__asm__ __volatile__(
-		GUSA_START_EVEN("%1", "%0")
-		GUSA_END("%1", "%2")
-		: "=&r"(old) : "r"(x), "r"(v) : GUSA_CLOBBERS);
-	return old;
-}
-
-int __sh_fetch_add(volatile int *x, int v)
-{
-	if (__sh_atomic_model == SH_A_LLSC) return __sh_fetch_add_llsc(x, v);
-
-	if (__sh_atomic_model == SH_A_IMASK) {
-		unsigned sr = mask();
-		int old = *x;
-		*x = old + v;
-		unmask(sr);
-		return old;
-	}
-
-	int old, dummy;
-	__asm__ __volatile__(
-		GUSA_START_EVEN("%2", "%0")
-		"	mov %0, %1\n"
-		"	add %3, %1\n"
-		GUSA_END("%2", "%1")
-		: "=&r"(old), "=&r"(dummy) : "r"(x), "r"(v) : GUSA_CLOBBERS);
-	return old;
-}
-
-void __sh_store(volatile int *p, int x)
-{
-	if (__sh_atomic_model == SH_A_LLSC) return __sh_store_llsc(p, x);
-	__asm__ __volatile__(
-		"	mov.l %1, @%0\n"
-		: : "r"(p), "r"(x) : "memory");
-}
-
-void __sh_and(volatile int *x, int v)
-{
-	if (__sh_atomic_model == SH_A_LLSC) return __sh_and_llsc(x, v);
-
-	if (__sh_atomic_model == SH_A_IMASK) {
-		unsigned sr = mask();
-		int old = *x;
-		*x = old & v;
-		unmask(sr);
-		return;
-	}
-
-	int dummy;
-	__asm__ __volatile__(
-		GUSA_START_ODD("%1", "%0")
-		"	and %2, %0\n"
-		GUSA_END("%1", "%0")
-		: "=&r"(dummy) : "r"(x), "r"(v) : GUSA_CLOBBERS);
-}
-
-void __sh_or(volatile int *x, int v)
-{
-	if (__sh_atomic_model == SH_A_LLSC) return __sh_or_llsc(x, v);
-
-	if (__sh_atomic_model == SH_A_IMASK) {
-		unsigned sr = mask();
-		int old = *x;
-		*x = old | v;
-		unmask(sr);
-		return;
-	}
-
-	int dummy;
-	__asm__ __volatile__(
-		GUSA_START_ODD("%1", "%0")
-		"	or %2, %0\n"
-		GUSA_END("%1", "%0")
-		: "=&r"(dummy) : "r"(x), "r"(v) : GUSA_CLOBBERS);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/src/sh_atomic.h b/src/components/lib/libc/musl-1.1.11/arch/sh/src/sh_atomic.h
deleted file mode 100644
index 054c2a3266..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/src/sh_atomic.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _SH_ATOMIC_H
-#define _SH_ATOMIC_H
-
-#define SH_A_GUSA 0
-#define SH_A_LLSC 1
-#define SH_A_CAS 2
-#if !defined(__SH3__) && !defined(__SH4__)
-#define SH_A_IMASK 3
-#else
-#define SH_A_IMASK -1LL /* unmatchable by unsigned int */
-#endif
-
-extern __attribute__((__visibility__("hidden"))) unsigned __sh_atomic_model;
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/sh/syscall_arch.h
deleted file mode 100644
index f63675a81f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/sh/syscall_arch.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#define __SYSCALL_LL_E(x) \
-((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
-((union { long long ll; long l[2]; }){ .ll = x }).l[1]
-#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
-
-/* The extra OR instructions are to work around a hardware bug:
- * http://documentation.renesas.com/doc/products/mpumcu/tu/tnsh7456ae.pdf
- */
-#define __asm_syscall(trapno, ...) do {   \
-	__asm__ __volatile__ (                \
-		"trapa #31\n"            \
-		"or r0, r0\n"                     \
-		"or r0, r0\n"                     \
-		"or r0, r0\n"                     \
-		"or r0, r0\n"                     \
-		"or r0, r0\n"                     \
-	: "=r"(r0) : __VA_ARGS__ : "memory"); \
-	return r0;                            \
-	} while (0)
-
-static inline long __syscall0(long n)
-{
-	register long r3 __asm__("r3") = n;
-	register long r0 __asm__("r0");
-	__asm_syscall(16, "r"(r3));
-}
-
-static inline long __syscall1(long n, long a)
-{
-	register long r3 __asm__("r3") = n;
-	register long r4 __asm__("r4") = a;
-	register long r0 __asm__("r0");
-	__asm_syscall(17, "r"(r3), "r"(r4));
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-	register long r3 __asm__("r3") = n;
-	register long r4 __asm__("r4") = a;
-	register long r5 __asm__("r5") = b;
-	register long r0 __asm__("r0");
-	__asm_syscall(18, "r"(r3), "r"(r4), "r"(r5));
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-	register long r3 __asm__("r3") = n;
-	register long r4 __asm__("r4") = a;
-	register long r5 __asm__("r5") = b;
-	register long r6 __asm__("r6") = c;
-	register long r0 __asm__("r0");
-	__asm_syscall(19, "r"(r3), "r"(r4), "r"(r5), "r"(r6));
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-	register long r3 __asm__("r3") = n;
-	register long r4 __asm__("r4") = a;
-	register long r5 __asm__("r5") = b;
-	register long r6 __asm__("r6") = c;
-	register long r7 __asm__("r7") = d;
-	register long r0 __asm__("r0");
-	__asm_syscall(20, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7));
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
-	register long r3 __asm__("r3") = n;
-	register long r4 __asm__("r4") = a;
-	register long r5 __asm__("r5") = b;
-	register long r6 __asm__("r6") = c;
-	register long r7 __asm__("r7") = d;
-	register long r0 __asm__("r0") = e;
-	__asm_syscall(21, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "0"(r0));
-}
-
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
-	register long r3 __asm__("r3") = n;
-	register long r4 __asm__("r4") = a;
-	register long r5 __asm__("r5") = b;
-	register long r6 __asm__("r6") = c;
-	register long r7 __asm__("r7") = d;
-	register long r0 __asm__("r0") = e;
-	register long r1 __asm__("r1") = f;
-	__asm_syscall(22, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "0"(r0), "r"(r1));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/x32/atomic.h
deleted file mode 100644
index 7690183d01..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/atomic.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_64(uint64_t x)
-{
-	__asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
-	return x;
-}
-
-static inline int a_ctz_l(unsigned long x)
-{
-	__asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
-	return x;
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	__asm__( "lock ; and %1, %0"
-			 : "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	__asm__( "lock ; or %1, %0"
-			 : "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	__asm__( "lock ; or %1, %0"
-		: "=m"(*(long *)p) : "r"(v) : "memory" );
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	__asm__( "lock ; cmpxchg %3, %1"
-		: "=a"(t), "=m"(*(long *)p) : "a"(t), "r"(s) : "memory" );
-	return t;
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	__asm__( "lock ; cmpxchg %3, %1"
-		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
-	return t;
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	__asm__( "lock ; or %1, %0"
-		: "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	__asm__( "lock ; and %1, %0"
-		: "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	__asm__( "xchg %0, %1" : "=r"(v), "=m"(*x) : "0"(v) : "memory" );
-	return v;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	__asm__( "lock ; xadd %0, %1" : "=r"(v), "=m"(*x) : "0"(v) : "memory" );
-	return v;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	__asm__( "lock ; incl %0" : "=m"(*x) : "m"(*x) : "memory" );
-}
-
-static inline void a_dec(volatile int *x)
-{
-	__asm__( "lock ; decl %0" : "=m"(*x) : "m"(*x) : "memory" );
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__( "mov %1, %0 ; lock ; orl $0,(%%rsp)" : "=m"(*p) : "r"(x) : "memory" );
-}
-
-static inline void a_spin()
-{
-	__asm__ __volatile__( "pause" : : : "memory" );
-}
-
-static inline void a_barrier()
-{
-	__asm__ __volatile__( "" : : : "memory" );
-}
-
-static inline void a_crash()
-{
-	__asm__ __volatile__( "hlt" : : : "memory" );
-}
-
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/alltypes.h.in
deleted file mode 100644
index 16391295bc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/alltypes.h.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#define _Addr int
-#define _Int64 long long
-#define _Reg long long
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF long wchar_t;
-#endif
-
-#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 2
-TYPEDEF long double float_t;
-TYPEDEF long double double_t;
-#else
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-#endif
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long long time_t;
-TYPEDEF long long suseconds_t;
-
-TYPEDEF struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/endian.h
deleted file mode 100644
index 172c338f50..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/endian.h
+++ /dev/null
@@ -1 +0,0 @@
-#define __BYTE_ORDER __LITTLE_ENDIAN
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/errno.h
deleted file mode 100644
index d2e1eeee05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/ioctl.h
deleted file mode 100644
index 77a9455179..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/ioctl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGPTN	0x80045430
-#define TIOCSPTLCK	0x40045431
-#define TCGETX          0x5432
-#define TCSETX          0x5433
-#define TCSETXF         0x5434
-#define TCSETXW         0x5435
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR   0x5459
-#define TIOCSERGETMULTI 0x545A
-#define TIOCSERSETMULTI 0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-#define FIOQSIZE	0x5460
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL           64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE  0x89F0
-#define SIOCPROTOPRIVATE 0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/ipc.h
deleted file mode 100644
index 6e604cefba..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/ipc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long long __pad1;
-	long long __pad2;
-};
-
-#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/limits.h
deleted file mode 100644
index 65a3dd6477..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/limits.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX  0x7fffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/mman.h
deleted file mode 100644
index 846b7eaee8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/mman.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define PROT_GROWSDOWN  0x01000000
-#define PROT_GROWSUP    0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/msg.h
deleted file mode 100644
index c3b4eae062..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/msg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	time_t msg_rtime;
-	time_t msg_ctime;
-	unsigned long msg_cbytes;
-	long __unused1;
-	msgqnum_t msg_qnum;
-	long __unused2;
-	msglen_t msg_qbytes;
-	long __unused3;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/poll.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/poll.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/resource.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/resource.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/sem.h
deleted file mode 100644
index c629b81ebb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/sem.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t __unused1;
-	time_t sem_ctime;
-	time_t __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/shm.h
deleted file mode 100644
index 8fa9e73deb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/shm.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	time_t shm_dtime;
-	time_t shm_ctime;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad0;
-	unsigned long long __pad1;
-	unsigned long long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, __pad0, shmmin, __pad1, shmmni, __pad2,
-	              shmseg, __pad3, shmall, __pad4;
-	unsigned long long __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	int __pad_ids;
-	unsigned long shm_tot, __pad0, shm_rss, __pad1, shm_swp, __pad2;
-	unsigned long __swap_attempts, __pad3, __swap_successes, __pad4;
-}
-#ifdef __GNUC__
-__attribute__((__aligned__(8)))
-#endif
-;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/signal.h
deleted file mode 100644
index 4c4adf3105..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/signal.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 2048
-#define SIGSTKSZ 8192
-#endif
-
-#ifdef _GNU_SOURCE
-#define REG_R8          0
-#define REG_R9          1
-#define REG_R10         2
-#define REG_R11         3
-#define REG_R12         4
-#define REG_R13         5
-#define REG_R14         6
-#define REG_R15         7
-#define REG_RDI         8
-#define REG_RSI         9
-#define REG_RBP         10
-#define REG_RBX         11
-#define REG_RDX         12
-#define REG_RAX         13
-#define REG_RCX         14
-#define REG_RSP         15
-#define REG_RIP         16
-#define REG_EFL         17
-#define REG_CSGSFS      18
-#define REG_ERR         19
-#define REG_TRAPNO      20
-#define REG_OLDMASK     21
-#define REG_CR2         22
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-typedef long long greg_t, gregset_t[23];
-typedef struct _fpstate {
-	unsigned short cwd, swd, ftw, fop;
-	unsigned long long rip, rdp;
-	unsigned mxcsr, mxcr_mask;
-	struct {
-		unsigned short significand[4], exponent, padding[3];
-	} _st[8];
-	struct {
-		unsigned element[4];
-	} _xmm[16];
-	unsigned padding[24];
-} *fpregset_t;
-struct sigcontext {
-	unsigned long long r8, r9, r10, r11, r12, r13, r14, r15;
-	unsigned long long rdi, rsi, rbp, rbx, rdx, rax, rcx, rsp, rip, eflags;
-	unsigned short cs, gs, fs, __pad0;
-	unsigned long long err, trapno, oldmask, cr2;
-	struct _fpstate *fpstate;
-	unsigned long long __reserved1[8];
-};
-typedef struct {
-	gregset_t gregs;
-	fpregset_t fpregs;
-	unsigned long long __reserved1[8];
-} mcontext_t;
-#else
-typedef struct {
-	unsigned long long __space[32];
-} mcontext_t;
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct __ucontext *uc_link;
-	stack_t uc_stack;
-	mcontext_t uc_mcontext;
-	sigset_t uc_sigmask;
-	unsigned long long __fpregs_mem[64];
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  2
-#define SA_SIGINFO    4
-#define SA_ONSTACK    0x08000000
-#define SA_RESTART    0x10000000
-#define SA_NODEFER    0x40000000
-#define SA_RESETHAND  0x80000000
-#define SA_RESTORER   0x04000000
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGBUS    7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGUSR1   10
-#define SIGSEGV   11
-#define SIGUSR2   12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGSTKFLT 16
-#define SIGCHLD   17
-#define SIGCONT   18
-#define SIGSTOP   19
-#define SIGTSTP   20
-#define SIGTTIN   21
-#define SIGTTOU   22
-#define SIGURG    23
-#define SIGXCPU   24
-#define SIGXFSZ   25
-#define SIGVTALRM 26
-#define SIGPROF   27
-#define SIGWINCH  28
-#define SIGIO     29
-#define SIGPOLL   29
-#define SIGPWR    30
-#define SIGSYS    31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 65
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/socket.h
deleted file mode 100644
index a90c4cae9d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/socket.h
+++ /dev/null
@@ -1,18 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen, __pad1;
-	void *msg_control;
-	socklen_t msg_controllen, __pad2;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int __pad1;
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/syscall.h
deleted file mode 100644
index 5a6d4d1067..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/syscall.h
+++ /dev/null
@@ -1,655 +0,0 @@
-#define __X32_SYSCALL_BIT        0x40000000
-#define __NR_read (__X32_SYSCALL_BIT + 0)
-#define __NR_write (__X32_SYSCALL_BIT + 1)
-#define __NR_open (__X32_SYSCALL_BIT + 2)
-#define __NR_close (__X32_SYSCALL_BIT + 3)
-#define __NR_stat (__X32_SYSCALL_BIT + 4)
-#define __NR_fstat (__X32_SYSCALL_BIT + 5)
-#define __NR_lstat (__X32_SYSCALL_BIT + 6)
-#define __NR_poll (__X32_SYSCALL_BIT + 7)
-#define __NR_lseek (__X32_SYSCALL_BIT + 8)
-#define __NR_mmap (__X32_SYSCALL_BIT + 9)
-#define __NR_mprotect (__X32_SYSCALL_BIT + 10)
-#define __NR_munmap (__X32_SYSCALL_BIT + 11)
-#define __NR_brk (__X32_SYSCALL_BIT + 12)
-#define __NR_rt_sigprocmask (__X32_SYSCALL_BIT + 14)
-#define __NR_pread64 (__X32_SYSCALL_BIT + 17)
-#define __NR_pwrite64 (__X32_SYSCALL_BIT + 18)
-#define __NR_access (__X32_SYSCALL_BIT + 21)
-#define __NR_pipe (__X32_SYSCALL_BIT + 22)
-#define __NR_select (__X32_SYSCALL_BIT + 23)
-#define __NR_sched_yield (__X32_SYSCALL_BIT + 24)
-#define __NR_mremap (__X32_SYSCALL_BIT + 25)
-#define __NR_msync (__X32_SYSCALL_BIT + 26)
-#define __NR_mincore (__X32_SYSCALL_BIT + 27)
-#define __NR_madvise (__X32_SYSCALL_BIT + 28)
-#define __NR_shmget (__X32_SYSCALL_BIT + 29)
-#define __NR_shmat (__X32_SYSCALL_BIT + 30)
-#define __NR_shmctl (__X32_SYSCALL_BIT + 31)
-#define __NR_dup (__X32_SYSCALL_BIT + 32)
-#define __NR_dup2 (__X32_SYSCALL_BIT + 33)
-#define __NR_pause (__X32_SYSCALL_BIT + 34)
-#define __NR_nanosleep (__X32_SYSCALL_BIT + 35)
-#define __NR_getitimer (__X32_SYSCALL_BIT + 36)
-#define __NR_alarm (__X32_SYSCALL_BIT + 37)
-#define __NR_setitimer (__X32_SYSCALL_BIT + 38)
-#define __NR_getpid (__X32_SYSCALL_BIT + 39)
-#define __NR_sendfile (__X32_SYSCALL_BIT + 40)
-#define __NR_socket (__X32_SYSCALL_BIT + 41)
-#define __NR_connect (__X32_SYSCALL_BIT + 42)
-#define __NR_accept (__X32_SYSCALL_BIT + 43)
-#define __NR_sendto (__X32_SYSCALL_BIT + 44)
-#define __NR_shutdown (__X32_SYSCALL_BIT + 48)
-#define __NR_bind (__X32_SYSCALL_BIT + 49)
-#define __NR_listen (__X32_SYSCALL_BIT + 50)
-#define __NR_getsockname (__X32_SYSCALL_BIT + 51)
-#define __NR_getpeername (__X32_SYSCALL_BIT + 52)
-#define __NR_socketpair (__X32_SYSCALL_BIT + 53)
-#define __NR_clone (__X32_SYSCALL_BIT + 56)
-#define __NR_fork (__X32_SYSCALL_BIT + 57)
-#define __NR_vfork (__X32_SYSCALL_BIT + 58)
-#define __NR_exit (__X32_SYSCALL_BIT + 60)
-#define __NR_wait4 (__X32_SYSCALL_BIT + 61)
-#define __NR_kill (__X32_SYSCALL_BIT + 62)
-#define __NR_uname (__X32_SYSCALL_BIT + 63)
-#define __NR_semget (__X32_SYSCALL_BIT + 64)
-#define __NR_semop (__X32_SYSCALL_BIT + 65)
-#define __NR_semctl (__X32_SYSCALL_BIT + 66)
-#define __NR_shmdt (__X32_SYSCALL_BIT + 67)
-#define __NR_msgget (__X32_SYSCALL_BIT + 68)
-#define __NR_msgsnd (__X32_SYSCALL_BIT + 69)
-#define __NR_msgrcv (__X32_SYSCALL_BIT + 70)
-#define __NR_msgctl (__X32_SYSCALL_BIT + 71)
-#define __NR_fcntl (__X32_SYSCALL_BIT + 72)
-#define __NR_flock (__X32_SYSCALL_BIT + 73)
-#define __NR_fsync (__X32_SYSCALL_BIT + 74)
-#define __NR_fdatasync (__X32_SYSCALL_BIT + 75)
-#define __NR_truncate (__X32_SYSCALL_BIT + 76)
-#define __NR_ftruncate (__X32_SYSCALL_BIT + 77)
-#define __NR_getdents (__X32_SYSCALL_BIT + 78)
-#define __NR_getcwd (__X32_SYSCALL_BIT + 79)
-#define __NR_chdir (__X32_SYSCALL_BIT + 80)
-#define __NR_fchdir (__X32_SYSCALL_BIT + 81)
-#define __NR_rename (__X32_SYSCALL_BIT + 82)
-#define __NR_mkdir (__X32_SYSCALL_BIT + 83)
-#define __NR_rmdir (__X32_SYSCALL_BIT + 84)
-#define __NR_creat (__X32_SYSCALL_BIT + 85)
-#define __NR_link (__X32_SYSCALL_BIT + 86)
-#define __NR_unlink (__X32_SYSCALL_BIT + 87)
-#define __NR_symlink (__X32_SYSCALL_BIT + 88)
-#define __NR_readlink (__X32_SYSCALL_BIT + 89)
-#define __NR_chmod (__X32_SYSCALL_BIT + 90)
-#define __NR_fchmod (__X32_SYSCALL_BIT + 91)
-#define __NR_chown (__X32_SYSCALL_BIT + 92)
-#define __NR_fchown (__X32_SYSCALL_BIT + 93)
-#define __NR_lchown (__X32_SYSCALL_BIT + 94)
-#define __NR_umask (__X32_SYSCALL_BIT + 95)
-#define __NR_gettimeofday (__X32_SYSCALL_BIT + 96)
-#define __NR_getrlimit (__X32_SYSCALL_BIT + 97)
-#define __NR_getrusage (__X32_SYSCALL_BIT + 98)
-#define __NR_sysinfo (__X32_SYSCALL_BIT + 99)
-#define __NR_times (__X32_SYSCALL_BIT + 100)
-#define __NR_getuid (__X32_SYSCALL_BIT + 102)
-#define __NR_syslog (__X32_SYSCALL_BIT + 103)
-#define __NR_getgid (__X32_SYSCALL_BIT + 104)
-#define __NR_setuid (__X32_SYSCALL_BIT + 105)
-#define __NR_setgid (__X32_SYSCALL_BIT + 106)
-#define __NR_geteuid (__X32_SYSCALL_BIT + 107)
-#define __NR_getegid (__X32_SYSCALL_BIT + 108)
-#define __NR_setpgid (__X32_SYSCALL_BIT + 109)
-#define __NR_getppid (__X32_SYSCALL_BIT + 110)
-#define __NR_getpgrp (__X32_SYSCALL_BIT + 111)
-#define __NR_setsid (__X32_SYSCALL_BIT + 112)
-#define __NR_setreuid (__X32_SYSCALL_BIT + 113)
-#define __NR_setregid (__X32_SYSCALL_BIT + 114)
-#define __NR_getgroups (__X32_SYSCALL_BIT + 115)
-#define __NR_setgroups (__X32_SYSCALL_BIT + 116)
-#define __NR_setresuid (__X32_SYSCALL_BIT + 117)
-#define __NR_getresuid (__X32_SYSCALL_BIT + 118)
-#define __NR_setresgid (__X32_SYSCALL_BIT + 119)
-#define __NR_getresgid (__X32_SYSCALL_BIT + 120)
-#define __NR_getpgid (__X32_SYSCALL_BIT + 121)
-#define __NR_setfsuid (__X32_SYSCALL_BIT + 122)
-#define __NR_setfsgid (__X32_SYSCALL_BIT + 123)
-#define __NR_getsid (__X32_SYSCALL_BIT + 124)
-#define __NR_capget (__X32_SYSCALL_BIT + 125)
-#define __NR_capset (__X32_SYSCALL_BIT + 126)
-#define __NR_rt_sigsuspend (__X32_SYSCALL_BIT + 130)
-#define __NR_utime (__X32_SYSCALL_BIT + 132)
-#define __NR_mknod (__X32_SYSCALL_BIT + 133)
-#define __NR_personality (__X32_SYSCALL_BIT + 135)
-#define __NR_ustat (__X32_SYSCALL_BIT + 136)
-#define __NR_statfs (__X32_SYSCALL_BIT + 137)
-#define __NR_fstatfs (__X32_SYSCALL_BIT + 138)
-#define __NR_sysfs (__X32_SYSCALL_BIT + 139)
-#define __NR_getpriority (__X32_SYSCALL_BIT + 140)
-#define __NR_setpriority (__X32_SYSCALL_BIT + 141)
-#define __NR_sched_setparam (__X32_SYSCALL_BIT + 142)
-#define __NR_sched_getparam (__X32_SYSCALL_BIT + 143)
-#define __NR_sched_setscheduler (__X32_SYSCALL_BIT + 144)
-#define __NR_sched_getscheduler (__X32_SYSCALL_BIT + 145)
-#define __NR_sched_get_priority_max (__X32_SYSCALL_BIT + 146)
-#define __NR_sched_get_priority_min (__X32_SYSCALL_BIT + 147)
-#define __NR_sched_rr_get_interval (__X32_SYSCALL_BIT + 148)
-#define __NR_mlock (__X32_SYSCALL_BIT + 149)
-#define __NR_munlock (__X32_SYSCALL_BIT + 150)
-#define __NR_mlockall (__X32_SYSCALL_BIT + 151)
-#define __NR_munlockall (__X32_SYSCALL_BIT + 152)
-#define __NR_vhangup (__X32_SYSCALL_BIT + 153)
-#define __NR_modify_ldt (__X32_SYSCALL_BIT + 154)
-#define __NR_pivot_root (__X32_SYSCALL_BIT + 155)
-#define __NR_prctl (__X32_SYSCALL_BIT + 157)
-#define __NR_arch_prctl (__X32_SYSCALL_BIT + 158)
-#define __NR_adjtimex (__X32_SYSCALL_BIT + 159)
-#define __NR_setrlimit (__X32_SYSCALL_BIT + 160)
-#define __NR_chroot (__X32_SYSCALL_BIT + 161)
-#define __NR_sync (__X32_SYSCALL_BIT + 162)
-#define __NR_acct (__X32_SYSCALL_BIT + 163)
-#define __NR_settimeofday (__X32_SYSCALL_BIT + 164)
-#define __NR_mount (__X32_SYSCALL_BIT + 165)
-#define __NR_umount2 (__X32_SYSCALL_BIT + 166)
-#define __NR_swapon (__X32_SYSCALL_BIT + 167)
-#define __NR_swapoff (__X32_SYSCALL_BIT + 168)
-#define __NR_reboot (__X32_SYSCALL_BIT + 169)
-#define __NR_sethostname (__X32_SYSCALL_BIT + 170)
-#define __NR_setdomainname (__X32_SYSCALL_BIT + 171)
-#define __NR_iopl (__X32_SYSCALL_BIT + 172)
-#define __NR_ioperm (__X32_SYSCALL_BIT + 173)
-#define __NR_init_module (__X32_SYSCALL_BIT + 175)
-#define __NR_delete_module (__X32_SYSCALL_BIT + 176)
-#define __NR_quotactl (__X32_SYSCALL_BIT + 179)
-#define __NR_getpmsg (__X32_SYSCALL_BIT + 181)
-#define __NR_putpmsg (__X32_SYSCALL_BIT + 182)
-#define __NR_afs_syscall (__X32_SYSCALL_BIT + 183)
-#define __NR_tuxcall (__X32_SYSCALL_BIT + 184)
-#define __NR_security (__X32_SYSCALL_BIT + 185)
-#define __NR_gettid (__X32_SYSCALL_BIT + 186)
-#define __NR_readahead (__X32_SYSCALL_BIT + 187)
-#define __NR_setxattr (__X32_SYSCALL_BIT + 188)
-#define __NR_lsetxattr (__X32_SYSCALL_BIT + 189)
-#define __NR_fsetxattr (__X32_SYSCALL_BIT + 190)
-#define __NR_getxattr (__X32_SYSCALL_BIT + 191)
-#define __NR_lgetxattr (__X32_SYSCALL_BIT + 192)
-#define __NR_fgetxattr (__X32_SYSCALL_BIT + 193)
-#define __NR_listxattr (__X32_SYSCALL_BIT + 194)
-#define __NR_llistxattr (__X32_SYSCALL_BIT + 195)
-#define __NR_flistxattr (__X32_SYSCALL_BIT + 196)
-#define __NR_removexattr (__X32_SYSCALL_BIT + 197)
-#define __NR_lremovexattr (__X32_SYSCALL_BIT + 198)
-#define __NR_fremovexattr (__X32_SYSCALL_BIT + 199)
-#define __NR_tkill (__X32_SYSCALL_BIT + 200)
-#define __NR_time (__X32_SYSCALL_BIT + 201)
-#define __NR_futex (__X32_SYSCALL_BIT + 202)
-#define __NR_sched_setaffinity (__X32_SYSCALL_BIT + 203)
-#define __NR_sched_getaffinity (__X32_SYSCALL_BIT + 204)
-#define __NR_io_destroy (__X32_SYSCALL_BIT + 207)
-#define __NR_io_getevents (__X32_SYSCALL_BIT + 208)
-#define __NR_io_cancel (__X32_SYSCALL_BIT + 210)
-#define __NR_lookup_dcookie (__X32_SYSCALL_BIT + 212)
-#define __NR_epoll_create (__X32_SYSCALL_BIT + 213)
-#define __NR_remap_file_pages (__X32_SYSCALL_BIT + 216)
-#define __NR_getdents64 (__X32_SYSCALL_BIT + 217)
-#define __NR_set_tid_address (__X32_SYSCALL_BIT + 218)
-#define __NR_restart_syscall (__X32_SYSCALL_BIT + 219)
-#define __NR_semtimedop (__X32_SYSCALL_BIT + 220)
-#define __NR_fadvise64 (__X32_SYSCALL_BIT + 221)
-#define __NR_timer_settime (__X32_SYSCALL_BIT + 223)
-#define __NR_timer_gettime (__X32_SYSCALL_BIT + 224)
-#define __NR_timer_getoverrun (__X32_SYSCALL_BIT + 225)
-#define __NR_timer_delete (__X32_SYSCALL_BIT + 226)
-#define __NR_clock_settime (__X32_SYSCALL_BIT + 227)
-#define __NR_clock_gettime (__X32_SYSCALL_BIT + 228)
-#define __NR_clock_getres (__X32_SYSCALL_BIT + 229)
-#define __NR_clock_nanosleep (__X32_SYSCALL_BIT + 230)
-#define __NR_exit_group (__X32_SYSCALL_BIT + 231)
-#define __NR_epoll_wait (__X32_SYSCALL_BIT + 232)
-#define __NR_epoll_ctl (__X32_SYSCALL_BIT + 233)
-#define __NR_tgkill (__X32_SYSCALL_BIT + 234)
-#define __NR_utimes (__X32_SYSCALL_BIT + 235)
-#define __NR_mbind (__X32_SYSCALL_BIT + 237)
-#define __NR_set_mempolicy (__X32_SYSCALL_BIT + 238)
-#define __NR_get_mempolicy (__X32_SYSCALL_BIT + 239)
-#define __NR_mq_open (__X32_SYSCALL_BIT + 240)
-#define __NR_mq_unlink (__X32_SYSCALL_BIT + 241)
-#define __NR_mq_timedsend (__X32_SYSCALL_BIT + 242)
-#define __NR_mq_timedreceive (__X32_SYSCALL_BIT + 243)
-#define __NR_mq_getsetattr (__X32_SYSCALL_BIT + 245)
-#define __NR_add_key (__X32_SYSCALL_BIT + 248)
-#define __NR_request_key (__X32_SYSCALL_BIT + 249)
-#define __NR_keyctl (__X32_SYSCALL_BIT + 250)
-#define __NR_ioprio_set (__X32_SYSCALL_BIT + 251)
-#define __NR_ioprio_get (__X32_SYSCALL_BIT + 252)
-#define __NR_inotify_init (__X32_SYSCALL_BIT + 253)
-#define __NR_inotify_add_watch (__X32_SYSCALL_BIT + 254)
-#define __NR_inotify_rm_watch (__X32_SYSCALL_BIT + 255)
-#define __NR_migrate_pages (__X32_SYSCALL_BIT + 256)
-#define __NR_openat (__X32_SYSCALL_BIT + 257)
-#define __NR_mkdirat (__X32_SYSCALL_BIT + 258)
-#define __NR_mknodat (__X32_SYSCALL_BIT + 259)
-#define __NR_fchownat (__X32_SYSCALL_BIT + 260)
-#define __NR_futimesat (__X32_SYSCALL_BIT + 261)
-#define __NR_newfstatat (__X32_SYSCALL_BIT + 262)
-#define __NR_unlinkat (__X32_SYSCALL_BIT + 263)
-#define __NR_renameat (__X32_SYSCALL_BIT + 264)
-#define __NR_linkat (__X32_SYSCALL_BIT + 265)
-#define __NR_symlinkat (__X32_SYSCALL_BIT + 266)
-#define __NR_readlinkat (__X32_SYSCALL_BIT + 267)
-#define __NR_fchmodat (__X32_SYSCALL_BIT + 268)
-#define __NR_faccessat (__X32_SYSCALL_BIT + 269)
-#define __NR_pselect6 (__X32_SYSCALL_BIT + 270)
-#define __NR_ppoll (__X32_SYSCALL_BIT + 271)
-#define __NR_unshare (__X32_SYSCALL_BIT + 272)
-#define __NR_splice (__X32_SYSCALL_BIT + 275)
-#define __NR_tee (__X32_SYSCALL_BIT + 276)
-#define __NR_sync_file_range (__X32_SYSCALL_BIT + 277)
-#define __NR_utimensat (__X32_SYSCALL_BIT + 280)
-#define __NR_epoll_pwait (__X32_SYSCALL_BIT + 281)
-#define __NR_signalfd (__X32_SYSCALL_BIT + 282)
-#define __NR_timerfd_create (__X32_SYSCALL_BIT + 283)
-#define __NR_eventfd (__X32_SYSCALL_BIT + 284)
-#define __NR_fallocate (__X32_SYSCALL_BIT + 285)
-#define __NR_timerfd_settime (__X32_SYSCALL_BIT + 286)
-#define __NR_timerfd_gettime (__X32_SYSCALL_BIT + 287)
-#define __NR_accept4 (__X32_SYSCALL_BIT + 288)
-#define __NR_signalfd4 (__X32_SYSCALL_BIT + 289)
-#define __NR_eventfd2 (__X32_SYSCALL_BIT + 290)
-#define __NR_epoll_create1 (__X32_SYSCALL_BIT + 291)
-#define __NR_dup3 (__X32_SYSCALL_BIT + 292)
-#define __NR_pipe2 (__X32_SYSCALL_BIT + 293)
-#define __NR_inotify_init1 (__X32_SYSCALL_BIT + 294)
-#define __NR_perf_event_open (__X32_SYSCALL_BIT + 298)
-#define __NR_fanotify_init (__X32_SYSCALL_BIT + 300)
-#define __NR_fanotify_mark (__X32_SYSCALL_BIT + 301)
-#define __NR_prlimit64 (__X32_SYSCALL_BIT + 302)
-#define __NR_name_to_handle_at (__X32_SYSCALL_BIT + 303)
-#define __NR_open_by_handle_at (__X32_SYSCALL_BIT + 304)
-#define __NR_clock_adjtime (__X32_SYSCALL_BIT + 305)
-#define __NR_syncfs (__X32_SYSCALL_BIT + 306)
-#define __NR_setns (__X32_SYSCALL_BIT + 308)
-#define __NR_getcpu (__X32_SYSCALL_BIT + 309)
-#define __NR_kcmp (__X32_SYSCALL_BIT + 312)
-#define __NR_finit_module (__X32_SYSCALL_BIT + 313)
-#define __NR_sched_setattr (__X32_SYSCALL_BIT + 314)
-#define __NR_sched_getattr (__X32_SYSCALL_BIT + 315)
-#define __NR_renameat2 (__X32_SYSCALL_BIT + 316)
-#define __NR_seccomp (__X32_SYSCALL_BIT + 317)
-#define __NR_getrandom (__X32_SYSCALL_BIT + 318)
-#define __NR_memfd_create (__X32_SYSCALL_BIT + 319)
-#define __NR_kexec_file_load (__X32_SYSCALL_BIT + 320)
-#define __NR_bpf (__X32_SYSCALL_BIT + 321)
-
-#define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)
-#define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)
-#define __NR_ioctl (__X32_SYSCALL_BIT + 514)
-#define __NR_readv (__X32_SYSCALL_BIT + 515)
-#define __NR_writev (__X32_SYSCALL_BIT + 516)
-#define __NR_recvfrom (__X32_SYSCALL_BIT + 517)
-#define __NR_sendmsg (__X32_SYSCALL_BIT + 518)
-#define __NR_recvmsg (__X32_SYSCALL_BIT + 519)
-#define __NR_execve (__X32_SYSCALL_BIT + 520)
-#define __NR_ptrace (__X32_SYSCALL_BIT + 521)
-#define __NR_rt_sigpending (__X32_SYSCALL_BIT + 522)
-#define __NR_rt_sigtimedwait (__X32_SYSCALL_BIT + 523)
-#define __NR_rt_sigqueueinfo (__X32_SYSCALL_BIT + 524)
-#define __NR_sigaltstack (__X32_SYSCALL_BIT + 525)
-#define __NR_timer_create (__X32_SYSCALL_BIT + 526)
-#define __NR_mq_notify (__X32_SYSCALL_BIT + 527)
-#define __NR_kexec_load (__X32_SYSCALL_BIT + 528)
-#define __NR_waitid (__X32_SYSCALL_BIT + 529)
-#define __NR_set_robust_list (__X32_SYSCALL_BIT + 530)
-#define __NR_get_robust_list (__X32_SYSCALL_BIT + 531)
-#define __NR_vmsplice (__X32_SYSCALL_BIT + 532)
-#define __NR_move_pages (__X32_SYSCALL_BIT + 533)
-#define __NR_preadv (__X32_SYSCALL_BIT + 534)
-#define __NR_pwritev (__X32_SYSCALL_BIT + 535)
-#define __NR_rt_tgsigqueueinfo (__X32_SYSCALL_BIT + 536)
-#define __NR_recvmmsg (__X32_SYSCALL_BIT + 537)
-#define __NR_sendmmsg (__X32_SYSCALL_BIT + 538)
-#define __NR_process_vm_readv (__X32_SYSCALL_BIT + 539)
-#define __NR_process_vm_writev (__X32_SYSCALL_BIT + 540)
-#define __NR_setsockopt (__X32_SYSCALL_BIT + 541)
-#define __NR_getsockopt (__X32_SYSCALL_BIT + 542)
-#define __NR_io_setup (__X32_SYSCALL_BIT + 543)
-#define __NR_io_submit (__X32_SYSCALL_BIT + 544)
-#define __NR_execveat (__X32_SYSCALL_BIT + 545)
-
-#undef __NR_fstatat
-#undef __NR_pread
-#undef __NR_pwrite
-#undef __NR_getdents
-#define __NR_fstatat __NR_newfstatat
-#define __NR_pread __NR_pread64
-#define __NR_pwrite __NR_pwrite64
-#define __NR_getdents __NR_getdents64
-#define __NR_fadvise __NR_fadvise64
-
-
-
-/* Repeat with SYS_ prefix */
-
-
-
-#define SYS_read __NR_read
-#define SYS_write __NR_write
-#define SYS_open __NR_open
-#define SYS_close __NR_close
-#define SYS_stat __NR_stat
-#define SYS_fstat __NR_fstat
-#define SYS_lstat __NR_lstat
-#define SYS_poll __NR_poll
-#define SYS_lseek __NR_lseek
-#define SYS_mmap __NR_mmap
-#define SYS_mprotect __NR_mprotect
-#define SYS_munmap __NR_munmap
-#define SYS_brk __NR_brk
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_pread64 __NR_pread64
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_access __NR_access
-#define SYS_pipe __NR_pipe
-#define SYS_select __NR_select
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_mremap __NR_mremap
-#define SYS_msync __NR_msync
-#define SYS_mincore __NR_mincore
-#define SYS_madvise __NR_madvise
-#define SYS_shmget __NR_shmget
-#define SYS_shmat __NR_shmat
-#define SYS_shmctl __NR_shmctl
-#define SYS_dup __NR_dup
-#define SYS_dup2 __NR_dup2
-#define SYS_pause __NR_pause
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_getitimer __NR_getitimer
-#define SYS_alarm __NR_alarm
-#define SYS_setitimer __NR_setitimer
-#define SYS_getpid __NR_getpid
-#define SYS_sendfile __NR_sendfile
-#define SYS_socket __NR_socket
-#define SYS_connect __NR_connect
-#define SYS_accept __NR_accept
-#define SYS_sendto __NR_sendto
-#define SYS_shutdown __NR_shutdown
-#define SYS_bind __NR_bind
-#define SYS_listen __NR_listen
-#define SYS_getsockname __NR_getsockname
-#define SYS_getpeername __NR_getpeername
-#define SYS_socketpair __NR_socketpair
-#define SYS_clone __NR_clone
-#define SYS_fork __NR_fork
-#define SYS_vfork __NR_vfork
-#define SYS_exit __NR_exit
-#define SYS_wait4 __NR_wait4
-#define SYS_kill __NR_kill
-#define SYS_uname __NR_uname
-#define SYS_semget __NR_semget
-#define SYS_semop __NR_semop
-#define SYS_semctl __NR_semctl
-#define SYS_shmdt __NR_shmdt
-#define SYS_msgget __NR_msgget
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgctl __NR_msgctl
-#define SYS_fcntl __NR_fcntl
-#define SYS_flock __NR_flock
-#define SYS_fsync __NR_fsync
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_truncate __NR_truncate
-#define SYS_ftruncate __NR_ftruncate
-#define SYS_getdents __NR_getdents
-#define SYS_getcwd __NR_getcwd
-#define SYS_chdir __NR_chdir
-#define SYS_fchdir __NR_fchdir
-#define SYS_rename __NR_rename
-#define SYS_mkdir __NR_mkdir
-#define SYS_rmdir __NR_rmdir
-#define SYS_creat __NR_creat
-#define SYS_link __NR_link
-#define SYS_unlink __NR_unlink
-#define SYS_symlink __NR_symlink
-#define SYS_readlink __NR_readlink
-#define SYS_chmod __NR_chmod
-#define SYS_fchmod __NR_fchmod
-#define SYS_chown __NR_chown
-#define SYS_fchown __NR_fchown
-#define SYS_lchown __NR_lchown
-#define SYS_umask __NR_umask
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_getrlimit __NR_getrlimit
-#define SYS_getrusage __NR_getrusage
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_times __NR_times
-#define SYS_getuid __NR_getuid
-#define SYS_syslog __NR_syslog
-#define SYS_getgid __NR_getgid
-#define SYS_setuid __NR_setuid
-#define SYS_setgid __NR_setgid
-#define SYS_geteuid __NR_geteuid
-#define SYS_getegid __NR_getegid
-#define SYS_setpgid __NR_setpgid
-#define SYS_getppid __NR_getppid
-#define SYS_getpgrp __NR_getpgrp
-#define SYS_setsid __NR_setsid
-#define SYS_setreuid __NR_setreuid
-#define SYS_setregid __NR_setregid
-#define SYS_getgroups __NR_getgroups
-#define SYS_setgroups __NR_setgroups
-#define SYS_setresuid __NR_setresuid
-#define SYS_getresuid __NR_getresuid
-#define SYS_setresgid __NR_setresgid
-#define SYS_getresgid __NR_getresgid
-#define SYS_getpgid __NR_getpgid
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_getsid __NR_getsid
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_utime __NR_utime
-#define SYS_mknod __NR_mknod
-#define SYS_personality __NR_personality
-#define SYS_ustat __NR_ustat
-#define SYS_statfs __NR_statfs
-#define SYS_fstatfs __NR_fstatfs
-#define SYS_sysfs __NR_sysfs
-#define SYS_getpriority __NR_getpriority
-#define SYS_setpriority __NR_setpriority
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_mlock __NR_mlock
-#define SYS_munlock __NR_munlock
-#define SYS_mlockall __NR_mlockall
-#define SYS_munlockall __NR_munlockall
-#define SYS_vhangup __NR_vhangup
-#define SYS_modify_ldt __NR_modify_ldt
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_prctl __NR_prctl
-#define SYS_arch_prctl __NR_arch_prctl
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_chroot __NR_chroot
-#define SYS_sync __NR_sync
-#define SYS_acct __NR_acct
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_mount __NR_mount
-#define SYS_umount2 __NR_umount2
-#define SYS_swapon __NR_swapon
-#define SYS_swapoff __NR_swapoff
-#define SYS_reboot __NR_reboot
-#define SYS_sethostname __NR_sethostname
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_iopl __NR_iopl
-#define SYS_ioperm __NR_ioperm
-#define SYS_init_module __NR_init_module
-#define SYS_delete_module __NR_delete_module
-#define SYS_quotactl __NR_quotactl
-#define SYS_getpmsg __NR_getpmsg
-#define SYS_putpmsg __NR_putpmsg
-#define SYS_afs_syscall __NR_afs_syscall
-#define SYS_tuxcall __NR_tuxcall
-#define SYS_security __NR_security
-#define SYS_gettid __NR_gettid
-#define SYS_readahead __NR_readahead
-#define SYS_setxattr __NR_setxattr
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_getxattr __NR_getxattr
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_removexattr __NR_removexattr
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_tkill __NR_tkill
-#define SYS_time __NR_time
-#define SYS_futex __NR_futex
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_epoll_create __NR_epoll_create
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_getdents64 __NR_getdents64
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_fadvise64 __NR_fadvise64
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_exit_group __NR_exit_group
-#define SYS_epoll_wait __NR_epoll_wait
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_tgkill __NR_tgkill
-#define SYS_utimes __NR_utimes
-#define SYS_mbind __NR_mbind
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_add_key __NR_add_key
-#define SYS_request_key __NR_request_key
-#define SYS_keyctl __NR_keyctl
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_inotify_init __NR_inotify_init
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_migrate_pages __NR_migrate_pages
-#define SYS_openat __NR_openat
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_mknodat __NR_mknodat
-#define SYS_fchownat __NR_fchownat
-#define SYS_futimesat __NR_futimesat
-#define SYS_newfstatat __NR_newfstatat
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_renameat __NR_renameat
-#define SYS_linkat __NR_linkat
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_faccessat __NR_faccessat
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ppoll __NR_ppoll
-#define SYS_unshare __NR_unshare
-#define SYS_splice __NR_splice
-#define SYS_tee __NR_tee
-#define SYS_sync_file_range __NR_sync_file_range
-#define SYS_utimensat __NR_utimensat
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_signalfd __NR_signalfd
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_eventfd __NR_eventfd
-#define SYS_fallocate __NR_fallocate
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_accept4 __NR_accept4
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_dup3 __NR_dup3
-#define SYS_pipe2 __NR_pipe2
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_syncfs __NR_syncfs
-#define SYS_setns __NR_setns
-#define SYS_getcpu __NR_getcpu
-#define SYS_kcmp __NR_kcmp
-#define SYS_finit_module __NR_finit_module
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_renameat2 __NR_renameat2
-#define SYS_seccomp __NR_seccomp
-#define SYS_getrandom __NR_getrandom
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_kexec_file_load __NR_kexec_file_load
-#define SYS_bpf __NR_bpf
-
-
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_ioctl __NR_ioctl
-#define SYS_readv __NR_readv
-#define SYS_writev __NR_writev
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_execve __NR_execve
-#define SYS_ptrace __NR_ptrace
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_timer_create __NR_timer_create
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_waitid __NR_waitid
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_move_pages __NR_move_pages
-#define SYS_preadv __NR_preadv
-#define SYS_pwritev __NR_pwritev
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_submit __NR_io_submit
-#define SYS_execveat __NR_execveat
-
-#undef SYS_fstatat
-#undef SYS_pread
-#undef SYS_pwrite
-#undef SYS_getdents
-#define SYS_fstatat SYS_newfstatat
-#define SYS_pread SYS_pread64
-#define SYS_pwrite SYS_pwrite64
-#define SYS_getdents SYS_getdents64
-#define SYS_fadvise SYS_fadvise64
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/termios.h
deleted file mode 100644
index f0d81b138f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/termios.h
+++ /dev/null
@@ -1,160 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/user.h b/src/components/lib/libc/musl-1.1.11/arch/x32/bits/user.h
deleted file mode 100644
index 1bd2d709e1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/user.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
-
-typedef struct user_fpregs_struct
-{
-	uint16_t cwd, swd, ftw, fop;
-	uint64_t rip, rdp;
-	uint32_t mxcsr, mxcr_mask;
-	uint32_t st_space[32], xmm_space[64], padding[24];
-} elf_fpregset_t;
-
-struct user_regs_struct
-{
-	unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
-	unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
-	unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
-};
-#define ELF_NGREG 27
-typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
-
-struct user
-{
-	struct user_regs_struct		regs;
-	int				u_fpvalid;
-	struct user_fpregs_struct	i387;
-	unsigned long			u_tsize;
-	unsigned long			u_dsize;
-	unsigned long			u_ssize;
-	unsigned long			start_code;
-	unsigned long			start_stack;
-	long				signal;
-	int				reserved;
-	struct user_regs_struct		*u_ar0;
-	struct user_fpregs_struct	*u_fpstate;
-	unsigned long			magic;
-	char				u_comm[32];
-	unsigned long			u_debugreg[8];
-};
-
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
-#define UPAGES			1
-#define HOST_TEXT_START_ADDR	(u.start_code)
-#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/x32/pthread_arch.h
deleted file mode 100644
index 033bfd69a3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/pthread_arch.h
+++ /dev/null
@@ -1,12 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-	struct pthread *self;
-	__asm__ __volatile__ ("mov %%fs:0,%0" : "=r" (self) );
-	return self;
-}
-
-#define TP_ADJ(p) (p)
-
-#define CANCEL_REG_IP 32
-
-#define CANARY canary2
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/x32/reloc.h
deleted file mode 100644
index 574f44a777..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/reloc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#define LDSO_ARCH "x32"
-
-/* FIXME: x32 is very strange in its use of 64-bit relocation types in
- * a 32-bit environment. As long as the memory at reloc_addr is
- * zero-filled prior to relocations, just treating 64-bit relocations
- * as operating on 32-bit slots should be fine, but this should be
- * checked. In particular, R_X86_64_64, R_X86_64_DTPOFF64, and
- * R_X86_64_TPOFF64 may need checking. */
-
-/* The R_X86_64_64, R_X86_64_DTPOFF32, and R_X86_64_TPOFF32 reloc types
- * were previously mapped in the switch table form of this file; however,
- * they do not seem to be used/usable for anything. If needed, new
- * mappings will have to be added. */
-
-#define REL_SYMBOLIC    R_X86_64_32
-#define REL_OFFSET      R_X86_64_PC32
-#define REL_GOT         R_X86_64_GLOB_DAT
-#define REL_PLT         R_X86_64_JUMP_SLOT
-#define REL_RELATIVE    R_X86_64_RELATIVE
-#define REL_COPY        R_X86_64_COPY
-#define REL_DTPMOD      R_X86_64_DTPMOD64
-#define REL_DTPOFF      R_X86_64_DTPOFF64
-#define REL_TPOFF       R_X86_64_TPOFF64
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"mov %1,%%esp ; jmp *%0" : : "r"((uint64_t)(uintptr_t)pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/src/syscall_cp_fixup.c b/src/components/lib/libc/musl-1.1.11/arch/x32/src/syscall_cp_fixup.c
deleted file mode 100644
index deb01ee9a5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/src/syscall_cp_fixup.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <sys/syscall.h>
-
-#ifdef SHARED
-__attribute__((__visibility__("hidden")))
-#endif
-long __syscall_cp_internal(volatile void*, long long, long long, long long, long long,
-                             long long, long long, long long);
-
-struct __timespec { long long tv_sec; long tv_nsec; };
-struct __timespec_kernel { long long tv_sec; long long tv_nsec; };
-#define __tsc(X) ((struct __timespec*)(unsigned long)(X))
-#define __fixup(X) do { if(X) { \
-	ts->tv_sec = __tsc(X)->tv_sec; \
-	ts->tv_nsec = __tsc(X)->tv_nsec; \
-	(X) = (unsigned long)ts; } } while(0)
-
-#ifdef SHARED
-__attribute__((__visibility__("hidden")))
-#endif
-long __syscall_cp_asm (volatile void * foo, long long n, long long a1, long long a2, long long a3,
-	                     long long a4, long long a5, long long a6)
-{
-	struct __timespec_kernel ts[1];
-	switch (n) {
-	case SYS_mq_timedsend: case SYS_mq_timedreceive: case SYS_pselect6:
-		__fixup(a5);
-		break;
-	case SYS_futex:
-		if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */)
-			__fixup(a4);
-		break;
-	case SYS_clock_nanosleep:
-	case SYS_rt_sigtimedwait: case SYS_ppoll:
-		__fixup(a3);
-		break;
-	case SYS_nanosleep:
-		__fixup(a1);
-		break;
-	}
-	return __syscall_cp_internal(foo, n, a1, a2, a3, a4, a5, a6);
-}
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/src/sysinfo.c b/src/components/lib/libc/musl-1.1.11/arch/x32/src/sysinfo.c
deleted file mode 100644
index d1c1b14892..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/src/sysinfo.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <sys/sysinfo.h>
-#include "syscall.h"
-#include "libc.h"
-
-#define klong long long
-#define kulong unsigned long long
-
-struct kernel_sysinfo {
-	klong uptime;
-	kulong loads[3];
-	kulong totalram;
-	kulong freeram;
-	kulong sharedram;
-	kulong bufferram;
-	kulong totalswap;
-	kulong freeswap;
-	short procs;
-	short pad;
-	kulong totalhigh;
-	kulong freehigh;
-	unsigned mem_unit;
-};
-
-int __lsysinfo(struct sysinfo *info)
-{
-	struct kernel_sysinfo tmp;
-	int ret = syscall(SYS_sysinfo, &tmp);
-	if(ret == -1) return ret;
-	info->uptime = tmp.uptime;
-	info->loads[0] = tmp.loads[0];
-	info->loads[1] = tmp.loads[1];
-	info->loads[2] = tmp.loads[2];
-	kulong shifts;
-	kulong max = tmp.totalram | tmp.totalswap;
-	__asm__("bsr %1,%0" : "=r"(shifts) : "r"(max));
-	shifts = shifts >= 32 ? shifts - 31 : 0;
-	info->totalram = tmp.totalram >> shifts;
-	info->freeram = tmp.freeram >> shifts;
-	info->sharedram = tmp.sharedram >> shifts;
-	info->bufferram = tmp.bufferram >> shifts;
-	info->totalswap = tmp.totalswap >> shifts;
-	info->freeswap = tmp.freeswap >> shifts;
-	info->procs = tmp.procs ;
-	info->totalhigh = tmp.totalhigh >> shifts;
-	info->freehigh = tmp.freehigh >> shifts;
-	info->mem_unit = (tmp.mem_unit ? tmp.mem_unit : 1) << shifts;
-	return ret;
-}
-
-weak_alias(__lsysinfo, sysinfo);
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/x32/syscall_arch.h
deleted file mode 100644
index 344da03c9a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x32/syscall_arch.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#define __SYSCALL_LL_E(x) (x)
-#define __SYSCALL_LL_O(x) (x)
-
-#define __scc(X) sizeof(1?(X):0ULL) < 8 ? (unsigned long) (X) : (long long) (X)
-typedef long long syscall_arg_t;
-struct __timespec { long long tv_sec; long tv_nsec; };
-struct __timespec_kernel { long long tv_sec; long long tv_nsec; };
-#define __tsc(X) ((struct __timespec*)(unsigned long)(X))
-#define __fixup(X) do { if(X) { \
-	ts->tv_sec = __tsc(X)->tv_sec; \
-	ts->tv_nsec = __tsc(X)->tv_nsec; \
-	(X) = (unsigned long)ts; } } while(0)
-#define __fixup_case_2 \
-	case SYS_nanosleep: \
-		__fixup(a1); break; \
-	case SYS_clock_settime: \
-		__fixup(a2); break;
-#define __fixup_case_3 \
-	case SYS_clock_nanosleep: case SYS_rt_sigtimedwait: case SYS_ppoll: \
-		__fixup(a3); break; \
-	case SYS_utimensat: \
-		if(a3) { \
-			ts[0].tv_sec = __tsc(a3)[0].tv_sec; \
-			ts[0].tv_nsec = __tsc(a3)[0].tv_nsec; \
-			ts[1].tv_sec = __tsc(a3)[1].tv_sec; \
-			ts[1].tv_nsec = __tsc(a3)[1].tv_nsec; \
-			a3 = (unsigned long)ts; \
-		} break;
-#define __fixup_case_4 \
-	case SYS_futex: \
-		if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */) __fixup(a4); break;
-#define __fixup_case_5 \
-	case SYS_mq_timedsend: case SYS_mq_timedreceive: case SYS_pselect6: \
-		__fixup(a5); break;
-
-static __inline long __syscall0(long long n)
-{
-	unsigned long ret;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall1(long long n, long long a1)
-{
-	unsigned long ret;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall2(long long n, long long a1, long long a2)
-{
-	unsigned long ret;
-	struct __timespec_kernel ts[1];
-	switch (n) {
-		__fixup_case_2;
-	}
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2)
-					: "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall3(long long n, long long a1, long long a2, long long a3)
-{
-	unsigned long ret;
-	struct __timespec_kernel ts[2];
-	switch (n) {
-		__fixup_case_2;
-		__fixup_case_3;
-	}
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-						  "d"(a3) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall4(long long n, long long a1, long long a2, long long a3,
-                                     long long a4_)
-{
-	unsigned long ret;
-	register long long a4 __asm__("r10") = a4_;
-	struct __timespec_kernel ts[2];
-	switch (n) {
-		__fixup_case_2;
-		__fixup_case_3;
-		__fixup_case_4;
-	}
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-					  "d"(a3), "r"(a4): "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall5(long long n, long long a1, long long a2, long long a3,
-                                     long long a4_, long long a5_)
-{
-	unsigned long ret;
-	register long long a4 __asm__("r10") = a4_;
-	register long long a5 __asm__("r8") = a5_;
-	struct __timespec_kernel ts[2];
-	switch (n) {
-		__fixup_case_2;
-		__fixup_case_3;
-		__fixup_case_4;
-		__fixup_case_5;
-	}
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-					  "d"(a3), "r"(a4), "r"(a5) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall6(long long n, long long a1, long long a2, long long a3,
-                                     long long a4_, long long a5_, long long a6_)
-{
-	unsigned long ret;
-	register long long a4 __asm__("r10") = a4_;
-	register long long a5 __asm__("r8") = a5_;
-	register long long a6 __asm__("r9") = a6_;
-	struct __timespec_kernel ts[2];
-	switch (n) {
-		__fixup_case_2;
-		__fixup_case_3;
-		__fixup_case_4;
-		__fixup_case_5;
-	}
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-					  "d"(a3), "r"(a4), "r"(a5), "r"(a6) : "rcx", "r11", "memory");
-	return ret;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/atomic.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/atomic.h
deleted file mode 100644
index 7690183d01..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/atomic.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _INTERNAL_ATOMIC_H
-#define _INTERNAL_ATOMIC_H
-
-#include <stdint.h>
-
-static inline int a_ctz_64(uint64_t x)
-{
-	__asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
-	return x;
-}
-
-static inline int a_ctz_l(unsigned long x)
-{
-	__asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
-	return x;
-}
-
-static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-{
-	__asm__( "lock ; and %1, %0"
-			 : "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-{
-	__asm__( "lock ; or %1, %0"
-			 : "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_or_l(volatile void *p, long v)
-{
-	__asm__( "lock ; or %1, %0"
-		: "=m"(*(long *)p) : "r"(v) : "memory" );
-}
-
-static inline void *a_cas_p(volatile void *p, void *t, void *s)
-{
-	__asm__( "lock ; cmpxchg %3, %1"
-		: "=a"(t), "=m"(*(long *)p) : "a"(t), "r"(s) : "memory" );
-	return t;
-}
-
-static inline int a_cas(volatile int *p, int t, int s)
-{
-	__asm__( "lock ; cmpxchg %3, %1"
-		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
-	return t;
-}
-
-static inline void a_or(volatile int *p, int v)
-{
-	__asm__( "lock ; or %1, %0"
-		: "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline void a_and(volatile int *p, int v)
-{
-	__asm__( "lock ; and %1, %0"
-		: "=m"(*p) : "r"(v) : "memory" );
-}
-
-static inline int a_swap(volatile int *x, int v)
-{
-	__asm__( "xchg %0, %1" : "=r"(v), "=m"(*x) : "0"(v) : "memory" );
-	return v;
-}
-
-static inline int a_fetch_add(volatile int *x, int v)
-{
-	__asm__( "lock ; xadd %0, %1" : "=r"(v), "=m"(*x) : "0"(v) : "memory" );
-	return v;
-}
-
-static inline void a_inc(volatile int *x)
-{
-	__asm__( "lock ; incl %0" : "=m"(*x) : "m"(*x) : "memory" );
-}
-
-static inline void a_dec(volatile int *x)
-{
-	__asm__( "lock ; decl %0" : "=m"(*x) : "m"(*x) : "memory" );
-}
-
-static inline void a_store(volatile int *p, int x)
-{
-	__asm__( "mov %1, %0 ; lock ; orl $0,(%%rsp)" : "=m"(*p) : "r"(x) : "memory" );
-}
-
-static inline void a_spin()
-{
-	__asm__ __volatile__( "pause" : : : "memory" );
-}
-
-static inline void a_barrier()
-{
-	__asm__ __volatile__( "" : : : "memory" );
-}
-
-static inline void a_crash()
-{
-	__asm__ __volatile__( "hlt" : : : "memory" );
-}
-
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/alltypes.h.in
deleted file mode 100644
index dc551d4720..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/alltypes.h.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#define _Addr long
-#define _Int64 long
-#define _Reg long
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF int wchar_t;
-#endif
-
-#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 2
-TYPEDEF long double float_t;
-TYPEDEF long double double_t;
-#else
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-#endif
-
-TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/endian.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/endian.h
deleted file mode 100644
index 172c338f50..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/endian.h
+++ /dev/null
@@ -1 +0,0 @@
-#define __BYTE_ORDER __LITTLE_ENDIAN
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/errno.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/errno.h
deleted file mode 100644
index d2e1eeee05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/errno.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#define EPERM            1
-#define ENOENT           2
-#define ESRCH            3
-#define EINTR            4
-#define EIO              5
-#define ENXIO            6
-#define E2BIG            7
-#define ENOEXEC          8
-#define EBADF            9
-#define ECHILD          10
-#define EAGAIN          11
-#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-#define ENOTBLK         15
-#define EBUSY           16
-#define EEXIST          17
-#define EXDEV           18
-#define ENODEV          19
-#define ENOTDIR         20
-#define EISDIR          21
-#define EINVAL          22
-#define ENFILE          23
-#define EMFILE          24
-#define ENOTTY          25
-#define ETXTBSY         26
-#define EFBIG           27
-#define ENOSPC          28
-#define ESPIPE          29
-#define EROFS           30
-#define EMLINK          31
-#define EPIPE           32
-#define EDOM            33
-#define ERANGE          34
-#define EDEADLK         35
-#define ENAMETOOLONG    36
-#define ENOLCK          37
-#define ENOSYS          38
-#define ENOTEMPTY       39
-#define ELOOP           40
-#define EWOULDBLOCK     EAGAIN
-#define ENOMSG          42
-#define EIDRM           43
-#define ECHRNG          44
-#define EL2NSYNC        45
-#define EL3HLT          46
-#define EL3RST          47
-#define ELNRNG          48
-#define EUNATCH         49
-#define ENOCSI          50
-#define EL2HLT          51
-#define EBADE           52
-#define EBADR           53
-#define EXFULL          54
-#define ENOANO          55
-#define EBADRQC         56
-#define EBADSLT         57
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59
-#define ENOSTR          60
-#define ENODATA         61
-#define ETIME           62
-#define ENOSR           63
-#define ENONET          64
-#define ENOPKG          65
-#define EREMOTE         66
-#define ENOLINK         67
-#define EADV            68
-#define ESRMNT          69
-#define ECOMM           70
-#define EPROTO          71
-#define EMULTIHOP       72
-#define EDOTDOT         73
-#define EBADMSG         74
-#define EOVERFLOW       75
-#define ENOTUNIQ        76
-#define EBADFD          77
-#define EREMCHG         78
-#define ELIBACC         79
-#define ELIBBAD         80
-#define ELIBSCN         81
-#define ELIBMAX         82
-#define ELIBEXEC        83
-#define EILSEQ          84
-#define ERESTART        85
-#define ESTRPIPE        86
-#define EUSERS          87
-#define ENOTSOCK        88
-#define EDESTADDRREQ    89
-#define EMSGSIZE        90
-#define EPROTOTYPE      91
-#define ENOPROTOOPT     92
-#define EPROTONOSUPPORT 93
-#define ESOCKTNOSUPPORT 94
-#define EOPNOTSUPP      95
-#define ENOTSUP         EOPNOTSUPP
-#define EPFNOSUPPORT    96
-#define EAFNOSUPPORT    97
-#define EADDRINUSE      98
-#define EADDRNOTAVAIL   99
-#define ENETDOWN        100
-#define ENETUNREACH     101
-#define ENETRESET       102
-#define ECONNABORTED    103
-#define ECONNRESET      104
-#define ENOBUFS         105
-#define EISCONN         106
-#define ENOTCONN        107
-#define ESHUTDOWN       108
-#define ETOOMANYREFS    109
-#define ETIMEDOUT       110
-#define ECONNREFUSED    111
-#define EHOSTDOWN       112
-#define EHOSTUNREACH    113
-#define EALREADY        114
-#define EINPROGRESS     115
-#define ESTALE          116
-#define EUCLEAN         117
-#define ENOTNAM         118
-#define ENAVAIL         119
-#define EISNAM          120
-#define EREMOTEIO       121
-#define EDQUOT          122
-#define ENOMEDIUM       123
-#define EMEDIUMTYPE     124
-#define ECANCELED       125
-#define ENOKEY          126
-#define EKEYEXPIRED     127
-#define EKEYREVOKED     128
-#define EKEYREJECTED    129
-#define EOWNERDEAD      130
-#define ENOTRECOVERABLE 131
-#define ERFKILL         132
-#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/ioctl.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/ioctl.h
deleted file mode 100644
index 77a9455179..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/ioctl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-#define _IOC_NONE  0U
-#define _IOC_WRITE 1U
-#define _IOC_READ  2U
-
-#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
-#define TIOCSBRK	0x5427
-#define TIOCCBRK	0x5428
-#define TIOCGSID	0x5429
-#define TIOCGPTN	0x80045430
-#define TIOCSPTLCK	0x40045431
-#define TCGETX          0x5432
-#define TCSETX          0x5433
-#define TCSETXF         0x5434
-#define TCSETXW         0x5435
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458
-#define TIOCSERGETLSR   0x5459
-#define TIOCSERGETMULTI 0x545A
-#define TIOCSERSETMULTI 0x545B
-
-#define TIOCMIWAIT	0x545C
-#define TIOCGICOUNT	0x545D
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-#define FIOQSIZE	0x5460
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL           64
-
-#define TIOCSER_TEMT    0x01
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6
-#define N_6PACK         7
-#define N_MASC          8
-#define N_R3964         9
-#define N_PROFIBUS_FDL  10
-#define N_IRDA          11
-#define N_SMSBLOCK      12
-#define N_HDLC          13
-#define N_SYNC_PPP      14
-#define N_HCI           15
-
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906
-
-#define SIOCADDRT       0x890B
-#define SIOCDELRT       0x890C
-#define SIOCRTMSG       0x890D
-
-#define SIOCGIFNAME     0x8910
-#define SIOCSIFLINK     0x8911
-#define SIOCGIFCONF     0x8912
-#define SIOCGIFFLAGS    0x8913
-#define SIOCSIFFLAGS    0x8914
-#define SIOCGIFADDR     0x8915
-#define SIOCSIFADDR     0x8916
-#define SIOCGIFDSTADDR  0x8917
-#define SIOCSIFDSTADDR  0x8918
-#define SIOCGIFBRDADDR  0x8919
-#define SIOCSIFBRDADDR  0x891a
-#define SIOCGIFNETMASK  0x891b
-#define SIOCSIFNETMASK  0x891c
-#define SIOCGIFMETRIC   0x891d
-#define SIOCSIFMETRIC   0x891e
-#define SIOCGIFMEM      0x891f
-#define SIOCSIFMEM      0x8920
-#define SIOCGIFMTU      0x8921
-#define SIOCSIFMTU      0x8922
-#define SIOCSIFHWADDR   0x8924
-#define SIOCGIFENCAP    0x8925
-#define SIOCSIFENCAP    0x8926
-#define SIOCGIFHWADDR   0x8927
-#define SIOCGIFSLAVE    0x8929
-#define SIOCSIFSLAVE    0x8930
-#define SIOCADDMULTI    0x8931
-#define SIOCDELMULTI    0x8932
-#define SIOCGIFINDEX    0x8933
-#define SIOGIFINDEX     SIOCGIFINDEX
-#define SIOCSIFPFLAGS   0x8934
-#define SIOCGIFPFLAGS   0x8935
-#define SIOCDIFADDR     0x8936
-#define SIOCSIFHWBROADCAST 0x8937
-#define SIOCGIFCOUNT    0x8938
-
-#define SIOCGIFBR       0x8940
-#define SIOCSIFBR       0x8941
-
-#define SIOCGIFTXQLEN   0x8942
-#define SIOCSIFTXQLEN   0x8943
-
-#define SIOCDARP        0x8953
-#define SIOCGARP        0x8954
-#define SIOCSARP        0x8955
-
-#define SIOCDRARP       0x8960
-#define SIOCGRARP       0x8961
-#define SIOCSRARP       0x8962
-
-#define SIOCGIFMAP      0x8970
-#define SIOCSIFMAP      0x8971
-
-#define SIOCADDDLCI     0x8980
-#define SIOCDELDLCI     0x8981
-
-#define SIOCDEVPRIVATE  0x89F0
-#define SIOCPROTOPRIVATE 0x89E0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/ipc.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/ipc.h
deleted file mode 100644
index ac5d097981..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/ipc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-struct ipc_perm
-{
-	key_t __ipc_perm_key;
-	uid_t uid;
-	gid_t gid;
-	uid_t cuid;
-	gid_t cgid;
-	mode_t mode;
-	int __ipc_perm_seq;
-	long __pad1;
-	long __pad2;
-};
-
-#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/limits.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/limits.h
deleted file mode 100644
index 792a30b95b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/limits.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
-#define LONG_BIT 64
-#endif
-
-#define LONG_MAX  0x7fffffffffffffffL
-#define LLONG_MAX  0x7fffffffffffffffLL
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/mman.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/mman.h
deleted file mode 100644
index 846b7eaee8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/mman.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define	PROT_NONE      0
-#define	PROT_READ      1
-#define	PROT_WRITE     2
-#define	PROT_EXEC      4
-#define PROT_GROWSDOWN  0x01000000
-#define PROT_GROWSUP    0x02000000
-
-#define	MAP_SHARED     0x01
-#define	MAP_PRIVATE    0x02
-#define	MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/msg.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/msg.h
deleted file mode 100644
index badcf168ef..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/msg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-struct msqid_ds
-{
-	struct ipc_perm msg_perm;
-	time_t msg_stime;
-	time_t msg_rtime;
-	time_t msg_ctime;
-	unsigned long msg_cbytes;
-	msgqnum_t msg_qnum;
-	msglen_t msg_qbytes;
-	pid_t msg_lspid;
-	pid_t msg_lrpid;
-	unsigned long __unused[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/poll.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/poll.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/resource.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/resource.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/sem.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/sem.h
deleted file mode 100644
index c629b81ebb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/sem.h
+++ /dev/null
@@ -1,16 +0,0 @@
-struct semid_ds {
-	struct ipc_perm sem_perm;
-	time_t sem_otime;
-	time_t __unused1;
-	time_t sem_ctime;
-	time_t __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned short sem_nsems;
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-#else
-	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-	unsigned short sem_nsems;
-#endif
-	time_t __unused3;
-	time_t __unused4;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/shm.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/shm.h
deleted file mode 100644
index f4b8712618..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/shm.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#define SHMLBA 4096
-
-struct shmid_ds
-{
-	struct ipc_perm shm_perm;
-	size_t shm_segsz;
-	time_t shm_atime;
-	time_t shm_dtime;
-	time_t shm_ctime;
-	pid_t shm_cpid;
-	pid_t shm_lpid;
-	unsigned long shm_nattch;
-	unsigned long __pad1;
-	unsigned long __pad2;
-};
-
-struct shminfo {
-	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-};
-
-struct shm_info {
-	int __used_ids;
-	unsigned long shm_tot, shm_rss, shm_swp;
-	unsigned long __swap_attempts, __swap_successes;
-};
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/signal.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/signal.h
deleted file mode 100644
index e3c314175c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/signal.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MINSIGSTKSZ 2048
-#define SIGSTKSZ 8192
-#endif
-
-#ifdef _GNU_SOURCE
-#define REG_R8          0
-#define REG_R9          1
-#define REG_R10         2
-#define REG_R11         3
-#define REG_R12         4
-#define REG_R13         5
-#define REG_R14         6
-#define REG_R15         7
-#define REG_RDI         8
-#define REG_RSI         9
-#define REG_RBP         10
-#define REG_RBX         11
-#define REG_RDX         12
-#define REG_RAX         13
-#define REG_RCX         14
-#define REG_RSP         15
-#define REG_RIP         16
-#define REG_EFL         17
-#define REG_CSGSFS      18
-#define REG_ERR         19
-#define REG_TRAPNO      20
-#define REG_OLDMASK     21
-#define REG_CR2         22
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-typedef long long greg_t, gregset_t[23];
-typedef struct _fpstate {
-	unsigned short cwd, swd, ftw, fop;
-	unsigned long long rip, rdp;
-	unsigned mxcsr, mxcr_mask;
-	struct {
-		unsigned short significand[4], exponent, padding[3];
-	} _st[8];
-	struct {
-		unsigned element[4];
-	} _xmm[16];
-	unsigned padding[24];
-} *fpregset_t;
-struct sigcontext {
-	unsigned long r8, r9, r10, r11, r12, r13, r14, r15;
-	unsigned long rdi, rsi, rbp, rbx, rdx, rax, rcx, rsp, rip, eflags;
-	unsigned short cs, gs, fs, __pad0;
-	unsigned long err, trapno, oldmask, cr2;
-	struct _fpstate *fpstate;
-	unsigned long __reserved1[8];
-};
-typedef struct {
-	gregset_t gregs;
-	fpregset_t fpregs;
-	unsigned long long __reserved1[8];
-} mcontext_t;
-#else
-typedef struct {
-	unsigned long __space[32];
-} mcontext_t;
-#endif
-
-struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-};
-
-typedef struct __ucontext {
-	unsigned long uc_flags;
-	struct __ucontext *uc_link;
-	stack_t uc_stack;
-	mcontext_t uc_mcontext;
-	sigset_t uc_sigmask;
-	unsigned long __fpregs_mem[64];
-} ucontext_t;
-
-#define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  2
-#define SA_SIGINFO    4
-#define SA_ONSTACK    0x08000000
-#define SA_RESTART    0x10000000
-#define SA_NODEFER    0x40000000
-#define SA_RESETHAND  0x80000000
-#define SA_RESTORER   0x04000000
-
-#endif
-
-#define SIGHUP    1
-#define SIGINT    2
-#define SIGQUIT   3
-#define SIGILL    4
-#define SIGTRAP   5
-#define SIGABRT   6
-#define SIGIOT    SIGABRT
-#define SIGBUS    7
-#define SIGFPE    8
-#define SIGKILL   9
-#define SIGUSR1   10
-#define SIGSEGV   11
-#define SIGUSR2   12
-#define SIGPIPE   13
-#define SIGALRM   14
-#define SIGTERM   15
-#define SIGSTKFLT 16
-#define SIGCHLD   17
-#define SIGCONT   18
-#define SIGSTOP   19
-#define SIGTSTP   20
-#define SIGTTIN   21
-#define SIGTTOU   22
-#define SIGURG    23
-#define SIGXCPU   24
-#define SIGXFSZ   25
-#define SIGVTALRM 26
-#define SIGPROF   27
-#define SIGWINCH  28
-#define SIGIO     29
-#define SIGPOLL   29
-#define SIGPWR    30
-#define SIGSYS    31
-#define SIGUNUSED SIGSYS
-
-#define _NSIG 65
-
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/socket.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/socket.h
deleted file mode 100644
index a90c4cae9d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/socket.h
+++ /dev/null
@@ -1,18 +0,0 @@
-struct msghdr
-{
-	void *msg_name;
-	socklen_t msg_namelen;
-	struct iovec *msg_iov;
-	int msg_iovlen, __pad1;
-	void *msg_control;
-	socklen_t msg_controllen, __pad2;
-	int msg_flags;
-};
-
-struct cmsghdr
-{
-	socklen_t cmsg_len;
-	int __pad1;
-	int cmsg_level;
-	int cmsg_type;
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/statfs.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/statfs.h
deleted file mode 100644
index f103f4e4f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-struct statfs {
-	unsigned long f_type, f_bsize;
-	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-	fsfilcnt_t f_files, f_ffree;
-	fsid_t f_fsid;
-	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/stdarg.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/stdarg.h
deleted file mode 100644
index fde378146d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/stdarg.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/syscall.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/syscall.h
deleted file mode 100644
index 96ec51fa45..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/syscall.h
+++ /dev/null
@@ -1,651 +0,0 @@
-#define __NR_read				0
-#define __NR_write				1
-#define __NR_open				2
-#define __NR_close				3
-#define __NR_stat				4
-#define __NR_fstat				5
-#define __NR_lstat				6
-#define __NR_poll				7
-#define __NR_lseek				8
-#define __NR_mmap				9
-#define __NR_mprotect			10
-#define __NR_munmap				11
-#define __NR_brk				12
-#define __NR_rt_sigaction		13
-#define __NR_rt_sigprocmask		14
-#define __NR_rt_sigreturn		15
-#define __NR_ioctl				16
-#define __NR_pread64			17
-#define __NR_pwrite64			18
-#define __NR_readv				19
-#define __NR_writev				20
-#define __NR_access				21
-#define __NR_pipe				22
-#define __NR_select				23
-#define __NR_sched_yield		24
-#define __NR_mremap				25
-#define __NR_msync				26
-#define __NR_mincore			27
-#define __NR_madvise			28
-#define __NR_shmget				29
-#define __NR_shmat				30
-#define __NR_shmctl				31
-#define __NR_dup				32
-#define __NR_dup2				33
-#define __NR_pause				34
-#define __NR_nanosleep			35
-#define __NR_getitimer			36
-#define __NR_alarm				37
-#define __NR_setitimer			38
-#define __NR_getpid				39
-#define __NR_sendfile			40
-#define __NR_socket				41
-#define __NR_connect			42
-#define __NR_accept				43
-#define __NR_sendto				44
-#define __NR_recvfrom			45
-#define __NR_sendmsg			46
-#define __NR_recvmsg			47
-#define __NR_shutdown			48
-#define __NR_bind				49
-#define __NR_listen				50
-#define __NR_getsockname		51
-#define __NR_getpeername		52
-#define __NR_socketpair			53
-#define __NR_setsockopt			54
-#define __NR_getsockopt			55
-#define __NR_clone				56
-#define __NR_fork				57
-#define __NR_vfork				58
-#define __NR_execve				59
-#define __NR_exit				60
-#define __NR_wait4				61
-#define __NR_kill				62
-#define __NR_uname				63
-#define __NR_semget				64
-#define __NR_semop				65
-#define __NR_semctl				66
-#define __NR_shmdt				67
-#define __NR_msgget				68
-#define __NR_msgsnd				69
-#define __NR_msgrcv				70
-#define __NR_msgctl				71
-#define __NR_fcntl				72
-#define __NR_flock				73
-#define __NR_fsync				74
-#define __NR_fdatasync			75
-#define __NR_truncate			76
-#define __NR_ftruncate			77
-#define __NR_getdents			78
-#define __NR_getcwd				79
-#define __NR_chdir				80
-#define __NR_fchdir				81
-#define __NR_rename				82
-#define __NR_mkdir				83
-#define __NR_rmdir				84
-#define __NR_creat				85
-#define __NR_link				86
-#define __NR_unlink				87
-#define __NR_symlink			88
-#define __NR_readlink			89
-#define __NR_chmod				90
-#define __NR_fchmod				91
-#define __NR_chown				92
-#define __NR_fchown				93
-#define __NR_lchown				94
-#define __NR_umask				95
-#define __NR_gettimeofday		96
-#define __NR_getrlimit			97
-#define __NR_getrusage			98
-#define __NR_sysinfo			99
-#define __NR_times				100
-#define __NR_ptrace				101
-#define __NR_getuid				102
-#define __NR_syslog				103
-#define __NR_getgid				104
-#define __NR_setuid				105
-#define __NR_setgid				106
-#define __NR_geteuid			107
-#define __NR_getegid			108
-#define __NR_setpgid			109
-#define __NR_getppid			110
-#define __NR_getpgrp			111
-#define __NR_setsid				112
-#define __NR_setreuid			113
-#define __NR_setregid			114
-#define __NR_getgroups			115
-#define __NR_setgroups			116
-#define __NR_setresuid			117
-#define __NR_getresuid			118
-#define __NR_setresgid			119
-#define __NR_getresgid			120
-#define __NR_getpgid			121
-#define __NR_setfsuid			122
-#define __NR_setfsgid			123
-#define __NR_getsid				124
-#define __NR_capget				125
-#define __NR_capset				126
-#define __NR_rt_sigpending		127
-#define __NR_rt_sigtimedwait	128
-#define __NR_rt_sigqueueinfo	129
-#define __NR_rt_sigsuspend		130
-#define __NR_sigaltstack		131
-#define __NR_utime				132
-#define __NR_mknod				133
-#define __NR_uselib				134
-#define __NR_personality		135
-#define __NR_ustat				136
-#define __NR_statfs				137
-#define __NR_fstatfs			138
-#define __NR_sysfs				139
-#define __NR_getpriority			140
-#define __NR_setpriority			141
-#define __NR_sched_setparam			142
-#define __NR_sched_getparam			143
-#define __NR_sched_setscheduler		144
-#define __NR_sched_getscheduler		145
-#define __NR_sched_get_priority_max	146
-#define __NR_sched_get_priority_min	147
-#define __NR_sched_rr_get_interval	148
-#define __NR_mlock					149
-#define __NR_munlock				150
-#define __NR_mlockall				151
-#define __NR_munlockall				152
-#define __NR_vhangup				153
-#define __NR_modify_ldt				154
-#define __NR_pivot_root				155
-#define __NR__sysctl				156
-#define __NR_prctl					157
-#define __NR_arch_prctl				158
-#define __NR_adjtimex				159
-#define __NR_setrlimit				160
-#define __NR_chroot					161
-#define __NR_sync					162
-#define __NR_acct					163
-#define __NR_settimeofday			164
-#define __NR_mount					165
-#define __NR_umount2				166
-#define __NR_swapon					167
-#define __NR_swapoff				168
-#define __NR_reboot					169
-#define __NR_sethostname			170
-#define __NR_setdomainname			171
-#define __NR_iopl					172
-#define __NR_ioperm					173
-#define __NR_create_module			174
-#define __NR_init_module			175
-#define __NR_delete_module			176
-#define __NR_get_kernel_syms		177
-#define __NR_query_module			178
-#define __NR_quotactl				179
-#define __NR_nfsservctl				180
-#define __NR_getpmsg				181
-#define __NR_putpmsg				182
-#define __NR_afs_syscall			183
-#define __NR_tuxcall				184
-#define __NR_security				185
-#define __NR_gettid					186
-#define __NR_readahead				187
-#define __NR_setxattr				188
-#define __NR_lsetxattr				189
-#define __NR_fsetxattr				190
-#define __NR_getxattr				191
-#define __NR_lgetxattr				192
-#define __NR_fgetxattr				193
-#define __NR_listxattr				194
-#define __NR_llistxattr				195
-#define __NR_flistxattr				196
-#define __NR_removexattr			197
-#define __NR_lremovexattr			198
-#define __NR_fremovexattr			199
-#define __NR_tkill					200
-#define __NR_time					201
-#define __NR_futex					202
-#define __NR_sched_setaffinity		203
-#define __NR_sched_getaffinity		204
-#define __NR_set_thread_area		205
-#define __NR_io_setup				206
-#define __NR_io_destroy				207
-#define __NR_io_getevents			208
-#define __NR_io_submit				209
-#define __NR_io_cancel				210
-#define __NR_get_thread_area		211
-#define __NR_lookup_dcookie			212
-#define __NR_epoll_create			213
-#define __NR_epoll_ctl_old			214
-#define __NR_epoll_wait_old			215
-#define __NR_remap_file_pages		216
-#define __NR_getdents64				217
-#define __NR_set_tid_address		218
-#define __NR_restart_syscall		219
-#define __NR_semtimedop				220
-#define __NR_fadvise64				221
-#define __NR_timer_create			222
-#define __NR_timer_settime			223
-#define __NR_timer_gettime			224
-#define __NR_timer_getoverrun		225
-#define __NR_timer_delete			226
-#define __NR_clock_settime			227
-#define __NR_clock_gettime			228
-#define __NR_clock_getres			229
-#define __NR_clock_nanosleep		230
-#define __NR_exit_group				231
-#define __NR_epoll_wait				232
-#define __NR_epoll_ctl				233
-#define __NR_tgkill					234
-#define __NR_utimes					235
-#define __NR_vserver				236
-#define __NR_mbind					237
-#define __NR_set_mempolicy			238
-#define __NR_get_mempolicy			239
-#define __NR_mq_open				240
-#define __NR_mq_unlink				241
-#define __NR_mq_timedsend			242
-#define __NR_mq_timedreceive		243
-#define __NR_mq_notify				244
-#define __NR_mq_getsetattr			245
-#define __NR_kexec_load				246
-#define __NR_waitid					247
-#define __NR_add_key				248
-#define __NR_request_key			249
-#define __NR_keyctl					250
-#define __NR_ioprio_set				251
-#define __NR_ioprio_get				252
-#define __NR_inotify_init			253
-#define __NR_inotify_add_watch		254
-#define __NR_inotify_rm_watch		255
-#define __NR_migrate_pages			256
-#define __NR_openat					257
-#define __NR_mkdirat				258
-#define __NR_mknodat				259
-#define __NR_fchownat				260
-#define __NR_futimesat				261
-#define __NR_newfstatat				262
-#define __NR_unlinkat				263
-#define __NR_renameat				264
-#define __NR_linkat					265
-#define __NR_symlinkat				266
-#define __NR_readlinkat				267
-#define __NR_fchmodat				268
-#define __NR_faccessat				269
-#define __NR_pselect6				270
-#define __NR_ppoll					271
-#define __NR_unshare				272
-#define __NR_set_robust_list		273
-#define __NR_get_robust_list		274
-#define __NR_splice					275
-#define __NR_tee					276
-#define __NR_sync_file_range		277
-#define __NR_vmsplice				278
-#define __NR_move_pages				279
-#define __NR_utimensat				280
-#define __NR_epoll_pwait			281
-#define __NR_signalfd				282
-#define __NR_timerfd_create			283
-#define __NR_eventfd				284
-#define __NR_fallocate				285
-#define __NR_timerfd_settime		286
-#define __NR_timerfd_gettime		287
-#define __NR_accept4				288
-#define __NR_signalfd4				289
-#define __NR_eventfd2				290
-#define __NR_epoll_create1			291
-#define __NR_dup3					292
-#define __NR_pipe2					293
-#define __NR_inotify_init1			294
-#define __NR_preadv					295
-#define __NR_pwritev				296
-#define __NR_rt_tgsigqueueinfo		297
-#define __NR_perf_event_open		298
-#define __NR_recvmmsg				299
-#define __NR_fanotify_init			300
-#define __NR_fanotify_mark			301
-#define __NR_prlimit64				302
-#define __NR_name_to_handle_at			303
-#define __NR_open_by_handle_at			304
-#define __NR_clock_adjtime			305
-#define __NR_syncfs				306
-#define __NR_sendmmsg				307
-#define __NR_setns				308
-#define __NR_getcpu				309
-#define __NR_process_vm_readv			310
-#define __NR_process_vm_writev			311
-#define __NR_kcmp				312
-#define __NR_finit_module			313
-#define __NR_sched_setattr			314
-#define __NR_sched_getattr			315
-#define __NR_renameat2				316
-#define __NR_seccomp				317
-#define __NR_getrandom				318
-#define __NR_memfd_create			319
-#define __NR_kexec_file_load			320
-#define __NR_bpf				321
-#define __NR_execveat				322
-
-
-
-/* Repeat with SYS_ prefix */
-
-#define SYS_read				0
-#define SYS_write				1
-#define SYS_open				2
-#define SYS_close				3
-#define SYS_stat				4
-#define SYS_fstat				5
-#define SYS_lstat				6
-#define SYS_poll				7
-#define SYS_lseek				8
-#define SYS_mmap				9
-#define SYS_mprotect			10
-#define SYS_munmap				11
-#define SYS_brk				12
-#define SYS_rt_sigaction		13
-#define SYS_rt_sigprocmask		14
-#define SYS_rt_sigreturn		15
-#define SYS_ioctl				16
-#define SYS_pread64			17
-#define SYS_pwrite64			18
-#define SYS_readv				19
-#define SYS_writev				20
-#define SYS_access				21
-#define SYS_pipe				22
-#define SYS_select				23
-#define SYS_sched_yield		24
-#define SYS_mremap				25
-#define SYS_msync				26
-#define SYS_mincore			27
-#define SYS_madvise			28
-#define SYS_shmget				29
-#define SYS_shmat				30
-#define SYS_shmctl				31
-#define SYS_dup				32
-#define SYS_dup2				33
-#define SYS_pause				34
-#define SYS_nanosleep			35
-#define SYS_getitimer			36
-#define SYS_alarm				37
-#define SYS_setitimer			38
-#define SYS_getpid				39
-#define SYS_sendfile			40
-#define SYS_socket				41
-#define SYS_connect			42
-#define SYS_accept				43
-#define SYS_sendto				44
-#define SYS_recvfrom			45
-#define SYS_sendmsg			46
-#define SYS_recvmsg			47
-#define SYS_shutdown			48
-#define SYS_bind				49
-#define SYS_listen				50
-#define SYS_getsockname		51
-#define SYS_getpeername		52
-#define SYS_socketpair			53
-#define SYS_setsockopt			54
-#define SYS_getsockopt			55
-#define SYS_clone				56
-#define SYS_fork				57
-#define SYS_vfork				58
-#define SYS_execve				59
-#define SYS_exit				60
-#define SYS_wait4				61
-#define SYS_kill				62
-#define SYS_uname				63
-#define SYS_semget				64
-#define SYS_semop				65
-#define SYS_semctl				66
-#define SYS_shmdt				67
-#define SYS_msgget				68
-#define SYS_msgsnd				69
-#define SYS_msgrcv				70
-#define SYS_msgctl				71
-#define SYS_fcntl				72
-#define SYS_flock				73
-#define SYS_fsync				74
-#define SYS_fdatasync			75
-#define SYS_truncate			76
-#define SYS_ftruncate			77
-#define SYS_getdents			78
-#define SYS_getcwd				79
-#define SYS_chdir				80
-#define SYS_fchdir				81
-#define SYS_rename				82
-#define SYS_mkdir				83
-#define SYS_rmdir				84
-#define SYS_creat				85
-#define SYS_link				86
-#define SYS_unlink				87
-#define SYS_symlink			88
-#define SYS_readlink			89
-#define SYS_chmod				90
-#define SYS_fchmod				91
-#define SYS_chown				92
-#define SYS_fchown				93
-#define SYS_lchown				94
-#define SYS_umask				95
-#define SYS_gettimeofday		96
-#define SYS_getrlimit			97
-#define SYS_getrusage			98
-#define SYS_sysinfo			99
-#define SYS_times				100
-#define SYS_ptrace				101
-#define SYS_getuid				102
-#define SYS_syslog				103
-#define SYS_getgid				104
-#define SYS_setuid				105
-#define SYS_setgid				106
-#define SYS_geteuid			107
-#define SYS_getegid			108
-#define SYS_setpgid			109
-#define SYS_getppid			110
-#define SYS_getpgrp			111
-#define SYS_setsid				112
-#define SYS_setreuid			113
-#define SYS_setregid			114
-#define SYS_getgroups			115
-#define SYS_setgroups			116
-#define SYS_setresuid			117
-#define SYS_getresuid			118
-#define SYS_setresgid			119
-#define SYS_getresgid			120
-#define SYS_getpgid			121
-#define SYS_setfsuid			122
-#define SYS_setfsgid			123
-#define SYS_getsid				124
-#define SYS_capget				125
-#define SYS_capset				126
-#define SYS_rt_sigpending		127
-#define SYS_rt_sigtimedwait	128
-#define SYS_rt_sigqueueinfo	129
-#define SYS_rt_sigsuspend		130
-#define SYS_sigaltstack		131
-#define SYS_utime				132
-#define SYS_mknod				133
-#define SYS_uselib				134
-#define SYS_personality		135
-#define SYS_ustat				136
-#define SYS_statfs				137
-#define SYS_fstatfs			138
-#define SYS_sysfs				139
-#define SYS_getpriority			140
-#define SYS_setpriority			141
-#define SYS_sched_setparam			142
-#define SYS_sched_getparam			143
-#define SYS_sched_setscheduler		144
-#define SYS_sched_getscheduler		145
-#define SYS_sched_get_priority_max	146
-#define SYS_sched_get_priority_min	147
-#define SYS_sched_rr_get_interval	148
-#define SYS_mlock					149
-#define SYS_munlock				150
-#define SYS_mlockall				151
-#define SYS_munlockall				152
-#define SYS_vhangup				153
-#define SYS_modify_ldt				154
-#define SYS_pivot_root				155
-#define SYS__sysctl				156
-#define SYS_prctl					157
-#define SYS_arch_prctl				158
-#define SYS_adjtimex				159
-#define SYS_setrlimit				160
-#define SYS_chroot					161
-#define SYS_sync					162
-#define SYS_acct					163
-#define SYS_settimeofday			164
-#define SYS_mount					165
-#define SYS_umount2				166
-#define SYS_swapon					167
-#define SYS_swapoff				168
-#define SYS_reboot					169
-#define SYS_sethostname			170
-#define SYS_setdomainname			171
-#define SYS_iopl					172
-#define SYS_ioperm					173
-#define SYS_create_module			174
-#define SYS_init_module			175
-#define SYS_delete_module			176
-#define SYS_get_kernel_syms		177
-#define SYS_query_module			178
-#define SYS_quotactl				179
-#define SYS_nfsservctl				180
-#define SYS_getpmsg				181
-#define SYS_putpmsg				182
-#define SYS_afs_syscall			183
-#define SYS_tuxcall				184
-#define SYS_security				185
-#define SYS_gettid					186
-#define SYS_readahead				187
-#define SYS_setxattr				188
-#define SYS_lsetxattr				189
-#define SYS_fsetxattr				190
-#define SYS_getxattr				191
-#define SYS_lgetxattr				192
-#define SYS_fgetxattr				193
-#define SYS_listxattr				194
-#define SYS_llistxattr				195
-#define SYS_flistxattr				196
-#define SYS_removexattr			197
-#define SYS_lremovexattr			198
-#define SYS_fremovexattr			199
-#define SYS_tkill					200
-#define SYS_time					201
-#define SYS_futex					202
-#define SYS_sched_setaffinity		203
-#define SYS_sched_getaffinity		204
-#define SYS_set_thread_area		205
-#define SYS_io_setup				206
-#define SYS_io_destroy				207
-#define SYS_io_getevents			208
-#define SYS_io_submit				209
-#define SYS_io_cancel				210
-#define SYS_get_thread_area		211
-#define SYS_lookup_dcookie			212
-#define SYS_epoll_create			213
-#define SYS_epoll_ctl_old			214
-#define SYS_epoll_wait_old			215
-#define SYS_remap_file_pages		216
-#define SYS_getdents64				217
-#define SYS_set_tid_address		218
-#define SYS_restart_syscall		219
-#define SYS_semtimedop				220
-#define SYS_fadvise64				221
-#define SYS_timer_create			222
-#define SYS_timer_settime			223
-#define SYS_timer_gettime			224
-#define SYS_timer_getoverrun		225
-#define SYS_timer_delete			226
-#define SYS_clock_settime			227
-#define SYS_clock_gettime			228
-#define SYS_clock_getres			229
-#define SYS_clock_nanosleep		230
-#define SYS_exit_group				231
-#define SYS_epoll_wait				232
-#define SYS_epoll_ctl				233
-#define SYS_tgkill					234
-#define SYS_utimes					235
-#define SYS_vserver				236
-#define SYS_mbind					237
-#define SYS_set_mempolicy			238
-#define SYS_get_mempolicy			239
-#define SYS_mq_open				240
-#define SYS_mq_unlink				241
-#define SYS_mq_timedsend			242
-#define SYS_mq_timedreceive		243
-#define SYS_mq_notify				244
-#define SYS_mq_getsetattr			245
-#define SYS_kexec_load				246
-#define SYS_waitid					247
-#define SYS_add_key				248
-#define SYS_request_key			249
-#define SYS_keyctl					250
-#define SYS_ioprio_set				251
-#define SYS_ioprio_get				252
-#define SYS_inotify_init			253
-#define SYS_inotify_add_watch		254
-#define SYS_inotify_rm_watch		255
-#define SYS_migrate_pages			256
-#define SYS_openat					257
-#define SYS_mkdirat				258
-#define SYS_mknodat				259
-#define SYS_fchownat				260
-#define SYS_futimesat				261
-#define SYS_newfstatat				262
-#define SYS_unlinkat				263
-#define SYS_renameat				264
-#define SYS_linkat					265
-#define SYS_symlinkat				266
-#define SYS_readlinkat				267
-#define SYS_fchmodat				268
-#define SYS_faccessat				269
-#define SYS_pselect6				270
-#define SYS_ppoll					271
-#define SYS_unshare				272
-#define SYS_set_robust_list		273
-#define SYS_get_robust_list		274
-#define SYS_splice					275
-#define SYS_tee					276
-#define SYS_sync_file_range		277
-#define SYS_vmsplice				278
-#define SYS_move_pages				279
-#define SYS_utimensat				280
-#define SYS_epoll_pwait			281
-#define SYS_signalfd				282
-#define SYS_timerfd_create			283
-#define SYS_eventfd				284
-#define SYS_fallocate				285
-#define SYS_timerfd_settime		286
-#define SYS_timerfd_gettime		287
-#define SYS_accept4				288
-#define SYS_signalfd4				289
-#define SYS_eventfd2				290
-#define SYS_epoll_create1			291
-#define SYS_dup3					292
-#define SYS_pipe2					293
-#define SYS_inotify_init1			294
-#define SYS_preadv					295
-#define SYS_pwritev				296
-#define SYS_rt_tgsigqueueinfo		297
-#define SYS_perf_event_open		298
-#define SYS_recvmmsg				299
-#define SYS_fanotify_init			300
-#define SYS_fanotify_mark			301
-#define SYS_prlimit64				302
-#define SYS_name_to_handle_at			303
-#define SYS_open_by_handle_at			304
-#define SYS_clock_adjtime			305
-#define SYS_syncfs				306
-#define SYS_sendmmsg				307
-#define SYS_setns				308
-#define SYS_getcpu				309
-#define SYS_process_vm_readv			310
-#define SYS_process_vm_writev			311
-#define SYS_kcmp				312
-#define SYS_finit_module			313
-#define SYS_sched_setattr			314
-#define SYS_sched_getattr			315
-#define SYS_renameat2				316
-#define SYS_seccomp				317
-#define SYS_getrandom				318
-#define SYS_memfd_create			319
-#define SYS_kexec_file_load			320
-#define SYS_bpf					321
-#define SYS_execveat				322
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/termios.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/termios.h
deleted file mode 100644
index f0d81b138f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/termios.h
+++ /dev/null
@@ -1,160 +0,0 @@
-struct termios
-{
-	tcflag_t c_iflag;
-	tcflag_t c_oflag;
-	tcflag_t c_cflag;
-	tcflag_t c_lflag;
-	cc_t c_line;
-	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
-};
-
-#define VINTR     0
-#define VQUIT     1
-#define VERASE    2
-#define VKILL     3
-#define VEOF      4
-#define VTIME     5
-#define VMIN      6
-#define VSWTC     7
-#define VSTART    8
-#define VSTOP     9
-#define VSUSP    10
-#define VEOL     11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE  14
-#define VLNEXT   15
-#define VEOL2    16
-
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-#define OPOST  0000001
-#define OLCUC  0000002
-#define ONLCR  0000004
-#define OCRNL  0000010
-#define ONOCR  0000020
-#define ONLRET 0000040
-#define OFILL  0000100
-#define OFDEL  0000200
-#define NLDLY  0000400
-#define NL0    0000000
-#define NL1    0000400
-#define CRDLY  0003000
-#define CR0    0000000
-#define CR1    0001000
-#define CR2    0002000
-#define CR3    0003000
-#define TABDLY 0014000
-#define TAB0   0000000
-#define TAB1   0004000
-#define TAB2   0010000
-#define TAB3   0014000
-#define BSDLY  0020000
-#define BS0    0000000
-#define BS1    0020000
-#define FFDLY  0100000
-#define FF0    0000000
-#define FF1    0100000
-
-#define VTDLY  0040000
-#define VT0    0000000
-#define VT1    0040000
-
-#define B0       0000000
-#define B50      0000001
-#define B75      0000002
-#define B110     0000003
-#define B134     0000004
-#define B150     0000005
-#define B200     0000006
-#define B300     0000007
-#define B600     0000010
-#define B1200    0000011
-#define B1800    0000012
-#define B2400    0000013
-#define B4800    0000014
-#define B9600    0000015
-#define B19200   0000016
-#define B38400   0000017
-
-#define B57600   0010001
-#define B115200  0010002
-#define B230400  0010003
-#define B460800  0010004
-#define B500000  0010005
-#define B576000  0010006
-#define B921600  0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-
-#define CBAUD    0010017
-
-#define CSIZE  0000060
-#define CS5    0000000
-#define CS6    0000020
-#define CS7    0000040
-#define CS8    0000060
-#define CSTOPB 0000100
-#define CREAD  0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL  0002000
-#define CLOCAL 0004000
-
-#define ISIG   0000001
-#define ICANON 0000002
-#define ECHO   0000010
-#define ECHOE  0000020
-#define ECHOK  0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define IEXTEN 0100000
-
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
-#define TCOOFF 0
-#define TCOON  1
-#define TCIOFF 2
-#define TCION  3
-
-#define TCIFLUSH  0
-#define TCOFLUSH  1
-#define TCIOFLUSH 2
-
-#define TCSANOW   0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define CBAUDEX 0010000
-#define CRTSCTS  020000000000
-#define EXTPROC 0200000
-#define XTABS  0014000
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/user.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/user.h
deleted file mode 100644
index 1bd2d709e1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/user.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#undef __WORDSIZE
-#define __WORDSIZE 64
-
-typedef struct user_fpregs_struct
-{
-	uint16_t cwd, swd, ftw, fop;
-	uint64_t rip, rdp;
-	uint32_t mxcsr, mxcr_mask;
-	uint32_t st_space[32], xmm_space[64], padding[24];
-} elf_fpregset_t;
-
-struct user_regs_struct
-{
-	unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
-	unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
-	unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
-};
-#define ELF_NGREG 27
-typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
-
-struct user
-{
-	struct user_regs_struct		regs;
-	int				u_fpvalid;
-	struct user_fpregs_struct	i387;
-	unsigned long			u_tsize;
-	unsigned long			u_dsize;
-	unsigned long			u_ssize;
-	unsigned long			start_code;
-	unsigned long			start_stack;
-	long				signal;
-	int				reserved;
-	struct user_regs_struct		*u_ar0;
-	struct user_fpregs_struct	*u_fpstate;
-	unsigned long			magic;
-	char				u_comm[32];
-	unsigned long			u_debugreg[8];
-};
-
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
-#define UPAGES			1
-#define HOST_TEXT_START_ADDR	(u.start_code)
-#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/pthread_arch.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/pthread_arch.h
deleted file mode 100644
index 29e4590c16..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/pthread_arch.h
+++ /dev/null
@@ -1,10 +0,0 @@
-static inline struct pthread *__pthread_self()
-{
-	struct pthread *self;
-	__asm__ __volatile__ ("mov %%fs:0,%0" : "=r" (self) );
-	return self;
-}
-
-#define TP_ADJ(p) (p)
-
-#define CANCEL_REG_IP 16
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/reloc.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/reloc.h
deleted file mode 100644
index 84c075c37e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/reloc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#define LDSO_ARCH "x86_64"
-
-#define REL_SYMBOLIC    R_X86_64_64
-#define REL_OFFSET32    R_X86_64_PC32
-#define REL_GOT         R_X86_64_GLOB_DAT
-#define REL_PLT         R_X86_64_JUMP_SLOT
-#define REL_RELATIVE    R_X86_64_RELATIVE
-#define REL_COPY        R_X86_64_COPY
-#define REL_DTPMOD      R_X86_64_DTPMOD64
-#define REL_DTPOFF      R_X86_64_DTPOFF64
-#define REL_TPOFF       R_X86_64_TPOFF64
-#define REL_TLSDESC     R_X86_64_TLSDESC
-
-#define CRTJMP(pc,sp) __asm__ __volatile__( \
-	"mov %1,%%rsp ; jmp *%0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/syscall_arch.h b/src/components/lib/libc/musl-1.1.11/arch/x86_64/syscall_arch.h
deleted file mode 100644
index a7a7b5a65b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/arch/x86_64/syscall_arch.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#define __SYSCALL_LL_E(x) (x)
-#define __SYSCALL_LL_O(x) (x)
-
-static __inline long __syscall0(long n)
-{
-	unsigned long ret;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall1(long n, long a1)
-{
-	unsigned long ret;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall2(long n, long a1, long a2)
-{
-	unsigned long ret;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2)
-						  : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall3(long n, long a1, long a2, long a3)
-{
-	unsigned long ret;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-						  "d"(a3) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall4(long n, long a1, long a2, long a3, long a4)
-{
-	unsigned long ret;
-	register long r10 __asm__("r10") = a4;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-						  "d"(a3), "r"(r10): "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5)
-{
-	unsigned long ret;
-	register long r10 __asm__("r10") = a4;
-	register long r8 __asm__("r8") = a5;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-						  "d"(a3), "r"(r10), "r"(r8) : "rcx", "r11", "memory");
-	return ret;
-}
-
-static __inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6)
-{
-	unsigned long ret;
-	register long r10 __asm__("r10") = a4;
-	register long r8 __asm__("r8") = a5;
-	register long r9 __asm__("r9") = a6;
-	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-						  "d"(a3), "r"(r10), "r"(r8), "r"(r9) : "rcx", "r11", "memory");
-	return ret;
-}
-
-#define VDSO_USEFUL
-#define VDSO_CGT_SYM "__vdso_clock_gettime"
-#define VDSO_CGT_VER "LINUX_2.6"
diff --git a/src/components/lib/libc/musl-1.1.11/configure b/src/components/lib/libc/musl-1.1.11/configure
deleted file mode 100755
index 7f7034cc3a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/configure
+++ /dev/null
@@ -1,633 +0,0 @@
-#!/bin/sh
-
-usage () {
-cat <<EOF
-Usage: $0 [OPTION]... [VAR=VALUE]... [TARGET]
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Installation directories:
-  --prefix=PREFIX         main installation prefix [/usr/local/musl]
-  --exec-prefix=EPREFIX   installation prefix for executable files [PREFIX]
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --libdir=DIR            library files for the linker [PREFIX/lib]
-  --includedir=DIR        include files for the C compiler [PREFIX/include]
-  --syslibdir=DIR         location for the dynamic linker [/lib]
-
-System types:
-  --target=TARGET         configure to run on target TARGET [detected]
-  --host=HOST             same as --target
-
-Optional features:
-  --enable-optimize=...   optimize listed components for speed over size [auto]
-  --enable-debug          build with debugging information [disabled]
-  --enable-warnings       build with recommended warnings flags [disabled]
-  --enable-visibility     use global visibility options to optimize PIC [auto]
-  --enable-wrapper=...    build given musl toolchain wrapper [auto]
-  --disable-shared        inhibit building shared library [enabled]
-  --disable-static        inhibit building static library [enabled]
-
-Some influential environment variables:
-  CC                      C compiler command [detected]
-  CFLAGS                  C compiler flags [-Os -pipe ...]
-  CROSS_COMPILE           prefix for cross compiler and tools [none]
-  LIBCC                   compiler runtime library [detected]
-
-Use these variables to override the choices made by configure.
-
-EOF
-exit 0
-}
-
-# Helper functions
-
-quote () {
-tr '\n' ' ' <<EOF | grep '^[-[:alnum:]_=,./:]* $' >/dev/null 2>&1 && { echo "$1" ; return 0 ; }
-$1
-EOF
-printf %s\\n "$1" | sed -e "s/'/'\\\\''/g" -e "1s/^/'/" -e "\$s/\$/'/" -e "s#^'\([-[:alnum:]_,./:]*\)=\(.*\)\$#\1='\2#"
-}
-echo () { printf "%s\n" "$*" ; }
-fail () { echo "$*" ; exit 1 ; }
-fnmatch () { eval "case \"\$2\" in $1) return 0 ;; *) return 1 ;; esac" ; }
-cmdexists () { type "$1" >/dev/null 2>&1 ; }
-trycc () { test -z "$CC" && cmdexists "$1" && CC=$1 ; }
-
-stripdir () {
-while eval "fnmatch '*/' \"\${$1}\"" ; do eval "$1=\${$1%/}" ; done
-}
-
-trycppif () {
-printf "checking preprocessor condition %s... " "$1"
-echo "typedef int x;" > "$tmpc"
-echo "#if $1" >> "$tmpc"
-echo "#error yes" >> "$tmpc"
-echo "#endif" >> "$tmpc"
-if $CC $2 -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-printf "false\n"
-return 1
-else
-printf "true\n"
-return 0
-fi
-}
-
-tryflag () {
-printf "checking whether compiler accepts %s... " "$2"
-echo "typedef int x;" > "$tmpc"
-if $CC $CFLAGS_TRY $2 -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-printf "yes\n"
-eval "$1=\"\${$1} \$2\""
-eval "$1=\${$1# }"
-return 0
-else
-printf "no\n"
-return 1
-fi
-}
-
-tryldflag () {
-printf "checking whether linker accepts %s... " "$2"
-echo "typedef int x;" > "$tmpc"
-if $CC $LDFLAGS_TRY -nostdlib -shared "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-printf "yes\n"
-eval "$1=\"\${$1} \$2\""
-eval "$1=\${$1# }"
-return 0
-else
-printf "no\n"
-return 1
-fi
-}
-
-
-
-# Beginning of actual script
-
-CFLAGS_C99FSE=
-CFLAGS_AUTO=
-CFLAGS_MEMOPS=
-CFLAGS_NOSSP=
-CFLAGS_TRY=
-LDFLAGS_AUTO=
-LDFLAGS_TRY=
-OPTIMIZE_GLOBS=
-prefix=$(pwd)
-exec_prefix='$(prefix)'
-bindir='$(exec_prefix)/bin'
-libdir='$(prefix)/lib'
-includedir='$(prefix)/include'
-syslibdir='/lib'
-tools=
-tool_libs=
-target=
-optimize=auto
-debug=no
-warnings=no
-visibility=auto
-shared=auto
-static=yes
-wrapper=auto
-gcc_wrapper=no
-clang_wrapper=no
-
-for arg ; do
-case "$arg" in
---help) usage ;;
---prefix=*) prefix=${arg#*=} ;;
---exec-prefix=*) exec_prefix=${arg#*=} ;;
---bindir=*) bindir=${arg#*=} ;;
---libdir=*) libdir=${arg#*=} ;;
---includedir=*) includedir=${arg#*=} ;;
---syslibdir=*) syslibdir=${arg#*=} ;;
---enable-shared|--enable-shared=yes) shared=yes ;;
---disable-shared|--enable-shared=no) shared=no ;;
---enable-static|--enable-static=yes) static=yes ;;
---disable-static|--enable-static=no) static=no ;;
---enable-optimize) optimize=yes ;;
---enable-optimize=*) optimize=${arg#*=} ;;
---disable-optimize) optimize=no ;;
---enable-debug|--enable-debug=yes) debug=yes ;;
---disable-debug|--enable-debug=no) debug=no ;;
---enable-warnings|--enable-warnings=yes) warnings=yes ;;
---disable-warnings|--enable-warnings=no) warnings=no ;;
---enable-visibility|--enable-visibility=yes) visibility=yes ;;
---disable-visibility|--enable-visibility=no) visibility=no ;;
---enable-wrapper|--enable-wrapper=yes) wrapper=detect ;;
---enable-wrapper=all) wrapper=yes ; gcc_wrapper=yes ; clang_wrapper=yes ;;
---enable-wrapper=gcc) wrapper=yes ; gcc_wrapper=yes ;;
---enable-wrapper=clang) wrapper=yes ; clang_wrapper=yes ;;
---disable-wrapper|--enable-wrapper=no) wrapper=no ;;
---enable-gcc-wrapper|--enable-gcc-wrapper=yes) wrapper=yes ; gcc_wrapper=yes ;;
---disable-gcc-wrapper|--enable-gcc-wrapper=no) wrapper=no ;;
---enable-*|--disable-*|--with-*|--without-*|--*dir=*|--build=*) ;;
---host=*|--target=*) target=${arg#*=} ;;
--* ) echo "$0: unknown option $arg" ;;
-CC=*) CC=${arg#*=} ;;
-CFLAGS=*) CFLAGS=${arg#*=} ;;
-CPPFLAGS=*) CPPFLAGS=${arg#*=} ;;
-LDFLAGS=*) LDFLAGS=${arg#*=} ;;
-CROSS_COMPILE=*) CROSS_COMPILE=${arg#*=} ;;
-LIBCC=*) LIBCC=${arg#*=} ;;
-*=*) ;;
-*) target=$arg ;;
-esac
-done
-
-for i in prefix exec_prefix bindir libdir includedir syslibdir ; do
-stripdir $i
-done
-
-#
-# Get a temp filename we can use
-#
-i=0
-set -C
-while : ; do i=$(($i+1))
-tmpc="./conf$$-$PPID-$i.c"
-2>|/dev/null > "$tmpc" && break
-test "$i" -gt 50 && fail "$0: cannot create temporary file $tmpc"
-done
-set +C
-trap 'rm "$tmpc"' EXIT INT QUIT TERM HUP
-
-#
-# Find a C compiler to use
-#
-printf "checking for C compiler... "
-trycc ${CROSS_COMPILE}gcc
-trycc ${CROSS_COMPILE}c99
-trycc ${CROSS_COMPILE}cc
-printf "%s\n" "$CC"
-test -n "$CC" || { echo "$0: cannot find a C compiler" ; exit 1 ; }
-
-printf "checking whether C compiler works... "
-echo "typedef int x;" > "$tmpc"
-if output=$($CC $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" 2>&1) ; then
-printf "yes\n"
-else
-printf "no; compiler output follows:\n%s\n" "$output"
-exit 1
-fi
-
-#
-# Figure out options to force errors on unknown flags.
-#
-tryflag   CFLAGS_TRY  -Werror=unknown-warning-option
-tryflag   CFLAGS_TRY  -Werror=unused-command-line-argument
-tryldflag LDFLAGS_TRY -Werror=unknown-warning-option
-tryldflag LDFLAGS_TRY -Werror=unused-command-line-argument
-
-#
-# Need to know if the compiler is gcc or clang to decide which toolchain
-# wrappers to build.
-#
-printf "checking for C compiler family... "
-cc_ver="$(LC_ALL=C $CC -v 2>&1)"
-cc_family=unknown
-if fnmatch '*gcc\ version*' "$cc_ver" ; then
-cc_family=gcc
-elif fnmatch '*clang\ version*' "$cc_ver" ; then
-cc_family=clang
-fi
-echo "$cc_family"
-
-#
-# Figure out toolchain wrapper to build
-#
-if test "$wrapper" = auto -o "$wrapper" = detect ; then
-echo "#include <stdlib.h>" > "$tmpc"
-echo "#if ! __GLIBC__" >> "$tmpc"
-echo "#error no" >> "$tmpc"
-echo "#endif" >> "$tmpc"
-printf "checking for toolchain wrapper to build... "
-if test "$wrapper" = auto && ! $CC -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-echo "none"
-elif test "$cc_family" = gcc ; then
-gcc_wrapper=yes
-echo "gcc"
-elif test "$cc_family" = clang ; then
-clang_wrapper=yes
-echo "clang"
-else
-echo "none"
-if test "$wrapper" = detect ; then
-fail "$0: could not find an appropriate toolchain wrapper"
-fi
-fi
-fi
-
-if test "$gcc_wrapper" = yes ; then
-tools="$tools tools/musl-gcc"
-tool_libs="$tool_libs lib/musl-gcc.specs"
-fi
-if test "$clang_wrapper" = yes ; then
-tools="$tools tools/musl-clang tools/ld.musl-clang"
-fi
-
-#
-# Find the target architecture
-#
-printf "checking target system type... "
-test -n "$target" || target=$($CC -dumpmachine 2>/dev/null) || target=unknown
-printf "%s\n" "$target"
-
-#
-# Convert to just ARCH
-#
-case "$target" in
-# Catch these early to simplify matching for 32-bit archs
-mips64*|powerpc64*) fail "$0: unsupported target \"$target\"" ;;
-arm*) ARCH=arm ;;
-aarch64*) ARCH=aarch64 ;;
-i?86*) ARCH=i386 ;;
-x86_64-x32*|x32*|x86_64*x32) ARCH=x32 ;;
-x86_64*) ARCH=x86_64 ;;
-mips*) ARCH=mips ;;
-microblaze*) ARCH=microblaze ;;
-or1k*) ARCH=or1k ;;
-powerpc*) ARCH=powerpc ;;
-sh[1-9bel-]*|sh|superh*) ARCH=sh ;;
-unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;;
-*) fail "$0: unknown or unsupported target \"$target\"" ;;
-esac
-
-#
-# Try to get a conforming C99 freestanding environment
-#
-tryflag CFLAGS_C99FSE -std=c99
-tryflag CFLAGS_C99FSE -nostdinc
-tryflag CFLAGS_C99FSE -ffreestanding \
-|| tryflag CFLAGS_C99FSE -fno-builtin
-tryflag CFLAGS_C99FSE -fexcess-precision=standard \
-|| { test "$ARCH" = i386 && tryflag CFLAGS_C99FSE -ffloat-store ; }
-tryflag CFLAGS_C99FSE -frounding-math
-
-#
-# We may use the may_alias attribute if __GNUC__ is defined, so
-# if the compiler defines __GNUC__ but does not provide it,
-# it must be defined away as part of the CFLAGS.
-#
-printf "checking whether compiler needs attribute((may_alias)) suppression... "
-cat > "$tmpc" <<EOF
-typedef int
-#ifdef __GNUC__
-__attribute__((__may_alias__))
-#endif
-x;
-EOF
-if $CC $CFLAGS_C99FSE -I./arch/$ARCH -I./include $CPPFLAGS $CFLAGS \
-  -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-printf "no\n"
-else
-printf "yes\n"
-CFLAGS_C99FSE="$CFLAGS_C99FSE -D__may_alias__="
-fi
-
-#
-# Check for options to disable stack protector, which needs to be
-# disabled for a few early-bootstrap translation units. If not found,
-# this is not an error; we assume the toolchain does not do ssp.
-#
-tryflag CFLAGS_NOSSP -fno-stack-protector
-
-#
-# Check for options that may be needed to prevent the compiler from
-# generating self-referential versions of memcpy,, memmove, memcmp,
-# and memset. Really, we should add a check to determine if this
-# option is sufficient, and if not, add a macro to cripple these
-# functions with volatile...
-#
-tryflag CFLAGS_MEMOPS -fno-tree-loop-distribute-patterns
-
-#
-# Enable debugging if requessted.
-#
-test "$debug" = yes && CFLAGS_AUTO=-g
-
-#
-# Preprocess asm files to add extra debugging information if debug is
-# enabled, our assembler supports the needed directives, and the
-# preprocessing script has been written for our architecture.
-#
-printf "checking whether we should preprocess assembly to add debugging information... "
-if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" &&
-   test -f "tools/add-cfi.$ARCH.awk" &&
-   printf ".file 1 \"srcfile.s\"\n.line 1\n.cfi_startproc\n.cfi_endproc" | $CC -g -x assembler -c -o /dev/null 2>/dev/null -
-then
-  ADD_CFI=yes
-else
-  ADD_CFI=no
-fi
-printf "%s\n" "$ADD_CFI"
-
-#
-# Possibly add a -O option to CFLAGS and select modules to optimize with
-# -O3 based on the status of --enable-optimize and provided CFLAGS.
-#
-printf "checking for optimization settings... "
-case "x$optimize" in
-xauto)
-if fnmatch '-O*|*\ -O*' "$CFLAGS_AUTO $CFLAGS" ; then
-printf "using provided CFLAGS\n" ;optimize=no
-else
-printf "using defaults\n" ; optimize=yes
-fi
-;;
-xsize|xnone) printf "minimize size\n" ; optimize=size ;;
-xno|x) printf "disabled\n" ; optimize=no ;;
-*) printf "custom\n" ;;
-esac
-
-test "$optimize" = no || tryflag CFLAGS_AUTO -Os || tryflag CFLAGS_AUTO -O2
-test "$optimize" = yes && optimize="internal,malloc,string"
-
-if fnmatch 'no|size' "$optimize" ; then :
-else
-printf "components to be optimized for speed:"
-while test "$optimize" ; do
-case "$optimize" in
-*,*) this=${optimize%%,*} optimize=${optimize#*,} ;;
-*) this=$optimize optimize=
-esac
-printf " $this"
-case "$this" in
-*/*.c) ;;
-*/*) this=$this*.c ;;
-*) this=$this/*.c ;;
-esac
-OPTIMIZE_GLOBS="$OPTIMIZE_GLOBS $this"
-done
-OPTIMIZE_GLOBS=${OPTIMIZE_GLOBS# }
-printf "\n"
-fi
-
-# Always try -pipe
-tryflag CFLAGS_AUTO -pipe
-
-#
-# If debugging is disabled, omit frame pointer. Modern GCC does this
-# anyway on most archs even when debugging is enabled since the frame
-# pointer is no longer needed for debugging.
-#
-if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" ; then :
-else 
-tryflag CFLAGS_AUTO -fomit-frame-pointer
-fi
-
-#
-# Modern GCC wants to put DWARF tables (used for debugging and
-# unwinding) in the loaded part of the program where they are
-# unstrippable. These options force them back to debug sections (and
-# cause them not to get generated at all if debugging is off).
-#
-tryflag CFLAGS_AUTO -fno-unwind-tables
-tryflag CFLAGS_AUTO -fno-asynchronous-unwind-tables
-
-#
-# The GNU toolchain defaults to assuming unmarked files need an
-# executable stack, potentially exposing vulnerabilities in programs
-# linked with such object files. Fix this.
-#
-tryflag CFLAGS_AUTO -Wa,--noexecstack
-
-#
-# On x86, make sure we don't have incompatible instruction set
-# extensions enabled by default. This is bad for making static binaries.
-# We cheat and use i486 rather than i386 because i386 really does not
-# work anyway (issues with atomic ops).
-# Some build environments pass -march and -mtune options via CC, so
-# check both CC and CFLAGS.
-#
-if test "$ARCH" = "i386" ; then
-fnmatch '-march=*|*\ -march=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -march=i486
-fnmatch '-mtune=*|*\ -mtune=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -mtune=generic
-fi
-
-#
-# Even with -std=c99, gcc accepts some constructs which are constraint
-# violations. We want to treat these as errors regardless of whether
-# other purely stylistic warnings are enabled -- especially implicit
-# function declarations, which are a dangerous programming error.
-#
-tryflag CFLAGS_AUTO -Werror=implicit-function-declaration
-tryflag CFLAGS_AUTO -Werror=implicit-int
-tryflag CFLAGS_AUTO -Werror=pointer-sign
-tryflag CFLAGS_AUTO -Werror=pointer-arith
-
-if test "x$warnings" = xyes ; then
-tryflag CFLAGS_AUTO -Wall
-tryflag CFLAGS_AUTO -Wno-parentheses
-tryflag CFLAGS_AUTO -Wno-uninitialized
-tryflag CFLAGS_AUTO -Wno-missing-braces
-tryflag CFLAGS_AUTO -Wno-unused-value
-tryflag CFLAGS_AUTO -Wno-unused-but-set-variable
-tryflag CFLAGS_AUTO -Wno-unknown-pragmas
-tryflag CFLAGS_AUTO -Wno-pointer-to-int-cast
-fi
-
-if test "x$visibility" = xauto ; then
-# This test checks toolchain support for several things:
-# - the -include option
-# - the attributes/pragmas used in vis.h
-# - linking code that takes the address of protected symbols
-printf "checking whether global visibility preinclude works... "
-echo 'int (*fp)(void);' > "$tmpc"
-echo 'int foo(void) { }' >> "$tmpc"
-echo 'int bar(void) { fp = foo; return foo(); }' >> "$tmpc"
-if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS \
-  -DSHARED -fPIC -I./src/internal -include vis.h \
-  -nostdlib -shared -Wl,-Bsymbolic-functions \
-  -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-visibility=yes
-else
-visibility=no
-fi
-printf "%s\n" "$visibility"
-fi
-
-if test "x$visibility" = xyes ; then
-CFLAGS_AUTO="$CFLAGS_AUTO -include vis.h"
-CFLAGS_AUTO="${CFLAGS_AUTO# }"
-fi
-
-# Some patched GCC builds have these defaults messed up...
-tryldflag LDFLAGS_AUTO -Wl,--hash-style=both
-
-test "$shared" = "no" || {
-# Disable dynamic linking if ld is broken and can't do -Bsymbolic-functions
-LDFLAGS_DUMMY=
-tryldflag LDFLAGS_DUMMY -Wl,-Bsymbolic-functions || {
-test "$shared" = "yes" && fail "$0: error: linker cannot build shared library"
-printf "warning: disabling dynamic linking support\n"
-shared=no
-}
-}
-
-# Find compiler runtime library
-test -z "$LIBCC" && tryldflag LIBCC -lgcc && tryldflag LIBCC -lgcc_eh
-test -z "$LIBCC" && tryldflag LIBCC -lcompiler_rt
-test -z "$LIBCC" && try_libcc=`$CC -print-file-name=libpcc.a 2>/dev/null` \
-                 && tryldflag LIBCC "$try_libcc"
-printf "using compiler runtime libraries: %s\n" "$LIBCC"
-
-# Figure out arch variants for archs with variants
-SUBARCH=
-t="$CFLAGS_C99FSE $CPPFLAGS $CFLAGS"
-
-if test "$ARCH" = "x86_64" ; then
-trycppif __ILP32__ "$t" && ARCH=x32
-fi
-
-if test "$ARCH" = "arm" ; then
-trycppif __ARMEB__ "$t" && SUBARCH=${SUBARCH}eb
-trycppif __ARM_PCS_VFP "$t" && SUBARCH=${SUBARCH}hf
-fi
-
-if test "$ARCH" = "aarch64" ; then
-trycppif __AARCH64EB__ "$t" && SUBARCH=${SUBARCH}_be
-fi
-
-if test "$ARCH" = "mips" ; then
-trycppif "_MIPSEL || __MIPSEL || __MIPSEL__" "$t" && SUBARCH=${SUBARCH}el
-trycppif __mips_soft_float "$t" && SUBARCH=${SUBARCH}-sf
-fi
-
-test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \
-&& SUBARCH=${SUBARCH}el
-
-if test "$ARCH" = "sh" ; then
-trycppif __BIG_ENDIAN__ "$t" && SUBARCH=${SUBARCH}eb
-if trycppif "__SH_FPU_ANY__ || __SH4__" "$t" ; then
-# Some sh configurations are broken and replace double with float
-# rather than using softfloat when the fpu is present but only
-# supports single precision. Reject them.
-printf "checking whether compiler's double type is IEEE double... "
-echo 'typedef char dblcheck[(int)sizeof(double)-5];' > "$tmpc"
-if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-printf "yes\n"
-else
-printf "no\n"
-fail "$0: error: compiler's floating point configuration is unsupported"
-fi
-else
-SUBARCH=${SUBARCH}-nofpu
-fi
-fi
-
-test "$SUBARCH" \
-&& printf "configured for %s variant: %s\n" "$ARCH" "$ARCH$SUBARCH"
-
-case "$ARCH$SUBARCH" in
-arm) ASMSUBARCH=el ;;
-*) ASMSUBARCH=$SUBARCH ;;
-esac
-
-#
-# Some archs (powerpc) have different possible long double formats
-# that the compiler can be configured for. The logic for whether this
-# is supported is in bits/float.h; in general, it is not. We need to
-# check for mismatches here or code in printf, strotd, and scanf will
-# be dangerously incorrect because it depends on (1) the macros being
-# correct, and (2) IEEE semantics.
-#
-printf "checking whether compiler's long double definition matches float.h... "
-echo '#include <float.h>' > "$tmpc"
-echo '#if LDBL_MANT_DIG == 53' >> "$tmpc"
-echo 'typedef char ldcheck[9-(int)sizeof(long double)];' >> "$tmpc"
-echo '#endif' >> "$tmpc"
-if $CC $CFLAGS_C99FSE -I./arch/$ARCH -I./include $CPPFLAGS $CFLAGS \
-  -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
-printf "yes\n"
-else
-printf "no\n"
-fail "$0: error: unsupported long double type"
-fi
-
-printf "creating config.mak... "
-
-cmdline=$(quote "$0")
-for i ; do cmdline="$cmdline $(quote "$i")" ; done
-
-exec 3>&1 1>config.mak
-
-
-cat << EOF
-# This version of config.mak was generated by:
-# $cmdline
-# Any changes made here will be lost if configure is re-run
-ARCH = $ARCH
-SUBARCH = $SUBARCH
-ASMSUBARCH = $ASMSUBARCH
-prefix = $prefix
-exec_prefix = $exec_prefix
-bindir = $bindir
-libdir = $libdir
-includedir = $includedir
-syslibdir = $syslibdir
-CC = $CC
-CFLAGS = $CFLAGS_AUTO $CFLAGS
-CFLAGS_C99FSE = $CFLAGS_C99FSE
-CFLAGS_MEMOPS = $CFLAGS_MEMOPS
-CFLAGS_NOSSP = $CFLAGS_NOSSP
-CPPFLAGS = $CPPFLAGS
-LDFLAGS = $LDFLAGS_AUTO $LDFLAGS
-CROSS_COMPILE = $CROSS_COMPILE
-LIBCC = $LIBCC
-OPTIMIZE_GLOBS = $OPTIMIZE_GLOBS
-ALL_TOOLS = $tools
-TOOL_LIBS = $tool_libs
-ADD_CFI = $ADD_CFI
-EOF
-test "x$static" = xno && echo "STATIC_LIBS ="
-test "x$shared" = xno && echo "SHARED_LIBS ="
-test "x$cc_family" = xgcc && echo 'WRAPCC_GCC = $(CC)'
-test "x$cc_family" = xclang && echo 'WRAPCC_CLANG = $(CC)'
-exec 1>&3 3>&-
-
-printf "done\n"
diff --git a/src/components/lib/libc/musl-1.1.11/crt/arm/Scrt1.s b/src/components/lib/libc/musl-1.1.11/crt/arm/Scrt1.s
deleted file mode 100644
index a54859aa47..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/arm/Scrt1.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.weak _init
-.weak _fini
-.global _start
-_start:
-	mov fp,#0
-	mov lr,#0
-
-	ldr a2,[sp],#4
-	mov a3,sp
-	str fp,[sp,#-4]!
-	str a1,[sp,#-4]!
-
-	adr ip,2f
-	ldr a4,2f+4
-	add a4,a4,ip
-	str a4,[sp,#-4]!
-	ldr a4,2f+8
-	add a4,a4,ip
-
-	ldr a1,2f
-	add ip,ip,a1
-	ldr a1,2f+12
-	ldr a1,[ip,a1]
-
-	bl __libc_start_main(PLT)
-1:	b 1b
-2:	.word _GLOBAL_OFFSET_TABLE_-2b
-	.word _fini-2b
-	.word _init-2b
-	.word main(GOT)
diff --git a/src/components/lib/libc/musl-1.1.11/crt/arm/crt1.s b/src/components/lib/libc/musl-1.1.11/crt/arm/crt1.s
deleted file mode 100644
index 90ef59f3bd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/arm/crt1.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.weak _init
-.weak _fini
-.global _start
-.type _start,%function
-_start:
-	mov fp,#0
-	mov lr,#0
-	ldr a2,[sp],#4
-	mov a3,sp
-	ldr a4,=_fini
-	str fp,[sp,#-4]!
-	str a1,[sp,#-4]!
-	str a4,[sp,#-4]!
-	ldr a4,=_init
-	ldr a1,=main
-	bl __libc_start_main
-1:	b 1b
diff --git a/src/components/lib/libc/musl-1.1.11/crt/arm/crti.s b/src/components/lib/libc/musl-1.1.11/crt/arm/crti.s
deleted file mode 100644
index 1ba165c5c5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/arm/crti.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.section .init
-.global _init
-.type _init,%function
-_init:
-	push {r0,lr}
-
-.section .fini
-.global _fini
-.type _fini,%function
-_fini:
-	push {r0,lr}
diff --git a/src/components/lib/libc/musl-1.1.11/crt/arm/crtn.s b/src/components/lib/libc/musl-1.1.11/crt/arm/crtn.s
deleted file mode 100644
index 1b626c0a12..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/arm/crtn.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.section .init
-	pop {r0,lr}
-	tst lr,#1
-	moveq pc,lr
-	bx lr
-
-.section .fini
-	pop {r0,lr}
-	tst lr,#1
-	moveq pc,lr
-	bx lr
diff --git a/src/components/lib/libc/musl-1.1.11/crt/crt1.c b/src/components/lib/libc/musl-1.1.11/crt/crt1.c
deleted file mode 100644
index af02af945b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/crt1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <features.h>
-
-#define START "_start"
-
-#include "crt_arch.h"
-
-int main();
-void _init() __attribute__((weak));
-void _fini() __attribute__((weak));
-_Noreturn int __libc_start_main(int (*)(), int, char **,
-	void (*)(), void(*)(), void(*)());
-
-void _start_c(long *p)
-{
-	int argc = p[0];
-	char **argv = (void *)(p+1);
-	__libc_start_main(main, argc, argv, _init, _fini, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/crt/i386/Scrt1.s b/src/components/lib/libc/musl-1.1.11/crt/i386/Scrt1.s
deleted file mode 100644
index 161ee8e8d7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/i386/Scrt1.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.weak _init
-.weak _fini
-.text
-.global _start
-_start:
-	xor %ebp,%ebp
-	pop %ecx
-	mov %esp,%eax
-	and $-16,%esp
-	push %esp
-	push %esp
-	push %edx
-	call 1f
-1:	addl $_GLOBAL_OFFSET_TABLE_,(%esp)
-	pop %ebx
-	call 1f
-1:	addl $[_fini-.],(%esp)
-	call 1f
-1:	addl $[_init-.],(%esp)
-	push %eax
-	push %ecx
-	push main@GOT(%ebx)
-	call __libc_start_main@plt
-1:	jmp 1b
diff --git a/src/components/lib/libc/musl-1.1.11/crt/i386/crt1.s b/src/components/lib/libc/musl-1.1.11/crt/i386/crt1.s
deleted file mode 100644
index f5b4f4fd61..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/i386/crt1.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.weak _init
-.weak _fini
-.text
-.global _start
-_start:
-	xor %ebp,%ebp
-	pop %ecx
-	mov %esp,%eax
-	and $-16,%esp
-	push %esp
-	push %esp
-	push %edx
-	push $_fini
-	push $_init
-	push %eax
-	push %ecx
-	push $main
-	call __libc_start_main
-1:	jmp 1b
diff --git a/src/components/lib/libc/musl-1.1.11/crt/microblaze/crt1.s b/src/components/lib/libc/musl-1.1.11/crt/microblaze/crt1.s
deleted file mode 100644
index 33090bba40..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/microblaze/crt1.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.weak  _init
-.weak  _fini
-.global _start
-.align  2
-_start:
-	add     r19, r0, r0             # Zero the frame pointer.
-	ori     r5, r0, main            # Get main() ...
-	lw      r6, r0, r1              # Get argc...
-	addi    r7, r1, 4               # ... and argv ...
-	ori     r8, r0, _init           # and _init() ...
-	ori     r9, r0, _fini           # and _fini() ...
-	add     r10, r0, r0             # ldso_fini == NULL
-	andi    r1, r1, -8              # align stack
-	addik   r1, r1, -4*6            # Leave space for the args.
-	bri     __libc_start_main       # Let's go!
-	nop                             # Never gets here.
diff --git a/src/components/lib/libc/musl-1.1.11/crt/mips/crt1.s b/src/components/lib/libc/musl-1.1.11/crt/mips/crt1.s
deleted file mode 100644
index 794b6f7117..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/mips/crt1.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noreorder
-
-.weak  _init
-.weak  _fini
-.global __start
-.global _start
-.type __start,@function
-.type _start,@function
-__start:
-_start:
-	subu    $fp, $fp, $fp            # Zero the frame pointer.
-	lui     $gp, %hi(_gp)
-	addi    $gp, %lo(_gp)
-	#la      $gp, _gp
-	lw      $4, %call16(main)($gp)   # Get main() ...
-	lw      $5, ($sp)                # Get argc...
-	addu    $6, $sp, 4               # and argv ...
-	lw      $7, %call16(_init)($gp)  # and _init() ...
-	and     $sp, $sp, -8             # Align the stack pointer to 8 bytes
-	addi    $sp, $sp, -4*6           # Leave space for arguments 0..3, arg4, and arg5.
-	lw      $12, %call16(_fini)($gp) # and _fini() ...
-	sw      $12, 4*4($sp)            # Save arg4.
-	sw      $0, 4*5($sp)             # ldso_fini == NULL
-	lw      $25, %call16(__libc_start_main)($gp)
-	jalr    $25                      # Let's go!
-	nop
-	b       .                        # Never gets here.
-	nop
diff --git a/src/components/lib/libc/musl-1.1.11/crt/powerpc/crt1.s b/src/components/lib/libc/musl-1.1.11/crt/powerpc/crt1.s
deleted file mode 100644
index 7025430c39..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/powerpc/crt1.s
+++ /dev/null
@@ -1,26 +0,0 @@
-        .weak  _init
-        .weak  _fini
-        .global _start
-        .type   _start, %function
-_start:
-        mr      9, 1                  # Save the original stack pointer.
-        clrrwi  1, 1, 4               # Align the stack to 16 bytes.
-        lis     13, _SDA_BASE_@ha      # r13 points to the small data area.
-        addi    13, 13, _SDA_BASE_@l  
-        li      0, 0                   # Zero the frame pointer.
-        stwu    1, -16(1)             # The initial stack frame.
-        mtlr    0                      # Clear the link register.
-        stw     0, 0(1)               # And save it.
-        lis     3, main@ha             # Get main() ...
-        addi    3, 3, main@l
-        lwz     4, 0(9)               # and argc...
-        addi    5, 9, 4               # and argv ...
-        lis     6, _init@ha            # and _init() ...
-        addi    6, 6, _init@l
-        lis     7, _fini@ha            # and _fini() ...
-        addi    7, 7, _fini@l
-        li      8, 0                   # ldso_fini == NULL
-        bl       __libc_start_main      # Let's go!
-        b       .                       # Never gets here.
-        .end    _start
-        .size   _start, .-_start
diff --git a/src/components/lib/libc/musl-1.1.11/crt/rcrt1.c b/src/components/lib/libc/musl-1.1.11/crt/rcrt1.c
deleted file mode 100644
index 5ac612dbb2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/rcrt1.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#define SHARED
-#define START "_start"
-#define _dlstart_c _start_c
-#include "../src/ldso/dlstart.c"
-
-int main();
-void _init() __attribute__((weak));
-void _fini() __attribute__((weak));
-_Noreturn int __libc_start_main(int (*)(), int, char **,
-	void (*)(), void(*)(), void(*)());
-
-_Noreturn void __dls2(unsigned char *base, size_t *sp)
-{
-	__libc_start_main(main, *sp, (void *)(sp+1), _init, _fini, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/crt/sh/crti.s b/src/components/lib/libc/musl-1.1.11/crt/sh/crti.s
deleted file mode 100644
index 0410ab6395..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/sh/crti.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.section .init
-.global  _init
-.type    _init, @function
-_init:
-	sts.l pr, @-r15
-	nop
-
-.section .fini
-.global  _fini
-.type    _fini, @function
-_fini:
-	sts.l pr, @-r15
-	nop
diff --git a/src/components/lib/libc/musl-1.1.11/crt/sh/crtn.s b/src/components/lib/libc/musl-1.1.11/crt/sh/crtn.s
deleted file mode 100644
index dde633b0da..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/sh/crtn.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.section .init
-	lds.l @r15+, pr
-	rts
-	 nop
-
-.section .fini
-	lds.l @r15+, pr
-	rts
-	 nop
diff --git a/src/components/lib/libc/musl-1.1.11/crt/x86_64/Scrt1.s b/src/components/lib/libc/musl-1.1.11/crt/x86_64/Scrt1.s
deleted file mode 100644
index ba34e95ed2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/x86_64/Scrt1.s
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Written 2011 Nicholas J. Kain, released as Public Domain */
-.weak _init
-.weak _fini
-.text
-.global _start
-_start:
-	xor %rbp,%rbp   /* rbp:undefined -> mark as zero 0 (ABI) */
-	mov %rdx,%r9    /* 6th arg: ptr to register with atexit() */
-	pop %rsi        /* 2nd arg: argc */
-	mov %rsp,%rdx   /* 3rd arg: argv */
-	andq $-16,%rsp  /* align stack pointer */
-	lea _fini(%rip),%r8           /* 5th arg: fini/dtors function */
-	lea _init(%rip),%rcx          /* 4th arg: init/ctors function */
-	mov main@GOTPCREL(%rip),%rdi  /* 1st arg: application entry ip */
-	call __libc_start_main@PLT    /* musl init will run the program */
-1:	jmp 1b
diff --git a/src/components/lib/libc/musl-1.1.11/crt/x86_64/crt1.s b/src/components/lib/libc/musl-1.1.11/crt/x86_64/crt1.s
deleted file mode 100644
index 40de3bed2e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/crt/x86_64/crt1.s
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Written 2011 Nicholas J. Kain, released as Public Domain */
-.weak _init
-.weak _fini
-.text
-.global _start
-_start:
-	xor %rbp,%rbp   /* rbp:undefined -> mark as zero 0 (ABI) */
-	mov %rdx,%r9    /* 6th arg: ptr to register with atexit() */
-	pop %rsi        /* 2nd arg: argc */
-	mov %rsp,%rdx   /* 3rd arg: argv */
-	andq $-16,%rsp  /* align stack pointer */
-	mov $_fini,%r8  /* 5th arg: fini/dtors function */
-	mov $_init,%rcx /* 4th arg: init/ctors function */
-	mov $main,%rdi  /* 1st arg: application entry ip */
-	call __libc_start_main /* musl init will run the program */
-1:	jmp 1b
diff --git a/src/components/lib/libc/musl-1.1.11/include/alltypes.h.in b/src/components/lib/libc/musl-1.1.11/include/alltypes.h.in
deleted file mode 100644
index 6a9c105fb6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/alltypes.h.in
+++ /dev/null
@@ -1,75 +0,0 @@
-TYPEDEF unsigned _Addr size_t;
-TYPEDEF unsigned _Addr uintptr_t;
-TYPEDEF _Addr ptrdiff_t;
-TYPEDEF _Addr ssize_t;
-TYPEDEF _Addr intptr_t;
-TYPEDEF _Addr regoff_t;
-TYPEDEF _Reg register_t;
-
-TYPEDEF signed char     int8_t;
-TYPEDEF short           int16_t;
-TYPEDEF int             int32_t;
-TYPEDEF _Int64          int64_t;
-TYPEDEF _Int64          intmax_t;
-TYPEDEF unsigned char   uint8_t;
-TYPEDEF unsigned short  uint16_t;
-TYPEDEF unsigned int    uint32_t;
-TYPEDEF unsigned _Int64 uint64_t;
-TYPEDEF unsigned _Int64 u_int64_t;
-TYPEDEF unsigned _Int64 uintmax_t;
-
-TYPEDEF unsigned mode_t;
-TYPEDEF unsigned _Reg nlink_t;
-TYPEDEF _Int64 off_t;
-TYPEDEF unsigned _Int64 ino_t;
-TYPEDEF unsigned _Int64 dev_t;
-TYPEDEF long blksize_t;
-TYPEDEF _Int64 blkcnt_t;
-TYPEDEF unsigned _Int64 fsblkcnt_t;
-TYPEDEF unsigned _Int64 fsfilcnt_t;
-
-TYPEDEF unsigned wint_t;
-TYPEDEF unsigned long wctype_t;
-
-TYPEDEF void * timer_t;
-TYPEDEF int clockid_t;
-TYPEDEF long clock_t;
-STRUCT timeval { time_t tv_sec; suseconds_t tv_usec; };
-STRUCT timespec { time_t tv_sec; long tv_nsec; };
-
-TYPEDEF int pid_t;
-TYPEDEF unsigned id_t;
-TYPEDEF unsigned uid_t;
-TYPEDEF unsigned gid_t;
-TYPEDEF int key_t;
-TYPEDEF unsigned useconds_t;
-
-#ifdef __cplusplus
-TYPEDEF unsigned long pthread_t;
-#else
-TYPEDEF struct __pthread * pthread_t;
-#endif
-TYPEDEF int pthread_once_t;
-TYPEDEF unsigned pthread_key_t;
-TYPEDEF int pthread_spinlock_t;
-TYPEDEF struct { unsigned __attr; } pthread_mutexattr_t;
-TYPEDEF struct { unsigned __attr; } pthread_condattr_t;
-TYPEDEF struct { unsigned __attr; } pthread_barrierattr_t;
-TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t;
-
-TYPEDEF struct _IO_FILE FILE;
-
-TYPEDEF struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
-
-TYPEDEF struct __locale_struct * locale_t;
-
-TYPEDEF struct __sigset_t { unsigned long __bits[128/sizeof(long)]; } sigset_t;
-
-STRUCT iovec { void *iov_base; size_t iov_len; };
-
-TYPEDEF unsigned socklen_t;
-TYPEDEF unsigned short sa_family_t;
-
-#undef _Addr
-#undef _Int64
-#undef _Reg
diff --git a/src/components/lib/libc/musl-1.1.11/include/assert.h b/src/components/lib/libc/musl-1.1.11/include/assert.h
deleted file mode 100644
index 1ee02a4a5f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/assert.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <features.h>
-
-#undef assert
-
-#ifdef NDEBUG
-#define	assert(x) (void)0
-#else
-#define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))
-#endif
-
-#ifndef __cplusplus
-#define static_assert _Static_assert
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void __assert_fail (const char *, const char *, int, const char *);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/dirent.h b/src/components/lib/libc/musl-1.1.11/include/dirent.h
deleted file mode 100644
index 5aa8510bfd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/dirent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef	_DIRENT_H
-#define	_DIRENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_ino_t
-#define __NEED_off_t
-#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-#define __NEED_size_t
-#endif
-
-#include <bits/alltypes.h>
-
-typedef struct __dirstream DIR;
-
-struct dirent
-{
-	ino_t d_ino;
-	off_t d_off;
-	unsigned short d_reclen;
-	unsigned char d_type;
-	char d_name[256];
-};
-
-#define d_fileno d_ino
-
-int            closedir(DIR *);
-DIR           *fdopendir(int);
-DIR           *opendir(const char *);
-struct dirent *readdir(DIR *);
-int            readdir_r(DIR *__restrict, struct dirent *__restrict, struct dirent **__restrict);
-void           rewinddir(DIR *);
-void           seekdir(DIR *, long);
-long           telldir(DIR *);
-int            dirfd(DIR *);
-
-int alphasort(const struct dirent **, const struct dirent **);
-int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define DT_UNKNOWN 0
-#define DT_FIFO 1
-#define DT_CHR 2
-#define DT_DIR 4
-#define DT_BLK 6
-#define DT_REG 8
-#define DT_LNK 10
-#define DT_SOCK 12
-#define DT_WHT 14
-#define IFTODT(x) ((x)>>12 & 017)
-#define DTTOIF(x) ((x)<<12)
-int getdents(int, struct dirent *, size_t);
-#endif
-
-#ifdef _GNU_SOURCE
-int versionsort(const struct dirent **, const struct dirent **);
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define dirent64 dirent
-#define readdir64 readdir
-#define readdir64_r readdir_r
-#define scandir64 scandir
-#define alphasort64 alphasort
-#define versionsort64 versionsort
-#define off64_t off_t
-#define ino64_t ino_t
-#define getdents64 getdents
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/endian.h b/src/components/lib/libc/musl-1.1.11/include/endian.h
deleted file mode 100644
index 1bd444518a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/endian.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef _ENDIAN_H
-#define _ENDIAN_H
-
-#include <features.h>
-
-#define __LITTLE_ENDIAN 1234
-#define __BIG_ENDIAN 4321
-#define __PDP_ENDIAN 3412
-
-#if defined(__GNUC__) && defined(__BYTE_ORDER__)
-#define __BYTE_ORDER __BYTE_ORDER__
-#else
-#include <bits/endian.h>
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#define BIG_ENDIAN __BIG_ENDIAN
-#define LITTLE_ENDIAN __LITTLE_ENDIAN
-#define PDP_ENDIAN __PDP_ENDIAN
-#define BYTE_ORDER __BYTE_ORDER
-
-#include <stdint.h>
-
-static __inline uint16_t __bswap16(uint16_t __x)
-{
-	return __x<<8 | __x>>8;
-}
-
-static __inline uint32_t __bswap32(uint32_t __x)
-{
-	return __x>>24 | __x>>8&0xff00 | __x<<8&0xff0000 | __x<<24;
-}
-
-static __inline uint64_t __bswap64(uint64_t __x)
-{
-	return __bswap32(__x)+0ULL<<32 | __bswap32(__x>>32);
-}
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define htobe16(x) __bswap16(x)
-#define be16toh(x) __bswap16(x)
-#define betoh16(x) __bswap16(x)
-#define htobe32(x) __bswap32(x)
-#define be32toh(x) __bswap32(x)
-#define betoh32(x) __bswap32(x)
-#define htobe64(x) __bswap64(x)
-#define be64toh(x) __bswap64(x)
-#define betoh64(x) __bswap64(x)
-#define htole16(x) (uint16_t)(x)
-#define le16toh(x) (uint16_t)(x)
-#define letoh16(x) (uint16_t)(x)
-#define htole32(x) (uint32_t)(x)
-#define le32toh(x) (uint32_t)(x)
-#define letoh32(x) (uint32_t)(x)
-#define htole64(x) (uint64_t)(x)
-#define le64toh(x) (uint64_t)(x)
-#define letoh64(x) (uint64_t)(x)
-#else
-#define htobe16(x) (uint16_t)(x)
-#define be16toh(x) (uint16_t)(x)
-#define betoh16(x) (uint16_t)(x)
-#define htobe32(x) (uint32_t)(x)
-#define be32toh(x) (uint32_t)(x)
-#define betoh32(x) (uint32_t)(x)
-#define htobe64(x) (uint64_t)(x)
-#define be64toh(x) (uint64_t)(x)
-#define betoh64(x) (uint64_t)(x)
-#define htole16(x) __bswap16(x)
-#define le16toh(x) __bswap16(x)
-#define letoh16(x) __bswap16(x)
-#define htole32(x) __bswap32(x)
-#define le32toh(x) __bswap32(x)
-#define letoh32(x) __bswap32(x)
-#define htole64(x) __bswap64(x)
-#define le64toh(x) __bswap64(x)
-#define letoh64(x) __bswap64(x)
-#endif
-
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/fcntl.h b/src/components/lib/libc/musl-1.1.11/include/fcntl.h
deleted file mode 100644
index ebd5c30491..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/fcntl.h
+++ /dev/null
@@ -1,188 +0,0 @@
-#ifndef	_FCNTL_H
-#define	_FCNTL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_off_t
-#define __NEED_pid_t
-#define __NEED_mode_t
-
-#ifdef _GNU_SOURCE
-#define __NEED_size_t
-#define __NEED_ssize_t
-#define __NEED_struct_iovec
-#endif
-
-#include <bits/alltypes.h>
-
-#include <bits/fcntl.h>
-
-struct flock
-{
-	short l_type;
-	short l_whence;
-	off_t l_start;
-	off_t l_len;
-	pid_t l_pid;
-};
-
-int creat(const char *, mode_t);
-int fcntl(int, int, ...);
-int open(const char *, int, ...);
-int openat(int, const char *, int, ...);
-int posix_fadvise(int, off_t, off_t, int);
-int posix_fallocate(int, off_t, off_t);
-
-#define O_SEARCH  O_PATH
-#define O_EXEC    O_PATH
-
-#define O_ACCMODE (03|O_SEARCH)
-#define O_RDONLY  00
-#define O_WRONLY  01
-#define O_RDWR    02
-
-#define F_OFD_GETLK 36
-#define F_OFD_SETLK 37
-#define F_OFD_SETLKW 38
-
-#define F_DUPFD_CLOEXEC 1030
-
-#define F_RDLCK 0
-#define F_WRLCK 1
-#define F_UNLCK 2
-
-#define FD_CLOEXEC 1
-
-#define AT_FDCWD (-100)
-#define AT_SYMLINK_NOFOLLOW 0x100
-#define AT_REMOVEDIR 0x200
-#define AT_SYMLINK_FOLLOW 0x400
-#define AT_EACCESS 0x200
-
-#define POSIX_FADV_NORMAL     0
-#define POSIX_FADV_RANDOM     1
-#define POSIX_FADV_SEQUENTIAL 2
-#define POSIX_FADV_WILLNEED   3
-#define POSIX_FADV_DONTNEED   4
-#define POSIX_FADV_NOREUSE    5
-
-#undef SEEK_SET
-#undef SEEK_CUR
-#undef SEEK_END
-#define SEEK_SET 0
-#define SEEK_CUR 1
-#define SEEK_END 2
-
-#ifndef S_IRUSR
-#define S_ISUID 04000
-#define S_ISGID 02000
-#define S_ISVTX 01000
-#define S_IRUSR 0400
-#define S_IWUSR 0200
-#define S_IXUSR 0100
-#define S_IRWXU 0700
-#define S_IRGRP 0040
-#define S_IWGRP 0020
-#define S_IXGRP 0010
-#define S_IRWXG 0070
-#define S_IROTH 0004
-#define S_IWOTH 0002
-#define S_IXOTH 0001
-#define S_IRWXO 0007
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define AT_NO_AUTOMOUNT 0x800
-#define AT_EMPTY_PATH 0x1000
-
-#define FAPPEND O_APPEND
-#define FFSYNC O_FSYNC
-#define FASYNC O_ASYNC
-#define FNONBLOCK O_NONBLOCK
-#define FNDELAY O_NDELAY
-
-#define F_OK 0
-#define R_OK 4
-#define W_OK 2
-#define X_OK 1
-#define F_ULOCK 0
-#define F_LOCK  1
-#define F_TLOCK 2
-#define F_TEST  3
-
-#define F_SETLEASE	1024
-#define F_GETLEASE	1025
-#define F_NOTIFY	1026
-#define F_CANCELLK	1029
-#define F_SETPIPE_SZ	1031
-#define F_GETPIPE_SZ	1032
-#define F_ADD_SEALS	1033
-#define F_GET_SEALS	1034
-
-#define F_SEAL_SEAL	0x0001
-#define F_SEAL_SHRINK	0x0002
-#define F_SEAL_GROW	0x0004
-#define F_SEAL_WRITE	0x0008
-
-#define DN_ACCESS	0x00000001
-#define DN_MODIFY	0x00000002
-#define DN_CREATE	0x00000004
-#define DN_DELETE	0x00000008
-#define DN_RENAME	0x00000010
-#define DN_ATTRIB	0x00000020
-#define DN_MULTISHOT	0x80000000
-
-int lockf(int, int, off_t);
-#endif
-
-#if defined(_GNU_SOURCE)
-#define F_OWNER_TID 0
-#define F_OWNER_PID 1
-#define F_OWNER_PGRP 2
-#define F_OWNER_GID 2
-struct f_owner_ex {
-	int type;
-	pid_t pid;
-};
-#define FALLOC_FL_KEEP_SIZE 1
-#define FALLOC_FL_PUNCH_HOLE 2
-#define SYNC_FILE_RANGE_WAIT_BEFORE 1
-#define SYNC_FILE_RANGE_WRITE 2
-#define SYNC_FILE_RANGE_WAIT_AFTER 4
-#define SPLICE_F_MOVE 1
-#define SPLICE_F_NONBLOCK 2
-#define SPLICE_F_MORE 4
-#define SPLICE_F_GIFT 8
-int fallocate(int, int, off_t, off_t);
-#define fallocate64 fallocate
-ssize_t readahead(int, off_t, size_t);
-int sync_file_range(int, off_t, off_t, unsigned);
-ssize_t vmsplice(int, const struct iovec *, size_t, unsigned);
-ssize_t splice(int, off_t *, int, off_t *, size_t, unsigned);
-ssize_t tee(int, int, size_t, unsigned);
-#define loff_t off_t
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define F_GETLK64 F_GETLK
-#define F_SETLK64 F_SETLK
-#define F_SETLKW64 F_SETLKW
-#define flock64 flock
-#define open64 open
-#define openat64 openat
-#define creat64 creat
-#define lockf64 lockf
-#define posix_fadvise64 posix_fadvise
-#define posix_fallocate64 posix_fallocate
-#define off64_t off_t
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/features.h b/src/components/lib/libc/musl-1.1.11/include/features.h
deleted file mode 100644
index 3cc3e57933..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/features.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _FEATURES_H
-#define _FEATURES_H
-
-#if defined(_ALL_SOURCE) && !defined(_GNU_SOURCE)
-#define _GNU_SOURCE 1
-#endif
-
-#if defined(_DEFAULT_SOURCE) && !defined(_BSD_SOURCE)
-#define _BSD_SOURCE 1
-#endif
-
-#if !defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE) \
- && !defined(_XOPEN_SOURCE) && !defined(_GNU_SOURCE) \
- && !defined(_BSD_SOURCE) && !defined(__STRICT_ANSI__)
-#define _BSD_SOURCE 1
-#define _XOPEN_SOURCE 700
-#endif
-
-#if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
-#elif !defined(__GNUC__)
-#define __restrict
-#endif
-
-#if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
-#define __inline inline
-#endif
-
-#if __STDC_VERSION__ >= 201112L
-#elif defined(__GNUC__)
-#define _Noreturn __attribute__((__noreturn__))
-#else
-#define _Noreturn
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/langinfo.h b/src/components/lib/libc/musl-1.1.11/include/langinfo.h
deleted file mode 100644
index 2153c42e99..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/langinfo.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _LANGINFO_H
-#define _LANGINFO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-#include <nl_types.h>
-
-#define __NEED_locale_t
-
-#include <bits/alltypes.h>
-
-#define ABDAY_1 0x20000
-#define ABDAY_2 0x20001
-#define ABDAY_3 0x20002
-#define ABDAY_4 0x20003
-#define ABDAY_5 0x20004
-#define ABDAY_6 0x20005
-#define ABDAY_7 0x20006
-
-#define DAY_1 0x20007
-#define DAY_2 0x20008
-#define DAY_3 0x20009
-#define DAY_4 0x2000A
-#define DAY_5 0x2000B
-#define DAY_6 0x2000C
-#define DAY_7 0x2000D
-
-#define ABMON_1 0x2000E
-#define ABMON_2 0x2000F
-#define ABMON_3 0x20010
-#define ABMON_4 0x20011
-#define ABMON_5 0x20012
-#define ABMON_6 0x20013
-#define ABMON_7 0x20014
-#define ABMON_8 0x20015
-#define ABMON_9 0x20016
-#define ABMON_10 0x20017
-#define ABMON_11 0x20018
-#define ABMON_12 0x20019
-
-#define MON_1 0x2001A
-#define MON_2 0x2001B
-#define MON_3 0x2001C
-#define MON_4 0x2001D
-#define MON_5 0x2001E
-#define MON_6 0x2001F
-#define MON_7 0x20020
-#define MON_8 0x20021
-#define MON_9 0x20022
-#define MON_10 0x20023
-#define MON_11 0x20024
-#define MON_12 0x20025
-
-#define AM_STR 0x20026
-#define PM_STR 0x20027
-
-#define D_T_FMT 0x20028
-#define D_FMT 0x20029
-#define T_FMT 0x2002A
-#define T_FMT_AMPM 0x2002B
-
-#define ERA 0x2002C
-#define ERA_D_FMT 0x2002E
-#define ALT_DIGITS 0x2002F
-#define ERA_D_T_FMT 0x20030
-#define ERA_T_FMT 0x20031
-
-#define CODESET 14
-
-#define CRNCYSTR 0x4000F
-
-#define RADIXCHAR 0x10000
-#define THOUSEP 0x10001
-#define YESEXPR 0x50000
-#define NOEXPR 0x50001
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define YESSTR 0x50002
-#define NOSTR 0x50003
-#endif
-
-char *nl_langinfo(nl_item);
-char *nl_langinfo_l(nl_item, locale_t);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/libintl.h b/src/components/lib/libc/musl-1.1.11/include/libintl.h
deleted file mode 100644
index a2dada675d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/libintl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _LIBINTL_H
-#define _LIBINTL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __USE_GNU_GETTEXT 1
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 1 : -1)
-
-char *gettext(const char *);
-char *dgettext(const char *, const char *);
-char *dcgettext(const char *, const char *, int);
-char *ngettext(const char *, const char *, unsigned long);
-char *dngettext(const char *, const char *, const char *, unsigned long);
-char *dcngettext(const char *, const char *, const char *, unsigned long, int);
-char *textdomain(const char *);
-char *bindtextdomain (const char *, const char *);
-char *bind_textdomain_codeset(const char *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/limits.h b/src/components/lib/libc/musl-1.1.11/include/limits.h
deleted file mode 100644
index f9805a1e15..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/limits.h
+++ /dev/null
@@ -1,154 +0,0 @@
-#ifndef _LIMITS_H
-#define _LIMITS_H
-
-#include <features.h>
-
-/* Most limits are system-specific */
-
-#include <bits/limits.h>
-
-/* Support signed or unsigned plain-char */
-
-#if '\0'-1 > 0
-#define CHAR_MIN 0
-#define CHAR_MAX 255
-#else
-#define CHAR_MIN (-128)
-#define CHAR_MAX 127
-#endif
-
-/* Some universal constants... */
-
-#define CHAR_BIT 8
-#define SCHAR_MIN (-128)
-#define SCHAR_MAX 127
-#define UCHAR_MAX 255
-#define SHRT_MIN  (-1-0x7fff)
-#define SHRT_MAX  0x7fff
-#define USHRT_MAX 0xffff
-#define INT_MIN  (-1-0x7fffffff)
-#define INT_MAX  0x7fffffff
-#define UINT_MAX 0xffffffffU
-#define LONG_MIN (-LONG_MAX-1)
-#define ULONG_MAX (2UL*LONG_MAX+1)
-#define LLONG_MIN (-LLONG_MAX-1)
-#define ULLONG_MAX (2ULL*LLONG_MAX+1)
-
-#define MB_LEN_MAX 4
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
-#define PIPE_BUF 4096
-#ifdef PAGE_SIZE
-#define PAGESIZE PAGE_SIZE
-#endif
-#define FILESIZEBITS 64
-#define NAME_MAX 255
-#define SYMLINK_MAX 255
-#define PATH_MAX 4096
-#define NZERO 20
-#define NGROUPS_MAX 32
-#define ARG_MAX 131072
-#define IOV_MAX 1024
-#define SYMLOOP_MAX 40
-#define WORD_BIT 32
-#define SSIZE_MAX LONG_MAX
-#define TZNAME_MAX 6
-#define TTY_NAME_MAX 32
-#define HOST_NAME_MAX 255
-
-/* Implementation choices... */
-
-#define PTHREAD_KEYS_MAX 128
-#define PTHREAD_STACK_MIN 2048
-#define PTHREAD_DESTRUCTOR_ITERATIONS 4
-#define SEM_VALUE_MAX 0x7fffffff
-#define SEM_NSEMS_MAX 256
-#define DELAYTIMER_MAX 0x7fffffff
-#define MQ_PRIO_MAX 32768
-#define LOGIN_NAME_MAX 256
-
-/* Arbitrary numbers... */
-
-#define BC_BASE_MAX 99
-#define BC_DIM_MAX 2048
-#define BC_SCALE_MAX 99
-#define BC_STRING_MAX 1000
-#define CHARCLASS_NAME_MAX 14
-#define COLL_WEIGHTS_MAX 2
-#define EXPR_NEST_MAX 32
-#define LINE_MAX 4096
-#define RE_DUP_MAX 255
-
-#define NL_ARGMAX 9
-#define NL_LANGMAX 32
-#define NL_MSGMAX 32767
-#define NL_SETMAX 255
-#define NL_TEXTMAX 2048
-
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) \
- || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
-
-#define NL_NMAX 16
-
-#endif
-
-/* POSIX/SUS requirements follow. These numbers come directly
- * from SUS and have nothing to do with the host system. */
-
-#define _POSIX_AIO_LISTIO_MAX   2
-#define _POSIX_AIO_MAX          1
-#define _POSIX_ARG_MAX          4096
-#define _POSIX_CHILD_MAX        25
-#define _POSIX_CLOCKRES_MIN     20000000
-#define _POSIX_DELAYTIMER_MAX   32
-#define _POSIX_HOST_NAME_MAX    255
-#define _POSIX_LINK_MAX         8
-#define _POSIX_LOGIN_NAME_MAX   9
-#define _POSIX_MAX_CANON        255
-#define _POSIX_MAX_INPUT        255
-#define _POSIX_MQ_OPEN_MAX      8
-#define _POSIX_MQ_PRIO_MAX      32
-#define _POSIX_NAME_MAX         14
-#define _POSIX_NGROUPS_MAX      8
-#define _POSIX_OPEN_MAX         20
-#define _POSIX_PATH_MAX         256
-#define _POSIX_PIPE_BUF         512
-#define _POSIX_RE_DUP_MAX       255
-#define _POSIX_RTSIG_MAX        8
-#define _POSIX_SEM_NSEMS_MAX    256
-#define _POSIX_SEM_VALUE_MAX    32767
-#define _POSIX_SIGQUEUE_MAX     32
-#define _POSIX_SSIZE_MAX        32767
-#define _POSIX_STREAM_MAX       8
-#define _POSIX_SS_REPL_MAX      4
-#define _POSIX_SYMLINK_MAX      255
-#define _POSIX_SYMLOOP_MAX      8
-#define _POSIX_THREAD_DESTRUCTOR_ITERATIONS 4
-#define _POSIX_THREAD_KEYS_MAX  128
-#define _POSIX_THREAD_THREADS_MAX 64
-#define _POSIX_TIMER_MAX        32
-#define _POSIX_TRACE_EVENT_NAME_MAX 30
-#define _POSIX_TRACE_NAME_MAX   8
-#define _POSIX_TRACE_SYS_MAX    8
-#define _POSIX_TRACE_USER_EVENT_MAX 32
-#define _POSIX_TTY_NAME_MAX     9
-#define _POSIX_TZNAME_MAX       6
-#define _POSIX2_BC_BASE_MAX     99
-#define _POSIX2_BC_DIM_MAX      2048
-#define _POSIX2_BC_SCALE_MAX    99
-#define _POSIX2_BC_STRING_MAX   1000
-#define _POSIX2_CHARCLASS_NAME_MAX 14
-#define _POSIX2_COLL_WEIGHTS_MAX 2
-#define _POSIX2_EXPR_NEST_MAX   32
-#define _POSIX2_LINE_MAX        2048
-#define _POSIX2_RE_DUP_MAX      255
-
-#define _XOPEN_IOV_MAX          16
-#define _XOPEN_NAME_MAX         255
-#define _XOPEN_PATH_MAX         1024
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/link.h b/src/components/lib/libc/musl-1.1.11/include/link.h
deleted file mode 100644
index 9349cddd5d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/link.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _LINK_H
-#define _LINK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <elf.h>
-#define __NEED_size_t
-#define __NEED_uint32_t
-#include <bits/alltypes.h>
-
-#if UINTPTR_MAX > 0xffffffff
-#define ElfW(type) Elf64_ ## type
-#else
-#define ElfW(type) Elf32_ ## type
-#endif
-
-/* this is the same everywhere except alpha and s390 */
-typedef uint32_t Elf_Symndx;
-
-struct dl_phdr_info {
-	ElfW(Addr) dlpi_addr;
-	const char *dlpi_name;
-	const ElfW(Phdr) *dlpi_phdr;
-	ElfW(Half) dlpi_phnum;
-	unsigned long long int dlpi_adds;
-	unsigned long long int dlpi_subs;
-	size_t dlpi_tls_modid;
-	void *dlpi_tls_data;
-};
-
-struct link_map {
-	ElfW(Addr) l_addr;
-	char *l_name;
-	ElfW(Dyn) *l_ld;
-	struct link_map *l_next, *l_prev;
-};
-
-struct r_debug {
-	int r_version;
-	struct link_map *r_map;
-	ElfW(Addr) r_brk;
-	enum { RT_CONSISTENT, RT_ADD, RT_DELETE } r_state;
-	ElfW(Addr) r_ldbase;
-};
-
-int dl_iterate_phdr(int (*)(struct dl_phdr_info *, size_t, void *), void *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/tcp.h b/src/components/lib/libc/musl-1.1.11/include/netinet/tcp.h
deleted file mode 100644
index 52358c75bc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/netinet/tcp.h
+++ /dev/null
@@ -1,182 +0,0 @@
-#ifndef _NETINET_TCP_H
-#define _NETINET_TCP_H
-
-#include <features.h>
-
-#define TCP_NODELAY 1
-#define TCP_MAXSEG	 2
-#define TCP_CORK	 3
-#define TCP_KEEPIDLE	 4
-#define TCP_KEEPINTVL	 5
-#define TCP_KEEPCNT	 6
-#define TCP_SYNCNT	 7
-#define TCP_LINGER2	 8
-#define TCP_DEFER_ACCEPT 9
-#define TCP_WINDOW_CLAMP 10
-#define TCP_INFO	 11
-#define	TCP_QUICKACK	 12
-#define TCP_CONGESTION	 13
-#define TCP_MD5SIG	 14
-#define TCP_THIN_LINEAR_TIMEOUTS 16
-#define TCP_THIN_DUPACK  17
-#define TCP_USER_TIMEOUT 18
-#define TCP_REPAIR       19
-#define TCP_REPAIR_QUEUE 20
-#define TCP_QUEUE_SEQ    21
-#define TCP_REPAIR_OPTIONS 22
-#define TCP_FASTOPEN     23
-#define TCP_TIMESTAMP    24
-#define TCP_NOTSENT_LOWAT 25
-
-#define TCP_ESTABLISHED  1
-#define TCP_SYN_SENT     2
-#define TCP_SYN_RECV     3
-#define TCP_FIN_WAIT1    4
-#define TCP_FIN_WAIT2    5
-#define TCP_TIME_WAIT    6
-#define TCP_CLOSE        7
-#define TCP_CLOSE_WAIT   8
-#define TCP_LAST_ACK     9
-#define TCP_LISTEN       10
-#define TCP_CLOSING      11
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define SOL_TCP 6
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdint.h>
-#include <endian.h>
-
-typedef uint32_t tcp_seq;
-
-#define TH_FIN 0x01
-#define TH_SYN 0x02
-#define TH_RST 0x04
-#define TH_PUSH 0x08
-#define TH_ACK 0x10
-#define TH_URG 0x20
-
-struct tcphdr {
-#ifdef _GNU_SOURCE
-#ifdef __GNUC__
-	__extension__
-#endif
-	union { struct {
-
-	uint16_t source;
-	uint16_t dest;
-	uint32_t seq;
-	uint32_t ack_seq;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	uint16_t res1:4;
-	uint16_t doff:4;
-	uint16_t fin:1;
-	uint16_t syn:1;
-	uint16_t rst:1;
-	uint16_t psh:1;
-	uint16_t ack:1;
-	uint16_t urg:1;
-	uint16_t res2:2;
-#else
-	uint16_t doff:4;
-	uint16_t res1:4;
-	uint16_t res2:2;
-	uint16_t urg:1;
-	uint16_t ack:1;
-	uint16_t psh:1;
-	uint16_t rst:1;
-	uint16_t syn:1;
-	uint16_t fin:1;
-#endif
-	uint16_t window;
-	uint16_t check;
-	uint16_t urg_ptr;
-
-	}; struct {
-#endif
-
-	uint16_t th_sport;
-	uint16_t th_dport;
-	uint32_t th_seq;
-	uint32_t th_ack;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	uint8_t th_x2:4;
-	uint8_t th_off:4;
-#else
-	uint8_t th_off:4;
-	uint8_t th_x2:4;
-#endif
-	uint8_t th_flags;
-	uint16_t th_win;
-	uint16_t th_sum;
-	uint16_t th_urp;
-
-#ifdef _GNU_SOURCE
-	}; };
-#endif
-};
-#endif
-
-#ifdef _GNU_SOURCE
-#define TCPI_OPT_TIMESTAMPS	1
-#define TCPI_OPT_SACK		2
-#define TCPI_OPT_WSCALE		4
-#define TCPI_OPT_ECN		8
-
-#define TCP_CA_Open		0
-#define TCP_CA_Disorder		1
-#define TCP_CA_CWR		2
-#define TCP_CA_Recovery		3
-#define TCP_CA_Loss		4
-
-struct tcp_info
-{
-	uint8_t tcpi_state;
-	uint8_t tcpi_ca_state;
-	uint8_t tcpi_retransmits;
-	uint8_t tcpi_probes;
-	uint8_t tcpi_backoff;
-	uint8_t tcpi_options;
-	uint8_t tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
-	uint32_t tcpi_rto;
-	uint32_t tcpi_ato;
-	uint32_t tcpi_snd_mss;
-	uint32_t tcpi_rcv_mss;
-	uint32_t tcpi_unacked;
-	uint32_t tcpi_sacked;
-	uint32_t tcpi_lost;
-	uint32_t tcpi_retrans;
-	uint32_t tcpi_fackets;
-	uint32_t tcpi_last_data_sent;
-	uint32_t tcpi_last_ack_sent;
-	uint32_t tcpi_last_data_recv;
-	uint32_t tcpi_last_ack_recv;
-	uint32_t tcpi_pmtu;
-	uint32_t tcpi_rcv_ssthresh;
-	uint32_t tcpi_rtt;
-	uint32_t tcpi_rttvar;
-	uint32_t tcpi_snd_ssthresh;
-	uint32_t tcpi_snd_cwnd;
-	uint32_t tcpi_advmss;
-	uint32_t tcpi_reordering;
-	uint32_t tcpi_rcv_rtt;
-	uint32_t tcpi_rcv_space;
-	uint32_t tcpi_total_retrans;
-	uint64_t tcpi_pacing_rate;
-	uint64_t tcpi_max_pacing_rate;
-};
-
-#define TCP_MD5SIG_MAXKEYLEN    80
-
-struct tcp_md5sig
-{
-	struct sockaddr_storage tcpm_addr;
-	uint16_t __tcpm_pad1;
-	uint16_t tcpm_keylen;
-	uint32_t __tcpm_pad2;
-	uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN];
-};
-
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/udp.h b/src/components/lib/libc/musl-1.1.11/include/netinet/udp.h
deleted file mode 100644
index b1b0eb819a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/netinet/udp.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _NETINET_UDP_H
-#define _NETINET_UDP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-#include <stdint.h>
-
-#ifdef _GNU_SOURCE
-#define uh_sport source
-#define uh_dport dest
-#define uh_ulen len
-#define uh_sum check
-#endif
-
-struct udphdr {
-	uint16_t uh_sport;
-	uint16_t uh_dport;
-	uint16_t uh_ulen;
-	uint16_t uh_sum;
-};
-
-#define UDP_CORK	1
-#define UDP_ENCAP	100
-
-#define UDP_ENCAP_ESPINUDP_NON_IKE 1
-#define UDP_ENCAP_ESPINUDP	2
-#define UDP_ENCAP_L2TPINUDP	3
-
-#define SOL_UDP            17
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/netpacket/packet.h b/src/components/lib/libc/musl-1.1.11/include/netpacket/packet.h
deleted file mode 100644
index fa53712f44..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/netpacket/packet.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _NETPACKET_PACKET_H
-#define _NETPACKET_PACKET_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct sockaddr_ll {
-	unsigned short sll_family, sll_protocol;
-	int sll_ifindex;
-	unsigned short sll_hatype;
-	unsigned char sll_pkttype, sll_halen;
-	unsigned char sll_addr[8];
-};
-
-struct packet_mreq {
-	int mr_ifindex;
-	unsigned short int mr_type,  mr_alen;
-	unsigned char mr_address[8];
-};
-
-#define PACKET_HOST		0
-#define PACKET_BROADCAST	1
-#define PACKET_MULTICAST	2
-#define PACKET_OTHERHOST	3
-#define PACKET_OUTGOING		4
-#define PACKET_LOOPBACK		5
-#define PACKET_FASTROUTE	6
-
-#define PACKET_ADD_MEMBERSHIP		1
-#define PACKET_DROP_MEMBERSHIP		2
-#define	PACKET_RECV_OUTPUT		3
-#define	PACKET_RX_RING			5
-#define	PACKET_STATISTICS		6
-
-#define PACKET_MR_MULTICAST	0
-#define PACKET_MR_PROMISC	1
-#define PACKET_MR_ALLMULTI	2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/poll.h b/src/components/lib/libc/musl-1.1.11/include/poll.h
deleted file mode 100644
index 7af737222f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/poll.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef	_POLL_H
-#define	_POLL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#include <bits/poll.h>
-
-#define POLLIN     0x001
-#define POLLPRI    0x002
-#define POLLOUT    0x004
-#define POLLERR    0x008
-#define POLLHUP    0x010
-#define POLLNVAL   0x020
-#define POLLRDNORM 0x040
-#define POLLRDBAND 0x080
-#ifndef POLLWRNORM
-#define POLLWRNORM 0x100
-#define POLLWRBAND 0x200
-#endif
-#ifndef POLLMSG
-#define POLLMSG    0x400
-#define POLLRDHUP  0x2000
-#endif
-
-typedef unsigned long nfds_t;
-
-struct pollfd
-{
-	int fd;
-	short events;
-	short revents;
-};
-
-int poll (struct pollfd *, nfds_t, int);
-
-#ifdef _GNU_SOURCE
-#define __NEED_time_t
-#define __NEED_struct_timespec
-#define __NEED_sigset_t
-#include <bits/alltypes.h>
-int ppoll(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/pthread.h b/src/components/lib/libc/musl-1.1.11/include/pthread.h
deleted file mode 100644
index 99a74a53b5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/pthread.h
+++ /dev/null
@@ -1,225 +0,0 @@
-#ifndef _PTHREAD_H
-#define _PTHREAD_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_time_t
-#define __NEED_clockid_t
-#define __NEED_struct_timespec
-#define __NEED_sigset_t
-#define __NEED_pthread_t
-#define __NEED_pthread_attr_t
-#define __NEED_pthread_mutexattr_t
-#define __NEED_pthread_condattr_t
-#define __NEED_pthread_rwlockattr_t
-#define __NEED_pthread_barrierattr_t
-#define __NEED_pthread_mutex_t
-#define __NEED_pthread_cond_t
-#define __NEED_pthread_rwlock_t
-#define __NEED_pthread_barrier_t
-#define __NEED_pthread_spinlock_t
-#define __NEED_pthread_key_t
-#define __NEED_pthread_once_t
-#define __NEED_size_t
-
-#include <bits/alltypes.h>
-
-#include <sched.h>
-#include <time.h>
-
-#define PTHREAD_CREATE_JOINABLE 0
-#define PTHREAD_CREATE_DETACHED 1
-
-#define PTHREAD_MUTEX_NORMAL 0
-#define PTHREAD_MUTEX_DEFAULT 0
-#define PTHREAD_MUTEX_RECURSIVE 1
-#define PTHREAD_MUTEX_ERRORCHECK 2
-
-#define PTHREAD_MUTEX_STALLED 0
-#define PTHREAD_MUTEX_ROBUST 1
-
-#define PTHREAD_PRIO_NONE 0
-#define PTHREAD_PRIO_INHERIT 1
-#define PTHREAD_PRIO_PROTECT 2
-
-#define PTHREAD_INHERIT_SCHED 0
-#define PTHREAD_EXPLICIT_SCHED 1
-
-#define PTHREAD_SCOPE_SYSTEM 0
-#define PTHREAD_SCOPE_PROCESS 1
-
-#define PTHREAD_PROCESS_PRIVATE 0
-#define PTHREAD_PROCESS_SHARED 1
-
-
-#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
-#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
-#define PTHREAD_COND_INITIALIZER {{{0}}}
-#define PTHREAD_ONCE_INIT 0
-
-
-#define PTHREAD_CANCEL_ENABLE 0
-#define PTHREAD_CANCEL_DISABLE 1
-#define PTHREAD_CANCEL_MASKED 2
-
-#define PTHREAD_CANCEL_DEFERRED 0
-#define PTHREAD_CANCEL_ASYNCHRONOUS 1
-
-#define PTHREAD_CANCELED ((void *)-1)
-
-
-#define PTHREAD_BARRIER_SERIAL_THREAD (-1)
-
-
-int pthread_create(pthread_t *__restrict, const pthread_attr_t *__restrict, void *(*)(void *), void *__restrict);
-int pthread_detach(pthread_t);
-_Noreturn void pthread_exit(void *);
-int pthread_join(pthread_t, void **);
-
-#ifdef __GNUC__
-__attribute__((const))
-#endif
-pthread_t pthread_self(void);
-
-int pthread_equal(pthread_t, pthread_t);
-#ifndef __cplusplus
-#define pthread_equal(x,y) ((x)==(y))
-#endif
-
-int pthread_setcancelstate(int, int *);
-int pthread_setcanceltype(int, int *);
-void pthread_testcancel(void);
-int pthread_cancel(pthread_t);
-
-int pthread_getschedparam(pthread_t, int *__restrict, struct sched_param *__restrict);
-int pthread_setschedparam(pthread_t, int, const struct sched_param *);
-int pthread_setschedprio(pthread_t, int);
-
-int pthread_once(pthread_once_t *, void (*)(void));
-
-int pthread_mutex_init(pthread_mutex_t *__restrict, const pthread_mutexattr_t *__restrict);
-int pthread_mutex_lock(pthread_mutex_t *);
-int pthread_mutex_unlock(pthread_mutex_t *);
-int pthread_mutex_trylock(pthread_mutex_t *);
-int pthread_mutex_timedlock(pthread_mutex_t *__restrict, const struct timespec *__restrict);
-int pthread_mutex_destroy(pthread_mutex_t *);
-int pthread_mutex_consistent(pthread_mutex_t *);
-
-int pthread_mutex_getprioceiling(const pthread_mutex_t *__restrict, int *__restrict);
-int pthread_mutex_setprioceiling(pthread_mutex_t *__restrict, int, int *__restrict);
-
-int pthread_cond_init(pthread_cond_t *__restrict, const pthread_condattr_t *__restrict);
-int pthread_cond_destroy(pthread_cond_t *);
-int pthread_cond_wait(pthread_cond_t *__restrict, pthread_mutex_t *__restrict);
-int pthread_cond_timedwait(pthread_cond_t *__restrict, pthread_mutex_t *__restrict, const struct timespec *__restrict);
-int pthread_cond_broadcast(pthread_cond_t *);
-int pthread_cond_signal(pthread_cond_t *);
-
-int pthread_rwlock_init(pthread_rwlock_t *__restrict, const pthread_rwlockattr_t *__restrict);
-int pthread_rwlock_destroy(pthread_rwlock_t *);
-int pthread_rwlock_rdlock(pthread_rwlock_t *);
-int pthread_rwlock_tryrdlock(pthread_rwlock_t *);
-int pthread_rwlock_timedrdlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
-int pthread_rwlock_wrlock(pthread_rwlock_t *);
-int pthread_rwlock_trywrlock(pthread_rwlock_t *);
-int pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
-int pthread_rwlock_unlock(pthread_rwlock_t *);
-
-int pthread_spin_init(pthread_spinlock_t *, int);
-int pthread_spin_destroy(pthread_spinlock_t *);
-int pthread_spin_lock(pthread_spinlock_t *);
-int pthread_spin_trylock(pthread_spinlock_t *);
-int pthread_spin_unlock(pthread_spinlock_t *);
-
-int pthread_barrier_init(pthread_barrier_t *__restrict, const pthread_barrierattr_t *__restrict, unsigned);
-int pthread_barrier_destroy(pthread_barrier_t *);
-int pthread_barrier_wait(pthread_barrier_t *);
-
-int pthread_key_create(pthread_key_t *, void (*)(void *));
-int pthread_key_delete(pthread_key_t);
-void *pthread_getspecific(pthread_key_t);
-int pthread_setspecific(pthread_key_t, const void *);
-
-int pthread_attr_init(pthread_attr_t *);
-int pthread_attr_destroy(pthread_attr_t *);
-
-int pthread_attr_getguardsize(const pthread_attr_t *__restrict, size_t *__restrict);
-int pthread_attr_setguardsize(pthread_attr_t *, size_t);
-int pthread_attr_getstacksize(const pthread_attr_t *__restrict, size_t *__restrict);
-int pthread_attr_setstacksize(pthread_attr_t *, size_t);
-int pthread_attr_getdetachstate(const pthread_attr_t *, int *);
-int pthread_attr_setdetachstate(pthread_attr_t *, int);
-int pthread_attr_getstack(const pthread_attr_t *__restrict, void **__restrict, size_t *__restrict);
-int pthread_attr_setstack(pthread_attr_t *, void *, size_t);
-int pthread_attr_getscope(const pthread_attr_t *__restrict, int *__restrict);
-int pthread_attr_setscope(pthread_attr_t *, int);
-int pthread_attr_getschedpolicy(const pthread_attr_t *__restrict, int *__restrict);
-int pthread_attr_setschedpolicy(pthread_attr_t *, int);
-int pthread_attr_getschedparam(const pthread_attr_t *__restrict, struct sched_param *__restrict);
-int pthread_attr_setschedparam(pthread_attr_t *__restrict, const struct sched_param *__restrict);
-int pthread_attr_getinheritsched(const pthread_attr_t *__restrict, int *__restrict);
-int pthread_attr_setinheritsched(pthread_attr_t *, int);
-
-int pthread_mutexattr_destroy(pthread_mutexattr_t *);
-int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict, int *__restrict);
-int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict, int *__restrict);
-int pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict, int *__restrict);
-int pthread_mutexattr_getrobust(const pthread_mutexattr_t *__restrict, int *__restrict);
-int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict, int *__restrict);
-int pthread_mutexattr_init(pthread_mutexattr_t *);
-int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *, int);
-int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
-int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
-int pthread_mutexattr_setrobust(pthread_mutexattr_t *, int);
-int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
-
-int pthread_condattr_init(pthread_condattr_t *);
-int pthread_condattr_destroy(pthread_condattr_t *);
-int pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
-int pthread_condattr_setpshared(pthread_condattr_t *, int);
-int pthread_condattr_getclock(const pthread_condattr_t *__restrict, clockid_t *__restrict);
-int pthread_condattr_getpshared(const pthread_condattr_t *__restrict, int *__restrict);
-
-int pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
-int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
-int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *__restrict, int *__restrict);
-
-int pthread_barrierattr_destroy(pthread_barrierattr_t *);
-int pthread_barrierattr_getpshared(const pthread_barrierattr_t *__restrict, int *__restrict);
-int pthread_barrierattr_init(pthread_barrierattr_t *);
-int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
-
-int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
-
-int pthread_getconcurrency(void);
-int pthread_setconcurrency(int);
-
-int pthread_getcpuclockid(pthread_t, clockid_t *);
-
-struct __ptcb {
-	void (*__f)(void *);
-	void *__x;
-	struct __ptcb *__next;
-};
-
-void _pthread_cleanup_push(struct __ptcb *, void (*)(void *), void *);
-void _pthread_cleanup_pop(struct __ptcb *, int);
-
-#define pthread_cleanup_push(f, x) do { struct __ptcb __cb; _pthread_cleanup_push(&__cb, f, x);
-#define pthread_cleanup_pop(r) _pthread_cleanup_pop(&__cb, (r)); } while(0)
-
-#ifdef _GNU_SOURCE
-struct cpu_set_t;
-int pthread_getaffinity_np(pthread_t, size_t, struct cpu_set_t *);
-int pthread_setaffinity_np(pthread_t, size_t, const struct cpu_set_t *);
-int pthread_getattr_np(pthread_t, pthread_attr_t *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/resolv.h b/src/components/lib/libc/musl-1.1.11/include/resolv.h
deleted file mode 100644
index e12cb3c7da..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/resolv.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef _RESOLV_H
-#define _RESOLV_H
-
-#include <stdint.h>
-#include <arpa/nameser.h>
-#include <netinet/in.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAXNS			3
-#define MAXDFLSRCH		3
-#define MAXDNSRCH		6
-#define LOCALDOMAINPARTS	2
-
-#define RES_TIMEOUT		5
-#define MAXRESOLVSORT		10
-#define RES_MAXNDOTS		15
-#define RES_MAXRETRANS		30
-#define RES_MAXRETRY		5
-#define RES_DFLRETRY		2
-#define RES_MAXTIME		65535
-
-/* unused; purely for broken apps */
-typedef struct __res_state {
-	int retrans;
-	int retry;
-	unsigned long options;
-	int nscount;
-	struct sockaddr_in nsaddr_list[MAXNS];
-# define nsaddr	nsaddr_list[0]
-	unsigned short id;
-	char *dnsrch[MAXDNSRCH+1];
-	char defdname[256];
-	unsigned long pfcode;
-	unsigned ndots:4;
-	unsigned nsort:4;
-	unsigned ipv6_unavail:1;
-	unsigned unused:23;
-	struct {
-		struct in_addr addr;
-		uint32_t mask;
-	} sort_list[MAXRESOLVSORT];
-	void *qhook;
-	void *rhook;
-	int res_h_errno;
-	int _vcsock;
-	unsigned _flags;
-	union {
-		char pad[52];
-		struct {
-			uint16_t		nscount;
-			uint16_t		nsmap[MAXNS];
-			int			nssocks[MAXNS];
-			uint16_t		nscount6;
-			uint16_t		nsinit;
-			struct sockaddr_in6	*nsaddrs[MAXNS];
-			unsigned int		_initstamp[2];
-		} _ext;
-	} _u;
-} *res_state;
-
-#define	__RES	19991006
-
-#ifndef _PATH_RESCONF
-#define _PATH_RESCONF        "/etc/resolv.conf"
-#endif
-
-struct res_sym {
-	int number;
-	char *name;
-	char *humanname;
-};
-
-#define	RES_F_VC	0x00000001
-#define	RES_F_CONN	0x00000002
-#define RES_F_EDNS0ERR	0x00000004
-
-#define	RES_EXHAUSTIVE	0x00000001
-
-#define RES_INIT	0x00000001
-#define RES_DEBUG	0x00000002
-#define RES_AAONLY	0x00000004
-#define RES_USEVC	0x00000008
-#define RES_PRIMARY	0x00000010
-#define RES_IGNTC	0x00000020
-#define RES_RECURSE	0x00000040
-#define RES_DEFNAMES	0x00000080
-#define RES_STAYOPEN	0x00000100
-#define RES_DNSRCH	0x00000200
-#define	RES_INSECURE1	0x00000400
-#define	RES_INSECURE2	0x00000800
-#define	RES_NOALIASES	0x00001000
-#define	RES_USE_INET6	0x00002000
-#define RES_ROTATE	0x00004000
-#define	RES_NOCHECKNAME	0x00008000
-#define	RES_KEEPTSIG	0x00010000
-#define	RES_BLAST	0x00020000
-#define RES_USEBSTRING	0x00040000
-#define RES_NOIP6DOTINT	0x00080000
-#define RES_USE_EDNS0	0x00100000
-#define RES_SNGLKUP	0x00200000
-#define RES_SNGLKUPREOP	0x00400000
-#define RES_USE_DNSSEC	0x00800000
-
-#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
-
-#define RES_PRF_STATS	0x00000001
-#define RES_PRF_UPDATE	0x00000002
-#define RES_PRF_CLASS   0x00000004
-#define RES_PRF_CMD	0x00000008
-#define RES_PRF_QUES	0x00000010
-#define RES_PRF_ANS	0x00000020
-#define RES_PRF_AUTH	0x00000040
-#define RES_PRF_ADD	0x00000080
-#define RES_PRF_HEAD1	0x00000100
-#define RES_PRF_HEAD2	0x00000200
-#define RES_PRF_TTLID	0x00000400
-#define RES_PRF_HEADX	0x00000800
-#define RES_PRF_QUERY	0x00001000
-#define RES_PRF_REPLY	0x00002000
-#define RES_PRF_INIT	0x00004000
-
-struct __res_state *__res_state(void);
-#define _res (*__res_state())
-
-int res_init(void);
-int res_query(const char *, int, int, unsigned char *, int);
-int res_querydomain(const char *, const char *, int, int, unsigned char *, int);
-int res_search(const char *, int, int, unsigned char *, int);
-int res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
-int res_send(const unsigned char *, int, unsigned char *, int);
-int dn_comp(const char *, unsigned char *, int, unsigned char **, unsigned char **);
-int dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
-int dn_skipname(const unsigned char *, const unsigned char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/signal.h b/src/components/lib/libc/musl-1.1.11/include/signal.h
deleted file mode 100644
index 559362f299..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/signal.h
+++ /dev/null
@@ -1,258 +0,0 @@
-#ifndef _SIGNAL_H
-#define _SIGNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-
-#ifdef _GNU_SOURCE
-#define __ucontext ucontext
-#endif
-
-#define __NEED_size_t
-#define __NEED_pid_t
-#define __NEED_uid_t
-#define __NEED_struct_timespec
-#define __NEED_pthread_t
-#define __NEED_pthread_attr_t
-#define __NEED_time_t
-#define __NEED_clock_t
-#define __NEED_sigset_t
-
-#include <bits/alltypes.h>
-
-#define SIG_HOLD ((void (*)(int)) 2)
-
-#define SIG_BLOCK     0
-#define SIG_UNBLOCK   1
-#define SIG_SETMASK   2
-
-#define SI_ASYNCNL (-60)
-#define SI_TKILL (-6)
-#define SI_SIGIO (-5)
-#define SI_ASYNCIO (-4)
-#define SI_MESGQ (-3)
-#define SI_TIMER (-2)
-#define SI_QUEUE (-1)
-#define SI_USER 0
-#define SI_KERNEL 128
-
-#define FPE_INTDIV 1
-#define FPE_INTOVF 2
-#define FPE_FLTDIV 3
-#define FPE_FLTOVF 4
-#define FPE_FLTUND 5
-#define FPE_FLTRES 6
-#define FPE_FLTINV 7
-#define FPE_FLTSUB 8
-
-#define ILL_ILLOPC 1
-#define ILL_ILLOPN 2
-#define ILL_ILLADR 3
-#define ILL_ILLTRP 4
-#define ILL_PRVOPC 5
-#define ILL_PRVREG 6
-#define ILL_COPROC 7
-#define ILL_BADSTK 8
-
-#define SEGV_MAPERR 1
-#define SEGV_ACCERR 2
-#define SEGV_BNDERR 3
-
-#define BUS_ADRALN 1
-#define BUS_ADRERR 2
-#define BUS_OBJERR 3
-#define BUS_MCEERR_AR 4
-#define BUS_MCEERR_AO 5
-
-#define CLD_EXITED 1
-#define CLD_KILLED 2
-#define CLD_DUMPED 3
-#define CLD_TRAPPED 4
-#define CLD_STOPPED 5
-#define CLD_CONTINUED 6
-
-typedef struct sigaltstack stack_t;
-
-union sigval {
-	int sival_int;
-	void *sival_ptr;
-};
-
-typedef struct {
-	int si_signo, si_errno, si_code;
-	union {
-		char __pad[128 - 2*sizeof(int) - sizeof(long)];
-		struct {
-			union {
-				struct {
-					pid_t si_pid;
-					uid_t si_uid;
-				} __piduid;
-				struct {
-					int si_timerid;
-					int si_overrun;
-				} __timer;
-			} __first;
-			union {
-				union sigval si_value;
-				struct {
-					int si_status;
-					clock_t si_utime, si_stime;
-				} __sigchld;
-			} __second;
-		} __si_common;
-		struct {
-			void *si_addr;
-			short si_addr_lsb;
-			struct {
-				void *si_lower;
-				void *si_upper;
-			} __addr_bnd;
-		} __sigfault;
-		struct {
-			long si_band;
-			int si_fd;
-		} __sigpoll;
-		struct {
-			void *si_call_addr;
-			int si_syscall;
-			unsigned si_arch;
-		} __sigsys;
-	} __si_fields;
-} siginfo_t;
-#define si_pid     __si_fields.__si_common.__first.__piduid.si_pid
-#define si_uid     __si_fields.__si_common.__first.__piduid.si_uid
-#define si_status  __si_fields.__si_common.__second.__sigchld.si_status
-#define si_utime   __si_fields.__si_common.__second.__sigchld.si_utime
-#define si_stime   __si_fields.__si_common.__second.__sigchld.si_stime
-#define si_value   __si_fields.__si_common.__second.si_value
-#define si_addr    __si_fields.__sigfault.si_addr
-#define si_addr_lsb __si_fields.__sigfault.si_addr_lsb
-#define si_lower   __si_fields.__sigfault.__addr_bnd.si_lower
-#define si_upper   __si_fields.__sigfault.__addr_bnd.si_upper
-#define si_band    __si_fields.__sigpoll.si_band
-#define si_fd      __si_fields.__sigpoll.si_fd
-#define si_timerid __si_fields.__si_common.__first.__timer.si_timerid
-#define si_overrun __si_fields.__si_common.__first.__timer.si_overrun
-#define si_ptr     si_value.sival_ptr
-#define si_int     si_value.sival_int
-#define si_call_addr __si_fields.__sigsys.si_call_addr
-#define si_syscall __si_fields.__sigsys.si_syscall
-#define si_arch    __si_fields.__sigsys.si_arch
-
-struct sigaction {
-	union {
-		void (*sa_handler)(int);
-		void (*sa_sigaction)(int, siginfo_t *, void *);
-	} __sa_handler;
-	sigset_t sa_mask;
-	int sa_flags;
-	void (*sa_restorer)(void);
-};
-#define sa_handler   __sa_handler.sa_handler
-#define sa_sigaction __sa_handler.sa_sigaction
-
-struct sigevent {
-	union sigval sigev_value;
-	int sigev_signo;
-	int sigev_notify;
-	void (*sigev_notify_function)(union sigval);
-	pthread_attr_t *sigev_notify_attributes;
-	char __pad[56-3*sizeof(long)];
-};
-
-#define SIGEV_SIGNAL 0
-#define SIGEV_NONE 1
-#define SIGEV_THREAD 2
-
-int __libc_current_sigrtmin(void);
-int __libc_current_sigrtmax(void);
-
-#define SIGRTMIN  (__libc_current_sigrtmin())
-#define SIGRTMAX  (__libc_current_sigrtmax())
-
-int kill(pid_t, int);
-
-int sigemptyset(sigset_t *);
-int sigfillset(sigset_t *);
-int sigaddset(sigset_t *, int);
-int sigdelset(sigset_t *, int);
-int sigismember(const sigset_t *, int);
-
-int sigprocmask(int, const sigset_t *__restrict, sigset_t *__restrict);
-int sigsuspend(const sigset_t *);
-int sigaction(int, const struct sigaction *__restrict, struct sigaction *__restrict);
-int sigpending(sigset_t *);
-int sigwait(const sigset_t *__restrict, int *__restrict);
-int sigwaitinfo(const sigset_t *__restrict, siginfo_t *__restrict);
-int sigtimedwait(const sigset_t *__restrict, siginfo_t *__restrict, const struct timespec *__restrict);
-int sigqueue(pid_t, int, const union sigval);
-
-int pthread_sigmask(int, const sigset_t *__restrict, sigset_t *__restrict);
-int pthread_kill(pthread_t, int);
-
-void psiginfo(const siginfo_t *, const char *);
-void psignal(int, const char *);
-
-#endif
-
-#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-int killpg(pid_t, int);
-int sigaltstack(const stack_t *__restrict, stack_t *__restrict);
-int sighold(int);
-int sigignore(int);
-int siginterrupt(int, int);
-int sigpause(int);
-int sigrelse(int);
-void (*sigset(int, void (*)(int)))(int);
-#define TRAP_BRKPT 1
-#define TRAP_TRACE 2
-#define POLL_IN 1
-#define POLL_OUT 2
-#define POLL_MSG 3
-#define POLL_ERR 4
-#define POLL_PRI 5
-#define POLL_HUP 6
-#define SS_ONSTACK    1
-#define SS_DISABLE    2
-#endif
-
-#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-#define NSIG _NSIG
-typedef void (*sig_t)(int);
-#endif
-
-#ifdef _GNU_SOURCE
-typedef void (*sighandler_t)(int);
-void (*bsd_signal(int, void (*)(int)))(int);
-int sigisemptyset(const sigset_t *);
-int sigorset (sigset_t *, const sigset_t *, const sigset_t *);
-int sigandset(sigset_t *, const sigset_t *, const sigset_t *);
-
-#define SA_NOMASK SA_NODEFER
-#define SA_ONESHOT SA_RESETHAND
-#endif
-
-#include <bits/signal.h>
-
-#define SIG_ERR  ((void (*)(int))-1)
-#define SIG_DFL  ((void (*)(int)) 0)
-#define SIG_IGN  ((void (*)(int)) 1)
-
-typedef int sig_atomic_t;
-
-void (*signal(int, void (*)(int)))(int);
-int raise(int);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdarg.h b/src/components/lib/libc/musl-1.1.11/include/stdarg.h
deleted file mode 100644
index 60d4e2af17..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/stdarg.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _STDARG_H
-#define _STDARG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __NEED_va_list
-
-#include <bits/alltypes.h>
-
-#if __GNUC__ >= 3
-#define va_start(v,l)   __builtin_va_start(v,l)
-#define va_end(v)       __builtin_va_end(v)
-#define va_arg(v,l)     __builtin_va_arg(v,l)
-#define va_copy(d,s)    __builtin_va_copy(d,s)
-#else
-#include <bits/stdarg.h>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdio.h b/src/components/lib/libc/musl-1.1.11/include/stdio.h
deleted file mode 100644
index 884d2e6a72..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/stdio.h
+++ /dev/null
@@ -1,203 +0,0 @@
-#ifndef _STDIO_H
-#define _STDIO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_FILE
-#define __NEED___isoc_va_list
-#define __NEED_size_t
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-#define __NEED_ssize_t
-#define __NEED_off_t
-#define __NEED_va_list
-#endif
-
-#include <bits/alltypes.h>
-
-#ifdef __cplusplus
-#define NULL 0L
-#else
-#define NULL ((void*)0)
-#endif
-
-#undef EOF
-#define EOF (-1)
-
-#undef SEEK_SET
-#undef SEEK_CUR
-#undef SEEK_END
-#define SEEK_SET 0
-#define SEEK_CUR 1
-#define SEEK_END 2
-
-#define _IOFBF 0
-#define _IOLBF 1
-#define _IONBF 2
-
-#define BUFSIZ 1024
-#define FILENAME_MAX 4096
-#define FOPEN_MAX 1000
-#define TMP_MAX 10000
-#define L_tmpnam 20
-
-typedef union _G_fpos64_t {
-	char __opaque[16];
-	double __align;
-} fpos_t;
-
-extern FILE *const stdin;
-extern FILE *const stdout;
-extern FILE *const stderr;
-
-#define stdin  (stdin)
-#define stdout (stdout)
-#define stderr (stderr)
-
-FILE *fopen(const char *__restrict, const char *__restrict);
-FILE *freopen(const char *__restrict, const char *__restrict, FILE *__restrict);
-int fclose(FILE *);
-
-int remove(const char *);
-int rename(const char *, const char *);
-
-int feof(FILE *);
-int ferror(FILE *);
-int fflush(FILE *);
-void clearerr(FILE *);
-
-int fseek(FILE *, long, int);
-long ftell(FILE *);
-void rewind(FILE *);
-
-int fgetpos(FILE *__restrict, fpos_t *__restrict);
-int fsetpos(FILE *, const fpos_t *);
-
-size_t fread(void *__restrict, size_t, size_t, FILE *__restrict);
-size_t fwrite(const void *__restrict, size_t, size_t, FILE *__restrict);
-
-int fgetc(FILE *);
-int getc(FILE *);
-int getchar(void);
-int ungetc(int, FILE *);
-
-int fputc(int, FILE *);
-int putc(int, FILE *);
-int putchar(int);
-
-char *fgets(char *__restrict, int, FILE *__restrict);
-#if __STDC_VERSION__ < 201112L
-char *gets(char *);
-#endif
-
-int fputs(const char *__restrict, FILE *__restrict);
-int puts(const char *);
-
-int printf(const char *__restrict, ...);
-int fprintf(FILE *__restrict, const char *__restrict, ...);
-int sprintf(char *__restrict, const char *__restrict, ...);
-int snprintf(char *__restrict, size_t, const char *__restrict, ...);
-
-int vprintf(const char *__restrict, __isoc_va_list);
-int vfprintf(FILE *__restrict, const char *__restrict, __isoc_va_list);
-int vsprintf(char *__restrict, const char *__restrict, __isoc_va_list);
-int vsnprintf(char *__restrict, size_t, const char *__restrict, __isoc_va_list);
-
-int scanf(const char *__restrict, ...);
-int fscanf(FILE *__restrict, const char *__restrict, ...);
-int sscanf(const char *__restrict, const char *__restrict, ...);
-int vscanf(const char *__restrict, __isoc_va_list);
-int vfscanf(FILE *__restrict, const char *__restrict, __isoc_va_list);
-int vsscanf(const char *__restrict, const char *__restrict, __isoc_va_list);
-
-void perror(const char *);
-
-int setvbuf(FILE *__restrict, char *__restrict, int, size_t);
-void setbuf(FILE *__restrict, char *__restrict);
-
-char *tmpnam(char *);
-FILE *tmpfile(void);
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-FILE *fmemopen(void *__restrict, size_t, const char *__restrict);
-FILE *open_memstream(char **, size_t *);
-FILE *fdopen(int, const char *);
-FILE *popen(const char *, const char *);
-int pclose(FILE *);
-int fileno(FILE *);
-int fseeko(FILE *, off_t, int);
-off_t ftello(FILE *);
-int dprintf(int, const char *__restrict, ...);
-int vdprintf(int, const char *__restrict, __isoc_va_list);
-void flockfile(FILE *);
-int ftrylockfile(FILE *);
-void funlockfile(FILE *);
-int getc_unlocked(FILE *);
-int getchar_unlocked(void);
-int putc_unlocked(int, FILE *);
-int putchar_unlocked(int);
-ssize_t getdelim(char **__restrict, size_t *__restrict, int, FILE *__restrict);
-ssize_t getline(char **__restrict, size_t *__restrict, FILE *__restrict);
-int renameat(int, const char *, int, const char *);
-char *ctermid(char *);
-#define L_ctermid 20
-#endif
-
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-#define P_tmpdir "/tmp"
-char *tempnam(const char *, const char *);
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define L_cuserid 20
-char *cuserid(char *);
-void setlinebuf(FILE *);
-void setbuffer(FILE *, char *, size_t);
-int fgetc_unlocked(FILE *);
-int fputc_unlocked(int, FILE *);
-int fflush_unlocked(FILE *);
-size_t fread_unlocked(void *, size_t, size_t, FILE *);
-size_t fwrite_unlocked(const void *, size_t, size_t, FILE *);
-void clearerr_unlocked(FILE *);
-int feof_unlocked(FILE *);
-int ferror_unlocked(FILE *);
-int fileno_unlocked(FILE *);
-int getw(FILE *);
-int putw(int, FILE *);
-char *fgetln(FILE *, size_t *);
-int asprintf(char **, const char *, ...);
-int vasprintf(char **, const char *, __isoc_va_list);
-#endif
-
-#ifdef _GNU_SOURCE
-char *fgets_unlocked(char *, int, FILE *);
-int fputs_unlocked(const char *, FILE *);
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define tmpfile64 tmpfile
-#define fopen64 fopen
-#define freopen64 freopen
-#define fseeko64 fseeko
-#define ftello64 ftello
-#define fgetpos64 fgetpos
-#define fsetpos64 fsetpos
-#define fpos64_t fpos_t
-#define off64_t off_t
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdlib.h b/src/components/lib/libc/musl-1.1.11/include/stdlib.h
deleted file mode 100644
index d2c911fcd7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/stdlib.h
+++ /dev/null
@@ -1,174 +0,0 @@
-#ifndef _STDLIB_H
-#define _STDLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#ifdef __cplusplus
-#define NULL 0L
-#else
-#define NULL ((void*)0)
-#endif
-
-#define __NEED_size_t
-#define __NEED_wchar_t
-
-#include <bits/alltypes.h>
-
-int atoi (const char *);
-long atol (const char *);
-long long atoll (const char *);
-double atof (const char *);
-
-float strtof (const char *__restrict, char **__restrict);
-double strtod (const char *__restrict, char **__restrict);
-long double strtold (const char *__restrict, char **__restrict);
-
-long strtol (const char *__restrict, char **__restrict, int);
-unsigned long strtoul (const char *__restrict, char **__restrict, int);
-long long strtoll (const char *__restrict, char **__restrict, int);
-unsigned long long strtoull (const char *__restrict, char **__restrict, int);
-
-int rand (void);
-void srand (unsigned);
-
-void *malloc (size_t);
-void *calloc (size_t, size_t);
-void *realloc (void *, size_t);
-void free (void *);
-void *aligned_alloc(size_t alignment, size_t size);
-
-_Noreturn void abort (void);
-int atexit (void (*) (void));
-_Noreturn void exit (int);
-_Noreturn void _Exit (int);
-int at_quick_exit (void (*) (void));
-_Noreturn void quick_exit (int);
-
-char *getenv (const char *);
-
-int system (const char *);
-
-void *bsearch (const void *, const void *, size_t, size_t, int (*)(const void *, const void *));
-void qsort (void *, size_t, size_t, int (*)(const void *, const void *));
-
-int abs (int);
-long labs (long);
-long long llabs (long long);
-
-typedef struct { int quot, rem; } div_t;
-typedef struct { long quot, rem; } ldiv_t;
-typedef struct { long long quot, rem; } lldiv_t;
-
-div_t div (int, int);
-ldiv_t ldiv (long, long);
-lldiv_t lldiv (long long, long long);
-
-int mblen (const char *, size_t);
-int mbtowc (wchar_t *__restrict, const char *__restrict, size_t);
-int wctomb (char *, wchar_t);
-size_t mbstowcs (wchar_t *__restrict, const char *__restrict, size_t);
-size_t wcstombs (char *__restrict, const wchar_t *__restrict, size_t);
-
-#define EXIT_FAILURE 1
-#define EXIT_SUCCESS 0
-
-size_t __ctype_get_mb_cur_max(void);
-#define MB_CUR_MAX (__ctype_get_mb_cur_max())
-
-#define RAND_MAX (0x7fffffff)
-
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-
-#define WNOHANG    1
-#define WUNTRACED  2
-
-#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
-#define WTERMSIG(s) ((s) & 0x7f)
-#define WSTOPSIG(s) WEXITSTATUS(s)
-#define WIFEXITED(s) (!WTERMSIG(s))
-#define WIFSTOPPED(s) ((short)((((s)&0xffff)*0x10001)>>8) > 0x7f00)
-#define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu)
-
-int posix_memalign (void **, size_t, size_t);
-int setenv (const char *, const char *, int);
-int unsetenv (const char *);
-int mkstemp (char *);
-int mkostemp (char *, int);
-char *mkdtemp (char *);
-int getsubopt (char **, char *const *, char **);
-int rand_r (unsigned *);
-
-#endif
-
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-char *realpath (const char *__restrict, char *__restrict);
-long int random (void);
-void srandom (unsigned int);
-char *initstate (unsigned int, char *, size_t);
-char *setstate (char *);
-int putenv (char *);
-int posix_openpt (int);
-int grantpt (int);
-int unlockpt (int);
-char *ptsname (int);
-char *l64a (long);
-long a64l (const char *);
-void setkey (const char *);
-double drand48 (void);
-double erand48 (unsigned short [3]);
-long int lrand48 (void);
-long int nrand48 (unsigned short [3]);
-long mrand48 (void);
-long jrand48 (unsigned short [3]);
-void srand48 (long);
-unsigned short *seed48 (unsigned short [3]);
-void lcong48 (unsigned short [7]);
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#include <alloca.h>
-char *mktemp (char *);
-int mkstemps (char *, int);
-int mkostemps (char *, int, int);
-void *valloc (size_t);
-void *memalign(size_t, size_t);
-int getloadavg(double *, int);
-int clearenv(void);
-#define WCOREDUMP(s) ((s) & 0x80)
-#define WIFCONTINUED(s) ((s) == 0xffff)
-#endif
-
-#ifdef _GNU_SOURCE
-int ptsname_r(int, char *, size_t);
-char *ecvt(double, int, int *, int *);
-char *fcvt(double, int, int *, int *);
-char *gcvt(double, int, char *);
-struct __locale_struct;
-float strtof_l(const char *__restrict, char **__restrict, struct __locale_struct *);
-double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *);
-long double strtold_l(const char *__restrict, char **__restrict, struct __locale_struct *);
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define mkstemp64 mkstemp
-#define mkostemp64 mkostemp
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define mkstemps64 mkstemps
-#define mkostemps64 mkostemps
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/string.h b/src/components/lib/libc/musl-1.1.11/include/string.h
deleted file mode 100644
index ff9badb9c3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/string.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef	_STRING_H
-#define	_STRING_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#ifdef __cplusplus
-#define NULL 0L
-#else
-#define NULL ((void*)0)
-#endif
-
-#define __NEED_size_t
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-#define __NEED_locale_t
-#endif
-
-#include <bits/alltypes.h>
-
-void *memcpy (void *__restrict, const void *__restrict, size_t);
-void *memmove (void *, const void *, size_t);
-void *memset (void *, int, size_t);
-int memcmp (const void *, const void *, size_t);
-void *memchr (const void *, int, size_t);
-
-char *strcpy (char *__restrict, const char *__restrict);
-char *strncpy (char *__restrict, const char *__restrict, size_t);
-
-char *strcat (char *__restrict, const char *__restrict);
-char *strncat (char *__restrict, const char *__restrict, size_t);
-
-int strcmp (const char *, const char *);
-int strncmp (const char *, const char *, size_t);
-
-int strcoll (const char *, const char *);
-size_t strxfrm (char *__restrict, const char *__restrict, size_t);
-
-char *strchr (const char *, int);
-char *strrchr (const char *, int);
-
-size_t strcspn (const char *, const char *);
-size_t strspn (const char *, const char *);
-char *strpbrk (const char *, const char *);
-char *strstr (const char *, const char *);
-char *strtok (char *__restrict, const char *__restrict);
-
-size_t strlen (const char *);
-
-char *strerror (int);
-
-#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-#include <strings.h>
-#endif
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-char *strtok_r (char *__restrict, const char *__restrict, char **__restrict);
-int strerror_r (int, char *, size_t);
-char *stpcpy(char *__restrict, const char *__restrict);
-char *stpncpy(char *__restrict, const char *__restrict, size_t);
-size_t strnlen (const char *, size_t);
-char *strdup (const char *);
-char *strndup (const char *, size_t);
-char *strsignal(int);
-char *strerror_l (int, locale_t);
-int strcoll_l (const char *, const char *, locale_t);
-size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t);
-#endif
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-void *memccpy (void *__restrict, const void *__restrict, int, size_t);
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-char *strsep(char **, const char *);
-size_t strlcat (char *, const char *, size_t);
-size_t strlcpy (char *, const char *, size_t);
-#endif
-
-#ifdef _GNU_SOURCE
-#define	strdupa(x)	strcpy(alloca(strlen(x)+1),x)
-int strverscmp (const char *, const char *);
-int strcasecmp_l (const char *, const char *, locale_t);
-int strncasecmp_l (const char *, const char *, size_t, locale_t);
-char *strchrnul(const char *, int);
-char *strcasestr(const char *, const char *);
-void *memmem(const void *, size_t, const void *, size_t);
-void *memrchr(const void *, int, size_t);
-void *mempcpy(void *, const void *, size_t);
-#ifndef __cplusplus
-char *basename();
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/auxv.h b/src/components/lib/libc/musl-1.1.11/include/sys/auxv.h
deleted file mode 100644
index 6dcf9adc2c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/auxv.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _SYS_AUXV_H
-#define _SYS_AUXV_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <elf.h>
-
-unsigned long getauxval(unsigned long);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/fanotify.h b/src/components/lib/libc/musl-1.1.11/include/sys/fanotify.h
deleted file mode 100644
index daab76b13b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/fanotify.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef _FANOTIFY_H
-#define _FANOTIFY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct fanotify_event_metadata {
-	unsigned event_len;
-	unsigned char vers;
-	unsigned char reserved;
-	unsigned short metadata_len;
-	unsigned long long mask
-#ifdef __GNUC__
-	__attribute__((__aligned__(8)))
-#endif
-	;
-	int fd;
-	int pid;
-};
-
-struct fanotify_response {
-	int fd;
-	unsigned response;
-};
-
-#define FAN_ACCESS 0x01
-#define FAN_MODIFY 0x02
-#define FAN_CLOSE_WRITE 0x08
-#define FAN_CLOSE_NOWRITE 0x10
-#define FAN_OPEN 0x20
-#define FAN_Q_OVERFLOW 0x4000
-#define FAN_OPEN_PERM 0x10000
-#define FAN_ACCESS_PERM 0x20000
-#define FAN_ONDIR 0x40000000
-#define FAN_EVENT_ON_CHILD 0x08000000
-#define FAN_CLOSE (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE)
-#define FAN_CLOEXEC 0x01
-#define FAN_NONBLOCK 0x02
-#define FAN_CLASS_NOTIF 0
-#define FAN_CLASS_CONTENT 0x04
-#define FAN_CLASS_PRE_CONTENT 0x08
-#define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
-#define FAN_UNLIMITED_QUEUE 0x10
-#define FAN_UNLIMITED_MARKS 0x20
-#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS)
-#define FAN_MARK_ADD 0x01
-#define FAN_MARK_REMOVE 0x02
-#define FAN_MARK_DONT_FOLLOW 0x04
-#define FAN_MARK_ONLYDIR 0x08
-#define FAN_MARK_MOUNT 0x10
-#define FAN_MARK_IGNORED_MASK 0x20
-#define FAN_MARK_IGNORED_SURV_MODIFY 0x40
-#define FAN_MARK_FLUSH 0x80
-#define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD | FAN_MARK_REMOVE | FAN_MARK_DONT_FOLLOW | FAN_MARK_ONLYDIR | FAN_MARK_MOUNT | FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY | FAN_MARK_FLUSH)
-#define FAN_ALL_EVENTS (FAN_ACCESS | FAN_MODIFY | FAN_CLOSE | FAN_OPEN)
-#define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM | FAN_ACCESS_PERM)
-#define FAN_ALL_OUTGOING_EVENTS (FAN_ALL_EVENTS | FAN_ALL_PERM_EVENTS | FAN_Q_OVERFLOW)
-#define FANOTIFY_METADATA_VERSION 3
-#define FAN_ALLOW 0x01
-#define FAN_DENY 0x02
-#define FAN_NOFD -1
-#define FAN_EVENT_METADATA_LEN (sizeof(struct fanotify_event_metadata))
-#define FAN_EVENT_NEXT(meta, len) ((len) -= (meta)->event_len, (struct fanotify_event_metadata*)(((char *)(meta)) + (meta)->event_len))
-#define FAN_EVENT_OK(meta, len) ((long)(len) >= (long)FAN_EVENT_METADATA_LEN && (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && (long)(meta)->event_len <= (long)(len))
-
-int fanotify_init(unsigned, unsigned);
-int fanotify_mark(int, unsigned, unsigned long long, int, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/ioctl.h b/src/components/lib/libc/musl-1.1.11/include/sys/ioctl.h
deleted file mode 100644
index d0415b3da2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/ioctl.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef	_SYS_IOCTL_H
-#define	_SYS_IOCTL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <bits/ioctl.h>
-
-int ioctl (int, int, ...);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/ipc.h b/src/components/lib/libc/musl-1.1.11/include/sys/ipc.h
deleted file mode 100644
index c5a39819c5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/ipc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _SYS_IPC_H
-#define _SYS_IPC_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_uid_t
-#define __NEED_gid_t
-#define __NEED_mode_t
-#define __NEED_key_t
-
-#include <bits/alltypes.h>
-
-#define __ipc_perm_key __key
-#define __ipc_perm_seq __seq
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define __key key
-#define __seq seq
-#endif
-
-#include <bits/ipc.h>
-
-#define IPC_CREAT  01000
-#define IPC_EXCL   02000
-#define IPC_NOWAIT 04000
-
-#define IPC_RMID 0
-#define IPC_SET  1
-#define IPC_STAT 2
-#define IPC_INFO 3
-
-#define IPC_PRIVATE ((key_t) 0)
-
-key_t ftok (const char *, int);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/kd.h b/src/components/lib/libc/musl-1.1.11/include/sys/kd.h
deleted file mode 100644
index 793fd59fe3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/kd.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SYS_KD_H
-#define _SYS_KD_H
-
-#define _LINUX_TYPES_H
-#include <linux/kd.h>
-#undef _LINUX_TYPES_H
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/mman.h b/src/components/lib/libc/musl-1.1.11/include/sys/mman.h
deleted file mode 100644
index 9fc2db51d1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/mman.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef	_SYS_MMAN_H
-#define	_SYS_MMAN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_mode_t
-#define __NEED_size_t
-#define __NEED_off_t
-
-#if defined(_GNU_SOURCE)
-#define __NEED_ssize_t
-#endif
-
-#include <bits/alltypes.h>
-
-#include <bits/mman.h>
-
-void *mmap (void *, size_t, int, int, int, off_t);
-int munmap (void *, size_t);
-
-int mprotect (void *, size_t, int);
-int msync (void *, size_t, int);
-
-int posix_madvise (void *, size_t, int);
-
-int mlock (const void *, size_t);
-int munlock (const void *, size_t);
-int mlockall (int);
-int munlockall (void);
-
-#ifdef _GNU_SOURCE
-#define MREMAP_MAYMOVE 1
-#define MREMAP_FIXED 2
-void *mremap (void *, size_t, size_t, int, ...);
-int remap_file_pages (void *, size_t, int, size_t, int);
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-int madvise (void *, size_t, int);
-int mincore (void *, size_t, unsigned char *);
-#endif
-
-int shm_open (const char *, int, mode_t);
-int shm_unlink (const char *);
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define mmap64 mmap
-#define off64_t off_t
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/msg.h b/src/components/lib/libc/musl-1.1.11/include/sys/msg.h
deleted file mode 100644
index 139f22b700..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/msg.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _SYS_MSG_H
-#define _SYS_MSG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/ipc.h>
-
-#define __NEED_pid_t
-#define __NEED_key_t
-#define __NEED_time_t
-#define __NEED_size_t
-#define __NEED_ssize_t
-
-#include <bits/alltypes.h>
-
-typedef unsigned long msgqnum_t;
-typedef unsigned long msglen_t;
-
-#include <bits/msg.h>
-
-#define __msg_cbytes msg_cbytes
-
-#define MSG_NOERROR 010000
-#define MSG_EXCEPT  020000
-
-#define MSG_STAT 11
-#define MSG_INFO 12
-
-struct msginfo {
-	int msgpool, msgmap, msgmax, msgmnb, msgmni, msgssz, msgtql;
-	unsigned short msgseg;
-};
-
-int msgctl (int, int, struct msqid_ds *);
-int msgget (key_t, int);
-ssize_t msgrcv (int, void *, size_t, long, int);
-int msgsnd (int, const void *, size_t, int);
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-struct msgbuf {
-	long mtype;
-	char mtext[1];
-};
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/ptrace.h b/src/components/lib/libc/musl-1.1.11/include/sys/ptrace.h
deleted file mode 100644
index a133e66a17..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/ptrace.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef _SYS_PTRACE_H
-#define _SYS_PTRACE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-#define PTRACE_TRACEME 0
-#define PT_TRACE_ME PTRACE_TRACEME
-
-#define PTRACE_PEEKTEXT 1
-#define PTRACE_PEEKDATA 2
-#define PTRACE_PEEKUSER 3
-#define PTRACE_POKETEXT 4
-#define PTRACE_POKEDATA 5
-#define PTRACE_POKEUSER 6
-#define PTRACE_CONT 7
-#define PTRACE_KILL 8
-#define PTRACE_SINGLESTEP 9
-#define PTRACE_GETREGS 12
-#define PTRACE_SETREGS 13
-#define PTRACE_GETFPREGS 14
-#define PTRACE_SETFPREGS 15
-#define PTRACE_ATTACH 16
-#define PTRACE_DETACH 17
-#define PTRACE_GETFPXREGS 18
-#define PTRACE_SETFPXREGS 19
-#define PTRACE_SYSCALL 24
-#define PTRACE_SETOPTIONS 0x4200
-#define PTRACE_GETEVENTMSG 0x4201
-#define PTRACE_GETSIGINFO 0x4202
-#define PTRACE_SETSIGINFO 0x4203
-#define PTRACE_GETREGSET 0x4204
-#define PTRACE_SETREGSET 0x4205
-#define PTRACE_SEIZE 0x4206
-#define PTRACE_INTERRUPT 0x4207
-#define PTRACE_LISTEN 0x4208
-#define PTRACE_PEEKSIGINFO 0x4209
-#define PTRACE_GETSIGMASK 0x420a
-#define PTRACE_SETSIGMASK 0x420b
-
-#define PT_READ_I PTRACE_PEEKTEXT
-#define PT_READ_D PTRACE_PEEKDATA
-#define PT_READ_U PTRACE_PEEKUSER
-#define PT_WRITE_I PTRACE_POKETEXT
-#define PT_WRITE_D PTRACE_POKEDATA
-#define PT_WRITE_U PTRACE_POKEUSER
-#define PT_CONTINUE PTRACE_CONT
-#define PT_KILL PTRACE_KILL
-#define PT_STEP PTRACE_SINGLESTEP
-#define PT_GETREGS PTRACE_GETREGS
-#define PT_SETREGS PTRACE_SETREGS
-#define PT_GETFPREGS PTRACE_GETFPREGS
-#define PT_SETFPREGS PTRACE_SETFPREGS
-#define PT_ATTACH PTRACE_ATTACH
-#define PT_DETACH PTRACE_DETACH
-#define PT_GETFPXREGS PTRACE_GETFPXREGS
-#define PT_SETFPXREGS PTRACE_SETFPXREGS
-#define PT_SYSCALL PTRACE_SYSCALL
-#define PT_SETOPTIONS PTRACE_SETOPTIONS
-#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
-#define PT_GETSIGINFO PTRACE_GETSIGINFO
-#define PT_SETSIGINFO PTRACE_SETSIGINFO
-
-#define PTRACE_O_TRACESYSGOOD   0x00000001
-#define PTRACE_O_TRACEFORK      0x00000002
-#define PTRACE_O_TRACEVFORK     0x00000004
-#define PTRACE_O_TRACECLONE     0x00000008
-#define PTRACE_O_TRACEEXEC      0x00000010
-#define PTRACE_O_TRACEVFORKDONE 0x00000020
-#define PTRACE_O_TRACEEXIT      0x00000040
-#define PTRACE_O_TRACESECCOMP   0x00000080
-#define PTRACE_O_EXITKILL       0x00100000
-#define PTRACE_O_MASK           0x001000ff
-
-#define PTRACE_EVENT_FORK 1
-#define PTRACE_EVENT_VFORK 2
-#define PTRACE_EVENT_CLONE 3
-#define PTRACE_EVENT_EXEC 4
-#define PTRACE_EVENT_VFORK_DONE 5
-#define PTRACE_EVENT_EXIT 6
-#define PTRACE_EVENT_SECCOMP 7
-
-#define PTRACE_PEEKSIGINFO_SHARED 1
-
-struct ptrace_peeksiginfo_args {
-	uint64_t off;
-	uint32_t flags;
-	int32_t nr;
-};
-
-long ptrace(int, ...);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/resource.h b/src/components/lib/libc/musl-1.1.11/include/sys/resource.h
deleted file mode 100644
index cc33de7445..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/resource.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef	_SYS_RESOURCE_H
-#define	_SYS_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-#include <sys/time.h>
-
-#define __NEED_id_t
-
-#ifdef _GNU_SOURCE
-#define __NEED_pid_t
-#endif
-
-#include <bits/alltypes.h>
-#include <bits/resource.h>
-
-typedef unsigned long long rlim_t;
-
-struct rlimit
-{
-	rlim_t rlim_cur;
-	rlim_t rlim_max;
-};
-
-struct rusage
-{
-	struct timeval ru_utime;
-	struct timeval ru_stime;
-	/* linux extentions, but useful */
-	long	ru_maxrss;
-	long	ru_ixrss;
-	long	ru_idrss;
-	long	ru_isrss;
-	long	ru_minflt;
-	long	ru_majflt;
-	long	ru_nswap;
-	long	ru_inblock;
-	long	ru_oublock;
-	long	ru_msgsnd;
-	long	ru_msgrcv;
-	long	ru_nsignals;
-	long	ru_nvcsw;
-	long	ru_nivcsw;
-	/* room for more... */
-	long    __reserved[16];
-};
-
-int getrlimit (int, struct rlimit *);
-int setrlimit (int, const struct rlimit *);
-int getrusage (int, struct rusage *);
-
-int getpriority (int, id_t);
-int setpriority (int, id_t, int);
-
-#ifdef _GNU_SOURCE
-int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
-#define prlimit64 prlimit
-#endif
-
-#define PRIO_MIN (-20)
-#define PRIO_MAX 20
-
-#define PRIO_PROCESS 0
-#define PRIO_PGRP    1
-#define PRIO_USER    2
-
-#define RUSAGE_SELF     0
-#define RUSAGE_CHILDREN 1
-
-#define RLIM_INFINITY (~0ULL)
-#define RLIM_SAVED_CUR RLIM_INFINITY
-#define RLIM_SAVED_MAX RLIM_INFINITY
-
-#define RLIMIT_CPU     0
-#define RLIMIT_FSIZE   1
-#define RLIMIT_DATA    2
-#define RLIMIT_STACK   3
-#define RLIMIT_CORE    4
-#ifndef RLIMIT_RSS
-#define RLIMIT_RSS     5
-#define RLIMIT_NPROC   6
-#define RLIMIT_NOFILE  7
-#define RLIMIT_MEMLOCK 8
-#define RLIMIT_AS      9
-#endif
-#define RLIMIT_LOCKS   10
-#define RLIMIT_SIGPENDING 11
-#define RLIMIT_MSGQUEUE 12
-#define RLIMIT_NICE    13
-#define RLIMIT_RTPRIO  14
-#define RLIMIT_NLIMITS 15
-
-#define RLIM_NLIMITS RLIMIT_NLIMITS
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define RLIM64_INFINITY RLIM_INFINITY
-#define RLIM64_SAVED_CUR RLIM_SAVED_CUR
-#define RLIM64_SAVED_MAX RLIM_SAVED_MAX
-#define getrlimit64 getrlimit
-#define setrlimit64 setrlimit
-#define rlimit64 rlimit
-#define rlim64_t rlim_t
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/sem.h b/src/components/lib/libc/musl-1.1.11/include/sys/sem.h
deleted file mode 100644
index e7c369803a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/sem.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _SYS_SEM_H
-#define _SYS_SEM_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_size_t
-#define __NEED_pid_t
-#define __NEED_time_t
-#ifdef _GNU_SOURCE
-#define __NEED_struct_timespec
-#endif
-#include <bits/alltypes.h>
-
-#include <sys/ipc.h>
-
-#define SEM_UNDO	0x1000
-#define GETPID		11
-#define GETVAL		12
-#define GETALL		13
-#define GETNCNT		14
-#define GETZCNT		15
-#define SETVAL		16
-#define SETALL		17
-
-#include <endian.h>
-
-#include <bits/sem.h>
-
-#define _SEM_SEMUN_UNDEFINED 1
-
-#define SEM_STAT 18
-#define SEM_INFO 19
-
-struct  seminfo {
-	int semmap;
-	int semmni;
-	int semmns;
-	int semmnu;
-	int semmsl;
-	int semopm;
-	int semume;
-	int semusz;
-	int semvmx;
-	int semaem;
-};
-
-struct sembuf {
-	unsigned short sem_num;
-	short sem_op;
-	short sem_flg;
-};
-
-int semctl(int, int, int, ...);
-int semget(key_t, int, int);
-int semop(int, struct sembuf *, size_t);
-
-#ifdef _GNU_SOURCE
-int semtimedop(int, struct sembuf *, size_t, const struct timespec *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/shm.h b/src/components/lib/libc/musl-1.1.11/include/sys/shm.h
deleted file mode 100644
index 67be822bc3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/shm.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _SYS_SHM_H
-#define _SYS_SHM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_time_t
-#define __NEED_size_t
-#define __NEED_pid_t
-
-#include <bits/alltypes.h>
-
-#include <sys/ipc.h>
-
-#ifdef _GNU_SOURCE
-#define __used_ids used_ids
-#define __swap_attempts swap_attempts
-#define __swap_successes swap_successes
-#endif
-
-#include <bits/shm.h>
-
-#define SHM_R 0400
-#define SHM_W 0200
-
-#define SHM_RDONLY 010000
-#define SHM_RND    020000
-#define SHM_REMAP  040000
-#define SHM_EXEC   0100000
-
-#define SHM_LOCK 11
-#define SHM_UNLOCK 12
-#define SHM_STAT 13
-#define SHM_INFO 14
-#define SHM_DEST 01000
-#define SHM_LOCKED 02000
-#define SHM_HUGETLB 04000
-#define SHM_NORESERVE 010000
-
-typedef unsigned long shmatt_t;
-
-void *shmat(int, const void *, int);
-int shmctl(int, int, struct shmid_ds *);
-int shmdt(const void *);
-int shmget(key_t, size_t, int);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/socket.h b/src/components/lib/libc/musl-1.1.11/include/sys/socket.h
deleted file mode 100644
index 40de336956..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/socket.h
+++ /dev/null
@@ -1,319 +0,0 @@
-#ifndef	_SYS_SOCKET_H
-#define	_SYS_SOCKET_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_socklen_t
-#define __NEED_sa_family_t
-#define __NEED_size_t
-#define __NEED_ssize_t
-#define __NEED_uid_t
-#define __NEED_pid_t
-#define __NEED_gid_t
-#define __NEED_struct_iovec
-
-#include <bits/alltypes.h>
-
-#include <bits/socket.h>
-
-#ifdef _GNU_SOURCE
-struct ucred
-{
-	pid_t pid;
-	uid_t uid;
-	gid_t gid;
-};
-
-struct mmsghdr
-{
-	struct msghdr msg_hdr;
-	unsigned int  msg_len;
-};
-
-struct timespec;
-
-int sendmmsg (int, struct mmsghdr *, unsigned int, unsigned int);
-int recvmmsg (int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
-#endif
-
-struct linger
-{
-	int l_onoff;
-	int l_linger;
-};
-
-#define SHUT_RD 0
-#define SHUT_WR 1
-#define SHUT_RDWR 2
-
-#ifndef SOCK_STREAM
-#define SOCK_STREAM    1
-#define SOCK_DGRAM     2
-#endif
-
-#define SOCK_RAW       3
-#define SOCK_RDM       4
-#define SOCK_SEQPACKET 5
-#define SOCK_DCCP      6
-#define SOCK_PACKET    10
-
-#ifndef SOCK_CLOEXEC
-#define SOCK_CLOEXEC   02000000
-#define SOCK_NONBLOCK  04000
-#endif
-
-#define PF_UNSPEC       0
-#define PF_LOCAL        1
-#define PF_UNIX         PF_LOCAL
-#define PF_FILE         PF_LOCAL
-#define PF_INET         2
-#define PF_AX25         3
-#define PF_IPX          4
-#define PF_APPLETALK    5
-#define PF_NETROM       6
-#define PF_BRIDGE       7
-#define PF_ATMPVC       8
-#define PF_X25          9
-#define PF_INET6        10
-#define PF_ROSE         11
-#define PF_DECnet       12
-#define PF_NETBEUI      13
-#define PF_SECURITY     14
-#define PF_KEY          15
-#define PF_NETLINK      16
-#define PF_ROUTE        PF_NETLINK
-#define PF_PACKET       17
-#define PF_ASH          18
-#define PF_ECONET       19
-#define PF_ATMSVC       20
-#define PF_RDS          21
-#define PF_SNA          22
-#define PF_IRDA         23
-#define PF_PPPOX        24
-#define PF_WANPIPE      25
-#define PF_LLC          26
-#define PF_IB           27
-#define PF_CAN          29
-#define PF_TIPC         30
-#define PF_BLUETOOTH    31
-#define PF_IUCV         32
-#define PF_RXRPC        33
-#define PF_ISDN         34
-#define PF_PHONET       35
-#define PF_IEEE802154   36
-#define PF_CAIF         37
-#define PF_ALG          38
-#define PF_NFC          39
-#define PF_VSOCK        40
-#define PF_MAX          41
-
-#define AF_UNSPEC       PF_UNSPEC
-#define AF_LOCAL        PF_LOCAL
-#define AF_UNIX         AF_LOCAL
-#define AF_FILE         AF_LOCAL
-#define AF_INET         PF_INET
-#define AF_AX25         PF_AX25
-#define AF_IPX          PF_IPX
-#define AF_APPLETALK    PF_APPLETALK
-#define AF_NETROM       PF_NETROM
-#define AF_BRIDGE       PF_BRIDGE
-#define AF_ATMPVC       PF_ATMPVC
-#define AF_X25          PF_X25
-#define AF_INET6        PF_INET6
-#define AF_ROSE         PF_ROSE
-#define AF_DECnet       PF_DECnet
-#define AF_NETBEUI      PF_NETBEUI
-#define AF_SECURITY     PF_SECURITY
-#define AF_KEY          PF_KEY
-#define AF_NETLINK      PF_NETLINK
-#define AF_ROUTE        PF_ROUTE
-#define AF_PACKET       PF_PACKET
-#define AF_ASH          PF_ASH
-#define AF_ECONET       PF_ECONET
-#define AF_ATMSVC       PF_ATMSVC
-#define AF_RDS          PF_RDS
-#define AF_SNA          PF_SNA
-#define AF_IRDA         PF_IRDA
-#define AF_PPPOX        PF_PPPOX
-#define AF_WANPIPE      PF_WANPIPE
-#define AF_LLC          PF_LLC
-#define AF_IB           PF_IB
-#define AF_CAN          PF_CAN
-#define AF_TIPC         PF_TIPC
-#define AF_BLUETOOTH    PF_BLUETOOTH
-#define AF_IUCV         PF_IUCV
-#define AF_RXRPC        PF_RXRPC
-#define AF_ISDN         PF_ISDN
-#define AF_PHONET       PF_PHONET
-#define AF_IEEE802154   PF_IEEE802154
-#define AF_CAIF         PF_CAIF
-#define AF_ALG          PF_ALG
-#define AF_NFC          PF_NFC
-#define AF_VSOCK        PF_VSOCK
-#define AF_MAX          PF_MAX
-
-#ifndef SO_DEBUG
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-#define SO_REUSEPORT    15
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-#define SO_ACCEPTCONN   30
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_PROTOCOL     38
-#define SO_DOMAIN       39
-#endif
-
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-
-#define SO_BINDTODEVICE 25
-
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-#define SO_GET_FILTER           SO_ATTACH_FILTER
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-
-#define SO_PEERSEC              31
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-#define SO_MARK                 36
-#define SO_TIMESTAMPING         37
-#define SCM_TIMESTAMPING        SO_TIMESTAMPING
-#define SO_RXQ_OVFL             40
-#define SO_WIFI_STATUS          41
-#define SCM_WIFI_STATUS         SO_WIFI_STATUS
-#define SO_PEEK_OFF             42
-#define SO_NOFCS                43
-#define SO_LOCK_FILTER          44
-#define SO_SELECT_ERR_QUEUE     45
-#define SO_BUSY_POLL            46
-#define SO_MAX_PACING_RATE      47
-#define SO_BPF_EXTENSIONS       48
-#define SO_INCOMING_CPU         49
-#define SO_ATTACH_BPF           50
-#define SO_DETACH_BPF           SO_DETACH_FILTER
-
-
-#ifndef SOL_SOCKET
-#define SOL_SOCKET      1
-#endif
-
-#define SOL_IP          0
-#define SOL_IPV6        41
-#define SOL_ICMPV6      58
-
-#define SOL_RAW         255
-#define SOL_DECNET      261
-#define SOL_X25         262
-#define SOL_PACKET      263
-#define SOL_ATM         264
-#define SOL_AAL         265
-#define SOL_IRDA        266
-
-#define SOMAXCONN       128
-
-#define MSG_OOB       0x0001
-#define MSG_PEEK      0x0002
-#define MSG_DONTROUTE 0x0004
-#define MSG_CTRUNC    0x0008
-#define MSG_PROXY     0x0010
-#define MSG_TRUNC     0x0020
-#define MSG_DONTWAIT  0x0040
-#define MSG_EOR       0x0080
-#define MSG_WAITALL   0x0100
-#define MSG_FIN       0x0200
-#define MSG_SYN       0x0400
-#define MSG_CONFIRM   0x0800
-#define MSG_RST       0x1000
-#define MSG_ERRQUEUE  0x2000
-#define MSG_NOSIGNAL  0x4000
-#define MSG_MORE      0x8000
-#define MSG_WAITFORONE 0x10000
-#define MSG_CMSG_CLOEXEC 0x40000000
-
-#define __CMSG_LEN(cmsg) (((cmsg)->cmsg_len + sizeof(long) - 1) & ~(long)(sizeof(long) - 1))
-#define __CMSG_NEXT(cmsg) ((unsigned char *)(cmsg) + __CMSG_LEN(cmsg))
-#define __MHDR_END(mhdr) ((unsigned char *)(mhdr)->msg_control + (mhdr)->msg_controllen)
-
-#define CMSG_DATA(cmsg) ((unsigned char *) (((struct cmsghdr *)(cmsg)) + 1))
-#define CMSG_NXTHDR(mhdr, cmsg) ((cmsg)->cmsg_len < sizeof (struct cmsghdr) ? (struct cmsghdr *)0 : \
-        (__CMSG_NEXT(cmsg) + sizeof (struct cmsghdr) >= __MHDR_END(mhdr) ? (struct cmsghdr *)0 : \
-        ((struct cmsghdr *)__CMSG_NEXT(cmsg))))
-#define CMSG_FIRSTHDR(mhdr) ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
-
-#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) & (size_t) ~(sizeof (size_t) - 1))
-#define CMSG_SPACE(len) (CMSG_ALIGN (len) + CMSG_ALIGN (sizeof (struct cmsghdr)))
-#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
-
-#define SCM_RIGHTS      0x01
-#define SCM_CREDENTIALS 0x02
-
-struct sockaddr
-{
-	sa_family_t sa_family;
-	char sa_data[14];
-};
-
-struct sockaddr_storage
-{
-	sa_family_t ss_family;
-	unsigned long __ss_align;
-	char __ss_padding[128-2*sizeof(unsigned long)];
-};
-
-int socket (int, int, int);
-int socketpair (int, int, int, int [2]);
-
-int shutdown (int, int);
-
-int bind (int, const struct sockaddr *, socklen_t);
-int connect (int, const struct sockaddr *, socklen_t);
-int listen (int, int);
-int accept (int, struct sockaddr *__restrict, socklen_t *__restrict);
-int accept4(int, struct sockaddr *__restrict, socklen_t *__restrict, int);
-
-int getsockname (int, struct sockaddr *__restrict, socklen_t *__restrict);
-int getpeername (int, struct sockaddr *__restrict, socklen_t *__restrict);
-
-ssize_t send (int, const void *, size_t, int);
-ssize_t recv (int, void *, size_t, int);
-ssize_t sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t);
-ssize_t recvfrom (int, void *__restrict, size_t, int, struct sockaddr *__restrict, socklen_t *__restrict);
-ssize_t sendmsg (int, const struct msghdr *, int);
-ssize_t recvmsg (int, struct msghdr *, int);
-
-int getsockopt (int, int, int, void *__restrict, socklen_t *__restrict);
-int setsockopt (int, int, int, const void *, socklen_t);
-
-int sockatmark (int);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/stat.h b/src/components/lib/libc/musl-1.1.11/include/sys/stat.h
deleted file mode 100644
index 82a649043d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/stat.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#ifndef	_SYS_STAT_H
-#define	_SYS_STAT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_dev_t
-#define __NEED_ino_t
-#define __NEED_mode_t
-#define __NEED_nlink_t
-#define __NEED_uid_t
-#define __NEED_gid_t
-#define __NEED_off_t
-#define __NEED_time_t
-#define __NEED_blksize_t
-#define __NEED_blkcnt_t
-#define __NEED_struct_timespec
-
-#include <bits/alltypes.h>
-
-#include <bits/stat.h>
-
-#define st_atime st_atim.tv_sec
-#define st_mtime st_mtim.tv_sec
-#define st_ctime st_ctim.tv_sec
-
-#define S_IFMT  0170000
-
-#define S_IFDIR 0040000
-#define S_IFCHR 0020000
-#define S_IFBLK 0060000
-#define S_IFREG 0100000
-#define S_IFIFO 0010000
-#define S_IFLNK 0120000
-#define S_IFSOCK 0140000
-
-#define S_TYPEISMQ(buf)  0
-#define S_TYPEISSEM(buf) 0
-#define S_TYPEISSHM(buf) 0
-#define S_TYPEISTMO(buf) 0
-
-#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
-#define S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
-#define S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
-#define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
-#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)
-#define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
-#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
-
-#ifndef S_IRUSR
-#define S_ISUID 04000
-#define S_ISGID 02000
-#define S_ISVTX 01000
-#define S_IRUSR 0400
-#define S_IWUSR 0200
-#define S_IXUSR 0100
-#define S_IRWXU 0700
-#define S_IRGRP 0040
-#define S_IWGRP 0020
-#define S_IXGRP 0010
-#define S_IRWXG 0070
-#define S_IROTH 0004
-#define S_IWOTH 0002
-#define S_IXOTH 0001
-#define S_IRWXO 0007
-#endif
-
-#define UTIME_NOW  0x3fffffff
-#define UTIME_OMIT 0x3ffffffe
-
-int stat(const char *__restrict, struct stat *__restrict);
-int fstat(int, struct stat *);
-int lstat(const char *__restrict, struct stat *__restrict);
-int fstatat(int, const char *__restrict, struct stat *__restrict, int);
-int chmod(const char *, mode_t);
-int fchmod(int, mode_t);
-int fchmodat(int, const char *, mode_t, int);
-mode_t umask(mode_t);
-int mkdir(const char *, mode_t);
-int mknod(const char *, mode_t, dev_t);
-int mkfifo(const char *, mode_t);
-int mkdirat(int, const char *, mode_t);
-int mknodat(int, const char *, mode_t, dev_t);
-int mkfifoat(int, const char *, mode_t);
-
-int futimens(int, const struct timespec [2]);
-int utimensat(int, const char *, const struct timespec [2], int);
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-int lchmod(const char *, mode_t);
-#define S_IREAD S_IRUSR
-#define S_IWRITE S_IWUSR
-#define S_IEXEC S_IXUSR
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define stat64 stat
-#define fstat64 fstat
-#define lstat64 lstat
-#define fstatat64 fstatat
-#define blkcnt64_t blkcnt_t
-#define fsblkcnt64_t fsblkcnt_t
-#define fsfilcnt64_t fsfilcnt_t
-#define ino64_t ino_t
-#define off64_t off_t
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/time.h b/src/components/lib/libc/musl-1.1.11/include/sys/time.h
deleted file mode 100644
index bfe1414e86..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/time.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef _SYS_TIME_H
-#define _SYS_TIME_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#include <sys/select.h>
-
-int gettimeofday (struct timeval *__restrict, void *__restrict);
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-
-#define ITIMER_REAL    0
-#define ITIMER_VIRTUAL 1
-#define ITIMER_PROF    2
-
-struct itimerval
-{
-	struct timeval it_interval;
-	struct timeval it_value;
-};
-
-int getitimer (int, struct itimerval *);
-int setitimer (int, const struct itimerval *__restrict, struct itimerval *__restrict);
-int utimes (const char *, const struct timeval [2]);
-
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-struct timezone {
-	int tz_minuteswest;
-	int tz_dsttime;
-};
-int futimes(int, const struct timeval [2]);
-int futimesat(int, const char *, const struct timeval [2]);
-int lutimes(const char *, const struct timeval [2]);
-int settimeofday(const struct timeval *, const struct timezone *);
-int adjtime (const struct timeval *, struct timeval *);
-#define timerisset(t) ((t)->tv_sec || (t)->tv_usec)
-#define timerclear(t) ((t)->tv_sec = (t)->tv_usec = 0)
-#define timercmp(s,t,op) ((s)->tv_sec == (t)->tv_sec ? \
-	(s)->tv_usec op (t)->tv_usec : (s)->tv_sec op (t)->tv_sec)
-#define timeradd(s,t,a) (void) ( (a)->tv_sec = (s)->tv_sec + (t)->tv_sec, \
-	((a)->tv_usec = (s)->tv_usec + (t)->tv_usec) >= 1000000 && \
-	((a)->tv_usec -= 1000000, (a)->tv_sec++) )
-#define timersub(s,t,a) (void) ( (a)->tv_sec = (s)->tv_sec - (t)->tv_sec, \
-	((a)->tv_usec = (s)->tv_usec - (t)->tv_usec) < 0 && \
-	((a)->tv_usec += 1000000, (a)->tv_sec--) )
-#endif
-
-#if defined(_GNU_SOURCE)
-#define TIMEVAL_TO_TIMESPEC(tv, ts) ( \
-	(ts)->tv_sec = (tv)->tv_sec, \
-	(ts)->tv_nsec = (tv)->tv_usec * 1000, \
-	(void)0 )
-#define TIMESPEC_TO_TIMEVAL(tv, ts) ( \
-	(tv)->tv_sec = (ts)->tv_sec, \
-	(tv)->tv_usec = (ts)->tv_nsec / 1000, \
-	(void)0 )
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/timerfd.h b/src/components/lib/libc/musl-1.1.11/include/sys/timerfd.h
deleted file mode 100644
index 9724d90347..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/sys/timerfd.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _SYS_TIMERFD_H
-#define _SYS_TIMERFD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <time.h>
-#include <fcntl.h>
-
-#define TFD_NONBLOCK O_NONBLOCK
-#define TFD_CLOEXEC O_CLOEXEC
-
-#define TFD_TIMER_ABSTIME 1
-
-struct itimerspec;
-
-int timerfd_create(int, int);
-int timerfd_settime(int, int, const struct itimerspec *, struct itimerspec *);
-int timerfd_gettime(int, struct itimerspec *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/time.h b/src/components/lib/libc/musl-1.1.11/include/time.h
deleted file mode 100644
index 16ec08aeb2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/time.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef	_TIME_H
-#define _TIME_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#ifdef __cplusplus
-#define NULL 0L
-#else
-#define NULL ((void*)0)
-#endif
-
-
-#define __NEED_size_t
-#define __NEED_time_t
-#define __NEED_clock_t
-#define __NEED_struct_timespec
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-#define __NEED_clockid_t
-#define __NEED_timer_t
-#define __NEED_pid_t
-#define __NEED_locale_t
-#endif
-
-#include <bits/alltypes.h>
-
-#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-#define __tm_gmtoff tm_gmtoff
-#define __tm_zone tm_zone
-#endif
-
-struct tm
-{
-	int tm_sec;
-	int tm_min;
-	int tm_hour;
-	int tm_mday;
-	int tm_mon;
-	int tm_year;
-	int tm_wday;
-	int tm_yday;
-	int tm_isdst;
-	long __tm_gmtoff;
-	const char *__tm_zone;
-};
-
-clock_t clock (void);
-time_t time (time_t *);
-double difftime (time_t, time_t);
-time_t mktime (struct tm *);
-size_t strftime (char *__restrict, size_t, const char *__restrict, const struct tm *__restrict);
-struct tm *gmtime (const time_t *);
-struct tm *localtime (const time_t *);
-char *asctime (const struct tm *);
-char *ctime (const time_t *);
-int timespec_get(struct timespec *, int);
-
-#define CLOCKS_PER_SEC 1000000L
-
-#define TIME_UTC 1
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
- || defined(_BSD_SOURCE)
-
-size_t strftime_l (char *  __restrict, size_t, const char *  __restrict, const struct tm *  __restrict, locale_t);
-
-struct tm *gmtime_r (const time_t *__restrict, struct tm *__restrict);
-struct tm *localtime_r (const time_t *__restrict, struct tm *__restrict);
-char *asctime_r (const struct tm *__restrict, char *__restrict);
-char *ctime_r (const time_t *, char *);
-
-void tzset (void);
-
-struct itimerspec
-{
-	struct timespec it_interval;
-	struct timespec it_value;
-};
-
-#define CLOCK_REALTIME           0
-#define CLOCK_MONOTONIC          1
-#define CLOCK_PROCESS_CPUTIME_ID 2
-#define CLOCK_THREAD_CPUTIME_ID  3
-#define CLOCK_MONOTONIC_RAW      4
-#define CLOCK_REALTIME_COARSE    5
-#define CLOCK_MONOTONIC_COARSE   6
-#define CLOCK_BOOTTIME           7
-#define CLOCK_REALTIME_ALARM     8
-#define CLOCK_BOOTTIME_ALARM     9
-#define CLOCK_SGI_CYCLE         10
-#define CLOCK_TAI               11
-
-#define TIMER_ABSTIME 1
-
-int nanosleep (const struct timespec *, struct timespec *);
-int clock_getres (clockid_t, struct timespec *);
-int clock_gettime (clockid_t, struct timespec *);
-int clock_settime (clockid_t, const struct timespec *);
-int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *);
-int clock_getcpuclockid (pid_t, clockid_t *);
-
-struct sigevent;
-int timer_create (clockid_t, struct sigevent *__restrict, timer_t *__restrict);
-int timer_delete (timer_t);
-int timer_settime (timer_t, int, const struct itimerspec *__restrict, struct itimerspec *__restrict);
-int timer_gettime (timer_t, struct itimerspec *);
-int timer_getoverrun (timer_t);
-
-#endif
-
-
-#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-char *strptime (const char *__restrict, const char *__restrict, struct tm *__restrict);
-extern int daylight;
-extern long timezone;
-extern char *tzname[2];
-extern int getdate_err;
-struct tm *getdate (const char *);
-#endif
-
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-int stime(const time_t *);
-time_t timegm(struct tm *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/unistd.h b/src/components/lib/libc/musl-1.1.11/include/unistd.h
deleted file mode 100644
index 760a1652ab..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/unistd.h
+++ /dev/null
@@ -1,465 +0,0 @@
-#ifndef	_UNISTD_H
-#define	_UNISTD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define STDIN_FILENO  0
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
-
-#define SEEK_SET 0
-#define SEEK_CUR 1
-#define SEEK_END 2
-
-#ifdef __cplusplus
-#define NULL 0L
-#else
-#define NULL ((void*)0)
-#endif
-
-#define __NEED_size_t
-#define __NEED_ssize_t
-#define __NEED_uid_t
-#define __NEED_gid_t
-#define __NEED_off_t
-#define __NEED_pid_t
-#define __NEED_intptr_t
-#define __NEED_useconds_t
-
-#include <bits/alltypes.h>
-
-int pipe(int [2]);
-int pipe2(int [2], int);
-int close(int);
-int posix_close(int, int);
-int dup(int);
-int dup2(int, int);
-int dup3(int, int, int);
-off_t lseek(int, off_t, int);
-int fsync(int);
-int fdatasync(int);
-
-ssize_t read(int, void *, size_t);
-ssize_t write(int, const void *, size_t);
-ssize_t pread(int, void *, size_t, off_t);
-ssize_t pwrite(int, const void *, size_t, off_t);
-
-int chown(const char *, uid_t, gid_t);
-int fchown(int, uid_t, gid_t);
-int lchown(const char *, uid_t, gid_t);
-int fchownat(int, const char *, uid_t, gid_t, int);
-
-int link(const char *, const char *);
-int linkat(int, const char *, int, const char *, int);
-int symlink(const char *, const char *);
-int symlinkat(const char *, int, const char *);
-ssize_t readlink(const char *__restrict, char *__restrict, size_t);
-ssize_t readlinkat(int, const char *__restrict, char *__restrict, size_t);
-int unlink(const char *);
-int unlinkat(int, const char *, int);
-int rmdir(const char *);
-int truncate(const char *, off_t);
-int ftruncate(int, off_t);
-
-#define F_OK 0
-#define R_OK 4
-#define W_OK 2
-#define X_OK 1
-
-int access(const char *, int);
-int faccessat(int, const char *, int, int);
-
-int chdir(const char *);
-int fchdir(int);
-char *getcwd(char *, size_t);
-
-unsigned alarm(unsigned);
-unsigned sleep(unsigned);
-int pause(void);
-
-pid_t fork(void);
-int execve(const char *, char *const [], char *const []);
-int execv(const char *, char *const []);
-int execle(const char *, const char *, ...);
-int execl(const char *, const char *, ...);
-int execvp(const char *, char *const []);
-int execlp(const char *, const char *, ...);
-int fexecve(int, char *const [], char *const []);
-_Noreturn void _exit(int);
-
-pid_t getpid(void);
-pid_t getppid(void);
-pid_t getpgrp(void);
-pid_t getpgid(pid_t);
-int setpgid(pid_t, pid_t);
-pid_t setsid(void);
-pid_t getsid(pid_t);
-char *ttyname(int);
-int ttyname_r(int, char *, size_t);
-int isatty(int);
-pid_t tcgetpgrp(int);
-int tcsetpgrp(int, pid_t);
-
-uid_t getuid(void);
-uid_t geteuid(void);
-gid_t getgid(void);
-gid_t getegid(void);
-int getgroups(int, gid_t []);
-int setuid(uid_t);
-int setreuid(uid_t, uid_t);
-int seteuid(uid_t);
-int setgid(gid_t);
-int setregid(gid_t, gid_t);
-int setegid(gid_t);
-
-char *getlogin(void);
-int getlogin_r(char *, size_t);
-int gethostname(char *, size_t);
-char *ctermid(char *);
-
-int getopt(int, char * const [], const char *);
-extern char *optarg;
-extern int optind, opterr, optopt;
-
-long pathconf(const char *, int);
-long fpathconf(int, int);
-long sysconf(int);
-size_t confstr(int, char *, size_t);
-
-#define F_ULOCK 0
-#define F_LOCK  1
-#define F_TLOCK 2
-#define F_TEST  3
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-int lockf(int, int, off_t);
-long gethostid(void);
-int nice(int);
-void sync(void);
-pid_t setpgrp(void);
-char *crypt(const char *, const char *);
-void encrypt(char *, int);
-void swab(const void *__restrict, void *__restrict, ssize_t);
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) \
- || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
-int usleep(unsigned);
-unsigned ualarm(unsigned, unsigned);
-#endif
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define L_SET 0
-#define L_INCR 1
-#define L_XTND 2
-int brk(void *);
-void *sbrk(intptr_t);
-pid_t vfork(void);
-int vhangup(void);
-int chroot(const char *);
-int getpagesize(void);
-int getdtablesize(void);
-int sethostname(const char *, size_t);
-int getdomainname(char *, size_t);
-int setdomainname(const char *, size_t);
-int setgroups(size_t, const gid_t *);
-char *getpass(const char *);
-int daemon(int, int);
-void setusershell(void);
-void endusershell(void);
-char *getusershell(void);
-int acct(const char *);
-long syscall(long, ...);
-int execvpe(const char *, char *const [], char *const []);
-int issetugid(void);
-#endif
-
-#ifdef _GNU_SOURCE
-extern char **environ;
-int setresuid(uid_t, uid_t, uid_t);
-int setresgid(gid_t, gid_t, gid_t);
-int getresuid(uid_t *, uid_t *, uid_t *);
-int getresgid(gid_t *, gid_t *, gid_t *);
-char *get_current_dir_name(void);
-int syncfs(int);
-int euidaccess(const char *, int);
-int eaccess(const char *, int);
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define lseek64 lseek
-#define pread64 pread
-#define pwrite64 pwrite
-#define truncate64 truncate
-#define ftruncate64 ftruncate
-#define lockf64 lockf
-#define off64_t off_t
-#endif
-
-#define POSIX_CLOSE_RESTART     0
-
-#define _XOPEN_VERSION          700
-#define _XOPEN_UNIX             1
-#define _XOPEN_ENH_I18N         1
-
-#define _POSIX_VERSION          200809L
-#define _POSIX2_VERSION         _POSIX_VERSION
-
-#define _POSIX_ADVISORY_INFO    _POSIX_VERSION
-#define _POSIX_CHOWN_RESTRICTED 1
-#define _POSIX_IPV6             _POSIX_VERSION
-#define _POSIX_JOB_CONTROL      1
-#define _POSIX_MAPPED_FILES     _POSIX_VERSION
-#define _POSIX_MEMLOCK          _POSIX_VERSION
-#define _POSIX_MEMLOCK_RANGE    _POSIX_VERSION
-#define _POSIX_MEMORY_PROTECTION _POSIX_VERSION
-#define _POSIX_MESSAGE_PASSING  _POSIX_VERSION
-#define _POSIX_FSYNC            _POSIX_VERSION
-#define _POSIX_NO_TRUNC         1
-#define _POSIX_RAW_SOCKETS      _POSIX_VERSION
-#define _POSIX_REALTIME_SIGNALS _POSIX_VERSION
-#define _POSIX_REGEXP           1
-#define _POSIX_SAVED_IDS        1
-#define _POSIX_SHELL            1
-#define _POSIX_SPAWN            _POSIX_VERSION
-#define _POSIX_VDISABLE         0
-
-#define _POSIX_THREADS          _POSIX_VERSION
-#define _POSIX_THREAD_PROCESS_SHARED _POSIX_VERSION
-#define _POSIX_THREAD_SAFE_FUNCTIONS _POSIX_VERSION
-#define _POSIX_THREAD_ATTR_STACKADDR _POSIX_VERSION
-#define _POSIX_THREAD_ATTR_STACKSIZE _POSIX_VERSION
-#define _POSIX_THREAD_PRIORITY_SCHEDULING _POSIX_VERSION
-#define _POSIX_THREAD_CPUTIME   _POSIX_VERSION
-#define _POSIX_TIMERS           _POSIX_VERSION
-#define _POSIX_TIMEOUTS         _POSIX_VERSION
-#define _POSIX_MONOTONIC_CLOCK  _POSIX_VERSION
-#define _POSIX_CPUTIME          _POSIX_VERSION
-#define _POSIX_CLOCK_SELECTION  _POSIX_VERSION
-#define _POSIX_BARRIERS         _POSIX_VERSION
-#define _POSIX_SPIN_LOCKS       _POSIX_VERSION
-#define _POSIX_READER_WRITER_LOCKS _POSIX_VERSION
-#define _POSIX_ASYNCHRONOUS_IO  _POSIX_VERSION
-#define _POSIX_SEMAPHORES       _POSIX_VERSION
-#define _POSIX_SHARED_MEMORY_OBJECTS _POSIX_VERSION
-
-#define _POSIX2_C_BIND          _POSIX_VERSION
-
-#include <bits/posix.h>
-
-
-
-#define _PC_LINK_MAX	0
-#define _PC_MAX_CANON	1
-#define _PC_MAX_INPUT	2
-#define _PC_NAME_MAX	3
-#define _PC_PATH_MAX	4
-#define _PC_PIPE_BUF	5
-#define _PC_CHOWN_RESTRICTED	6
-#define _PC_NO_TRUNC	7
-#define _PC_VDISABLE	8
-#define _PC_SYNC_IO	9
-#define _PC_ASYNC_IO	10
-#define _PC_PRIO_IO	11
-#define _PC_SOCK_MAXBUF	12
-#define _PC_FILESIZEBITS	13
-#define _PC_REC_INCR_XFER_SIZE	14
-#define _PC_REC_MAX_XFER_SIZE	15
-#define _PC_REC_MIN_XFER_SIZE	16
-#define _PC_REC_XFER_ALIGN	17
-#define _PC_ALLOC_SIZE_MIN	18
-#define _PC_SYMLINK_MAX	19
-#define _PC_2_SYMLINKS	20
-
-#define _SC_ARG_MAX	0
-#define _SC_CHILD_MAX	1
-#define _SC_CLK_TCK	2
-#define _SC_NGROUPS_MAX	3
-#define _SC_OPEN_MAX	4
-#define _SC_STREAM_MAX	5
-#define _SC_TZNAME_MAX	6
-#define _SC_JOB_CONTROL	7
-#define _SC_SAVED_IDS	8
-#define _SC_REALTIME_SIGNALS	9
-#define _SC_PRIORITY_SCHEDULING	10
-#define _SC_TIMERS	11
-#define _SC_ASYNCHRONOUS_IO	12
-#define _SC_PRIORITIZED_IO	13
-#define _SC_SYNCHRONIZED_IO	14
-#define _SC_FSYNC	15
-#define _SC_MAPPED_FILES	16
-#define _SC_MEMLOCK	17
-#define _SC_MEMLOCK_RANGE	18
-#define _SC_MEMORY_PROTECTION	19
-#define _SC_MESSAGE_PASSING	20
-#define _SC_SEMAPHORES	21
-#define _SC_SHARED_MEMORY_OBJECTS	22
-#define _SC_AIO_LISTIO_MAX	23
-#define _SC_AIO_MAX	24
-#define _SC_AIO_PRIO_DELTA_MAX	25
-#define _SC_DELAYTIMER_MAX	26
-#define _SC_MQ_OPEN_MAX	27
-#define _SC_MQ_PRIO_MAX	28
-#define _SC_VERSION	29
-#define _SC_PAGE_SIZE	30
-#define _SC_PAGESIZE	30 /* !! */
-#define _SC_RTSIG_MAX	31
-#define _SC_SEM_NSEMS_MAX	32
-#define _SC_SEM_VALUE_MAX	33
-#define _SC_SIGQUEUE_MAX	34
-#define _SC_TIMER_MAX	35
-#define _SC_BC_BASE_MAX	36
-#define _SC_BC_DIM_MAX	37
-#define _SC_BC_SCALE_MAX	38
-#define _SC_BC_STRING_MAX	39
-#define _SC_COLL_WEIGHTS_MAX	40
-#define _SC_EXPR_NEST_MAX	42
-#define _SC_LINE_MAX	43
-#define _SC_RE_DUP_MAX	44
-#define _SC_2_VERSION	46
-#define _SC_2_C_BIND	47
-#define _SC_2_C_DEV	48
-#define _SC_2_FORT_DEV	49
-#define _SC_2_FORT_RUN	50
-#define _SC_2_SW_DEV	51
-#define _SC_2_LOCALEDEF	52
-#define _SC_UIO_MAXIOV	60 /* !! */
-#define _SC_IOV_MAX	60
-#define _SC_THREADS	67
-#define _SC_THREAD_SAFE_FUNCTIONS	68
-#define _SC_GETGR_R_SIZE_MAX	69
-#define _SC_GETPW_R_SIZE_MAX	70
-#define _SC_LOGIN_NAME_MAX	71
-#define _SC_TTY_NAME_MAX	72
-#define _SC_THREAD_DESTRUCTOR_ITERATIONS	73
-#define _SC_THREAD_KEYS_MAX	74
-#define _SC_THREAD_STACK_MIN	75
-#define _SC_THREAD_THREADS_MAX	76
-#define _SC_THREAD_ATTR_STACKADDR	77
-#define _SC_THREAD_ATTR_STACKSIZE	78
-#define _SC_THREAD_PRIORITY_SCHEDULING	79
-#define _SC_THREAD_PRIO_INHERIT	80
-#define _SC_THREAD_PRIO_PROTECT	81
-#define _SC_THREAD_PROCESS_SHARED	82
-#define _SC_NPROCESSORS_CONF	83
-#define _SC_NPROCESSORS_ONLN	84
-#define _SC_PHYS_PAGES	85
-#define _SC_AVPHYS_PAGES	86
-#define _SC_ATEXIT_MAX	87
-#define _SC_PASS_MAX	88
-#define _SC_XOPEN_VERSION	89
-#define _SC_XOPEN_XCU_VERSION	90
-#define _SC_XOPEN_UNIX	91
-#define _SC_XOPEN_CRYPT	92
-#define _SC_XOPEN_ENH_I18N	93
-#define _SC_XOPEN_SHM	94
-#define _SC_2_CHAR_TERM	95
-#define _SC_2_UPE	97
-#define _SC_XOPEN_XPG2	98
-#define _SC_XOPEN_XPG3	99
-#define _SC_XOPEN_XPG4	100
-#define _SC_NZERO	109
-#define _SC_XBS5_ILP32_OFF32	125
-#define _SC_XBS5_ILP32_OFFBIG	126
-#define _SC_XBS5_LP64_OFF64	127
-#define _SC_XBS5_LPBIG_OFFBIG	128
-#define _SC_XOPEN_LEGACY	129
-#define _SC_XOPEN_REALTIME	130
-#define _SC_XOPEN_REALTIME_THREADS	131
-#define _SC_ADVISORY_INFO	132
-#define _SC_BARRIERS	133
-#define _SC_CLOCK_SELECTION	137
-#define _SC_CPUTIME	138
-#define _SC_THREAD_CPUTIME	139
-#define _SC_MONOTONIC_CLOCK	149
-#define _SC_READER_WRITER_LOCKS	153
-#define _SC_SPIN_LOCKS	154
-#define _SC_REGEXP	155
-#define _SC_SHELL	157
-#define _SC_SPAWN	159
-#define _SC_SPORADIC_SERVER	160
-#define _SC_THREAD_SPORADIC_SERVER	161
-#define _SC_TIMEOUTS	164
-#define _SC_TYPED_MEMORY_OBJECTS	165
-#define _SC_2_PBS	168
-#define _SC_2_PBS_ACCOUNTING	169
-#define _SC_2_PBS_LOCATE	170
-#define _SC_2_PBS_MESSAGE	171
-#define _SC_2_PBS_TRACK	172
-#define _SC_SYMLOOP_MAX	173
-#define _SC_STREAMS	174
-#define _SC_2_PBS_CHECKPOINT	175
-#define _SC_V6_ILP32_OFF32	176
-#define _SC_V6_ILP32_OFFBIG	177
-#define _SC_V6_LP64_OFF64	178
-#define _SC_V6_LPBIG_OFFBIG	179
-#define _SC_HOST_NAME_MAX	180
-#define _SC_TRACE	181
-#define _SC_TRACE_EVENT_FILTER	182
-#define _SC_TRACE_INHERIT	183
-#define _SC_TRACE_LOG	184
-
-#define _SC_IPV6	235
-#define _SC_RAW_SOCKETS	236
-#define _SC_V7_ILP32_OFF32	237
-#define _SC_V7_ILP32_OFFBIG	238
-#define _SC_V7_LP64_OFF64	239
-#define _SC_V7_LPBIG_OFFBIG	240
-#define _SC_SS_REPL_MAX	241
-#define _SC_TRACE_EVENT_NAME_MAX	242
-#define _SC_TRACE_NAME_MAX	243
-#define _SC_TRACE_SYS_MAX	244
-#define _SC_TRACE_USER_EVENT_MAX	245
-#define _SC_XOPEN_STREAMS	246
-#define _SC_THREAD_ROBUST_PRIO_INHERIT	247
-#define _SC_THREAD_ROBUST_PRIO_PROTECT	248
-
-#define _CS_PATH	0
-#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	1
-#define _CS_GNU_LIBC_VERSION	2
-#define _CS_GNU_LIBPTHREAD_VERSION	3
-#define _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS	4
-#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS	5
-
-#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS	1116
-#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS	1117
-#define _CS_POSIX_V6_ILP32_OFF32_LIBS	1118
-#define _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS	1119
-#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS	1120
-#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS	1121
-#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS	1122
-#define _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS	1123
-#define _CS_POSIX_V6_LP64_OFF64_CFLAGS	1124
-#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS	1125
-#define _CS_POSIX_V6_LP64_OFF64_LIBS	1126
-#define _CS_POSIX_V6_LP64_OFF64_LINTFLAGS	1127
-#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS	1128
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS	1129
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS	1130
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS	1131
-#define _CS_POSIX_V7_ILP32_OFF32_CFLAGS	1132
-#define _CS_POSIX_V7_ILP32_OFF32_LDFLAGS	1133
-#define _CS_POSIX_V7_ILP32_OFF32_LIBS	1134
-#define _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS	1135
-#define _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS	1136
-#define _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS	1137
-#define _CS_POSIX_V7_ILP32_OFFBIG_LIBS	1138
-#define _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS	1139
-#define _CS_POSIX_V7_LP64_OFF64_CFLAGS	1140
-#define _CS_POSIX_V7_LP64_OFF64_LDFLAGS	1141
-#define _CS_POSIX_V7_LP64_OFF64_LIBS	1142
-#define _CS_POSIX_V7_LP64_OFF64_LINTFLAGS	1143
-#define _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS	1144
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS	1145
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS	1146
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS	1147
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/utime.h b/src/components/lib/libc/musl-1.1.11/include/utime.h
deleted file mode 100644
index ec82e0f3f8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/utime.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef	_UTIME_H
-#define	_UTIME_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __NEED_time_t
-
-#include <bits/alltypes.h>
-
-struct utimbuf
-{
-	time_t actime;
-	time_t modtime;
-};
-
-int utime (const char *, const struct utimbuf *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/wchar.h b/src/components/lib/libc/musl-1.1.11/include/wchar.h
deleted file mode 100644
index 0167dce6b5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/include/wchar.h
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef _WCHAR_H
-#define _WCHAR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define __NEED_FILE
-#define __NEED___isoc_va_list
-#define __NEED_size_t
-#define __NEED_wchar_t
-#define __NEED_wint_t
-#define __NEED_mbstate_t
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define __NEED_locale_t
-#define __NEED_va_list
-#endif
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define __NEED_wctype_t
-#endif
-
-#include <bits/alltypes.h>
-
-#if L'\0'-1 > 0
-#define WCHAR_MAX (0xffffffffu+L'\0')
-#define WCHAR_MIN (0+L'\0')
-#else
-#define WCHAR_MAX (0x7fffffff+L'\0')
-#define WCHAR_MIN (-1-0x7fffffff+L'\0')
-#endif
-
-#ifdef __cplusplus
-#define NULL 0L
-#else
-#define NULL ((void*)0)
-#endif
-
-#undef WEOF
-#define WEOF 0xffffffffU
-
-wchar_t *wcscpy (wchar_t *__restrict, const wchar_t *__restrict);
-wchar_t *wcsncpy (wchar_t *__restrict, const wchar_t *__restrict, size_t);
-
-wchar_t *wcscat (wchar_t *__restrict, const wchar_t *__restrict);
-wchar_t *wcsncat (wchar_t *__restrict, const wchar_t *__restrict, size_t);
-
-int wcscmp (const wchar_t *, const wchar_t *);
-int wcsncmp (const wchar_t *, const wchar_t *, size_t);
-
-int wcscoll(const wchar_t *, const wchar_t *);
-size_t wcsxfrm (wchar_t *__restrict, const wchar_t *__restrict, size_t n);
-
-wchar_t *wcschr (const wchar_t *, wchar_t);
-wchar_t *wcsrchr (const wchar_t *, wchar_t);
-
-size_t wcscspn (const wchar_t *, const wchar_t *);
-size_t wcsspn (const wchar_t *, const wchar_t *);
-wchar_t *wcspbrk (const wchar_t *, const wchar_t *);
-
-wchar_t *wcstok (wchar_t *__restrict, const wchar_t *__restrict, wchar_t **__restrict);
-
-size_t wcslen (const wchar_t *);
-
-wchar_t *wcsstr (const wchar_t *__restrict, const wchar_t *__restrict);
-wchar_t *wcswcs (const wchar_t *, const wchar_t *);
-
-wchar_t *wmemchr (const wchar_t *, wchar_t, size_t);
-int wmemcmp (const wchar_t *, const wchar_t *, size_t);
-wchar_t *wmemcpy (wchar_t *__restrict, const wchar_t *__restrict, size_t);
-wchar_t *wmemmove (wchar_t *, const wchar_t *, size_t);
-wchar_t *wmemset (wchar_t *, wchar_t, size_t);
-
-wint_t btowc (int);
-int wctob (wint_t);
-
-int mbsinit (const mbstate_t *);
-size_t mbrtowc (wchar_t *__restrict, const char *__restrict, size_t, mbstate_t *__restrict);
-size_t wcrtomb (char *__restrict, wchar_t, mbstate_t *__restrict);
-
-size_t mbrlen (const char *__restrict, size_t, mbstate_t *__restrict);
-
-size_t mbsrtowcs (wchar_t *__restrict, const char **__restrict, size_t, mbstate_t *__restrict);
-size_t wcsrtombs (char *__restrict, const wchar_t **__restrict, size_t, mbstate_t *__restrict);
-
-float wcstof (const wchar_t *__restrict, wchar_t **__restrict);
-double wcstod (const wchar_t *__restrict, wchar_t **__restrict);
-long double wcstold (const wchar_t *__restrict, wchar_t **__restrict);
-
-long wcstol (const wchar_t *__restrict, wchar_t **__restrict, int);
-unsigned long wcstoul (const wchar_t *__restrict, wchar_t **__restrict, int);
-
-long long wcstoll (const wchar_t *__restrict, wchar_t **__restrict, int);
-unsigned long long wcstoull (const wchar_t *__restrict, wchar_t **__restrict, int);
-
-
-
-int fwide (FILE *, int);
-
-
-int wprintf (const wchar_t *__restrict, ...);
-int fwprintf (FILE *__restrict, const wchar_t *__restrict, ...);
-int swprintf (wchar_t *__restrict, size_t, const wchar_t *__restrict, ...);
-
-int vwprintf (const wchar_t *__restrict, __isoc_va_list);
-int vfwprintf (FILE *__restrict, const wchar_t *__restrict, __isoc_va_list);
-int vswprintf (wchar_t *__restrict, size_t, const wchar_t *__restrict, __isoc_va_list);
-
-int wscanf (const wchar_t *__restrict, ...);
-int fwscanf (FILE *__restrict, const wchar_t *__restrict, ...);
-int swscanf (const wchar_t *__restrict, const wchar_t *__restrict, ...);
-
-int vwscanf (const wchar_t *__restrict, __isoc_va_list);
-int vfwscanf (FILE *__restrict, const wchar_t *__restrict, __isoc_va_list);
-int vswscanf (const wchar_t *__restrict, const wchar_t *__restrict, __isoc_va_list);
-
-wint_t fgetwc (FILE *);
-wint_t getwc (FILE *);
-wint_t getwchar (void);
-
-wint_t fputwc (wchar_t, FILE *);
-wint_t putwc (wchar_t, FILE *);
-wint_t putwchar (wchar_t);
-
-wchar_t *fgetws (wchar_t *__restrict, int, FILE *__restrict);
-int fputws (const wchar_t *__restrict, FILE *__restrict);
-
-wint_t ungetwc (wint_t, FILE *);
-
-struct tm;
-size_t wcsftime (wchar_t *__restrict, size_t, const wchar_t *__restrict, const struct tm *__restrict);
-
-#undef iswdigit
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)  || defined(_BSD_SOURCE)
-FILE *open_wmemstream(wchar_t **, size_t *);
-size_t mbsnrtowcs(wchar_t *__restrict, const char **__restrict, size_t, size_t, mbstate_t *__restrict);
-size_t wcsnrtombs(char *__restrict, const wchar_t **__restrict, size_t, size_t, mbstate_t *__restrict);
-wchar_t *wcsdup(const wchar_t *);
-size_t wcsnlen (const wchar_t *, size_t);
-wchar_t *wcpcpy (wchar_t *__restrict, const wchar_t *__restrict);
-wchar_t *wcpncpy (wchar_t *__restrict, const wchar_t *__restrict, size_t);
-int wcscasecmp(const wchar_t *, const wchar_t *);
-int wcscasecmp_l(const wchar_t *, const wchar_t *, locale_t);
-int wcsncasecmp(const wchar_t *, const wchar_t *, size_t);
-int wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t, locale_t);
-int wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
-size_t wcsxfrm_l(wchar_t *__restrict, const wchar_t *__restrict, size_t n, locale_t);
-#endif
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-int wcwidth (wchar_t);
-int wcswidth (const wchar_t *, size_t);
-int       iswalnum(wint_t);
-int       iswalpha(wint_t);
-int       iswblank(wint_t);
-int       iswcntrl(wint_t);
-int       iswdigit(wint_t);
-int       iswgraph(wint_t);
-int       iswlower(wint_t);
-int       iswprint(wint_t);
-int       iswpunct(wint_t);
-int       iswspace(wint_t);
-int       iswupper(wint_t);
-int       iswxdigit(wint_t);
-int       iswctype(wint_t, wctype_t);
-wint_t    towlower(wint_t);
-wint_t    towupper(wint_t);
-wctype_t  wctype(const char *);
-
-#ifndef __cplusplus
-#undef iswdigit
-#define iswdigit(a) (0 ? iswdigit(a) : ((unsigned)(a)-'0') < 10)
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/lib/empty b/src/components/lib/libc/musl-1.1.11/lib/empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cabs.c b/src/components/lib/libc/musl-1.1.11/src/complex/cabs.c
deleted file mode 100644
index f61d364e47..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cabs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libm.h"
-
-double cabs(double complex z)
-{
-	return hypot(creal(z), cimag(z));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cabsf.c b/src/components/lib/libc/musl-1.1.11/src/complex/cabsf.c
deleted file mode 100644
index 30b25c7031..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cabsf.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libm.h"
-
-float cabsf(float complex z)
-{
-	return hypotf(crealf(z), cimagf(z));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cacosh.c b/src/components/lib/libc/musl-1.1.11/src/complex/cacosh.c
deleted file mode 100644
index 8c68cb01fd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cacosh.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "libm.h"
-
-/* acosh(z) = i acos(z) */
-
-double complex cacosh(double complex z)
-{
-	z = cacos(z);
-	return CMPLX(-cimag(z), creal(z));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cacoshf.c b/src/components/lib/libc/musl-1.1.11/src/complex/cacoshf.c
deleted file mode 100644
index ade01c0907..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cacoshf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "libm.h"
-
-float complex cacoshf(float complex z)
-{
-	z = cacosf(z);
-	return CMPLXF(-cimagf(z), crealf(z));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cacoshl.c b/src/components/lib/libc/musl-1.1.11/src/complex/cacoshl.c
deleted file mode 100644
index 65342557f9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cacoshl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "libm.h"
-
-#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-long double complex cacoshl(long double complex z)
-{
-	return cacosh(z);
-}
-#else
-long double complex cacoshl(long double complex z)
-{
-	z = cacosl(z);
-	return CMPLXL(-cimagl(z), creall(z));
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/carg.c b/src/components/lib/libc/musl-1.1.11/src/complex/carg.c
deleted file mode 100644
index d2d1b4623a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/carg.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libm.h"
-
-double carg(double complex z)
-{
-	return atan2(cimag(z), creal(z));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cargf.c b/src/components/lib/libc/musl-1.1.11/src/complex/cargf.c
deleted file mode 100644
index ce183c4b33..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cargf.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libm.h"
-
-float cargf(float complex z)
-{
-	return atan2f(cimagf(z), crealf(z));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/casin.c b/src/components/lib/libc/musl-1.1.11/src/complex/casin.c
deleted file mode 100644
index dfdda988ba..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/casin.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "libm.h"
-
-// FIXME
-
-/* asin(z) = -i log(i z + sqrt(1 - z*z)) */
-
-double complex casin(double complex z)
-{
-	double complex w;
-	double x, y;
-
-	x = creal(z);
-	y = cimag(z);
-	w = CMPLX(1.0 - (x - y)*(x + y), -2.0*x*y);
-	return clog(CMPLX(-y, x) + csqrt(w));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/casinf.c b/src/components/lib/libc/musl-1.1.11/src/complex/casinf.c
deleted file mode 100644
index 93f0e33509..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/casinf.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "libm.h"
-
-// FIXME
-
-float complex casinf(float complex z)
-{
-	float complex w;
-	float x, y;
-
-	x = crealf(z);
-	y = cimagf(z);
-	w = CMPLXF(1.0 - (x - y)*(x + y), -2.0*x*y);
-	return clogf(CMPLXF(-y, x) + csqrtf(w));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/casinl.c b/src/components/lib/libc/musl-1.1.11/src/complex/casinl.c
deleted file mode 100644
index 0916c60f2a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/casinl.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "libm.h"
-
-#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-long double complex casinl(long double complex z)
-{
-	return casin(z);
-}
-#else
-// FIXME
-long double complex casinl(long double complex z)
-{
-	long double complex w;
-	long double x, y;
-
-	x = creall(z);
-	y = cimagl(z);
-	w = CMPLXL(1.0 - (x - y)*(x + y), -2.0*x*y);
-	return clogl(CMPLXL(-y, x) + csqrtl(w));
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cimag.c b/src/components/lib/libc/musl-1.1.11/src/complex/cimag.c
deleted file mode 100644
index 00955641b1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cimag.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libm.h"
-
-double (cimag)(double complex z)
-{
-	return cimag(z);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cimagf.c b/src/components/lib/libc/musl-1.1.11/src/complex/cimagf.c
deleted file mode 100644
index f7bcd76e43..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cimagf.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libm.h"
-
-float (cimagf)(float complex z)
-{
-	return cimagf(z);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cimagl.c b/src/components/lib/libc/musl-1.1.11/src/complex/cimagl.c
deleted file mode 100644
index 9ec24eeeaf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cimagl.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libm.h"
-
-long double (cimagl)(long double complex z)
-{
-	return cimagl(z);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_r.c b/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_r.c
deleted file mode 100644
index 5982c4c9ab..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_r.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <crypt.h>
-#include "libc.h"
-
-struct crypt_data;
-
-char *__crypt_des(const char *, const char *, char *);
-char *__crypt_md5(const char *, const char *, char *);
-char *__crypt_blowfish(const char *, const char *, char *);
-char *__crypt_sha256(const char *, const char *, char *);
-char *__crypt_sha512(const char *, const char *, char *);
-
-char *__crypt_r(const char *key, const char *salt, struct crypt_data *data)
-{
-	/* Per the crypt_r API, the caller has provided a pointer to
-	 * struct crypt_data; however, this implementation does not
-	 * use the structure to store any internal state, and treats
-	 * it purely as a char buffer for storing the result. */
-	char *output = (char *)data;
-	if (salt[0] == '$' && salt[1] && salt[2]) {
-		if (salt[1] == '1' && salt[2] == '$')
-			return __crypt_md5(key, salt, output);
-		if (salt[1] == '2' && salt[3] == '$')
-			return __crypt_blowfish(key, salt, output);
-		if (salt[1] == '5' && salt[2] == '$')
-			return __crypt_sha256(key, salt, output);
-		if (salt[1] == '6' && salt[2] == '$')
-			return __crypt_sha512(key, salt, output);
-	}
-	return __crypt_des(key, salt, output);
-}
-
-weak_alias(__crypt_r, crypt_r);
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/alpha.h b/src/components/lib/libc/musl-1.1.11/src/ctype/alpha.h
deleted file mode 100644
index b318c827f4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/alpha.h
+++ /dev/null
@@ -1,125 +0,0 @@
-18,17,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,17,34,35,36,17,37,38,39,40,
-41,42,43,44,17,45,46,47,16,16,48,16,16,16,16,16,16,16,49,50,51,16,52,53,16,16,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,54,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,55,17,17,17,17,56,17,57,58,59,60,61,62,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,63,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,64,65,17,66,67,68,69,70,71,72,
-73,16,16,16,74,75,76,77,78,16,16,16,79,80,16,16,16,16,81,16,16,16,16,16,16,16,
-16,16,17,17,17,82,83,16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,84,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,85,16,
-16,16,16,86,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,87,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-88,89,90,91,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-92,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,0,0,0,0,0,0,0,0,254,255,255,7,254,255,255,7,0,0,0,0,0,4,32,4,
-255,255,127,255,255,255,127,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,195,255,3,0,31,80,0,0,0,0,
-0,0,0,0,0,0,32,0,0,0,0,0,223,60,64,215,255,255,251,255,255,255,255,255,255,
-255,255,255,191,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,3,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,0,254,255,255,255,127,2,254,255,255,255,255,0,0,0,0,0,255,191,182,
-0,255,255,255,7,7,0,0,0,255,7,255,255,255,255,255,255,255,254,255,195,255,255,
-255,255,255,255,255,255,255,255,255,255,239,31,254,225,255,159,0,0,255,255,
-255,255,255,255,0,224,255,255,255,255,255,255,255,255,255,255,255,255,3,0,255,
-255,255,255,255,7,48,4,255,255,255,252,255,31,0,0,255,255,255,1,0,0,0,0,0,0,0,
-0,253,31,0,0,0,0,0,0,240,3,255,127,255,255,255,255,255,255,255,239,255,223,
-225,255,207,255,254,254,238,159,249,255,255,253,197,227,159,89,128,176,207,
-255,3,0,238,135,249,255,255,253,109,195,135,25,2,94,192,255,63,0,238,191,251,
-255,255,253,237,227,191,27,1,0,207,255,0,0,238,159,249,255,255,253,237,227,
-159,25,192,176,207,255,2,0,236,199,61,214,24,199,255,195,199,29,129,0,192,255,
-0,0,238,223,253,255,255,253,239,227,223,29,96,3,207,255,0,0,236,223,253,255,
-255,253,239,227,223,29,96,64,207,255,6,0,236,223,253,255,255,255,255,231,223,
-93,128,0,207,255,0,252,236,255,127,252,255,255,251,47,127,128,95,255,0,0,12,0,
-254,255,255,255,255,127,255,7,63,32,255,3,0,0,0,0,150,37,240,254,174,236,255,
-59,95,32,255,243,0,0,0,0,1,0,0,0,255,3,0,0,255,254,255,255,255,31,254,255,3,
-255,255,254,255,255,255,31,0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,249,
-255,3,255,255,231,193,255,255,127,64,255,51,255,255,255,255,191,32,255,255,
-255,255,255,247,255,255,255,255,255,255,255,255,255,61,127,61,255,255,255,255,
-255,61,255,255,255,255,61,127,61,255,127,255,255,255,255,255,255,255,61,255,
-255,255,255,255,255,255,255,135,0,0,0,0,255,255,0,0,255,255,255,255,255,255,
-255,255,255,255,31,0,254,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,159,255,255,254,255,255,7,255,
-255,255,255,255,255,255,255,255,199,1,0,255,223,15,0,255,255,15,0,255,255,15,
-0,255,223,13,0,255,255,255,255,255,255,207,255,255,1,128,16,255,3,0,0,0,0,255,
-3,255,255,255,255,255,255,255,255,255,255,255,0,255,255,255,255,255,7,255,255,
-255,255,255,255,255,255,63,0,255,255,255,31,255,15,255,1,192,255,255,255,255,
-63,31,0,255,255,255,255,255,15,255,255,255,3,255,3,0,0,0,0,255,255,255,15,255,
-255,255,255,255,255,255,127,254,255,31,0,255,3,255,3,128,0,0,0,0,0,0,0,0,0,0,
-0,255,255,255,255,255,255,239,255,239,15,255,3,0,0,0,0,255,255,255,255,255,
-243,255,255,255,255,255,255,191,255,3,0,255,255,255,255,255,255,63,0,255,227,
-255,255,255,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,222,111,0,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,0,0,0,0,0,0,0,0,255,255,63,63,255,255,255,255,63,63,255,170,255,255,255,
-63,255,255,255,255,255,255,223,95,220,31,207,15,255,31,220,31,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,2,128,0,0,255,31,0,0,0,0,0,0,0,0,0,0,0,0,132,252,47,62,80,189,255,
-243,224,67,0,0,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,255,255,255,255,255,255,3,0,0,255,255,255,
-255,255,127,255,255,255,255,255,127,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,31,120,12,0,255,255,255,255,191,32,255,255,255,255,
-255,255,255,128,0,0,255,255,127,0,127,127,127,127,127,127,127,127,255,255,255,
-255,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,
-0,254,3,62,31,254,255,255,255,255,255,255,255,255,255,127,224,254,255,255,255,
-255,255,255,255,255,255,255,247,224,255,255,255,255,63,254,255,255,255,255,
-255,255,255,255,255,255,127,0,0,255,255,255,7,0,0,0,0,0,0,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-63,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,31,0,0,0,0,0,0,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,255,
-255,255,255,255,63,255,31,255,255,255,15,0,0,255,255,255,255,255,127,240,143,
-255,255,255,128,255,255,255,255,255,255,255,255,255,255,0,0,0,0,128,255,252,
-255,255,255,255,255,255,255,255,255,255,255,255,121,15,0,255,7,0,0,0,0,0,0,0,
-0,0,255,187,247,255,255,255,0,0,0,255,255,255,255,255,255,15,0,255,255,255,
-255,255,255,255,255,15,0,255,3,0,0,252,8,255,255,255,255,255,7,255,255,255,
-255,7,0,255,255,255,31,255,255,255,255,255,255,247,255,0,128,255,3,0,0,0,0,
-255,255,255,255,255,255,127,0,255,63,255,3,255,255,127,4,255,255,255,255,255,
-255,255,127,5,0,0,56,255,255,60,0,126,126,126,0,127,127,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,255,255,255,255,255,7,255,3,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,15,0,255,255,127,248,255,255,255,
-255,255,15,255,255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255,
-255,255,255,255,255,255,255,255,255,255,3,0,0,0,0,127,0,248,224,255,253,127,
-95,219,255,255,255,255,255,255,255,255,255,255,255,255,255,3,0,0,0,248,255,
-255,255,255,255,255,255,255,255,255,255,255,63,0,0,255,255,255,255,255,255,
-255,255,252,255,255,255,255,255,255,0,0,0,0,0,255,15,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,223,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,31,0,
-0,255,3,254,255,255,7,254,255,255,7,192,255,255,255,255,255,255,255,255,255,
-255,127,252,252,252,28,0,0,0,0,255,239,255,255,127,255,255,183,255,63,255,63,
-0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,7,0,0,0,0,
-0,0,0,0,255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,31,255,255,255,255,255,255,1,0,0,0,0,0,
-255,255,255,127,0,0,255,255,255,7,0,0,0,0,0,0,255,255,255,63,255,255,255,255,
-15,255,62,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,63,255,3,0,0,0,0,0,0,0,0,0,0,63,253,255,255,255,255,191,
-145,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,63,0,255,255,
-255,3,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,192,0,0,0,0,0,0,0,0,111,240,
-239,254,255,255,15,0,0,0,0,0,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-255,255,255,255,255,255,63,0,255,255,63,0,255,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,255,255,255,255,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,255,255,255,255,255,255,255,255,63,0,0,0,192,255,0,0,252,255,255,
-255,255,255,255,1,0,0,255,255,255,1,255,3,255,255,255,255,255,255,199,255,0,0,
-0,0,0,0,0,0,255,255,255,255,255,255,255,255,30,0,255,3,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,63,0,255,3,0,0,0,0,0,0,255,255,255,
-255,255,255,255,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,255,255,255,255,255,255,255,255,255,255,255,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,255,255,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,255,255,255,255,255,255,255,255,31,0,255,255,255,255,255,127,0,0,
-248,255,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,223,255,255,255,255,
-255,255,255,255,223,100,222,255,235,239,255,255,255,255,255,255,255,191,231,
-223,223,255,255,255,123,95,252,253,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255,253,255,255,
-247,255,255,255,247,255,255,223,255,255,255,223,255,255,127,255,255,255,127,
-255,255,255,253,255,255,255,253,255,255,247,207,255,255,255,255,255,255,239,
-255,255,255,150,254,247,10,132,234,150,170,150,247,247,94,255,251,255,15,238,
-251,255,15,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/nonspacing.h b/src/components/lib/libc/musl-1.1.11/src/ctype/nonspacing.h
deleted file mode 100644
index 4c25ef5176..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/nonspacing.h
+++ /dev/null
@@ -1,62 +0,0 @@
-16,16,16,18,19,20,21,22,23,24,25,26,27,28,29,30,31,16,16,32,16,16,16,33,34,35,
-36,37,38,39,16,16,40,16,16,16,16,16,16,16,16,16,16,16,41,42,16,16,43,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,44,16,45,46,47,48,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,49,16,16,50,51,16,52,16,16,
-16,16,16,16,16,16,53,16,16,16,16,16,54,55,16,16,16,16,56,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,57,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,58,59,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,3,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,255,255,255,255,191,
-182,0,0,0,0,0,0,0,31,0,255,7,0,0,0,0,0,248,255,255,0,0,1,0,0,0,0,0,0,0,0,0,0,
-0,192,191,159,61,0,0,0,128,2,0,0,0,255,255,255,7,0,0,0,0,0,0,0,0,0,0,192,255,
-1,0,0,0,0,0,0,248,15,0,0,0,192,251,239,62,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,240,255,255,127,7,0,0,0,0,0,0,20,254,33,254,0,12,0,0,0,2,0,0,0,0,0,
-0,16,30,32,0,0,12,0,0,0,6,0,0,0,0,0,0,16,134,57,2,0,0,0,35,0,6,0,0,0,0,0,0,16,
-190,33,0,0,12,0,0,0,2,0,0,0,0,0,0,144,30,32,64,0,12,0,0,0,4,0,0,0,0,0,0,0,1,
-32,0,0,0,0,0,0,0,0,0,0,0,0,0,192,193,61,96,0,12,0,0,0,0,0,0,0,0,0,0,144,64,48,
-0,0,12,0,0,0,0,0,0,0,0,0,0,0,30,32,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,4,92,0,0,0,
-0,0,0,0,0,0,0,0,242,7,128,127,0,0,0,0,0,0,0,0,0,0,0,0,242,27,0,63,0,0,0,0,0,0,
-0,0,0,3,0,0,160,2,0,0,0,0,0,0,254,127,223,224,255,254,255,255,255,31,64,0,0,0,
-0,0,0,0,0,0,0,0,0,224,253,102,0,0,0,195,1,0,30,0,100,32,0,32,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-28,0,0,0,28,0,0,0,12,0,0,0,12,0,0,0,0,0,0,0,176,63,64,254,15,32,0,0,0,0,0,56,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,1,4,
-14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,1,0,0,0,0,0,0,64,
-127,229,31,248,159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,208,23,4,0,0,
-0,0,248,15,0,3,0,0,0,60,11,0,0,0,0,0,0,64,163,3,0,0,0,0,0,0,240,207,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,247,255,253,33,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,255,255,255,255,127,0,0,240,0,248,0,0,0,124,0,0,0,0,0,0,31,
-252,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,
-0,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,247,63,0,0,0,128,0,0,0,0,0,
-0,0,0,0,0,3,0,68,8,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,255,
-255,3,0,0,0,0,0,192,63,0,0,128,255,3,0,0,0,0,0,7,0,0,0,0,0,200,19,0,0,0,0,0,0,
-0,0,0,0,0,0,0,126,102,0,8,16,0,0,0,0,0,0,0,0,0,0,0,0,157,193,2,0,0,0,0,48,64,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,33,0,0,0,0,0,64,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,0,0,127,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,32,110,240,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,255,127,0,0,0,0,0,0,0,3,0,0,0,0,0,120,38,0,0,
-0,0,0,0,0,0,7,0,0,0,128,239,31,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,192,127,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,191,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,128,3,248,255,231,15,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/punct.h b/src/components/lib/libc/musl-1.1.11/src/ctype/punct.h
deleted file mode 100644
index 466e6b3308..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/punct.h
+++ /dev/null
@@ -1,109 +0,0 @@
-18,16,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,16,16,34,35,16,36,37,38,39,
-40,41,42,43,16,44,45,46,17,47,48,17,17,49,17,17,17,50,51,52,53,54,55,56,57,17,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,58,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,59,16,60,61,62,63,64,65,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,66,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,67,16,16,68,16,69,70,71,16,72,16,73,
-16,16,16,16,74,75,76,77,16,16,78,16,79,80,16,16,16,16,81,16,16,16,16,16,16,16,
-16,16,16,16,16,16,82,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,83,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,84,85,86,87,
-16,16,88,89,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-90,16,91,92,93,94,95,96,97,98,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,0,0,0,0,254,255,0,252,1,0,0,248,1,0,0,120,0,0,0,0,255,251,223,
-251,0,0,128,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0,
-252,255,224,175,255,255,255,255,255,255,255,255,255,255,223,255,255,255,255,
-255,32,64,176,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-252,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,0,0,0,0,0,134,254,
-255,255,255,0,64,73,0,0,0,0,0,24,0,223,255,0,200,0,0,0,0,0,0,0,1,0,60,0,0,0,0,
-0,0,0,0,0,0,0,0,16,224,1,30,0,96,255,191,0,0,0,0,0,0,255,7,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,248,207,3,0,0,0,3,0,32,255,127,0,0,0,78,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,0,0,0,16,0,32,30,0,48,0,1,0,0,0,0,0,0,0,0,16,
-0,32,0,0,0,0,252,15,0,0,0,0,0,0,0,16,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,32,0,
-0,0,0,3,0,0,0,0,0,0,0,0,16,0,32,0,0,0,0,253,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,
-255,7,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,255,0,0,0,0,0,0,0,16,0,32,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,32,0,0,0,0,63,2,0,0,0,0,0,0,0,0,0,4,0,0,0,0,16,0,0,0,0,0,0,
-128,0,128,192,223,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,254,255,255,
-255,0,252,255,255,0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,192,255,223,255,7,0,0,0,0,0,
-0,0,0,0,0,128,6,0,252,0,0,24,62,0,0,128,191,0,204,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
-0,0,0,0,0,0,0,0,0,96,255,255,255,31,0,0,255,3,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,96,0,0,1,0,0,24,0,0,0,0,0,0,0,0,0,56,0,0,0,0,16,0,0,0,112,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,48,0,0,254,127,47,0,0,255,3,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,49,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,196,255,255,255,255,0,0,0,192,0,0,0,0,0,0,0,0,1,0,224,159,0,0,0,0,
-127,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,16,0,0,252,255,255,255,31,0,0,0,0,
-0,12,0,0,0,0,0,0,64,0,12,240,0,0,0,0,0,0,192,248,0,0,0,0,0,0,0,192,0,0,0,0,0,
-0,0,0,255,0,255,255,255,33,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,255,255,255,255,127,0,0,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-160,3,224,0,224,0,224,0,96,128,248,255,255,255,252,255,255,255,255,255,127,31,
-252,241,127,255,127,0,0,255,255,255,3,0,0,255,255,255,255,1,0,123,3,208,193,
-175,66,0,12,31,188,255,255,0,0,0,0,0,2,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,255,
-255,255,127,0,0,0,255,7,0,0,255,255,255,255,255,255,255,255,255,255,63,0,0,0,
-0,0,0,252,255,255,254,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,31,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,135,3,254,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,
-127,255,15,0,0,0,0,0,0,0,0,255,255,255,251,255,255,255,255,255,255,255,255,
-255,255,15,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,63,0,0,0,255,15,30,255,255,255,1,252,
-193,224,0,0,0,0,0,0,0,0,0,0,0,30,1,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,255,255,0,0,0,0,255,255,255,255,15,0,0,0,255,255,255,127,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,
-255,255,255,255,127,0,0,0,0,0,0,192,0,224,0,0,0,0,0,0,0,0,0,0,0,128,15,112,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,255,255,127,0,3,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,68,8,0,0,0,15,255,3,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,
-16,192,0,0,255,255,3,7,0,0,0,0,0,248,0,0,0,0,8,128,0,0,0,0,0,0,0,0,0,0,8,0,
-255,63,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0,0,128,11,0,0,0,0,0,0,0,128,2,
-0,0,192,0,0,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
-0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,2,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,252,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,255,255,255,3,127,0,255,255,255,255,247,
-255,127,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,254,255,0,252,1,0,0,248,1,0,
-0,248,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,127,0,48,135,255,255,255,255,255,
-143,255,0,0,0,0,0,0,224,255,255,7,255,15,0,0,0,0,0,0,255,255,255,255,255,63,0,
-0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,128,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,143,0,0,0,128,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,255,0,255,1,
-0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,0,0,0,255,0,0,0,
-255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,127,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,63,252,255,63,0,0,0,3,0,0,0,
-0,0,0,254,3,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-225,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,7,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,63,0,255,255,255,255,127,254,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,63,0,0,0,0,
-255,255,255,255,255,255,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,255,255,255,255,255,255,255,255,255,255,127,0,255,255,3,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,8,0,0,0,
-8,0,0,32,0,0,0,32,0,0,128,0,0,0,128,0,0,0,2,0,0,0,2,0,0,8,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,255,255,255,255,255,
-15,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,127,254,127,254,
-255,254,255,0,0,0,0,255,7,255,255,255,127,255,255,255,255,255,255,255,15,255,
-255,255,255,255,7,0,0,0,0,0,0,0,0,192,255,255,255,7,0,255,255,255,255,255,7,
-255,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,1,0,191,255,
-255,255,255,255,255,255,255,31,255,255,15,0,255,255,255,255,223,7,0,0,255,255,
-1,0,255,255,255,255,255,255,255,127,253,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,30,255,255,255,255,255,
-255,255,63,15,0,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,255,255,
-255,255,255,255,255,255,225,255,0,0,0,0,0,0,255,255,255,255,255,255,255,255,
-63,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/towctrans.c b/src/components/lib/libc/musl-1.1.11/src/ctype/towctrans.c
deleted file mode 100644
index 6af618758b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/towctrans.c
+++ /dev/null
@@ -1,279 +0,0 @@
-#include <wctype.h>
-#include "libc.h"
-
-#define CASEMAP(u1,u2,l) { (u1), (l)-(u1), (u2)-(u1)+1 }
-#define CASELACE(u1,u2) CASEMAP((u1),(u2),(u1)+1)
-
-static const struct {
-	unsigned short upper;
-	signed char lower;
-	unsigned char len;
-} casemaps[] = {
-	CASEMAP('A','Z','a'),
-	CASEMAP(0xc0,0xde,0xe0),
-
-	CASELACE(0x0100,0x012e),
-	CASELACE(0x0132,0x0136),
-	CASELACE(0x0139,0x0147),
-	CASELACE(0x014a,0x0176),
-	CASELACE(0x0179,0x017d),
-
-	CASELACE(0x370,0x372),
-	CASEMAP(0x391,0x3a1,0x3b1),
-	CASEMAP(0x3a3,0x3ab,0x3c3),
-	CASEMAP(0x400,0x40f,0x450),
-	CASEMAP(0x410,0x42f,0x430),
-
-	CASELACE(0x460,0x480),
-	CASELACE(0x48a,0x4be),
-	CASELACE(0x4c1,0x4cd),
-	CASELACE(0x4d0,0x50e),
-
-	CASELACE(0x514,0x526),
-	CASEMAP(0x531,0x556,0x561),
-
-	CASELACE(0x01a0,0x01a4),
-	CASELACE(0x01b3,0x01b5),
-	CASELACE(0x01cd,0x01db),
-	CASELACE(0x01de,0x01ee),
-	CASELACE(0x01f8,0x021e),
-	CASELACE(0x0222,0x0232),
-	CASELACE(0x03d8,0x03ee),
-
-	CASELACE(0x1e00,0x1e94),
-	CASELACE(0x1ea0,0x1efe),
-
-	CASEMAP(0x1f08,0x1f0f,0x1f00),
-	CASEMAP(0x1f18,0x1f1d,0x1f10),
-	CASEMAP(0x1f28,0x1f2f,0x1f20),
-	CASEMAP(0x1f38,0x1f3f,0x1f30),
-	CASEMAP(0x1f48,0x1f4d,0x1f40),
-
-	CASEMAP(0x1f68,0x1f6f,0x1f60),
-	CASEMAP(0x1f88,0x1f8f,0x1f80),
-	CASEMAP(0x1f98,0x1f9f,0x1f90),
-	CASEMAP(0x1fa8,0x1faf,0x1fa0),
-	CASEMAP(0x1fb8,0x1fb9,0x1fb0),
-	CASEMAP(0x1fba,0x1fbb,0x1f70),
-	CASEMAP(0x1fc8,0x1fcb,0x1f72),
-	CASEMAP(0x1fd8,0x1fd9,0x1fd0),
-	CASEMAP(0x1fda,0x1fdb,0x1f76),
-	CASEMAP(0x1fe8,0x1fe9,0x1fe0),
-	CASEMAP(0x1fea,0x1feb,0x1f7a),
-	CASEMAP(0x1ff8,0x1ff9,0x1f78),
-	CASEMAP(0x1ffa,0x1ffb,0x1f7c),
-
-	CASELACE(0x246,0x24e),
-	CASELACE(0x510,0x512),
-	CASEMAP(0x2160,0x216f,0x2170),
-	CASEMAP(0x2c00,0x2c2e,0x2c30),
-	CASELACE(0x2c67,0x2c6b),
-	CASELACE(0x2c80,0x2ce2),
-	CASELACE(0x2ceb,0x2ced),
-
-	CASELACE(0xa640,0xa66c),
-	CASELACE(0xa680,0xa696),
-
-	CASELACE(0xa722,0xa72e),
-	CASELACE(0xa732,0xa76e),
-	CASELACE(0xa779,0xa77b),
-	CASELACE(0xa77e,0xa786),
-
-	CASELACE(0xa790,0xa792),
-	CASELACE(0xa7a0,0xa7a8),
-
-	CASEMAP(0xff21,0xff3a,0xff41),
-	{ 0,0,0 }
-};
-
-static const unsigned short pairs[][2] = {
-	{ 'I',    0x0131 },
-	{ 'S',    0x017f },
-	{ 0x0130, 'i'    },
-	{ 0x0178, 0x00ff },
-	{ 0x0181, 0x0253 },
-	{ 0x0182, 0x0183 },
-	{ 0x0184, 0x0185 },
-	{ 0x0186, 0x0254 },
-	{ 0x0187, 0x0188 },
-	{ 0x0189, 0x0256 },
-	{ 0x018a, 0x0257 },
-	{ 0x018b, 0x018c },
-	{ 0x018e, 0x01dd },
-	{ 0x018f, 0x0259 },
-	{ 0x0190, 0x025b },
-	{ 0x0191, 0x0192 },
-	{ 0x0193, 0x0260 },
-	{ 0x0194, 0x0263 },
-	{ 0x0196, 0x0269 },
-	{ 0x0197, 0x0268 },
-	{ 0x0198, 0x0199 },
-	{ 0x019c, 0x026f },
-	{ 0x019d, 0x0272 },
-	{ 0x019f, 0x0275 },
-	{ 0x01a6, 0x0280 },
-	{ 0x01a7, 0x01a8 },
-	{ 0x01a9, 0x0283 },
-	{ 0x01ac, 0x01ad },
-	{ 0x01ae, 0x0288 },
-	{ 0x01af, 0x01b0 },
-	{ 0x01b1, 0x028a },
-	{ 0x01b2, 0x028b },
-	{ 0x01b7, 0x0292 },
-	{ 0x01b8, 0x01b9 },
-	{ 0x01bc, 0x01bd },
-	{ 0x01c4, 0x01c6 },
-	{ 0x01c4, 0x01c5 },
-	{ 0x01c5, 0x01c6 },
-	{ 0x01c7, 0x01c9 },
-	{ 0x01c7, 0x01c8 },
-	{ 0x01c8, 0x01c9 },
-	{ 0x01ca, 0x01cc },
-	{ 0x01ca, 0x01cb },
-	{ 0x01cb, 0x01cc },
-	{ 0x01f1, 0x01f3 },
-	{ 0x01f1, 0x01f2 },
-	{ 0x01f2, 0x01f3 },
-	{ 0x01f4, 0x01f5 },
-	{ 0x01f6, 0x0195 },
-	{ 0x01f7, 0x01bf },
-	{ 0x0220, 0x019e },
-	{ 0x0386, 0x03ac },
-	{ 0x0388, 0x03ad },
-	{ 0x0389, 0x03ae },
-	{ 0x038a, 0x03af },
-	{ 0x038c, 0x03cc },
-	{ 0x038e, 0x03cd },
-	{ 0x038f, 0x03ce },
-	{ 0x0399, 0x0345 },
-	{ 0x0399, 0x1fbe },
-	{ 0x03a3, 0x03c2 },
-	{ 0x03f7, 0x03f8 },
-	{ 0x03fa, 0x03fb },
-	{ 0x1e60, 0x1e9b },
-	{ 0x1e9e, 0xdf },
-
-	{ 0x1f59, 0x1f51 },
-	{ 0x1f5b, 0x1f53 },
-	{ 0x1f5d, 0x1f55 },
-	{ 0x1f5f, 0x1f57 },
-	{ 0x1fbc, 0x1fb3 },
-	{ 0x1fcc, 0x1fc3 },
-	{ 0x1fec, 0x1fe5 },
-	{ 0x1ffc, 0x1ff3 },
-
-	{ 0x23a, 0x2c65 },
-	{ 0x23b, 0x23c },
-	{ 0x23d, 0x19a },
-	{ 0x23e, 0x2c66 },
-	{ 0x241, 0x242 },
-	{ 0x243, 0x180 },
-	{ 0x244, 0x289 },
-	{ 0x245, 0x28c },
-	{ 0x3f4, 0x3b8 },
-	{ 0x3f9, 0x3f2 },
-	{ 0x3fd, 0x37b },
-	{ 0x3fe, 0x37c },
-	{ 0x3ff, 0x37d },
-	{ 0x4c0, 0x4cf },
-
-	{ 0x2126, 0x3c9 },
-	{ 0x212a, 'k' },
-	{ 0x212b, 0xe5 },
-	{ 0x2132, 0x214e },
-	{ 0x2183, 0x2184 },
-	{ 0x2c60, 0x2c61 },
-	{ 0x2c62, 0x26b },
-	{ 0x2c63, 0x1d7d },
-	{ 0x2c64, 0x27d },
-	{ 0x2c6d, 0x251 },
-	{ 0x2c6e, 0x271 },
-	{ 0x2c6f, 0x250 },
-	{ 0x2c70, 0x252 },
-	{ 0x2c72, 0x2c73 },
-	{ 0x2c75, 0x2c76 },
-	{ 0x2c7e, 0x23f },
-	{ 0x2c7f, 0x240 },
-	{ 0x2cf2, 0x2cf3 },
-
-	{ 0xa77d, 0x1d79 },
-	{ 0xa78b, 0xa78c },
-	{ 0xa78d, 0x265 },
-	{ 0xa7aa, 0x266 },
-
-	{ 0x10c7, 0x2d27 },
-	{ 0x10cd, 0x2d2d },
-
-	/* bogus greek 'symbol' letters */
-	{ 0x376, 0x377 },
-	{ 0x39c, 0xb5 },
-	{ 0x392, 0x3d0 },
-	{ 0x398, 0x3d1 },
-	{ 0x3a6, 0x3d5 },
-	{ 0x3a0, 0x3d6 },
-	{ 0x39a, 0x3f0 },
-	{ 0x3a1, 0x3f1 },
-	{ 0x395, 0x3f5 },
-	{ 0x3cf, 0x3d7 },
-
-	{ 0,0 }
-};
-
-
-static wchar_t __towcase(wchar_t wc, int lower)
-{
-	int i;
-	int lmul = 2*lower-1;
-	int lmask = lower-1;
-	/* no letters with case in these large ranges */
-	if (!iswalpha(wc)
-	 || (unsigned)wc - 0x0600 <= 0x0fff-0x0600
-	 || (unsigned)wc - 0x2e00 <= 0xa63f-0x2e00
-	 || (unsigned)wc - 0xa800 <= 0xfeff-0xa800)
-		return wc;
-	/* special case because the diff between upper/lower is too big */
-	if (lower && (unsigned)wc - 0x10a0 < 0x2e)
-		if (wc>0x10c5 && wc != 0x10c7 && wc != 0x10cd) return wc;
-		else return wc + 0x2d00 - 0x10a0;
-	if (!lower && (unsigned)wc - 0x2d00 < 0x26)
-		if (wc>0x2d25 && wc != 0x2d27 && wc != 0x2d2d) return wc;
-		else return wc + 0x10a0 - 0x2d00;
-	for (i=0; casemaps[i].len; i++) {
-		int base = casemaps[i].upper + (lmask & casemaps[i].lower);
-		if ((unsigned)wc-base < casemaps[i].len) {
-			if (casemaps[i].lower == 1)
-				return wc + lower - ((wc-casemaps[i].upper)&1);
-			return wc + lmul*casemaps[i].lower;
-		}
-	}
-	for (i=0; pairs[i][1-lower]; i++) {
-		if (pairs[i][1-lower] == wc)
-			return pairs[i][lower];
-	}
-	if ((unsigned)wc - (0x10428 - 0x28*lower) < 0x28)
-		return wc - 0x28 + 0x50*lower;
-	return wc;
-}
-
-wint_t towupper(wint_t wc)
-{
-	return __towcase(wc, 0);
-}
-
-wint_t towlower(wint_t wc)
-{
-	return __towcase(wc, 1);
-}
-
-wint_t __towupper_l(wint_t c, locale_t l)
-{
-	return towupper(c);
-}
-
-wint_t __towlower_l(wint_t c, locale_t l)
-{
-	return towlower(c);
-}
-
-weak_alias(__towupper_l, towupper_l);
-weak_alias(__towlower_l, towlower_l);
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/wide.h b/src/components/lib/libc/musl-1.1.11/src/ctype/wide.h
deleted file mode 100644
index 125d0ce398..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/wide.h
+++ /dev/null
@@ -1,42 +0,0 @@
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,18,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,19,16,16,16,16,16,16,16,16,16,16,20,21,22,23,24,17,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,25,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,17,26,16,16,16,16,27,16,16,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
-17,17,17,17,17,17,17,28,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,16,16,16,29,30,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,31,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
-16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,
-0,248,0,0,0,0,0,0,0,0,0,0,252,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,251,255,255,255,
-255,255,255,255,255,255,255,15,0,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,63,0,0,0,255,15,
-255,255,255,255,255,255,255,127,254,255,255,255,255,255,255,255,255,255,127,
-254,255,255,255,255,255,255,255,255,255,255,255,255,224,255,255,255,255,63,
-254,255,255,255,255,255,255,255,255,255,255,127,255,255,255,255,255,7,255,255,
-255,255,15,0,255,255,255,255,255,127,255,255,255,255,255,0,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,127,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,31,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,
-255,127,248,255,255,255,255,255,15,0,0,255,3,0,0,255,255,255,255,247,255,127,
-15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,255,255,255,255,255,255,255,255,
-255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,255,255,255,255,255,7,255,1,3,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/__dirent.h b/src/components/lib/libc/musl-1.1.11/src/dirent/__dirent.h
deleted file mode 100644
index 32871baf51..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/__dirent.h
+++ /dev/null
@@ -1,9 +0,0 @@
-struct __dirstream
-{
-	int fd;
-	off_t tell;
-	int buf_pos;
-	int buf_end;
-	volatile int lock[2];
-	char buf[2048];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/__getdents.c b/src/components/lib/libc/musl-1.1.11/src/dirent/__getdents.c
deleted file mode 100644
index 1acd5a696a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/__getdents.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <dirent.h>
-#include "syscall.h"
-#include "libc.h"
-
-int __getdents(int fd, struct dirent *buf, size_t len)
-{
-	return syscall(SYS_getdents, fd, buf, len);
-}
-
-weak_alias(__getdents, getdents);
-
-LFS64(getdents);
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/__init_tls.c b/src/components/lib/libc/musl-1.1.11/src/env/__init_tls.c
deleted file mode 100644
index 73551e6c41..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/__init_tls.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include <elf.h>
-#include <limits.h>
-#include <sys/mman.h>
-#include <string.h>
-#include <stddef.h>
-#include "pthread_impl.h"
-#include "libc.h"
-#include "atomic.h"
-#include "syscall.h"
-
-#ifndef SHARED
-static
-#endif
-int __init_tp(void *p)
-{
-	pthread_t td = p;
-	td->self = td;
-	int r = __set_thread_area(TP_ADJ(p));
-	if (r < 0) return -1;
-	if (!r) libc.can_do_threads = 1;
-	td->tid = __syscall(SYS_set_tid_address, &td->tid);
-	td->locale = &libc.global_locale;
-	td->robust_list.head = &td->robust_list.head;
-	return 0;
-}
-
-#ifndef SHARED
-
-static struct builtin_tls {
-	char c;
-	struct pthread pt;
-	void *space[16];
-} builtin_tls[1];
-#define MIN_TLS_ALIGN offsetof(struct builtin_tls, pt)
-
-struct tls_image {
-	void *image;
-	size_t len, size, align;
-} __static_tls;
-
-#define T __static_tls
-
-void *__copy_tls(unsigned char *mem)
-{
-	pthread_t td;
-	if (!T.image) return mem;
-	void **dtv = (void *)mem;
-	dtv[0] = (void *)1;
-#ifdef TLS_ABOVE_TP
-	mem += sizeof(void *) * 2;
-	mem += -((uintptr_t)mem + sizeof(struct pthread)) & (T.align-1);
-	td = (pthread_t)mem;
-	mem += sizeof(struct pthread);
-#else
-	mem += libc.tls_size - sizeof(struct pthread);
-	mem -= (uintptr_t)mem & (T.align-1);
-	td = (pthread_t)mem;
-	mem -= T.size;
-#endif
-	td->dtv = td->dtv_copy = dtv;
-	dtv[1] = mem;
-	memcpy(mem, T.image, T.len);
-	return td;
-}
-
-#if ULONG_MAX == 0xffffffff
-typedef Elf32_Phdr Phdr;
-#else
-typedef Elf64_Phdr Phdr;
-#endif
-
-void __init_tls(size_t *aux)
-{
-	unsigned char *p;
-	size_t n;
-	Phdr *phdr, *tls_phdr=0;
-	size_t base = 0;
-	void *mem;
-
-	for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) {
-		phdr = (void *)p;
-		if (phdr->p_type == PT_PHDR)
-			base = aux[AT_PHDR] - phdr->p_vaddr;
-		if (phdr->p_type == PT_TLS)
-			tls_phdr = phdr;
-	}
-
-	if (tls_phdr) {
-		T.image = (void *)(base + tls_phdr->p_vaddr);
-		T.len = tls_phdr->p_filesz;
-		T.size = tls_phdr->p_memsz;
-		T.align = tls_phdr->p_align;
-	}
-
-	T.size += (-T.size - (uintptr_t)T.image) & (T.align-1);
-	if (T.align < MIN_TLS_ALIGN) T.align = MIN_TLS_ALIGN;
-
-	libc.tls_size = 2*sizeof(void *)+T.size+T.align+sizeof(struct pthread)
-		+ MIN_TLS_ALIGN-1 & -MIN_TLS_ALIGN;
-
-	if (libc.tls_size > sizeof builtin_tls) {
-#ifndef SYS_mmap2
-#define SYS_mmap2 SYS_mmap
-#endif
-		mem = (void *)__syscall(
-			SYS_mmap2,
-			0, libc.tls_size, PROT_READ|PROT_WRITE,
-			MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
-		/* -4095...-1 cast to void * will crash on dereference anyway,
-		 * so don't bloat the init code checking for error codes and
-		 * explicitly calling a_crash(). */
-	} else {
-		mem = builtin_tls;
-	}
-
-	/* Failure to initialize thread pointer is always fatal. */
-	if (__init_tp(__copy_tls(mem)) < 0)
-		a_crash();
-}
-#else
-void __init_tls(size_t *auxv) { }
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/__libc_start_main.c b/src/components/lib/libc/musl-1.1.11/src/env/__libc_start_main.c
deleted file mode 100644
index 99732414a6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/__libc_start_main.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <elf.h>
-#include <poll.h>
-#include <fcntl.h>
-#include <signal.h>
-#include "syscall.h"
-#include "atomic.h"
-#include "libc.h"
-
-void __init_tls(size_t *);
-
-#ifndef SHARED
-static void dummy() {}
-weak_alias(dummy, _init);
-extern void (*const __init_array_start)() __attribute__((weak));
-extern void (*const __init_array_end)() __attribute__((weak));
-#endif
-
-static void dummy1(void *p) {}
-weak_alias(dummy1, __init_ssp);
-
-#define AUX_CNT 38
-
-void __init_libc(char **envp, char *pn)
-{
-	size_t i, *auxv, aux[AUX_CNT] = { 0 };
-	__environ = envp;
-	for (i=0; envp[i]; i++);
-	libc.auxv = auxv = (void *)(envp+i+1);
-	for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT) aux[auxv[i]] = auxv[i+1];
-	__hwcap = aux[AT_HWCAP];
-	__sysinfo = aux[AT_SYSINFO];
-	libc.page_size = aux[AT_PAGESZ];
-
-	if (pn) {
-		__progname = __progname_full = pn;
-		for (i=0; pn[i]; i++) if (pn[i]=='/') __progname = pn+i+1;
-	}
-
-	__init_tls(aux);
-	__init_ssp((void *)aux[AT_RANDOM]);
-
-	if (aux[AT_UID]==aux[AT_EUID] && aux[AT_GID]==aux[AT_EGID]
-		&& !aux[AT_SECURE]) return;
-
-	struct pollfd pfd[3] = { {.fd=0}, {.fd=1}, {.fd=2} };
-#ifdef SYS_poll
-	__syscall(SYS_poll, pfd, 3, 0);
-#else
-	__syscall(SYS_ppoll, pfd, 3, &(struct timespec){0}, 0, _NSIG/8);
-#endif
-	for (i=0; i<3; i++) if (pfd[i].revents&POLLNVAL)
-		if (__sys_open("/dev/null", O_RDWR)<0)
-			a_crash();
-	libc.secure = 1;
-}
-
-int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv)
-{
-	char **envp = argv+argc+1;
-
-#ifndef SHARED
-	__init_libc(envp, argv[0]);
-	_init();
-	uintptr_t a = (uintptr_t)&__init_array_start;
-	for (; a<(uintptr_t)&__init_array_end; a+=sizeof(void(*)()))
-		(*(void (**)())a)();
-#endif
-
-	/* Pass control to the application */
-	exit(main(argc, argv, envp));
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/__reset_tls.c b/src/components/lib/libc/musl-1.1.11/src/env/__reset_tls.c
deleted file mode 100644
index bd61f311e7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/__reset_tls.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SHARED
-
-#include <string.h>
-#include "pthread_impl.h"
-
-extern struct tls_image {
-	void *image;
-	size_t len, size, align;
-} __static_tls;
-
-#define T __static_tls
-
-void __reset_tls()
-{
-	if (!T.size) return;
-	pthread_t self = __pthread_self();
-	memcpy(self->dtv[1], T.image, T.len);
-	memset((char *)self->dtv[1]+T.len, 0, T.size-T.len);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/clearenv.c b/src/components/lib/libc/musl-1.1.11/src/env/clearenv.c
deleted file mode 100644
index 62d50952da..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/clearenv.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define _GNU_SOURCE
-#include <stdlib.h>
-
-extern char **__environ;
-
-int clearenv()
-{
-	__environ[0] = 0;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/getenv.c b/src/components/lib/libc/musl-1.1.11/src/env/getenv.c
deleted file mode 100644
index 00c1bce037..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/getenv.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "libc.h"
-
-char *getenv(const char *name)
-{
-	int i;
-	size_t l = strlen(name);
-	if (!__environ || !*name || strchr(name, '=')) return NULL;
-	for (i=0; __environ[i] && (strncmp(name, __environ[i], l)
-		|| __environ[i][l] != '='); i++);
-	if (__environ[i]) return __environ[i] + l+1;
-	return NULL;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/putenv.c b/src/components/lib/libc/musl-1.1.11/src/env/putenv.c
deleted file mode 100644
index 4042869b50..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/putenv.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-extern char **__environ;
-char **__env_map;
-
-int __putenv(char *s, int a)
-{
-	int i=0, j=0;
-	char *z = strchr(s, '=');
-	char **newenv = 0;
-	char **newmap = 0;
-	static char **oldenv;
-
-	if (!z) return unsetenv(s);
-	if (z==s) return -1;
-	for (; __environ[i] && memcmp(s, __environ[i], z-s+1); i++);
-	if (a) {
-		if (!__env_map) {
-			__env_map = calloc(2, sizeof(char *));
-			if (__env_map) __env_map[0] = s;
-		} else {
-			for (; __env_map[j] && __env_map[j] != __environ[i]; j++);
-			if (!__env_map[j]) {
-				newmap = realloc(__env_map, sizeof(char *)*(j+2));
-				if (newmap) {
-					__env_map = newmap;
-					__env_map[j] = s;
-					__env_map[j+1] = NULL;
-				}
-			} else {
-				free(__env_map[j]);
-			}
-		}
-	}
-	if (!__environ[i]) {
-		newenv = malloc(sizeof(char *)*(i+2));
-		if (!newenv) {
-			if (a && __env_map) __env_map[j] = 0;
-			return -1;
-		}
-		memcpy(newenv, __environ, sizeof(char *)*i);
-		newenv[i] = s;
-		newenv[i+1] = 0;
-		__environ = newenv;
-		free(oldenv);
-		oldenv = __environ;
-	}
-
-	__environ[i] = s;
-	return 0;
-}
-
-int putenv(char *s)
-{
-	return __putenv(s, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/setenv.c b/src/components/lib/libc/musl-1.1.11/src/env/setenv.c
deleted file mode 100644
index 76e8ee1206..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/setenv.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-int __putenv(char *s, int a);
-
-int setenv(const char *var, const char *value, int overwrite)
-{
-	char *s;
-	int l1, l2;
-
-	if (!var || !*var || strchr(var, '=')) {
-		errno = EINVAL;
-		return -1;
-	}
-	if (!overwrite && getenv(var)) return 0;
-
-	l1 = strlen(var);
-	l2 = strlen(value);
-	s = malloc(l1+l2+2);
-	if (s) {
-		memcpy(s, var, l1);
-		s[l1] = '=';
-		memcpy(s+l1+1, value, l2);
-		s[l1+l2+1] = 0;
-		if (!__putenv(s, 1)) return 0;
-	}
-	free(s);
-	return -1;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/unsetenv.c b/src/components/lib/libc/musl-1.1.11/src/env/unsetenv.c
deleted file mode 100644
index 356933546a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/env/unsetenv.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-extern char **__environ;
-extern char **__env_map;
-
-int unsetenv(const char *name)
-{
-	int i, j;
-	size_t l = strlen(name);
-
-	if (!*name || strchr(name, '=')) {
-		errno = EINVAL;
-		return -1;
-	}
-again:
-	for (i=0; __environ[i] && (memcmp(name, __environ[i], l) || __environ[i][l] != '='); i++);
-	if (__environ[i]) {
-		if (__env_map) {
-			for (j=0; __env_map[j] && __env_map[j] != __environ[i]; j++);
-			free (__env_map[j]);
-			for (; __env_map[j]; j++)
-				__env_map[j] = __env_map[j+1];
-		}
-		for (; __environ[i]; i++)
-			__environ[i] = __environ[i+1];
-		goto again;
-	}
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/errno/__errno_location.c b/src/components/lib/libc/musl-1.1.11/src/errno/__errno_location.c
deleted file mode 100644
index d736e35d58..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/errno/__errno_location.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "pthread_impl.h"
-
-int *__errno_location(void)
-{
-	static int e;
-	return &e;
-	return &__pthread_self()->errno_val;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/exit/abort.c b/src/components/lib/libc/musl-1.1.11/src/exit/abort.c
deleted file mode 100644
index 203dd35cb9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/exit/abort.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdlib.h>
-#include <signal.h>
-#include "syscall.h"
-
-_Noreturn void abort(void)
-{
-	raise(SIGABRT);
-	raise(SIGKILL);
-	for (;;);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/exit/assert.c b/src/components/lib/libc/musl-1.1.11/src/exit/assert.c
deleted file mode 100644
index e87442a7c5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/exit/assert.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-void __assert_fail(const char *expr, const char *file, int line, const char *func)
-{
-	fprintf(stderr, "Assertion failed: %s (%s: %s: %d)\n", expr, file, func, line);
-	fflush(NULL);
-	abort();
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/exit/at_quick_exit.c b/src/components/lib/libc/musl-1.1.11/src/exit/at_quick_exit.c
deleted file mode 100644
index 34541badad..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/exit/at_quick_exit.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <stdlib.h>
-#include "libc.h"
-
-#define COUNT 32
-
-static void (*funcs[COUNT])(void);
-static int count;
-static volatile int lock[2];
-
-void __funcs_on_quick_exit()
-{
-	void (*func)(void);
-	LOCK(lock);
-	while (count > 0) {
-		func = funcs[--count];
-		UNLOCK(lock);
-		func();
-		LOCK(lock);
-	}
-}
-
-int at_quick_exit(void (*func)(void))
-{
-	if (count == 32) return -1;
-	LOCK(lock);
-	funcs[count++] = func;
-	UNLOCK(lock);
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/exit/exit.c b/src/components/lib/libc/musl-1.1.11/src/exit/exit.c
deleted file mode 100644
index 163d8f1b22..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/exit/exit.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "libc.h"
-
-static void dummy()
-{
-}
-
-/* atexit.c and __stdio_exit.c override these. the latter is linked
- * as a consequence of linking either __toread.c or __towrite.c. */
-weak_alias(dummy, __funcs_on_exit);
-weak_alias(dummy, __stdio_exit);
-
-#ifndef SHARED
-weak_alias(dummy, _fini);
-extern void (*const __fini_array_start)() __attribute__((weak));
-extern void (*const __fini_array_end)() __attribute__((weak));
-#endif
-
-_Noreturn void exit(int code)
-{
-	__funcs_on_exit();
-
-#ifndef SHARED
-	uintptr_t a = (uintptr_t)&__fini_array_end;
-	for (; a>(uintptr_t)&__fini_array_start; a-=sizeof(void(*)()))
-		(*(void (**)())(a-sizeof(void(*)())))();
-	_fini();
-#endif
-
-	__stdio_exit();
-
-	_Exit(code);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/fcntl/posix_fadvise.c b/src/components/lib/libc/musl-1.1.11/src/fcntl/posix_fadvise.c
deleted file mode 100644
index d5360e0fc4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fcntl/posix_fadvise.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <fcntl.h>
-#include "syscall.h"
-#include "libc.h"
-
-int posix_fadvise(int fd, off_t base, off_t len, int advice)
-{
-	return -(__syscall)(SYS_fadvise, fd, __SYSCALL_LL_O(base),
-		__SYSCALL_LL_E(len), advice);
-}
-
-LFS64(posix_fadvise);
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/aarch64/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/aarch64/fenv.s
deleted file mode 100644
index f0db5d9d1b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/aarch64/fenv.s
+++ /dev/null
@@ -1,67 +0,0 @@
-.global fegetround
-.type fegetround,%function
-fegetround:
-	mrs x0, fpcr
-	and w0, w0, #0xc00000
-	ret
-
-.global __fesetround
-.type __fesetround,%function
-__fesetround:
-	mrs x1, fpcr
-	bic w1, w1, #0xc00000
-	orr w1, w1, w0
-	msr fpcr, x1
-	mov w0, #0
-	ret
-
-.global fetestexcept
-.type fetestexcept,%function
-fetestexcept:
-	and w0, w0, #0x1f
-	mrs x1, fpsr
-	and w0, w0, w1
-	ret
-
-.global feclearexcept
-.type feclearexcept,%function
-feclearexcept:
-	and w0, w0, #0x1f
-	mrs x1, fpsr
-	bic w1, w1, w0
-	msr fpsr, x1
-	mov w0, #0
-	ret
-
-.global feraiseexcept
-.type feraiseexcept,%function
-feraiseexcept:
-	and w0, w0, #0x1f
-	mrs x1, fpsr
-	orr w1, w1, w0
-	msr fpsr, x1
-	mov w0, #0
-	ret
-
-.global fegetenv
-.type fegetenv,%function
-fegetenv:
-	mrs x1, fpcr
-	mrs x2, fpsr
-	stp w1, w2, [x0]
-	mov w0, #0
-	ret
-
-// TODO preserve some bits
-.global fesetenv
-.type fesetenv,%function
-fesetenv:
-	mov x1, #0
-	mov x2, #0
-	cmn x0, #1
-	b.eq 1f
-	ldp w1, w2, [x0]
-1:	msr fpcr, x1
-	msr fpsr, x2
-	mov w0, #0
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/armebhf/fenv.sub b/src/components/lib/libc/musl-1.1.11/src/fenv/armebhf/fenv.sub
deleted file mode 100644
index 5281e40b92..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/armebhf/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armhf/fenv.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/armhf/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/armhf/fenv.s
deleted file mode 100644
index 387234bc2d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/armhf/fenv.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.global fegetround
-.type fegetround,%function
-fegetround:
-	mrc p10, 7, r0, cr1, cr0, 0
-	and r0, r0, #0xc00000
-	bx lr
-
-.global __fesetround
-.type __fesetround,%function
-__fesetround:
-	mrc p10, 7, r3, cr1, cr0, 0
-	bic r3, r3, #0xc00000
-	orr r3, r3, r0
-	mcr p10, 7, r3, cr1, cr0, 0
-	mov r0, #0
-	bx lr
-
-.global fetestexcept
-.type fetestexcept,%function
-fetestexcept:
-	and r0, r0, #0x1f
-	mrc p10, 7, r3, cr1, cr0, 0
-	and r0, r0, r3
-	bx lr
-
-.global feclearexcept
-.type feclearexcept,%function
-feclearexcept:
-	and r0, r0, #0x1f
-	mrc p10, 7, r3, cr1, cr0, 0
-	bic r3, r3, r0
-	mcr p10, 7, r3, cr1, cr0, 0
-	mov r0, #0
-	bx lr
-
-.global feraiseexcept
-.type feraiseexcept,%function
-feraiseexcept:
-	and r0, r0, #0x1f
-	mrc p10, 7, r3, cr1, cr0, 0
-	orr r3, r3, r0
-	mcr p10, 7, r3, cr1, cr0, 0
-	mov r0, #0
-	bx lr
-
-.global fegetenv
-.type fegetenv,%function
-fegetenv:
-	mrc p10, 7, r3, cr1, cr0, 0
-	str r3, [r0]
-	mov r0, #0
-	bx lr
-
-.global fesetenv
-.type fesetenv,%function
-fesetenv:
-	cmn r0, #1
-	moveq r3, #0
-	ldrne r3, [r0]
-	mcr p10, 7, r3, cr1, cr0, 0
-	mov r0, #0
-	bx lr
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/armhf/fenv.sub b/src/components/lib/libc/musl-1.1.11/src/fenv/armhf/fenv.sub
deleted file mode 100644
index ec559cd47a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/armhf/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-fenv.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/fesetround.c b/src/components/lib/libc/musl-1.1.11/src/fenv/fesetround.c
deleted file mode 100644
index 9bbd4ade8d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/fesetround.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <fenv.h>
-
-/* __fesetround wrapper for arch independent argument check */
-
-int __fesetround(int);
-
-int fesetround(int r)
-{
-	if (r & ~(
-		FE_TONEAREST
-#ifdef FE_DOWNWARD
-		|FE_DOWNWARD
-#endif
-#ifdef FE_UPWARD
-		|FE_UPWARD
-#endif
-#ifdef FE_TOWARDZERO
-		|FE_TOWARDZERO
-#endif
-		))
-		return -1;
-	return __fesetround(r);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/i386/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/i386/fenv.s
deleted file mode 100644
index a189ca2e36..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/i386/fenv.s
+++ /dev/null
@@ -1,163 +0,0 @@
-.hidden __hwcap
-
-.global feclearexcept
-.type feclearexcept,@function
-feclearexcept:	
-	mov 4(%esp),%ecx
-	and $0x3f,%ecx
-	fnstsw %ax
-		# consider sse fenv as well if the cpu has XMM capability
-	call 1f
-1:	addl $__hwcap-1b,(%esp)
-	pop %edx
-	testl $0x02000000,(%edx)
-	jz 2f
-		# maintain exceptions in the sse mxcsr, clear x87 exceptions
-	test %eax,%ecx
-	jz 1f
-	fnclex
-1:	push %edx
-	stmxcsr (%esp)
-	pop %edx
-	and $0x3f,%eax
-	or %eax,%edx
-	test %edx,%ecx
-	jz 1f
-	not %ecx
-	and %ecx,%edx
-	push %edx
-	ldmxcsr (%esp)
-	pop %edx
-1:	xor %eax,%eax
-	ret
-		# only do the expensive x87 fenv load/store when needed
-2:	test %eax,%ecx
-	jz 1b
-	not %ecx
-	and %ecx,%eax
-	test $0x3f,%eax
-	jz 1f
-	fnclex
-	jmp 1b
-1:	sub $32,%esp
-	fnstenv (%esp)
-	mov %al,4(%esp)
-	fldenv (%esp)
-	add $32,%esp
-	xor %eax,%eax
-	ret
-
-.global feraiseexcept
-.type feraiseexcept,@function
-feraiseexcept:	
-	mov 4(%esp),%eax
-	and $0x3f,%eax
-	sub $32,%esp
-	fnstenv (%esp)
-	or %al,4(%esp)
-	fldenv (%esp)
-	add $32,%esp
-	xor %eax,%eax
-	ret
-
-.global __fesetround
-.type __fesetround,@function
-__fesetround:
-	mov 4(%esp),%ecx
-	push %eax
-	xor %eax,%eax
-	fnstcw (%esp)
-	andb $0xf3,1(%esp)
-	or %ch,1(%esp)
-	fldcw (%esp)
-		# consider sse fenv as well if the cpu has XMM capability
-	call 1f
-1:	addl $__hwcap-1b,(%esp)
-	pop %edx
-	testl $0x02000000,(%edx)
-	jz 1f
-	stmxcsr (%esp)
-	shl $3,%ch
-	andb $0x9f,1(%esp)
-	or %ch,1(%esp)
-	ldmxcsr (%esp)
-1:	pop %ecx
-	ret
-
-.global fegetround
-.type fegetround,@function
-fegetround:
-	push %eax
-	fnstcw (%esp)
-	pop %eax
-	and $0xc00,%eax
-	ret
-
-.global fegetenv
-.type fegetenv,@function
-fegetenv:
-	mov 4(%esp),%ecx
-	xor %eax,%eax
-	fnstenv (%ecx)
-		# consider sse fenv as well if the cpu has XMM capability
-	call 1f
-1:	addl $__hwcap-1b,(%esp)
-	pop %edx
-	testl $0x02000000,(%edx)
-	jz 1f
-	push %eax
-	stmxcsr (%esp)
-	pop %edx
-	and $0x3f,%edx
-	or %edx,4(%ecx)
-1:	ret
-
-.global fesetenv
-.type fesetenv,@function
-fesetenv:
-	mov 4(%esp),%ecx
-	xor %eax,%eax
-	inc %ecx
-	jz 1f
-	fldenv -1(%ecx)
-	movl -1(%ecx),%ecx
-	jmp 2f
-1:	push %eax
-	push %eax
-	push %eax
-	push %eax
-	pushl $0xffff
-	push %eax
-	pushl $0x37f
-	fldenv (%esp)
-	add $28,%esp
-		# consider sse fenv as well if the cpu has XMM capability
-2:	call 1f
-1:	addl $__hwcap-1b,(%esp)
-	pop %edx
-	testl $0x02000000,(%edx)
-	jz 1f
-		# mxcsr := same rounding mode, cleared exceptions, default mask
-	and $0xc00,%ecx
-	shl $3,%ecx
-	or $0x1f80,%ecx
-	mov %ecx,4(%esp)
-	ldmxcsr 4(%esp)
-1:	ret
-
-.global fetestexcept
-.type fetestexcept,@function
-fetestexcept:
-	mov 4(%esp),%ecx
-	and $0x3f,%ecx
-	fnstsw %ax
-		# consider sse fenv as well if the cpu has XMM capability
-	call 1f
-1:	addl $__hwcap-1b,(%esp)
-	pop %edx
-	testl $0x02000000,(%edx)
-	jz 1f
-	stmxcsr 4(%esp)
-	or 4(%esp),%eax
-1:	and %ecx,%eax
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/mips-sf/fenv.sub b/src/components/lib/libc/musl-1.1.11/src/fenv/mips-sf/fenv.sub
deleted file mode 100644
index 9cafca5e98..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/mips-sf/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-../fenv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/mips/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/mips/fenv.s
deleted file mode 100644
index 9b45ffc329..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/mips/fenv.s
+++ /dev/null
@@ -1,66 +0,0 @@
-.set noreorder
-
-.global feclearexcept
-.type  feclearexcept,@function
-feclearexcept:
-	and     $4, $4, 0x7c
-	cfc1    $5, $31
-	or      $5, $5, $4
-	xor     $5, $5, $4
-	ctc1    $5, $31
-	jr      $ra
-	li      $2, 0
-
-.global feraiseexcept
-.type  feraiseexcept,@function
-feraiseexcept:
-	and     $4, $4, 0x7c
-	cfc1    $5, $31
-	or      $5, $5, $4
-	ctc1    $5, $31
-	jr      $ra
-	li      $2, 0
-
-.global fetestexcept
-.type  fetestexcept,@function
-fetestexcept:
-	and     $4, $4, 0x7c
-	cfc1    $2, $31
-	jr      $ra
-	and     $2, $2, $4
-
-.global fegetround
-.type  fegetround,@function
-fegetround:
-	cfc1    $2, $31
-	jr      $ra
-	andi    $2, $2, 3
-
-.global __fesetround
-.type __fesetround,@function
-__fesetround:
-	cfc1    $5, $31
-	li      $6, -4
-	and     $5, $5, $6
-	or      $5, $5, $4
-	jr      $ra
-	li      $2, 0
-
-.global fegetenv
-.type  fegetenv,@function
-fegetenv:
-	cfc1    $5, $31
-	sw      $5, 0($4)
-	jr      $ra
-	li      $2, 0
-
-.global fesetenv
-.type  fesetenv,@function
-fesetenv:
-	addiu   $5, $4, 1
-	beq     $5, $0, 1f
-	 nop
-	lw      $5, 0($4)
-1:	ctc1    $5, $31
-	jr      $ra
-	li      $2, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/mipsel-sf/fenv.sub b/src/components/lib/libc/musl-1.1.11/src/fenv/mipsel-sf/fenv.sub
deleted file mode 100644
index 9cafca5e98..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/mipsel-sf/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-../fenv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/powerpc/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/powerpc/fenv.s
deleted file mode 100644
index e34a999089..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/powerpc/fenv.s
+++ /dev/null
@@ -1,123 +0,0 @@
-.global feclearexcept
-.type feclearexcept,@function
-feclearexcept:
-	andis. 3,3,0x3e00
-	# if (r3 & FE_INVALID) r3 |= all_invalid_flags
-	andis. 0,3,0x2000
-	stwu 1,-16(1)
-	beq- 0,1f
-	oris 3,3,0x01f8
-	ori  3,3,0x0700
-1:
-	# note: fpscr contains various fpu status and control
-	# flags and we dont check if r3 may alter other flags
-	# than the exception related ones
-	# fpscr &= ~r3
-	mffs 0
-	stfd 0,8(1)
-	lwz 9,12(1)
-	andc 9,9,3
-	stw 9,12(1)
-	lfd 0,8(1)
-	mtfsf 255,0
-
-	# return 0
-	li 3,0
-	addi 1,1,16
-	blr
-
-.global feraiseexcept
-.type feraiseexcept,@function
-feraiseexcept:
-	andis. 3,3,0x3e00
-	# if (r3 & FE_INVALID) r3 |= software_invalid_flag
-	andis. 0,3,0x2000
-	stwu 1,-16(1)
-	beq- 0,1f
-	ori 3,3,0x0400
-1:
-	# fpscr |= r3
-	mffs 0
-	stfd 0,8(1)
-	lwz 9,12(1)
-	or 9,9,3
-	stw 9,12(1)
-	lfd 0,8(1)
-	mtfsf 255,0
-
-	# return 0
-	li 3,0
-	addi 1,1,16
-	blr
-
-.global fetestexcept
-.type fetestexcept,@function
-fetestexcept:
-	andis. 3,3,0x3e00
-	# return r3 & fpscr
-	stwu 1,-16(1)
-	mffs 0
-	stfd 0,8(1)
-	lwz 9,12(1)
-	addi 1,1,16
-	and 3,3,9
-	blr
-
-.global fegetround
-.type fegetround,@function
-fegetround:
-	# return fpscr & 3
-	stwu 1,-16(1)
-	mffs 0
-	stfd 0,8(1)
-	lwz 3,12(1)
-	addi 1,1,16
-	clrlwi 3,3,30
-	blr
-
-.global __fesetround
-.type __fesetround,@function
-__fesetround:
-	# note: invalid input is not checked, r3 < 4 must hold
-	# fpscr = (fpscr & -4U) | r3
-	stwu 1,-16(1)
-	mffs 0
-	stfd 0,8(1)
-	lwz 9,12(1)
-	clrrwi 9,9,2
-	or 9,9,3
-	stw 9,12(1)
-	lfd 0,8(1)
-	mtfsf 255,0
-
-	# return 0
-	li 3,0
-	addi 1,1,16
-	blr
-
-.global fegetenv
-.type fegetenv,@function
-fegetenv:
-	# *r3 = fpscr
-	mffs 0
-	stfd 0,0(3)
-	# return 0
-	li 3,0
-	blr
-
-.global fesetenv
-.type fesetenv,@function
-fesetenv:
-	cmpwi 3, -1
-	bne 1f
-	mflr 4
-	bl 2f
-	.zero 8
-2:	mflr 3
-	mtlr 4
-1:	# fpscr = *r3
-	lfd 0,0(3)
-	mtfsf 255,0
-	# return 0
-	li 3,0
-	blr
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/sh-nofpu/fenv.sub b/src/components/lib/libc/musl-1.1.11/src/fenv/sh-nofpu/fenv.sub
deleted file mode 100644
index 9cafca5e98..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/sh-nofpu/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-../fenv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/sh/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/sh/fenv.s
deleted file mode 100644
index 7f5c62778e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/sh/fenv.s
+++ /dev/null
@@ -1,74 +0,0 @@
-.global fegetround
-.type   fegetround, @function
-fegetround:
-	sts fpscr, r0
-	rts
-	 and #3, r0
-
-.global __fesetround
-.type   __fesetround, @function
-__fesetround:
-	sts fpscr, r0
-	or  r4, r0
-	lds r0, fpscr
-	rts
-	 mov #0, r0
-
-.global fetestexcept
-.type   fetestexcept, @function
-fetestexcept:
-	sts fpscr, r0
-	and r4, r0
-	rts
-	 and #0x7c, r0
-
-.global feclearexcept
-.type   feclearexcept, @function
-feclearexcept:
-	mov r4, r0
-	and #0x7c, r0
-	not r0, r4
-	sts fpscr, r0
-	and r4, r0
-	lds r0, fpscr
-	rts
-	 mov #0, r0
-
-.global feraiseexcept
-.type   feraiseexcept, @function
-feraiseexcept:
-	mov r4, r0
-	and #0x7c, r0
-	sts fpscr, r4
-	or  r4, r0
-	lds r0, fpscr
-	rts
-	 mov #0, r0
-
-.global fegetenv
-.type   fegetenv, @function
-fegetenv:
-	sts fpscr, r0
-	mov.l r0, @r4
-	rts
-	 mov #0, r0
-
-.global fesetenv
-.type   fesetenv, @function
-fesetenv:
-	mov r4, r0
-	cmp/eq #-1, r0
-	bf 1f
-
-	! the default environment is complicated by the fact that we need to
-	! preserve the current precision bit, which we do not know a priori
-	sts fpscr, r0
-	mov #8, r1
-	swap.w r1, r1
-	bra 2f
-	 and r1, r0
-
-1:	mov.l @r4, r0      ! non-default environment
-2:	lds r0, fpscr
-	rts
-	 mov #0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/sheb-nofpu/fenv.sub b/src/components/lib/libc/musl-1.1.11/src/fenv/sheb-nofpu/fenv.sub
deleted file mode 100644
index 9cafca5e98..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/sheb-nofpu/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-../fenv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/x32/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/x32/fenv.s
deleted file mode 100644
index 45310465ce..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/x32/fenv.s
+++ /dev/null
@@ -1,97 +0,0 @@
-.global feclearexcept
-.type feclearexcept,@function
-feclearexcept:
-		# maintain exceptions in the sse mxcsr, clear x87 exceptions
-	mov %edi,%ecx
-	and $0x3f,%ecx
-	fnstsw %ax
-	test %eax,%ecx
-	jz 1f
-	fnclex
-1:	stmxcsr -8(%esp)
-	and $0x3f,%eax
-	or %eax,-8(%esp)
-	test %ecx,-8(%esp)
-	jz 1f
-	not %ecx
-	and %ecx,-8(%esp)
-	ldmxcsr -8(%esp)
-1:	xor %eax,%eax
-	ret
-
-.global feraiseexcept
-.type feraiseexcept,@function
-feraiseexcept:
-	and $0x3f,%edi
-	stmxcsr -8(%esp)
-	or %edi,-8(%esp)
-	ldmxcsr -8(%esp)
-	xor %eax,%eax
-	ret
-
-.global __fesetround
-.type __fesetround,@function
-__fesetround:
-	push %rax
-	xor %eax,%eax
-	mov %edi,%ecx
-	fnstcw (%esp)
-	andb $0xf3,1(%esp)
-	or %ch,1(%esp)
-	fldcw (%esp)
-	stmxcsr (%esp)
-	shl $3,%ch
-	andb $0x9f,1(%esp)
-	or %ch,1(%esp)
-	ldmxcsr (%esp)
-	pop %rcx
-	ret
-
-.global fegetround
-.type fegetround,@function
-fegetround:
-	push %rax
-	stmxcsr (%esp)
-	pop %rax
-	shr $3,%eax
-	and $0xc00,%eax
-	ret
-
-.global fegetenv
-.type fegetenv,@function
-fegetenv:
-	xor %eax,%eax
-	fnstenv (%edi)
-	stmxcsr 28(%edi)
-	ret
-
-.global fesetenv
-.type fesetenv,@function
-fesetenv:
-	xor %eax,%eax
-	inc %edi
-	jz 1f
-	fldenv -1(%edi)
-	ldmxcsr 27(%edi)
-	ret
-1:	push %rax
-	push %rax
-	pushq $0xffff
-	pushq $0x37f
-	fldenv (%esp)
-	pushq $0x1f80
-	ldmxcsr (%esp)
-	add $40,%esp
-	ret
-
-.global fetestexcept
-.type fetestexcept,@function
-fetestexcept:
-	and $0x3f,%edi
-	push %rax
-	stmxcsr (%esp)
-	pop %rsi
-	fnstsw %ax
-	or %esi,%eax
-	and %edi,%eax
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/x86_64/fenv.s b/src/components/lib/libc/musl-1.1.11/src/fenv/x86_64/fenv.s
deleted file mode 100644
index b5aeaf4f49..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/fenv/x86_64/fenv.s
+++ /dev/null
@@ -1,97 +0,0 @@
-.global feclearexcept
-.type feclearexcept,@function
-feclearexcept:
-		# maintain exceptions in the sse mxcsr, clear x87 exceptions
-	mov %edi,%ecx
-	and $0x3f,%ecx
-	fnstsw %ax
-	test %eax,%ecx
-	jz 1f
-	fnclex
-1:	stmxcsr -8(%rsp)
-	and $0x3f,%eax
-	or %eax,-8(%rsp)
-	test %ecx,-8(%rsp)
-	jz 1f
-	not %ecx
-	and %ecx,-8(%rsp)
-	ldmxcsr -8(%rsp)
-1:	xor %eax,%eax
-	ret
-
-.global feraiseexcept
-.type feraiseexcept,@function
-feraiseexcept:
-	and $0x3f,%edi
-	stmxcsr -8(%rsp)
-	or %edi,-8(%rsp)
-	ldmxcsr -8(%rsp)
-	xor %eax,%eax
-	ret
-
-.global __fesetround
-.type __fesetround,@function
-__fesetround:
-	push %rax
-	xor %eax,%eax
-	mov %edi,%ecx
-	fnstcw (%rsp)
-	andb $0xf3,1(%rsp)
-	or %ch,1(%rsp)
-	fldcw (%rsp)
-	stmxcsr (%rsp)
-	shl $3,%ch
-	andb $0x9f,1(%rsp)
-	or %ch,1(%rsp)
-	ldmxcsr (%rsp)
-	pop %rcx
-	ret
-
-.global fegetround
-.type fegetround,@function
-fegetround:
-	push %rax
-	stmxcsr (%rsp)
-	pop %rax
-	shr $3,%eax
-	and $0xc00,%eax
-	ret
-
-.global fegetenv
-.type fegetenv,@function
-fegetenv:
-	xor %eax,%eax
-	fnstenv (%rdi)
-	stmxcsr 28(%rdi)
-	ret
-
-.global fesetenv
-.type fesetenv,@function
-fesetenv:
-	xor %eax,%eax
-	inc %rdi
-	jz 1f
-	fldenv -1(%rdi)
-	ldmxcsr 27(%rdi)
-	ret
-1:	push %rax
-	push %rax
-	pushq $0xffff
-	pushq $0x37f
-	fldenv (%rsp)
-	pushq $0x1f80
-	ldmxcsr (%rsp)
-	add $40,%rsp
-	ret
-
-.global fetestexcept
-.type fetestexcept,@function
-fetestexcept:
-	and $0x3f,%edi
-	push %rax
-	stmxcsr (%rsp)
-	pop %rsi
-	fnstsw %ax
-	or %esi,%eax
-	and %edi,%eax
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/aarch64/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/aarch64/syscall.s
deleted file mode 100644
index 845986bf78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/aarch64/syscall.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.global __syscall
-.hidden __syscall
-.type __syscall,%function
-__syscall:
-	uxtw x8,w0
-	mov x0,x1
-	mov x1,x2
-	mov x2,x3
-	mov x3,x4
-	mov x4,x5
-	mov x5,x6
-	mov x6,x7
-	svc 0
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/arm/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/arm/syscall.s
deleted file mode 100644
index 2028456c0a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/arm/syscall.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.global __syscall
-.hidden __syscall
-.type __syscall,%function
-__syscall:
-	mov ip,sp
-	stmfd sp!,{r4,r5,r6,r7}
-	mov r7,r0
-	mov r0,r1
-	mov r1,r2
-	mov r2,r3
-	ldmfd ip,{r3,r4,r5,r6}
-	svc 0
-	ldmfd sp!,{r4,r5,r6,r7}
-	tst lr,#1
-	moveq pc,lr
-	bx lr
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/cos_syscalls.c b/src/components/lib/libc/musl-1.1.11/src/internal/cos_syscalls.c
deleted file mode 100644
index eae28b7d3b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/cos_syscalls.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdlib.h>
-	
-__attribute__((weak, regparm(1))) long
-__cos_syscall(int syscall_num, long a, long b, long c, long d, long e, long f, long g)
-{
-        long *x = NULL;
-        volatile long y = *x;
-
-        return y;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/dynlink.h b/src/components/lib/libc/musl-1.1.11/src/internal/dynlink.h
deleted file mode 100644
index 8621d2dddc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/dynlink.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _INTERNAL_RELOC_H
-#define _INTERNAL_RELOC_H
-
-#include <features.h>
-#include <elf.h>
-#include <stdint.h>
-
-#if UINTPTR_MAX == 0xffffffff
-typedef Elf32_Ehdr Ehdr;
-typedef Elf32_Phdr Phdr;
-typedef Elf32_Sym Sym;
-#define R_TYPE(x) ((x)&255)
-#define R_SYM(x) ((x)>>8)
-#else
-typedef Elf64_Ehdr Ehdr;
-typedef Elf64_Phdr Phdr;
-typedef Elf64_Sym Sym;
-#define R_TYPE(x) ((x)&0x7fffffff)
-#define R_SYM(x) ((x)>>32)
-#endif
-
-/* These enum constants provide unmatchable default values for
- * any relocation type the arch does not use. */
-enum {
-	REL_NONE = 0,
-	REL_SYMBOLIC = -100,
-	REL_GOT,
-	REL_PLT,
-	REL_RELATIVE,
-	REL_OFFSET,
-	REL_OFFSET32,
-	REL_COPY,
-	REL_SYM_OR_REL,
-	REL_DTPMOD,
-	REL_DTPOFF,
-	REL_TPOFF,
-	REL_TPOFF_NEG,
-	REL_TLSDESC,
-};
-
-#include "reloc.h"
-
-#define IS_RELATIVE(x) ( \
-	(R_TYPE(x) == REL_RELATIVE) || \
-	(R_TYPE(x) == REL_SYM_OR_REL && !R_SYM(x)) )
-
-#ifndef NEED_MIPS_GOT_RELOCS
-#define NEED_MIPS_GOT_RELOCS 0
-#endif
-
-#define AUX_CNT 32
-#define DYN_CNT 32
-
-typedef void (*stage2_func)(unsigned char *, size_t *);
-typedef _Noreturn void (*stage3_func)(size_t *);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/floatscan.h b/src/components/lib/libc/musl-1.1.11/src/internal/floatscan.h
deleted file mode 100644
index e027fa08f1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/floatscan.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef FLOATSCAN_H
-#define FLOATSCAN_H
-
-#include <stdio.h>
-
-long double __floatscan(FILE *, int, int);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/intscan.h b/src/components/lib/libc/musl-1.1.11/src/internal/intscan.h
deleted file mode 100644
index 994c5e7dee..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/intscan.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef INTSCAN_H
-#define INTSCAN_H
-
-#include <stdio.h>
-
-unsigned long long __intscan(FILE *, unsigned, int, unsigned long long);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/ksigaction.h b/src/components/lib/libc/musl-1.1.11/src/internal/ksigaction.h
deleted file mode 100644
index 2eacabf113..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/ksigaction.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This is the structure used for the rt_sigaction syscall on most archs,
- * but it can be overridden by a file with the same name in the top-level
- * arch dir for a given arch, if necessary. */
-struct k_sigaction {
-	void (*handler)(int);
-	unsigned long flags;
-	void (*restorer)(void);
-	unsigned mask[2];
-};
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/libc.h b/src/components/lib/libc/musl-1.1.11/src/internal/libc.h
deleted file mode 100644
index 98c7535aa8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/libc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef LIBC_H
-#define LIBC_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-
-struct __locale_map;
-
-struct __locale_struct {
-	const struct __locale_map *volatile cat[6];
-};
-
-struct __libc {
-	int can_do_threads;
-	int threaded;
-	int secure;
-	volatile int threads_minus_1;
-	size_t *auxv;
-	size_t tls_size;
-	size_t page_size;
-	struct __locale_struct global_locale;
-};
-
-#ifndef PAGE_SIZE
-#define PAGE_SIZE libc.page_size
-#endif
-
-#ifdef __PIC__
-#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
-#else
-#define ATTR_LIBC_VISIBILITY
-#endif
-
-extern struct __libc __libc ATTR_LIBC_VISIBILITY;
-#define libc __libc
-
-extern size_t __hwcap ATTR_LIBC_VISIBILITY;
-extern size_t __sysinfo ATTR_LIBC_VISIBILITY;
-extern char *__progname, *__progname_full;
-
-/* Designed to avoid any overhead in non-threaded processes */
-void __lock(volatile int *) ATTR_LIBC_VISIBILITY;
-void __unlock(volatile int *) ATTR_LIBC_VISIBILITY;
-int __lockfile(FILE *) ATTR_LIBC_VISIBILITY;
-void __unlockfile(FILE *) ATTR_LIBC_VISIBILITY;
-#define LOCK(x) __lock(x)
-#define UNLOCK(x) __unlock(x)
-
-void __synccall(void (*)(void *), void *);
-int __setxid(int, int, int, int);
-
-extern char **__environ;
-
-#undef weak_alias
-#define weak_alias(old, new) \
-	extern __typeof(old) new __attribute__((weak, alias(#old)))
-
-#undef LFS64_2
-#define LFS64_2(x, y) weak_alias(x, y)
-
-#undef LFS64
-#define LFS64(x) LFS64_2(x, x##64)
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/libm.h b/src/components/lib/libc/musl-1.1.11/src/internal/libm.h
deleted file mode 100644
index df8641116a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/libm.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/math_private.h */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#ifndef _LIBM_H
-#define _LIBM_H
-
-#include <stdint.h>
-#include <float.h>
-#include <math.h>
-#include <complex.h>
-#include <endian.h>
-
-#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN
-union ldshape {
-	long double f;
-	struct {
-		uint64_t m;
-		uint16_t se;
-	} i;
-};
-#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN
-union ldshape {
-	long double f;
-	struct {
-		uint64_t lo;
-		uint32_t mid;
-		uint16_t top;
-		uint16_t se;
-	} i;
-	struct {
-		uint64_t lo;
-		uint64_t hi;
-	} i2;
-};
-#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __BIG_ENDIAN
-union ldshape {
-	long double f;
-	struct {
-		uint16_t se;
-		uint16_t top;
-		uint32_t mid;
-		uint64_t lo;
-	} i;
-	struct {
-		uint64_t hi;
-		uint64_t lo;
-	} i2;
-};
-#else
-#error Unsupported long double representation
-#endif
-
-#define FORCE_EVAL(x) do {                        \
-	if (sizeof(x) == sizeof(float)) {         \
-		volatile float __x;               \
-		__x = (x);                        \
-	} else if (sizeof(x) == sizeof(double)) { \
-		volatile double __x;              \
-		__x = (x);                        \
-	} else {                                  \
-		volatile long double __x;         \
-		__x = (x);                        \
-	}                                         \
-} while(0)
-
-/* Get two 32 bit ints from a double.  */
-#define EXTRACT_WORDS(hi,lo,d)                    \
-do {                                              \
-  union {double f; uint64_t i;} __u;              \
-  __u.f = (d);                                    \
-  (hi) = __u.i >> 32;                             \
-  (lo) = (uint32_t)__u.i;                         \
-} while (0)
-
-/* Get the more significant 32 bit int from a double.  */
-#define GET_HIGH_WORD(hi,d)                       \
-do {                                              \
-  union {double f; uint64_t i;} __u;              \
-  __u.f = (d);                                    \
-  (hi) = __u.i >> 32;                             \
-} while (0)
-
-/* Get the less significant 32 bit int from a double.  */
-#define GET_LOW_WORD(lo,d)                        \
-do {                                              \
-  union {double f; uint64_t i;} __u;              \
-  __u.f = (d);                                    \
-  (lo) = (uint32_t)__u.i;                         \
-} while (0)
-
-/* Set a double from two 32 bit ints.  */
-#define INSERT_WORDS(d,hi,lo)                     \
-do {                                              \
-  union {double f; uint64_t i;} __u;              \
-  __u.i = ((uint64_t)(hi)<<32) | (uint32_t)(lo);  \
-  (d) = __u.f;                                    \
-} while (0)
-
-/* Set the more significant 32 bits of a double from an int.  */
-#define SET_HIGH_WORD(d,hi)                       \
-do {                                              \
-  union {double f; uint64_t i;} __u;              \
-  __u.f = (d);                                    \
-  __u.i &= 0xffffffff;                            \
-  __u.i |= (uint64_t)(hi) << 32;                  \
-  (d) = __u.f;                                    \
-} while (0)
-
-/* Set the less significant 32 bits of a double from an int.  */
-#define SET_LOW_WORD(d,lo)                        \
-do {                                              \
-  union {double f; uint64_t i;} __u;              \
-  __u.f = (d);                                    \
-  __u.i &= 0xffffffff00000000ull;                 \
-  __u.i |= (uint32_t)(lo);                        \
-  (d) = __u.f;                                    \
-} while (0)
-
-/* Get a 32 bit int from a float.  */
-#define GET_FLOAT_WORD(w,d)                       \
-do {                                              \
-  union {float f; uint32_t i;} __u;               \
-  __u.f = (d);                                    \
-  (w) = __u.i;                                    \
-} while (0)
-
-/* Set a float from a 32 bit int.  */
-#define SET_FLOAT_WORD(d,w)                       \
-do {                                              \
-  union {float f; uint32_t i;} __u;               \
-  __u.i = (w);                                    \
-  (d) = __u.f;                                    \
-} while (0)
-
-#undef __CMPLX
-#undef CMPLX
-#undef CMPLXF
-#undef CMPLXL
-
-#define __CMPLX(x, y, t) \
-	((union { _Complex t __z; t __xy[2]; }){.__xy = {(x),(y)}}.__z)
-
-#define CMPLX(x, y) __CMPLX(x, y, double)
-#define CMPLXF(x, y) __CMPLX(x, y, float)
-#define CMPLXL(x, y) __CMPLX(x, y, long double)
-
-/* fdlibm kernel functions */
-
-int    __rem_pio2_large(double*,double*,int,int,int);
-
-int    __rem_pio2(double,double*);
-double __sin(double,double,int);
-double __cos(double,double);
-double __tan(double,double,int);
-double __expo2(double);
-double complex __ldexp_cexp(double complex,int);
-
-int    __rem_pio2f(float,double*);
-float  __sindf(double);
-float  __cosdf(double);
-float  __tandf(double,int);
-float  __expo2f(float);
-float complex __ldexp_cexpf(float complex,int);
-
-int __rem_pio2l(long double, long double *);
-long double __sinl(long double, long double, int);
-long double __cosl(long double, long double);
-long double __tanl(long double, long double, int);
-
-/* polynomial evaluation */
-long double __polevll(long double, const long double *, int);
-long double __p1evll(long double, const long double *, int);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/locale_impl.h b/src/components/lib/libc/musl-1.1.11/src/internal/locale_impl.h
deleted file mode 100644
index f5e4d9b4ae..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/locale_impl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _LOCALE_IMPL_H
-#define _LOCALE_IMPL_H
-
-#include <locale.h>
-#include <stdlib.h>
-#include "libc.h"
-#include "pthread_impl.h"
-
-#define LOCALE_NAME_MAX 15
-
-struct __locale_map {
-	const void *map;
-	size_t map_size;
-	char name[LOCALE_NAME_MAX+1];
-	const struct __locale_map *next;
-};
-
-extern const struct __locale_map __c_dot_utf8;
-extern const struct __locale_struct __c_locale;
-extern const struct __locale_struct __c_dot_utf8_locale;
-
-const struct __locale_map *__get_locale(int, const char *);
-const char *__mo_lookup(const void *, size_t, const char *);
-const char *__lctrans(const char *, const struct __locale_map *);
-const char *__lctrans_cur(const char *);
-
-#define LCTRANS(msg, lc, loc) __lctrans(msg, (loc)->cat[(lc)])
-#define LCTRANS_CUR(msg) __lctrans_cur(msg)
-
-#define C_LOCALE ((locale_t)&__c_locale)
-#define UTF8_LOCALE ((locale_t)&__c_dot_utf8_locale)
-
-#define CURRENT_LOCALE (__pthread_self()->locale)
-
-#define CURRENT_UTF8 (!!__pthread_self()->locale->cat[LC_CTYPE])
-
-#undef MB_CUR_MAX
-#define MB_CUR_MAX (CURRENT_UTF8 ? 4 : 1)
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/microblaze/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/microblaze/syscall.s
deleted file mode 100644
index e0312e7875..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/microblaze/syscall.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.global __syscall
-.hidden __syscall
-.type   __syscall,@function
-__syscall:
-	addi    r12, r5, 0              # Save the system call number
-	add     r5, r6, r0              # Shift the arguments, arg1
-	add     r6, r7, r0              # arg2
-	add     r7, r8, r0              # arg3
-	add     r8, r9, r0              # arg4
-	add     r9, r10, r0             # arg5
-	lwi     r10, r1, 28             # Get arg6.
-	brki    r14, 0x8                # syscall
-	rtsd    r15, 8
-	nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/mips/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/mips/syscall.s
deleted file mode 100644
index 5d0def523e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/mips/syscall.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set    noreorder
-
-.global __syscall
-.hidden __syscall
-.type   __syscall,@function
-__syscall:
-	move    $2, $4
-	move    $4, $5
-	move    $5, $6
-	move    $6, $7
-	lw      $7, 16($sp)
-	lw      $8, 20($sp)
-	lw      $9, 24($sp)
-	lw      $10,28($sp)
-	subu    $sp, $sp, 32
-	sw      $8, 16($sp)
-	sw      $9, 20($sp)
-	sw      $10,24($sp)
-	sw      $2 ,28($sp)
-	lw      $2, 28($sp)
-	syscall
-	beq     $7, $0, 1f
-	addu    $sp, $sp, 32
-	subu    $2, $0, $2
-1:	jr      $ra
-	nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/or1k/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/or1k/syscall.s
deleted file mode 100644
index 177964e904..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/or1k/syscall.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.global __syscall
-.hidden __syscall
-.type   __syscall,@function
-__syscall:
-	l.ori	r11, r3, 0
-	l.lwz	r3, 0(r1)
-	l.lwz	r4, 4(r1)
-	l.lwz	r5, 8(r1)
-	l.lwz	r6, 12(r1)
-	l.lwz	r7, 16(r1)
-	l.lwz	r8, 20(r1)
-	l.sys	1
-	l.jr	r9
-	 l.nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/powerpc/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/powerpc/syscall.s
deleted file mode 100644
index 5b16b8f20c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/powerpc/syscall.s
+++ /dev/null
@@ -1,19 +0,0 @@
-	.global __syscall
-	.hidden __syscall
-	.type   __syscall,@function
-__syscall:
-	mr      0, 3                  # Save the system call number
-	mr      3, 4                  # Shift the arguments: arg1
-	mr      4, 5                  # arg2
-	mr      5, 6                  # arg3
-	mr      6, 7                  # arg4
-	mr      7, 8                  # arg5
-	mr      8, 9                  # arg6
-	sc
-	bnslr+ # return if not summary overflow
-	#else error:
-	# return negated value.
-	neg 3, 3
-	blr
-	.end    __syscall
-	.size   __syscall, .-__syscall
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/pthread_impl.h b/src/components/lib/libc/musl-1.1.11/src/internal/pthread_impl.h
deleted file mode 100644
index f35f1e12ad..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/pthread_impl.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef _PTHREAD_IMPL_H
-#define _PTHREAD_IMPL_H
-
-#include <pthread.h>
-#include <signal.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <syscall.h>
-#include "libc.h"
-#include "syscall.h"
-#include "atomic.h"
-#include "futex.h"
-
-#define pthread __pthread
-
-struct pthread {
-	struct pthread *self;
-	void **dtv, *unused1, *unused2;
-	uintptr_t sysinfo;
-	uintptr_t canary, canary2;
-	pid_t tid, pid;
-	int tsd_used, errno_val;
-	volatile int cancel, canceldisable, cancelasync;
-	int detached;
-	unsigned char *map_base;
-	size_t map_size;
-	void *stack;
-	size_t stack_size;
-	void *start_arg;
-	void *(*start)(void *);
-	void *result;
-	struct __ptcb *cancelbuf;
-	void **tsd;
-	pthread_attr_t attr;
-	volatile int dead;
-	struct {
-		volatile void *volatile head;
-		long off;
-		volatile void *volatile pending;
-	} robust_list;
-	int unblock_cancel;
-	volatile int timer_id;
-	locale_t locale;
-	volatile int killlock[2];
-	volatile int exitlock[2];
-	volatile int startlock[2];
-	unsigned long sigmask[_NSIG/8/sizeof(long)];
-	char *dlerror_buf;
-	int dlerror_flag;
-	void *stdio_locks;
-	uintptr_t canary_at_end;
-	void **dtv_copy;
-};
-
-struct __timer {
-	int timerid;
-	pthread_t thread;
-};
-
-#define __SU (sizeof(size_t)/sizeof(int))
-
-#define _a_stacksize __u.__s[0]
-#define _a_guardsize __u.__s[1]
-#define _a_stackaddr __u.__s[2]
-#define _a_detach __u.__i[3*__SU+0]
-#define _a_sched __u.__i[3*__SU+1]
-#define _a_policy __u.__i[3*__SU+2]
-#define _a_prio __u.__i[3*__SU+3]
-#define _m_type __u.__i[0]
-#define _m_lock __u.__vi[1]
-#define _m_waiters __u.__vi[2]
-#define _m_prev __u.__p[3]
-#define _m_next __u.__p[4]
-#define _m_count __u.__i[5]
-#define _c_shared __u.__p[0]
-#define _c_seq __u.__vi[2]
-#define _c_waiters __u.__vi[3]
-#define _c_clock __u.__i[4]
-#define _c_lock __u.__vi[8]
-#define _c_head __u.__p[1]
-#define _c_tail __u.__p[5]
-#define _rw_lock __u.__vi[0]
-#define _rw_waiters __u.__vi[1]
-#define _rw_shared __u.__i[2]
-#define _b_lock __u.__vi[0]
-#define _b_waiters __u.__vi[1]
-#define _b_limit __u.__i[2]
-#define _b_count __u.__vi[3]
-#define _b_waiters2 __u.__vi[4]
-#define _b_inst __u.__p[3]
-
-#include "pthread_arch.h"
-
-#ifndef CANARY
-#define CANARY canary
-#endif
-
-#ifndef DTP_OFFSET
-#define DTP_OFFSET 0
-#endif
-
-#define SIGTIMER 32
-#define SIGCANCEL 33
-#define SIGSYNCCALL 34
-
-#define SIGALL_SET ((sigset_t *)(const unsigned long long [2]){ -1,-1 })
-#define SIGPT_SET \
-	((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \
-	[sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
-#define SIGTIMER_SET \
-	((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \
-	 0x80000000 })
-
-pthread_t __pthread_self_init(void);
-
-int __clone(int (*a)(void *), void *b, int c, void *d, void *e, void* f, void* g);
-
-int __set_thread_area(void *);
-int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
-int __libc_sigprocmask(int, const sigset_t *, sigset_t *);
-void __lock(volatile int *);
-void __unmapself(void *, size_t);
-
-void __vm_wait(void);
-void __vm_lock(void);
-void __vm_unlock(void);
-
-int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int);
-int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int);
-void __wait(volatile int *, volatile int *, int, int);
-static inline void __wake(volatile void *addr, int cnt, int priv)
-{
-	if (priv) priv = 128;
-	if (cnt<0) cnt = INT_MAX;
-	__syscall(SYS_futex, addr, FUTEX_WAKE|priv, cnt) != -ENOSYS ||
-	__syscall(SYS_futex, addr, FUTEX_WAKE, cnt);
-}
-
-void __acquire_ptc(void);
-void __release_ptc(void);
-void __inhibit_ptc(void);
-
-void __block_all_sigs(void *);
-void __block_app_sigs(void *);
-void __restore_sigs(void *);
-
-#define DEFAULT_STACK_SIZE 81920
-#define DEFAULT_GUARD_SIZE PAGE_SIZE
-
-#define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1)
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/sh/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/sh/syscall.s
deleted file mode 100644
index 331918a5aa..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/sh/syscall.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.global __syscall
-.hidden __syscall
-.type   __syscall, @function
-__syscall:
-	! The kernel syscall entry point documents that the trap number indicates
-	! the number of arguments being passed, but it then ignores that information.
-	! Since we do not actually know how many arguments are being passed, we will
-	! say there are six, since that is the maximum we support here.
-	mov r4, r3
-	mov r5, r4
-	mov r6, r5
-	mov r7, r6
-	mov.l @r15, r7
-	mov.l @(4,r15), r0
-	mov.l @(8,r15), r1
-	trapa #31
-	or r0, r0
-	or r0, r0
-	or r0, r0
-	or r0, r0
-	or r0, r0
-	rts
-	 nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/shgetc.c b/src/components/lib/libc/musl-1.1.11/src/internal/shgetc.c
deleted file mode 100644
index e878b00ad5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/shgetc.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "shgetc.h"
-
-void __shlim(FILE *f, off_t lim)
-{
-	f->shlim = lim;
-	f->shcnt = f->rend - f->rpos;
-	if (lim && f->shcnt > lim)
-		f->shend = f->rpos + lim;
-	else
-		f->shend = f->rend;
-}
-
-int __shgetc(FILE *f)
-{
-	int c;
-	if (f->shlim && f->shcnt >= f->shlim || (c=__uflow(f)) < 0) {
-		f->shend = 0;
-		return EOF;
-	}
-	if (f->shlim && f->rend - f->rpos > f->shlim - f->shcnt - 1)
-		f->shend = f->rpos + (f->shlim - f->shcnt - 1);
-	else
-		f->shend = f->rend;
-	if (f->rend) f->shcnt += f->rend - f->rpos + 1;
-	if (f->rpos[-1] != c) f->rpos[-1] = c;
-	return c;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/shgetc.h b/src/components/lib/libc/musl-1.1.11/src/internal/shgetc.h
deleted file mode 100644
index 7beb8ce621..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/shgetc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "stdio_impl.h"
-
-void __shlim(FILE *, off_t);
-int __shgetc(FILE *);
-
-#define shcnt(f) ((f)->shcnt + ((f)->rpos - (f)->rend))
-#define shlim(f, lim) __shlim((f), (lim))
-#define shgetc(f) (((f)->rpos < (f)->shend) ? *(f)->rpos++ : __shgetc(f))
-#define shunget(f) ((f)->shend ? (void)(f)->rpos-- : (void)0)
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/stdio_impl.h b/src/components/lib/libc/musl-1.1.11/src/internal/stdio_impl.h
deleted file mode 100644
index 0dd7fb5e41..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/stdio_impl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef _STDIO_IMPL_H
-#define _STDIO_IMPL_H
-
-#include <stdio.h>
-#include "syscall.h"
-#include "libc.h"
-
-#define UNGET 8
-
-#define FFINALLOCK(f) ((f)->lock>=0 ? __lockfile((f)) : 0)
-#define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0)
-#define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else
-
-#define F_PERM 1
-#define F_NORD 4
-#define F_NOWR 8
-#define F_EOF 16
-#define F_ERR 32
-#define F_SVB 64
-#define F_APP 128
-
-struct _IO_FILE {
-	unsigned flags;
-	unsigned char *rpos, *rend;
-	int (*close)(FILE *);
-	unsigned char *wend, *wpos;
-	unsigned char *mustbezero_1;
-	unsigned char *wbase;
-	size_t (*read)(FILE *, unsigned char *, size_t);
-	size_t (*write)(FILE *, const unsigned char *, size_t);
-	off_t (*seek)(FILE *, off_t, int);
-	unsigned char *buf;
-	size_t buf_size;
-	FILE *prev, *next;
-	int fd;
-	int pipe_pid;
-	long lockcount;
-	short dummy3;
-	signed char mode;
-	signed char lbf;
-	volatile int lock;
-	volatile int waiters;
-	void *cookie;
-	off_t off;
-	char *getln_buf;
-	void *mustbezero_2;
-	unsigned char *shend;
-	off_t shlim, shcnt;
-	FILE *prev_locked, *next_locked;
-	struct __locale_struct *locale;
-};
-
-size_t __stdio_read(FILE *, unsigned char *, size_t);
-size_t __stdio_write(FILE *, const unsigned char *, size_t);
-size_t __stdout_write(FILE *, const unsigned char *, size_t);
-off_t __stdio_seek(FILE *, off_t, int);
-int __stdio_close(FILE *);
-
-size_t __string_read(FILE *, unsigned char *, size_t);
-
-int __toread(FILE *);
-int __towrite(FILE *);
-
-#if defined(__PIC__) && (100*__GNUC__+__GNUC_MINOR__ >= 303)
-__attribute__((visibility("protected")))
-#endif
-int __overflow(FILE *, int), __uflow(FILE *);
-
-int __fseeko(FILE *, off_t, int);
-int __fseeko_unlocked(FILE *, off_t, int);
-off_t __ftello(FILE *);
-off_t __ftello_unlocked(FILE *);
-size_t __fwritex(const unsigned char *, size_t, FILE *);
-int __putc_unlocked(int, FILE *);
-
-FILE *__fdopen(int, const char *);
-int __fmodeflags(const char *);
-
-FILE *__ofl_add(FILE *f);
-FILE **__ofl_lock(void);
-void __ofl_unlock(void);
-
-#define feof(f) ((f)->flags & F_EOF)
-#define ferror(f) ((f)->flags & F_ERR)
-
-#define getc_unlocked(f) \
-	( ((f)->rpos < (f)->rend) ? *(f)->rpos++ : __uflow((f)) )
-
-#define putc_unlocked(c, f) ( ((c)!=(f)->lbf && (f)->wpos<(f)->wend) \
-	? *(f)->wpos++ = (c) : __overflow((f),(c)) )
-
-/* Caller-allocated FILE * operations */
-FILE *__fopen_rb_ca(const char *, FILE *, unsigned char *, size_t);
-int __fclose_ca(FILE *);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/syscall.c b/src/components/lib/libc/musl-1.1.11/src/internal/syscall.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/syscall.h b/src/components/lib/libc/musl-1.1.11/src/internal/syscall.h
deleted file mode 100644
index a93f6d1e0b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/syscall.h
+++ /dev/null
@@ -1,245 +0,0 @@
-#ifndef _INTERNAL_SYSCALL_H
-#define _INTERNAL_SYSCALL_H
-
-#include <sys/syscall.h>
-#include "syscall_arch.h"
-
-#ifndef SYSCALL_RLIM_INFINITY
-#define SYSCALL_RLIM_INFINITY (~0ULL)
-#endif
-
-#ifndef SYSCALL_MMAP2_UNIT
-#define SYSCALL_MMAP2_UNIT 4096ULL
-#endif
-
-#ifndef __scc
-#define __scc(X) ((long) (X))
-typedef long syscall_arg_t;
-#endif
-
-#ifdef SHARED
-__attribute__((visibility("hidden")))
-#endif
-long __syscall_ret(unsigned long), __syscall(syscall_arg_t, ...),
-	__syscall_cp(syscall_arg_t, syscall_arg_t, syscall_arg_t, syscall_arg_t,
-	             syscall_arg_t, syscall_arg_t, syscall_arg_t);
-
-#ifdef SYSCALL_NO_INLINE
-#define __syscall0(n) (__syscall)(n)
-#define __syscall1(n,a) (__syscall)(n,__scc(a))
-#define __syscall2(n,a,b) (__syscall)(n,__scc(a),__scc(b))
-#define __syscall3(n,a,b,c) (__syscall)(n,__scc(a),__scc(b),__scc(c))
-#define __syscall4(n,a,b,c,d) (__syscall)(n,__scc(a),__scc(b),__scc(c),__scc(d))
-#define __syscall5(n,a,b,c,d,e) (__syscall)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
-#define __syscall6(n,a,b,c,d,e,f) (__syscall)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
-#else
-#define __syscall1(n,a) __syscall1(n,__scc(a))
-#define __syscall2(n,a,b) __syscall2(n,__scc(a),__scc(b))
-#define __syscall3(n,a,b,c) __syscall3(n,__scc(a),__scc(b),__scc(c))
-#define __syscall4(n,a,b,c,d) __syscall4(n,__scc(a),__scc(b),__scc(c),__scc(d))
-#define __syscall5(n,a,b,c,d,e) __syscall5(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
-#define __syscall6(n,a,b,c,d,e,f) __syscall6(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
-#endif
-#define __syscall7(n,a,b,c,d,e,f,g) (__syscall)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f),__scc(g))
-
-#define __SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n
-#define __SYSCALL_NARGS(...) __SYSCALL_NARGS_X(__VA_ARGS__,7,6,5,4,3,2,1,0,)
-#define __SYSCALL_CONCAT_X(a,b) a##b
-#define __SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X(a,b)
-#define __SYSCALL_DISP(b,...) __SYSCALL_CONCAT(b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
-
-#define __syscall(...) __SYSCALL_DISP(__syscall,__VA_ARGS__)
-#define syscall(...) __syscall_ret(__syscall(__VA_ARGS__))
-
-#define socketcall __socketcall
-#define socketcall_cp __socketcall_cp
-
-#define __syscall_cp0(n) (__syscall_cp)(n,0,0,0,0,0,0)
-#define __syscall_cp1(n,a) (__syscall_cp)(n,__scc(a),0,0,0,0,0)
-#define __syscall_cp2(n,a,b) (__syscall_cp)(n,__scc(a),__scc(b),0,0,0,0)
-#define __syscall_cp3(n,a,b,c) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),0,0,0)
-#define __syscall_cp4(n,a,b,c,d) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),0,0)
-#define __syscall_cp5(n,a,b,c,d,e) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),0)
-#define __syscall_cp6(n,a,b,c,d,e,f) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
-
-#define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp,__VA_ARGS__)
-#define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
-
-#ifdef SYS_socket
-#define __socketcall(nm,a,b,c,d,e,f) syscall(SYS_##nm, a, b, c, d, e, f)
-#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(SYS_##nm, a, b, c, d, e, f)
-#else
-#define __socketcall(nm,a,b,c,d,e,f) syscall(SYS_socketcall, __SC_##nm, \
-    ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f }))
-#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(SYS_socketcall, __SC_##nm, \
-    ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f }))
-#endif
-
-/* fixup legacy 16-bit junk */
-
-#ifdef SYS_getuid32
-#undef SYS_lchown
-#undef SYS_getuid
-#undef SYS_getgid
-#undef SYS_geteuid
-#undef SYS_getegid
-#undef SYS_setreuid
-#undef SYS_setregid
-#undef SYS_getgroups
-#undef SYS_setgroups
-#undef SYS_fchown
-#undef SYS_setresuid
-#undef SYS_getresuid
-#undef SYS_setresgid
-#undef SYS_getresgid
-#undef SYS_chown
-#undef SYS_setuid
-#undef SYS_setgid
-#undef SYS_setfsuid
-#undef SYS_setfsgid
-#define SYS_lchown SYS_lchown32
-#define SYS_getuid SYS_getuid32
-#define SYS_getgid SYS_getgid32
-#define SYS_geteuid SYS_geteuid32
-#define SYS_getegid SYS_getegid32
-#define SYS_setreuid SYS_setreuid32
-#define SYS_setregid SYS_setregid32
-#define SYS_getgroups SYS_getgroups32
-#define SYS_setgroups SYS_setgroups32
-#define SYS_fchown SYS_fchown32
-#define SYS_setresuid SYS_setresuid32
-#define SYS_getresuid SYS_getresuid32
-#define SYS_setresgid SYS_setresgid32
-#define SYS_getresgid SYS_getresgid32
-#define SYS_chown SYS_chown32
-#define SYS_setuid SYS_setuid32
-#define SYS_setgid SYS_setgid32
-#define SYS_setfsuid SYS_setfsuid32
-#define SYS_setfsgid SYS_setfsgid32
-#endif
-
-
-/* fixup legacy 32-bit-vs-lfs64 junk */
-
-#ifdef SYS_fcntl64
-#undef SYS_fcntl
-#define SYS_fcntl SYS_fcntl64
-#endif
-
-#ifdef SYS_getdents64
-#undef SYS_getdents
-#define SYS_getdents SYS_getdents64
-#endif
-
-#ifdef SYS_ftruncate64
-#undef SYS_ftruncate
-#undef SYS_truncate
-#define SYS_ftruncate SYS_ftruncate64
-#define SYS_truncate SYS_truncate64
-#endif
-
-#ifdef SYS_stat64
-#undef SYS_stat
-#define SYS_stat SYS_stat64
-#endif
-
-#ifdef SYS_fstat64
-#undef SYS_fstat
-#define SYS_fstat SYS_fstat64
-#endif
-
-#ifdef SYS_lstat64
-#undef SYS_lstat
-#define SYS_lstat SYS_lstat64
-#endif
-
-#ifdef SYS_statfs64
-#undef SYS_statfs
-#define SYS_statfs SYS_statfs64
-#endif
-
-#ifdef SYS_fstatfs64
-#undef SYS_fstatfs
-#define SYS_fstatfs SYS_fstatfs64
-#endif
-
-#if defined(SYS_newfstatat)
-#undef SYS_fstatat
-#define SYS_fstatat SYS_newfstatat
-#elif defined(SYS_fstatat64)
-#undef SYS_fstatat
-#define SYS_fstatat SYS_fstatat64
-#endif
-
-#ifdef SYS_ugetrlimit
-#undef SYS_getrlimit
-#define SYS_getrlimit SYS_ugetrlimit
-#endif
-
-#ifdef SYS__newselect
-#undef SYS_select
-#define SYS_select SYS__newselect
-#endif
-
-#ifdef SYS_pread64
-#undef SYS_pread
-#undef SYS_pwrite
-#define SYS_pread SYS_pread64
-#define SYS_pwrite SYS_pwrite64
-#endif
-
-#ifdef SYS_fadvise64_64
-#undef SYS_fadvise
-#define SYS_fadvise SYS_fadvise64_64
-#elif defined(SYS_fadvise64)
-#undef SYS_fadvise
-#define SYS_fadvise SYS_fadvise64
-#endif
-
-#ifdef SYS_sendfile64
-#undef SYS_sendfile
-#define SYS_sendfile SYS_sendfile64
-#endif
-
-/* socketcall calls */
-
-#define __SC_socket      1
-#define __SC_bind        2
-#define __SC_connect     3
-#define __SC_listen      4
-#define __SC_accept      5
-#define __SC_getsockname 6
-#define __SC_getpeername 7
-#define __SC_socketpair  8
-#define __SC_send        9
-#define __SC_recv        10
-#define __SC_sendto      11
-#define __SC_recvfrom    12
-#define __SC_shutdown    13
-#define __SC_setsockopt  14
-#define __SC_getsockopt  15
-#define __SC_sendmsg     16
-#define __SC_recvmsg     17
-#define __SC_accept4     18
-#define __SC_recvmmsg    19
-#define __SC_sendmmsg    20
-
-#ifdef SYS_open
-#define __sys_open2(x,pn,fl) __syscall2(SYS_open, pn, (fl)|O_LARGEFILE)
-#define __sys_open3(x,pn,fl,mo) __syscall3(SYS_open, pn, (fl)|O_LARGEFILE, mo)
-#define __sys_open_cp2(x,pn,fl) __syscall_cp2(SYS_open, pn, (fl)|O_LARGEFILE)
-#define __sys_open_cp3(x,pn,fl,mo) __syscall_cp3(SYS_open, pn, (fl)|O_LARGEFILE, mo)
-#else
-#define __sys_open2(x,pn,fl) __syscall3(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE)
-#define __sys_open3(x,pn,fl,mo) __syscall4(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE, mo)
-#define __sys_open_cp2(x,pn,fl) __syscall_cp3(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE)
-#define __sys_open_cp3(x,pn,fl,mo) __syscall_cp4(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE, mo)
-#endif
-
-#define __sys_open(...) __SYSCALL_DISP(__sys_open,,__VA_ARGS__)
-#define sys_open(...) __syscall_ret(__sys_open(__VA_ARGS__))
-
-#define __sys_open_cp(...) __SYSCALL_DISP(__sys_open_cp,,__VA_ARGS__)
-#define sys_open_cp(...) __syscall_ret(__sys_open_cp(__VA_ARGS__))
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/version.c b/src/components/lib/libc/musl-1.1.11/src/internal/version.c
deleted file mode 100644
index 16554ba226..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/version.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifdef SHARED
-
-#include "version.h"
-
-static const char version[] = VERSION;
-
-const char *__libc_get_version()
-{
-	return version;
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/vis.h b/src/components/lib/libc/musl-1.1.11/src/internal/vis.h
deleted file mode 100644
index a01fda182a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/vis.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* This file is only used if enabled in the build system, in which case it is
- * included automatically via command line options. It is not included
- * explicitly by any source files or other headers. Its purpose is to
- * override default visibilities to reduce the size and performance costs
- * of position-independent code. */
-
-#ifndef CRT
-#ifdef SHARED
-
-/* For shared libc.so, all symbols should be protected, but some toolchains
- * fail to support copy relocations for protected data, so exclude all
- * exported data symbols. */
-
-__attribute__((__visibility__("default")))
-extern int optind, opterr, optopt, optreset, __optreset, getdate_err, h_errno, daylight, __daylight, signgam, __signgam;
-
-__attribute__((__visibility__("default")))
-extern long timezone, __timezone;
-
-__attribute__((__visibility__("default")))
-extern char *optarg, **environ, **__environ, *tzname[2], *__tzname[2], *__progname, *__progname_full;
-
-#pragma GCC visibility push(protected)
-
-#elif defined(__PIC__)
-
-/* If building static libc.a as position-independent code, try to make
- * everything hidden except possibly-undefined weak references. */
-
-__attribute__((__visibility__("default")))
-extern void (*const __init_array_start)(), (*const __init_array_end)(),
-	(*const __fini_array_start)(), (*const __fini_array_end)();
-
-#pragma GCC visibility push(hidden)
-
-#endif
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/x32/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/x32/syscall.s
deleted file mode 100644
index c4bee804ff..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/x32/syscall.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.global __syscall
-.hidden __syscall
-.type __syscall,@function
-__syscall:
-	movq %rdi,%rax
-	movq %rsi,%rdi
-	movq %rdx,%rsi
-	movq %rcx,%rdx
-	movq %r8,%r10
-	movq %r9,%r8
-	movq 8(%rsp),%r9
-	syscall
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/x86_64/syscall.s b/src/components/lib/libc/musl-1.1.11/src/internal/x86_64/syscall.s
deleted file mode 100644
index c4bee804ff..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/internal/x86_64/syscall.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.global __syscall
-.hidden __syscall
-.type __syscall,@function
-__syscall:
-	movq %rdi,%rax
-	movq %rsi,%rdi
-	movq %rdx,%rsi
-	movq %rcx,%rdx
-	movq %r8,%r10
-	movq %r9,%r8
-	movq 8(%rsp),%r9
-	syscall
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/ipc.h b/src/components/lib/libc/musl-1.1.11/src/ipc/ipc.h
deleted file mode 100644
index 30ab939ad6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/ipc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#define IPCOP_semop      1
-#define IPCOP_semget     2
-#define IPCOP_semctl     3
-#define IPCOP_semtimedop 4
-#define IPCOP_msgsnd    11
-#define IPCOP_msgrcv    12
-#define IPCOP_msgget    13
-#define IPCOP_msgctl    14
-#define IPCOP_shmat     21
-#define IPCOP_shmdt     22
-#define IPCOP_shmget    23
-#define IPCOP_shmctl    24
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/msgctl.c b/src/components/lib/libc/musl-1.1.11/src/ipc/msgctl.c
deleted file mode 100644
index 4372c71939..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/msgctl.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <sys/msg.h>
-#include "syscall.h"
-#include "ipc.h"
-
-int msgctl(int q, int cmd, struct msqid_ds *buf)
-{
-#ifdef SYS_msgctl
-	return syscall(SYS_msgctl, q, cmd | IPC_64, buf);
-#else
-	return syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0);
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/semctl.c b/src/components/lib/libc/musl-1.1.11/src/ipc/semctl.c
deleted file mode 100644
index 673a9a8c99..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/semctl.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <sys/sem.h>
-#include <stdarg.h>
-#include "syscall.h"
-#include "ipc.h"
-
-union semun {
-	int val;
-	struct semid_ds *buf;
-	unsigned short *array;
-};
-
-int semctl(int id, int num, int cmd, ...)
-{
-	union semun arg = {0};
-	va_list ap;
-	switch (cmd) {
-	case SETVAL: case GETALL: case SETALL: case IPC_STAT: case IPC_SET:
-	case IPC_INFO: case SEM_INFO: case SEM_STAT:
-		va_start(ap, cmd);
-		arg = va_arg(ap, union semun);
-		va_end(ap);
-	}
-#ifdef SYS_semctl
-	return syscall(SYS_semctl, id, num, cmd | IPC_64, arg.buf);
-#else
-	return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg.buf);
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/semtimedop.c b/src/components/lib/libc/musl-1.1.11/src/ipc/semtimedop.c
deleted file mode 100644
index b0c4cf9f82..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/semtimedop.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#define _GNU_SOURCE
-#include <sys/sem.h>
-#include "syscall.h"
-#include "ipc.h"
-
-int semtimedop(int id, struct sembuf *buf, size_t n, const struct timespec *ts)
-{
-#ifdef SYS_semtimedop
-	return syscall(SYS_semtimedop, id, buf, n, ts);
-#else
-	return syscall(SYS_ipc, IPCOP_semtimedop, id, n, 0, buf, ts);
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/shmctl.c b/src/components/lib/libc/musl-1.1.11/src/ipc/shmctl.c
deleted file mode 100644
index e2879f20aa..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/shmctl.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <sys/shm.h>
-#include "syscall.h"
-#include "ipc.h"
-
-int shmctl(int id, int cmd, struct shmid_ds *buf)
-{
-#ifdef SYS_shmctl
-	return syscall(SYS_shmctl, id, cmd | IPC_64, buf);
-#else
-	return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0);
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/aarch64/tlsdesc.s b/src/components/lib/libc/musl-1.1.11/src/ldso/aarch64/tlsdesc.s
deleted file mode 100644
index 8ed5c26784..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/aarch64/tlsdesc.s
+++ /dev/null
@@ -1,96 +0,0 @@
-// size_t __tlsdesc_static(size_t *a)
-// {
-// 	return a[1];
-// }
-.global __tlsdesc_static
-.hidden __tlsdesc_static
-.type __tlsdesc_static,@function
-__tlsdesc_static:
-	ldr x0,[x0,#8]
-	ret
-
-.hidden __tls_get_new
-
-// size_t __tlsdesc_dynamic(size_t *a)
-// {
-// 	struct {size_t modidx,off;} *p = (void*)a[1];
-// 	size_t *dtv = *(size_t**)(tp + 16 - 8);
-// 	if (p->modidx <= dtv[0])
-// 		return dtv[p->modidx] + p->off - tp;
-// 	return __tls_get_new(p) - tp;
-// }
-.global __tlsdesc_dynamic
-.hidden __tlsdesc_dynamic
-.type __tlsdesc_dynamic,@function
-__tlsdesc_dynamic:
-	stp x1,x2,[sp,#-32]!
-	stp x3,x4,[sp,#16]
-	mrs x1,tpidr_el0      // tp
-	ldr x0,[x0,#8]        // p
-	ldr x2,[x0]           // p->modidx
-	add x3,x1,#8
-	ldr x3,[x3]           // dtv
-	ldr x4,[x3]           // dtv[0]
-	cmp x2,x4
-	b.hi 1f
-	ldr x2,[x3,x2,lsl #3] // dtv[p->modidx]
-	ldr x0,[x0,#8]        // p->off
-	add x0,x0,x2
-2:	sub x0,x0,x1
-	ldp x3,x4,[sp,#16]
-	ldp x1,x2,[sp],#32
-	ret
-
-	// save all registers __tls_get_new may clobber
-	// update sp in two steps because offset must be in [-512,509]
-1:	stp x29,x30,[sp,#-160]!
-	stp x5,x6,[sp,#16]
-	stp x7,x8,[sp,#32]
-	stp x9,x10,[sp,#48]
-	stp x11,x12,[sp,#64]
-	stp x13,x14,[sp,#80]
-	stp x15,x16,[sp,#96]
-	stp x17,x18,[sp,#112]
-	stp q0,q1,[sp,#128]
-	stp q2,q3,[sp,#-480]!
-	stp q4,q5,[sp,#32]
-	stp q6,q7,[sp,#64]
-	stp q8,q9,[sp,#96]
-	stp q10,q11,[sp,#128]
-	stp q12,q13,[sp,#160]
-	stp q14,q15,[sp,#192]
-	stp q16,q17,[sp,#224]
-	stp q18,q19,[sp,#256]
-	stp q20,q21,[sp,#288]
-	stp q22,q23,[sp,#320]
-	stp q24,q25,[sp,#352]
-	stp q26,q27,[sp,#384]
-	stp q28,q29,[sp,#416]
-	stp q30,q31,[sp,#448]
-	bl __tls_get_new
-	mrs x1,tpidr_el0
-	ldp q4,q5,[sp,#32]
-	ldp q6,q7,[sp,#64]
-	ldp q8,q9,[sp,#96]
-	ldp q10,q11,[sp,#128]
-	ldp q12,q13,[sp,#160]
-	ldp q14,q15,[sp,#192]
-	ldp q16,q17,[sp,#224]
-	ldp q18,q19,[sp,#256]
-	ldp q20,q21,[sp,#288]
-	ldp q22,q23,[sp,#320]
-	ldp q24,q25,[sp,#352]
-	ldp q26,q27,[sp,#384]
-	ldp q28,q29,[sp,#416]
-	ldp q30,q31,[sp,#448]
-	ldp q2,q3,[sp],#480
-	ldp x5,x6,[sp,#16]
-	ldp x7,x8,[sp,#32]
-	ldp x9,x10,[sp,#48]
-	ldp x11,x12,[sp,#64]
-	ldp x13,x14,[sp,#80]
-	ldp x15,x16,[sp,#96]
-	ldp x17,x18,[sp,#112]
-	ldp q0,q1,[sp,#128]
-	ldp x29,x30,[sp],#160
-	b 2b
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/arm/dlsym.s b/src/components/lib/libc/musl-1.1.11/src/ldso/arm/dlsym.s
deleted file mode 100644
index 3b88d91038..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/arm/dlsym.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.text
-.global dlsym
-.hidden __dlsym
-.type dlsym,%function
-dlsym:
-	mov r2,lr
-	b __dlsym
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/dl_iterate_phdr.c b/src/components/lib/libc/musl-1.1.11/src/ldso/dl_iterate_phdr.c
deleted file mode 100644
index 49b321a020..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/dl_iterate_phdr.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef SHARED
-
-#include <elf.h>
-#include <link.h>
-#include "libc.h"
-
-#define AUX_CNT 38
-
-int dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data)
-{
-	unsigned char *p;
-	ElfW(Phdr) *phdr, *tls_phdr=0;
-	size_t base = 0;
-	size_t n;
-	struct dl_phdr_info info;
-	size_t i, aux[AUX_CNT];
-
-	for (i=0; libc.auxv[i]; i+=2)
-		if (libc.auxv[i]<AUX_CNT) aux[libc.auxv[i]] = libc.auxv[i+1];
-
-	for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) {
-		phdr = (void *)p;
-		if (phdr->p_type == PT_PHDR)
-			base = aux[AT_PHDR] - phdr->p_vaddr;
-		if (phdr->p_type == PT_TLS)
-			tls_phdr = phdr;
-	}
-	info.dlpi_addr  = base;
-	info.dlpi_name  = "/proc/self/exe";
-	info.dlpi_phdr  = (void *)aux[AT_PHDR];
-	info.dlpi_phnum = aux[AT_PHNUM];
-	info.dlpi_adds  = 0;
-	info.dlpi_subs  = 0;
-	if (tls_phdr) {
-		info.dlpi_tls_modid = 1;
-		info.dlpi_tls_data = (void *)(base + tls_phdr->p_vaddr);
-	} else {
-		info.dlpi_tls_modid = 0;
-		info.dlpi_tls_data = 0;
-	}
-	return (callback)(&info, sizeof (info), data);
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/dladdr.c b/src/components/lib/libc/musl-1.1.11/src/ldso/dladdr.c
deleted file mode 100644
index 7ca718f4fb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/dladdr.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#define _GNU_SOURCE
-#include <dlfcn.h>
-
-int __dladdr(const void *, Dl_info *);
-
-int dladdr(const void *addr, Dl_info *info)
-{
-	return __dladdr(addr, info);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/dlinfo.c b/src/components/lib/libc/musl-1.1.11/src/ldso/dlinfo.c
deleted file mode 100644
index 63d276d408..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/dlinfo.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#define _GNU_SOURCE
-#include <dlfcn.h>
-
-int __dlinfo(void *, int, void *);
-
-int dlinfo(void *dso, int req, void *res)
-{
-	return __dlinfo(dso, req, res);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/dlstart.c b/src/components/lib/libc/musl-1.1.11/src/ldso/dlstart.c
deleted file mode 100644
index 3aaa200fbb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/dlstart.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <stddef.h>
-#include "dynlink.h"
-
-#ifdef SHARED
-
-#ifndef START
-#define START "_dlstart"
-#endif
-
-#include "crt_arch.h"
-
-__attribute__((__visibility__("hidden")))
-void _dlstart_c(size_t *sp, size_t *dynv)
-{
-	size_t i, aux[AUX_CNT], dyn[DYN_CNT];
-
-	int argc = *sp;
-	char **argv = (void *)(sp+1);
-
-	for (i=argc+1; argv[i]; i++);
-	size_t *auxv = (void *)(argv+i+1);
-
-	for (i=0; i<AUX_CNT; i++) aux[i] = 0;
-	for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT)
-		aux[auxv[i]] = auxv[i+1];
-
-	for (i=0; i<DYN_CNT; i++) dyn[i] = 0;
-	for (i=0; dynv[i]; i+=2) if (dynv[i]<DYN_CNT)
-		dyn[dynv[i]] = dynv[i+1];
-
-	/* If the dynamic linker is invoked as a command, its load
-	 * address is not available in the aux vector. Instead, compute
-	 * the load address as the difference between &_DYNAMIC and the
-	 * virtual address in the PT_DYNAMIC program header. */
-	unsigned char *base = (void *)aux[AT_BASE];
-	if (!base) {
-		size_t phnum = aux[AT_PHNUM];
-		size_t phentsize = aux[AT_PHENT];
-		Phdr *ph = (void *)aux[AT_PHDR];
-		for (i=phnum; i--; ph = (void *)((char *)ph + phentsize)) {
-			if (ph->p_type == PT_DYNAMIC) {
-				base = (void *)((size_t)dynv - ph->p_vaddr);
-				break;
-			}
-		}
-	}
-
-	/* MIPS uses an ugly packed form for GOT relocations. Since we
-	 * can't make function calls yet and the code is tiny anyway,
-	 * it's simply inlined here. */
-	if (NEED_MIPS_GOT_RELOCS) {
-		size_t local_cnt = 0;
-		size_t *got = (void *)(base + dyn[DT_PLTGOT]);
-		for (i=0; dynv[i]; i+=2) if (dynv[i]==DT_MIPS_LOCAL_GOTNO)
-			local_cnt = dynv[i+1];
-		for (i=0; i<local_cnt; i++) got[i] += (size_t)base;
-	}
-
-	size_t *rel, rel_size;
-
-	rel = (void *)(base+dyn[DT_REL]);
-	rel_size = dyn[DT_RELSZ];
-	for (; rel_size; rel+=2, rel_size-=2*sizeof(size_t)) {
-		if (!IS_RELATIVE(rel[1])) continue;
-		size_t *rel_addr = (void *)(base + rel[0]);
-		*rel_addr += (size_t)base;
-	}
-
-	rel = (void *)(base+dyn[DT_RELA]);
-	rel_size = dyn[DT_RELASZ];
-	for (; rel_size; rel+=3, rel_size-=3*sizeof(size_t)) {
-		if (!IS_RELATIVE(rel[1])) continue;
-		size_t *rel_addr = (void *)(base + rel[0]);
-		*rel_addr = (size_t)base + rel[2];
-	}
-
-	const char *strings = (void *)(base + dyn[DT_STRTAB]);
-	const Sym *syms = (void *)(base + dyn[DT_SYMTAB]);
-
-	/* Call dynamic linker stage-2, __dls2 */
-	for (i=0; ;i++) {
-		const char *s = strings + syms[i].st_name;
-		if (s[0]=='_' && s[1]=='_' && s[2]=='d'
-		 && s[3]=='l' && s[4]=='s' && s[5]=='2' && !s[6])
-			break;
-	}
-	((stage2_func)(base + syms[i].st_value))(base, sp);
-}
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/dlsym.c b/src/components/lib/libc/musl-1.1.11/src/ldso/dlsym.c
deleted file mode 100644
index c0f50e923b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/dlsym.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <dlfcn.h>
-
-void *__dlsym(void *restrict, const char *restrict, void *restrict);
-
-void *dlsym(void *restrict p, const char *restrict s)
-{
-	return __dlsym(p, s, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/dynlink.c b/src/components/lib/libc/musl-1.1.11/src/ldso/dynlink.c
deleted file mode 100644
index 70b2ae1363..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/dynlink.c
+++ /dev/null
@@ -1,1788 +0,0 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <elf.h>
-#include <sys/mman.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <link.h>
-#include <setjmp.h>
-#include <pthread.h>
-#include <ctype.h>
-#include <dlfcn.h>
-#include "pthread_impl.h"
-#include "libc.h"
-#include "dynlink.h"
-
-static void error(const char *, ...);
-
-#ifdef SHARED
-
-#define MAXP2(a,b) (-(-(a)&-(b)))
-#define ALIGN(x,y) ((x)+(y)-1 & -(y))
-
-struct debug {
-	int ver;
-	void *head;
-	void (*bp)(void);
-	int state;
-	void *base;
-};
-
-struct td_index {
-	size_t args[2];
-	struct td_index *next;
-};
-
-struct dso {
-	unsigned char *base;
-	char *name;
-	size_t *dynv;
-	struct dso *next, *prev;
-
-	Phdr *phdr;
-	int phnum;
-	size_t phentsize;
-	int refcnt;
-	Sym *syms;
-	uint32_t *hashtab;
-	uint32_t *ghashtab;
-	int16_t *versym;
-	char *strings;
-	unsigned char *map;
-	size_t map_len;
-	dev_t dev;
-	ino_t ino;
-	signed char global;
-	char relocated;
-	char constructed;
-	char kernel_mapped;
-	struct dso **deps, *needed_by;
-	char *rpath_orig, *rpath;
-	void *tls_image;
-	size_t tls_len, tls_size, tls_align, tls_id, tls_offset;
-	size_t relro_start, relro_end;
-	void **new_dtv;
-	unsigned char *new_tls;
-	volatile int new_dtv_idx, new_tls_idx;
-	struct td_index *td_index;
-	struct dso *fini_next;
-	char *shortname;
-	char buf[];
-};
-
-struct symdef {
-	Sym *sym;
-	struct dso *dso;
-};
-
-int __init_tp(void *);
-void __init_libc(char **, char *);
-
-const char *__libc_get_version(void);
-
-static struct builtin_tls {
-	char c;
-	struct pthread pt;
-	void *space[16];
-} builtin_tls[1];
-#define MIN_TLS_ALIGN offsetof(struct builtin_tls, pt)
-
-#define ADDEND_LIMIT 4096
-static size_t *saved_addends, *apply_addends_to;
-
-static struct dso ldso;
-static struct dso *head, *tail, *fini_head;
-static char *env_path, *sys_path;
-static unsigned long long gencnt;
-static int runtime;
-static int ldd_mode;
-static int ldso_fail;
-static int noload;
-static jmp_buf *rtld_fail;
-static pthread_rwlock_t lock;
-static struct debug debug;
-static size_t tls_cnt, tls_offset, tls_align = MIN_TLS_ALIGN;
-static size_t static_tls_cnt;
-static pthread_mutex_t init_fini_lock = { ._m_type = PTHREAD_MUTEX_RECURSIVE };
-
-struct debug *_dl_debug_addr = &debug;
-
-static int dl_strcmp(const char *l, const char *r)
-{
-	for (; *l==*r && *l; l++, r++);
-	return *(unsigned char *)l - *(unsigned char *)r;
-}
-#define strcmp(l,r) dl_strcmp(l,r)
-
-static void decode_vec(size_t *v, size_t *a, size_t cnt)
-{
-	size_t i;
-	for (i=0; i<cnt; i++) a[i] = 0;
-	for (; v[0]; v+=2) if (v[0]-1<cnt-1) {
-		a[0] |= 1UL<<v[0];
-		a[v[0]] = v[1];
-	}
-}
-
-static int search_vec(size_t *v, size_t *r, size_t key)
-{
-	for (; v[0]!=key; v+=2)
-		if (!v[0]) return 0;
-	*r = v[1];
-	return 1;
-}
-
-static uint32_t sysv_hash(const char *s0)
-{
-	const unsigned char *s = (void *)s0;
-	uint_fast32_t h = 0;
-	while (*s) {
-		h = 16*h + *s++;
-		h ^= h>>24 & 0xf0;
-	}
-	return h & 0xfffffff;
-}
-
-static uint32_t gnu_hash(const char *s0)
-{
-	const unsigned char *s = (void *)s0;
-	uint_fast32_t h = 5381;
-	for (; *s; s++)
-		h += h*32 + *s;
-	return h;
-}
-
-static Sym *sysv_lookup(const char *s, uint32_t h, struct dso *dso)
-{
-	size_t i;
-	Sym *syms = dso->syms;
-	uint32_t *hashtab = dso->hashtab;
-	char *strings = dso->strings;
-	for (i=hashtab[2+h%hashtab[0]]; i; i=hashtab[2+hashtab[0]+i]) {
-		if ((!dso->versym || dso->versym[i] >= 0)
-		    && (!strcmp(s, strings+syms[i].st_name)))
-			return syms+i;
-	}
-	return 0;
-}
-
-static Sym *gnu_lookup(uint32_t h1, uint32_t *hashtab, struct dso *dso, const char *s)
-{
-	uint32_t nbuckets = hashtab[0];
-	uint32_t *buckets = hashtab + 4 + hashtab[2]*(sizeof(size_t)/4);
-	uint32_t i = buckets[h1 % nbuckets];
-
-	if (!i) return 0;
-
-	uint32_t *hashval = buckets + nbuckets + (i - hashtab[1]);
-
-	for (h1 |= 1; ; i++) {
-		uint32_t h2 = *hashval++;
-		if ((h1 == (h2|1)) && (!dso->versym || dso->versym[i] >= 0)
-		    && !strcmp(s, dso->strings + dso->syms[i].st_name))
-			return dso->syms+i;
-		if (h2 & 1) break;
-	}
-
-	return 0;
-}
-
-static Sym *gnu_lookup_filtered(uint32_t h1, uint32_t *hashtab, struct dso *dso, const char *s, uint32_t fofs, size_t fmask)
-{
-	const size_t *bloomwords = (const void *)(hashtab+4);
-	size_t f = bloomwords[fofs & (hashtab[2]-1)];
-	if (!(f & fmask)) return 0;
-
-	f >>= (h1 >> hashtab[3]) % (8 * sizeof f);
-	if (!(f & 1)) return 0;
-
-	return gnu_lookup(h1, hashtab, dso, s);
-}
-
-#define OK_TYPES (1<<STT_NOTYPE | 1<<STT_OBJECT | 1<<STT_FUNC | 1<<STT_COMMON | 1<<STT_TLS)
-#define OK_BINDS (1<<STB_GLOBAL | 1<<STB_WEAK | 1<<STB_GNU_UNIQUE)
-
-#ifndef ARCH_SYM_REJECT_UND
-#define ARCH_SYM_REJECT_UND(s) 0
-#endif
-
-static struct symdef find_sym(struct dso *dso, const char *s, int need_def)
-{
-	uint32_t h = 0, gh, gho, *ght;
-	size_t ghm = 0;
-	struct symdef def = {0};
-	for (; dso; dso=dso->next) {
-		Sym *sym;
-		if (!dso->global) continue;
-		if ((ght = dso->ghashtab)) {
-			if (!ghm) {
-				gh = gnu_hash(s);
-				int maskbits = 8 * sizeof ghm;
-				gho = gh / maskbits;
-				ghm = 1ul << gh % maskbits;
-			}
-			sym = gnu_lookup_filtered(gh, ght, dso, s, gho, ghm);
-		} else {
-			if (!h) h = sysv_hash(s);
-			sym = sysv_lookup(s, h, dso);
-		}
-		if (!sym) continue;
-		if (!sym->st_shndx)
-			if (need_def || (sym->st_info&0xf) == STT_TLS
-			    || ARCH_SYM_REJECT_UND(sym))
-				continue;
-		if (!sym->st_value)
-			if ((sym->st_info&0xf) != STT_TLS)
-				continue;
-		if (!(1<<(sym->st_info&0xf) & OK_TYPES)) continue;
-		if (!(1<<(sym->st_info>>4) & OK_BINDS)) continue;
-
-		if (def.sym && sym->st_info>>4 == STB_WEAK) continue;
-		def.sym = sym;
-		def.dso = dso;
-		if (sym->st_info>>4 == STB_GLOBAL) break;
-	}
-	return def;
-}
-
-__attribute__((__visibility__("hidden")))
-ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic();
-
-static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stride)
-{
-	unsigned char *base = dso->base;
-	Sym *syms = dso->syms;
-	char *strings = dso->strings;
-	Sym *sym;
-	const char *name;
-	void *ctx;
-	int type;
-	int sym_index;
-	struct symdef def;
-	size_t *reloc_addr;
-	size_t sym_val;
-	size_t tls_val;
-	size_t addend;
-	int skip_relative = 0, reuse_addends = 0, save_slot = 0;
-
-	if (dso == &ldso) {
-		/* Only ldso's REL table needs addend saving/reuse. */
-		if (rel == apply_addends_to)
-			reuse_addends = 1;
-		skip_relative = 1;
-	}
-
-	for (; rel_size; rel+=stride, rel_size-=stride*sizeof(size_t)) {
-		if (skip_relative && IS_RELATIVE(rel[1])) continue;
-		type = R_TYPE(rel[1]);
-		if (type == REL_NONE) continue;
-		sym_index = R_SYM(rel[1]);
-		reloc_addr = (void *)(base + rel[0]);
-		if (sym_index) {
-			sym = syms + sym_index;
-			name = strings + sym->st_name;
-			ctx = type==REL_COPY ? head->next : head;
-			def = find_sym(ctx, name, type==REL_PLT);
-			if (!def.sym && (sym->st_shndx != SHN_UNDEF
-			    || sym->st_info>>4 != STB_WEAK)) {
-				error("Error relocating %s: %s: symbol not found",
-					dso->name, name);
-				if (runtime) longjmp(*rtld_fail, 1);
-				continue;
-			}
-		} else {
-			sym = 0;
-			def.sym = 0;
-			def.dso = dso;
-		}
-
-		if (stride > 2) {
-			addend = rel[2];
-		} else if (type==REL_GOT || type==REL_PLT|| type==REL_COPY) {
-			addend = 0;
-		} else if (reuse_addends) {
-			/* Save original addend in stage 2 where the dso
-			 * chain consists of just ldso; otherwise read back
-			 * saved addend since the inline one was clobbered. */
-			if (head==&ldso)
-				saved_addends[save_slot] = *reloc_addr;
-			addend = saved_addends[save_slot++];
-		} else {
-			addend = *reloc_addr;
-		}
-
-		sym_val = def.sym ? (size_t)def.dso->base+def.sym->st_value : 0;
-		tls_val = def.sym ? def.sym->st_value : 0;
-
-		switch(type) {
-		case REL_NONE:
-			break;
-		case REL_OFFSET:
-			addend -= (size_t)reloc_addr;
-		case REL_SYMBOLIC:
-		case REL_GOT:
-		case REL_PLT:
-			*reloc_addr = sym_val + addend;
-			break;
-		case REL_RELATIVE:
-			*reloc_addr = (size_t)base + addend;
-			break;
-		case REL_SYM_OR_REL:
-			if (sym) *reloc_addr = sym_val + addend;
-			else *reloc_addr = (size_t)base + addend;
-			break;
-		case REL_COPY:
-			memcpy(reloc_addr, (void *)sym_val, sym->st_size);
-			break;
-		case REL_OFFSET32:
-			*(uint32_t *)reloc_addr = sym_val + addend
-				- (size_t)reloc_addr;
-			break;
-		case REL_DTPMOD:
-			*reloc_addr = def.dso->tls_id;
-			break;
-		case REL_DTPOFF:
-			*reloc_addr = tls_val + addend - DTP_OFFSET;
-			break;
-#ifdef TLS_ABOVE_TP
-		case REL_TPOFF:
-			*reloc_addr = tls_val + def.dso->tls_offset + TPOFF_K + addend;
-			break;
-#else
-		case REL_TPOFF:
-			*reloc_addr = tls_val - def.dso->tls_offset + addend;
-			break;
-		case REL_TPOFF_NEG:
-			*reloc_addr = def.dso->tls_offset - tls_val + addend;
-			break;
-#endif
-		case REL_TLSDESC:
-			if (stride<3) addend = reloc_addr[1];
-			if (runtime && def.dso->tls_id >= static_tls_cnt) {
-				struct td_index *new = malloc(sizeof *new);
-				if (!new) {
-					error(
-					"Error relocating %s: cannot allocate TLSDESC for %s",
-					dso->name, sym ? name : "(local)" );
-					longjmp(*rtld_fail, 1);
-				}
-				new->next = dso->td_index;
-				dso->td_index = new;
-				new->args[0] = def.dso->tls_id;
-				new->args[1] = tls_val + addend;
-				reloc_addr[0] = (size_t)__tlsdesc_dynamic;
-				reloc_addr[1] = (size_t)new;
-			} else {
-				reloc_addr[0] = (size_t)__tlsdesc_static;
-#ifdef TLS_ABOVE_TP
-				reloc_addr[1] = tls_val + def.dso->tls_offset
-					+ TPOFF_K + addend;
-#else
-				reloc_addr[1] = tls_val - def.dso->tls_offset
-					+ addend;
-#endif
-			}
-			break;
-		default:
-			error("Error relocating %s: unsupported relocation type %d",
-				dso->name, type);
-			if (runtime) longjmp(*rtld_fail, 1);
-			continue;
-		}
-	}
-}
-
-/* A huge hack: to make up for the wastefulness of shared libraries
- * needing at least a page of dirty memory even if they have no global
- * data, we reclaim the gaps at the beginning and end of writable maps
- * and "donate" them to the heap by setting up minimal malloc
- * structures and then freeing them. */
-
-static void reclaim(struct dso *dso, size_t start, size_t end)
-{
-	size_t *a, *z;
-	if (start >= dso->relro_start && start < dso->relro_end) start = dso->relro_end;
-	if (end   >= dso->relro_start && end   < dso->relro_end) end = dso->relro_start;
-	start = start + 6*sizeof(size_t)-1 & -4*sizeof(size_t);
-	end = (end & -4*sizeof(size_t)) - 2*sizeof(size_t);
-	if (start>end || end-start < 4*sizeof(size_t)) return;
-	a = (size_t *)(dso->base + start);
-	z = (size_t *)(dso->base + end);
-	a[-2] = 1;
-	a[-1] = z[0] = end-start + 2*sizeof(size_t) | 1;
-	z[1] = 1;
-	free(a);
-}
-
-static void reclaim_gaps(struct dso *dso)
-{
-	Phdr *ph = dso->phdr;
-	size_t phcnt = dso->phnum;
-
-	for (; phcnt--; ph=(void *)((char *)ph+dso->phentsize)) {
-		if (ph->p_type!=PT_LOAD) continue;
-		if ((ph->p_flags&(PF_R|PF_W))!=(PF_R|PF_W)) continue;
-		reclaim(dso, ph->p_vaddr & -PAGE_SIZE, ph->p_vaddr);
-		reclaim(dso, ph->p_vaddr+ph->p_memsz,
-			ph->p_vaddr+ph->p_memsz+PAGE_SIZE-1 & -PAGE_SIZE);
-	}
-}
-
-static void *mmap_fixed(void *p, size_t n, int prot, int flags, int fd, off_t off)
-{
-	char *q = mmap(p, n, prot, flags, fd, off);
-	if (q != MAP_FAILED || errno != EINVAL) return q;
-	/* Fallbacks for MAP_FIXED failure on NOMMU kernels. */
-	if (flags & MAP_ANONYMOUS) {
-		memset(p, 0, n);
-		return p;
-	}
-	ssize_t r;
-	if (lseek(fd, off, SEEK_SET) < 0) return MAP_FAILED;
-	for (q=p; n; q+=r, off+=r, n-=r) {
-		r = read(fd, q, n);
-		if (r < 0 && errno != EINTR) return MAP_FAILED;
-		if (!r) {
-			memset(q, 0, n);
-			break;
-		}
-	}
-	return p;
-}
-
-static void *map_library(int fd, struct dso *dso)
-{
-	Ehdr buf[(896+sizeof(Ehdr))/sizeof(Ehdr)];
-	void *allocated_buf=0;
-	size_t phsize;
-	size_t addr_min=SIZE_MAX, addr_max=0, map_len;
-	size_t this_min, this_max;
-	off_t off_start;
-	Ehdr *eh;
-	Phdr *ph, *ph0;
-	unsigned prot;
-	unsigned char *map=MAP_FAILED, *base;
-	size_t dyn=0;
-	size_t tls_image=0;
-	size_t i;
-
-	ssize_t l = read(fd, buf, sizeof buf);
-	eh = buf;
-	if (l<0) return 0;
-	if (l<sizeof *eh || (eh->e_type != ET_DYN && eh->e_type != ET_EXEC))
-		goto noexec;
-	phsize = eh->e_phentsize * eh->e_phnum;
-	if (phsize > sizeof buf - sizeof *eh) {
-		allocated_buf = malloc(phsize);
-		if (!allocated_buf) return 0;
-		l = pread(fd, allocated_buf, phsize, eh->e_phoff);
-		if (l < 0) goto error;
-		if (l != phsize) goto noexec;
-		ph = ph0 = allocated_buf;
-	} else if (eh->e_phoff + phsize > l) {
-		l = pread(fd, buf+1, phsize, eh->e_phoff);
-		if (l < 0) goto error;
-		if (l != phsize) goto noexec;
-		ph = ph0 = (void *)(buf + 1);
-	} else {
-		ph = ph0 = (void *)((char *)buf + eh->e_phoff);
-	}
-	for (i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
-		if (ph->p_type == PT_DYNAMIC) {
-			dyn = ph->p_vaddr;
-		} else if (ph->p_type == PT_TLS) {
-			tls_image = ph->p_vaddr;
-			dso->tls_align = ph->p_align;
-			dso->tls_len = ph->p_filesz;
-			dso->tls_size = ph->p_memsz;
-		} else if (ph->p_type == PT_GNU_RELRO) {
-			dso->relro_start = ph->p_vaddr & -PAGE_SIZE;
-			dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
-		}
-		if (ph->p_type != PT_LOAD) continue;
-		if (ph->p_vaddr < addr_min) {
-			addr_min = ph->p_vaddr;
-			off_start = ph->p_offset;
-			prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) |
-				((ph->p_flags&PF_W) ? PROT_WRITE: 0) |
-				((ph->p_flags&PF_X) ? PROT_EXEC : 0));
-		}
-		if (ph->p_vaddr+ph->p_memsz > addr_max) {
-			addr_max = ph->p_vaddr+ph->p_memsz;
-		}
-	}
-	if (!dyn) goto noexec;
-	addr_max += PAGE_SIZE-1;
-	addr_max &= -PAGE_SIZE;
-	addr_min &= -PAGE_SIZE;
-	off_start &= -PAGE_SIZE;
-	map_len = addr_max - addr_min + off_start;
-	/* The first time, we map too much, possibly even more than
-	 * the length of the file. This is okay because we will not
-	 * use the invalid part; we just need to reserve the right
-	 * amount of virtual address space to map over later. */
-	map = mmap((void *)addr_min, map_len, prot, MAP_PRIVATE, fd, off_start);
-	if (map==MAP_FAILED) goto error;
-	/* If the loaded file is not relocatable and the requested address is
-	 * not available, then the load operation must fail. */
-	if (eh->e_type != ET_DYN && addr_min && map!=(void *)addr_min) {
-		errno = EBUSY;
-		goto error;
-	}
-	base = map - addr_min;
-	dso->phdr = 0;
-	dso->phnum = 0;
-	for (ph=ph0, i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
-		if (ph->p_type != PT_LOAD) continue;
-		/* Check if the programs headers are in this load segment, and
-		 * if so, record the address for use by dl_iterate_phdr. */
-		if (!dso->phdr && eh->e_phoff >= ph->p_offset
-		    && eh->e_phoff+phsize <= ph->p_offset+ph->p_filesz) {
-			dso->phdr = (void *)(base + ph->p_vaddr
-				+ (eh->e_phoff-ph->p_offset));
-			dso->phnum = eh->e_phnum;
-			dso->phentsize = eh->e_phentsize;
-		}
-		/* Reuse the existing mapping for the lowest-address LOAD */
-		if ((ph->p_vaddr & -PAGE_SIZE) == addr_min) continue;
-		this_min = ph->p_vaddr & -PAGE_SIZE;
-		this_max = ph->p_vaddr+ph->p_memsz+PAGE_SIZE-1 & -PAGE_SIZE;
-		off_start = ph->p_offset & -PAGE_SIZE;
-		prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) |
-			((ph->p_flags&PF_W) ? PROT_WRITE: 0) |
-			((ph->p_flags&PF_X) ? PROT_EXEC : 0));
-		if (mmap_fixed(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED)
-			goto error;
-		if (ph->p_memsz > ph->p_filesz) {
-			size_t brk = (size_t)base+ph->p_vaddr+ph->p_filesz;
-			size_t pgbrk = brk+PAGE_SIZE-1 & -PAGE_SIZE;
-			memset((void *)brk, 0, pgbrk-brk & PAGE_SIZE-1);
-			if (pgbrk-(size_t)base < this_max && mmap_fixed((void *)pgbrk, (size_t)base+this_max-pgbrk, prot, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) == MAP_FAILED)
-				goto error;
-		}
-	}
-	for (i=0; ((size_t *)(base+dyn))[i]; i+=2)
-		if (((size_t *)(base+dyn))[i]==DT_TEXTREL) {
-			if (mprotect(map, map_len, PROT_READ|PROT_WRITE|PROT_EXEC)
-			    && errno != ENOSYS)
-				goto error;
-			break;
-		}
-	dso->map = map;
-	dso->map_len = map_len;
-	dso->base = base;
-	dso->dynv = (void *)(base+dyn);
-	if (dso->tls_size) dso->tls_image = (void *)(base+tls_image);
-	if (!runtime) reclaim_gaps(dso);
-	free(allocated_buf);
-	return map;
-noexec:
-	errno = ENOEXEC;
-error:
-	if (map!=MAP_FAILED) munmap(map, map_len);
-	free(allocated_buf);
-	return 0;
-}
-
-static int path_open(const char *name, const char *s, char *buf, size_t buf_size)
-{
-	size_t l;
-	int fd;
-	for (;;) {
-		s += strspn(s, ":\n");
-		l = strcspn(s, ":\n");
-		if (l-1 >= INT_MAX) return -1;
-		if (snprintf(buf, buf_size, "%.*s/%s", (int)l, s, name) < buf_size) {
-			if ((fd = open(buf, O_RDONLY|O_CLOEXEC))>=0) return fd;
-			switch (errno) {
-			case ENOENT:
-			case ENOTDIR:
-			case EACCES:
-			case ENAMETOOLONG:
-				break;
-			default:
-				/* Any negative value but -1 will inhibit
-				 * futher path search. */
-				return -2;
-			}
-		}
-		s += l;
-	}
-}
-
-static int fixup_rpath(struct dso *p, char *buf, size_t buf_size)
-{
-	size_t n, l;
-	const char *s, *t, *origin;
-	char *d;
-	if (p->rpath || !p->rpath_orig) return 0;
-	if (!strchr(p->rpath_orig, '$')) {
-		p->rpath = p->rpath_orig;
-		return 0;
-	}
-	n = 0;
-	s = p->rpath_orig;
-	while ((t=strchr(s, '$'))) {
-		if (strncmp(t, "$ORIGIN", 7) && strncmp(t, "${ORIGIN}", 9))
-			return 0;
-		s = t+1;
-		n++;
-	}
-	if (n > SSIZE_MAX/PATH_MAX) return 0;
-
-	if (p->kernel_mapped) {
-		/* $ORIGIN searches cannot be performed for the main program
-		 * when it is suid/sgid/AT_SECURE. This is because the
-		 * pathname is under the control of the caller of execve.
-		 * For libraries, however, $ORIGIN can be processed safely
-		 * since the library's pathname came from a trusted source
-		 * (either system paths or a call to dlopen). */
-		if (libc.secure)
-			return 0;
-		l = readlink("/proc/self/exe", buf, buf_size);
-		if (l == -1) switch (errno) {
-		case ENOENT:
-		case ENOTDIR:
-		case EACCES:
-			break;
-		default:
-			return -1;
-		}
-		if (l >= buf_size)
-			return 0;
-		buf[l] = 0;
-		origin = buf;
-	} else {
-		origin = p->name;
-	}
-	t = strrchr(origin, '/');
-	l = t ? t-origin : 0;
-	p->rpath = malloc(strlen(p->rpath_orig) + n*l + 1);
-	if (!p->rpath) return -1;
-
-	d = p->rpath;
-	s = p->rpath_orig;
-	while ((t=strchr(s, '$'))) {
-		memcpy(d, s, t-s);
-		d += t-s;
-		memcpy(d, origin, l);
-		d += l;
-		/* It was determined previously that the '$' is followed
-		 * either by "ORIGIN" or "{ORIGIN}". */
-		s = t + 7 + 2*(t[1]=='{');
-	}
-	strcpy(d, s);
-	return 0;
-}
-
-static void decode_dyn(struct dso *p)
-{
-	size_t dyn[DYN_CNT];
-	decode_vec(p->dynv, dyn, DYN_CNT);
-	p->syms = (void *)(p->base + dyn[DT_SYMTAB]);
-	p->strings = (void *)(p->base + dyn[DT_STRTAB]);
-	if (dyn[0]&(1<<DT_HASH))
-		p->hashtab = (void *)(p->base + dyn[DT_HASH]);
-	if (dyn[0]&(1<<DT_RPATH))
-		p->rpath_orig = (void *)(p->strings + dyn[DT_RPATH]);
-	if (dyn[0]&(1<<DT_RUNPATH))
-		p->rpath_orig = (void *)(p->strings + dyn[DT_RUNPATH]);
-	if (search_vec(p->dynv, dyn, DT_GNU_HASH))
-		p->ghashtab = (void *)(p->base + *dyn);
-	if (search_vec(p->dynv, dyn, DT_VERSYM))
-		p->versym = (void *)(p->base + *dyn);
-}
-
-static struct dso *load_library(const char *name, struct dso *needed_by)
-{
-	char buf[2*NAME_MAX+2];
-	const char *pathname;
-	unsigned char *map;
-	struct dso *p, temp_dso = {0};
-	int fd;
-	struct stat st;
-	size_t alloc_size;
-	int n_th = 0;
-	int is_self = 0;
-
-	if (!*name) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	/* Catch and block attempts to reload the implementation itself */
-	if (name[0]=='l' && name[1]=='i' && name[2]=='b') {
-		static const char *rp, reserved[] =
-			"c\0pthread\0rt\0m\0dl\0util\0xnet\0";
-		char *z = strchr(name, '.');
-		if (z) {
-			size_t l = z-name;
-			for (rp=reserved; *rp && strncmp(name+3, rp, l-3); rp+=strlen(rp)+1);
-			if (*rp) {
-				if (ldd_mode) {
-					/* Track which names have been resolved
-					 * and only report each one once. */
-					static unsigned reported;
-					unsigned mask = 1U<<(rp-reserved);
-					if (!(reported & mask)) {
-						reported |= mask;
-						dprintf(1, "\t%s => %s (%p)\n",
-							name, ldso.name,
-							ldso.base);
-					}
-				}
-				is_self = 1;
-			}
-		}
-	}
-	if (!strcmp(name, ldso.name)) is_self = 1;
-	if (is_self) {
-		if (!ldso.prev) {
-			tail->next = &ldso;
-			ldso.prev = tail;
-			tail = ldso.next ? ldso.next : &ldso;
-		}
-		return &ldso;
-	}
-	if (strchr(name, '/')) {
-		pathname = name;
-		fd = open(name, O_RDONLY|O_CLOEXEC);
-	} else {
-		/* Search for the name to see if it's already loaded */
-		for (p=head->next; p; p=p->next) {
-			if (p->shortname && !strcmp(p->shortname, name)) {
-				p->refcnt++;
-				return p;
-			}
-		}
-		if (strlen(name) > NAME_MAX) return 0;
-		fd = -1;
-		if (env_path) fd = path_open(name, env_path, buf, sizeof buf);
-		for (p=needed_by; fd == -1 && p; p=p->needed_by) {
-			if (fixup_rpath(p, buf, sizeof buf) < 0)
-				fd = -2; /* Inhibit further search. */
-			if (p->rpath)
-				fd = path_open(name, p->rpath, buf, sizeof buf);
-		}
-		if (fd == -1) {
-			if (!sys_path) {
-				char *prefix = 0;
-				size_t prefix_len;
-				if (ldso.name[0]=='/') {
-					char *s, *t, *z;
-					for (s=t=z=ldso.name; *s; s++)
-						if (*s=='/') z=t, t=s;
-					prefix_len = z-ldso.name;
-					if (prefix_len < PATH_MAX)
-						prefix = ldso.name;
-				}
-				if (!prefix) {
-					prefix = "";
-					prefix_len = 0;
-				}
-				char etc_ldso_path[prefix_len + 1
-					+ sizeof "/etc/ld-musl-" LDSO_ARCH ".path"];
-				snprintf(etc_ldso_path, sizeof etc_ldso_path,
-					"%.*s/etc/ld-musl-" LDSO_ARCH ".path",
-					(int)prefix_len, prefix);
-				FILE *f = fopen(etc_ldso_path, "rbe");
-				if (f) {
-					if (getdelim(&sys_path, (size_t[1]){0}, 0, f) <= 0) {
-						free(sys_path);
-						sys_path = "";
-					}
-					fclose(f);
-				} else if (errno != ENOENT) {
-					sys_path = "";
-				}
-			}
-			if (!sys_path) sys_path = "/lib:/usr/local/lib:/usr/lib";
-			fd = path_open(name, sys_path, buf, sizeof buf);
-		}
-		pathname = buf;
-	}
-	if (fd < 0) return 0;
-	if (fstat(fd, &st) < 0) {
-		close(fd);
-		return 0;
-	}
-	for (p=head->next; p; p=p->next) {
-		if (p->dev == st.st_dev && p->ino == st.st_ino) {
-			/* If this library was previously loaded with a
-			 * pathname but a search found the same inode,
-			 * setup its shortname so it can be found by name. */
-			if (!p->shortname && pathname != name)
-				p->shortname = strrchr(p->name, '/')+1;
-			close(fd);
-			p->refcnt++;
-			return p;
-		}
-	}
-	map = noload ? 0 : map_library(fd, &temp_dso);
-	close(fd);
-	if (!map) return 0;
-
-	/* Allocate storage for the new DSO. When there is TLS, this
-	 * storage must include a reservation for all pre-existing
-	 * threads to obtain copies of both the new TLS, and an
-	 * extended DTV capable of storing an additional slot for
-	 * the newly-loaded DSO. */
-	alloc_size = sizeof *p + strlen(pathname) + 1;
-	if (runtime && temp_dso.tls_image) {
-		size_t per_th = temp_dso.tls_size + temp_dso.tls_align
-			+ sizeof(void *) * (tls_cnt+3);
-		n_th = libc.threads_minus_1 + 1;
-		if (n_th > SSIZE_MAX / per_th) alloc_size = SIZE_MAX;
-		else alloc_size += n_th * per_th;
-	}
-	p = calloc(1, alloc_size);
-	if (!p) {
-		munmap(map, temp_dso.map_len);
-		return 0;
-	}
-	memcpy(p, &temp_dso, sizeof temp_dso);
-	decode_dyn(p);
-	p->dev = st.st_dev;
-	p->ino = st.st_ino;
-	p->refcnt = 1;
-	p->needed_by = needed_by;
-	p->name = p->buf;
-	strcpy(p->name, pathname);
-	/* Add a shortname only if name arg was not an explicit pathname. */
-	if (pathname != name) p->shortname = strrchr(p->name, '/')+1;
-	if (p->tls_image) {
-		p->tls_id = ++tls_cnt;
-		tls_align = MAXP2(tls_align, p->tls_align);
-#ifdef TLS_ABOVE_TP
-		p->tls_offset = tls_offset + ( (tls_align-1) &
-			-(tls_offset + (uintptr_t)p->tls_image) );
-		tls_offset += p->tls_size;
-#else
-		tls_offset += p->tls_size + p->tls_align - 1;
-		tls_offset -= (tls_offset + (uintptr_t)p->tls_image)
-			& (p->tls_align-1);
-		p->tls_offset = tls_offset;
-#endif
-		p->new_dtv = (void *)(-sizeof(size_t) &
-			(uintptr_t)(p->name+strlen(p->name)+sizeof(size_t)));
-		p->new_tls = (void *)(p->new_dtv + n_th*(tls_cnt+1));
-	}
-
-	tail->next = p;
-	p->prev = tail;
-	tail = p;
-
-	if (ldd_mode) dprintf(1, "\t%s => %s (%p)\n", name, pathname, p->base);
-
-	return p;
-}
-
-static void load_deps(struct dso *p)
-{
-	size_t i, ndeps=0;
-	struct dso ***deps = &p->deps, **tmp, *dep;
-	for (; p; p=p->next) {
-		for (i=0; p->dynv[i]; i+=2) {
-			if (p->dynv[i] != DT_NEEDED) continue;
-			dep = load_library(p->strings + p->dynv[i+1], p);
-			if (!dep) {
-				error("Error loading shared library %s: %m (needed by %s)",
-					p->strings + p->dynv[i+1], p->name);
-				if (runtime) longjmp(*rtld_fail, 1);
-				continue;
-			}
-			if (runtime) {
-				tmp = realloc(*deps, sizeof(*tmp)*(ndeps+2));
-				if (!tmp) longjmp(*rtld_fail, 1);
-				tmp[ndeps++] = dep;
-				tmp[ndeps] = 0;
-				*deps = tmp;
-			}
-		}
-	}
-}
-
-static void load_preload(char *s)
-{
-	int tmp;
-	char *z;
-	for (z=s; *z; s=z) {
-		for (   ; *s && (isspace(*s) || *s==':'); s++);
-		for (z=s; *z && !isspace(*z) && *z!=':'; z++);
-		tmp = *z;
-		*z = 0;
-		load_library(s, 0);
-		*z = tmp;
-	}
-}
-
-static void make_global(struct dso *p)
-{
-	for (; p; p=p->next) p->global = 1;
-}
-
-static void do_mips_relocs(struct dso *p, size_t *got)
-{
-	size_t i, j, rel[2];
-	unsigned char *base = p->base;
-	i=0; search_vec(p->dynv, &i, DT_MIPS_LOCAL_GOTNO);
-	if (p==&ldso) {
-		got += i;
-	} else {
-		while (i--) *got++ += (size_t)base;
-	}
-	j=0; search_vec(p->dynv, &j, DT_MIPS_GOTSYM);
-	i=0; search_vec(p->dynv, &i, DT_MIPS_SYMTABNO);
-	Sym *sym = p->syms + j;
-	rel[0] = (unsigned char *)got - base;
-	for (i-=j; i; i--, sym++, rel[0]+=sizeof(size_t)) {
-		rel[1] = sym-p->syms << 8 | R_MIPS_JUMP_SLOT;
-		do_relocs(p, rel, sizeof rel, 2);
-	}
-}
-
-static void reloc_all(struct dso *p)
-{
-	size_t dyn[DYN_CNT];
-	for (; p; p=p->next) {
-		if (p->relocated) continue;
-		decode_vec(p->dynv, dyn, DYN_CNT);
-		if (NEED_MIPS_GOT_RELOCS)
-			do_mips_relocs(p, (void *)(p->base+dyn[DT_PLTGOT]));
-		do_relocs(p, (void *)(p->base+dyn[DT_JMPREL]), dyn[DT_PLTRELSZ],
-			2+(dyn[DT_PLTREL]==DT_RELA));
-		do_relocs(p, (void *)(p->base+dyn[DT_REL]), dyn[DT_RELSZ], 2);
-		do_relocs(p, (void *)(p->base+dyn[DT_RELA]), dyn[DT_RELASZ], 3);
-
-		if (head != &ldso && p->relro_start != p->relro_end &&
-		    mprotect(p->base+p->relro_start, p->relro_end-p->relro_start, PROT_READ)
-		    && errno != ENOSYS) {
-			error("Error relocating %s: RELRO protection failed: %m",
-				p->name);
-			if (runtime) longjmp(*rtld_fail, 1);
-		}
-
-		p->relocated = 1;
-	}
-}
-
-static void kernel_mapped_dso(struct dso *p)
-{
-	size_t min_addr = -1, max_addr = 0, cnt;
-	Phdr *ph = p->phdr;
-	for (cnt = p->phnum; cnt--; ph = (void *)((char *)ph + p->phentsize)) {
-		if (ph->p_type == PT_DYNAMIC) {
-			p->dynv = (void *)(p->base + ph->p_vaddr);
-		} else if (ph->p_type == PT_GNU_RELRO) {
-			p->relro_start = ph->p_vaddr & -PAGE_SIZE;
-			p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
-		}
-		if (ph->p_type != PT_LOAD) continue;
-		if (ph->p_vaddr < min_addr)
-			min_addr = ph->p_vaddr;
-		if (ph->p_vaddr+ph->p_memsz > max_addr)
-			max_addr = ph->p_vaddr+ph->p_memsz;
-	}
-	min_addr &= -PAGE_SIZE;
-	max_addr = (max_addr + PAGE_SIZE-1) & -PAGE_SIZE;
-	p->map = p->base + min_addr;
-	p->map_len = max_addr - min_addr;
-	p->kernel_mapped = 1;
-}
-
-static void do_fini()
-{
-	struct dso *p;
-	size_t dyn[DYN_CNT];
-	for (p=fini_head; p; p=p->fini_next) {
-		if (!p->constructed) continue;
-		decode_vec(p->dynv, dyn, DYN_CNT);
-		if (dyn[0] & (1<<DT_FINI_ARRAY)) {
-			size_t n = dyn[DT_FINI_ARRAYSZ]/sizeof(size_t);
-			size_t *fn = (size_t *)(p->base + dyn[DT_FINI_ARRAY])+n;
-			while (n--) ((void (*)(void))*--fn)();
-		}
-#ifndef NO_LEGACY_INITFINI
-		if ((dyn[0] & (1<<DT_FINI)) && dyn[DT_FINI])
-			((void (*)(void))(p->base + dyn[DT_FINI]))();
-#endif
-	}
-}
-
-static void do_init_fini(struct dso *p)
-{
-	size_t dyn[DYN_CNT];
-	int need_locking = libc.threads_minus_1;
-	/* Allow recursive calls that arise when a library calls
-	 * dlopen from one of its constructors, but block any
-	 * other threads until all ctors have finished. */
-	if (need_locking) pthread_mutex_lock(&init_fini_lock);
-	for (; p; p=p->prev) {
-		if (p->constructed) continue;
-		p->constructed = 1;
-		decode_vec(p->dynv, dyn, DYN_CNT);
-		if (dyn[0] & ((1<<DT_FINI) | (1<<DT_FINI_ARRAY))) {
-			p->fini_next = fini_head;
-			fini_head = p;
-		}
-#ifndef NO_LEGACY_INITFINI
-		if ((dyn[0] & (1<<DT_INIT)) && dyn[DT_INIT])
-			((void (*)(void))(p->base + dyn[DT_INIT]))();
-#endif
-		if (dyn[0] & (1<<DT_INIT_ARRAY)) {
-			size_t n = dyn[DT_INIT_ARRAYSZ]/sizeof(size_t);
-			size_t *fn = (void *)(p->base + dyn[DT_INIT_ARRAY]);
-			while (n--) ((void (*)(void))*fn++)();
-		}
-		if (!need_locking && libc.threads_minus_1) {
-			need_locking = 1;
-			pthread_mutex_lock(&init_fini_lock);
-		}
-	}
-	if (need_locking) pthread_mutex_unlock(&init_fini_lock);
-}
-
-static void dl_debug_state(void)
-{
-}
-
-weak_alias(dl_debug_state, _dl_debug_state);
-
-void __reset_tls()
-{
-	pthread_t self = __pthread_self();
-	struct dso *p;
-	for (p=head; p; p=p->next) {
-		if (!p->tls_id || !self->dtv[p->tls_id]) continue;
-		memcpy(self->dtv[p->tls_id], p->tls_image, p->tls_len);
-		memset((char *)self->dtv[p->tls_id]+p->tls_len, 0,
-			p->tls_size - p->tls_len);
-		if (p->tls_id == (size_t)self->dtv[0]) break;
-	}
-}
-
-void *__copy_tls(unsigned char *mem)
-{
-	pthread_t td;
-	struct dso *p;
-	void **dtv;
-
-#ifdef TLS_ABOVE_TP
-	dtv = (void **)(mem + libc.tls_size) - (tls_cnt + 1);
-
-	mem += -((uintptr_t)mem + sizeof(struct pthread)) & (tls_align-1);
-	td = (pthread_t)mem;
-	mem += sizeof(struct pthread);
-
-	for (p=head; p; p=p->next) {
-		if (!p->tls_id) continue;
-		dtv[p->tls_id] = mem + p->tls_offset;
-		memcpy(dtv[p->tls_id], p->tls_image, p->tls_len);
-	}
-#else
-	dtv = (void **)mem;
-
-	mem += libc.tls_size - sizeof(struct pthread);
-	mem -= (uintptr_t)mem & (tls_align-1);
-	td = (pthread_t)mem;
-
-	for (p=head; p; p=p->next) {
-		if (!p->tls_id) continue;
-		dtv[p->tls_id] = mem - p->tls_offset;
-		memcpy(dtv[p->tls_id], p->tls_image, p->tls_len);
-	}
-#endif
-	dtv[0] = (void *)tls_cnt;
-	td->dtv = td->dtv_copy = dtv;
-	return td;
-}
-
-__attribute__((__visibility__("hidden")))
-void *__tls_get_new(size_t *v)
-{
-	pthread_t self = __pthread_self();
-
-	/* Block signals to make accessing new TLS async-signal-safe */
-	sigset_t set;
-	__block_all_sigs(&set);
-	if (v[0]<=(size_t)self->dtv[0]) {
-		__restore_sigs(&set);
-		return (char *)self->dtv[v[0]]+v[1]+DTP_OFFSET;
-	}
-
-	/* This is safe without any locks held because, if the caller
-	 * is able to request the Nth entry of the DTV, the DSO list
-	 * must be valid at least that far out and it was synchronized
-	 * at program startup or by an already-completed call to dlopen. */
-	struct dso *p;
-	for (p=head; p->tls_id != v[0]; p=p->next);
-
-	/* Get new DTV space from new DSO if needed */
-	if (v[0] > (size_t)self->dtv[0]) {
-		void **newdtv = p->new_dtv +
-			(v[0]+1)*sizeof(void *)*a_fetch_add(&p->new_dtv_idx,1);
-		memcpy(newdtv, self->dtv,
-			((size_t)self->dtv[0]+1) * sizeof(void *));
-		newdtv[0] = (void *)v[0];
-		self->dtv = self->dtv_copy = newdtv;
-	}
-
-	/* Get new TLS memory from all new DSOs up to the requested one */
-	unsigned char *mem;
-	for (p=head; ; p=p->next) {
-		if (!p->tls_id || self->dtv[p->tls_id]) continue;
-		mem = p->new_tls + (p->tls_size + p->tls_align)
-			* a_fetch_add(&p->new_tls_idx,1);
-		mem += ((uintptr_t)p->tls_image - (uintptr_t)mem)
-			& (p->tls_align-1);
-		self->dtv[p->tls_id] = mem;
-		memcpy(mem, p->tls_image, p->tls_len);
-		if (p->tls_id == v[0]) break;
-	}
-	__restore_sigs(&set);
-	return mem + v[1] + DTP_OFFSET;
-}
-
-static void update_tls_size()
-{
-	libc.tls_size = ALIGN(
-		(1+tls_cnt) * sizeof(void *) +
-		tls_offset +
-		sizeof(struct pthread) +
-		tls_align * 2,
-	tls_align);
-}
-
-/* Stage 1 of the dynamic linker is defined in dlstart.c. It calls the
- * following stage 2 and stage 3 functions via primitive symbolic lookup
- * since it does not have access to their addresses to begin with. */
-
-/* Stage 2 of the dynamic linker is called after relative relocations 
- * have been processed. It can make function calls to static functions
- * and access string literals and static data, but cannot use extern
- * symbols. Its job is to perform symbolic relocations on the dynamic
- * linker itself, but some of the relocations performed may need to be
- * replaced later due to copy relocations in the main program. */
-
-void __dls2(unsigned char *base, size_t *sp)
-{
-	Ehdr *ehdr = (void *)base;
-	ldso.base = base;
-	ldso.name = ldso.shortname = "libc.so";
-	ldso.global = 1;
-	ldso.phnum = ehdr->e_phnum;
-	ldso.phdr = (void *)(base + ehdr->e_phoff);
-	ldso.phentsize = ehdr->e_phentsize;
-	kernel_mapped_dso(&ldso);
-	decode_dyn(&ldso);
-
-	/* Prepare storage for to save clobbered REL addends so they
-	 * can be reused in stage 3. There should be very few. If
-	 * something goes wrong and there are a huge number, abort
-	 * instead of risking stack overflow. */
-	size_t dyn[DYN_CNT];
-	decode_vec(ldso.dynv, dyn, DYN_CNT);
-	size_t *rel = (void *)(base+dyn[DT_REL]);
-	size_t rel_size = dyn[DT_RELSZ];
-	size_t symbolic_rel_cnt = 0;
-	apply_addends_to = rel;
-	for (; rel_size; rel+=2, rel_size-=2*sizeof(size_t))
-		if (!IS_RELATIVE(rel[1])) symbolic_rel_cnt++;
-	if (symbolic_rel_cnt >= ADDEND_LIMIT) a_crash();
-	size_t addends[symbolic_rel_cnt+1];
-	saved_addends = addends;
-
-	head = &ldso;
-	reloc_all(&ldso);
-
-	ldso.relocated = 0;
-
-	/* Call dynamic linker stage-3, __dls3, looking it up
-	 * symbolically as a barrier against moving the address
-	 * load across the above relocation processing. */
-	struct symdef dls3_def = find_sym(&ldso, "__dls3", 0);
-	((stage3_func)(ldso.base+dls3_def.sym->st_value))(sp);
-}
-
-/* Stage 3 of the dynamic linker is called with the dynamic linker/libc
- * fully functional. Its job is to load (if not already loaded) and
- * process dependencies and relocations for the main application and
- * transfer control to its entry point. */
-
-_Noreturn void __dls3(size_t *sp)
-{
-	static struct dso app, vdso;
-	size_t aux[AUX_CNT], *auxv;
-	size_t i;
-	char *env_preload=0;
-	size_t vdso_base;
-	int argc = *sp;
-	char **argv = (void *)(sp+1);
-	char **argv_orig = argv;
-	char **envp = argv+argc+1;
-
-	/* Find aux vector just past environ[] and use it to initialize
-	 * global data that may be needed before we can make syscalls. */
-	__environ = envp;
-	for (i=argc+1; argv[i]; i++);
-	libc.auxv = auxv = (void *)(argv+i+1);
-	decode_vec(auxv, aux, AUX_CNT);
-	__hwcap = aux[AT_HWCAP];
-	libc.page_size = aux[AT_PAGESZ];
-	libc.secure = ((aux[0]&0x7800)!=0x7800 || aux[AT_UID]!=aux[AT_EUID]
-		|| aux[AT_GID]!=aux[AT_EGID] || aux[AT_SECURE]);
-
-	/* Setup early thread pointer in builtin_tls for ldso/libc itself to
-	 * use during dynamic linking. If possible it will also serve as the
-	 * thread pointer at runtime. */
-	libc.tls_size = sizeof builtin_tls;
-	if (__init_tp(__copy_tls((void *)builtin_tls)) < 0) {
-		a_crash();
-	}
-
-	/* Only trust user/env if kernel says we're not suid/sgid */
-	if (!libc.secure) {
-		env_path = getenv("LD_LIBRARY_PATH");
-		env_preload = getenv("LD_PRELOAD");
-	}
-
-	/* If the main program was already loaded by the kernel,
-	 * AT_PHDR will point to some location other than the dynamic
-	 * linker's program headers. */
-	if (aux[AT_PHDR] != (size_t)ldso.phdr) {
-		size_t interp_off = 0;
-		size_t tls_image = 0;
-		/* Find load address of the main program, via AT_PHDR vs PT_PHDR. */
-		Phdr *phdr = app.phdr = (void *)aux[AT_PHDR];
-		app.phnum = aux[AT_PHNUM];
-		app.phentsize = aux[AT_PHENT];
-		for (i=aux[AT_PHNUM]; i; i--, phdr=(void *)((char *)phdr + aux[AT_PHENT])) {
-			if (phdr->p_type == PT_PHDR)
-				app.base = (void *)(aux[AT_PHDR] - phdr->p_vaddr);
-			else if (phdr->p_type == PT_INTERP)
-				interp_off = (size_t)phdr->p_vaddr;
-			else if (phdr->p_type == PT_TLS) {
-				tls_image = phdr->p_vaddr;
-				app.tls_len = phdr->p_filesz;
-				app.tls_size = phdr->p_memsz;
-				app.tls_align = phdr->p_align;
-			}
-		}
-		if (app.tls_size) app.tls_image = (char *)app.base + tls_image;
-		if (interp_off) ldso.name = (char *)app.base + interp_off;
-		if ((aux[0] & (1UL<<AT_EXECFN))
-		    && strncmp((char *)aux[AT_EXECFN], "/proc/", 6))
-			app.name = (char *)aux[AT_EXECFN];
-		else
-			app.name = argv[0];
-		kernel_mapped_dso(&app);
-	} else {
-		int fd;
-		char *ldname = argv[0];
-		size_t l = strlen(ldname);
-		if (l >= 3 && !strcmp(ldname+l-3, "ldd")) ldd_mode = 1;
-		argv++;
-		while (argv[0] && argv[0][0]=='-' && argv[0][1]=='-') {
-			char *opt = argv[0]+2;
-			*argv++ = (void *)-1;
-			if (!*opt) {
-				break;
-			} else if (!memcmp(opt, "list", 5)) {
-				ldd_mode = 1;
-			} else if (!memcmp(opt, "library-path", 12)) {
-				if (opt[12]=='=') env_path = opt+13;
-				else if (opt[12]) *argv = 0;
-				else if (*argv) env_path = *argv++;
-			} else if (!memcmp(opt, "preload", 7)) {
-				if (opt[7]=='=') env_preload = opt+8;
-				else if (opt[7]) *argv = 0;
-				else if (*argv) env_preload = *argv++;
-			} else {
-				argv[0] = 0;
-			}
-		}
-		argv[-1] = (void *)(argc - (argv-argv_orig));
-		if (!argv[0]) {
-			dprintf(2, "musl libc\n"
-				"Version %s\n"
-				"Dynamic Program Loader\n"
-				"Usage: %s [options] [--] pathname%s\n",
-				__libc_get_version(), ldname,
-				ldd_mode ? "" : " [args]");
-			_exit(1);
-		}
-		fd = open(argv[0], O_RDONLY);
-		if (fd < 0) {
-			dprintf(2, "%s: cannot load %s: %s\n", ldname, argv[0], strerror(errno));
-			_exit(1);
-		}
-		runtime = 1;
-		Ehdr *ehdr = (void *)map_library(fd, &app);
-		if (!ehdr) {
-			dprintf(2, "%s: %s: Not a valid dynamic program\n", ldname, argv[0]);
-			_exit(1);
-		}
-		runtime = 0;
-		close(fd);
-		ldso.name = ldname;
-		app.name = argv[0];
-		aux[AT_ENTRY] = (size_t)app.base + ehdr->e_entry;
-		/* Find the name that would have been used for the dynamic
-		 * linker had ldd not taken its place. */
-		if (ldd_mode) {
-			for (i=0; i<app.phnum; i++) {
-				if (app.phdr[i].p_type == PT_INTERP)
-					ldso.name = (void *)(app.base
-						+ app.phdr[i].p_vaddr);
-			}
-			dprintf(1, "\t%s (%p)\n", ldso.name, ldso.base);
-		}
-	}
-	if (app.tls_size) {
-		app.tls_id = tls_cnt = 1;
-#ifdef TLS_ABOVE_TP
-		app.tls_offset = 0;
-		tls_offset = app.tls_size
-			+ ( -((uintptr_t)app.tls_image + app.tls_size)
-			& (app.tls_align-1) );
-#else
-		tls_offset = app.tls_offset = app.tls_size
-			+ ( -((uintptr_t)app.tls_image + app.tls_size)
-			& (app.tls_align-1) );
-#endif
-		tls_align = MAXP2(tls_align, app.tls_align);
-	}
-	app.global = 1;
-	decode_dyn(&app);
-
-	/* Attach to vdso, if provided by the kernel */
-	if (search_vec(auxv, &vdso_base, AT_SYSINFO_EHDR)) {
-		Ehdr *ehdr = (void *)vdso_base;
-		Phdr *phdr = vdso.phdr = (void *)(vdso_base + ehdr->e_phoff);
-		vdso.phnum = ehdr->e_phnum;
-		vdso.phentsize = ehdr->e_phentsize;
-		for (i=ehdr->e_phnum; i; i--, phdr=(void *)((char *)phdr + ehdr->e_phentsize)) {
-			if (phdr->p_type == PT_DYNAMIC)
-				vdso.dynv = (void *)(vdso_base + phdr->p_offset);
-			if (phdr->p_type == PT_LOAD)
-				vdso.base = (void *)(vdso_base - phdr->p_vaddr + phdr->p_offset);
-		}
-		vdso.name = "";
-		vdso.shortname = "linux-gate.so.1";
-		vdso.global = 1;
-		vdso.relocated = 1;
-		decode_dyn(&vdso);
-		vdso.prev = &ldso;
-		ldso.next = &vdso;
-	}
-
-	/* Initial dso chain consists only of the app. */
-	head = tail = &app;
-
-	/* Donate unused parts of app and library mapping to malloc */
-	reclaim_gaps(&app);
-	reclaim_gaps(&ldso);
-
-	/* Load preload/needed libraries, add their symbols to the global
-	 * namespace, and perform all remaining relocations. */
-	if (env_preload) load_preload(env_preload);
-	load_deps(&app);
-	make_global(&app);
-
-#ifndef DYNAMIC_IS_RO
-	for (i=0; app.dynv[i]; i+=2)
-		if (app.dynv[i]==DT_DEBUG)
-			app.dynv[i+1] = (size_t)&debug;
-#endif
-
-	/* The main program must be relocated LAST since it may contin
-	 * copy relocations which depend on libraries' relocations. */
-	reloc_all(app.next);
-	reloc_all(&app);
-
-	update_tls_size();
-	if (libc.tls_size > sizeof builtin_tls || tls_align > MIN_TLS_ALIGN) {
-		void *initial_tls = calloc(libc.tls_size, 1);
-		if (!initial_tls) {
-			dprintf(2, "%s: Error getting %zu bytes thread-local storage: %m\n",
-				argv[0], libc.tls_size);
-			_exit(127);
-		}
-		if (__init_tp(__copy_tls(initial_tls)) < 0) {
-			a_crash();
-		}
-	} else {
-		size_t tmp_tls_size = libc.tls_size;
-		pthread_t self = __pthread_self();
-		/* Temporarily set the tls size to the full size of
-		 * builtin_tls so that __copy_tls will use the same layout
-		 * as it did for before. Then check, just to be safe. */
-		libc.tls_size = sizeof builtin_tls;
-		if (__copy_tls((void*)builtin_tls) != self) a_crash();
-		libc.tls_size = tmp_tls_size;
-	}
-	static_tls_cnt = tls_cnt;
-
-	if (ldso_fail) _exit(127);
-	if (ldd_mode) _exit(0);
-
-	/* Switch to runtime mode: any further failures in the dynamic
-	 * linker are a reportable failure rather than a fatal startup
-	 * error. */
-	runtime = 1;
-
-	debug.ver = 1;
-	debug.bp = dl_debug_state;
-	debug.head = head;
-	debug.base = ldso.base;
-	debug.state = 0;
-	_dl_debug_state();
-
-	__init_libc(envp, argv[0]);
-	atexit(do_fini);
-	errno = 0;
-	do_init_fini(tail);
-
-	CRTJMP((void *)aux[AT_ENTRY], argv-1);
-	for(;;);
-}
-
-void *dlopen(const char *file, int mode)
-{
-	struct dso *volatile p, *orig_tail, *next;
-	size_t orig_tls_cnt, orig_tls_offset, orig_tls_align;
-	size_t i;
-	int cs;
-	jmp_buf jb;
-
-	if (!file) return head;
-
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-	pthread_rwlock_wrlock(&lock);
-	__inhibit_ptc();
-
-	p = 0;
-	orig_tls_cnt = tls_cnt;
-	orig_tls_offset = tls_offset;
-	orig_tls_align = tls_align;
-	orig_tail = tail;
-	noload = mode & RTLD_NOLOAD;
-
-	rtld_fail = &jb;
-	if (setjmp(*rtld_fail)) {
-		/* Clean up anything new that was (partially) loaded */
-		if (p && p->deps) for (i=0; p->deps[i]; i++)
-			if (p->deps[i]->global < 0)
-				p->deps[i]->global = 0;
-		for (p=orig_tail->next; p; p=next) {
-			next = p->next;
-			munmap(p->map, p->map_len);
-			while (p->td_index) {
-				void *tmp = p->td_index->next;
-				free(p->td_index);
-				p->td_index = tmp;
-			}
-			if (p->rpath != p->rpath_orig)
-				free(p->rpath);
-			free(p->deps);
-			free(p);
-		}
-		tls_cnt = orig_tls_cnt;
-		tls_offset = orig_tls_offset;
-		tls_align = orig_tls_align;
-		tail = orig_tail;
-		tail->next = 0;
-		p = 0;
-		goto end;
-	} else p = load_library(file, head);
-
-	if (!p) {
-		error(noload ?
-			"Library %s is not already loaded" :
-			"Error loading shared library %s: %m",
-			file);
-		goto end;
-	}
-
-	/* First load handling */
-	if (!p->deps) {
-		load_deps(p);
-		if (p->deps) for (i=0; p->deps[i]; i++)
-			if (!p->deps[i]->global)
-				p->deps[i]->global = -1;
-		if (!p->global) p->global = -1;
-		reloc_all(p);
-		if (p->deps) for (i=0; p->deps[i]; i++)
-			if (p->deps[i]->global < 0)
-				p->deps[i]->global = 0;
-		if (p->global < 0) p->global = 0;
-	}
-
-	if (mode & RTLD_GLOBAL) {
-		if (p->deps) for (i=0; p->deps[i]; i++)
-			p->deps[i]->global = 1;
-		p->global = 1;
-	}
-
-	update_tls_size();
-	_dl_debug_state();
-	orig_tail = tail;
-end:
-	__release_ptc();
-	if (p) gencnt++;
-	pthread_rwlock_unlock(&lock);
-	if (p) do_init_fini(orig_tail);
-	pthread_setcancelstate(cs, 0);
-	return p;
-}
-
-static int invalid_dso_handle(void *h)
-{
-	struct dso *p;
-	for (p=head; p; p=p->next) if (h==p) return 0;
-	error("Invalid library handle %p", (void *)h);
-	return 1;
-}
-
-void *__tls_get_addr(size_t *);
-
-static void *do_dlsym(struct dso *p, const char *s, void *ra)
-{
-	size_t i;
-	uint32_t h = 0, gh = 0, *ght;
-	Sym *sym;
-	if (p == head || p == RTLD_DEFAULT || p == RTLD_NEXT) {
-		if (p == RTLD_DEFAULT) {
-			p = head;
-		} else if (p == RTLD_NEXT) {
-			for (p=head; p && (unsigned char *)ra-p->map>p->map_len; p=p->next);
-			if (!p) p=head;
-			p = p->next;
-		}
-		struct symdef def = find_sym(p, s, 0);
-		if (!def.sym) goto failed;
-		if ((def.sym->st_info&0xf) == STT_TLS)
-			return __tls_get_addr((size_t []){def.dso->tls_id, def.sym->st_value});
-		return def.dso->base + def.sym->st_value;
-	}
-	if (invalid_dso_handle(p))
-		return 0;
-	if ((ght = p->ghashtab)) {
-		gh = gnu_hash(s);
-		sym = gnu_lookup(gh, ght, p, s);
-	} else {
-		h = sysv_hash(s);
-		sym = sysv_lookup(s, h, p);
-	}
-	if (sym && (sym->st_info&0xf) == STT_TLS)
-		return __tls_get_addr((size_t []){p->tls_id, sym->st_value});
-	if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
-		return p->base + sym->st_value;
-	if (p->deps) for (i=0; p->deps[i]; i++) {
-		if ((ght = p->deps[i]->ghashtab)) {
-			if (!gh) gh = gnu_hash(s);
-			sym = gnu_lookup(gh, ght, p->deps[i], s);
-		} else {
-			if (!h) h = sysv_hash(s);
-			sym = sysv_lookup(s, h, p->deps[i]);
-		}
-		if (sym && (sym->st_info&0xf) == STT_TLS)
-			return __tls_get_addr((size_t []){p->deps[i]->tls_id, sym->st_value});
-		if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
-			return p->deps[i]->base + sym->st_value;
-	}
-failed:
-	error("Symbol not found: %s", s);
-	return 0;
-}
-
-int __dladdr(const void *addr, Dl_info *info)
-{
-	struct dso *p;
-	Sym *sym;
-	uint32_t nsym;
-	char *strings;
-	size_t i;
-	void *best = 0;
-	char *bestname;
-
-	pthread_rwlock_rdlock(&lock);
-	for (p=head; p && (unsigned char *)addr-p->map>p->map_len; p=p->next);
-	pthread_rwlock_unlock(&lock);
-
-	if (!p) return 0;
-
-	sym = p->syms;
-	strings = p->strings;
-	if (p->hashtab) {
-		nsym = p->hashtab[1];
-	} else {
-		uint32_t *buckets;
-		uint32_t *hashval;
-		buckets = p->ghashtab + 4 + (p->ghashtab[2]*sizeof(size_t)/4);
-		sym += p->ghashtab[1];
-		for (i = nsym = 0; i < p->ghashtab[0]; i++) {
-			if (buckets[i] > nsym)
-				nsym = buckets[i];
-		}
-		if (nsym) {
-			nsym -= p->ghashtab[1];
-			hashval = buckets + p->ghashtab[0] + nsym;
-			do nsym++;
-			while (!(*hashval++ & 1));
-		}
-	}
-
-	for (; nsym; nsym--, sym++) {
-		if (sym->st_value
-		 && (1<<(sym->st_info&0xf) & OK_TYPES)
-		 && (1<<(sym->st_info>>4) & OK_BINDS)) {
-			void *symaddr = p->base + sym->st_value;
-			if (symaddr > addr || symaddr < best)
-				continue;
-			best = symaddr;
-			bestname = strings + sym->st_name;
-			if (addr == symaddr)
-				break;
-		}
-	}
-
-	if (!best) return 0;
-
-	info->dli_fname = p->name;
-	info->dli_fbase = p->base;
-	info->dli_sname = bestname;
-	info->dli_saddr = best;
-
-	return 1;
-}
-
-__attribute__((__visibility__("hidden")))
-void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra)
-{
-	void *res;
-	pthread_rwlock_rdlock(&lock);
-	res = do_dlsym(p, s, ra);
-	pthread_rwlock_unlock(&lock);
-	return res;
-}
-
-int dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data)
-{
-	struct dso *current;
-	struct dl_phdr_info info;
-	int ret = 0;
-	for(current = head; current;) {
-		info.dlpi_addr      = (uintptr_t)current->base;
-		info.dlpi_name      = current->name;
-		info.dlpi_phdr      = current->phdr;
-		info.dlpi_phnum     = current->phnum;
-		info.dlpi_adds      = gencnt;
-		info.dlpi_subs      = 0;
-		info.dlpi_tls_modid = current->tls_id;
-		info.dlpi_tls_data  = current->tls_image;
-
-		ret = (callback)(&info, sizeof (info), data);
-
-		if (ret != 0) break;
-
-		pthread_rwlock_rdlock(&lock);
-		current = current->next;
-		pthread_rwlock_unlock(&lock);
-	}
-	return ret;
-}
-#else
-static int invalid_dso_handle(void *h)
-{
-	error("Invalid library handle %p", (void *)h);
-	return 1;
-}
-void *dlopen(const char *file, int mode)
-{
-	error("Dynamic loading not supported");
-	return 0;
-}
-void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra)
-{
-	error("Symbol not found: %s", s);
-	return 0;
-}
-int __dladdr (const void *addr, Dl_info *info)
-{
-	return 0;
-}
-#endif
-
-int __dlinfo(void *dso, int req, void *res)
-{
-	if (invalid_dso_handle(dso)) return -1;
-	if (req != RTLD_DI_LINKMAP) {
-		error("Unsupported request %d", req);
-		return -1;
-	}
-	*(struct link_map **)res = dso;
-	return 0;
-}
-
-char *dlerror()
-{
-	pthread_t self = __pthread_self();
-	if (!self->dlerror_flag) return 0;
-	self->dlerror_flag = 0;
-	char *s = self->dlerror_buf;
-	if (s == (void *)-1)
-		return "Dynamic linker failed to allocate memory for error message";
-	else
-		return s;
-}
-
-int dlclose(void *p)
-{
-	return invalid_dso_handle(p);
-}
-
-void __dl_thread_cleanup(void)
-{
-	pthread_t self = __pthread_self();
-	if (self->dlerror_buf != (void *)-1)
-		free(self->dlerror_buf);
-}
-
-static void error(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-#ifdef SHARED
-	if (!runtime) {
-		vdprintf(2, fmt, ap);
-		dprintf(2, "\n");
-		ldso_fail = 1;
-		va_end(ap);
-		return;
-	}
-#endif
-	pthread_t self = __pthread_self();
-	if (self->dlerror_buf != (void *)-1)
-		free(self->dlerror_buf);
-	size_t len = vsnprintf(0, 0, fmt, ap);
-	va_end(ap);
-	char *buf = malloc(len+1);
-	if (buf) {
-		va_start(ap, fmt);
-		vsnprintf(buf, len+1, fmt, ap);
-		va_end(ap);
-	} else {
-		buf = (void *)-1;	
-	}
-	self->dlerror_buf = buf;
-	self->dlerror_flag = 1;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/i386/tlsdesc.s b/src/components/lib/libc/musl-1.1.11/src/ldso/i386/tlsdesc.s
deleted file mode 100644
index 4a553bce11..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/i386/tlsdesc.s
+++ /dev/null
@@ -1,31 +0,0 @@
-.text
-.global __tlsdesc_static
-.hidden __tlsdesc_static
-.type __tlsdesc_static,@function
-__tlsdesc_static:
-	mov 4(%eax),%eax
-	ret
-
-.hidden __tls_get_new
-
-.global __tlsdesc_dynamic
-.hidden __tlsdesc_dynamic
-.type __tlsdesc_dynamic,@function
-__tlsdesc_dynamic:
-	mov 4(%eax),%eax
-	push %edx
-	mov %gs:4,%edx
-	push %ecx
-	mov (%eax),%ecx
-	cmp %ecx,(%edx)
-	jc 1f
-	mov 4(%eax),%eax
-	add (%edx,%ecx,4),%eax
-2:	pop %ecx
-	sub %gs:0,%eax
-	pop %edx
-	ret
-1:	push %eax
-	call __tls_get_new
-	pop %ecx
-	jmp 2b
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/powerpc/dlsym.s b/src/components/lib/libc/musl-1.1.11/src/ldso/powerpc/dlsym.s
deleted file mode 100644
index 357d577131..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/powerpc/dlsym.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.text
-	.global dlsym
-	.hidden __dlsym
-	.type   dlsym,@function
-dlsym:
-	mflr    5                      # The return address is arg3.
-	b       __dlsym
-	.end    dlsym
-	.size   dlsym, .-dlsym
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/tlsdesc.c b/src/components/lib/libc/musl-1.1.11/src/ldso/tlsdesc.c
deleted file mode 100644
index 4bc654fa5c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/tlsdesc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef SHARED
-
-#include <stddef.h>
-#include "libc.h"
-
-__attribute__((__visibility__("hidden")))
-ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic();
-
-ptrdiff_t __tlsdesc_static()
-{
-	return 0;
-}
-
-weak_alias(__tlsdesc_static, __tlsdesc_dynamic);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/x86_64/tlsdesc.s b/src/components/lib/libc/musl-1.1.11/src/ldso/x86_64/tlsdesc.s
deleted file mode 100644
index 8238c3ebf4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/ldso/x86_64/tlsdesc.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.text
-.global __tlsdesc_static
-.hidden __tlsdesc_static
-.type __tlsdesc_static,@function
-__tlsdesc_static:
-	mov 8(%rax),%rax
-	ret
-
-.hidden __tls_get_new
-
-.global __tlsdesc_dynamic
-.hidden __tlsdesc_dynamic
-.type __tlsdesc_dynamic,@function
-__tlsdesc_dynamic:
-	mov 8(%rax),%rax
-	push %rdx
-	mov %fs:8,%rdx
-	push %rcx
-	mov (%rax),%rcx
-	cmp %rcx,(%rdx)
-	jc 1f
-	mov 8(%rax),%rax
-	add (%rdx,%rcx,8),%rax
-2:	pop %rcx
-	sub %fs:0,%rax
-	pop %rdx
-	ret
-1:	push %rdi
-	push %rdi
-	push %rsi
-	push %r8
-	push %r9
-	push %r10
-	push %r11
-	mov %rax,%rdi
-	call __tls_get_new
-	pop %r11
-	pop %r10
-	pop %r9
-	pop %r8
-	pop %rsi
-	pop %rdi
-	pop %rdi
-	jmp 2b
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/adjtimex.c b/src/components/lib/libc/musl-1.1.11/src/linux/adjtimex.c
deleted file mode 100644
index 91de6824c3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/adjtimex.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sys/timex.h>
-#include "syscall.h"
-
-int adjtimex(struct timex *tx)
-{
-	return syscall(SYS_adjtimex, tx);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/brk.c b/src/components/lib/libc/musl-1.1.11/src/linux/brk.c
deleted file mode 100644
index ffdbbd5297..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/brk.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <errno.h>
-#include "syscall.h"
-
-int brk(void *end)
-{
-	return __syscall_ret(-ENOMEM);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/cache.c b/src/components/lib/libc/musl-1.1.11/src/linux/cache.c
deleted file mode 100644
index 3f0abc7caf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/cache.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "syscall.h"
-#include "libc.h"
-
-#ifdef SYS_cacheflush
-int _flush_cache(void *addr, int len, int op)
-{
-	return syscall(SYS_cacheflush, addr, len, op);
-}
-weak_alias(_flush_cache, cacheflush);
-#endif
-
-#ifdef SYS_cachectl
-int __cachectl(void *addr, int len, int op)
-{
-	return syscall(SYS_cachectl, addr, len, op);
-}
-weak_alias(__cachectl, cachectl);
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/clock_adjtime.c b/src/components/lib/libc/musl-1.1.11/src/linux/clock_adjtime.c
deleted file mode 100644
index 056ad6d341..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/clock_adjtime.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sys/timex.h>
-#include "syscall.h"
-
-int clock_adjtime (clockid_t clock_id, struct timex *utx)
-{
-	return syscall(SYS_clock_adjtime, clock_id, utx);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/ppoll.c b/src/components/lib/libc/musl-1.1.11/src/linux/ppoll.c
deleted file mode 100644
index 9e262477ba..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/ppoll.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define _GNU_SOURCE
-#include <poll.h>
-#include <signal.h>
-#include "syscall.h"
-
-int ppoll(struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask)
-{
-	return syscall_cp(SYS_ppoll, fds, n,
-		to ? (struct timespec []){*to} : 0, mask, _NSIG/8);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/ptrace.c b/src/components/lib/libc/musl-1.1.11/src/linux/ptrace.c
deleted file mode 100644
index 83b8022bee..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/ptrace.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <sys/ptrace.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include "syscall.h"
-
-long ptrace(int req, ...)
-{
-	va_list ap;
-	pid_t pid;
-	void *addr, *data, *addr2;
-	long ret, result;
-
-	va_start(ap, req);
-	pid = va_arg(ap, pid_t);
-	addr = va_arg(ap, void *);
-	data = va_arg(ap, void *);
-	addr2 = va_arg(ap, void *);
-	va_end(ap);
-
-	if (req-1U < 3) data = &result;
-	ret = syscall(SYS_ptrace, req, pid, addr, data, addr2);
-
-	if (ret < 0 || req-1U >= 3) return ret;
-	return result;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/settimeofday.c b/src/components/lib/libc/musl-1.1.11/src/linux/settimeofday.c
deleted file mode 100644
index 15c18c6379..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/settimeofday.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#define _BSD_SOURCE
-#include <sys/time.h>
-#include "syscall.h"
-
-int settimeofday(const struct timeval *tv, const struct timezone *tz)
-{
-	return syscall(SYS_settimeofday, tv, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/sysinfo.c b/src/components/lib/libc/musl-1.1.11/src/linux/sysinfo.c
deleted file mode 100644
index 4b5a798d06..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/sysinfo.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <sys/sysinfo.h>
-#include "syscall.h"
-#include "libc.h"
-
-int __lsysinfo(struct sysinfo *info)
-{
-	return syscall(SYS_sysinfo, info);
-}
-
-weak_alias(__lsysinfo, sysinfo);
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/timerfd.c b/src/components/lib/libc/musl-1.1.11/src/linux/timerfd.c
deleted file mode 100644
index 62cc277365..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/timerfd.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <sys/timerfd.h>
-#include "syscall.h"
-
-int timerfd_create(int clockid, int flags)
-{
-	return syscall(SYS_timerfd_create, clockid, flags);
-}
-
-int timerfd_settime(int fd, int flags, const struct itimerspec *new, struct itimerspec *old)
-{
-	return syscall(SYS_timerfd_settime, fd, flags, new, old);
-}
-
-int timerfd_gettime(int fd, struct itimerspec *cur)
-{
-	return syscall(SYS_timerfd_gettime, fd, cur);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/utimes.c b/src/components/lib/libc/musl-1.1.11/src/linux/utimes.c
deleted file mode 100644
index b814c88b2f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/utimes.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <sys/time.h>
-#include "fcntl.h"
-#include "syscall.h"
-
-int __futimesat(int, const char *, const struct timeval [2]);
-
-int utimes(const char *path, const struct timeval times[2])
-{
-	return __futimesat(AT_FDCWD, path, times);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/wait4.c b/src/components/lib/libc/musl-1.1.11/src/linux/wait4.c
deleted file mode 100644
index 97f12cc524..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/wait4.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#define _GNU_SOURCE
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "syscall.h"
-
-pid_t wait4(pid_t pid, int *status, int options, struct rusage *usage)
-{
-	return syscall(SYS_wait4, pid, status, options, usage);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/x32/sysinfo.s b/src/components/lib/libc/musl-1.1.11/src/linux/x32/sysinfo.s
deleted file mode 100644
index 53d79db27d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/linux/x32/sysinfo.s
+++ /dev/null
@@ -1 +0,0 @@
-# see arch/x32/src/sysinfo.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/catclose.c b/src/components/lib/libc/musl-1.1.11/src/locale/catclose.c
deleted file mode 100644
index 02cd3e5c9c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/catclose.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <nl_types.h>
-
-int catclose (nl_catd catd)
-{
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/catgets.c b/src/components/lib/libc/musl-1.1.11/src/locale/catgets.c
deleted file mode 100644
index bbee8986fc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/catgets.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <nl_types.h>
-
-char *catgets (nl_catd catd, int set_id, int msg_id, const char *s)
-{
-	return (char *)s;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/catopen.c b/src/components/lib/libc/musl-1.1.11/src/locale/catopen.c
deleted file mode 100644
index 4423c4d9e8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/catopen.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <nl_types.h>
-
-nl_catd catopen (const char *name, int oflag)
-{
-	return (nl_catd)-1;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/codepages.h b/src/components/lib/libc/musl-1.1.11/src/locale/codepages.h
deleted file mode 100644
index ab146e89a4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/codepages.h
+++ /dev/null
@@ -1,265 +0,0 @@
-"iso88591\0"
-"latin1\0"
-"\0\200"
-
-"iso88592\0"
-"\0\40"
-"\0\330\20\313\32\0\244\21\10\0\0\34\122\310\42\240\0\100\212\50\0\334\60\13\33"
-"\0\250\41\10\54\0\40\142\10\43\241\324\122\312\50\173\0\0\0\15\0\224\201\3\0"
-"\76\0\200\4\0\112\0\0\0\20\102\264\21\7\0\0\334\1\0\0\177\124\2\300\45"
-"\0\0\220\10\0\174\0\0\100\15\0\230\221\3\0\77\0\220\4\0\113\0\0\100\20"
-"\103\270\41\7\0\0\340\1\0\0\200\130\2\0\46\0\0\240\210\54"
-
-"iso88593\0"
-"\0\40"
-"\0\130\21\13\0\0\4\100\5\0\0\170\121\210\23\140\0\20\200\50\0\134\1\0\0"
-"\0\0\120\5\0\0\174\141\310\23\141\0\20\300\50\0\0\0\100\0\0\360\240\3\0"
-"\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0\100\1\0\0\114\0\0\0\0\0\114\62\10\0"
-"\0\0\0\100\0\0\364\260\3\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0\104\1\0\0"
-"\115\0\0\0\0\0\120\102\210\54"
-
-"iso88594\0"
-"\0\40"
-"\0\330\100\106\37\0\140\161\6\0\0\34\102\204\24\215\0\100\12\0\0\334\60\213\37"
-"\0\144\201\6\54\0\40\122\304\24\216\314\121\12\35\62\0\0\0\0\0\0\0\0\27"
-"\76\0\200\4\0\106\0\0\200\26\102\274\121\207\30\0\0\0\0\0\0\144\2\0\0"
-"\0\74\22\11\0\63\0\0\0\0\0\0\0\100\27\77\0\220\4\0\107\0\0\300\26"
-"\103\300\141\307\30\0\0\0\0\0\0\150\2\0\0\0\100\42\211\54"
-
-"iso88595\0"
-"\0\40"
-"\0\14\104\120\101\6\35\204\120\102\12\55\304\120\103\16\1\360\20\104"
-"\21\111\64\21\105\25\131\164\21\106\31\151\264\21\107\35\171\364\21\110"
-"\41\211\64\22\111\45\231\164\22\112\51\251\264\22\113\55\271\364\22\114"
-"\61\311\64\23\115\65\331\164\23\116\71\351\264\23\117\75\371\364\23\120"
-"\101\11\65\24\121\105\31\165\24\122\111\51\265\24\123\115\71\365\24\124"
-"\127\106\45\325\124\124\125\145\325\125\130\145\245\325\126\134\15\320\225\127"
-
-"iso88596\0"
-"\0\40"
-"\0\4\20\100\0\0\4\20\100\0\1\4\20\100\0\224\1\20\100\0\1\4\20\100\0"
-"\1\4\20\100\0\1\4\20\100\145\1\4\20\200\145\1\134\206\131\146"
-"\232\155\306\131\147\236\175\6\132\150\242\215\106\132\151\246\235\206\132\152"
-"\252\255\306\132\153\256\275\6\133\0\1\4\20\100\0\261\311\66\33\155"
-"\265\331\166\33\156\271\351\266\33\157\275\371\366\33\160\301\11\67\134\0"
-"\1\4\20\100\0\1\4\20\100\0\1\4\20\100\0"
-
-"iso88597\0"
-"\0\40"
-"\0\24\151\44\0\124\126\11\0\0\0\0\260\13\0\0\0\20\300\220\0\0\0\0\0"
-"\274\364\342\13\0\277\0\23\14\0\302\0\60\14\61\305\30\163\14\62"
-"\311\50\263\14\63\315\70\363\14\64\321\110\63\15\65\325\130\23\300\65"
-"\330\144\243\315\66\334\164\343\315\67\340\204\43\316\70\344\224\143\316\71"
-"\350\244\243\316\72\354\264\343\316\73\360\304\43\317\74\364\324\143\317\75"
-"\370\344\243\317\76\374\364\343\317\77\0\5\44\120\0"
-
-"iso88598\0"
-"\0\40"
-"\0\4\0\0\0\0\0\0\0\0\0\0\300\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\360\0\0"
-"\0\0\0\100\0\1\4\20\100\0\1\4\20\100\0\1\4\20\100\0\1\4\20\100\0\1\4\20\100\0"
-"\1\4\20\100\0\1\4\20\100\0\1\4\20\0\221\164\325\145\327\135"
-"\170\345\245\327\136\174\365\345\327\137\200\5\46\330\140\204\25\146\330\141"
-"\210\45\246\330\142\214\65\346\130\0\1\374\10\144\0"
-
-"iso88599\0"
-"\0\120"
-"\116\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\170\121\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\117\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\174\141\10\0"
-
-"iso885910\0"
-"\0\40"
-"\0\330\100\204\24\132\140\41\6\0\147\10\161\110\43\244\0\20\311\34"
-"\0\334\120\304\24\133\144\61\6\0\150\14\201\210\43\245\14\51\11\35\62\0\0\0\0"
-"\0\0\0\0\27\76\0\200\4\0\106\0\0\0\0\0\274\121\7\0\0\0\0\300\43\0\144\2\0\0"
-"\0\0\0\0\0\63\0\0\0\0\0\0\0\100\27\77\0\220\4\0\107\0\0\0\0\0\300\141\7\0"
-"\0\0\0\0\44\0\150\2\0\0\0\0\0\0\31"
-
-"iso885911\0"
-"tis620\0"
-"\0\40"
-"\0\100\27\235\164\323\121\127\235\165\327\141\227\235\166\333\161\327\235\167"
-"\337\201\27\236\170\343\221\127\236\171\347\241\227\236\172"
-"\353\261\327\236\173\357\301\27\237\174\363\321\127\237\175"
-"\367\341\227\237\176\373\361\327\237\177\377\1\30\240\200\3\22\130\240\201"
-"\7\42\230\140\0\1\4\20\200\202\13\62\330\240\203\17\102\30\241\204"
-"\23\122\130\241\205\27\142\230\241\206\33\162\330\241\207\37\202\30\242\210"
-"\43\222\130\242\211\1\4\20\100\0"
-
-"iso885913\0"
-"\0\40"
-"\0\44\11\0\0\0\50\11\0\0\15\0\320\7\0\0\0\0\300\2\0\0\0\0\0\110\2\0\0\0"
-"\20\0\340\7\0\0\0\0\200\3\66\160\41\3\16\0\0\200\4\21\76\0\0\212\21"
-"\122\210\241\305\31\207\264\361\6\0\165\0\0\0\0\231\254\21\110\44"
-"\0\210\102\12\0\67\164\61\103\16\0\0\220\104\21\77\0\20\312\21"
-"\123\214\261\5\32\210\270\1\7\0\166\0\0\0\0\232\260\41\210\44"
-"\0\214\122\212\221"
-
-"iso885914\0"
-"\0\40"
-"\0\234\210\42\0\74\364\220\42\0\65\2\160\243\212\73\2\0\300\47"
-"\53\262\10\105\24\55\272\10\300\213\66\302\210\143\214\74\346\250\243\214"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\233\0\0\0\0\0\0\0\300\214\0\0\0\0\0"
-"\0\0\320\11\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\234\0\0\0\0\0\0\0\0\215"
-"\0\0\0\0\0\0\0\340\11\0"
-
-"iso885915\0"
-"latin9\0"
-"\0\44"
-"\124\2\160\10\0\210\0\0\0\0\0\0\0\0\0\0\0\0\0\0\244\0\0\0\0\245\0\0\0\0"
-"\171\350\361\11\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-"iso885916\0"
-"\0\40"
-"\0\330\160\303\32\124\52\171\10\0\210\0\260\12\0\240\0\20\212\50\0\0\340\3\33"
-"\244\44\11\0\0\245\374\300\12\0\171\350\361\311\50\0\0\0\0\15\0\340\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\102\264\1\0\0\0\334\1\100\40\227\0\0\0\0\0\40\321\12\0"
-"\0\0\0\100\15\0\344\0\0\0\0\0\0\0\0\0\0\0\0\0\103\270\1\0\0\0\340\1\200\40"
-"\230\0\0\0\0\0\44\341\12\0"
-
-"cp1250\0"
-"windows1250\0"
-"\0\0"
-"\124\6\160\144\0\112\72\271\44\223\1\74\171\10\224\201\54\102\12\50"
-"\1\24\151\44\222\111\66\31\244\220\1\140\211\110\224\202\60\122\112\50"
-"\0\300\22\313\32\0\330\0\0\0\0\0\120\10\0\0\0\0\200\50\0\0\60\13\33\0\0\0\0\0"
-"\0\334\140\10\0\151\324\242\306\50\173\0\0\0\15\0\224\201\3\0\76\0\200\4\0"
-"\112\0\0\0\20\102\264\21\7\0\0\334\1\0\0\177\124\2\300\45\0\0\220\10\0"
-"\174\0\0\100\15\0\230\221\3\0\77\0\220\4\0\113\0\0\100\20\103\270\41\7\0"
-"\0\340\1\0\0\200\130\2\0\46\0\0\240\210\54"
-
-"cp1251\0"
-"windows1251\0"
-"\0\0"
-"\4\25\164\344\124\112\72\271\44\223\124\76\271\20\224\14\71\324\20\104"
-"\122\25\151\44\222\111\66\31\244\220\1\140\231\125\224\132\161\265\225\127"
-"\0\74\324\225\102\0\174\5\0\0\3\1\140\20\0\0\0\0\100\102\0\0\200\220\125"
-"\140\1\0\0\0\121\135\111\25\0\130\35\124\325\125\21\111\64\21\105"
-"\25\131\164\21\106\31\151\264\21\107\35\171\364\21\110\41\211\64\22\111"
-"\45\231\164\22\112\51\251\264\22\113\55\271\364\22\114\61\311\64\23\115"
-"\65\331\164\23\116\71\351\264\23\117\75\371\364\23\120\101\11\65\24\121"
-"\105\31\165\24\122\111\51\265\24\123\115\71\365\24\124"
-
-"cp1252\0"
-"windows1252\0"
-"\0\0"
-"\124\6\160\244\51\112\72\271\44\223\257\74\171\10\224\171\4\100\112\0"
-"\1\24\151\44\222\111\66\31\244\220\264\140\211\110\224\172\4\120\312\47"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-"cp1253\0"
-"windows1253\0"
-"\0\0"
-"\124\6\160\244\51\112\72\271\44\223\1\74\31\0\224\1\4\20\100\0\1\24\151\44\222"
-"\111\66\31\244\220\1\140\31\100\224\1\4\20\100\0\0\364\342\13\0\0\0\0\0\0"
-"\0\0\20\0\0\0\0\0\300\220\0\0\0\0\0\274\0\0\0\0\277\0\23\14\0\302\0\60\14\61"
-"\305\30\163\14\62\311\50\263\14\63\315\70\363\14\64\321\110\63\15\65"
-"\325\130\23\300\65\330\144\243\315\66\334\164\343\315\67\340\204\43\316\70"
-"\344\224\143\316\71\350\244\243\316\72\354\264\343\316\73\360\304\43\317\74"
-"\364\324\143\317\75\370\344\243\317\76\374\364\343\317\77\0\5\44\120\0"
-
-"cp1254\0"
-"windows1254\0"
-"\0\0"
-"\124\6\160\244\51\112\72\271\44\223\257\74\171\10\224\171\4\20\100\0"
-"\1\24\151\44\222\111\66\31\244\220\264\140\211\110\224\172\4\20\300\47"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\116\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\170\121\10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\117\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\0\0\174\141\10\0"
-
-"cp1255\0"
-"windows1255\0"
-"\0\0"
-"\124\6\160\244\51\112\72\271\44\223\257\74\31\0\224\1\4\20\100\0"
-"\1\24\151\44\222\111\66\31\244\220\264\140\31\100\224\1\4\20\100\0\0\0\0\0\0"
-"\122\2\0\0\0\0\0\300\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\360\0\0\0\0\0\0\0"
-"\141\211\65\26\131\145\231\165\26\132\151\251\25\300\132\154\265\345\326\133"
-"\160\305\45\327\134\217\101\26\231\144\223\5\20\100\0\1\4\20\100\0"
-"\164\325\145\327\135\170\345\245\327\136\174\365\345\327\137\200\5\46\330\140"
-"\204\25\146\330\141\210\45\246\330\142\214\65\346\130\0\1\374\10\144\0"
-
-"cp1256\0"
-"windows1256\0"
-"\0\0"
-"\124\26\167\244\51\112\72\271\44\223\257\74\111\34\224\171\30\227\334\161"
-"\313\25\151\44\222\111\66\31\244\220\312\141\211\134\224\172\364\350\43\163"
-"\0\120\6\0\0\0\0\0\0\0\0\0\320\34\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\120\31\0"
-"\0\0\0\200\145\316\135\206\131\146\232\155\306\131\147\236\175\6\132\150"
-"\242\215\106\132\151\246\235\206\132\152\252\255\306\32\0\255\271\366\32\154"
-"\261\311\66\33\155\0\324\6\200\155\267\341\226\33\0\0\0\0\0\0\272\355\6\0\0"
-"\274\365\346\333\157\0\0\27\34\0\302\1\60\34\0\0\374\10\344\163"
-
-"cp1257\0"
-"windows1257\0"
-"\0\0"
-"\124\6\160\144\0\112\72\271\44\223\1\74\31\0\224\1\20\0\213\2\1\24\151\44\222"
-"\111\66\31\244\220\1\140\31\100\224\1\30\60\113\0\0\4\0\0\0\0\4\0\0\0"
-"\15\0\320\7\0\0\0\0\300\2\0\0\0\0\0\0\0\0\0\0\20\0\340\7\0\0\0\0\200\3"
-"\66\160\41\3\16\0\0\200\4\21\76\0\0\212\21\122\210\241\305\31\207\264\361\6\0"
-"\165\0\0\0\0\231\254\21\110\44\0\210\102\12\0\67\164\61\103\16\0\0\220\104\21"
-"\77\0\20\312\21\123\214\261\5\32\210\270\1\7\0\166\0\0\0\0\232\260\41\210\44"
-"\0\214\122\212\54"
-
-"cp1258\0"
-"windows1258\0"
-"\0\0"
-"\124\6\160\244\51\112\72\271\44\223\257\74\31\0\224\171\4\20\100\0"
-"\1\24\151\44\222\111\66\31\244\220\264\140\31\100\224\172\4\20\300\47"
-"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-"\0\0\0\0\0\0\0\0\0\15\0\0\0\0\0\0\0\0\0\0\266\0\0\0\0\102\0\220\13\0"
-"\0\234\2\0\0\0\0\0\0\0\0\244\202\13\0\0\0\0\100\15\0\0\0\0\0\0\0\0\0\0"
-"\267\0\0\0\0\103\0\240\13\0\0\240\2\0\0\0\0\0\0\0\0\250\62\45\0"
-
-"koi8r\0"
-"\0\0"
-"\140\206\51\346\230\144\226\151\346\231\150\246\251\46\242\211\52\272\50\243"
-"\215\72\372\250\227\220\146\251\345\226\134\166\51\300\227\7\40\220\300\3"
-"\153\262\331\146\124\156\276\11\147\234\162\316\111\147\235"
-"\166\336\211\147\236\172\356\311\347\100\175\372\371\47\240\201\12\72\50\241"
-"\205\32\172\150\1\117\305\44\323\121\65\331\124\24\115\106\345\244\323\116"
-"\74\365\344\323\117\100\101\25\224\120\103\21\165\323\114\115\61\205\123\122"
-"\116\51\205\324\122\57\105\44\321\111\25\131\124\22\105\46\145\244\321\106"
-"\34\165\344\321\107\40\301\24\222\110\43\221\164\321\104\55\261\204\121\112"
-"\56\251\204\322\112"
-
-"koi8u\0"
-"\0\0"
-"\140\206\51\346\230\144\226\151\346\231\150\246\251\46\242\211\52\272\50\243"
-"\215\72\372\250\227\220\146\251\345\226\134\166\51\300\227\7\40\220\300\3"
-"\153\262\331\146\124\124\275\151\325\125\162\316\111\147\235"
-"\166\202\205\147\236\172\356\311\347\100\6\371\211\120\102\201\12\72\50\241"
-"\205\176\165\150\1\117\305\44\323\121\65\331\124\24\115\106\345\244\323\116"
-"\74\365\344\323\117\100\101\25\224\120\103\21\165\323\114\115\61\205\123\122"
-"\116\51\205\324\122\57\105\44\321\111\25\131\124\22\105\46\145\244\321\106"
-"\34\165\344\321\107\40\301\24\222\110\43\221\164\321\104\55\261\204\121\112"
-"\56\251\204\322\112"
-
-"cp437\0"
-"\0\0"
-"\27\300\100\202\7\37\164\0\202\10\45\230\60\102\12\50\234\100\101\5"
-"\30\70\260\300\12\54\250\360\202\13\61\144\300\101\4\22\114\140\245\51"
-"\221\106\32\151\244\221\106\32\151\244\221\106\32\151\244\221\106\32\151\244"
-"\215\72\372\150\230\147\362\331\147\234\160\372\311\246\234"
-"\170\336\151\347\230\144\246\211\246\231\140\252\231\247\236"
-"\165\276\111\150\240\173\256\171\250\240\203\376\11\50\235\163\266\351\246\241"
-"\205\226\51\246\242\211\56\312\50\242\345\104\212\14\75\327\334\23\51\76"
-"\332\64\323\15\72\221\352\223\116\244\221\106\332\45\227\136\176\371\300\226"
-"\7\144\231\200\226\221\42\0\251\0"
-
-"cp850\0"
-"\0\0"
-"\27\300\100\202\7\37\164\0\202\10\45\230\60\102\12\50\234\100\101\5"
-"\30\70\260\300\12\54\250\360\202\13\61\144\300\1\4\22\64\300\200\51"
-"\221\106\32\151\244\221\106\32\151\244\221\106\32\151\244\221\106\32\151\244"
-"\215\72\372\150\230\147\106\32\151\244\5\370\311\246\234\170\106\60\301\230"
-"\144\246\211\246\231\140\252\31\151\244\165\276\111\150\240"
-"\173\256\171\150\244\221\106\32\151\244\221\176\21\151\244\221\226\51\246\242"
-"\211\106\32\51\242\221\106\32\151\244\221\106\32\151\244\221\106\32\151\244"
-"\221\106\152\100\244\221\106\112\144\244\221\16\360\200\2\7\20\220\100\244"
-"\221\42\0\251\0"
-
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/dcngettext.c b/src/components/lib/libc/musl-1.1.11/src/locale/dcngettext.c
deleted file mode 100644
index a5ff847504..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/dcngettext.c
+++ /dev/null
@@ -1,249 +0,0 @@
-#include <libintl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include "locale_impl.h"
-#include "libc.h"
-#include "atomic.h"
-
-struct binding {
-	struct binding *next;
-	int dirlen;
-	volatile int active;
-	char *domainname;
-	char *dirname;
-	char buf[];
-};
-
-static void *volatile bindings;
-
-static char *gettextdir(const char *domainname, size_t *dirlen)
-{
-	struct binding *p;
-	for (p=bindings; p; p=p->next) {
-		if (!strcmp(p->domainname, domainname) && p->active) {
-			*dirlen = p->dirlen;
-			return (char *)p->dirname;
-		}
-	}
-	return 0;
-}
-
-char *bindtextdomain(const char *domainname, const char *dirname)
-{
-	static volatile int lock[2];
-	struct binding *p, *q;
-
-	if (!domainname) return 0;
-	if (!dirname) return gettextdir(domainname, &(size_t){0});
-
-	size_t domlen = strlen(domainname);
-	size_t dirlen = strlen(dirname);
-	if (domlen > NAME_MAX || dirlen >= PATH_MAX) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	LOCK(lock);
-
-	for (p=bindings; p; p=p->next) {
-		if (!strcmp(p->domainname, domainname) &&
-		    !strcmp(p->dirname, dirname)) {
-			break;
-		}
-	}
-
-	if (!p) {
-		p = malloc(sizeof *p + domlen + dirlen + 2);
-		if (!p) {
-			UNLOCK(lock);
-			return 0;
-		}
-		p->next = bindings;
-		p->dirlen = dirlen;
-		p->domainname = p->buf;
-		p->dirname = p->buf + domlen + 1;
-		memcpy(p->domainname, domainname, domlen+1);
-		memcpy(p->dirname, dirname, dirlen+1);
-		a_cas_p(&bindings, bindings, p);
-	}
-
-	a_store(&p->active, 1);
-
-	for (q=bindings; q; q=q->next) {
-		if (!strcmp(p->domainname, domainname) && q != p)
-			a_store(&q->active, 0);
-	}
-
-	UNLOCK(lock);
-	
-	return (char *)p->dirname;
-}
-
-static const char catnames[][12] = {
-	"LC_CTYPE",
-	"LC_NUMERIC",
-	"LC_TIME",
-	"LC_COLLATE",
-	"LC_MONETARY",
-	"LC_MESSAGES",
-};
-
-static const char catlens[] = { 8, 10, 7, 10, 11, 11 };
-
-struct msgcat {
-	struct msgcat *next;
-	const void *map;
-	size_t map_size;
-	void *volatile plural_rule;
-	volatile int nplurals;
-	char name[];
-};
-
-static char *dummy_gettextdomain()
-{
-	return "messages";
-}
-
-weak_alias(dummy_gettextdomain, __gettextdomain);
-
-const unsigned char *__map_file(const char *, size_t *);
-int __munmap(void *, size_t);
-unsigned long __pleval(const char *, unsigned long);
-
-char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n, int category)
-{
-	static struct msgcat *volatile cats;
-	struct msgcat *p;
-	struct __locale_struct *loc = CURRENT_LOCALE;
-	const struct __locale_map *lm;
-	const char *dirname, *locname, *catname;
-	size_t dirlen, loclen, catlen, domlen;
-
-	if ((unsigned)category >= LC_ALL) goto notrans;
-
-	if (!domainname) domainname = __gettextdomain();
-
-	domlen = strlen(domainname);
-	if (domlen > NAME_MAX) goto notrans;
-
-	dirname = gettextdir(domainname, &dirlen);
-	if (!dirname) goto notrans;
-
-	lm = loc->cat[category];
-	if (!lm) {
-notrans:
-		return (char *) ((n == 1) ? msgid1 : msgid2);
-	}
-	locname = lm->name;
-
-	catname = catnames[category];
-	catlen = catlens[category];
-	loclen = strlen(locname);
-
-	size_t namelen = dirlen+1 + loclen+1 + catlen+1 + domlen+3;
-	char name[namelen+1], *s = name;
-
-	memcpy(s, dirname, dirlen);
-	s[dirlen] = '/';
-	s += dirlen + 1;
-	memcpy(s, locname, loclen);
-	s[loclen] = '/';
-	s += loclen + 1;
-	memcpy(s, catname, catlen);
-	s[catlen] = '/';
-	s += catlen + 1;
-	memcpy(s, domainname, domlen);
-	s[domlen] = '.';
-	s[domlen+1] = 'm';
-	s[domlen+2] = 'o';
-	s[domlen+3] = 0;
-
-	for (p=cats; p; p=p->next)
-		if (!strcmp(p->name, name))
-			break;
-
-	if (!p) {
-		void *old_cats;
-		size_t map_size;
-		const void *map = __map_file(name, &map_size);
-		if (!map) goto notrans;
-		p = malloc(sizeof *p + namelen + 1);
-		if (!p) {
-			__munmap((void *)map, map_size);
-			goto notrans;
-		}
-		p->map = map;
-		p->map_size = map_size;
-		memcpy(p->name, name, namelen+1);
-		do {
-			old_cats = cats;
-			p->next = old_cats;
-		} while (a_cas_p(&cats, old_cats, p) != old_cats);
-	}
-
-	const char *trans = __mo_lookup(p->map, p->map_size, msgid1);
-	if (!trans) goto notrans;
-
-	/* Non-plural-processing gettext forms pass a null pointer as
-	 * msgid2 to request that dcngettext suppress plural processing. */
-	if (!msgid2) return (char *)trans;
-
-	if (!p->plural_rule) {
-		const char *rule = "n!=1;";
-		unsigned long np = 2;
-		const char *r = __mo_lookup(p->map, p->map_size, "");
-		char *z;
-		while (r && strncmp(r, "Plural-Forms:", 13)) {
-			z = strchr(r, '\n');
-			r = z ? z+1 : 0;
-		}
-		if (r) {
-			r += 13;
-			while (isspace(*r)) r++;
-			if (!strncmp(r, "nplurals=", 9)) {
-				np = strtoul(r+9, &z, 10);
-				r = z;
-			}
-			while (*r && *r != ';') r++;
-			if (*r) {
-				r++;
-				while (isspace(*r)) r++;
-				if (!strncmp(r, "plural=", 7))
-					rule = r+7;
-			}
-		}
-		a_store(&p->nplurals, np);
-		a_cas_p(&p->plural_rule, 0, (void *)rule);
-	}
-	if (p->nplurals) {
-		unsigned long plural = __pleval(p->plural_rule, n);
-		if (plural > p->nplurals) goto notrans;
-		while (plural--) {
-			size_t rem = p->map_size - (trans - (char *)p->map);
-			size_t l = strnlen(trans, rem);
-			if (l+1 >= rem)
-				goto notrans;
-			trans += l+1;
-		}
-	}
-	return (char *)trans;
-}
-
-char *dcgettext(const char *domainname, const char *msgid, int category)
-{
-	return dcngettext(domainname, msgid, 0, 1, category);
-}
-
-char *dngettext(const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n)
-{
-	return dcngettext(domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-char *dgettext(const char *domainname, const char *msgid)
-{
-	return dcngettext(domainname, msgid, 0, 1, LC_MESSAGES);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/freelocale.c b/src/components/lib/libc/musl-1.1.11/src/locale/freelocale.c
deleted file mode 100644
index c2ae1a3180..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/freelocale.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdlib.h>
-#include "locale_impl.h"
-#include "libc.h"
-
-int __loc_is_allocated(locale_t);
-
-void freelocale(locale_t l)
-{
-	if (__loc_is_allocated(l)) free(l);
-}
-
-weak_alias(freelocale, __freelocale);
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/gb18030.h b/src/components/lib/libc/musl-1.1.11/src/locale/gb18030.h
deleted file mode 100644
index 5aceb32900..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/gb18030.h
+++ /dev/null
@@ -1,1836 +0,0 @@
-19970,19972,19973,19974,19983,19986,19991,19999,20000,20001,20003,20006,20009,
-20014,20015,20017,20019,20021,20023,20028,20032,20033,20034,20036,20038,20042,
-20049,20053,20055,20058,20059,20066,20067,20068,20069,20071,20072,20074,20075,
-20076,20077,20078,20079,20082,20084,20085,20086,20087,20088,20089,20090,20091,
-20092,20093,20095,20096,20097,20098,20099,20100,20101,20103,20106,20112,20118,
-20119,20121,20124,20125,20126,20131,20138,20143,20144,20145,20148,20150,20151,
-20152,20153,20156,20157,20158,20168,20172,20175,20176,20178,20186,20187,20188,
-20192,20194,20198,20199,20201,20205,20206,20207,20209,20212,20216,20217,20218,
-20220,20222,20224,20226,20227,20228,20229,20230,20231,20232,20235,20236,20242,
-20243,20244,20245,20246,20252,20253,20257,20259,20264,20265,20268,20269,20270,
-20273,20275,20277,20279,20281,20283,20286,20287,20288,20289,20290,20292,20293,
-20295,20296,20297,20298,20299,20300,20306,20308,20310,20321,20322,20326,20328,
-20330,20331,20333,20334,20337,20338,20341,20343,20344,20345,20346,20349,20352,
-20353,20354,20357,20358,20359,20362,20364,20366,20368,20370,20371,20373,20374,
-20376,20377,20378,20380,20382,20383,20385,20386,20388,20395,20397,20400,20401,
-20402,20403,20404,20406,20407,20408,20409,20410,20411,20412,20413,20414,20416,
-20417,20418,20422,20423,20424,20425,20427,20428,20429,20434,20435,20436,20437,
-20438,20441,20443,20448,20450,20452,20453,20455,20459,20460,20464,20466,20468,
-20469,20470,20471,20473,20475,20476,20477,20479,20480,20481,20482,20483,20484,
-20485,20486,20487,20488,20489,20490,20491,20494,20496,20497,20499,20501,20502,
-20503,20507,20509,20510,20512,20514,20515,20516,20519,20523,20527,20528,20529,
-20530,20531,20532,20533,20534,20535,20536,20537,20539,20541,20543,20544,20545,
-20546,20548,20549,20550,20553,20554,20555,20557,20560,20561,20562,20563,20564,
-20566,20567,20568,20569,20571,20573,20574,20575,20576,20577,20578,20579,20580,
-20582,20583,20584,20585,20586,20587,20589,20590,20591,20592,20593,20594,20595,
-20596,20597,20600,20601,20602,20604,20605,20609,20610,20611,20612,20614,20615,
-20617,20618,20619,20620,20622,20623,20624,20625,20626,20627,20628,20629,20630,
-20631,20632,20633,20634,20635,20636,20637,20638,20639,20640,20641,20642,20644,
-20646,20650,20651,20653,20654,20655,20656,20657,20659,20660,20661,20662,20663,
-20664,20665,20668,20669,20670,20671,20672,20673,20674,20675,20676,20677,20678,
-20679,20680,20681,20682,20683,20684,20685,20686,20688,20689,20690,20691,20692,
-20693,20695,20696,20697,20699,20700,20701,20702,20703,20704,20705,20706,20707,
-20708,20709,20712,20713,20714,20715,20719,20720,20721,20722,20724,20726,20727,
-20728,20729,20730,20732,20733,20734,20735,20736,20737,20738,20739,20740,20741,
-20744,20745,20746,20748,20749,20750,20751,20752,20753,20755,20756,20757,20758,
-20759,20760,20761,20762,20763,20764,20765,20766,20767,20768,20770,20771,20772,
-20773,20774,20775,20776,20777,20778,20779,20780,20781,20782,20783,20784,20785,
-20786,20787,20788,20789,20790,20791,20792,20793,20794,20795,20796,20797,20798,
-20802,20807,20810,20812,20814,20815,20816,20818,20819,20823,20824,20825,20827,
-20829,20830,20831,20832,20833,20835,20836,20838,20839,20841,20842,20847,20850,
-20858,20862,20863,20867,20868,20870,20871,20874,20875,20878,20879,20880,20881,
-20883,20884,20888,20890,20893,20894,20895,20897,20899,20902,20903,20904,20905,
-20906,20909,20910,20916,20920,20921,20922,20926,20927,20929,20930,20931,20933,
-20936,20938,20941,20942,20944,20946,20947,20948,20949,20950,20951,20952,20953,
-20954,20956,20958,20959,20962,20963,20965,20966,20967,20968,20969,20970,20972,
-20974,20977,20978,20980,20983,20990,20996,20997,21001,21003,21004,21007,21008,
-21011,21012,21013,21020,21022,21023,21025,21026,21027,21029,21030,21031,21034,
-21036,21039,21041,21042,21044,21045,21052,21054,21060,21061,21062,21063,21064,
-21065,21067,21070,21071,21074,21075,21077,21079,21080,21081,21082,21083,21085,
-21087,21088,21090,21091,21092,21094,21096,21099,21100,21101,21102,21104,21105,
-21107,21108,21109,21110,21111,21112,21113,21114,21115,21116,21118,21120,21123,
-21124,21125,21126,21127,21129,21130,21131,21132,21133,21134,21135,21137,21138,
-21140,21141,21142,21143,21144,21145,21146,21148,21156,21157,21158,21159,21166,
-21167,21168,21172,21173,21174,21175,21176,21177,21178,21179,21180,21181,21184,
-21185,21186,21188,21189,21190,21192,21194,21196,21197,21198,21199,21201,21203,
-21204,21205,21207,21209,21210,21211,21212,21213,21214,21216,21217,21218,21219,
-21221,21222,21223,21224,21225,21226,21227,21228,21229,21230,21231,21233,21234,
-21235,21236,21237,21238,21239,21240,21243,21244,21245,21249,21250,21251,21252,
-21255,21257,21258,21259,21260,21262,21265,21266,21267,21268,21272,21275,21276,
-21278,21279,21282,21284,21285,21287,21288,21289,21291,21292,21293,21295,21296,
-21297,21298,21299,21300,21301,21302,21303,21304,21308,21309,21312,21314,21316,
-21318,21323,21324,21325,21328,21332,21336,21337,21339,21341,21349,21352,21354,
-21356,21357,21362,21366,21369,21371,21372,21373,21374,21376,21377,21379,21383,
-21384,21386,21390,21391,21392,21393,21394,21395,21396,21398,21399,21401,21403,
-21404,21406,21408,21409,21412,21415,21418,21419,21420,21421,21423,21424,21425,
-21426,21427,21428,21429,21431,21432,21433,21434,21436,21437,21438,21440,21443,
-21444,21445,21446,21447,21454,21455,21456,21458,21459,21461,21466,21468,21469,
-21470,21473,21474,21479,21492,21498,21502,21503,21504,21506,21509,21511,21515,
-21524,21528,21529,21530,21532,21538,21540,21541,21546,21552,21555,21558,21559,
-21562,21565,21567,21569,21570,21572,21573,21575,21577,21580,21581,21582,21583,
-21585,21594,21597,21598,21599,21600,21601,21603,21605,21607,21609,21610,21611,
-21612,21613,21614,21615,21616,21620,21625,21626,21630,21631,21633,21635,21637,
-21639,21640,21641,21642,21645,21649,21651,21655,21656,21660,21662,21663,21664,
-21665,21666,21669,21678,21680,21682,21685,21686,21687,21689,21690,21692,21694,
-21699,21701,21706,21707,21718,21720,21723,21728,21729,21730,21731,21732,21739,
-21740,21743,21744,21745,21748,21749,21750,21751,21752,21753,21755,21758,21760,
-21762,21763,21764,21765,21768,21770,21771,21772,21773,21774,21778,21779,21781,
-21782,21783,21784,21785,21786,21788,21789,21790,21791,21793,21797,21798,21800,
-21801,21803,21805,21810,21812,21813,21814,21816,21817,21818,21819,21821,21824,
-21826,21829,21831,21832,21835,21836,21837,21838,21839,21841,21842,21843,21844,
-21847,21848,21849,21850,21851,21853,21854,21855,21856,21858,21859,21864,21865,
-21867,21871,21872,21873,21874,21875,21876,21881,21882,21885,21887,21893,21894,
-21900,21901,21902,21904,21906,21907,21909,21910,21911,21914,21915,21918,21920,
-21921,21922,21923,21924,21925,21926,21928,21929,21930,21931,21932,21933,21934,
-21935,21936,21938,21940,21942,21944,21946,21948,21951,21952,21953,21954,21955,
-21958,21959,21960,21962,21963,21966,21967,21968,21973,21975,21976,21977,21978,
-21979,21982,21984,21986,21991,21993,21997,21998,22000,22001,22004,22006,22008,
-22009,22010,22011,22012,22015,22018,22019,22020,22021,22022,22023,22026,22027,
-22029,22032,22033,22034,22035,22036,22037,22038,22039,22041,22042,22044,22045,
-22048,22049,22050,22053,22054,22056,22057,22058,22059,22062,22063,22064,22067,
-22069,22071,22072,22074,22076,22077,22078,22080,22081,22082,22083,22084,22085,
-22086,22087,22088,22089,22090,22091,22095,22096,22097,22098,22099,22101,22102,
-22106,22107,22109,22110,22111,22112,22113,22115,22117,22118,22119,22125,22126,
-22127,22128,22130,22131,22132,22133,22135,22136,22137,22138,22141,22142,22143,
-22144,22145,22146,22147,22148,22151,22152,22153,22154,22155,22156,22157,22160,
-22161,22162,22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174,
-22175,22176,22177,22178,22180,22181,22182,22183,22184,22185,22186,22187,22188,
-22189,22190,22192,22193,22194,22195,22196,22197,22198,22200,22201,22202,22203,
-22205,22206,22207,22208,22209,22210,22211,22212,22213,22214,22215,22216,22217,
-22219,22220,22221,22222,22223,22224,22225,22226,22227,22229,22230,22232,22233,
-22236,22243,22245,22246,22247,22248,22249,22250,22252,22254,22255,22258,22259,
-22262,22263,22264,22267,22268,22272,22273,22274,22277,22279,22283,22284,22285,
-22286,22287,22288,22289,22290,22291,22292,22293,22294,22295,22296,22297,22298,
-22299,22301,22302,22304,22305,22306,22308,22309,22310,22311,22315,22321,22322,
-22324,22325,22326,22327,22328,22332,22333,22335,22337,22339,22340,22341,22342,
-22344,22345,22347,22354,22355,22356,22357,22358,22360,22361,22370,22371,22373,
-22375,22380,22382,22384,22385,22386,22388,22389,22392,22393,22394,22397,22398,
-22399,22400,22401,22407,22408,22409,22410,22413,22414,22415,22416,22417,22420,
-22421,22422,22423,22424,22425,22426,22428,22429,22430,22431,22437,22440,22442,
-22444,22447,22448,22449,22451,22453,22454,22455,22457,22458,22459,22460,22461,
-22462,22463,22464,22465,22468,22469,22470,22471,22472,22473,22474,22476,22477,
-22480,22481,22483,22486,22487,22491,22492,22494,22497,22498,22499,22501,22502,
-22503,22504,22505,22506,22507,22508,22510,22512,22513,22514,22515,22517,22518,
-22519,22523,22524,22526,22527,22529,22531,22532,22533,22536,22537,22538,22540,
-22542,22543,22544,22546,22547,22548,22550,22551,22552,22554,22555,22556,22557,
-22559,22562,22563,22565,22566,22567,22568,22569,22571,22572,22573,22574,22575,
-22577,22578,22579,22580,22582,22583,22584,22585,22586,22587,22588,22589,22590,
-22591,22592,22593,22594,22595,22597,22598,22599,22600,22601,22602,22603,22606,
-22607,22608,22610,22611,22613,22614,22615,22617,22618,22619,22620,22621,22623,
-22624,22625,22626,22627,22628,22630,22631,22632,22633,22634,22637,22638,22639,
-22640,22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,22652,
-22653,22655,22658,22660,22662,22663,22664,22666,22667,22668,22669,22670,22671,
-22672,22673,22676,22677,22678,22679,22680,22683,22684,22685,22688,22689,22690,
-22691,22692,22693,22694,22695,22698,22699,22700,22701,22702,22703,22704,22705,
-22706,22707,22708,22709,22710,22711,22712,22713,22714,22715,22717,22718,22719,
-22720,22722,22723,22724,22726,22727,22728,22729,22730,22731,22732,22733,22734,
-22735,22736,22738,22739,22740,22742,22743,22744,22745,22746,22747,22748,22749,
-22750,22751,22752,22753,22754,22755,22757,22758,22759,22760,22761,22762,22765,
-22767,22769,22770,22772,22773,22775,22776,22778,22779,22780,22781,22782,22783,
-22784,22785,22787,22789,22790,22792,22793,22794,22795,22796,22798,22800,22801,
-22802,22803,22807,22808,22811,22813,22814,22816,22817,22818,22819,22822,22824,
-22828,22832,22834,22835,22837,22838,22843,22845,22846,22847,22848,22851,22853,
-22854,22858,22860,22861,22864,22866,22867,22873,22875,22876,22877,22878,22879,
-22881,22883,22884,22886,22887,22888,22889,22890,22891,22892,22893,22894,22895,
-22896,22897,22898,22901,22903,22906,22907,22908,22910,22911,22912,22917,22921,
-22923,22924,22926,22927,22928,22929,22932,22933,22936,22938,22939,22940,22941,
-22943,22944,22945,22946,22950,22951,22956,22957,22960,22961,22963,22964,22965,
-22966,22967,22968,22970,22972,22973,22975,22976,22977,22978,22979,22980,22981,
-22983,22984,22985,22988,22989,22990,22991,22997,22998,23001,23003,23006,23007,
-23008,23009,23010,23012,23014,23015,23017,23018,23019,23021,23022,23023,23024,
-23025,23026,23027,23028,23029,23030,23031,23032,23034,23036,23037,23038,23040,
-23042,23050,23051,23053,23054,23055,23056,23058,23060,23061,23062,23063,23065,
-23066,23067,23069,23070,23073,23074,23076,23078,23079,23080,23082,23083,23084,
-23085,23086,23087,23088,23091,23093,23095,23096,23097,23098,23099,23101,23102,
-23103,23105,23106,23107,23108,23109,23111,23112,23115,23116,23117,23118,23119,
-23120,23121,23122,23123,23124,23126,23127,23128,23129,23131,23132,23133,23134,
-23135,23136,23137,23139,23140,23141,23142,23144,23145,23147,23148,23149,23150,
-23151,23152,23153,23154,23155,23160,23161,23163,23164,23165,23166,23168,23169,
-23170,23171,23172,23173,23174,23175,23176,23177,23178,23179,23180,23181,23182,
-23183,23184,23185,23187,23188,23189,23190,23191,23192,23193,23196,23197,23198,
-23199,23200,23201,23202,23203,23204,23205,23206,23207,23208,23209,23211,23212,
-23213,23214,23215,23216,23217,23220,23222,23223,23225,23226,23227,23228,23229,
-23231,23232,23235,23236,23237,23238,23239,23240,23242,23243,23245,23246,23247,
-23248,23249,23251,23253,23255,23257,23258,23259,23261,23262,23263,23266,23268,
-23269,23271,23272,23274,23276,23277,23278,23279,23280,23282,23283,23284,23285,
-23286,23287,23288,23289,23290,23291,23292,23293,23294,23295,23296,23297,23298,
-23299,23300,23301,23302,23303,23304,23306,23307,23308,23309,23310,23311,23312,
-23313,23314,23315,23316,23317,23320,23321,23322,23323,23324,23325,23326,23327,
-23328,23329,23330,23331,23332,23333,23334,23335,23336,23337,23338,23339,23340,
-23341,23342,23343,23344,23345,23347,23349,23350,23352,23353,23354,23355,23356,
-23357,23358,23359,23361,23362,23363,23364,23365,23366,23367,23368,23369,23370,
-23371,23372,23373,23374,23375,23378,23382,23390,23392,23393,23399,23400,23403,
-23405,23406,23407,23410,23412,23414,23415,23416,23417,23419,23420,23422,23423,
-23426,23430,23434,23437,23438,23440,23441,23442,23444,23446,23455,23463,23464,
-23465,23468,23469,23470,23471,23473,23474,23479,23482,23483,23484,23488,23489,
-23491,23496,23497,23498,23499,23501,23502,23503,23505,23508,23509,23510,23511,
-23512,23513,23514,23515,23516,23520,23522,23523,23526,23527,23529,23530,23531,
-23532,23533,23535,23537,23538,23539,23540,23541,23542,23543,23549,23550,23552,
-23554,23555,23557,23559,23560,23563,23564,23565,23566,23568,23570,23571,23575,
-23577,23579,23582,23583,23584,23585,23587,23590,23592,23593,23594,23595,23597,
-23598,23599,23600,23602,23603,23605,23606,23607,23619,23620,23622,23623,23628,
-23629,23634,23635,23636,23638,23639,23640,23642,23643,23644,23645,23647,23650,
-23652,23655,23656,23657,23658,23659,23660,23661,23664,23666,23667,23668,23669,
-23670,23671,23672,23675,23676,23677,23678,23680,23683,23684,23685,23686,23687,
-23689,23690,23691,23694,23695,23698,23699,23701,23709,23710,23711,23712,23713,
-23716,23717,23718,23719,23720,23722,23726,23727,23728,23730,23732,23734,23737,
-23738,23739,23740,23742,23744,23746,23747,23749,23750,23751,23752,23753,23754,
-23756,23757,23758,23759,23760,23761,23763,23764,23765,23766,23767,23768,23770,
-23771,23772,23773,23774,23775,23776,23778,23779,23783,23785,23787,23788,23790,
-23791,23793,23794,23795,23796,23797,23798,23799,23800,23801,23802,23804,23805,
-23806,23807,23808,23809,23812,23813,23816,23817,23818,23819,23820,23821,23823,
-23824,23825,23826,23827,23829,23831,23832,23833,23834,23836,23837,23839,23840,
-23841,23842,23843,23845,23848,23850,23851,23852,23855,23856,23857,23858,23859,
-23861,23862,23863,23864,23865,23866,23867,23868,23871,23872,23873,23874,23875,
-23876,23877,23878,23880,23881,23885,23886,23887,23888,23889,23890,23891,23892,
-23893,23894,23895,23897,23898,23900,23902,23903,23904,23905,23906,23907,23908,
-23909,23910,23911,23912,23914,23917,23918,23920,23921,23922,23923,23925,23926,
-23927,23928,23929,23930,23931,23932,23933,23934,23935,23936,23937,23939,23940,
-23941,23942,23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953,
-23954,23955,23956,23957,23958,23959,23960,23962,23963,23964,23966,23967,23968,
-23969,23970,23971,23972,23973,23974,23975,23976,23977,23978,23979,23980,23981,
-23982,23983,23984,23985,23986,23987,23988,23989,23990,23992,23993,23994,23995,
-23996,23997,23998,23999,24000,24001,24002,24003,24004,24006,24007,24008,24009,
-24010,24011,24012,24014,24015,24016,24017,24018,24019,24020,24021,24022,24023,
-24024,24025,24026,24028,24031,24032,24035,24036,24042,24044,24045,24048,24053,
-24054,24056,24057,24058,24059,24060,24063,24064,24068,24071,24073,24074,24075,
-24077,24078,24082,24083,24087,24094,24095,24096,24097,24098,24099,24100,24101,
-24104,24105,24106,24107,24108,24111,24112,24114,24115,24116,24117,24118,24121,
-24122,24126,24127,24128,24129,24131,24134,24135,24136,24137,24138,24139,24141,
-24142,24143,24144,24145,24146,24147,24150,24151,24152,24153,24154,24156,24157,
-24159,24160,24163,24164,24165,24166,24167,24168,24169,24170,24171,24172,24173,
-24174,24175,24176,24177,24181,24183,24185,24190,24193,24194,24195,24197,24200,
-24201,24204,24205,24206,24210,24216,24219,24221,24225,24226,24227,24228,24232,
-24233,24234,24235,24236,24238,24239,24240,24241,24242,24244,24250,24251,24252,
-24253,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264,24267,24268,
-24269,24270,24271,24272,24276,24277,24279,24280,24281,24282,24284,24285,24286,
-24287,24288,24289,24290,24291,24292,24293,24294,24295,24297,24299,24300,24301,
-24302,24303,24304,24305,24306,24307,24309,24312,24313,24315,24316,24317,24325,
-24326,24327,24329,24332,24333,24334,24336,24338,24340,24342,24345,24346,24348,
-24349,24350,24353,24354,24355,24356,24360,24363,24364,24366,24368,24370,24371,
-24372,24373,24374,24375,24376,24379,24381,24382,24383,24385,24386,24387,24388,
-24389,24390,24391,24392,24393,24394,24395,24396,24397,24398,24399,24401,24404,
-24409,24410,24411,24412,24414,24415,24416,24419,24421,24423,24424,24427,24430,
-24431,24434,24436,24437,24438,24440,24442,24445,24446,24447,24451,24454,24461,
-24462,24463,24465,24467,24468,24470,24474,24475,24477,24478,24479,24480,24482,
-24483,24484,24485,24486,24487,24489,24491,24492,24495,24496,24497,24498,24499,
-24500,24502,24504,24505,24506,24507,24510,24511,24512,24513,24514,24519,24520,
-24522,24523,24526,24531,24532,24533,24538,24539,24540,24542,24543,24546,24547,
-24549,24550,24552,24553,24556,24559,24560,24562,24563,24564,24566,24567,24569,
-24570,24572,24583,24584,24585,24587,24588,24592,24593,24595,24599,24600,24602,
-24606,24607,24610,24611,24612,24620,24621,24622,24624,24625,24626,24627,24628,
-24630,24631,24632,24633,24634,24637,24638,24640,24644,24645,24646,24647,24648,
-24649,24650,24652,24654,24655,24657,24659,24660,24662,24663,24664,24667,24668,
-24670,24671,24672,24673,24677,24678,24686,24689,24690,24692,24693,24695,24702,
-24704,24705,24706,24709,24710,24711,24712,24714,24715,24718,24719,24720,24721,
-24723,24725,24727,24728,24729,24732,24734,24737,24738,24740,24741,24743,24745,
-24746,24750,24752,24755,24757,24758,24759,24761,24762,24765,24766,24767,24768,
-24769,24770,24771,24772,24775,24776,24777,24780,24781,24782,24783,24784,24786,
-24787,24788,24790,24791,24793,24795,24798,24801,24802,24803,24804,24805,24810,
-24817,24818,24821,24823,24824,24827,24828,24829,24830,24831,24834,24835,24836,
-24837,24839,24842,24843,24844,24848,24849,24850,24851,24852,24854,24855,24856,
-24857,24859,24860,24861,24862,24865,24866,24869,24872,24873,24874,24876,24877,
-24878,24879,24880,24881,24882,24883,24884,24885,24886,24887,24888,24889,24890,
-24891,24892,24893,24894,24896,24897,24898,24899,24900,24901,24902,24903,24905,
-24907,24909,24911,24912,24914,24915,24916,24918,24919,24920,24921,24922,24923,
-24924,24926,24927,24928,24929,24931,24932,24933,24934,24937,24938,24939,24940,
-24941,24942,24943,24945,24946,24947,24948,24950,24952,24953,24954,24955,24956,
-24957,24958,24959,24960,24961,24962,24963,24964,24965,24966,24967,24968,24969,
-24970,24972,24973,24975,24976,24977,24978,24979,24981,24982,24983,24984,24985,
-24986,24987,24988,24990,24991,24992,24993,24994,24995,24996,24997,24998,25002,
-25003,25005,25006,25007,25008,25009,25010,25011,25012,25013,25014,25016,25017,
-25018,25019,25020,25021,25023,25024,25025,25027,25028,25029,25030,25031,25033,
-25036,25037,25038,25039,25040,25043,25045,25046,25047,25048,25049,25050,25051,
-25052,25053,25054,25055,25056,25057,25058,25059,25060,25061,25063,25064,25065,
-25066,25067,25068,25069,25070,25071,25072,25073,25074,25075,25076,25078,25079,
-25080,25081,25082,25083,25084,25085,25086,25088,25089,25090,25091,25092,25093,
-25095,25097,25107,25108,25113,25116,25117,25118,25120,25123,25126,25127,25128,
-25129,25131,25133,25135,25136,25137,25138,25141,25142,25144,25145,25146,25147,
-25148,25154,25156,25157,25158,25162,25167,25168,25173,25174,25175,25177,25178,
-25180,25181,25182,25183,25184,25185,25186,25188,25189,25192,25201,25202,25204,
-25205,25207,25208,25210,25211,25213,25217,25218,25219,25221,25222,25223,25224,
-25227,25228,25229,25230,25231,25232,25236,25241,25244,25245,25246,25251,25254,
-25255,25257,25258,25261,25262,25263,25264,25266,25267,25268,25270,25271,25272,
-25274,25278,25280,25281,25283,25291,25295,25297,25301,25309,25310,25312,25313,
-25316,25322,25323,25328,25330,25333,25336,25337,25338,25339,25344,25347,25348,
-25349,25350,25354,25355,25356,25357,25359,25360,25362,25363,25364,25365,25367,
-25368,25369,25372,25382,25383,25385,25388,25389,25390,25392,25393,25395,25396,
-25397,25398,25399,25400,25403,25404,25406,25407,25408,25409,25412,25415,25416,
-25418,25425,25426,25427,25428,25430,25431,25432,25433,25434,25435,25436,25437,
-25440,25444,25445,25446,25448,25450,25451,25452,25455,25456,25458,25459,25460,
-25461,25464,25465,25468,25469,25470,25471,25473,25475,25476,25477,25478,25483,
-25485,25489,25491,25492,25493,25495,25497,25498,25499,25500,25501,25502,25503,
-25505,25508,25510,25515,25519,25521,25522,25525,25526,25529,25531,25533,25535,
-25536,25537,25538,25539,25541,25543,25544,25546,25547,25548,25553,25555,25556,
-25557,25559,25560,25561,25562,25563,25564,25565,25567,25570,25572,25573,25574,
-25575,25576,25579,25580,25582,25583,25584,25585,25587,25589,25591,25593,25594,
-25595,25596,25598,25603,25604,25606,25607,25608,25609,25610,25613,25614,25617,
-25618,25621,25622,25623,25624,25625,25626,25629,25631,25634,25635,25636,25637,
-25639,25640,25641,25643,25646,25647,25648,25649,25650,25651,25653,25654,25655,
-25656,25657,25659,25660,25662,25664,25666,25667,25673,25675,25676,25677,25678,
-25679,25680,25681,25683,25685,25686,25687,25689,25690,25691,25692,25693,25695,
-25696,25697,25698,25699,25700,25701,25702,25704,25706,25707,25708,25710,25711,
-25712,25713,25714,25715,25716,25717,25718,25719,25723,25724,25725,25726,25727,
-25728,25729,25731,25734,25736,25737,25738,25739,25740,25741,25742,25743,25744,
-25747,25748,25751,25752,25754,25755,25756,25757,25759,25760,25761,25762,25763,
-25765,25766,25767,25768,25770,25771,25775,25777,25778,25779,25780,25782,25785,
-25787,25789,25790,25791,25793,25795,25796,25798,25799,25800,25801,25802,25803,
-25804,25807,25809,25811,25812,25813,25814,25817,25818,25819,25820,25821,25823,
-25824,25825,25827,25829,25831,25832,25833,25834,25835,25836,25837,25838,25839,
-25840,25841,25842,25843,25844,25845,25846,25847,25848,25849,25850,25851,25852,
-25853,25854,25855,25857,25858,25859,25860,25861,25862,25863,25864,25866,25867,
-25868,25869,25870,25871,25872,25873,25875,25876,25877,25878,25879,25881,25882,
-25883,25884,25885,25886,25887,25888,25889,25890,25891,25892,25894,25895,25896,
-25897,25898,25900,25901,25904,25905,25906,25907,25911,25914,25916,25917,25920,
-25921,25922,25923,25924,25926,25927,25930,25931,25933,25934,25936,25938,25939,
-25940,25943,25944,25946,25948,25951,25952,25953,25956,25957,25959,25960,25961,
-25962,25965,25966,25967,25969,25971,25973,25974,25976,25977,25978,25979,25980,
-25981,25982,25983,25984,25985,25986,25987,25988,25989,25990,25992,25993,25994,
-25997,25998,25999,26002,26004,26005,26006,26008,26010,26013,26014,26016,26018,
-26019,26022,26024,26026,26028,26030,26033,26034,26035,26036,26037,26038,26039,
-26040,26042,26043,26046,26047,26048,26050,26055,26056,26057,26058,26061,26064,
-26065,26067,26068,26069,26072,26073,26074,26075,26076,26077,26078,26079,26081,
-26083,26084,26090,26091,26098,26099,26100,26101,26104,26105,26107,26108,26109,
-26110,26111,26113,26116,26117,26119,26120,26121,26123,26125,26128,26129,26130,
-26134,26135,26136,26138,26139,26140,26142,26145,26146,26147,26148,26150,26153,
-26154,26155,26156,26158,26160,26162,26163,26167,26168,26169,26170,26171,26173,
-26175,26176,26178,26180,26181,26182,26183,26184,26185,26186,26189,26190,26192,
-26193,26200,26201,26203,26204,26205,26206,26208,26210,26211,26213,26215,26217,
-26218,26219,26220,26221,26225,26226,26227,26229,26232,26233,26235,26236,26237,
-26239,26240,26241,26243,26245,26246,26248,26249,26250,26251,26253,26254,26255,
-26256,26258,26259,26260,26261,26264,26265,26266,26267,26268,26270,26271,26272,
-26273,26274,26275,26276,26277,26278,26281,26282,26283,26284,26285,26287,26288,
-26289,26290,26291,26293,26294,26295,26296,26298,26299,26300,26301,26303,26304,
-26305,26306,26307,26308,26309,26310,26311,26312,26313,26314,26315,26316,26317,
-26318,26319,26320,26321,26322,26323,26324,26325,26326,26327,26328,26330,26334,
-26335,26336,26337,26338,26339,26340,26341,26343,26344,26346,26347,26348,26349,
-26350,26351,26353,26357,26358,26360,26362,26363,26365,26369,26370,26371,26372,
-26373,26374,26375,26380,26382,26383,26385,26386,26387,26390,26392,26393,26394,
-26396,26398,26400,26401,26402,26403,26404,26405,26407,26409,26414,26416,26418,
-26419,26422,26423,26424,26425,26427,26428,26430,26431,26433,26436,26437,26439,
-26442,26443,26445,26450,26452,26453,26455,26456,26457,26458,26459,26461,26466,
-26467,26468,26470,26471,26475,26476,26478,26481,26484,26486,26488,26489,26490,
-26491,26493,26496,26498,26499,26501,26502,26504,26506,26508,26509,26510,26511,
-26513,26514,26515,26516,26518,26521,26523,26527,26528,26529,26532,26534,26537,
-26540,26542,26545,26546,26548,26553,26554,26555,26556,26557,26558,26559,26560,
-26562,26565,26566,26567,26568,26569,26570,26571,26572,26573,26574,26581,26582,
-26583,26587,26591,26593,26595,26596,26598,26599,26600,26602,26603,26605,26606,
-26610,26613,26614,26615,26616,26617,26618,26619,26620,26622,26625,26626,26627,
-26628,26630,26637,26640,26642,26644,26645,26648,26649,26650,26651,26652,26654,
-26655,26656,26658,26659,26660,26661,26662,26663,26664,26667,26668,26669,26670,
-26671,26672,26673,26676,26677,26678,26682,26683,26687,26695,26699,26701,26703,
-26706,26710,26711,26712,26713,26714,26715,26716,26717,26718,26719,26730,26732,
-26733,26734,26735,26736,26737,26738,26739,26741,26744,26745,26746,26747,26748,
-26749,26750,26751,26752,26754,26756,26759,26760,26761,26762,26763,26764,26765,
-26766,26768,26769,26770,26772,26773,26774,26776,26777,26778,26779,26780,26781,
-26782,26783,26784,26785,26787,26788,26789,26793,26794,26795,26796,26798,26801,
-26802,26804,26806,26807,26808,26809,26810,26811,26812,26813,26814,26815,26817,
-26819,26820,26821,26822,26823,26824,26826,26828,26830,26831,26832,26833,26835,
-26836,26838,26839,26841,26843,26844,26845,26846,26847,26849,26850,26852,26853,
-26854,26855,26856,26857,26858,26859,26860,26861,26863,26866,26867,26868,26870,
-26871,26872,26875,26877,26878,26879,26880,26882,26883,26884,26886,26887,26888,
-26889,26890,26892,26895,26897,26899,26900,26901,26902,26903,26904,26905,26906,
-26907,26908,26909,26910,26913,26914,26915,26917,26918,26919,26920,26921,26922,
-26923,26924,26926,26927,26929,26930,26931,26933,26934,26935,26936,26938,26939,
-26940,26942,26944,26945,26947,26948,26949,26950,26951,26952,26953,26954,26955,
-26956,26957,26958,26959,26960,26961,26962,26963,26965,26966,26968,26969,26971,
-26972,26975,26977,26978,26980,26981,26983,26984,26985,26986,26988,26989,26991,
-26992,26994,26995,26996,26997,26998,27002,27003,27005,27006,27007,27009,27011,
-27013,27018,27019,27020,27022,27023,27024,27025,27026,27027,27030,27031,27033,
-27034,27037,27038,27039,27040,27041,27042,27043,27044,27045,27046,27049,27050,
-27052,27054,27055,27056,27058,27059,27061,27062,27064,27065,27066,27068,27069,
-27070,27071,27072,27074,27075,27076,27077,27078,27079,27080,27081,27083,27085,
-27087,27089,27090,27091,27093,27094,27095,27096,27097,27098,27100,27101,27102,
-27105,27106,27107,27108,27109,27110,27111,27112,27113,27114,27115,27116,27118,
-27119,27120,27121,27123,27124,27125,27126,27127,27128,27129,27130,27131,27132,
-27134,27136,27137,27138,27139,27140,27141,27142,27143,27144,27145,27147,27148,
-27149,27150,27151,27152,27153,27154,27155,27156,27157,27158,27161,27162,27163,
-27164,27165,27166,27168,27170,27171,27172,27173,27174,27175,27177,27179,27180,
-27181,27182,27184,27186,27187,27188,27190,27191,27192,27193,27194,27195,27196,
-27199,27200,27201,27202,27203,27205,27206,27208,27209,27210,27211,27212,27213,
-27214,27215,27217,27218,27219,27220,27221,27222,27223,27226,27228,27229,27230,
-27231,27232,27234,27235,27236,27238,27239,27240,27241,27242,27243,27244,27245,
-27246,27247,27248,27250,27251,27252,27253,27254,27255,27256,27258,27259,27261,
-27262,27263,27265,27266,27267,27269,27270,27271,27272,27273,27274,27275,27276,
-27277,27279,27282,27283,27284,27285,27286,27288,27289,27290,27291,27292,27293,
-27294,27295,27297,27298,27299,27300,27301,27302,27303,27304,27306,27309,27310,
-27311,27312,27313,27314,27315,27316,27317,27318,27319,27320,27321,27322,27323,
-27324,27325,27326,27327,27328,27329,27330,27331,27332,27333,27334,27335,27336,
-27337,27338,27339,27340,27341,27342,27343,27344,27345,27346,27347,27348,27349,
-27350,27351,27352,27353,27354,27355,27356,27357,27358,27359,27360,27361,27362,
-27363,27364,27365,27366,27367,27368,27369,27370,27371,27372,27373,27374,27375,
-27376,27377,27378,27379,27380,27381,27382,27383,27384,27385,27386,27387,27388,
-27389,27390,27391,27392,27393,27394,27395,27396,27397,27398,27399,27400,27401,
-27402,27403,27404,27405,27406,27407,27408,27409,27410,27411,27412,27413,27414,
-27415,27416,27417,27418,27419,27420,27421,27422,27423,27429,27430,27432,27433,
-27434,27435,27436,27437,27438,27439,27440,27441,27443,27444,27445,27446,27448,
-27451,27452,27453,27455,27456,27457,27458,27460,27461,27464,27466,27467,27469,
-27470,27471,27472,27473,27474,27475,27476,27477,27478,27479,27480,27482,27483,
-27484,27485,27486,27487,27488,27489,27496,27497,27499,27500,27501,27502,27503,
-27504,27505,27506,27507,27508,27509,27510,27511,27512,27514,27517,27518,27519,
-27520,27525,27528,27532,27534,27535,27536,27537,27540,27541,27543,27544,27545,
-27548,27549,27550,27551,27552,27554,27555,27556,27557,27558,27559,27560,27561,
-27563,27564,27565,27566,27567,27568,27569,27570,27574,27576,27577,27578,27579,
-27580,27581,27582,27584,27587,27588,27590,27591,27592,27593,27594,27596,27598,
-27600,27601,27608,27610,27612,27613,27614,27615,27616,27618,27619,27620,27621,
-27622,27623,27624,27625,27628,27629,27630,27632,27633,27634,27636,27638,27639,
-27640,27642,27643,27644,27646,27647,27648,27649,27650,27651,27652,27656,27657,
-27658,27659,27660,27662,27666,27671,27676,27677,27678,27680,27683,27685,27691,
-27692,27693,27697,27699,27702,27703,27705,27706,27707,27708,27710,27711,27715,
-27716,27717,27720,27723,27724,27725,27726,27727,27729,27730,27731,27734,27736,
-27737,27738,27746,27747,27749,27750,27751,27755,27756,27757,27758,27759,27761,
-27763,27765,27767,27768,27770,27771,27772,27775,27776,27780,27783,27786,27787,
-27789,27790,27793,27794,27797,27798,27799,27800,27802,27804,27805,27806,27808,
-27810,27816,27820,27823,27824,27828,27829,27830,27831,27834,27840,27841,27842,
-27843,27846,27847,27848,27851,27853,27854,27855,27857,27858,27864,27865,27866,
-27868,27869,27871,27876,27878,27879,27881,27884,27885,27890,27892,27897,27903,
-27904,27906,27907,27909,27910,27912,27913,27914,27917,27919,27920,27921,27923,
-27924,27925,27926,27928,27932,27933,27935,27936,27937,27938,27939,27940,27942,
-27944,27945,27948,27949,27951,27952,27956,27958,27959,27960,27962,27967,27968,
-27970,27972,27977,27980,27984,27989,27990,27991,27992,27995,27997,27999,28001,
-28002,28004,28005,28007,28008,28011,28012,28013,28016,28017,28018,28019,28021,
-28022,28025,28026,28027,28029,28030,28031,28032,28033,28035,28036,28038,28039,
-28042,28043,28045,28047,28048,28050,28054,28055,28056,28057,28058,28060,28066,
-28069,28076,28077,28080,28081,28083,28084,28086,28087,28089,28090,28091,28092,
-28093,28094,28097,28098,28099,28104,28105,28106,28109,28110,28111,28112,28114,
-28115,28116,28117,28119,28122,28123,28124,28127,28130,28131,28133,28135,28136,
-28137,28138,28141,28143,28144,28146,28148,28149,28150,28152,28154,28157,28158,
-28159,28160,28161,28162,28163,28164,28166,28167,28168,28169,28171,28175,28178,
-28179,28181,28184,28185,28187,28188,28190,28191,28194,28198,28199,28200,28202,
-28204,28206,28208,28209,28211,28213,28214,28215,28217,28219,28220,28221,28222,
-28223,28224,28225,28226,28229,28230,28231,28232,28233,28234,28235,28236,28239,
-28240,28241,28242,28245,28247,28249,28250,28252,28253,28254,28256,28257,28258,
-28259,28260,28261,28262,28263,28264,28265,28266,28268,28269,28271,28272,28273,
-28274,28275,28276,28277,28278,28279,28280,28281,28282,28283,28284,28285,28288,
-28289,28290,28292,28295,28296,28298,28299,28300,28301,28302,28305,28306,28307,
-28308,28309,28310,28311,28313,28314,28315,28317,28318,28320,28321,28323,28324,
-28326,28328,28329,28331,28332,28333,28334,28336,28339,28341,28344,28345,28348,
-28350,28351,28352,28355,28356,28357,28358,28360,28361,28362,28364,28365,28366,
-28368,28370,28374,28376,28377,28379,28380,28381,28387,28391,28394,28395,28396,
-28397,28398,28399,28400,28401,28402,28403,28405,28406,28407,28408,28410,28411,
-28412,28413,28414,28415,28416,28417,28419,28420,28421,28423,28424,28426,28427,
-28428,28429,28430,28432,28433,28434,28438,28439,28440,28441,28442,28443,28444,
-28445,28446,28447,28449,28450,28451,28453,28454,28455,28456,28460,28462,28464,
-28466,28468,28469,28471,28472,28473,28474,28475,28476,28477,28479,28480,28481,
-28482,28483,28484,28485,28488,28489,28490,28492,28494,28495,28496,28497,28498,
-28499,28500,28501,28502,28503,28505,28506,28507,28509,28511,28512,28513,28515,
-28516,28517,28519,28520,28521,28522,28523,28524,28527,28528,28529,28531,28533,
-28534,28535,28537,28539,28541,28542,28543,28544,28545,28546,28547,28549,28550,
-28551,28554,28555,28559,28560,28561,28562,28563,28564,28565,28566,28567,28568,
-28569,28570,28571,28573,28574,28575,28576,28578,28579,28580,28581,28582,28584,
-28585,28586,28587,28588,28589,28590,28591,28592,28593,28594,28596,28597,28599,
-28600,28602,28603,28604,28605,28606,28607,28609,28611,28612,28613,28614,28615,
-28616,28618,28619,28620,28621,28622,28623,28624,28627,28628,28629,28630,28631,
-28632,28633,28634,28635,28636,28637,28639,28642,28643,28644,28645,28646,28647,
-28648,28649,28650,28651,28652,28653,28656,28657,28658,28659,28660,28661,28662,
-28663,28664,28665,28666,28667,28668,28669,28670,28671,28672,28673,28674,28675,
-28676,28677,28678,28679,28680,28681,28682,28683,28684,28685,28686,28687,28688,
-28690,28691,28692,28693,28694,28695,28696,28697,28700,28701,28702,28703,28704,
-28705,28706,28708,28709,28710,28711,28712,28713,28714,28715,28716,28717,28718,
-28719,28720,28721,28722,28723,28724,28726,28727,28728,28730,28731,28732,28733,
-28734,28735,28736,28737,28738,28739,28740,28741,28742,28743,28744,28745,28746,
-28747,28749,28750,28752,28753,28754,28755,28756,28757,28758,28759,28760,28761,
-28762,28763,28764,28765,28767,28768,28769,28770,28771,28772,28773,28774,28775,
-28776,28777,28778,28782,28785,28786,28787,28788,28791,28793,28794,28795,28797,
-28801,28802,28803,28804,28806,28807,28808,28811,28812,28813,28815,28816,28817,
-28819,28823,28824,28826,28827,28830,28831,28832,28833,28834,28835,28836,28837,
-28838,28839,28840,28841,28842,28848,28850,28852,28853,28854,28858,28862,28863,
-28868,28869,28870,28871,28873,28875,28876,28877,28878,28879,28880,28881,28882,
-28883,28884,28885,28886,28887,28890,28892,28893,28894,28896,28897,28898,28899,
-28901,28906,28910,28912,28913,28914,28915,28916,28917,28918,28920,28922,28923,
-28924,28926,28927,28928,28929,28930,28931,28932,28933,28934,28935,28936,28939,
-28940,28941,28942,28943,28945,28946,28948,28951,28955,28956,28957,28958,28959,
-28960,28961,28962,28963,28964,28965,28967,28968,28969,28970,28971,28972,28973,
-28974,28978,28979,28980,28981,28983,28984,28985,28986,28987,28988,28989,28990,
-28991,28992,28993,28994,28995,28996,28998,28999,29000,29001,29003,29005,29007,
-29008,29009,29010,29011,29012,29013,29014,29015,29016,29017,29018,29019,29021,
-29023,29024,29025,29026,29027,29029,29033,29034,29035,29036,29037,29039,29040,
-29041,29044,29045,29046,29047,29049,29051,29052,29054,29055,29056,29057,29058,
-29059,29061,29062,29063,29064,29065,29067,29068,29069,29070,29072,29073,29074,
-29075,29077,29078,29079,29082,29083,29084,29085,29086,29089,29090,29091,29092,
-29093,29094,29095,29097,29098,29099,29101,29102,29103,29104,29105,29106,29108,
-29110,29111,29112,29114,29115,29116,29117,29118,29119,29120,29121,29122,29124,
-29125,29126,29127,29128,29129,29130,29131,29132,29133,29135,29136,29137,29138,
-29139,29142,29143,29144,29145,29146,29147,29148,29149,29150,29151,29153,29154,
-29155,29156,29158,29160,29161,29162,29163,29164,29165,29167,29168,29169,29170,
-29171,29172,29173,29174,29175,29176,29178,29179,29180,29181,29182,29183,29184,
-29185,29186,29187,29188,29189,29191,29192,29193,29194,29195,29196,29197,29198,
-29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209,29210,29211,
-29212,29214,29215,29216,29217,29218,29219,29220,29221,29222,29223,29225,29227,
-29229,29230,29231,29234,29235,29236,29242,29244,29246,29248,29249,29250,29251,
-29252,29253,29254,29257,29258,29259,29262,29263,29264,29265,29267,29268,29269,
-29271,29272,29274,29276,29278,29280,29283,29284,29285,29288,29290,29291,29292,
-29293,29296,29297,29299,29300,29302,29303,29304,29307,29308,29309,29314,29315,
-29317,29318,29319,29320,29321,29324,29326,29328,29329,29331,29332,29333,29334,
-29335,29336,29337,29338,29339,29340,29341,29342,29344,29345,29346,29347,29348,
-29349,29350,29351,29352,29353,29354,29355,29358,29361,29362,29363,29365,29370,
-29371,29372,29373,29374,29375,29376,29381,29382,29383,29385,29386,29387,29388,
-29391,29393,29395,29396,29397,29398,29400,29402,29403,58566,58567,58568,58569,
-58570,58571,58572,58573,58574,58575,58576,58577,58578,58579,58580,58581,58582,
-58583,58584,58585,58586,58587,58588,58589,58590,58591,58592,58593,58594,58595,
-58596,58597,58598,58599,58600,58601,58602,58603,58604,58605,58606,58607,58608,
-58609,58610,58611,58612,58613,58614,58615,58616,58617,58618,58619,58620,58621,
-58622,58623,58624,58625,58626,58627,58628,58629,58630,58631,58632,58633,58634,
-58635,58636,58637,58638,58639,58640,58641,58642,58643,58644,58645,58646,58647,
-58648,58649,58650,58651,58652,58653,58654,58655,58656,58657,58658,58659,58660,
-58661,12288,12289,12290,183,713,711,168,12291,12293,8212,65374,8214,8230,8216,
-8217,8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303,
-12310,12311,12304,12305,177,215,247,8758,8743,8744,8721,8719,8746,8745,8712,
-8759,8730,8869,8741,8736,8978,8857,8747,8750,8801,8780,8776,8765,8733,8800,
-8814,8815,8804,8805,8734,8757,8756,9794,9792,176,8242,8243,8451,65284,164,
-65504,65505,8240,167,8470,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,
-9650,8251,8594,8592,8593,8595,12307,58662,58663,58664,58665,58666,58667,58668,
-58669,58670,58671,58672,58673,58674,58675,58676,58677,58678,58679,58680,58681,
-58682,58683,58684,58685,58686,58687,58688,58689,58690,58691,58692,58693,58694,
-58695,58696,58697,58698,58699,58700,58701,58702,58703,58704,58705,58706,58707,
-58708,58709,58710,58711,58712,58713,58714,58715,58716,58717,58718,58719,58720,
-58721,58722,58723,58724,58725,58726,58727,58728,58729,58730,58731,58732,58733,
-58734,58735,58736,58737,58738,58739,58740,58741,58742,58743,58744,58745,58746,
-58747,58748,58749,58750,58751,58752,58753,58754,58755,58756,58757,8560,8561,
-8562,8563,8564,8565,8566,8567,8568,8569,59238,59239,59240,59241,59242,59243,
-9352,9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,
-9367,9368,9369,9370,9371,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,
-9342,9343,9344,9345,9346,9347,9348,9349,9350,9351,9312,9313,9314,9315,9316,
-9317,9318,9319,9320,9321,8364,59245,12832,12833,12834,12835,12836,12837,12838,
-12839,12840,12841,59246,59247,8544,8545,8546,8547,8548,8549,8550,8551,8552,
-8553,8554,8555,59248,59249,58758,58759,58760,58761,58762,58763,58764,58765,
-58766,58767,58768,58769,58770,58771,58772,58773,58774,58775,58776,58777,58778,
-58779,58780,58781,58782,58783,58784,58785,58786,58787,58788,58789,58790,58791,
-58792,58793,58794,58795,58796,58797,58798,58799,58800,58801,58802,58803,58804,
-58805,58806,58807,58808,58809,58810,58811,58812,58813,58814,58815,58816,58817,
-58818,58819,58820,58821,58822,58823,58824,58825,58826,58827,58828,58829,58830,
-58831,58832,58833,58834,58835,58836,58837,58838,58839,58840,58841,58842,58843,
-58844,58845,58846,58847,58848,58849,58850,58851,58852,58853,65281,65282,65283,
-65509,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,
-65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,
-65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,
-65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,
-65336,65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348,
-65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,
-65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,
-58854,58855,58856,58857,58858,58859,58860,58861,58862,58863,58864,58865,58866,
-58867,58868,58869,58870,58871,58872,58873,58874,58875,58876,58877,58878,58879,
-58880,58881,58882,58883,58884,58885,58886,58887,58888,58889,58890,58891,58892,
-58893,58894,58895,58896,58897,58898,58899,58900,58901,58902,58903,58904,58905,
-58906,58907,58908,58909,58910,58911,58912,58913,58914,58915,58916,58917,58918,
-58919,58920,58921,58922,58923,58924,58925,58926,58927,58928,58929,58930,58931,
-58932,58933,58934,58935,58936,58937,58938,58939,58940,58941,58942,58943,58944,
-58945,58946,58947,58948,58949,12353,12354,12355,12356,12357,12358,12359,12360,
-12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,
-12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,
-12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,
-12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,
-12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,
-12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,59250,59251,59252,
-59253,59254,59255,59256,59257,59258,59259,59260,58950,58951,58952,58953,58954,
-58955,58956,58957,58958,58959,58960,58961,58962,58963,58964,58965,58966,58967,
-58968,58969,58970,58971,58972,58973,58974,58975,58976,58977,58978,58979,58980,
-58981,58982,58983,58984,58985,58986,58987,58988,58989,58990,58991,58992,58993,
-58994,58995,58996,58997,58998,58999,59000,59001,59002,59003,59004,59005,59006,
-59007,59008,59009,59010,59011,59012,59013,59014,59015,59016,59017,59018,59019,
-59020,59021,59022,59023,59024,59025,59026,59027,59028,59029,59030,59031,59032,
-59033,59034,59035,59036,59037,59038,59039,59040,59041,59042,59043,59044,59045,
-12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,
-12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,
-12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,
-12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,
-12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,
-12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,
-12527,12528,12529,12530,12531,12532,12533,12534,59261,59262,59263,59264,59265,
-59266,59267,59268,59046,59047,59048,59049,59050,59051,59052,59053,59054,59055,
-59056,59057,59058,59059,59060,59061,59062,59063,59064,59065,59066,59067,59068,
-59069,59070,59071,59072,59073,59074,59075,59076,59077,59078,59079,59080,59081,
-59082,59083,59084,59085,59086,59087,59088,59089,59090,59091,59092,59093,59094,
-59095,59096,59097,59098,59099,59100,59101,59102,59103,59104,59105,59106,59107,
-59108,59109,59110,59111,59112,59113,59114,59115,59116,59117,59118,59119,59120,
-59121,59122,59123,59124,59125,59126,59127,59128,59129,59130,59131,59132,59133,
-59134,59135,59136,59137,59138,59139,59140,59141,913,914,915,916,917,918,919,
-920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,59269,
-59270,59271,59272,59273,59274,59275,59276,945,946,947,948,949,950,951,952,953,
-954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,59277,59278,59279,
-59280,59281,59282,59283,65077,65078,65081,65082,65087,65088,65085,65086,65089,
-65090,65091,65092,59284,59285,65083,65084,65079,65080,65073,59286,65075,65076,
-59287,59288,59289,59290,59291,59292,59293,59294,59295,59142,59143,59144,59145,
-59146,59147,59148,59149,59150,59151,59152,59153,59154,59155,59156,59157,59158,
-59159,59160,59161,59162,59163,59164,59165,59166,59167,59168,59169,59170,59171,
-59172,59173,59174,59175,59176,59177,59178,59179,59180,59181,59182,59183,59184,
-59185,59186,59187,59188,59189,59190,59191,59192,59193,59194,59195,59196,59197,
-59198,59199,59200,59201,59202,59203,59204,59205,59206,59207,59208,59209,59210,
-59211,59212,59213,59214,59215,59216,59217,59218,59219,59220,59221,59222,59223,
-59224,59225,59226,59227,59228,59229,59230,59231,59232,59233,59234,59235,59236,
-59237,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,
-1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,
-1068,1069,1070,1071,59296,59297,59298,59299,59300,59301,59302,59303,59304,
-59305,59306,59307,59308,59309,59310,1072,1073,1074,1075,1076,1077,1105,1078,
-1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,
-1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,59311,59312,59313,59314,
-59315,59316,59317,59318,59319,59320,59321,59322,59323,714,715,729,8211,8213,
-8229,8245,8453,8457,8598,8599,8600,8601,8725,8735,8739,8786,8806,8807,8895,
-9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,
-9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,
-9582,9583,9584,9585,9586,9587,9601,9602,9603,9604,9605,9606,9607,9608,9609,
-9610,9611,9612,9613,9614,9615,9619,9620,9621,9660,9661,9698,9699,9700,9701,
-9737,8853,12306,12317,12318,59324,59325,59326,59327,59328,59329,59330,59331,
-59332,59333,59334,257,225,462,224,275,233,283,232,299,237,464,236,333,243,466,
-242,363,250,468,249,470,472,474,476,252,234,593,59335,324,328,505,609,59337,
-59338,59339,59340,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558,
-12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571,
-12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,12584,
-12585,59341,59342,59343,59344,59345,59346,59347,59348,59349,59350,59351,59352,
-59353,59354,59355,59356,59357,59358,59359,59360,59361,12321,12322,12323,12324,
-12325,12326,12327,12328,12329,12963,13198,13199,13212,13213,13214,13217,13252,
-13262,13265,13266,13269,65072,65506,65508,59362,8481,12849,59363,8208,59364,
-59365,59366,12540,12443,12444,12541,12542,12294,12445,12446,65097,65098,65099,
-65100,65101,65102,65103,65104,65105,65106,65108,65109,65110,65111,65113,65114,
-65115,65116,65117,65118,65119,65120,65121,65122,65123,65124,65125,65126,65128,
-65129,65130,65131,12350,12272,12273,12274,12275,12276,12277,12278,12279,12280,
-12281,12282,12283,12295,59380,59381,59382,59383,59384,59385,59386,59387,59388,
-59389,59390,59391,59392,9472,9473,9474,9475,9476,9477,9478,9479,9480,9481,
-9482,9483,9484,9485,9486,9487,9488,9489,9490,9491,9492,9493,9494,9495,9496,
-9497,9498,9499,9500,9501,9502,9503,9504,9505,9506,9507,9508,9509,9510,9511,
-9512,9513,9514,9515,9516,9517,9518,9519,9520,9521,9522,9523,9524,9525,9526,
-9527,9528,9529,9530,9531,9532,9533,9534,9535,9536,9537,9538,9539,9540,9541,
-9542,9543,9544,9545,9546,9547,59393,59394,59395,59396,59397,59398,59399,59400,
-59401,59402,59403,59404,59405,59406,59407,29404,29405,29407,29410,29411,29412,
-29413,29414,29415,29418,29419,29429,29430,29433,29437,29438,29439,29440,29442,
-29444,29445,29446,29447,29448,29449,29451,29452,29453,29455,29456,29457,29458,
-29460,29464,29465,29466,29471,29472,29475,29476,29478,29479,29480,29485,29487,
-29488,29490,29491,29493,29494,29498,29499,29500,29501,29504,29505,29506,29507,
-29508,29509,29510,29511,29512,29513,29514,29515,29516,29518,29519,29521,29523,
-29524,29525,29526,29528,29529,29530,29531,29532,29533,29534,29535,29537,29538,
-29539,29540,29541,29542,29543,29544,29545,29546,29547,29550,29552,29553,57344,
-57345,57346,57347,57348,57349,57350,57351,57352,57353,57354,57355,57356,57357,
-57358,57359,57360,57361,57362,57363,57364,57365,57366,57367,57368,57369,57370,
-57371,57372,57373,57374,57375,57376,57377,57378,57379,57380,57381,57382,57383,
-57384,57385,57386,57387,57388,57389,57390,57391,57392,57393,57394,57395,57396,
-57397,57398,57399,57400,57401,57402,57403,57404,57405,57406,57407,57408,57409,
-57410,57411,57412,57413,57414,57415,57416,57417,57418,57419,57420,57421,57422,
-57423,57424,57425,57426,57427,57428,57429,57430,57431,57432,57433,57434,57435,
-57436,57437,29554,29555,29556,29557,29558,29559,29560,29561,29562,29563,29564,
-29565,29567,29568,29569,29570,29571,29573,29574,29576,29578,29580,29581,29583,
-29584,29586,29587,29588,29589,29591,29592,29593,29594,29596,29597,29598,29600,
-29601,29603,29604,29605,29606,29607,29608,29610,29612,29613,29617,29620,29621,
-29622,29624,29625,29628,29629,29630,29631,29633,29635,29636,29637,29638,29639,
-29643,29644,29646,29650,29651,29652,29653,29654,29655,29656,29658,29659,29660,
-29661,29663,29665,29666,29667,29668,29670,29672,29674,29675,29676,29678,29679,
-29680,29681,29683,29684,29685,29686,29687,57438,57439,57440,57441,57442,57443,
-57444,57445,57446,57447,57448,57449,57450,57451,57452,57453,57454,57455,57456,
-57457,57458,57459,57460,57461,57462,57463,57464,57465,57466,57467,57468,57469,
-57470,57471,57472,57473,57474,57475,57476,57477,57478,57479,57480,57481,57482,
-57483,57484,57485,57486,57487,57488,57489,57490,57491,57492,57493,57494,57495,
-57496,57497,57498,57499,57500,57501,57502,57503,57504,57505,57506,57507,57508,
-57509,57510,57511,57512,57513,57514,57515,57516,57517,57518,57519,57520,57521,
-57522,57523,57524,57525,57526,57527,57528,57529,57530,57531,29688,29689,29690,
-29691,29692,29693,29694,29695,29696,29697,29698,29700,29703,29704,29707,29708,
-29709,29710,29713,29714,29715,29716,29717,29718,29719,29720,29721,29724,29725,
-29726,29727,29728,29729,29731,29732,29735,29737,29739,29741,29743,29745,29746,
-29751,29752,29753,29754,29755,29757,29758,29759,29760,29762,29763,29764,29765,
-29766,29767,29768,29769,29770,29771,29772,29773,29774,29775,29776,29777,29778,
-29779,29780,29782,29784,29789,29792,29793,29794,29795,29796,29797,29798,29799,
-29800,29801,29802,29803,29804,29806,29807,29809,29810,29811,29812,29813,29816,
-29817,29818,57532,57533,57534,57535,57536,57537,57538,57539,57540,57541,57542,
-57543,57544,57545,57546,57547,57548,57549,57550,57551,57552,57553,57554,57555,
-57556,57557,57558,57559,57560,57561,57562,57563,57564,57565,57566,57567,57568,
-57569,57570,57571,57572,57573,57574,57575,57576,57577,57578,57579,57580,57581,
-57582,57583,57584,57585,57586,57587,57588,57589,57590,57591,57592,57593,57594,
-57595,57596,57597,57598,57599,57600,57601,57602,57603,57604,57605,57606,57607,
-57608,57609,57610,57611,57612,57613,57614,57615,57616,57617,57618,57619,57620,
-57621,57622,57623,57624,57625,29819,29820,29821,29823,29826,29828,29829,29830,
-29832,29833,29834,29836,29837,29839,29841,29842,29843,29844,29845,29846,29847,
-29848,29849,29850,29851,29853,29855,29856,29857,29858,29859,29860,29861,29862,
-29866,29867,29868,29869,29870,29871,29872,29873,29874,29875,29876,29877,29878,
-29879,29880,29881,29883,29884,29885,29886,29887,29888,29889,29890,29891,29892,
-29893,29894,29895,29896,29897,29898,29899,29900,29901,29902,29903,29904,29905,
-29907,29908,29909,29910,29911,29912,29913,29914,29915,29917,29919,29921,29925,
-29927,29928,29929,29930,29931,29932,29933,29936,29937,29938,57626,57627,57628,
-57629,57630,57631,57632,57633,57634,57635,57636,57637,57638,57639,57640,57641,
-57642,57643,57644,57645,57646,57647,57648,57649,57650,57651,57652,57653,57654,
-57655,57656,57657,57658,57659,57660,57661,57662,57663,57664,57665,57666,57667,
-57668,57669,57670,57671,57672,57673,57674,57675,57676,57677,57678,57679,57680,
-57681,57682,57683,57684,57685,57686,57687,57688,57689,57690,57691,57692,57693,
-57694,57695,57696,57697,57698,57699,57700,57701,57702,57703,57704,57705,57706,
-57707,57708,57709,57710,57711,57712,57713,57714,57715,57716,57717,57718,57719,
-29939,29941,29944,29945,29946,29947,29948,29949,29950,29952,29953,29954,29955,
-29957,29958,29959,29960,29961,29962,29963,29964,29966,29968,29970,29972,29973,
-29974,29975,29979,29981,29982,29984,29985,29986,29987,29988,29990,29991,29994,
-29998,30004,30006,30009,30012,30013,30015,30017,30018,30019,30020,30022,30023,
-30025,30026,30029,30032,30033,30034,30035,30037,30038,30039,30040,30045,30046,
-30047,30048,30049,30050,30051,30052,30055,30056,30057,30059,30060,30061,30062,
-30063,30064,30065,30067,30069,30070,30071,30074,30075,30076,30077,30078,30080,
-30081,30082,30084,30085,30087,57720,57721,57722,57723,57724,57725,57726,57727,
-57728,57729,57730,57731,57732,57733,57734,57735,57736,57737,57738,57739,57740,
-57741,57742,57743,57744,57745,57746,57747,57748,57749,57750,57751,57752,57753,
-57754,57755,57756,57757,57758,57759,57760,57761,57762,57763,57764,57765,57766,
-57767,57768,57769,57770,57771,57772,57773,57774,57775,57776,57777,57778,57779,
-57780,57781,57782,57783,57784,57785,57786,57787,57788,57789,57790,57791,57792,
-57793,57794,57795,57796,57797,57798,57799,57800,57801,57802,57803,57804,57805,
-57806,57807,57808,57809,57810,57811,57812,57813,30088,30089,30090,30092,30093,
-30094,30096,30099,30101,30104,30107,30108,30110,30114,30118,30119,30120,30121,
-30122,30125,30134,30135,30138,30139,30143,30144,30145,30150,30155,30156,30158,
-30159,30160,30161,30163,30167,30169,30170,30172,30173,30175,30176,30177,30181,
-30185,30188,30189,30190,30191,30194,30195,30197,30198,30199,30200,30202,30203,
-30205,30206,30210,30212,30214,30215,30216,30217,30219,30221,30222,30223,30225,
-30226,30227,30228,30230,30234,30236,30237,30238,30241,30243,30247,30248,30252,
-30254,30255,30257,30258,30262,30263,30265,30266,30267,30269,30273,30274,30276,
-57814,57815,57816,57817,57818,57819,57820,57821,57822,57823,57824,57825,57826,
-57827,57828,57829,57830,57831,57832,57833,57834,57835,57836,57837,57838,57839,
-57840,57841,57842,57843,57844,57845,57846,57847,57848,57849,57850,57851,57852,
-57853,57854,57855,57856,57857,57858,57859,57860,57861,57862,57863,57864,57865,
-57866,57867,57868,57869,57870,57871,57872,57873,57874,57875,57876,57877,57878,
-57879,57880,57881,57882,57883,57884,57885,57886,57887,57888,57889,57890,57891,
-57892,57893,57894,57895,57896,57897,57898,57899,57900,57901,57902,57903,57904,
-57905,57906,57907,30277,30278,30279,30280,30281,30282,30283,30286,30287,30288,
-30289,30290,30291,30293,30295,30296,30297,30298,30299,30301,30303,30304,30305,
-30306,30308,30309,30310,30311,30312,30313,30314,30316,30317,30318,30320,30321,
-30322,30323,30324,30325,30326,30327,30329,30330,30332,30335,30336,30337,30339,
-30341,30345,30346,30348,30349,30351,30352,30354,30356,30357,30359,30360,30362,
-30363,30364,30365,30366,30367,30368,30369,30370,30371,30373,30374,30375,30376,
-30377,30378,30379,30380,30381,30383,30384,30387,30389,30390,30391,30392,30393,
-30394,30395,30396,30397,30398,30400,30401,30403,21834,38463,22467,25384,21710,
-21769,21696,30353,30284,34108,30702,33406,30861,29233,38552,38797,27688,23433,
-20474,25353,26263,23736,33018,26696,32942,26114,30414,20985,25942,29100,32753,
-34948,20658,22885,25034,28595,33453,25420,25170,21485,21543,31494,20843,30116,
-24052,25300,36299,38774,25226,32793,22365,38712,32610,29240,30333,26575,30334,
-25670,20336,36133,25308,31255,26001,29677,25644,25203,33324,39041,26495,29256,
-25198,25292,20276,29923,21322,21150,32458,37030,24110,26758,27036,33152,32465,
-26834,30917,34444,38225,20621,35876,33502,32990,21253,35090,21093,30404,30407,
-30409,30411,30412,30419,30421,30425,30426,30428,30429,30430,30432,30433,30434,
-30435,30436,30438,30439,30440,30441,30442,30443,30444,30445,30448,30451,30453,
-30454,30455,30458,30459,30461,30463,30464,30466,30467,30469,30470,30474,30476,
-30478,30479,30480,30481,30482,30483,30484,30485,30486,30487,30488,30491,30492,
-30493,30494,30497,30499,30500,30501,30503,30506,30507,30508,30510,30512,30513,
-30514,30515,30516,30521,30523,30525,30526,30527,30530,30532,30533,30534,30536,
-30537,30538,30539,30540,30541,30542,30543,30546,30547,30548,30549,30550,30551,
-30552,30553,30556,34180,38649,20445,22561,39281,23453,25265,25253,26292,35961,
-40077,29190,26479,30865,24754,21329,21271,36744,32972,36125,38049,20493,29384,
-22791,24811,28953,34987,22868,33519,26412,31528,23849,32503,29997,27893,36454,
-36856,36924,40763,27604,37145,31508,24444,30887,34006,34109,27605,27609,27606,
-24065,24199,30201,38381,25949,24330,24517,36767,22721,33218,36991,38491,38829,
-36793,32534,36140,25153,20415,21464,21342,36776,36777,36779,36941,26631,24426,
-33176,34920,40150,24971,21035,30250,24428,25996,28626,28392,23486,25672,20853,
-20912,26564,19993,31177,39292,28851,30557,30558,30559,30560,30564,30567,30569,
-30570,30573,30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,30584,
-30586,30587,30588,30593,30594,30595,30598,30599,30600,30601,30602,30603,30607,
-30608,30611,30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622,
-30625,30627,30628,30630,30632,30635,30637,30638,30639,30641,30642,30644,30646,
-30647,30648,30649,30650,30652,30654,30656,30657,30658,30659,30660,30661,30662,
-30663,30664,30665,30666,30667,30668,30670,30671,30672,30673,30674,30675,30676,
-30677,30678,30680,30681,30682,30685,30686,30687,30688,30689,30692,30149,24182,
-29627,33760,25773,25320,38069,27874,21338,21187,25615,38082,31636,20271,24091,
-33334,33046,33162,28196,27850,39539,25429,21340,21754,34917,22496,19981,24067,
-27493,31807,37096,24598,25830,29468,35009,26448,25165,36130,30572,36393,37319,
-24425,33756,34081,39184,21442,34453,27531,24813,24808,28799,33485,33329,20179,
-27815,34255,25805,31961,27133,26361,33609,21397,31574,20391,20876,27979,23618,
-36461,25554,21449,33580,33590,26597,30900,25661,23519,23700,24046,35815,25286,
-26612,35962,25600,25530,34633,39307,35863,32544,38130,20135,38416,39076,26124,
-29462,30694,30696,30698,30703,30704,30705,30706,30708,30709,30711,30713,30714,
-30715,30716,30723,30724,30725,30726,30727,30728,30730,30731,30734,30735,30736,
-30739,30741,30745,30747,30750,30752,30753,30754,30756,30760,30762,30763,30766,
-30767,30769,30770,30771,30773,30774,30781,30783,30785,30786,30787,30788,30790,
-30792,30793,30794,30795,30797,30799,30801,30803,30804,30808,30809,30810,30811,
-30812,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823,30824,30825,
-30831,30832,30833,30834,30835,30836,30837,30838,30840,30841,30842,30843,30845,
-30846,30847,30848,30849,30850,30851,22330,23581,24120,38271,20607,32928,21378,
-25950,30021,21809,20513,36229,25220,38046,26397,22066,28526,24034,21557,28818,
-36710,25199,25764,25507,24443,28552,37108,33251,36784,23576,26216,24561,27785,
-38472,36225,34924,25745,31216,22478,27225,25104,21576,20056,31243,24809,28548,
-35802,25215,36894,39563,31204,21507,30196,25345,21273,27744,36831,24347,39536,
-32827,40831,20360,23610,36196,32709,26021,28861,20805,20914,34411,23815,23456,
-25277,37228,30068,36364,31264,24833,31609,20167,32504,30597,19985,33261,21021,
-20986,27249,21416,36487,38148,38607,28353,38500,26970,30852,30853,30854,30856,
-30858,30859,30863,30864,30866,30868,30869,30870,30873,30877,30878,30880,30882,
-30884,30886,30888,30889,30890,30891,30892,30893,30894,30895,30901,30902,30903,
-30904,30906,30907,30908,30909,30911,30912,30914,30915,30916,30918,30919,30920,
-30924,30925,30926,30927,30929,30930,30931,30934,30935,30936,30938,30939,30940,
-30941,30942,30943,30944,30945,30946,30947,30948,30949,30950,30951,30953,30954,
-30955,30957,30958,30959,30960,30961,30963,30965,30966,30968,30969,30971,30972,
-30973,30974,30975,30976,30978,30979,30980,30982,30983,30984,30985,30986,30987,
-30988,30784,20648,30679,25616,35302,22788,25571,24029,31359,26941,20256,33337,
-21912,20018,30126,31383,24162,24202,38383,21019,21561,28810,25462,38180,22402,
-26149,26943,37255,21767,28147,32431,34850,25139,32496,30133,33576,30913,38604,
-36766,24904,29943,35789,27492,21050,36176,27425,32874,33905,22257,21254,20174,
-19995,20945,31895,37259,31751,20419,36479,31713,31388,25703,23828,20652,33030,
-30209,31929,28140,32736,26449,23384,23544,30923,25774,25619,25514,25387,38169,
-25645,36798,31572,30249,25171,22823,21574,27513,20643,25140,24102,27526,20195,
-36151,34955,24453,36910,30989,30990,30991,30992,30993,30994,30996,30997,30998,
-30999,31000,31001,31002,31003,31004,31005,31007,31008,31009,31010,31011,31013,
-31014,31015,31016,31017,31018,31019,31020,31021,31022,31023,31024,31025,31026,
-31027,31029,31030,31031,31032,31033,31037,31039,31042,31043,31044,31045,31047,
-31050,31051,31052,31053,31054,31055,31056,31057,31058,31060,31061,31064,31065,
-31073,31075,31076,31078,31081,31082,31083,31084,31086,31088,31089,31090,31091,
-31092,31093,31094,31097,31099,31100,31101,31102,31103,31106,31107,31110,31111,
-31112,31113,31115,31116,31117,31118,31120,31121,31122,24608,32829,25285,20025,
-21333,37112,25528,32966,26086,27694,20294,24814,28129,35806,24377,34507,24403,
-25377,20826,33633,26723,20992,25443,36424,20498,23707,31095,23548,21040,31291,
-24764,36947,30423,24503,24471,30340,36460,28783,30331,31561,30634,20979,37011,
-22564,20302,28404,36842,25932,31515,29380,28068,32735,23265,25269,24213,22320,
-33922,31532,24093,24351,36882,32532,39072,25474,28359,30872,28857,20856,38747,
-22443,30005,20291,30008,24215,24806,22880,28096,27583,30857,21500,38613,20939,
-20993,25481,21514,38035,35843,36300,29241,30879,34678,36845,35853,21472,31123,
-31124,31125,31126,31127,31128,31129,31131,31132,31133,31134,31135,31136,31137,
-31138,31139,31140,31141,31142,31144,31145,31146,31147,31148,31149,31150,31151,
-31152,31153,31154,31156,31157,31158,31159,31160,31164,31167,31170,31172,31173,
-31175,31176,31178,31180,31182,31183,31184,31187,31188,31190,31191,31193,31194,
-31195,31196,31197,31198,31200,31201,31202,31205,31208,31210,31212,31214,31217,
-31218,31219,31220,31221,31222,31223,31225,31226,31228,31230,31231,31233,31236,
-31237,31239,31240,31241,31242,31244,31247,31248,31249,31250,31251,31253,31254,
-31256,31257,31259,31260,19969,30447,21486,38025,39030,40718,38189,23450,35746,
-20002,19996,20908,33891,25026,21160,26635,20375,24683,20923,27934,20828,25238,
-26007,38497,35910,36887,30168,37117,30563,27602,29322,29420,35835,22581,30585,
-36172,26460,38208,32922,24230,28193,22930,31471,30701,38203,27573,26029,32526,
-22534,20817,38431,23545,22697,21544,36466,25958,39039,22244,38045,30462,36929,
-25479,21702,22810,22842,22427,36530,26421,36346,33333,21057,24816,22549,34558,
-23784,40517,20420,39069,35769,23077,24694,21380,25212,36943,37122,39295,24681,
-32780,20799,32819,23572,39285,27953,20108,31261,31263,31265,31266,31268,31269,
-31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281,31282,
-31284,31285,31286,31288,31290,31294,31296,31297,31298,31299,31300,31301,31303,
-31304,31305,31306,31307,31308,31309,31310,31311,31312,31314,31315,31316,31317,
-31318,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330,31331,
-31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,31343,31345,
-31346,31347,31349,31355,31356,31357,31358,31362,31365,31367,31369,31370,31371,
-31372,31374,31375,31376,31379,31380,31385,31386,31387,31390,31393,31394,36144,
-21457,32602,31567,20240,20047,38400,27861,29648,34281,24070,30058,32763,27146,
-30718,38034,32321,20961,28902,21453,36820,33539,36137,29359,39277,27867,22346,
-33459,26041,32938,25151,38450,22952,20223,35775,32442,25918,33778,38750,21857,
-39134,32933,21290,35837,21536,32954,24223,27832,36153,33452,37210,21545,27675,
-20998,32439,22367,28954,27774,31881,22859,20221,24575,24868,31914,20016,23553,
-26539,34562,23792,38155,39118,30127,28925,36898,20911,32541,35773,22857,20964,
-20315,21542,22827,25975,32932,23413,25206,25282,36752,24133,27679,31526,20239,
-20440,26381,31395,31396,31399,31401,31402,31403,31406,31407,31408,31409,31410,
-31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31424,31425,
-31426,31427,31428,31429,31430,31431,31432,31433,31434,31436,31437,31438,31439,
-31440,31441,31442,31443,31444,31445,31447,31448,31450,31451,31452,31453,31457,
-31458,31460,31463,31464,31465,31466,31467,31468,31470,31472,31473,31474,31475,
-31476,31477,31478,31479,31480,31483,31484,31486,31488,31489,31490,31493,31495,
-31497,31500,31501,31502,31504,31506,31507,31510,31511,31512,31514,31516,31517,
-31519,31521,31522,31523,31527,31529,31533,28014,28074,31119,34993,24343,29995,
-25242,36741,20463,37340,26023,33071,33105,24220,33104,36212,21103,35206,36171,
-22797,20613,20184,38428,29238,33145,36127,23500,35747,38468,22919,32538,21648,
-22134,22030,35813,25913,27010,38041,30422,28297,24178,29976,26438,26577,31487,
-32925,36214,24863,31174,25954,36195,20872,21018,38050,32568,32923,32434,23703,
-28207,26464,31705,30347,39640,33167,32660,31957,25630,38224,31295,21578,21733,
-27468,25601,25096,40509,33011,30105,21106,38761,33883,26684,34532,38401,38548,
-38124,20010,21508,32473,26681,36319,32789,26356,24218,32697,31535,31536,31538,
-31540,31541,31542,31543,31545,31547,31549,31551,31552,31553,31554,31555,31556,
-31558,31560,31562,31565,31566,31571,31573,31575,31577,31580,31582,31583,31585,
-31587,31588,31589,31590,31591,31592,31593,31594,31595,31596,31597,31599,31600,
-31603,31604,31606,31608,31610,31612,31613,31615,31617,31618,31619,31620,31622,
-31623,31624,31625,31626,31627,31628,31630,31631,31633,31634,31635,31638,31640,
-31641,31642,31643,31646,31647,31648,31651,31652,31653,31662,31663,31664,31666,
-31667,31669,31670,31671,31673,31674,31675,31676,31677,31678,31679,31680,31682,
-31683,31684,22466,32831,26775,24037,25915,21151,24685,40858,20379,36524,20844,
-23467,24339,24041,27742,25329,36129,20849,38057,21246,27807,33503,29399,22434,
-26500,36141,22815,36764,33735,21653,31629,20272,27837,23396,22993,40723,21476,
-34506,39592,35895,32929,25925,39038,22266,38599,21038,29916,21072,23521,25346,
-35074,20054,25296,24618,26874,20851,23448,20896,35266,31649,39302,32592,24815,
-28748,36143,20809,24191,36891,29808,35268,22317,30789,24402,40863,38394,36712,
-39740,35809,30328,26690,26588,36330,36149,21053,36746,28378,26829,38149,37101,
-22269,26524,35065,36807,21704,31685,31688,31689,31690,31691,31693,31694,31695,
-31696,31698,31700,31701,31702,31703,31704,31707,31708,31710,31711,31712,31714,
-31715,31716,31719,31720,31721,31723,31724,31725,31727,31728,31730,31731,31732,
-31733,31734,31736,31737,31738,31739,31741,31743,31744,31745,31746,31747,31748,
-31749,31750,31752,31753,31754,31757,31758,31760,31761,31762,31763,31764,31765,
-31767,31768,31769,31770,31771,31772,31773,31774,31776,31777,31778,31779,31780,
-31781,31784,31785,31787,31788,31789,31790,31791,31792,31793,31794,31795,31796,
-31797,31798,31799,31801,31802,31803,31804,31805,31806,31810,39608,23401,28023,
-27686,20133,23475,39559,37219,25000,37039,38889,21547,28085,23506,20989,21898,
-32597,32752,25788,25421,26097,25022,24717,28938,27735,27721,22831,26477,33322,
-22741,22158,35946,27627,37085,22909,32791,21495,28009,21621,21917,33655,33743,
-26680,31166,21644,20309,21512,30418,35977,38402,27827,28088,36203,35088,40548,
-36154,22079,40657,30165,24456,29408,24680,21756,20136,27178,34913,24658,36720,
-21700,28888,34425,40511,27946,23439,24344,32418,21897,20399,29492,21564,21402,
-20505,21518,21628,20046,24573,29786,22774,33899,32993,34676,29392,31946,28246,
-31811,31812,31813,31814,31815,31816,31817,31818,31819,31820,31822,31823,31824,
-31825,31826,31827,31828,31829,31830,31831,31832,31833,31834,31835,31836,31837,
-31838,31839,31840,31841,31842,31843,31844,31845,31846,31847,31848,31849,31850,
-31851,31852,31853,31854,31855,31856,31857,31858,31861,31862,31863,31864,31865,
-31866,31870,31871,31872,31873,31874,31875,31876,31877,31878,31879,31880,31882,
-31883,31884,31885,31886,31887,31888,31891,31892,31894,31897,31898,31899,31904,
-31905,31907,31910,31911,31912,31913,31915,31916,31917,31919,31920,31924,31925,
-31926,31927,31928,31930,31931,24359,34382,21804,25252,20114,27818,25143,33457,
-21719,21326,29502,28369,30011,21010,21270,35805,27088,24458,24576,28142,22351,
-27426,29615,26707,36824,32531,25442,24739,21796,30186,35938,28949,28067,23462,
-24187,33618,24908,40644,30970,34647,31783,30343,20976,24822,29004,26179,24140,
-24653,35854,28784,25381,36745,24509,24674,34516,22238,27585,24724,24935,21321,
-24800,26214,36159,31229,20250,28905,27719,35763,35826,32472,33636,26127,23130,
-39746,27985,28151,35905,27963,20249,28779,33719,25110,24785,38669,36135,31096,
-20987,22334,22522,26426,30072,31293,31215,31637,31935,31936,31938,31939,31940,
-31942,31945,31947,31950,31951,31952,31953,31954,31955,31956,31960,31962,31963,
-31965,31966,31969,31970,31971,31972,31973,31974,31975,31977,31978,31979,31980,
-31981,31982,31984,31985,31986,31987,31988,31989,31990,31991,31993,31994,31996,
-31997,31998,31999,32000,32001,32002,32003,32004,32005,32006,32007,32008,32009,
-32011,32012,32013,32014,32015,32016,32017,32018,32019,32020,32021,32022,32023,
-32024,32025,32026,32027,32028,32029,32030,32031,32033,32035,32036,32037,32038,
-32040,32041,32042,32044,32045,32046,32048,32049,32050,32051,32052,32053,32054,
-32908,39269,36857,28608,35749,40481,23020,32489,32521,21513,26497,26840,36753,
-31821,38598,21450,24613,30142,27762,21363,23241,32423,25380,20960,33034,24049,
-34015,25216,20864,23395,20238,31085,21058,24760,27982,23492,23490,35745,35760,
-26082,24524,38469,22931,32487,32426,22025,26551,22841,20339,23478,21152,33626,
-39050,36158,30002,38078,20551,31292,20215,26550,39550,23233,27516,30417,22362,
-23574,31546,38388,29006,20860,32937,33392,22904,32516,33575,26816,26604,30897,
-30839,25315,25441,31616,20461,21098,20943,33616,27099,37492,36341,36145,35265,
-38190,31661,20214,32055,32056,32057,32058,32059,32060,32061,32062,32063,32064,
-32065,32066,32067,32068,32069,32070,32071,32072,32073,32074,32075,32076,32077,
-32078,32079,32080,32081,32082,32083,32084,32085,32086,32087,32088,32089,32090,
-32091,32092,32093,32094,32095,32096,32097,32098,32099,32100,32101,32102,32103,
-32104,32105,32106,32107,32108,32109,32111,32112,32113,32114,32115,32116,32117,
-32118,32120,32121,32122,32123,32124,32125,32126,32127,32128,32129,32130,32131,
-32132,32133,32134,32135,32136,32137,32138,32139,32140,32141,32142,32143,32144,
-32145,32146,32147,32148,32149,32150,32151,32152,20581,33328,21073,39279,28176,
-28293,28071,24314,20725,23004,23558,27974,27743,30086,33931,26728,22870,35762,
-21280,37233,38477,34121,26898,30977,28966,33014,20132,37066,27975,39556,23047,
-22204,25605,38128,30699,20389,33050,29409,35282,39290,32564,32478,21119,25945,
-37237,36735,36739,21483,31382,25581,25509,30342,31224,34903,38454,25130,21163,
-33410,26708,26480,25463,30571,31469,27905,32467,35299,22992,25106,34249,33445,
-30028,20511,20171,30117,35819,23626,24062,31563,26020,37329,20170,27941,35167,
-32039,38182,20165,35880,36827,38771,26187,31105,36817,28908,28024,32153,32154,
-32155,32156,32157,32158,32159,32160,32161,32162,32163,32164,32165,32167,32168,
-32169,32170,32171,32172,32173,32175,32176,32177,32178,32179,32180,32181,32182,
-32183,32184,32185,32186,32187,32188,32189,32190,32191,32192,32193,32194,32195,
-32196,32197,32198,32199,32200,32201,32202,32203,32204,32205,32206,32207,32208,
-32209,32210,32211,32212,32213,32214,32215,32216,32217,32218,32219,32220,32221,
-32222,32223,32224,32225,32226,32227,32228,32229,32230,32231,32232,32233,32234,
-32235,32236,32237,32238,32239,32240,32241,32242,32243,32244,32245,32246,32247,
-32248,32249,32250,23613,21170,33606,20834,33550,30555,26230,40120,20140,24778,
-31934,31923,32463,20117,35686,26223,39048,38745,22659,25964,38236,24452,30153,
-38742,31455,31454,20928,28847,31384,25578,31350,32416,29590,38893,20037,28792,
-20061,37202,21417,25937,26087,33276,33285,21646,23601,30106,38816,25304,29401,
-30141,23621,39545,33738,23616,21632,30697,20030,27822,32858,25298,25454,24040,
-20855,36317,36382,38191,20465,21477,24807,28844,21095,25424,40515,23071,20518,
-30519,21367,32482,25733,25899,25225,25496,20500,29237,35273,20915,35776,32477,
-22343,33740,38055,20891,21531,23803,32251,32252,32253,32254,32255,32256,32257,
-32258,32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,32270,
-32271,32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,32282,32283,
-32284,32285,32286,32287,32288,32289,32290,32291,32292,32293,32294,32295,32296,
-32297,32298,32299,32300,32301,32302,32303,32304,32305,32306,32307,32308,32309,
-32310,32311,32312,32313,32314,32316,32317,32318,32319,32320,32322,32323,32324,
-32325,32326,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338,
-32339,32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,20426,31459,
-27994,37089,39567,21888,21654,21345,21679,24320,25577,26999,20975,24936,21002,
-22570,21208,22350,30733,30475,24247,24951,31968,25179,25239,20130,28821,32771,
-25335,28900,38752,22391,33499,26607,26869,30933,39063,31185,22771,21683,21487,
-28212,20811,21051,23458,35838,32943,21827,22438,24691,22353,21549,31354,24656,
-23380,25511,25248,21475,25187,23495,26543,21741,31391,33510,37239,24211,35044,
-22840,22446,25358,36328,33007,22359,31607,20393,24555,23485,27454,21281,31568,
-29378,26694,30719,30518,26103,20917,20111,30420,23743,31397,33909,22862,39745,
-20608,32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361,
-32362,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374,
-32375,32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32387,32388,
-32389,32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401,
-32402,32403,32404,32405,32406,32407,32408,32409,32410,32412,32413,32414,32430,
-32436,32443,32444,32470,32484,32492,32505,32522,32528,32542,32567,32569,32571,
-32572,32573,32574,32575,32576,32577,32579,32582,32583,32584,32585,32586,32587,
-32588,32589,32590,32591,32594,32595,39304,24871,28291,22372,26118,25414,22256,
-25324,25193,24275,38420,22403,25289,21895,34593,33098,36771,21862,33713,26469,
-36182,34013,23146,26639,25318,31726,38417,20848,28572,35888,25597,35272,25042,
-32518,28866,28389,29701,27028,29436,24266,37070,26391,28010,25438,21171,29282,
-32769,20332,23013,37226,28889,28061,21202,20048,38647,38253,34174,30922,32047,
-20769,22418,25794,32907,31867,27882,26865,26974,20919,21400,26792,29313,40654,
-31729,29432,31163,28435,29702,26446,37324,40100,31036,33673,33620,21519,26647,
-20029,21385,21169,30782,21382,21033,20616,20363,20432,32598,32601,32603,32604,
-32605,32606,32608,32611,32612,32613,32614,32615,32619,32620,32621,32623,32624,
-32627,32629,32630,32631,32632,32634,32635,32636,32637,32639,32640,32642,32643,
-32644,32645,32646,32647,32648,32649,32651,32653,32655,32656,32657,32658,32659,
-32661,32662,32663,32664,32665,32667,32668,32672,32674,32675,32677,32678,32680,
-32681,32682,32683,32684,32685,32686,32689,32691,32692,32693,32694,32695,32698,
-32699,32702,32704,32706,32707,32708,32710,32711,32712,32713,32715,32717,32719,
-32720,32721,32722,32723,32726,32727,32729,32730,32731,32732,32733,32734,32738,
-32739,30178,31435,31890,27813,38582,21147,29827,21737,20457,32852,33714,36830,
-38256,24265,24604,28063,24088,25947,33080,38142,24651,28860,32451,31918,20937,
-26753,31921,33391,20004,36742,37327,26238,20142,35845,25769,32842,20698,30103,
-29134,23525,36797,28518,20102,25730,38243,24278,26009,21015,35010,28872,21155,
-29454,29747,26519,30967,38678,20020,37051,40158,28107,20955,36161,21533,25294,
-29618,33777,38646,40836,38083,20278,32666,20940,28789,38517,23725,39046,21478,
-20196,28316,29705,27060,30827,39311,30041,21016,30244,27969,26611,20845,40857,
-32843,21657,31548,31423,32740,32743,32744,32746,32747,32748,32749,32751,32754,
-32756,32757,32758,32759,32760,32761,32762,32765,32766,32767,32770,32775,32776,
-32777,32778,32782,32783,32785,32787,32794,32795,32797,32798,32799,32801,32803,
-32804,32811,32812,32813,32814,32815,32816,32818,32820,32825,32826,32828,32830,
-32832,32833,32836,32837,32839,32840,32841,32846,32847,32848,32849,32851,32853,
-32854,32855,32857,32859,32860,32861,32862,32863,32864,32865,32866,32867,32868,
-32869,32870,32871,32872,32875,32876,32877,32878,32879,32880,32882,32883,32884,
-32885,32886,32887,32888,32889,32890,32891,32892,32893,38534,22404,25314,38471,
-27004,23044,25602,31699,28431,38475,33446,21346,39045,24208,28809,25523,21348,
-34383,40065,40595,30860,38706,36335,36162,40575,28510,31108,24405,38470,25134,
-39540,21525,38109,20387,26053,23653,23649,32533,34385,27695,24459,29575,28388,
-32511,23782,25371,23402,28390,21365,20081,25504,30053,25249,36718,20262,20177,
-27814,32438,35770,33821,34746,32599,36923,38179,31657,39585,35064,33853,27931,
-39558,32476,22920,40635,29595,30721,34434,39532,39554,22043,21527,22475,20080,
-40614,21334,36808,33033,30610,39314,34542,28385,34067,26364,24930,28459,32894,
-32897,32898,32901,32904,32906,32909,32910,32911,32912,32913,32914,32916,32917,
-32919,32921,32926,32931,32934,32935,32936,32940,32944,32947,32949,32950,32952,
-32953,32955,32965,32967,32968,32969,32970,32971,32975,32976,32977,32978,32979,
-32980,32981,32984,32991,32992,32994,32995,32998,33006,33013,33015,33017,33019,
-33022,33023,33024,33025,33027,33028,33029,33031,33032,33035,33036,33045,33047,
-33049,33051,33052,33053,33055,33056,33057,33058,33059,33060,33061,33062,33063,
-33064,33065,33066,33067,33069,33070,33072,33075,33076,33077,33079,33081,33082,
-33083,33084,33085,33087,35881,33426,33579,30450,27667,24537,33725,29483,33541,
-38170,27611,30683,38086,21359,33538,20882,24125,35980,36152,20040,29611,26522,
-26757,37238,38665,29028,27809,30473,23186,38209,27599,32654,26151,23504,22969,
-23194,38376,38391,20204,33804,33945,27308,30431,38192,29467,26790,23391,30511,
-37274,38753,31964,36855,35868,24357,31859,31192,35269,27852,34588,23494,24130,
-26825,30496,32501,20885,20813,21193,23081,32517,38754,33495,25551,30596,34256,
-31186,28218,24217,22937,34065,28781,27665,25279,30399,25935,24751,38397,26126,
-34719,40483,38125,21517,21629,35884,25720,33088,33089,33090,33091,33092,33093,
-33095,33097,33101,33102,33103,33106,33110,33111,33112,33115,33116,33117,33118,
-33119,33121,33122,33123,33124,33126,33128,33130,33131,33132,33135,33138,33139,
-33141,33142,33143,33144,33153,33155,33156,33157,33158,33159,33161,33163,33164,
-33165,33166,33168,33170,33171,33172,33173,33174,33175,33177,33178,33182,33183,
-33184,33185,33186,33188,33189,33191,33193,33195,33196,33197,33198,33199,33200,
-33201,33202,33204,33205,33206,33207,33208,33209,33212,33213,33214,33215,33220,
-33221,33223,33224,33225,33227,33229,33230,33231,33232,33233,33234,33235,25721,
-34321,27169,33180,30952,25705,39764,25273,26411,33707,22696,40664,27819,28448,
-23518,38476,35851,29279,26576,25287,29281,20137,22982,27597,22675,26286,24149,
-21215,24917,26408,30446,30566,29287,31302,25343,21738,21584,38048,37027,23068,
-32435,27670,20035,22902,32784,22856,21335,30007,38590,22218,25376,33041,24700,
-38393,28118,21602,39297,20869,23273,33021,22958,38675,20522,27877,23612,25311,
-20320,21311,33147,36870,28346,34091,25288,24180,30910,25781,25467,24565,23064,
-37247,40479,23615,25423,32834,23421,21870,38218,38221,28037,24744,26592,29406,
-20957,23425,33236,33237,33238,33239,33240,33241,33242,33243,33244,33245,33246,
-33247,33248,33249,33250,33252,33253,33254,33256,33257,33259,33262,33263,33264,
-33265,33266,33269,33270,33271,33272,33273,33274,33277,33279,33283,33287,33288,
-33289,33290,33291,33294,33295,33297,33299,33301,33302,33303,33304,33305,33306,
-33309,33312,33316,33317,33318,33319,33321,33326,33330,33338,33340,33341,33343,
-33344,33345,33346,33347,33349,33350,33352,33354,33356,33357,33358,33360,33361,
-33362,33363,33364,33365,33366,33367,33369,33371,33372,33373,33374,33376,33377,
-33378,33379,33380,33381,33382,33383,33385,25319,27870,29275,25197,38062,32445,
-33043,27987,20892,24324,22900,21162,24594,22899,26262,34384,30111,25386,25062,
-31983,35834,21734,27431,40485,27572,34261,21589,20598,27812,21866,36276,29228,
-24085,24597,29750,25293,25490,29260,24472,28227,27966,25856,28504,30424,30928,
-30460,30036,21028,21467,20051,24222,26049,32810,32982,25243,21638,21032,28846,
-34957,36305,27873,21624,32986,22521,35060,36180,38506,37197,20329,27803,21943,
-30406,30768,25256,28921,28558,24429,34028,26842,30844,31735,33192,26379,40527,
-25447,30896,22383,30738,38713,25209,25259,21128,29749,27607,33386,33387,33388,
-33389,33393,33397,33398,33399,33400,33403,33404,33408,33409,33411,33413,33414,
-33415,33417,33420,33424,33427,33428,33429,33430,33434,33435,33438,33440,33442,
-33443,33447,33458,33461,33462,33466,33467,33468,33471,33472,33474,33475,33477,
-33478,33481,33488,33494,33497,33498,33501,33506,33511,33512,33513,33514,33516,
-33517,33518,33520,33522,33523,33525,33526,33528,33530,33532,33533,33534,33535,
-33536,33546,33547,33549,33552,33554,33555,33558,33560,33561,33565,33566,33567,
-33568,33569,33570,33571,33572,33573,33574,33577,33578,33582,33584,33586,33591,
-33595,33597,21860,33086,30130,30382,21305,30174,20731,23617,35692,31687,20559,
-29255,39575,39128,28418,29922,31080,25735,30629,25340,39057,36139,21697,32856,
-20050,22378,33529,33805,24179,20973,29942,35780,23631,22369,27900,39047,23110,
-30772,39748,36843,31893,21078,25169,38138,20166,33670,33889,33769,33970,22484,
-26420,22275,26222,28006,35889,26333,28689,26399,27450,26646,25114,22971,19971,
-20932,28422,26578,27791,20854,26827,22855,27495,30054,23822,33040,40784,26071,
-31048,31041,39569,36215,23682,20062,20225,21551,22865,30732,22120,27668,36804,
-24323,27773,27875,35755,25488,33598,33599,33601,33602,33604,33605,33608,33610,
-33611,33612,33613,33614,33619,33621,33622,33623,33624,33625,33629,33634,33648,
-33649,33650,33651,33652,33653,33654,33657,33658,33662,33663,33664,33665,33666,
-33667,33668,33671,33672,33674,33675,33676,33677,33679,33680,33681,33684,33685,
-33686,33687,33689,33690,33693,33695,33697,33698,33699,33700,33701,33702,33703,
-33708,33709,33710,33711,33717,33723,33726,33727,33730,33731,33732,33734,33736,
-33737,33739,33741,33742,33744,33745,33746,33747,33749,33751,33753,33754,33755,
-33758,33762,33763,33764,33766,33767,33768,33771,33772,33773,24688,27965,29301,
-25190,38030,38085,21315,36801,31614,20191,35878,20094,40660,38065,38067,21069,
-28508,36963,27973,35892,22545,23884,27424,27465,26538,21595,33108,32652,22681,
-34103,24378,25250,27207,38201,25970,24708,26725,30631,20052,20392,24039,38808,
-25772,32728,23789,20431,31373,20999,33540,19988,24623,31363,38054,20405,20146,
-31206,29748,21220,33465,25810,31165,23517,27777,38738,36731,27682,20542,21375,
-28165,25806,26228,27696,24773,39031,35831,24198,29756,31351,31179,19992,37041,
-29699,27714,22234,37195,27845,36235,21306,34502,26354,36527,23624,39537,28192,
-33774,33775,33779,33780,33781,33782,33783,33786,33787,33788,33790,33791,33792,
-33794,33797,33799,33800,33801,33802,33808,33810,33811,33812,33813,33814,33815,
-33817,33818,33819,33822,33823,33824,33825,33826,33827,33833,33834,33835,33836,
-33837,33838,33839,33840,33842,33843,33844,33845,33846,33847,33849,33850,33851,
-33854,33855,33856,33857,33858,33859,33860,33861,33863,33864,33865,33866,33867,
-33868,33869,33870,33871,33872,33874,33875,33876,33877,33878,33880,33885,33886,
-33887,33888,33890,33892,33893,33894,33895,33896,33898,33902,33903,33904,33906,
-33908,33911,33913,33915,33916,21462,23094,40843,36259,21435,22280,39079,26435,
-37275,27849,20840,30154,25331,29356,21048,21149,32570,28820,30264,21364,40522,
-27063,30830,38592,35033,32676,28982,29123,20873,26579,29924,22756,25880,22199,
-35753,39286,25200,32469,24825,28909,22764,20161,20154,24525,38887,20219,35748,
-20995,22922,32427,25172,20173,26085,25102,33592,33993,33635,34701,29076,28342,
-23481,32466,20887,25545,26580,32905,33593,34837,20754,23418,22914,36785,20083,
-27741,20837,35109,36719,38446,34122,29790,38160,38384,28070,33509,24369,25746,
-27922,33832,33134,40131,22622,36187,19977,21441,33917,33918,33919,33920,33921,
-33923,33924,33925,33926,33930,33933,33935,33936,33937,33938,33939,33940,33941,
-33942,33944,33946,33947,33949,33950,33951,33952,33954,33955,33956,33957,33958,
-33959,33960,33961,33962,33963,33964,33965,33966,33968,33969,33971,33973,33974,
-33975,33979,33980,33982,33984,33986,33987,33989,33990,33991,33992,33995,33996,
-33998,33999,34002,34004,34005,34007,34008,34009,34010,34011,34012,34014,34017,
-34018,34020,34023,34024,34025,34026,34027,34029,34030,34031,34033,34034,34035,
-34036,34037,34038,34039,34040,34041,34042,34043,34045,34046,34048,34049,34050,
-20254,25955,26705,21971,20007,25620,39578,25195,23234,29791,33394,28073,26862,
-20711,33678,30722,26432,21049,27801,32433,20667,21861,29022,31579,26194,29642,
-33515,26441,23665,21024,29053,34923,38378,38485,25797,36193,33203,21892,27733,
-25159,32558,22674,20260,21830,36175,26188,19978,23578,35059,26786,25422,31245,
-28903,33421,21242,38902,23569,21736,37045,32461,22882,36170,34503,33292,33293,
-36198,25668,23556,24913,28041,31038,35774,30775,30003,21627,20280,36523,28145,
-23072,32453,31070,27784,23457,23158,29978,32958,24910,28183,22768,29983,29989,
-29298,21319,32499,34051,34052,34053,34054,34055,34056,34057,34058,34059,34061,
-34062,34063,34064,34066,34068,34069,34070,34072,34073,34075,34076,34077,34078,
-34080,34082,34083,34084,34085,34086,34087,34088,34089,34090,34093,34094,34095,
-34096,34097,34098,34099,34100,34101,34102,34110,34111,34112,34113,34114,34116,
-34117,34118,34119,34123,34124,34125,34126,34127,34128,34129,34130,34131,34132,
-34133,34135,34136,34138,34139,34140,34141,34143,34144,34145,34146,34147,34149,
-34150,34151,34153,34154,34155,34156,34157,34158,34159,34160,34161,34163,34165,
-34166,34167,34168,34172,34173,34175,34176,34177,30465,30427,21097,32988,22307,
-24072,22833,29422,26045,28287,35799,23608,34417,21313,30707,25342,26102,20160,
-39135,34432,23454,35782,21490,30690,20351,23630,39542,22987,24335,31034,22763,
-19990,26623,20107,25325,35475,36893,21183,26159,21980,22124,36866,20181,20365,
-37322,39280,27663,24066,24643,23460,35270,35797,25910,25163,39318,23432,23551,
-25480,21806,21463,30246,20861,34092,26530,26803,27530,25234,36755,21460,33298,
-28113,30095,20070,36174,23408,29087,34223,26257,26329,32626,34560,40653,40736,
-23646,26415,36848,26641,26463,25101,31446,22661,24246,25968,28465,34178,34179,
-34182,34184,34185,34186,34187,34188,34189,34190,34192,34193,34194,34195,34196,
-34197,34198,34199,34200,34201,34202,34205,34206,34207,34208,34209,34210,34211,
-34213,34214,34215,34217,34219,34220,34221,34225,34226,34227,34228,34229,34230,
-34232,34234,34235,34236,34237,34238,34239,34240,34242,34243,34244,34245,34246,
-34247,34248,34250,34251,34252,34253,34254,34257,34258,34260,34262,34263,34264,
-34265,34266,34267,34269,34270,34271,34272,34273,34274,34275,34277,34278,34279,
-34280,34282,34283,34284,34285,34286,34287,34288,34289,34290,34291,34292,34293,
-34294,34295,34296,24661,21047,32781,25684,34928,29993,24069,26643,25332,38684,
-21452,29245,35841,27700,30561,31246,21550,30636,39034,33308,35828,30805,26388,
-28865,26031,25749,22070,24605,31169,21496,19997,27515,32902,23546,21987,22235,
-20282,20284,39282,24051,26494,32824,24578,39042,36865,23435,35772,35829,25628,
-33368,25822,22013,33487,37221,20439,32032,36895,31903,20723,22609,28335,23487,
-35785,32899,37240,33948,31639,34429,38539,38543,32485,39635,30862,23681,31319,
-36930,38567,31071,23385,25439,31499,34001,26797,21766,32553,29712,32034,38145,
-25152,22604,20182,23427,22905,22612,34297,34298,34300,34301,34302,34304,34305,
-34306,34307,34308,34310,34311,34312,34313,34314,34315,34316,34317,34318,34319,
-34320,34322,34323,34324,34325,34327,34328,34329,34330,34331,34332,34333,34334,
-34335,34336,34337,34338,34339,34340,34341,34342,34344,34346,34347,34348,34349,
-34350,34351,34352,34353,34354,34355,34356,34357,34358,34359,34361,34362,34363,
-34365,34366,34367,34368,34369,34370,34371,34372,34373,34374,34375,34376,34377,
-34378,34379,34380,34386,34387,34389,34390,34391,34392,34393,34395,34396,34397,
-34399,34400,34401,34403,34404,34405,34406,34407,34408,34409,34410,29549,25374,
-36427,36367,32974,33492,25260,21488,27888,37214,22826,24577,27760,22349,25674,
-36138,30251,28393,22363,27264,30192,28525,35885,35848,22374,27631,34962,30899,
-25506,21497,28845,27748,22616,25642,22530,26848,33179,21776,31958,20504,36538,
-28108,36255,28907,25487,28059,28372,32486,33796,26691,36867,28120,38518,35752,
-22871,29305,34276,33150,30140,35466,26799,21076,36386,38161,25552,39064,36420,
-21884,20307,26367,22159,24789,28053,21059,23625,22825,28155,22635,30000,29980,
-24684,33300,33094,25361,26465,36834,30522,36339,36148,38081,24086,21381,21548,
-28867,34413,34415,34416,34418,34419,34420,34421,34422,34423,34424,34435,34436,
-34437,34438,34439,34440,34441,34446,34447,34448,34449,34450,34452,34454,34455,
-34456,34457,34458,34459,34462,34463,34464,34465,34466,34469,34470,34475,34477,
-34478,34482,34483,34487,34488,34489,34491,34492,34493,34494,34495,34497,34498,
-34499,34501,34504,34508,34509,34514,34515,34517,34518,34519,34522,34524,34525,
-34528,34529,34530,34531,34533,34534,34535,34536,34538,34539,34540,34543,34549,
-34550,34551,34554,34555,34556,34557,34559,34561,34564,34565,34566,34571,34572,
-34574,34575,34576,34577,34580,34582,27712,24311,20572,20141,24237,25402,33351,
-36890,26704,37230,30643,21516,38108,24420,31461,26742,25413,31570,32479,30171,
-20599,25237,22836,36879,20984,31171,31361,22270,24466,36884,28034,23648,22303,
-21520,20820,28237,22242,25512,39059,33151,34581,35114,36864,21534,23663,33216,
-25302,25176,33073,40501,38464,39534,39548,26925,22949,25299,21822,25366,21703,
-34521,27964,23043,29926,34972,27498,22806,35916,24367,28286,29609,39037,20024,
-28919,23436,30871,25405,26202,30358,24779,23451,23113,19975,33109,27754,29579,
-20129,26505,32593,24448,26106,26395,24536,22916,23041,34585,34587,34589,34591,
-34592,34596,34598,34599,34600,34602,34603,34604,34605,34607,34608,34610,34611,
-34613,34614,34616,34617,34618,34620,34621,34624,34625,34626,34627,34628,34629,
-34630,34634,34635,34637,34639,34640,34641,34642,34644,34645,34646,34648,34650,
-34651,34652,34653,34654,34655,34657,34658,34662,34663,34664,34665,34666,34667,
-34668,34669,34671,34673,34674,34675,34677,34679,34680,34681,34682,34687,34688,
-34689,34692,34694,34695,34697,34698,34700,34702,34703,34704,34705,34706,34708,
-34709,34710,34712,34713,34714,34715,34716,34717,34718,34720,34721,34722,34723,
-34724,24013,24494,21361,38886,36829,26693,22260,21807,24799,20026,28493,32500,
-33479,33806,22996,20255,20266,23614,32428,26410,34074,21619,30031,32963,21890,
-39759,20301,28205,35859,23561,24944,21355,30239,28201,34442,25991,38395,32441,
-21563,31283,32010,38382,21985,32705,29934,25373,34583,28065,31389,25105,26017,
-21351,25569,27779,24043,21596,38056,20044,27745,35820,23627,26080,33436,26791,
-21566,21556,27595,27494,20116,25410,21320,33310,20237,20398,22366,25098,38654,
-26212,29289,21247,21153,24735,35823,26132,29081,26512,35199,30802,30717,26224,
-22075,21560,38177,29306,34725,34726,34727,34729,34730,34734,34736,34737,34738,
-34740,34742,34743,34744,34745,34747,34748,34750,34751,34753,34754,34755,34756,
-34757,34759,34760,34761,34764,34765,34766,34767,34768,34772,34773,34774,34775,
-34776,34777,34778,34780,34781,34782,34783,34785,34786,34787,34788,34790,34791,
-34792,34793,34795,34796,34797,34799,34800,34801,34802,34803,34804,34805,34806,
-34807,34808,34810,34811,34812,34813,34815,34816,34817,34818,34820,34821,34822,
-34823,34824,34825,34827,34828,34829,34830,34831,34832,34833,34834,34836,34839,
-34840,34841,34842,34844,34845,34846,34847,34848,34851,31232,24687,24076,24713,
-33181,22805,24796,29060,28911,28330,27728,29312,27268,34989,24109,20064,23219,
-21916,38115,27927,31995,38553,25103,32454,30606,34430,21283,38686,36758,26247,
-23777,20384,29421,19979,21414,22799,21523,25472,38184,20808,20185,40092,32420,
-21688,36132,34900,33335,38386,28046,24358,23244,26174,38505,29616,29486,21439,
-33146,39301,32673,23466,38519,38480,32447,30456,21410,38262,39321,31665,35140,
-28248,20065,32724,31077,35814,24819,21709,20139,39033,24055,27233,20687,21521,
-35937,33831,30813,38660,21066,21742,22179,38144,28040,23477,28102,26195,34852,
-34853,34854,34855,34856,34857,34858,34859,34860,34861,34862,34863,34864,34865,
-34867,34868,34869,34870,34871,34872,34874,34875,34877,34878,34879,34881,34882,
-34883,34886,34887,34888,34889,34890,34891,34894,34895,34896,34897,34898,34899,
-34901,34902,34904,34906,34907,34908,34909,34910,34911,34912,34918,34919,34922,
-34925,34927,34929,34931,34932,34933,34934,34936,34937,34938,34939,34940,34944,
-34947,34950,34951,34953,34954,34956,34958,34959,34960,34961,34963,34964,34965,
-34967,34968,34969,34970,34971,34973,34974,34975,34976,34977,34979,34981,34982,
-34983,34984,34985,34986,23567,23389,26657,32918,21880,31505,25928,26964,20123,
-27463,34638,38795,21327,25375,25658,37034,26012,32961,35856,20889,26800,21368,
-34809,25032,27844,27899,35874,23633,34218,33455,38156,27427,36763,26032,24571,
-24515,20449,34885,26143,33125,29481,24826,20852,21009,22411,24418,37026,34892,
-37266,24184,26447,24615,22995,20804,20982,33016,21256,27769,38596,29066,20241,
-20462,32670,26429,21957,38152,31168,34966,32483,22687,25100,38656,34394,22040,
-39035,24464,35768,33988,37207,21465,26093,24207,30044,24676,32110,23167,32490,
-32493,36713,21927,23459,24748,26059,29572,34988,34990,34991,34992,34994,34995,
-34996,34997,34998,35000,35001,35002,35003,35005,35006,35007,35008,35011,35012,
-35015,35016,35018,35019,35020,35021,35023,35024,35025,35027,35030,35031,35034,
-35035,35036,35037,35038,35040,35041,35046,35047,35049,35050,35051,35052,35053,
-35054,35055,35058,35061,35062,35063,35066,35067,35069,35071,35072,35073,35075,
-35076,35077,35078,35079,35080,35081,35083,35084,35085,35086,35087,35089,35092,
-35093,35094,35095,35096,35100,35101,35102,35103,35104,35106,35107,35108,35110,
-35111,35112,35113,35116,35117,35118,35119,35121,35122,35123,35125,35127,36873,
-30307,30505,32474,38772,34203,23398,31348,38634,34880,21195,29071,24490,26092,
-35810,23547,39535,24033,27529,27739,35757,35759,36874,36805,21387,25276,40486,
-40493,21568,20011,33469,29273,34460,23830,34905,28079,38597,21713,20122,35766,
-28937,21693,38409,28895,28153,30416,20005,30740,34578,23721,24310,35328,39068,
-38414,28814,27839,22852,25513,30524,34893,28436,33395,22576,29141,21388,30746,
-38593,21761,24422,28976,23476,35866,39564,27523,22830,40495,31207,26472,25196,
-20335,30113,32650,27915,38451,27687,20208,30162,20859,26679,28478,36992,33136,
-22934,29814,35128,35129,35130,35131,35132,35133,35134,35135,35136,35138,35139,
-35141,35142,35143,35144,35145,35146,35147,35148,35149,35150,35151,35152,35153,
-35154,35155,35156,35157,35158,35159,35160,35161,35162,35163,35164,35165,35168,
-35169,35170,35171,35172,35173,35175,35176,35177,35178,35179,35180,35181,35182,
-35183,35184,35185,35186,35187,35188,35189,35190,35191,35192,35193,35194,35196,
-35197,35198,35200,35202,35204,35205,35207,35208,35209,35210,35211,35212,35213,
-35214,35215,35216,35217,35218,35219,35220,35221,35222,35223,35224,35225,35226,
-35227,35228,35229,35230,35231,35232,35233,25671,23591,36965,31377,35875,23002,
-21676,33280,33647,35201,32768,26928,22094,32822,29239,37326,20918,20063,39029,
-25494,19994,21494,26355,33099,22812,28082,19968,22777,21307,25558,38129,20381,
-20234,34915,39056,22839,36951,31227,20202,33008,30097,27778,23452,23016,24413,
-26885,34433,20506,24050,20057,30691,20197,33402,25233,26131,37009,23673,20159,
-24441,33222,36920,32900,30123,20134,35028,24847,27589,24518,20041,30410,28322,
-35811,35758,35850,35793,24322,32764,32716,32462,33589,33643,22240,27575,38899,
-38452,23035,21535,38134,28139,23493,39278,23609,24341,38544,35234,35235,35236,
-35237,35238,35239,35240,35241,35242,35243,35244,35245,35246,35247,35248,35249,
-35250,35251,35252,35253,35254,35255,35256,35257,35258,35259,35260,35261,35262,
-35263,35264,35267,35277,35283,35284,35285,35287,35288,35289,35291,35293,35295,
-35296,35297,35298,35300,35303,35304,35305,35306,35308,35309,35310,35312,35313,
-35314,35316,35317,35318,35319,35320,35321,35322,35323,35324,35325,35326,35327,
-35329,35330,35331,35332,35333,35334,35336,35337,35338,35339,35340,35341,35342,
-35343,35344,35345,35346,35347,35348,35349,35350,35351,35352,35353,35354,35355,
-35356,35357,21360,33521,27185,23156,40560,24212,32552,33721,33828,33829,33639,
-34631,36814,36194,30408,24433,39062,30828,26144,21727,25317,20323,33219,30152,
-24248,38605,36362,34553,21647,27891,28044,27704,24703,21191,29992,24189,20248,
-24736,24551,23588,30001,37038,38080,29369,27833,28216,37193,26377,21451,21491,
-20305,37321,35825,21448,24188,36802,28132,20110,30402,27014,34398,24858,33286,
-20313,20446,36926,40060,24841,28189,28180,38533,20104,23089,38632,19982,23679,
-31161,23431,35821,32701,29577,22495,33419,37057,21505,36935,21947,23786,24481,
-24840,27442,29425,32946,35465,35358,35359,35360,35361,35362,35363,35364,35365,
-35366,35367,35368,35369,35370,35371,35372,35373,35374,35375,35376,35377,35378,
-35379,35380,35381,35382,35383,35384,35385,35386,35387,35388,35389,35391,35392,
-35393,35394,35395,35396,35397,35398,35399,35401,35402,35403,35404,35405,35406,
-35407,35408,35409,35410,35411,35412,35413,35414,35415,35416,35417,35418,35419,
-35420,35421,35422,35423,35424,35425,35426,35427,35428,35429,35430,35431,35432,
-35433,35434,35435,35436,35437,35438,35439,35440,35441,35442,35443,35444,35445,
-35446,35447,35448,35450,35451,35452,35453,35454,35455,35456,28020,23507,35029,
-39044,35947,39533,40499,28170,20900,20803,22435,34945,21407,25588,36757,22253,
-21592,22278,29503,28304,32536,36828,33489,24895,24616,38498,26352,32422,36234,
-36291,38053,23731,31908,26376,24742,38405,32792,20113,37095,21248,38504,20801,
-36816,34164,37213,26197,38901,23381,21277,30776,26434,26685,21705,28798,23472,
-36733,20877,22312,21681,25874,26242,36190,36163,33039,33900,36973,31967,20991,
-34299,26531,26089,28577,34468,36481,22122,36896,30338,28790,29157,36131,25321,
-21017,27901,36156,24590,22686,24974,26366,36192,25166,21939,28195,26413,36711,
-35457,35458,35459,35460,35461,35462,35463,35464,35467,35468,35469,35470,35471,
-35472,35473,35474,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485,
-35486,35487,35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,35498,
-35499,35500,35501,35502,35503,35504,35505,35506,35507,35508,35509,35510,35511,
-35512,35513,35514,35515,35516,35517,35518,35519,35520,35521,35522,35523,35524,
-35525,35526,35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537,
-35538,35539,35540,35541,35542,35543,35544,35545,35546,35547,35548,35549,35550,
-35551,35552,35553,35554,35555,38113,38392,30504,26629,27048,21643,20045,28856,
-35784,25688,25995,23429,31364,20538,23528,30651,27617,35449,31896,27838,30415,
-26025,36759,23853,23637,34360,26632,21344,25112,31449,28251,32509,27167,31456,
-24432,28467,24352,25484,28072,26454,19976,24080,36134,20183,32960,30260,38556,
-25307,26157,25214,27836,36213,29031,32617,20806,32903,21484,36974,25240,21746,
-34544,36761,32773,38167,34071,36825,27993,29645,26015,30495,29956,30759,33275,
-36126,38024,20390,26517,30137,35786,38663,25391,38215,38453,33976,25379,30529,
-24449,29424,20105,24596,25972,25327,27491,25919,35556,35557,35558,35559,35560,
-35561,35562,35563,35564,35565,35566,35567,35568,35569,35570,35571,35572,35573,
-35574,35575,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586,
-35587,35588,35589,35590,35592,35593,35594,35595,35596,35597,35598,35599,35600,
-35601,35602,35603,35604,35605,35606,35607,35608,35609,35610,35611,35612,35613,
-35614,35615,35616,35617,35618,35619,35620,35621,35623,35624,35625,35626,35627,
-35628,35629,35630,35631,35632,35633,35634,35635,35636,35637,35638,35639,35640,
-35641,35642,35643,35644,35645,35646,35647,35648,35649,35650,35651,35652,35653,
-24103,30151,37073,35777,33437,26525,25903,21553,34584,30693,32930,33026,27713,
-20043,32455,32844,30452,26893,27542,25191,20540,20356,22336,25351,27490,36286,
-21482,26088,32440,24535,25370,25527,33267,33268,32622,24092,23769,21046,26234,
-31209,31258,36136,28825,30164,28382,27835,31378,20013,30405,24544,38047,34935,
-32456,31181,32959,37325,20210,20247,33311,21608,24030,27954,35788,31909,36724,
-32920,24090,21650,30385,23449,26172,39588,29664,26666,34523,26417,29482,35832,
-35803,36880,31481,28891,29038,25284,30633,22065,20027,33879,26609,21161,34496,
-36142,38136,31569,35654,35655,35656,35657,35658,35659,35660,35661,35662,35663,
-35664,35665,35666,35667,35668,35669,35670,35671,35672,35673,35674,35675,35676,
-35677,35678,35679,35680,35681,35682,35683,35684,35685,35687,35688,35689,35690,
-35691,35693,35694,35695,35696,35697,35698,35699,35700,35701,35702,35703,35704,
-35705,35706,35707,35708,35709,35710,35711,35712,35713,35714,35715,35716,35717,
-35718,35719,35720,35721,35722,35723,35724,35725,35726,35727,35728,35729,35730,
-35731,35732,35733,35734,35735,35736,35737,35738,35739,35740,35741,35742,35743,
-35756,35761,35771,35783,35792,35818,35849,35870,20303,27880,31069,39547,25235,
-29226,25341,19987,30742,36716,25776,36186,31686,26729,24196,35013,22918,25758,
-22766,29366,26894,38181,36861,36184,22368,32512,35846,20934,25417,25305,21331,
-26700,29730,33537,37196,21828,30528,28796,27978,20857,21672,36164,23039,28363,
-28100,23388,32043,20180,31869,28371,23376,33258,28173,23383,39683,26837,36394,
-23447,32508,24635,32437,37049,36208,22863,25549,31199,36275,21330,26063,31062,
-35781,38459,32452,38075,32386,22068,37257,26368,32618,23562,36981,26152,24038,
-20304,26590,20570,20316,22352,24231,59408,59409,59410,59411,59412,35896,35897,
-35898,35899,35900,35901,35902,35903,35904,35906,35907,35908,35909,35912,35914,
-35915,35917,35918,35919,35920,35921,35922,35923,35924,35926,35927,35928,35929,
-35931,35932,35933,35934,35935,35936,35939,35940,35941,35942,35943,35944,35945,
-35948,35949,35950,35951,35952,35953,35954,35956,35957,35958,35959,35963,35964,
-35965,35966,35967,35968,35969,35971,35972,35974,35975,35976,35979,35981,35982,
-35983,35984,35985,35986,35987,35989,35990,35991,35993,35994,35995,35996,35997,
-35998,35999,36000,36001,36002,36003,36004,36005,36006,36007,36008,36009,36010,
-36011,36012,36013,20109,19980,20800,19984,24319,21317,19989,20120,19998,39730,
-23404,22121,20008,31162,20031,21269,20039,22829,29243,21358,27664,22239,32996,
-39319,27603,30590,40727,20022,20127,40720,20060,20073,20115,33416,23387,21868,
-22031,20164,21389,21405,21411,21413,21422,38757,36189,21274,21493,21286,21294,
-21310,36188,21350,21347,20994,21000,21006,21037,21043,21055,21056,21068,21086,
-21089,21084,33967,21117,21122,21121,21136,21139,20866,32596,20155,20163,20169,
-20162,20200,20193,20203,20190,20251,20211,20258,20324,20213,20261,20263,20233,
-20267,20318,20327,25912,20314,20317,36014,36015,36016,36017,36018,36019,36020,
-36021,36022,36023,36024,36025,36026,36027,36028,36029,36030,36031,36032,36033,
-36034,36035,36036,36037,36038,36039,36040,36041,36042,36043,36044,36045,36046,
-36047,36048,36049,36050,36051,36052,36053,36054,36055,36056,36057,36058,36059,
-36060,36061,36062,36063,36064,36065,36066,36067,36068,36069,36070,36071,36072,
-36073,36074,36075,36076,36077,36078,36079,36080,36081,36082,36083,36084,36085,
-36086,36087,36088,36089,36090,36091,36092,36093,36094,36095,36096,36097,36098,
-36099,36100,36101,36102,36103,36104,36105,36106,36107,36108,36109,20319,20311,
-20274,20285,20342,20340,20369,20361,20355,20367,20350,20347,20394,20348,20396,
-20372,20454,20456,20458,20421,20442,20451,20444,20433,20447,20472,20521,20556,
-20467,20524,20495,20526,20525,20478,20508,20492,20517,20520,20606,20547,20565,
-20552,20558,20588,20603,20645,20647,20649,20666,20694,20742,20717,20716,20710,
-20718,20743,20747,20189,27709,20312,20325,20430,40864,27718,31860,20846,24061,
-40649,39320,20865,22804,21241,21261,35335,21264,20971,22809,20821,20128,20822,
-20147,34926,34980,20149,33044,35026,31104,23348,34819,32696,20907,20913,20925,
-20924,36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120,36121,
-36122,36123,36124,36128,36177,36178,36183,36191,36197,36200,36201,36202,36204,
-36206,36207,36209,36210,36216,36217,36218,36219,36220,36221,36222,36223,36224,
-36226,36227,36230,36231,36232,36233,36236,36237,36238,36239,36240,36242,36243,
-36245,36246,36247,36248,36249,36250,36251,36252,36253,36254,36256,36257,36258,
-36260,36261,36262,36263,36264,36265,36266,36267,36268,36269,36270,36271,36272,
-36274,36278,36279,36281,36283,36285,36288,36289,36290,36293,36295,36296,36297,
-36298,36301,36304,36306,36307,36308,20935,20886,20898,20901,35744,35750,35751,
-35754,35764,35765,35767,35778,35779,35787,35791,35790,35794,35795,35796,35798,
-35800,35801,35804,35807,35808,35812,35816,35817,35822,35824,35827,35830,35833,
-35836,35839,35840,35842,35844,35847,35852,35855,35857,35858,35860,35861,35862,
-35865,35867,35864,35869,35871,35872,35873,35877,35879,35882,35883,35886,35887,
-35890,35891,35893,35894,21353,21370,38429,38434,38433,38449,38442,38461,38460,
-38466,38473,38484,38495,38503,38508,38514,38516,38536,38541,38551,38576,37015,
-37019,37021,37017,37036,37025,37044,37043,37046,37050,36309,36312,36313,36316,
-36320,36321,36322,36325,36326,36327,36329,36333,36334,36336,36337,36338,36340,
-36342,36348,36350,36351,36352,36353,36354,36355,36356,36358,36359,36360,36363,
-36365,36366,36368,36369,36370,36371,36373,36374,36375,36376,36377,36378,36379,
-36380,36384,36385,36388,36389,36390,36391,36392,36395,36397,36400,36402,36403,
-36404,36406,36407,36408,36411,36412,36414,36415,36419,36421,36422,36428,36429,
-36430,36431,36432,36435,36436,36437,36438,36439,36440,36442,36443,36444,36445,
-36446,36447,36448,36449,36450,36451,36452,36453,36455,36456,36458,36459,36462,
-36465,37048,37040,37071,37061,37054,37072,37060,37063,37075,37094,37090,37084,
-37079,37083,37099,37103,37118,37124,37154,37150,37155,37169,37167,37177,37187,
-37190,21005,22850,21154,21164,21165,21182,21759,21200,21206,21232,21471,29166,
-30669,24308,20981,20988,39727,21430,24321,30042,24047,22348,22441,22433,22654,
-22716,22725,22737,22313,22316,22314,22323,22329,22318,22319,22364,22331,22338,
-22377,22405,22379,22406,22396,22395,22376,22381,22390,22387,22445,22436,22412,
-22450,22479,22439,22452,22419,22432,22485,22488,22490,22489,22482,22456,22516,
-22511,22520,22500,22493,36467,36469,36471,36472,36473,36474,36475,36477,36478,
-36480,36482,36483,36484,36486,36488,36489,36490,36491,36492,36493,36494,36497,
-36498,36499,36501,36502,36503,36504,36505,36506,36507,36509,36511,36512,36513,
-36514,36515,36516,36517,36518,36519,36520,36521,36522,36525,36526,36528,36529,
-36531,36532,36533,36534,36535,36536,36537,36539,36540,36541,36542,36543,36544,
-36545,36546,36547,36548,36549,36550,36551,36552,36553,36554,36555,36556,36557,
-36559,36560,36561,36562,36563,36564,36565,36566,36567,36568,36569,36570,36571,
-36572,36573,36574,36575,36576,36577,36578,36579,36580,22539,22541,22525,22509,
-22528,22558,22553,22596,22560,22629,22636,22657,22665,22682,22656,39336,40729,
-25087,33401,33405,33407,33423,33418,33448,33412,33422,33425,33431,33433,33451,
-33464,33470,33456,33480,33482,33507,33432,33463,33454,33483,33484,33473,33449,
-33460,33441,33450,33439,33476,33486,33444,33505,33545,33527,33508,33551,33543,
-33500,33524,33490,33496,33548,33531,33491,33553,33562,33542,33556,33557,33504,
-33493,33564,33617,33627,33628,33544,33682,33596,33588,33585,33691,33630,33583,
-33615,33607,33603,33631,33600,33559,33632,33581,33594,33587,33638,33637,36581,
-36582,36583,36584,36585,36586,36587,36588,36589,36590,36591,36592,36593,36594,
-36595,36596,36597,36598,36599,36600,36601,36602,36603,36604,36605,36606,36607,
-36608,36609,36610,36611,36612,36613,36614,36615,36616,36617,36618,36619,36620,
-36621,36622,36623,36624,36625,36626,36627,36628,36629,36630,36631,36632,36633,
-36634,36635,36636,36637,36638,36639,36640,36641,36642,36643,36644,36645,36646,
-36647,36648,36649,36650,36651,36652,36653,36654,36655,36656,36657,36658,36659,
-36660,36661,36662,36663,36664,36665,36666,36667,36668,36669,36670,36671,36672,
-36673,36674,36675,36676,33640,33563,33641,33644,33642,33645,33646,33712,33656,
-33715,33716,33696,33706,33683,33692,33669,33660,33718,33705,33661,33720,33659,
-33688,33694,33704,33722,33724,33729,33793,33765,33752,22535,33816,33803,33757,
-33789,33750,33820,33848,33809,33798,33748,33759,33807,33795,33784,33785,33770,
-33733,33728,33830,33776,33761,33884,33873,33882,33881,33907,33927,33928,33914,
-33929,33912,33852,33862,33897,33910,33932,33934,33841,33901,33985,33997,34000,
-34022,33981,34003,33994,33983,33978,34016,33953,33977,33972,33943,34021,34019,
-34060,29965,34104,34032,34105,34079,34106,36677,36678,36679,36680,36681,36682,
-36683,36684,36685,36686,36687,36688,36689,36690,36691,36692,36693,36694,36695,
-36696,36697,36698,36699,36700,36701,36702,36703,36704,36705,36706,36707,36708,
-36709,36714,36736,36748,36754,36765,36768,36769,36770,36772,36773,36774,36775,
-36778,36780,36781,36782,36783,36786,36787,36788,36789,36791,36792,36794,36795,
-36796,36799,36800,36803,36806,36809,36810,36811,36812,36813,36815,36818,36822,
-36823,36826,36832,36833,36835,36839,36844,36847,36849,36850,36852,36853,36854,
-36858,36859,36860,36862,36863,36871,36872,36876,36878,36883,36885,36888,34134,
-34107,34047,34044,34137,34120,34152,34148,34142,34170,30626,34115,34162,34171,
-34212,34216,34183,34191,34169,34222,34204,34181,34233,34231,34224,34259,34241,
-34268,34303,34343,34309,34345,34326,34364,24318,24328,22844,22849,32823,22869,
-22874,22872,21263,23586,23589,23596,23604,25164,25194,25247,25275,25290,25306,
-25303,25326,25378,25334,25401,25419,25411,25517,25590,25457,25466,25486,25524,
-25453,25516,25482,25449,25518,25532,25586,25592,25568,25599,25540,25566,25550,
-25682,25542,25534,25669,25665,25611,25627,25632,25612,25638,25633,25694,25732,
-25709,25750,36889,36892,36899,36900,36901,36903,36904,36905,36906,36907,36908,
-36912,36913,36914,36915,36916,36919,36921,36922,36925,36927,36928,36931,36933,
-36934,36936,36937,36938,36939,36940,36942,36948,36949,36950,36953,36954,36956,
-36957,36958,36959,36960,36961,36964,36966,36967,36969,36970,36971,36972,36975,
-36976,36977,36978,36979,36982,36983,36984,36985,36986,36987,36988,36990,36993,
-36996,36997,36998,36999,37001,37002,37004,37005,37006,37007,37008,37010,37012,
-37014,37016,37018,37020,37022,37023,37024,37028,37029,37031,37032,37033,37035,
-37037,37042,37047,37052,37053,37055,37056,25722,25783,25784,25753,25786,25792,
-25808,25815,25828,25826,25865,25893,25902,24331,24530,29977,24337,21343,21489,
-21501,21481,21480,21499,21522,21526,21510,21579,21586,21587,21588,21590,21571,
-21537,21591,21593,21539,21554,21634,21652,21623,21617,21604,21658,21659,21636,
-21622,21606,21661,21712,21677,21698,21684,21714,21671,21670,21715,21716,21618,
-21667,21717,21691,21695,21708,21721,21722,21724,21673,21674,21668,21725,21711,
-21726,21787,21735,21792,21757,21780,21747,21794,21795,21775,21777,21799,21802,
-21863,21903,21941,21833,21869,21825,21845,21823,21840,21820,37058,37059,37062,
-37064,37065,37067,37068,37069,37074,37076,37077,37078,37080,37081,37082,37086,
-37087,37088,37091,37092,37093,37097,37098,37100,37102,37104,37105,37106,37107,
-37109,37110,37111,37113,37114,37115,37116,37119,37120,37121,37123,37125,37126,
-37127,37128,37129,37130,37131,37132,37133,37134,37135,37136,37137,37138,37139,
-37140,37141,37142,37143,37144,37146,37147,37148,37149,37151,37152,37153,37156,
-37157,37158,37159,37160,37161,37162,37163,37164,37165,37166,37168,37170,37171,
-37172,37173,37174,37175,37176,37178,37179,37180,37181,37182,37183,37184,37185,
-37186,37188,21815,21846,21877,21878,21879,21811,21808,21852,21899,21970,21891,
-21937,21945,21896,21889,21919,21886,21974,21905,21883,21983,21949,21950,21908,
-21913,21994,22007,21961,22047,21969,21995,21996,21972,21990,21981,21956,21999,
-21989,22002,22003,21964,21965,21992,22005,21988,36756,22046,22024,22028,22017,
-22052,22051,22014,22016,22055,22061,22104,22073,22103,22060,22093,22114,22105,
-22108,22092,22100,22150,22116,22129,22123,22139,22140,22149,22163,22191,22228,
-22231,22237,22241,22261,22251,22265,22271,22276,22282,22281,22300,24079,24089,
-24084,24081,24113,24123,24124,37189,37191,37192,37201,37203,37204,37205,37206,
-37208,37209,37211,37212,37215,37216,37222,37223,37224,37227,37229,37235,37242,
-37243,37244,37248,37249,37250,37251,37252,37254,37256,37258,37262,37263,37267,
-37268,37269,37270,37271,37272,37273,37276,37277,37278,37279,37280,37281,37284,
-37285,37286,37287,37288,37289,37291,37292,37296,37297,37298,37299,37302,37303,
-37304,37305,37307,37308,37309,37310,37311,37312,37313,37314,37315,37316,37317,
-37318,37320,37323,37328,37330,37331,37332,37333,37334,37335,37336,37337,37338,
-37339,37341,37342,37343,37344,37345,37346,37347,37348,37349,24119,24132,24148,
-24155,24158,24161,23692,23674,23693,23696,23702,23688,23704,23705,23697,23706,
-23708,23733,23714,23741,23724,23723,23729,23715,23745,23735,23748,23762,23780,
-23755,23781,23810,23811,23847,23846,23854,23844,23838,23814,23835,23896,23870,
-23860,23869,23916,23899,23919,23901,23915,23883,23882,23913,23924,23938,23961,
-23965,35955,23991,24005,24435,24439,24450,24455,24457,24460,24469,24473,24476,
-24488,24493,24501,24508,34914,24417,29357,29360,29364,29367,29368,29379,29377,
-29390,29389,29394,29416,29423,29417,29426,29428,29431,29441,29427,29443,29434,
-37350,37351,37352,37353,37354,37355,37356,37357,37358,37359,37360,37361,37362,
-37363,37364,37365,37366,37367,37368,37369,37370,37371,37372,37373,37374,37375,
-37376,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37387,37388,
-37389,37390,37391,37392,37393,37394,37395,37396,37397,37398,37399,37400,37401,
-37402,37403,37404,37405,37406,37407,37408,37409,37410,37411,37412,37413,37414,
-37415,37416,37417,37418,37419,37420,37421,37422,37423,37424,37425,37426,37427,
-37428,37429,37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440,
-37441,37442,37443,37444,37445,29435,29463,29459,29473,29450,29470,29469,29461,
-29474,29497,29477,29484,29496,29489,29520,29517,29527,29536,29548,29551,29566,
-33307,22821,39143,22820,22786,39267,39271,39272,39273,39274,39275,39276,39284,
-39287,39293,39296,39300,39303,39306,39309,39312,39313,39315,39316,39317,24192,
-24209,24203,24214,24229,24224,24249,24245,24254,24243,36179,24274,24273,24283,
-24296,24298,33210,24516,24521,24534,24527,24579,24558,24580,24545,24548,24574,
-24581,24582,24554,24557,24568,24601,24629,24614,24603,24591,24589,24617,24619,
-24586,24639,24609,24696,24697,24699,24698,24642,37446,37447,37448,37449,37450,
-37451,37452,37453,37454,37455,37456,37457,37458,37459,37460,37461,37462,37463,
-37464,37465,37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476,
-37477,37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489,
-37490,37491,37493,37494,37495,37496,37497,37498,37499,37500,37501,37502,37503,
-37504,37505,37506,37507,37508,37509,37510,37511,37512,37513,37514,37515,37516,
-37517,37519,37520,37521,37522,37523,37524,37525,37526,37527,37528,37529,37530,
-37531,37532,37533,37534,37535,37536,37537,37538,37539,37540,37541,37542,37543,
-24682,24701,24726,24730,24749,24733,24707,24722,24716,24731,24812,24763,24753,
-24797,24792,24774,24794,24756,24864,24870,24853,24867,24820,24832,24846,24875,
-24906,24949,25004,24980,24999,25015,25044,25077,24541,38579,38377,38379,38385,
-38387,38389,38390,38396,38398,38403,38404,38406,38408,38410,38411,38412,38413,
-38415,38418,38421,38422,38423,38425,38426,20012,29247,25109,27701,27732,27740,
-27722,27811,27781,27792,27796,27788,27752,27753,27764,27766,27782,27817,27856,
-27860,27821,27895,27896,27889,27863,27826,27872,27862,27898,27883,27886,27825,
-27859,27887,27902,37544,37545,37546,37547,37548,37549,37551,37552,37553,37554,
-37555,37556,37557,37558,37559,37560,37561,37562,37563,37564,37565,37566,37567,
-37568,37569,37570,37571,37572,37573,37574,37575,37577,37578,37579,37580,37581,
-37582,37583,37584,37585,37586,37587,37588,37589,37590,37591,37592,37593,37594,
-37595,37596,37597,37598,37599,37600,37601,37602,37603,37604,37605,37606,37607,
-37608,37609,37610,37611,37612,37613,37614,37615,37616,37617,37618,37619,37620,
-37621,37622,37623,37624,37625,37626,37627,37628,37629,37630,37631,37632,37633,
-37634,37635,37636,37637,37638,37639,37640,37641,27961,27943,27916,27971,27976,
-27911,27908,27929,27918,27947,27981,27950,27957,27930,27983,27986,27988,27955,
-28049,28015,28062,28064,27998,28051,28052,27996,28000,28028,28003,28186,28103,
-28101,28126,28174,28095,28128,28177,28134,28125,28121,28182,28075,28172,28078,
-28203,28270,28238,28267,28338,28255,28294,28243,28244,28210,28197,28228,28383,
-28337,28312,28384,28461,28386,28325,28327,28349,28347,28343,28375,28340,28367,
-28303,28354,28319,28514,28486,28487,28452,28437,28409,28463,28470,28491,28532,
-28458,28425,28457,28553,28557,28556,28536,28530,28540,28538,28625,37642,37643,
-37644,37645,37646,37647,37648,37649,37650,37651,37652,37653,37654,37655,37656,
-37657,37658,37659,37660,37661,37662,37663,37664,37665,37666,37667,37668,37669,
-37670,37671,37672,37673,37674,37675,37676,37677,37678,37679,37680,37681,37682,
-37683,37684,37685,37686,37687,37688,37689,37690,37691,37692,37693,37695,37696,
-37697,37698,37699,37700,37701,37702,37703,37704,37705,37706,37707,37708,37709,
-37710,37711,37712,37713,37714,37715,37716,37717,37718,37719,37720,37721,37722,
-37723,37724,37725,37726,37727,37728,37729,37730,37731,37732,37733,37734,37735,
-37736,37737,37739,28617,28583,28601,28598,28610,28641,28654,28638,28640,28655,
-28698,28707,28699,28729,28725,28751,28766,23424,23428,23445,23443,23461,23480,
-29999,39582,25652,23524,23534,35120,23536,36423,35591,36790,36819,36821,36837,
-36846,36836,36841,36838,36851,36840,36869,36868,36875,36902,36881,36877,36886,
-36897,36917,36918,36909,36911,36932,36945,36946,36944,36968,36952,36962,36955,
-26297,36980,36989,36994,37000,36995,37003,24400,24407,24406,24408,23611,21675,
-23632,23641,23409,23651,23654,32700,24362,24361,24365,33396,24380,39739,23662,
-22913,22915,22925,22953,22954,22947,37740,37741,37742,37743,37744,37745,37746,
-37747,37748,37749,37750,37751,37752,37753,37754,37755,37756,37757,37758,37759,
-37760,37761,37762,37763,37764,37765,37766,37767,37768,37769,37770,37771,37772,
-37773,37774,37776,37777,37778,37779,37780,37781,37782,37783,37784,37785,37786,
-37787,37788,37789,37790,37791,37792,37793,37794,37795,37796,37797,37798,37799,
-37800,37801,37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812,
-37813,37814,37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825,
-37826,37827,37828,37829,37830,37831,37832,37833,37835,37836,37837,22935,22986,
-22955,22942,22948,22994,22962,22959,22999,22974,23045,23046,23005,23048,23011,
-23000,23033,23052,23049,23090,23092,23057,23075,23059,23104,23143,23114,23125,
-23100,23138,23157,33004,23210,23195,23159,23162,23230,23275,23218,23250,23252,
-23224,23264,23267,23281,23254,23270,23256,23260,23305,23319,23318,23346,23351,
-23360,23573,23580,23386,23397,23411,23377,23379,23394,39541,39543,39544,39546,
-39551,39549,39552,39553,39557,39560,39562,39568,39570,39571,39574,39576,39579,
-39580,39581,39583,39584,39586,39587,39589,39591,32415,32417,32419,32421,32424,
-32425,37838,37839,37840,37841,37842,37843,37844,37845,37847,37848,37849,37850,
-37851,37852,37853,37854,37855,37856,37857,37858,37859,37860,37861,37862,37863,
-37864,37865,37866,37867,37868,37869,37870,37871,37872,37873,37874,37875,37876,
-37877,37878,37879,37880,37881,37882,37883,37884,37885,37886,37887,37888,37889,
-37890,37891,37892,37893,37894,37895,37896,37897,37898,37899,37900,37901,37902,
-37903,37904,37905,37906,37907,37908,37909,37910,37911,37912,37913,37914,37915,
-37916,37917,37918,37919,37920,37921,37922,37923,37924,37925,37926,37927,37928,
-37929,37930,37931,37932,37933,37934,32429,32432,32446,32448,32449,32450,32457,
-32459,32460,32464,32468,32471,32475,32480,32481,32488,32491,32494,32495,32497,
-32498,32525,32502,32506,32507,32510,32513,32514,32515,32519,32520,32523,32524,
-32527,32529,32530,32535,32537,32540,32539,32543,32545,32546,32547,32548,32549,
-32550,32551,32554,32555,32556,32557,32559,32560,32561,32562,32563,32565,24186,
-30079,24027,30014,37013,29582,29585,29614,29602,29599,29647,29634,29649,29623,
-29619,29632,29641,29640,29669,29657,39036,29706,29673,29671,29662,29626,29682,
-29711,29738,29787,29734,29733,29736,29744,29742,29740,37935,37936,37937,37938,
-37939,37940,37941,37942,37943,37944,37945,37946,37947,37948,37949,37951,37952,
-37953,37954,37955,37956,37957,37958,37959,37960,37961,37962,37963,37964,37965,
-37966,37967,37968,37969,37970,37971,37972,37973,37974,37975,37976,37977,37978,
-37979,37980,37981,37982,37983,37984,37985,37986,37987,37988,37989,37990,37991,
-37992,37993,37994,37996,37997,37998,37999,38000,38001,38002,38003,38004,38005,
-38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016,38017,38018,
-38019,38020,38033,38038,38040,38087,38095,38099,38100,38106,38118,38139,38172,
-38176,29723,29722,29761,29788,29783,29781,29785,29815,29805,29822,29852,29838,
-29824,29825,29831,29835,29854,29864,29865,29840,29863,29906,29882,38890,38891,
-38892,26444,26451,26462,26440,26473,26533,26503,26474,26483,26520,26535,26485,
-26536,26526,26541,26507,26487,26492,26608,26633,26584,26634,26601,26544,26636,
-26585,26549,26586,26547,26589,26624,26563,26552,26594,26638,26561,26621,26674,
-26675,26720,26721,26702,26722,26692,26724,26755,26653,26709,26726,26689,26727,
-26688,26686,26698,26697,26665,26805,26767,26740,26743,26771,26731,26818,26990,
-26876,26911,26912,26873,38183,38195,38205,38211,38216,38219,38229,38234,38240,
-38254,38260,38261,38263,38264,38265,38266,38267,38268,38269,38270,38272,38273,
-38274,38275,38276,38277,38278,38279,38280,38281,38282,38283,38284,38285,38286,
-38287,38288,38289,38290,38291,38292,38293,38294,38295,38296,38297,38298,38299,
-38300,38301,38302,38303,38304,38305,38306,38307,38308,38309,38310,38311,38312,
-38313,38314,38315,38316,38317,38318,38319,38320,38321,38322,38323,38324,38325,
-38326,38327,38328,38329,38330,38331,38332,38333,38334,38335,38336,38337,38338,
-38339,38340,38341,38342,38343,38344,38345,38346,38347,26916,26864,26891,26881,
-26967,26851,26896,26993,26937,26976,26946,26973,27012,26987,27008,27032,27000,
-26932,27084,27015,27016,27086,27017,26982,26979,27001,27035,27047,27067,27051,
-27053,27092,27057,27073,27082,27103,27029,27104,27021,27135,27183,27117,27159,
-27160,27237,27122,27204,27198,27296,27216,27227,27189,27278,27257,27197,27176,
-27224,27260,27281,27280,27305,27287,27307,29495,29522,27521,27522,27527,27524,
-27538,27539,27533,27546,27547,27553,27562,36715,36717,36721,36722,36723,36725,
-36726,36728,36727,36729,36730,36732,36734,36737,36738,36740,36743,36747,38348,
-38349,38350,38351,38352,38353,38354,38355,38356,38357,38358,38359,38360,38361,
-38362,38363,38364,38365,38366,38367,38368,38369,38370,38371,38372,38373,38374,
-38375,38380,38399,38407,38419,38424,38427,38430,38432,38435,38436,38437,38438,
-38439,38440,38441,38443,38444,38445,38447,38448,38455,38456,38457,38458,38462,
-38465,38467,38474,38478,38479,38481,38482,38483,38486,38487,38488,38489,38490,
-38492,38493,38494,38496,38499,38501,38502,38507,38509,38510,38511,38512,38513,
-38515,38520,38521,38522,38523,38524,38525,38526,38527,38528,38529,38530,38531,
-38532,38535,38537,38538,36749,36750,36751,36760,36762,36558,25099,25111,25115,
-25119,25122,25121,25125,25124,25132,33255,29935,29940,29951,29967,29969,29971,
-25908,26094,26095,26096,26122,26137,26482,26115,26133,26112,28805,26359,26141,
-26164,26161,26166,26165,32774,26207,26196,26177,26191,26198,26209,26199,26231,
-26244,26252,26279,26269,26302,26331,26332,26342,26345,36146,36147,36150,36155,
-36157,36160,36165,36166,36168,36169,36167,36173,36181,36185,35271,35274,35275,
-35276,35278,35279,35280,35281,29294,29343,29277,29286,29295,29310,29311,29316,
-29323,29325,29327,29330,25352,25394,25520,38540,38542,38545,38546,38547,38549,
-38550,38554,38555,38557,38558,38559,38560,38561,38562,38563,38564,38565,38566,
-38568,38569,38570,38571,38572,38573,38574,38575,38577,38578,38580,38581,38583,
-38584,38586,38587,38591,38594,38595,38600,38602,38603,38608,38609,38611,38612,
-38614,38615,38616,38617,38618,38619,38620,38621,38622,38623,38625,38626,38627,
-38628,38629,38630,38631,38635,38636,38637,38638,38640,38641,38642,38644,38645,
-38648,38650,38651,38652,38653,38655,38658,38659,38661,38666,38667,38668,38672,
-38673,38674,38676,38677,38679,38680,38681,38682,38683,38685,38687,38688,25663,
-25816,32772,27626,27635,27645,27637,27641,27653,27655,27654,27661,27669,27672,
-27673,27674,27681,27689,27684,27690,27698,25909,25941,25963,29261,29266,29270,
-29232,34402,21014,32927,32924,32915,32956,26378,32957,32945,32939,32941,32948,
-32951,32999,33000,33001,33002,32987,32962,32964,32985,32973,32983,26384,32989,
-33003,33009,33012,33005,33037,33038,33010,33020,26389,33042,35930,33078,33054,
-33068,33048,33074,33096,33100,33107,33140,33113,33114,33137,33120,33129,33148,
-33149,33133,33127,22605,23221,33160,33154,33169,28373,33187,33194,33228,26406,
-33226,33211,38689,38690,38691,38692,38693,38694,38695,38696,38697,38699,38700,
-38702,38703,38705,38707,38708,38709,38710,38711,38714,38715,38716,38717,38719,
-38720,38721,38722,38723,38724,38725,38726,38727,38728,38729,38730,38731,38732,
-38733,38734,38735,38736,38737,38740,38741,38743,38744,38746,38748,38749,38751,
-38755,38756,38758,38759,38760,38762,38763,38764,38765,38766,38767,38768,38769,
-38770,38773,38775,38776,38777,38778,38779,38781,38782,38783,38784,38785,38786,
-38787,38788,38790,38791,38792,38793,38794,38796,38798,38799,38800,38803,38805,
-38806,38807,38809,38810,38811,38812,38813,33217,33190,27428,27447,27449,27459,
-27462,27481,39121,39122,39123,39125,39129,39130,27571,24384,27586,35315,26000,
-40785,26003,26044,26054,26052,26051,26060,26062,26066,26070,28800,28828,28822,
-28829,28859,28864,28855,28843,28849,28904,28874,28944,28947,28950,28975,28977,
-29043,29020,29032,28997,29042,29002,29048,29050,29080,29107,29109,29096,29088,
-29152,29140,29159,29177,29213,29224,28780,28952,29030,29113,25150,25149,25155,
-25160,25161,31035,31040,31046,31049,31067,31068,31059,31066,31074,31063,31072,
-31087,31079,31098,31109,31114,31130,31143,31155,24529,24528,38814,38815,38817,
-38818,38820,38821,38822,38823,38824,38825,38826,38828,38830,38832,38833,38835,
-38837,38838,38839,38840,38841,38842,38843,38844,38845,38846,38847,38848,38849,
-38850,38851,38852,38853,38854,38855,38856,38857,38858,38859,38860,38861,38862,
-38863,38864,38865,38866,38867,38868,38869,38870,38871,38872,38873,38874,38875,
-38876,38877,38878,38879,38880,38881,38882,38883,38884,38885,38888,38894,38895,
-38896,38897,38898,38900,38903,38904,38905,38906,38907,38908,38909,38910,38911,
-38912,38913,38914,38915,38916,38917,38918,38919,38920,38921,38922,38923,38924,
-38925,38926,24636,24669,24666,24679,24641,24665,24675,24747,24838,24845,24925,
-25001,24989,25035,25041,25094,32896,32895,27795,27894,28156,30710,30712,30720,
-30729,30743,30744,30737,26027,30765,30748,30749,30777,30778,30779,30751,30780,
-30757,30764,30755,30761,30798,30829,30806,30807,30758,30800,30791,30796,30826,
-30875,30867,30874,30855,30876,30881,30883,30898,30905,30885,30932,30937,30921,
-30956,30962,30981,30964,30995,31012,31006,31028,40859,40697,40699,40700,30449,
-30468,30477,30457,30471,30472,30490,30498,30489,30509,30502,30517,30520,30544,
-30545,30535,30531,30554,30568,38927,38928,38929,38930,38931,38932,38933,38934,
-38935,38936,38937,38938,38939,38940,38941,38942,38943,38944,38945,38946,38947,
-38948,38949,38950,38951,38952,38953,38954,38955,38956,38957,38958,38959,38960,
-38961,38962,38963,38964,38965,38966,38967,38968,38969,38970,38971,38972,38973,
-38974,38975,38976,38977,38978,38979,38980,38981,38982,38983,38984,38985,38986,
-38987,38988,38989,38990,38991,38992,38993,38994,38995,38996,38997,38998,38999,
-39000,39001,39002,39003,39004,39005,39006,39007,39008,39009,39010,39011,39012,
-39013,39014,39015,39016,39017,39018,39019,39020,39021,39022,30562,30565,30591,
-30605,30589,30592,30604,30609,30623,30624,30640,30645,30653,30010,30016,30030,
-30027,30024,30043,30066,30073,30083,32600,32609,32607,35400,32616,32628,32625,
-32633,32641,32638,30413,30437,34866,38021,38022,38023,38027,38026,38028,38029,
-38031,38032,38036,38039,38037,38042,38043,38044,38051,38052,38059,38058,38061,
-38060,38063,38064,38066,38068,38070,38071,38072,38073,38074,38076,38077,38079,
-38084,38088,38089,38090,38091,38092,38093,38094,38096,38097,38098,38101,38102,
-38103,38105,38104,38107,38110,38111,38112,38114,38116,38117,38119,38120,38122,
-39023,39024,39025,39026,39027,39028,39051,39054,39058,39061,39065,39075,39080,
-39081,39082,39083,39084,39085,39086,39087,39088,39089,39090,39091,39092,39093,
-39094,39095,39096,39097,39098,39099,39100,39101,39102,39103,39104,39105,39106,
-39107,39108,39109,39110,39111,39112,39113,39114,39115,39116,39117,39119,39120,
-39124,39126,39127,39131,39132,39133,39136,39137,39138,39139,39140,39141,39142,
-39145,39146,39147,39148,39149,39150,39151,39152,39153,39154,39155,39156,39157,
-39158,39159,39160,39161,39162,39163,39164,39165,39166,39167,39168,39169,39170,
-39171,39172,39173,39174,39175,38121,38123,38126,38127,38131,38132,38133,38135,
-38137,38140,38141,38143,38147,38146,38150,38151,38153,38154,38157,38158,38159,
-38162,38163,38164,38165,38166,38168,38171,38173,38174,38175,38178,38186,38187,
-38185,38188,38193,38194,38196,38198,38199,38200,38204,38206,38207,38210,38197,
-38212,38213,38214,38217,38220,38222,38223,38226,38227,38228,38230,38231,38232,
-38233,38235,38238,38239,38237,38241,38242,38244,38245,38246,38247,38248,38249,
-38250,38251,38252,38255,38257,38258,38259,38202,30695,30700,38601,31189,31213,
-31203,31211,31238,23879,31235,31234,31262,31252,39176,39177,39178,39179,39180,
-39182,39183,39185,39186,39187,39188,39189,39190,39191,39192,39193,39194,39195,
-39196,39197,39198,39199,39200,39201,39202,39203,39204,39205,39206,39207,39208,
-39209,39210,39211,39212,39213,39215,39216,39217,39218,39219,39220,39221,39222,
-39223,39224,39225,39226,39227,39228,39229,39230,39231,39232,39233,39234,39235,
-39236,39237,39238,39239,39240,39241,39242,39243,39244,39245,39246,39247,39248,
-39249,39250,39251,39254,39255,39256,39257,39258,39259,39260,39261,39262,39263,
-39264,39265,39266,39268,39270,39283,39288,39289,39291,39294,39298,39299,39305,
-31289,31287,31313,40655,39333,31344,30344,30350,30355,30361,30372,29918,29920,
-29996,40480,40482,40488,40489,40490,40491,40492,40498,40497,40502,40504,40503,
-40505,40506,40510,40513,40514,40516,40518,40519,40520,40521,40523,40524,40526,
-40529,40533,40535,40538,40539,40540,40542,40547,40550,40551,40552,40553,40554,
-40555,40556,40561,40557,40563,30098,30100,30102,30112,30109,30124,30115,30131,
-30132,30136,30148,30129,30128,30147,30146,30166,30157,30179,30184,30182,30180,
-30187,30183,30211,30193,30204,30207,30224,30208,30213,30220,30231,30218,30245,
-30232,30229,30233,39308,39310,39322,39323,39324,39325,39326,39327,39328,39329,
-39330,39331,39332,39334,39335,39337,39338,39339,39340,39341,39342,39343,39344,
-39345,39346,39347,39348,39349,39350,39351,39352,39353,39354,39355,39356,39357,
-39358,39359,39360,39361,39362,39363,39364,39365,39366,39367,39368,39369,39370,
-39371,39372,39373,39374,39375,39376,39377,39378,39379,39380,39381,39382,39383,
-39384,39385,39386,39387,39388,39389,39390,39391,39392,39393,39394,39395,39396,
-39397,39398,39399,39400,39401,39402,39403,39404,39405,39406,39407,39408,39409,
-39410,39411,39412,39413,39414,39415,39416,39417,30235,30268,30242,30240,30272,
-30253,30256,30271,30261,30275,30270,30259,30285,30302,30292,30300,30294,30315,
-30319,32714,31462,31352,31353,31360,31366,31368,31381,31398,31392,31404,31400,
-31405,31411,34916,34921,34930,34941,34943,34946,34978,35014,34999,35004,35017,
-35042,35022,35043,35045,35057,35098,35068,35048,35070,35056,35105,35097,35091,
-35099,35082,35124,35115,35126,35137,35174,35195,30091,32997,30386,30388,30684,
-32786,32788,32790,32796,32800,32802,32805,32806,32807,32809,32808,32817,32779,
-32821,32835,32838,32845,32850,32873,32881,35203,39032,39040,39043,39418,39419,
-39420,39421,39422,39423,39424,39425,39426,39427,39428,39429,39430,39431,39432,
-39433,39434,39435,39436,39437,39438,39439,39440,39441,39442,39443,39444,39445,
-39446,39447,39448,39449,39450,39451,39452,39453,39454,39455,39456,39457,39458,
-39459,39460,39461,39462,39463,39464,39465,39466,39467,39468,39469,39470,39471,
-39472,39473,39474,39475,39476,39477,39478,39479,39480,39481,39482,39483,39484,
-39485,39486,39487,39488,39489,39490,39491,39492,39493,39494,39495,39496,39497,
-39498,39499,39500,39501,39502,39503,39504,39505,39506,39507,39508,39509,39510,
-39511,39512,39513,39049,39052,39053,39055,39060,39066,39067,39070,39071,39073,
-39074,39077,39078,34381,34388,34412,34414,34431,34426,34428,34427,34472,34445,
-34443,34476,34461,34471,34467,34474,34451,34473,34486,34500,34485,34510,34480,
-34490,34481,34479,34505,34511,34484,34537,34545,34546,34541,34547,34512,34579,
-34526,34548,34527,34520,34513,34563,34567,34552,34568,34570,34573,34569,34595,
-34619,34590,34597,34606,34586,34622,34632,34612,34609,34601,34615,34623,34690,
-34594,34685,34686,34683,34656,34672,34636,34670,34699,34643,34659,34684,34660,
-34649,34661,34707,34735,34728,34770,39514,39515,39516,39517,39518,39519,39520,
-39521,39522,39523,39524,39525,39526,39527,39528,39529,39530,39531,39538,39555,
-39561,39565,39566,39572,39573,39577,39590,39593,39594,39595,39596,39597,39598,
-39599,39602,39603,39604,39605,39609,39611,39613,39614,39615,39619,39620,39622,
-39623,39624,39625,39626,39629,39630,39631,39632,39634,39636,39637,39638,39639,
-39641,39642,39643,39644,39645,39646,39648,39650,39651,39652,39653,39655,39656,
-39657,39658,39660,39662,39664,39665,39666,39667,39668,39669,39670,39671,39672,
-39674,39676,39677,39678,39679,39680,39681,39682,39684,39685,39686,34758,34696,
-34693,34733,34711,34691,34731,34789,34732,34741,34739,34763,34771,34749,34769,
-34752,34762,34779,34794,34784,34798,34838,34835,34814,34826,34843,34849,34873,
-34876,32566,32578,32580,32581,33296,31482,31485,31496,31491,31492,31509,31498,
-31531,31503,31559,31544,31530,31513,31534,31537,31520,31525,31524,31539,31550,
-31518,31576,31578,31557,31605,31564,31581,31584,31598,31611,31586,31602,31601,
-31632,31654,31655,31672,31660,31645,31656,31621,31658,31644,31650,31659,31668,
-31697,31681,31692,31709,31706,31717,31718,31722,31756,31742,31740,31759,31766,
-31755,39687,39689,39690,39691,39692,39693,39694,39696,39697,39698,39700,39701,
-39702,39703,39704,39705,39706,39707,39708,39709,39710,39712,39713,39714,39716,
-39717,39718,39719,39720,39721,39722,39723,39724,39725,39726,39728,39729,39731,
-39732,39733,39734,39735,39736,39737,39738,39741,39742,39743,39744,39750,39754,
-39755,39756,39758,39760,39762,39763,39765,39766,39767,39768,39769,39770,39771,
-39772,39773,39774,39775,39776,39777,39778,39779,39780,39781,39782,39783,39784,
-39785,39786,39787,39788,39789,39790,39791,39792,39793,39794,39795,39796,39797,
-39798,39799,39800,39801,39802,39803,31775,31786,31782,31800,31809,31808,33278,
-33281,33282,33284,33260,34884,33313,33314,33315,33325,33327,33320,33323,33336,
-33339,33331,33332,33342,33348,33353,33355,33359,33370,33375,33384,34942,34949,
-34952,35032,35039,35166,32669,32671,32679,32687,32688,32690,31868,25929,31889,
-31901,31900,31902,31906,31922,31932,31933,31937,31943,31948,31949,31944,31941,
-31959,31976,33390,26280,32703,32718,32725,32741,32737,32742,32745,32750,32755,
-31992,32119,32166,32174,32327,32411,40632,40628,36211,36228,36244,36241,36273,
-36199,36205,35911,35913,37194,37200,37198,37199,37220,39804,39805,39806,39807,
-39808,39809,39810,39811,39812,39813,39814,39815,39816,39817,39818,39819,39820,
-39821,39822,39823,39824,39825,39826,39827,39828,39829,39830,39831,39832,39833,
-39834,39835,39836,39837,39838,39839,39840,39841,39842,39843,39844,39845,39846,
-39847,39848,39849,39850,39851,39852,39853,39854,39855,39856,39857,39858,39859,
-39860,39861,39862,39863,39864,39865,39866,39867,39868,39869,39870,39871,39872,
-39873,39874,39875,39876,39877,39878,39879,39880,39881,39882,39883,39884,39885,
-39886,39887,39888,39889,39890,39891,39892,39893,39894,39895,39896,39897,39898,
-39899,37218,37217,37232,37225,37231,37245,37246,37234,37236,37241,37260,37253,
-37264,37261,37265,37282,37283,37290,37293,37294,37295,37301,37300,37306,35925,
-40574,36280,36331,36357,36441,36457,36277,36287,36284,36282,36292,36310,36311,
-36314,36318,36302,36303,36315,36294,36332,36343,36344,36323,36345,36347,36324,
-36361,36349,36372,36381,36383,36396,36398,36387,36399,36410,36416,36409,36405,
-36413,36401,36425,36417,36418,36433,36434,36426,36464,36470,36476,36463,36468,
-36485,36495,36500,36496,36508,36510,35960,35970,35978,35973,35992,35988,26011,
-35286,35294,35290,35292,39900,39901,39902,39903,39904,39905,39906,39907,39908,
-39909,39910,39911,39912,39913,39914,39915,39916,39917,39918,39919,39920,39921,
-39922,39923,39924,39925,39926,39927,39928,39929,39930,39931,39932,39933,39934,
-39935,39936,39937,39938,39939,39940,39941,39942,39943,39944,39945,39946,39947,
-39948,39949,39950,39951,39952,39953,39954,39955,39956,39957,39958,39959,39960,
-39961,39962,39963,39964,39965,39966,39967,39968,39969,39970,39971,39972,39973,
-39974,39975,39976,39977,39978,39979,39980,39981,39982,39983,39984,39985,39986,
-39987,39988,39989,39990,39991,39992,39993,39994,39995,35301,35307,35311,35390,
-35622,38739,38633,38643,38639,38662,38657,38664,38671,38670,38698,38701,38704,
-38718,40832,40835,40837,40838,40839,40840,40841,40842,40844,40702,40715,40717,
-38585,38588,38589,38606,38610,30655,38624,37518,37550,37576,37694,37738,37834,
-37775,37950,37995,40063,40066,40069,40070,40071,40072,31267,40075,40078,40080,
-40081,40082,40084,40085,40090,40091,40094,40095,40096,40097,40098,40099,40101,
-40102,40103,40104,40105,40107,40109,40110,40112,40113,40114,40115,40116,40117,
-40118,40119,40122,40123,40124,40125,40132,40133,40134,40135,40138,40139,39996,
-39997,39998,39999,40000,40001,40002,40003,40004,40005,40006,40007,40008,40009,
-40010,40011,40012,40013,40014,40015,40016,40017,40018,40019,40020,40021,40022,
-40023,40024,40025,40026,40027,40028,40029,40030,40031,40032,40033,40034,40035,
-40036,40037,40038,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,
-40049,40050,40051,40052,40053,40054,40055,40056,40057,40058,40059,40061,40062,
-40064,40067,40068,40073,40074,40076,40079,40083,40086,40087,40088,40089,40093,
-40106,40108,40111,40121,40126,40127,40128,40129,40130,40136,40137,40145,40146,
-40154,40155,40160,40161,40140,40141,40142,40143,40144,40147,40148,40149,40151,
-40152,40153,40156,40157,40159,40162,38780,38789,38801,38802,38804,38831,38827,
-38819,38834,38836,39601,39600,39607,40536,39606,39610,39612,39617,39616,39621,
-39618,39627,39628,39633,39749,39747,39751,39753,39752,39757,39761,39144,39181,
-39214,39253,39252,39647,39649,39654,39663,39659,39675,39661,39673,39688,39695,
-39699,39711,39715,40637,40638,32315,40578,40583,40584,40587,40594,37846,40605,
-40607,40667,40668,40669,40672,40671,40674,40681,40679,40677,40682,40687,40738,
-40748,40751,40761,40759,40765,40766,40772,40163,40164,40165,40166,40167,40168,
-40169,40170,40171,40172,40173,40174,40175,40176,40177,40178,40179,40180,40181,
-40182,40183,40184,40185,40186,40187,40188,40189,40190,40191,40192,40193,40194,
-40195,40196,40197,40198,40199,40200,40201,40202,40203,40204,40205,40206,40207,
-40208,40209,40210,40211,40212,40213,40214,40215,40216,40217,40218,40219,40220,
-40221,40222,40223,40224,40225,40226,40227,40228,40229,40230,40231,40232,40233,
-40234,40235,40236,40237,40238,40239,40240,40241,40242,40243,40244,40245,40246,
-40247,40248,40249,40250,40251,40252,40253,40254,40255,40256,40257,40258,57908,
-57909,57910,57911,57912,57913,57914,57915,57916,57917,57918,57919,57920,57921,
-57922,57923,57924,57925,57926,57927,57928,57929,57930,57931,57932,57933,57934,
-57935,57936,57937,57938,57939,57940,57941,57942,57943,57944,57945,57946,57947,
-57948,57949,57950,57951,57952,57953,57954,57955,57956,57957,57958,57959,57960,
-57961,57962,57963,57964,57965,57966,57967,57968,57969,57970,57971,57972,57973,
-57974,57975,57976,57977,57978,57979,57980,57981,57982,57983,57984,57985,57986,
-57987,57988,57989,57990,57991,57992,57993,57994,57995,57996,57997,57998,57999,
-58000,58001,40259,40260,40261,40262,40263,40264,40265,40266,40267,40268,40269,
-40270,40271,40272,40273,40274,40275,40276,40277,40278,40279,40280,40281,40282,
-40283,40284,40285,40286,40287,40288,40289,40290,40291,40292,40293,40294,40295,
-40296,40297,40298,40299,40300,40301,40302,40303,40304,40305,40306,40307,40308,
-40309,40310,40311,40312,40313,40314,40315,40316,40317,40318,40319,40320,40321,
-40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332,40333,40334,
-40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345,40346,40347,
-40348,40349,40350,40351,40352,40353,40354,58002,58003,58004,58005,58006,58007,
-58008,58009,58010,58011,58012,58013,58014,58015,58016,58017,58018,58019,58020,
-58021,58022,58023,58024,58025,58026,58027,58028,58029,58030,58031,58032,58033,
-58034,58035,58036,58037,58038,58039,58040,58041,58042,58043,58044,58045,58046,
-58047,58048,58049,58050,58051,58052,58053,58054,58055,58056,58057,58058,58059,
-58060,58061,58062,58063,58064,58065,58066,58067,58068,58069,58070,58071,58072,
-58073,58074,58075,58076,58077,58078,58079,58080,58081,58082,58083,58084,58085,
-58086,58087,58088,58089,58090,58091,58092,58093,58094,58095,40355,40356,40357,
-40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368,40369,40370,
-40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381,40382,40383,
-40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,40394,40395,40396,
-40397,40398,40399,40400,40401,40402,40403,40404,40405,40406,40407,40408,40409,
-40410,40411,40412,40413,40414,40415,40416,40417,40418,40419,40420,40421,40422,
-40423,40424,40425,40426,40427,40428,40429,40430,40431,40432,40433,40434,40435,
-40436,40437,40438,40439,40440,40441,40442,40443,40444,40445,40446,40447,40448,
-40449,40450,58096,58097,58098,58099,58100,58101,58102,58103,58104,58105,58106,
-58107,58108,58109,58110,58111,58112,58113,58114,58115,58116,58117,58118,58119,
-58120,58121,58122,58123,58124,58125,58126,58127,58128,58129,58130,58131,58132,
-58133,58134,58135,58136,58137,58138,58139,58140,58141,58142,58143,58144,58145,
-58146,58147,58148,58149,58150,58151,58152,58153,58154,58155,58156,58157,58158,
-58159,58160,58161,58162,58163,58164,58165,58166,58167,58168,58169,58170,58171,
-58172,58173,58174,58175,58176,58177,58178,58179,58180,58181,58182,58183,58184,
-58185,58186,58187,58188,58189,40451,40452,40453,40454,40455,40456,40457,40458,
-40459,40460,40461,40462,40463,40464,40465,40466,40467,40468,40469,40470,40471,
-40472,40473,40474,40475,40476,40477,40478,40484,40487,40494,40496,40500,40507,
-40508,40512,40525,40528,40530,40531,40532,40534,40537,40541,40543,40544,40545,
-40546,40549,40558,40559,40562,40564,40565,40566,40567,40568,40569,40570,40571,
-40572,40573,40576,40577,40579,40580,40581,40582,40585,40586,40588,40589,40590,
-40591,40592,40593,40596,40597,40598,40599,40600,40601,40602,40603,40604,40606,
-40608,40609,40610,40611,40612,40613,40615,40616,40617,40618,58190,58191,58192,
-58193,58194,58195,58196,58197,58198,58199,58200,58201,58202,58203,58204,58205,
-58206,58207,58208,58209,58210,58211,58212,58213,58214,58215,58216,58217,58218,
-58219,58220,58221,58222,58223,58224,58225,58226,58227,58228,58229,58230,58231,
-58232,58233,58234,58235,58236,58237,58238,58239,58240,58241,58242,58243,58244,
-58245,58246,58247,58248,58249,58250,58251,58252,58253,58254,58255,58256,58257,
-58258,58259,58260,58261,58262,58263,58264,58265,58266,58267,58268,58269,58270,
-58271,58272,58273,58274,58275,58276,58277,58278,58279,58280,58281,58282,58283,
-40619,40620,40621,40622,40623,40624,40625,40626,40627,40629,40630,40631,40633,
-40634,40636,40639,40640,40641,40642,40643,40645,40646,40647,40648,40650,40651,
-40652,40656,40658,40659,40661,40662,40663,40665,40666,40670,40673,40675,40676,
-40678,40680,40683,40684,40685,40686,40688,40689,40690,40691,40692,40693,40694,
-40695,40696,40698,40701,40703,40704,40705,40706,40707,40708,40709,40710,40711,
-40712,40713,40714,40716,40719,40721,40722,40724,40725,40726,40728,40730,40731,
-40732,40733,40734,40735,40737,40739,40740,40741,40742,40743,40744,40745,40746,
-40747,40749,40750,40752,40753,58284,58285,58286,58287,58288,58289,58290,58291,
-58292,58293,58294,58295,58296,58297,58298,58299,58300,58301,58302,58303,58304,
-58305,58306,58307,58308,58309,58310,58311,58312,58313,58314,58315,58316,58317,
-58318,58319,58320,58321,58322,58323,58324,58325,58326,58327,58328,58329,58330,
-58331,58332,58333,58334,58335,58336,58337,58338,58339,58340,58341,58342,58343,
-58344,58345,58346,58347,58348,58349,58350,58351,58352,58353,58354,58355,58356,
-58357,58358,58359,58360,58361,58362,58363,58364,58365,58366,58367,58368,58369,
-58370,58371,58372,58373,58374,58375,58376,58377,40754,40755,40756,40757,40758,
-40760,40762,40764,40767,40768,40769,40770,40771,40773,40774,40775,40776,40777,
-40778,40779,40780,40781,40782,40783,40786,40787,40788,40789,40790,40791,40792,
-40793,40794,40795,40796,40797,40798,40799,40800,40801,40802,40803,40804,40805,
-40806,40807,40808,40809,40810,40811,40812,40813,40814,40815,40816,40817,40818,
-40819,40820,40821,40822,40823,40824,40825,40826,40827,40828,40829,40830,40833,
-40834,40845,40846,40847,40848,40849,40850,40851,40852,40853,40854,40855,40856,
-40860,40861,40862,40865,40866,40867,40868,40869,63788,63865,63893,63975,63985,
-58378,58379,58380,58381,58382,58383,58384,58385,58386,58387,58388,58389,58390,
-58391,58392,58393,58394,58395,58396,58397,58398,58399,58400,58401,58402,58403,
-58404,58405,58406,58407,58408,58409,58410,58411,58412,58413,58414,58415,58416,
-58417,58418,58419,58420,58421,58422,58423,58424,58425,58426,58427,58428,58429,
-58430,58431,58432,58433,58434,58435,58436,58437,58438,58439,58440,58441,58442,
-58443,58444,58445,58446,58447,58448,58449,58450,58451,58452,58453,58454,58455,
-58456,58457,58458,58459,58460,58461,58462,58463,58464,58465,58466,58467,58468,
-58469,58470,58471,64012,64013,64014,64015,64017,64019,64020,64024,64031,64032,
-64033,64035,64036,64039,64040,64041,11905,59414,59415,59416,11908,13427,13383,
-11912,11915,59422,13726,13850,13838,11916,11927,14702,14616,59430,14799,14815,
-14963,14800,59435,59436,15182,15470,15584,11943,59441,59442,11946,16470,16735,
-11950,17207,11955,11958,11959,59451,17329,17324,11963,17373,17622,18017,17996,
-59459,18211,18217,18300,18317,11978,18759,18810,18813,18818,18819,18821,18822,
-18847,18843,18871,18870,59476,59477,19619,19615,19616,19617,19575,19618,19731,
-19732,19733,19734,19735,19736,19737,19886,59492,58472,58473,58474,58475,58476,
-58477,58478,58479,58480,58481,58482,58483,58484,58485,58486,58487,58488,58489,
-58490,58491,58492,58493,58494,58495,58496,58497,58498,58499,58500,58501,58502,
-58503,58504,58505,58506,58507,58508,58509,58510,58511,58512,58513,58514,58515,
-58516,58517,58518,58519,58520,58521,58522,58523,58524,58525,58526,58527,58528,
-58529,58530,58531,58532,58533,58534,58535,58536,58537,58538,58539,58540,58541,
-58542,58543,58544,58545,58546,58547,58548,58549,58550,58551,58552,58553,58554,
-58555,58556,58557,58558,58559,58560,58561,58562,58563,58564,58565,
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/iconv.c b/src/components/lib/libc/musl-1.1.11/src/locale/iconv.c
deleted file mode 100644
index 1eeea94e0a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/iconv.c
+++ /dev/null
@@ -1,455 +0,0 @@
-#include <iconv.h>
-#include <errno.h>
-#include <wchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <stdint.h>
-#include "locale_impl.h"
-
-#define UTF_32BE    0300
-#define UTF_16LE    0301
-#define UTF_16BE    0302
-#define UTF_32LE    0303
-#define UCS2BE      0304
-#define UCS2LE      0305
-#define WCHAR_T     0306
-#define US_ASCII    0307
-#define UTF_8       0310
-#define EUC_JP      0320
-#define SHIFT_JIS   0321
-#define GB18030     0330
-#define GBK         0331
-#define GB2312      0332
-#define BIG5        0340
-#define EUC_KR      0350
-
-/* Definitions of charmaps. Each charmap consists of:
- * 1. Empty-string-terminated list of null-terminated aliases.
- * 2. Special type code or number of elided entries.
- * 3. Character table (size determined by field 2). */
-
-static const unsigned char charmaps[] =
-"utf8\0char\0\0\310"
-"wchart\0\0\306"
-"ucs2\0ucs2be\0\0\304"
-"ucs2le\0\0\305"
-"utf16\0utf16be\0\0\302"
-"utf16le\0\0\301"
-"ucs4\0ucs4be\0utf32\0utf32be\0\0\300"
-"ucs4le\0utf32le\0\0\303"
-"ascii\0usascii\0iso646\0iso646us\0\0\307"
-"eucjp\0\0\320"
-"shiftjis\0sjis\0\0\321"
-"gb18030\0\0\330"
-"gbk\0\0\331"
-"gb2312\0\0\332"
-"big5\0bigfive\0cp950\0big5hkscs\0\0\340"
-"euckr\0ksc5601\0ksx1001\0cp949\0\0\350"
-#include "codepages.h"
-;
-
-static const unsigned short legacy_chars[] = {
-#include "legacychars.h"
-};
-
-static const unsigned short jis0208[84][94] = {
-#include "jis0208.h"
-};
-
-static const unsigned short gb18030[126][190] = {
-#include "gb18030.h"
-};
-
-static const unsigned short big5[89][157] = {
-#include "big5.h"
-};
-
-static const unsigned short hkscs[] = {
-#include "hkscs.h"
-};
-
-static const unsigned short ksc[93][94] = {
-#include "ksc.h"
-};
-
-static int fuzzycmp(const unsigned char *a, const unsigned char *b)
-{
-	for (; *a && *b; a++, b++) {
-		while (*a && (*a|32U)-'a'>26 && *a-'0'>10U) a++;
-		if ((*a|32U) != *b) return 1;
-	}
-	return *a != *b;
-}
-
-static size_t find_charmap(const void *name)
-{
-	const unsigned char *s;
-	if (!*(char *)name) name=charmaps; /* "utf8" */
-	for (s=charmaps; *s; ) {
-		if (!fuzzycmp(name, s)) {
-			for (; *s; s+=strlen((void *)s)+1);
-			return s+1-charmaps;
-		}
-		s += strlen((void *)s)+1;
-		if (!*s) {
-			if (s[1] > 0200) s+=2;
-			else s+=2+(128U-s[1])/4*5;
-		}
-	}
-	return -1;
-}
-
-iconv_t iconv_open(const char *to, const char *from)
-{
-	size_t f, t;
-
-	if ((t = find_charmap(to))==-1
-	 || (f = find_charmap(from))==-1
-	 || (charmaps[t] >= 0320)) {
-		errno = EINVAL;
-		return (iconv_t)-1;
-	}
-
-	return (void *)(f<<16 | t);
-}
-
-int iconv_close(iconv_t cd)
-{
-	return 0;
-}
-
-static unsigned get_16(const unsigned char *s, int e)
-{
-	e &= 1;
-	return s[e]<<8 | s[1-e];
-}
-
-static void put_16(unsigned char *s, unsigned c, int e)
-{
-	e &= 1;
-	s[e] = c>>8;
-	s[1-e] = c;
-}
-
-static unsigned get_32(const unsigned char *s, int e)
-{
-	e &= 3;
-	return s[e]+0U<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
-}
-
-static void put_32(unsigned char *s, unsigned c, int e)
-{
-	e &= 3;
-	s[e^0] = c>>24;
-	s[e^1] = c>>16;
-	s[e^2] = c>>8;
-	s[e^3] = c;
-}
-
-/* Adapt as needed */
-#define mbrtowc_utf8 mbrtowc
-#define wctomb_utf8 wctomb
-
-size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restrict out, size_t *restrict outb)
-{
-	size_t x=0;
-	unsigned long cd = (unsigned long)cd0;
-	unsigned to = cd & 0xffff;
-	unsigned from = cd >> 16;
-	const unsigned char *map = charmaps+from+1;
-	const unsigned char *tomap = charmaps+to+1;
-	mbstate_t st = {0};
-	wchar_t wc;
-	unsigned c, d;
-	size_t k, l;
-	int err;
-	unsigned char type = map[-1];
-	unsigned char totype = tomap[-1];
-	locale_t *ploc = &CURRENT_LOCALE, loc = *ploc;
-
-	if (!in || !*in || !*inb) return 0;
-
-	*ploc = UTF8_LOCALE;
-
-	for (; *inb; *in+=l, *inb-=l) {
-		c = *(unsigned char *)*in;
-		l = 1;
-
-		if (c >= 128 || type-UTF_32BE < 7U) switch (type) {
-		case UTF_8:
-			l = mbrtowc_utf8(&wc, *in, *inb, &st);
-			if (!l) l++;
-			else if (l == (size_t)-1) goto ilseq;
-			else if (l == (size_t)-2) goto starved;
-			c = wc;
-			break;
-		case US_ASCII:
-			goto ilseq;
-		case WCHAR_T:
-			l = sizeof(wchar_t);
-			if (*inb < l) goto starved;
-			c = *(wchar_t *)*in;
-			if (0) {
-		case UTF_32BE:
-		case UTF_32LE:
-			l = 4;
-			if (*inb < 4) goto starved;
-			c = get_32((void *)*in, type);
-			}
-			if (c-0xd800u < 0x800u || c >= 0x110000u) goto ilseq;
-			break;
-		case UCS2BE:
-		case UCS2LE:
-		case UTF_16BE:
-		case UTF_16LE:
-			l = 2;
-			if (*inb < 2) goto starved;
-			c = get_16((void *)*in, type);
-			if ((unsigned)(c-0xdc00) < 0x400) goto ilseq;
-			if ((unsigned)(c-0xd800) < 0x400) {
-				if (type-UCS2BE < 2U) goto ilseq;
-				l = 4;
-				if (*inb < 4) goto starved;
-				d = get_16((void *)(*in + 2), type);
-				if ((unsigned)(d-0xdc00) >= 0x400) goto ilseq;
-				c = ((c-0xd7c0)<<10) + (d-0xdc00);
-			}
-			break;
-		case SHIFT_JIS:
-			if (c-0xa1 <= 0xdf-0xa1) {
-				c += 0xff61-0xa1;
-				break;
-			}
-			l = 2;
-			if (*inb < 2) goto starved;
-			d = *((unsigned char *)*in + 1);
-			if (c-129 <= 159-129) c -= 129;
-			else if (c-224 <= 239-224) c -= 193;
-			else goto ilseq;
-			c *= 2;
-			if (d-64 <= 158-64) {
-				if (d==127) goto ilseq;
-				if (d>127) d--;
-				d -= 64;
-			} else if (d-159 <= 252-159) {
-				c++;
-				d -= 159;
-			}
-			c = jis0208[c][d];
-			if (!c) goto ilseq;
-			break;
-		case EUC_JP:
-			l = 2;
-			if (*inb < 2) goto starved;
-			d = *((unsigned char *)*in + 1);
-			if (c==0x8e) {
-				c = d;
-				if (c-0xa1 > 0xdf-0xa1) goto ilseq;
-				c += 0xff61 - 0xa1;
-				break;
-			}
-			c -= 0xa1;
-			d -= 0xa1;
-			if (c >= 84 || d >= 94) goto ilseq;
-			c = jis0208[c][d];
-			if (!c) goto ilseq;
-			break;
-		case GB2312:
-			if (c < 0xa1) goto ilseq;
-		case GBK:
-		case GB18030:
-			c -= 0x81;
-			if (c >= 126) goto ilseq;
-			l = 2;
-			if (*inb < 2) goto starved;
-			d = *((unsigned char *)*in + 1);
-			if (d < 0xa1 && type == GB2312) goto ilseq;
-			if (d-0x40>=191 || d==127) {
-				if (d-'0'>9 || type != GB18030)
-					goto ilseq;
-				l = 4;
-				if (*inb < 4) goto starved;
-				c = (10*c + d-'0') * 1260;
-				d = *((unsigned char *)*in + 2);
-				if (d-0x81>126) goto ilseq;
-				c += 10*(d-0x81);
-				d = *((unsigned char *)*in + 3);
-				if (d-'0'>9) goto ilseq;
-				c += d-'0';
-				c += 128;
-				for (d=0; d<=c; ) {
-					k = 0;
-					for (int i=0; i<126; i++)
-						for (int j=0; j<190; j++)
-							if (gb18030[i][j]-d <= c-d)
-								k++;
-					d = c+1;
-					c += k;
-				}
-				break;
-			}
-			d -= 0x40;
-			if (d>63) d--;
-			c = gb18030[c][d];
-			break;
-		case BIG5:
-			l = 2;
-			if (*inb < 2) goto starved;
-			d = *((unsigned char *)*in + 1);
-			if (d-0x40>=0xff-0x40 || d-0x7f<0xa1-0x7f) goto ilseq;
-			d -= 0x40;
-			if (d > 0x3e) d -= 0x22;
-			if (c-0xa1>=0xfa-0xa1) {
-				if (c-0x87>=0xff-0x87) goto ilseq;
-				if (c < 0xa1) c -= 0x87;
-				else c -= 0x87 + (0xfa-0xa1);
-				c = (hkscs[4867+(c*157+d)/16]>>(c*157+d)%16)%2<<17
-					| hkscs[c*157+d];
-				/* A few HKSCS characters map to pairs of UCS
-				 * characters. These are mapped to surrogate
-				 * range in the hkscs table then hard-coded
-				 * here. Ugly, yes. */
-				if (c/256 == 0xdc) {
-					if (totype-0300U > 8) k = 2;
-					else k = "\10\4\4\10\4\4\10\2\4"[totype-0300];
-					if (k > *outb) goto toobig;
-					x += iconv((iconv_t)(uintptr_t)to,
-						&(char *){"\303\212\314\204"
-						"\303\212\314\214"
-						"\303\252\314\204"
-						"\303\252\314\214"
-						+c%256}, &(size_t){4},
-						out, outb);
-					continue;
-				}
-				if (!c) goto ilseq;
-				break;
-			}
-			c -= 0xa1;
-			c = big5[c][d]|(c==0x27&&(d==0x3a||d==0x3c||d==0x42))<<17;
-			if (!c) goto ilseq;
-			break;
-		case EUC_KR:
-			l = 2;
-			if (*inb < 2) goto starved;
-			d = *((unsigned char *)*in + 1);
-			c -= 0xa1;
-			d -= 0xa1;
-			if (c >= 93 || d >= 94) {
-				c += (0xa1-0x81);
-				d += 0xa1;
-				if (c >= 93 || c>=0xc6-0x81 && d>0x52)
-					goto ilseq;
-				if (d-'A'<26) d = d-'A';
-				else if (d-'a'<26) d = d-'a'+26;
-				else if (d-0x81<0xff-0x81) d = d-0x81+52;
-				else goto ilseq;
-				if (c < 0x20) c = 178*c + d;
-				else c = 178*0x20 + 84*(c-0x20) + d;
-				c += 0xac00;
-				for (d=0xac00; d<=c; ) {
-					k = 0;
-					for (int i=0; i<93; i++)
-						for (int j=0; j<94; j++)
-							if (ksc[i][j]-d <= c-d)
-								k++;
-					d = c+1;
-					c += k;
-				}
-				break;
-			}
-			c = ksc[c][d];
-			if (!c) goto ilseq;
-			break;
-		default:
-			if (c < 128+type) break;
-			c -= 128+type;
-			c = legacy_chars[ map[c*5/4]>>2*c%8 |
-				map[c*5/4+1]<<8-2*c%8 & 1023 ];
-			if (!c) c = *(unsigned char *)*in;
-			if (c==1) goto ilseq;
-		}
-
-		switch (totype) {
-		case WCHAR_T:
-			if (*outb < sizeof(wchar_t)) goto toobig;
-			*(wchar_t *)*out = c;
-			*out += sizeof(wchar_t);
-			*outb -= sizeof(wchar_t);
-			break;
-		case UTF_8:
-			if (*outb < 4) {
-				char tmp[4];
-				k = wctomb_utf8(tmp, c);
-				if (*outb < k) goto toobig;
-				memcpy(*out, tmp, k);
-			} else k = wctomb_utf8(*out, c);
-			*out += k;
-			*outb -= k;
-			break;
-		case US_ASCII:
-			if (c > 0x7f) subst: x++, c='*';
-		default:
-			if (*outb < 1) goto toobig;
-			if (c < 128+totype) {
-			revout:
-				*(*out)++ = c;
-				*outb -= 1;
-				break;
-			}
-			d = c;
-			for (c=0; c<128-totype; c++) {
-				if (d == legacy_chars[ tomap[c*5/4]>>2*c%8 |
-					tomap[c*5/4+1]<<8-2*c%8 & 1023 ]) {
-					c += 128;
-					goto revout;
-				}
-			}
-			goto subst;
-		case UCS2BE:
-		case UCS2LE:
-		case UTF_16BE:
-		case UTF_16LE:
-			if (c < 0x10000 || type-UCS2BE < 2U) {
-				if (c >= 0x10000) c = 0xFFFD;
-				if (*outb < 2) goto toobig;
-				put_16((void *)*out, c, totype);
-				*out += 2;
-				*outb -= 2;
-				break;
-			}
-			if (*outb < 4) goto toobig;
-			c -= 0x10000;
-			put_16((void *)*out, (c>>10)|0xd800, totype);
-			put_16((void *)(*out + 2), (c&0x3ff)|0xdc00, totype);
-			*out += 4;
-			*outb -= 4;
-			break;
-		case UTF_32BE:
-		case UTF_32LE:
-			if (*outb < 4) goto toobig;
-			put_32((void *)*out, c, totype);
-			*out += 4;
-			*outb -= 4;
-			break;
-		}
-	}
-	*ploc = loc;
-	return x;
-ilseq:
-	err = EILSEQ;
-	x = -1;
-	goto end;
-toobig:
-	err = E2BIG;
-	x = -1;
-	goto end;
-starved:
-	err = EINVAL;
-	x = -1;
-end:
-	errno = err;
-	*ploc = loc;
-	return x;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/jis0208.h b/src/components/lib/libc/musl-1.1.11/src/locale/jis0208.h
deleted file mode 100644
index f465b9d854..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/jis0208.h
+++ /dev/null
@@ -1,550 +0,0 @@
-12288,12289,12290,65292,65294,12539,65306,65307,65311,65281,12443,12444,180,
-65344,168,65342,65507,65343,12541,12542,12445,12446,12291,20189,12293,12294,
-12295,12540,8213,8208,65295,92,12316,8214,65372,8230,8229,8216,8217,8220,8221,
-65288,65289,12308,12309,65339,65341,65371,65373,12296,12297,12298,12299,12300,
-12301,12302,12303,12304,12305,65291,8722,177,215,247,65309,8800,65308,65310,
-8806,8807,8734,8756,9794,9792,176,8242,8243,8451,65509,65284,162,163,65285,
-65283,65286,65290,65312,167,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,
-9650,9661,9660,8251,12306,8594,8592,8593,8595,12307,0,0,0,0,0,0,0,0,0,0,0,
-8712,8715,8838,8839,8834,8835,8746,8745,0,0,0,0,0,0,0,0,8743,8744,172,8658,
-8660,8704,8707,0,0,0,0,0,0,0,0,0,0,0,8736,8869,8978,8706,8711,8801,8786,8810,
-8811,8730,8765,8733,8757,8747,8748,0,0,0,0,0,0,0,8491,8240,9839,9837,9834,
-8224,8225,182,0,0,0,0,9711,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65296,65297,65298,
-65299,65300,65301,65302,65303,65304,65305,0,0,0,0,0,0,0,65313,65314,65315,
-65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,
-65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,0,0,0,0,0,0,65345,
-65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,
-65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,0,0,0,
-0,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,
-12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,
-12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,
-12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,
-12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,
-12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,
-12430,12431,12432,12433,12434,12435,0,0,0,0,0,0,0,0,0,0,0,12449,12450,12451,
-12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,
-12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,
-12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,
-12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,
-12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,
-12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,
-12530,12531,12532,12533,12534,0,0,0,0,0,0,0,0,913,914,915,916,917,918,919,920,
-921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,0,0,0,0,0,0,0,
-0,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964,
-965,966,967,968,969,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,
-1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,
-1066,1067,1068,1069,1070,1071,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1072,1073,1074,
-1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,
-1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,0,
-0,0,0,0,0,0,0,0,0,0,0,0,9472,9474,9484,9488,9496,9492,9500,9516,9508,9524,
-9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504,9519,9512,
-9527,9535,9501,9520,9509,9528,9538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20124,
-21782,23043,38463,21696,24859,25384,23030,36898,33909,33564,31312,24746,25569,
-28197,26093,33894,33446,39925,26771,22311,26017,25201,23451,22992,34427,39156,
-32098,32190,39822,25110,31903,34999,23433,24245,25353,26263,26696,38343,38797,
-26447,20197,20234,20301,20381,20553,22258,22839,22996,23041,23561,24799,24847,
-24944,26131,26885,28858,30031,30064,31227,32173,32239,32963,33806,34915,35586,
-36949,36986,21307,20117,20133,22495,32946,37057,30959,19968,22769,28322,36920,
-31282,33576,33419,39983,20801,21360,21693,21729,22240,23035,24341,39154,28139,
-32996,34093,38498,38512,38560,38907,21515,21491,23431,28879,32701,36802,38632,
-21359,40284,31418,19985,30867,33276,28198,22040,21764,27421,34074,39995,23013,
-21417,28006,29916,38287,22082,20113,36939,38642,33615,39180,21473,21942,23344,
-24433,26144,26355,26628,27704,27891,27945,29787,30408,31310,38964,33521,34907,
-35424,37613,28082,30123,30410,39365,24742,35585,36234,38322,27022,21421,20870,
-22290,22576,22852,23476,24310,24616,25513,25588,27839,28436,28814,28948,29017,
-29141,29503,32257,33398,33489,34199,36960,37467,40219,22633,26044,27738,29989,
-20985,22830,22885,24448,24540,25276,26106,27178,27431,27572,29579,32705,35158,
-40236,40206,40644,23713,27798,33659,20740,23627,25014,33222,26742,29281,20057,
-20474,21368,24681,28201,31311,38899,19979,21270,20206,20309,20285,20385,20339,
-21152,21487,22025,22799,23233,23478,23521,31185,26247,26524,26550,27468,27827,
-28779,29634,31117,31166,31292,31623,33457,33499,33540,33655,33775,33747,34662,
-35506,22057,36008,36838,36942,38686,34442,20420,23784,25105,29273,30011,33253,
-33469,34558,36032,38597,39187,39381,20171,20250,35299,22238,22602,22730,24315,
-24555,24618,24724,24674,25040,25106,25296,25913,39745,26214,26800,28023,28784,
-30028,30342,32117,33445,34809,38283,38542,35997,20977,21182,22806,21683,23475,
-23830,24936,27010,28079,30861,33995,34903,35442,37799,39608,28012,39336,34521,
-22435,26623,34510,37390,21123,22151,21508,24275,25313,25785,26684,26680,27579,
-29554,30906,31339,35226,35282,36203,36611,37101,38307,38548,38761,23398,23731,
-27005,38989,38990,25499,31520,27179,27263,26806,39949,28511,21106,21917,24688,
-25324,27963,28167,28369,33883,35088,36676,19988,39993,21494,26907,27194,38788,
-26666,20828,31427,33970,37340,37772,22107,40232,26658,33541,33841,31909,21000,
-33477,29926,20094,20355,20896,23506,21002,21208,21223,24059,21914,22570,23014,
-23436,23448,23515,24178,24185,24739,24863,24931,25022,25563,25954,26577,26707,
-26874,27454,27475,27735,28450,28567,28485,29872,29976,30435,30475,31487,31649,
-31777,32233,32566,32752,32925,33382,33694,35251,35532,36011,36996,37969,38291,
-38289,38306,38501,38867,39208,33304,20024,21547,23736,24012,29609,30284,30524,
-23721,32747,36107,38593,38929,38996,39000,20225,20238,21361,21916,22120,22522,
-22855,23305,23492,23696,24076,24190,24524,25582,26426,26071,26082,26399,26827,
-26820,27231,24112,27589,27671,27773,30079,31048,23395,31232,32000,24509,35215,
-35352,36020,36215,36556,36637,39138,39438,39740,20096,20605,20736,22931,23452,
-25135,25216,25836,27450,29344,30097,31047,32681,34811,35516,35696,25516,33738,
-38816,21513,21507,21931,26708,27224,35440,30759,26485,40653,21364,23458,33050,
-34384,36870,19992,20037,20167,20241,21450,21560,23470,24339,24613,25937,26429,
-27714,27762,27875,28792,29699,31350,31406,31496,32026,31998,32102,26087,29275,
-21435,23621,24040,25298,25312,25369,28192,34394,35377,36317,37624,28417,31142,
-39770,20136,20139,20140,20379,20384,20689,20807,31478,20849,20982,21332,21281,
-21375,21483,21932,22659,23777,24375,24394,24623,24656,24685,25375,25945,27211,
-27841,29378,29421,30703,33016,33029,33288,34126,37111,37857,38911,39255,39514,
-20208,20957,23597,26241,26989,23616,26354,26997,29577,26704,31873,20677,21220,
-22343,24062,37670,26020,27427,27453,29748,31105,31165,31563,32202,33465,33740,
-34943,35167,35641,36817,37329,21535,37504,20061,20534,21477,21306,29399,29590,
-30697,33510,36527,39366,39368,39378,20855,24858,34398,21936,31354,20598,23507,
-36935,38533,20018,27355,37351,23633,23624,25496,31391,27795,38772,36705,31402,
-29066,38536,31874,26647,32368,26705,37740,21234,21531,34219,35347,32676,36557,
-37089,21350,34952,31041,20418,20670,21009,20804,21843,22317,29674,22411,22865,
-24418,24452,24693,24950,24935,25001,25522,25658,25964,26223,26690,28179,30054,
-31293,31995,32076,32153,32331,32619,33550,33610,34509,35336,35427,35686,36605,
-38938,40335,33464,36814,39912,21127,25119,25731,28608,38553,26689,20625,27424,
-27770,28500,31348,32080,34880,35363,26376,20214,20537,20518,20581,20860,21048,
-21091,21927,22287,22533,23244,24314,25010,25080,25331,25458,26908,27177,29309,
-29356,29486,30740,30831,32121,30476,32937,35211,35609,36066,36562,36963,37749,
-38522,38997,39443,40568,20803,21407,21427,24187,24358,28187,28304,29572,29694,
-32067,33335,35328,35578,38480,20046,20491,21476,21628,22266,22993,23396,24049,
-24235,24359,25144,25925,26543,28246,29392,31946,34996,32929,32993,33776,34382,
-35463,36328,37431,38599,39015,40723,20116,20114,20237,21320,21577,21566,23087,
-24460,24481,24735,26791,27278,29786,30849,35486,35492,35703,37264,20062,39881,
-20132,20348,20399,20505,20502,20809,20844,21151,21177,21246,21402,21475,21521,
-21518,21897,22353,22434,22909,23380,23389,23439,24037,24039,24055,24184,24195,
-24218,24247,24344,24658,24908,25239,25304,25511,25915,26114,26179,26356,26477,
-26657,26775,27083,27743,27946,28009,28207,28317,30002,30343,30828,31295,31968,
-32005,32024,32094,32177,32789,32771,32943,32945,33108,33167,33322,33618,34892,
-34913,35611,36002,36092,37066,37237,37489,30783,37628,38308,38477,38917,39321,
-39640,40251,21083,21163,21495,21512,22741,25335,28640,35946,36703,40633,20811,
-21051,21578,22269,31296,37239,40288,40658,29508,28425,33136,29969,24573,24794,
-39592,29403,36796,27492,38915,20170,22256,22372,22718,23130,24680,25031,26127,
-26118,26681,26801,28151,30165,32058,33390,39746,20123,20304,21449,21766,23919,
-24038,24046,26619,27801,29811,30722,35408,37782,35039,22352,24231,25387,20661,
-20652,20877,26368,21705,22622,22971,23472,24425,25165,25505,26685,27507,28168,
-28797,37319,29312,30741,30758,31085,25998,32048,33756,35009,36617,38555,21092,
-22312,26448,32618,36001,20916,22338,38442,22586,27018,32948,21682,23822,22524,
-30869,40442,20316,21066,21643,25662,26152,26388,26613,31364,31574,32034,37679,
-26716,39853,31545,21273,20874,21047,23519,25334,25774,25830,26413,27578,34217,
-38609,30352,39894,25420,37638,39851,30399,26194,19977,20632,21442,23665,24808,
-25746,25955,26719,29158,29642,29987,31639,32386,34453,35715,36059,37240,39184,
-26028,26283,27531,20181,20180,20282,20351,21050,21496,21490,21987,22235,22763,
-22987,22985,23039,23376,23629,24066,24107,24535,24605,25351,25903,23388,26031,
-26045,26088,26525,27490,27515,27663,29509,31049,31169,31992,32025,32043,32930,
-33026,33267,35222,35422,35433,35430,35468,35566,36039,36060,38604,39164,27503,
-20107,20284,20365,20816,23383,23546,24904,25345,26178,27425,28363,27835,29246,
-29885,30164,30913,31034,32780,32819,33258,33940,36766,27728,40575,24335,35672,
-40235,31482,36600,23437,38635,19971,21489,22519,22833,23241,23460,24713,28287,
-28422,30142,36074,23455,34048,31712,20594,26612,33437,23649,34122,32286,33294,
-20889,23556,25448,36198,26012,29038,31038,32023,32773,35613,36554,36974,34503,
-37034,20511,21242,23610,26451,28796,29237,37196,37320,37675,33509,23490,24369,
-24825,20027,21462,23432,25163,26417,27530,29417,29664,31278,33131,36259,37202,
-39318,20754,21463,21610,23551,25480,27193,32172,38656,22234,21454,21608,23447,
-23601,24030,20462,24833,25342,27954,31168,31179,32066,32333,32722,33261,33311,
-33936,34886,35186,35728,36468,36655,36913,37195,37228,38598,37276,20160,20303,
-20805,21313,24467,25102,26580,27713,28171,29539,32294,37325,37507,21460,22809,
-23487,28113,31069,32302,31899,22654,29087,20986,34899,36848,20426,23803,26149,
-30636,31459,33308,39423,20934,24490,26092,26991,27529,28147,28310,28516,30462,
-32020,24033,36981,37255,38918,20966,21021,25152,26257,26329,28186,24246,32210,
-32626,26360,34223,34295,35576,21161,21465,22899,24207,24464,24661,37604,38500,
-20663,20767,21213,21280,21319,21484,21736,21830,21809,22039,22888,22974,23100,
-23477,23558,23567,23569,23578,24196,24202,24288,24432,25215,25220,25307,25484,
-25463,26119,26124,26157,26230,26494,26786,27167,27189,27836,28040,28169,28248,
-28988,28966,29031,30151,30465,30813,30977,31077,31216,31456,31505,31911,32057,
-32918,33750,33931,34121,34909,35059,35359,35388,35412,35443,35937,36062,37284,
-37478,37758,37912,38556,38808,19978,19976,19998,20055,20887,21104,22478,22580,
-22732,23330,24120,24773,25854,26465,26454,27972,29366,30067,31331,33976,35698,
-37304,37664,22065,22516,39166,25325,26893,27542,29165,32340,32887,33394,35302,
-39135,34645,36785,23611,20280,20449,20405,21767,23072,23517,23529,24515,24910,
-25391,26032,26187,26862,27035,28024,28145,30003,30137,30495,31070,31206,32051,
-33251,33455,34218,35242,35386,36523,36763,36914,37341,38663,20154,20161,20995,
-22645,22764,23563,29978,23613,33102,35338,36805,38499,38765,31525,35535,38920,
-37218,22259,21416,36887,21561,22402,24101,25512,27700,28810,30561,31883,32736,
-34928,36930,37204,37648,37656,38543,29790,39620,23815,23913,25968,26530,36264,
-38619,25454,26441,26905,33733,38935,38592,35070,28548,25722,23544,19990,28716,
-30045,26159,20932,21046,21218,22995,24449,24615,25104,25919,25972,26143,26228,
-26866,26646,27491,28165,29298,29983,30427,31934,32854,22768,35069,35199,35488,
-35475,35531,36893,37266,38738,38745,25993,31246,33030,38587,24109,24796,25114,
-26021,26132,26512,30707,31309,31821,32318,33034,36012,36196,36321,36447,30889,
-20999,25305,25509,25666,25240,35373,31363,31680,35500,38634,32118,33292,34633,
-20185,20808,21315,21344,23459,23554,23574,24029,25126,25159,25776,26643,26676,
-27849,27973,27927,26579,28508,29006,29053,26059,31359,31661,32218,32330,32680,
-33146,33307,33337,34214,35438,36046,36341,36984,36983,37549,37521,38275,39854,
-21069,21892,28472,28982,20840,31109,32341,33203,31950,22092,22609,23720,25514,
-26366,26365,26970,29401,30095,30094,30990,31062,31199,31895,32032,32068,34311,
-35380,38459,36961,40736,20711,21109,21452,21474,20489,21930,22766,22863,29245,
-23435,23652,21277,24803,24819,25436,25475,25407,25531,25805,26089,26361,24035,
-27085,27133,28437,29157,20105,30185,30456,31379,31967,32207,32156,32865,33609,
-33624,33900,33980,34299,35013,36208,36865,36973,37783,38684,39442,20687,22679,
-24974,33235,34101,36104,36896,20419,20596,21063,21363,24687,25417,26463,28204,
-36275,36895,20439,23646,36042,26063,32154,21330,34966,20854,25539,23384,23403,
-23562,25613,26449,36956,20182,22810,22826,27760,35409,21822,22549,22949,24816,
-25171,26561,33333,26965,38464,39364,39464,20307,22534,23550,32784,23729,24111,
-24453,24608,24907,25140,26367,27888,28382,32974,33151,33492,34955,36024,36864,
-36910,38538,40667,39899,20195,21488,22823,31532,37261,38988,40441,28381,28711,
-21331,21828,23429,25176,25246,25299,27810,28655,29730,35351,37944,28609,35582,
-33592,20967,34552,21482,21481,20294,36948,36784,22890,33073,24061,31466,36799,
-26842,35895,29432,40008,27197,35504,20025,21336,22022,22374,25285,25506,26086,
-27470,28129,28251,28845,30701,31471,31658,32187,32829,32966,34507,35477,37723,
-22243,22727,24382,26029,26262,27264,27573,30007,35527,20516,30693,22320,24347,
-24677,26234,27744,30196,31258,32622,33268,34584,36933,39347,31689,30044,31481,
-31569,33988,36880,31209,31378,33590,23265,30528,20013,20210,23449,24544,25277,
-26172,26609,27880,34411,34935,35387,37198,37619,39376,27159,28710,29482,33511,
-33879,36015,19969,20806,20939,21899,23541,24086,24115,24193,24340,24373,24427,
-24500,25074,25361,26274,26397,28526,29266,30010,30522,32884,33081,33144,34678,
-35519,35548,36229,36339,37530,38263,38914,40165,21189,25431,30452,26389,27784,
-29645,36035,37806,38515,27941,22684,26894,27084,36861,37786,30171,36890,22618,
-26626,25524,27131,20291,28460,26584,36795,34086,32180,37716,26943,28528,22378,
-22775,23340,32044,29226,21514,37347,40372,20141,20302,20572,20597,21059,35998,
-21576,22564,23450,24093,24213,24237,24311,24351,24716,25269,25402,25552,26799,
-27712,30855,31118,31243,32224,33351,35330,35558,36420,36883,37048,37165,37336,
-40718,27877,25688,25826,25973,28404,30340,31515,36969,37841,28346,21746,24505,
-25764,36685,36845,37444,20856,22635,22825,23637,24215,28155,32399,29980,36028,
-36578,39003,28857,20253,27583,28593,30000,38651,20814,21520,22581,22615,22956,
-23648,24466,26007,26460,28193,30331,33759,36077,36884,37117,37709,30757,30778,
-21162,24230,22303,22900,24594,20498,20826,20908,20941,20992,21776,22612,22616,
-22871,23445,23798,23947,24764,25237,25645,26481,26691,26812,26847,30423,28120,
-28271,28059,28783,29128,24403,30168,31095,31561,31572,31570,31958,32113,21040,
-33891,34153,34276,35342,35588,35910,36367,36867,36879,37913,38518,38957,39472,
-38360,20685,21205,21516,22530,23566,24999,25758,27934,30643,31461,33012,33796,
-36947,37509,23776,40199,21311,24471,24499,28060,29305,30563,31167,31716,27602,
-29420,35501,26627,27233,20984,31361,26932,23626,40182,33515,23493,37193,28702,
-22136,23663,24775,25958,27788,35930,36929,38931,21585,26311,37389,22856,37027,
-20869,20045,20970,34201,35598,28760,25466,37707,26978,39348,32260,30071,21335,
-26976,36575,38627,27741,20108,23612,24336,36841,21250,36049,32905,34425,24319,
-26085,20083,20837,22914,23615,38894,20219,22922,24525,35469,28641,31152,31074,
-23527,33905,29483,29105,24180,24565,25467,25754,29123,31896,20035,24316,20043,
-22492,22178,24745,28611,32013,33021,33075,33215,36786,35223,34468,24052,25226,
-25773,35207,26487,27874,27966,29750,30772,23110,32629,33453,39340,20467,24259,
-25309,25490,25943,26479,30403,29260,32972,32954,36649,37197,20493,22521,23186,
-26757,26995,29028,29437,36023,22770,36064,38506,36889,34687,31204,30695,33833,
-20271,21093,21338,25293,26575,27850,30333,31636,31893,33334,34180,36843,26333,
-28448,29190,32283,33707,39361,40614,20989,31665,30834,31672,32903,31560,27368,
-24161,32908,30033,30048,20843,37474,28300,30330,37271,39658,20240,32624,25244,
-31567,38309,40169,22138,22617,34532,38588,20276,21028,21322,21453,21467,24070,
-25644,26001,26495,27710,27726,29256,29359,29677,30036,32321,33324,34281,36009,
-31684,37318,29033,38930,39151,25405,26217,30058,30436,30928,34115,34542,21290,
-21329,21542,22915,24199,24444,24754,25161,25209,25259,26000,27604,27852,30130,
-30382,30865,31192,32203,32631,32933,34987,35513,36027,36991,38750,39131,27147,
-31800,20633,23614,24494,26503,27608,29749,30473,32654,40763,26570,31255,21305,
-30091,39661,24422,33181,33777,32920,24380,24517,30050,31558,36924,26727,23019,
-23195,32016,30334,35628,20469,24426,27161,27703,28418,29922,31080,34920,35413,
-35961,24287,25551,30149,31186,33495,37672,37618,33948,34541,39981,21697,24428,
-25996,27996,28693,36007,36051,38971,25935,29942,19981,20184,22496,22827,23142,
-23500,20904,24067,24220,24598,25206,25975,26023,26222,28014,29238,31526,33104,
-33178,33433,35676,36000,36070,36212,38428,38468,20398,25771,27494,33310,33889,
-34154,37096,23553,26963,39080,33914,34135,20239,21103,24489,24133,26381,31119,
-33145,35079,35206,28149,24343,25173,27832,20175,29289,39826,20998,21563,22132,
-22707,24996,25198,28954,22894,31881,31966,32027,38640,25991,32862,19993,20341,
-20853,22592,24163,24179,24330,26564,20006,34109,38281,38491,31859,38913,20731,
-22721,30294,30887,21029,30629,34065,31622,20559,22793,29255,31687,32232,36794,
-36820,36941,20415,21193,23081,24321,38829,20445,33303,37610,22275,25429,27497,
-29995,35036,36628,31298,21215,22675,24917,25098,26286,27597,31807,33769,20515,
-20472,21253,21574,22577,22857,23453,23792,23791,23849,24214,25265,25447,25918,
-26041,26379,27861,27873,28921,30770,32299,32990,33459,33804,34028,34562,35090,
-35370,35914,37030,37586,39165,40179,40300,20047,20129,20621,21078,22346,22952,
-24125,24536,24537,25151,26292,26395,26576,26834,20882,32033,32938,33192,35584,
-35980,36031,37502,38450,21536,38956,21271,20693,21340,22696,25778,26420,29287,
-30566,31302,37350,21187,27809,27526,22528,24140,22868,26412,32763,20961,30406,
-25705,30952,39764,40635,22475,22969,26151,26522,27598,21737,27097,24149,33180,
-26517,39850,26622,40018,26717,20134,20451,21448,25273,26411,27819,36804,20397,
-32365,40639,19975,24930,28288,28459,34067,21619,26410,39749,24051,31637,23724,
-23494,34588,28234,34001,31252,33032,22937,31885,27665,30496,21209,22818,28961,
-29279,30683,38695,40289,26891,23167,23064,20901,21517,21629,26126,30431,36855,
-37528,40180,23018,29277,28357,20813,26825,32191,32236,38754,40634,25720,27169,
-33538,22916,23391,27611,29467,30450,32178,32791,33945,20786,26408,40665,30446,
-26466,21247,39173,23588,25147,31870,36016,21839,24758,32011,38272,21249,20063,
-20918,22812,29242,32822,37326,24357,30690,21380,24441,32004,34220,35379,36493,
-38742,26611,34222,37971,24841,24840,27833,30290,35565,36664,21807,20305,20778,
-21191,21451,23461,24189,24736,24962,25558,26377,26586,28263,28044,29494,29495,
-30001,31056,35029,35480,36938,37009,37109,38596,34701,22805,20104,20313,19982,
-35465,36671,38928,20653,24188,22934,23481,24248,25562,25594,25793,26332,26954,
-27096,27915,28342,29076,29992,31407,32650,32768,33865,33993,35201,35617,36362,
-36965,38525,39178,24958,25233,27442,27779,28020,32716,32764,28096,32645,34746,
-35064,26469,33713,38972,38647,27931,32097,33853,37226,20081,21365,23888,27396,
-28651,34253,34349,35239,21033,21519,23653,26446,26792,29702,29827,30178,35023,
-35041,37324,38626,38520,24459,29575,31435,33870,25504,30053,21129,27969,28316,
-29705,30041,30827,31890,38534,31452,40845,20406,24942,26053,34396,20102,20142,
-20698,20001,20940,23534,26009,26753,28092,29471,30274,30637,31260,31975,33391,
-35538,36988,37327,38517,38936,21147,32209,20523,21400,26519,28107,29136,29747,
-33256,36650,38563,40023,40607,29792,22593,28057,32047,39006,20196,20278,20363,
-20919,21169,23994,24604,29618,31036,33491,37428,38583,38646,38666,40599,40802,
-26278,27508,21015,21155,28872,35010,24265,24651,24976,28451,29001,31806,32244,
-32879,34030,36899,37676,21570,39791,27347,28809,36034,36335,38706,21172,23105,
-24266,24324,26391,27004,27028,28010,28431,29282,29436,31725,32769,32894,34635,
-37070,20845,40595,31108,32907,37682,35542,20525,21644,35441,27498,36036,33031,
-24785,26528,40434,20121,20120,39952,35435,34241,34152,26880,28286,30871,33109,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,24332,19984,19989,20010,20017,20022,20028,20031,20034,20054,20056,
-20098,20101,35947,20106,33298,24333,20110,20126,20127,20128,20130,20144,20147,
-20150,20174,20173,20164,20166,20162,20183,20190,20205,20191,20215,20233,20314,
-20272,20315,20317,20311,20295,20342,20360,20367,20376,20347,20329,20336,20369,
-20335,20358,20374,20760,20436,20447,20430,20440,20443,20433,20442,20432,20452,
-20453,20506,20520,20500,20522,20517,20485,20252,20470,20513,20521,20524,20478,
-20463,20497,20486,20547,20551,26371,20565,20560,20552,20570,20566,20588,20600,
-20608,20634,20613,20660,20658,20681,20682,20659,20674,20694,20702,20709,20717,
-20707,20718,20729,20725,20745,20737,20738,20758,20757,20756,20762,20769,20794,
-20791,20796,20795,20799,20800,20818,20812,20820,20834,31480,20841,20842,20846,
-20864,20866,22232,20876,20873,20879,20881,20883,20885,20886,20900,20902,20898,
-20905,20906,20907,20915,20913,20914,20912,20917,20925,20933,20937,20955,20960,
-34389,20969,20973,20976,20981,20990,20996,21003,21012,21006,21031,21034,21038,
-21043,21049,21071,21060,21067,21068,21086,21076,21098,21108,21097,21107,21119,
-21117,21133,21140,21138,21105,21128,21137,36776,36775,21164,21165,21180,21173,
-21185,21197,21207,21214,21219,21222,39149,21216,21235,21237,21240,21241,21254,
-21256,30008,21261,21264,21263,21269,21274,21283,21295,21297,21299,21304,21312,
-21318,21317,19991,21321,21325,20950,21342,21353,21358,22808,21371,21367,21378,
-21398,21408,21414,21413,21422,21424,21430,21443,31762,38617,21471,26364,29166,
-21486,21480,21485,21498,21505,21565,21568,21548,21549,21564,21550,21558,21545,
-21533,21582,21647,21621,21646,21599,21617,21623,21616,21650,21627,21632,21622,
-21636,21648,21638,21703,21666,21688,21669,21676,21700,21704,21672,21675,21698,
-21668,21694,21692,21720,21733,21734,21775,21780,21757,21742,21741,21754,21730,
-21817,21824,21859,21836,21806,21852,21829,21846,21847,21816,21811,21853,21913,
-21888,21679,21898,21919,21883,21886,21912,21918,21934,21884,21891,21929,21895,
-21928,21978,21957,21983,21956,21980,21988,21972,22036,22007,22038,22014,22013,
-22043,22009,22094,22096,29151,22068,22070,22066,22072,22123,22116,22063,22124,
-22122,22150,22144,22154,22176,22164,22159,22181,22190,22198,22196,22210,22204,
-22209,22211,22208,22216,22222,22225,22227,22231,22254,22265,22272,22271,22276,
-22281,22280,22283,22285,22291,22296,22294,21959,22300,22310,22327,22328,22350,
-22331,22336,22351,22377,22464,22408,22369,22399,22409,22419,22432,22451,22436,
-22442,22448,22467,22470,22484,22482,22483,22538,22486,22499,22539,22553,22557,
-22642,22561,22626,22603,22640,27584,22610,22589,22649,22661,22713,22687,22699,
-22714,22750,22715,22712,22702,22725,22739,22737,22743,22745,22744,22757,22748,
-22756,22751,22767,22778,22777,22779,22780,22781,22786,22794,22800,22811,26790,
-22821,22828,22829,22834,22840,22846,31442,22869,22864,22862,22874,22872,22882,
-22880,22887,22892,22889,22904,22913,22941,20318,20395,22947,22962,22982,23016,
-23004,22925,23001,23002,23077,23071,23057,23068,23049,23066,23104,23148,23113,
-23093,23094,23138,23146,23194,23228,23230,23243,23234,23229,23267,23255,23270,
-23273,23254,23290,23291,23308,23307,23318,23346,23248,23338,23350,23358,23363,
-23365,23360,23377,23381,23386,23387,23397,23401,23408,23411,23413,23416,25992,
-23418,23424,23427,23462,23480,23491,23495,23497,23508,23504,23524,23526,23522,
-23518,23525,23531,23536,23542,23539,23557,23559,23560,23565,23571,23584,23586,
-23592,23608,23609,23617,23622,23630,23635,23632,23631,23409,23660,23662,20066,
-23670,23673,23692,23697,23700,22939,23723,23739,23734,23740,23735,23749,23742,
-23751,23769,23785,23805,23802,23789,23948,23786,23819,23829,23831,23900,23839,
-23835,23825,23828,23842,23834,23833,23832,23884,23890,23886,23883,23916,23923,
-23926,23943,23940,23938,23970,23965,23980,23982,23997,23952,23991,23996,24009,
-24013,24019,24018,24022,24027,24043,24050,24053,24075,24090,24089,24081,24091,
-24118,24119,24132,24131,24128,24142,24151,24148,24159,24162,24164,24135,24181,
-24182,24186,40636,24191,24224,24257,24258,24264,24272,24271,24278,24291,24285,
-24282,24283,24290,24289,24296,24297,24300,24305,24307,24304,24308,24312,24318,
-24323,24329,24413,24412,24331,24337,24342,24361,24365,24376,24385,24392,24396,
-24398,24367,24401,24406,24407,24409,24417,24429,24435,24439,24451,24450,24447,
-24458,24456,24465,24455,24478,24473,24472,24480,24488,24493,24508,24534,24571,
-24548,24568,24561,24541,24755,24575,24609,24672,24601,24592,24617,24590,24625,
-24603,24597,24619,24614,24591,24634,24666,24641,24682,24695,24671,24650,24646,
-24653,24675,24643,24676,24642,24684,24683,24665,24705,24717,24807,24707,24730,
-24708,24731,24726,24727,24722,24743,24715,24801,24760,24800,24787,24756,24560,
-24765,24774,24757,24792,24909,24853,24838,24822,24823,24832,24820,24826,24835,
-24865,24827,24817,24845,24846,24903,24894,24872,24871,24906,24895,24892,24876,
-24884,24893,24898,24900,24947,24951,24920,24921,24922,24939,24948,24943,24933,
-24945,24927,24925,24915,24949,24985,24982,24967,25004,24980,24986,24970,24977,
-25003,25006,25036,25034,25033,25079,25032,25027,25030,25018,25035,32633,25037,
-25062,25059,25078,25082,25076,25087,25085,25084,25086,25088,25096,25097,25101,
-25100,25108,25115,25118,25121,25130,25134,25136,25138,25139,25153,25166,25182,
-25187,25179,25184,25192,25212,25218,25225,25214,25234,25235,25238,25300,25219,
-25236,25303,25297,25275,25295,25343,25286,25812,25288,25308,25292,25290,25282,
-25287,25243,25289,25356,25326,25329,25383,25346,25352,25327,25333,25424,25406,
-25421,25628,25423,25494,25486,25472,25515,25462,25507,25487,25481,25503,25525,
-25451,25449,25534,25577,25536,25542,25571,25545,25554,25590,25540,25622,25652,
-25606,25619,25638,25654,25885,25623,25640,25615,25703,25711,25718,25678,25898,
-25749,25747,25765,25769,25736,25788,25818,25810,25797,25799,25787,25816,25794,
-25841,25831,33289,25824,25825,25260,25827,25839,25900,25846,25844,25842,25850,
-25856,25853,25880,25884,25861,25892,25891,25899,25908,25909,25911,25910,25912,
-30027,25928,25942,25941,25933,25944,25950,25949,25970,25976,25986,25987,35722,
-26011,26015,26027,26039,26051,26054,26049,26052,26060,26066,26075,26073,26080,
-26081,26097,26482,26122,26115,26107,26483,26165,26166,26164,26140,26191,26180,
-26185,26177,26206,26205,26212,26215,26216,26207,26210,26224,26243,26248,26254,
-26249,26244,26264,26269,26305,26297,26313,26302,26300,26308,26296,26326,26330,
-26336,26175,26342,26345,26352,26357,26359,26383,26390,26398,26406,26407,38712,
-26414,26431,26422,26433,26424,26423,26438,26462,26464,26457,26467,26468,26505,
-26480,26537,26492,26474,26508,26507,26534,26529,26501,26551,26607,26548,26604,
-26547,26601,26552,26596,26590,26589,26594,26606,26553,26574,26566,26599,27292,
-26654,26694,26665,26688,26701,26674,26702,26803,26667,26713,26723,26743,26751,
-26783,26767,26797,26772,26781,26779,26755,27310,26809,26740,26805,26784,26810,
-26895,26765,26750,26881,26826,26888,26840,26914,26918,26849,26892,26829,26836,
-26855,26837,26934,26898,26884,26839,26851,26917,26873,26848,26863,26920,26922,
-26906,26915,26913,26822,27001,26999,26972,27000,26987,26964,27006,26990,26937,
-26996,26941,26969,26928,26977,26974,26973,27009,26986,27058,27054,27088,27071,
-27073,27091,27070,27086,23528,27082,27101,27067,27075,27047,27182,27025,27040,
-27036,27029,27060,27102,27112,27138,27163,27135,27402,27129,27122,27111,27141,
-27057,27166,27117,27156,27115,27146,27154,27329,27171,27155,27204,27148,27250,
-27190,27256,27207,27234,27225,27238,27208,27192,27170,27280,27277,27296,27268,
-27298,27299,27287,34327,27323,27331,27330,27320,27315,27308,27358,27345,27359,
-27306,27354,27370,27387,27397,34326,27386,27410,27414,39729,27423,27448,27447,
-30428,27449,39150,27463,27459,27465,27472,27481,27476,27483,27487,27489,27512,
-27513,27519,27520,27524,27523,27533,27544,27541,27550,27556,27562,27563,27567,
-27570,27569,27571,27575,27580,27590,27595,27603,27615,27628,27627,27635,27631,
-40638,27656,27667,27668,27675,27684,27683,27742,27733,27746,27754,27778,27789,
-27802,27777,27803,27774,27752,27763,27794,27792,27844,27889,27859,27837,27863,
-27845,27869,27822,27825,27838,27834,27867,27887,27865,27882,27935,34893,27958,
-27947,27965,27960,27929,27957,27955,27922,27916,28003,28051,28004,27994,28025,
-27993,28046,28053,28644,28037,28153,28181,28170,28085,28103,28134,28088,28102,
-28140,28126,28108,28136,28114,28101,28154,28121,28132,28117,28138,28142,28205,
-28270,28206,28185,28274,28255,28222,28195,28267,28203,28278,28237,28191,28227,
-28218,28238,28196,28415,28189,28216,28290,28330,28312,28361,28343,28371,28349,
-28335,28356,28338,28372,28373,28303,28325,28354,28319,28481,28433,28748,28396,
-28408,28414,28479,28402,28465,28399,28466,28364,28478,28435,28407,28550,28538,
-28536,28545,28544,28527,28507,28659,28525,28546,28540,28504,28558,28561,28610,
-28518,28595,28579,28577,28580,28601,28614,28586,28639,28629,28652,28628,28632,
-28657,28654,28635,28681,28683,28666,28689,28673,28687,28670,28699,28698,28532,
-28701,28696,28703,28720,28734,28722,28753,28771,28825,28818,28847,28913,28844,
-28856,28851,28846,28895,28875,28893,28889,28937,28925,28956,28953,29029,29013,
-29064,29030,29026,29004,29014,29036,29071,29179,29060,29077,29096,29100,29143,
-29113,29118,29138,29129,29140,29134,29152,29164,29159,29173,29180,29177,29183,
-29197,29200,29211,29224,29229,29228,29232,29234,29243,29244,29247,29248,29254,
-29259,29272,29300,29310,29314,29313,29319,29330,29334,29346,29351,29369,29362,
-29379,29382,29380,29390,29394,29410,29408,29409,29433,29431,20495,29463,29450,
-29468,29462,29469,29492,29487,29481,29477,29502,29518,29519,40664,29527,29546,
-29544,29552,29560,29557,29563,29562,29640,29619,29646,29627,29632,29669,29678,
-29662,29858,29701,29807,29733,29688,29746,29754,29781,29759,29791,29785,29761,
-29788,29801,29808,29795,29802,29814,29822,29835,29854,29863,29898,29903,29908,
-29681,29920,29923,29927,29929,29934,29938,29936,29937,29944,29943,29956,29955,
-29957,29964,29966,29965,29973,29971,29982,29990,29996,30012,30020,30029,30026,
-30025,30043,30022,30042,30057,30052,30055,30059,30061,30072,30070,30086,30087,
-30068,30090,30089,30082,30100,30106,30109,30117,30115,30146,30131,30147,30133,
-30141,30136,30140,30129,30157,30154,30162,30169,30179,30174,30206,30207,30204,
-30209,30192,30202,30194,30195,30219,30221,30217,30239,30247,30240,30241,30242,
-30244,30260,30256,30267,30279,30280,30278,30300,30296,30305,30306,30312,30313,
-30314,30311,30316,30320,30322,30326,30328,30332,30336,30339,30344,30347,30350,
-30358,30355,30361,30362,30384,30388,30392,30393,30394,30402,30413,30422,30418,
-30430,30433,30437,30439,30442,34351,30459,30472,30471,30468,30505,30500,30494,
-30501,30502,30491,30519,30520,30535,30554,30568,30571,30555,30565,30591,30590,
-30585,30606,30603,30609,30624,30622,30640,30646,30649,30655,30652,30653,30651,
-30663,30669,30679,30682,30684,30691,30702,30716,30732,30738,31014,30752,31018,
-30789,30862,30836,30854,30844,30874,30860,30883,30901,30890,30895,30929,30918,
-30923,30932,30910,30908,30917,30922,30956,30951,30938,30973,30964,30983,30994,
-30993,31001,31020,31019,31040,31072,31063,31071,31066,31061,31059,31098,31103,
-31114,31133,31143,40779,31146,31150,31155,31161,31162,31177,31189,31207,31212,
-31201,31203,31240,31245,31256,31257,31264,31263,31104,31281,31291,31294,31287,
-31299,31319,31305,31329,31330,31337,40861,31344,31353,31357,31368,31383,31381,
-31384,31382,31401,31432,31408,31414,31429,31428,31423,36995,31431,31434,31437,
-31439,31445,31443,31449,31450,31453,31457,31458,31462,31469,31472,31490,31503,
-31498,31494,31539,31512,31513,31518,31541,31528,31542,31568,31610,31492,31565,
-31499,31564,31557,31605,31589,31604,31591,31600,31601,31596,31598,31645,31640,
-31647,31629,31644,31642,31627,31634,31631,31581,31641,31691,31681,31692,31695,
-31668,31686,31709,31721,31761,31764,31718,31717,31840,31744,31751,31763,31731,
-31735,31767,31757,31734,31779,31783,31786,31775,31799,31787,31805,31820,31811,
-31828,31823,31808,31824,31832,31839,31844,31830,31845,31852,31861,31875,31888,
-31908,31917,31906,31915,31905,31912,31923,31922,31921,31918,31929,31933,31936,
-31941,31938,31960,31954,31964,31970,39739,31983,31986,31988,31990,31994,32006,
-32002,32028,32021,32010,32069,32075,32046,32050,32063,32053,32070,32115,32086,
-32078,32114,32104,32110,32079,32099,32147,32137,32091,32143,32125,32155,32186,
-32174,32163,32181,32199,32189,32171,32317,32162,32175,32220,32184,32159,32176,
-32216,32221,32228,32222,32251,32242,32225,32261,32266,32291,32289,32274,32305,
-32287,32265,32267,32290,32326,32358,32315,32309,32313,32323,32311,32306,32314,
-32359,32349,32342,32350,32345,32346,32377,32362,32361,32380,32379,32387,32213,
-32381,36782,32383,32392,32393,32396,32402,32400,32403,32404,32406,32398,32411,
-32412,32568,32570,32581,32588,32589,32590,32592,32593,32597,32596,32600,32607,
-32608,32616,32617,32615,32632,32642,32646,32643,32648,32647,32652,32660,32670,
-32669,32666,32675,32687,32690,32697,32686,32694,32696,35697,32709,32710,32714,
-32725,32724,32737,32742,32745,32755,32761,39132,32774,32772,32779,32786,32792,
-32793,32796,32801,32808,32831,32827,32842,32838,32850,32856,32858,32863,32866,
-32872,32883,32882,32880,32886,32889,32893,32895,32900,32902,32901,32923,32915,
-32922,32941,20880,32940,32987,32997,32985,32989,32964,32986,32982,33033,33007,
-33009,33051,33065,33059,33071,33099,38539,33094,33086,33107,33105,33020,33137,
-33134,33125,33126,33140,33155,33160,33162,33152,33154,33184,33173,33188,33187,
-33119,33171,33193,33200,33205,33214,33208,33213,33216,33218,33210,33225,33229,
-33233,33241,33240,33224,33242,33247,33248,33255,33274,33275,33278,33281,33282,
-33285,33287,33290,33293,33296,33302,33321,33323,33336,33331,33344,33369,33368,
-33373,33370,33375,33380,33378,33384,33386,33387,33326,33393,33399,33400,33406,
-33421,33426,33451,33439,33467,33452,33505,33507,33503,33490,33524,33523,33530,
-33683,33539,33531,33529,33502,33542,33500,33545,33497,33589,33588,33558,33586,
-33585,33600,33593,33616,33605,33583,33579,33559,33560,33669,33690,33706,33695,
-33698,33686,33571,33678,33671,33674,33660,33717,33651,33653,33696,33673,33704,
-33780,33811,33771,33742,33789,33795,33752,33803,33729,33783,33799,33760,33778,
-33805,33826,33824,33725,33848,34054,33787,33901,33834,33852,34138,33924,33911,
-33899,33965,33902,33922,33897,33862,33836,33903,33913,33845,33994,33890,33977,
-33983,33951,34009,33997,33979,34010,34000,33985,33990,34006,33953,34081,34047,
-34036,34071,34072,34092,34079,34069,34068,34044,34112,34147,34136,34120,34113,
-34306,34123,34133,34176,34212,34184,34193,34186,34216,34157,34196,34203,34282,
-34183,34204,34167,34174,34192,34249,34234,34255,34233,34256,34261,34269,34277,
-34268,34297,34314,34323,34315,34302,34298,34310,34338,34330,34352,34367,34381,
-20053,34388,34399,34407,34417,34451,34467,34473,34474,34443,34444,34486,34479,
-34500,34502,34480,34505,34851,34475,34516,34526,34537,34540,34527,34523,34543,
-34578,34566,34568,34560,34563,34555,34577,34569,34573,34553,34570,34612,34623,
-34615,34619,34597,34601,34586,34656,34655,34680,34636,34638,34676,34647,34664,
-34670,34649,34643,34659,34666,34821,34722,34719,34690,34735,34763,34749,34752,
-34768,38614,34731,34756,34739,34759,34758,34747,34799,34802,34784,34831,34829,
-34814,34806,34807,34830,34770,34833,34838,34837,34850,34849,34865,34870,34873,
-34855,34875,34884,34882,34898,34905,34910,34914,34923,34945,34942,34974,34933,
-34941,34997,34930,34946,34967,34962,34990,34969,34978,34957,34980,34992,35007,
-34993,35011,35012,35028,35032,35033,35037,35065,35074,35068,35060,35048,35058,
-35076,35084,35082,35091,35139,35102,35109,35114,35115,35137,35140,35131,35126,
-35128,35148,35101,35168,35166,35174,35172,35181,35178,35183,35188,35191,35198,
-35203,35208,35210,35219,35224,35233,35241,35238,35244,35247,35250,35258,35261,
-35263,35264,35290,35292,35293,35303,35316,35320,35331,35350,35344,35340,35355,
-35357,35365,35382,35393,35419,35410,35398,35400,35452,35437,35436,35426,35461,
-35458,35460,35496,35489,35473,35493,35494,35482,35491,35524,35533,35522,35546,
-35563,35571,35559,35556,35569,35604,35552,35554,35575,35550,35547,35596,35591,
-35610,35553,35606,35600,35607,35616,35635,38827,35622,35627,35646,35624,35649,
-35660,35663,35662,35657,35670,35675,35674,35691,35679,35692,35695,35700,35709,
-35712,35724,35726,35730,35731,35734,35737,35738,35898,35905,35903,35912,35916,
-35918,35920,35925,35938,35948,35960,35962,35970,35977,35973,35978,35981,35982,
-35988,35964,35992,25117,36013,36010,36029,36018,36019,36014,36022,36040,36033,
-36068,36067,36058,36093,36090,36091,36100,36101,36106,36103,36111,36109,36112,
-40782,36115,36045,36116,36118,36199,36205,36209,36211,36225,36249,36290,36286,
-36282,36303,36314,36310,36300,36315,36299,36330,36331,36319,36323,36348,36360,
-36361,36351,36381,36382,36368,36383,36418,36405,36400,36404,36426,36423,36425,
-36428,36432,36424,36441,36452,36448,36394,36451,36437,36470,36466,36476,36481,
-36487,36485,36484,36491,36490,36499,36497,36500,36505,36522,36513,36524,36528,
-36550,36529,36542,36549,36552,36555,36571,36579,36604,36603,36587,36606,36618,
-36613,36629,36626,36633,36627,36636,36639,36635,36620,36646,36659,36667,36665,
-36677,36674,36670,36684,36681,36678,36686,36695,36700,36706,36707,36708,36764,
-36767,36771,36781,36783,36791,36826,36837,36834,36842,36847,36999,36852,36869,
-36857,36858,36881,36885,36897,36877,36894,36886,36875,36903,36918,36917,36921,
-36856,36943,36944,36945,36946,36878,36937,36926,36950,36952,36958,36968,36975,
-36982,38568,36978,36994,36989,36993,36992,37002,37001,37007,37032,37039,37041,
-37045,37090,37092,25160,37083,37122,37138,37145,37170,37168,37194,37206,37208,
-37219,37221,37225,37235,37234,37259,37257,37250,37282,37291,37295,37290,37301,
-37300,37306,37312,37313,37321,37323,37328,37334,37343,37345,37339,37372,37365,
-37366,37406,37375,37396,37420,37397,37393,37470,37463,37445,37449,37476,37448,
-37525,37439,37451,37456,37532,37526,37523,37531,37466,37583,37561,37559,37609,
-37647,37626,37700,37678,37657,37666,37658,37667,37690,37685,37691,37724,37728,
-37756,37742,37718,37808,37804,37805,37780,37817,37846,37847,37864,37861,37848,
-37827,37853,37840,37832,37860,37914,37908,37907,37891,37895,37904,37942,37931,
-37941,37921,37946,37953,37970,37956,37979,37984,37986,37982,37994,37417,38000,
-38005,38007,38013,37978,38012,38014,38017,38015,38274,38279,38282,38292,38294,
-38296,38297,38304,38312,38311,38317,38332,38331,38329,38334,38346,28662,38339,
-38349,38348,38357,38356,38358,38364,38369,38373,38370,38433,38440,38446,38447,
-38466,38476,38479,38475,38519,38492,38494,38493,38495,38502,38514,38508,38541,
-38552,38549,38551,38570,38567,38577,38578,38576,38580,38582,38584,38585,38606,
-38603,38601,38605,35149,38620,38669,38613,38649,38660,38662,38664,38675,38670,
-38673,38671,38678,38681,38692,38698,38704,38713,38717,38718,38724,38726,38728,
-38722,38729,38748,38752,38756,38758,38760,21202,38763,38769,38777,38789,38780,
-38785,38778,38790,38795,38799,38800,38812,38824,38822,38819,38835,38836,38851,
-38854,38856,38859,38876,38893,40783,38898,31455,38902,38901,38927,38924,38968,
-38948,38945,38967,38973,38982,38991,38987,39019,39023,39024,39025,39028,39027,
-39082,39087,39089,39094,39108,39107,39110,39145,39147,39171,39177,39186,39188,
-39192,39201,39197,39198,39204,39200,39212,39214,39229,39230,39234,39241,39237,
-39248,39243,39249,39250,39244,39253,39319,39320,39333,39341,39342,39356,39391,
-39387,39389,39384,39377,39405,39406,39409,39410,39419,39416,39425,39439,39429,
-39394,39449,39467,39479,39493,39490,39488,39491,39486,39509,39501,39515,39511,
-39519,39522,39525,39524,39529,39531,39530,39597,39600,39612,39616,39631,39633,
-39635,39636,39646,39647,39650,39651,39654,39663,39659,39662,39668,39665,39671,
-39675,39686,39704,39706,39711,39714,39715,39717,39719,39720,39721,39722,39726,
-39727,39730,39748,39747,39759,39757,39758,39761,39768,39796,39827,39811,39825,
-39830,39831,39839,39840,39848,39860,39872,39882,39865,39878,39887,39889,39890,
-39907,39906,39908,39892,39905,39994,39922,39921,39920,39957,39956,39945,39955,
-39948,39942,39944,39954,39946,39940,39982,39963,39973,39972,39969,39984,40007,
-39986,40006,39998,40026,40032,40039,40054,40056,40167,40172,40176,40201,40200,
-40171,40195,40198,40234,40230,40367,40227,40223,40260,40213,40210,40257,40255,
-40254,40262,40264,40285,40286,40292,40273,40272,40281,40306,40329,40327,40363,
-40303,40314,40346,40356,40361,40370,40388,40385,40379,40376,40378,40390,40399,
-40386,40409,40403,40440,40422,40429,40431,40445,40474,40475,40478,40565,40569,
-40573,40577,40584,40587,40588,40594,40597,40593,40605,40613,40617,40632,40618,
-40621,38753,40652,40654,40655,40656,40660,40668,40670,40669,40672,40677,40680,
-40687,40692,40694,40695,40697,40699,40700,40701,40711,40712,30391,40725,40737,
-40748,40766,40778,40786,40788,40803,40799,40800,40801,40806,40807,40812,40810,
-40823,40818,40822,40853,40860,40864,22575,27079,36953,29796,20956,29081,
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/ksc.h b/src/components/lib/libc/musl-1.1.11/src/locale/ksc.h
deleted file mode 100644
index 8f6eca4bde..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/ksc.h
+++ /dev/null
@@ -1,640 +0,0 @@
-12288,12289,12290,183,8229,8230,168,12291,173,8213,8741,65340,8764,8216,8217,
-8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303,12304,
-12305,177,215,247,8800,8804,8805,8734,8756,176,8242,8243,8451,8491,65504,
-65505,65509,9794,9792,8736,8869,8978,8706,8711,8801,8786,167,8251,9734,9733,
-9675,9679,9678,9671,9670,9633,9632,9651,9650,9661,9660,8594,8592,8593,8595,
-8596,12307,8810,8811,8730,8765,8733,8757,8747,8748,8712,8715,8838,8839,8834,
-8835,8746,8745,8743,8744,65506,8658,8660,8704,8707,180,65374,711,728,733,730,
-729,184,731,161,191,720,8750,8721,8719,164,8457,8240,9665,9664,9655,9654,9828,
-9824,9825,9829,9831,9827,8857,9672,9635,9680,9681,9618,9636,9637,9640,9639,
-9638,9641,9832,9743,9742,9756,9758,182,8224,8225,8597,8599,8601,8598,8600,
-9837,9833,9834,9836,12927,12828,8470,13255,8482,13250,13272,8481,8364,174,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65281,65282,65283,65284,65285,65286,
-65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,
-65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,
-65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,
-65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,
-65339,65510,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351,
-65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,
-65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,12593,12594,12595,
-12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,12608,
-12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,
-12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,
-12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,
-12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,
-12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,
-12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,
-8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,0,0,0,0,0,8544,8545,8546,
-8547,8548,8549,8550,8551,8552,8553,0,0,0,0,0,0,0,913,914,915,916,917,918,919,
-920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,0,0,0,0,0,
-0,0,0,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,
-964,965,966,967,968,969,0,0,0,0,0,0,9472,9474,9484,9488,9496,9492,9500,9516,
-9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504,
-9519,9512,9527,9535,9501,9520,9509,9528,9538,9490,9489,9498,9497,9494,9493,
-9486,9485,9502,9503,9505,9506,9510,9511,9513,9514,9517,9518,9521,9522,9525,
-9526,9529,9530,9533,9534,9536,9537,9539,9540,9541,9542,9543,9544,9545,9546,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13205,13206,13207,8467,
-13208,13252,13219,13220,13221,13222,13209,13210,13211,13212,13213,13214,13215,
-13216,13217,13218,13258,13197,13198,13199,13263,13192,13193,13256,13223,13224,
-13232,13233,13234,13235,13236,13237,13238,13239,13240,13241,13184,13185,13186,
-13187,13188,13242,13243,13244,13245,13246,13247,13200,13201,13202,13203,13204,
-8486,13248,13249,13194,13195,13196,13270,13253,13229,13230,13231,13275,13225,
-13226,13227,13228,13277,13264,13267,13251,13257,13276,13254,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,198,208,170,294,0,306,0,319,321,216,338,186,222,358,330,0,12896,
-12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,
-12910,12911,12912,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,
-12923,9424,9425,9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437,
-9438,9439,9440,9441,9442,9443,9444,9445,9446,9447,9448,9449,9312,9313,9314,
-9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,189,8531,8532,188,
-190,8539,8540,8541,8542,230,273,240,295,305,307,312,320,322,248,339,223,254,
-359,331,329,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,
-12811,12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,
-12824,12825,12826,12827,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,
-9382,9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,
-9397,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,
-9346,185,178,179,8308,8319,8321,8322,8323,8324,12353,12354,12355,12356,12357,
-12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,
-12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,
-12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,
-12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,
-12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,
-12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,
-0,0,0,0,0,0,0,0,0,0,0,12449,12450,12451,12452,12453,12454,12455,12456,12457,
-12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,
-12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,
-12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,
-12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,
-12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,
-12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,0,0,0,
-0,0,0,0,0,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,
-1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,
-1067,1068,1069,1070,1071,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1072,1073,1074,1075,
-1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,
-1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44032,44033,44036,44039,44040,44041,44042,
-44048,44049,44050,44051,44052,44053,44054,44055,44057,44058,44059,44060,44061,
-44064,44068,44076,44077,44079,44080,44081,44088,44089,44092,44096,44107,44109,
-44116,44120,44124,44144,44145,44148,44151,44152,44154,44160,44161,44163,44164,
-44165,44166,44169,44170,44171,44172,44176,44180,44188,44189,44191,44192,44193,
-44200,44201,44202,44204,44207,44208,44216,44217,44219,44220,44221,44225,44228,
-44232,44236,44245,44247,44256,44257,44260,44263,44264,44266,44268,44271,44272,
-44273,44275,44277,44278,44284,44285,44288,44292,44294,44300,44301,44303,44305,
-44312,44316,44320,44329,44332,44333,44340,44341,44344,44348,44356,44357,44359,
-44361,44368,44372,44376,44385,44387,44396,44397,44400,44403,44404,44405,44406,
-44411,44412,44413,44415,44417,44418,44424,44425,44428,44432,44444,44445,44452,
-44471,44480,44481,44484,44488,44496,44497,44499,44508,44512,44516,44536,44537,
-44540,44543,44544,44545,44552,44553,44555,44557,44564,44592,44593,44596,44599,
-44600,44602,44608,44609,44611,44613,44614,44618,44620,44621,44622,44624,44628,
-44630,44636,44637,44639,44640,44641,44645,44648,44649,44652,44656,44664,44665,
-44667,44668,44669,44676,44677,44684,44732,44733,44734,44736,44740,44748,44749,
-44751,44752,44753,44760,44761,44764,44776,44779,44781,44788,44792,44796,44807,
-44808,44813,44816,44844,44845,44848,44850,44852,44860,44861,44863,44865,44866,
-44867,44872,44873,44880,44892,44893,44900,44901,44921,44928,44932,44936,44944,
-44945,44949,44956,44984,44985,44988,44992,44999,45000,45001,45003,45005,45006,
-45012,45020,45032,45033,45040,45041,45044,45048,45056,45057,45060,45068,45072,
-45076,45084,45085,45096,45124,45125,45128,45130,45132,45134,45139,45140,45141,
-45143,45145,45149,45180,45181,45184,45188,45196,45197,45199,45201,45208,45209,
-45210,45212,45215,45216,45217,45218,45224,45225,45227,45228,45229,45230,45231,
-45233,45235,45236,45237,45240,45244,45252,45253,45255,45256,45257,45264,45265,
-45268,45272,45280,45285,45320,45321,45323,45324,45328,45330,45331,45336,45337,
-45339,45340,45341,45347,45348,45349,45352,45356,45364,45365,45367,45368,45369,
-45376,45377,45380,45384,45392,45393,45396,45397,45400,45404,45408,45432,45433,
-45436,45440,45442,45448,45449,45451,45453,45458,45459,45460,45464,45468,45480,
-45516,45520,45524,45532,45533,45535,45544,45545,45548,45552,45561,45563,45565,
-45572,45573,45576,45579,45580,45588,45589,45591,45593,45600,45620,45628,45656,
-45660,45664,45672,45673,45684,45685,45692,45700,45701,45705,45712,45713,45716,
-45720,45721,45722,45728,45729,45731,45733,45734,45738,45740,45744,45748,45768,
-45769,45772,45776,45778,45784,45785,45787,45789,45794,45796,45797,45798,45800,
-45803,45804,45805,45806,45807,45811,45812,45813,45815,45816,45817,45818,45819,
-45823,45824,45825,45828,45832,45840,45841,45843,45844,45845,45852,45908,45909,
-45910,45912,45915,45916,45918,45919,45924,45925,45927,45929,45931,45934,45936,
-45937,45940,45944,45952,45953,45955,45956,45957,45964,45968,45972,45984,45985,
-45992,45996,46020,46021,46024,46027,46028,46030,46032,46036,46037,46039,46041,
-46043,46045,46048,46052,46056,46076,46096,46104,46108,46112,46120,46121,46123,
-46132,46160,46161,46164,46168,46176,46177,46179,46181,46188,46208,46216,46237,
-46244,46248,46252,46261,46263,46265,46272,46276,46280,46288,46293,46300,46301,
-46304,46307,46308,46310,46316,46317,46319,46321,46328,46356,46357,46360,46363,
-46364,46372,46373,46375,46376,46377,46378,46384,46385,46388,46392,46400,46401,
-46403,46404,46405,46411,46412,46413,46416,46420,46428,46429,46431,46432,46433,
-46496,46497,46500,46504,46506,46507,46512,46513,46515,46516,46517,46523,46524,
-46525,46528,46532,46540,46541,46543,46544,46545,46552,46572,46608,46609,46612,
-46616,46629,46636,46644,46664,46692,46696,46748,46749,46752,46756,46763,46764,
-46769,46804,46832,46836,46840,46848,46849,46853,46888,46889,46892,46895,46896,
-46904,46905,46907,46916,46920,46924,46932,46933,46944,46948,46952,46960,46961,
-46963,46965,46972,46973,46976,46980,46988,46989,46991,46992,46993,46994,46998,
-46999,47000,47001,47004,47008,47016,47017,47019,47020,47021,47028,47029,47032,
-47047,47049,47084,47085,47088,47092,47100,47101,47103,47104,47105,47111,47112,
-47113,47116,47120,47128,47129,47131,47133,47140,47141,47144,47148,47156,47157,
-47159,47160,47161,47168,47172,47185,47187,47196,47197,47200,47204,47212,47213,
-47215,47217,47224,47228,47245,47272,47280,47284,47288,47296,47297,47299,47301,
-47308,47312,47316,47325,47327,47329,47336,47337,47340,47344,47352,47353,47355,
-47357,47364,47384,47392,47420,47421,47424,47428,47436,47439,47441,47448,47449,
-47452,47456,47464,47465,47467,47469,47476,47477,47480,47484,47492,47493,47495,
-47497,47498,47501,47502,47532,47533,47536,47540,47548,47549,47551,47553,47560,
-47561,47564,47566,47567,47568,47569,47570,47576,47577,47579,47581,47582,47585,
-47587,47588,47589,47592,47596,47604,47605,47607,47608,47609,47610,47616,47617,
-47624,47637,47672,47673,47676,47680,47682,47688,47689,47691,47693,47694,47699,
-47700,47701,47704,47708,47716,47717,47719,47720,47721,47728,47729,47732,47736,
-47747,47748,47749,47751,47756,47784,47785,47787,47788,47792,47794,47800,47801,
-47803,47805,47812,47816,47832,47833,47868,47872,47876,47885,47887,47889,47896,
-47900,47904,47913,47915,47924,47925,47926,47928,47931,47932,47933,47934,47940,
-47941,47943,47945,47949,47951,47952,47956,47960,47969,47971,47980,48008,48012,
-48016,48036,48040,48044,48052,48055,48064,48068,48072,48080,48083,48120,48121,
-48124,48127,48128,48130,48136,48137,48139,48140,48141,48143,48145,48148,48149,
-48150,48151,48152,48155,48156,48157,48158,48159,48164,48165,48167,48169,48173,
-48176,48177,48180,48184,48192,48193,48195,48196,48197,48201,48204,48205,48208,
-48221,48260,48261,48264,48267,48268,48270,48276,48277,48279,48281,48282,48288,
-48289,48292,48295,48296,48304,48305,48307,48308,48309,48316,48317,48320,48324,
-48333,48335,48336,48337,48341,48344,48348,48372,48373,48374,48376,48380,48388,
-48389,48391,48393,48400,48404,48420,48428,48448,48456,48457,48460,48464,48472,
-48473,48484,48488,48512,48513,48516,48519,48520,48521,48522,48528,48529,48531,
-48533,48537,48538,48540,48548,48560,48568,48596,48597,48600,48604,48617,48624,
-48628,48632,48640,48643,48645,48652,48653,48656,48660,48668,48669,48671,48708,
-48709,48712,48716,48718,48724,48725,48727,48729,48730,48731,48736,48737,48740,
-48744,48746,48752,48753,48755,48756,48757,48763,48764,48765,48768,48772,48780,
-48781,48783,48784,48785,48792,48793,48808,48848,48849,48852,48855,48856,48864,
-48867,48868,48869,48876,48897,48904,48905,48920,48921,48923,48924,48925,48960,
-48961,48964,48968,48976,48977,48981,49044,49072,49093,49100,49101,49104,49108,
-49116,49119,49121,49212,49233,49240,49244,49248,49256,49257,49296,49297,49300,
-49304,49312,49313,49315,49317,49324,49325,49327,49328,49331,49332,49333,49334,
-49340,49341,49343,49344,49345,49349,49352,49353,49356,49360,49368,49369,49371,
-49372,49373,49380,49381,49384,49388,49396,49397,49399,49401,49408,49412,49416,
-49424,49429,49436,49437,49438,49439,49440,49443,49444,49446,49447,49452,49453,
-49455,49456,49457,49462,49464,49465,49468,49472,49480,49481,49483,49484,49485,
-49492,49493,49496,49500,49508,49509,49511,49512,49513,49520,49524,49528,49541,
-49548,49549,49550,49552,49556,49558,49564,49565,49567,49569,49573,49576,49577,
-49580,49584,49597,49604,49608,49612,49620,49623,49624,49632,49636,49640,49648,
-49649,49651,49660,49661,49664,49668,49676,49677,49679,49681,49688,49689,49692,
-49695,49696,49704,49705,49707,49709,49711,49713,49714,49716,49736,49744,49745,
-49748,49752,49760,49765,49772,49773,49776,49780,49788,49789,49791,49793,49800,
-49801,49808,49816,49819,49821,49828,49829,49832,49836,49837,49844,49845,49847,
-49849,49884,49885,49888,49891,49892,49899,49900,49901,49903,49905,49910,49912,
-49913,49915,49916,49920,49928,49929,49932,49933,49939,49940,49941,49944,49948,
-49956,49957,49960,49961,49989,50024,50025,50028,50032,50034,50040,50041,50044,
-50045,50052,50056,50060,50112,50136,50137,50140,50143,50144,50146,50152,50153,
-50157,50164,50165,50168,50184,50192,50212,50220,50224,50228,50236,50237,50248,
-50276,50277,50280,50284,50292,50293,50297,50304,50324,50332,50360,50364,50409,
-50416,50417,50420,50424,50426,50431,50432,50433,50444,50448,50452,50460,50472,
-50473,50476,50480,50488,50489,50491,50493,50500,50501,50504,50505,50506,50508,
-50509,50510,50515,50516,50517,50519,50520,50521,50525,50526,50528,50529,50532,
-50536,50544,50545,50547,50548,50549,50556,50557,50560,50564,50567,50572,50573,
-50575,50577,50581,50583,50584,50588,50592,50601,50612,50613,50616,50617,50619,
-50620,50621,50622,50628,50629,50630,50631,50632,50633,50634,50636,50638,50640,
-50641,50644,50648,50656,50657,50659,50661,50668,50669,50670,50672,50676,50678,
-50679,50684,50685,50686,50687,50688,50689,50693,50694,50695,50696,50700,50704,
-50712,50713,50715,50716,50724,50725,50728,50732,50733,50734,50736,50739,50740,
-50741,50743,50745,50747,50752,50753,50756,50760,50768,50769,50771,50772,50773,
-50780,50781,50784,50796,50799,50801,50808,50809,50812,50816,50824,50825,50827,
-50829,50836,50837,50840,50844,50852,50853,50855,50857,50864,50865,50868,50872,
-50873,50874,50880,50881,50883,50885,50892,50893,50896,50900,50908,50909,50912,
-50913,50920,50921,50924,50928,50936,50937,50941,50948,50949,50952,50956,50964,
-50965,50967,50969,50976,50977,50980,50984,50992,50993,50995,50997,50999,51004,
-51005,51008,51012,51018,51020,51021,51023,51025,51026,51027,51028,51029,51030,
-51031,51032,51036,51040,51048,51051,51060,51061,51064,51068,51069,51070,51075,
-51076,51077,51079,51080,51081,51082,51086,51088,51089,51092,51094,51095,51096,
-51098,51104,51105,51107,51108,51109,51110,51116,51117,51120,51124,51132,51133,
-51135,51136,51137,51144,51145,51148,51150,51152,51160,51165,51172,51176,51180,
-51200,51201,51204,51208,51210,51216,51217,51219,51221,51222,51228,51229,51232,
-51236,51244,51245,51247,51249,51256,51260,51264,51272,51273,51276,51277,51284,
-51312,51313,51316,51320,51322,51328,51329,51331,51333,51334,51335,51339,51340,
-51341,51348,51357,51359,51361,51368,51388,51389,51396,51400,51404,51412,51413,
-51415,51417,51424,51425,51428,51445,51452,51453,51456,51460,51461,51462,51468,
-51469,51471,51473,51480,51500,51508,51536,51537,51540,51544,51552,51553,51555,
-51564,51568,51572,51580,51592,51593,51596,51600,51608,51609,51611,51613,51648,
-51649,51652,51655,51656,51658,51664,51665,51667,51669,51670,51673,51674,51676,
-51677,51680,51682,51684,51687,51692,51693,51695,51696,51697,51704,51705,51708,
-51712,51720,51721,51723,51724,51725,51732,51736,51753,51788,51789,51792,51796,
-51804,51805,51807,51808,51809,51816,51837,51844,51864,51900,51901,51904,51908,
-51916,51917,51919,51921,51923,51928,51929,51936,51948,51956,51976,51984,51988,
-51992,52000,52001,52033,52040,52041,52044,52048,52056,52057,52061,52068,52088,
-52089,52124,52152,52180,52196,52199,52201,52236,52237,52240,52244,52252,52253,
-52257,52258,52263,52264,52265,52268,52270,52272,52280,52281,52283,52284,52285,
-52286,52292,52293,52296,52300,52308,52309,52311,52312,52313,52320,52324,52326,
-52328,52336,52341,52376,52377,52380,52384,52392,52393,52395,52396,52397,52404,
-52405,52408,52412,52420,52421,52423,52425,52432,52436,52452,52460,52464,52481,
-52488,52489,52492,52496,52504,52505,52507,52509,52516,52520,52524,52537,52572,
-52576,52580,52588,52589,52591,52593,52600,52616,52628,52629,52632,52636,52644,
-52645,52647,52649,52656,52676,52684,52688,52712,52716,52720,52728,52729,52731,
-52733,52740,52744,52748,52756,52761,52768,52769,52772,52776,52784,52785,52787,
-52789,52824,52825,52828,52831,52832,52833,52840,52841,52843,52845,52852,52853,
-52856,52860,52868,52869,52871,52873,52880,52881,52884,52888,52896,52897,52899,
-52900,52901,52908,52909,52929,52964,52965,52968,52971,52972,52980,52981,52983,
-52984,52985,52992,52993,52996,53000,53008,53009,53011,53013,53020,53024,53028,
-53036,53037,53039,53040,53041,53048,53076,53077,53080,53084,53092,53093,53095,
-53097,53104,53105,53108,53112,53120,53125,53132,53153,53160,53168,53188,53216,
-53217,53220,53224,53232,53233,53235,53237,53244,53248,53252,53265,53272,53293,
-53300,53301,53304,53308,53316,53317,53319,53321,53328,53332,53336,53344,53356,
-53357,53360,53364,53372,53373,53377,53412,53413,53416,53420,53428,53429,53431,
-53433,53440,53441,53444,53448,53449,53456,53457,53459,53460,53461,53468,53469,
-53472,53476,53484,53485,53487,53488,53489,53496,53517,53552,53553,53556,53560,
-53562,53568,53569,53571,53572,53573,53580,53581,53584,53588,53596,53597,53599,
-53601,53608,53612,53628,53636,53640,53664,53665,53668,53672,53680,53681,53683,
-53685,53690,53692,53696,53720,53748,53752,53767,53769,53776,53804,53805,53808,
-53812,53820,53821,53823,53825,53832,53852,53860,53888,53889,53892,53896,53904,
-53905,53909,53916,53920,53924,53932,53937,53944,53945,53948,53951,53952,53954,
-53960,53961,53963,53972,53976,53980,53988,53989,54000,54001,54004,54008,54016,
-54017,54019,54021,54028,54029,54030,54032,54036,54038,54044,54045,54047,54048,
-54049,54053,54056,54057,54060,54064,54072,54073,54075,54076,54077,54084,54085,
-54140,54141,54144,54148,54156,54157,54159,54160,54161,54168,54169,54172,54176,
-54184,54185,54187,54189,54196,54200,54204,54212,54213,54216,54217,54224,54232,
-54241,54243,54252,54253,54256,54260,54268,54269,54271,54273,54280,54301,54336,
-54340,54364,54368,54372,54381,54383,54392,54393,54396,54399,54400,54402,54408,
-54409,54411,54413,54420,54441,54476,54480,54484,54492,54495,54504,54508,54512,
-54520,54523,54525,54532,54536,54540,54548,54549,54551,54588,54589,54592,54596,
-54604,54605,54607,54609,54616,54617,54620,54624,54629,54632,54633,54635,54637,
-54644,54645,54648,54652,54660,54661,54663,54664,54665,54672,54693,54728,54729,
-54732,54736,54738,54744,54745,54747,54749,54756,54757,54760,54764,54772,54773,
-54775,54777,54784,54785,54788,54792,54800,54801,54803,54804,54805,54812,54816,
-54820,54829,54840,54841,54844,54848,54853,54856,54857,54859,54861,54865,54868,
-54869,54872,54876,54887,54889,54896,54897,54900,54915,54917,54924,54925,54928,
-54932,54941,54943,54945,54952,54956,54960,54969,54971,54980,54981,54984,54988,
-54993,54996,54999,55001,55008,55012,55016,55024,55029,55036,55037,55040,55044,
-55057,55064,55065,55068,55072,55080,55081,55083,55085,55092,55093,55096,55100,
-55108,55111,55113,55120,55121,55124,55126,55127,55128,55129,55136,55137,55139,
-55141,55145,55148,55152,55156,55164,55165,55169,55176,55177,55180,55184,55192,
-55193,55195,55197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20285,20339,20551,20729,
-21152,21487,21621,21733,22025,23233,23478,26247,26550,26551,26607,27468,29634,
-30146,31292,33499,33540,34903,34952,35382,36040,36303,36603,36838,39381,21051,
-21364,21508,24682,24932,27580,29647,33050,35258,35282,38307,20355,21002,22718,
-22904,23014,24178,24185,25031,25536,26438,26604,26751,28567,30286,30475,30965,
-31240,31487,31777,32925,33390,33393,35563,38291,20075,21917,26359,28212,30883,
-31469,33883,35088,34638,38824,21208,22350,22570,23884,24863,25022,25121,25954,
-26577,27204,28187,29976,30131,30435,30640,32058,37039,37969,37970,40853,21283,
-23724,30002,32987,37440,38296,21083,22536,23004,23713,23831,24247,24378,24394,
-24951,27743,30074,30086,31968,32115,32177,32652,33108,33313,34193,35137,35611,
-37628,38477,40007,20171,20215,20491,20977,22607,24887,24894,24936,25913,27114,
-28433,30117,30342,30422,31623,33445,33995,63744,37799,38283,21888,23458,22353,
-63745,31923,32697,37301,20520,21435,23621,24040,25298,25454,25818,25831,28192,
-28844,31067,36317,36382,63746,36989,37445,37624,20094,20214,20581,24062,24314,
-24838,26967,33137,34388,36423,37749,39467,20062,20625,26480,26688,20745,21133,
-21138,27298,30652,37392,40660,21163,24623,36850,20552,25001,25581,25802,26684,
-27268,28608,33160,35233,38548,22533,29309,29356,29956,32121,32365,32937,35211,
-35700,36963,40273,25225,27770,28500,32080,32570,35363,20860,24906,31645,35609,
-37463,37772,20140,20435,20510,20670,20742,21185,21197,21375,22384,22659,24218,
-24465,24950,25004,25806,25964,26223,26299,26356,26775,28039,28805,28913,29855,
-29861,29898,30169,30828,30956,31455,31478,32069,32147,32789,32831,33051,33686,
-35686,36629,36885,37857,38915,38968,39514,39912,20418,21843,22586,22865,23395,
-23622,24760,25106,26690,26800,26856,28330,30028,30328,30926,31293,31995,32363,
-32380,35336,35489,35903,38542,40388,21476,21481,21578,21617,22266,22993,23396,
-23611,24235,25335,25911,25925,25970,26272,26543,27073,27837,30204,30352,30590,
-31295,32660,32771,32929,33167,33510,33533,33776,34241,34865,34996,35493,63747,
-36764,37678,38599,39015,39640,40723,21741,26011,26354,26767,31296,35895,40288,
-22256,22372,23825,26118,26801,26829,28414,29736,34974,39908,27752,63748,39592,
-20379,20844,20849,21151,23380,24037,24656,24685,25329,25511,25915,29657,31354,
-34467,36002,38799,20018,23521,25096,26524,29916,31185,33747,35463,35506,36328,
-36942,37707,38982,24275,27112,34303,37101,63749,20896,23448,23532,24931,26874,
-27454,28748,29743,29912,31649,32592,33733,35264,36011,38364,39208,21038,24669,
-25324,36866,20362,20809,21281,22745,24291,26336,27960,28826,29378,29654,31568,
-33009,37979,21350,25499,32619,20054,20608,22602,22750,24618,24871,25296,27088,
-39745,23439,32024,32945,36703,20132,20689,21676,21932,23308,23968,24039,25898,
-25934,26657,27211,29409,30350,30703,32094,32761,33184,34126,34527,36611,36686,
-37066,39171,39509,39851,19992,20037,20061,20167,20465,20855,21246,21312,21475,
-21477,21646,22036,22389,22434,23495,23943,24272,25084,25304,25937,26552,26601,
-27083,27472,27590,27628,27714,28317,28792,29399,29590,29699,30655,30697,31350,
-32127,32777,33276,33285,33290,33503,34914,35635,36092,36544,36881,37041,37476,
-37558,39378,39493,40169,40407,40860,22283,23616,33738,38816,38827,40628,21531,
-31384,32676,35033,36557,37089,22528,23624,25496,31391,23470,24339,31353,31406,
-33422,36524,20518,21048,21240,21367,22280,25331,25458,27402,28099,30519,21413,
-29527,34152,36470,38357,26426,27331,28528,35437,36556,39243,63750,26231,27512,
-36020,39740,63751,21483,22317,22862,25542,27131,29674,30789,31418,31429,31998,
-33909,35215,36211,36917,38312,21243,22343,30023,31584,33740,37406,63752,27224,
-20811,21067,21127,25119,26840,26997,38553,20677,21156,21220,25027,26020,26681,
-27135,29822,31563,33465,33771,35250,35641,36817,39241,63753,20170,22935,25810,
-26129,27278,29748,31105,31165,33449,34942,34943,35167,63754,37670,20235,21450,
-24613,25201,27762,32026,32102,20120,20834,30684,32943,20225,20238,20854,20864,
-21980,22120,22331,22522,22524,22804,22855,22931,23492,23696,23822,24049,24190,
-24524,25216,26071,26083,26398,26399,26462,26827,26820,27231,27450,27683,27773,
-27778,28103,29592,29734,29738,29826,29859,30072,30079,30849,30959,31041,31047,
-31048,31098,31637,32000,32186,32648,32774,32813,32908,35352,35663,35912,36215,
-37665,37668,39138,39249,39438,39439,39525,40594,32202,20342,21513,25326,26708,
-37329,21931,20794,63755,63756,23068,25062,63757,25295,25343,63758,63759,63760,
-63761,63762,63763,37027,63764,63765,63766,63767,63768,35582,63769,63770,63771,
-63772,26262,63773,29014,63774,63775,38627,63776,25423,25466,21335,63777,26511,
-26976,28275,63778,30007,63779,63780,63781,32013,63782,63783,34930,22218,23064,
-63784,63785,63786,63787,63788,20035,63789,20839,22856,26608,32784,63790,22899,
-24180,25754,31178,24565,24684,25288,25467,23527,23511,21162,63791,22900,24361,
-24594,63792,63793,63794,29785,63795,63796,63797,63798,63799,63800,39377,63801,
-63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,28611,63812,63813,
-33215,36786,24817,63814,63815,33126,63816,63817,23615,63818,63819,63820,63821,
-63822,63823,63824,63825,23273,35365,26491,32016,63826,63827,63828,63829,63830,
-63831,33021,63832,63833,23612,27877,21311,28346,22810,33590,20025,20150,20294,
-21934,22296,22727,24406,26039,26086,27264,27573,28237,30701,31471,31774,32222,
-34507,34962,37170,37723,25787,28606,29562,30136,36948,21846,22349,25018,25812,
-26311,28129,28251,28525,28601,30192,32835,33213,34113,35203,35527,35674,37663,
-27795,30035,31572,36367,36957,21776,22530,22616,24162,25095,25758,26848,30070,
-31958,34739,40680,20195,22408,22382,22823,23565,23729,24118,24453,25140,25825,
-29619,33274,34955,36024,38538,40667,23429,24503,24755,20498,20992,21040,22294,
-22581,22615,23566,23648,23798,23947,24230,24466,24764,25361,25481,25623,26691,
-26873,27330,28120,28193,28372,28644,29182,30428,30585,31153,31291,33796,35241,
-36077,36339,36424,36867,36884,36947,37117,37709,38518,38876,27602,28678,29272,
-29346,29544,30563,31167,31716,32411,35712,22697,24775,25958,26109,26302,27788,
-28958,29129,35930,38931,20077,31361,20189,20908,20941,21205,21516,24999,26481,
-26704,26847,27934,28540,30140,30643,31461,33012,33891,37509,20828,26007,26460,
-26515,30168,31431,33651,63834,35910,36887,38957,23663,33216,33434,36929,36975,
-37389,24471,23965,27225,29128,30331,31561,34276,35588,37159,39472,21895,25078,
-63835,30313,32645,34367,34746,35064,37007,63836,27931,28889,29662,32097,33853,
-63837,37226,39409,63838,20098,21365,27396,27410,28734,29211,34349,40478,21068,
-36771,23888,25829,25900,27414,28651,31811,32412,34253,35172,35261,25289,33240,
-34847,24266,26391,28010,29436,29701,29807,34690,37086,20358,23821,24480,33802,
-20919,25504,30053,20142,20486,20841,20937,26753,27153,31918,31921,31975,33391,
-35538,36635,37327,20406,20791,21237,21570,24300,24942,25150,26053,27354,28670,
-31018,34268,34851,38317,39522,39530,40599,40654,21147,26310,27511,28701,31019,
-36706,38722,24976,25088,25891,28451,29001,29833,32244,32879,34030,36646,36899,
-37706,20925,21015,21155,27916,28872,35010,24265,25986,27566,28610,31806,29557,
-20196,20278,22265,63839,23738,23994,24604,29618,31533,32666,32718,32838,36894,
-37428,38646,38728,38936,40801,20363,28583,31150,37300,38583,21214,63840,25736,
-25796,27347,28510,28696,29200,30439,32769,34310,34396,36335,36613,38706,39791,
-40442,40565,30860,31103,32160,33737,37636,40575,40595,35542,22751,24324,26407,
-28711,29903,31840,32894,20769,28712,29282,30922,36034,36058,36084,38647,20102,
-20698,23534,24278,26009,29134,30274,30637,32842,34044,36988,39719,40845,22744,
-23105,23650,27155,28122,28431,30267,32047,32311,34078,35128,37860,38475,21129,
-26066,26611,27060,27969,28316,28687,29705,29792,30041,30244,30827,35628,39006,
-20845,25134,38520,20374,20523,23833,28138,32184,36650,24459,24900,26647,63841,
-38534,21202,32907,20956,20940,26974,31260,32190,33777,38517,20442,21033,21400,
-21519,21774,23653,24743,26446,26792,28012,29313,29432,29702,29827,63842,30178,
-31852,32633,32696,33673,35023,35041,37324,37328,38626,39881,21533,28542,29136,
-29848,34298,36522,38563,40023,40607,26519,28107,29747,33256,38678,30764,31435,
-31520,31890,25705,29802,30194,30908,30952,39340,39764,40635,23518,24149,28448,
-33180,33707,37000,19975,21325,23081,24018,24398,24930,25405,26217,26364,28415,
-28459,28771,30622,33836,34067,34875,36627,39237,39995,21788,25273,26411,27819,
-33545,35178,38778,20129,22916,24536,24537,26395,32178,32596,33426,33579,33725,
-36638,37017,22475,22969,23186,23504,26151,26522,26757,27599,29028,32629,36023,
-36067,36993,39749,33032,35978,38476,39488,40613,23391,27667,29467,30450,30431,
-33804,20906,35219,20813,20885,21193,26825,27796,30468,30496,32191,32236,38754,
-40629,28357,34065,20901,21517,21629,26126,26269,26919,28319,30399,30609,33559,
-33986,34719,37225,37528,40180,34946,20398,20882,21215,22982,24125,24917,25720,
-25721,26286,26576,27169,27597,27611,29279,29281,29761,30520,30683,32791,33468,
-33541,35584,35624,35980,26408,27792,29287,30446,30566,31302,40361,27519,27794,
-22818,26406,33945,21359,22675,22937,24287,25551,26164,26483,28218,29483,31447,
-33495,37672,21209,24043,25006,25035,25098,25287,25771,26080,26969,27494,27595,
-28961,29687,30045,32326,33310,33538,34154,35491,36031,38695,40289,22696,40664,
-20497,21006,21563,21839,25991,27766,32010,32011,32862,34442,38272,38639,21247,
-27797,29289,21619,23194,23614,23883,24396,24494,26410,26806,26979,28220,28228,
-30473,31859,32654,34183,35598,36855,38753,40692,23735,24758,24845,25003,25935,
-26107,26108,27665,27887,29599,29641,32225,38292,23494,34588,35600,21085,21338,
-25293,25615,25778,26420,27192,27850,29632,29854,31636,31893,32283,33162,33334,
-34180,36843,38649,39361,20276,21322,21453,21467,25292,25644,25856,26001,27075,
-27886,28504,29677,30036,30242,30436,30460,30928,30971,31020,32070,33324,34784,
-36820,38930,39151,21187,25300,25765,28196,28497,30332,36299,37297,37474,39662,
-39747,20515,20621,22346,22952,23592,24135,24439,25151,25918,26041,26049,26121,
-26507,27036,28354,30917,32033,32938,33152,33323,33459,33953,34444,35370,35607,
-37030,38450,40848,20493,20467,63843,22521,24472,25308,25490,26479,28227,28953,
-30403,32972,32986,35060,35061,35097,36064,36649,37197,38506,20271,20336,24091,
-26575,26658,30333,30334,39748,24161,27146,29033,29140,30058,63844,32321,34115,
-34281,39132,20240,31567,32624,38309,20961,24070,26805,27710,27726,27867,29359,
-31684,33539,27861,29754,20731,21128,22721,25816,27287,29863,30294,30887,34327,
-38370,38713,63845,21342,24321,35722,36776,36783,37002,21029,30629,40009,40712,
-19993,20482,20853,23643,24183,26142,26170,26564,26821,28851,29953,30149,31177,
-31453,36647,39200,39432,20445,22561,22577,23542,26222,27493,27921,28282,28541,
-29668,29995,33769,35036,35091,35676,36628,20239,20693,21264,21340,23443,24489,
-26381,31119,33145,33583,34068,35079,35206,36665,36667,39333,39954,26412,20086,
-20472,22857,23553,23791,23792,25447,26834,28925,29090,29739,32299,34028,34562,
-36898,37586,40179,19981,20184,20463,20613,21078,21103,21542,21648,22496,22827,
-23142,23386,23413,23500,24220,63846,25206,25975,26023,28014,28325,29238,31526,
-31807,32566,33104,33105,33178,33344,33433,33705,35331,36000,36070,36091,36212,
-36282,37096,37340,38428,38468,39385,40167,21271,20998,21545,22132,22707,22868,
-22894,24575,24996,25198,26128,27774,28954,30406,31881,31966,32027,33452,36033,
-38640,63847,20315,24343,24447,25282,23849,26379,26842,30844,32323,40300,19989,
-20633,21269,21290,21329,22915,23138,24199,24754,24970,25161,25209,26000,26503,
-27047,27604,27606,27607,27608,27832,63848,29749,30202,30738,30865,31189,31192,
-31875,32203,32737,32933,33086,33218,33778,34586,35048,35513,35692,36027,37145,
-38750,39131,40763,22188,23338,24428,25996,27315,27567,27996,28657,28693,29277,
-29613,36007,36051,38971,24977,27703,32856,39425,20045,20107,20123,20181,20282,
-20284,20351,20447,20735,21490,21496,21766,21987,22235,22763,22882,23057,23531,
-23546,23556,24051,24107,24473,24605,25448,26012,26031,26614,26619,26797,27515,
-27801,27863,28195,28681,29509,30722,31038,31040,31072,31169,31721,32023,32114,
-32902,33293,33678,34001,34503,35039,35408,35422,35613,36060,36198,36781,37034,
-39164,39391,40605,21066,63849,26388,63850,20632,21034,23665,25955,27733,29642,
-29987,30109,31639,33948,37240,38704,20087,25746,27578,29022,34217,19977,63851,
-26441,26862,28183,33439,34072,34923,25591,28545,37394,39087,19978,20663,20687,
-20767,21830,21930,22039,23360,23577,23776,24120,24202,24224,24258,24819,26705,
-27233,28248,29245,29248,29376,30456,31077,31665,32724,35059,35316,35443,35937,
-36062,38684,22622,29885,36093,21959,63852,31329,32034,33394,29298,29983,29989,
-63853,31513,22661,22779,23996,24207,24246,24464,24661,25234,25471,25933,26257,
-26329,26360,26646,26866,29312,29790,31598,32110,32214,32626,32997,33298,34223,
-35199,35475,36893,37604,40653,40736,22805,22893,24109,24796,26132,26227,26512,
-27728,28101,28511,30707,30889,33990,37323,37675,20185,20682,20808,21892,23307,
-23459,25159,25982,26059,28210,29053,29697,29764,29831,29887,30316,31146,32218,
-32341,32680,33146,33203,33337,34330,34796,35445,36323,36984,37521,37925,39245,
-39854,21352,23633,26964,27844,27945,28203,33292,34203,35131,35373,35498,38634,
-40807,21089,26297,27570,32406,34814,36109,38275,38493,25885,28041,29166,63854,
-22478,22995,23468,24615,24826,25104,26143,26207,29481,29689,30427,30465,31596,
-32854,32882,33125,35488,37266,19990,21218,27506,27927,31237,31545,32048,63855,
-36016,21484,22063,22609,23477,23567,23569,24034,25152,25475,25620,26157,26803,
-27836,28040,28335,28703,28836,29138,29990,30095,30094,30233,31505,31712,31787,
-32032,32057,34092,34157,34311,35380,36877,36961,37045,37559,38902,39479,20439,
-23660,26463,28049,31903,32396,35606,36118,36895,23403,24061,25613,33984,36956,
-39137,29575,23435,24730,26494,28126,35359,35494,36865,38924,21047,63856,28753,
-30862,37782,34928,37335,20462,21463,22013,22234,22402,22781,23234,23432,23723,
-23744,24101,24833,25101,25163,25480,25628,25910,25976,27193,27530,27700,27929,
-28465,29159,29417,29560,29703,29874,30246,30561,31168,31319,31466,31929,32143,
-32172,32353,32670,33065,33585,33936,34010,34282,34966,35504,35728,36664,36930,
-36995,37228,37526,37561,38539,38567,38568,38614,38656,38920,39318,39635,39706,
-21460,22654,22809,23408,23487,28113,28506,29087,29729,29881,32901,33789,24033,
-24455,24490,24642,26092,26642,26991,27219,27529,27957,28147,29667,30462,30636,
-31565,32020,33059,33308,33600,34036,34147,35426,35524,37255,37662,38918,39348,
-25100,34899,36848,37477,23815,23847,23913,29791,33181,34664,28629,25342,32722,
-35126,35186,19998,20056,20711,21213,21319,25215,26119,32361,34821,38494,20365,
-21273,22070,22987,23204,23608,23630,23629,24066,24337,24643,26045,26159,26178,
-26558,26612,29468,30690,31034,32709,33940,33997,35222,35430,35433,35553,35925,
-35962,22516,23508,24335,24687,25325,26893,27542,28252,29060,31698,34645,35672,
-36606,39135,39166,20280,20353,20449,21627,23072,23480,24892,26032,26216,29180,
-30003,31070,32051,33102,33251,33688,34218,34254,34563,35338,36523,36763,63857,
-36805,22833,23460,23526,24713,23529,23563,24515,27777,63858,28145,28683,29978,
-33455,35574,20160,21313,63859,38617,27663,20126,20420,20818,21854,23077,23784,
-25105,29273,33469,33706,34558,34905,35357,38463,38597,39187,40201,40285,22538,
-23731,23997,24132,24801,24853,25569,27138,28197,37122,37716,38990,39952,40823,
-23433,23736,25353,26191,26696,30524,38593,38797,38996,39839,26017,35585,36555,
-38332,21813,23721,24022,24245,26263,30284,33780,38343,22739,25276,29390,40232,
-20208,22830,24591,26171,27523,31207,40230,21395,21696,22467,23830,24859,26326,
-28079,30861,33406,38552,38724,21380,25212,25494,28082,32266,33099,38989,27387,
-32588,40367,40474,20063,20539,20918,22812,24825,25590,26928,29242,32822,63860,
-37326,24369,63861,63862,32004,33509,33903,33979,34277,36493,63863,20335,63864,
-63865,22756,23363,24665,25562,25880,25965,26264,63866,26954,27171,27915,28673,
-29036,30162,30221,31155,31344,63867,32650,63868,35140,63869,35731,37312,38525,
-63870,39178,22276,24481,26044,28417,30208,31142,35486,39341,39770,40812,20740,
-25014,25233,27277,33222,20547,22576,24422,28937,35328,35578,23420,34326,20474,
-20796,22196,22852,25513,28153,23978,26989,20870,20104,20313,63871,63872,63873,
-22914,63874,63875,27487,27741,63876,29877,30998,63877,33287,33349,33593,36671,
-36701,63878,39192,63879,63880,63881,20134,63882,22495,24441,26131,63883,63884,
-30123,32377,35695,63885,36870,39515,22181,22567,23032,23071,23476,63886,24310,
-63887,63888,25424,25403,63889,26941,27783,27839,28046,28051,28149,28436,63890,
-28895,28982,29017,63891,29123,29141,63892,30799,30831,63893,31605,32227,63894,
-32303,63895,34893,36575,63896,63897,63898,37467,63899,40182,63900,63901,63902,
-24709,28037,63903,29105,63904,63905,38321,21421,63906,63907,63908,26579,63909,
-28814,28976,29744,33398,33490,63910,38331,39653,40573,26308,63911,29121,33865,
-63912,63913,22603,63914,63915,23992,24433,63916,26144,26254,27001,27054,27704,
-27891,28214,28481,28634,28699,28719,29008,29151,29552,63917,29787,63918,29908,
-30408,31310,32403,63919,63920,33521,35424,36814,63921,37704,63922,38681,63923,
-63924,20034,20522,63925,21000,21473,26355,27757,28618,29450,30591,31330,33454,
-34269,34306,63926,35028,35427,35709,35947,63927,37555,63928,38675,38928,20116,
-20237,20425,20658,21320,21566,21555,21978,22626,22714,22887,23067,23524,24735,
-63929,25034,25942,26111,26212,26791,27738,28595,28879,29100,29522,31613,34568,
-35492,39986,40711,23627,27779,29508,29577,37434,28331,29797,30239,31337,32277,
-34314,20800,22725,25793,29934,29973,30320,32705,37013,38605,39252,28198,29926,
-31401,31402,33253,34521,34680,35355,23113,23436,23451,26785,26880,28003,29609,
-29715,29740,30871,32233,32747,33048,33109,33694,35916,38446,38929,26352,24448,
-26106,26505,27754,29579,20525,23043,27498,30702,22806,23916,24013,29477,30031,
-63930,63931,20709,20985,22575,22829,22934,23002,23525,63932,63933,23970,25303,
-25622,25747,25854,63934,26332,63935,27208,63936,29183,29796,63937,31368,31407,
-32327,32350,32768,33136,63938,34799,35201,35616,36953,63939,36992,39250,24958,
-27442,28020,32287,35109,36785,20433,20653,20887,21191,22471,22665,23481,24248,
-24898,27029,28044,28263,28342,29076,29794,29992,29996,32883,33592,33993,36362,
-37780,37854,63940,20110,20305,20598,20778,21448,21451,21491,23431,23507,23588,
-24858,24962,26100,29275,29591,29760,30402,31056,31121,31161,32006,32701,33419,
-34261,34398,36802,36935,37109,37354,38533,38632,38633,21206,24423,26093,26161,
-26671,29020,31286,37057,38922,20113,63941,27218,27550,28560,29065,32792,33464,
-34131,36939,38549,38642,38907,34074,39729,20112,29066,38596,20803,21407,21729,
-22291,22290,22435,23195,23236,23491,24616,24895,25588,27781,27961,28274,28304,
-29232,29503,29783,33489,34945,36677,36960,63942,38498,39000,40219,26376,36234,
-37470,20301,20553,20702,21361,22285,22996,23041,23561,24944,26256,28205,29234,
-29771,32239,32963,33806,33894,34111,34655,34907,35096,35586,36949,38859,39759,
-20083,20369,20754,20842,63943,21807,21929,23418,23461,24188,24189,24254,24736,
-24799,24840,24841,25540,25912,26377,63944,26580,26586,63945,26977,26978,27833,
-27943,63946,28216,63947,28641,29494,29495,63948,29788,30001,63949,30290,63950,
-63951,32173,33278,33848,35029,35480,35547,35565,36400,36418,36938,36926,36986,
-37193,37321,37742,63952,63953,22537,63954,27603,32905,32946,63955,63956,20801,
-22891,23609,63957,63958,28516,29607,32996,36103,63959,37399,38287,63960,63961,
-63962,63963,32895,25102,28700,32104,34701,63964,22432,24681,24903,27575,35518,
-37504,38577,20057,21535,28139,34093,38512,38899,39150,25558,27875,37009,20957,
-25033,33210,40441,20381,20506,20736,23452,24847,25087,25836,26885,27589,30097,
-30691,32681,33380,34191,34811,34915,35516,35696,37291,20108,20197,20234,63965,
-63966,22839,23016,63967,24050,24347,24411,24609,63968,63969,63970,63971,29246,
-29669,63972,30064,30157,63973,31227,63974,32780,32819,32900,33505,33617,63975,
-63976,36029,36019,36999,63977,63978,39156,39180,63979,63980,28727,30410,32714,
-32716,32764,35610,20154,20161,20995,21360,63981,21693,22240,23035,23493,24341,
-24525,28270,63982,63983,32106,33589,63984,34451,35469,63985,38765,38775,63986,
-63987,19968,20314,20350,22777,26085,28322,36920,37808,39353,20219,22764,22922,
-23001,24641,63988,63989,31252,63990,33615,36035,20837,21316,63991,63992,63993,
-20173,21097,23381,33471,20180,21050,21672,22985,23039,23376,23383,23388,24675,
-24904,28363,28825,29038,29574,29943,30133,30913,32043,32773,33258,33576,34071,
-34249,35566,36039,38604,20316,21242,22204,26027,26152,28796,28856,29237,32189,
-33421,37196,38592,40306,23409,26855,27544,28538,30430,23697,26283,28507,31668,
-31786,34870,38620,19976,20183,21280,22580,22715,22767,22892,23559,24115,24196,
-24373,25484,26290,26454,27167,27299,27404,28479,29254,63994,29520,29835,31456,
-31911,33144,33247,33255,33674,33900,34083,34196,34255,35037,36115,37292,38263,
-38556,20877,21705,22312,23472,25165,26448,26685,26771,28221,28371,28797,32289,
-35009,36001,36617,40779,40782,29229,31631,35533,37658,20295,20302,20786,21632,
-22992,24213,25269,26485,26990,27159,27822,28186,29401,29482,30141,31672,32053,
-33511,33785,33879,34295,35419,36015,36487,36889,37048,38606,40799,21219,21514,
-23265,23490,25688,25973,28404,29380,63995,30340,31309,31515,31821,32318,32735,
-33659,35627,36042,36196,36321,36447,36842,36857,36969,37841,20291,20346,20659,
-20840,20856,21069,21098,22625,22652,22880,23560,23637,24283,24731,25136,26643,
-27583,27656,28593,29006,29728,30000,30008,30033,30322,31564,31627,31661,31686,
-32399,35438,36670,36681,37439,37523,37666,37931,38651,39002,39019,39198,20999,
-25130,25240,27993,30308,31434,31680,32118,21344,23742,24215,28472,28857,31896,
-38673,39822,40670,25509,25722,34678,19969,20117,20141,20572,20597,21576,22979,
-23450,24128,24237,24311,24449,24773,25402,25919,25972,26060,26230,26232,26622,
-26984,27273,27491,27712,28096,28136,28191,28254,28702,28833,29582,29693,30010,
-30555,30855,31118,31243,31357,31934,32142,33351,35330,35562,35998,37165,37194,
-37336,37478,37580,37664,38662,38742,38748,38914,40718,21046,21137,21884,22564,
-24093,24351,24716,25552,26799,28639,31085,31532,33229,34234,35069,35576,36420,
-37261,38500,38555,38717,38988,40778,20430,20806,20939,21161,22066,24340,24427,
-25514,25805,26089,26177,26362,26361,26397,26781,26839,27133,28437,28526,29031,
-29157,29226,29866,30522,31062,31066,31199,31264,31381,31895,31967,32068,32368,
-32903,34299,34468,35412,35519,36249,36481,36896,36973,37347,38459,38613,40165,
-26063,31751,36275,37827,23384,23562,21330,25305,29469,20519,23447,24478,24752,
-24939,26837,28121,29742,31278,32066,32156,32305,33131,36394,36405,37758,37912,
-20304,22352,24038,24231,25387,32618,20027,20303,20367,20570,23005,32964,21610,
-21608,22014,22863,23449,24030,24282,26205,26417,26609,26666,27880,27954,28234,
-28557,28855,29664,30087,31820,32002,32044,32162,33311,34523,35387,35461,36208,
-36490,36659,36913,37198,37202,37956,39376,31481,31909,20426,20737,20934,22472,
-23535,23803,26201,27197,27994,28310,28652,28940,30063,31459,34850,36897,36981,
-38603,39423,33537,20013,20210,34886,37325,21373,27355,26987,27713,33914,22686,
-24974,26366,25327,28893,29969,30151,32338,33976,35657,36104,20043,21482,21675,
-22320,22336,24535,25345,25351,25711,25903,26088,26234,26525,26547,27490,27744,
-27802,28460,30693,30757,31049,31063,32025,32930,33026,33267,33437,33463,34584,
-35468,63996,36100,36286,36978,30452,31257,31287,32340,32887,21767,21972,22645,
-25391,25634,26185,26187,26733,27035,27524,27941,28337,29645,29800,29857,30043,
-30137,30433,30494,30603,31206,32265,32285,33275,34095,34967,35386,36049,36587,
-36784,36914,37805,38499,38515,38663,20356,21489,23018,23241,24089,26702,29894,
-30142,31209,31378,33187,34541,36074,36300,36845,26015,26389,63997,22519,28503,
-32221,36655,37878,38598,24501,25074,28548,19988,20376,20511,21449,21983,23919,
-24046,27425,27492,30923,31642,63998,36425,36554,36974,25417,25662,30528,31364,
-37679,38015,40810,25776,28591,29158,29864,29914,31428,31762,32386,31922,32408,
-35738,36106,38013,39184,39244,21049,23519,25830,26413,32046,20717,21443,22649,
-24920,24921,25082,26028,31449,35730,35734,20489,20513,21109,21809,23100,24288,
-24432,24884,25950,26124,26166,26274,27085,28356,28466,29462,30241,31379,33081,
-33369,33750,33980,20661,22512,23488,23528,24425,25505,30758,32181,33756,34081,
-37319,37365,20874,26613,31574,36012,20932,22971,24765,34389,20508,63999,21076,
-23610,24957,25114,25299,25842,26021,28364,30240,33034,36448,38495,38587,20191,
-21315,21912,22825,24029,25797,27849,28154,29588,31359,33307,34214,36068,36368,
-36983,37351,38369,38433,38854,20984,21746,21894,24505,25764,28552,32180,36639,
-36685,37941,20681,23574,27838,28155,29979,30651,31805,31844,35449,35522,22558,
-22974,24086,25463,29266,30090,30571,35548,36028,36626,24307,26228,28152,32893,
-33729,35531,38737,39894,64000,21059,26367,28053,28399,32224,35558,36910,36958,
-39636,21021,21119,21736,24980,25220,25307,26786,26898,26970,27189,28818,28966,
-30813,30977,30990,31186,31245,32918,33400,33493,33609,34121,35970,36229,37218,
-37259,37294,20419,22225,29165,30679,34560,35320,23544,24534,26449,37032,21474,
-22618,23541,24740,24961,25696,32317,32880,34085,37507,25774,20652,23828,26368,
-22684,25277,25512,26894,27000,27166,28267,30394,31179,33467,33833,35535,36264,
-36861,37138,37195,37276,37648,37656,37786,38619,39478,39949,19985,30044,31069,
-31482,31569,31689,32302,33988,36441,36468,36600,36880,26149,26943,29763,20986,
-26414,40668,20805,24544,27798,34802,34909,34935,24756,33205,33795,36101,21462,
-21561,22068,23094,23601,28810,32736,32858,33030,33261,36259,37257,39519,40434,
-20596,20164,21408,24827,28204,23652,20360,20516,21988,23769,24159,24677,26772,
-27835,28100,29118,30164,30196,30305,31258,31305,32199,32251,32622,33268,34473,
-36636,38601,39347,40786,21063,21189,39149,35242,19971,26578,28422,20405,23522,
-26517,27784,28024,29723,30759,37341,37756,34756,31204,31281,24555,20182,21668,
-21822,22702,22949,24816,25171,25302,26422,26965,33333,38464,39345,39389,20524,
-21331,21828,22396,64001,25176,64002,25826,26219,26589,28609,28655,29730,29752,
-35351,37944,21585,22022,22374,24392,24986,27470,28760,28845,32187,35477,22890,
-33067,25506,30472,32829,36010,22612,25645,27067,23445,24081,28271,64003,34153,
-20812,21488,22826,24608,24907,27526,27760,27888,31518,32974,33492,36294,37040,
-39089,64004,25799,28580,25745,25860,20814,21520,22303,35342,24927,26742,64005,
-30171,31570,32113,36890,22534,27084,33151,35114,36864,38969,20600,22871,22956,
-25237,36879,39722,24925,29305,38358,22369,23110,24052,25226,25773,25850,26487,
-27874,27966,29228,29750,30772,32631,33453,36315,38935,21028,22338,26495,29256,
-29923,36009,36774,37393,38442,20843,21485,25420,20329,21764,24726,25943,27803,
-28031,29260,29437,31255,35207,35997,24429,28558,28921,33192,24846,20415,20559,
-25153,29255,31687,32232,32745,36941,38829,39449,36022,22378,24179,26544,33805,
-35413,21536,23318,24163,24290,24330,25987,32954,34109,38281,38491,20296,21253,
-21261,21263,21638,21754,22275,24067,24598,25243,25265,25429,64006,27873,28006,
-30129,30770,32990,33071,33502,33889,33970,34957,35090,36875,37610,39165,39825,
-24133,26292,26333,28689,29190,64007,20469,21117,24426,24915,26451,27161,28418,
-29922,31080,34920,35961,39111,39108,39491,21697,31263,26963,35575,35914,39080,
-39342,24444,25259,30130,30382,34987,36991,38466,21305,24380,24517,27852,29644,
-30050,30091,31558,33534,39325,20047,36924,19979,20309,21414,22799,24264,26160,
-27827,29781,33655,34662,36032,36944,38686,39957,22737,23416,34384,35604,40372,
-23506,24680,24717,26097,27735,28450,28579,28698,32597,32752,38289,38290,38480,
-38867,21106,36676,20989,21547,21688,21859,21898,27323,28085,32216,33382,37532,
-38519,40569,21512,21704,30418,34532,38308,38356,38492,20130,20233,23022,23270,
-24055,24658,25239,26477,26689,27782,28207,32568,32923,33322,64008,64009,38917,
-20133,20565,21683,22419,22874,23401,23475,25032,26999,28023,28707,34809,35299,
-35442,35559,36994,39405,39608,21182,26680,20502,24184,26447,33607,34892,20139,
-21521,22190,29670,37141,38911,39177,39255,39321,22099,22687,34395,35377,25010,
-27382,29563,36562,27463,38570,39511,22869,29184,36203,38761,20436,23796,24358,
-25080,26203,27883,28843,29572,29625,29694,30505,30541,32067,32098,32291,33335,
-34898,64010,36066,37449,39023,23377,31348,34880,38913,23244,20448,21332,22846,
-23805,25406,28025,29433,33029,33031,33698,37583,38960,20136,20804,21009,22411,
-24418,27842,28366,28677,28752,28847,29074,29673,29801,33610,34722,34913,36872,
-37026,37795,39336,20846,24407,24800,24935,26291,34137,36426,37295,38795,20046,
-20114,21628,22741,22778,22909,23733,24359,25142,25160,26122,26215,27627,28009,
-28111,28246,28408,28564,28640,28649,28765,29392,29733,29786,29920,30355,31068,
-31946,32286,32993,33446,33899,33983,34382,34399,34676,35703,35946,37804,38912,
-39013,24785,25110,37239,23130,26127,28151,28222,29759,39746,24573,24794,31503,
-21700,24344,27742,27859,27946,28888,32005,34425,35340,40251,21270,21644,23301,
-27194,28779,30069,31117,31166,33457,33775,35441,35649,36008,38772,64011,25844,
-25899,30906,30907,31339,20024,21914,22864,23462,24187,24739,25563,27489,26213,
-26707,28185,29029,29872,32008,36996,39529,39973,27963,28369,29502,35905,38346,
-20976,24140,24488,24653,24822,24880,24908,26179,26180,27045,27841,28255,28361,
-28514,29004,29852,30343,31681,31783,33618,34647,36945,38541,40643,21295,22238,
-24315,24458,24674,24724,25079,26214,26371,27292,28142,28590,28784,29546,32362,
-33214,33588,34516,35496,36036,21123,29554,23446,27243,37892,21742,22150,23389,
-25928,25989,26313,26783,28045,28102,29243,32948,37237,39501,20399,20505,21402,
-21518,21564,21897,21957,24127,24460,26429,29030,29661,36869,21211,21235,22628,
-22734,28932,29071,29179,34224,35347,26248,34216,21927,26244,29002,33841,21321,
-21913,27585,24409,24509,25582,26249,28999,35569,36637,40638,20241,25658,28875,
-30054,34407,24676,35662,40440,20807,20982,21256,27958,33016,40657,26133,27427,
-28824,30165,21507,23673,32007,35350,27424,27453,27462,21560,24688,27965,32725,
-33288,20694,20958,21916,22123,22221,23020,23305,24076,24985,24984,25137,26206,
-26342,29081,29113,29114,29351,31143,31232,32690,35440,
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/legacychars.h b/src/components/lib/libc/musl-1.1.11/src/locale/legacychars.h
deleted file mode 100644
index 914ad0d512..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/legacychars.h
+++ /dev/null
@@ -1,41 +0,0 @@
-0,1,160,167,168,169,175,176,178,183,184,198,215,216,230,247,248,162,163,165,
-196,197,198,199,201,214,215,216,220,224,226,228,229,230,231,232,233,234,235,
-236,238,239,242,244,246,248,249,251,252,255,256,257,258,259,260,261,262,263,
-264,265,266,267,268,269,270,271,272,273,274,275,278,279,280,281,282,283,284,
-285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,302,303,304,305,
-308,309,310,311,312,313,314,315,316,317,318,321,322,323,324,325,326,327,328,
-330,331,332,333,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,
-351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,
-370,371,372,373,374,375,376,377,378,379,380,381,382,402,416,417,431,432,536,
-537,538,539,710,711,728,729,731,732,733,768,769,771,777,803,890,900,901,902,
-904,905,906,908,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,
-925,926,927,928,929,931,932,933,934,935,936,937,938,939,940,941,942,943,944,
-945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,
-964,965,966,967,968,969,970,
-971,972,973,974,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,
-1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,
-1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,
-1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,
-1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,
-1098,1099,1100,1101,1102,1103,1105,1106,1107,1108,1109,1110,1111,1112,1113,
-1114,1115,1116,1118,1119,1168,1169,1456,1457,1458,1459,1460,1461,1462,1463,
-1464,1465,1467,1468,1469,1470,1471,1472,1473,1474,1475,1488,1489,1490,1491,
-1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,
-1507,1508,1509,1510,1511,1512,1513,1514,1520,1521,1522,1523,1524,1548,1563,
-1567,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,
-1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1600,1601,1602,
-1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,
-1618,1657,1662,1670,1672,1681,1688,1705,1711,1722,1726,1729,1746,3585,3586,
-3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,
-3602,3603,3604,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,
-3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,3630,3631,
-3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3647,3648,3649,3650,
-3651,3652,3653,3654,3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,
-3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,7682,7683,7690,7691,7710,
-7711,7744,7745,7766,7767,7776,7777,7786,7787,7808,7809,7810,7811,7812,7813,
-7922,7923,8204,8205,8206,8207,8211,8212,8213,8215,8216,8217,8218,8220,8221,
-8222,8224,8225,8226,8230,8240,8249,8250,8362,8363,8364,8367,8359,8470,8482,
-8729,8730,8776,8804,8805,8992,8993,9472,9474,9484,9488,9492,9496,9500,9508,
-9516,9524,9532,9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,
-9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,
-9579,9580,9600,9604,9608,9612,9616,9617,9618,9619,9632,
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/localeconv.c b/src/components/lib/libc/musl-1.1.11/src/locale/localeconv.c
deleted file mode 100644
index cbc75d7a45..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/localeconv.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <locale.h>
-
-static const struct lconv posix_lconv = {
-	.decimal_point = ".",
-	.thousands_sep = "",
-	.grouping = "",
-	.int_curr_symbol = "",
-	.currency_symbol = "",
-	.mon_decimal_point = "",
-	.mon_thousands_sep = "",
-	.mon_grouping = "",
-	.positive_sign = "",
-	.negative_sign = "",
-	.int_frac_digits = -1,
-	.frac_digits = -1,
-	.p_cs_precedes = -1,
-	.p_sep_by_space = -1,
-	.n_cs_precedes = -1,
-	.n_sep_by_space = -1,
-	.p_sign_posn = -1,
-	.n_sign_posn = -1,
-	.int_p_cs_precedes = -1,
-	.int_p_sep_by_space = -1,
-	.int_n_cs_precedes = -1,
-	.int_n_sep_by_space = -1,
-	.int_p_sign_posn = -1,
-	.int_n_sign_posn = -1,
-};
-
-struct lconv *localeconv(void)
-{
-	return (void *)&posix_lconv;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/newlocale.c b/src/components/lib/libc/musl-1.1.11/src/locale/newlocale.c
deleted file mode 100644
index f50bbe9132..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/newlocale.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "locale_impl.h"
-#include "libc.h"
-
-int __loc_is_allocated(locale_t loc)
-{
-	return loc && loc != C_LOCALE && loc != UTF8_LOCALE;
-}
-
-locale_t __newlocale(int mask, const char *name, locale_t loc)
-{
-	int i, j;
-	struct __locale_struct tmp;
-	const struct __locale_map *lm;
-
-	/* For locales with allocated storage, modify in-place. */
-	if (__loc_is_allocated(loc)) {
-		for (i=0; i<LC_ALL; i++)
-			if (mask & (1<<i))
-				loc->cat[i] = __get_locale(i, name);
-		return loc;
-	}
-
-	/* Otherwise, build a temporary locale object, which will only
-	 * be instantiated in allocated storage if it does not match
-	 * one of the built-in static locales. This makes the common
-	 * usage case for newlocale, getting a C locale with predictable
-	 * behavior, very fast, and more importantly, fail-safe. */
-	for (j=i=0; i<LC_ALL; i++) {
-		if (loc && !(mask & (1<<i)))
-			lm = loc->cat[i];
-		else
-			lm = __get_locale(i, mask & (1<<i) ? name : "");
-		if (lm) j++;
-		tmp.cat[i] = lm;
-	}
-
-	if (!j)
-		return C_LOCALE;
-	if (j==1 && tmp.cat[LC_CTYPE]==&__c_dot_utf8)
-		return UTF8_LOCALE;
-
-	if ((loc = malloc(sizeof *loc))) *loc = tmp;
-
-	return loc;
-}
-
-weak_alias(__newlocale, newlocale);
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/setlocale.c b/src/components/lib/libc/musl-1.1.11/src/locale/setlocale.c
deleted file mode 100644
index 8dae5a4e8e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/locale/setlocale.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-#include "locale_impl.h"
-#include "libc.h"
-#include "atomic.h"
-
-static char buf[LC_ALL*(LOCALE_NAME_MAX+1)];
-
-static char *setlocale_one_unlocked(int cat, const char *name)
-{
-	const struct __locale_map *lm;
-
-	if (name) libc.global_locale.cat[cat] = lm = __get_locale(cat, name);
-	else lm = libc.global_locale.cat[cat];
-
-	return lm ? (char *)lm->name : "C";
-}
-
-char *__strchrnul(const char *, int);
-
-char *setlocale(int cat, const char *name)
-{
-	static volatile int lock[2];
-
-	if ((unsigned)cat > LC_ALL) return 0;
-
-	LOCK(lock);
-
-	/* For LC_ALL, setlocale is required to return a string which
-	 * encodes the current setting for all categories. The format of
-	 * this string is unspecified, and only the following code, which
-	 * performs both the serialization and deserialization, depends
-	 * on the format, so it can easily be changed if needed. */
-	if (cat == LC_ALL) {
-		int i;
-		if (name) {
-			char part[LOCALE_NAME_MAX+1] = "C.UTF-8";
-			const char *p = name;
-			for (i=0; i<LC_ALL; i++) {
-				const char *z = __strchrnul(p, ';');
-				if (z-p <= LOCALE_NAME_MAX) {
-					memcpy(part, p, z-p);
-					part[z-p] = 0;
-					if (*z) p = z+1;
-				}
-				setlocale_one_unlocked(i, part);
-			}
-		}
-		char *s = buf;
-		for (i=0; i<LC_ALL; i++) {
-			const struct __locale_map *lm =
-				libc.global_locale.cat[i];
-			const char *part = lm ? lm->name : "C";
-			size_t l = strlen(part);
-			memcpy(s, part, l);
-			s[l] = ';';
-			s += l+1;
-		}
-		*--s = 0;
-		UNLOCK(lock);
-		return buf;
-	}
-
-	char *ret = setlocale_one_unlocked(cat, name);
-
-	UNLOCK(lock);
-
-	return ret;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/__brk.c b/src/components/lib/libc/musl-1.1.11/src/malloc/__brk.c
deleted file mode 100644
index 4c9119b4d1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/__brk.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdint.h>
-#include "syscall.h"
-
-uintptr_t __brk(uintptr_t newbrk)
-{
-	return __syscall(SYS_brk, newbrk);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/aligned_alloc.c b/src/components/lib/libc/musl-1.1.11/src/malloc/aligned_alloc.c
deleted file mode 100644
index cc0a801208..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/aligned_alloc.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdlib.h>
-
-void *__memalign(size_t, size_t);
-
-void *aligned_alloc(size_t align, size_t len)
-{
-	return __memalign(align, len);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/calloc.c b/src/components/lib/libc/musl-1.1.11/src/malloc/calloc.c
deleted file mode 100644
index 436c0b0348..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/calloc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdlib.h>
-#include <errno.h>
-
-void *__malloc0(size_t);
-
-void *calloc(size_t m, size_t n)
-{
-	if (n && m > (size_t)-1/n) {
-		errno = ENOMEM;
-		return 0;
-	}
-	return __malloc0(n * m);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/lite_malloc.c b/src/components/lib/libc/musl-1.1.11/src/malloc/lite_malloc.c
deleted file mode 100644
index 09ac575596..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/lite_malloc.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include <limits.h>
-#include <errno.h>
-#include "libc.h"
-
-#define ALIGN 16
-
-void *__expand_heap(size_t *);
-
-void *__simple_malloc(size_t n)
-{
-	static char *cur, *end;
-	static volatile int lock[2];
-	size_t align=1, pad;
-	void *p;
-
-	if (!n) n++;
-	while (align<n && align<ALIGN)
-		align += align;
-
-	LOCK(lock);
-
-	pad = -(uintptr_t)cur & align-1;
-
-	if (n <= SIZE_MAX/2 + ALIGN) n += pad;
-
-	if (n > end-cur) {
-		size_t m = n;
-		char *new = __expand_heap(&m);
-		if (!new) {
-			UNLOCK(lock);
-			return 0;
-		}
-		if (new != end) {
-			cur = new;
-			n -= pad;
-			pad = 0;
-		}
-		end = new + m;
-	}
-
-	p = cur + pad;
-	cur += n;
-	UNLOCK(lock);
-	return p;
-}
-
-weak_alias(__simple_malloc, malloc);
-weak_alias(__simple_malloc, __malloc0);
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/malloc_usable_size.c b/src/components/lib/libc/musl-1.1.11/src/malloc/malloc_usable_size.c
deleted file mode 100644
index 8cccd9d8d6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/malloc_usable_size.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <malloc.h>
-
-void *(*const __realloc_dep)(void *, size_t) = realloc;
-
-struct chunk {
-	size_t psize, csize;
-	struct chunk *next, *prev;
-};
-
-#define OVERHEAD (2*sizeof(size_t))
-#define CHUNK_SIZE(c) ((c)->csize & -2)
-#define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD)
-
-size_t malloc_usable_size(void *p)
-{
-	return CHUNK_SIZE(MEM_TO_CHUNK(p)) - OVERHEAD;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/memalign.c b/src/components/lib/libc/musl-1.1.11/src/malloc/memalign.c
deleted file mode 100644
index 006bd21c76..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/memalign.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include <errno.h>
-#include "libc.h"
-
-/* This function should work with most dlmalloc-like chunk bookkeeping
- * systems, but it's only guaranteed to work with the native implementation
- * used in this library. */
-
-void *__memalign(size_t align, size_t len)
-{
-	unsigned char *mem, *new, *end;
-	size_t header, footer;
-
-	if ((align & -align) != align) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	if (len > SIZE_MAX - align) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-	if (align <= 4*sizeof(size_t)) {
-		if (!(mem = malloc(len)))
-			return NULL;
-		return mem;
-	}
-
-	if (!(mem = malloc(len + align-1)))
-		return NULL;
-
-	new = (void *)((uintptr_t)mem + align-1 & -align);
-	if (new == mem) return mem;
-
-	header = ((size_t *)mem)[-1];
-
-	if (!(header & 7)) {
-		((size_t *)new)[-2] = ((size_t *)mem)[-2] + (new-mem);
-		((size_t *)new)[-1] = ((size_t *)mem)[-1] - (new-mem);
-		return new;
-	}
-
-	end = mem + (header & -8);
-	footer = ((size_t *)end)[-2];
-
-	((size_t *)mem)[-1] = header&7 | new-mem;
-	((size_t *)new)[-2] = footer&7 | new-mem;
-	((size_t *)new)[-1] = header&7 | end-new;
-	((size_t *)end)[-2] = footer&7 | end-new;
-
-	free(mem);
-	return new;
-}
-
-weak_alias(__memalign, memalign);
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__fpclassifyl.c b/src/components/lib/libc/musl-1.1.11/src/math/__fpclassifyl.c
deleted file mode 100644
index 481c0b9499..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/__fpclassifyl.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "libm.h"
-
-#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-int __fpclassifyl(long double x)
-{
-	return __fpclassify(x);
-}
-#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384
-int __fpclassifyl(long double x)
-{
-	union ldshape u = {x};
-	int e = u.i.se & 0x7fff;
-	int msb = u.i.m>>63;
-	if (!e && !msb)
-		return u.i.m ? FP_SUBNORMAL : FP_ZERO;
-	if (!msb)
-		return FP_NAN;
-	if (e == 0x7fff)
-		return u.i.m << 1 ? FP_NAN : FP_INFINITE;
-	return FP_NORMAL;
-}
-#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384
-int __fpclassifyl(long double x)
-{
-	union ldshape u = {x};
-	int e = u.i.se & 0x7fff;
-	u.i.se = 0;
-	if (!e)
-		return u.i2.lo | u.i2.hi ? FP_SUBNORMAL : FP_ZERO;
-	if (e == 0x7fff)
-		return u.i2.lo | u.i2.hi ? FP_NAN : FP_INFINITE;
-	return FP_NORMAL;
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__invtrigl.h b/src/components/lib/libc/musl-1.1.11/src/math/__invtrigl.h
deleted file mode 100644
index 91a8a3b61f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/__invtrigl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* shared by acosl, asinl and atan2l */
-#define pio2_hi __pio2_hi
-#define pio2_lo __pio2_lo
-extern const long double pio2_hi, pio2_lo;
-
-long double __invtrigl_R(long double z);
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/fabs.s b/src/components/lib/libc/musl-1.1.11/src/math/aarch64/fabs.s
deleted file mode 100644
index 8c04d09177..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/fabs.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global fabs
-.type   fabs,%function
-fabs:
-	fabs d0, d0
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/fabsf.s b/src/components/lib/libc/musl-1.1.11/src/math/aarch64/fabsf.s
deleted file mode 100644
index 6e96dd43e7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/fabsf.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global fabsf
-.type   fabsf,%function
-fabsf:
-	fabs s0, s0
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/sqrt.s b/src/components/lib/libc/musl-1.1.11/src/math/aarch64/sqrt.s
deleted file mode 100644
index 1917e18d13..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/sqrt.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global sqrt
-.type   sqrt,%function
-sqrt:
-	fsqrt d0, d0
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/sqrtf.s b/src/components/lib/libc/musl-1.1.11/src/math/aarch64/sqrtf.s
deleted file mode 100644
index 1639497b06..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/aarch64/sqrtf.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global sqrtf
-.type   sqrtf,%function
-sqrtf:
-	fsqrt s0, s0
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/fabs.sub b/src/components/lib/libc/musl-1.1.11/src/math/armebhf/fabs.sub
deleted file mode 100644
index 10d9fb7e40..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/fabs.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armhf/fabs.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/fabsf.sub b/src/components/lib/libc/musl-1.1.11/src/math/armebhf/fabsf.sub
deleted file mode 100644
index 940b20bd33..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/fabsf.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armhf/fabsf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/sqrt.sub b/src/components/lib/libc/musl-1.1.11/src/math/armebhf/sqrt.sub
deleted file mode 100644
index de2be116a1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/sqrt.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armhf/sqrt.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/sqrtf.sub b/src/components/lib/libc/musl-1.1.11/src/math/armebhf/sqrtf.sub
deleted file mode 100644
index 150ab9ccdc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armebhf/sqrtf.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armhf/sqrtf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabs.s b/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabs.s
deleted file mode 100644
index 2bdebff5ae..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabs.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global fabs
-.type   fabs,%function
-fabs:
-	vabs.f64 d0, d0
-	bx lr
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabs.sub b/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabs.sub
deleted file mode 100644
index 99e8740666..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabs.sub
+++ /dev/null
@@ -1 +0,0 @@
-fabs.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabsf.s b/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabsf.s
deleted file mode 100644
index 35c720fab8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabsf.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global fabsf
-.type   fabsf,%function
-fabsf:
-	vabs.f32 s0, s0
-	bx lr
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabsf.sub b/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabsf.sub
deleted file mode 100644
index c04638aeb7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/fabsf.sub
+++ /dev/null
@@ -1 +0,0 @@
-fabsf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrt.s b/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrt.s
deleted file mode 100644
index 99fe64b90b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrt.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global sqrt
-.type   sqrt,%function
-sqrt:
-	vsqrt.f64 d0, d0
-	bx lr
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrt.sub b/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrt.sub
deleted file mode 100644
index 25de7cfa12..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrt.sub
+++ /dev/null
@@ -1 +0,0 @@
-sqrt.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrtf.s b/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrtf.s
deleted file mode 100644
index 9ea519f600..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrtf.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.text
-.global sqrtf
-.type   sqrtf,%function
-sqrtf:
-	vsqrt.f32 s0, s0
-	bx lr
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrtf.sub b/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrtf.sub
deleted file mode 100644
index 3bcbac87a0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/armhf/sqrtf.sub
+++ /dev/null
@@ -1 +0,0 @@
-sqrtf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/exp.c b/src/components/lib/libc/musl-1.1.11/src/math/exp.c
deleted file mode 100644
index 9ea672fac6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/exp.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_exp.c */
-/*
- * ====================================================
- * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-/* exp(x)
- * Returns the exponential of x.
- *
- * Method
- *   1. Argument reduction:
- *      Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658.
- *      Given x, find r and integer k such that
- *
- *               x = k*ln2 + r,  |r| <= 0.5*ln2.
- *
- *      Here r will be represented as r = hi-lo for better
- *      accuracy.
- *
- *   2. Approximation of exp(r) by a special rational function on
- *      the interval [0,0.34658]:
- *      Write
- *          R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ...
- *      We use a special Remez algorithm on [0,0.34658] to generate
- *      a polynomial of degree 5 to approximate R. The maximum error
- *      of this polynomial approximation is bounded by 2**-59. In
- *      other words,
- *          R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5
- *      (where z=r*r, and the values of P1 to P5 are listed below)
- *      and
- *          |                  5          |     -59
- *          | 2.0+P1*z+...+P5*z   -  R(z) | <= 2
- *          |                             |
- *      The computation of exp(r) thus becomes
- *                              2*r
- *              exp(r) = 1 + ----------
- *                            R(r) - r
- *                                 r*c(r)
- *                     = 1 + r + ----------- (for better accuracy)
- *                                2 - c(r)
- *      where
- *                              2       4             10
- *              c(r) = r - (P1*r  + P2*r  + ... + P5*r   ).
- *
- *   3. Scale back to obtain exp(x):
- *      From step 1, we have
- *         exp(x) = 2^k * exp(r)
- *
- * Special cases:
- *      exp(INF) is INF, exp(NaN) is NaN;
- *      exp(-INF) is 0, and
- *      for finite argument, only exp(0)=1 is exact.
- *
- * Accuracy:
- *      according to an error analysis, the error is always less than
- *      1 ulp (unit in the last place).
- *
- * Misc. info.
- *      For IEEE double
- *          if x >  709.782712893383973096 then exp(x) overflows
- *          if x < -745.133219101941108420 then exp(x) underflows
- */
-
-#include "libm.h"
-
-static const double
-half[2] = {0.5,-0.5},
-ln2hi = 6.93147180369123816490e-01, /* 0x3fe62e42, 0xfee00000 */
-ln2lo = 1.90821492927058770002e-10, /* 0x3dea39ef, 0x35793c76 */
-invln2 = 1.44269504088896338700e+00, /* 0x3ff71547, 0x652b82fe */
-P1   =  1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */
-P2   = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */
-P3   =  6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */
-P4   = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */
-P5   =  4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
-
-double exp(double x)
-{
-	double_t hi, lo, c, xx, y;
-	int k, sign;
-	uint32_t hx;
-
-	GET_HIGH_WORD(hx, x);
-	sign = hx>>31;
-	hx &= 0x7fffffff;  /* high word of |x| */
-
-	/* special cases */
-	if (hx >= 0x4086232b) {  /* if |x| >= 708.39... */
-		if (isnan(x))
-			return x;
-		if (x > 709.782712893383973096) {
-			/* overflow if x!=inf */
-			x *= 0x1p1023;
-			return x;
-		}
-		if (x < -708.39641853226410622) {
-			/* underflow if x!=-inf */
-			FORCE_EVAL((float)(-0x1p-149/x));
-			if (x < -745.13321910194110842)
-				return 0;
-		}
-	}
-
-	/* argument reduction */
-	if (hx > 0x3fd62e42) {  /* if |x| > 0.5 ln2 */
-		if (hx >= 0x3ff0a2b2)  /* if |x| >= 1.5 ln2 */
-			k = (int)(invln2*x + half[sign]);
-		else
-			k = 1 - sign - sign;
-		hi = x - k*ln2hi;  /* k*ln2hi is exact here */
-		lo = k*ln2lo;
-		x = hi - lo;
-	} else if (hx > 0x3e300000)  {  /* if |x| > 2**-28 */
-		k = 0;
-		hi = x;
-		lo = 0;
-	} else {
-		/* inexact if x!=0 */
-		FORCE_EVAL(0x1p1023 + x);
-		return 1 + x;
-	}
-
-	/* x is now in primary range */
-	xx = x*x;
-	c = x - xx*(P1+xx*(P2+xx*(P3+xx*(P4+xx*P5))));
-	y = 1 + (x*c/(2-c) - lo + hi);
-	if (k == 0)
-		return y;
-	return scalbn(y, k);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/exp2.c b/src/components/lib/libc/musl-1.1.11/src/math/exp2.c
deleted file mode 100644
index e14adba530..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/exp2.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/s_exp2.c */
-/*-
- * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "libm.h"
-
-#define TBLSIZE 256
-
-static const double
-redux = 0x1.8p52 / TBLSIZE,
-P1    = 0x1.62e42fefa39efp-1,
-P2    = 0x1.ebfbdff82c575p-3,
-P3    = 0x1.c6b08d704a0a6p-5,
-P4    = 0x1.3b2ab88f70400p-7,
-P5    = 0x1.5d88003875c74p-10;
-
-static const double tbl[TBLSIZE * 2] = {
-/*  exp2(z + eps)          eps     */
-  0x1.6a09e667f3d5dp-1,  0x1.9880p-44,
-  0x1.6b052fa751744p-1,  0x1.8000p-50,
-  0x1.6c012750bd9fep-1, -0x1.8780p-45,
-  0x1.6cfdcddd476bfp-1,  0x1.ec00p-46,
-  0x1.6dfb23c651a29p-1, -0x1.8000p-50,
-  0x1.6ef9298593ae3p-1, -0x1.c000p-52,
-  0x1.6ff7df9519386p-1, -0x1.fd80p-45,
-  0x1.70f7466f42da3p-1, -0x1.c880p-45,
-  0x1.71f75e8ec5fc3p-1,  0x1.3c00p-46,
-  0x1.72f8286eacf05p-1, -0x1.8300p-44,
-  0x1.73f9a48a58152p-1, -0x1.0c00p-47,
-  0x1.74fbd35d7ccfcp-1,  0x1.f880p-45,
-  0x1.75feb564267f1p-1,  0x1.3e00p-47,
-  0x1.77024b1ab6d48p-1, -0x1.7d00p-45,
-  0x1.780694fde5d38p-1, -0x1.d000p-50,
-  0x1.790b938ac1d00p-1,  0x1.3000p-49,
-  0x1.7a11473eb0178p-1, -0x1.d000p-49,
-  0x1.7b17b0976d060p-1,  0x1.0400p-45,
-  0x1.7c1ed0130c133p-1,  0x1.0000p-53,
-  0x1.7d26a62ff8636p-1, -0x1.6900p-45,
-  0x1.7e2f336cf4e3bp-1, -0x1.2e00p-47,
-  0x1.7f3878491c3e8p-1, -0x1.4580p-45,
-  0x1.80427543e1b4ep-1,  0x1.3000p-44,
-  0x1.814d2add1071ap-1,  0x1.f000p-47,
-  0x1.82589994ccd7ep-1, -0x1.1c00p-45,
-  0x1.8364c1eb942d0p-1,  0x1.9d00p-45,
-  0x1.8471a4623cab5p-1,  0x1.7100p-43,
-  0x1.857f4179f5bbcp-1,  0x1.2600p-45,
-  0x1.868d99b4491afp-1, -0x1.2c40p-44,
-  0x1.879cad931a395p-1, -0x1.3000p-45,
-  0x1.88ac7d98a65b8p-1, -0x1.a800p-45,
-  0x1.89bd0a4785800p-1, -0x1.d000p-49,
-  0x1.8ace5422aa223p-1,  0x1.3280p-44,
-  0x1.8be05bad619fap-1,  0x1.2b40p-43,
-  0x1.8cf3216b54383p-1, -0x1.ed00p-45,
-  0x1.8e06a5e08664cp-1, -0x1.0500p-45,
-  0x1.8f1ae99157807p-1,  0x1.8280p-45,
-  0x1.902fed0282c0ep-1, -0x1.cb00p-46,
-  0x1.9145b0b91ff96p-1, -0x1.5e00p-47,
-  0x1.925c353aa2ff9p-1,  0x1.5400p-48,
-  0x1.93737b0cdc64ap-1,  0x1.7200p-46,
-  0x1.948b82b5f98aep-1, -0x1.9000p-47,
-  0x1.95a44cbc852cbp-1,  0x1.5680p-45,
-  0x1.96bdd9a766f21p-1, -0x1.6d00p-44,
-  0x1.97d829fde4e2ap-1, -0x1.1000p-47,
-  0x1.98f33e47a23a3p-1,  0x1.d000p-45,
-  0x1.9a0f170ca0604p-1, -0x1.8a40p-44,
-  0x1.9b2bb4d53ff89p-1,  0x1.55c0p-44,
-  0x1.9c49182a3f15bp-1,  0x1.6b80p-45,
-  0x1.9d674194bb8c5p-1, -0x1.c000p-49,
-  0x1.9e86319e3238ep-1,  0x1.7d00p-46,
-  0x1.9fa5e8d07f302p-1,  0x1.6400p-46,
-  0x1.a0c667b5de54dp-1, -0x1.5000p-48,
-  0x1.a1e7aed8eb8f6p-1,  0x1.9e00p-47,
-  0x1.a309bec4a2e27p-1,  0x1.ad80p-45,
-  0x1.a42c980460a5dp-1, -0x1.af00p-46,
-  0x1.a5503b23e259bp-1,  0x1.b600p-47,
-  0x1.a674a8af46213p-1,  0x1.8880p-44,
-  0x1.a799e1330b3a7p-1,  0x1.1200p-46,
-  0x1.a8bfe53c12e8dp-1,  0x1.6c00p-47,
-  0x1.a9e6b5579fcd2p-1, -0x1.9b80p-45,
-  0x1.ab0e521356fb8p-1,  0x1.b700p-45,
-  0x1.ac36bbfd3f381p-1,  0x1.9000p-50,
-  0x1.ad5ff3a3c2780p-1,  0x1.4000p-49,
-  0x1.ae89f995ad2a3p-1, -0x1.c900p-45,
-  0x1.afb4ce622f367p-1,  0x1.6500p-46,
-  0x1.b0e07298db790p-1,  0x1.fd40p-45,
-  0x1.b20ce6c9a89a9p-1,  0x1.2700p-46,
-  0x1.b33a2b84f1a4bp-1,  0x1.d470p-43,
-  0x1.b468415b747e7p-1, -0x1.8380p-44,
-  0x1.b59728de5593ap-1,  0x1.8000p-54,
-  0x1.b6c6e29f1c56ap-1,  0x1.ad00p-47,
-  0x1.b7f76f2fb5e50p-1,  0x1.e800p-50,
-  0x1.b928cf22749b2p-1, -0x1.4c00p-47,
-  0x1.ba5b030a10603p-1, -0x1.d700p-47,
-  0x1.bb8e0b79a6f66p-1,  0x1.d900p-47,
-  0x1.bcc1e904bc1ffp-1,  0x1.2a00p-47,
-  0x1.bdf69c3f3a16fp-1, -0x1.f780p-46,
-  0x1.bf2c25bd71db8p-1, -0x1.0a00p-46,
-  0x1.c06286141b2e9p-1, -0x1.1400p-46,
-  0x1.c199bdd8552e0p-1,  0x1.be00p-47,
-  0x1.c2d1cd9fa64eep-1, -0x1.9400p-47,
-  0x1.c40ab5fffd02fp-1, -0x1.ed00p-47,
-  0x1.c544778fafd15p-1,  0x1.9660p-44,
-  0x1.c67f12e57d0cbp-1, -0x1.a100p-46,
-  0x1.c7ba88988c1b6p-1, -0x1.8458p-42,
-  0x1.c8f6d9406e733p-1, -0x1.a480p-46,
-  0x1.ca3405751c4dfp-1,  0x1.b000p-51,
-  0x1.cb720dcef9094p-1,  0x1.1400p-47,
-  0x1.ccb0f2e6d1689p-1,  0x1.0200p-48,
-  0x1.cdf0b555dc412p-1,  0x1.3600p-48,
-  0x1.cf3155b5bab3bp-1, -0x1.6900p-47,
-  0x1.d072d4a0789bcp-1,  0x1.9a00p-47,
-  0x1.d1b532b08c8fap-1, -0x1.5e00p-46,
-  0x1.d2f87080d8a85p-1,  0x1.d280p-46,
-  0x1.d43c8eacaa203p-1,  0x1.1a00p-47,
-  0x1.d5818dcfba491p-1,  0x1.f000p-50,
-  0x1.d6c76e862e6a1p-1, -0x1.3a00p-47,
-  0x1.d80e316c9834ep-1, -0x1.cd80p-47,
-  0x1.d955d71ff6090p-1,  0x1.4c00p-48,
-  0x1.da9e603db32aep-1,  0x1.f900p-48,
-  0x1.dbe7cd63a8325p-1,  0x1.9800p-49,
-  0x1.dd321f301b445p-1, -0x1.5200p-48,
-  0x1.de7d5641c05bfp-1, -0x1.d700p-46,
-  0x1.dfc97337b9aecp-1, -0x1.6140p-46,
-  0x1.e11676b197d5ep-1,  0x1.b480p-47,
-  0x1.e264614f5a3e7p-1,  0x1.0ce0p-43,
-  0x1.e3b333b16ee5cp-1,  0x1.c680p-47,
-  0x1.e502ee78b3fb4p-1, -0x1.9300p-47,
-  0x1.e653924676d68p-1, -0x1.5000p-49,
-  0x1.e7a51fbc74c44p-1, -0x1.7f80p-47,
-  0x1.e8f7977cdb726p-1, -0x1.3700p-48,
-  0x1.ea4afa2a490e8p-1,  0x1.5d00p-49,
-  0x1.eb9f4867ccae4p-1,  0x1.61a0p-46,
-  0x1.ecf482d8e680dp-1,  0x1.5500p-48,
-  0x1.ee4aaa2188514p-1,  0x1.6400p-51,
-  0x1.efa1bee615a13p-1, -0x1.e800p-49,
-  0x1.f0f9c1cb64106p-1, -0x1.a880p-48,
-  0x1.f252b376bb963p-1, -0x1.c900p-45,
-  0x1.f3ac948dd7275p-1,  0x1.a000p-53,
-  0x1.f50765b6e4524p-1, -0x1.4f00p-48,
-  0x1.f6632798844fdp-1,  0x1.a800p-51,
-  0x1.f7bfdad9cbe38p-1,  0x1.abc0p-48,
-  0x1.f91d802243c82p-1, -0x1.4600p-50,
-  0x1.fa7c1819e908ep-1, -0x1.b0c0p-47,
-  0x1.fbdba3692d511p-1, -0x1.0e00p-51,
-  0x1.fd3c22b8f7194p-1, -0x1.0de8p-46,
-  0x1.fe9d96b2a23eep-1,  0x1.e430p-49,
-  0x1.0000000000000p+0,  0x0.0000p+0,
-  0x1.00b1afa5abcbep+0, -0x1.3400p-52,
-  0x1.0163da9fb3303p+0, -0x1.2170p-46,
-  0x1.02168143b0282p+0,  0x1.a400p-52,
-  0x1.02c9a3e77806cp+0,  0x1.f980p-49,
-  0x1.037d42e11bbcap+0, -0x1.7400p-51,
-  0x1.04315e86e7f89p+0,  0x1.8300p-50,
-  0x1.04e5f72f65467p+0, -0x1.a3f0p-46,
-  0x1.059b0d315855ap+0, -0x1.2840p-47,
-  0x1.0650a0e3c1f95p+0,  0x1.1600p-48,
-  0x1.0706b29ddf71ap+0,  0x1.5240p-46,
-  0x1.07bd42b72a82dp+0, -0x1.9a00p-49,
-  0x1.0874518759bd0p+0,  0x1.6400p-49,
-  0x1.092bdf66607c8p+0, -0x1.0780p-47,
-  0x1.09e3ecac6f383p+0, -0x1.8000p-54,
-  0x1.0a9c79b1f3930p+0,  0x1.fa00p-48,
-  0x1.0b5586cf988fcp+0, -0x1.ac80p-48,
-  0x1.0c0f145e46c8ap+0,  0x1.9c00p-50,
-  0x1.0cc922b724816p+0,  0x1.5200p-47,
-  0x1.0d83b23395dd8p+0, -0x1.ad00p-48,
-  0x1.0e3ec32d3d1f3p+0,  0x1.bac0p-46,
-  0x1.0efa55fdfa9a6p+0, -0x1.4e80p-47,
-  0x1.0fb66affed2f0p+0, -0x1.d300p-47,
-  0x1.1073028d7234bp+0,  0x1.1500p-48,
-  0x1.11301d0125b5bp+0,  0x1.c000p-49,
-  0x1.11edbab5e2af9p+0,  0x1.6bc0p-46,
-  0x1.12abdc06c31d5p+0,  0x1.8400p-49,
-  0x1.136a814f2047dp+0, -0x1.ed00p-47,
-  0x1.1429aaea92de9p+0,  0x1.8e00p-49,
-  0x1.14e95934f3138p+0,  0x1.b400p-49,
-  0x1.15a98c8a58e71p+0,  0x1.5300p-47,
-  0x1.166a45471c3dfp+0,  0x1.3380p-47,
-  0x1.172b83c7d5211p+0,  0x1.8d40p-45,
-  0x1.17ed48695bb9fp+0, -0x1.5d00p-47,
-  0x1.18af9388c8d93p+0, -0x1.c880p-46,
-  0x1.1972658375d66p+0,  0x1.1f00p-46,
-  0x1.1a35beb6fcba7p+0,  0x1.0480p-46,
-  0x1.1af99f81387e3p+0, -0x1.7390p-43,
-  0x1.1bbe084045d54p+0,  0x1.4e40p-45,
-  0x1.1c82f95281c43p+0, -0x1.a200p-47,
-  0x1.1d4873168b9b2p+0,  0x1.3800p-49,
-  0x1.1e0e75eb44031p+0,  0x1.ac00p-49,
-  0x1.1ed5022fcd938p+0,  0x1.1900p-47,
-  0x1.1f9c18438cdf7p+0, -0x1.b780p-46,
-  0x1.2063b88628d8fp+0,  0x1.d940p-45,
-  0x1.212be3578a81ep+0,  0x1.8000p-50,
-  0x1.21f49917ddd41p+0,  0x1.b340p-45,
-  0x1.22bdda2791323p+0,  0x1.9f80p-46,
-  0x1.2387a6e7561e7p+0, -0x1.9c80p-46,
-  0x1.2451ffb821427p+0,  0x1.2300p-47,
-  0x1.251ce4fb2a602p+0, -0x1.3480p-46,
-  0x1.25e85711eceb0p+0,  0x1.2700p-46,
-  0x1.26b4565e27d16p+0,  0x1.1d00p-46,
-  0x1.2780e341de00fp+0,  0x1.1ee0p-44,
-  0x1.284dfe1f5633ep+0, -0x1.4c00p-46,
-  0x1.291ba7591bb30p+0, -0x1.3d80p-46,
-  0x1.29e9df51fdf09p+0,  0x1.8b00p-47,
-  0x1.2ab8a66d10e9bp+0, -0x1.27c0p-45,
-  0x1.2b87fd0dada3ap+0,  0x1.a340p-45,
-  0x1.2c57e39771af9p+0, -0x1.0800p-46,
-  0x1.2d285a6e402d9p+0, -0x1.ed00p-47,
-  0x1.2df961f641579p+0, -0x1.4200p-48,
-  0x1.2ecafa93e2ecfp+0, -0x1.4980p-45,
-  0x1.2f9d24abd8822p+0, -0x1.6300p-46,
-  0x1.306fe0a31b625p+0, -0x1.2360p-44,
-  0x1.31432edeea50bp+0, -0x1.0df8p-40,
-  0x1.32170fc4cd7b8p+0, -0x1.2480p-45,
-  0x1.32eb83ba8e9a2p+0, -0x1.5980p-45,
-  0x1.33c08b2641766p+0,  0x1.ed00p-46,
-  0x1.3496266e3fa27p+0, -0x1.c000p-50,
-  0x1.356c55f929f0fp+0, -0x1.0d80p-44,
-  0x1.36431a2de88b9p+0,  0x1.2c80p-45,
-  0x1.371a7373aaa39p+0,  0x1.0600p-45,
-  0x1.37f26231e74fep+0, -0x1.6600p-46,
-  0x1.38cae6d05d838p+0, -0x1.ae00p-47,
-  0x1.39a401b713ec3p+0, -0x1.4720p-43,
-  0x1.3a7db34e5a020p+0,  0x1.8200p-47,
-  0x1.3b57fbfec6e95p+0,  0x1.e800p-44,
-  0x1.3c32dc313a8f2p+0,  0x1.f800p-49,
-  0x1.3d0e544ede122p+0, -0x1.7a00p-46,
-  0x1.3dea64c1234bbp+0,  0x1.6300p-45,
-  0x1.3ec70df1c4eccp+0, -0x1.8a60p-43,
-  0x1.3fa4504ac7e8cp+0, -0x1.cdc0p-44,
-  0x1.40822c367a0bbp+0,  0x1.5b80p-45,
-  0x1.4160a21f72e95p+0,  0x1.ec00p-46,
-  0x1.423fb27094646p+0, -0x1.3600p-46,
-  0x1.431f5d950a920p+0,  0x1.3980p-45,
-  0x1.43ffa3f84b9ebp+0,  0x1.a000p-48,
-  0x1.44e0860618919p+0, -0x1.6c00p-48,
-  0x1.45c2042a7d201p+0, -0x1.bc00p-47,
-  0x1.46a41ed1d0016p+0, -0x1.2800p-46,
-  0x1.4786d668b3326p+0,  0x1.0e00p-44,
-  0x1.486a2b5c13c00p+0, -0x1.d400p-45,
-  0x1.494e1e192af04p+0,  0x1.c200p-47,
-  0x1.4a32af0d7d372p+0, -0x1.e500p-46,
-  0x1.4b17dea6db801p+0,  0x1.7800p-47,
-  0x1.4bfdad53629e1p+0, -0x1.3800p-46,
-  0x1.4ce41b817c132p+0,  0x1.0800p-47,
-  0x1.4dcb299fddddbp+0,  0x1.c700p-45,
-  0x1.4eb2d81d8ab96p+0, -0x1.ce00p-46,
-  0x1.4f9b2769d2d02p+0,  0x1.9200p-46,
-  0x1.508417f4531c1p+0, -0x1.8c00p-47,
-  0x1.516daa2cf662ap+0, -0x1.a000p-48,
-  0x1.5257de83f51eap+0,  0x1.a080p-43,
-  0x1.5342b569d4edap+0, -0x1.6d80p-45,
-  0x1.542e2f4f6ac1ap+0, -0x1.2440p-44,
-  0x1.551a4ca5d94dbp+0,  0x1.83c0p-43,
-  0x1.56070dde9116bp+0,  0x1.4b00p-45,
-  0x1.56f4736b529dep+0,  0x1.15a0p-43,
-  0x1.57e27dbe2c40ep+0, -0x1.9e00p-45,
-  0x1.58d12d497c76fp+0, -0x1.3080p-45,
-  0x1.59c0827ff0b4cp+0,  0x1.dec0p-43,
-  0x1.5ab07dd485427p+0, -0x1.4000p-51,
-  0x1.5ba11fba87af4p+0,  0x1.0080p-44,
-  0x1.5c9268a59460bp+0, -0x1.6c80p-45,
-  0x1.5d84590998e3fp+0,  0x1.69a0p-43,
-  0x1.5e76f15ad20e1p+0, -0x1.b400p-46,
-  0x1.5f6a320dcebcap+0,  0x1.7700p-46,
-  0x1.605e1b976dcb8p+0,  0x1.6f80p-45,
-  0x1.6152ae6cdf715p+0,  0x1.1000p-47,
-  0x1.6247eb03a5531p+0, -0x1.5d00p-46,
-  0x1.633dd1d1929b5p+0, -0x1.2d00p-46,
-  0x1.6434634ccc313p+0, -0x1.a800p-49,
-  0x1.652b9febc8efap+0, -0x1.8600p-45,
-  0x1.6623882553397p+0,  0x1.1fe0p-40,
-  0x1.671c1c708328ep+0, -0x1.7200p-44,
-  0x1.68155d44ca97ep+0,  0x1.6800p-49,
-  0x1.690f4b19e9471p+0, -0x1.9780p-45,
-};
-
-/*
- * exp2(x): compute the base 2 exponential of x
- *
- * Accuracy: Peak error < 0.503 ulp for normalized results.
- *
- * Method: (accurate tables)
- *
- *   Reduce x:
- *     x = k + y, for integer k and |y| <= 1/2.
- *     Thus we have exp2(x) = 2**k * exp2(y).
- *
- *   Reduce y:
- *     y = i/TBLSIZE + z - eps[i] for integer i near y * TBLSIZE.
- *     Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z - eps[i]),
- *     with |z - eps[i]| <= 2**-9 + 2**-39 for the table used.
- *
- *   We compute exp2(i/TBLSIZE) via table lookup and exp2(z - eps[i]) via
- *   a degree-5 minimax polynomial with maximum error under 1.3 * 2**-61.
- *   The values in exp2t[] and eps[] are chosen such that
- *   exp2t[i] = exp2(i/TBLSIZE + eps[i]), and eps[i] is a small offset such
- *   that exp2t[i] is accurate to 2**-64.
- *
- *   Note that the range of i is +-TBLSIZE/2, so we actually index the tables
- *   by i0 = i + TBLSIZE/2.  For cache efficiency, exp2t[] and eps[] are
- *   virtual tables, interleaved in the real table tbl[].
- *
- *   This method is due to Gal, with many details due to Gal and Bachelis:
- *
- *      Gal, S. and Bachelis, B.  An Accurate Elementary Mathematical Library
- *      for the IEEE Floating Point Standard.  TOMS 17(1), 26-46 (1991).
- */
-double exp2(double x)
-{
-	double_t r, t, z;
-	uint32_t ix, i0;
-	union {double f; uint64_t i;} u = {x};
-	union {uint32_t u; int32_t i;} k;
-
-	/* Filter out exceptional cases. */
-	ix = u.i>>32 & 0x7fffffff;
-	if (ix >= 0x408ff000) {  /* |x| >= 1022 or nan */
-		if (ix >= 0x40900000 && u.i>>63 == 0) {  /* x >= 1024 or nan */
-			/* overflow */
-			x *= 0x1p1023;
-			return x;
-		}
-		if (ix >= 0x7ff00000)  /* -inf or -nan */
-			return -1/x;
-		if (u.i>>63) {  /* x <= -1022 */
-			/* underflow */
-			if (x <= -1075 || x - 0x1p52 + 0x1p52 != x)
-				FORCE_EVAL((float)(-0x1p-149/x));
-			if (x <= -1075)
-				return 0;
-		}
-	} else if (ix < 0x3c900000) {  /* |x| < 0x1p-54 */
-		return 1.0 + x;
-	}
-
-	/* Reduce x, computing z, i0, and k. */
-	u.f = x + redux;
-	i0 = u.i;
-	i0 += TBLSIZE / 2;
-	k.u = i0 / TBLSIZE * TBLSIZE;
-	k.i /= TBLSIZE;
-	i0 %= TBLSIZE;
-	u.f -= redux;
-	z = x - u.f;
-
-	/* Compute r = exp2(y) = exp2t[i0] * p(z - eps[i]). */
-	t = tbl[2*i0];       /* exp2t[i0] */
-	z -= tbl[2*i0 + 1];  /* eps[i0]   */
-	r = t + t * z * (P1 + z * (P2 + z * (P3 + z * (P4 + z * P5))));
-
-	return scalbn(r, k.i);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/exp2f.c b/src/components/lib/libc/musl-1.1.11/src/math/exp2f.c
deleted file mode 100644
index cf6126eea7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/exp2f.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/s_exp2f.c */
-/*-
- * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "libm.h"
-
-#define TBLSIZE 16
-
-static const float
-redux = 0x1.8p23f / TBLSIZE,
-P1    = 0x1.62e430p-1f,
-P2    = 0x1.ebfbe0p-3f,
-P3    = 0x1.c6b348p-5f,
-P4    = 0x1.3b2c9cp-7f;
-
-static const double exp2ft[TBLSIZE] = {
-  0x1.6a09e667f3bcdp-1,
-  0x1.7a11473eb0187p-1,
-  0x1.8ace5422aa0dbp-1,
-  0x1.9c49182a3f090p-1,
-  0x1.ae89f995ad3adp-1,
-  0x1.c199bdd85529cp-1,
-  0x1.d5818dcfba487p-1,
-  0x1.ea4afa2a490dap-1,
-  0x1.0000000000000p+0,
-  0x1.0b5586cf9890fp+0,
-  0x1.172b83c7d517bp+0,
-  0x1.2387a6e756238p+0,
-  0x1.306fe0a31b715p+0,
-  0x1.3dea64c123422p+0,
-  0x1.4bfdad5362a27p+0,
-  0x1.5ab07dd485429p+0,
-};
-
-/*
- * exp2f(x): compute the base 2 exponential of x
- *
- * Accuracy: Peak error < 0.501 ulp; location of peak: -0.030110927.
- *
- * Method: (equally-spaced tables)
- *
- *   Reduce x:
- *     x = k + y, for integer k and |y| <= 1/2.
- *     Thus we have exp2f(x) = 2**k * exp2(y).
- *
- *   Reduce y:
- *     y = i/TBLSIZE + z for integer i near y * TBLSIZE.
- *     Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z),
- *     with |z| <= 2**-(TBLSIZE+1).
- *
- *   We compute exp2(i/TBLSIZE) via table lookup and exp2(z) via a
- *   degree-4 minimax polynomial with maximum error under 1.4 * 2**-33.
- *   Using double precision for everything except the reduction makes
- *   roundoff error insignificant and simplifies the scaling step.
- *
- *   This method is due to Tang, but I do not use his suggested parameters:
- *
- *      Tang, P.  Table-driven Implementation of the Exponential Function
- *      in IEEE Floating-Point Arithmetic.  TOMS 15(2), 144-157 (1989).
- */
-float exp2f(float x)
-{
-	double_t t, r, z;
-	union {float f; uint32_t i;} u = {x};
-	union {double f; uint64_t i;} uk;
-	uint32_t ix, i0, k;
-
-	/* Filter out exceptional cases. */
-	ix = u.i & 0x7fffffff;
-	if (ix > 0x42fc0000) {  /* |x| > 126 */
-		if (u.i >= 0x43000000 && u.i < 0x80000000) {  /* x >= 128 */
-			x *= 0x1p127f;
-			return x;
-		}
-		if (u.i >= 0x80000000) {  /* x < -126 */
-			if (u.i >= 0xc3160000 || (u.i & 0x0000ffff))
-				FORCE_EVAL(-0x1p-149f/x);
-			if (u.i >= 0xc3160000)  /* x <= -150 */
-				return 0;
-		}
-	} else if (ix <= 0x33000000) {  /* |x| <= 0x1p-25 */
-		return 1.0f + x;
-	}
-
-	/* Reduce x, computing z, i0, and k. */
-	u.f = x + redux;
-	i0 = u.i;
-	i0 += TBLSIZE / 2;
-	k = i0 / TBLSIZE;
-	uk.i = (uint64_t)(0x3ff + k)<<52;
-	i0 &= TBLSIZE - 1;
-	u.f -= redux;
-	z = x - u.f;
-	/* Compute r = exp2(y) = exp2ft[i0] * p(z). */
-	r = exp2ft[i0];
-	t = r * z;
-	r = r + t * (P1 + z * P2) + t * (z * z) * (P3 + z * P4);
-
-	/* Scale by 2**k */
-	return r * uk.f;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/expf.c b/src/components/lib/libc/musl-1.1.11/src/math/expf.c
deleted file mode 100644
index 16e9afe62a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/expf.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_expf.c */
-/*
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include "libm.h"
-
-static const float
-half[2] = {0.5,-0.5},
-ln2hi   = 6.9314575195e-1f,  /* 0x3f317200 */
-ln2lo   = 1.4286067653e-6f,  /* 0x35bfbe8e */
-invln2  = 1.4426950216e+0f,  /* 0x3fb8aa3b */
-/*
- * Domain [-0.34568, 0.34568], range ~[-4.278e-9, 4.447e-9]:
- * |x*(exp(x)+1)/(exp(x)-1) - p(x)| < 2**-27.74
- */
-P1 =  1.6666625440e-1f, /*  0xaaaa8f.0p-26 */
-P2 = -2.7667332906e-3f; /* -0xb55215.0p-32 */
-
-float expf(float x)
-{
-	float_t hi, lo, c, xx, y;
-	int k, sign;
-	uint32_t hx;
-
-	GET_FLOAT_WORD(hx, x);
-	sign = hx >> 31;   /* sign bit of x */
-	hx &= 0x7fffffff;  /* high word of |x| */
-
-	/* special cases */
-	if (hx >= 0x42aeac50) {  /* if |x| >= -87.33655f or NaN */
-		if (hx >= 0x42b17218 && !sign) {  /* x >= 88.722839f */
-			/* overflow */
-			x *= 0x1p127f;
-			return x;
-		}
-		if (sign) {
-			/* underflow */
-			FORCE_EVAL(-0x1p-149f/x);
-			if (hx >= 0x42cff1b5)  /* x <= -103.972084f */
-				return 0;
-		}
-	}
-
-	/* argument reduction */
-	if (hx > 0x3eb17218) {  /* if |x| > 0.5 ln2 */
-		if (hx > 0x3f851592)  /* if |x| > 1.5 ln2 */
-			k = invln2*x + half[sign];
-		else
-			k = 1 - sign - sign;
-		hi = x - k*ln2hi;  /* k*ln2hi is exact here */
-		lo = k*ln2lo;
-		x = hi - lo;
-	} else if (hx > 0x39000000) {  /* |x| > 2**-14 */
-		k = 0;
-		hi = x;
-		lo = 0;
-	} else {
-		/* raise inexact */
-		FORCE_EVAL(0x1p127f + x);
-		return 1 + x;
-	}
-
-	/* x is now in primary range */
-	xx = x*x;
-	c = x - xx*(P1+xx*P2);
-	y = 1 + (x*c/(2-c) - lo + hi);
-	if (k == 0)
-		return y;
-	return scalbnf(y, k);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fma.c b/src/components/lib/libc/musl-1.1.11/src/math/fma.c
deleted file mode 100644
index 741ccd757a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/fma.c
+++ /dev/null
@@ -1,460 +0,0 @@
-#include <fenv.h>
-#include "libm.h"
-
-#if LDBL_MANT_DIG==64 && LDBL_MAX_EXP==16384
-/* exact add, assumes exponent_x >= exponent_y */
-static void add(long double *hi, long double *lo, long double x, long double y)
-{
-	long double r;
-
-	r = x + y;
-	*hi = r;
-	r -= x;
-	*lo = y - r;
-}
-
-/* exact mul, assumes no over/underflow */
-static void mul(long double *hi, long double *lo, long double x, long double y)
-{
-	static const long double c = 1.0 + 0x1p32L;
-	long double cx, xh, xl, cy, yh, yl;
-
-	cx = c*x;
-	xh = (x - cx) + cx;
-	xl = x - xh;
-	cy = c*y;
-	yh = (y - cy) + cy;
-	yl = y - yh;
-	*hi = x*y;
-	*lo = (xh*yh - *hi) + xh*yl + xl*yh + xl*yl;
-}
-
-/*
-assume (long double)(hi+lo) == hi
-return an adjusted hi so that rounding it to double (or less) precision is correct
-*/
-static long double adjust(long double hi, long double lo)
-{
-	union ldshape uhi, ulo;
-
-	if (lo == 0)
-		return hi;
-	uhi.f = hi;
-	if (uhi.i.m & 0x3ff)
-		return hi;
-	ulo.f = lo;
-	if ((uhi.i.se & 0x8000) == (ulo.i.se & 0x8000))
-		uhi.i.m++;
-	else {
-		/* handle underflow and take care of ld80 implicit msb */
-		if (uhi.i.m << 1 == 0) {
-			uhi.i.m = 0;
-			uhi.i.se--;
-		}
-		uhi.i.m--;
-	}
-	return uhi.f;
-}
-
-/* adjusted add so the result is correct when rounded to double (or less) precision */
-static long double dadd(long double x, long double y)
-{
-	add(&x, &y, x, y);
-	return adjust(x, y);
-}
-
-/* adjusted mul so the result is correct when rounded to double (or less) precision */
-static long double dmul(long double x, long double y)
-{
-	mul(&x, &y, x, y);
-	return adjust(x, y);
-}
-
-static int getexp(long double x)
-{
-	union ldshape u;
-	u.f = x;
-	return u.i.se & 0x7fff;
-}
-
-double fma(double x, double y, double z)
-{
-	#pragma STDC FENV_ACCESS ON
-	long double hi, lo1, lo2, xy;
-	int round, ez, exy;
-
-	/* handle +-inf,nan */
-	if (!isfinite(x) || !isfinite(y))
-		return x*y + z;
-	if (!isfinite(z))
-		return z;
-	/* handle +-0 */
-	if (x == 0.0 || y == 0.0)
-		return x*y + z;
-	round = fegetround();
-	if (z == 0.0) {
-		if (round == FE_TONEAREST)
-			return dmul(x, y);
-		return x*y;
-	}
-
-	/* exact mul and add require nearest rounding */
-	/* spurious inexact exceptions may be raised */
-	fesetround(FE_TONEAREST);
-	mul(&xy, &lo1, x, y);
-	exy = getexp(xy);
-	ez = getexp(z);
-	if (ez > exy) {
-		add(&hi, &lo2, z, xy);
-	} else if (ez > exy - 12) {
-		add(&hi, &lo2, xy, z);
-		if (hi == 0) {
-			/*
-			xy + z is 0, but it should be calculated with the
-			original rounding mode so the sign is correct, if the
-			compiler does not support FENV_ACCESS ON it does not
-			know about the changed rounding mode and eliminates
-			the xy + z below without the volatile memory access
-			*/
-			volatile double z_;
-			fesetround(round);
-			z_ = z;
-			return (xy + z_) + lo1;
-		}
-	} else {
-		/*
-		ez <= exy - 12
-		the 12 extra bits (1guard, 11round+sticky) are needed so with
-			lo = dadd(lo1, lo2)
-		elo <= ehi - 11, and we use the last 10 bits in adjust so
-			dadd(hi, lo)
-		gives correct result when rounded to double
-		*/
-		hi = xy;
-		lo2 = z;
-	}
-	/*
-	the result is stored before return for correct precision and exceptions
-
-	one corner case is when the underflow flag should be raised because
-	the precise result is an inexact subnormal double, but the calculated
-	long double result is an exact subnormal double
-	(so rounding to double does not raise exceptions)
-
-	in nearest rounding mode dadd takes care of this: the last bit of the
-	result is adjusted so rounding sees an inexact value when it should
-
-	in non-nearest rounding mode fenv is used for the workaround
-	*/
-	fesetround(round);
-	if (round == FE_TONEAREST)
-		z = dadd(hi, dadd(lo1, lo2));
-	else {
-#if defined(FE_INEXACT) && defined(FE_UNDERFLOW)
-		int e = fetestexcept(FE_INEXACT);
-		feclearexcept(FE_INEXACT);
-#endif
-		z = hi + (lo1 + lo2);
-#if defined(FE_INEXACT) && defined(FE_UNDERFLOW)
-		if (getexp(z) < 0x3fff-1022 && fetestexcept(FE_INEXACT))
-			feraiseexcept(FE_UNDERFLOW);
-		else if (e)
-			feraiseexcept(FE_INEXACT);
-#endif
-	}
-	return z;
-}
-#else
-/* origin: FreeBSD /usr/src/lib/msun/src/s_fma.c */
-/*-
- * Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * A struct dd represents a floating-point number with twice the precision
- * of a double.  We maintain the invariant that "hi" stores the 53 high-order
- * bits of the result.
- */
-struct dd {
-	double hi;
-	double lo;
-};
-
-/*
- * Compute a+b exactly, returning the exact result in a struct dd.  We assume
- * that both a and b are finite, but make no assumptions about their relative
- * magnitudes.
- */
-static inline struct dd dd_add(double a, double b)
-{
-	struct dd ret;
-	double s;
-
-	ret.hi = a + b;
-	s = ret.hi - a;
-	ret.lo = (a - (ret.hi - s)) + (b - s);
-	return (ret);
-}
-
-/*
- * Compute a+b, with a small tweak:  The least significant bit of the
- * result is adjusted into a sticky bit summarizing all the bits that
- * were lost to rounding.  This adjustment negates the effects of double
- * rounding when the result is added to another number with a higher
- * exponent.  For an explanation of round and sticky bits, see any reference
- * on FPU design, e.g.,
- *
- *     J. Coonen.  An Implementation Guide to a Proposed Standard for
- *     Floating-Point Arithmetic.  Computer, vol. 13, no. 1, Jan 1980.
- */
-static inline double add_adjusted(double a, double b)
-{
-	struct dd sum;
-	union {double f; uint64_t i;} uhi, ulo;
-
-	sum = dd_add(a, b);
-	if (sum.lo != 0) {
-		uhi.f = sum.hi;
-		if ((uhi.i & 1) == 0) {
-			/* hibits += (int)copysign(1.0, sum.hi * sum.lo) */
-			ulo.f = sum.lo;
-			uhi.i += 1 - ((uhi.i ^ ulo.i) >> 62);
-			sum.hi = uhi.f;
-		}
-	}
-	return (sum.hi);
-}
-
-/*
- * Compute ldexp(a+b, scale) with a single rounding error. It is assumed
- * that the result will be subnormal, and care is taken to ensure that
- * double rounding does not occur.
- */
-static inline double add_and_denormalize(double a, double b, int scale)
-{
-	struct dd sum;
-	union {double f; uint64_t i;} uhi, ulo;
-	int bits_lost;
-
-	sum = dd_add(a, b);
-
-	/*
-	 * If we are losing at least two bits of accuracy to denormalization,
-	 * then the first lost bit becomes a round bit, and we adjust the
-	 * lowest bit of sum.hi to make it a sticky bit summarizing all the
-	 * bits in sum.lo. With the sticky bit adjusted, the hardware will
-	 * break any ties in the correct direction.
-	 *
-	 * If we are losing only one bit to denormalization, however, we must
-	 * break the ties manually.
-	 */
-	if (sum.lo != 0) {
-		uhi.f = sum.hi;
-		bits_lost = -((int)(uhi.i >> 52) & 0x7ff) - scale + 1;
-		if ((bits_lost != 1) ^ (int)(uhi.i & 1)) {
-			/* hibits += (int)copysign(1.0, sum.hi * sum.lo) */
-			ulo.f = sum.lo;
-			uhi.i += 1 - (((uhi.i ^ ulo.i) >> 62) & 2);
-			sum.hi = uhi.f;
-		}
-	}
-	return scalbn(sum.hi, scale);
-}
-
-/*
- * Compute a*b exactly, returning the exact result in a struct dd.  We assume
- * that both a and b are normalized, so no underflow or overflow will occur.
- * The current rounding mode must be round-to-nearest.
- */
-static inline struct dd dd_mul(double a, double b)
-{
-	static const double split = 0x1p27 + 1.0;
-	struct dd ret;
-	double ha, hb, la, lb, p, q;
-
-	p = a * split;
-	ha = a - p;
-	ha += p;
-	la = a - ha;
-
-	p = b * split;
-	hb = b - p;
-	hb += p;
-	lb = b - hb;
-
-	p = ha * hb;
-	q = ha * lb + la * hb;
-
-	ret.hi = p + q;
-	ret.lo = p - ret.hi + q + la * lb;
-	return (ret);
-}
-
-/*
- * Fused multiply-add: Compute x * y + z with a single rounding error.
- *
- * We use scaling to avoid overflow/underflow, along with the
- * canonical precision-doubling technique adapted from:
- *
- *      Dekker, T.  A Floating-Point Technique for Extending the
- *      Available Precision.  Numer. Math. 18, 224-242 (1971).
- *
- * This algorithm is sensitive to the rounding precision.  FPUs such
- * as the i387 must be set in double-precision mode if variables are
- * to be stored in FP registers in order to avoid incorrect results.
- * This is the default on FreeBSD, but not on many other systems.
- *
- * Hardware instructions should be used on architectures that support it,
- * since this implementation will likely be several times slower.
- */
-double fma(double x, double y, double z)
-{
-	#pragma STDC FENV_ACCESS ON
-	double xs, ys, zs, adj;
-	struct dd xy, r;
-	int oround;
-	int ex, ey, ez;
-	int spread;
-
-	/*
-	 * Handle special cases. The order of operations and the particular
-	 * return values here are crucial in handling special cases involving
-	 * infinities, NaNs, overflows, and signed zeroes correctly.
-	 */
-	if (!isfinite(x) || !isfinite(y))
-		return (x * y + z);
-	if (!isfinite(z))
-		return (z);
-	if (x == 0.0 || y == 0.0)
-		return (x * y + z);
-	if (z == 0.0)
-		return (x * y);
-
-	xs = frexp(x, &ex);
-	ys = frexp(y, &ey);
-	zs = frexp(z, &ez);
-	oround = fegetround();
-	spread = ex + ey - ez;
-
-	/*
-	 * If x * y and z are many orders of magnitude apart, the scaling
-	 * will overflow, so we handle these cases specially.  Rounding
-	 * modes other than FE_TONEAREST are painful.
-	 */
-	if (spread < -DBL_MANT_DIG) {
-#ifdef FE_INEXACT
-		feraiseexcept(FE_INEXACT);
-#endif
-#ifdef FE_UNDERFLOW
-		if (!isnormal(z))
-			feraiseexcept(FE_UNDERFLOW);
-#endif
-		switch (oround) {
-		default: /* FE_TONEAREST */
-			return (z);
-#ifdef FE_TOWARDZERO
-		case FE_TOWARDZERO:
-			if (x > 0.0 ^ y < 0.0 ^ z < 0.0)
-				return (z);
-			else
-				return (nextafter(z, 0));
-#endif
-#ifdef FE_DOWNWARD
-		case FE_DOWNWARD:
-			if (x > 0.0 ^ y < 0.0)
-				return (z);
-			else
-				return (nextafter(z, -INFINITY));
-#endif
-#ifdef FE_UPWARD
-		case FE_UPWARD:
-			if (x > 0.0 ^ y < 0.0)
-				return (nextafter(z, INFINITY));
-			else
-				return (z);
-#endif
-		}
-	}
-	if (spread <= DBL_MANT_DIG * 2)
-		zs = scalbn(zs, -spread);
-	else
-		zs = copysign(DBL_MIN, zs);
-
-	fesetround(FE_TONEAREST);
-
-	/*
-	 * Basic approach for round-to-nearest:
-	 *
-	 *     (xy.hi, xy.lo) = x * y           (exact)
-	 *     (r.hi, r.lo)   = xy.hi + z       (exact)
-	 *     adj = xy.lo + r.lo               (inexact; low bit is sticky)
-	 *     result = r.hi + adj              (correctly rounded)
-	 */
-	xy = dd_mul(xs, ys);
-	r = dd_add(xy.hi, zs);
-
-	spread = ex + ey;
-
-	if (r.hi == 0.0) {
-		/*
-		 * When the addends cancel to 0, ensure that the result has
-		 * the correct sign.
-		 */
-		fesetround(oround);
-		volatile double vzs = zs; /* XXX gcc CSE bug workaround */
-		return xy.hi + vzs + scalbn(xy.lo, spread);
-	}
-
-	if (oround != FE_TONEAREST) {
-		/*
-		 * There is no need to worry about double rounding in directed
-		 * rounding modes.
-		 * But underflow may not be raised properly, example in downward rounding:
-		 * fma(0x1.000000001p-1000, 0x1.000000001p-30, -0x1p-1066)
-		 */
-		double ret;
-#if defined(FE_INEXACT) && defined(FE_UNDERFLOW)
-		int e = fetestexcept(FE_INEXACT);
-		feclearexcept(FE_INEXACT);
-#endif
-		fesetround(oround);
-		adj = r.lo + xy.lo;
-		ret = scalbn(r.hi + adj, spread);
-#if defined(FE_INEXACT) && defined(FE_UNDERFLOW)
-		if (ilogb(ret) < -1022 && fetestexcept(FE_INEXACT))
-			feraiseexcept(FE_UNDERFLOW);
-		else if (e)
-			feraiseexcept(FE_INEXACT);
-#endif
-		return ret;
-	}
-
-	adj = add_adjusted(r.lo, xy.lo);
-	if (spread + ilogb(r.hi) > -1023)
-		return scalbn(r.hi + adj, spread);
-	else
-		return add_and_denormalize(r.hi, adj, spread);
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmaf.c b/src/components/lib/libc/musl-1.1.11/src/math/fmaf.c
deleted file mode 100644
index aa57feb695..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/fmaf.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/s_fmaf.c */
-/*-
- * Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <fenv.h>
-#include <math.h>
-#include <stdint.h>
-
-/*
- * Fused multiply-add: Compute x * y + z with a single rounding error.
- *
- * A double has more than twice as much precision than a float, so
- * direct double-precision arithmetic suffices, except where double
- * rounding occurs.
- */
-float fmaf(float x, float y, float z)
-{
-	#pragma STDC FENV_ACCESS ON
-	double xy, result;
-	union {double f; uint64_t i;} u;
-	int e;
-
-	xy = (double)x * y;
-	result = xy + z;
-	u.f = result;
-	e = u.i>>52 & 0x7ff;
-	/* Common case: The double precision result is fine. */
-	if ((u.i & 0x1fffffff) != 0x10000000 || /* not a halfway case */
-		e == 0x7ff ||                   /* NaN */
-		result - xy == z ||                 /* exact */
-		fegetround() != FE_TONEAREST)       /* not round-to-nearest */
-	{
-		/*
-		underflow may not be raised correctly, example:
-		fmaf(0x1p-120f, 0x1p-120f, 0x1p-149f)
-		*/
-#if defined(FE_INEXACT) && defined(FE_UNDERFLOW)
-		if (e < 0x3ff-126 && e >= 0x3ff-149 && fetestexcept(FE_INEXACT)) {
-			feclearexcept(FE_INEXACT);
-			/* TODO: gcc and clang bug workaround */
-			volatile float vz = z;
-			result = xy + vz;
-			if (fetestexcept(FE_INEXACT))
-				feraiseexcept(FE_UNDERFLOW);
-			else
-				feraiseexcept(FE_INEXACT);
-		}
-#endif
-		z = result;
-		return z;
-	}
-
-	/*
-	 * If result is inexact, and exactly halfway between two float values,
-	 * we need to adjust the low-order bit in the direction of the error.
-	 */
-#ifdef FE_TOWARDZERO
-	fesetround(FE_TOWARDZERO);
-#endif
-	volatile double vxy = xy;  /* XXX work around gcc CSE bug */
-	double adjusted_result = vxy + z;
-	fesetround(FE_TONEAREST);
-	if (result == adjusted_result) {
-		u.f = adjusted_result;
-		u.i++;
-		adjusted_result = u.f;
-	}
-	z = adjusted_result;
-	return z;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/acos.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/acos.s
deleted file mode 100644
index 47f365efb1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/acos.s
+++ /dev/null
@@ -1,28 +0,0 @@
-# use acos(x) = atan2(fabs(sqrt((1-x)*(1+x))), x)
-
-.global acosf
-.type acosf,@function
-acosf:
-	flds 4(%esp)
-	jmp 1f
-
-.global acosl
-.type acosl,@function
-acosl:
-	fldt 4(%esp)
-	jmp 1f
-
-.global acos
-.type acos,@function
-acos:
-	fldl 4(%esp)
-1:	fld %st(0)
-	fld1
-	fsub %st(0),%st(1)
-	fadd %st(2)
-	fmulp
-	fsqrt
-	fabs         # fix sign of zero (matters in downward rounding mode)
-	fxch %st(1)
-	fpatan
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/acosf.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/acosf.s
deleted file mode 100644
index 6c95509f78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/acosf.s
+++ /dev/null
@@ -1 +0,0 @@
-# see acos.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/acosl.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/acosl.s
deleted file mode 100644
index 6c95509f78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/acosl.s
+++ /dev/null
@@ -1 +0,0 @@
-# see acos.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/asin.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/asin.s
deleted file mode 100644
index a9f691bff3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/asin.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.global asinf
-.type asinf,@function
-asinf:
-	flds 4(%esp)
-	mov 4(%esp),%eax
-	add %eax,%eax
-	cmp $0x01000000,%eax
-	jae 1f
-		# subnormal x, return x with underflow
-	fnstsw %ax
-	and $16,%ax
-	jnz 2f
-	fld %st(0)
-	fmul %st(1)
-	fstps 4(%esp)
-2:	ret
-
-.global asinl
-.type asinl,@function
-asinl:
-	fldt 4(%esp)
-	jmp 1f
-
-.global asin
-.type asin,@function
-asin:
-	fldl 4(%esp)
-	mov 8(%esp),%eax
-	add %eax,%eax
-	cmp $0x00200000,%eax
-	jae 1f
-		# subnormal x, return x with underflow
-	fnstsw %ax
-	and $16,%ax
-	jnz 2f
-	fsts 4(%esp)
-2:	ret
-1:	fld %st(0)
-	fld1
-	fsub %st(0),%st(1)
-	fadd %st(2)
-	fmulp
-	fsqrt
-	fpatan
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/asinf.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/asinf.s
deleted file mode 100644
index e07bf5999c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/asinf.s
+++ /dev/null
@@ -1 +0,0 @@
-# see asin.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/asinl.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/asinl.s
deleted file mode 100644
index e07bf5999c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/asinl.s
+++ /dev/null
@@ -1 +0,0 @@
-# see asin.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/exp.s
deleted file mode 100644
index c7aa5b6eaa..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp.s
+++ /dev/null
@@ -1,152 +0,0 @@
-.global expm1f
-.type expm1f,@function
-expm1f:
-	flds 4(%esp)
-	mov 4(%esp),%eax
-	add %eax,%eax
-	cmp $0x01000000,%eax
-	jae 1f
-		# subnormal x, return x with underflow
-	fnstsw %ax
-	and $16,%ax
-	jnz 2f
-	fld %st(0)
-	fmul %st(1)
-	fstps 4(%esp)
-2:	ret
-
-.global expm1l
-.type expm1l,@function
-expm1l:
-	fldt 4(%esp)
-	jmp 1f
-
-.global expm1
-.type expm1,@function
-expm1:
-	fldl 4(%esp)
-	mov 8(%esp),%eax
-	add %eax,%eax
-	cmp $0x00200000,%eax
-	jae 1f
-		# subnormal x, return x with underflow
-	fnstsw %ax
-	and $16,%ax
-	jnz 2f
-	fsts 4(%esp)
-2:	ret
-1:	fldl2e
-	fmulp
-	mov $0xc2820000,%eax
-	push %eax
-	flds (%esp)
-	pop %eax
-	fucomp %st(1)
-	fnstsw %ax
-	sahf
-	fld1
-	jb 1f
-		# x*log2e < -65, return -1 without underflow
-	fstp %st(1)
-	fchs
-	ret
-1:	fld %st(1)
-	fabs
-	fucom %st(1)
-	fnstsw %ax
-	fstp %st(0)
-	fstp %st(0)
-	sahf
-	ja 1f
-	f2xm1
-	ret
-1:	call 1f
-	fld1
-	fsubrp
-	ret
-
-.global exp2f
-.type exp2f,@function
-exp2f:
-	flds 4(%esp)
-	jmp 1f
-
-.global exp2l
-.global __exp2l
-.hidden __exp2l
-.type exp2l,@function
-exp2l:
-__exp2l:
-	fldt 4(%esp)
-	jmp 1f
-
-.global expf
-.type expf,@function
-expf:
-	flds 4(%esp)
-	jmp 2f
-
-.global exp
-.type exp,@function
-exp:
-	fldl 4(%esp)
-2:	fldl2e
-	fmulp
-	jmp 1f
-
-.global exp2
-.type exp2,@function
-exp2:
-	fldl 4(%esp)
-1:	sub $12,%esp
-	fld %st(0)
-	fstpt (%esp)
-	mov 8(%esp),%ax
-	and $0x7fff,%ax
-	cmp $0x3fff+13,%ax
-	jb 4f             # |x| < 8192
-	cmp $0x3fff+15,%ax
-	jae 3f            # |x| >= 32768
-	fsts (%esp)
-	cmpl $0xc67ff800,(%esp)
-	jb 2f             # x > -16382
-	movl $0x5f000000,(%esp)
-	flds (%esp)       # 0x1p63
-	fld %st(1)
-	fsub %st(1)
-	faddp
-	fucomp %st(1)
-	fnstsw
-	sahf
-	je 2f             # x - 0x1p63 + 0x1p63 == x
-	movl $1,(%esp)
-	flds (%esp)       # 0x1p-149
-	fdiv %st(1)
-	fstps (%esp)      # raise underflow
-2:	fld1
-	fld %st(1)
-	frndint
-	fxch %st(2)
-	fsub %st(2)       # st(0)=x-rint(x), st(1)=1, st(2)=rint(x)
-	f2xm1
-	faddp             # 2^(x-rint(x))
-1:	fscale
-	fstp %st(1)
-	add $12,%esp
-	ret
-3:	xor %eax,%eax
-4:	cmp $0x3fff-64,%ax
-	fld1
-	jb 1b             # |x| < 0x1p-64
-	fstpt (%esp)
-	fistl 8(%esp)
-	fildl 8(%esp)
-	fsubrp %st(1)
-	addl $0x3fff,8(%esp)
-	f2xm1
-	fld1
-	faddp             # 2^(x-rint(x))
-	fldt (%esp)       # 2^rint(x)
-	fmulp
-	add $12,%esp
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2.s
deleted file mode 100644
index f335a3e527..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2.s
+++ /dev/null
@@ -1 +0,0 @@
-# see exp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2f.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2f.s
deleted file mode 100644
index f335a3e527..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2f.s
+++ /dev/null
@@ -1 +0,0 @@
-# see exp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2l.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2l.s
deleted file mode 100644
index f335a3e527..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/exp2l.s
+++ /dev/null
@@ -1 +0,0 @@
-# see exp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/expf.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/expf.s
deleted file mode 100644
index f335a3e527..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/expf.s
+++ /dev/null
@@ -1 +0,0 @@
-# see exp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1.s
deleted file mode 100644
index f335a3e527..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1.s
+++ /dev/null
@@ -1 +0,0 @@
-# see exp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1f.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1f.s
deleted file mode 100644
index f335a3e527..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1f.s
+++ /dev/null
@@ -1 +0,0 @@
-# see exp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1l.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1l.s
deleted file mode 100644
index f335a3e527..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/expm1l.s
+++ /dev/null
@@ -1 +0,0 @@
-# see exp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/log.s
deleted file mode 100644
index fcccf0309c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/log.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global log
-.type log,@function
-log:
-	fldln2
-	fldl 4(%esp)
-	fyl2x
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log10.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/log10.s
deleted file mode 100644
index 28eb5b2f91..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/log10.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global log10
-.type log10,@function
-log10:
-	fldlg2
-	fldl 4(%esp)
-	fyl2x
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log10f.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/log10f.s
deleted file mode 100644
index c0c0c67ef1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/log10f.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global log10f
-.type log10f,@function
-log10f:
-	fldlg2
-	flds 4(%esp)
-	fyl2x
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log2.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/log2.s
deleted file mode 100644
index 1508803774..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/log2.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global log2
-.type log2,@function
-log2:
-	fld1
-	fldl 4(%esp)
-	fyl2x
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log2f.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/log2f.s
deleted file mode 100644
index 00cdce75a0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/log2f.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global log2f
-.type log2f,@function
-log2f:
-	fld1
-	flds 4(%esp)
-	fyl2x
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/logf.s b/src/components/lib/libc/musl-1.1.11/src/math/i386/logf.s
deleted file mode 100644
index da7ff3ae11..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/logf.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global logf
-.type logf,@function
-logf:
-	fldln2
-	flds 4(%esp)
-	fyl2x
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lgamma.c b/src/components/lib/libc/musl-1.1.11/src/math/lgamma.c
deleted file mode 100644
index e25ec8e600..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/lgamma.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-
-extern int __signgam;
-double __lgamma_r(double, int *);
-
-double lgamma(double x)
-{
-	return __lgamma_r(x, &__signgam);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lgammaf.c b/src/components/lib/libc/musl-1.1.11/src/math/lgammaf.c
deleted file mode 100644
index badb6dfec9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/lgammaf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-
-extern int __signgam;
-float __lgammaf_r(float, int *);
-
-float lgammaf(float x)
-{
-	return __lgammaf_r(x, &__signgam);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log.c b/src/components/lib/libc/musl-1.1.11/src/math/log.c
deleted file mode 100644
index e61e113d41..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/log.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_log.c */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-/* log(x)
- * Return the logarithm of x
- *
- * Method :
- *   1. Argument Reduction: find k and f such that
- *                      x = 2^k * (1+f),
- *         where  sqrt(2)/2 < 1+f < sqrt(2) .
- *
- *   2. Approximation of log(1+f).
- *      Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
- *               = 2s + 2/3 s**3 + 2/5 s**5 + .....,
- *               = 2s + s*R
- *      We use a special Remez algorithm on [0,0.1716] to generate
- *      a polynomial of degree 14 to approximate R The maximum error
- *      of this polynomial approximation is bounded by 2**-58.45. In
- *      other words,
- *                      2      4      6      8      10      12      14
- *          R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s +Lg5*s  +Lg6*s  +Lg7*s
- *      (the values of Lg1 to Lg7 are listed in the program)
- *      and
- *          |      2          14          |     -58.45
- *          | Lg1*s +...+Lg7*s    -  R(z) | <= 2
- *          |                             |
- *      Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2.
- *      In order to guarantee error in log below 1ulp, we compute log
- *      by
- *              log(1+f) = f - s*(f - R)        (if f is not too large)
- *              log(1+f) = f - (hfsq - s*(hfsq+R)).     (better accuracy)
- *
- *      3. Finally,  log(x) = k*ln2 + log(1+f).
- *                          = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo)))
- *         Here ln2 is split into two floating point number:
- *                      ln2_hi + ln2_lo,
- *         where n*ln2_hi is always exact for |n| < 2000.
- *
- * Special cases:
- *      log(x) is NaN with signal if x < 0 (including -INF) ;
- *      log(+INF) is +INF; log(0) is -INF with signal;
- *      log(NaN) is that NaN with no signal.
- *
- * Accuracy:
- *      according to an error analysis, the error is always less than
- *      1 ulp (unit in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include <math.h>
-#include <stdint.h>
-
-static const double
-ln2_hi = 6.93147180369123816490e-01,  /* 3fe62e42 fee00000 */
-ln2_lo = 1.90821492927058770002e-10,  /* 3dea39ef 35793c76 */
-Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-
-double log(double x)
-{
-	union {double f; uint64_t i;} u = {x};
-	double_t hfsq,f,s,z,R,w,t1,t2,dk;
-	uint32_t hx;
-	int k;
-
-	hx = u.i>>32;
-	k = 0;
-	if (hx < 0x00100000 || hx>>31) {
-		if (u.i<<1 == 0)
-			return -1/(x*x);  /* log(+-0)=-inf */
-		if (hx>>31)
-			return (x-x)/0.0; /* log(-#) = NaN */
-		/* subnormal number, scale x up */
-		k -= 54;
-		x *= 0x1p54;
-		u.f = x;
-		hx = u.i>>32;
-	} else if (hx >= 0x7ff00000) {
-		return x;
-	} else if (hx == 0x3ff00000 && u.i<<32 == 0)
-		return 0;
-
-	/* reduce x into [sqrt(2)/2, sqrt(2)] */
-	hx += 0x3ff00000 - 0x3fe6a09e;
-	k += (int)(hx>>20) - 0x3ff;
-	hx = (hx&0x000fffff) + 0x3fe6a09e;
-	u.i = (uint64_t)hx<<32 | (u.i&0xffffffff);
-	x = u.f;
-
-	f = x - 1.0;
-	hfsq = 0.5*f*f;
-	s = f/(2.0+f);
-	z = s*s;
-	w = z*z;
-	t1 = w*(Lg2+w*(Lg4+w*Lg6));
-	t2 = z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
-	R = t2 + t1;
-	dk = k;
-	return s*(hfsq+R) + dk*ln2_lo - hfsq + f + dk*ln2_hi;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log2.c b/src/components/lib/libc/musl-1.1.11/src/math/log2.c
deleted file mode 100644
index 0aafad4b86..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/log2.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_log2.c */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-/*
- * Return the base 2 logarithm of x.  See log.c for most comments.
- *
- * Reduce x to 2^k (1+f) and calculate r = log(1+f) - f + f*f/2
- * as in log.c, then combine and scale in extra precision:
- *    log2(x) = (f - f*f/2 + r)/log(2) + k
- */
-
-#include <math.h>
-#include <stdint.h>
-
-static const double
-ivln2hi = 1.44269504072144627571e+00, /* 0x3ff71547, 0x65200000 */
-ivln2lo = 1.67517131648865118353e-10, /* 0x3de705fc, 0x2eefa200 */
-Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-
-double log2(double x)
-{
-	union {double f; uint64_t i;} u = {x};
-	double_t hfsq,f,s,z,R,w,t1,t2,y,hi,lo,val_hi,val_lo;
-	uint32_t hx;
-	int k;
-
-	hx = u.i>>32;
-	k = 0;
-	if (hx < 0x00100000 || hx>>31) {
-		if (u.i<<1 == 0)
-			return -1/(x*x);  /* log(+-0)=-inf */
-		if (hx>>31)
-			return (x-x)/0.0; /* log(-#) = NaN */
-		/* subnormal number, scale x up */
-		k -= 54;
-		x *= 0x1p54;
-		u.f = x;
-		hx = u.i>>32;
-	} else if (hx >= 0x7ff00000) {
-		return x;
-	} else if (hx == 0x3ff00000 && u.i<<32 == 0)
-		return 0;
-
-	/* reduce x into [sqrt(2)/2, sqrt(2)] */
-	hx += 0x3ff00000 - 0x3fe6a09e;
-	k += (int)(hx>>20) - 0x3ff;
-	hx = (hx&0x000fffff) + 0x3fe6a09e;
-	u.i = (uint64_t)hx<<32 | (u.i&0xffffffff);
-	x = u.f;
-
-	f = x - 1.0;
-	hfsq = 0.5*f*f;
-	s = f/(2.0+f);
-	z = s*s;
-	w = z*z;
-	t1 = w*(Lg2+w*(Lg4+w*Lg6));
-	t2 = z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
-	R = t2 + t1;
-
-	/*
-	 * f-hfsq must (for args near 1) be evaluated in extra precision
-	 * to avoid a large cancellation when x is near sqrt(2) or 1/sqrt(2).
-	 * This is fairly efficient since f-hfsq only depends on f, so can
-	 * be evaluated in parallel with R.  Not combining hfsq with R also
-	 * keeps R small (though not as small as a true `lo' term would be),
-	 * so that extra precision is not needed for terms involving R.
-	 *
-	 * Compiler bugs involving extra precision used to break Dekker's
-	 * theorem for spitting f-hfsq as hi+lo, unless double_t was used
-	 * or the multi-precision calculations were avoided when double_t
-	 * has extra precision.  These problems are now automatically
-	 * avoided as a side effect of the optimization of combining the
-	 * Dekker splitting step with the clear-low-bits step.
-	 *
-	 * y must (for args near sqrt(2) and 1/sqrt(2)) be added in extra
-	 * precision to avoid a very large cancellation when x is very near
-	 * these values.  Unlike the above cancellations, this problem is
-	 * specific to base 2.  It is strange that adding +-1 is so much
-	 * harder than adding +-ln2 or +-log10_2.
-	 *
-	 * This uses Dekker's theorem to normalize y+val_hi, so the
-	 * compiler bugs are back in some configurations, sigh.  And I
-	 * don't want to used double_t to avoid them, since that gives a
-	 * pessimization and the support for avoiding the pessimization
-	 * is not yet available.
-	 *
-	 * The multi-precision calculations for the multiplications are
-	 * routine.
-	 */
-
-	/* hi+lo = f - hfsq + s*(hfsq+R) ~ log(1+f) */
-	hi = f - hfsq;
-	u.f = hi;
-	u.i &= (uint64_t)-1<<32;
-	hi = u.f;
-	lo = f - hi - hfsq + s*(hfsq+R);
-
-	val_hi = hi*ivln2hi;
-	val_lo = (lo+hi)*ivln2lo + lo*ivln2hi;
-
-	/* spadd(val_hi, val_lo, y), except for not using double_t: */
-	y = k;
-	w = y + val_hi;
-	val_lo += (y - w) + val_hi;
-	val_hi = w;
-
-	return val_lo + val_hi;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log2f.c b/src/components/lib/libc/musl-1.1.11/src/math/log2f.c
deleted file mode 100644
index b3e305fe2a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/log2f.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_log2f.c */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-/*
- * See comments in log2.c.
- */
-
-#include <math.h>
-#include <stdint.h>
-
-static const float
-ivln2hi =  1.4428710938e+00, /* 0x3fb8b000 */
-ivln2lo = -1.7605285393e-04, /* 0xb9389ad4 */
-/* |(log(1+s)-log(1-s))/s - Lg(s)| < 2**-34.24 (~[-4.95e-11, 4.97e-11]). */
-Lg1 = 0xaaaaaa.0p-24, /* 0.66666662693 */
-Lg2 = 0xccce13.0p-25, /* 0.40000972152 */
-Lg3 = 0x91e9ee.0p-25, /* 0.28498786688 */
-Lg4 = 0xf89e26.0p-26; /* 0.24279078841 */
-
-float log2f(float x)
-{
-	union {float f; uint32_t i;} u = {x};
-	float_t hfsq,f,s,z,R,w,t1,t2,hi,lo;
-	uint32_t ix;
-	int k;
-
-	ix = u.i;
-	k = 0;
-	if (ix < 0x00800000 || ix>>31) {  /* x < 2**-126  */
-		if (ix<<1 == 0)
-			return -1/(x*x);  /* log(+-0)=-inf */
-		if (ix>>31)
-			return (x-x)/0.0f; /* log(-#) = NaN */
-		/* subnormal number, scale up x */
-		k -= 25;
-		x *= 0x1p25f;
-		u.f = x;
-		ix = u.i;
-	} else if (ix >= 0x7f800000) {
-		return x;
-	} else if (ix == 0x3f800000)
-		return 0;
-
-	/* reduce x into [sqrt(2)/2, sqrt(2)] */
-	ix += 0x3f800000 - 0x3f3504f3;
-	k += (int)(ix>>23) - 0x7f;
-	ix = (ix&0x007fffff) + 0x3f3504f3;
-	u.i = ix;
-	x = u.f;
-
-	f = x - 1.0f;
-	s = f/(2.0f + f);
-	z = s*s;
-	w = z*z;
-	t1= w*(Lg2+w*Lg4);
-	t2= z*(Lg1+w*Lg3);
-	R = t2 + t1;
-	hfsq = 0.5f*f*f;
-
-	hi = f - hfsq;
-	u.f = hi;
-	u.i &= 0xfffff000;
-	hi = u.f;
-	lo = f - hi - hfsq + s*(hfsq+R);
-	return (lo+hi)*ivln2lo + lo*ivln2hi + hi*ivln2hi + k;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/logf.c b/src/components/lib/libc/musl-1.1.11/src/math/logf.c
deleted file mode 100644
index 52230a1bd4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/logf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_logf.c */
-/*
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include <math.h>
-#include <stdint.h>
-
-static const float
-ln2_hi = 6.9313812256e-01, /* 0x3f317180 */
-ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */
-/* |(log(1+s)-log(1-s))/s - Lg(s)| < 2**-34.24 (~[-4.95e-11, 4.97e-11]). */
-Lg1 = 0xaaaaaa.0p-24, /* 0.66666662693 */
-Lg2 = 0xccce13.0p-25, /* 0.40000972152 */
-Lg3 = 0x91e9ee.0p-25, /* 0.28498786688 */
-Lg4 = 0xf89e26.0p-26; /* 0.24279078841 */
-
-float logf(float x)
-{
-	union {float f; uint32_t i;} u = {x};
-	float_t hfsq,f,s,z,R,w,t1,t2,dk;
-	uint32_t ix;
-	int k;
-
-	ix = u.i;
-	k = 0;
-	if (ix < 0x00800000 || ix>>31) {  /* x < 2**-126  */
-		if (ix<<1 == 0)
-			return -1/(x*x);  /* log(+-0)=-inf */
-		if (ix>>31)
-			return (x-x)/0.0f; /* log(-#) = NaN */
-		/* subnormal number, scale up x */
-		k -= 25;
-		x *= 0x1p25f;
-		u.f = x;
-		ix = u.i;
-	} else if (ix >= 0x7f800000) {
-		return x;
-	} else if (ix == 0x3f800000)
-		return 0;
-
-	/* reduce x into [sqrt(2)/2, sqrt(2)] */
-	ix += 0x3f800000 - 0x3f3504f3;
-	k += (int)(ix>>23) - 0x7f;
-	ix = (ix&0x007fffff) + 0x3f3504f3;
-	u.i = ix;
-	x = u.f;
-
-	f = x - 1.0f;
-	s = f/(2.0f + f);
-	z = s*s;
-	w = z*z;
-	t1= w*(Lg2+w*Lg4);
-	t2= z*(Lg1+w*Lg3);
-	R = t2 + t1;
-	hfsq = 0.5f*f*f;
-	dk = k;
-	return s*(hfsq+R) + dk*ln2_lo - hfsq + f + dk*ln2_hi;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lrint.c b/src/components/lib/libc/musl-1.1.11/src/math/lrint.c
deleted file mode 100644
index bdca8b7cb8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/lrint.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <limits.h>
-#include <fenv.h>
-#include "libm.h"
-
-/*
-If the result cannot be represented (overflow, nan), then
-lrint raises the invalid exception.
-
-Otherwise if the input was not an integer then the inexact
-exception is raised.
-
-C99 is a bit vague about whether inexact exception is
-allowed to be raised when invalid is raised.
-(F.9 explicitly allows spurious inexact exceptions, F.9.6.5
-does not make it clear if that rule applies to lrint, but
-IEEE 754r 7.8 seems to forbid spurious inexact exception in
-the ineger conversion functions)
-
-So we try to make sure that no spurious inexact exception is
-raised in case of an overflow.
-
-If the bit size of long > precision of double, then there
-cannot be inexact rounding in case the result overflows,
-otherwise LONG_MAX and LONG_MIN can be represented exactly
-as a double.
-*/
-
-#if LONG_MAX < 1U<<53 && defined(FE_INEXACT)
-long lrint(double x)
-{
-	#pragma STDC FENV_ACCESS ON
-	int e;
-
-	e = fetestexcept(FE_INEXACT);
-	x = rint(x);
-	if (!e && (x > LONG_MAX || x < LONG_MIN))
-		feclearexcept(FE_INEXACT);
-	/* conversion */
-	return x;
-}
-#else
-long lrint(double x)
-{
-	return rint(x);
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/pow.c b/src/components/lib/libc/musl-1.1.11/src/math/pow.c
deleted file mode 100644
index b66f632d8e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/pow.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_pow.c */
-/*
- * ====================================================
- * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-/* pow(x,y) return x**y
- *
- *                    n
- * Method:  Let x =  2   * (1+f)
- *      1. Compute and return log2(x) in two pieces:
- *              log2(x) = w1 + w2,
- *         where w1 has 53-24 = 29 bit trailing zeros.
- *      2. Perform y*log2(x) = n+y' by simulating muti-precision
- *         arithmetic, where |y'|<=0.5.
- *      3. Return x**y = 2**n*exp(y'*log2)
- *
- * Special cases:
- *      1.  (anything) ** 0  is 1
- *      2.  1 ** (anything)  is 1
- *      3.  (anything except 1) ** NAN is NAN
- *      4.  NAN ** (anything except 0) is NAN
- *      5.  +-(|x| > 1) **  +INF is +INF
- *      6.  +-(|x| > 1) **  -INF is +0
- *      7.  +-(|x| < 1) **  +INF is +0
- *      8.  +-(|x| < 1) **  -INF is +INF
- *      9.  -1          ** +-INF is 1
- *      10. +0 ** (+anything except 0, NAN)               is +0
- *      11. -0 ** (+anything except 0, NAN, odd integer)  is +0
- *      12. +0 ** (-anything except 0, NAN)               is +INF, raise divbyzero
- *      13. -0 ** (-anything except 0, NAN, odd integer)  is +INF, raise divbyzero
- *      14. -0 ** (+odd integer) is -0
- *      15. -0 ** (-odd integer) is -INF, raise divbyzero
- *      16. +INF ** (+anything except 0,NAN) is +INF
- *      17. +INF ** (-anything except 0,NAN) is +0
- *      18. -INF ** (+odd integer) is -INF
- *      19. -INF ** (anything) = -0 ** (-anything), (anything except odd integer)
- *      20. (anything) ** 1 is (anything)
- *      21. (anything) ** -1 is 1/(anything)
- *      22. (-anything) ** (integer) is (-1)**(integer)*(+anything**integer)
- *      23. (-anything except 0 and inf) ** (non-integer) is NAN
- *
- * Accuracy:
- *      pow(x,y) returns x**y nearly rounded. In particular
- *                      pow(integer,integer)
- *      always returns the correct integer provided it is
- *      representable.
- *
- * Constants :
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "libm.h"
-
-static const double
-bp[]   = {1.0, 1.5,},
-dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */
-dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */
-two53  =  9007199254740992.0, /* 0x43400000, 0x00000000 */
-huge   =  1.0e300,
-tiny   =  1.0e-300,
-/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */
-L1 =  5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */
-L2 =  4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */
-L3 =  3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */
-L4 =  2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */
-L5 =  2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */
-L6 =  2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */
-P1 =  1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */
-P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */
-P3 =  6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */
-P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */
-P5 =  4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */
-lg2     =  6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */
-lg2_h   =  6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */
-lg2_l   = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */
-ovt     =  8.0085662595372944372e-017, /* -(1024-log2(ovfl+.5ulp)) */
-cp      =  9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */
-cp_h    =  9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */
-cp_l    = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/
-ivln2   =  1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */
-ivln2_h =  1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/
-ivln2_l =  1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
-
-double pow(double x, double y)
-{
-	double z,ax,z_h,z_l,p_h,p_l;
-	double y1,t1,t2,r,s,t,u,v,w;
-	int32_t i,j,k,yisint,n;
-	int32_t hx,hy,ix,iy;
-	uint32_t lx,ly;
-
-	EXTRACT_WORDS(hx, lx, x);
-	EXTRACT_WORDS(hy, ly, y);
-	ix = hx & 0x7fffffff;
-	iy = hy & 0x7fffffff;
-
-	/* x**0 = 1, even if x is NaN */
-	if ((iy|ly) == 0)
-		return 1.0;
-	/* 1**y = 1, even if y is NaN */
-	if (hx == 0x3ff00000 && lx == 0)
-		return 1.0;
-	/* NaN if either arg is NaN */
-	if (ix > 0x7ff00000 || (ix == 0x7ff00000 && lx != 0) ||
-	    iy > 0x7ff00000 || (iy == 0x7ff00000 && ly != 0))
-		return x + y;
-
-	/* determine if y is an odd int when x < 0
-	 * yisint = 0       ... y is not an integer
-	 * yisint = 1       ... y is an odd int
-	 * yisint = 2       ... y is an even int
-	 */
-	yisint = 0;
-	if (hx < 0) {
-		if (iy >= 0x43400000)
-			yisint = 2; /* even integer y */
-		else if (iy >= 0x3ff00000) {
-			k = (iy>>20) - 0x3ff;  /* exponent */
-			if (k > 20) {
-				j = ly>>(52-k);
-				if ((j<<(52-k)) == ly)
-					yisint = 2 - (j&1);
-			} else if (ly == 0) {
-				j = iy>>(20-k);
-				if ((j<<(20-k)) == iy)
-					yisint = 2 - (j&1);
-			}
-		}
-	}
-
-	/* special value of y */
-	if (ly == 0) {
-		if (iy == 0x7ff00000) {  /* y is +-inf */
-			if (((ix-0x3ff00000)|lx) == 0)  /* (-1)**+-inf is 1 */
-				return 1.0;
-			else if (ix >= 0x3ff00000) /* (|x|>1)**+-inf = inf,0 */
-				return hy >= 0 ? y : 0.0;
-			else                       /* (|x|<1)**+-inf = 0,inf */
-				return hy >= 0 ? 0.0 : -y;
-		}
-		if (iy == 0x3ff00000) {    /* y is +-1 */
-			if (hy >= 0)
-				return x;
-			y = 1/x;
-#if FLT_EVAL_METHOD!=0
-			{
-				union {double f; uint64_t i;} u = {y};
-				uint64_t i = u.i & -1ULL/2;
-				if (i>>52 == 0 && (i&(i-1)))
-					FORCE_EVAL((float)y);
-			}
-#endif
-			return y;
-		}
-		if (hy == 0x40000000)    /* y is 2 */
-			return x*x;
-		if (hy == 0x3fe00000) {  /* y is 0.5 */
-			if (hx >= 0)     /* x >= +0 */
-				return sqrt(x);
-		}
-	}
-
-	ax = fabs(x);
-	/* special value of x */
-	if (lx == 0) {
-		if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) { /* x is +-0,+-inf,+-1 */
-			z = ax;
-			if (hy < 0)   /* z = (1/|x|) */
-				z = 1.0/z;
-			if (hx < 0) {
-				if (((ix-0x3ff00000)|yisint) == 0) {
-					z = (z-z)/(z-z); /* (-1)**non-int is NaN */
-				} else if (yisint == 1)
-					z = -z;          /* (x<0)**odd = -(|x|**odd) */
-			}
-			return z;
-		}
-	}
-
-	s = 1.0; /* sign of result */
-	if (hx < 0) {
-		if (yisint == 0) /* (x<0)**(non-int) is NaN */
-			return (x-x)/(x-x);
-		if (yisint == 1) /* (x<0)**(odd int) */
-			s = -1.0;
-	}
-
-	/* |y| is huge */
-	if (iy > 0x41e00000) { /* if |y| > 2**31 */
-		if (iy > 0x43f00000) {  /* if |y| > 2**64, must o/uflow */
-			if (ix <= 0x3fefffff)
-				return hy < 0 ? huge*huge : tiny*tiny;
-			if (ix >= 0x3ff00000)
-				return hy > 0 ? huge*huge : tiny*tiny;
-		}
-		/* over/underflow if x is not close to one */
-		if (ix < 0x3fefffff)
-			return hy < 0 ? s*huge*huge : s*tiny*tiny;
-		if (ix > 0x3ff00000)
-			return hy > 0 ? s*huge*huge : s*tiny*tiny;
-		/* now |1-x| is tiny <= 2**-20, suffice to compute
-		   log(x) by x-x^2/2+x^3/3-x^4/4 */
-		t = ax - 1.0;       /* t has 20 trailing zeros */
-		w = (t*t)*(0.5 - t*(0.3333333333333333333333-t*0.25));
-		u = ivln2_h*t;      /* ivln2_h has 21 sig. bits */
-		v = t*ivln2_l - w*ivln2;
-		t1 = u + v;
-		SET_LOW_WORD(t1, 0);
-		t2 = v - (t1-u);
-	} else {
-		double ss,s2,s_h,s_l,t_h,t_l;
-		n = 0;
-		/* take care subnormal number */
-		if (ix < 0x00100000) {
-			ax *= two53;
-			n -= 53;
-			GET_HIGH_WORD(ix,ax);
-		}
-		n += ((ix)>>20) - 0x3ff;
-		j = ix & 0x000fffff;
-		/* determine interval */
-		ix = j | 0x3ff00000;   /* normalize ix */
-		if (j <= 0x3988E)      /* |x|<sqrt(3/2) */
-			k = 0;
-		else if (j < 0xBB67A)  /* |x|<sqrt(3)   */
-			k = 1;
-		else {
-			k = 0;
-			n += 1;
-			ix -= 0x00100000;
-		}
-		SET_HIGH_WORD(ax, ix);
-
-		/* compute ss = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
-		u = ax - bp[k];        /* bp[0]=1.0, bp[1]=1.5 */
-		v = 1.0/(ax+bp[k]);
-		ss = u*v;
-		s_h = ss;
-		SET_LOW_WORD(s_h, 0);
-		/* t_h=ax+bp[k] High */
-		t_h = 0.0;
-		SET_HIGH_WORD(t_h, ((ix>>1)|0x20000000) + 0x00080000 + (k<<18));
-		t_l = ax - (t_h-bp[k]);
-		s_l = v*((u-s_h*t_h)-s_h*t_l);
-		/* compute log(ax) */
-		s2 = ss*ss;
-		r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6)))));
-		r += s_l*(s_h+ss);
-		s2 = s_h*s_h;
-		t_h = 3.0 + s2 + r;
-		SET_LOW_WORD(t_h, 0);
-		t_l = r - ((t_h-3.0)-s2);
-		/* u+v = ss*(1+...) */
-		u = s_h*t_h;
-		v = s_l*t_h + t_l*ss;
-		/* 2/(3log2)*(ss+...) */
-		p_h = u + v;
-		SET_LOW_WORD(p_h, 0);
-		p_l = v - (p_h-u);
-		z_h = cp_h*p_h;        /* cp_h+cp_l = 2/(3*log2) */
-		z_l = cp_l*p_h+p_l*cp + dp_l[k];
-		/* log2(ax) = (ss+..)*2/(3*log2) = n + dp_h + z_h + z_l */
-		t = (double)n;
-		t1 = ((z_h + z_l) + dp_h[k]) + t;
-		SET_LOW_WORD(t1, 0);
-		t2 = z_l - (((t1 - t) - dp_h[k]) - z_h);
-	}
-
-	/* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */
-	y1 = y;
-	SET_LOW_WORD(y1, 0);
-	p_l = (y-y1)*t1 + y*t2;
-	p_h = y1*t1;
-	z = p_l + p_h;
-	EXTRACT_WORDS(j, i, z);
-	if (j >= 0x40900000) {                      /* z >= 1024 */
-		if (((j-0x40900000)|i) != 0)        /* if z > 1024 */
-			return s*huge*huge;         /* overflow */
-		if (p_l + ovt > z - p_h)
-			return s*huge*huge;         /* overflow */
-	} else if ((j&0x7fffffff) >= 0x4090cc00) {  /* z <= -1075 */  // FIXME: instead of abs(j) use unsigned j
-		if (((j-0xc090cc00)|i) != 0)        /* z < -1075 */
-			return s*tiny*tiny;         /* underflow */
-		if (p_l <= z - p_h)
-			return s*tiny*tiny;         /* underflow */
-	}
-	/*
-	 * compute 2**(p_h+p_l)
-	 */
-	i = j & 0x7fffffff;
-	k = (i>>20) - 0x3ff;
-	n = 0;
-	if (i > 0x3fe00000) {  /* if |z| > 0.5, set n = [z+0.5] */
-		n = j + (0x00100000>>(k+1));
-		k = ((n&0x7fffffff)>>20) - 0x3ff;  /* new k for n */
-		t = 0.0;
-		SET_HIGH_WORD(t, n & ~(0x000fffff>>k));
-		n = ((n&0x000fffff)|0x00100000)>>(20-k);
-		if (j < 0)
-			n = -n;
-		p_h -= t;
-	}
-	t = p_l + p_h;
-	SET_LOW_WORD(t, 0);
-	u = t*lg2_h;
-	v = (p_l-(t-p_h))*lg2 + t*lg2_l;
-	z = u + v;
-	w = v - (z-u);
-	t = z*z;
-	t1 = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	r = (z*t1)/(t1-2.0) - (w + z*w);
-	z = 1.0 - (r-z);
-	GET_HIGH_WORD(j, z);
-	j += n<<20;
-	if ((j>>20) <= 0)  /* subnormal output */
-		z = scalbn(z,n);
-	else
-		SET_HIGH_WORD(z, j);
-	return s*z;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/powf.c b/src/components/lib/libc/musl-1.1.11/src/math/powf.c
deleted file mode 100644
index 427c8965b9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/powf.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_powf.c */
-/*
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include "libm.h"
-
-static const float
-bp[]   = {1.0, 1.5,},
-dp_h[] = { 0.0, 5.84960938e-01,}, /* 0x3f15c000 */
-dp_l[] = { 0.0, 1.56322085e-06,}, /* 0x35d1cfdc */
-two24  =  16777216.0,  /* 0x4b800000 */
-huge   =  1.0e30,
-tiny   =  1.0e-30,
-/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */
-L1 =  6.0000002384e-01, /* 0x3f19999a */
-L2 =  4.2857143283e-01, /* 0x3edb6db7 */
-L3 =  3.3333334327e-01, /* 0x3eaaaaab */
-L4 =  2.7272811532e-01, /* 0x3e8ba305 */
-L5 =  2.3066075146e-01, /* 0x3e6c3255 */
-L6 =  2.0697501302e-01, /* 0x3e53f142 */
-P1 =  1.6666667163e-01, /* 0x3e2aaaab */
-P2 = -2.7777778450e-03, /* 0xbb360b61 */
-P3 =  6.6137559770e-05, /* 0x388ab355 */
-P4 = -1.6533901999e-06, /* 0xb5ddea0e */
-P5 =  4.1381369442e-08, /* 0x3331bb4c */
-lg2     =  6.9314718246e-01, /* 0x3f317218 */
-lg2_h   =  6.93145752e-01,   /* 0x3f317200 */
-lg2_l   =  1.42860654e-06,   /* 0x35bfbe8c */
-ovt     =  4.2995665694e-08, /* -(128-log2(ovfl+.5ulp)) */
-cp      =  9.6179670095e-01, /* 0x3f76384f =2/(3ln2) */
-cp_h    =  9.6191406250e-01, /* 0x3f764000 =12b cp */
-cp_l    = -1.1736857402e-04, /* 0xb8f623c6 =tail of cp_h */
-ivln2   =  1.4426950216e+00, /* 0x3fb8aa3b =1/ln2 */
-ivln2_h =  1.4426879883e+00, /* 0x3fb8aa00 =16b 1/ln2*/
-ivln2_l =  7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/
-
-float powf(float x, float y)
-{
-	float z,ax,z_h,z_l,p_h,p_l;
-	float y1,t1,t2,r,s,sn,t,u,v,w;
-	int32_t i,j,k,yisint,n;
-	int32_t hx,hy,ix,iy,is;
-
-	GET_FLOAT_WORD(hx, x);
-	GET_FLOAT_WORD(hy, y);
-	ix = hx & 0x7fffffff;
-	iy = hy & 0x7fffffff;
-
-	/* x**0 = 1, even if x is NaN */
-	if (iy == 0)
-		return 1.0f;
-	/* 1**y = 1, even if y is NaN */
-	if (hx == 0x3f800000)
-		return 1.0f;
-	/* NaN if either arg is NaN */
-	if (ix > 0x7f800000 || iy > 0x7f800000)
-		return x + y;
-
-	/* determine if y is an odd int when x < 0
-	 * yisint = 0       ... y is not an integer
-	 * yisint = 1       ... y is an odd int
-	 * yisint = 2       ... y is an even int
-	 */
-	yisint  = 0;
-	if (hx < 0) {
-		if (iy >= 0x4b800000)
-			yisint = 2; /* even integer y */
-		else if (iy >= 0x3f800000) {
-			k = (iy>>23) - 0x7f;         /* exponent */
-			j = iy>>(23-k);
-			if ((j<<(23-k)) == iy)
-				yisint = 2 - (j & 1);
-		}
-	}
-
-	/* special value of y */
-	if (iy == 0x7f800000) {  /* y is +-inf */
-		if (ix == 0x3f800000)      /* (-1)**+-inf is 1 */
-			return 1.0f;
-		else if (ix > 0x3f800000)  /* (|x|>1)**+-inf = inf,0 */
-			return hy >= 0 ? y : 0.0f;
-		else                       /* (|x|<1)**+-inf = 0,inf */
-			return hy >= 0 ? 0.0f: -y;
-	}
-	if (iy == 0x3f800000)    /* y is +-1 */
-		return hy >= 0 ? x : 1.0f/x;
-	if (hy == 0x40000000)    /* y is 2 */
-		return x*x;
-	if (hy == 0x3f000000) {  /* y is  0.5 */
-		if (hx >= 0)     /* x >= +0 */
-			return sqrtf(x);
-	}
-
-	ax = fabsf(x);
-	/* special value of x */
-	if (ix == 0x7f800000 || ix == 0 || ix == 0x3f800000) { /* x is +-0,+-inf,+-1 */
-		z = ax;
-		if (hy < 0)  /* z = (1/|x|) */
-			z = 1.0f/z;
-		if (hx < 0) {
-			if (((ix-0x3f800000)|yisint) == 0) {
-				z = (z-z)/(z-z); /* (-1)**non-int is NaN */
-			} else if (yisint == 1)
-				z = -z;          /* (x<0)**odd = -(|x|**odd) */
-		}
-		return z;
-	}
-
-	sn = 1.0f; /* sign of result */
-	if (hx < 0) {
-		if (yisint == 0) /* (x<0)**(non-int) is NaN */
-			return (x-x)/(x-x);
-		if (yisint == 1) /* (x<0)**(odd int) */
-			sn = -1.0f;
-	}
-
-	/* |y| is huge */
-	if (iy > 0x4d000000) { /* if |y| > 2**27 */
-		/* over/underflow if x is not close to one */
-		if (ix < 0x3f7ffff8)
-			return hy < 0 ? sn*huge*huge : sn*tiny*tiny;
-		if (ix > 0x3f800007)
-			return hy > 0 ? sn*huge*huge : sn*tiny*tiny;
-		/* now |1-x| is tiny <= 2**-20, suffice to compute
-		   log(x) by x-x^2/2+x^3/3-x^4/4 */
-		t = ax - 1;     /* t has 20 trailing zeros */
-		w = (t*t)*(0.5f - t*(0.333333333333f - t*0.25f));
-		u = ivln2_h*t;  /* ivln2_h has 16 sig. bits */
-		v = t*ivln2_l - w*ivln2;
-		t1 = u + v;
-		GET_FLOAT_WORD(is, t1);
-		SET_FLOAT_WORD(t1, is & 0xfffff000);
-		t2 = v - (t1-u);
-	} else {
-		float s2,s_h,s_l,t_h,t_l;
-		n = 0;
-		/* take care subnormal number */
-		if (ix < 0x00800000) {
-			ax *= two24;
-			n -= 24;
-			GET_FLOAT_WORD(ix, ax);
-		}
-		n += ((ix)>>23) - 0x7f;
-		j = ix & 0x007fffff;
-		/* determine interval */
-		ix = j | 0x3f800000;     /* normalize ix */
-		if (j <= 0x1cc471)       /* |x|<sqrt(3/2) */
-			k = 0;
-		else if (j < 0x5db3d7)   /* |x|<sqrt(3)   */
-			k = 1;
-		else {
-			k = 0;
-			n += 1;
-			ix -= 0x00800000;
-		}
-		SET_FLOAT_WORD(ax, ix);
-
-		/* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
-		u = ax - bp[k];   /* bp[0]=1.0, bp[1]=1.5 */
-		v = 1.0f/(ax+bp[k]);
-		s = u*v;
-		s_h = s;
-		GET_FLOAT_WORD(is, s_h);
-		SET_FLOAT_WORD(s_h, is & 0xfffff000);
-		/* t_h=ax+bp[k] High */
-		is = ((ix>>1) & 0xfffff000) | 0x20000000;
-		SET_FLOAT_WORD(t_h, is + 0x00400000 + (k<<21));
-		t_l = ax - (t_h - bp[k]);
-		s_l = v*((u - s_h*t_h) - s_h*t_l);
-		/* compute log(ax) */
-		s2 = s*s;
-		r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6)))));
-		r += s_l*(s_h+s);
-		s2 = s_h*s_h;
-		t_h = 3.0f + s2 + r;
-		GET_FLOAT_WORD(is, t_h);
-		SET_FLOAT_WORD(t_h, is & 0xfffff000);
-		t_l = r - ((t_h - 3.0f) - s2);
-		/* u+v = s*(1+...) */
-		u = s_h*t_h;
-		v = s_l*t_h + t_l*s;
-		/* 2/(3log2)*(s+...) */
-		p_h = u + v;
-		GET_FLOAT_WORD(is, p_h);
-		SET_FLOAT_WORD(p_h, is & 0xfffff000);
-		p_l = v - (p_h - u);
-		z_h = cp_h*p_h;  /* cp_h+cp_l = 2/(3*log2) */
-		z_l = cp_l*p_h + p_l*cp+dp_l[k];
-		/* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */
-		t = (float)n;
-		t1 = (((z_h + z_l) + dp_h[k]) + t);
-		GET_FLOAT_WORD(is, t1);
-		SET_FLOAT_WORD(t1, is & 0xfffff000);
-		t2 = z_l - (((t1 - t) - dp_h[k]) - z_h);
-	}
-
-	/* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */
-	GET_FLOAT_WORD(is, y);
-	SET_FLOAT_WORD(y1, is & 0xfffff000);
-	p_l = (y-y1)*t1 + y*t2;
-	p_h = y1*t1;
-	z = p_l + p_h;
-	GET_FLOAT_WORD(j, z);
-	if (j > 0x43000000)          /* if z > 128 */
-		return sn*huge*huge;  /* overflow */
-	else if (j == 0x43000000) {  /* if z == 128 */
-		if (p_l + ovt > z - p_h)
-			return sn*huge*huge;  /* overflow */
-	} else if ((j&0x7fffffff) > 0x43160000)  /* z < -150 */ // FIXME: check should be  (uint32_t)j > 0xc3160000
-		return sn*tiny*tiny;  /* underflow */
-	else if (j == 0xc3160000) {  /* z == -150 */
-		if (p_l <= z-p_h)
-			return sn*tiny*tiny;  /* underflow */
-	}
-	/*
-	 * compute 2**(p_h+p_l)
-	 */
-	i = j & 0x7fffffff;
-	k = (i>>23) - 0x7f;
-	n = 0;
-	if (i > 0x3f000000) {   /* if |z| > 0.5, set n = [z+0.5] */
-		n = j + (0x00800000>>(k+1));
-		k = ((n&0x7fffffff)>>23) - 0x7f;  /* new k for n */
-		SET_FLOAT_WORD(t, n & ~(0x007fffff>>k));
-		n = ((n&0x007fffff)|0x00800000)>>(23-k);
-		if (j < 0)
-			n = -n;
-		p_h -= t;
-	}
-	t = p_l + p_h;
-	GET_FLOAT_WORD(is, t);
-	SET_FLOAT_WORD(t, is & 0xffff8000);
-	u = t*lg2_h;
-	v = (p_l-(t-p_h))*lg2 + t*lg2_l;
-	z = u + v;
-	w = v - (z - u);
-	t = z*z;
-	t1 = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	r = (z*t1)/(t1-2.0f) - (w+z*w);
-	z = 1.0f - (r - z);
-	GET_FLOAT_WORD(j, z);
-	j += n<<23;
-	if ((j>>23) <= 0)  /* subnormal output */
-		z = scalbnf(z, n);
-	else
-		SET_FLOAT_WORD(z, j);
-	return sn*z;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalbn.c b/src/components/lib/libc/musl-1.1.11/src/math/scalbn.c
deleted file mode 100644
index 530e07c79f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/scalbn.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <math.h>
-#include <stdint.h>
-
-double scalbn(double x, int n)
-{
-	union {double f; uint64_t i;} u;
-	double_t y = x;
-
-	if (n > 1023) {
-		y *= 0x1p1023;
-		n -= 1023;
-		if (n > 1023) {
-			y *= 0x1p1023;
-			n -= 1023;
-			if (n > 1023)
-				n = 1023;
-		}
-	} else if (n < -1022) {
-		y *= 0x1p-1022;
-		n += 1022;
-		if (n < -1022) {
-			y *= 0x1p-1022;
-			n += 1022;
-			if (n < -1022)
-				n = -1022;
-		}
-	}
-	u.i = (uint64_t)(0x3ff+n)<<52;
-	x = y * u.f;
-	return x;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sqrt.c b/src/components/lib/libc/musl-1.1.11/src/math/sqrt.c
deleted file mode 100644
index b277567385..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/sqrt.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_sqrt.c */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-/* sqrt(x)
- * Return correctly rounded sqrt.
- *           ------------------------------------------
- *           |  Use the hardware sqrt if you have one |
- *           ------------------------------------------
- * Method:
- *   Bit by bit method using integer arithmetic. (Slow, but portable)
- *   1. Normalization
- *      Scale x to y in [1,4) with even powers of 2:
- *      find an integer k such that  1 <= (y=x*2^(2k)) < 4, then
- *              sqrt(x) = 2^k * sqrt(y)
- *   2. Bit by bit computation
- *      Let q  = sqrt(y) truncated to i bit after binary point (q = 1),
- *           i                                                   0
- *                                     i+1         2
- *          s  = 2*q , and      y  =  2   * ( y - q  ).         (1)
- *           i      i            i                 i
- *
- *      To compute q    from q , one checks whether
- *                  i+1       i
- *
- *                            -(i+1) 2
- *                      (q + 2      ) <= y.                     (2)
- *                        i
- *                                                            -(i+1)
- *      If (2) is false, then q   = q ; otherwise q   = q  + 2      .
- *                             i+1   i             i+1   i
- *
- *      With some algebric manipulation, it is not difficult to see
- *      that (2) is equivalent to
- *                             -(i+1)
- *                      s  +  2       <= y                      (3)
- *                       i                i
- *
- *      The advantage of (3) is that s  and y  can be computed by
- *                                    i      i
- *      the following recurrence formula:
- *          if (3) is false
- *
- *          s     =  s  ,       y    = y   ;                    (4)
- *           i+1      i          i+1    i
- *
- *          otherwise,
- *                         -i                     -(i+1)
- *          s     =  s  + 2  ,  y    = y  -  s  - 2             (5)
- *           i+1      i          i+1    i     i
- *
- *      One may easily use induction to prove (4) and (5).
- *      Note. Since the left hand side of (3) contain only i+2 bits,
- *            it does not necessary to do a full (53-bit) comparison
- *            in (3).
- *   3. Final rounding
- *      After generating the 53 bits result, we compute one more bit.
- *      Together with the remainder, we can decide whether the
- *      result is exact, bigger than 1/2ulp, or less than 1/2ulp
- *      (it will never equal to 1/2ulp).
- *      The rounding mode can be detected by checking whether
- *      huge + tiny is equal to huge, and whether huge - tiny is
- *      equal to huge for some floating point number "huge" and "tiny".
- *
- * Special cases:
- *      sqrt(+-0) = +-0         ... exact
- *      sqrt(inf) = inf
- *      sqrt(-ve) = NaN         ... with invalid signal
- *      sqrt(NaN) = NaN         ... with invalid signal for signaling NaN
- */
-
-#include "libm.h"
-
-static const double tiny = 1.0e-300;
-
-double sqrt(double x)
-{
-	double z;
-	int32_t sign = (int)0x80000000;
-	int32_t ix0,s0,q,m,t,i;
-	uint32_t r,t1,s1,ix1,q1;
-
-	EXTRACT_WORDS(ix0, ix1, x);
-
-	/* take care of Inf and NaN */
-	if ((ix0&0x7ff00000) == 0x7ff00000) {
-		return x*x + x;  /* sqrt(NaN)=NaN, sqrt(+inf)=+inf, sqrt(-inf)=sNaN */
-	}
-	/* take care of zero */
-	if (ix0 <= 0) {
-		if (((ix0&~sign)|ix1) == 0)
-			return x;  /* sqrt(+-0) = +-0 */
-		if (ix0 < 0)
-			return (x-x)/(x-x);  /* sqrt(-ve) = sNaN */
-	}
-	/* normalize x */
-	m = ix0>>20;
-	if (m == 0) {  /* subnormal x */
-		while (ix0 == 0) {
-			m -= 21;
-			ix0 |= (ix1>>11);
-			ix1 <<= 21;
-		}
-		for (i=0; (ix0&0x00100000) == 0; i++)
-			ix0<<=1;
-		m -= i - 1;
-		ix0 |= ix1>>(32-i);
-		ix1 <<= i;
-	}
-	m -= 1023;    /* unbias exponent */
-	ix0 = (ix0&0x000fffff)|0x00100000;
-	if (m & 1) {  /* odd m, double x to make it even */
-		ix0 += ix0 + ((ix1&sign)>>31);
-		ix1 += ix1;
-	}
-	m >>= 1;      /* m = [m/2] */
-
-	/* generate sqrt(x) bit by bit */
-	ix0 += ix0 + ((ix1&sign)>>31);
-	ix1 += ix1;
-	q = q1 = s0 = s1 = 0;  /* [q,q1] = sqrt(x) */
-	r = 0x00200000;        /* r = moving bit from right to left */
-
-	while (r != 0) {
-		t = s0 + r;
-		if (t <= ix0) {
-			s0   = t + r;
-			ix0 -= t;
-			q   += r;
-		}
-		ix0 += ix0 + ((ix1&sign)>>31);
-		ix1 += ix1;
-		r >>= 1;
-	}
-
-	r = sign;
-	while (r != 0) {
-		t1 = s1 + r;
-		t  = s0;
-		if (t < ix0 || (t == ix0 && t1 <= ix1)) {
-			s1 = t1 + r;
-			if ((t1&sign) == sign && (s1&sign) == 0)
-				s0++;
-			ix0 -= t;
-			if (ix1 < t1)
-				ix0--;
-			ix1 -= t1;
-			q1 += r;
-		}
-		ix0 += ix0 + ((ix1&sign)>>31);
-		ix1 += ix1;
-		r >>= 1;
-	}
-
-	/* use floating add to find out rounding direction */
-	if ((ix0|ix1) != 0) {
-		z = 1.0 - tiny; /* raise inexact flag */
-		if (z >= 1.0) {
-			z = 1.0 + tiny;
-			if (q1 == (uint32_t)0xffffffff) {
-				q1 = 0;
-				q++;
-			} else if (z > 1.0) {
-				if (q1 == (uint32_t)0xfffffffe)
-					q++;
-				q1 += 2;
-			} else
-				q1 += q1 & 1;
-		}
-	}
-	ix0 = (q>>1) + 0x3fe00000;
-	ix1 = q1>>1;
-	if (q&1)
-		ix1 |= sign;
-	ix0 += m << 20;
-	INSERT_WORDS(z, ix0, ix1);
-	return z;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sqrtf.c b/src/components/lib/libc/musl-1.1.11/src/math/sqrtf.c
deleted file mode 100644
index 28cb4ad371..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/sqrtf.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* origin: FreeBSD /usr/src/lib/msun/src/e_sqrtf.c */
-/*
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include "libm.h"
-
-static const float tiny = 1.0e-30;
-
-float sqrtf(float x)
-{
-	float z;
-	int32_t sign = (int)0x80000000;
-	int32_t ix,s,q,m,t,i;
-	uint32_t r;
-
-	GET_FLOAT_WORD(ix, x);
-
-	/* take care of Inf and NaN */
-	if ((ix&0x7f800000) == 0x7f800000)
-		return x*x + x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf, sqrt(-inf)=sNaN */
-
-	/* take care of zero */
-	if (ix <= 0) {
-		if ((ix&~sign) == 0)
-			return x;  /* sqrt(+-0) = +-0 */
-		if (ix < 0)
-			return (x-x)/(x-x);  /* sqrt(-ve) = sNaN */
-	}
-	/* normalize x */
-	m = ix>>23;
-	if (m == 0) {  /* subnormal x */
-		for (i = 0; (ix&0x00800000) == 0; i++)
-			ix<<=1;
-		m -= i - 1;
-	}
-	m -= 127;  /* unbias exponent */
-	ix = (ix&0x007fffff)|0x00800000;
-	if (m&1)  /* odd m, double x to make it even */
-		ix += ix;
-	m >>= 1;  /* m = [m/2] */
-
-	/* generate sqrt(x) bit by bit */
-	ix += ix;
-	q = s = 0;       /* q = sqrt(x) */
-	r = 0x01000000;  /* r = moving bit from right to left */
-
-	while (r != 0) {
-		t = s + r;
-		if (t <= ix) {
-			s = t+r;
-			ix -= t;
-			q += r;
-		}
-		ix += ix;
-		r >>= 1;
-	}
-
-	/* use floating add to find out rounding direction */
-	if (ix != 0) {
-		z = 1.0f - tiny; /* raise inexact flag */
-		if (z >= 1.0f) {
-			z = 1.0f + tiny;
-			if (z > 1.0f)
-				q += 2;
-			else
-				q += q & 1;
-		}
-	}
-	ix = (q>>1) + 0x3f000000;
-	ix += m << 23;
-	SET_FLOAT_WORD(z, ix);
-	return z;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/lrintl.s b/src/components/lib/libc/musl-1.1.11/src/math/x32/lrintl.s
deleted file mode 100644
index ee97d1cfec..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/math/x32/lrintl.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.global lrintl
-.type lrintl,@function
-lrintl:
-	fldt 8(%esp)
-	fistpll 8(%esp)
-	mov 8(%esp),%rax
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/a64l.c b/src/components/lib/libc/musl-1.1.11/src/misc/a64l.c
deleted file mode 100644
index 86aeefe0d5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/misc/a64l.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
-static const char digits[] =
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-long a64l(const char *s)
-{
-	int e;
-	uint32_t x = 0;
-	for (e=0; e<36 && *s; e+=6, s++)
-		x |= (strchr(digits, *s)-digits)<<e;
-	return x;
-}
-
-char *l64a(long x0)
-{
-	static char s[7];
-	char *p;
-	uint32_t x = x0;
-	for (p=s; x; p++, x>>=6)
-		*p = digits[x&63];
-	*p = 0;
-	return s;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getauxval.c b/src/components/lib/libc/musl-1.1.11/src/misc/getauxval.c
deleted file mode 100644
index b846c80fdd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/misc/getauxval.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <sys/auxv.h>
-#include <errno.h>
-#include "libc.h"
-
-unsigned long getauxval(unsigned long item)
-{
-	size_t *auxv = libc.auxv;
-	if (item == AT_SECURE) return libc.secure;
-	for (; *auxv; auxv+=2)
-		if (*auxv==item) return auxv[1];
-	errno = ENOENT;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/gethostid.c b/src/components/lib/libc/musl-1.1.11/src/misc/gethostid.c
deleted file mode 100644
index ea65611abb..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/misc/gethostid.c
+++ /dev/null
@@ -1,4 +0,0 @@
-long gethostid()
-{
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getrusage.c b/src/components/lib/libc/musl-1.1.11/src/misc/getrusage.c
deleted file mode 100644
index 0aaf0ac72e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/misc/getrusage.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sys/resource.h>
-#include "syscall.h"
-
-int getrusage(int who, struct rusage *ru)
-{
-	return syscall(SYS_getrusage, who, ru);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/ioctl.c b/src/components/lib/libc/musl-1.1.11/src/misc/ioctl.c
deleted file mode 100644
index 5a41f0e846..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/misc/ioctl.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <sys/ioctl.h>
-#include <stdarg.h>
-#include "syscall.h"
-
-int ioctl(int fd, int req, ...)
-{
-	void *arg;
-	va_list ap;
-	va_start(ap, req);
-	arg = va_arg(ap, void *);
-	va_end(ap);
-	return syscall(SYS_ioctl, fd, req, arg);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/syscall.c b/src/components/lib/libc/musl-1.1.11/src/misc/syscall.c
deleted file mode 100644
index 9d435a9785..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/misc/syscall.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "syscall.h"
-#include <stdarg.h>
-
-#undef syscall
-
-long syscall(long n, ...)
-{
-	va_list ap;
-	syscall_arg_t a,b,c,d,e,f;
-	va_start(ap, n);
-	a=va_arg(ap, syscall_arg_t);
-	b=va_arg(ap, syscall_arg_t);
-	c=va_arg(ap, syscall_arg_t);
-	d=va_arg(ap, syscall_arg_t);
-	e=va_arg(ap, syscall_arg_t);
-	f=va_arg(ap, syscall_arg_t);
-	va_end(ap);
-	return __syscall_ret(__syscall(n,a,b,c,d,e,f));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/mlock.c b/src/components/lib/libc/musl-1.1.11/src/mman/mlock.c
deleted file mode 100644
index e683a44aef..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/mman/mlock.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sys/mman.h>
-#include "syscall.h"
-
-int mlock(const void *addr, size_t len)
-{
-	return syscall(SYS_mlock, addr, len);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/mmap.c b/src/components/lib/libc/musl-1.1.11/src/mman/mmap.c
deleted file mode 100644
index b85f25ca08..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/mman/mmap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <unistd.h>
-#include <sys/mman.h>
-#include <errno.h>
-#include <stdint.h>
-#include <limits.h>
-#include "syscall.h"
-#include "libc.h"
-
-static void dummy(void) { }
-weak_alias(dummy, __vm_wait);
-
-#define UNIT SYSCALL_MMAP2_UNIT
-#define OFF_MASK ((-0x2000ULL << (8*sizeof(long)-1)) | (UNIT-1))
-
-void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
-{
-	if (off & OFF_MASK) {
-		errno = EINVAL;
-		return MAP_FAILED;
-	}
-	if (len >= PTRDIFF_MAX) {
-		errno = ENOMEM;
-		return MAP_FAILED;
-	}
-	if (flags & MAP_FIXED) {
-		__vm_wait();
-	}
-#ifdef SYS_mmap2
-	return (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT);
-#else
-	return (void *)syscall(SYS_mmap, start, len, prot, flags, fd, off);
-#endif
-}
-
-weak_alias(__mmap, mmap);
-
-LFS64(mmap);
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/mremap.c b/src/components/lib/libc/musl-1.1.11/src/mman/mremap.c
deleted file mode 100644
index 596c45fbde..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/mman/mremap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <unistd.h>
-#include <sys/mman.h>
-#include <stdarg.h>
-#include "syscall.h"
-#include "libc.h"
-
-void *__mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...)
-{
-	va_list ap;
-	void *new_addr;
-	
-	va_start(ap, flags);
-	new_addr = va_arg(ap, void *);
-	va_end(ap);
-
-	return (void *)syscall(SYS_mremap, old_addr, old_len, new_len, flags, new_addr);
-}
-
-weak_alias(__mremap, mremap);
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_timedreceive.c b/src/components/lib/libc/musl-1.1.11/src/mq/mq_timedreceive.c
deleted file mode 100644
index 2cef6a86bf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/mq/mq_timedreceive.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <mqueue.h>
-#include "syscall.h"
-
-ssize_t mq_timedreceive(mqd_t mqd, char *restrict msg, size_t len, unsigned *restrict prio, const struct timespec *restrict at)
-{
-	return syscall_cp(SYS_mq_timedreceive, mqd, msg, len, prio, at);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_timedsend.c b/src/components/lib/libc/musl-1.1.11/src/mq/mq_timedsend.c
deleted file mode 100644
index 1c00aa0b28..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/mq/mq_timedsend.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <mqueue.h>
-#include "syscall.h"
-
-int mq_timedsend(mqd_t mqd, const char *msg, size_t len, unsigned prio, const struct timespec *at)
-{
-	return syscall_cp(SYS_mq_timedsend, mqd, msg, len, prio, at);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/internal.h b/src/components/lib/libc/musl-1.1.11/src/multibyte/internal.h
deleted file mode 100644
index 51308f4f0c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/internal.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
-#define bittab __fsmu8
-
-#include <stdint.h>
-
-#ifdef __PIC__
-__attribute__((__visibility__("hidden")))
-#endif
-extern const uint32_t bittab[];
-
-/* Upper 6 state bits are a negative integer offset to bound-check next byte */
-/*    equivalent to: ( (b-0x80) | (b+offset) ) & ~0x3f      */
-#define OOB(c,b) (((((b)>>3)-0x10)|(((b)>>3)+((int32_t)(c)>>26))) & ~7)
-
-/* Interval [a,b). Either a must be 80 or b must be c0, lower 3 bits clear. */
-#define R(a,b) ((uint32_t)((a==0x80 ? 0x40u-b : 0u-a) << 23))
-#define FAILSTATE R(0x80,0x80)
-
-#define SA 0xc2u
-#define SB 0xf4u
-
-/* Arbitrary encoding for representing code units instead of characters. */
-#define CODEUNIT(c) (0xdfff & (signed char)(c))
-#define IS_CODEUNIT(c) ((unsigned)(c)-0xdf80 < 0x80)
-
-/* Get inline definition of MB_CUR_MAX. */
-#include "locale_impl.h"
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mblen.c b/src/components/lib/libc/musl-1.1.11/src/multibyte/mblen.c
deleted file mode 100644
index 96b47b1238..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/mblen.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
-#include <stdlib.h>
-
-int mblen(const char *s, size_t n)
-{
-	return mbtowc(0, s, n);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbrlen.c b/src/components/lib/libc/musl-1.1.11/src/multibyte/mbrlen.c
deleted file mode 100644
index 3a5a743362..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbrlen.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
-#include <wchar.h>
-
-size_t mbrlen(const char *restrict s, size_t n, mbstate_t *restrict st)
-{
-	static unsigned internal;
-	return mbrtowc(0, s, n, st ? st : (mbstate_t *)&internal);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbsinit.c b/src/components/lib/libc/musl-1.1.11/src/multibyte/mbsinit.c
deleted file mode 100644
index e001d84443..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbsinit.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
-#include <wchar.h>
-
-int mbsinit(const mbstate_t *st)
-{
-	return !st || !*(unsigned *)st;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/wctomb.c b/src/components/lib/libc/musl-1.1.11/src/multibyte/wctomb.c
deleted file mode 100644
index de7ed84d9b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/wctomb.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
-#include <stdlib.h>
-#include <wchar.h>
-
-int wctomb(char *s, wchar_t wc)
-{
-	if (!s) return 0;
-	return wcrtomb(s, wc, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/dn_skipname.c b/src/components/lib/libc/musl-1.1.11/src/network/dn_skipname.c
deleted file mode 100644
index d54c2e5d04..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/dn_skipname.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <resolv.h>
-
-int dn_skipname(const unsigned char *s, const unsigned char *end)
-{
-	const unsigned char *p;
-	for (p=s; p<end; p++)
-		if (!*p) return p-s+1;
-		else if (*p>=192)
-			if (p+1<end) return p-s+2;
-			else break;
-	return -1;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/ent.c b/src/components/lib/libc/musl-1.1.11/src/network/ent.c
deleted file mode 100644
index ececdc4866..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/ent.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "libc.h"
-
-void sethostent(int x)
-{
-}
-
-void *gethostent()
-{
-	return 0;
-}
-
-void endhostent(void)
-{
-}
-
-weak_alias(sethostent, setnetent);
-weak_alias(gethostent, getnetent);
-weak_alias(endhostent, endnetent);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/freeaddrinfo.c b/src/components/lib/libc/musl-1.1.11/src/network/freeaddrinfo.c
deleted file mode 100644
index df3798ae78..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/freeaddrinfo.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-#include <netdb.h>
-
-void freeaddrinfo(struct addrinfo *p)
-{
-	free(p);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getaddrinfo.c b/src/components/lib/libc/musl-1.1.11/src/network/getaddrinfo.c
deleted file mode 100644
index c88d558c49..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/getaddrinfo.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include "lookup.h"
-
-int getaddrinfo(const char *restrict host, const char *restrict serv, const struct addrinfo *restrict hint, struct addrinfo **restrict res)
-{
-	struct service ports[MAXSERVS];
-	struct address addrs[MAXADDRS];
-	char canon[256], *outcanon;
-	int nservs, naddrs, nais, canon_len, i, j, k;
-	int family = AF_UNSPEC, flags = 0, proto = 0, socktype = 0;
-	struct aibuf {
-		struct addrinfo ai;
-		union sa {
-			struct sockaddr_in sin;
-			struct sockaddr_in6 sin6;
-		} sa;
-	} *out;
-
-	if (hint) {
-		family = hint->ai_family;
-		flags = hint->ai_flags;
-		proto = hint->ai_protocol;
-		socktype = hint->ai_socktype;
-
-		const int mask = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST |
-			AI_V4MAPPED | AI_ALL | AI_ADDRCONFIG | AI_NUMERICSERV;
-		if ((flags & mask) != flags)
-			return EAI_BADFLAGS;
-
-		switch (family) {
-		case AF_INET:
-		case AF_INET6:
-		case AF_UNSPEC:
-			break;
-		default:
-			return EAI_FAMILY;
-		}
-	}
-
-	nservs = __lookup_serv(ports, serv, proto, socktype, flags);
-	if (nservs < 0) return nservs;
-
-	naddrs = __lookup_name(addrs, canon, host, family, flags);
-	if (naddrs < 0) return naddrs;
-
-	nais = nservs * naddrs;
-	canon_len = strlen(canon);
-	out = calloc(1, nais * sizeof(*out) + canon_len + 1);
-	if (!out) return EAI_MEMORY;
-
-	if (canon_len) {
-		outcanon = (void *)&out[nais];
-		memcpy(outcanon, canon, canon_len+1);
-	} else {
-		outcanon = 0;
-	}
-
-	for (k=i=0; i<naddrs; i++) for (j=0; j<nservs; j++, k++) {
-		out[k].ai = (struct addrinfo){
-			.ai_family = addrs[i].family,
-			.ai_socktype = ports[j].socktype,
-			.ai_protocol = ports[j].proto,
-			.ai_addrlen = addrs[i].family == AF_INET
-				? sizeof(struct sockaddr_in)
-				: sizeof(struct sockaddr_in6),
-			.ai_addr = (void *)&out[k].sa,
-			.ai_canonname = outcanon,
-			.ai_next = &out[k+1].ai };
-		switch (addrs[i].family) {
-		case AF_INET:
-			out[k].sa.sin.sin_family = AF_INET;
-			out[k].sa.sin.sin_port = htons(ports[j].port);
-			memcpy(&out[k].sa.sin.sin_addr, &addrs[i].addr, 4);
-			break;
-		case AF_INET6:
-			out[k].sa.sin6.sin6_family = AF_INET6;
-			out[k].sa.sin6.sin6_port = htons(ports[j].port);
-			out[k].sa.sin6.sin6_scope_id = addrs[i].scopeid;
-			memcpy(&out[k].sa.sin6.sin6_addr, &addrs[i].addr, 16);
-			break;			
-		}
-	}
-	out[nais-1].ai.ai_next = 0;
-	*res = &out->ai;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyname.c b/src/components/lib/libc/musl-1.1.11/src/network/gethostbyname.c
deleted file mode 100644
index 5088a51e07..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyname.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#define _GNU_SOURCE
-
-#include <sys/socket.h>
-#include <netdb.h>
-#include <string.h>
-#include <netinet/in.h>
-
-struct hostent *gethostbyname(const char *name)
-{
-	return gethostbyname2(name, AF_INET);
-}
-
-#if 0
-struct hostent *gethostbyname(const char *name)
-{
-	static struct hostent h;
-	static char *h_aliases[3];
-	static char h_canon[256];
-	static char *h_addr_list[10];
-	static char h_addr_data[10][4];
-	static const struct addrinfo hint = {
-		.ai_family = AF_INET, .ai_flags = AI_CANONNAME
-	};
-	struct addrinfo *ai, *p;
-	int i;
-
-	switch (getaddrinfo(name, 0, &hint, &ai)) {
-	case EAI_NONAME:
-		h_errno = HOST_NOT_FOUND;
-		break;
-	case EAI_AGAIN:
-		h_errno = TRY_AGAIN;
-		break;
-	case EAI_FAIL:
-		h_errno = NO_RECOVERY;
-		break;
-	default:
-	case EAI_MEMORY:
-	case EAI_SYSTEM:
-		h_errno = NO_DATA;
-		break;
-	case 0:
-		break;
-	}
-
-	strcpy(h_canon, ai->ai_canonname);
-	h.h_name = h_canon;
-	h.h_aliases = h_aliases;
-	h.h_aliases[0] = h_canon;
-	h.h_aliases[1] = strcmp(h_canon, name) ? (char *)name : 0;
-	h.h_length = 4;
-	h.h_addr_list = h_addr_list;
-	for (i=0, p=ai; i<sizeof h_addr_data/4 && p; i++, p=p->ai_next) {
-		h.h_addr_list[i] = h_addr_data[i];
-		memcpy(h.h_addr_list[i],
-			&((struct sockaddr_in *)p->ai_addr)->sin_addr, 4);
-	}
-	h.h_addr_list[i] = 0;
-	h.h_addrtype = AF_INET;
-	freeaddrinfo(ai);
-	return &h;
-}
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getsockopt.c b/src/components/lib/libc/musl-1.1.11/src/network/getsockopt.c
deleted file mode 100644
index 28079d8c0c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/getsockopt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sys/socket.h>
-#include "syscall.h"
-
-int getsockopt(int fd, int level, int optname, void *restrict optval, socklen_t *restrict optlen)
-{
-	return socketcall(getsockopt, fd, level, optname, optval, optlen, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/if_indextoname.c b/src/components/lib/libc/musl-1.1.11/src/network/if_indextoname.c
deleted file mode 100644
index 6ee7f13ce3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/if_indextoname.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#define _GNU_SOURCE
-#include <net/if.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include "syscall.h"
-
-char *if_indextoname(unsigned index, char *name)
-{
-	struct ifreq ifr;
-	int fd, r;
-
-	if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) return 0;
-	ifr.ifr_ifindex = index;
-	r = ioctl(fd, SIOCGIFNAME, &ifr);
-	__syscall(SYS_close, fd);
-	return r < 0 ? 0 : strncpy(name, ifr.ifr_name, IF_NAMESIZE);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/lookup.h b/src/components/lib/libc/musl-1.1.11/src/network/lookup.h
deleted file mode 100644
index 69419115b3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/lookup.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef LOOKUP_H
-#define LOOKUP_H
-
-#include <stdint.h>
-
-struct address {
-	int family;
-	unsigned scopeid;
-	uint8_t addr[16];
-	int sortkey;
-};
-
-struct service {
-	uint16_t port;
-	unsigned char proto, socktype;
-};
-
-/* The limit of 48 results is a non-sharp bound on the number of addresses
- * that can fit in one 512-byte DNS packet full of v4 results and a second
- * packet full of v6 results. Due to headers, the actual limit is lower. */
-#define MAXADDRS 48
-#define MAXSERVS 2
-
-int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int proto, int socktype, int flags);
-int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, int flags);
-int __lookup_ipliteral(struct address buf[static 1], const char *name, int family);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/lookup_ipliteral.c b/src/components/lib/libc/musl-1.1.11/src/network/lookup_ipliteral.c
deleted file mode 100644
index 7bcb85fc50..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/lookup_ipliteral.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "lookup.h"
-
-int __inet_aton(const char *, struct in_addr *);
-
-int __lookup_ipliteral(struct address buf[static 1], const char *name, int family)
-{
-	struct in_addr a4;
-	struct in6_addr a6;
-	if (family != AF_INET6 && __inet_aton(name, &a4)>0) {
-		memcpy(&buf[0].addr, &a4, sizeof a4);
-		buf[0].family = AF_INET;
-		buf[0].scopeid = 0;
-		return 1;
-	}
-	if (family != AF_INET) {
-		char tmp[64];
-		char *p = strchr(name, '%'), *z;
-		unsigned long long scopeid;
-		if (p && p-name < 64) {
-			memcpy(tmp, name, p-name);
-			tmp[p-name] = 0;
-			name = tmp;
-		}
-		if (inet_pton(AF_INET6, name, &a6)<=0) return 0;
-		memcpy(&buf[0].addr, &a6, sizeof a6);
-		buf[0].family = AF_INET6;
-		if (p) {
-			if (isdigit(*++p)) scopeid = strtoull(p, &z, 10);
-			else z = p-1;
-			if (*z) {
-				if (!IN6_IS_ADDR_LINKLOCAL(&a6) &&
-				    !IN6_IS_ADDR_MC_LINKLOCAL(&a6))
-					return EAI_NONAME;
-				scopeid = if_nametoindex(p);
-				if (!scopeid) return EAI_NONAME;
-			}
-			if (scopeid > UINT_MAX) return EAI_NONAME;
-			buf[0].scopeid = scopeid;
-		}
-		return 1;
-	}
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/lookup_name.c b/src/components/lib/libc/musl-1.1.11/src/network/lookup_name.c
deleted file mode 100644
index 0225a9346b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/lookup_name.c
+++ /dev/null
@@ -1,337 +0,0 @@
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "lookup.h"
-#include "stdio_impl.h"
-#include "syscall.h"
-
-static int is_valid_hostname(const char *host)
-{
-	const unsigned char *s;
-	if (strnlen(host, 255)-1 >= 254 || mbstowcs(0, host, 0) == -1) return 0;
-	for (s=(void *)host; *s>=0x80 || *s=='.' || *s=='-' || isalnum(*s); s++);
-	return !*s;
-}
-
-static int name_from_null(struct address buf[static 2], const char *name, int family, int flags)
-{
-	int cnt = 0;
-	if (name) return 0;
-	if (flags & AI_PASSIVE) {
-		if (family != AF_INET6)
-			buf[cnt++] = (struct address){ .family = AF_INET };
-		if (family != AF_INET)
-			buf[cnt++] = (struct address){ .family = AF_INET6 };
-	} else {
-		if (family != AF_INET6)
-			buf[cnt++] = (struct address){ .family = AF_INET, .addr = { 127,0,0,1 } };
-		if (family != AF_INET)
-			buf[cnt++] = (struct address){ .family = AF_INET6, .addr = { [15] = 1 } };
-	}
-	return cnt;
-}
-
-static int name_from_numeric(struct address buf[static 1], const char *name, int family)
-{
-	return __lookup_ipliteral(buf, name, family);
-}
-
-static int name_from_hosts(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family)
-{
-	char line[512];
-	size_t l = strlen(name);
-	int cnt = 0;
-	unsigned char _buf[1032];
-	FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf);
-	if (!f) return 0;
-	while (fgets(line, sizeof line, f) && cnt < MAXADDRS) {
-		char *p, *z;
-
-		if ((p=strchr(line, '#'))) *p++='\n', *p=0;
-		for(p=line+1; (p=strstr(p, name)) &&
-			(!isspace(p[-1]) || !isspace(p[l])); p++);
-		if (!p) continue;
-
-		/* Isolate IP address to parse */
-		for (p=line; *p && !isspace(*p); p++);
-		*p++ = 0;
-		if (name_from_numeric(buf+cnt, line, family))
-			cnt++;
-
-		/* Extract first name as canonical name */
-		for (; *p && isspace(*p); p++);
-		for (z=p; *z && !isspace(*z); z++);
-		*z = 0;
-		if (is_valid_hostname(p)) memcpy(canon, p, z-p+1);
-	}
-	__fclose_ca(f);
-	return cnt;
-}
-
-struct dpc_ctx {
-	struct address *addrs;
-	char *canon;
-	int cnt;
-};
-
-int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
-int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
-int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
-int __res_msend(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int);
-
-#define RR_A 1
-#define RR_CNAME 5
-#define RR_AAAA 28
-
-static int dns_parse_callback(void *c, int rr, const void *data, int len, const void *packet)
-{
-	char tmp[256];
-	struct dpc_ctx *ctx = c;
-	switch (rr) {
-	case RR_A:
-		if (len != 4) return -1;
-		ctx->addrs[ctx->cnt].family = AF_INET;
-		ctx->addrs[ctx->cnt].scopeid = 0;
-		memcpy(ctx->addrs[ctx->cnt++].addr, data, 4);
-		break;
-	case RR_AAAA:
-		if (len != 16) return -1;
-		ctx->addrs[ctx->cnt].family = AF_INET6;
-		ctx->addrs[ctx->cnt].scopeid = 0;
-		memcpy(ctx->addrs[ctx->cnt++].addr, data, 16);
-		break;
-	case RR_CNAME:
-		if (__dn_expand(packet, (const unsigned char *)packet + 512,
-		    data, tmp, sizeof tmp) > 0 && is_valid_hostname(tmp))
-			strcpy(ctx->canon, tmp);
-		break;
-	}
-	return 0;
-}
-
-static int name_from_dns(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family)
-{
-	unsigned char qbuf[2][280], abuf[2][512];
-	const unsigned char *qp[2] = { qbuf[0], qbuf[1] };
-	unsigned char *ap[2] = { abuf[0], abuf[1] };
-	int qlens[2], alens[2];
-	int i, nq = 0;
-	struct dpc_ctx ctx = { .addrs = buf, .canon = canon };
-
-	if (family != AF_INET6) {
-		qlens[nq] = __res_mkquery(0, name, 1, RR_A, 0, 0, 0,
-			qbuf[nq], sizeof *qbuf);
-		nq++;
-	}
-	if (family != AF_INET) {
-		qlens[nq] = __res_mkquery(0, name, 1, RR_AAAA, 0, 0, 0,
-			qbuf[nq], sizeof *qbuf);
-		nq++;
-	}
-
-	if (__res_msend(nq, qp, qlens, ap, alens, sizeof *abuf) < 0) return EAI_SYSTEM;
-
-	for (i=0; i<nq; i++)
-		__dns_parse(abuf[i], alens[i], dns_parse_callback, &ctx);
-
-	if (ctx.cnt) return ctx.cnt;
-	if (alens[0] < 4 || (abuf[0][3] & 15) == 2) return EAI_AGAIN;
-	if ((abuf[0][3] & 15) == 3) return EAI_NONAME;
-	return EAI_FAIL;
-}
-
-static const struct policy {
-	unsigned char addr[16];
-	unsigned char len, mask;
-	unsigned char prec, label;
-} defpolicy[] = {
-	{ "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1", 15, 0xff, 50, 0 },
-	{ "\0\0\0\0\0\0\0\0\0\0\xff\xff", 11, 0xff, 35, 4 },
-	{ "\x20\2", 1, 0xff, 30, 2 },
-	{ "\x20\1", 3, 0xff, 5, 5 },
-	{ "\xfc", 0, 0xfe, 3, 13 },
-#if 0
-	/* These are deprecated and/or returned to the address
-	 * pool, so despite the RFC, treating them as special
-	 * is probably wrong. */
-	{ "", 11, 0xff, 1, 3 },
-	{ "\xfe\xc0", 1, 0xc0, 1, 11 },
-	{ "\x3f\xfe", 1, 0xff, 1, 12 },
-#endif
-	/* Last rule must match all addresses to stop loop. */
-	{ "", 0, 0, 40, 1 },
-};
-
-static const struct policy *policyof(const struct in6_addr *a)
-{
-	int i;
-	for (i=0; ; i++) {
-		if (memcmp(a->s6_addr, defpolicy[i].addr, defpolicy[i].len))
-			continue;
-		if ((a->s6_addr[defpolicy[i].len] & defpolicy[i].mask)
-		    != defpolicy[i].addr[defpolicy[i].len])
-			continue;
-		return defpolicy+i;
-	}
-}
-
-static int labelof(const struct in6_addr *a)
-{
-	return policyof(a)->label;
-}
-
-static int scopeof(const struct in6_addr *a)
-{
-	if (IN6_IS_ADDR_MULTICAST(a)) return a->s6_addr[1] & 15;
-	if (IN6_IS_ADDR_LINKLOCAL(a)) return 2;
-	if (IN6_IS_ADDR_LOOPBACK(a)) return 2;
-	if (IN6_IS_ADDR_SITELOCAL(a)) return 5;
-	return 14;
-}
-
-static int prefixmatch(const struct in6_addr *s, const struct in6_addr *d)
-{
-	/* FIXME: The common prefix length should be limited to no greater
-	 * than the nominal length of the prefix portion of the source
-	 * address. However the definition of the source prefix length is
-	 * not clear and thus this limiting is not yet implemented. */
-	unsigned i;
-	for (i=0; i<128 && !((s->s6_addr[i/8]^d->s6_addr[i/8])&(128>>(i%8))); i++);
-	return i;
-}
-
-#define DAS_USABLE              0x40000000
-#define DAS_MATCHINGSCOPE       0x20000000
-#define DAS_MATCHINGLABEL       0x10000000
-#define DAS_PREC_SHIFT          20
-#define DAS_SCOPE_SHIFT         16
-#define DAS_PREFIX_SHIFT        8
-#define DAS_ORDER_SHIFT         0
-
-static int addrcmp(const void *_a, const void *_b)
-{
-	const struct address *a = _a, *b = _b;
-	return b->sortkey - a->sortkey;
-}
-
-int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, int flags)
-{
-	int cnt = 0, i, j;
-
-	*canon = 0;
-	if (name) {
-		/* reject empty name and check len so it fits into temp bufs */
-		size_t l = strnlen(name, 255);
-		if (l-1 >= 254)
-			return EAI_NONAME;
-		memcpy(canon, name, l+1);
-	}
-
-	/* Procedurally, a request for v6 addresses with the v4-mapped
-	 * flag set is like a request for unspecified family, followed
-	 * by filtering of the results. */
-	if (flags & AI_V4MAPPED) {
-		if (family == AF_INET6) family = AF_UNSPEC;
-		else flags -= AI_V4MAPPED;
-	}
-
-	/* Try each backend until there's at least one result. */
-	cnt = name_from_null(buf, name, family, flags);
-	if (!cnt) cnt = name_from_numeric(buf, name, family);
-	if (!cnt && !(flags & AI_NUMERICHOST)) {
-		cnt = name_from_hosts(buf, canon, name, family);
-		if (!cnt) cnt = name_from_dns(buf, canon, name, family);
-	}
-	if (cnt<=0) return cnt ? cnt : EAI_NONAME;
-
-	/* Filter/transform results for v4-mapped lookup, if requested. */
-	if (flags & AI_V4MAPPED) {
-		if (!(flags & AI_ALL)) {
-			/* If any v6 results exist, remove v4 results. */
-			for (i=0; i<cnt && buf[i].family != AF_INET6; i++);
-			if (i<cnt) {
-				for (j=0; i<cnt; i++) {
-					if (buf[i].family == AF_INET6)
-						buf[j++] = buf[i];
-				}
-				cnt = i = j;
-			}
-		}
-		/* Translate any remaining v4 results to v6 */
-		for (i=0; i<cnt; i++) {
-			if (buf[i].family != AF_INET) continue;
-			memcpy(buf[i].addr+12, buf[i].addr, 4);
-			memcpy(buf[i].addr, "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
-			buf[i].family = AF_INET6;
-		}
-	}
-
-	/* No further processing is needed if there are fewer than 2
-	 * results or if there are only IPv4 results. */
-	if (cnt<2 || family==AF_INET) return cnt;
-	for (i=0; buf[i].family == AF_INET; i++)
-		if (i==cnt) return cnt;
-
-	int cs;
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-
-	/* The following implements a subset of RFC 3484/6724 destination
-	 * address selection by generating a single 31-bit sort key for
-	 * each address. Rules 3, 4, and 7 are omitted for having
-	 * excessive runtime and code size cost and dubious benefit.
-	 * So far the label/precedence table cannot be customized. */
-	for (i=0; i<cnt; i++) {
-		int key = 0;
-		struct sockaddr_in6 sa, da = {
-			.sin6_family = AF_INET6,
-			.sin6_scope_id = buf[i].scopeid,
-			.sin6_port = 65535
-		};
-		if (buf[i].family == AF_INET6) {
-			memcpy(da.sin6_addr.s6_addr, buf[i].addr, 16);
-		} else {
-			memcpy(da.sin6_addr.s6_addr,
-				"\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
-			memcpy(da.sin6_addr.s6_addr+12, buf[i].addr, 4);
-		}
-		const struct policy *dpolicy = policyof(&da.sin6_addr);
-		int dscope = scopeof(&da.sin6_addr);
-		int dlabel = dpolicy->label;
-		int dprec = dpolicy->prec;
-		int prefixlen = 0;
-		int fd = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP);
-		if (fd >= 0) {
-			if (!connect(fd, (void *)&da, sizeof da)) {
-				key |= DAS_USABLE;
-				if (!getsockname(fd, (void *)&sa,
-				    &(socklen_t){sizeof sa})) {
-					if (dscope == scopeof(&sa.sin6_addr))
-						key |= DAS_MATCHINGSCOPE;
-					if (dlabel == labelof(&sa.sin6_addr))
-						key |= DAS_MATCHINGLABEL;
-					prefixlen = prefixmatch(&sa.sin6_addr,
-						&da.sin6_addr);
-				}
-			}
-			close(fd);
-		}
-		key |= dprec << DAS_PREC_SHIFT;
-		key |= (15-dscope) << DAS_SCOPE_SHIFT;
-		key |= prefixlen << DAS_PREFIX_SHIFT;
-		key |= (MAXADDRS-i) << DAS_ORDER_SHIFT;
-		buf[i].sortkey = key;
-	}
-	qsort(buf, cnt, sizeof *buf, addrcmp);
-
-	pthread_setcancelstate(cs, 0);
-
-	return cnt;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/recvmmsg.c b/src/components/lib/libc/musl-1.1.11/src/network/recvmmsg.c
deleted file mode 100644
index 58b1b2f635..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/recvmmsg.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#define _GNU_SOURCE
-#include <sys/socket.h>
-#include <limits.h>
-#include "syscall.h"
-
-int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags, struct timespec *timeout)
-{
-#if LONG_MAX > INT_MAX
-	struct mmsghdr *mh = msgvec;
-	unsigned int i;
-	for (i = vlen; i; i--, mh++)
-		mh->msg_hdr.__pad1 = mh->msg_hdr.__pad2 = 0;
-#endif
-	return syscall_cp(SYS_recvmmsg, fd, msgvec, vlen, flags, timeout);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/recvmsg.c b/src/components/lib/libc/musl-1.1.11/src/network/recvmsg.c
deleted file mode 100644
index 4f52665918..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/recvmsg.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <sys/socket.h>
-#include <limits.h>
-#include "syscall.h"
-#include "libc.h"
-
-ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
-{
-	ssize_t r;
-#if LONG_MAX > INT_MAX
-	struct msghdr h, *orig = msg;
-	if (msg) {
-		h = *msg;
-		h.__pad1 = h.__pad2 = 0;
-		msg = &h;
-	}
-#endif
-	r = socketcall_cp(recvmsg, fd, msg, flags, 0, 0, 0);
-#if LONG_MAX > INT_MAX
-	if (orig) *orig = h;
-#endif
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/res_msend.c b/src/components/lib/libc/musl-1.1.11/src/network/res_msend.c
deleted file mode 100644
index 35f106dd40..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/res_msend.c
+++ /dev/null
@@ -1,209 +0,0 @@
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <stdint.h>
-#include <string.h>
-#include <poll.h>
-#include <time.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <errno.h>
-#include <pthread.h>
-#include "stdio_impl.h"
-#include "syscall.h"
-#include "lookup.h"
-
-static void cleanup(void *p)
-{
-	__syscall(SYS_close, (intptr_t)p);
-}
-
-static unsigned long mtime()
-{
-	struct timespec ts;
-	clock_gettime(CLOCK_REALTIME, &ts);
-	return (unsigned long)ts.tv_sec * 1000
-		+ ts.tv_nsec / 1000000;
-}
-
-int __res_msend(int nqueries, const unsigned char *const *queries,
-	const int *qlens, unsigned char *const *answers, int *alens, int asize)
-{
-	int fd;
-	FILE *f, _f;
-	unsigned char _buf[256];
-	char line[64], *s, *z;
-	int timeout = 5000, attempts = 2, retry_interval, servfail_retry;
-	union {
-		struct sockaddr_in sin;
-		struct sockaddr_in6 sin6;
-	} sa = {0}, ns[3] = {{0}};
-	socklen_t sl = sizeof sa.sin;
-	int nns = 0;
-	int family = AF_INET;
-	int rlen;
-	int next;
-	int i, j;
-	int cs;
-	struct pollfd pfd;
-	unsigned long t0, t1, t2;
-	struct address iplit;
-
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-
-	/* Get nameservers from resolv.conf, fallback to localhost */
-	f = __fopen_rb_ca("/etc/resolv.conf", &_f, _buf, sizeof _buf);
-	if (f) for (nns=0; nns<3 && fgets(line, sizeof line, f); ) {
-		if (!strncmp(line, "options", 7) && isspace(line[7])) {
-			unsigned long x;
-			char *p, *z;
-			p = strstr(line, "timeout:");
-			if (p && isdigit(p[8])) {
-				p += 8;
-				x = strtoul(p, &z, 10);
-				if (z != p) timeout = x < 30 ? x*1000 : 30000;
-			}
-			p = strstr(line, "attempts:");
-			if (p && isdigit(p[9])) {
-				p += 9;
-				x = strtoul(p, &z, 10);
-				if (z != p) attempts = x < 10 ? x : 10;
-				if (!attempts) attempts = 1;
-			}
-		}
-		if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
-			continue;
-		for (s=line+11; isspace(*s); s++);
-		for (z=s; *z && !isspace(*z); z++);
-		*z=0;
-
-		if (__lookup_ipliteral(&iplit, s, AF_UNSPEC)>0) {
-			if (iplit.family == AF_INET) {
-				memcpy(&ns[nns].sin.sin_addr, iplit.addr, 4);
-				ns[nns].sin.sin_port = htons(53);
-				ns[nns++].sin.sin_family = AF_INET;
-			} else {
-				sl = sizeof sa.sin6;
-				memcpy(&ns[nns].sin6.sin6_addr, iplit.addr, 16);
-				ns[nns].sin6.sin6_port = htons(53);
-				ns[nns].sin6.sin6_scope_id = iplit.scopeid;
-				ns[nns++].sin6.sin6_family = family = AF_INET6;
-			}
-		}
-	}
-	if (f) __fclose_ca(f);
-	if (!nns) {
-		ns[0].sin.sin_family = AF_INET;
-		ns[0].sin.sin_port = htons(53);
-		ns[0].sin.sin_addr.s_addr = htonl(0x7f000001);
-		nns=1;
-	}
-
-	/* Get local address and open/bind a socket */
-	sa.sin.sin_family = family;
-	fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-
-	/* Handle case where system lacks IPv6 support */
-	if (fd < 0 && family == AF_INET6 && errno == EAFNOSUPPORT) {
-		fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-		family = AF_INET;
-	}
-	if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) return -1;
-
-	/* Past this point, there are no errors. Each individual query will
-	 * yield either no reply (indicated by zero length) or an answer
-	 * packet which is up to the caller to interpret. */
-
-	pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
-	pthread_setcancelstate(cs, 0);
-
-	/* Convert any IPv4 addresses in a mixed environment to v4-mapped */
-	if (family == AF_INET6) {
-		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &(int){0}, sizeof 0);
-		for (i=0; i<nns; i++) {
-			if (ns[i].sin.sin_family != AF_INET) continue;
-			memcpy(ns[i].sin6.sin6_addr.s6_addr+12,
-				&ns[i].sin.sin_addr, 4);
-			memcpy(ns[i].sin6.sin6_addr.s6_addr,
-				"\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
-			ns[i].sin6.sin6_family = AF_INET6;
-			ns[i].sin6.sin6_flowinfo = 0;
-			ns[i].sin6.sin6_scope_id = 0;
-		}
-	}
-
-	memset(alens, 0, sizeof *alens * nqueries);
-
-	pfd.fd = fd;
-	pfd.events = POLLIN;
-	retry_interval = timeout / attempts;
-	next = 0;
-	t0 = t2 = mtime();
-	t1 = t2 - retry_interval;
-
-	for (; t2-t0 < timeout; t2=mtime()) {
-		if (t2-t1 >= retry_interval) {
-			/* Query all configured namservers in parallel */
-			for (i=0; i<nqueries; i++)
-				if (!alens[i])
-					for (j=0; j<nns; j++)
-						sendto(fd, queries[i],
-							qlens[i], MSG_NOSIGNAL,
-							(void *)&ns[j], sl);
-			t1 = t2;
-			servfail_retry = 2 * nqueries;
-		}
-
-		/* Wait for a response, or until time to retry */
-		if (poll(&pfd, 1, t1+retry_interval-t2) <= 0) continue;
-
-		while ((rlen = recvfrom(fd, answers[next], asize, 0,
-		  (void *)&sa, (socklen_t[1]){sl})) >= 0) {
-
-			/* Ignore non-identifiable packets */
-			if (rlen < 4) continue;
-
-			/* Ignore replies from addresses we didn't send to */
-			for (j=0; j<nns && memcmp(ns+j, &sa, sl); j++);
-			if (j==nns) continue;
-
-			/* Find which query this answer goes with, if any */
-			for (i=next; i<nqueries && (
-				answers[next][0] != queries[i][0] ||
-				answers[next][1] != queries[i][1] ); i++);
-			if (i==nqueries) continue;
-			if (alens[i]) continue;
-
-			/* Only accept positive or negative responses;
-			 * retry immediately on server failure, and ignore
-			 * all other codes such as refusal. */
-			switch (answers[next][3] & 15) {
-			case 0:
-			case 3:
-				break;
-			case 2:
-				if (servfail_retry && servfail_retry--)
-					sendto(fd, queries[i],
-						qlens[i], MSG_NOSIGNAL,
-						(void *)&ns[j], sl);
-			default:
-				continue;
-			}
-
-			/* Store answer in the right slot, or update next
-			 * available temp slot if it's already in place. */
-			alens[i] = rlen;
-			if (i == next)
-				for (; next<nqueries && alens[next]; next++);
-			else
-				memcpy(answers[i], answers[next], rlen);
-
-			if (next == nqueries) goto out;
-		}
-	}
-out:
-	pthread_cleanup_pop(1);
-
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/res_query.c b/src/components/lib/libc/musl-1.1.11/src/network/res_query.c
deleted file mode 100644
index 2b4e4bb1be..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/res_query.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <resolv.h>
-#include <netdb.h>
-#include "libc.h"
-
-int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
-int __res_send(const unsigned char *, int, unsigned char *, int);
-
-int __res_query(const char *name, int class, int type, unsigned char *dest, int len)
-{
-	unsigned char q[280];
-	int ql = __res_mkquery(0, name, class, type, 0, 0, 0, q, sizeof q);
-	if (ql < 0) return ql;
-	return __res_send(q, ql, dest, len);
-}
-
-weak_alias(__res_query, res_query);
-weak_alias(__res_query, res_search);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/res_send.c b/src/components/lib/libc/musl-1.1.11/src/network/res_send.c
deleted file mode 100644
index 19cfe0f6b4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/res_send.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <resolv.h>
-#include "libc.h"
-
-int __res_msend(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int);
-
-int __res_send(const unsigned char *msg, int msglen, unsigned char *answer, int anslen)
-{
-	int r = __res_msend(1, &msg, &msglen, &answer, &anslen, anslen);
-	return r<0 ? r : anslen;
-}
-
-weak_alias(__res_send, res_send);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/setsockopt.c b/src/components/lib/libc/musl-1.1.11/src/network/setsockopt.c
deleted file mode 100644
index c960c9ca7d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/network/setsockopt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sys/socket.h>
-#include "syscall.h"
-
-int setsockopt(int fd, int level, int optname, const void *optval, socklen_t optlen)
-{
-	return socketcall(setsockopt, fd, level, optname, optval, optlen, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/pwf.h b/src/components/lib/libc/musl-1.1.11/src/passwd/pwf.h
deleted file mode 100644
index fc63db21a2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/pwf.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <pwd.h>
-#include <grp.h>
-#include <shadow.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdint.h>
-#include <string.h>
-#include <limits.h>
-#include "libc.h"
-
-int __getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size, struct passwd **res);
-int __getpw_a(const char *name, uid_t uid, struct passwd *pw, char **buf, size_t *size, struct passwd **res);
-int __getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem, struct group **res);
-int __getgr_a(const char *name, gid_t gid, struct group *gr, char **buf, size_t *size, char ***mem, size_t *nmem, struct group **res);
-int __parsespent(char *s, struct spwd *sp);
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/drand48.c b/src/components/lib/libc/musl-1.1.11/src/prng/drand48.c
deleted file mode 100644
index d808353c98..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/prng/drand48.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <stdlib.h>
-#include <inttypes.h>
-
-uint64_t __rand48_step(unsigned short *xi, unsigned short *lc);
-extern unsigned short __seed48[7];
-
-double erand48(unsigned short s[3])
-{
-	union {
-		uint64_t u;
-		double f;
-	} x = { 0x3ff0000000000000ULL | __rand48_step(s, __seed48+3)<<4 };
-	return x.f - 1.0;
-}
-
-double drand48(void)
-{
-	return erand48(__seed48);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/lrand48.c b/src/components/lib/libc/musl-1.1.11/src/prng/lrand48.c
deleted file mode 100644
index a3c4e4e2b2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/prng/lrand48.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdlib.h>
-#include <inttypes.h>
-
-uint64_t __rand48_step(unsigned short *xi, unsigned short *lc);
-extern unsigned short __seed48[7];
-
-long nrand48(unsigned short s[3])
-{
-	return __rand48_step(s, __seed48+3) >> 17;
-}
-
-long lrand48(void)
-{
-	return nrand48(__seed48);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/mrand48.c b/src/components/lib/libc/musl-1.1.11/src/prng/mrand48.c
deleted file mode 100644
index ee650fc3e6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/prng/mrand48.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdlib.h>
-#include <inttypes.h>
-
-uint64_t __rand48_step(unsigned short *xi, unsigned short *lc);
-extern unsigned short __seed48[7];
-
-long jrand48(unsigned short s[3])
-{
-	return __rand48_step(s, __seed48+3) >> 16;
-}
-
-long mrand48(void)
-{
-	return jrand48(__seed48);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/fexecve.c b/src/components/lib/libc/musl-1.1.11/src/process/fexecve.c
deleted file mode 100644
index 6507b42949..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/process/fexecve.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <unistd.h>
-#include <errno.h>
-
-void __procfdname(char *, unsigned);
-
-int fexecve(int fd, char *const argv[], char *const envp[])
-{
-	char buf[15 + 3*sizeof(int)];
-	__procfdname(buf, fd);
-	execve(buf, argv, envp);
-	if (errno == ENOENT) errno = EBADF;
-	return -1;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/i386/vfork.s b/src/components/lib/libc/musl-1.1.11/src/process/i386/vfork.s
deleted file mode 100644
index fadca20731..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/process/i386/vfork.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
-.type vfork,@function
-__vfork:
-vfork:
-	pop %edx
-	mov $190,%eax
-	int $128
-	push %edx
-	push %eax
-	call __syscall_ret
-	pop %edx
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setflags.c b/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setflags.c
deleted file mode 100644
index f750c040bc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setflags.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <spawn.h>
-
-int posix_spawnattr_setflags(posix_spawnattr_t *attr, short flags)
-{
-	attr->__flags = flags;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnp.c b/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnp.c
deleted file mode 100644
index 37360001d2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <spawn.h>
-#include <unistd.h>
-
-int __execvpe(const char *, char *const *, char *const *);
-
-int __posix_spawnx(pid_t *restrict, const char *restrict,
-	int (*)(const char *, char *const *, char *const *),
-	const posix_spawn_file_actions_t *,
-	const posix_spawnattr_t *restrict, char *const *restrict, char *const *restrict);
-
-int posix_spawnp(pid_t *restrict res, const char *restrict file,
-	const posix_spawn_file_actions_t *fa,
-	const posix_spawnattr_t *restrict attr,
-	char *const argv[restrict], char *const envp[restrict])
-{
-	return __posix_spawnx(res, file, __execvpe, fa, attr, argv, envp);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/sh/vfork.s b/src/components/lib/libc/musl-1.1.11/src/process/sh/vfork.s
deleted file mode 100644
index 48cc9396fa..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/process/sh/vfork.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
-.type vfork,@function
-__vfork:
-vfork:
-	mov #95, r3
-	add r3, r3
-
-	trapa #31
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-
-	mov r0, r4
-	mov.l 1f, r0
-2:	braf r0
-	 nop
-	.align 2
-	.hidden __syscall_ret
-1:	.long __syscall_ret@PLT-(2b+4-.)
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/x32/vfork.s b/src/components/lib/libc/musl-1.1.11/src/process/x32/vfork.s
deleted file mode 100644
index 1039f0f2f1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/process/x32/vfork.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
-.type vfork,@function
-__vfork:
-vfork:
-	pop %rdx
-	mov $0x4000003a,%eax /* SYS_vfork */
-	syscall
-	push %rdx
-	mov %rax,%rdi
-	jmp __syscall_ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/x86_64/vfork.s b/src/components/lib/libc/musl-1.1.11/src/process/x86_64/vfork.s
deleted file mode 100644
index 27af46f5d6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/process/x86_64/vfork.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
-.type vfork,@function
-__vfork:
-vfork:
-	pop %rdx
-	mov $58,%eax
-	syscall
-	push %rdx
-	mov %rax,%rdi
-	jmp __syscall_ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/regex/glob.c b/src/components/lib/libc/musl-1.1.11/src/regex/glob.c
deleted file mode 100644
index 6affee040c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/regex/glob.c
+++ /dev/null
@@ -1,238 +0,0 @@
-#include <glob.h>
-#include <fnmatch.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stddef.h>
-#include "libc.h"
-
-struct match
-{
-	struct match *next;
-	char name[1];
-};
-
-static int is_literal(const char *p, int useesc)
-{
-	int bracket = 0;
-	for (; *p; p++) {
-		switch (*p) {
-		case '\\':
-			if (!useesc) break;
-		case '?':
-		case '*':
-			return 0;
-		case '[':
-			bracket = 1;
-			break;
-		case ']':
-			if (bracket) return 0;
-			break;
-		}
-	}
-	return 1;
-}
-
-static int append(struct match **tail, const char *name, size_t len, int mark)
-{
-	struct match *new = malloc(sizeof(struct match) + len + 1);
-	if (!new) return -1;
-	(*tail)->next = new;
-	new->next = NULL;
-	strcpy(new->name, name);
-	if (mark) strcat(new->name, "/");
-	*tail = new;
-	return 0;
-}
-
-static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail)
-{
-	DIR *dir;
-	struct dirent de_buf, *de;
-	char pat[strlen(p)+1];
-	char *p2;
-	size_t l = strlen(d);
-	int literal;
-	int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
-		| ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0);
-	int error;
-
-	if ((p2 = strchr(p, '/'))) {
-		strcpy(pat, p);
-		pat[p2-p] = 0;
-		for (; *p2 == '/'; p2++);
-		p = pat;
-	}
-	literal = is_literal(p, !(flags & GLOB_NOESCAPE));
-	if (*d == '/' && !*(d+1)) l = 0;
-
-	/* rely on opendir failing for nondirectory objects */
-	dir = opendir(*d ? d : ".");
-	error = errno;
-	if (!dir) {
-		/* this is not an error -- we let opendir call stat for us */
-		if (error == ENOTDIR) return 0;
-		if (error == EACCES && !*p) {
-			struct stat st;
-			if (!stat(d, &st) && S_ISDIR(st.st_mode)) {
-				if (append(tail, d, l, l))
-					return GLOB_NOSPACE;
-				return 0;
-			}
-		}
-		if (errfunc(d, error) || (flags & GLOB_ERR))
-			return GLOB_ABORTED;
-		return 0;
-	}
-	if (!*p) {
-		error = append(tail, d, l, l) ? GLOB_NOSPACE : 0;
-		closedir(dir);
-		return error;
-	}
-	while (!(error = readdir_r(dir, &de_buf, &de)) && de) {
-		char namebuf[l+de->d_reclen+2], *name = namebuf;
-		if (!literal && fnmatch(p, de->d_name, fnm_flags))
-			continue;
-		if (literal && strcmp(p, de->d_name))
-			continue;
-		if (p2 && de->d_type && !S_ISDIR(de->d_type<<12) && !S_ISLNK(de->d_type<<12))
-			continue;
-		if (*d) {
-			memcpy(name, d, l);
-			name[l] = '/';
-			strcpy(name+l+1, de->d_name);
-		} else {
-			name = de->d_name;
-		}
-		if (p2) {
-			if ((error = match_in_dir(name, p2, flags, errfunc, tail))) {
-				closedir(dir);
-				return error;
-			}
-		} else {
-			int mark = 0;
-			if (flags & GLOB_MARK) {
-				if (de->d_type && !S_ISLNK(de->d_type<<12))
-					mark = S_ISDIR(de->d_type<<12);
-				else {
-					struct stat st;
-					stat(name, &st);
-					mark = S_ISDIR(st.st_mode);
-				}
-			}
-			if (append(tail, name, l+de->d_reclen+1, mark)) {
-				closedir(dir);
-				return GLOB_NOSPACE;
-			}
-		}
-	}
-	closedir(dir);
-	if (error && (errfunc(d, error) || (flags & GLOB_ERR)))
-		return GLOB_ABORTED;
-	return 0;
-}
-
-static int ignore_err(const char *path, int err)
-{
-	return 0;
-}
-
-static void freelist(struct match *head)
-{
-	struct match *match, *next;
-	for (match=head->next; match; match=next) {
-		next = match->next;
-		free(match);
-	}
-}
-
-static int sort(const void *a, const void *b)
-{
-	return strcmp(*(const char **)a, *(const char **)b);
-}
-
-int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, int err), glob_t *restrict g)
-{
-	const char *p=pat, *d;
-	struct match head = { .next = NULL }, *tail = &head;
-	size_t cnt, i;
-	size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0;
-	int error = 0;
-	
-	if (*p == '/') {
-		for (; *p == '/'; p++);
-		d = "/";
-	} else {
-		d = "";
-	}
-
-	if (strlen(p) > PATH_MAX) return GLOB_NOSPACE;
-
-	if (!errfunc) errfunc = ignore_err;
-
-	if (!(flags & GLOB_APPEND)) {
-		g->gl_offs = offs;
-		g->gl_pathc = 0;
-		g->gl_pathv = NULL;
-	}
-
-	if (*p) error = match_in_dir(d, p, flags, errfunc, &tail);
-	if (error == GLOB_NOSPACE) {
-		freelist(&head);
-		return error;
-	}
-	
-	for (cnt=0, tail=head.next; tail; tail=tail->next, cnt++);
-	if (!cnt) {
-		if (flags & GLOB_NOCHECK) {
-			tail = &head;
-			if (append(&tail, pat, strlen(pat), 0))
-				return GLOB_NOSPACE;
-			cnt++;
-		} else
-			return GLOB_NOMATCH;
-	}
-
-	if (flags & GLOB_APPEND) {
-		char **pathv = realloc(g->gl_pathv, (offs + g->gl_pathc + cnt + 1) * sizeof(char *));
-		if (!pathv) {
-			freelist(&head);
-			return GLOB_NOSPACE;
-		}
-		g->gl_pathv = pathv;
-		offs += g->gl_pathc;
-	} else {
-		g->gl_pathv = malloc((offs + cnt + 1) * sizeof(char *));
-		if (!g->gl_pathv) {
-			freelist(&head);
-			return GLOB_NOSPACE;
-		}
-		for (i=0; i<offs; i++)
-			g->gl_pathv[i] = NULL;
-	}
-	for (i=0, tail=head.next; i<cnt; tail=tail->next, i++)
-		g->gl_pathv[offs + i] = tail->name;
-	g->gl_pathv[offs + i] = NULL;
-	g->gl_pathc += cnt;
-
-	if (!(flags & GLOB_NOSORT))
-		qsort(g->gl_pathv+offs, cnt, sizeof(char *), sort);
-	
-	return error;
-}
-
-void globfree(glob_t *g)
-{
-	size_t i;
-	for (i=0; i<g->gl_pathc; i++)
-		free(g->gl_pathv[g->gl_offs + i] - offsetof(struct match, name));
-	free(g->gl_pathv);
-	g->gl_pathc = 0;
-	g->gl_pathv = NULL;
-}
-
-LFS64(glob);
-LFS64(globfree);
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_rr_get_interval.c b/src/components/lib/libc/musl-1.1.11/src/sched/sched_rr_get_interval.c
deleted file mode 100644
index 4b01028f5d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/sched/sched_rr_get_interval.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sched.h>
-#include "syscall.h"
-
-int sched_rr_get_interval(pid_t pid, struct timespec *ts)
-{
-	return syscall(SYS_sched_rr_get_interval, pid, ts);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/search/tdestroy.c b/src/components/lib/libc/musl-1.1.11/src/search/tdestroy.c
deleted file mode 100644
index 5f9e197dcd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/search/tdestroy.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <search.h>
-
-struct node {
-	void *key;
-	struct node *left;
-	struct node *right;
-};
-
-void tdestroy(void *root, void (*freekey)(void *))
-{
-	struct node *r = root;
-
-	if (r == 0)
-		return;
-	tdestroy(r->left, freekey);
-	tdestroy(r->right, freekey);
-	if (freekey) freekey(r->key);
-	free(r);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/search/tsearch_avl.c b/src/components/lib/libc/musl-1.1.11/src/search/tsearch_avl.c
deleted file mode 100644
index 86200928ef..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/search/tsearch_avl.c
+++ /dev/null
@@ -1,185 +0,0 @@
-#include <stdlib.h>
-#include <search.h>
-
-/*
-avl tree implementation using recursive functions
-the height of an n node tree is less than 1.44*log2(n+2)-1
-(so the max recursion depth in case of a tree with 2^32 nodes is 45)
-*/
-
-struct node {
-	const void *key;
-	struct node *left;
-	struct node *right;
-	int height;
-};
-
-static int delta(struct node *n) {
-	return (n->left ? n->left->height:0) - (n->right ? n->right->height:0);
-}
-
-static void updateheight(struct node *n) {
-	n->height = 0;
-	if (n->left && n->left->height > n->height)
-		n->height = n->left->height;
-	if (n->right && n->right->height > n->height)
-		n->height = n->right->height;
-	n->height++;
-}
-
-static struct node *rotl(struct node *n) {
-	struct node *r = n->right;
-	n->right = r->left;
-	r->left = n;
-	updateheight(n);
-	updateheight(r);
-	return r;
-}
-
-static struct node *rotr(struct node *n) {
-	struct node *l = n->left;
-	n->left = l->right;
-	l->right = n;
-	updateheight(n);
-	updateheight(l);
-	return l;
-}
-
-static struct node *balance(struct node *n) {
-	int d = delta(n);
-
-	if (d < -1) {
-		if (delta(n->right) > 0)
-			n->right = rotr(n->right);
-		return rotl(n);
-	} else if (d > 1) {
-		if (delta(n->left) < 0)
-			n->left = rotl(n->left);
-		return rotr(n);
-	}
-	updateheight(n);
-	return n;
-}
-
-static struct node *find(struct node *n, const void *k,
-	int (*cmp)(const void *, const void *))
-{
-	int c;
-
-	if (!n)
-		return 0;
-	c = cmp(k, n->key);
-	if (c == 0)
-		return n;
-	if (c < 0)
-		return find(n->left, k, cmp);
-	else
-		return find(n->right, k, cmp);
-}
-
-static struct node *insert(struct node **n, const void *k,
-	int (*cmp)(const void *, const void *), int *new)
-{
-	struct node *r = *n;
-	int c;
-
-	if (!r) {
-		*n = r = malloc(sizeof **n);
-		if (r) {
-			r->key = k;
-			r->left = r->right = 0;
-			r->height = 1;
-		}
-		*new = 1;
-		return r;
-	}
-	c = cmp(k, r->key);
-	if (c == 0)
-		return r;
-	if (c < 0)
-		r = insert(&r->left, k, cmp, new);
-	else
-		r = insert(&r->right, k, cmp, new);
-	if (*new)
-		*n = balance(*n);
-	return r;
-}
-
-static struct node *movr(struct node *n, struct node *r) {
-	if (!n)
-		return r;
-	n->right = movr(n->right, r);
-	return balance(n);
-}
-
-static struct node *remove(struct node **n, const void *k,
-	int (*cmp)(const void *, const void *), struct node *parent)
-{
-	int c;
-
-	if (!*n)
-		return 0;
-	c = cmp(k, (*n)->key);
-	if (c == 0) {
-		struct node *r = *n;
-		*n = movr(r->left, r->right);
-		free(r);
-		return parent;
-	}
-	if (c < 0)
-		parent = remove(&(*n)->left, k, cmp, *n);
-	else
-		parent = remove(&(*n)->right, k, cmp, *n);
-	if (parent)
-		*n = balance(*n);
-	return parent;
-}
-
-void *tdelete(const void *restrict key, void **restrict rootp,
-	int(*compar)(const void *, const void *))
-{
-	struct node *n = *rootp;
-	struct node *ret;
-	/* last argument is arbitrary non-null pointer
-	   which is returned when the root node is deleted */
-	ret = remove(&n, key, compar, n);
-	*rootp = n;
-	return ret;
-}
-
-void *tfind(const void *key, void *const *rootp,
-	int(*compar)(const void *, const void *))
-{
-	return find(*rootp, key, compar);
-}
-
-void *tsearch(const void *key, void **rootp,
-	int (*compar)(const void *, const void *))
-{
-	int new = 0;
-	struct node *n = *rootp;
-	struct node *ret;
-	ret = insert(&n, key, compar, &new);
-	*rootp = n;
-	return ret;
-}
-
-static void walk(const struct node *r, void (*action)(const void *, VISIT, int), int d)
-{
-	if (r == 0)
-		return;
-	if (r->left == 0 && r->right == 0)
-		action(r, leaf, d);
-	else {
-		action(r, preorder, d);
-		walk(r->left, action, d+1);
-		action(r, postorder, d);
-		walk(r->right, action, d+1);
-		action(r, endorder, d);
-	}
-}
-
-void twalk(const void *root, void (*action)(const void *, VISIT, int))
-{
-	walk(root, action, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/select/pselect.c b/src/components/lib/libc/musl-1.1.11/src/select/pselect.c
deleted file mode 100644
index 4e2d7b073d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/select/pselect.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <sys/select.h>
-#include <signal.h>
-#include <stdint.h>
-#include "syscall.h"
-#include "libc.h"
-
-int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask)
-{
-	syscall_arg_t data[2] = { (uintptr_t)mask, _NSIG/8 };
-	struct timespec ts_tmp;
-	if (ts) ts_tmp = *ts;
-	return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, ts ? &ts_tmp : 0, data);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/select/select.c b/src/components/lib/libc/musl-1.1.11/src/select/select.c
deleted file mode 100644
index 7b5f6dcf7a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/select/select.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <sys/select.h>
-#include <signal.h>
-#include <stdint.h>
-#include <errno.h>
-#include "syscall.h"
-#include "libc.h"
-
-int select(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, struct timeval *restrict tv)
-{
-#ifdef SYS_select
-	return syscall_cp(SYS_select, n, rfds, wfds, efds, tv);
-#else
-	syscall_arg_t data[2] = { 0, _NSIG/8 };
-	struct timespec ts;
-	if (tv) {
-		if (tv->tv_sec < 0 || tv->tv_usec < 0)
-			return __syscall_ret(-EINVAL);
-		time_t extra_secs = tv->tv_usec / 1000000;
-		ts.tv_nsec = tv->tv_usec % 1000000 * 1000;
-		const time_t max_time = (1ULL<<8*sizeof(time_t)-1)-1;
-		ts.tv_sec = extra_secs > max_time - tv->tv_sec ?
-			max_time : tv->tv_sec + extra_secs;
-	}
-	return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, tv ? &ts : 0, data);
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/arm/longjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/arm/longjmp.s
deleted file mode 100644
index c3d15ae223..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/arm/longjmp.s
+++ /dev/null
@@ -1,37 +0,0 @@
-.global _longjmp
-.global longjmp
-.type _longjmp,%function
-.type longjmp,%function
-_longjmp:
-longjmp:
-	mov ip,r0
-	movs r0,r1
-	moveq r0,#1
-	ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp,sp,lr}
-
-	adr r1,1f
-	ldr r2,1f
-	ldr r1,[r1,r2]
-
-	tst r1,#0x260
-	beq 3f
-	tst r1,#0x20
-	beq 2f
-	ldc p2, cr4, [ip], #48
-2:	tst r1,#0x40
-	beq 2f
-	.word 0xecbc8b10 /* vldmia ip!, {d8-d15} */
-2:	tst r1,#0x200
-	beq 3f
-	ldcl p1, cr10, [ip], #8
-	ldcl p1, cr11, [ip], #8
-	ldcl p1, cr12, [ip], #8
-	ldcl p1, cr13, [ip], #8
-	ldcl p1, cr14, [ip], #8
-	ldcl p1, cr15, [ip], #8
-3:	tst lr,#1
-	moveq pc,lr
-	bx lr
-
-.hidden __hwcap
-1:	.word __hwcap-1b
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/arm/setjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/arm/setjmp.s
deleted file mode 100644
index 19f8abc014..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/arm/setjmp.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.global __setjmp
-.global _setjmp
-.global setjmp
-.type __setjmp,%function
-.type _setjmp,%function
-.type setjmp,%function
-__setjmp:
-_setjmp:
-setjmp:
-	mov ip,r0
-	stmia ip!,{v1,v2,v3,v4,v5,v6,sl,fp,sp,lr}
-	mov r0,#0
-
-	adr r1,1f
-	ldr r2,1f
-	ldr r1,[r1,r2]
-
-	tst r1,#0x260
-	beq 3f
-	tst r1,#0x20
-	beq 2f
-	stc p2, cr4, [ip], #48
-2:	tst r1,#0x40
-	beq 2f
-	.word 0xecac8b10 /* vstmia ip!, {d8-d15} */
-2:	tst r1,#0x200
-	beq 3f
-	stcl p1, cr10, [ip], #8
-	stcl p1, cr11, [ip], #8
-	stcl p1, cr12, [ip], #8
-	stcl p1, cr13, [ip], #8
-	stcl p1, cr14, [ip], #8
-	stcl p1, cr15, [ip], #8
-3:	tst lr,#1
-	moveq pc,lr
-	bx lr
-
-.hidden __hwcap
-1:	.word __hwcap-1b
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/longjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/longjmp.s
deleted file mode 100644
index 8e7696759c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/longjmp.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noreorder
-
-.global _longjmp
-.global longjmp
-.type   _longjmp,@function
-.type   longjmp,@function
-_longjmp:
-longjmp:
-	move    $2, $5
-	bne     $2, $0, 1f
-	nop
-	addu    $2, $2, 1
-1:	lw      $ra,  0($4)
-	lw      $sp,  4($4)
-	lw      $16,  8($4)
-	lw      $17, 12($4)
-	lw      $18, 16($4)
-	lw      $19, 20($4)
-	lw      $20, 24($4)
-	lw      $21, 28($4)
-	lw      $22, 32($4)
-	lw      $23, 36($4)
-	lw      $30, 40($4)
-	jr      $ra
-	lw      $28, 44($4)
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/longjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/longjmp.sub
deleted file mode 100644
index e80331b654..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/longjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/setjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/setjmp.s
deleted file mode 100644
index 38ed5e00d6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/setjmp.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noreorder
-
-.global __setjmp
-.global _setjmp
-.global setjmp
-.type   __setjmp,@function
-.type   _setjmp,@function
-.type   setjmp,@function
-__setjmp:
-_setjmp:
-setjmp:
-	sw      $ra,  0($4)
-	sw      $sp,  4($4)
-	sw      $16,  8($4)
-	sw      $17, 12($4)
-	sw      $18, 16($4)
-	sw      $19, 20($4)
-	sw      $20, 24($4)
-	sw      $21, 28($4)
-	sw      $22, 32($4)
-	sw      $23, 36($4)
-	sw      $30, 40($4)
-	sw      $28, 44($4)
-	jr      $ra
-	li      $2, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/setjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/setjmp.sub
deleted file mode 100644
index b7ad221051..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips-sf/setjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-setjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips/longjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/mips/longjmp.s
deleted file mode 100644
index a972d67788..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips/longjmp.s
+++ /dev/null
@@ -1,37 +0,0 @@
-.set noreorder
-
-.global _longjmp
-.global longjmp
-.type   _longjmp,@function
-.type   longjmp,@function
-_longjmp:
-longjmp:
-	move    $2, $5
-	bne     $2, $0, 1f
-	nop
-	addu    $2, $2, 1
-1:	lwc1    $20, 56($4)
-	lwc1    $21, 60($4)
-	lwc1    $22, 64($4)
-	lwc1    $23, 68($4)
-	lwc1    $24, 72($4)
-	lwc1    $25, 76($4)
-	lwc1    $26, 80($4)
-	lwc1    $27, 84($4)
-	lwc1    $28, 88($4)
-	lwc1    $29, 92($4)
-	lwc1    $30, 96($4)
-	lwc1    $31, 100($4)
-	lw      $ra,  0($4)
-	lw      $sp,  4($4)
-	lw      $16,  8($4)
-	lw      $17, 12($4)
-	lw      $18, 16($4)
-	lw      $19, 20($4)
-	lw      $20, 24($4)
-	lw      $21, 28($4)
-	lw      $22, 32($4)
-	lw      $23, 36($4)
-	lw      $30, 40($4)
-	jr      $ra
-	lw      $28, 44($4)
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips/setjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/mips/setjmp.s
deleted file mode 100644
index 53d702a918..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mips/setjmp.s
+++ /dev/null
@@ -1,37 +0,0 @@
-.set noreorder
-
-.global __setjmp
-.global _setjmp
-.global setjmp
-.type   __setjmp,@function
-.type   _setjmp,@function
-.type   setjmp,@function
-__setjmp:
-_setjmp:
-setjmp:
-	sw      $ra,  0($4)
-	sw      $sp,  4($4)
-	sw      $16,  8($4)
-	sw      $17, 12($4)
-	sw      $18, 16($4)
-	sw      $19, 20($4)
-	sw      $20, 24($4)
-	sw      $21, 28($4)
-	sw      $22, 32($4)
-	sw      $23, 36($4)
-	sw      $30, 40($4)
-	sw      $28, 44($4)
-	swc1    $20, 56($4)
-	swc1    $21, 60($4)
-	swc1    $22, 64($4)
-	swc1    $23, 68($4)
-	swc1    $24, 72($4)
-	swc1    $25, 76($4)
-	swc1    $26, 80($4)
-	swc1    $27, 84($4)
-	swc1    $28, 88($4)
-	swc1    $29, 92($4)
-	swc1    $30, 96($4)
-	swc1    $31, 100($4)
-	jr      $ra
-	li      $2, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mipsel-sf/longjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/mipsel-sf/longjmp.sub
deleted file mode 100644
index 6907202918..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mipsel-sf/longjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-../mips-sf/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/mipsel-sf/setjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/mipsel-sf/setjmp.sub
deleted file mode 100644
index 991747580b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/mipsel-sf/setjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-../mips-sf/setjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/powerpc/longjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/powerpc/longjmp.s
deleted file mode 100644
index bab1751176..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/powerpc/longjmp.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.global _longjmp
-	.global longjmp
-	.type   _longjmp,@function
-	.type   longjmp,@function
-_longjmp:
-longjmp:
-# void longjmp(jmp_buf env, int val);
-# put val into return register and restore the env saved in setjmp
-# if val(r4) is 0, put 1 there.
-	# 0) move old return address into r0
-	lwz 0, 0(3)
-	# 1) put it into link reg
-	mtlr 0
-	#2 ) restore stack ptr
-	lwz 1, 4(3)
-	#3) restore control reg
-	lwz 0, 8(3)
-	mtcr 0
-	#4) restore r14-r31
-	lwz 14, 12(3)
-	lwz 15, 16(3)
-	lwz 16, 20(3)
-	lwz 17, 24(3)
-	lwz 18, 28(3)
-	lwz 19, 32(3)
-	lwz 20, 36(3)
-	lwz 21, 40(3)
-	lwz 22, 44(3)
-	lwz 23, 48(3)
-	lwz 24, 52(3)
-	lwz 25, 56(3)
-	lwz 26, 60(3)
-	lwz 27, 64(3)
-	lwz 28, 68(3)
-	lwz 29, 72(3)
-	lwz 30, 76(3)
-	lwz 31, 80(3)
-	lfd 14,88(3)
-	lfd 15,96(3)
-	lfd 16,104(3)
-	lfd 17,112(3)
-	lfd 18,120(3)
-	lfd 19,128(3)
-	lfd 20,136(3)
-	lfd 21,144(3)
-	lfd 22,152(3)
-	lfd 23,160(3)
-	lfd 24,168(3)
-	lfd 25,176(3)
-	lfd 26,184(3)
-	lfd 27,192(3)
-	lfd 28,200(3)
-	lfd 29,208(3)
-	lfd 30,216(3)
-	lfd 31,224(3)
-	#5) put val into return reg r3
-	mr 3, 4
-
-	#6) check if return value is 0, make it 1 in that case
-	cmpwi cr7, 4, 0
-	bne cr7, 1f
-	li 3, 1
-1:
-	blr
-
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/powerpc/setjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/powerpc/setjmp.s
deleted file mode 100644
index 122177f142..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/powerpc/setjmp.s
+++ /dev/null
@@ -1,61 +0,0 @@
-	.global ___setjmp
-	.hidden ___setjmp
-	.global __setjmp
-	.global _setjmp
-	.global setjmp
-	.type   __setjmp,@function
-	.type   _setjmp,@function
-	.type   setjmp,@function
-___setjmp:
-__setjmp:
-_setjmp:
-setjmp:
-	# 0) store IP int 0, then into the jmpbuf pointed to by r3 (first arg)
-	mflr 0
-	stw 0, 0(3)
-	# 1) store reg1 (SP)
-	stw 1, 4(3)
-	# 2) store cr
-	mfcr 0
-	stw 0, 8(3)
-	# 3) store r14-31
-	stw 14, 12(3)
-	stw 15, 16(3)
-	stw 16, 20(3)
-	stw 17, 24(3)
-	stw 18, 28(3)
-	stw 19, 32(3)
-	stw 20, 36(3)
-	stw 21, 40(3)
-	stw 22, 44(3)
-	stw 23, 48(3)
-	stw 24, 52(3)
-	stw 25, 56(3)
-	stw 26, 60(3)
-	stw 27, 64(3)
-	stw 28, 68(3)
-	stw 29, 72(3)
-	stw 30, 76(3)
-	stw 31, 80(3)
-	stfd 14,88(3)
-	stfd 15,96(3)
-	stfd 16,104(3)
-	stfd 17,112(3)
-	stfd 18,120(3)
-	stfd 19,128(3)
-	stfd 20,136(3)
-	stfd 21,144(3)
-	stfd 22,152(3)
-	stfd 23,160(3)
-	stfd 24,168(3)
-	stfd 25,176(3)
-	stfd 26,184(3)
-	stfd 27,192(3)
-	stfd 28,200(3)
-	stfd 29,208(3)
-	stfd 30,216(3)
-	stfd 31,224(3)
-	# 4) set return value to 0
-	li 3, 0
-	# 5) return
-	blr
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/longjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/longjmp.s
deleted file mode 100644
index cda482c547..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/longjmp.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.global _longjmp
-.global longjmp
-.type   _longjmp, @function
-.type   longjmp,  @function
-_longjmp:
-longjmp:
-	mov.l  @r4+, r8
-	mov.l  @r4+, r9
-	mov.l  @r4+, r10
-	mov.l  @r4+, r11
-	mov.l  @r4+, r12
-	mov.l  @r4+, r13
-	mov.l  @r4+, r14
-	mov.l  @r4+, r15
-	lds.l  @r4+, pr
-
-	tst  r5, r5
-	movt r0
-	add  r5, r0
-
-	rts
-	 nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/longjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/longjmp.sub
deleted file mode 100644
index e80331b654..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/longjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/setjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/setjmp.s
deleted file mode 100644
index 41210f92b0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/setjmp.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.global ___setjmp
-.hidden ___setjmp
-.global __setjmp
-.global _setjmp
-.global setjmp
-.type   __setjmp, @function
-.type   _setjmp,  @function
-.type   setjmp,   @function
-___setjmp:
-__setjmp:
-_setjmp:
-setjmp:
-	add   #36, r4
-	sts.l  pr,   @-r4
-	mov.l  r15   @-r4
-	mov.l  r14,  @-r4
-	mov.l  r13,  @-r4
-	mov.l  r12,  @-r4
-	mov.l  r11,  @-r4
-	mov.l  r10,  @-r4
-	mov.l  r9,   @-r4
-	mov.l  r8,   @-r4
-	rts
-	 mov  #0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/setjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/setjmp.sub
deleted file mode 100644
index b7ad221051..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh-nofpu/setjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-setjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh/longjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/sh/longjmp.s
deleted file mode 100644
index e9aa4e500c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh/longjmp.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.global _longjmp
-.global longjmp
-.type   _longjmp, @function
-.type   longjmp,  @function
-_longjmp:
-longjmp:
-	mov.l  @r4+, r8
-	mov.l  @r4+, r9
-	mov.l  @r4+, r10
-	mov.l  @r4+, r11
-	mov.l  @r4+, r12
-	mov.l  @r4+, r13
-	mov.l  @r4+, r14
-	mov.l  @r4+, r15
-	lds.l  @r4+, pr
-	fmov.s @r4+, fr12
-	fmov.s @r4+, fr13
-	fmov.s @r4+, fr14
-	fmov.s @r4+, fr15
-
-	tst  r5, r5
-	movt r0
-	add  r5, r0
-
-	rts
-	 nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh/setjmp.s b/src/components/lib/libc/musl-1.1.11/src/setjmp/sh/setjmp.s
deleted file mode 100644
index ffde868737..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sh/setjmp.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.global ___setjmp
-.hidden ___setjmp
-.global __setjmp
-.global _setjmp
-.global setjmp
-.type   __setjmp, @function
-.type   _setjmp,  @function
-.type   setjmp,   @function
-___setjmp:
-__setjmp:
-_setjmp:
-setjmp:
-	add   #52, r4
-	fmov.s fr15, @-r4
-	fmov.s fr14, @-r4
-	fmov.s fr13, @-r4
-	fmov.s fr12, @-r4
-	sts.l  pr,   @-r4
-	mov.l  r15,  @-r4
-	mov.l  r14,  @-r4
-	mov.l  r13,  @-r4
-	mov.l  r12,  @-r4
-	mov.l  r11,  @-r4
-	mov.l  r10,  @-r4
-	mov.l  r9,   @-r4
-	mov.l  r8,   @-r4
-	rts
-	 mov  #0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sheb-nofpu/longjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/sheb-nofpu/longjmp.sub
deleted file mode 100644
index 62fcd2b16c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sheb-nofpu/longjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-../sh-nofpu/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/sheb-nofpu/setjmp.sub b/src/components/lib/libc/musl-1.1.11/src/setjmp/sheb-nofpu/setjmp.sub
deleted file mode 100644
index a5bb294cd9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/setjmp/sheb-nofpu/setjmp.sub
+++ /dev/null
@@ -1 +0,0 @@
-../sh-nofpu/setjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/aarch64/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/aarch64/restore.s
deleted file mode 100644
index d3d0243d41..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/aarch64/restore.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.global __restore
-.type __restore,%function
-__restore:
-.global __restore_rt
-.type __restore_rt,%function
-__restore_rt:
-	mov x8,#139 // SYS_rt_sigreturn
-	svc 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/arm/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/arm/restore.s
deleted file mode 100644
index 18f7216b14..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/arm/restore.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.global __restore
-.type __restore,%function
-__restore:
-	mov r7,#119
-	swi 0x0
-
-.global __restore_rt
-.type __restore_rt,%function
-__restore_rt:
-	mov r7,#173
-	swi 0x0
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/arm/sigsetjmp.s b/src/components/lib/libc/musl-1.1.11/src/signal/arm/sigsetjmp.s
deleted file mode 100644
index 89c020b8ea..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/arm/sigsetjmp.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.global sigsetjmp
-.global __sigsetjmp
-.type sigsetjmp,%function
-.type __sigsetjmp,%function
-sigsetjmp:
-__sigsetjmp:
-	tst r1,r1
-	beq setjmp
-
-	str lr,[r0,#256]
-	str r4,[r0,#260+8]
-	mov r4,r0
-
-	bl setjmp
-
-	mov r1,r0
-	mov r0,r4
-	ldr lr,[r0,#256]
-	ldr r4,[r0,#260+8]
-
-.hidden __sigsetjmp_tail
-	b __sigsetjmp_tail
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/i386/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/i386/restore.s
deleted file mode 100644
index a30b69c414..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/i386/restore.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.global __restore
-.type __restore,@function
-__restore:
-	popl %eax
-	movl $119, %eax
-	int $0x80
-
-.global __restore_rt
-.type __restore_rt,@function
-__restore_rt:
-	movl $173, %eax
-	int $0x80
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/microblaze/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/microblaze/restore.s
deleted file mode 100644
index fe4f5a0976..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/microblaze/restore.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.global __restore
-.type __restore,@function
-__restore:
-	ori     r12, r0, 119
-	brki    r14, 0x8
-
-.global __restore_rt
-.type __restore_rt,@function
-__restore_rt:
-	ori     r12, r0, 173
-	brki    r14, 0x8
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/mips/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/mips/restore.s
deleted file mode 100644
index 5c22dd4877..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/mips/restore.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noreorder
-
-.global __restore_rt
-.type   __restore_rt,@function
-__restore_rt:
-	li $2, 4193
-	syscall
-
-.global __restore
-.type   __restore,@function
-__restore:
-	li $2, 4119
-	syscall
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/powerpc/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/powerpc/restore.s
deleted file mode 100644
index 4d41c27aa8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/powerpc/restore.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.global __restore
-	.type __restore,%function
-__restore:
-	li      0, 119 #__NR_sigreturn
-	sc
-
-	.global __restore_rt
-	.type __restore_rt,%function
-__restore_rt:
-	li      0, 172 # __NR_rt_sigreturn
-	sc
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/psiginfo.c b/src/components/lib/libc/musl-1.1.11/src/signal/psiginfo.c
deleted file mode 100644
index 57be34cd01..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/psiginfo.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-
-void psiginfo(const siginfo_t *si, const char *msg)
-{
-	char *s = strsignal(si->si_signo);
-	if (msg) fprintf(stderr, "%s: %s\n", msg, s);
-	else fprintf(stderr, "%s\n", s);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/psignal.c b/src/components/lib/libc/musl-1.1.11/src/signal/psignal.c
deleted file mode 100644
index 02f1c76096..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/psignal.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-
-void psignal(int sig, const char *msg)
-{
-	char *s = strsignal(sig);
-	if (msg) fprintf(stderr, "%s: %s\n", msg, s);
-	else fprintf(stderr, "%s\n", s);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/raise.c b/src/components/lib/libc/musl-1.1.11/src/signal/raise.c
deleted file mode 100644
index 717b1c917a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/raise.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <signal.h>
-#include <stdint.h>
-#include "syscall.h"
-#include "pthread_impl.h"
-
-int raise(int sig)
-{
-	int tid, ret;
-	sigset_t set;
-	__block_app_sigs(&set);
-	tid = __syscall(SYS_gettid);
-	ret = syscall(SYS_tkill, tid, sig);
-	__restore_sigs(&set);
-	return ret;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/restore.c b/src/components/lib/libc/musl-1.1.11/src/signal/restore.c
deleted file mode 100644
index 873b867e6f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/restore.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* These functions will not work, but suffice for targets where the
- * kernel sigaction structure does not actually use sa_restorer. */
-
-void __restore()
-{
-}
-
-void __restore_rt()
-{
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sh/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/sh/restore.s
deleted file mode 100644
index eaedcdfba8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sh/restore.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.global __restore
-.type   __restore, @function
-__restore:
-	mov   #119, r3  !__NR_sigreturn
-	trapa #31
-
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-
-.global __restore_rt
-.type   __restore_rt, @function
-__restore_rt:
-	mov   #100, r3  !__NR_rt_sigreturn
-	add   #73, r3
-	trapa #31
-
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigaction.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigaction.c
deleted file mode 100644
index d5f4774137..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigaction.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include "syscall.h"
-#include "pthread_impl.h"
-#include "libc.h"
-#include "ksigaction.h"
-
-void __restore(), __restore_rt();
-
-static int unmask_done;
-static unsigned long handler_set[_NSIG/(8*sizeof(long))];
-
-void __get_handler_set(sigset_t *set)
-{
-	memcpy(set, handler_set, sizeof handler_set);
-}
-
-int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
-{
-	struct k_sigaction ksa, ksa_old;
-	if (sig >= (unsigned)_NSIG) {
-		errno = EINVAL;
-		return -1;
-	}
-	if (sa) {
-		if ((uintptr_t)sa->sa_handler > 1UL) {
-			a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
-				1UL<<(sig-1)%(8*sizeof(long)));
-
-			/* If pthread_create has not yet been called,
-			 * implementation-internal signals might not
-			 * yet have been unblocked. They must be
-			 * unblocked before any signal handler is
-			 * installed, so that an application cannot
-			 * receive an illegal sigset_t (with them
-			 * blocked) as part of the ucontext_t passed
-			 * to the signal handler. */
-			if (!libc.threaded && !unmask_done) {
-				__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
-					SIGPT_SET, 0, _NSIG/8);
-				unmask_done = 1;
-			}
-		}
-		ksa.handler = sa->sa_handler;
-		ksa.flags = sa->sa_flags | SA_RESTORER;
-		ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
-		memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
-	}
-	if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, sizeof ksa.mask))
-		return -1;
-	if (old) {
-		old->sa_handler = ksa_old.handler;
-		old->sa_flags = ksa_old.flags;
-		memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask);
-	}
-	return 0;
-}
-
-int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
-{
-	if (sig-32U < 3) {
-		errno = EINVAL;
-		return -1;
-	}
-	return __libc_sigaction(sig, sa, old);
-}
-
-weak_alias(__sigaction, sigaction);
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigaltstack.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigaltstack.c
deleted file mode 100644
index 62cb81adfe..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigaltstack.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <signal.h>
-#include <errno.h>
-#include "syscall.h"
-
-int sigaltstack(const stack_t *restrict ss, stack_t *restrict old)
-{
-	if (ss) {
-		if (ss->ss_size < MINSIGSTKSZ) {
-			errno = ENOMEM;
-			return -1;
-		}
-		if (ss->ss_flags & ~SS_DISABLE) {
-			errno = EINVAL;
-			return -1;
-		}
-	}
-	return syscall(SYS_sigaltstack, ss, old);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigisemptyset.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigisemptyset.c
deleted file mode 100644
index 312c66cf84..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigisemptyset.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#define _GNU_SOURCE
-#include <signal.h>
-#include <string.h>
-
-int sigisemptyset(const sigset_t *set)
-{
-	static const unsigned long zeroset[_NSIG/8/sizeof(long)];
-	return !memcmp(set, &zeroset, _NSIG/8);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigrtmin.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigrtmin.c
deleted file mode 100644
index d0e769bbc1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigrtmin.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int __libc_current_sigrtmin()
-{
-	return 35;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigset.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigset.c
deleted file mode 100644
index 0d7b456467..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigset.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <signal.h>
-
-void (*sigset(int sig, void (*handler)(int)))(int)
-{
-	struct sigaction sa, sa_old;
-	sigset_t mask;
-
-	sigemptyset(&mask);
-	if (sigaddset(&mask, sig) < 0)
-		return SIG_ERR;
-	
-	if (handler == SIG_HOLD) {
-		if (sigaction(sig, 0, &sa_old) < 0)
-			return SIG_ERR;
-		if (sigprocmask(SIG_BLOCK, &mask, &mask) < 0)
-			return SIG_ERR;
-	} else {
-		sa.sa_handler = handler;
-		sa.sa_flags = 0;
-		sigemptyset(&sa.sa_mask);
-		if (sigaction(sig, &sa, &sa_old) < 0)
-			return SIG_ERR;
-		if (sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0)
-			return SIG_ERR;
-	}
-	return sigismember(&mask, sig) ? SIG_HOLD : sa_old.sa_handler;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigsetjmp.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigsetjmp.c
deleted file mode 100644
index 1bbe1a0b53..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigsetjmp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <setjmp.h>
-#include <signal.h>
-#include "libc.h"
-
-/* !!! This function will not work unless the compiler performs
- * tail call optimization. Machine-specific asm versions should
- * be created instead even though the workaround (tail call)
- * is entirely non-machine-specific... */
-
-int sigsetjmp(sigjmp_buf buf, int save)
-{
-	if ((buf->__fl = save))
-		pthread_sigmask(SIG_SETMASK, 0, (sigset_t *)buf->__ss);
-	return setjmp(buf);
-}
-
-weak_alias(sigsetjmp, __sigsetjmp);
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigsetjmp_tail.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigsetjmp_tail.c
deleted file mode 100644
index 487ad8caef..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigsetjmp_tail.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <setjmp.h>
-#include <signal.h>
-#include "syscall.h"
-
-#ifdef SHARED
-__attribute__((__visibility__("hidden")))
-#endif
-int __sigsetjmp_tail(sigjmp_buf jb, int ret)
-{
-	void *p = jb->__ss;
-	__syscall(SYS_rt_sigprocmask, SIG_SETMASK, ret?p:0, ret?0:p, _NSIG/8);
-	return ret;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigtimedwait.c b/src/components/lib/libc/musl-1.1.11/src/signal/sigtimedwait.c
deleted file mode 100644
index 0739986b19..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigtimedwait.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <signal.h>
-#include <errno.h>
-#include "syscall.h"
-#include "libc.h"
-
-int sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const struct timespec *restrict timeout)
-{
-	int ret;
-	do ret = syscall_cp(SYS_rt_sigtimedwait, mask,
-		si, timeout, _NSIG/8);
-	while (ret<0 && errno==EINTR);
-	return ret;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/x32/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/x32/restore.s
deleted file mode 100644
index 27cd3cef9b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/x32/restore.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.global __restore_rt
-.global __restore
-.type __restore_rt,@function
-.type __restore,@function
-__restore_rt:
-__restore:
-	movl $0x40000201, %eax /* SYS_rt_sigreturn */
-	syscall
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/x86_64/restore.s b/src/components/lib/libc/musl-1.1.11/src/signal/x86_64/restore.s
deleted file mode 100644
index 682af2dd84..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/signal/x86_64/restore.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.global __restore_rt
-.global __restore
-.type __restore_rt,@function
-.type __restore,@function
-__restore_rt:
-__restore:
-	movl $15, %eax
-	syscall
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/__xstat.c b/src/components/lib/libc/musl-1.1.11/src/stat/__xstat.c
deleted file mode 100644
index 73c873aea2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stat/__xstat.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <sys/stat.h>
-#include "libc.h"
-
-int __fxstat(int ver, int fd, struct stat *buf)
-{
-	return fstat(fd, buf);
-}
-
-int __fxstatat(int ver, int fd, const char *path, struct stat *buf, int flag)
-{
-	return fstatat(fd, path, buf, flag);
-}
-
-int __lxstat(int ver, const char *path, struct stat *buf)
-{
-	return lstat(path, buf);
-}
-
-int __xstat(int ver, const char *path, struct stat *buf)
-{
-	return stat(path, buf);
-}
-
-LFS64(__fxstat);
-LFS64(__fxstatat);
-LFS64(__lxstat);
-LFS64(__xstat);
-
-int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev)
-{
-	return mknod(path, mode, *dev);
-}
-
-int __xmknodat(int ver, int fd, const char *path, mode_t mode, dev_t *dev)
-{
-	return mknodat(fd, path, mode, *dev);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/fstat.c b/src/components/lib/libc/musl-1.1.11/src/stat/fstat.c
deleted file mode 100644
index ab4afc0f92..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stat/fstat.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include "syscall.h"
-#include "libc.h"
-
-void __procfdname(char *, unsigned);
-
-int fstat(int fd, struct stat *st)
-{
-	int ret = __syscall(SYS_fstat, fd, st);
-	if (ret != -EBADF || __syscall(SYS_fcntl, fd, F_GETFD) < 0)
-		return __syscall_ret(ret);
-
-	char buf[15+3*sizeof(int)];
-	__procfdname(buf, fd);
-#ifdef SYS_stat
-	return syscall(SYS_stat, buf, st);
-#else
-	return syscall(SYS_fstatat, AT_FDCWD, buf, st, 0);
-#endif
-}
-
-LFS64(fstat);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/fstatat.c b/src/components/lib/libc/musl-1.1.11/src/stat/fstatat.c
deleted file mode 100644
index 863d5268e8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stat/fstatat.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <sys/stat.h>
-#include "syscall.h"
-#include "libc.h"
-
-int fstatat(int fd, const char *restrict path, struct stat *restrict buf, int flag)
-{
-	return syscall(SYS_fstatat, fd, path, buf, flag);
-}
-
-LFS64(fstatat);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/lstat.c b/src/components/lib/libc/musl-1.1.11/src/stat/lstat.c
deleted file mode 100644
index 5e8b84fcff..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stat/lstat.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <sys/stat.h>
-#include <fcntl.h>
-#include "syscall.h"
-#include "libc.h"
-
-int lstat(const char *restrict path, struct stat *restrict buf)
-{
-#ifdef SYS_lstat
-	return syscall(SYS_lstat, path, buf);
-#else
-	return syscall(SYS_fstatat, AT_FDCWD, path, buf, AT_SYMLINK_NOFOLLOW);
-#endif
-}
-
-LFS64(lstat);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/stat.c b/src/components/lib/libc/musl-1.1.11/src/stat/stat.c
deleted file mode 100644
index b4433a0a7c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stat/stat.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <sys/stat.h>
-#include <fcntl.h>
-#include "syscall.h"
-#include "libc.h"
-
-int stat(const char *restrict path, struct stat *restrict buf)
-{
-#ifdef SYS_stat
-	return syscall(SYS_stat, path, buf);
-#else
-	return syscall(SYS_fstatat, AT_FDCWD, path, buf, 0);
-#endif
-}
-
-LFS64(stat);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/utimensat.c b/src/components/lib/libc/musl-1.1.11/src/stat/utimensat.c
deleted file mode 100644
index 159c8be3b3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stat/utimensat.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "syscall.h"
-
-int utimensat(int fd, const char *path, const struct timespec times[2], int flags)
-{
-	int r = __syscall(SYS_utimensat, fd, path, times, flags);
-#ifdef SYS_futimesat
-	if (r != -ENOSYS || flags) return __syscall_ret(r);
-	struct timeval *tv = 0, tmp[2];
-	if (times) {
-		int i;
-		tv = tmp;
-		for (i=0; i<2; i++) {
-			if (times[i].tv_nsec >= 1000000000ULL) {
-				if (times[i].tv_nsec == UTIME_NOW &&
-				    times[1-i].tv_nsec == UTIME_NOW) {
-					tv = 0;
-					break;
-				}
-				if (times[i].tv_nsec == UTIME_OMIT)
-					return __syscall_ret(-ENOSYS);
-				return __syscall_ret(-EINVAL);
-			}
-			tmp[i].tv_sec = times[i].tv_sec;
-			tmp[i].tv_usec = times[i].tv_nsec / 1000;
-		}
-	}
-
-	r = __syscall(SYS_futimesat, fd, path, tv);
-	if (r != -ENOSYS || fd != AT_FDCWD) return __syscall_ret(r);
-	r = __syscall(SYS_utimes, path, tv);
-#endif
-	return __syscall_ret(r);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__lockfile.c b/src/components/lib/libc/musl-1.1.11/src/stdio/__lockfile.c
deleted file mode 100644
index 9d967d6eb8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__lockfile.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "stdio_impl.h"
-#include "pthread_impl.h"
-
-int __lockfile(FILE *f)
-{
-	int owner, tid = __pthread_self()->tid;
-	if (f->lock == tid)
-		return 0;
-	while ((owner = a_cas(&f->lock, 0, tid)))
-		__wait(&f->lock, &f->waiters, owner, 1);
-	return 1;
-}
-
-void __unlockfile(FILE *f)
-{
-	a_store(&f->lock, 0);
-
-	/* The following read is technically invalid under situations
-	 * of self-synchronized destruction. Another thread may have
-	 * called fclose as soon as the above store has completed.
-	 * Nonetheless, since FILE objects always live in memory
-	 * obtained by malloc from the heap, it's safe to assume
-	 * the dereferences below will not fault. In the worst case,
-	 * a spurious syscall will be made. If the implementation of
-	 * malloc changes, this assumption needs revisiting. */
-
-	if (f->waiters) __wake(&f->lock, 1, 1);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__overflow.c b/src/components/lib/libc/musl-1.1.11/src/stdio/__overflow.c
deleted file mode 100644
index 3bb37923ab..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__overflow.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "stdio_impl.h"
-
-int __overflow(FILE *f, int _c)
-{
-	unsigned char c = _c;
-	if (!f->wend && __towrite(f)) return EOF;
-	if (f->wpos < f->wend && c != f->lbf) return *f->wpos++ = c;
-	if (f->write(f, &c, 1)!=1) return EOF;
-	return c;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_read.c b/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_read.c
deleted file mode 100644
index f8fa6d3bf3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_read.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "stdio_impl.h"
-#include <sys/uio.h>
-
-size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
-{
-	struct iovec iov[2] = {
-		{ .iov_base = buf, .iov_len = len - !!f->buf_size },
-		{ .iov_base = f->buf, .iov_len = f->buf_size }
-	};
-	ssize_t cnt;
-
-	cnt = syscall(SYS_readv, f->fd, iov, 2);
-	if (cnt <= 0) {
-		f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt);
-		return cnt;
-	}
-	if (cnt <= iov[0].iov_len) return cnt;
-	cnt -= iov[0].iov_len;
-	f->rpos = f->buf;
-	f->rend = f->buf + cnt;
-	if (f->buf_size) buf[len-1] = *f->rpos++;
-	return len;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_seek.c b/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_seek.c
deleted file mode 100644
index 13e06a663e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_seek.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "stdio_impl.h"
-
-off_t __stdio_seek(FILE *f, off_t off, int whence)
-{
-	off_t ret;
-#ifdef SYS__llseek
-	if (syscall(SYS__llseek, f->fd, off>>32, off, &ret, whence)<0)
-		ret = -1;
-#else
-	ret = syscall(SYS_lseek, f->fd, off, whence);
-#endif
-	return ret;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__toread.c b/src/components/lib/libc/musl-1.1.11/src/stdio/__toread.c
deleted file mode 100644
index b08f5bb440..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__toread.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio_impl.h>
-
-int __toread(FILE *f)
-{
-	f->mode |= f->mode-1;
-	if (f->wpos > f->buf) f->write(f, 0, 0);
-	f->wpos = f->wbase = f->wend = 0;
-	if (f->flags & F_NORD) {
-		f->flags |= F_ERR;
-		return EOF;
-	}
-	f->rpos = f->rend = f->buf + f->buf_size;
-	return (f->flags & F_EOF) ? EOF : 0;
-}
-
-void __stdio_exit_needed(void);
-
-void __toread_needs_stdio_exit()
-{
-	__stdio_exit_needed();
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ext2.c b/src/components/lib/libc/musl-1.1.11/src/stdio/ext2.c
deleted file mode 100644
index f359be9af7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/ext2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "stdio_impl.h"
-
-size_t __freadahead(FILE *f)
-{
-	return f->rend - f->rpos;
-}
-
-const char *__freadptr(FILE *f, size_t *sizep)
-{
-	size_t size = f->rend - f->rpos;
-	if (!size) return 0;
-	*sizep = size;
-	return (const char *)f->rpos;
-}
-
-void __freadptrinc(FILE *f, size_t inc)
-{
-	f->rpos += inc;
-}
-
-void __fseterr(FILE *f)
-{
-	f->flags |= F_ERR;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fclose.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fclose.c
deleted file mode 100644
index 839d88af9b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fclose.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "stdio_impl.h"
-#include "libc.h"
-
-static void dummy(FILE *f) { }
-weak_alias(dummy, __unlist_locked_file);
-
-int fclose(FILE *f)
-{
-	int r;
-	int perm;
-	
-	FFINALLOCK(f);
-
-	__unlist_locked_file(f);
-
-	if (!(perm = f->flags & F_PERM)) {
-		FILE **head = __ofl_lock();
-		if (f->prev) f->prev->next = f->next;
-		if (f->next) f->next->prev = f->prev;
-		if (*head == f) *head = f->next;
-		__ofl_unlock();
-	}
-
-	r = fflush(f);
-	r |= f->close(f);
-
-	if (f->getln_buf) free(f->getln_buf);
-	if (!perm) free(f);
-	
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fflush.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fflush.c
deleted file mode 100644
index 3f462c80e8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fflush.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "stdio_impl.h"
-
-static int __fflush_unlocked(FILE *f)
-{
-	/* If writing, flush output */
-	if (f->wpos > f->wbase) {
-		f->write(f, 0, 0);
-		if (!f->wpos) return EOF;
-	}
-
-	/* If reading, sync position, per POSIX */
-	if (f->rpos < f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
-
-	/* Clear read and write modes */
-	f->wpos = f->wbase = f->wend = 0;
-	f->rpos = f->rend = 0;
-
-	return 0;
-}
-
-/* stdout.c will override this if linked */
-static FILE *volatile dummy = 0;
-weak_alias(dummy, __stdout_used);
-
-int fflush(FILE *f)
-{
-	int r;
-
-	if (f) {
-		FLOCK(f);
-		r = __fflush_unlocked(f);
-		FUNLOCK(f);
-		return r;
-	}
-
-	r = __stdout_used ? fflush(__stdout_used) : 0;
-
-	for (f=*__ofl_lock(); f; f=f->next) {
-		FLOCK(f);
-		if (f->wpos > f->wbase) r |= __fflush_unlocked(f);
-		FUNLOCK(f);
-	}
-	__ofl_unlock();
-	
-	return r;
-}
-
-weak_alias(__fflush_unlocked, fflush_unlocked);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetc.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fgetc.c
deleted file mode 100644
index e122416406..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetc.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "stdio_impl.h"
-
-int fgetc(FILE *f)
-{
-	int c;
-	if (f->lock < 0 || !__lockfile(f))
-		return getc_unlocked(f);
-	c = getc_unlocked(f);
-	__unlockfile(f);
-	return c;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetpos.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fgetpos.c
deleted file mode 100644
index c3fa0eb0af..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetpos.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "stdio_impl.h"
-
-int fgetpos(FILE *restrict f, fpos_t *restrict pos)
-{
-	off_t off = __ftello(f);
-	if (off < 0) return -1;
-	*(off_t *)pos = off;
-	return 0;
-}
-
-LFS64(fgetpos);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fgets.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fgets.c
deleted file mode 100644
index d3f9819e82..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fgets.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "stdio_impl.h"
-#include <string.h>
-
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
-
-char *fgets(char *restrict s, int n, FILE *restrict f)
-{
-	char *p = s;
-	unsigned char *z;
-	size_t k;
-	int c;
-
-	FLOCK(f);
-
-	if (n--<=1) {
-		f->mode |= f->mode-1;
-		FUNLOCK(f);
-		if (n) return 0;
-		*s = 0;
-		return s;
-	}
-
-	while (n) {
-		z = memchr(f->rpos, '\n', f->rend - f->rpos);
-		k = z ? z - f->rpos + 1 : f->rend - f->rpos;
-		k = MIN(k, n);
-		memcpy(p, f->rpos, k);
-		f->rpos += k;
-		p += k;
-		n -= k;
-		if (z || !n) break;
-		if ((c = getc_unlocked(f)) < 0) {
-			if (p==s || !feof(f)) s = 0;
-			break;
-		}
-		n--;
-		if ((*p++ = c) == '\n') break;
-	}
-	if (s) *p = 0;
-
-	FUNLOCK(f);
-
-	return s;
-}
-
-weak_alias(fgets, fgets_unlocked);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetws.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fgetws.c
deleted file mode 100644
index 195cb4355a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetws.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "stdio_impl.h"
-#include <wchar.h>
-
-wint_t __fgetwc_unlocked(FILE *);
-
-wchar_t *fgetws(wchar_t *restrict s, int n, FILE *restrict f)
-{
-	wchar_t *p = s;
-
-	if (!n--) return s;
-
-	FLOCK(f);
-
-	for (; n; n--) {
-		wint_t c = __fgetwc_unlocked(f);
-		if (c == WEOF) break;
-		*p++ = c;
-		if (c == '\n') break;
-	}
-	*p = 0;
-	if (ferror(f)) p = s;
-
-	FUNLOCK(f);
-
-	return (p == s) ? NULL : s;
-}
-
-weak_alias(fgetws, fgetws_unlocked);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fileno.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fileno.c
deleted file mode 100644
index ba7f9391b1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fileno.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "stdio_impl.h"
-
-int fileno(FILE *f)
-{
-	/* f->fd never changes, but the lock must be obtained and released
-	 * anyway since this function cannot return while another thread
-	 * holds the lock. */
-	FLOCK(f);
-	FUNLOCK(f);
-	return f->fd;
-}
-
-weak_alias(fileno, fileno_unlocked);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/flockfile.c b/src/components/lib/libc/musl-1.1.11/src/stdio/flockfile.c
deleted file mode 100644
index a196c1efe0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/flockfile.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "stdio_impl.h"
-#include "pthread_impl.h"
-
-void flockfile(FILE *f)
-{
-	while (ftrylockfile(f)) {
-		int owner = f->lock;
-		if (owner) __wait(&f->lock, &f->waiters, owner, 1);
-	}
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fmemopen.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fmemopen.c
deleted file mode 100644
index 7c193a579b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fmemopen.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "stdio_impl.h"
-#include <errno.h>
-#include <string.h>
-#include <inttypes.h>
-
-struct cookie {
-	size_t pos, len, size;
-	unsigned char *buf;
-	int mode;
-};
-
-static off_t mseek(FILE *f, off_t off, int whence)
-{
-	ssize_t base;
-	struct cookie *c = f->cookie;
-	if (whence>2U) {
-fail:
-		errno = EINVAL;
-		return -1;
-	}
-	base = (size_t [3]){0, c->pos, c->len}[whence];
-	if (off < -base || off > (ssize_t)c->size-base) goto fail;
-	return c->pos = base+off;
-}
-
-static size_t mread(FILE *f, unsigned char *buf, size_t len)
-{
-	struct cookie *c = f->cookie;
-	size_t rem = c->len - c->pos;
-	if (c->pos > c->len) rem = 0;
-	if (len > rem) {
-		len = rem;
-		f->flags |= F_EOF;
-	}
-	memcpy(buf, c->buf+c->pos, len);
-	c->pos += len;
-	rem -= len;
-	if (rem > f->buf_size) rem = f->buf_size;
-	f->rpos = f->buf;
-	f->rend = f->buf + rem;
-	memcpy(f->rpos, c->buf+c->pos, rem);
-	c->pos += rem;
-	return len;
-}
-
-static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
-{
-	struct cookie *c = f->cookie;
-	size_t rem;
-	size_t len2 = f->wpos - f->wbase;
-	if (len2) {
-		f->wpos = f->wbase;
-		if (mwrite(f, f->wpos, len2) < len2) return 0;
-	}
-	if (c->mode == 'a') c->pos = c->len;
-	rem = c->size - c->pos;
-	if (len > rem) len = rem;
-	memcpy(c->buf+c->pos, buf, len);
-	c->pos += len;
-	if (c->pos > c->len) {
-		c->len = c->pos;
-		if (c->len < c->size) c->buf[c->len] = 0;
-		else if ((f->flags&F_NORD) && c->size) c->buf[c->size-1] = 0;
-	}
-	return len;
-}
-
-static int mclose(FILE *m)
-{
-	return 0;
-}
-
-FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
-{
-	FILE *f;
-	struct cookie *c;
-	int plus = !!strchr(mode, '+');
-	
-	if (!size || !strchr("rwa", *mode)) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	if (!buf && size > SIZE_MAX-sizeof(FILE)-BUFSIZ-UNGET) {
-		errno = ENOMEM;
-		return 0;
-	}
-
-	f = calloc(sizeof *f + sizeof *c + UNGET + BUFSIZ + (buf?0:size), 1);
-	if (!f) return 0;
-	f->cookie = c = (void *)(f+1);
-	f->fd = -1;
-	f->lbf = EOF;
-	f->buf = (unsigned char *)(c+1) + UNGET;
-	f->buf_size = BUFSIZ;
-	if (!buf) buf = f->buf + BUFSIZ;
-
-	c->buf = buf;
-	c->size = size;
-	c->mode = *mode;
-	
-	if (!plus) f->flags = (*mode == 'r') ? F_NOWR : F_NORD;
-	if (*mode == 'r') c->len = size;
-	else if (*mode == 'a') c->len = c->pos = strnlen(buf, size);
-
-	f->read = mread;
-	f->write = mwrite;
-	f->seek = mseek;
-	f->close = mclose;
-
-	if (!libc.threaded) f->lock = -1;
-
-	return __ofl_add(f);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fputc.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fputc.c
deleted file mode 100644
index 92762c98f8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fputc.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "stdio_impl.h"
-
-int fputc(int c, FILE *f)
-{
-	if (f->lock < 0 || !__lockfile(f))
-		return putc_unlocked(c, f);
-	c = putc_unlocked(c, f);
-	__unlockfile(f);
-	return c;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fputs.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fputs.c
deleted file mode 100644
index 4737f448e9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fputs.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "stdio_impl.h"
-#include <string.h>
-
-int fputs(const char *restrict s, FILE *restrict f)
-{
-	return (int)fwrite(s, strlen(s), 1, f) - 1;
-}
-
-weak_alias(fputs, fputs_unlocked);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fsetpos.c b/src/components/lib/libc/musl-1.1.11/src/stdio/fsetpos.c
deleted file mode 100644
index 5d76c8cd5d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fsetpos.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "stdio_impl.h"
-
-int fsetpos(FILE *f, const fpos_t *pos)
-{
-	return __fseeko(f, *(const off_t *)pos, SEEK_SET);
-}
-
-LFS64(fsetpos);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ftell.c b/src/components/lib/libc/musl-1.1.11/src/stdio/ftell.c
deleted file mode 100644
index bb62897a4c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/ftell.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "stdio_impl.h"
-#include <limits.h>
-#include <errno.h>
-
-off_t __ftello_unlocked(FILE *f)
-{
-	off_t pos = f->seek(f, 0,
-		(f->flags & F_APP) && f->wpos > f->wbase
-		? SEEK_END : SEEK_CUR);
-	if (pos < 0) return pos;
-
-	/* Adjust for data in buffer. */
-	return pos - (f->rend - f->rpos) + (f->wpos - f->wbase);
-}
-
-off_t __ftello(FILE *f)
-{
-	off_t pos;
-	FLOCK(f);
-	pos = __ftello_unlocked(f);
-	FUNLOCK(f);
-	return pos;
-}
-
-long ftell(FILE *f)
-{
-	off_t pos = __ftello(f);
-	if (pos > LONG_MAX) {
-		errno = EOVERFLOW;
-		return -1;
-	}
-	return pos;
-}
-
-weak_alias(__ftello, ftello);
-
-LFS64(ftello);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getc.c b/src/components/lib/libc/musl-1.1.11/src/stdio/getc.c
deleted file mode 100644
index b3f351d1d7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/getc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "stdio_impl.h"
-
-int getc(FILE *f)
-{
-	int c;
-	if (f->lock < 0 || !__lockfile(f))
-		return getc_unlocked(f);
-	c = getc_unlocked(f);
-	__unlockfile(f);
-	return c;
-}
-
-weak_alias(getc, _IO_getc);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getchar.c b/src/components/lib/libc/musl-1.1.11/src/stdio/getchar.c
deleted file mode 100644
index c10126581b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/getchar.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-int getchar(void)
-{
-	return fgetc(stdin);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getdelim.c b/src/components/lib/libc/musl-1.1.11/src/stdio/getdelim.c
deleted file mode 100644
index a88c3933f8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/getdelim.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "stdio_impl.h"
-#include <string.h>
-#include <inttypes.h>
-#include <errno.h>
-
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
-
-ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restrict f)
-{
-	char *tmp;
-	unsigned char *z;
-	size_t k;
-	size_t i=0;
-	int c;
-
-	FLOCK(f);
-
-	if (!n || !s) {
-		f->flags |= F_ERR;
-		FUNLOCK(f);
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (!*s) *n=0;
-
-	for (;;) {
-		z = memchr(f->rpos, delim, f->rend - f->rpos);
-		k = z ? z - f->rpos + 1 : f->rend - f->rpos;
-		if (i+k >= *n) {
-			if (k >= SIZE_MAX/2-i) goto oom;
-			*n = i+k+2;
-			if (*n < SIZE_MAX/4) *n *= 2;
-			tmp = realloc(*s, *n);
-			if (!tmp) {
-				*n = i+k+2;
-				tmp = realloc(*s, *n);
-				if (!tmp) goto oom;
-			}
-			*s = tmp;
-		}
-		memcpy(*s+i, f->rpos, k);
-		f->rpos += k;
-		i += k;
-		if (z) break;
-		if ((c = getc_unlocked(f)) == EOF) {
-			if (!i || !feof(f)) {
-				FUNLOCK(f);
-				return -1;
-			}
-			break;
-		}
-		if (((*s)[i++] = c) == delim) break;
-	}
-	(*s)[i] = 0;
-
-	FUNLOCK(f);
-
-	return i;
-oom:
-	f->flags |= F_ERR;
-	FUNLOCK(f);
-	errno = ENOMEM;
-	return -1;
-}
-
-weak_alias(getdelim, __getdelim);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/gets.c b/src/components/lib/libc/musl-1.1.11/src/stdio/gets.c
deleted file mode 100644
index 6c4645e564..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/gets.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "stdio_impl.h"
-#include <limits.h>
-#include <string.h>
-
-char *gets(char *s)
-{
-	char *ret = fgets(s, INT_MAX, stdin);
-	if (ret && s[strlen(s)-1] == '\n') s[strlen(s)-1] = 0;
-	return ret;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/open_memstream.c b/src/components/lib/libc/musl-1.1.11/src/stdio/open_memstream.c
deleted file mode 100644
index 58504c9f5e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/open_memstream.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "stdio_impl.h"
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-
-struct cookie {
-	char **bufp;
-	size_t *sizep;
-	size_t pos;
-	char *buf;
-	size_t len;
-	size_t space;
-};
-
-static off_t ms_seek(FILE *f, off_t off, int whence)
-{
-	ssize_t base;
-	struct cookie *c = f->cookie;
-	if (whence>2U) {
-fail:
-		errno = EINVAL;
-		return -1;
-	}
-	base = (size_t [3]){0, c->pos, c->len}[whence];
-	if (off < -base || off > SSIZE_MAX-base) goto fail;
-	return c->pos = base+off;
-}
-
-static size_t ms_write(FILE *f, const unsigned char *buf, size_t len)
-{
-	struct cookie *c = f->cookie;
-	size_t len2 = f->wpos - f->wbase;
-	char *newbuf;
-	if (len2) {
-		f->wpos = f->wbase;
-		if (ms_write(f, f->wbase, len2) < len2) return 0;
-	}
-	if (len + c->pos >= c->space) {
-		len2 = 2*c->space+1 | c->pos+len+1;
-		newbuf = realloc(c->buf, len2);
-		if (!newbuf) return 0;
-		*c->bufp = c->buf = newbuf;
-		memset(c->buf + c->space, 0, len2 - c->space);
-		c->space = len2;
-	}
-	memcpy(c->buf+c->pos, buf, len);
-	c->pos += len;
-	if (c->pos >= c->len) c->len = c->pos;
-	*c->sizep = c->pos;
-	return len;
-}
-
-static int ms_close(FILE *f)
-{
-	return 0;
-}
-
-FILE *open_memstream(char **bufp, size_t *sizep)
-{
-	FILE *f;
-	struct cookie *c;
-	if (!(f=malloc(sizeof *f + sizeof *c + BUFSIZ))) return 0;
-	memset(f, 0, sizeof *f + sizeof *c);
-	f->cookie = c = (void *)(f+1);
-
-	c->bufp = bufp;
-	c->sizep = sizep;
-	c->pos = c->len = c->space = 0;
-	c->buf = 0;
-
-	f->flags = F_NORD;
-	f->fd = -1;
-	f->buf = (void *)(c+1);
-	f->buf_size = BUFSIZ;
-	f->lbf = EOF;
-	f->write = ms_write;
-	f->seek = ms_seek;
-	f->close = ms_close;
-
-	if (!libc.threaded) f->lock = -1;
-
-	return __ofl_add(f);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/open_wmemstream.c b/src/components/lib/libc/musl-1.1.11/src/stdio/open_wmemstream.c
deleted file mode 100644
index 7ab2c64364..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/open_wmemstream.c
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "stdio_impl.h"
-#include <wchar.h>
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-
-struct cookie {
-	wchar_t **bufp;
-	size_t *sizep;
-	size_t pos;
-	wchar_t *buf;
-	size_t len;
-	size_t space;
-	mbstate_t mbs;
-};
-
-static off_t wms_seek(FILE *f, off_t off, int whence)
-{
-	ssize_t base;
-	struct cookie *c = f->cookie;
-	if (whence>2U) {
-fail:
-		errno = EINVAL;
-		return -1;
-	}
-	base = (size_t [3]){0, c->pos, c->len}[whence];
-	if (off < -base || off > SSIZE_MAX/4-base) goto fail;
-	memset(&c->mbs, 0, sizeof c->mbs);
-	return c->pos = base+off;
-}
-
-static size_t wms_write(FILE *f, const unsigned char *buf, size_t len)
-{
-	struct cookie *c = f->cookie;
-	size_t len2;
-	wchar_t *newbuf;
-	if (len + c->pos >= c->space) {
-		len2 = 2*c->space+1 | c->pos+len+1;
-		if (len2 > SSIZE_MAX/4) return 0;
-		newbuf = realloc(c->buf, len2*4);
-		if (!newbuf) return 0;
-		*c->bufp = c->buf = newbuf;
-		memset(c->buf + c->space, 0, 4*(len2 - c->space));
-		c->space = len2;
-	}
-	
-	len2 = mbsnrtowcs(c->buf+c->pos, (void *)&buf, len, c->space-c->pos, &c->mbs);
-	if (len2 == -1) return 0;
-	c->pos += len2;
-	if (c->pos >= c->len) c->len = c->pos;
-	*c->sizep = c->pos;
-	return len;
-}
-
-static int wms_close(FILE *f)
-{
-	return 0;
-}
-
-FILE *open_wmemstream(wchar_t **bufp, size_t *sizep)
-{
-	FILE *f;
-	struct cookie *c;
-	if (!(f=malloc(sizeof *f + sizeof *c))) return 0;
-	memset(f, 0, sizeof *f + sizeof *c);
-	f->cookie = c = (void *)(f+1);
-
-	c->bufp = bufp;
-	c->sizep = sizep;
-	c->pos = c->len = c->space = 0;
-	c->buf = 0;
-
-	f->flags = F_NORD;
-	f->fd = -1;
-	f->buf = (void *)(c+1);
-	f->buf_size = 0;
-	f->lbf = EOF;
-	f->write = wms_write;
-	f->seek = wms_seek;
-	f->close = wms_close;
-
-	if (!libc.threaded) f->lock = -1;
-
-	return __ofl_add(f);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/perror.c b/src/components/lib/libc/musl-1.1.11/src/stdio/perror.c
deleted file mode 100644
index fdcb4d71c8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/perror.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include "stdio_impl.h"
-
-void perror(const char *msg)
-{
-	FILE *f = stderr;
-	char *errstr = strerror(errno);
-
-	FLOCK(f);
-	
-	if (msg && *msg) {
-		fwrite(msg, strlen(msg), 1, f);
-		fputc(':', f);
-		fputc(' ', f);
-	}
-	fwrite(errstr, strlen(errstr), 1, f);
-	fputc('\n', f);
-
-	FUNLOCK(f);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/putc.c b/src/components/lib/libc/musl-1.1.11/src/stdio/putc.c
deleted file mode 100644
index fa8934969b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/putc.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "stdio_impl.h"
-
-int putc(int c, FILE *f)
-{
-	if (f->lock < 0 || !__lockfile(f))
-		return putc_unlocked(c, f);
-	c = putc_unlocked(c, f);
-	__unlockfile(f);
-	return c;
-}
-
-weak_alias(putc, _IO_putc);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/putchar.c b/src/components/lib/libc/musl-1.1.11/src/stdio/putchar.c
deleted file mode 100644
index 945636d5e6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/putchar.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-int putchar(int c)
-{
-	return fputc(c, stdout);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/rename.c b/src/components/lib/libc/musl-1.1.11/src/stdio/rename.c
deleted file mode 100644
index 04c90c0134..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/rename.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-#include "syscall.h"
-
-int rename(const char *old, const char *new)
-{
-#ifdef SYS_rename
-	return syscall(SYS_rename, old, new);
-#else
-	return syscall(SYS_renameat, AT_FDCWD, old, AT_FDCWD, new);
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/setvbuf.c b/src/components/lib/libc/musl-1.1.11/src/stdio/setvbuf.c
deleted file mode 100644
index 541a125ff1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/setvbuf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "stdio_impl.h"
-
-/* This function makes no attempt to protect the user from his/her own
- * stupidity. If called any time but when then ISO C standard specifically
- * allows it, all hell can and will break loose, especially with threads!
- *
- * This implementation ignores all arguments except the buffering type,
- * and uses the existing buffer allocated alongside the FILE object.
- * In the case of stderr where the preexisting buffer is length 1, it
- * is not possible to set line buffering or full buffering. */
-
-int setvbuf(FILE *restrict f, char *restrict buf, int type, size_t size)
-{
-	f->lbf = EOF;
-
-	if (type == _IONBF)
-		f->buf_size = 0;
-	else if (type == _IOLBF)
-		f->lbf = '\n';
-
-	f->flags |= F_SVB;
-
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/stderr.c b/src/components/lib/libc/musl-1.1.11/src/stdio/stderr.c
deleted file mode 100644
index 229c8651dd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/stderr.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "stdio_impl.h"
-
-static unsigned char buf[UNGET];
-static FILE f = {
-	.buf = buf+UNGET,
-	.buf_size = 0,
-	.fd = 2,
-	.flags = F_PERM | F_NORD,
-	.lbf = -1,
-	.write = __stdio_write,
-	.seek = __stdio_seek,
-	.close = __stdio_close,
-	.lock = -1,
-};
-FILE *const stderr = &f;
-FILE *volatile __stderr_used = &f;
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/stdin.c b/src/components/lib/libc/musl-1.1.11/src/stdio/stdin.c
deleted file mode 100644
index 171ff22a98..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/stdin.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "stdio_impl.h"
-
-static unsigned char buf[BUFSIZ+UNGET];
-static FILE f = {
-	.buf = buf+UNGET,
-	.buf_size = sizeof buf-UNGET,
-	.fd = 0,
-	.flags = F_PERM | F_NOWR,
-	.read = __stdio_read,
-	.seek = __stdio_seek,
-	.close = __stdio_close,
-	.lock = -1,
-};
-FILE *const stdin = &f;
-FILE *volatile __stdin_used = &f;
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/stdout.c b/src/components/lib/libc/musl-1.1.11/src/stdio/stdout.c
deleted file mode 100644
index 6b188942dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/stdout.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "stdio_impl.h"
-
-static unsigned char buf[BUFSIZ+UNGET];
-static FILE f = {
-	.buf = buf+UNGET,
-	.buf_size = sizeof buf-UNGET,
-	.fd = 1,
-	.flags = F_PERM | F_NORD,
-	.lbf = '\n',
-	.write = __stdout_write,
-	.seek = __stdio_seek,
-	.close = __stdio_close,
-	.lock = -1,
-};
-FILE *const stdout = &f;
-FILE *volatile __stdout_used = &f;
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vsnprintf.c b/src/components/lib/libc/musl-1.1.11/src/stdio/vsnprintf.c
deleted file mode 100644
index be2c44eb17..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vsnprintf.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "stdio_impl.h"
-#include <limits.h>
-#include <string.h>
-#include <errno.h>
-#include <stdint.h>
-
-static size_t sn_write(FILE *f, const unsigned char *s, size_t l)
-{
-	size_t k = f->wend - f->wpos;
-	if (k > l) k = l;
-	memcpy(f->wpos, s, k);
-	f->wpos += k;
-	/* pretend to succeed, but discard extra data */
-	return l;
-}
-
-int vsnprintf(char *restrict s, size_t n, const char *restrict fmt, va_list ap)
-{
-	int r;
-	char b;
-	FILE f = { .lbf = EOF, .write = sn_write, .lock = -1 };
-
-	if (n-1 > INT_MAX-1) {
-		if (n) {
-			errno = EOVERFLOW;
-			return -1;
-		}
-		s = &b;
-		n = 1;
-	}
-
-	/* Ensure pointers don't wrap if "infinite" n is passed in */
-	if (n > (char *)0+SIZE_MAX-s-1) n = (char *)0+SIZE_MAX-s-1;
-	f.buf_size = n;
-	f.buf = f.wpos = (void *)s;
-	f.wbase = f.wend = (void *)(s+n);
-	r = vfprintf(&f, fmt, ap);
-
-	/* Null-terminate, overwriting last char if dest buffer is full */
-	if (n) f.wpos[-(f.wpos == f.wend)] = 0;
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vswprintf.c b/src/components/lib/libc/musl-1.1.11/src/stdio/vswprintf.c
deleted file mode 100644
index 7d237bae72..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vswprintf.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "stdio_impl.h"
-#include <limits.h>
-#include <string.h>
-#include <errno.h>
-#include <stdint.h>
-#include <wchar.h>
-
-struct cookie {
-	wchar_t *ws;
-	size_t l;
-};
-
-static size_t sw_write(FILE *f, const unsigned char *s, size_t l)
-{
-	size_t l0 = l;
-	int i = 0;
-	struct cookie *c = f->cookie;
-	if (s!=f->wbase && sw_write(f, f->wbase, f->wpos-f->wbase)==-1)
-		return -1;
-	while (c->l && l && (i=mbtowc(c->ws, (void *)s, l))>=0) {
-		s+=i;
-		l-=i;
-		c->l--;
-		c->ws++;
-	}
-	*c->ws = 0;
-	return i<0 ? i : l0;
-}
-
-int vswprintf(wchar_t *restrict s, size_t n, const wchar_t *restrict fmt, va_list ap)
-{
-	int r;
-	FILE f;
-	unsigned char buf[256];
-	struct cookie c = { s, n-1 };
-
-	memset(&f, 0, sizeof(FILE));
-	f.lbf = EOF;
-	f.write = sw_write;
-	f.buf_size = sizeof buf;
-	f.buf = buf;
-	f.lock = -1;
-	f.cookie = &c;
-	if (!n) {
-		return -1;
-	} else if (n > INT_MAX) {
-		errno = EOVERFLOW;
-		return -1;
-	}
-	r = vfwprintf(&f, fmt, ap);
-	sw_write(&f, 0, 0);
-	return r>=n ? -1 : r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/abs.c b/src/components/lib/libc/musl-1.1.11/src/stdlib/abs.c
deleted file mode 100644
index 4806d629d6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdlib/abs.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int abs(int a)
-{
-	return a>0 ? a : -a;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/bsearch.c b/src/components/lib/libc/musl-1.1.11/src/stdlib/bsearch.c
deleted file mode 100644
index 61d89367e7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdlib/bsearch.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdlib.h>
-
-void *bsearch(const void *key, const void *base, size_t nel, size_t width, int (*cmp)(const void *, const void *))
-{
-	void *try;
-	int sign;
-	while (nel > 0) {
-		try = (char *)base + width*(nel/2);
-		sign = cmp(key, try);
-		if (!sign) return try;
-		else if (nel == 1) break;
-		else if (sign < 0)
-			nel /= 2;
-		else {
-			base = try;
-			nel -= nel/2;
-		}
-	}
-	return NULL;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/labs.c b/src/components/lib/libc/musl-1.1.11/src/stdlib/labs.c
deleted file mode 100644
index 675b95b8ef..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdlib/labs.c
+++ /dev/null
@@ -1,4 +0,0 @@
-long labs(long a)
-{
-	return a>0 ? a : -a;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/llabs.c b/src/components/lib/libc/musl-1.1.11/src/stdlib/llabs.c
deleted file mode 100644
index bec4a03d66..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/stdlib/llabs.c
+++ /dev/null
@@ -1,4 +0,0 @@
-long long llabs(long long a)
-{
-	return a>0 ? a : -a;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/armel/memcpy.s b/src/components/lib/libc/musl-1.1.11/src/string/armel/memcpy.s
deleted file mode 100644
index 9c5e38d328..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/armel/memcpy.s
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-
-/*
- * Optimized memcpy() for ARM.
- *
- * note that memcpy() always returns the destination pointer,
- * so we have to preserve R0.
-  */
-
-/*
- * This file has been modified from the original for use in musl libc.
- * The main changes are: addition of .type memcpy,%function to make the
- * code safely callable from thumb mode, adjusting the return
- * instructions to be compatible with pre-thumb ARM cpus, and removal
- * of prefetch code that is not compatible with older cpus.
- */
-
-.global memcpy
-.type memcpy,%function
-memcpy:
-	/* The stack must always be 64-bits aligned to be compliant with the
-	 * ARM ABI. Since we have to save R0, we might as well save R4
-	 * which we can use for better pipelining of the reads below
-	 */
-	.fnstart
-	.save       {r0, r4, lr}
-	stmfd       sp!, {r0, r4, lr}
-	/* Making room for r5-r11 which will be spilled later */
-	.pad        #28
-	sub         sp, sp, #28
-
-	/* it simplifies things to take care of len<4 early */
-	cmp     r2, #4
-	blo     copy_last_3_and_return
-
-	/* compute the offset to align the source
-	 * offset = (4-(src&3))&3 = -src & 3
-	 */
-	rsb     r3, r1, #0
-	ands    r3, r3, #3
-	beq     src_aligned
-
-	/* align source to 32 bits. We need to insert 2 instructions between
-	 * a ldr[b|h] and str[b|h] because byte and half-word instructions
-	 * stall 2 cycles.
-	 */
-	movs    r12, r3, lsl #31
-	sub     r2, r2, r3              /* we know that r3 <= r2 because r2 >= 4 */
-	.word 0x44d13001 /* ldrbmi r3, [r1], #1 */
-	.word 0x24d14001 /* ldrbcs r4, [r1], #1 */
-	.word 0x24d1c001 /* ldrbcs r12,[r1], #1 */
-	.word 0x44c03001 /* strbmi r3, [r0], #1 */
-	.word 0x24c04001 /* strbcs r4, [r0], #1 */
-	.word 0x24c0c001 /* strbcs r12,[r0], #1 */
-
-src_aligned:
-
-	/* see if src and dst are aligned together (congruent) */
-	eor     r12, r0, r1
-	tst     r12, #3
-	bne     non_congruent
-
-	/* Use post-incriment mode for stm to spill r5-r11 to reserved stack
-	 * frame. Don't update sp.
-	 */
-	stmea   sp, {r5-r11}
-
-	/* align the destination to a cache-line */
-	rsb     r3, r0, #0
-	ands    r3, r3, #0x1C
-	beq     congruent_aligned32
-	cmp     r3, r2
-	andhi   r3, r2, #0x1C
-
-	/* conditionnaly copies 0 to 7 words (length in r3) */
-	movs    r12, r3, lsl #28
-	ldmcs   r1!, {r4, r5, r6, r7}           /* 16 bytes */
-	ldmmi   r1!, {r8, r9}                   /*  8 bytes */
-	stmcs   r0!, {r4, r5, r6, r7}
-	stmmi   r0!, {r8, r9}
-	tst     r3, #0x4
-	ldrne   r10,[r1], #4                    /*  4 bytes */
-	strne   r10,[r0], #4
-	sub     r2, r2, r3
-
-congruent_aligned32:
-	/*
-	 * here source is aligned to 32 bytes.
-	 */
-
-cached_aligned32:
-	subs    r2, r2, #32
-	blo     less_than_32_left
-
-	/*
-	 * We preload a cache-line up to 64 bytes ahead. On the 926, this will
-	 * stall only until the requested world is fetched, but the linefill
-	 * continues in the the background.
-	 * While the linefill is going, we write our previous cache-line
-	 * into the write-buffer (which should have some free space).
-	 * When the linefill is done, the writebuffer will
-	 * start dumping its content into memory
-	 *
-	 * While all this is going, we then load a full cache line into
-	 * 8 registers, this cache line should be in the cache by now
-	 * (or partly in the cache).
-	 *
-	 * This code should work well regardless of the source/dest alignment.
-	 *
-	 */
-
-	/* Align the preload register to a cache-line because the cpu does
-	 * "critical word first" (the first word requested is loaded first).
-	 */
-	@ bic           r12, r1, #0x1F
-	@ add           r12, r12, #64
-
-1:      ldmia   r1!, { r4-r11 }
-	subs    r2, r2, #32
-
-	/* 
-	 * NOTE: if r12 is more than 64 ahead of r1, the following ldrhi
-	 * for ARM9 preload will not be safely guarded by the preceding subs.
-	 * When it is safely guarded the only possibility to have SIGSEGV here
-	 * is because the caller overstates the length.
-	 */
-	@ ldrhi         r3, [r12], #32      /* cheap ARM9 preload */
-	stmia   r0!, { r4-r11 }
-	bhs     1b
-
-	add     r2, r2, #32
-
-less_than_32_left:
-	/*
-	 * less than 32 bytes left at this point (length in r2)
-	 */
-
-	/* skip all this if there is nothing to do, which should
-	 * be a common case (if not executed the code below takes
-	 * about 16 cycles)
-	 */
-	tst     r2, #0x1F
-	beq     1f
-
-	/* conditionnaly copies 0 to 31 bytes */
-	movs    r12, r2, lsl #28
-	ldmcs   r1!, {r4, r5, r6, r7}           /* 16 bytes */
-	ldmmi   r1!, {r8, r9}                   /*  8 bytes */
-	stmcs   r0!, {r4, r5, r6, r7}
-	stmmi   r0!, {r8, r9}
-	movs    r12, r2, lsl #30
-	ldrcs   r3, [r1], #4                    /*  4 bytes */
-	.word 0x40d140b2 /* ldrhmi r4, [r1], #2 */ /*  2 bytes */
-	strcs   r3, [r0], #4
-	.word 0x40c040b2 /* strhmi r4, [r0], #2 */
-	tst     r2, #0x1
-	.word 0x15d13000 /* ldrbne r3, [r1] */  /*  last byte  */
-	.word 0x15c03000 /* strbne r3, [r0] */
-
-	/* we're done! restore everything and return */
-1:      ldmfd   sp!, {r5-r11}
-	ldmfd   sp!, {r0, r4, lr}
-	tst     lr, #1
-	moveq   pc, lr
-	bx      lr
-
-	/********************************************************************/
-
-non_congruent:
-	/*
-	 * here source is aligned to 4 bytes
-	 * but destination is not.
-	 *
-	 * in the code below r2 is the number of bytes read
-	 * (the number of bytes written is always smaller, because we have
-	 * partial words in the shift queue)
-	 */
-	cmp     r2, #4
-	blo     copy_last_3_and_return
-
-	/* Use post-incriment mode for stm to spill r5-r11 to reserved stack
-	 * frame. Don't update sp.
-	 */
-	stmea   sp, {r5-r11}
-
-	/* compute shifts needed to align src to dest */
-	rsb     r5, r0, #0
-	and     r5, r5, #3                      /* r5 = # bytes in partial words */
-	mov     r12, r5, lsl #3         /* r12 = right */
-	rsb     lr, r12, #32            /* lr = left  */
-
-	/* read the first word */
-	ldr     r3, [r1], #4
-	sub     r2, r2, #4
-
-	/* write a partial word (0 to 3 bytes), such that destination
-	 * becomes aligned to 32 bits (r5 = nb of words to copy for alignment)
-	 */
-	movs    r5, r5, lsl #31
-	.word 0x44c03001 /* strbmi r3, [r0], #1 */
-	movmi   r3, r3, lsr #8
-	.word 0x24c03001 /* strbcs r3, [r0], #1 */
-	movcs   r3, r3, lsr #8
-	.word 0x24c03001 /* strbcs r3, [r0], #1 */
-	movcs   r3, r3, lsr #8
-
-	cmp     r2, #4
-	blo     partial_word_tail
-
-	/* Align destination to 32 bytes (cache line boundary) */
-1:      tst     r0, #0x1c
-	beq     2f
-	ldr     r5, [r1], #4
-	sub     r2, r2, #4
-	orr     r4, r3, r5,             lsl lr
-	mov     r3, r5,                 lsr r12
-	str     r4, [r0], #4
-	cmp     r2, #4
-	bhs     1b
-	blo     partial_word_tail
-
-	/* copy 32 bytes at a time */
-2:      subs    r2, r2, #32
-	blo     less_than_thirtytwo
-
-	/* Use immediate mode for the shifts, because there is an extra cycle
-	 * for register shifts, which could account for up to 50% of
-	 * performance hit.
-	 */
-
-	cmp     r12, #24
-	beq     loop24
-	cmp     r12, #8
-	beq     loop8
-
-loop16:
-	ldr     r12, [r1], #4
-1:      mov     r4, r12
-	ldmia   r1!, {   r5,r6,r7,  r8,r9,r10,r11}
-	subs    r2, r2, #32
-	ldrhs   r12, [r1], #4
-	orr     r3, r3, r4, lsl #16
-	mov     r4, r4, lsr #16
-	orr     r4, r4, r5, lsl #16
-	mov     r5, r5, lsr #16
-	orr     r5, r5, r6, lsl #16
-	mov     r6, r6, lsr #16
-	orr     r6, r6, r7, lsl #16
-	mov     r7, r7, lsr #16
-	orr     r7, r7, r8, lsl #16
-	mov     r8, r8, lsr #16
-	orr     r8, r8, r9, lsl #16
-	mov     r9, r9, lsr #16
-	orr     r9, r9, r10, lsl #16
-	mov     r10, r10,               lsr #16
-	orr     r10, r10, r11, lsl #16
-	stmia   r0!, {r3,r4,r5,r6, r7,r8,r9,r10}
-	mov     r3, r11, lsr #16
-	bhs     1b
-	b       less_than_thirtytwo
-
-loop8:
-	ldr     r12, [r1], #4
-1:      mov     r4, r12
-	ldmia   r1!, {   r5,r6,r7,  r8,r9,r10,r11}
-	subs    r2, r2, #32
-	ldrhs   r12, [r1], #4
-	orr     r3, r3, r4, lsl #24
-	mov     r4, r4, lsr #8
-	orr     r4, r4, r5, lsl #24
-	mov     r5, r5, lsr #8
-	orr     r5, r5, r6, lsl #24
-	mov     r6, r6,  lsr #8
-	orr     r6, r6, r7, lsl #24
-	mov     r7, r7,  lsr #8
-	orr     r7, r7, r8,             lsl #24
-	mov     r8, r8,  lsr #8
-	orr     r8, r8, r9,             lsl #24
-	mov     r9, r9,  lsr #8
-	orr     r9, r9, r10,    lsl #24
-	mov     r10, r10, lsr #8
-	orr     r10, r10, r11,  lsl #24
-	stmia   r0!, {r3,r4,r5,r6, r7,r8,r9,r10}
-	mov     r3, r11, lsr #8
-	bhs     1b
-	b       less_than_thirtytwo
-
-loop24:
-	ldr     r12, [r1], #4
-1:      mov     r4, r12
-	ldmia   r1!, {   r5,r6,r7,  r8,r9,r10,r11}
-	subs    r2, r2, #32
-	ldrhs   r12, [r1], #4
-	orr     r3, r3, r4, lsl #8
-	mov     r4, r4, lsr #24
-	orr     r4, r4, r5, lsl #8
-	mov     r5, r5, lsr #24
-	orr     r5, r5, r6, lsl #8
-	mov     r6, r6, lsr #24
-	orr     r6, r6, r7, lsl #8
-	mov     r7, r7, lsr #24
-	orr     r7, r7, r8, lsl #8
-	mov     r8, r8, lsr #24
-	orr     r8, r8, r9, lsl #8
-	mov     r9, r9, lsr #24
-	orr     r9, r9, r10, lsl #8
-	mov     r10, r10, lsr #24
-	orr     r10, r10, r11, lsl #8
-	stmia   r0!, {r3,r4,r5,r6, r7,r8,r9,r10}
-	mov     r3, r11, lsr #24
-	bhs     1b
-
-less_than_thirtytwo:
-	/* copy the last 0 to 31 bytes of the source */
-	rsb     r12, lr, #32            /* we corrupted r12, recompute it  */
-	add     r2, r2, #32
-	cmp     r2, #4
-	blo     partial_word_tail
-
-1:      ldr     r5, [r1], #4
-	sub     r2, r2, #4
-	orr     r4, r3, r5,             lsl lr
-	mov     r3,     r5,                     lsr r12
-	str     r4, [r0], #4
-	cmp     r2, #4
-	bhs     1b
-
-partial_word_tail:
-	/* we have a partial word in the input buffer */
-	movs    r5, lr, lsl #(31-3)
-	.word 0x44c03001 /* strbmi r3, [r0], #1 */
-	movmi   r3, r3, lsr #8
-	.word 0x24c03001 /* strbcs r3, [r0], #1 */
-	movcs   r3, r3, lsr #8
-	.word 0x24c03001 /* strbcs r3, [r0], #1 */
-
-	/* Refill spilled registers from the stack. Don't update sp. */
-	ldmfd   sp, {r5-r11}
-
-copy_last_3_and_return:
-	movs    r2, r2, lsl #31 /* copy remaining 0, 1, 2 or 3 bytes */
-	.word 0x44d12001 /* ldrbmi r2, [r1], #1 */
-	.word 0x24d13001 /* ldrbcs r3, [r1], #1 */
-	.word 0x25d1c000 /* ldrbcs r12,[r1] */
-	.word 0x44c02001 /* strbmi r2, [r0], #1 */
-	.word 0x24c03001 /* strbcs r3, [r0], #1 */
-	.word 0x25c0c000 /* strbcs r12,[r0] */
-
-	/* we're done! restore sp and spilled registers and return */
-	add     sp,  sp, #28
-	ldmfd   sp!, {r0, r4, lr}
-	tst     lr, #1
-	moveq   pc, lr
-	bx      lr
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/armel/memcpy.sub b/src/components/lib/libc/musl-1.1.11/src/string/armel/memcpy.sub
deleted file mode 100644
index 543f583fdf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/armel/memcpy.sub
+++ /dev/null
@@ -1 +0,0 @@
-memcpy.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/armhf/memcpy.sub b/src/components/lib/libc/musl-1.1.11/src/string/armhf/memcpy.sub
deleted file mode 100644
index add0590cf0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/armhf/memcpy.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armel/memcpy.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strchrnul.c b/src/components/lib/libc/musl-1.1.11/src/string/strchrnul.c
deleted file mode 100644
index 05700ad64e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/strchrnul.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <string.h>
-#include <stdint.h>
-#include <limits.h>
-#include "libc.h"
-
-#define ALIGN (sizeof(size_t))
-#define ONES ((size_t)-1/UCHAR_MAX)
-#define HIGHS (ONES * (UCHAR_MAX/2+1))
-#define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
-
-char *__strchrnul(const char *s, int c)
-{
-	size_t *w, k;
-
-	c = (unsigned char)c;
-	if (!c) return (char *)s + strlen(s);
-
-	for (; (uintptr_t)s % ALIGN; s++)
-		if (!*s || *(unsigned char *)s == c) return (char *)s;
-	k = ONES * c;
-	for (w = (void *)s; !HASZERO(*w) && !HASZERO(*w^k); w++);
-	for (s = (void *)w; *s && *(unsigned char *)s != c; s++);
-	return (char *)s;
-}
-
-weak_alias(__strchrnul, strchrnul);
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strcpy.c b/src/components/lib/libc/musl-1.1.11/src/string/strcpy.c
deleted file mode 100644
index f7e3ba38c1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/strcpy.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <string.h>
-
-char *__stpcpy(char *, const char *);
-
-char *strcpy(char *restrict dest, const char *restrict src)
-{
-#if 1
-	__stpcpy(dest, src);
-	return dest;
-#else
-	const unsigned char *s = src;
-	unsigned char *d = dest;
-	while ((*d++ = *s++));
-	return dest;
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strdup.c b/src/components/lib/libc/musl-1.1.11/src/string/strdup.c
deleted file mode 100644
index dd5f80c1c3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/strdup.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "libc.h"
-
-char *__strdup(const char *s)
-{
-	size_t l = strlen(s);
-	char *d = malloc(l+1);
-	if (!d) return NULL;
-	return memcpy(d, s, l+1);
-}
-
-weak_alias(__strdup, strdup);
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strlen.c b/src/components/lib/libc/musl-1.1.11/src/string/strlen.c
deleted file mode 100644
index 929ddcbc1c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/strlen.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <string.h>
-#include <stdint.h>
-#include <limits.h>
-
-#define ALIGN (sizeof(size_t))
-#define ONES ((size_t)-1/UCHAR_MAX)
-#define HIGHS (ONES * (UCHAR_MAX/2+1))
-#define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
-
-size_t strlen(const char *s)
-{
-	const char *a = s;
-	const size_t *w;
-	for (; (uintptr_t)s % ALIGN; s++) if (!*s) return s-a;
-	for (w = (const void *)s; !HASZERO(*w); w++);
-	for (s = (const void *)w; *s; s++);
-	return s-a;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strncpy.c b/src/components/lib/libc/musl-1.1.11/src/string/strncpy.c
deleted file mode 100644
index 441ba0335f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/strncpy.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <string.h>
-
-char *__stpncpy(char *, const char *, size_t);
-
-char *strncpy(char *restrict d, const char *restrict s, size_t n)
-{
-	__stpncpy(d, s, n);
-	return d;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strrchr.c b/src/components/lib/libc/musl-1.1.11/src/string/strrchr.c
deleted file mode 100644
index 635fb3c1dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/strrchr.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <string.h>
-
-void *__memrchr(const void *, int, size_t);
-
-char *strrchr(const char *s, int c)
-{
-	return __memrchr(s, c, strlen(s) + 1);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wmemmove.c b/src/components/lib/libc/musl-1.1.11/src/string/wmemmove.c
deleted file mode 100644
index e406f3d5c8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/string/wmemmove.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <wchar.h>
-
-wchar_t *wmemmove(wchar_t *d, const wchar_t *s, size_t n)
-{
-	wchar_t *d0 = d;
-	if ((size_t)(d-s) < n)
-		while (n--) d[n] = s[n];
-	else
-		while (n--) *d++ = *s++;
-	return d0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/temp/mkostemp.c b/src/components/lib/libc/musl-1.1.11/src/temp/mkostemp.c
deleted file mode 100644
index e73e22a68d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/temp/mkostemp.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#define _BSD_SOURCE
-#include <stdlib.h>
-#include "libc.h"
-
-int __mkostemps(char *, int, int);
-
-int mkostemp(char *template, int flags)
-{
-	return __mkostemps(template, 0, flags);
-}
-
-LFS64(mkostemp);
diff --git a/src/components/lib/libc/musl-1.1.11/src/temp/mkstemp.c b/src/components/lib/libc/musl-1.1.11/src/temp/mkstemp.c
deleted file mode 100644
index 85764af7cd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/temp/mkstemp.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdlib.h>
-#include "libc.h"
-
-int __mkostemps(char *, int, int);
-
-int mkstemp(char *template)
-{
-	return __mkostemps(template, 0, 0);
-}
-
-LFS64(mkstemp);
diff --git a/src/components/lib/libc/musl-1.1.11/src/temp/mkstemps.c b/src/components/lib/libc/musl-1.1.11/src/temp/mkstemps.c
deleted file mode 100644
index fda710b0d9..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/temp/mkstemps.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#define _BSD_SOURCE
-#include <stdlib.h>
-#include "libc.h"
-
-int __mkostemps(char *, int, int);
-
-int mkstemps(char *template, int len)
-{
-	return __mkostemps(template, len, 0);
-}
-
-LFS64(mkstemps);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__futex.c b/src/components/lib/libc/musl-1.1.11/src/thread/__futex.c
deleted file mode 100644
index 96307c0888..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/__futex.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "futex.h"
-#include "syscall.h"
-
-int __futex(volatile int *addr, int op, int val, void *ts)
-{
-	return syscall(SYS_futex, addr, op, val, ts);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__lock.c b/src/components/lib/libc/musl-1.1.11/src/thread/__lock.c
deleted file mode 100644
index 0874c04a4c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/__lock.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "pthread_impl.h"
-
-void __lock(volatile int *l)
-{
-	if (libc.threads_minus_1)
-		while (a_swap(l, 1)) __wait(l, l+1, 1, 1);
-}
-
-void __unlock(volatile int *l)
-{
-	if (l[0]) {
-		a_store(l, 0);
-		if (l[1]) __wake(l, 1, 1);
-	}
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__timedwait.c b/src/components/lib/libc/musl-1.1.11/src/thread/__timedwait.c
deleted file mode 100644
index 13d8465a45..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/__timedwait.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <pthread.h>
-#include <time.h>
-#include <errno.h>
-#include "futex.h"
-#include "syscall.h"
-#include "pthread_impl.h"
-
-int __pthread_setcancelstate(int, int *);
-int __clock_gettime(clockid_t, struct timespec *);
-
-int __timedwait_cp(volatile int *addr, int val,
-	clockid_t clk, const struct timespec *at, int priv)
-{
-	int r;
-	struct timespec to, *top=0;
-
-	if (priv) priv = 128;
-
-	if (at) {
-		if (at->tv_nsec >= 1000000000UL) return EINVAL;
-		if (__clock_gettime(clk, &to)) return EINVAL;
-		to.tv_sec = at->tv_sec - to.tv_sec;
-		if ((to.tv_nsec = at->tv_nsec - to.tv_nsec) < 0) {
-			to.tv_sec--;
-			to.tv_nsec += 1000000000;
-		}
-		if (to.tv_sec < 0) return ETIMEDOUT;
-		top = &to;
-	}
-
-	r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT|priv, val, top);
-	if (r == ENOSYS) r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT, val, top);
-	if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0;
-
-	return r;
-}
-
-int __timedwait(volatile int *addr, int val,
-	clockid_t clk, const struct timespec *at, int priv)
-{
-	int cs, r;
-	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-	r = __timedwait_cp(addr, val, clk, at, priv);
-	__pthread_setcancelstate(cs, 0);
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__tls_get_addr.c b/src/components/lib/libc/musl-1.1.11/src/thread/__tls_get_addr.c
deleted file mode 100644
index 84a413d4a8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/__tls_get_addr.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stddef.h>
-#include "pthread_impl.h"
-
-void *__tls_get_addr(size_t *v)
-{
-	pthread_t self = __pthread_self();
-#ifdef SHARED
-	__attribute__((__visibility__("hidden")))
-	void *__tls_get_new(size_t *);
-	if (v[0]<=(size_t)self->dtv[0])
-		return (char *)self->dtv[v[0]]+v[1]+DTP_OFFSET;
-	return __tls_get_new(v);
-#else
-	return (char *)self->dtv[1]+v[1]+DTP_OFFSET;
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__unmapself.c b/src/components/lib/libc/musl-1.1.11/src/thread/__unmapself.c
deleted file mode 100644
index 1d3bee1d9b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/__unmapself.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "pthread_impl.h"
-#include "atomic.h"
-#include "syscall.h"
-/* cheat and reuse CRTJMP macro from dynlink code */
-#include "dynlink.h"
-
-static volatile int lock;
-static void *unmap_base;
-static size_t unmap_size;
-static char shared_stack[256];
-
-static void do_unmap()
-{
-	__syscall(SYS_munmap, unmap_base, unmap_size);
-	__syscall(SYS_exit);
-}
-
-void __unmapself(void *base, size_t size)
-{
-	int tid=__pthread_self()->tid;
-	char *stack = shared_stack + sizeof shared_stack;
-	stack -= (uintptr_t)stack % 16;
-	while (lock || a_cas(&lock, 0, tid))
-		a_spin();
-	__syscall(SYS_set_tid_address, &lock);
-	unmap_base = base;
-	unmap_size = size;
-	CRTJMP(do_unmap, stack);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/__set_thread_area.s
deleted file mode 100644
index 97a80acc6b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/__set_thread_area.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.global __set_thread_area
-.type   __set_thread_area,@function
-__set_thread_area:
-	msr tpidr_el0,x0
-	mov w0,#0
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/clone.s
deleted file mode 100644
index 50af913ce6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/clone.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// __clone(func, stack, flags, arg, ptid, tls, ctid)
-//         x0,   x1,    w2,    x3,  x4,   x5,  x6
-
-// syscall(SYS_clone, flags, stack, ptid, tls, ctid)
-//         x8,        x0,    x1,    x2,   x3,  x4
-
-.global __clone
-.type   __clone,%function
-__clone:
-	// align stack and save func,arg
-	and x1,x1,#-16
-	stp x0,x3,[x1,#-16]!
-
-	// syscall
-	uxtw x0,w2
-	mov x2,x4
-	mov x3,x5
-	mov x4,x6
-	mov x8,#220 // SYS_clone
-	svc #0
-
-	cbz x0,1f
-	// parent
-	ret
-	// child
-1:	ldp x1,x0,[sp],#16
-	blr x1
-	mov x8,#93 // SYS_exit
-	svc #0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/syscall_cp.s
deleted file mode 100644
index 30e677ce52..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/syscall_cp.s
+++ /dev/null
@@ -1,33 +0,0 @@
-// __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z)
-//                  x0             x1  x2 x3 x4 x5 x6 x7
-
-// syscall(nr, u, v, w, x, y, z)
-//         x8  x0 x1 x2 x3 x4 x5
-
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-.type __syscall_cp_asm,%function
-__syscall_cp_asm:
-__cp_begin:
-	ldr w0,[x0]
-	cbnz w0,1f
-	mov x8,x1
-	mov x0,x2
-	mov x1,x3
-	mov x2,x4
-	mov x3,x5
-	mov x4,x6
-	mov x5,x7
-	svc 0
-__cp_end:
-	ret
-
-	// cbnz might not be able to jump far enough
-1:	b __cancel
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/arm/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/arm/__set_thread_area.s
deleted file mode 100644
index 4a4cd0d8f6..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/arm/__set_thread_area.s
+++ /dev/null
@@ -1 +0,0 @@
-/* Replaced by C code in arch/arm/src */
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/arm/__unmapself.s b/src/components/lib/libc/musl-1.1.11/src/thread/arm/__unmapself.s
deleted file mode 100644
index 62ebb7c189..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/arm/__unmapself.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.text
-.global __unmapself
-.type   __unmapself,%function
-__unmapself:
-	mov r7,#91
-	svc 0
-	mov r7,#1
-	svc 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/arm/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/arm/clone.s
deleted file mode 100644
index d146999bda..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/arm/clone.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.text
-.global __clone
-.type   __clone,%function
-__clone:
-	stmfd sp!,{r4,r5,r6,r7}
-	mov r7,#120
-	mov r6,r3
-	mov r5,r0
-	mov r0,r2
-	and r1,r1,#-16
-	ldr r2,[sp,#16]
-	ldr r3,[sp,#20]
-	ldr r4,[sp,#24]
-	svc 0
-	tst r0,r0
-	beq 1f
-	ldmfd sp!,{r4,r5,r6,r7}
-	tst lr,#1
-	moveq pc,lr
-	bx lr
-
-1:	mov r0,r6
-	tst r5,#1
-	bne 1f
-	mov lr,pc
-	mov pc,r5
-2:	mov r7,#1
-	svc 0
-
-1:	mov lr,pc
-	bx r5
-	b 2b
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/arm/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/arm/syscall_cp.s
deleted file mode 100644
index 96ce6135ec..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/arm/syscall_cp.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-.type __syscall_cp_asm,%function
-__syscall_cp_asm:
-	mov ip,sp
-	stmfd sp!,{r4,r5,r6,r7,lr}
-__cp_begin:
-	ldr r0,[r0]
-	cmp r0,#0
-	blne __cp_cancel
-	mov r7,r1
-	mov r0,r2
-	mov r1,r3
-	ldmfd ip,{r2,r3,r4,r5,r6}
-	svc 0
-__cp_end:
-	ldmfd sp!,{r4,r5,r6,r7,lr}
-	tst lr,#1
-	moveq pc,lr
-	bx lr
-__cp_cancel:
-	ldmfd sp!,{r4,r5,r6,r7,lr}
-	b __cancel
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/call_once.c b/src/components/lib/libc/musl-1.1.11/src/thread/call_once.c
deleted file mode 100644
index a7bc93532b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/call_once.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <threads.h>
-
-int __pthread_once(once_flag *, void (*)(void));
-
-void call_once(once_flag *flag, void (*func)(void))
-{
-	__pthread_once(flag, func);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_broadcast.c b/src/components/lib/libc/musl-1.1.11/src/thread/cnd_broadcast.c
deleted file mode 100644
index 85d4d3ead3..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_broadcast.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <threads.h>
-
-int __private_cond_signal(cnd_t *, int);
-
-int cnd_broadcast(cnd_t *c)
-{
-	/* This internal function never fails, and always returns zero,
-	 * which matches the value thrd_success is defined with. */
-	return __private_cond_signal(c, -1);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_signal.c b/src/components/lib/libc/musl-1.1.11/src/thread/cnd_signal.c
deleted file mode 100644
index 1211260b4b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_signal.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <threads.h>
-
-int __private_cond_signal(cnd_t *, int);
-
-int cnd_signal(cnd_t *c)
-{
-	/* This internal function never fails, and always returns zero,
-	 * which matches the value thrd_success is defined with. */
-	return __private_cond_signal(c, 1);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_timedwait.c b/src/components/lib/libc/musl-1.1.11/src/thread/cnd_timedwait.c
deleted file mode 100644
index 599767937d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_timedwait.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <threads.h>
-#include <errno.h>
-
-int __pthread_cond_timedwait(cnd_t *restrict, mtx_t *restrict, const struct timespec *restrict);
-
-int cnd_timedwait(cnd_t *restrict c, mtx_t *restrict m, const struct timespec *restrict ts)
-{
-	int ret = __pthread_cond_timedwait(c, m, ts);
-	switch (ret) {
-	/* May also return EINVAL or EPERM. */
-	default:        return thrd_error;
-	case 0:         return thrd_success;
-	case ETIMEDOUT: return thrd_timedout;
-	}
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/i386/tls.s b/src/components/lib/libc/musl-1.1.11/src/thread/i386/tls.s
deleted file mode 100644
index 76d5d46253..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/i386/tls.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.text
-.global ___tls_get_addr
-.type ___tls_get_addr,@function
-___tls_get_addr:
-	mov %gs:4,%edx
-	mov (%eax),%ecx
-	cmp %ecx,(%edx)
-	jc 1f
-	mov 4(%eax),%eax
-	add (%edx,%ecx,4),%eax
-	ret
-1:	push %eax
-.weak __tls_get_new
-.hidden __tls_get_new
-	call __tls_get_new
-	pop %edx
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/__set_thread_area.s
deleted file mode 100644
index 21dc1e1fd5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/__set_thread_area.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.global __set_thread_area
-.type   __set_thread_area,@function
-__set_thread_area:
-	ori      r21, r5, 0
-	rtsd     r15, 8
-	ori      r3, r0, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/clone.s
deleted file mode 100644
index 13448a33a8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/clone.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.global __clone
-.type   __clone,@function
-
-# r5, r6, r7, r8, r9, r10, stack
-# fn, st, fl, ar, pt, tl, ct
-# fl, st, __, pt, ct, tl
-
-__clone:
-	andi    r6, r6, -16
-	addi    r6, r6, -16
-	swi     r5, r6, 0
-	swi     r8, r6, 4
-
-	ori     r5, r7, 0
-	ori     r8, r9, 0
-	lwi     r9, r1, 28
-	ori     r12, r0, 120
-
-	brki    r14, 8
-	beqi	r3, 1f
-	rtsd    r15, 8
-	nop
-
-1:	lwi     r3, r1, 0
-	lwi     r5, r1, 4
-	brald   r15, r3
-	nop
-	ori     r12, r0, 1
-	brki    r14, 8
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/syscall_cp.s
deleted file mode 100644
index 51599c912a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/syscall_cp.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-.type   __syscall_cp_asm,@function
-__syscall_cp_asm:
-__cp_begin:
-	lwi     r5, r5, 0
-	bnei    r5, __cancel
-	addi    r12, r6, 0
-	add     r5, r7, r0
-	add     r6, r8, r0
-	add     r7, r9, r0
-	add     r8, r10, r0
-	lwi     r9, r1, 28
-	lwi     r10, r1, 32
-	brki    r14, 0x8
-__cp_end:
-	rtsd    r15, 8
-	nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mips/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/mips/clone.s
deleted file mode 100644
index 37dddf57ba..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/mips/clone.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noreorder
-.global __clone
-.type   __clone,@function
-__clone:
-	# Save function pointer and argument pointer on new thread stack
-	and $5, $5, -8
-	subu $5, $5, 16
-	sw $4, 0($5)
-	sw $7, 4($5)
-	# Shuffle (fn,sp,fl,arg,ptid,tls,ctid) to (fl,sp,ptid,tls,ctid)
-	move $4, $6
-	lw $6, 16($sp)
-	lw $7, 20($sp)
-	lw $9, 24($sp)
-	subu $sp, $sp, 16
-	sw $9, 16($sp)
-	li $2, 4120
-	syscall
-	beq $7, $0, 1f
-	nop
-	addu $sp, $sp, 16
-	jr $ra
-	subu $2, $0, $2
-1:	beq $2, $0, 1f
-	nop
-	addu $sp, $sp, 16
-	jr $ra
-	nop
-1:	lw $25, 0($sp)
-	lw $4, 4($sp)
-	jr $25
-	nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mips/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/mips/syscall_cp.s
deleted file mode 100644
index 8f76d40e1e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/mips/syscall_cp.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set    noreorder
-
-.global __cp_begin
-.hidden __cp_begin
-.type   __cp_begin,@function
-.global __cp_end
-.hidden __cp_end
-.type   __cp_end,@function
-.global __cp_cancel
-.hidden __cp_cancel
-.type   __cp_cancel,@function
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-.type   __syscall_cp_asm,@function
-__syscall_cp_asm:
-	subu    $sp, $sp, 32
-__cp_begin:
-	lw      $4, 0($4)
-	bne     $4, $0, __cp_cancel
-	move    $2, $5
-	move    $4, $6
-	move    $5, $7
-	lw      $6, 48($sp)
-	lw      $7, 52($sp)
-	lw      $8, 56($sp)
-	lw      $9, 60($sp)
-	lw      $10,64($sp)
-	sw      $8, 16($sp)
-	sw      $9, 20($sp)
-	sw      $10,24($sp)
-	sw      $2, 28($sp)
-	lw      $2, 28($sp)
-	syscall
-__cp_end:
-	beq     $7, $0, 1f
-	addu    $sp, $sp, 32
-	subu    $2, $0, $2
-1:	jr      $ra
-	nop
-
-__cp_cancel:
-	addu    $sp, $sp, 32
-	lw      $25, %call16(__cancel)($gp)
-	jr      $25
-	nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_timedlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/mtx_timedlock.c
deleted file mode 100644
index bcc152c564..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_timedlock.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <threads.h>
-#include <errno.h>
-
-int __pthread_mutex_timedlock(mtx_t *restrict, const struct timespec *restrict);
-
-int mtx_timedlock(mtx_t *restrict m, const struct timespec *restrict ts)
-{
-	int ret = __pthread_mutex_timedlock(m, ts);
-	switch (ret) {
-	default:        return thrd_error;
-	case 0:         return thrd_success;
-	case ETIMEDOUT: return thrd_timedout;
-	}
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/or1k/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/or1k/__set_thread_area.s
deleted file mode 100644
index 44c5d459b0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/or1k/__set_thread_area.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.global __set_thread_area
-.type   __set_thread_area,@function
-__set_thread_area:
-	l.ori	r10, r3, 0
-	l.jr	r9
-	 l.ori	r11, r0, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/or1k/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/or1k/clone.s
deleted file mode 100644
index 02f380bd5f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/or1k/clone.s
+++ /dev/null
@@ -1,30 +0,0 @@
-/* int clone(fn, stack, flags, arg, ptid, tls, ctid)
- *           r3  r4     r5     r6   sp+0  sp+4 sp+8
- * sys_clone(flags, stack, ptid, ctid, tls)
- */
-.global __clone
-.type   __clone,@function
-__clone:
-	l.addi	r4, r4, -8
-	l.sw	0(r4), r3
-	l.sw	4(r4), r6
-	/* (fn, st, fl, ar, pt, tl, ct) => (fl, st, pt, ct, tl) */
-	l.ori	r3, r5, 0
-	l.lwz	r5, 0(r1)
-	l.lwz	r6, 8(r1)
-	l.lwz	r7, 4(r1)
-	l.ori	r11, r0, 220 /* __NR_clone */
-	l.sys	1
-
-	l.sfeqi	r11, 0
-	l.bf	1f
-	 l.nop
-	l.jr	r9
-	 l.nop
-
-1:	l.lwz	r11, 0(r1)
-	l.jalr	r11
-	 l.lwz	r3, 4(r1)
-
-	l.ori	r11, r0, 93 /* __NR_exit */
-	l.sys	1
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/or1k/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/or1k/syscall_cp.s
deleted file mode 100644
index 2c0bf0e8ff..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/or1k/syscall_cp.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-.type   __syscall_cp_asm,@function
-__syscall_cp_asm:
-__cp_begin:
-	l.lwz	r3, 0(r3)
-	l.sfeqi	r3, 0
-	l.bnf	__cancel
-	 l.ori	r11, r4, 0
-	l.ori	r3, r5, 0
-	l.ori	r4, r6, 0
-	l.ori	r5, r7, 0
-	l.ori	r6, r8, 0
-	l.lwz	r7, 0(r1)
-	l.lwz	r8, 4(r1)
-	l.sys	1
-__cp_end:
-	l.jr	r9
-	 l.nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/__set_thread_area.s
deleted file mode 100644
index c1a34c1f8e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/__set_thread_area.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.text
-.global __set_thread_area
-.type   __set_thread_area, %function
-__set_thread_area:
-	# mov pointer in reg3 into r2
-	mr 2, 3
-	# put 0 into return reg
-	li 3, 0
-	# return
-	blr
-
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/clone.s
deleted file mode 100644
index dc5c74c646..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/clone.s
+++ /dev/null
@@ -1,67 +0,0 @@
-.text
-.global __clone
-.type __clone, %function
-__clone:
-# int clone(fn, stack, flags, arg, ptid, tls, ctid)
-#            a  b       c     d     e    f    g
-#            3  4       5     6     7    8    9
-# pseudo C code:
-# tid = syscall(SYS_clone,c,b,e,f,g);
-# if (!tid) syscall(SYS_exit, a(d));
-# return tid;
-
-# SYS_clone = 120
-# SYS_exit = 1
-
-# store non-volatile regs r30, r31 on stack in order to put our
-# start func and its arg there
-stwu 30, -16(1)
-stw 31, 4(1)
-
-# save r3 (func) into r30, and r6(arg) into r31
-mr 30, 3
-mr 31, 6
-
-#move c into first arg
-mr 3, 5
-#mr 4, 4
-mr 5, 7
-mr 6, 8
-mr 7, 9
-
-# move syscall number into r0    
-li 0, 120
-
-sc
-
-# check for syscall error
-bns+ 1f # jump to label 1 if no summary overflow.
-#else
-neg 3, 3 #negate the result (errno)
-1:
-# compare sc result with 0
-cmpwi cr7, 3, 0
-
-# if not 0, jump to end
-bne cr7, 2f
-
-#else: we're the child
-#call funcptr: move arg (d) into r3
-mr 3, 31
-#move r30 (funcptr) into CTR reg
-mtctr 30
-# call CTR reg
-bctrl
-# mov SYS_exit into r0 (the exit param is already in r3)
-li 0, 1
-sc
-
-2:
-
-# restore stack
-lwz 30, 0(1)
-lwz 31, 4(1)
-addi 1, 1, 16
-
-blr
-
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/syscall_cp.s
deleted file mode 100644
index 20b5e0acc2..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/syscall_cp.s
+++ /dev/null
@@ -1,57 +0,0 @@
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-
-#r0: volatile. may be modified during linkage.
-#r1: stack frame: 16 byte alignment.
-#r2: tls/thread pointer on pp32
-#r3,r4: return values, first args
-#r5-r10: args
-#r11-r12: volatile. may be modified during linkage
-#r13: "small data area" pointer
-#r14 - r30: local vars
-#r31: local or environment pointer
-
-#r1, r14-31: belong to the caller, must be saved and restored
-#r0, r3-r12, ctr, xer: volatile, not preserved
-#r0,r11,r12: may be altered by cross-module call, 
-#"a func cannot depend on that these regs have the values placed by the caller"
-
-#the fields CR2,CR2,CR4 of the cond reg must be preserved
-#LR (link reg) shall contain the funcs return address
-	.text
-	.type   __syscall_cp_asm,%function
-__syscall_cp_asm:
-	# at enter: r3 = pointer to self->cancel, r4: syscall no, r5: first arg, r6: 2nd, r7: 3rd, r8: 4th, r9: 5th, r10: 6th
-__cp_begin:
-	# r3 holds first argument, its a pointer to self->cancel. 
-	# we must compare the dereferenced value with 0 and jump to __cancel if its not
-	
-	lwz 0, 0(3) #deref pointer into r0
-	
-	cmpwi cr7, 0, 0 #compare r0 with 0, store result in cr7. 
-	beq+ cr7, 1f #jump to label 1 if r0 was 0
-	
-	b __cancel #else call cancel 
-1:
-	#ok, the cancel flag was not set
-	# syscall: number goes to r0, the rest 3-8
-	mr      0, 4                  # put the system call number into r0
-	mr      3, 5                  # Shift the arguments: arg1
-	mr      4, 6                  # arg2
-	mr      5, 7                  # arg3
-	mr      6, 8                  # arg4
-	mr      7, 9                  # arg5
-	mr      8, 10                  # arg6
-	sc
-__cp_end:
-	bnslr+ # return if no summary overflow. 
-	#else negate result.
-	neg 3, 3
-	blr
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_init.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_init.c
deleted file mode 100644
index 969e0a3805..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_init.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_attr_init(pthread_attr_t *a)
-{
-	*a = (pthread_attr_t){0};
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cancel.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cancel.c
deleted file mode 100644
index 0151a1ae5f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cancel.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <string.h>
-#include "pthread_impl.h"
-#include "syscall.h"
-#include "libc.h"
-
-#ifdef SHARED
-__attribute__((__visibility__("hidden")))
-#endif
-long __cancel(), __cp_cancel(), __syscall_cp_asm(), __syscall_cp_c();
-
-long __cancel()
-{
-	pthread_t self = __pthread_self();
-	if (self->canceldisable == PTHREAD_CANCEL_ENABLE || self->cancelasync)
-		pthread_exit(PTHREAD_CANCELED);
-	self->canceldisable = PTHREAD_CANCEL_DISABLE;
-	return -ECANCELED;
-}
-
-/* If __syscall_cp_asm has adjusted the stack pointer, it must provide a
- * definition of __cp_cancel to undo those adjustments and call __cancel.
- * Otherwise, __cancel provides a definition for __cp_cancel. */
-
-weak_alias(__cancel, __cp_cancel);
-
-long __syscall_cp_asm(volatile void *, syscall_arg_t,
-                      syscall_arg_t, syscall_arg_t, syscall_arg_t,
-                      syscall_arg_t, syscall_arg_t, syscall_arg_t);
-
-long __syscall_cp_c(syscall_arg_t nr,
-                    syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
-                    syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
-{
-	pthread_t self;
-	long r;
-	int st;
-
-	if ((st=(self=__pthread_self())->canceldisable)
-	    && (st==PTHREAD_CANCEL_DISABLE || nr==SYS_close))
-		return __syscall(nr, u, v, w, x, y, z);
-
-	r = __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z);
-	if (r==-EINTR && nr!=SYS_close && self->cancel &&
-	    self->canceldisable != PTHREAD_CANCEL_DISABLE)
-		r = __cancel();
-	return r;
-}
-
-static void _sigaddset(sigset_t *set, int sig)
-{
-	unsigned s = sig-1;
-	set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1);
-}
-
-#ifdef SHARED
-__attribute__((__visibility__("hidden")))
-#endif
-extern const char __cp_begin[1], __cp_end[1];
-
-static void cancel_handler(int sig, siginfo_t *si, void *ctx)
-{
-	pthread_t self = __pthread_self();
-	ucontext_t *uc = ctx;
-	const char *ip = ((char **)&uc->uc_mcontext)[CANCEL_REG_IP];
-
-	a_barrier();
-	if (!self->cancel || self->canceldisable == PTHREAD_CANCEL_DISABLE) return;
-
-	_sigaddset(&uc->uc_sigmask, SIGCANCEL);
-
-	if (self->cancelasync || ip >= __cp_begin && ip < __cp_end) {
-		((char **)&uc->uc_mcontext)[CANCEL_REG_IP] = (char *)__cp_cancel;
-		return;
-	}
-
-	__syscall(SYS_tkill, self->tid, SIGCANCEL);
-}
-
-void __testcancel()
-{
-	pthread_t self = __pthread_self();
-	if (self->cancel && !self->canceldisable)
-		__cancel();
-}
-
-static void init_cancellation()
-{
-	struct sigaction sa = {
-		.sa_flags = SA_SIGINFO | SA_RESTART,
-		.sa_sigaction = cancel_handler
-	};
-	memset(&sa.sa_mask, -1, _NSIG/8);
-	__libc_sigaction(SIGCANCEL, &sa, 0);
-}
-
-int pthread_cancel(pthread_t t)
-{
-	static int init;
-	if (!init) {
-		init_cancellation();
-		init = 1;
-	}
-	a_store(&t->cancel, 1);
-	return pthread_kill(t, SIGCANCEL);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_create.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_create.c
deleted file mode 100644
index e7df34a949..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_create.c
+++ /dev/null
@@ -1,304 +0,0 @@
-#define _GNU_SOURCE
-#include "pthread_impl.h"
-#include "stdio_impl.h"
-#include "libc.h"
-#include <sys/mman.h>
-#include <string.h>
-#include <stddef.h>
-
-void *__mmap(void *, size_t, int, int, int, off_t);
-int __munmap(void *, size_t);
-int __mprotect(void *, size_t, int);
-
-static void dummy_0()
-{
-}
-weak_alias(dummy_0, __acquire_ptc);
-weak_alias(dummy_0, __release_ptc);
-weak_alias(dummy_0, __pthread_tsd_run_dtors);
-weak_alias(dummy_0, __do_orphaned_stdio_locks);
-weak_alias(dummy_0, __dl_thread_cleanup);
-
-_Noreturn void __pthread_exit(void *result)
-{
-	pthread_t self = __pthread_self();
-	sigset_t set;
-
-	self->canceldisable = 1;
-	self->cancelasync = 0;
-	self->result = result;
-
-	while (self->cancelbuf) {
-		void (*f)(void *) = self->cancelbuf->__f;
-		void *x = self->cancelbuf->__x;
-		self->cancelbuf = self->cancelbuf->__next;
-		f(x);
-	}
-
-	__pthread_tsd_run_dtors();
-
-	__lock(self->exitlock);
-
-	/* Mark this thread dead before decrementing count */
-	__lock(self->killlock);
-	self->dead = 1;
-
-	/* Block all signals before decrementing the live thread count.
-	 * This is important to ensure that dynamically allocated TLS
-	 * is not under-allocated/over-committed, and possibly for other
-	 * reasons as well. */
-	__block_all_sigs(&set);
-
-	/* Wait to unlock the kill lock, which governs functions like
-	 * pthread_kill which target a thread id, until signals have
-	 * been blocked. This precludes observation of the thread id
-	 * as a live thread (with application code running in it) after
-	 * the thread was reported dead by ESRCH being returned. */
-	__unlock(self->killlock);
-
-	/* It's impossible to determine whether this is "the last thread"
-	 * until performing the atomic decrement, since multiple threads
-	 * could exit at the same time. For the last thread, revert the
-	 * decrement and unblock signals to give the atexit handlers and
-	 * stdio cleanup code a consistent state. */
-	if (a_fetch_add(&libc.threads_minus_1, -1)==0) {
-		libc.threads_minus_1 = 0;
-		__restore_sigs(&set);
-		exit(0);
-	}
-
-	/* Process robust list in userspace to handle non-pshared mutexes
-	 * and the detached thread case where the robust list head will
-	 * be invalid when the kernel would process it. */
-	__vm_lock();
-	volatile void *volatile *rp;
-	while ((rp=self->robust_list.head) && rp != &self->robust_list.head) {
-		pthread_mutex_t *m = (void *)((char *)rp
-			- offsetof(pthread_mutex_t, _m_next));
-		int waiters = m->_m_waiters;
-		int priv = (m->_m_type & 128) ^ 128;
-		self->robust_list.pending = rp;
-		self->robust_list.head = *rp;
-		int cont = a_swap(&m->_m_lock, self->tid|0x40000000);
-		self->robust_list.pending = 0;
-		if (cont < 0 || waiters)
-			__wake(&m->_m_lock, 1, priv);
-	}
-	__vm_unlock();
-
-	__do_orphaned_stdio_locks();
-	__dl_thread_cleanup();
-
-	if (self->detached && self->map_base) {
-		/* Detached threads must avoid the kernel clear_child_tid
-		 * feature, since the virtual address will have been
-		 * unmapped and possibly already reused by a new mapping
-		 * at the time the kernel would perform the write. In
-		 * the case of threads that started out detached, the
-		 * initial clone flags are correct, but if the thread was
-		 * detached later (== 2), we need to clear it here. */
-		if (self->detached == 2) __syscall(SYS_set_tid_address, 0);
-
-		/* Robust list will no longer be valid, and was already
-		 * processed above, so unregister it with the kernel. */
-		if (self->robust_list.off)
-			__syscall(SYS_set_robust_list, 0, 3*sizeof(long));
-
-		/* Since __unmapself bypasses the normal munmap code path,
-		 * explicitly wait for vmlock holders first. */
-		__vm_wait();
-
-		/* The following call unmaps the thread's stack mapping
-		 * and then exits without touching the stack. */
-		__unmapself(self->map_base, self->map_size);
-	}
-
-	for (;;) __syscall(SYS_exit, 0);
-}
-
-void __do_cleanup_push(struct __ptcb *cb)
-{
-	struct pthread *self = __pthread_self();
-	cb->__next = self->cancelbuf;
-	self->cancelbuf = cb;
-}
-
-void __do_cleanup_pop(struct __ptcb *cb)
-{
-	__pthread_self()->cancelbuf = cb->__next;
-}
-
-static int start(void *p)
-{
-	pthread_t self = p;
-	if (self->startlock[0]) {
-		__wait(self->startlock, 0, 1, 1);
-		if (self->startlock[0]) {
-			self->detached = 2;
-			pthread_exit(0);
-		}
-		__restore_sigs(self->sigmask);
-	}
-	if (self->unblock_cancel)
-		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
-			SIGPT_SET, 0, _NSIG/8);
-	__pthread_exit(self->start(self->start_arg));
-	return 0;
-}
-
-static int start_c11(void *p)
-{
-	pthread_t self = p;
-	int (*start)(void*) = (int(*)(void*)) self->start;
-	__pthread_exit((void *)(uintptr_t)start(self->start_arg));
-	return 0;
-}
-
-#define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
-
-/* pthread_key_create.c overrides this */
-static volatile size_t dummy = 0;
-weak_alias(dummy, __pthread_tsd_size);
-static void *dummy_tsd[1] = { 0 };
-weak_alias(dummy_tsd, __pthread_tsd_main);
-
-volatile int __block_new_threads = 0;
-
-static FILE *volatile dummy_file = 0;
-weak_alias(dummy_file, __stdin_used);
-weak_alias(dummy_file, __stdout_used);
-weak_alias(dummy_file, __stderr_used);
-
-static void init_file_lock(FILE *f)
-{
-	if (f && f->lock<0) f->lock = 0;
-}
-
-void *__copy_tls(unsigned char *);
-
-int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp, void *(*entry)(void *), void *restrict arg)
-{
-	int ret, c11 = (attrp == __ATTRP_C11_THREAD);
-	size_t size, guard;
-	struct pthread *self, *new;
-	unsigned char *map = 0, *stack = 0, *tsd = 0, *stack_limit;
-	unsigned flags = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND
-		| CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS
-		| CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED;
-	int do_sched = 0;
-	pthread_attr_t attr = {0};
-
-	if (!libc.can_do_threads) return ENOSYS;
-	self = __pthread_self();
-	if (!libc.threaded) {
-		for (FILE *f=*__ofl_lock(); f; f=f->next)
-			init_file_lock(f);
-		__ofl_unlock();
-		init_file_lock(__stdin_used);
-		init_file_lock(__stdout_used);
-		init_file_lock(__stderr_used);
-		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, _NSIG/8);
-		self->tsd = (void **)__pthread_tsd_main;
-		libc.threaded = 1;
-	}
-	if (attrp && !c11) attr = *attrp;
-
-	__acquire_ptc();
-	if (__block_new_threads) __wait(&__block_new_threads, 0, 1, 1);
-
-	if (attr._a_stackaddr) {
-		size_t need = libc.tls_size + __pthread_tsd_size;
-		size = attr._a_stacksize + DEFAULT_STACK_SIZE;
-		stack = (void *)(attr._a_stackaddr & -16);
-		stack_limit = (void *)(attr._a_stackaddr - size);
-		/* Use application-provided stack for TLS only when
-		 * it does not take more than ~12% or 2k of the
-		 * application's stack space. */
-		if (need < size/8 && need < 2048) {
-			tsd = stack - __pthread_tsd_size;
-			stack = tsd - libc.tls_size;
-			memset(stack, 0, need);
-		} else {
-			size = ROUND(need);
-			guard = 0;
-		}
-	} else {
-		guard = ROUND(DEFAULT_GUARD_SIZE + attr._a_guardsize);
-		size = guard + ROUND(DEFAULT_STACK_SIZE + attr._a_stacksize
-			+ libc.tls_size +  __pthread_tsd_size);
-	}
-
-	if (!tsd) {
-		if (guard) {
-			map = __mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANON, -1, 0);
-			if (map == MAP_FAILED) goto fail;
-			if (__mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)
-			    && errno != ENOSYS) {
-				__munmap(map, size);
-				goto fail;
-			}
-		} else {
-			map = __mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
-			if (map == MAP_FAILED) goto fail;
-		}
-		tsd = map + size - __pthread_tsd_size;
-		if (!stack) {
-			stack = tsd - libc.tls_size;
-			stack_limit = map + guard;
-		}
-	}
-
-	new = __copy_tls(tsd - libc.tls_size);
-	new->map_base = map;
-	new->map_size = size;
-	new->stack = stack;
-	new->stack_size = stack - stack_limit;
-	new->start = entry;
-	new->start_arg = arg;
-	new->self = new;
-	new->tsd = (void *)tsd;
-	new->locale = &libc.global_locale;
-	if (attr._a_detach) {
-		new->detached = 1;
-		flags -= CLONE_CHILD_CLEARTID;
-	}
-	if (attr._a_sched) {
-		do_sched = new->startlock[0] = 1;
-		__block_app_sigs(new->sigmask);
-	}
-	new->robust_list.head = &new->robust_list.head;
-	new->unblock_cancel = self->cancel;
-	new->CANARY = self->CANARY;
-
-	a_inc(&libc.threads_minus_1);
-	ret = __clone((c11 ? start_c11 : start), stack, flags, new, &new->tid, TP_ADJ(new), &new->tid);
-
-	__release_ptc();
-
-	if (do_sched) {
-		__restore_sigs(new->sigmask);
-	}
-
-	if (ret < 0) {
-		a_dec(&libc.threads_minus_1);
-		if (map) __munmap(map, size);
-		return EAGAIN;
-	}
-
-	if (do_sched) {
-		ret = __syscall(SYS_sched_setscheduler, new->tid,
-			attr._a_policy, &attr._a_prio);
-		a_store(new->startlock, ret<0 ? 2 : 0);
-		__wake(new->startlock, 1, 1);
-		if (ret < 0) return -ret;
-	}
-
-	*res = new;
-	return 0;
-fail:
-	__release_ptc();
-	return EAGAIN;
-}
-
-weak_alias(__pthread_exit, pthread_exit);
-weak_alias(__pthread_create, pthread_create);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_detach.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_detach.c
deleted file mode 100644
index ed77f74d52..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_detach.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "pthread_impl.h"
-#include <threads.h>
-
-int __pthread_join(pthread_t, void **);
-
-static int __pthread_detach(pthread_t t)
-{
-	/* Cannot detach a thread that's already exiting */
-	if (a_swap(t->exitlock, 1))
-		return __pthread_join(t, 0);
-	t->detached = 2;
-	__unlock(t->exitlock);
-	return 0;
-}
-
-weak_alias(__pthread_detach, pthread_detach);
-weak_alias(__pthread_detach, thrd_detach);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_join.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_join.c
deleted file mode 100644
index 966b4ab0d1..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_join.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "pthread_impl.h"
-#include <sys/mman.h>
-
-int __munmap(void *, size_t);
-void __pthread_testcancel(void);
-int __pthread_setcancelstate(int, int *);
-
-int __pthread_join(pthread_t t, void **res)
-{
-	int tmp, cs;
-	__pthread_testcancel();
-	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-	if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
-	while ((tmp = t->tid)) __timedwait_cp(&t->tid, tmp, 0, 0, 0);
-	__pthread_setcancelstate(cs, 0);
-	if (res) *res = t->result;
-	if (t->map_base) __munmap(t->map_base, t->map_size);
-	return 0;
-}
-
-weak_alias(__pthread_join, pthread_join);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_key_create.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_key_create.c
deleted file mode 100644
index a78e507a6f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_key_create.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "pthread_impl.h"
-
-volatile size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
-void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
-
-static void (*volatile keys[PTHREAD_KEYS_MAX])(void *);
-
-static void nodtor(void *dummy)
-{
-}
-
-int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
-{
-	unsigned i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX;
-	unsigned j = i;
-	pthread_t self = __pthread_self();
-
-	/* This can only happen in the main thread before
-	 * pthread_create has been called. */
-	if (!self->tsd) self->tsd = __pthread_tsd_main;
-
-	if (!dtor) dtor = nodtor;
-	do {
-		if (!a_cas_p(keys+j, 0, (void *)dtor)) {
-			*k = j;
-			return 0;
-		}
-	} while ((j=(j+1)%PTHREAD_KEYS_MAX) != i);
-	return EAGAIN;
-}
-
-int __pthread_key_delete(pthread_key_t k)
-{
-	keys[k] = 0;
-	return 0;
-}
-
-void __pthread_tsd_run_dtors()
-{
-	pthread_t self = __pthread_self();
-	int i, j, not_finished = self->tsd_used;
-	for (j=0; not_finished && j<PTHREAD_DESTRUCTOR_ITERATIONS; j++) {
-		not_finished = 0;
-		for (i=0; i<PTHREAD_KEYS_MAX; i++) {
-			if (self->tsd[i] && keys[i]) {
-				void *tmp = self->tsd[i];
-				self->tsd[i] = 0;
-				keys[i](tmp);
-				not_finished = 1;
-			}
-		}
-	}
-}
-
-weak_alias(__pthread_key_delete, pthread_key_delete);
-weak_alias(__pthread_key_create, pthread_key_create);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_kill.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_kill.c
deleted file mode 100644
index acdb1ea617..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_kill.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_kill(pthread_t t, int sig)
-{
-	int r;
-	__lock(t->killlock);
-	r = t->dead ? ESRCH : -__syscall(SYS_tkill, t->tid, sig);
-	__unlock(t->killlock);
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_consistent.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_consistent.c
deleted file mode 100644
index 96b83b5285..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_consistent.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_mutex_consistent(pthread_mutex_t *m)
-{
-	if (!(m->_m_type & 8)) return EINVAL;
-	if ((m->_m_lock & 0x7fffffff) != __pthread_self()->tid)
-		return EPERM;
-	m->_m_type &= ~8U;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_lock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_lock.c
deleted file mode 100644
index d0c93cab50..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_lock.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "pthread_impl.h"
-
-int __pthread_mutex_timedlock(pthread_mutex_t *restrict, const struct timespec *restrict);
-
-int __pthread_mutex_lock(pthread_mutex_t *m)
-{
-	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
-	    && !a_cas(&m->_m_lock, 0, EBUSY))
-		return 0;
-
-	return __pthread_mutex_timedlock(m, 0);
-}
-
-weak_alias(__pthread_mutex_lock, pthread_mutex_lock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_timedlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_timedlock.c
deleted file mode 100644
index 0a240e7913..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_timedlock.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "pthread_impl.h"
-
-int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at)
-{
-	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
-	    && !a_cas(&m->_m_lock, 0, EBUSY))
-		return 0;
-
-	int r, t, priv = (m->_m_type & 128) ^ 128;
-
-	r = pthread_mutex_trylock(m);
-	if (r != EBUSY) return r;
-	
-	int spins = 100;
-	while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
-
-	while ((r=pthread_mutex_trylock(m)) == EBUSY) {
-		if (!(r=m->_m_lock) || ((r&0x40000000) && (m->_m_type&4)))
-			continue;
-		if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK
-		 && (r&0x7fffffff) == __pthread_self()->tid)
-			return EDEADLK;
-
-		a_inc(&m->_m_waiters);
-		t = r | 0x80000000;
-		a_cas(&m->_m_lock, r, t);
-		r = __timedwait(&m->_m_lock, t, CLOCK_REALTIME, at, priv);
-		a_dec(&m->_m_waiters);
-		if (r && r != EINTR) break;
-	}
-	return r;
-}
-
-weak_alias(__pthread_mutex_timedlock, pthread_mutex_timedlock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_trylock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_trylock.c
deleted file mode 100644
index 0df3ce2982..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_trylock.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "pthread_impl.h"
-
-int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
-{
-	int old, own;
-	int type = m->_m_type & 15;
-	pthread_t self = __pthread_self();
-	int tid = self->tid;
-
-	old = m->_m_lock;
-	own = old & 0x7fffffff;
-	if (own == tid && (type&3) == PTHREAD_MUTEX_RECURSIVE) {
-		if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN;
-		m->_m_count++;
-		return 0;
-	}
-	if (own == 0x40000000) return ENOTRECOVERABLE;
-
-	if (m->_m_type & 128) {
-		if (!self->robust_list.off) {
-			self->robust_list.off = (char*)&m->_m_lock-(char *)&m->_m_next;
-			__syscall(SYS_set_robust_list, &self->robust_list, 3*sizeof(long));
-		}
-		if (m->_m_waiters) tid |= 0x80000000;
-		self->robust_list.pending = &m->_m_next;
-	}
-
-	if ((own && (!(own & 0x40000000) || !(type & 4)))
-	    || a_cas(&m->_m_lock, old, tid) != old) {
-		self->robust_list.pending = 0;
-		return EBUSY;
-	}
-
-	volatile void *next = self->robust_list.head;
-	m->_m_next = next;
-	m->_m_prev = &self->robust_list.head;
-	if (next != &self->robust_list.head) *(volatile void *volatile *)
-		((char *)next - sizeof(void *)) = &m->_m_next;
-	self->robust_list.head = &m->_m_next;
-	self->robust_list.pending = 0;
-
-	if (own) {
-		m->_m_count = 0;
-		m->_m_type |= 8;
-		return EOWNERDEAD;
-	}
-
-	return 0;
-}
-
-int __pthread_mutex_trylock(pthread_mutex_t *m)
-{
-	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL)
-		return a_cas(&m->_m_lock, 0, EBUSY) & EBUSY;
-	return __pthread_mutex_trylock_owner(m);
-}
-
-weak_alias(__pthread_mutex_trylock, pthread_mutex_trylock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_unlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_unlock.c
deleted file mode 100644
index 02da92a96b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_unlock.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "pthread_impl.h"
-
-int __pthread_mutex_unlock(pthread_mutex_t *m)
-{
-	pthread_t self;
-	int waiters = m->_m_waiters;
-	int cont;
-	int type = m->_m_type & 15;
-	int priv = (m->_m_type & 128) ^ 128;
-
-	if (type != PTHREAD_MUTEX_NORMAL) {
-		self = __pthread_self();
-		if ((m->_m_lock&0x7fffffff) != self->tid)
-			return EPERM;
-		if ((type&3) == PTHREAD_MUTEX_RECURSIVE && m->_m_count)
-			return m->_m_count--, 0;
-		if (!priv) {
-			self->robust_list.pending = &m->_m_next;
-			__vm_lock();
-		}
-		volatile void *prev = m->_m_prev;
-		volatile void *next = m->_m_next;
-		*(volatile void *volatile *)prev = next;
-		if (next != &self->robust_list.head) *(volatile void *volatile *)
-			((char *)next - sizeof(void *)) = prev;
-	}
-	cont = a_swap(&m->_m_lock, (type & 8) ? 0x40000000 : 0);
-	if (type != PTHREAD_MUTEX_NORMAL && !priv) {
-		self->robust_list.pending = 0;
-		__vm_unlock();
-	}
-	if (waiters || cont<0)
-		__wake(&m->_m_lock, 1, priv);
-	return 0;
-}
-
-weak_alias(__pthread_mutex_unlock, pthread_mutex_unlock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setprotocol.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setprotocol.c
deleted file mode 100644
index c92a31c8a4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setprotocol.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_mutexattr_setprotocol(pthread_mutexattr_t *a, int protocol)
-{
-	if (protocol) return ENOTSUP;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setrobust.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setrobust.c
deleted file mode 100644
index dcfa4cf1c7..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setrobust.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_mutexattr_setrobust(pthread_mutexattr_t *a, int robust)
-{
-	if (robust > 1U) return EINVAL;
-	a->__attr &= ~4;
-	a->__attr |= robust*4;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_rdlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_rdlock.c
deleted file mode 100644
index 0800d21ffd..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_rdlock.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_rwlock_rdlock(pthread_rwlock_t *rw)
-{
-	return pthread_rwlock_timedrdlock(rw, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_timedrdlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_timedrdlock.c
deleted file mode 100644
index 0d5d0d6c05..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_timedrdlock.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
-{
-	int r, t;
-
-	r = pthread_rwlock_tryrdlock(rw);
-	if (r != EBUSY) return r;
-	
-	int spins = 100;
-	while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
-
-	while ((r=pthread_rwlock_tryrdlock(rw))==EBUSY) {
-		if (!(r=rw->_rw_lock) || (r&0x7fffffff)!=0x7fffffff) continue;
-		t = r | 0x80000000;
-		a_inc(&rw->_rw_waiters);
-		a_cas(&rw->_rw_lock, r, t);
-		r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, rw->_rw_shared^128);
-		a_dec(&rw->_rw_waiters);
-		if (r && r != EINTR) return r;
-	}
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_timedwrlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_timedwrlock.c
deleted file mode 100644
index 7f26dad1f5..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_timedwrlock.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
-{
-	int r, t;
-	
-	r = pthread_rwlock_trywrlock(rw);
-	if (r != EBUSY) return r;
-	
-	int spins = 100;
-	while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
-
-	while ((r=pthread_rwlock_trywrlock(rw))==EBUSY) {
-		if (!(r=rw->_rw_lock)) continue;
-		t = r | 0x80000000;
-		a_inc(&rw->_rw_waiters);
-		a_cas(&rw->_rw_lock, r, t);
-		r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, rw->_rw_shared^128);
-		a_dec(&rw->_rw_waiters);
-		if (r && r != EINTR) return r;
-	}
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_tryrdlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_tryrdlock.c
deleted file mode 100644
index fa271fcc6a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_tryrdlock.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_rwlock_tryrdlock(pthread_rwlock_t *rw)
-{
-	int val, cnt;
-	do {
-		val = rw->_rw_lock;
-		cnt = val & 0x7fffffff;
-		if (cnt == 0x7fffffff) return EBUSY;
-		if (cnt == 0x7ffffffe) return EAGAIN;
-	} while (a_cas(&rw->_rw_lock, val, val+1) != val);
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_trywrlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_trywrlock.c
deleted file mode 100644
index bb3d3a992d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_trywrlock.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_rwlock_trywrlock(pthread_rwlock_t *rw)
-{
-	if (a_cas(&rw->_rw_lock, 0, 0x7fffffff)) return EBUSY;
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_wrlock.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_wrlock.c
deleted file mode 100644
index 7f33535c7d..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_wrlock.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_rwlock_wrlock(pthread_rwlock_t *rw)
-{
-	return pthread_rwlock_timedwrlock(rw, 0);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setschedparam.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setschedparam.c
deleted file mode 100644
index c4738d643b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setschedparam.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_setschedparam(pthread_t t, int policy, const struct sched_param *param)
-{
-	int r;
-	__lock(t->killlock);
-	r = t->dead ? ESRCH : -__syscall(SYS_sched_setscheduler, t->tid, policy, param);
-	__unlock(t->killlock);
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setschedprio.c b/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setschedprio.c
deleted file mode 100644
index e0bdc03b84..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setschedprio.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "pthread_impl.h"
-
-int pthread_setschedprio(pthread_t t, int prio)
-{
-	int r;
-	__lock(t->killlock);
-	r = t->dead ? ESRCH : -__syscall(SYS_sched_setparam, t->tid, &prio);
-	__unlock(t->killlock);
-	return r;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sh/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/sh/__set_thread_area.s
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sh/__unmapself.s b/src/components/lib/libc/musl-1.1.11/src/thread/sh/__unmapself.s
deleted file mode 100644
index 0161d53d42..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/sh/__unmapself.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.text
-.global __unmapself_sh_mmu
-.type   __unmapself_sh_mmu, @function
-__unmapself_sh_mmu:
-	mov   #91, r3  ! SYS_munmap
-	trapa #31
-
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-
-	mov   #1, r3   ! SYS_exit
-	mov   #0, r4
-	trapa #31
-
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
-	or    r0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sh/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/sh/clone.s
deleted file mode 100644
index f8ad8451e8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/sh/clone.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.text
-.global __clone
-.type   __clone, @function
-__clone:
-! incoming: fn stack flags arg ptid tls      ctid
-!           r4 r5    r6    r7  @r15 @(4,r15) @(8,r15)
-
-	mov   #-16, r0
-	and   r0, r5
-
-	mov   r4, r1         ! r1 = fn
-	mov   r7, r2         ! r2 = arg
-
-	mov   #120,     r3   ! r3 = __NR_clone
-	mov   r6,       r4   ! r4 = flags
-	!mov  r5,       r5   ! r5 = stack
-	mov.l @r15,     r6   ! r6 = ptid
-	mov.l @(8,r15), r7   ! r7 = ctid
-	mov.l @(4,r15), r0   ! r0 = tls
-	trapa #31
-
-	or r0, r0
-	or r0, r0
-	or r0, r0
-	or r0, r0
-	or r0, r0
-
-	cmp/eq #0, r0
-	bt     1f
-
-	! we are the parent, return
-	rts
-	 nop
-
-1:	! we are the child, call fn(arg)
-	jsr    @r1
-	 mov   r2, r4
-
-	mov   #1, r3   ! __NR_exit
-	mov   r0, r4
-	trapa #31
-
-	or   r0, r0
-	or   r0, r0
-	or   r0, r0
-	or   r0, r0
-	or   r0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sh/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/sh/syscall_cp.s
deleted file mode 100644
index c3caface8f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/sh/syscall_cp.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.text
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-.type   __syscall_cp_asm, @function
-__syscall_cp_asm:
-
-__cp_begin:
-	mov.l @r4, r4
-	tst   r4, r4
-	bt    2f
-
-	mov.l L1, r0
-	braf  r0
-	 nop
-1:
-
-.align 2
-L1:	.long __cancel@PLT-(1b-.)
-
-2:	mov   r5, r3
-	mov   r6, r4
-	mov   r7, r5
-	mov.l @r15, r6
-	mov.l @(4,r15), r7
-	mov.l @(8,r15), r0
-	mov.l @(12,r15), r1
-	trapa #31
-
-__cp_end:
-	! work around hardware bug
-	or   r0, r0
-	or   r0, r0
-	or   r0, r0
-	or   r0, r0
-	or   r0, r0
-
-	rts
-	 nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/synccall.c b/src/components/lib/libc/musl-1.1.11/src/thread/synccall.c
deleted file mode 100644
index 000ec4e353..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/synccall.c
+++ /dev/null
@@ -1,178 +0,0 @@
-#include "pthread_impl.h"
-#include <semaphore.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include "futex.h"
-#include "atomic.h"
-#include "../dirent/__dirent.h"
-
-static struct chain {
-	struct chain *next;
-	int tid;
-	sem_t target_sem, caller_sem;
-} *volatile head;
-
-static volatile int synccall_lock[2];
-static volatile int target_tid;
-static void (*callback)(void *), *context;
-static volatile int dummy = 0;
-weak_alias(dummy, __block_new_threads);
-
-static void handler(int sig)
-{
-	struct chain ch;
-	int old_errno = errno;
-
-	sem_init(&ch.target_sem, 0, 0);
-	sem_init(&ch.caller_sem, 0, 0);
-
-	ch.tid = __syscall(SYS_gettid);
-
-	do ch.next = head;
-	while (a_cas_p(&head, ch.next, &ch) != ch.next);
-
-	if (a_cas(&target_tid, ch.tid, 0) == (ch.tid | 0x80000000))
-		__syscall(SYS_futex, &target_tid, FUTEX_UNLOCK_PI|FUTEX_PRIVATE);
-
-	sem_wait(&ch.target_sem);
-	callback(context);
-	sem_post(&ch.caller_sem);
-	sem_wait(&ch.target_sem);
-
-	errno = old_errno;
-}
-
-void __synccall(void (*func)(void *), void *ctx)
-{
-	sigset_t oldmask;
-	int cs, i, r, pid, self;;
-	DIR dir = {0};
-	struct dirent *de;
-	struct sigaction sa = { .sa_flags = 0, .sa_handler = handler };
-	struct chain *cp, *next;
-	struct timespec ts;
-
-	/* Blocking signals in two steps, first only app-level signals
-	 * before taking the lock, then all signals after taking the lock,
-	 * is necessary to achieve AS-safety. Blocking them all first would
-	 * deadlock if multiple threads called __synccall. Waiting to block
-	 * any until after the lock would allow re-entry in the same thread
-	 * with the lock already held. */
-	__block_app_sigs(&oldmask);
-	LOCK(synccall_lock);
-	__block_all_sigs(0);
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-
-	head = 0;
-
-	if (!libc.threaded) goto single_threaded;
-
-	callback = func;
-	context = ctx;
-
-	/* This atomic store ensures that any signaled threads will see the
-	 * above stores, and prevents more than a bounded number of threads,
-	 * those already in pthread_create, from creating new threads until
-	 * the value is cleared to zero again. */
-	a_store(&__block_new_threads, 1);
-
-	/* Block even implementation-internal signals, so that nothing
-	 * interrupts the SIGSYNCCALL handlers. The main possible source
-	 * of trouble is asynchronous cancellation. */
-	memset(&sa.sa_mask, -1, sizeof sa.sa_mask);
-	__libc_sigaction(SIGSYNCCALL, &sa, 0);
-
-	pid = __syscall(SYS_getpid);
-	self = __syscall(SYS_gettid);
-
-	/* Since opendir is not AS-safe, the DIR needs to be setup manually
-	 * in automatic storage. Thankfully this is easy. */
-	dir.fd = open("/proc/self/task", O_RDONLY|O_DIRECTORY|O_CLOEXEC);
-	if (dir.fd < 0) goto out;
-
-	/* Initially send one signal per counted thread. But since we can't
-	 * synchronize with thread creation/exit here, there could be too
-	 * few signals. This initial signaling is just an optimization, not
-	 * part of the logic. */
-	for (i=libc.threads_minus_1; i; i--)
-		__syscall(SYS_kill, pid, SIGSYNCCALL);
-
-	/* Loop scanning the kernel-provided thread list until it shows no
-	 * threads that have not already replied to the signal. */
-	for (;;) {
-		int miss_cnt = 0;
-		while ((de = readdir(&dir))) {
-			if (!isdigit(de->d_name[0])) continue;
-			int tid = atoi(de->d_name);
-			if (tid == self || !tid) continue;
-
-			/* Set the target thread as the PI futex owner before
-			 * checking if it's in the list of caught threads. If it
-			 * adds itself to the list after we check for it, then
-			 * it will see its own tid in the PI futex and perform
-			 * the unlock operation. */
-			a_store(&target_tid, tid);
-
-			/* Thread-already-caught is a success condition. */
-			for (cp = head; cp && cp->tid != tid; cp=cp->next);
-			if (cp) continue;
-
-			r = -__syscall(SYS_tgkill, pid, tid, SIGSYNCCALL);
-
-			/* Target thread exit is a success condition. */
-			if (r == ESRCH) continue;
-
-			/* The FUTEX_LOCK_PI operation is used to loan priority
-			 * to the target thread, which otherwise may be unable
-			 * to run. Timeout is necessary because there is a race
-			 * condition where the tid may be reused by a different
-			 * process. */
-			clock_gettime(CLOCK_REALTIME, &ts);
-			ts.tv_nsec += 10000000;
-			if (ts.tv_nsec >= 1000000000) {
-				ts.tv_sec++;
-				ts.tv_nsec -= 1000000000;
-			}
-			r = -__syscall(SYS_futex, &target_tid,
-				FUTEX_LOCK_PI|FUTEX_PRIVATE, 0, &ts);
-
-			/* Obtaining the lock means the thread responded. ESRCH
-			 * means the target thread exited, which is okay too. */
-			if (!r || r == ESRCH) continue;
-
-			miss_cnt++;
-		}
-		if (!miss_cnt) break;
-		rewinddir(&dir);
-	}
-	close(dir.fd);
-
-	/* Serialize execution of callback in caught threads. */
-	for (cp=head; cp; cp=cp->next) {
-		sem_post(&cp->target_sem);
-		sem_wait(&cp->caller_sem);
-	}
-
-	sa.sa_handler = SIG_IGN;
-	__libc_sigaction(SIGSYNCCALL, &sa, 0);
-
-single_threaded:
-	func(ctx);
-
-	/* Only release the caught threads once all threads, including the
-	 * caller, have returned from the callback function. */
-	for (cp=head; cp; cp=next) {
-		next = cp->next;
-		sem_post(&cp->target_sem);
-	}
-
-out:
-	a_store(&__block_new_threads, 0);
-	__wake(&__block_new_threads, -1, 1);
-
-	pthread_setcancelstate(cs, 0);
-	UNLOCK(synccall_lock);
-	__restore_sigs(&oldmask);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_create.c b/src/components/lib/libc/musl-1.1.11/src/thread/thrd_create.c
deleted file mode 100644
index e033669526..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_create.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "pthread_impl.h"
-#include <threads.h>
-
-int __pthread_create(pthread_t *restrict, const pthread_attr_t *restrict, void *(*)(void *), void *restrict);
-
-int thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
-{
-	int ret = __pthread_create(thr, __ATTRP_C11_THREAD, (void *(*)(void *))func, arg);
-	switch (ret) {
-	case 0:      return thrd_success;
-	case EAGAIN: return thrd_nomem;
-	default:     return thrd_error;
-	}
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_exit.c b/src/components/lib/libc/musl-1.1.11/src/thread/thrd_exit.c
deleted file mode 100644
index b66bd99695..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_exit.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "pthread_impl.h"
-#include <threads.h>
-
-_Noreturn void __pthread_exit(void *);
-
-_Noreturn void thrd_exit(int result)
-{
-	__pthread_exit((void*)(intptr_t)result);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/tss_delete.c b/src/components/lib/libc/musl-1.1.11/src/thread/tss_delete.c
deleted file mode 100644
index 35db1032dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/tss_delete.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <threads.h>
-
-int __pthread_key_delete(tss_t k);
-
-void tss_delete(tss_t key)
-{
-	__pthread_key_delete(key);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x32/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/x32/__set_thread_area.s
deleted file mode 100644
index e0daf72f5f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/x32/__set_thread_area.s
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
-.text
-.global __set_thread_area
-.type __set_thread_area,@function
-__set_thread_area:
-	mov %edi,%esi           /* shift for syscall */
-	movl $0x1002,%edi       /* SET_FS register */
-	movl $0x4000009e,%eax          /* set fs segment to */
-	syscall                 /* arch_prctl(SET_FS, arg)*/
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x32/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/x32/clone.s
deleted file mode 100644
index eed461510b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/x32/clone.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.text
-.global __clone
-.type   __clone,@function
-__clone:
-	movl $0x40000038,%eax /* SYS_clone */
-	mov %rdi,%r11
-	mov %rdx,%rdi
-	mov %r8,%rdx
-	mov %r9,%r8
-	mov 8(%rsp),%r10
-	mov %r11,%r9
-	and $-16,%rsi
-	sub $8,%rsi
-	mov %rcx,(%rsi)
-	syscall
-	test %eax,%eax
-	jnz 1f
-	xor %ebp,%ebp
-	pop %rdi
-	call *%r9
-	mov %eax,%edi
-	movl $0x4000003c,%eax /* SYS_exit */
-	syscall
-	hlt
-1:	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x32/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/x32/syscall_cp.s
deleted file mode 100644
index 79709a550a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/x32/syscall_cp.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.text
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_internal
-.hidden __syscall_cp_internal
-.type   __syscall_cp_internal,@function
-__syscall_cp_internal:
-
-__cp_begin:
-	mov (%rdi),%eax
-	test %eax,%eax
-	jnz __cancel
-	mov %rdi,%r11
-	mov %rsi,%rax
-	mov %rdx,%rdi
-	mov %rcx,%rsi
-	mov %r8,%rdx
-	mov %r9,%r10
-	mov 8(%rsp),%r8
-	mov 16(%rsp),%r9
-	mov %r11,8(%rsp)
-	syscall
-__cp_end:
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/__set_thread_area.s b/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/__set_thread_area.s
deleted file mode 100644
index f3ff4f61bf..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/__set_thread_area.s
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
-.text
-.global __set_thread_area
-.type __set_thread_area,@function
-__set_thread_area:
-	mov %rdi,%rsi           /* shift for syscall */
-	movl $0x1002,%edi       /* SET_FS register */
-	movl $158,%eax          /* set fs segment to */
-	syscall                 /* arch_prctl(SET_FS, arg)*/
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/clone.s b/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/clone.s
deleted file mode 100644
index ee59903a2e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/clone.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.text
-.global __clone
-.type   __clone,@function
-__clone:
-	xor %eax,%eax
-	mov $56,%al
-	mov %rdi,%r11
-	mov %rdx,%rdi
-	mov %r8,%rdx
-	mov %r9,%r8
-	mov 8(%rsp),%r10
-	mov %r11,%r9
-	and $-16,%rsi
-	sub $8,%rsi
-	mov %rcx,(%rsi)
-	syscall
-	test %eax,%eax
-	jnz 1f
-	xor %ebp,%ebp
-	pop %rdi
-	call *%r9
-	mov %eax,%edi
-	xor %eax,%eax
-	mov $60,%al
-	syscall
-	hlt
-1:	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/syscall_cp.s b/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/syscall_cp.s
deleted file mode 100644
index 1a0fd5d20c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/syscall_cp.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.text
-.global __cp_begin
-.hidden __cp_begin
-.global __cp_end
-.hidden __cp_end
-.global __cp_cancel
-.hidden __cp_cancel
-.hidden __cancel
-.global __syscall_cp_asm
-.hidden __syscall_cp_asm
-.type   __syscall_cp_asm,@function
-__syscall_cp_asm:
-
-__cp_begin:
-	mov (%rdi),%eax
-	test %eax,%eax
-	jnz __cancel
-	mov %rdi,%r11
-	mov %rsi,%rax
-	mov %rdx,%rdi
-	mov %rcx,%rsi
-	mov %r8,%rdx
-	mov %r9,%r10
-	mov 8(%rsp),%r8
-	mov 16(%rsp),%r9
-	mov %r11,8(%rsp)
-	syscall
-__cp_end:
-	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/__asctime.c b/src/components/lib/libc/musl-1.1.11/src/time/__asctime.c
deleted file mode 100644
index e7e7f07e2e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/__asctime.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <time.h>
-#include <stdio.h>
-#include <langinfo.h>
-#include "atomic.h"
-
-const char *__nl_langinfo(nl_item);
-
-char *__asctime(const struct tm *restrict tm, char *restrict buf)
-{
-	/* FIXME: change __nl_langinfo to __nl_langinfo_l with explicit C
-	 * locale once we have locales */
-	if (snprintf(buf, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
-		__nl_langinfo(ABDAY_1+tm->tm_wday),
-		__nl_langinfo(ABMON_1+tm->tm_mon),
-		tm->tm_mday, tm->tm_hour,
-		tm->tm_min, tm->tm_sec,
-		1900 + tm->tm_year) >= 26)
-	{
-		/* ISO C requires us to use the above format string,
-		 * even if it will not fit in the buffer. Thus asctime_r
-		 * is _supposed_ to crash if the fields in tm are too large.
-		 * We follow this behavior and crash "gracefully" to warn
-		 * application developers that they may not be so lucky
-		 * on other implementations (e.g. stack smashing..).
-		 */
-		a_crash();
-	}
-	return buf;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/__map_file.c b/src/components/lib/libc/musl-1.1.11/src/time/__map_file.c
deleted file mode 100644
index d06a581472..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/__map_file.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "syscall.h"
-
-void *__mmap(void *, size_t, int, int, int, off_t);
-
-const char unsigned *__map_file(const char *pathname, size_t *size)
-{
-	struct stat st;
-	const unsigned char *map = MAP_FAILED;
-	int fd = __sys_open(pathname, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
-	if (fd < 0) return 0;
-	if (!__syscall(SYS_fstat, fd, &st))
-		map = __mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	__syscall(SYS_close, fd);
-	*size = st.st_size;
-	return map == MAP_FAILED ? 0 : map;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/asctime.c b/src/components/lib/libc/musl-1.1.11/src/time/asctime.c
deleted file mode 100644
index 3102eb8738..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/asctime.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <time.h>
-
-char *__asctime(const struct tm *, char *);
-
-char *asctime(const struct tm *tm)
-{
-	static char buf[26];
-	return __asctime(tm, buf);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/asctime_r.c b/src/components/lib/libc/musl-1.1.11/src/time/asctime_r.c
deleted file mode 100644
index 7dfbb12103..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/asctime_r.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <time.h>
-
-char *__asctime(const struct tm *restrict, char *restrict);
-
-char *asctime_r(const struct tm *restrict tm, char *restrict buf)
-{
-	return __asctime(tm, buf);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/clock_getres.c b/src/components/lib/libc/musl-1.1.11/src/time/clock_getres.c
deleted file mode 100644
index 36a0d695b0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/clock_getres.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <time.h>
-#include "syscall.h"
-
-int clock_getres(clockid_t clk, struct timespec *ts)
-{
-	return syscall(SYS_clock_getres, clk, ts);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/clock_gettime.c b/src/components/lib/libc/musl-1.1.11/src/time/clock_gettime.c
deleted file mode 100644
index 1572de0ef0..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/clock_gettime.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <time.h>
-#include <errno.h>
-#include <stdint.h>
-#include "syscall.h"
-#include "libc.h"
-#include "atomic.h"
-
-static int sc_clock_gettime(clockid_t clk, struct timespec *ts)
-{
-	int r = __syscall(SYS_clock_gettime, clk, ts);
-	if (!r) return r;
-	if (r == -ENOSYS) {
-		if (clk == CLOCK_REALTIME) {
-			__syscall(SYS_gettimeofday, ts, 0);
-			ts->tv_nsec = (int)ts->tv_nsec * 1000;
-			return 0;
-		}
-		r = -EINVAL;
-	}
-	errno = -r;
-	return -1;
-}
-
-void *__vdsosym(const char *, const char *);
-
-int __clock_gettime(clockid_t clk, struct timespec *ts)
-{
-#ifdef VDSO_CGT_SYM
-	static int (*volatile cgt)(clockid_t, struct timespec *);
-	if (!cgt) {
-		void *f = __vdsosym(VDSO_CGT_VER, VDSO_CGT_SYM);
-		if (!f) f = (void *)sc_clock_gettime;
-		a_cas_p(&cgt, 0, f);
-	}
-	return cgt(clk, ts);
-#else
-	return sc_clock_gettime(clk, ts);
-#endif
-}
-
-weak_alias(__clock_gettime, clock_gettime);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/clock_nanosleep.c b/src/components/lib/libc/musl-1.1.11/src/time/clock_nanosleep.c
deleted file mode 100644
index ec87b9e332..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/clock_nanosleep.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <time.h>
-#include "syscall.h"
-#include "libc.h"
-
-int clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct timespec *rem)
-{
-	return -__syscall_cp(SYS_clock_nanosleep, clk, flags, req, rem);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/clock_settime.c b/src/components/lib/libc/musl-1.1.11/src/time/clock_settime.c
deleted file mode 100644
index 66b8162d72..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/clock_settime.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <time.h>
-#include "syscall.h"
-
-int clock_settime(clockid_t clk, const struct timespec *ts)
-{
-	return syscall(SYS_clock_settime, clk, ts);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/ctime.c b/src/components/lib/libc/musl-1.1.11/src/time/ctime.c
deleted file mode 100644
index 185ec5543b..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/ctime.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <time.h>
-
-char *ctime(const time_t *t)
-{
-	return asctime(localtime(t));
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/ctime_r.c b/src/components/lib/libc/musl-1.1.11/src/time/ctime_r.c
deleted file mode 100644
index d2260a165a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/ctime_r.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <time.h>
-
-char *ctime_r(const time_t *t, char *buf)
-{
-	struct tm tm;
-	localtime_r(t, &tm);
-	return asctime_r(&tm, buf);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/gmtime.c b/src/components/lib/libc/musl-1.1.11/src/time/gmtime.c
deleted file mode 100644
index 3791b24c66..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/gmtime.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "time_impl.h"
-#include <errno.h>
-
-struct tm *__gmtime_r(const time_t *restrict, struct tm *restrict);
-
-struct tm *gmtime(const time_t *t)
-{
-	static struct tm tm;
-	return __gmtime_r(t, &tm);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/localtime.c b/src/components/lib/libc/musl-1.1.11/src/time/localtime.c
deleted file mode 100644
index bb6718c33f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/localtime.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "time_impl.h"
-
-struct tm *__localtime_r(const time_t *restrict, struct tm *restrict);
-
-struct tm *localtime(const time_t *t)
-{
-	static struct tm tm;
-	return __localtime_r(t, &tm);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/nanosleep.c b/src/components/lib/libc/musl-1.1.11/src/time/nanosleep.c
deleted file mode 100644
index a2ff483942..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/nanosleep.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <time.h>
-#include "syscall.h"
-#include "libc.h"
-
-int nanosleep(const struct timespec *req, struct timespec *rem)
-{
-	return syscall_cp(SYS_nanosleep, req, rem);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/strftime.c b/src/components/lib/libc/musl-1.1.11/src/time/strftime.c
deleted file mode 100644
index e945bb7d16..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/strftime.c
+++ /dev/null
@@ -1,270 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <langinfo.h>
-#include <locale.h>
-#include <time.h>
-#include <limits.h>
-#include "locale_impl.h"
-#include "libc.h"
-#include "time_impl.h"
-
-const char *__nl_langinfo_l(nl_item, locale_t);
-
-static int is_leap(int y)
-{
-	/* Avoid overflow */
-	if (y>INT_MAX-1900) y -= 2000;
-	y += 1900;
-	return !(y%4) && ((y%100) || !(y%400));
-}
-
-static int week_num(const struct tm *tm)
-{
-	int val = (tm->tm_yday + 7 - (tm->tm_wday+6)%7) / 7;
-	/* If 1 Jan is just 1-3 days past Monday,
-	 * the previous week is also in this year. */
-	if ((tm->tm_wday - tm->tm_yday - 2 + 371) % 7 <= 2)
-		val++;
-	if (!val) {
-		val = 52;
-		/* If 31 December of prev year a Thursday,
-		 * or Friday of a leap year, then the
-		 * prev year has 53 weeks. */
-		int dec31 = (tm->tm_wday - tm->tm_yday - 1 + 7) % 7;
-		if (dec31 == 4 || (dec31 == 5 && is_leap(tm->tm_year%400-1)))
-			val++;
-	} else if (val == 53) {
-		/* If 1 January is not a Thursday, and not
-		 * a Wednesday of a leap year, then this
-		 * year has only 52 weeks. */
-		int jan1 = (tm->tm_wday - tm->tm_yday + 371) % 7;
-		if (jan1 != 4 && (jan1 != 3 || !is_leap(tm->tm_year)))
-			val = 1;
-	}
-	return val;
-}
-
-const char *__tm_to_tzname(const struct tm *);
-size_t __strftime_l(char *restrict, size_t, const char *restrict, const struct tm *restrict, locale_t);
-
-const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc)
-{
-	nl_item item;
-	long long val;
-	const char *fmt;
-	int width = 2;
-
-	switch (f) {
-	case 'a':
-		item = ABDAY_1 + tm->tm_wday;
-		goto nl_strcat;
-	case 'A':
-		item = DAY_1 + tm->tm_wday;
-		goto nl_strcat;
-	case 'h':
-	case 'b':
-		item = ABMON_1 + tm->tm_mon;
-		goto nl_strcat;
-	case 'B':
-		item = MON_1 + tm->tm_mon;
-		goto nl_strcat;
-	case 'c':
-		item = D_T_FMT;
-		goto nl_strftime;
-	case 'C':
-		val = (1900LL+tm->tm_year) / 100;
-		goto number;
-	case 'd':
-		val = tm->tm_mday;
-		goto number;
-	case 'D':
-		fmt = "%m/%d/%y";
-		goto recu_strftime;
-	case 'e':
-		*l = snprintf(*s, sizeof *s, "%2d", tm->tm_mday);
-		return *s;
-	case 'F':
-		fmt = "%Y-%m-%d";
-		goto recu_strftime;
-	case 'g':
-	case 'G':
-		val = tm->tm_year + 1900LL;
-		if (tm->tm_yday < 3 && week_num(tm) != 1) val--;
-		else if (tm->tm_yday > 360 && week_num(tm) == 1) val++;
-		if (f=='g') val %= 100;
-		else width = 4;
-		goto number;
-	case 'H':
-		val = tm->tm_hour;
-		goto number;
-	case 'I':
-		val = tm->tm_hour;
-		if (!val) val = 12;
-		else if (val > 12) val -= 12;
-		goto number;
-	case 'j':
-		val = tm->tm_yday+1;
-		width = 3;
-		goto number;
-	case 'm':
-		val = tm->tm_mon+1;
-		goto number;
-	case 'M':
-		val = tm->tm_min;
-		goto number;
-	case 'n':
-		*l = 1;
-		return "\n";
-	case 'p':
-		item = tm->tm_hour >= 12 ? PM_STR : AM_STR;
-		goto nl_strcat;
-	case 'r':
-		item = T_FMT_AMPM;
-		goto nl_strftime;
-	case 'R':
-		fmt = "%H:%M";
-		goto recu_strftime;
-	case 's':
-		val = __tm_to_secs(tm) - tm->__tm_gmtoff;
-		width = 1;
-		goto number;
-	case 'S':
-		val = tm->tm_sec;
-		goto number;
-	case 't':
-		*l = 1;
-		return "\t";
-	case 'T':
-		fmt = "%H:%M:%S";
-		goto recu_strftime;
-	case 'u':
-		val = tm->tm_wday ? tm->tm_wday : 7;
-		width = 1;
-		goto number;
-	case 'U':
-		val = (tm->tm_yday + 7 - tm->tm_wday) / 7;
-		goto number;
-	case 'W':
-		val = (tm->tm_yday + 7 - (tm->tm_wday+6)%7) / 7;
-		goto number;
-	case 'V':
-		val = week_num(tm);
-		goto number;
-	case 'w':
-		val = tm->tm_wday;
-		width = 1;
-		goto number;
-	case 'x':
-		item = D_FMT;
-		goto nl_strftime;
-	case 'X':
-		item = T_FMT;
-		goto nl_strftime;
-	case 'y':
-		val = tm->tm_year % 100;
-		goto number;
-	case 'Y':
-		val = tm->tm_year + 1900;
-		if (val >= 10000) {
-			*l = snprintf(*s, sizeof *s, "+%lld", val);
-			return *s;
-		}
-		width = 4;
-		goto number;
-	case 'z':
-		if (tm->tm_isdst < 0) {
-			*l = 0;
-			return "";
-		}
-		*l = snprintf(*s, sizeof *s, "%+.2d%.2d",
-			(tm->__tm_gmtoff)/3600,
-			abs(tm->__tm_gmtoff%3600)/60);
-		return *s;
-	case 'Z':
-		if (tm->tm_isdst < 0) {
-			*l = 0;
-			return "";
-		}
-		fmt = __tm_to_tzname(tm);
-		goto string;
-	case '%':
-		*l = 1;
-		return "%";
-	default:
-		return 0;
-	}
-number:
-	*l = snprintf(*s, sizeof *s, "%0*lld", width, val);
-	return *s;
-nl_strcat:
-	fmt = __nl_langinfo_l(item, loc);
-string:
-	*l = strlen(fmt);
-	return fmt;
-nl_strftime:
-	fmt = __nl_langinfo_l(item, loc);
-recu_strftime:
-	*l = __strftime_l(*s, sizeof *s, fmt, tm, loc);
-	if (!*l) return 0;
-	return *s;
-}
-
-size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm, locale_t loc)
-{
-	size_t l, k;
-	char buf[100];
-	char *p;
-	const char *t;
-	int plus;
-	unsigned long width;
-	for (l=0; l<n; f++) {
-		if (!*f) {
-			s[l] = 0;
-			return l;
-		}
-		if (*f != '%') {
-			s[l++] = *f;
-			continue;
-		}
-		f++;
-		if ((plus = (*f == '+'))) f++;
-		width = strtoul(f, &p, 10);
-		if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') {
-			if (!width && p!=f) width = 1;
-		} else {
-			width = 0;
-		}
-		f = p;
-		if (*f == 'E' || *f == 'O') f++;
-		t = __strftime_fmt_1(&buf, &k, *f, tm, loc);
-		if (!t) break;
-		if (width) {
-			for (; *t=='+' || *t=='-' || (*t=='0'&&t[1]); t++, k--);
-			width--;
-			if (plus && tm->tm_year >= 10000-1900)
-				s[l++] = '+';
-			else if (tm->tm_year < -1900)
-				s[l++] = '-';
-			else
-				width++;
-			for (; width > k && l < n; width--)
-				s[l++] = '0';
-		}
-		if (k > n-l) k = n-l;
-		memcpy(s+l, t, k);
-		l += k;
-	}
-	if (n) {
-		if (l==n) l=n-1;
-		s[l] = 0;
-	}
-	return 0;
-}
-
-size_t strftime(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm)
-{
-	return __strftime_l(s, n, f, tm, CURRENT_LOCALE);
-}
-
-weak_alias(__strftime_l, strftime_l);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/time_impl.h b/src/components/lib/libc/musl-1.1.11/src/time/time_impl.h
deleted file mode 100644
index 2e9a2c096e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/time_impl.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <time.h>
-
-int __days_in_month(int, int);
-int __month_to_secs(int, int);
-long long __year_to_secs(long long, int *);
-long long __tm_to_secs(const struct tm *);
-int __secs_to_tm(long long, struct tm *);
-void __secs_to_zone(long long, int, int *, long *, long *, const char **);
-const unsigned char *__map_file(const char *, size_t *);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/timer_create.c b/src/components/lib/libc/musl-1.1.11/src/time/timer_create.c
deleted file mode 100644
index b54a524ce8..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/timer_create.c
+++ /dev/null
@@ -1,141 +0,0 @@
-#include <time.h>
-#include <setjmp.h>
-#include "pthread_impl.h"
-
-struct ksigevent {
-	union sigval sigev_value;
-	int sigev_signo;
-	int sigev_notify;
-	int sigev_tid;
-};
-
-struct start_args {
-	pthread_barrier_t b;
-	struct sigevent *sev;
-};
-
-static void dummy_1(pthread_t self)
-{
-}
-weak_alias(dummy_1, __pthread_tsd_run_dtors);
-
-void __reset_tls();
-
-static void cleanup_fromsig(void *p)
-{
-	pthread_t self = __pthread_self();
-	__pthread_tsd_run_dtors(self);
-	self->cancel = 0;
-	self->cancelbuf = 0;
-	self->canceldisable = 0;
-	self->cancelasync = 0;
-	self->unblock_cancel = 0;
-	__reset_tls();
-	longjmp(p, 1);
-}
-
-static void timer_handler(int sig, siginfo_t *si, void *ctx)
-{
-	pthread_t self = __pthread_self();
-	jmp_buf jb;
-	void (*notify)(union sigval) = (void (*)(union sigval))self->start;
-	union sigval val = { .sival_ptr = self->start_arg };
-
-	if (!setjmp(jb) && si->si_code == SI_TIMER) {
-		pthread_cleanup_push(cleanup_fromsig, jb);
-		notify(val);
-		pthread_cleanup_pop(1);
-	}
-}
-
-static void install_handler()
-{
-	struct sigaction sa = {
-		.sa_sigaction = timer_handler,
-		.sa_flags = SA_SIGINFO | SA_RESTART
-	};
-	__libc_sigaction(SIGTIMER, &sa, 0);
-}
-
-static void *start(void *arg)
-{
-	pthread_t self = __pthread_self();
-	struct start_args *args = arg;
-	int id;
-
-	/* Reuse no-longer-needed thread structure fields to avoid
-	 * needing the timer address in the signal handler. */
-	self->start = (void *(*)(void *))args->sev->sigev_notify_function;
-	self->start_arg = args->sev->sigev_value.sival_ptr;
-
-	pthread_barrier_wait(&args->b);
-	if ((id = self->timer_id) >= 0) {
-		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
-			SIGTIMER_SET, 0, _NSIG/8);
-		__wait(&self->timer_id, 0, id, 1);
-		__syscall(SYS_timer_delete, id);
-	}
-	return 0;
-}
-
-int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict res)
-{
-	static pthread_once_t once = PTHREAD_ONCE_INIT;
-	pthread_t td;
-	pthread_attr_t attr;
-	int r;
-	struct start_args args;
-	struct ksigevent ksev, *ksevp=0;
-	int timerid;
-	sigset_t set;
-
-	switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
-	case SIGEV_NONE:
-	case SIGEV_SIGNAL:
-		if (evp) {
-			ksev.sigev_value = evp->sigev_value;
-			ksev.sigev_signo = evp->sigev_signo;
-			ksev.sigev_notify = evp->sigev_notify;
-			ksev.sigev_tid = 0;
-			ksevp = &ksev;
-		}
-		if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
-			return -1;
-		*res = (void *)(intptr_t)timerid;
-		break;
-	case SIGEV_THREAD:
-		pthread_once(&once, install_handler);
-		if (evp->sigev_notify_attributes)
-			attr = *evp->sigev_notify_attributes;
-		else
-			pthread_attr_init(&attr);
-		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-		pthread_barrier_init(&args.b, 0, 2);
-		args.sev = evp;
-
-		__block_app_sigs(&set);
-		r = pthread_create(&td, &attr, start, &args);
-		__restore_sigs(&set);
-		if (r) {
-			errno = r;
-			return -1;
-		}
-
-		ksev.sigev_value.sival_ptr = 0;
-		ksev.sigev_signo = SIGTIMER;
-		ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */
-		ksev.sigev_tid = td->tid;
-		if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
-			timerid = -1;
-		td->timer_id = timerid;
-		pthread_barrier_wait(&args.b);
-		if (timerid < 0) return -1;
-		*res = (void *)(INTPTR_MIN | (uintptr_t)td>>1);
-		break;
-	default:
-		errno = EINVAL;
-		return -1;
-	}
-
-	return 0;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/timer_gettime.c b/src/components/lib/libc/musl-1.1.11/src/time/timer_gettime.c
deleted file mode 100644
index ed6d8d65ce..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/timer_gettime.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <time.h>
-#include <limits.h>
-#include "pthread_impl.h"
-
-int timer_gettime(timer_t t, struct itimerspec *val)
-{
-	if ((intptr_t)t < 0) {
-		pthread_t td = (void *)((uintptr_t)t << 1);
-		t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
-	}
-	return syscall(SYS_timer_gettime, t, val);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/timer_settime.c b/src/components/lib/libc/musl-1.1.11/src/time/timer_settime.c
deleted file mode 100644
index 62631aa49c..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/time/timer_settime.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <time.h>
-#include <limits.h>
-#include "pthread_impl.h"
-
-int timer_settime(timer_t t, int flags, const struct itimerspec *restrict val, struct itimerspec *restrict old)
-{
-	if ((intptr_t)t < 0) {
-		pthread_t td = (void *)((uintptr_t)t << 1);
-		t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
-	}
-	return syscall(SYS_timer_settime, t, flags, val, old);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/alarm.c b/src/components/lib/libc/musl-1.1.11/src/unistd/alarm.c
deleted file mode 100644
index 2e3263ac59..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/alarm.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <unistd.h>
-#include <sys/time.h>
-#include "syscall.h"
-
-unsigned alarm(unsigned seconds)
-{
-	struct itimerval it = { .it_value.tv_sec = seconds };
-	__syscall(SYS_setitimer, ITIMER_REAL, &it, &it);
-	return it.it_value.tv_sec + !!it.it_value.tv_usec;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/faccessat.c b/src/components/lib/libc/musl-1.1.11/src/unistd/faccessat.c
deleted file mode 100644
index bcc6636d17..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/faccessat.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include "syscall.h"
-#include "pthread_impl.h"
-
-struct ctx {
-	int fd;
-	const char *filename;
-	int amode;
-};
-
-static const int errors[] = {
-	0, -EACCES, -ELOOP, -ENAMETOOLONG, -ENOENT, -ENOTDIR,
-	-EROFS, -EBADF, -EINVAL, -ETXTBSY,
-	-EFAULT, -EIO, -ENOMEM,
-	-EBUSY
-};
-
-static int checker(void *p)
-{
-	struct ctx *c = p;
-	int ret;
-	int i;
-	if (__syscall(SYS_setregid, __syscall(SYS_getegid), -1)
-	    || __syscall(SYS_setreuid, __syscall(SYS_geteuid), -1))
-		__syscall(SYS_exit, 1);
-	ret = __syscall(SYS_faccessat, c->fd, c->filename, c->amode, 0);
-	for (i=0; i < sizeof errors/sizeof *errors - 1 && ret!=errors[i]; i++);
-	return i;
-}
-
-int faccessat(int fd, const char *filename, int amode, int flag)
-{
-	if (!flag || (flag==AT_EACCESS && getuid()==geteuid() && getgid()==getegid()))
-		return syscall(SYS_faccessat, fd, filename, amode, flag);
-
-	if (flag != AT_EACCESS)
-		return __syscall_ret(-EINVAL);
-
-	char stack[1024];
-	sigset_t set;
-	pid_t pid;
-	int ret = -EBUSY;
-	struct ctx c = { .fd = fd, .filename = filename, .amode = amode };
-
-	__block_all_sigs(&set);
-
-	pid = __clone(checker, stack+sizeof stack, 0, &c, 0, 0, 0);
-	if (pid > 0) {
-		int status;
-		do {
-			__syscall(SYS_wait4, pid, &status, __WCLONE, 0);
-		} while (!WIFEXITED(status) && !WIFSIGNALED(status));
-		if (WIFEXITED(status))
-			ret = errors[WEXITSTATUS(status)];
-	}
-
-	__restore_sigs(&set);
-
-	return __syscall_ret(ret);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getcwd.c b/src/components/lib/libc/musl-1.1.11/src/unistd/getcwd.c
deleted file mode 100644
index a7b925d2db..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/getcwd.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <unistd.h>
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include "syscall.h"
-
-char *getcwd(char *buf, size_t size)
-{
-	char tmp[PATH_MAX];
-	if (!buf) {
-		buf = tmp;
-		size = PATH_MAX;
-	} else if (!size) {
-		errno = EINVAL;
-		return 0;
-	}
-	if (syscall(SYS_getcwd, buf, size) < 0) return 0;
-	return buf == tmp ? strdup(buf) : buf;
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/isatty.c b/src/components/lib/libc/musl-1.1.11/src/unistd/isatty.c
deleted file mode 100644
index c8badaf55e..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/isatty.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include "syscall.h"
-
-int isatty(int fd)
-{
-	struct winsize wsz;
-	return !__syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/lseek.c b/src/components/lib/libc/musl-1.1.11/src/unistd/lseek.c
deleted file mode 100644
index 0a5ed392bc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/lseek.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <unistd.h>
-#include "syscall.h"
-#include "libc.h"
-
-off_t lseek(int fd, off_t offset, int whence)
-{
-#ifdef SYS__llseek
-	off_t result;
-	return syscall(SYS__llseek, fd, offset>>32, offset, &result, whence) ? -1 : result;
-#else
-	return syscall(SYS_lseek, fd, offset, whence);
-#endif
-}
-
-LFS64(lseek);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/nice.c b/src/components/lib/libc/musl-1.1.11/src/unistd/nice.c
deleted file mode 100644
index da56996776..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/nice.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <unistd.h>
-#include <sys/resource.h>
-#include "syscall.h"
-
-int nice(int inc)
-{
-#ifdef SYS_nice
-	return syscall(SYS_nice, inc);
-#else
-	return setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS, 0)+inc);
-#endif
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/pread.c b/src/components/lib/libc/musl-1.1.11/src/unistd/pread.c
deleted file mode 100644
index 3d2799fdd4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/pread.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <unistd.h>
-#include "syscall.h"
-#include "libc.h"
-
-ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
-{
-	return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_O(ofs));
-}
-
-LFS64(pread);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/pwrite.c b/src/components/lib/libc/musl-1.1.11/src/unistd/pwrite.c
deleted file mode 100644
index bbe4c345dc..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/pwrite.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <unistd.h>
-#include "syscall.h"
-#include "libc.h"
-
-ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs)
-{
-	return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_O(ofs));
-}
-
-LFS64(pwrite);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/renameat.c b/src/components/lib/libc/musl-1.1.11/src/unistd/renameat.c
deleted file mode 100644
index 125748221f..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/renameat.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-#include "syscall.h"
-
-int renameat(int oldfd, const char *old, int newfd, const char *new)
-{
-	return syscall(SYS_renameat, oldfd, old, newfd, new);
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/ttyname_r.c b/src/components/lib/libc/musl-1.1.11/src/unistd/ttyname_r.c
deleted file mode 100644
index 8bac7b2f3a..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/ttyname_r.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <unistd.h>
-#include <errno.h>
-
-void __procfdname(char *, unsigned);
-
-int ttyname_r(int fd, char *name, size_t size)
-{
-	char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2];
-	ssize_t l;
-
-	if (!isatty(fd)) return ENOTTY;
-
-	__procfdname(procname, fd);
-	l = readlink(procname, name, size);
-
-	if (l < 0) return errno;
-	else if (l == size) return ERANGE;
-	else {
-		name[l] = 0;
-		return 0;
-	}
-}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/ualarm.c b/src/components/lib/libc/musl-1.1.11/src/unistd/ualarm.c
deleted file mode 100644
index 855504bca4..0000000000
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/ualarm.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#define _GNU_SOURCE
-#include <unistd.h>
-#include <sys/time.h>
-
-unsigned ualarm(unsigned value, unsigned interval)
-{
-	struct itimerval it = {
-		.it_interval.tv_usec = interval,
-		.it_value.tv_usec = value
-	};
-	setitimer(ITIMER_REAL, &it, &it);
-	return it.it_value.tv_sec*1000000 + it.it_value.tv_usec;
-}
diff --git a/src/components/lib/libc/musl-1.2.0/.gitignore b/src/components/lib/libc/musl-1.2.0/.gitignore
new file mode 100644
index 0000000000..8043b6b6ae
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/.gitignore
@@ -0,0 +1,8 @@
+*.o
+*.lo
+*.a
+*.so
+*.so.1
+config.mak
+lib/musl-gcc.specs
+/obj/
diff --git a/src/components/lib/libc/musl-1.2.0/.mailmap b/src/components/lib/libc/musl-1.2.0/.mailmap
new file mode 100644
index 0000000000..aede9ec828
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/.mailmap
@@ -0,0 +1 @@
+Ada Worcester <oss@ada.pikhq.com> <josiahw@gmail.com>
diff --git a/src/components/lib/libc/musl-1.2.0/COPYRIGHT b/src/components/lib/libc/musl-1.2.0/COPYRIGHT
new file mode 100644
index 0000000000..e647237146
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/COPYRIGHT
@@ -0,0 +1,190 @@
+musl as a whole is licensed under the following standard MIT license:
+
+----------------------------------------------------------------------
+Copyright © 2005-2020 Rich Felker, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+----------------------------------------------------------------------
+
+Authors/contributors include:
+
+A. Wilcox
+Ada Worcester
+Alex Dowad
+Alex Suykov
+Alexander Monakov
+Andre McCurdy
+Andrew Kelley
+Anthony G. Basile
+Aric Belsito
+Arvid Picciani
+Bartosz Brachaczek
+Benjamin Peterson
+Bobby Bingham
+Boris Brezillon
+Brent Cook
+Chris Spiegel
+Clément Vasseur
+Daniel Micay
+Daniel Sabogal
+Daurnimator
+David Carlier
+David Edelsohn
+Denys Vlasenko
+Dmitry Ivanov
+Dmitry V. Levin
+Drew DeVault
+Emil Renner Berthing
+Fangrui Song
+Felix Fietkau
+Felix Janda
+Gianluca Anzolin
+Hauke Mehrtens
+He X
+Hiltjo Posthuma
+Isaac Dunham
+Jaydeep Patil
+Jens Gustedt
+Jeremy Huntwork
+Jo-Philipp Wich
+Joakim Sindholt
+John Spencer
+Julien Ramseier
+Justin Cormack
+Kaarle Ritvanen
+Khem Raj
+Kylie McClain
+Leah Neukirchen
+Luca Barbato
+Luka Perkov
+M Farkas-Dyck (Strake)
+Mahesh Bodapati
+Markus Wichmann
+Masanori Ogino
+Michael Clark
+Michael Forney
+Mikhail Kremnyov
+Natanael Copa
+Nicholas J. Kain
+orc
+Pascal Cuoq
+Patrick Oppenlander
+Petr Hosek
+Petr Skocik
+Pierre Carrier
+Reini Urban
+Rich Felker
+Richard Pennington
+Ryan Fairfax
+Samuel Holland
+Segev Finer
+Shiz
+sin
+Solar Designer
+Stefan Kristiansson
+Stefan O'Rear
+Szabolcs Nagy
+Timo Teräs
+Trutz Behn
+Valentin Ochs
+Will Dietz
+William Haddon
+William Pitcock
+
+Portions of this software are derived from third-party works licensed
+under terms compatible with the above MIT license:
+
+The TRE regular expression implementation (src/regex/reg* and
+src/regex/tre*) is Copyright © 2001-2008 Ville Laurikari and licensed
+under a 2-clause BSD license (license text in the source files). The
+included version has been heavily modified by Rich Felker in 2012, in
+the interests of size, simplicity, and namespace cleanliness.
+
+Much of the math library code (src/math/* and src/complex/*) is
+Copyright © 1993,2004 Sun Microsystems or
+Copyright © 2003-2011 David Schultz or
+Copyright © 2003-2009 Steven G. Kargl or
+Copyright © 2003-2009 Bruce D. Evans or
+Copyright © 2008 Stephen L. Moshier or
+Copyright © 2017-2018 Arm Limited
+and labelled as such in comments in the individual source files. All
+have been licensed under extremely permissive terms.
+
+The ARM memcpy code (src/string/arm/memcpy_el.S) is Copyright © 2008
+The Android Open Source Project and is licensed under a two-clause BSD
+license. It was taken from Bionic libc, used on Android.
+
+The implementation of DES for crypt (src/crypt/crypt_des.c) is
+Copyright © 1994 David Burren. It is licensed under a BSD license.
+
+The implementation of blowfish crypt (src/crypt/crypt_blowfish.c) was
+originally written by Solar Designer and placed into the public
+domain. The code also comes with a fallback permissive license for use
+in jurisdictions that may not recognize the public domain.
+
+The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
+Valentin Ochs and is licensed under an MIT-style license.
+
+The x86_64 port was written by Nicholas J. Kain and is licensed under
+the standard MIT terms.
+
+The mips and microblaze ports were originally written by Richard
+Pennington for use in the ellcc project. The original code was adapted
+by Rich Felker for build system and code conventions during upstream
+integration. It is licensed under the standard MIT terms.
+
+The mips64 port was contributed by Imagination Technologies and is
+licensed under the standard MIT terms.
+
+The powerpc port was also originally written by Richard Pennington,
+and later supplemented and integrated by John Spencer. It is licensed
+under the standard MIT terms.
+
+All other files which have no copyright comments are original works
+produced specifically for use as part of this library, written either
+by Rich Felker, the main author of the library, or by one or more
+contibutors listed above. Details on authorship of individual files
+can be found in the git version control history of the project. The
+omission of copyright and license comments in each file is in the
+interest of source tree size.
+
+In addition, permission is hereby granted for all public header files
+(include/* and arch/*/bits/*) and crt files intended to be linked into
+applications (crt/*, ldso/dlstart.c, and arch/*/crt_arch.h) to omit
+the copyright notice and permission notice otherwise required by the
+license, and to use these files without any requirement of
+attribution. These files include substantial contributions from:
+
+Bobby Bingham
+John Spencer
+Nicholas J. Kain
+Rich Felker
+Richard Pennington
+Stefan Kristiansson
+Szabolcs Nagy
+
+all of whom have explicitly granted such permission.
+
+This file previously contained text expressing a belief that most of
+the files covered by the above exception were sufficiently trivial not
+to be subject to copyright, resulting in confusion over whether it
+negated the permissions granted in the license. In the spirit of
+permissive licensing, and of not having licensing issues being an
+obstacle to adoption, that text has been removed.
diff --git a/src/components/lib/libc/musl-1.1.11/INSTALL b/src/components/lib/libc/musl-1.2.0/INSTALL
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/INSTALL
rename to src/components/lib/libc/musl-1.2.0/INSTALL
index 5713cd49ba..22477b6ba0 100644
--- a/src/components/lib/libc/musl-1.1.11/INSTALL
+++ b/src/components/lib/libc/musl-1.2.0/INSTALL
@@ -18,28 +18,18 @@ Build Prerequisites
 
 The only build-time prerequisites for musl are GNU Make and a
 freestanding C99 compiler toolchain targeting the desired instruction
-set architecture and ABI, with support for gcc-style inline assembly,
-weak aliases, and stand-alone assembly source files.
+set architecture and ABI, with support for a minimal subset of "GNU C"
+extensions consisting mainly of gcc-style inline assembly, weak
+aliases, hidden visibility, and stand-alone assembly source files.
+
+GCC, LLVM/clang, Firm/cparser, and PCC have all successfully built
+musl, but GCC is the most widely used/tested. Recent compiler (and
+binutils) versions should be used if possible since some older
+versions have bugs which affect musl.
 
 The system used to build musl does not need to be Linux-based, nor do
 the Linux kernel headers need to be available.
 
-If support for dynamic linking is desired, some further requirements
-are placed on the compiler and linker. In particular, the linker must
-support the -Bsymbolic-functions option.
-
-At present, GCC 4.6 or later is the recommended compiler for building
-musl. Any earlier version of GCC with full C99 support should also
-work, but may be subject to minor floating point conformance issues on
-i386 targets. Sufficiently recent versions of PCC and LLVM/clang are
-also believed to work, but have not been tested as heavily; prior to
-Fall 2012, both had known bugs that affected musl. Firm/cparser is
-also believed to work but lacks support for producing shared
-libraries. GCC 4.9.0 and 4.9.1 are known to have a serious bug
-(#61144) which affects musl. Beginning with version 1.1.4 musl
-attempts to work around the bug, but these compiler versions are still
-considered unstable and unsupported.
-
 
 
 Supported Targets
@@ -53,42 +43,64 @@ and ABI combinations:
       the `cmpxchg` instruction is added
 
 * x86_64
+    * ILP32 ABI (x32) is available as a separate arch but is still
+      experimental
 
 * ARM
     * EABI, standard or hard-float VFP variant
     * Little-endian default; big-endian variants also supported
     * Compiler toolchains only support armv4t and later
 
+* AArch64
+    * Little-endian default; big-endian variants also supported
+
 * MIPS
-    * ABI is o32
+    * ABI is o32, fp32/fpxx (except on r6 which is fp64)
     * Big-endian default; little-endian variants also supported
     * Default ABI variant uses FPU registers; alternate soft-float ABI
       that does not use FPU registers or instructions is available
     * MIPS2 or later, or kernel emulation of ll/sc (standard in Linux)
       is required
+    * MIPS32r6, an incompatible ISA, is supported as a variant "mipsr6"
+
+* MIPS64
+    * ABI is n64 (LP64) or n32 (ILP32)
+    * Big-endian default; little-endian variants also supported
+    * Default ABI variant uses FPU registers; alternate soft-float ABI
+      that does not use FPU registers or instructions is available
 
 * PowerPC
-    * Only 32-bit is supported
     * Compiler toolchain must provide 64-bit long double, not IBM
       double-double or IEEE quad
     * For dynamic linking, compiler toolchain must be configured for
       "secure PLT" variant
 
-* Microblaze
-    * Big-endian default; little-endian variants also supported
-    * Soft-float
-    * Requires support for lwx/swx instructions
+* PowerPC64
+    * Both little and big endian variants are supported
+    * Compiler toolchain must provide 64-bit long double, not IBM
+      double-double or IEEE quad
+    * Compiler toolchain must use the new (ELFv2) ABI regardless of
+      whether it is for little or big endian
 
-The following additional targets are available for build, but may not
-work correctly and may not yet have ABI stability:
+* S390X (64-bit S390)
 
 * SuperH (SH)
+    * Standard ELF ABI or FDPIC ABI (shared-text without MMU)
     * Little-endian by default; big-engian variant also supported
     * Full FPU ABI or soft-float ABI is supported, but the
-      single-precision-only FPU ABI is not supported (musl always
-      requires IEEE single and double to be supported)
+      single-precision-only FPU ABI is not
+
+* Microblaze
+    * Big-endian default; little-endian variants also supported
+    * Soft-float
+    * Requires support for lwx/swx instructions
+
+* OpenRISC 1000 (or1k)
 
-* x32 (x86_64 ILP32 ABI)
+* RISC-V 64
+    * Little endian
+    * Hard, soft, and hard-single/soft-double floating point ABIs
+    * Standard ELF; no shared-text NOMMU support
 
 
 
diff --git a/src/components/lib/libc/musl-1.2.0/Makefile b/src/components/lib/libc/musl-1.2.0/Makefile
new file mode 100644
index 0000000000..df0769c340
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/Makefile
@@ -0,0 +1,242 @@
+#
+# Makefile for musl (requires GNU make)
+#
+# This is how simple every makefile should be...
+# No, I take that back - actually most should be less than half this size.
+#
+# Use config.mak to override any of the following variables.
+# Do not make changes here.
+#
+
+srcdir = .
+exec_prefix = /usr/local
+bindir = $(exec_prefix)/bin
+
+prefix = /usr/local/musl
+includedir = $(prefix)/include
+libdir = $(prefix)/lib
+syslibdir = /lib
+
+SRC_DIRS = $(addprefix $(srcdir)/,src/* crt ldso $(COMPAT_SRC_DIRS))
+BASE_GLOBS = $(addsuffix /*.c,$(SRC_DIRS))
+ARCH_GLOBS = $(addsuffix /$(ARCH)/*.[csS],$(SRC_DIRS))
+BASE_SRCS = $(sort $(wildcard $(BASE_GLOBS)))
+ARCH_SRCS = $(sort $(wildcard $(ARCH_GLOBS)))
+BASE_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(BASE_SRCS)))
+ARCH_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(ARCH_SRCS)))
+REPLACED_OBJS = $(sort $(subst /$(ARCH)/,/,$(ARCH_OBJS)))
+ALL_OBJS = $(addprefix obj/, $(filter-out $(REPLACED_OBJS), $(sort $(BASE_OBJS) $(ARCH_OBJS))))
+
+LIBC_OBJS = $(filter obj/src/%,$(ALL_OBJS)) $(filter obj/compat/%,$(ALL_OBJS))
+LDSO_OBJS = $(filter obj/ldso/%,$(ALL_OBJS:%.o=%.lo))
+CRT_OBJS = $(filter obj/crt/%,$(ALL_OBJS))
+
+AOBJS = $(LIBC_OBJS)
+LOBJS = $(LIBC_OBJS:.o=.lo)
+GENH = obj/include/bits/alltypes.h obj/include/bits/syscall.h
+GENH_INT = obj/src/internal/version.h
+IMPH = $(addprefix $(srcdir)/, src/internal/stdio_impl.h src/internal/pthread_impl.h src/internal/locale_impl.h src/internal/libc.h)
+
+LDFLAGS =
+LDFLAGS_AUTO =
+LIBCC = -lgcc
+CPPFLAGS =
+CFLAGS =
+CFLAGS_AUTO = -Os -pipe
+CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc 
+
+CFLAGS_ALL = $(CFLAGS_C99FSE)
+CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I$(srcdir)/arch/$(ARCH) -I$(srcdir)/arch/generic -Iobj/src/internal -I$(srcdir)/src/include -I$(srcdir)/src/internal -Iobj/include -I$(srcdir)/include
+CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS)
+
+LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS)
+
+AR      = $(CROSS_COMPILE)ar
+RANLIB  = $(CROSS_COMPILE)ranlib
+INSTALL = $(srcdir)/tools/install.sh
+
+ARCH_INCLUDES = $(wildcard $(srcdir)/arch/$(ARCH)/bits/*.h)
+GENERIC_INCLUDES = $(wildcard $(srcdir)/arch/generic/bits/*.h)
+INCLUDES = $(wildcard $(srcdir)/include/*.h $(srcdir)/include/*/*.h)
+ALL_INCLUDES = $(sort $(INCLUDES:$(srcdir)/%=%) $(GENH:obj/%=%) $(ARCH_INCLUDES:$(srcdir)/arch/$(ARCH)/%=include/%) $(GENERIC_INCLUDES:$(srcdir)/arch/generic/%=include/%))
+
+EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl
+EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
+CRT_LIBS = $(addprefix lib/,$(notdir $(CRT_OBJS)))
+STATIC_LIBS = lib/libc.a
+SHARED_LIBS = lib/libc.so
+TOOL_LIBS = lib/musl-gcc.specs
+ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS)
+ALL_TOOLS = obj/musl-gcc
+
+WRAPCC_GCC = gcc
+WRAPCC_CLANG = clang
+
+LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1
+
+-include config.mak
+-include $(srcdir)/arch/$(ARCH)/arch.mak
+
+ifeq ($(ARCH),)
+
+all:
+	@echo "Please set ARCH in config.mak before running make."
+	@exit 1
+
+else
+
+all: $(ALL_LIBS) $(ALL_TOOLS)
+
+OBJ_DIRS = $(sort $(patsubst %/,%,$(dir $(ALL_LIBS) $(ALL_TOOLS) $(ALL_OBJS) $(GENH) $(GENH_INT))) obj/include)
+
+$(ALL_LIBS) $(ALL_TOOLS) $(ALL_OBJS) $(ALL_OBJS:%.o=%.lo) $(GENH) $(GENH_INT): | $(OBJ_DIRS)
+
+$(OBJ_DIRS):
+	@mkdir -p $@
+
+obj/include/bits/alltypes.h: $(srcdir)/arch/$(ARCH)/bits/alltypes.h.in $(srcdir)/include/alltypes.h.in $(srcdir)/tools/mkalltypes.sed
+	@sed -f $(srcdir)/tools/mkalltypes.sed $(srcdir)/arch/$(ARCH)/bits/alltypes.h.in $(srcdir)/include/alltypes.h.in > $@
+
+obj/include/bits/syscall.h: $(srcdir)/arch/$(ARCH)/bits/syscall.h.in
+	@cp $< $@
+	@sed -n -e s/__NR_/SYS_/p < $< >> $@
+
+obj/src/internal/version.h: $(wildcard $(srcdir)/VERSION $(srcdir)/.git)
+	@printf '#define VERSION "%s"\n' "$$(cd $(srcdir); sh tools/version.sh)" > $@
+
+obj/src/internal/version.o obj/src/internal/version.lo: obj/src/internal/version.h
+
+obj/crt/rcrt1.o obj/ldso/dlstart.lo obj/ldso/dynlink.lo: $(srcdir)/src/internal/dynlink.h $(srcdir)/arch/$(ARCH)/reloc.h
+
+obj/crt/crt1.o obj/crt/scrt1.o obj/crt/rcrt1.o obj/ldso/dlstart.lo: $(srcdir)/arch/$(ARCH)/crt_arch.h
+
+obj/crt/rcrt1.o: $(srcdir)/ldso/dlstart.c
+
+obj/crt/Scrt1.o obj/crt/rcrt1.o: CFLAGS_ALL += -fPIC
+
+OPTIMIZE_SRCS = $(wildcard $(OPTIMIZE_GLOBS:%=$(srcdir)/src/%))
+$(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.o) $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.lo): CFLAGS += -O3
+
+MEMOPS_OBJS = $(filter %/memcpy.o %/memmove.o %/memcmp.o %/memset.o, $(LIBC_OBJS))
+$(MEMOPS_OBJS) $(MEMOPS_OBJS:%.o=%.lo): CFLAGS_ALL += $(CFLAGS_MEMOPS)
+
+NOSSP_OBJS = $(CRT_OBJS) $(LDSO_OBJS) $(filter \
+	%/__libc_start_main.o %/__init_tls.o %/__stack_chk_fail.o \
+	%/__set_thread_area.o %/memset.o %/memcpy.o \
+	, $(LIBC_OBJS))
+$(NOSSP_OBJS) $(NOSSP_OBJS:%.o=%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP)
+
+$(CRT_OBJS): CFLAGS_ALL += -DCRT
+
+$(LOBJS) $(LDSO_OBJS): CFLAGS_ALL += -fPIC
+
+CC_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $<
+
+# Choose invocation of assembler to be used
+ifeq ($(ADD_CFI),yes)
+	AS_CMD = LC_ALL=C awk -f $(srcdir)/tools/add-cfi.common.awk -f $(srcdir)/tools/add-cfi.$(ARCH).awk $< | $(CC) $(CFLAGS_ALL) -x assembler -c -o $@ -
+else
+	AS_CMD = $(CC_CMD)
+endif
+
+obj/%.o: $(srcdir)/%.s
+	@$(AS_CMD)
+
+obj/%.o: $(srcdir)/%.S
+	@$(CC_CMD)
+
+obj/%.o: $(srcdir)/%.c $(GENH) $(IMPH)
+	@$(CC_CMD)
+
+obj/%.lo: $(srcdir)/%.s
+	@$(AS_CMD)
+
+obj/%.lo: $(srcdir)/%.S
+	@$(CC_CMD)
+
+obj/%.lo: $(srcdir)/%.c $(GENH) $(IMPH)
+	@$(CC_CMD)
+
+lib/libc.so: $(LOBJS) $(LDSO_OBJS)
+	@$(CC) $(CFLAGS_ALL) $(LDFLAGS_ALL) -nostdlib -shared \
+	-Wl,-e,_dlstart -o $@ $(LOBJS) $(LDSO_OBJS) $(LIBCC)
+
+lib/libc.a: $(AOBJS)
+	@rm -f $@
+	@$(AR) rc $@ $(AOBJS)
+	@$(RANLIB) $@
+#	@echo "musl-gcc & musl-gcc.specs not built for cross-compile"
+	@sh tools/musl-gcc.specs.sh "$(includedir)" "$(libdir)" "$(LDSO_PATHNAME)" > lib/musl-gcc.specs
+	@printf '#!/bin/sh\nexec "$${REALGCC:-$(WRAPCC_GCC)}" "$$@" -specs "%s/musl-gcc.specs"\n' "$(libdir)" > obj/musl-gcc
+	@chmod +x obj/musl-gcc
+
+$(EMPTY_LIBS):
+	@rm -f $@
+	@$(AR) rc $@
+
+lib/%.o: obj/crt/$(ARCH)/%.o
+	@cp $< $@
+
+lib/%.o: obj/crt/%.o
+	@cp $< $@
+
+lib/musl-gcc.specs: $(srcdir)/tools/musl-gcc.specs.sh config.mak
+	@echo "Do nothing! $@"
+#	sh $< "$(includedir)" "$(libdir)" "$(LDSO_PATHNAME)" > $@
+
+obj/musl-gcc: config.mak
+	@echo "Do nothing! $@"
+#	printf '#!/bin/sh\nexec "$${REALGCC:-$(WRAPCC_GCC)}" "$$@" -specs "%s/musl-gcc.specs"\n' "$(libdir)" > $@
+#	chmod +x $@
+
+obj/%-clang: $(srcdir)/tools/%-clang.in config.mak
+	sed -e 's!@CC@!$(WRAPCC_CLANG)!g' -e 's!@PREFIX@!$(prefix)!g' -e 's!@INCDIR@!$(includedir)!g' -e 's!@LIBDIR@!$(libdir)!g' -e 's!@LDSO@!$(LDSO_PATHNAME)!g' $< > $@
+	chmod +x $@
+
+$(DESTDIR)$(bindir)/%: obj/%
+	$(INSTALL) -D $< $@
+
+$(DESTDIR)$(libdir)/%.so: lib/%.so
+	$(INSTALL) -D -m 755 $< $@
+
+$(DESTDIR)$(libdir)/%: lib/%
+	$(INSTALL) -D -m 644 $< $@
+
+$(DESTDIR)$(includedir)/bits/%: $(srcdir)/arch/$(ARCH)/bits/%
+	$(INSTALL) -D -m 644 $< $@
+
+$(DESTDIR)$(includedir)/bits/%: $(srcdir)/arch/generic/bits/%
+	$(INSTALL) -D -m 644 $< $@
+
+$(DESTDIR)$(includedir)/bits/%: obj/include/bits/%
+	$(INSTALL) -D -m 644 $< $@
+
+$(DESTDIR)$(includedir)/%: $(srcdir)/include/%
+	$(INSTALL) -D -m 644 $< $@
+
+$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
+	$(INSTALL) -D -l $(libdir)/libc.so $@ || true
+
+install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
+
+install-headers: $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%)
+
+install-tools: $(ALL_TOOLS:obj/%=$(DESTDIR)$(bindir)/%)
+
+install: install-libs install-headers install-tools
+
+musl-git-%.tar.gz: .git
+	 git --git-dir=$(srcdir)/.git archive --format=tar.gz --prefix=$(patsubst %.tar.gz,%,$@)/ -o $@ $(patsubst musl-git-%.tar.gz,%,$@)
+
+musl-%.tar.gz: .git
+	 git --git-dir=$(srcdir)/.git archive --format=tar.gz --prefix=$(patsubst %.tar.gz,%,$@)/ -o $@ v$(patsubst musl-%.tar.gz,%,$@)
+
+endif
+
+clean:
+	rm -rf obj lib
+
+distclean: clean
+	rm -f config.mak
+
+.PHONY: all clean install install-libs install-headers install-tools
diff --git a/src/components/lib/libc/musl-1.1.11/README b/src/components/lib/libc/musl-1.2.0/README
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/README
rename to src/components/lib/libc/musl-1.2.0/README
diff --git a/src/components/lib/libc/musl-1.2.0/VERSION b/src/components/lib/libc/musl-1.2.0/VERSION
new file mode 100644
index 0000000000..26aaba0e86
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/VERSION
@@ -0,0 +1 @@
+1.2.0
diff --git a/src/components/lib/libc/musl-1.2.0/WHATSNEW b/src/components/lib/libc/musl-1.2.0/WHATSNEW
new file mode 100644
index 0000000000..ecf0cebab4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/WHATSNEW
@@ -0,0 +1,2202 @@
+0.5.0 - initial release
+
+
+
+0.5.9 - signal ABI bugfix, various cleanup and fixes:
+
+sigset_t was wrongly defined as 1024 bytes instead of 1024 bits,
+breaking the intended ABI compatibility with the LSB/glibc sigaction
+structure. users should upgrade immediately and rebuild any libraries
+or object files that might be using the incorrect definitions.
+
+improved security against DoS with tcb shadow passwords by checking
+that the file opened was really an ordinary file.
+
+fixed a bug in the implementation of atomic ops that could have
+allowed the compiler to incorrectly reorder them (in practice, gcc
+with the default settings on i386 was not reordering them).
+
+greatly improved conformance to the C and POSIX standards regarding
+what the standard header files make visible. _POSIX_C_SOURCE is now
+needed to get POSIX functions in standard C headers, and _XOPEN_SOURCE
+or _GNU_SOURCE are required to get XSI interfaces or GNU extensions,
+respectively.
+
+many internal improvements have been made to the syscall-related code
+in preparation for porting to x86_64 and other archs.
+
+
+
+0.6.0 - x86_64 port, various important bugs fixed
+
+new x86_64 (amd64) architecture port, contributed by Nicholas J. Kain,
+along with PORTING guide. source tree layout and build system have
+been improved to accommodate further ports.
+
+various bugs that were introduced while making the headers respect C
+and POSIX namespace standards have been fixed. conformance to the
+standards has been improved.
+
+fixed an inefficiency in qsort that triggered a bug (occasionaly
+internal compiler error) in some versions of gcc.
+
+fixed a major bug in the printf %n specifier that prevented it from
+working and caused memory corruption.
+
+
+
+0.7.0 - major improvements to posix conformance and completeness
+
+implemented posix shared memory and semaphore interfaces.
+
+implemented all remaining required pthread and clock interfaces.
+
+major fixes to signal semantics.
+
+greatly improved temporary file name generation for safety against
+denial of service due to intentional name collisions.
+
+added syscall wrappers for the linux inotify interface.
+
+malloc(0) now returns a non-null pointer.
+
+fixed printf %n specifier (again), pthread_once (it was always
+hanging), and non-default-type mutex behavior.
+
+added ucontext/sigcontext support in headers to facilitate building
+libgcc with dwarf2 unwind support, and possibly other low-level tools.
+
+improved musl-gcc compiler wrapper.
+
+implemented many small missing functions here and there, minor header
+fixes, etc.
+
+
+
+0.7.1 - improvements to completeness, bug fixes
+
+implemented flockfile, wprintf, and robust mutex functions.
+
+fixed stack corruption bug in times(), minor header bugs, and some
+error return value bugs in thread interfaces.
+
+
+
+0.7.5 - new features, major optimization, and robustness
+
+implemented POSIX timers.
+
+optimized and simplified many thread-related functions.
+
+eliminated resource leak races in thread cancellation. (almost all
+existing implementations, including glibc, have these leaks.)
+
+overhauled stdio implementation to take advantage of readv/writev for
+reduced syscall load, and improved stdio's handling of error status.
+
+added syscall header and interface for applications to use and
+greatly simplified internal system for making syscalls.
+
+strangthened tmpnam/tempnam/tmpfile filename generation and made the
+straight C functions not depend on POSIX symbols.
+
+fixed pthread cancellation ABI on i386 to match the LSB/glibc ABI
+
+better double-free handling in malloc
+
+various minor bug fixes
+
+
+
+0.7.6 - major bug fixes
+
+fixed rare but serious under-allocation bug in malloc.
+
+fixed signedness bug in strchr that prevented finding high bytes.
+
+fixed serious parsing bugs in strtold.
+
+fixed statvfs syscall (it was always failing with EINVAL).
+
+fixed race condition in set*id() functions with threads (possible
+deadlock). further audit still needed though.
+
+fseek no longer sets the stream error flag on failed seeks (this was
+wrong and broke some programs, notably GNU m4).
+
+nl_langinfo is no longer a dummy function. (the functionality was
+previously implemented but accidentally left unused).
+
+various small fixes have been made to the implementations and
+prototypes for nonstandard and obsolete functions
+
+
+
+0.7.7 - more bug fixes and program-compatibility improvements
+
+fixed floating point formatting and rounding bugs in printf.
+
+fixed broken %N$ positional argument specifiers in printf.
+
+fixed misaligned read/overread bug in strchr which could lead to
+crashes scanning tiny strings at the end of a page when the next page
+is not readable, or on archs (not yet supported) that forbid
+misaligned reads.
+
+fixed breakage of statvfs on x86_64
+
+fixed crash in getmntent_r
+
+fixed bug in POSIX timers created with NULL sigevent argument
+
+improved semaphore performance, and sem_wait is now interruptable by
+signals, as required by POSIX.
+
+added many compatibility and system-level interfaces, increasing the
+proportion of busybox that works with musl.
+
+
+
+0.7.8 - more bug fixes and compatibility improvements
+
+fixed problems with ipv6 dns and address printing code that made ipv6
+support practically unusable, and some other getaddrinfo bugs.
+
+fixed broken sendmsg/recvmsg functions on x86_64 (caused by incorrect
+msghdr structure).
+
+fixed broken sigsetjmp asm on x86_64.
+
+worked around a problem with input buffering on terminals reblocking
+after getting a blank line, due to a bug in the linux readv syscall.
+
+various improvements to the "rsyscall" system used to implement
+threaded setuid, setgid, etc.
+
+exiting/cancelling the a timer handler thread no longer kills the
+timer.
+
+fixed incorrect trailing zeros on some %g conversions in printf.
+
+fixed buggy byte-swapping functions and moved them to inlines in
+byteswap.h.
+
+many small improvements to header/application compatibility, support
+for nonstandard macros, etc.
+
+
+
+0.7.9 release notes
+
+new pthread cancellation implementation:
+- safe against resource-leak/side-effect-leak race conditions
+- safe against interruption by signal handlers
+- reduced bloat in all cancellable functions
+- reduced bloat for blocking cancellation
+
+new interfaces implemented:
+- realpath (limited functionality)
+- wordexp (limited functionality)
+- flock (nonstandard)
+- forkpty (nonstandard)
+- posix_fadvise
+- posix_fallocate
+
+general bug fixes:
+- syslog function failure to communicate with syslogd
+- bug in siginfo_t definition if wait.h was included before signal.h
+- incorrect struct definitions for most of sysv ipc
+- pthread_exit/cancel on timer handler wrongly destroying the timer
+- linux dup2 ebusy workaround
+- obscure issues in non-threaded programs using some pthread functions
+- getopt_long allowed mismatch in last char of option name
+- incorrect parsing of obscure ip address forms
+- initgroups not working reliably (uninitialized var)
+- shadow pass treating empty expiry field as pass-expired-in-1970
+- bogus longjmp if pthread_exit was called from cancellation handlers
+
+x86_64-specific bug fixes:
+- fcntl file locking
+- thread stack alignment
+- broken select timeouts due to incorrect timeval definition
+
+
+
+0.7.10 release notes
+
+new features:
+- ipv6 numeric string parsing
+- eventfd syscall wrappers
+
+optimizations:
+- new qsort implementation using the smoothsort algorithm
+- much smaller/faster sigset_t handling functions
+- lowered spin count before futex wait in synchronization functions
+
+general bug fixes:
+- incorrect floating point round-to-even behavior in printf
+- major bugs in pthread barrier implementation
+- off-by-one error in scanf %n results
+- scanf failure to report EOF when scanning for literal text
+- minor missing/incorrect prototype issues
+- dependency on undefined call order in fclose
+
+compiler issue workarounds:
+- incorrect inlining of variadic functions on recent gcc versions
+- pcc preprocessor bug with recursive macro expansion
+
+
+
+0.7.11 release notes
+
+new features:
+- integrated dynamic linker
+- dynamic loading (dlopen/dlsym) (for dynamic-linked programs only)
+- XSI search.h API
+- POSIX message queues
+- POSIX spawn interfaces
+- BSD pseudo-random number generator API (random/srandom/initstate/etc.)
+- floating point environment (limited usefulness due to gcc bugs)
+
+general bug fixes:
+- possible crashes with wordexp due to uninitialized variable
+- race condition in pthread_kill (also present and unfixed in glibc/nptl)
+- pthread exit destructors called too late
+- dangerous unbounded vla in glob
+- brk/sbrk legacy functions mismatching legacy semantics
+- wcsncpy dest buffer overflow
+- strncat and wcsncat possible overflows due to double-termination
+
+
+
+0.7.12 release notes
+
+new features:
+- support for textrels in shared objects
+- rpath support in dynamic linker
+- stdio_ext.h functions (for better gnu software compatibility)
+
+bug fixes:
+- some compilers miscompiling dlopen due to misuse of longjmp
+- safe handling of invalid long-double bit patterns (affects printf)
+- workaround for bugs in linux mprotect syscall
+- thread-safety for random() functions
+- various minor issues
+
+
+
+0.8.0 release notes
+
+new features:
+- chinese and japanese legacy charset support in iconv
+- zero-syscall clock_gettime support (dynamic-linked x86_64 only)
+- futex-based locking for stdio (previously used spinlocks)
+- LD_PRELOAD and RTLD_NEXT support in dynamic linker
+- strptime (mostly working but incomplete)
+- posix aio (mostly working but not entirely conformant)
+- memory streams (fmemopen, open_memstream, ...)
+- stub/dummy implementations for various useless legacy functions
+- if_nameindex
+
+security hardening:
+- setuid, etc. should not longer be able to "partially fail" with threads
+- ensure suid programs start with fd 0,1,2 open
+- improved openpty/forkpty failure checks
+
+threads/synchronization bug fixes:
+- dangerous spurious wakeup in pthread_join lead to early return
+- race condition enabling async cancellation (delayed/lost cancellation)
+- destruction/unmapping race conditions in semaphores, mutexes, rwlocks
+- recursive rwlock_rdlock deadlock when a writer is waiting
+- race condition in sigqueue with fork
+- timer expiration thread exit wasn't running dtors
+- timer threads weren't blocking signals
+- close was wrongly cancellable after succeeding on some devices
+- robust mutex list was not reset on fork
+
+general bug fixes:
+- incorrect logic in fread (spurious blocking; crash on write-only files)
+- many corner cases and overflow cases for strtol-family functions
+- various printf integer formatting issues with flags/width/precision
+- incorrect iconv return value on failure
+- broken FD_* macros on 64-bit targets
+- clock function returning wrong value (real time not cpu time)
+- siglongjmp signal mask clobbering (off-by-one pointer error)
+- dynamic linker weak symbol resolution issues
+- fdopendir failure to set errno
+- various minor header fixes
+
+
+
+0.8.1 release notes
+
+bug fixes:
+- mismatching prototypes caused build failure on 64-bit
+- other minor prototype errors in the headers have been fixed
+- various other small omissions fixed
+
+
+
+0.8.2 release notes
+
+new features:
+- ptrace syscall support
+
+bug fixes:
+- const error (only a warning with many compilers) in lio_listio
+- minor portability fixes aimed at supporting new arch targets
+
+
+
+0.8.3 release notes
+
+new features:
+- arm port (experimental)
+- better musl-gcc wrapper script for building against musl
+- added clone system call
+
+bug fixes:
+- numerous header file typos, copy/paste errors, omissions
+- statfs and statvfs ABI are now LSB-conformant (and actually work)
+
+
+
+0.8.4 release notes
+
+new features: 
+- arm dynamic linker support
+- process-shared pthread barriers now work
+- efficient futex-requeue-based cond var broadcast
+- more optional cancellation points are now cancellable
+- printf accepts null pointers with %s, prints as "(null)"
+- recursive mutexes are now fully reentrant
+- __cxa_atexit support
+- real vfork
+- dynamic linker now gold-compatible
+- prlimit syscall
+- support for large limits with setrlimit/getrlimit (even on 32-bit)
+- glob now supports GLOB_PERIOD option (GNU extension)
+
+bug fixes:
+- many serious issues in condition variables
+- rwlock failure-to-wake deadlock issues
+- various small header files bugs/omissions
+- wrong failure return for pthread_create
+- path handling issues on execvp
+- lock count corruption with robust recursive mutexes on owner death
+- integer overflows in atoi, etc. reading most-negative value
+- spurious mremaps on every realloc of large memory chunks
+- pthread cancellation failure in single-threaded programs
+
+security:
+- avoid fd_set overflow in dns lookups
+
+
+
+0.8.5 release notes
+
+new features:
+- stdio operations are now cancellable (only when low-level io happens)
+- global ctor/dtor support in main program start code and shared libs
+- dynamic linker support for PIE executables (but missing startup code)
+- vfork support on x86_64
+- complete set of locale_t functions (all ignore the locale argument)
+- provide define float_t and double_t in math.h
+- lighter/faster cancellation cleanup handler register/unregister
+
+bug fixes:
+- gcc wrapper now supports -shared, -nostdlib, -nostartfiles
+- removed one wrongly-classified character from iswspace set (zwsp)
+- fixed crashes in dns lookup on some errors, e.g. resolv.conf missing
+- "make install" no longer tries to build shared libc if disabled
+- ptrace argument handling bugs fixed
+- work around visibility-hidden bugs in gcc 3.x
+- fix thread-pointer-loss issue when it's initialized in signal handlers
+- various minor typo/misc fixes in headers
+
+compatibility:
+- glob behaves more like traditional implementations w.r.t. GLOB_MARK
+- added legacy futimes, lutimes functions
+- more compatibility macros in sys/param.h (nonstandard header)
+- setfs[ug]id syscall wrappers (linux specific)
+- fgetpwent function (nonstandard)
+- utmp.h matches traditional version more closely
+- caddr_t now matches glibc type (void * instead of long)
+- dummy (always-fail) dlopen and dlsym functions for static linked programs
+- [efg]cvt functions (previously posix, removed from standard)
+- get_current_dir_name function (nonstandard)
+
+
+
+0.8.6 release notes
+
+bug fixes:
+- fix crash in dns lookups for all static-linked, non-threaded programs
+
+
+
+0.8.7 release notes
+
+new features:
+- c++ support with g++'s libstdc++
+- c99 math library (float, long double, complex, etc.)
+- numerous wchar_t functions
+- a64l, l64a functions
+- getdate function
+
+compatibility:
+- c89 compatibility in math.h
+- syscall.h alias for sys/syscall.h
+- memory.h alias for string.h
+- getcwd supports null buffer argument (auto-allocation)
+
+bug fixes:
+- major fenv (floating point environment) fixes and optimizations
+- strptime mishandling of day/month names
+- strtoull wrongly rejecting the highest 16 possible values as overflow
+- math.h constant expression fixes for INFINITY/NAN/etc.
+- scanf mishandling of "0" with "%x"
+
+
+
+0.8.8 release notes
+
+new feature:
+- major math correctness and performance improvements
+- many math functions implemented in asm for i386
+- some math functions (mostly long double) in asm for x86_64
+- new floating point parser/converter with correct rounding
+- implement wcstod, wcstof, and wcstold
+- new scanf implementation - cleaner, faster, more correct
+- minimal/incomplete strfmon implementation
+
+compatibility:
+- header fixes for c++
+- regex code resync with TRE; support common regex extensions
+- support for compiling apps with gcc's -funsigned-char
+- sysconf now returns dynamic limits for open files, processes
+- give dlerror proper error status stickiness
+- make alloca work even with -fno-builtin
+
+critical security fixes:
+- stack-based buffer overflow in fprintf on unbuffered files
+
+other bug fixes:
+- rare gcc register allocation (miscompilation) bug in syscall wrappers
+- printf was rejecting the valid (but redundant) %lf format specifier
+- fixed big data bloat (missing const) in math functions
+- many math fixes related to floating point exceptions and rounding
+- corrected DECIMAL_DIG definitions
+- tgammal was wrongly setting global signgam
+- crash in wordfree with uninitialized we_offs
+- fix wordexp not null-initializing the we_offs initial slots
+
+
+
+0.8.9 release notes
+
+bug fixes:
+- major breakage in strtol and family: failure to accept leading spaces
+- incorrect name for MATH_ERREXCEPT in math.h
+
+compatibility:
+- prototypes for a few additional nonstandard functions
+
+
+
+0.8.10 release notes
+
+new features:
+- correct over/underflow detection (ERANGE setting) for strtod
+- new musl-gcc wrapper, specfile based, faster and more robust
+- meaningful return strings for dlerror
+- new iswalpha, iswpunct, and wcwidth; sync'd to Unicode 6.1
+- towupper/towlower sync'd with Unicode 6.1
+- new futex-based libc-internal locks instead of spinlocks
+- experimental stack protector support (minimal; no random canary)
+- experimental gdb shared library tracking support
+
+compatibility:
+- getusershell family functions
+- getresuid and getresgid syscall wrappers
+- byte swapping macros in endian.h
+- getdtablesize was wrongly declared in unistd.h for _XOPEN_SOURCE
+
+bug fixes:
+- iconv_open wrongly rejecting most dest charsets (broken in 0.8.0)
+- sysconf failure when correct value is -1 (broken in 0.8.8)
+- scanf and strtod family functions overreading past NAN (4 bytes vs 3)
+- scanf and strtod wrongly treating "0.00000000001", etc. as 0
+- many bugs in towupper/towlower (never seriously tested before)
+- int8_t definition was wrong when gcc -funsigned-char was used
+
+
+
+0.9.0 release notes
+
+license change: MIT
+
+new features:
+- configure script, improved build system
+- full stack protector support
+- PIE support on x86 and x86_64
+- new O(1) space, O(nm) time implementation of fnmatch
+- improved support for sse2 floating point mode on x86
+
+compatibility:
+- added linux unshare syscall
+- exp10/pow10 function
+- sqrtl support on arm (previously missing)
+- removed minimal linux/*.h headers that could conflict with real ones
+- support for _LARGEFILE64_SOURCE (mapped to standard fcns with #define)
+- better c89 compatibility in headers
+- stub versions of sched_* functions (previously missing)
+- pthread stacks no longer executable (compat with hardened kernels)
+- new ar.h and lastlog.h (legacy junk)
+- various other header improvements
+
+optimization:
+- additional x86_64 math asm
+- better formula for acos use in i386 asm
+
+bug fixes:
+- large (up to a few %) errors in strtod for certain values due to bug
+- mbsnrtowcs and wcsnrtombs were completely broken (bad exit logic)
+- wide printf %.0s could fail due to uninitialized variable
+- missing dlerror strings for dlsym in some cases
+
+
+
+0.9.1 release notes
+
+new features:
+- dynamic linker can be used as a program to explicitly load/run executables
+- ldd command, usable by making a symlink to the dynamic linker named ldd
+
+bug fixes:
+- major bugs in POSIX BRE parsing inherited from TRE regex code
+- character matching bug in regex on ARM: WCHAR_MAX was assumed to be signed
+- various obscure fixes related to signals and pthread cancellation
+- remquot subnormal remainder bug
+- buggy macros in (nonstandard) sys/param.h
+- major bug in pthread barriers on x86_64 (out of bounds write)
+- utimes (legacy) function was making wrong syscall (utime instead of utimes)
+- avoid using "old" syscalls that don't exist on arm eabi linux
+- broken strrchr(str, 0)
+- broken mbsinit(0)
+- broken wcsncmp
+- syntax error in nextafter macro in tgmath.h
+- missing support for -pie in musl-gcc wrapper
+- abort could wrongly fail to terminate the program in some cases
+
+compatibility:
+- increase default thread stack size to 80k
+- support _BSD_SOURCE feature test macro
+- support _LARGEFILE64_SOURCE feature test macro (merely exposes alt names)
+- lots of legacy-compatibility improvements in headers
+- various minor GNU extension functions
+- sysconf reporting number of available CPUs/cores
+- various LSB/glibc ABI interfaces aimed at compatibility with some binaries
+- use fistpll asm mnemonic instead of fistpq for compat with clang
+
+
+
+0.9.2 release notes
+
+bug fixes:
+- pointer overflow in printf (crash on 32bit userspace, 64bit kernel)
+- printf %ls over-read bug
+- strtod failure to read -0x as negative zero
+- flush stdio after dtors, not before
+- wrong file position for buffered input streams on exit
+- popen was broken when stdin/out were already closed
+- broken wcwidth tables (missing many characters)
+- fwrite: wrong return value of partial/failed write
+- broken utf-16 conversions
+- bad buffer length check in getlogin_r
+- bad perror("") behavior; did not match perror(0)
+- broken sysinfo syscall/structure
+- stdint.h const macro signedness bugs
+- broken include guards in some headers
+- bogus localeconv values
+- cancellation-safety for popen and pclose
+- fma corner cases wrong on i386
+- fcntl F_GETOWN errno missing on failure.
+- char signedness bug in dynamic linker broke dlopen on arm
+- mprotect failure in dynamic linker caused crash instead of error
+
+build system:
+- configure check to work around hacked-up gcc versions
+- test for old binutils that can't support musl dynamic linker
+
+compatibility:
+- make _GNU_SOURCE imply _LARGEFILE64_SOURCE
+- syscall wrapper for lots of nonstandard and/or legacy linux syscalls
+- versionsort stub
+- timegm function (inverse of gmtime)
+- various minor header tweaks
+- make __freading/__fwriting semantics match traditional ones
+- added gnulib-compatibility stdio interfaces
+- added pthread_attr_setstack interface
+- make strerror_r return partial string when buffer is too small
+- duplocale should accept LC_GLOBAL_LOCALE
+- align ptsname_r to upcoming posix requirements
+- support invalid ld80 bit patterns as extra nans.
+
+
+
+0.9.3 release notes
+
+new features:
+- mips (32-bit, o32 abi) port, currently static-linked only
+- newly overhauled crypt implementation
+- improved library pathname info for debugger from the dynamic linker
+- getaddrinfo (and getservbyname) now support /etc/services lookups
+- pipe2 syscall wrapper
+- splice and vmsplice syscall wrappers
+- syscall wrappers for extended attribute interfaces
+- ioperm/iopl syscall wrappers on archs that support these operations
+
+bug fixes:
+- dlsym RTLD_NEXT library search order was wrong
+- multiple dlopen pathname and library name handling errors
+- potential race condition in detached thread exit
+- broken internal-lock-handling code not updated for futex-based __lock
+- sem_trywait spurious EAGAIN errors arising from CAS failures
+- workaround kernel bug in cmsghdr size_t vs socklen_t issue (64-bit)
+- getservby* crash on null protocol argument
+- logic error skipping failed interfaces in if_nameindex
+- various minor header/declaration related issues
+
+arm-specific bug fixes:
+- broken crti/crtn startup code when gcc crtbegin/end files are linked
+- sigsetjmp tail call optimization failure broke the function
+- incorrect little-endian assumptions in atomic.h functions
+- use of blx instruction in asm (not supported on pre-v5 arm)
+
+build system:
+- only use expensive -ffloat-store cflag on archs/compilers that need it
+- make musl-gcc wrapper support -lgcc (mainly for self-hosting)
+
+
+
+0.9.4 release notes
+
+new features:
+- blowfish crypt
+- dynamic linking on mips
+- arm hard float support
+- BSD fgetln function in stdio
+- minor header improvements for compatibility
+- support for CROSS_COMPILE variable to configure
+- legacy significand function
+- better support for SUSv3-targeted programs
+
+performance:
+- assembly (string ops based) memcpy for i386 and x86_64
+- reduce printf overhead
+
+bug fixes:
+- failure of strtod, etc. to process extremely long strings correctly
+- read overrun in wcsstr for short needles
+- various major mips issues that prevented most software from working
+- erroneous floating point exception behavior in i386/x86_64 exp asm
+- crashes on null arguments to legacy err.h functions
+- various header file/type issues
+- extremely rare/obscure race condition with robust mutexes
+- crypt now never returns null (most programs don't check, then crash)
+- missing xattr remove functions
+
+
+
+0.9.5 release notes
+
+compatibility and headers:
+- POSIX+XSI+BSD features enabled by default with no macros defined
+- most programs can now be built without adding -D_GNU_SOURCE
+- added C99 restrict keyword where required in all prototypes
+- greater C89 compatibility
+- cleaner, more-compatible public syscall.h
+- many other header fixes
+- support for compiling musl with clang/llvm
+
+new features:
+- sha 256/512 password hash functions in crypt
+- GNU hash support in dynamic linker
+- partial C11 coverage
+- dladdr function added
+- dynamic linker reports all errors instead of exiting on first error
+- syscall wrappers added for most remaining linux syscalls
+- provide POSIX O_SEARCH open mode using linux O_PATH
+
+bug fixes:
+- most atexit functions were being skipped when exiting
+- some BSD functions were not being exposed under _BSD_SOURCE
+- issues loading ssp-protected DSO into non-ssp program with dlopen
+
+debloating:
+- eliminate .eh_frame (10-15% loaded size bloat)
+- optimal inline syscall asm for ARM and MIPS
+- no longer force -O3 for shared libs
+
+
+
+0.9.6 release notes
+
+bug fixes:
+- serious breakage in definition of O_ACCMODE mask (missing a bit)
+
+new features:
+- O_EXEC open mode
+- md5 crypt hash function
+
+
+
+0.9.7 release notes
+
+new features:
+- thread-local storage (__thread/_Thread_local)
+- microblaze port
+- getopt option parsing reset support
+- vsyscall (sysenter, etc.) support on i386 (faster syscalls)
+- memmem function (GNU extension)
+- mips fenv support
+- accept "nan(n-char-sequence)" in strtod/scanf family functions
+- configure now supports compiling with pcc
+
+quality and correctness improvements:
+- close-on-exec flag for all library-internal file descriptors
+- cancellation-safety and corner-case overhaul in shm_open/sem_open
+- close EINTR vs EINPROGRESS issue
+- mark binaries as not requiring executable stack
+- better gdb compatibility in dynamic linker
+- support recursive dlopen (dlopen called from constructors)
+- posix_spawn/system/popen no longer momentarily double commit charge
+- all stdio functions wait for locks
+
+bug fixes:
+- broken sysvipc *ctl functions on 64-bit archs
+- broken shmdt on some archs
+- getaddrinfo failure with port "0"
+- dirname handling of trailing slash
+- vfork race in posix_spawn
+
+
+
+0.9.8 release notes
+
+new features:
+- powerpc port
+- dl_iterate_phdr interface
+- added mips-specific syscalls
+- thread priority scheduling
+- C11 CMPLX macro in complex.h
+- x86 port io functions in sys/io.h
+
+compatibility:
+- improved headers for trace/debugging/machine-access
+- stub functions for unsupported thread-related functionality
+
+bug fixes:
+- numerous math bugs (mostly exception flags and excess-precision issues)
+- register clobber error in i386 vsyscall asm (did not affect most callers)
+- various incorrect definitions in mips headers
+- broken dlsym asm on mips
+- empty prefix handling in configure script (--prefix="")
+- ldso search path logic issues
+- lock handling for stdio memory streams at exit time
+- invalid SO_REUSEPORT definition in socket.h (not supported by Linux)
+- broken redirection attempt to /dev/null in configure script
+
+
+
+0.9.9 release notes
+
+new features:
+- tgamma implementation (no longer lgamma wrapper with low precision)
+- various gnu extensions: sigandset, sigorset, etc.
+- futimesat function (obsolete)
+- various linux syscalls: arch_prctl, personality, etc.
+
+optimizations:
+- hyperbolic, inverse hyperbolic, and inverse trig, bessel functions
+- is* comparison macros in math.h now expand inline properly
+
+library bugs fixed:
+- calling getenv from shared library ctors was broken
+- invalid read in mmap-serviced aligned_alloc/memalign (possible crash)
+- wrong errno result in fallback path of pipe2 
+- various math functions raising spurious exceptions
+- mmap errno value on invalid offsets
+- backwards alignment logic in strlcpy
+- integer overflows in bessel functions
+- large (up to 60ulp) error in erfcf
+- dlsym/dlclose crashing on invalid library handles
+- failure to handle arch variations for cloexec/nonblock flags
+- lio_listio wrong return value for LIO_WAIT mode
+- dladdr failure to resolve PLT addresses
+- time_t/struct tm conversion off-by-one-day in december
+- malloc corruption on nonstandard kernels with non-page-aligned brk
+
+arch-specific bugs fixed:
+- arm ctors/dtors were not working with recent gcc versions
+- arm and mips setjmp/longjmp wrongly saved/restored fenv state
+- loss of precision in i386/x86_64 expl
+
+header bugs fixed:
+- incorrect PRI/SCN macros in inttypes.h for some types
+- arm sys/user.h regressions
+- failure of offsetof() to be an integer constant expression
+- tgmath return value type problems
+
+header compatibility improvements:
+- _GNU_SOURCE now enables everything; _ALL_SOURCE also works
+- scsi/scsi.h and scsi/sg.h are now provided
+- additional MAP_* flags for mmap
+- additional F_* commands and flags for fcntl
+- additional socket option, IPPROTO_* values, and multicase macros
+- thread-related waitpid flags
+- EHWPOISON added to errno.h
+- additional macros for mount, swap, and reboot operations
+- expose additional link.h structures
+- always ensure sizeof(NULL)==sizeof(void *), even in c++
+- additional flags for poll, epoll, inotify, timerfd, timex, dlfcn
+- register names in signal.h/ucontext.h for x86
+- ipc.h ipc_perm nonstandard struct field name compatibility improve
+
+
+
+0.9.10 release notes
+
+new features:
+- getifaddrs 
+- pthread_getattr_np (widely used by garbage collectors)
+- mkostemps, mkostemp, mkstemps functions (mkostemp is future-POSIX)
+- strcasestr and strverscmp (previously stubs)
+
+improvements:
+- major performance improvements in mbtowc
+- avoid filling caller-provided thread stacks with large TLS
+- debloat unnecessary static buffers
+- robust posix_spawn based on CLONE_VM instead of vfork
+- new system() and popen() based on posix_spawn
+- better strerror strings
+- further emulation of atomic close-on-exec/nonblock options for old kernels
+- provide macro constants for new-ish kernel features
+
+compatibility:
+- several nonstandard but widely-available pwd/grp/shadow functions
+- program_invocation_[short_]name
+- re-added useconds_t type used by some programs
+- some legacy arpa headers
+- dn_skipname function (legacy resolver API)
+- additional ABI aliases for supporting glibc-linked libraries/binaries
+
+general bugs fixed:
+- stale locks and bogus munmap call when pthread_create fails
+- uninitialized argument to munmap when dynlink load_library fails
+- incorrect error returns in gethostby*_r
+- memory leak in gethostbyname family
+- blank ai_canonname in getaddrinfo for non-CNAME records
+- undefined HZ macro in scsi/sg.h
+- wrong return value for wmemmove on forward-copy
+- namespace conformance in strings.h
+- various utmp.h bugs
+- unnecessary DT_SONAME in libc.so caused problems on some systems
+- multiple bugs in syslog, some possibly dangerous
+- non-functional setpriority function
+- slight mishandling of 0xf5 byte in UTF-8 decoder
+- misaligned memory accesses in mbsrtowcs
+
+arch-specific bugs fixed:
+- crash in shared library loading on arm
+- missing __aeabi_atexit needed by arm eabi
+- wrong float_t definition on x86_64
+- various low-impact type size/alignment mismatches in some headers
+- epoll struct alignment wrong on non-x86[_64] archs
+- broken pipe2 fallback code on mips with old kernels
+
+
+
+0.9.11 release notes
+
+new features:
+- %m allocation modifier for scanf
+- week number and ISO week-based-year functionality in strftime
+- per-process and per-thread cputime clocks
+- ethernet address conversion interfaces
+- legacy classful ipv4 network address interfaces
+- minimal dlinfo function (nonstandard)
+
+other improvements:
+- dynamic linker path file can now use newlines to separate paths
+- math optimizations for archs with extended precision (i386)
+- musl-gcc wrapper now exposes gcc's intrinsic headers
+- quality of rand and rand_r pseudo-random sequences
+- support for large device minor numbers (greater than 8 bits)
+- various header conformance and compatibility fixes
+
+directly user-visible bugs fixed:
+- scanf losing characters on unbuffered streams and fmemopen streams
+- failure of mbsrtowcs to record stop position when dest is full
+- failure of iconv to convert to legacy codepages
+- non-working pthread_[sg]etschedparam functions (wrong syscall arguments)
+
+other potentially-serious bugs fixed:
+- resource leaks in sem_open
+- various bugs in thread exit synchronization
+- invalid access in aio notification after aiocb free/reuse
+- synchronization in dynamic linker when new thread dlopens during ctors
+- lack of error handling for failure to read dynamic linker path file
+- creation by mmap or shmget of objects larger than PTRDIFF_MAX
+
+minor conformance bugs fixed:
+- overflow handling for the clock function
+- workaround for incorrect exceptions in fma due to compiler bugs
+- workaround wrong kernel type for sem_nsems field in struct semid_ds
+
+arch-specific bugs fixed:
+- x86_64 sigsetjmp clobbered the signal mask rather than saving it
+- misaligned stack when calling ctors/dtors (crashing on x86_64)
+
+
+
+0.9.12 release notes
+
+new features:
+- zoneinfo time zone support
+- PIE support on all supported archs
+- named sub-archs for endian and float ABI variants
+- improved support for non-root installs of the dynamic linker
+- ability to selectively build only performance-critical modules with -O3
+- simple buffer overflow detection in free/realloc
+- inet_ntop now presents v4-mapped addresses in ::ffff:a.b.c.d form
+- ldd now reports libc and the dynamic linker in its output
+
+compatibility:
+- support for new init/fini array (needed for ctors/dtors on newer gcc)
+- C++ ABI fully matches glibc/LSB, at least on x86
+- many added ABI compatibility symbols for using glibc-linked libs
+- support for STB_GNU_UNIQUE symbol bindings (found in some C++ libs)
+- macros/types for new Linux kernel features in headers
+
+bugs fixed:
+- crashes in scanf on literal mismatches (regression from adding %m)
+- dl_iterate_phdr was passing invalid phdr pointers to its callback
+- getaddrinfo with null host and AF_UNSPEC was failing to report IPv6
+- integer overflows in date/time conversion code
+- misinterpretation of pre-1930s dates as post-2038 on 32-bit archs
+- make install failed to install bits headers if make was not run first
+- shm_open was wrongly cancellable
+- low- or no-impact heap corruption in memalign
+- explicitly running the dynamic linker on PIE programs did not work
+- missing macros and sysconf for some supported POSIX option groups
+- missing close-on-exec flags for several internal fd uses
+
+arch-specific bugs:
+- wrong SIG_ATOMIC_MIN/MAX macros on x86_64
+- erfcl was missing on archs where long double is same as double
+- broken dynamic-model TLS in static-linked arm/mips/powerpc programs
+
+
+
+0.9.13 release notes
+
+new features:
+- iconv support for EUC-KR and Big5 (including HKSCS) encodings
+- field widths (POSIX 2008 feature) in strftime
+- recursive rpath and $ORIGIN support in dynamic linker
+- cpu affinity interfaces
+- support for armhf (hardfloat) floating point environment (fenv)
+- support for SSE fenv on i386 (for apps using -mfpmath=sse -msse2)
+- strftime %s format (seconds since the epoch, future POSIX requirement)
+- configure script now saves its command line as a comment in config.mak
+- legacy functions valloc and euidaccess
+
+performance:
+- optimized asm memcpy for arm
+- optimized asm memset for i386 and x86_64
+- optimized C versions of memcpy and memset for all archs
+- eliminated major spurious syscalls from posix_spawn
+- some math asm for armhf (hardfloat)
+
+workarounds for:
+- qemu-user's rt_sigaction syscall does not allow old to alias new
+- qemu-user's madvise always succeeds (broke pthread_getattr_np)
+- passing PT_INTERP to dlopen attempted to double-load libc
+- gcc 4.8.x generating self-referential (infinite recursion) memcpy/memset
+- linux's lack of support for fchdir, fchmod, fchown, fstat on O_PATH fds
+
+bugs fixed:
+- failure to honor flags for fchmodat and faccessat (linux syscall api flaws)
+- SIGEV_THREAD timer id corruption and race condition issues
+- timer thread TLS incorrectly keeping values from previous expiry run
+- ecvt/fcvt decimal position off-by-one
+- in symbol-versioned libs, symbol resolved to oldest instead of newest
+- posix_spawn not correctly reporting errno from exec failure
+- "make install" was not atomic (overwrote files rather than replacing)
+- integer overflows in strftime
+- unset/empty TZ variable was mishandled
+- strftime could crash if the struct tm did not have valid tm_zone field
+- failure of fenv functions to handle invalid arguments (required by ISO C)
+- failure of some math functions (C and i386 asm) to raise underflow flag
+- broken dn_expand function (previously not used internally)
+- race conditions with signals during fork
+- incorrect access check in mktemp (obsolete function)
+- unnecessary arbitrary limits on size of program headers in dynamic loader
+- text formatting bugs in output of err.h functions
+
+arch-specific bugs:
+- fesetenv(FE_DFL_ENV) crashed on i386
+- breakage of arm crt code when libc is compiled as thumb
+- arm/armhf (hardfloat) misidentified by configure
+- ambiguity of wait (exit status) macros on mips with signal number 127
+- wrong value of _NSIG and SIGRTMAX on mips
+
+
+
+0.9.14 release notes
+
+bugs fixed:
+- failure to properly install dynamic linker with DESTDIR set (symlink wrong)
+- rare deadlock in libc-internal locking routines
+- dynamic linker used fallback paths wrongly on (possibly transient) errors
+- popen broken when stdin or stdout was already closed in parent
+- deadlock/memory-corruption in multithreaded set*id and setrlimit functions
+- realpath failed when file was not readable
+- readpath mistakenly had cancellation points in it
+- crashes in scanf with invalid %m conversion specifiers
+- misclassificiation of some invalid ld80 float representation in fpclassify
+- various overflow and underflow flag issues in math functions
+- domain handling errors for acoshf and acoshl
+- wrong values for some sysconf properties
+- lack of proper memory barriers on arm
+
+mips-specific bugs:
+- broken sysv ipc structures
+- multiple stack-related bugs in clone, leading to crashes in parent or child
+- overflow writing sigset_t in multithreaded set*id and setrlimit functions
+
+other improvements:
+- size and performance improvements to various math functions
+- wait.h as a compatibility alias for sys/wait.h
+- various header improvements
+- support for runtime-variable page size on archs that need it (mainly mips)
+
+
+
+0.9.15 release notes
+
+new features:
+- support for mixing IPv4 and v6 nameserver addresses in resolv.conf
+- RFC 3678 multicast structures/macros in netinet/in.h
+- putspent and fgetspent functions (shadow password API)
+- timef function (obsolete, removed in POSIX 2008)
+- fanotify syscalls (Linux-specific feature)
+- semtimedop syscall (Linux-specific sysvipc extension)
+- quotactl syscall and header (filesystem quotas support)
+- drem and finite functions (obsolete BSD functions)
+- getloadavg function (non-standard)
+- herror function (non-standard and obsolete)
+- libc.so now stores and prints its version information
+- expose constants for new Linux features including O_TMPFILE
+- implement FNM_LEADING_DIR option to fnmatch (GNU extension)
+- posix_close function (accepted for inclusion in next POSIX issue)
+
+bugs fixed:
+- buffer overflow in mbsrtowcs
+- clobbering of gr_name in getgrnam_r and getgrgid_r
+- execle ignoring the environment argument
+- setenv crash on malloc failure
+- out-of-bounds access in fnmatch with FNM_PATHNAME and certain patterns
+- failure of malloc to set errno when failing to extend heap
+- incorrect errno value from getcwd with zero size
+- spurious failure in faccessat with AT_EACCESS flag with suid/sgid programs
+- several fd leaks due to missing close-on-exec flag
+- misspellings/typos in macro names in several headers
+- incorrect failure return value in inet_pton
+- various numeric ip address parsing and validation fixes
+- namespace conformance issues in several headers
+- minor header issues
+- zombie processes left by faccessat with AT_EACCESS
+- timezone file parser failing/crashing on 64-bit archs
+- hang in localtime with near-overflowing time_t values on 64-bit archs
+- timezone path search was only trying first path
+- incorrect handling of excessive-length TZ environment strings
+- timezone file loading was wrongly enforcing O_NOFOLLOW/rejecting symlinks
+- iswspace was wrongly returning true for the null character
+- various bugs in wordexp
+- putgrent could write corrupt lines after write failures
+- dn_expand misinterpreted in-packet offsets greater than 255
+- spurious strftime/wcsftime failure on len+1==bufsize case
+- incorrect underflow flag in fma corner cases
+- log*(0) wrongly returned +inf in downward-rounding mode
+- failure of fchmod, fstat, fchdir, and fchown to produce EBADF
+
+arch-specific bugs fixed:
+- i386: failure of fesetround to set sse rounding mode
+- i386: floating point limit constants misinterpreted due to excess precision
+- powerpc: broken thread pointer access when compiled with clang
+- microblaze: dynamic linker entry point code possibly clobbering argv
+
+strict conformance issues:
+- NULL definition re-aligned with POSIX (requires (void *) cast)
+- alignment of math.h is* comparison functions with C11 annex F requirements
+
+
+
+1.0.0 release notes
+
+new features:
+- support for mips softfloat ABI variant
+- legacy setkey and encrypt API for DES
+- support for BSD version of struct tcphdr in addition to GNU version
+- added ipv6 and icmpv6 protocol lookups to getprotoent-family functions
+
+new experimental ports:
+- sh (SuperH)
+- x32 (ILP32 ABI for x86_64)
+
+compatibility:
+- improved c89 compiler support in math.h
+- eliminate some compiler warnings in public headers
+- added some missing things for LFS64 APIs
+- added fallback emulation of accept4 for older kernels
+
+bugs fixed:
+- buffer overflow in printf when printing smallest denormal exactly
+- rounding errors in printf in some just-over-halfway cases
+- posix_spawn did not accept null pid pointer (crashed)
+- ftello gave incorrect result for unflushed append-mode streams
+- mishandling of n=0 case in wcsxfrm (wild buffer overrun)
+- possible system breakage during libc upgrade due to install.sh bugs
+- nftw FTW_MOUNT flag prevented walking any directories at all
+- ptsname/ptsname_r returned negated error codes
+- getprotoent function returned junk after listing valid protocols
+- wrong error code from readdir when the directory has been deleted
+- various prototype/argument-type fixes, mostly to legacy functions
+- various header namespace violations
+
+arch-specific bugs fixed:
+- fesetenv(FE_DFL_ENV) was broken on i386 and x86_64
+- strerror(EDQUOT) did not work on mips
+- recvmsg/sendmsg were broken on powerpc
+- sysv ipc was broken on powerpc and mips
+- statfs/statvfs were broken on mips
+- sigaltstack was broken on mips
+
+
+
+1.1.0 release notes
+
+new features:
+- relro memory protection in dynamic linker
+- malloc can now extend heap with mmap if brk fails
+- vdso clock_gettime/gettimeofday/time acceleration on x86_64
+- thread/library-safe versions of search.h functions (nonstandard)
+- getauxval function (nonstandard)
+- sysconf extensions to query physical memory size
+
+bugs fixed:
+- floating point printf output corruption from carry into uninitialized slot
+- possible runaway carry overflow in printf floating point
+- printf %g failure to strip trailing zeros in some cases
+- search past end of haystack in memmem
+- off-by-one error in confstr return value
+- crashes in some near-empty static programs that use stack protector
+- deadlock race in pthread_once
+- non-working clock_gettime fallback for old kernels
+
+arch-specific bugs fixed:
+- crash from missing syscall asm register clobbers on real microblaze kernel
+- crash in all nontrivial dynamic linker use on microblaze
+- incorrect rlimit constants on mips
+- broken, possibly dangerous, use of getrlimit syscall on x32 in sysconf
+
+
+
+1.1.1 release notes
+
+new features:
+- new options --preload and --library-path to dynamic linker
+- public execvpe function (nonstandard extension)
+- iconv support for cp437 and cp850
+
+bugs fixed:
+- false negatives with some periodic needles in strstr, wcsstr, and memmem
+- crash on invalid zoneinfo files
+- incorrect zero-padding of some outputs for strftime %s specifier
+- misreporting of errors in configure script when $CC does not work at all
+- treating not-yet-implemented strptime specifiers as errors
+
+compatibility:
+- configure now detects serious constant-folding bug in gcc 4.9.0
+- removed __yield symbol (unused) that clashed with some compilers
+- improvements to sysconf's handling of unsupported/invalid arguments
+
+arch-specific bugs fixed:
+- misdetection of superh ABI variant by configure on gcc 3.x
+- missing SO_RCVBUFFORCE and SO_SNDBUFFORCE in mips socket.h
+- build regression on armv6 and later with -mthumb
+
+
+
+1.1.2 release notes
+
+new features:
+- multi-protocol matches (tcp and udp) in getaddrinfo
+- support for AI_V4MAPPED and AI_ALL flags to getaddrinfo
+- reverse name lookups from /etc/hosts
+- reverse service lookups from /etc/services
+- support for service aliases in /etc/services
+- ipsec and tunneling protocols to getprotoent-family functions
+- res_send, res_mkquery, res_querydomain, and dn_comp functions
+- ipv6 scope id handling for link-local scope addresses
+- previously-unimplemented %C and %y in strptime now work
+- vdso clock_gettime acceleration on i386 (new kernel feature)
+- better O_CLOEXEC/SOCK_CLOEXEC fallbacks for old kernels
+
+bugs fixed:
+- buffer overflow in dns response parsing (CVE-2014-3484)
+- possible infinite loop in dns response parsing
+- sendfile off_t 32/64-bit size mismatch
+- incorrect end pointer in some cases when wcsrtombs stops early
+- incorrect if_nametoindex return value when interface does not exist
+- dummy "ent" function aliases that possibly shadowed real ones
+- tmpfile fd leak on memory exhaustion
+- getaddrinfo returning EAI_NONAME for some transient failures
+
+arch-specific bugs fixed:
+- broken kernel side RLIM_INFINITY on mips
+- incorrect syscall argument 6/7 types for pselect on x32
+
+
+
+1.1.3 release notes
+
+new features:
+- address sorting in getaddrinfo, etc. modeled on rfc 3484/6724
+- default timezone taken from /etc/localtime when $TZ is unset
+- getopt double-colon extension for optional arguments
+- support for TLSDESC-based (gnu2) TLS dialect on i386 and x86_64
+- sendmmsg/recvmmsg (linux-specific)
+- fmtmsg (last mandatory XSI function that was missing)
+
+compatibility:
+- treat dns rcode=2 as temporary failure, not negative result
+- working thread-pointer for pre-2.6 kernels on i386
+- further ABI-compat symbols: __xmknod[at], __sysv_signal
+
+bugs fixed:
+- memmem false positives/false negatives/crashes from invalid logic
+- gethostby*_r not setting result pointer to null on failure
+- aliasing violations in syscall.h SYSLOG_NAMES feature
+- fanotify_mark syscall arguments wrong
+
+arch-specific bugs fixed:
+- various subtle relocation bugs in powerpc and sh dynamic linker
+
+
+
+1.1.4 release notes
+
+new features:
+- experimental locale support for LC_MESSAGES and LC_TIME
+- non-stub gettext family functions for message translation
+- or1k (OpenRISC 1000) port
+- syslog options LOG_CONS and LOG_PERROR
+- issetugid function (from OpenBSD)
+- improved if_nameindex and getifaddrs functions
+
+compatibility:
+- work around bug #61144 in gcc 4.9.0 and 4.9.1
+- support getauxval(AT_SECURE) even on kernels without AT_SECURE
+
+bugs fixed:
+- empty dynamic linker error messages (regression in 1.1.3)
+- if_nameindex omitted unconfigured and ipv6-only interfaces
+- incorrect return value for fwide function
+- failure of wide printf/scanf functions to set wide orientation
+- multiple issues in legacy function getpass
+- dynamic linker did not accept colon as a separator for LD_PRELOAD
+- errno clobber in syslog caused wrong output for %m specifier
+- crash in regexec for nonzero nmatch argument with REG_NOSUB
+- minor bugs in rarely-used nl_langinfo item lookups
+
+arch-specific bugs fixed:
+- broken relocations in mips dynamic linker (regression in 1.1.3)
+- register state corruption in setjmp asm for microblaze
+- broken struct stat st_ino field on microblaze
+- broken struct stat st_dev field on big endian mips
+- broken asm register constraints in atomics on powerpc
+- missing barriers in atomics on mips, powerpc, microblaze, and sh
+
+
+
+1.1.5 release notes
+
+new features:
+- full C11 coverage (threads, UTF-16/32 API, timespec_get, etc.)
+- malloc_usable_size function (nonstandard)
+- support for new F_OFD_* fcntl operations (linux 3.15, POSIX-future)
+- new _DEFAULT_SOURCE feature test macro to request default profile
+
+performance:
+- private-futex support
+- redesigned cond var implementation with major performance improvement
+- tweaked spinning in userspace before performing futex waits
+
+bugs fixed:
+- failure of dn_expand to null-terminate name for crafted DNS packets
+- corruption of cond var mutex state when switching mutexes
+- use of uninitialized memory with application-provided thread stacks
+- false ownership of orphaned mutexes due to tid reuse
+- possible failure-to-wake for robust mutexes on owner death
+- subtle errors in robust mutex unrecoverable status handling
+- missing memory/compiler barrier spinning to obtain locks
+- wrong behavior in various zero-length stdio operations
+- buffer overflow in swab with odd argument
+- incorrect sequence generation in the rand48 family of prng functions
+- missing cancellation check in non-wait paths of sem_wait, pthread_join
+- missing barrier in pthread_once fast path
+- memory leak in regexec when input contains illegal sequence
+- various parser bugs in regcomp
+- wrong return value on overflow in some strtoul-family functions
+- broken CPU_EQUAL macro in sched.h
+- dlerror not working in static-linked programs
+- mishandling of negative non-whole-hour TZ offsets
+- incorrect case mappings for U+00DF
+- namespace pollution via accidentally-non-static function named "dummy"
+- missing __fpclassifyl and __signbitl definitions for ld64 archs
+
+
+
+1.1.6 release notes
+
+new features:
+- getopt '-' flag for processing non-option arguments
+- getopt_long argument permutation extension
+- getopt_long abbreviated options
+- ns_parserr and related DNS-packet-parsing functions
+- fnmatch FNM_CASEFOLD extension
+- support for translation of getopt error messages
+- login_tty function (legacy)
+
+performance:
+- efficient atomics on armv7+ targets
+- pthread_once shrink-wrapping of fast path
+
+compatibility:
+- baseline arm binaries now work on new cpus/kernels without kuser_helper
+- dynamic linker now honors DT_RUNPATH without DT_RPATH (new binutils)
+- arm asm is now compatible with clang's internal assembler
+- suppress macro implementations of functions when headers are used in C++
+- increased message length limit for syslog
+
+bugs fixed:
+- open ignored file creation mode argument for O_TMPFILE
+- wrong printf formatting for %#.0o with value zero
+- missing private state for uchar.h functions (null ps pointer)
+- sched_getaffinity left uninitialized data in output bit array
+- wrong return values for pthread_getaffinity_np and pthread_setaffinity_np
+- buggy handling of multibyte option chars with arguments in getopt
+- printf failed to report or stop on write errors
+- printf failed to honor '+' modifier when printing NANs
+- wcsnrtombs returned the wrong value in one code path
+- syslog failed to check for connect error
+- multi-threaded set*id() had spurious failures from ugly workaround code
+- various minor header conformance bugs (signedness, constant expressions, ...)
+
+arch-specific bugs fixed:
+- on or1k, some syscalls with 64-bit arguments were broken (misaligned)
+- usage of sahf instruction on x86_64 crashed on some early cpu models
+
+
+
+1.1.7 release notes
+
+new features:
+- alternate passwd/group backend support via nscd protocol
+- masked cancellation mode extension (experimental)
+- aio cancellation
+- aarch64 port (experimental)
+
+performance:
+- significant memset asm optimizations on i386 and x86_64
+
+compatibility:
+- suppress EINTR in semaphores for old kernels where futex restart is broken
+- always set optarg in getopt_long
+- support SOCK_RAW socket type in getaddrinfo
+- report success instead of EINPROGRESS when close is interrupted
+
+bugs fixed:
+- multithreaded set*id() was not async-signal safe, had various race bugs
+- getspnam_r returned results for partial username matches
+- wordexp bad character checker mis-counted parentheses
+- close on fd with pending aio could lead to file corruption
+- old aio implementation had numerous conformance bugs
+- malloc init code could deadlock due to race condition
+- pthread_exit did not disable cancellation
+- pthread_cond_wait could wrongly consume signal on cancellation
+- execvp wrongly stopped path search on EACCESS
+- fsync, fdatasync, and msync were not honored as cancellation points
+- fchmodat was subject to fd leak race (missing O_CLOEXEC)
+- fchmodat failed to report EOPNOTSUPP in race path
+- passwd/group lookup functions had various minor error-reporting bugs
+- isatty had false-positives/device-state-corruption for OSS sound devices
+- configure script failed to detect gcc with translated messages
+- FLT_ROUNDS macro failed to reflect rounding mode changes in fenv
+
+arch-specific bugs fixed:
+- mips fesetenv did not handle FE_DFL_ENV
+- mips POLLWRNORM and POLLWRBAND macros had wrong values
+- x32 pthread synchronization object type definitions were wrong
+- powerpc minimum signal stack size was insufficient
+
+
+
+1.1.8 release notes
+
+bugs fixed:
+- stack-based buffer overflow in inet_pton (CVE-2015-1817)
+- regcomp crash/mem-corruption with illegal bytes after backslash
+- regcomp wrongly allowed backrefs in ER
+- regcomp miscompiled character class brace-repetitions
+- regcomp wrongly processed \0 as an unmatchable backref
+- new FLT_ROUNDS definition failed to work in C++ code
+
+arch-specific bugs fixed:
+- aarch64 was missing max_align_t definition
+
+
+
+1.1.9 release notes
+
+new features:
+- ability to protect libc code itself with stack protector
+- sigsetjmp now restores signal mask after restoring context, not before
+- thread-local dlerror status/messages
+- dlerror messages are no longer truncated
+- diagnostics for constraint violations with ctype.h macros
+
+optimizations:
+- reduce cost of PIC on archs where PLT calls need a fixed GOT register
+- spin locks no longer constantly invalidate cache lines while spinning
+- code size reduction in static-linked TLS init
+
+bugs fixed:
+- failure to process robust mutexes on detached-thread exit
+- possible memory corruption due to robust mutex list on detached-thread exit
+- crash on memory exhaustion in getgr* internals
+- misaligned memory accesses in static binaries with low-alignment TLS blocks
+- multiple cases of wrongful path search continuation after transient failure
+- small memory leak on failure of dlopen with RPATH $ORIGIN
+- several small math bugs related to exception flags with non-finite args
+- mmap leak in sem_open failure path for link call
+- duplocale clobbered new locale struct with memcpy of old
+- futimes crashed with null timeval argument
+
+arch-specific bugs fixed:
+- stack protector spuriously aborted after forking on x32
+- stack protector spuriously aborted with flockfile on powerpc
+- theoretically-possible clobbering of syscall return value on mips
+- random thread-pointer setup failure on sh (uninitialized return value)
+- possible crash in dlsym on sh due to incorrectly-computed branch target
+- broken fesetenv(FE_DFL_ENV) on mips
+- dynamic linker name for sh ignored fpu/nofpu and endianness
+- various minor aarch64 bugs
+- dangling pointers in x32 syscall timespec fixup code
+
+
+
+1.1.10 release notes
+
+new features:
+- fail-safe (allocation-free) C locale for newlocale to return
+- all locale categories track requested locale name
+- rcrt1.o start file for static PIE
+
+optimizations:
+- inline atomics for sh4a
+- removed heavy atomics from locale-related code paths
+- removed global data accesses from CURRENT_LOCALE macro & callers
+- dynamic linker stage 1 size reduction
+
+compatibility:
+- better configure detection of unsupported compiler options
+- support for more relocation types in libc.so, not currently used
+- iconv_open accepts "" and "CHAR" as aliases for native (UTF-8)
+- additional LFS64 macros in sys/resource.h
+
+regressions fixed:
+- dynamic linker crash on NONE-type relocations (only mips affected)
+- inability to build as thumb2 on arm
+- failure to run under qemu-i386 user-level emulation
+- inability to access globals from libc on powerpc
+- PIE link errors in Scrt1.o under unusual usage on some archs
+
+other bugs fixed:
+- failure of ungetc/ungetwc to work on FILE streams in EOF state
+- possible null pointer dereference in gettext
+- possible initial stack misalignment on mips with PIE
+
+
+
+1.1.11 release notes
+
+new features:
+- byte-based C locale
+- vdso clock_gettime on arm
+- musl-clang wrapper
+- sh2 nommu target support
+
+performance:
+- major speed-up for dynamic linker symbol lookups with GNU hash
+
+compatibility:
+- strverscmp now matches GNU behavior in corner cases
+- empty TZ environment variable gives GMT rather than system default
+- reconnection on syslog server socket loss (syslogd restart)
+- mmap fallback in simple_malloc when brk fails
+- support for %m and %s with null pointers in wide printf variants
+- call frame information in i386 asm for improved debugger support
+
+bugs fixed:
+- spurious errors from pwd/grp functions when nscd backend is absent
+- possible invalid access on calloc with simple_malloc
+- null pointer dereferences after calling uselocale((locale_t)0)
+- erroneous support for cancellation in stdio caused data loss
+- inconsistent handling of atexit called from atexit handler
+- missing locking in error paths for ungetwc
+- btowc mishandling of out-of-range non-EOF inputs
+- negated return value of ns_skiprr, failure in related functions
+- incorrect void return type for syncfs, missing error status
+- possible failure of tempnam due to missing null termination
+- negated tm_gmtoff field in struct tm
+- off-by-one error in getsubopt leaving equals sign in value result
+
+arch-specific bugs fixed:
+- soft deadlocks on i386/x86_64 due to missing barrier in internal locks
+- regression in arm pre-v7 support for kernels with kuser helper removed
+- runaway PC on mips detached thread exit (due to kernel regression)
+- mismatched ABI for local-dynamic model TLS on mips and powerpc
+- incorrect value of some SO_* constants on mips
+- broken 64-bit syscall argument passing on aarch64
+
+
+
+1.1.12 release notes
+
+new features:
+- fdpic abi on sh2 for shareable text segment without mmu
+- general fdpic elf support in dynamic linker
+- CFI generation for x86_64 asm source files
+- protection against silently building a libc.so with missing symbols
+
+compatibility:
+- nl_langinfo(CODESET) now returns "ASCII" in byte-based C locale
+- fixed build regression due to buggy .SECONDARY in some GNU make versions
+- additional arm eabi functions needed by llvm arm backend
+- added format argument attributes to gettext function prototypes
+- static PIE no longer requires linking with -E/-rdynamic
+- eliminated spurious protected-data warnings linking against libc.so
+- avoided spurious fpu asm errors with some armhf toolchains
+
+bugs fixed:
+- fclose of stdin/stdout caused deadlock at exit
+- missing memory barrier in pthread_join
+- open_[w]memstream produced no buffer when no writes took place
+- uninitialized scopeid in address lookups from hosts file and ip literals
+- ip literals for mismatching family (v4 vs v6) were queried as hostnames
+- possible crash on OOM in regcomp
+- incorrect contents in localeconv structure (-1 instead of CHAR_MAX)
+- strftime mishandling of out-of-range struct tm members
+- wrongful attribute((const)) on pthread_self and errno location function
+
+arch-specific bugs fixed:
+- arm crt1 entry point failed to align stack pointer in some cases
+- mips fesetround failed to actually set rounding mode
+- i386 asm source CFI generation had multiple bugs
+
+
+
+1.1.13 release notes
+
+new features:
+- out-of-tree builds
+- search domains in resolv.conf
+- sh arch supports j-core (j2) cas.l atomics
+- dynamic linker includes arch/abi in output when run as a command
+- header support for new kernel features through linux 4.4
+- mips vdso clock_gettime support
+- regex BRE extensions: \|, \+, \?
+
+performance:
+- improved atomics performance on all archs with ll/sc model
+- atomic instructions are now inlined on armv6
+- use fpu sqrt for arm softfp abi on targets with vfp
+
+compatibility:
+- getnameinfo now accepts sockaddr sizes larger than needed
+- new default CFLAGS/LDFLAGS avoid entire classes of toolchain bugs
+- explicit use of float_t/double_t avoids compiler float spill bugs
+- i386 max_align_t definition now works with g++ 4.7's pseudo-c++11
+- all known protocols are added to protoent functions
+- stub utmpname, utmpxname functions
+- linker support for -Bsymbolic-functions is no longer mandatory
+- regex parsing size limits increased
+- malloc_usable_size now accepts null pointer input
+
+bugs fixed:
+- potential single-byte heap overflow in getdelim
+- mishandling of transient failure opening hosts, services, resolv.conf
+- mremap was sometimes able to allocate objects larger than PTRDIFF_MAX
+- nl_langinfo wrongly returned NULL instead of "" for invalid items
+- out-of-bounds dynamic tls allocation due to pointer/index scaling error
+- getifaddrs misreported point-to-point interface addresses
+- tdelete left tsearch trees misbalanced
+- tsearch crashed on allocation failure
+- tsearch, tfind, and tdelete failed to handle null pointer input
+- passing signal number 0 to sigaction resulted in a crash
+- getdelim updated caller's size wrongly when realloc failed
+- getdelim realloc strategy was wasteful
+- if_nametoindex returned wrong value on failure
+- missing ssp-suppression for some source files called from early-init
+- various minor resolv.conf parsing bugs
+- fwrite wrongly reported success on write errors in line-buffered flush
+- fwrite and fread wrongly returned nmemb (not 0) when size was 0
+
+nommu-specific bugs fix:
+- failure to zero bss in FDPIC shared library loader
+- unsafe writes to read-only file mapping in non-FDPIC library loader
+
+arch-specific bugs fixed:
+- sh[eb]-nofpu-fdpic was using fpu-dependent setjmp/longjmp variants
+- dynamic linker path file name was wrong for arm "softfp" targets
+- mips siginfo_t and related macros were defined incorrectly
+- possibly misaligned pointer globals on arm (from an asm source file)
+- mips dynamic linker failed to provide info needed by debugger
+- mips cancellation asm wrongly assumed validity of $gp register value
+
+
+
+1.1.14 release notes
+
+regressions fixed:
+- treatment of empty string argument as error by puts and fputs
+- make clean and distclean failure in unconfigured trees
+- sh/fdpic dynamic linker entry point hang due to wrong code
+- armhf (and arm softfp model) build failure with clang
+
+other bugs fixed:
+- wrongly clamping (rather than failing) excessive rounds in crypt-sha*
+
+
+
+1.1.15 release notes
+
+new features:
+- mips64 (full 64-bit and n32) port
+- mips r6 isa support (subarch for mips, mips64, and mipsn32 archs)
+- powerpc64 port
+- powerpc (32-bit) soft-float ABI support (subarch)
+- pthread_tryjoin_np and pthread_timedjoin_np (nonstandard extensions)
+- header-level support for linux 4.5 and 4.6 features
+- sched_getcpu (nonstandard extension) support, including vdso version
+- __STDC_ISO_10646__, __STDC_IEC_559__ macros predefined via stdc-predef.h
+- support for new elf/arch features in elf.h
+
+compatibility:
+- configure now correctly chooses cross-prefix based on build/host/target
+- abort now successfully terminates pid 1 in a container (or top-level)
+
+bugs fixed:
+- memmem read past end of haystack, possible false positives or crashes
+- buffer underflow (reverse-overflow) in ungetwc
+- double-free under certain usage of putenv
+- incorrect treatment by regcomp of * at start of BRE subexpression
+- gethostbyname[2][_r] produced ip addresses in misaligned buffers
+- looking up some invalid hostnames caused malformed dns queries
+- lookups from hosts file were inconsistent with non-matching family
+- missing h_length value in gethostbyaddr results
+- a64l function produced wrong-signed results on 64-bit archs
+- broken padding of string formats to width in wide printf variants
+- wrong results for expf(-NAN) and exp2f(-NAN)
+- wrong value for RUSAGE_CHILDREN prevented it from working
+- abort failed to provide abnormal termination with SIGABRT blocked
+
+arch-specific bugs fixed:
+- broken posix_fadvise on arm and powerpc (32-bit)
+- thread structure/dtv corruption on powerpc at thread startup
+- various wrong mips and powerpc ioctl and termios constant values
+
+
+
+1.1.16 release notes
+
+new features:
+- s390x (64-bit S/390) port
+- pthread_setname_np extension function
+- limited pthread_setattr_default_np function to set stack size defaults
+- header-level support for linux 4.7, 4.8, and 4.9 features
+- confstr _CS_V6_ENV and _CS_V7_ENV items
+
+compatibility:
+- public prototypes for abi-compat *_unlocked symbols, etc.
+- fflush_unlocked(NULL) now works
+- resolv.h __RES version macro now matches supported APIs
+- workaround for gdb bugs backtracing across signals on x86_64
+- anchors ^ and $ are now accepted in BRE subexpressions
+- building for thumb2-only arm isa levels is now possible
+
+bugs fixed:
+- integer overflows in regexec buffer allocation (CVE-2016-8859)
+- failure of regexec to report matches at offsets past INT_MAX
+- static-pie executables with initialized thread-local storage crashed
+- printf failed to catch EOVERFLOW in some cases, wrongly produced it in others
+- printf produced wrong output, result for float with precision near INT_MAX
+- printf produced wrong results with alt-form octal, zero flag, & field width
+- printf float rounding was wrong for some midpoint cases
+- swprintf printed junk after internal (256-byte) buffer filled up
+- strtod family rounded incorrectly in several corner cases
+- getmntent failed to handle long records
+- getopt_long_only wrongly treated "--" as an option
+- asctime output wrongly varied by locale
+- strftime %y specifier produced wrong output for negative tm_year
+- time zone names quoted with <> were misparsed
+- corner case integer overflow in tm_year for some date conversions
+- failure to load shared libs whose names were prefixes of standard lib names
+- wrong error codes for several failure cases in various functions
+- various asymptomatic undefined behavior
+- various minor namespace issues in headers
+
+arch-specific bugs fixed:
+- tcsetattr regression on mips (completely non-working)
+- wrong pread/pwrite syscall calling convention on sh
+- wrong preadv2/pwritev2 syscall numbers on x32
+- mrand48/jrand48 produced wrong-signedness results on 64-bit archs
+
+
+1.1.17 release notes
+
+new features:
+- RTLD_LAZY deferred symbol binding, functionally equivalent to lazy binding
+- safeguard against dlopen of multiple libc versions/instances
+- new posix_spawn flag POSIX_SPAWN_SETSID
+- posix_spawnattr_setflags now reports unknown flags as error
+- ldso option --argv0 to set argv[0]
+- added _NL_LOCALE_NAME extension to nl_langinfo
+
+compatibility:
+- dlopen local-to-global promotion no longer changes existing symbols
+- gettext now searches locale name variants for translation files
+- increased locale name length limit from 15 to 23 bytes
+- setlocale(LC_ALL, 0) returns single name if all categories are same
+- realloc no longer fails when mremap doesn't work
+- getservby* no longer treat numeric port strings as service records
+- mmap now works around incorrect EPERM error codes from kernel
+- impact of REG_* namespace pollution in x86[_64] signal.h is reduced
+- arm atomic asm now assembles correctly with new binutils
+- PAGE_SIZE on arm is no longer constant (quiet upstream ABI relaxation)
+- lsearch/lfind now pass args to compare callback in canonical order
+- STB_WEAK and STB_GNU_UNIQUE symbols now behave same as STB_GLOBAL
+- better clang CFLAGS checks in configure
+- global vis.h hack, which made lld refuse to link to libc.so, is disabled
+
+performance:
+- single-instruction optimized math functions for aarch64, s390x, powerpc64
+- fast path for ASCII in towupper/towlower
+- new mostly-integer-math fma function
+
+semantic bugs fixed:
+- POSIX-format TZ dst time transitions were wrong for southern hemisphere
+- regex REG_NEWLINE semantics were wrong with negated brackets
+- various bugs in strptime %j, %p, %C formats
+- iconv mapped some characters to legacy 8bit encodings incorrectly
+- glob failed to match "/"
+- UTF-8 decoder accepted invalid f4 9x xx xx code sequences
+- scanf %% conversion failed to consume whitespace
+- glob with GLOB_PERIOD wrongly descended into . and ..
+- nftw gave incorrect base name offset when pathname ends in "/"
+- functional regression in resolv.conf attempts option
+- scalbn could produce wrong result due to double rounding in subnormal range
+- strftime %y format wrong with negative years
+- mbsnrtowcs and wcsnrtombs mishandled input limits
+- minor issues with error codes for various functions
+
+safety/consistency bugs fixed:
+- stack-based buffer overflow in dns response processing
+- invalid free in regexec on certain error paths
+- invalid free in globfree after failed glob
+- one-byte buffer overflow in legacy getpass function
+- failed dlopen corrupted thread-local storage module list
+- race in pthread_create with priority attributes could leave signals masked
+- multithreaded set*id() functions could induce spurious EINTRs
+- dl_iterate_phdr reported wrong base address in static PIE
+- fd leak and wrong cancellation state after dns socket failure
+- memory leaks and other issues in environment-modification functions
+- read-after-free race in pthread_detach
+- memmem performed single-byte over-read in short-needle code paths
+- read via uninitialized pointer in gettext core
+- bindtextdomain broke bindings for all other domains
+- various silent undefined behavior
+- getopt clobbered optopt on success
+
+arch-specific bugs fixed:
+- x32 dynamic TLS accesses crashed
+- s390x was missing dlsym entry point (needed for RTLD_NEXT)
+- powerpc64 ldso startup could crash depending on link order
+- powerpc64 setjmp/longjmp didn't properly save/restore TOC pointer
+- thumb2 setjmp/longjmp silently broke at ld-time with text not aligned
+- fchown was broken on archs without SYS_fchown syscall
+- fstatat was broken on mips64
+- various incorrect constants in powerpc64 and mips headers
+
+
+1.1.18 release notes
+
+regression fixes:
+- glob failed to match literal . and .. path components
+- build for armv4t ISA level was broken
+
+other bug fixes:
+- stack overflow in posix_spawnp with large PATH variable in environment
+
+
+1.1.19 release notes
+
+new features:
+- iconv framework for processing stateful encodings
+- iconv support for iso-2022-jp
+- iconv support for converting to legacy JIS-based Japanese encodings
+- iconv support for UTF-16/32 with BOM-determined endianness
+- iconv ibm1047 (ebcdic latin1-equivalent) support
+- iconv cp866 (dos cyrillic) support
+- character data tables & case mappings updated to Unicode 10.0
+- fopencookie stdio extension
+- strftime padding character extensions
+- header-level support for new linux features through 4.13
+
+compatibility:
+- UTC timezone is now called UTC instead of GMT
+- _DIRENT_HAVE_D_* macros in dirent.h
+- dladdr dli_fbase definition now matches other implementations
+- pthread_getattr_np now reports guard size
+- strftime '+' modifier better matches apparent intent of POSIX
+- getopt_long handles long option names containing '='
+- better compatibility with linux uapi headers
+- workaround linux bug where getcwd can return non-absolute pathname
+- configure logic for finding compiler_rt with clang
+- execvp path search now continues after ENOTDIR components
+
+bugs fixed:
+- fgetwc failed when character crossed buffer boundary
+- memory corruption after failing to dlopen a second libc
+- sysconf reported infinite rlimits incorrectly
+- getopt_long --opt=arg did not work with partial matches
+- printf was wrong for alt-form octal with value 0, no explicit precision
+- endian errors in arpa/nameser.h and netinet/icmp6.h (missing endian.h)
+- atfork handler could clobber fork's errno
+- iconv could wrongly output surrogate pairs in ucs2
+- fmemopen buffer underallocation with extreme size argument
+- getaddrinfo AI_NUMERICSERV wrong error code
+- data race in at_quick_exit
+- ldd failed to honor rpath $ORIGIN for program in . without "./" prefix
+
+arch-specfic bugs fixed:
+- x32 unistd.h wrongly reported LP64 instead of ILP32
+- aarch64 signal.h had wrong type for ucontext_t uc_link member
+
+
+1.1.20 release notes
+
+new features:
+- m68k port
+- replacement of malloc is now allowed/supported
+- setvbuf now accepts caller-provided buffers for stdio streams
+- getrandom syscall wrapper, getentropy function
+- mlock2 syscall wrapper
+- memfd_create syscall wrapper
+- explicit_bzero function
+- header-level support for new linux features through 4.17
+- wcsftime now supports padding specifier extensions
+- dynamic linker's reclaim_gaps now works on fdpic archs
+- getaddrinfo now honors AI_ADDRCONFIG
+- pthread_attr_init now honors pthread_setattr_default_np defaults
+
+hardening:
+- prevent bypass of guarantee that suids start with fd 0/1/2 open
+- dlopen now rejects libraries with initial-exec refs to dynamic TLS
+
+compatibility:
+- elf.h: new flags, aux vector entry types, etc.
+- minor namespace issues in several headers
+- intNN_t types used in bitfields now safe against -funsigned-bitfields
+- complex arc trig/hyperbolic functions were badly broken
+- nice function returned wrong value
+- stdio locks no longer depend on read-after-free not faulting
+- avoid excessive stack usage in getcwd
+- inet_ntop no longer compresses single zeros in IPv6 (RFC 5952)
+- resolver routability probe for sorting results works on no-IPv6 systems
+- added missing ST_RELATIME definition to statvfs.h
+- uchar.h now works with old C++ profiles
+- added missing and arch-specific commands to ptrace.h
+- musl-gcc wrapper now works with default-pie host toolchains
+
+bugs fixed:
+- getopt wrongly treating colons in optstring as valid option chars
+- nl_langinfo_l(CODESET, loc) reported wrong locale's value
+- out-of-tree build produced broken crt files with stack protector enabled
+- fmaf produced wrong result for some corner cases
+- out of bounds write for zero length buffer passed to gethostname
+- getopt_long_only wrongly prefix-matched long-options over short ones
+- pthread_kill wrongly returned ESRCH for exited by valid pthread_t's
+- iconv buffer overflow converting to legacy JIS-based encodings
+- iconv conversion to "UTF-32" (no explicit endianness) failed (regression)
+- iconv mishandled big5-hkscs characters that map to two unicode chars
+- dynamic linker didn't map/clear bss for libraries with single LOAD segment
+- resolver wrongly duplicated trailing dot from query into canonical name
+- some futex waits omitted timeout arg to syscall, thereby spun on EFAULT
+- dladdr mishandled addresses not matching symbols
+- alignment of dirent structures from readdir was broken (regression)
+- strftime %z output wrong sign for offsets <1 hour west of UTC
+- limits.h, pathconf erroneously defined SYMLINK_MAX
+- FP_ILOGB0 and FP_ILOGBNAN definitions were not valid for use in #if
+- getopt failed to update optarg and optind correctly on missing argument
+- EMULTIHOP error lacked strerror text
+- mktime malfunctioned with tm_isdst>0 but no-DST POSIX-format time zone
+- async thread self-cancellation produced a deadlock condition
+- pthread_barrierattr_setpshared failed to produce EINVAL for bad argument
+- fileno failed to produce EBADF for non-fd-associated FILEs
+- fmemopen's w+ mode failed to truncate buffer at open
+- open_[w]memstream did not bind stream orientation at open time
+- system wrongly returned 0x7f00 instead of -1 on error
+- wide printf functions ignored field width for %c formats
+- fprintf failed to set stream orientation for unbuffered stream or no output
+- psignal, psiginfo, and perror wrongly set stream orientation for stderr
+- psignal, psiginfo potentially clobbered errno on success
+
+arch-specfic bugs fixed:
+- on arm/aarch64/sh, local-exec TLS layout mismatched ABI with large align
+- on arm/microblaze/sh, struct ipc_perm mismatched (buggy) kernel ABI
+- SO_PEERSEC definition was wrong on mips
+- on mips, return from start function passed to clone crashed (runaway exec)
+- printf %a precision specifier malfunctioned except on ld80 archs
+- async thread cancellation crashed on powerpc64 and sh-fdpic
+
+
+1.1.21 release notes
+
+new features:
+- setting default thread stack size via PT_GNU_STACK program header
+- arm vfork implementation
+- arm tlsdesc/gnu2 tls dialect support
+- name_to_handle_at and name_to_handle_at syscall wrappers
+- header-level support for new linux features through 4.18
+
+optimizations:
+- glob rewrite with much better performance and stack usage properties
+- single-threaded and already-locked fast paths for getc/putc variants
+- single-instruction fma implementations for arm, s390x, powerpc, & x86_64
+- single-instruction fabs and sqrt implementations for powerpc
+- size and performance from making all internal-only functions/data hidden
+- made &errno and pthread_self results cachable again (attribute((const)))
+- significant speedup in strtod with short inputs
+- new tsearch AVL tree implementation, smaller and faster
+- special-cased nop calls to wmemmove
+- fixed erroneously suboptimal skip conditions in strstr and memmem
+
+hardening:
+- default thread stack guard size increased from 4k to 8k
+
+compatibility:
+- default thread stack size increased from 80k to 128k
+- building for arm as thumb2 with clang internal assembler now works
+- aio threads could overflow stack on kernels that break MINSIGSTKSZ ABI
+- aio threads no longer call malloc (problematic with malloc replacement)
+- pthread_sigmask/sigprocmask now ignore an invalid how when not changing mask
+
+bugs fixed:
+- soft deadlock regression in stdio FILE locks with >2 threads contending
+- deadlock and buffered data loss race in fclose
+- race condition leading to possible crash in dcngettext plural forms
+- glob failed to see past searchable-but-unreadable path components
+- getdelim wrongly realloc'd buffer that was already exactly right size
+- getdelim failed to set stream orientation on early error
+- ttyname[_r] reported wrong error when given bad fd
+- pthread_key_delete left old tsd values exposed if slot was reused
+- freeaddrinfo failed to support freeing sublists
+- access to optopt was broken by copy relocations
+- memccpy returned wrong result if first byte past buffer end matched
+- wordexp read past end of input string ending in backslash
+- sem_wait and sem_timedwait were wrongly not interruptible by signals
+- getspnam[_r] wrongly treated not-found as an error
+
+arch-specfic bugs fixed:
+- soft deadlocks (missing futex wake) on powerpc locking
+- dlsym returned wrong address for thread-local symbols on ppc/mips/m68k
+
+
+1.1.22 release notes
+
+new features:
+- priority-inheritance mutexes
+- membarrier syscall, pre-registration to use it, fallback emulation
+- header-level support for new linux features in 4.19, 4.20, 5.0
+
+major internal changes:
+- complete, async-safe view of all existent threads as global list
+- robust __synccall based on new thread list
+- new dynamic TLS is installed synchronously at dlopen
+- TLSDESC resolver functions no longer make bad ABI assumptions to call C
+- resolved shared library dependencies are now recorded
+
+compatibility & conformance:
+- dependency-order shared library constructor execution
+- sigaltstack no longer rejects SS_AUTODISARM, future flags
+- FILE is now a complete (dummy) type in pre-C11 feature profiles
+- setvbuf reports failure on invalid arguments
+- TSVTX is exposed unconditionally in tar.h
+- multithreaded set*id() no longer depends on /proc
+- key slot reuse after pthread_key_delete no longer depends on /proc
+
+bugs fixed:
+- failures in multithreaded set*id() with concurrent thread creation/exit
+- interposed free was called from invalid/inconsistent contexts
+- freeaddrinfo performed invalid free of some partial results lists
+- dlsym dependency order search had false negatives and false positives
+- dn_skipname gave wrong results for labels with 8-bit content
+- dcngettext clobbered errno, often breaking printing of error messages
+- sscanf read past end of buffer under certain conditions (1.1.21 regression)
+- pthread_key_create spuriously failed under race condition (1.1.21 regression)
+- fdopendir wrongly succeeded with O_PATH file descriptors
+- gets behaved incorrectly in presence of null bytes
+- namespace violations in c11 tsd and mutex function dependencies
+- incorrect prototype for makecontext (unimplemented)
+
+arch-specfic bugs fixed:
+- s390x had wrong values for POSIX_FADV_DONTNEED/_NOREUSE
+
+
+
+1.1.23 release notes
+
+new features:
+- riscv64 port
+- configure now allows customizing AR and RANLIB vars
+- header-level support for new linux features in 5.1
+
+major internal changes:
+- removed extern __syscall; syscall header code is now fully self-contained
+
+performance:
+- new math library implementation for log/exp/pow
+- aarch64 dynamic tlsdesc function is streamlined
+
+compatibility & conformance:
+- O_TTY_INIT is now defined
+- sys/types.h no longer pollutes namespace with sys/sysmacros.h in any profile
+- powerpc asm is now compatible with clang internal assembler
+
+changes for new POSIX interpretations:
+- fgetwc now sets stream error indicator on encoding errors
+- fmemopen no longer rejects 0 size
+
+bugs fixed:
+- static TLS for shared libraries was allocated wrong on "Variant I" archs
+- crash in dladdr reading through uninitialized pointer on non-match
+- sigaltstack wrongly errored out on invalid ss_size when doing SS_DISABLE
+- getdents function misbehaved with buffer length larger than INT_MAX
+- set*id could deadlock after fork from multithreaded process
+
+arch-specfic bugs fixed:
+- s390x SO_PEERSEC definition was wrong
+- passing of 64-bit syscall arguments was broken on microblaze
+- posix_fadvise was broken on mips due to missing 7-arg syscall support
+- vrregset_t layout and member naming was wrong on powerpc64
+
+
+
+1.1.24 release notes
+
+new features:
+- GLOB_TILDE extension to glob
+- non-stub catgets localization API, using netbsd binary catalog format
+- posix_spawn file actions for [f]chdir (extension, pending future standard)
+- secure_getenv function (extension)
+- copy_file_range syscall wrapper (Linux extension)
+- header-level support for new linux features in 5.2
+
+performance:
+- new fast path for lrint (generic C version) on 32-bit archs
+
+major internal changes:
+- functions involving time are overhauled to be time64-ready in 32-bit archs
+- x32 uses the new time64 code paths to replace nasty hacks in syscall glue
+
+compatibility & conformance:
+- support for powerpc[64] unaligned relocation types
+- powerpc[64] and sh sys/user.h no longer clash with kernel asm/ptrace.h
+- select no longer modifies timeout on failure (or at all)
+- mips64 stat results are no longer limited to 32-bit time range
+- optreset (BSD extension) now has a public declaration
+- support for clang inconsistencies in wchar_t type vs some 32-bit archs
+- mips r6 syscall asm no longer has invalid lo/hi register clobbers
+- vestigial asm declarations of __tls_get_new are removed (broke some tooling)
+- riscv64 mcontext_t mismatch glibc's member naming is corrected
+
+bugs fixed:
+- glob failed to match broken symlinks consistently
+- invalid use of interposed calloc to allocate initial TLS
+- various dlsym symbol resolution logic errors
+- semctl with SEM_STAT_ANY didn't work
+- pthread_create with explicit scheduling was subject to priority inversion
+- pthread_create failure path had data race for thread count
+- timer_create with SIGEV_THREAD notification had data race getting timer id
+- wide printf family failed to support l modifier for float formats
+
+arch-specific bugs fixed:
+- x87 floating point stack imbalance in math asm (i386-only CVE-2019-14697)
+- x32 clock_adjtime, getrusage, wait3, wait4 produced junk (struct mismatches)
+- lseek broken on x32 and mipsn32 with large file offsets
+- riscv64 atomics weren't compiler barriers
+- riscv64 atomics had broken asm constraints (missing earlyclobber flag)
+- arm clone() was broken when compiled as thumb if start function returned
+- mipsr6 setjmp/longjmp did not preserve fpu register state correctly
+
+
+
+1.2.0 release notes
+
+new features:
+- time_t is now 64-bit on all archs (not just 64-bit archs)
+- character type & case mapping data updated to Unicode 12.1.0
+- header-level support for new linux features in 5.3 and 5.4
+
+performance:
+- new O(1) wchar_t case mapping implementation
+- i386 now uses C math code for exp, faster than old asm
+- mips math asm
+
+compatibility & conformance:
+- endian.h now aims to conform to future POSIX definition
+- support older compilers that don't accept powerpc math asm constraints
+- fdpic code in ldso was incompatible with valid optimizations in gcc 9+
+- RLIMIT_RTTIME was missing from sys/resource.h
+
+bugs fixed:
+- wcwidth wrongly returned 0 for most of planes 4 and up
+- missing case mapping between U+03F3 and U+037F
+- wrong cacosh results for arguments with negative imaginary part
+- wrong catanf/catanl results for various classes of arguments
+- wrong return value for ungetc with argument outside [0,UCHAR_MAX]
+- posix_openpt with no ptys available produced wrong errno
+
+arch-specific bugs fixed:
+- sigcontext/regset definition mistakes & omissions on m68k, powerpc64
+- fesetenv(FE_DFL_ENV) crashed on riscv64
+- sh2 dynamic linker was broken since 1.1.21 (crash in stage 2b)
+- arm dynamic linker chose wrong tls/atomic variants since 1.1.21
+- some math library functions returned excess precision on i386
+- unconfirmed regression in fchmodat AT_SYMLINK_NOFOLLOW on mips*
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/atomic_arch.h
new file mode 100644
index 0000000000..40fefc25bb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/atomic_arch.h
@@ -0,0 +1,82 @@
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+	__asm__ __volatile__ ("ldaxr %w0,%1" : "=r"(v) : "Q"(*p));
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+	__asm__ __volatile__ ("stlxr %w0,%w2,%1" : "=&r"(r), "=Q"(*p) : "r"(v) : "memory");
+	return !r;
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("dmb ish" : : : "memory");
+}
+
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	int old;
+	do {
+		old = a_ll(p);
+		if (old != t) {
+			a_barrier();
+			break;
+		}
+	} while (!a_sc(p, s));
+	return old;
+}
+
+#define a_ll_p a_ll_p
+static inline void *a_ll_p(volatile void *p)
+{
+	void *v;
+	__asm__ __volatile__ ("ldaxr %0, %1" : "=r"(v) : "Q"(*(void *volatile *)p));
+	return v;
+}
+
+#define a_sc_p a_sc_p
+static inline int a_sc_p(volatile int *p, void *v)
+{
+	int r;
+	__asm__ __volatile__ ("stlxr %w0,%2,%1" : "=&r"(r), "=Q"(*(void *volatile *)p) : "r"(v) : "memory");
+	return !r;
+}
+
+#define a_cas_p a_cas_p
+static inline void *a_cas_p(volatile void *p, void *t, void *s)
+{
+	void *old;
+	do {
+		old = a_ll_p(p);
+		if (old != t) {
+			a_barrier();
+			break;
+		}
+	} while (!a_sc_p(p, s));
+	return old;
+}
+
+#define a_ctz_64 a_ctz_64
+static inline int a_ctz_64(uint64_t x)
+{
+	__asm__(
+		"	rbit %0, %1\n"
+		"	clz %0, %0\n"
+		: "=r"(x) : "r"(x));
+	return x;
+}
+
+#define a_clz_64 a_clz_64
+static inline int a_clz_64(uint64_t x)
+{
+	__asm__("clz %0, %1" : "=r"(x) : "r"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/alltypes.h.in
new file mode 100644
index 0000000000..c547ca0b72
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/alltypes.h.in
@@ -0,0 +1,24 @@
+#define _Addr long
+#define _Int64 long
+#define _Reg long
+
+#if __AARCH64EB__
+#define __BYTE_ORDER 4321
+#else
+#define __BYTE_ORDER 1234
+#endif
+
+#define __LONG_MAX 0x7fffffffffffffffL
+
+#ifndef __cplusplus
+TYPEDEF unsigned wchar_t;
+#endif
+TYPEDEF unsigned wint_t;
+
+TYPEDEF int blksize_t;
+TYPEDEF unsigned int nlink_t;
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/fcntl.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/float.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/hwcap.h
new file mode 100644
index 0000000000..a7484028e0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/hwcap.h
@@ -0,0 +1,40 @@
+#define HWCAP_FP		(1 << 0)
+#define HWCAP_ASIMD		(1 << 1)
+#define HWCAP_EVTSTRM		(1 << 2)
+#define HWCAP_AES		(1 << 3)
+#define HWCAP_PMULL		(1 << 4)
+#define HWCAP_SHA1		(1 << 5)
+#define HWCAP_SHA2		(1 << 6)
+#define HWCAP_CRC32		(1 << 7)
+#define HWCAP_ATOMICS		(1 << 8)
+#define HWCAP_FPHP		(1 << 9)
+#define HWCAP_ASIMDHP		(1 << 10)
+#define HWCAP_CPUID		(1 << 11)
+#define HWCAP_ASIMDRDM		(1 << 12)
+#define HWCAP_JSCVT		(1 << 13)
+#define HWCAP_FCMA		(1 << 14)
+#define HWCAP_LRCPC		(1 << 15)
+#define HWCAP_DCPOP		(1 << 16)
+#define HWCAP_SHA3		(1 << 17)
+#define HWCAP_SM3		(1 << 18)
+#define HWCAP_SM4		(1 << 19)
+#define HWCAP_ASIMDDP		(1 << 20)
+#define HWCAP_SHA512		(1 << 21)
+#define HWCAP_SVE		(1 << 22)
+#define HWCAP_ASIMDFHM		(1 << 23)
+#define HWCAP_DIT		(1 << 24)
+#define HWCAP_USCAT		(1 << 25)
+#define HWCAP_ILRCPC		(1 << 26)
+#define HWCAP_FLAGM		(1 << 27)
+#define HWCAP_SSBS		(1 << 28)
+#define HWCAP_SB		(1 << 29)
+#define HWCAP_PACA		(1 << 30)
+#define HWCAP_PACG		(1UL << 31)
+
+#define HWCAP2_DCPODP		(1 << 0)
+#define HWCAP2_SVE2		(1 << 1)
+#define HWCAP2_SVEAES		(1 << 2)
+#define HWCAP2_SVEPMULL		(1 << 3)
+#define HWCAP2_SVEBITPERM	(1 << 4)
+#define HWCAP2_SVESHA3		(1 << 5)
+#define HWCAP2_SVESM4		(1 << 6)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/signal.h
new file mode 100644
index 0000000000..b71261f568
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/signal.h
@@ -0,0 +1,153 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 6144
+#define SIGSTKSZ 12288
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef unsigned long greg_t;
+typedef unsigned long gregset_t[34];
+
+typedef struct {
+	long double vregs[32];
+	unsigned int fpsr;
+	unsigned int fpcr;
+} fpregset_t;
+typedef struct sigcontext {
+	unsigned long fault_address;
+	unsigned long regs[31];
+	unsigned long sp, pc, pstate;
+	long double __reserved[256];
+} mcontext_t;
+
+#define FPSIMD_MAGIC 0x46508001
+#define ESR_MAGIC 0x45535201
+#define EXTRA_MAGIC 0x45585401
+#define SVE_MAGIC 0x53564501
+struct _aarch64_ctx {
+	unsigned int magic;
+	unsigned int size;
+};
+struct fpsimd_context {
+	struct _aarch64_ctx head;
+	unsigned int fpsr;
+	unsigned int fpcr;
+	long double vregs[32];
+};
+struct esr_context {
+	struct _aarch64_ctx head;
+	unsigned long esr;
+};
+struct extra_context {
+	struct _aarch64_ctx head;
+	unsigned long datap;
+	unsigned int size;
+	unsigned int __reserved[3];
+};
+struct sve_context {
+	struct _aarch64_ctx head;
+	unsigned short vl;
+	unsigned short __reserved[3];
+};
+#define SVE_VQ_BYTES		16
+#define SVE_VQ_MIN		1
+#define SVE_VQ_MAX		512
+#define SVE_VL_MIN		(SVE_VQ_MIN * SVE_VQ_BYTES)
+#define SVE_VL_MAX		(SVE_VQ_MAX * SVE_VQ_BYTES)
+#define SVE_NUM_ZREGS		32
+#define SVE_NUM_PREGS		16
+#define sve_vl_valid(vl) \
+	((vl) % SVE_VQ_BYTES == 0 && (vl) >= SVE_VL_MIN && (vl) <= SVE_VL_MAX)
+#define sve_vq_from_vl(vl)	((vl) / SVE_VQ_BYTES)
+#define sve_vl_from_vq(vq)	((vq) * SVE_VQ_BYTES)
+#define SVE_SIG_ZREG_SIZE(vq)	((unsigned)(vq) * SVE_VQ_BYTES)
+#define SVE_SIG_PREG_SIZE(vq)	((unsigned)(vq) * (SVE_VQ_BYTES / 8))
+#define SVE_SIG_FFR_SIZE(vq)	SVE_SIG_PREG_SIZE(vq)
+#define SVE_SIG_REGS_OFFSET					\
+	((sizeof(struct sve_context) + (SVE_VQ_BYTES - 1))	\
+		/ SVE_VQ_BYTES * SVE_VQ_BYTES)
+#define SVE_SIG_ZREGS_OFFSET	SVE_SIG_REGS_OFFSET
+#define SVE_SIG_ZREG_OFFSET(vq, n) \
+	(SVE_SIG_ZREGS_OFFSET + SVE_SIG_ZREG_SIZE(vq) * (n))
+#define SVE_SIG_ZREGS_SIZE(vq) \
+	(SVE_SIG_ZREG_OFFSET(vq, SVE_NUM_ZREGS) - SVE_SIG_ZREGS_OFFSET)
+#define SVE_SIG_PREGS_OFFSET(vq) \
+	(SVE_SIG_ZREGS_OFFSET + SVE_SIG_ZREGS_SIZE(vq))
+#define SVE_SIG_PREG_OFFSET(vq, n) \
+	(SVE_SIG_PREGS_OFFSET(vq) + SVE_SIG_PREG_SIZE(vq) * (n))
+#define SVE_SIG_PREGS_SIZE(vq) \
+	(SVE_SIG_PREG_OFFSET(vq, SVE_NUM_PREGS) - SVE_SIG_PREGS_OFFSET(vq))
+#define SVE_SIG_FFR_OFFSET(vq) \
+	(SVE_SIG_PREGS_OFFSET(vq) + SVE_SIG_PREGS_SIZE(vq))
+#define SVE_SIG_REGS_SIZE(vq) \
+	(SVE_SIG_FFR_OFFSET(vq) + SVE_SIG_FFR_SIZE(vq) - SVE_SIG_REGS_OFFSET)
+#define SVE_SIG_CONTEXT_SIZE(vq) (SVE_SIG_REGS_OFFSET + SVE_SIG_REGS_SIZE(vq))
+#else
+typedef struct {
+	long double __regs[18+256];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	sigset_t uc_sigmask;
+	mcontext_t uc_mcontext;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  2
+#define SA_SIGINFO    4
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/stat.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/stat.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/stat.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/syscall.h.in
new file mode 100644
index 0000000000..93648afdfe
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/syscall.h.in
@@ -0,0 +1,292 @@
+#define __NR_io_setup 0
+#define __NR_io_destroy 1
+#define __NR_io_submit 2
+#define __NR_io_cancel 3
+#define __NR_io_getevents 4
+#define __NR_setxattr 5
+#define __NR_lsetxattr 6
+#define __NR_fsetxattr 7
+#define __NR_getxattr 8
+#define __NR_lgetxattr 9
+#define __NR_fgetxattr 10
+#define __NR_listxattr 11
+#define __NR_llistxattr 12
+#define __NR_flistxattr 13
+#define __NR_removexattr 14
+#define __NR_lremovexattr 15
+#define __NR_fremovexattr 16
+#define __NR_getcwd 17
+#define __NR_lookup_dcookie 18
+#define __NR_eventfd2 19
+#define __NR_epoll_create1 20
+#define __NR_epoll_ctl 21
+#define __NR_epoll_pwait 22
+#define __NR_dup 23
+#define __NR_dup3 24
+#define __NR_fcntl 25
+#define __NR_inotify_init1 26
+#define __NR_inotify_add_watch 27
+#define __NR_inotify_rm_watch 28
+#define __NR_ioctl 29
+#define __NR_ioprio_set 30
+#define __NR_ioprio_get 31
+#define __NR_flock 32
+#define __NR_mknodat 33
+#define __NR_mkdirat 34
+#define __NR_unlinkat 35
+#define __NR_symlinkat 36
+#define __NR_linkat 37
+#define __NR_renameat 38
+#define __NR_umount2 39
+#define __NR_mount 40
+#define __NR_pivot_root 41
+#define __NR_nfsservctl 42
+#define __NR_statfs 43
+#define __NR_fstatfs 44
+#define __NR_truncate 45
+#define __NR_ftruncate 46
+#define __NR_fallocate 47
+#define __NR_faccessat 48
+#define __NR_chdir 49
+#define __NR_fchdir 50
+#define __NR_chroot 51
+#define __NR_fchmod 52
+#define __NR_fchmodat 53
+#define __NR_fchownat 54
+#define __NR_fchown 55
+#define __NR_openat 56
+#define __NR_close 57
+#define __NR_vhangup 58
+#define __NR_pipe2 59
+#define __NR_quotactl 60
+#define __NR_getdents64 61
+#define __NR_lseek 62
+#define __NR_read 63
+#define __NR_write 64
+#define __NR_readv 65
+#define __NR_writev 66
+#define __NR_pread64 67
+#define __NR_pwrite64 68
+#define __NR_preadv 69
+#define __NR_pwritev 70
+#define __NR_sendfile 71
+#define __NR_pselect6 72
+#define __NR_ppoll 73
+#define __NR_signalfd4 74
+#define __NR_vmsplice 75
+#define __NR_splice 76
+#define __NR_tee 77
+#define __NR_readlinkat 78
+#define __NR_newfstatat 79
+#define __NR_fstat 80
+#define __NR_sync 81
+#define __NR_fsync 82
+#define __NR_fdatasync 83
+#define __NR_sync_file_range 84
+#define __NR_timerfd_create 85
+#define __NR_timerfd_settime 86
+#define __NR_timerfd_gettime 87
+#define __NR_utimensat 88
+#define __NR_acct 89
+#define __NR_capget 90
+#define __NR_capset 91
+#define __NR_personality 92
+#define __NR_exit 93
+#define __NR_exit_group 94
+#define __NR_waitid 95
+#define __NR_set_tid_address 96
+#define __NR_unshare 97
+#define __NR_futex 98
+#define __NR_set_robust_list 99
+#define __NR_get_robust_list 100
+#define __NR_nanosleep 101
+#define __NR_getitimer 102
+#define __NR_setitimer 103
+#define __NR_kexec_load 104
+#define __NR_init_module 105
+#define __NR_delete_module 106
+#define __NR_timer_create 107
+#define __NR_timer_gettime 108
+#define __NR_timer_getoverrun 109
+#define __NR_timer_settime 110
+#define __NR_timer_delete 111
+#define __NR_clock_settime 112
+#define __NR_clock_gettime 113
+#define __NR_clock_getres 114
+#define __NR_clock_nanosleep 115
+#define __NR_syslog 116
+#define __NR_ptrace 117
+#define __NR_sched_setparam 118
+#define __NR_sched_setscheduler 119
+#define __NR_sched_getscheduler 120
+#define __NR_sched_getparam 121
+#define __NR_sched_setaffinity 122
+#define __NR_sched_getaffinity 123
+#define __NR_sched_yield 124
+#define __NR_sched_get_priority_max 125
+#define __NR_sched_get_priority_min 126
+#define __NR_sched_rr_get_interval 127
+#define __NR_restart_syscall 128
+#define __NR_kill 129
+#define __NR_tkill 130
+#define __NR_tgkill 131
+#define __NR_sigaltstack 132
+#define __NR_rt_sigsuspend 133
+#define __NR_rt_sigaction 134
+#define __NR_rt_sigprocmask 135
+#define __NR_rt_sigpending 136
+#define __NR_rt_sigtimedwait 137
+#define __NR_rt_sigqueueinfo 138
+#define __NR_rt_sigreturn 139
+#define __NR_setpriority 140
+#define __NR_getpriority 141
+#define __NR_reboot 142
+#define __NR_setregid 143
+#define __NR_setgid 144
+#define __NR_setreuid 145
+#define __NR_setuid 146
+#define __NR_setresuid 147
+#define __NR_getresuid 148
+#define __NR_setresgid 149
+#define __NR_getresgid 150
+#define __NR_setfsuid 151
+#define __NR_setfsgid 152
+#define __NR_times 153
+#define __NR_setpgid 154
+#define __NR_getpgid 155
+#define __NR_getsid 156
+#define __NR_setsid 157
+#define __NR_getgroups 158
+#define __NR_setgroups 159
+#define __NR_uname 160
+#define __NR_sethostname 161
+#define __NR_setdomainname 162
+#define __NR_getrlimit 163
+#define __NR_setrlimit 164
+#define __NR_getrusage 165
+#define __NR_umask 166
+#define __NR_prctl 167
+#define __NR_getcpu 168
+#define __NR_gettimeofday 169
+#define __NR_settimeofday 170
+#define __NR_adjtimex 171
+#define __NR_getpid 172
+#define __NR_getppid 173
+#define __NR_getuid 174
+#define __NR_geteuid 175
+#define __NR_getgid 176
+#define __NR_getegid 177
+#define __NR_gettid 178
+#define __NR_sysinfo 179
+#define __NR_mq_open 180
+#define __NR_mq_unlink 181
+#define __NR_mq_timedsend 182
+#define __NR_mq_timedreceive 183
+#define __NR_mq_notify 184
+#define __NR_mq_getsetattr 185
+#define __NR_msgget 186
+#define __NR_msgctl 187
+#define __NR_msgrcv 188
+#define __NR_msgsnd 189
+#define __NR_semget 190
+#define __NR_semctl 191
+#define __NR_semtimedop 192
+#define __NR_semop 193
+#define __NR_shmget 194
+#define __NR_shmctl 195
+#define __NR_shmat 196
+#define __NR_shmdt 197
+#define __NR_socket 198
+#define __NR_socketpair 199
+#define __NR_bind 200
+#define __NR_listen 201
+#define __NR_accept 202
+#define __NR_connect 203
+#define __NR_getsockname 204
+#define __NR_getpeername 205
+#define __NR_sendto 206
+#define __NR_recvfrom 207
+#define __NR_setsockopt 208
+#define __NR_getsockopt 209
+#define __NR_shutdown 210
+#define __NR_sendmsg 211
+#define __NR_recvmsg 212
+#define __NR_readahead 213
+#define __NR_brk 214
+#define __NR_munmap 215
+#define __NR_mremap 216
+#define __NR_add_key 217
+#define __NR_request_key 218
+#define __NR_keyctl 219
+#define __NR_clone 220
+#define __NR_execve 221
+#define __NR_mmap 222
+#define __NR_fadvise64 223
+#define __NR_swapon 224
+#define __NR_swapoff 225
+#define __NR_mprotect 226
+#define __NR_msync 227
+#define __NR_mlock 228
+#define __NR_munlock 229
+#define __NR_mlockall 230
+#define __NR_munlockall 231
+#define __NR_mincore 232
+#define __NR_madvise 233
+#define __NR_remap_file_pages 234
+#define __NR_mbind 235
+#define __NR_get_mempolicy 236
+#define __NR_set_mempolicy 237
+#define __NR_migrate_pages 238
+#define __NR_move_pages 239
+#define __NR_rt_tgsigqueueinfo 240
+#define __NR_perf_event_open 241
+#define __NR_accept4 242
+#define __NR_recvmmsg 243
+#define __NR_wait4 260
+#define __NR_prlimit64 261
+#define __NR_fanotify_init 262
+#define __NR_fanotify_mark 263
+#define __NR_name_to_handle_at 264
+#define __NR_open_by_handle_at 265
+#define __NR_clock_adjtime 266
+#define __NR_syncfs 267
+#define __NR_setns 268
+#define __NR_sendmmsg 269
+#define __NR_process_vm_readv 270
+#define __NR_process_vm_writev 271
+#define __NR_kcmp 272
+#define __NR_finit_module 273
+#define __NR_sched_setattr 274
+#define __NR_sched_getattr 275
+#define __NR_renameat2 276
+#define __NR_seccomp 277
+#define __NR_getrandom 278
+#define __NR_memfd_create 279
+#define __NR_bpf 280
+#define __NR_execveat 281
+#define __NR_userfaultfd 282
+#define __NR_membarrier 283
+#define __NR_mlock2 284
+#define __NR_copy_file_range 285
+#define __NR_preadv2 286
+#define __NR_pwritev2 287
+#define __NR_pkey_mprotect 288
+#define __NR_pkey_alloc 289
+#define __NR_pkey_free 290
+#define __NR_statx 291
+#define __NR_io_pgetevents 292
+#define __NR_rseq 293
+#define __NR_kexec_file_load 294
+#define __NR_pidfd_send_signal 424
+#define __NR_io_uring_setup 425
+#define __NR_io_uring_enter 426
+#define __NR_io_uring_register 427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/user.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/user.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/bits/user.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/aarch64/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/fp_arch.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/fp_arch.h
new file mode 100644
index 0000000000..f3d445b958
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/fp_arch.h
@@ -0,0 +1,25 @@
+#define fp_barrierf fp_barrierf
+static inline float fp_barrierf(float x)
+{
+	__asm__ __volatile__ ("" : "+w"(x));
+	return x;
+}
+
+#define fp_barrier fp_barrier
+static inline double fp_barrier(double x)
+{
+	__asm__ __volatile__ ("" : "+w"(x));
+	return x;
+}
+
+#define fp_force_evalf fp_force_evalf
+static inline void fp_force_evalf(float x)
+{
+	__asm__ __volatile__ ("" : "+w"(x));
+}
+
+#define fp_force_eval fp_force_eval
+static inline void fp_force_eval(double x)
+{
+	__asm__ __volatile__ ("" : "+w"(x));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/kstat.h
new file mode 100644
index 0000000000..92625f3639
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	unsigned long __pad;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __pad2;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	unsigned __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/pthread_arch.h
new file mode 100644
index 0000000000..e64b126d2c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/pthread_arch.h
@@ -0,0 +1,12 @@
+static inline struct pthread *__pthread_self()
+{
+	char *self;
+	__asm__ ("mrs %0,tpidr_el0" : "=r"(self));
+	return (void*)(self - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 16
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
+
+#define MC_PC pc
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/reloc.h
new file mode 100644
index 0000000000..b1b68c7255
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/reloc.h
@@ -0,0 +1,24 @@
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define ENDIAN_SUFFIX "_be"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "aarch64" ENDIAN_SUFFIX
+
+#define NO_LEGACY_INITFINI
+
+#define TPOFF_K 0
+
+#define REL_SYMBOLIC    R_AARCH64_ABS64
+#define REL_GOT         R_AARCH64_GLOB_DAT
+#define REL_PLT         R_AARCH64_JUMP_SLOT
+#define REL_RELATIVE    R_AARCH64_RELATIVE
+#define REL_COPY        R_AARCH64_COPY
+#define REL_DTPMOD      R_AARCH64_TLS_DTPMOD64
+#define REL_DTPOFF      R_AARCH64_TLS_DTPREL64
+#define REL_TPOFF       R_AARCH64_TLS_TPREL64
+#define REL_TLSDESC     R_AARCH64_TLSDESC
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mov sp,%1 ; br %0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/aarch64/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/aarch64/syscall_arch.h
new file mode 100644
index 0000000000..504983aa27
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/aarch64/syscall_arch.h
@@ -0,0 +1,78 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+
+#define __asm_syscall(...) do { \
+	__asm__ __volatile__ ( "svc 0" \
+	: "=r"(x0) : __VA_ARGS__ : "memory", "cc"); \
+	return x0; \
+	} while (0)
+
+static inline long __syscall0(long n)
+{
+	register long x8 __asm__("x8") = n;
+	register long x0 __asm__("x0");
+	__asm_syscall("r"(x8));
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long x8 __asm__("x8") = n;
+	register long x0 __asm__("x0") = a;
+	__asm_syscall("r"(x8), "0"(x0));
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long x8 __asm__("x8") = n;
+	register long x0 __asm__("x0") = a;
+	register long x1 __asm__("x1") = b;
+	__asm_syscall("r"(x8), "0"(x0), "r"(x1));
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long x8 __asm__("x8") = n;
+	register long x0 __asm__("x0") = a;
+	register long x1 __asm__("x1") = b;
+	register long x2 __asm__("x2") = c;
+	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2));
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long x8 __asm__("x8") = n;
+	register long x0 __asm__("x0") = a;
+	register long x1 __asm__("x1") = b;
+	register long x2 __asm__("x2") = c;
+	register long x3 __asm__("x3") = d;
+	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3));
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long x8 __asm__("x8") = n;
+	register long x0 __asm__("x0") = a;
+	register long x1 __asm__("x1") = b;
+	register long x2 __asm__("x2") = c;
+	register long x3 __asm__("x3") = d;
+	register long x4 __asm__("x4") = e;
+	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4));
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long x8 __asm__("x8") = n;
+	register long x0 __asm__("x0") = a;
+	register long x1 __asm__("x1") = b;
+	register long x2 __asm__("x2") = c;
+	register long x3 __asm__("x3") = d;
+	register long x4 __asm__("x4") = e;
+	register long x5 __asm__("x5") = f;
+	__asm_syscall("r"(x8), "0"(x0), "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5));
+}
+
+#define VDSO_USEFUL
+#define VDSO_CGT_SYM "__kernel_clock_gettime"
+#define VDSO_CGT_VER "LINUX_2.6.39"
+
+#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/arm/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/arm/atomic_arch.h
new file mode 100644
index 0000000000..9e3937cc0f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/atomic_arch.h
@@ -0,0 +1,107 @@
+#include "libc.h"
+
+#if __ARM_ARCH_4__ || __ARM_ARCH_4T__ || __ARM_ARCH == 4
+#define BLX "mov lr,pc\n\tbx"
+#else
+#define BLX "blx"
+#endif
+
+extern hidden uintptr_t __a_cas_ptr, __a_barrier_ptr;
+
+#if ((__ARM_ARCH_6__ || __ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+ || __ARM_ARCH_6T2__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
+
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+	__asm__ __volatile__ ("ldrex %0, %1" : "=r"(v) : "Q"(*p));
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+	__asm__ __volatile__ ("strex %0,%2,%1" : "=&r"(r), "=Q"(*p) : "r"(v) : "memory");
+	return !r;
+}
+
+#if __ARM_ARCH_7A__ || __ARM_ARCH_7R__ ||  __ARM_ARCH >= 7
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("dmb ish" : : : "memory");
+}
+
+#endif
+
+#define a_pre_llsc a_barrier
+#define a_post_llsc a_barrier
+
+#else
+
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	for (;;) {
+		register int r0 __asm__("r0") = t;
+		register int r1 __asm__("r1") = s;
+		register volatile int *r2 __asm__("r2") = p;
+		register uintptr_t r3 __asm__("r3") = __a_cas_ptr;
+		int old;
+		__asm__ __volatile__ (
+			BLX " r3"
+			: "+r"(r0), "+r"(r3) : "r"(r1), "r"(r2)
+			: "memory", "lr", "ip", "cc" );
+		if (!r0) return t;
+		if ((old=*p)!=t) return old;
+	}
+}
+
+#endif
+
+#ifndef a_barrier
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	register uintptr_t ip __asm__("ip") = __a_barrier_ptr;
+	__asm__ __volatile__( BLX " ip" : "+r"(ip) : : "memory", "cc", "lr" );
+}
+#endif
+
+#define a_crash a_crash
+static inline void a_crash()
+{
+	__asm__ __volatile__(
+#ifndef __thumb__
+		".word 0xe7f000f0"
+#else
+		".short 0xdeff"
+#endif
+		: : : "memory");
+}
+
+#if __ARM_ARCH >= 5 && (!__thumb__ || __thumb2__)
+
+#define a_clz_32 a_clz_32
+static inline int a_clz_32(uint32_t x)
+{
+	__asm__ ("clz %0, %1" : "=r"(x) : "r"(x));
+	return x;
+}
+
+#if __ARM_ARCH_6T2__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
+
+#define a_ctz_32 a_ctz_32
+static inline int a_ctz_32(uint32_t x)
+{
+	uint32_t xr;
+	__asm__ ("rbit %0, %1" : "=r"(xr) : "r"(x));
+	return a_clz_32(xr);
+}
+
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/alltypes.h.in
new file mode 100644
index 0000000000..d62bd7bde6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/alltypes.h.in
@@ -0,0 +1,21 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#if __ARMEB__
+#define __BYTE_ORDER 4321
+#else
+#define __BYTE_ORDER 1234
+#endif
+
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+TYPEDEF unsigned wchar_t;
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/fcntl.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/float.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/hwcap.h
new file mode 100644
index 0000000000..a3d87312d3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/hwcap.h
@@ -0,0 +1,53 @@
+#define HWCAP_SWP	(1 << 0)
+#define HWCAP_HALF	(1 << 1)
+#define HWCAP_THUMB	(1 << 2)
+#define HWCAP_26BIT	(1 << 3)
+#define HWCAP_FAST_MULT	(1 << 4)
+#define HWCAP_FPA	(1 << 5)
+#define HWCAP_VFP	(1 << 6)
+#define HWCAP_EDSP	(1 << 7)
+#define HWCAP_JAVA	(1 << 8)
+#define HWCAP_IWMMXT	(1 << 9)
+#define HWCAP_CRUNCH	(1 << 10)
+#define HWCAP_THUMBEE	(1 << 11)
+#define HWCAP_NEON	(1 << 12)
+#define HWCAP_VFPv3	(1 << 13)
+#define HWCAP_VFPv3D16	(1 << 14)
+#define HWCAP_TLS	(1 << 15)
+#define HWCAP_VFPv4	(1 << 16)
+#define HWCAP_IDIVA	(1 << 17)
+#define HWCAP_IDIVT	(1 << 18)
+#define HWCAP_VFPD32	(1 << 19)
+#define HWCAP_IDIV	(HWCAP_IDIVA | HWCAP_IDIVT)
+#define HWCAP_LPAE	(1 << 20)
+#define HWCAP_EVTSTRM	(1 << 21)
+
+#define HWCAP2_AES	(1 << 0)
+#define HWCAP2_PMULL	(1 << 1)
+#define HWCAP2_SHA1	(1 << 2)
+#define HWCAP2_SHA2	(1 << 3)
+#define HWCAP2_CRC32	(1 << 4)
+
+#define HWCAP_ARM_SWP	(1 << 0)
+#define HWCAP_ARM_HALF	(1 << 1)
+#define HWCAP_ARM_THUMB	(1 << 2)
+#define HWCAP_ARM_26BIT	(1 << 3)
+#define HWCAP_ARM_FAST_MULT	(1 << 4)
+#define HWCAP_ARM_FPA	(1 << 5)
+#define HWCAP_ARM_VFP	(1 << 6)
+#define HWCAP_ARM_EDSP	(1 << 7)
+#define HWCAP_ARM_JAVA	(1 << 8)
+#define HWCAP_ARM_IWMMXT	(1 << 9)
+#define HWCAP_ARM_CRUNCH	(1 << 10)
+#define HWCAP_ARM_THUMBEE	(1 << 11)
+#define HWCAP_ARM_NEON	(1 << 12)
+#define HWCAP_ARM_VFPv3	(1 << 13)
+#define HWCAP_ARM_VFPv3D16	(1 << 14)
+#define HWCAP_ARM_TLS	(1 << 15)
+#define HWCAP_ARM_VFPv4	(1 << 16)
+#define HWCAP_ARM_IDIVA	(1 << 17)
+#define HWCAP_ARM_IDIVT	(1 << 18)
+#define HWCAP_ARM_VFPD32	(1 << 19)
+#define HWCAP_ARM_IDIV	(HWCAP_ARM_IDIVA | HWCAP_ARM_IDIVT)
+#define HWCAP_ARM_LPAE	(1 << 20)
+#define HWCAP_ARM_EVTSTRM	(1 << 21)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ioctl_fix.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ioctl_fix.h
new file mode 100644
index 0000000000..ebb383dafa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ioctl_fix.h
@@ -0,0 +1,2 @@
+#undef FIOQSIZE
+#define FIOQSIZE 0x545e
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/msg.h
new file mode 100644
index 0000000000..7bbbb2bf43
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/msg.h
@@ -0,0 +1,18 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ptrace.h
new file mode 100644
index 0000000000..9556ef4b7c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/ptrace.h
@@ -0,0 +1,25 @@
+#define PTRACE_GETWMMXREGS	18
+#define PTRACE_SETWMMXREGS	19
+#define PTRACE_GET_THREAD_AREA	22
+#define PTRACE_SET_SYSCALL	23
+#define PTRACE_GETCRUNCHREGS	25
+#define PTRACE_SETCRUNCHREGS	26
+#define PTRACE_GETVFPREGS	27
+#define PTRACE_SETVFPREGS	28
+#define PTRACE_GETHBPREGS	29
+#define PTRACE_SETHBPREGS	30
+#define PTRACE_GETFDPIC		31
+#define PTRACE_GETFDPIC_EXEC	0
+#define PTRACE_GETFDPIC_INTERP	1
+
+#define PT_GETWMMXREGS PTRACE_GETWMMXREGS
+#define PT_SETWMMXREGS PTRACE_SETWMMXREGS
+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
+#define PT_SET_SYSCALL PTRACE_SET_SYSCALL
+#define PT_GETCRUNCHREGS PTRACE_GETCRUNCHREGS
+#define PT_SETCRUNCHREGS PTRACE_SETCRUNCHREGS
+#define PT_GETVFPREGS PTRACE_GETVFPREGS
+#define PT_SETVFPREGS PTRACE_SETVFPREGS
+#define PT_GETHBPREGS PTRACE_GETHBPREGS
+#define PT_SETHBPREGS PTRACE_SETHBPREGS
+#define PT_GETFDPIC PTRACE_GETFDPIC
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/sem.h
new file mode 100644
index 0000000000..544e3d2a52
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/sem.h
@@ -0,0 +1,18 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_lo;
+	unsigned long __sem_ctime_hi;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+#else
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+#endif
+	long __unused3;
+	long __unused4;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/shm.h
new file mode 100644
index 0000000000..725fb46968
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/shm.h
@@ -0,0 +1,31 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_atime_hi;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_dtime_hi;
+	unsigned long __shm_ctime_lo;
+	unsigned long __shm_ctime_hi;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+	unsigned long __pad3;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/signal.h
new file mode 100644
index 0000000000..3c78985672
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/signal.h
@@ -0,0 +1,86 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef int greg_t, gregset_t[18];
+typedef struct sigcontext {
+	unsigned long trap_no, error_code, oldmask;
+	unsigned long arm_r0, arm_r1, arm_r2, arm_r3;
+	unsigned long arm_r4, arm_r5, arm_r6, arm_r7;
+	unsigned long arm_r8, arm_r9, arm_r10, arm_fp;
+	unsigned long arm_ip, arm_sp, arm_lr, arm_pc;
+	unsigned long arm_cpsr, fault_address;
+} mcontext_t;
+#else
+typedef struct {
+	unsigned long __regs[21];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+	unsigned long long uc_regspace[64];
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  2
+#define SA_SIGINFO    4
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/stat.h
new file mode 100644
index 0000000000..5d7828cf79
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/stat.h
@@ -0,0 +1,25 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	int __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	int __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	ino_t st_ino;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/syscall.h.in
new file mode 100644
index 0000000000..11d677635b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/syscall.h.in
@@ -0,0 +1,399 @@
+#define __NR_restart_syscall	0
+#define __NR_exit	1
+#define __NR_fork	2
+#define __NR_read	3
+#define __NR_write	4
+#define __NR_open	5
+#define __NR_close	6
+#define __NR_creat	8
+#define __NR_link	9
+#define __NR_unlink	10
+#define __NR_execve	11
+#define __NR_chdir	12
+#define __NR_mknod	14
+#define __NR_chmod	15
+#define __NR_lchown	16
+#define __NR_lseek	19
+#define __NR_getpid	20
+#define __NR_mount	21
+#define __NR_setuid	23
+#define __NR_getuid	24
+#define __NR_ptrace	26
+#define __NR_pause	29
+#define __NR_access	33
+#define __NR_nice	34
+#define __NR_sync	36
+#define __NR_kill	37
+#define __NR_rename	38
+#define __NR_mkdir	39
+#define __NR_rmdir	40
+#define __NR_dup	41
+#define __NR_pipe	42
+#define __NR_times	43
+#define __NR_brk	45
+#define __NR_setgid	46
+#define __NR_getgid	47
+#define __NR_geteuid	49
+#define __NR_getegid	50
+#define __NR_acct	51
+#define __NR_umount2	52
+#define __NR_ioctl	54
+#define __NR_fcntl	55
+#define __NR_setpgid	57
+#define __NR_umask	60
+#define __NR_chroot	61
+#define __NR_ustat	62
+#define __NR_dup2	63
+#define __NR_getppid	64
+#define __NR_getpgrp	65
+#define __NR_setsid	66
+#define __NR_sigaction	67
+#define __NR_setreuid	70
+#define __NR_setregid	71
+#define __NR_sigsuspend	72
+#define __NR_sigpending	73
+#define __NR_sethostname	74
+#define __NR_setrlimit	75
+#define __NR_getrusage	77
+#define __NR_gettimeofday_time32	78
+#define __NR_settimeofday_time32	79
+#define __NR_getgroups	80
+#define __NR_setgroups	81
+#define __NR_symlink	83
+#define __NR_readlink	85
+#define __NR_uselib	86
+#define __NR_swapon	87
+#define __NR_reboot	88
+#define __NR_munmap	91
+#define __NR_truncate	92
+#define __NR_ftruncate	93
+#define __NR_fchmod	94
+#define __NR_fchown	95
+#define __NR_getpriority	96
+#define __NR_setpriority	97
+#define __NR_statfs	99
+#define __NR_fstatfs	100
+#define __NR_syslog	103
+#define __NR_setitimer	104
+#define __NR_getitimer	105
+#define __NR_stat	106
+#define __NR_lstat	107
+#define __NR_fstat	108
+#define __NR_vhangup	111
+#define __NR_wait4	114
+#define __NR_swapoff	115
+#define __NR_sysinfo	116
+#define __NR_fsync	118
+#define __NR_sigreturn	119
+#define __NR_clone	120
+#define __NR_setdomainname	121
+#define __NR_uname	122
+#define __NR_adjtimex	124
+#define __NR_mprotect	125
+#define __NR_sigprocmask	126
+#define __NR_init_module	128
+#define __NR_delete_module	129
+#define __NR_quotactl	131
+#define __NR_getpgid	132
+#define __NR_fchdir	133
+#define __NR_bdflush	134
+#define __NR_sysfs	135
+#define __NR_personality	136
+#define __NR_setfsuid	138
+#define __NR_setfsgid	139
+#define __NR__llseek	140
+#define __NR_getdents	141
+#define __NR__newselect	142
+#define __NR_flock	143
+#define __NR_msync	144
+#define __NR_readv	145
+#define __NR_writev	146
+#define __NR_getsid	147
+#define __NR_fdatasync	148
+#define __NR__sysctl	149
+#define __NR_mlock	150
+#define __NR_munlock	151
+#define __NR_mlockall	152
+#define __NR_munlockall	153
+#define __NR_sched_setparam	154
+#define __NR_sched_getparam	155
+#define __NR_sched_setscheduler	156
+#define __NR_sched_getscheduler	157
+#define __NR_sched_yield	158
+#define __NR_sched_get_priority_max	159
+#define __NR_sched_get_priority_min	160
+#define __NR_sched_rr_get_interval	161
+#define __NR_nanosleep	162
+#define __NR_mremap	163
+#define __NR_setresuid	164
+#define __NR_getresuid	165
+#define __NR_poll	168
+#define __NR_nfsservctl	169
+#define __NR_setresgid	170
+#define __NR_getresgid	171
+#define __NR_prctl	172
+#define __NR_rt_sigreturn	173
+#define __NR_rt_sigaction	174
+#define __NR_rt_sigprocmask	175
+#define __NR_rt_sigpending	176
+#define __NR_rt_sigtimedwait	177
+#define __NR_rt_sigqueueinfo	178
+#define __NR_rt_sigsuspend	179
+#define __NR_pread64	180
+#define __NR_pwrite64	181
+#define __NR_chown	182
+#define __NR_getcwd	183
+#define __NR_capget	184
+#define __NR_capset	185
+#define __NR_sigaltstack	186
+#define __NR_sendfile	187
+#define __NR_vfork	190
+#define __NR_ugetrlimit	191
+#define __NR_mmap2	192
+#define __NR_truncate64	193
+#define __NR_ftruncate64	194
+#define __NR_stat64	195
+#define __NR_lstat64	196
+#define __NR_fstat64	197
+#define __NR_lchown32	198
+#define __NR_getuid32	199
+#define __NR_getgid32	200
+#define __NR_geteuid32	201
+#define __NR_getegid32	202
+#define __NR_setreuid32	203
+#define __NR_setregid32	204
+#define __NR_getgroups32	205
+#define __NR_setgroups32	206
+#define __NR_fchown32	207
+#define __NR_setresuid32	208
+#define __NR_getresuid32	209
+#define __NR_setresgid32	210
+#define __NR_getresgid32	211
+#define __NR_chown32	212
+#define __NR_setuid32	213
+#define __NR_setgid32	214
+#define __NR_setfsuid32	215
+#define __NR_setfsgid32	216
+#define __NR_getdents64	217
+#define __NR_pivot_root	218
+#define __NR_mincore	219
+#define __NR_madvise	220
+#define __NR_fcntl64	221
+#define __NR_gettid	224
+#define __NR_readahead	225
+#define __NR_setxattr	226
+#define __NR_lsetxattr	227
+#define __NR_fsetxattr	228
+#define __NR_getxattr	229
+#define __NR_lgetxattr	230
+#define __NR_fgetxattr	231
+#define __NR_listxattr	232
+#define __NR_llistxattr	233
+#define __NR_flistxattr	234
+#define __NR_removexattr	235
+#define __NR_lremovexattr	236
+#define __NR_fremovexattr	237
+#define __NR_tkill	238
+#define __NR_sendfile64	239
+#define __NR_futex	240
+#define __NR_sched_setaffinity	241
+#define __NR_sched_getaffinity	242
+#define __NR_io_setup	243
+#define __NR_io_destroy	244
+#define __NR_io_getevents	245
+#define __NR_io_submit	246
+#define __NR_io_cancel	247
+#define __NR_exit_group	248
+#define __NR_lookup_dcookie	249
+#define __NR_epoll_create	250
+#define __NR_epoll_ctl	251
+#define __NR_epoll_wait	252
+#define __NR_remap_file_pages	253
+#define __NR_set_tid_address	256
+#define __NR_timer_create	257
+#define __NR_timer_settime32	258
+#define __NR_timer_gettime32	259
+#define __NR_timer_getoverrun	260
+#define __NR_timer_delete	261
+#define __NR_clock_settime32	262
+#define __NR_clock_gettime32	263
+#define __NR_clock_getres_time32	264
+#define __NR_clock_nanosleep_time32	265
+#define __NR_statfs64	266
+#define __NR_fstatfs64	267
+#define __NR_tgkill	268
+#define __NR_utimes	269
+#define __NR_fadvise64_64	270
+#define __NR_arm_fadvise64_64	270
+#define __NR_pciconfig_iobase	271
+#define __NR_pciconfig_read	272
+#define __NR_pciconfig_write	273
+#define __NR_mq_open	274
+#define __NR_mq_unlink	275
+#define __NR_mq_timedsend	276
+#define __NR_mq_timedreceive	277
+#define __NR_mq_notify	278
+#define __NR_mq_getsetattr	279
+#define __NR_waitid	280
+#define __NR_socket	281
+#define __NR_bind	282
+#define __NR_connect	283
+#define __NR_listen	284
+#define __NR_accept	285
+#define __NR_getsockname	286
+#define __NR_getpeername	287
+#define __NR_socketpair	288
+#define __NR_send	289
+#define __NR_sendto	290
+#define __NR_recv	291
+#define __NR_recvfrom	292
+#define __NR_shutdown	293
+#define __NR_setsockopt	294
+#define __NR_getsockopt	295
+#define __NR_sendmsg	296
+#define __NR_recvmsg	297
+#define __NR_semop	298
+#define __NR_semget	299
+#define __NR_semctl	300
+#define __NR_msgsnd	301
+#define __NR_msgrcv	302
+#define __NR_msgget	303
+#define __NR_msgctl	304
+#define __NR_shmat	305
+#define __NR_shmdt	306
+#define __NR_shmget	307
+#define __NR_shmctl	308
+#define __NR_add_key	309
+#define __NR_request_key	310
+#define __NR_keyctl	311
+#define __NR_semtimedop	312
+#define __NR_vserver	313
+#define __NR_ioprio_set	314
+#define __NR_ioprio_get	315
+#define __NR_inotify_init	316
+#define __NR_inotify_add_watch	317
+#define __NR_inotify_rm_watch	318
+#define __NR_mbind	319
+#define __NR_get_mempolicy	320
+#define __NR_set_mempolicy	321
+#define __NR_openat	322
+#define __NR_mkdirat	323
+#define __NR_mknodat	324
+#define __NR_fchownat	325
+#define __NR_futimesat	326
+#define __NR_fstatat64	327
+#define __NR_unlinkat	328
+#define __NR_renameat	329
+#define __NR_linkat	330
+#define __NR_symlinkat	331
+#define __NR_readlinkat	332
+#define __NR_fchmodat	333
+#define __NR_faccessat	334
+#define __NR_pselect6	335
+#define __NR_ppoll	336
+#define __NR_unshare	337
+#define __NR_set_robust_list	338
+#define __NR_get_robust_list	339
+#define __NR_splice	340
+#define __NR_sync_file_range2	341
+#define __NR_arm_sync_file_range	341
+#define __NR_tee	342
+#define __NR_vmsplice	343
+#define __NR_move_pages	344
+#define __NR_getcpu	345
+#define __NR_epoll_pwait	346
+#define __NR_kexec_load	347
+#define __NR_utimensat	348
+#define __NR_signalfd	349
+#define __NR_timerfd_create	350
+#define __NR_eventfd	351
+#define __NR_fallocate	352
+#define __NR_timerfd_settime32	353
+#define __NR_timerfd_gettime32	354
+#define __NR_signalfd4	355
+#define __NR_eventfd2	356
+#define __NR_epoll_create1	357
+#define __NR_dup3	358
+#define __NR_pipe2	359
+#define __NR_inotify_init1	360
+#define __NR_preadv	361
+#define __NR_pwritev	362
+#define __NR_rt_tgsigqueueinfo	363
+#define __NR_perf_event_open	364
+#define __NR_recvmmsg	365
+#define __NR_accept4	366
+#define __NR_fanotify_init	367
+#define __NR_fanotify_mark	368
+#define __NR_prlimit64	369
+#define __NR_name_to_handle_at	370
+#define __NR_open_by_handle_at	371
+#define __NR_clock_adjtime	372
+#define __NR_syncfs	373
+#define __NR_sendmmsg	374
+#define __NR_setns	375
+#define __NR_process_vm_readv	376
+#define __NR_process_vm_writev	377
+#define __NR_kcmp		378
+#define __NR_finit_module	379
+#define __NR_sched_setattr	380
+#define __NR_sched_getattr	381
+#define __NR_renameat2	382
+#define __NR_seccomp	383
+#define __NR_getrandom	384
+#define __NR_memfd_create	385
+#define __NR_bpf	386
+#define __NR_execveat	387
+#define __NR_userfaultfd	388
+#define __NR_membarrier		389
+#define __NR_mlock2		390
+#define __NR_copy_file_range	391
+#define __NR_preadv2	392
+#define __NR_pwritev2	393
+#define __NR_pkey_mprotect	394
+#define __NR_pkey_alloc	395
+#define __NR_pkey_free	396
+#define __NR_statx	397
+#define __NR_rseq	398
+#define __NR_io_pgetevents	399
+#define __NR_migrate_pages	400
+#define __NR_kexec_file_load	401
+#define __NR_clock_gettime64	403
+#define __NR_clock_settime64	404
+#define __NR_clock_adjtime64	405
+#define __NR_clock_getres_time64	406
+#define __NR_clock_nanosleep_time64	407
+#define __NR_timer_gettime64	408
+#define __NR_timer_settime64	409
+#define __NR_timerfd_gettime64	410
+#define __NR_timerfd_settime64	411
+#define __NR_utimensat_time64	412
+#define __NR_pselect6_time64	413
+#define __NR_ppoll_time64	414
+#define __NR_io_pgetevents_time64	416
+#define __NR_recvmmsg_time64	417
+#define __NR_mq_timedsend_time64	418
+#define __NR_mq_timedreceive_time64	419
+#define __NR_semtimedop_time64	420
+#define __NR_rt_sigtimedwait_time64	421
+#define __NR_futex_time64	422
+#define __NR_sched_rr_get_interval_time64	423
+#define __NR_pidfd_send_signal	424
+#define __NR_io_uring_setup	425
+#define __NR_io_uring_enter	426
+#define __NR_io_uring_register	427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
+#define __ARM_NR_breakpoint	0x0f0001
+#define __ARM_NR_cacheflush	0x0f0002
+#define __ARM_NR_usr26		0x0f0003
+#define __ARM_NR_usr32		0x0f0004
+#define __ARM_NR_set_tls	0x0f0005
+#define __ARM_NR_get_tls	0x0f0006
+
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/arm/bits/user.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/user.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/bits/user.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/arm/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/arm/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/arm/kstat.h
new file mode 100644
index 0000000000..af449c9509
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	int __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	int __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	ino_t st_ino;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/arm/pthread_arch.h
new file mode 100644
index 0000000000..e689ea212a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/pthread_arch.h
@@ -0,0 +1,33 @@
+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
+
+static inline pthread_t __pthread_self()
+{
+	char *p;
+	__asm__ ( "mrc p15,0,%0,c13,c0,3" : "=r"(p) );
+	return (void *)(p-sizeof(struct pthread));
+}
+
+#else
+
+#if __ARM_ARCH_4__ || __ARM_ARCH_4T__ || __ARM_ARCH == 4
+#define BLX "mov lr,pc\n\tbx"
+#else
+#define BLX "blx"
+#endif
+
+static inline pthread_t __pthread_self()
+{
+	extern hidden uintptr_t __a_gettp_ptr;
+	register uintptr_t p __asm__("r0");
+	__asm__ ( BLX " %1" : "=r"(p) : "r"(__a_gettp_ptr) : "cc", "lr" );
+	return (void *)(p-sizeof(struct pthread));
+}
+
+#endif
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 8
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
+
+#define MC_PC arm_pc
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/arm/reloc.h
new file mode 100644
index 0000000000..d091d2ad92
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/reloc.h
@@ -0,0 +1,32 @@
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define ENDIAN_SUFFIX "eb"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#if __ARM_PCS_VFP
+#define FP_SUFFIX "hf"
+#else
+#define FP_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "arm" ENDIAN_SUFFIX FP_SUFFIX
+
+#define NO_LEGACY_INITFINI
+
+#define TPOFF_K 0
+
+#define REL_SYMBOLIC    R_ARM_ABS32
+#define REL_GOT         R_ARM_GLOB_DAT
+#define REL_PLT         R_ARM_JUMP_SLOT
+#define REL_RELATIVE    R_ARM_RELATIVE
+#define REL_COPY        R_ARM_COPY
+#define REL_DTPMOD      R_ARM_TLS_DTPMOD32
+#define REL_DTPOFF      R_ARM_TLS_DTPOFF32
+#define REL_TPOFF       R_ARM_TLS_TPOFF32
+#define REL_TLSDESC     R_ARM_TLS_DESC
+
+#define TLSDESC_BACKWARDS
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mov sp,%1 ; bx %0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/arm/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/arm/syscall_arch.h
new file mode 100644
index 0000000000..5e87282e13
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/arm/syscall_arch.h
@@ -0,0 +1,76 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
+
+#ifdef __thumb__
+
+/* Avoid use of r7 in asm constraints when producing thumb code,
+ * since it's reserved as frame pointer and might not be supported. */
+#define __ASM____R7__
+#define __asm_syscall(...) do { \
+	__asm__ __volatile__ ( "mov %1,r7 ; mov r7,%2 ; svc 0 ; mov r7,%1" \
+	: "=r"(r0), "=&r"((int){0}) : __VA_ARGS__ : "memory"); \
+	return r0; \
+	} while (0)
+
+#else
+
+#define __ASM____R7__ __asm__("r7")
+#define __asm_syscall(...) do { \
+	__asm__ __volatile__ ( "svc 0" \
+	: "=r"(r0) : __VA_ARGS__ : "memory"); \
+	return r0; \
+	} while (0)
+#endif
+
+/* For thumb2, we can allow 8-bit immediate syscall numbers, saving a
+ * register in the above dance around r7. Does not work for thumb1 where
+ * only movs, not mov, supports immediates, and we can't use movs because
+ * it doesn't support high regs. */
+#ifdef __thumb2__
+#define R7_OPERAND "rI"(r7)
+#else
+#define R7_OPERAND "r"(r7)
+#endif
+
+extern long __cos_syscall(int, long, long, long, long, long, long, long);
+
+static inline long __syscall0(long n)
+{
+	return __cos_syscall(n, 0, 0, 0, 0, 0, 0, 0);
+}
+
+static inline long __syscall1(long n, long a)
+{
+	return __cos_syscall(n, a, 0, 0, 0, 0, 0, 0);
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	return __cos_syscall(n, a, b, 0, 0, 0, 0, 0);
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	return __cos_syscall(n, a, b, c, 0, 0, 0, 0);
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	return __cos_syscall(n, a, b, c, d, 0, 0, 0);
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	return __cos_syscall(n, a, b, c, d, e, 0, 0);
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	return __cos_syscall(n, a, b, c, d, e, f, 0);
+}
+
+#define SYSCALL_FADVISE_6_ARG
+
+#define SYSCALL_IPC_BROKEN_MODE
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/dirent.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/dirent.h
new file mode 100644
index 0000000000..c845fe82dd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/dirent.h
@@ -0,0 +1,11 @@
+#define _DIRENT_HAVE_D_RECLEN
+#define _DIRENT_HAVE_D_OFF
+#define _DIRENT_HAVE_D_TYPE
+
+struct dirent {
+	ino_t d_ino;
+	off_t d_off;
+	unsigned short d_reclen;
+	unsigned char d_type;
+	char d_name[256];
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/errno.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/errno.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/errno.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/errno.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/fcntl.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/poll.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/hwcap.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/poll.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/hwcap.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/io.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/io.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/io.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/io.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ioctl.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ioctl.h
new file mode 100644
index 0000000000..60ae8b850b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ioctl.h
@@ -0,0 +1,115 @@
+#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  0U
+#define _IOC_WRITE 1U
+#define _IOC_READ  2U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+
+#define TCGETS		0x5401
+#define TCSETS		0x5402
+#define TCSETSW		0x5403
+#define TCSETSF		0x5404
+#define TCGETA		0x5405
+#define TCSETA		0x5406
+#define TCSETAW		0x5407
+#define TCSETAF		0x5408
+#define TCSBRK		0x5409
+#define TCXONC		0x540A
+#define TCFLSH		0x540B
+#define TIOCEXCL	0x540C
+#define TIOCNXCL	0x540D
+#define TIOCSCTTY	0x540E
+#define TIOCGPGRP	0x540F
+#define TIOCSPGRP	0x5410
+#define TIOCOUTQ	0x5411
+#define TIOCSTI		0x5412
+#define TIOCGWINSZ	0x5413
+#define TIOCSWINSZ	0x5414
+#define TIOCMGET	0x5415
+#define TIOCMBIS	0x5416
+#define TIOCMBIC	0x5417
+#define TIOCMSET	0x5418
+#define TIOCGSOFTCAR	0x5419
+#define TIOCSSOFTCAR	0x541A
+#define FIONREAD	0x541B
+#define TIOCINQ		FIONREAD
+#define TIOCLINUX	0x541C
+#define TIOCCONS	0x541D
+#define TIOCGSERIAL	0x541E
+#define TIOCSSERIAL	0x541F
+#define TIOCPKT		0x5420
+#define FIONBIO		0x5421
+#define TIOCNOTTY	0x5422
+#define TIOCSETD	0x5423
+#define TIOCGETD	0x5424
+#define TCSBRKP		0x5425
+#define TIOCSBRK	0x5427
+#define TIOCCBRK	0x5428
+#define TIOCGSID	0x5429
+#define TIOCGRS485	0x542E
+#define TIOCSRS485	0x542F
+#define TIOCGPTN	0x80045430
+#define TIOCSPTLCK	0x40045431
+#define TIOCGDEV	0x80045432
+#define TCGETX		0x5432
+#define TCSETX		0x5433
+#define TCSETXF		0x5434
+#define TCSETXW		0x5435
+#define TIOCSIG		0x40045436
+#define TIOCVHANGUP	0x5437
+#define TIOCGPKT	0x80045438
+#define TIOCGPTLCK	0x80045439
+#define TIOCGEXCL	0x80045440
+#define TIOCGPTPEER	0x5441
+#define TIOCGISO7816	0x80285442
+#define TIOCSISO7816	0xc0285443
+
+#define FIONCLEX	0x5450
+#define FIOCLEX		0x5451
+#define FIOASYNC	0x5452
+#define TIOCSERCONFIG	0x5453
+#define TIOCSERGWILD	0x5454
+#define TIOCSERSWILD	0x5455
+#define TIOCGLCKTRMIOS	0x5456
+#define TIOCSLCKTRMIOS	0x5457
+#define TIOCSERGSTRUCT	0x5458
+#define TIOCSERGETLSR   0x5459
+#define TIOCSERGETMULTI 0x545A
+#define TIOCSERSETMULTI 0x545B
+
+#define TIOCMIWAIT	0x545C
+#define TIOCGICOUNT	0x545D
+#define FIOQSIZE	0x5460
+
+#define TIOCM_LE        0x001
+#define TIOCM_DTR       0x002
+#define TIOCM_RTS       0x004
+#define TIOCM_ST        0x008
+#define TIOCM_SR        0x010
+#define TIOCM_CTS       0x020
+#define TIOCM_CAR       0x040
+#define TIOCM_RNG       0x080
+#define TIOCM_DSR       0x100
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+
+#define FIOSETOWN       0x8901
+#define SIOCSPGRP       0x8902
+#define FIOGETOWN       0x8903
+#define SIOCGPGRP       0x8904
+#define SIOCATMARK      0x8905
+#if __LONG_MAX == 0x7fffffff
+#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
+#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])
+#else
+#define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
+#endif
+
+#include <bits/ioctl_fix.h>
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/resource.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ioctl_fix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/resource.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/ioctl_fix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ipc.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ipc.h
new file mode 100644
index 0000000000..40d6f3a258
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ipc.h
@@ -0,0 +1,11 @@
+struct ipc_perm {
+	key_t __ipc_perm_key;
+	uid_t uid;
+	gid_t gid;
+	uid_t cuid;
+	gid_t cgid;
+	mode_t mode;
+	int __ipc_perm_seq;
+	long __pad1;
+	long __pad2;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ipcstat.h
new file mode 100644
index 0000000000..0018ad1e20
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 2
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/kd.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/kd.h
new file mode 100644
index 0000000000..33b873f49c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/kd.h
@@ -0,0 +1 @@
+#include <linux/kd.h>
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/poll.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/limits.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/poll.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/limits.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/link.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/link.h
new file mode 100644
index 0000000000..4a94d8f895
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/link.h
@@ -0,0 +1 @@
+typedef uint32_t Elf_Symndx;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/bits/resource.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/mman.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/bits/resource.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/mman.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/msg.h
new file mode 100644
index 0000000000..2e23ca27f5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/msg.h
@@ -0,0 +1,12 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/poll.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/poll.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/poll.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/poll.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/src/atomics.c b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/ptrace.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/src/atomics.c
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/ptrace.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/resource.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/resource.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/resource.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/resource.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/sem.h
new file mode 100644
index 0000000000..5184eb5977
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/sem.h
@@ -0,0 +1,14 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	time_t sem_otime;
+	time_t sem_ctime;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+#else
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+#endif
+	long __unused3;
+	long __unused4;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/shm.h
new file mode 100644
index 0000000000..8d19378191
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/shm.h
@@ -0,0 +1,24 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/io.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/socket.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/io.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/socket.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/soundcard.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/soundcard.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/soundcard.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/soundcard.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/statfs.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/statfs.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/aarch64/bits/statfs.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/statfs.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/generic/bits/termios.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/termios.h
new file mode 100644
index 0000000000..124f71d201
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/termios.h
@@ -0,0 +1,166 @@
+struct termios {
+	tcflag_t c_iflag;
+	tcflag_t c_oflag;
+	tcflag_t c_cflag;
+	tcflag_t c_lflag;
+	cc_t c_line;
+	cc_t c_cc[NCCS];
+	speed_t __c_ispeed;
+	speed_t __c_ospeed;
+};
+
+#define VINTR     0
+#define VQUIT     1
+#define VERASE    2
+#define VKILL     3
+#define VEOF      4
+#define VTIME     5
+#define VMIN      6
+#define VSWTC     7
+#define VSTART    8
+#define VSTOP     9
+#define VSUSP    10
+#define VEOL     11
+#define VREPRINT 12
+#define VDISCARD 13
+#define VWERASE  14
+#define VLNEXT   15
+#define VEOL2    16
+
+#define IGNBRK  0000001
+#define BRKINT  0000002
+#define IGNPAR  0000004
+#define PARMRK  0000010
+#define INPCK   0000020
+#define ISTRIP  0000040
+#define INLCR   0000100
+#define IGNCR   0000200
+#define ICRNL   0000400
+#define IUCLC   0001000
+#define IXON    0002000
+#define IXANY   0004000
+#define IXOFF   0010000
+#define IMAXBEL 0020000
+#define IUTF8   0040000
+
+#define OPOST  0000001
+#define OLCUC  0000002
+#define ONLCR  0000004
+#define OCRNL  0000010
+#define ONOCR  0000020
+#define ONLRET 0000040
+#define OFILL  0000100
+#define OFDEL  0000200
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE)
+#define NLDLY  0000400
+#define NL0    0000000
+#define NL1    0000400
+#define CRDLY  0003000
+#define CR0    0000000
+#define CR1    0001000
+#define CR2    0002000
+#define CR3    0003000
+#define TABDLY 0014000
+#define TAB0   0000000
+#define TAB1   0004000
+#define TAB2   0010000
+#define TAB3   0014000
+#define BSDLY  0020000
+#define BS0    0000000
+#define BS1    0020000
+#define FFDLY  0100000
+#define FF0    0000000
+#define FF1    0100000
+#endif
+
+#define VTDLY  0040000
+#define VT0    0000000
+#define VT1    0040000
+
+#define B0       0000000
+#define B50      0000001
+#define B75      0000002
+#define B110     0000003
+#define B134     0000004
+#define B150     0000005
+#define B200     0000006
+#define B300     0000007
+#define B600     0000010
+#define B1200    0000011
+#define B1800    0000012
+#define B2400    0000013
+#define B4800    0000014
+#define B9600    0000015
+#define B19200   0000016
+#define B38400   0000017
+
+#define B57600   0010001
+#define B115200  0010002
+#define B230400  0010003
+#define B460800  0010004
+#define B500000  0010005
+#define B576000  0010006
+#define B921600  0010007
+#define B1000000 0010010
+#define B1152000 0010011
+#define B1500000 0010012
+#define B2000000 0010013
+#define B2500000 0010014
+#define B3000000 0010015
+#define B3500000 0010016
+#define B4000000 0010017
+
+#define CSIZE  0000060
+#define CS5    0000000
+#define CS6    0000020
+#define CS7    0000040
+#define CS8    0000060
+#define CSTOPB 0000100
+#define CREAD  0000200
+#define PARENB 0000400
+#define PARODD 0001000
+#define HUPCL  0002000
+#define CLOCAL 0004000
+
+#define ISIG   0000001
+#define ICANON 0000002
+#define ECHO   0000010
+#define ECHOE  0000020
+#define ECHOK  0000040
+#define ECHONL 0000100
+#define NOFLSH 0000200
+#define TOSTOP 0000400
+#define IEXTEN 0100000
+
+#define TCOOFF 0
+#define TCOON  1
+#define TCIOFF 2
+#define TCION  3
+
+#define TCIFLUSH  0
+#define TCOFLUSH  1
+#define TCIOFLUSH 2
+
+#define TCSANOW   0
+#define TCSADRAIN 1
+#define TCSAFLUSH 2
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA    0000016
+#define EXTB    0000017
+#define CBAUD   0010017
+#define CBAUDEX 0010000
+#define CIBAUD  002003600000
+#define CMSPAR  010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE   0000004
+#define ECHOCTL 0001000
+#define ECHOPRT 0002000
+#define ECHOKE  0004000
+#define FLUSHO  0010000
+#define PENDIN  0040000
+#define EXTPROC 0200000
+
+#define XTABS  0014000
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/vt.h b/src/components/lib/libc/musl-1.2.0/arch/generic/bits/vt.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/vt.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/bits/vt.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/poll.h b/src/components/lib/libc/musl-1.2.0/arch/generic/fp_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/poll.h
rename to src/components/lib/libc/musl-1.2.0/arch/generic/fp_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/i386/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/i386/atomic_arch.h
new file mode 100644
index 0000000000..047fb68dd5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/atomic_arch.h
@@ -0,0 +1,108 @@
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__ __volatile__ (
+		"lock ; cmpxchg %3, %1"
+		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
+	return t;
+}
+
+#define a_swap a_swap
+static inline int a_swap(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"xchg %0, %1"
+		: "=r"(v), "=m"(*p) : "0"(v) : "memory" );
+	return v;
+}
+
+#define a_fetch_add a_fetch_add
+static inline int a_fetch_add(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; xadd %0, %1"
+		: "=r"(v), "=m"(*p) : "0"(v) : "memory" );
+	return v;
+}
+
+#define a_and a_and
+static inline void a_and(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; and %1, %0"
+		: "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_or a_or
+static inline void a_or(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; or %1, %0"
+		: "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_inc a_inc
+static inline void a_inc(volatile int *p)
+{
+	__asm__ __volatile__(
+		"lock ; incl %0"
+		: "=m"(*p) : "m"(*p) : "memory" );
+}
+
+#define a_dec a_dec
+static inline void a_dec(volatile int *p)
+{
+	__asm__ __volatile__(
+		"lock ; decl %0"
+		: "=m"(*p) : "m"(*p) : "memory" );
+}
+
+#define a_store a_store
+static inline void a_store(volatile int *p, int x)
+{
+	__asm__ __volatile__(
+		"mov %1, %0 ; lock ; orl $0,(%%esp)"
+		: "=m"(*p) : "r"(x) : "memory" );
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__( "" : : : "memory" );
+}
+
+#define a_spin a_spin
+static inline void a_spin()
+{
+	__asm__ __volatile__( "pause" : : : "memory" );
+}
+
+#define a_crash a_crash
+static inline void a_crash()
+{
+	__asm__ __volatile__( "hlt" : : : "memory" );
+}
+
+#define a_ctz_64 a_ctz_64
+static inline int a_ctz_64(uint64_t x)
+{
+	int r;
+	__asm__( "bsf %1,%0 ; jnz 1f ; bsf %2,%0 ; add $32,%0\n1:"
+		: "=&r"(r) : "r"((unsigned)x), "r"((unsigned)(x>>32)) );
+	return r;
+}
+
+#define a_ctz_32 a_ctz_32
+static inline int a_ctz_32(uint32_t x)
+{
+	int r;
+	__asm__( "bsf %1,%0" : "=r"(r) : "r"(x) );
+	return r;
+}
+
+#define a_clz_32 a_clz_32
+static inline int a_clz_32(uint32_t x)
+{
+	__asm__( "bsr %1,%0 ; xor $31,%0" : "=r"(x) : "r"(x) );
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/alltypes.h.in
new file mode 100644
index 0000000000..6feb03a6c3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/alltypes.h.in
@@ -0,0 +1,31 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#define __BYTE_ORDER 1234
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+#ifdef __WCHAR_TYPE__
+TYPEDEF __WCHAR_TYPE__ wchar_t;
+#else
+TYPEDEF long wchar_t;
+#endif
+#endif
+
+#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+#else
+TYPEDEF long double float_t;
+TYPEDEF long double double_t;
+#endif
+
+#if !defined(__cplusplus)
+TYPEDEF struct { _Alignas(8) long long __ll; long double __ld; } max_align_t;
+#elif defined(__GNUC__)
+TYPEDEF struct { __attribute__((__aligned__(8))) long long __ll; long double __ld; } max_align_t;
+#else
+TYPEDEF struct { alignas(8) long long __ll; long double __ld; } max_align_t;
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/bits/float.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/io.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/io.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/io.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/bits/io.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/limits.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/limits.h
new file mode 100644
index 0000000000..07743b6fd6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/limits.h
@@ -0,0 +1 @@
+#define PAGESIZE 4096
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/mman.h
new file mode 100644
index 0000000000..ba2d6f7a83
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/mman.h
@@ -0,0 +1 @@
+#define MAP_32BIT      0x40
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/msg.h
new file mode 100644
index 0000000000..7bbbb2bf43
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/msg.h
@@ -0,0 +1,18 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/ptrace.h
new file mode 100644
index 0000000000..7d0efbf344
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/ptrace.h
@@ -0,0 +1,11 @@
+#define PTRACE_GET_THREAD_AREA		25
+#define PTRACE_SET_THREAD_AREA		26
+#define PTRACE_SYSEMU			31
+#define PTRACE_SYSEMU_SINGLESTEP	32
+#define PTRACE_SINGLEBLOCK		33
+
+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
+#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA
+#define PT_SYSEMU PTRACE_SYSEMU
+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP
+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/sem.h
new file mode 100644
index 0000000000..65661542a5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/sem.h
@@ -0,0 +1,13 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_lo;
+	unsigned long __sem_ctime_hi;
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	long __unused3;
+	long __unused4;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/shm.h
new file mode 100644
index 0000000000..725fb46968
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/shm.h
@@ -0,0 +1,31 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_atime_hi;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_dtime_hi;
+	unsigned long __shm_ctime_lo;
+	unsigned long __shm_ctime_hi;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+	unsigned long __pad3;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/signal.h
new file mode 100644
index 0000000000..9931ee93ed
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/signal.h
@@ -0,0 +1,142 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#ifdef _GNU_SOURCE
+enum { REG_GS = 0 };
+#define REG_GS REG_GS
+enum { REG_FS = 1 };
+#define REG_FS REG_FS
+enum { REG_ES = 2 };
+#define REG_ES REG_ES
+enum { REG_DS = 3 };
+#define REG_DS REG_DS
+enum { REG_EDI = 4 };
+#define REG_EDI REG_EDI
+enum { REG_ESI = 5 };
+#define REG_ESI REG_ESI
+enum { REG_EBP = 6 };
+#define REG_EBP REG_EBP
+enum { REG_ESP = 7 };
+#define REG_ESP REG_ESP
+enum { REG_EBX = 8 };
+#define REG_EBX REG_EBX
+enum { REG_EDX = 9 };
+#define REG_EDX REG_EDX
+enum { REG_ECX = 10 };
+#define REG_ECX REG_ECX
+enum { REG_EAX = 11 };
+#define REG_EAX REG_EAX
+enum { REG_TRAPNO = 12 };
+#define REG_TRAPNO REG_TRAPNO
+enum { REG_ERR = 13 };
+#define REG_ERR REG_ERR
+enum { REG_EIP = 14 };
+#define REG_EIP REG_EIP
+enum { REG_CS = 15 };
+#define REG_CS REG_CS
+enum { REG_EFL = 16 };
+#define REG_EFL REG_EFL
+enum { REG_UESP = 17 };
+#define REG_UESP REG_UESP
+enum { REG_SS = 18 };
+#define REG_SS REG_SS
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef int greg_t, gregset_t[19];
+typedef struct _fpstate {
+	unsigned long cw, sw, tag, ipoff, cssel, dataoff, datasel;
+	struct {
+		unsigned short significand[4], exponent;
+	} _st[8];
+	unsigned long status;
+} *fpregset_t;
+struct sigcontext {
+	unsigned short gs, __gsh, fs, __fsh, es, __esh, ds, __dsh;
+	unsigned long edi, esi, ebp, esp, ebx, edx, ecx, eax;
+	unsigned long trapno, err, eip;
+	unsigned short cs, __csh;
+	unsigned long eflags, esp_at_signal;
+	unsigned short ss, __ssh;
+	struct _fpstate *fpstate;
+	unsigned long oldmask, cr2;
+};
+typedef struct {
+	gregset_t gregs;
+	fpregset_t fpregs;
+	unsigned long oldmask, cr2;
+} mcontext_t;
+#else
+typedef struct {
+	unsigned __space[22];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+	unsigned long __fpregs_mem[28];
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  2
+#define SA_SIGINFO    4
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/stat.h
new file mode 100644
index 0000000000..5d7828cf79
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/stat.h
@@ -0,0 +1,25 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	int __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	int __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	ino_t st_ino;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/syscall.h.in
new file mode 100644
index 0000000000..1ae4e48a8f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/syscall.h.in
@@ -0,0 +1,429 @@
+#define __NR_restart_syscall      0
+#define __NR_exit		  1
+#define __NR_fork		  2
+#define __NR_read		  3
+#define __NR_write		  4
+#define __NR_open		  5
+#define __NR_close		  6
+#define __NR_waitpid		  7
+#define __NR_creat		  8
+#define __NR_link		  9
+#define __NR_unlink		 10
+#define __NR_execve		 11
+#define __NR_chdir		 12
+#define __NR_time		 13
+#define __NR_mknod		 14
+#define __NR_chmod		 15
+#define __NR_lchown		 16
+#define __NR_break		 17
+#define __NR_oldstat		 18
+#define __NR_lseek		 19
+#define __NR_getpid		 20
+#define __NR_mount		 21
+#define __NR_umount		 22
+#define __NR_setuid		 23
+#define __NR_getuid		 24
+#define __NR_stime		 25
+#define __NR_ptrace		 26
+#define __NR_alarm		 27
+#define __NR_oldfstat		 28
+#define __NR_pause		 29
+#define __NR_utime		 30
+#define __NR_stty		 31
+#define __NR_gtty		 32
+#define __NR_access		 33
+#define __NR_nice		 34
+#define __NR_ftime		 35
+#define __NR_sync		 36
+#define __NR_kill		 37
+#define __NR_rename		 38
+#define __NR_mkdir		 39
+#define __NR_rmdir		 40
+#define __NR_dup		 41
+#define __NR_pipe		 42
+#define __NR_times		 43
+#define __NR_prof		 44
+#define __NR_brk		 45
+#define __NR_setgid		 46
+#define __NR_getgid		 47
+#define __NR_signal		 48
+#define __NR_geteuid		 49
+#define __NR_getegid		 50
+#define __NR_acct		 51
+#define __NR_umount2		 52
+#define __NR_lock		 53
+#define __NR_ioctl		 54
+#define __NR_fcntl		 55
+#define __NR_mpx		 56
+#define __NR_setpgid		 57
+#define __NR_ulimit		 58
+#define __NR_oldolduname	 59
+#define __NR_umask		 60
+#define __NR_chroot		 61
+#define __NR_ustat		 62
+#define __NR_dup2		 63
+#define __NR_getppid		 64
+#define __NR_getpgrp		 65
+#define __NR_setsid		 66
+#define __NR_sigaction		 67
+#define __NR_sgetmask		 68
+#define __NR_ssetmask		 69
+#define __NR_setreuid		 70
+#define __NR_setregid		 71
+#define __NR_sigsuspend		 72
+#define __NR_sigpending		 73
+#define __NR_sethostname	 74
+#define __NR_setrlimit		 75
+#define __NR_getrlimit		 76   /* Back compatible 2Gig limited rlimit */
+#define __NR_getrusage		 77
+#define __NR_gettimeofday_time32	 78
+#define __NR_settimeofday_time32	 79
+#define __NR_getgroups		 80
+#define __NR_setgroups		 81
+#define __NR_select		 82
+#define __NR_symlink		 83
+#define __NR_oldlstat		 84
+#define __NR_readlink		 85
+#define __NR_uselib		 86
+#define __NR_swapon		 87
+#define __NR_reboot		 88
+#define __NR_readdir		 89
+#define __NR_mmap		 90
+#define __NR_munmap		 91
+#define __NR_truncate		 92
+#define __NR_ftruncate		 93
+#define __NR_fchmod		 94
+#define __NR_fchown		 95
+#define __NR_getpriority	 96
+#define __NR_setpriority	 97
+#define __NR_profil		 98
+#define __NR_statfs		99
+#define __NR_fstatfs		100
+#define __NR_ioperm		101
+#define __NR_socketcall		102
+#define __NR_syslog		103
+#define __NR_setitimer		104
+#define __NR_getitimer		105
+#define __NR_stat		106
+#define __NR_lstat		107
+#define __NR_fstat		108
+#define __NR_olduname		109
+#define __NR_iopl		110
+#define __NR_vhangup		111
+#define __NR_idle		112
+#define __NR_vm86old		113
+#define __NR_wait4		114
+#define __NR_swapoff		115
+#define __NR_sysinfo		116
+#define __NR_ipc		117
+#define __NR_fsync		118
+#define __NR_sigreturn		119
+#define __NR_clone		120
+#define __NR_setdomainname	121
+#define __NR_uname		122
+#define __NR_modify_ldt		123
+#define __NR_adjtimex		124
+#define __NR_mprotect		125
+#define __NR_sigprocmask	126
+#define __NR_create_module	127
+#define __NR_init_module	128
+#define __NR_delete_module	129
+#define __NR_get_kernel_syms	130
+#define __NR_quotactl		131
+#define __NR_getpgid		132
+#define __NR_fchdir		133
+#define __NR_bdflush		134
+#define __NR_sysfs		135
+#define __NR_personality	136
+#define __NR_afs_syscall	137
+#define __NR_setfsuid		138
+#define __NR_setfsgid		139
+#define __NR__llseek		140
+#define __NR_getdents		141
+#define __NR__newselect		142
+#define __NR_flock		143
+#define __NR_msync		144
+#define __NR_readv		145
+#define __NR_writev		146
+#define __NR_getsid		147
+#define __NR_fdatasync		148
+#define __NR__sysctl		149
+#define __NR_mlock		150
+#define __NR_munlock		151
+#define __NR_mlockall		152
+#define __NR_munlockall		153
+#define __NR_sched_setparam		154
+#define __NR_sched_getparam		155
+#define __NR_sched_setscheduler		156
+#define __NR_sched_getscheduler		157
+#define __NR_sched_yield		158
+#define __NR_sched_get_priority_max	159
+#define __NR_sched_get_priority_min	160
+#define __NR_sched_rr_get_interval	161
+#define __NR_nanosleep		162
+#define __NR_mremap		163
+#define __NR_setresuid		164
+#define __NR_getresuid		165
+#define __NR_vm86		166
+#define __NR_query_module	167
+#define __NR_poll		168
+#define __NR_nfsservctl		169
+#define __NR_setresgid		170
+#define __NR_getresgid		171
+#define __NR_prctl              172
+#define __NR_rt_sigreturn	173
+#define __NR_rt_sigaction	174
+#define __NR_rt_sigprocmask	175
+#define __NR_rt_sigpending	176
+#define __NR_rt_sigtimedwait	177
+#define __NR_rt_sigqueueinfo	178
+#define __NR_rt_sigsuspend	179
+#define __NR_pread64		180
+#define __NR_pwrite64		181
+#define __NR_chown		182
+#define __NR_getcwd		183
+#define __NR_capget		184
+#define __NR_capset		185
+#define __NR_sigaltstack	186
+#define __NR_sendfile		187
+#define __NR_getpmsg		188
+#define __NR_putpmsg		189
+#define __NR_vfork		190
+#define __NR_ugetrlimit		191
+#define __NR_mmap2		192
+#define __NR_truncate64		193
+#define __NR_ftruncate64	194
+#define __NR_stat64		195
+#define __NR_lstat64		196
+#define __NR_fstat64		197
+#define __NR_lchown32		198
+#define __NR_getuid32		199
+#define __NR_getgid32		200
+#define __NR_geteuid32		201
+#define __NR_getegid32		202
+#define __NR_setreuid32		203
+#define __NR_setregid32		204
+#define __NR_getgroups32	205
+#define __NR_setgroups32	206
+#define __NR_fchown32		207
+#define __NR_setresuid32	208
+#define __NR_getresuid32	209
+#define __NR_setresgid32	210
+#define __NR_getresgid32	211
+#define __NR_chown32		212
+#define __NR_setuid32		213
+#define __NR_setgid32		214
+#define __NR_setfsuid32		215
+#define __NR_setfsgid32		216
+#define __NR_pivot_root		217
+#define __NR_mincore		218
+#define __NR_madvise		219
+#define __NR_getdents64		220
+#define __NR_fcntl64		221
+/* 223 is unused */
+#define __NR_gettid		224
+#define __NR_readahead		225
+#define __NR_setxattr		226
+#define __NR_lsetxattr		227
+#define __NR_fsetxattr		228
+#define __NR_getxattr		229
+#define __NR_lgetxattr		230
+#define __NR_fgetxattr		231
+#define __NR_listxattr		232
+#define __NR_llistxattr		233
+#define __NR_flistxattr		234
+#define __NR_removexattr	235
+#define __NR_lremovexattr	236
+#define __NR_fremovexattr	237
+#define __NR_tkill		238
+#define __NR_sendfile64		239
+#define __NR_futex		240
+#define __NR_sched_setaffinity	241
+#define __NR_sched_getaffinity	242
+#define __NR_set_thread_area	243
+#define __NR_get_thread_area	244
+#define __NR_io_setup		245
+#define __NR_io_destroy		246
+#define __NR_io_getevents	247
+#define __NR_io_submit		248
+#define __NR_io_cancel		249
+#define __NR_fadvise64		250
+/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
+#define __NR_exit_group		252
+#define __NR_lookup_dcookie	253
+#define __NR_epoll_create	254
+#define __NR_epoll_ctl		255
+#define __NR_epoll_wait		256
+#define __NR_remap_file_pages	257
+#define __NR_set_tid_address	258
+#define __NR_timer_create	259
+#define __NR_timer_settime32	(__NR_timer_create+1)
+#define __NR_timer_gettime32	(__NR_timer_create+2)
+#define __NR_timer_getoverrun	(__NR_timer_create+3)
+#define __NR_timer_delete	(__NR_timer_create+4)
+#define __NR_clock_settime32	(__NR_timer_create+5)
+#define __NR_clock_gettime32	(__NR_timer_create+6)
+#define __NR_clock_getres_time32	(__NR_timer_create+7)
+#define __NR_clock_nanosleep_time32	(__NR_timer_create+8)
+#define __NR_statfs64		268
+#define __NR_fstatfs64		269
+#define __NR_tgkill		270
+#define __NR_utimes		271
+#define __NR_fadvise64_64	272
+#define __NR_vserver		273
+#define __NR_mbind		274
+#define __NR_get_mempolicy	275
+#define __NR_set_mempolicy	276
+#define __NR_mq_open 		277
+#define __NR_mq_unlink		(__NR_mq_open+1)
+#define __NR_mq_timedsend	(__NR_mq_open+2)
+#define __NR_mq_timedreceive	(__NR_mq_open+3)
+#define __NR_mq_notify		(__NR_mq_open+4)
+#define __NR_mq_getsetattr	(__NR_mq_open+5)
+#define __NR_kexec_load		283
+#define __NR_waitid		284
+/* #define __NR_sys_setaltroot	285 */
+#define __NR_add_key		286
+#define __NR_request_key	287
+#define __NR_keyctl		288
+#define __NR_ioprio_set		289
+#define __NR_ioprio_get		290
+#define __NR_inotify_init	291
+#define __NR_inotify_add_watch	292
+#define __NR_inotify_rm_watch	293
+#define __NR_migrate_pages	294
+#define __NR_openat		295
+#define __NR_mkdirat		296
+#define __NR_mknodat		297
+#define __NR_fchownat		298
+#define __NR_futimesat		299
+#define __NR_fstatat64		300
+#define __NR_unlinkat		301
+#define __NR_renameat		302
+#define __NR_linkat		303
+#define __NR_symlinkat		304
+#define __NR_readlinkat		305
+#define __NR_fchmodat		306
+#define __NR_faccessat		307
+#define __NR_pselect6		308
+#define __NR_ppoll		309
+#define __NR_unshare		310
+#define __NR_set_robust_list	311
+#define __NR_get_robust_list	312
+#define __NR_splice		313
+#define __NR_sync_file_range	314
+#define __NR_tee		315
+#define __NR_vmsplice		316
+#define __NR_move_pages		317
+#define __NR_getcpu		318
+#define __NR_epoll_pwait	319
+#define __NR_utimensat		320
+#define __NR_signalfd		321
+#define __NR_timerfd_create	322
+#define __NR_eventfd		323
+#define __NR_fallocate		324
+#define __NR_timerfd_settime32	325
+#define __NR_timerfd_gettime32	326
+#define __NR_signalfd4		327
+#define __NR_eventfd2		328
+#define __NR_epoll_create1	329
+#define __NR_dup3		330
+#define __NR_pipe2		331
+#define __NR_inotify_init1	332
+#define __NR_preadv		333
+#define __NR_pwritev		334
+#define __NR_rt_tgsigqueueinfo	335
+#define __NR_perf_event_open	336
+#define __NR_recvmmsg		337
+#define __NR_fanotify_init	338
+#define __NR_fanotify_mark	339
+#define __NR_prlimit64		340
+#define __NR_name_to_handle_at	341
+#define __NR_open_by_handle_at	342
+#define __NR_clock_adjtime	343
+#define __NR_syncfs		344
+#define __NR_sendmmsg		345
+#define __NR_setns		346
+#define __NR_process_vm_readv	347
+#define __NR_process_vm_writev	348
+#define __NR_kcmp		349
+#define __NR_finit_module	350
+#define __NR_sched_setattr	351
+#define __NR_sched_getattr	352
+#define __NR_renameat2		353
+#define __NR_seccomp		354
+#define __NR_getrandom		355
+#define __NR_memfd_create	356
+#define __NR_bpf		357
+#define __NR_execveat		358
+#define __NR_socket		359
+#define __NR_socketpair		360
+#define __NR_bind		361
+#define __NR_connect		362
+#define __NR_listen		363
+#define __NR_accept4		364
+#define __NR_getsockopt		365
+#define __NR_setsockopt		366
+#define __NR_getsockname	367
+#define __NR_getpeername	368
+#define __NR_sendto		369
+#define __NR_sendmsg		370
+#define __NR_recvfrom		371
+#define __NR_recvmsg		372
+#define __NR_shutdown		373
+#define __NR_userfaultfd	374
+#define __NR_membarrier		375
+#define __NR_mlock2		376
+#define __NR_copy_file_range	377
+#define __NR_preadv2		378
+#define __NR_pwritev2		379
+#define __NR_pkey_mprotect	380
+#define __NR_pkey_alloc		381
+#define __NR_pkey_free		382
+#define __NR_statx		383
+#define __NR_arch_prctl		384
+#define __NR_io_pgetevents	385
+#define __NR_rseq		386
+#define __NR_semget		393
+#define __NR_semctl		394
+#define __NR_shmget		395
+#define __NR_shmctl		396
+#define __NR_shmat		397
+#define __NR_shmdt		398
+#define __NR_msgget		399
+#define __NR_msgsnd		400
+#define __NR_msgrcv		401
+#define __NR_msgctl		402
+#define __NR_clock_gettime64	403
+#define __NR_clock_settime64	404
+#define __NR_clock_adjtime64	405
+#define __NR_clock_getres_time64 406
+#define __NR_clock_nanosleep_time64 407
+#define __NR_timer_gettime64	408
+#define __NR_timer_settime64	409
+#define __NR_timerfd_gettime64	410
+#define __NR_timerfd_settime64	411
+#define __NR_utimensat_time64	412
+#define __NR_pselect6_time64	413
+#define __NR_ppoll_time64	414
+#define __NR_io_pgetevents_time64 416
+#define __NR_recvmmsg_time64	417
+#define __NR_mq_timedsend_time64 418
+#define __NR_mq_timedreceive_time64 419
+#define __NR_semtimedop_time64	420
+#define __NR_rt_sigtimedwait_time64 421
+#define __NR_futex_time64	422
+#define __NR_sched_rr_get_interval_time64 423
+#define __NR_pidfd_send_signal	424
+#define __NR_io_uring_setup	425
+#define __NR_io_uring_enter	426
+#define __NR_io_uring_register	427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/user.h
new file mode 100644
index 0000000000..33fea98616
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/bits/user.h
@@ -0,0 +1,44 @@
+#undef __WORDSIZE
+#define __WORDSIZE 32
+
+typedef struct user_fpregs_struct {
+	long cwd, swd, twd, fip, fcs, foo, fos, st_space[20];
+} elf_fpregset_t;
+
+typedef struct user_fpxregs_struct {
+	unsigned short cwd, swd, twd, fop;
+	long fip, fcs, foo, fos, mxcsr, reserved;
+	long st_space[32], xmm_space[32], padding[56];
+} elf_fpxregset_t;
+
+struct user_regs_struct {
+	long ebx, ecx, edx, esi, edi, ebp, eax, xds, xes, xfs, xgs;
+	long orig_eax, eip, xcs, eflags, esp, xss;
+};
+
+#define ELF_NGREG 17
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+
+struct user {
+	struct user_regs_struct		regs;
+	int				u_fpvalid;
+	struct user_fpregs_struct	i387;
+	unsigned long			u_tsize;
+	unsigned long			u_dsize;
+	unsigned long			u_ssize;
+	unsigned long			start_code;
+	unsigned long			start_stack;
+	long				signal;
+	int				reserved;
+	struct user_regs_struct		*u_ar0;
+	struct user_fpregs_struct	*u_fpstate;
+	unsigned long			magic;
+	char				u_comm[32];
+	int				u_debugreg[8];
+};
+
+#define PAGE_MASK		(~(PAGESIZE-1))
+#define NBPG			PAGESIZE
+#define UPAGES			1
+#define HOST_TEXT_START_ADDR	(u.start_code)
+#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/i386/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/i386/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/i386/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/i386/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/i386/kstat.h
new file mode 100644
index 0000000000..af449c9509
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	int __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	int __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	ino_t st_ino;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/i386/pthread_arch.h
new file mode 100644
index 0000000000..6f600b9e01
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/pthread_arch.h
@@ -0,0 +1,10 @@
+static inline struct pthread *__pthread_self()
+{
+	struct pthread *self;
+	__asm__ ("movl %%gs:0,%0" : "=r" (self) );
+	return self;
+}
+
+#define TP_ADJ(p) (p)
+
+#define MC_PC gregs[REG_EIP]
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/i386/reloc.h
new file mode 100644
index 0000000000..032f454bda
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/reloc.h
@@ -0,0 +1,23 @@
+#define LDSO_ARCH "i386"
+
+#define REL_SYMBOLIC    R_386_32
+#define REL_OFFSET      R_386_PC32
+#define REL_GOT         R_386_GLOB_DAT
+#define REL_PLT         R_386_JMP_SLOT
+#define REL_RELATIVE    R_386_RELATIVE
+#define REL_COPY        R_386_COPY
+#define REL_DTPMOD      R_386_TLS_DTPMOD32
+#define REL_DTPOFF      R_386_TLS_DTPOFF32
+#define REL_TPOFF       R_386_TLS_TPOFF
+#define REL_TPOFF_NEG   R_386_TLS_TPOFF32
+#define REL_TLSDESC     R_386_TLS_DESC
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mov %1,%%esp ; jmp *%0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	"	call 1f\n" \
+	"1:	addl $" #sym "-.,(%%esp)\n" \
+	"	pop %0" \
+	: "=r"(*fp) : : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/i386/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/i386/syscall_arch.h
new file mode 100644
index 0000000000..84be612dab
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/i386/syscall_arch.h
@@ -0,0 +1,52 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
+
+#if SYSCALL_NO_TLS
+#define SYSCALL_INSNS "int $128"
+#else
+#define SYSCALL_INSNS "call *%%gs:16"
+#endif
+
+#define SYSCALL_INSNS_12 "xchg %%ebx,%%edx ; " SYSCALL_INSNS " ; xchg %%ebx,%%edx"
+#define SYSCALL_INSNS_34 "xchg %%ebx,%%edi ; " SYSCALL_INSNS " ; xchg %%ebx,%%edi"
+
+extern __attribute__((regparm(1))) long __cos_syscall(int, long, long, long, long, long, long, long);
+
+static inline long __syscall0(long n)
+{
+	return __cos_syscall(n, 0, 0, 0, 0, 0, 0, 0);
+}
+
+static inline long __syscall1(long n, long a1)
+{
+	return __cos_syscall(n, a1, 0, 0, 0, 0, 0, 0);
+}
+
+static inline long __syscall2(long n, long a1, long a2)
+{
+	return __cos_syscall(n, a1, a2, 0, 0, 0, 0, 0);
+}
+
+static inline long __syscall3(long n, long a1, long a2, long a3)
+{
+	return __cos_syscall(n, a1, a2, a3, 0, 0, 0, 0);
+}
+
+static inline long __syscall4(long n, long a1, long a2, long a3, long a4)
+{
+	return __cos_syscall(n, a1, a2, a3, a4, 0, 0, 0);
+}
+
+static inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5)
+{
+	return __cos_syscall(n, a1, a2, a3, a4, a5, 0, 0);
+}
+
+static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6)
+{
+	return __cos_syscall(n, a1, a2, a3, a4, a5, a6, 0);
+}
+
+#define SYSCALL_USE_SOCKETCALL
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/m68k/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/atomic_arch.h
new file mode 100644
index 0000000000..b369649a1a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/atomic_arch.h
@@ -0,0 +1,8 @@
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__ __volatile__ (
+		"cas.l %0, %2, (%1)"
+		: "+d"(t) : "a"(p), "d"(s) : "memory", "cc");
+	return t;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/alltypes.h.in
new file mode 100644
index 0000000000..f564690983
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/alltypes.h.in
@@ -0,0 +1,25 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#define __BYTE_ORDER 4321
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+#ifdef __WCHAR_TYPE__
+TYPEDEF __WCHAR_TYPE__ wchar_t;
+#else
+TYPEDEF long wchar_t;
+#endif
+#endif
+
+#if __mcffpu__
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+#else
+TYPEDEF long double float_t;
+TYPEDEF long double double_t;
+#endif
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/fcntl.h
new file mode 100644
index 0000000000..f1c8400ffc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/fcntl.h
@@ -0,0 +1,40 @@
+#define O_CREAT        0100
+#define O_EXCL         0200
+#define O_NOCTTY       0400
+#define O_TRUNC       01000
+#define O_APPEND      02000
+#define O_NONBLOCK    04000
+#define O_DSYNC      010000
+#define O_SYNC     04010000
+#define O_RSYNC    04010000
+#define O_DIRECTORY  040000
+#define O_NOFOLLOW  0100000
+#define O_CLOEXEC  02000000
+
+#define O_ASYNC      020000
+#define O_DIRECT    0200000
+#define O_LARGEFILE 0400000
+#define O_NOATIME  01000000
+#define O_PATH    010000000
+#define O_TMPFILE 020200000
+#define O_NDELAY O_NONBLOCK
+
+#define F_DUPFD  0
+#define F_GETFD  1
+#define F_SETFD  2
+#define F_GETFL  3
+#define F_SETFL  4
+
+#define F_SETOWN 8
+#define F_GETOWN 9
+#define F_SETSIG 10
+#define F_GETSIG 11
+
+#define F_GETLK 12
+#define F_SETLK 13
+#define F_SETLKW 14
+
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
+
+#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/fenv.h
new file mode 100644
index 0000000000..c90a4a58af
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/fenv.h
@@ -0,0 +1,29 @@
+#if __HAVE_68881__ || __mcffpu__
+
+#define FE_INEXACT    8
+#define FE_DIVBYZERO  16
+#define FE_UNDERFLOW  32
+#define FE_OVERFLOW   64
+#define FE_INVALID    128
+
+#define FE_ALL_EXCEPT 0xf8
+
+#define FE_TONEAREST  0
+#define FE_TOWARDZERO 16
+#define FE_DOWNWARD   32
+#define FE_UPWARD     48
+
+#else
+
+#define FE_ALL_EXCEPT 0
+#define FE_TONEAREST  0
+
+#endif
+
+typedef unsigned fexcept_t;
+
+typedef struct {
+	unsigned __control_register, __status_register, __instruction_address;
+} fenv_t;
+
+#define FE_DFL_ENV      ((const fenv_t *) -1)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/float.h
new file mode 100644
index 0000000000..0e6899d583
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/float.h
@@ -0,0 +1,39 @@
+#if !__mcffpu__
+
+#define FLT_EVAL_METHOD 2
+
+#define LDBL_TRUE_MIN 3.6451995318824746025e-4951L
+#define LDBL_MIN     1.68105157155604675313e-4932L
+#define LDBL_MAX     1.1897314953572317650e+4932L
+#define LDBL_EPSILON 1.0842021724855044340e-19L
+
+#define LDBL_MANT_DIG 64
+#define LDBL_MIN_EXP (-16382)
+#define LDBL_MAX_EXP 16384
+
+#define LDBL_DIG 18
+#define LDBL_MIN_10_EXP (-4931)
+#define LDBL_MAX_10_EXP 4932
+
+#define DECIMAL_DIG 21
+
+#else
+
+#define FLT_EVAL_METHOD 0
+
+#define LDBL_TRUE_MIN 4.94065645841246544177e-324L
+#define LDBL_MIN 2.22507385850720138309e-308L
+#define LDBL_MAX 1.79769313486231570815e+308L
+#define LDBL_EPSILON 2.22044604925031308085e-16L
+
+#define LDBL_MANT_DIG 53
+#define LDBL_MIN_EXP (-1021)
+#define LDBL_MAX_EXP 1024
+
+#define LDBL_DIG 15
+#define LDBL_MIN_10_EXP (-307)
+#define LDBL_MAX_10_EXP 308
+
+#define DECIMAL_DIG 17
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/msg.h
new file mode 100644
index 0000000000..7bbbb2bf43
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/msg.h
@@ -0,0 +1,18 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/m68k/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/ptrace.h
new file mode 100644
index 0000000000..da93e7a729
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/ptrace.h
@@ -0,0 +1,2 @@
+#define PTRACE_GET_THREAD_AREA	25
+#define PTRACE_SINGLEBLOCK	33
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/reg.h
new file mode 100644
index 0000000000..99201f7094
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/reg.h
@@ -0,0 +1,45 @@
+#undef __WORDSIZE
+#define __WORDSIZE 32
+#define PT_D1 0
+#define PT_D2 1
+#define PT_D3 2
+#define PT_D4 3
+#define PT_D5 4
+#define PT_D6 5
+#define PT_D7 6
+#define PT_A0 7
+#define PT_A1 8
+#define PT_A2 9
+#define PT_A3 10
+#define PT_A4 11
+#define PT_A5 12
+#define PT_A6 13
+#define PT_D0 14
+#define PT_USP 15
+#define PT_ORIG_D0 16
+#define PT_SR 17
+#define PT_PC 18
+
+#if __mcffpu__
+#define PT_FP0 21
+#define PT_FP1 23
+#define PT_FP2 25
+#define PT_FP3 27
+#define PT_FP4 29
+#define PT_FP5 31
+#define PT_FP6 33
+#define PT_FP7 35
+#else
+#define PT_FP0 21
+#define PT_FP1 24
+#define PT_FP2 27
+#define PT_FP3 30
+#define PT_FP4 33
+#define PT_FP5 36
+#define PT_FP6 39
+#define PT_FP7 42
+#endif
+
+#define PT_FPCR 45
+#define PT_FPSR 46
+#define PT_FPIAR 47
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/sem.h
new file mode 100644
index 0000000000..d88338e695
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/sem.h
@@ -0,0 +1,13 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_lo;
+	unsigned long __sem_ctime_hi;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+	long __unused3;
+	long __unused4;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/setjmp.h
new file mode 100644
index 0000000000..5e091fb49b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/setjmp.h
@@ -0,0 +1 @@
+typedef unsigned long __jmp_buf[39];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/shm.h
new file mode 100644
index 0000000000..725fb46968
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/shm.h
@@ -0,0 +1,31 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_atime_hi;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_dtime_hi;
+	unsigned long __shm_ctime_lo;
+	unsigned long __shm_ctime_hi;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+	unsigned long __pad3;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/signal.h
new file mode 100644
index 0000000000..2c369ca35c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/signal.h
@@ -0,0 +1,140 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#ifdef _GNU_SOURCE
+enum { R_D0 = 0 };
+#define R_D0 R_D0
+enum { R_D1 = 1 };
+#define R_D1 R_D1
+enum { R_D2 = 2 };
+#define R_D2 R_D2
+enum { R_D3 = 3 };
+#define R_D3 R_D3
+enum { R_D4 = 4 };
+#define R_D4 R_D4
+enum { R_D5 = 5 };
+#define R_D5 R_D5
+enum { R_D6 = 6 };
+#define R_D6 R_D6
+enum { R_D7 = 7 };
+#define R_D7 R_D7
+enum { R_A0 = 8 };
+#define R_A0 R_A0
+enum { R_A1 = 9 };
+#define R_A1 R_A1
+enum { R_A2 = 10 };
+#define R_A2 R_A2
+enum { R_A3 = 11 };
+#define R_A3 R_A3
+enum { R_A4 = 12 };
+#define R_A4 R_A4
+enum { R_A5 = 13 };
+#define R_A5 R_A5
+enum { R_A6 = 14 };
+#define R_A6 R_A6
+enum { R_A7 = 15 };
+#define R_A7 R_A7
+enum { R_SP = 15 };
+#define R_SP R_SP
+enum { R_PC = 16 };
+#define R_PC R_PC
+enum { R_PS = 17 };
+#define R_PS R_PS
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+struct sigcontext {
+	unsigned long sc_mask, sc_usp, sc_d0, sc_d1, sc_a0, sc_a1;
+	unsigned short sc_sr;
+	unsigned long sc_pc;
+	unsigned short sc_formatvec;
+	unsigned long sc_fpregs[6], sc_fpcntl[3];
+	unsigned char sc_fpstate[216];
+};
+
+typedef int greg_t, gregset_t[18];
+typedef struct {
+	int f_pcr, f_psr, f_fpiaddr, f_fpregs[8][3];
+} fpregset_t;
+
+typedef struct {
+	int version;
+	gregset_t gregs;
+	fpregset_t fpregs;
+} mcontext_t;
+#else
+typedef struct {
+	int __version;
+	int __gregs[18];
+	int __fpregs[27];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	long __reserved[80];
+	sigset_t uc_sigmask;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  2
+#define SA_SIGINFO    4
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/stat.h
new file mode 100644
index 0000000000..f87681471a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/stat.h
@@ -0,0 +1,25 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	short __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	short __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	ino_t st_ino;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/m68k/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/syscall.h.in
new file mode 100644
index 0000000000..ddfa72e4dd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/syscall.h.in
@@ -0,0 +1,407 @@
+#define __NR_restart_syscall	  0
+#define __NR_exit		  1
+#define __NR_fork		  2
+#define __NR_read		  3
+#define __NR_write		  4
+#define __NR_open		  5
+#define __NR_close		  6
+#define __NR_waitpid		  7
+#define __NR_creat		  8
+#define __NR_link		  9
+#define __NR_unlink		 10
+#define __NR_execve		 11
+#define __NR_chdir		 12
+#define __NR_time		 13
+#define __NR_mknod		 14
+#define __NR_chmod		 15
+#define __NR_chown		 16
+#define __NR_oldstat		 18
+#define __NR_lseek		 19
+#define __NR_getpid		 20
+#define __NR_mount		 21
+#define __NR_umount		 22
+#define __NR_setuid		 23
+#define __NR_getuid		 24
+#define __NR_stime		 25
+#define __NR_ptrace		 26
+#define __NR_alarm		 27
+#define __NR_oldfstat		 28
+#define __NR_pause		 29
+#define __NR_utime		 30
+#define __NR_access		 33
+#define __NR_nice		 34
+#define __NR_sync		 36
+#define __NR_kill		 37
+#define __NR_rename		 38
+#define __NR_mkdir		 39
+#define __NR_rmdir		 40
+#define __NR_dup		 41
+#define __NR_pipe		 42
+#define __NR_times		 43
+#define __NR_brk		 45
+#define __NR_setgid		 46
+#define __NR_getgid		 47
+#define __NR_signal		 48
+#define __NR_geteuid		 49
+#define __NR_getegid		 50
+#define __NR_acct		 51
+#define __NR_umount2		 52
+#define __NR_ioctl		 54
+#define __NR_fcntl		 55
+#define __NR_setpgid		 57
+#define __NR_umask		 60
+#define __NR_chroot		 61
+#define __NR_ustat		 62
+#define __NR_dup2		 63
+#define __NR_getppid		 64
+#define __NR_getpgrp		 65
+#define __NR_setsid		 66
+#define __NR_sigaction		 67
+#define __NR_sgetmask		 68
+#define __NR_ssetmask		 69
+#define __NR_setreuid		 70
+#define __NR_setregid		 71
+#define __NR_sigsuspend		 72
+#define __NR_sigpending		 73
+#define __NR_sethostname	 74
+#define __NR_setrlimit		 75
+#define __NR_getrlimit		 76
+#define __NR_getrusage		 77
+#define __NR_gettimeofday_time32	 78
+#define __NR_settimeofday_time32	 79
+#define __NR_getgroups		 80
+#define __NR_setgroups		 81
+#define __NR_select		 82
+#define __NR_symlink		 83
+#define __NR_oldlstat		 84
+#define __NR_readlink		 85
+#define __NR_uselib		 86
+#define __NR_swapon		 87
+#define __NR_reboot		 88
+#define __NR_readdir		 89
+#define __NR_mmap		 90
+#define __NR_munmap		 91
+#define __NR_truncate		 92
+#define __NR_ftruncate		 93
+#define __NR_fchmod		 94
+#define __NR_fchown		 95
+#define __NR_getpriority	 96
+#define __NR_setpriority	 97
+#define __NR_statfs		 99
+#define __NR_fstatfs		100
+#define __NR_socketcall		102
+#define __NR_syslog		103
+#define __NR_setitimer		104
+#define __NR_getitimer		105
+#define __NR_stat		106
+#define __NR_lstat		107
+#define __NR_fstat		108
+#define __NR_vhangup		111
+#define __NR_wait4		114
+#define __NR_swapoff		115
+#define __NR_sysinfo		116
+#define __NR_ipc		117
+#define __NR_fsync		118
+#define __NR_sigreturn		119
+#define __NR_clone		120
+#define __NR_setdomainname	121
+#define __NR_uname		122
+#define __NR_cacheflush		123
+#define __NR_adjtimex		124
+#define __NR_mprotect		125
+#define __NR_sigprocmask	126
+#define __NR_create_module	127
+#define __NR_init_module	128
+#define __NR_delete_module	129
+#define __NR_get_kernel_syms	130
+#define __NR_quotactl		131
+#define __NR_getpgid		132
+#define __NR_fchdir		133
+#define __NR_bdflush		134
+#define __NR_sysfs		135
+#define __NR_personality	136
+#define __NR_setfsuid		138
+#define __NR_setfsgid		139
+#define __NR__llseek		140
+#define __NR_getdents		141
+#define __NR__newselect		142
+#define __NR_flock		143
+#define __NR_msync		144
+#define __NR_readv		145
+#define __NR_writev		146
+#define __NR_getsid		147
+#define __NR_fdatasync		148
+#define __NR__sysctl		149
+#define __NR_mlock		150
+#define __NR_munlock		151
+#define __NR_mlockall		152
+#define __NR_munlockall		153
+#define __NR_sched_setparam		154
+#define __NR_sched_getparam		155
+#define __NR_sched_setscheduler		156
+#define __NR_sched_getscheduler		157
+#define __NR_sched_yield		158
+#define __NR_sched_get_priority_max	159
+#define __NR_sched_get_priority_min	160
+#define __NR_sched_rr_get_interval	161
+#define __NR_nanosleep		162
+#define __NR_mremap		163
+#define __NR_setresuid		164
+#define __NR_getresuid		165
+#define __NR_getpagesize	166
+#define __NR_query_module	167
+#define __NR_poll		168
+#define __NR_nfsservctl		169
+#define __NR_setresgid		170
+#define __NR_getresgid		171
+#define __NR_prctl		172
+#define __NR_rt_sigreturn	173
+#define __NR_rt_sigaction	174
+#define __NR_rt_sigprocmask	175
+#define __NR_rt_sigpending	176
+#define __NR_rt_sigtimedwait	177
+#define __NR_rt_sigqueueinfo	178
+#define __NR_rt_sigsuspend	179
+#define __NR_pread64		180
+#define __NR_pwrite64		181
+#define __NR_lchown		182
+#define __NR_getcwd		183
+#define __NR_capget		184
+#define __NR_capset		185
+#define __NR_sigaltstack	186
+#define __NR_sendfile		187
+#define __NR_getpmsg		188
+#define __NR_putpmsg		189
+#define __NR_vfork		190
+#define __NR_ugetrlimit		191
+#define __NR_mmap2		192
+#define __NR_truncate64		193
+#define __NR_ftruncate64	194
+#define __NR_stat64		195
+#define __NR_lstat64		196
+#define __NR_fstat64		197
+#define __NR_chown32		198
+#define __NR_getuid32		199
+#define __NR_getgid32		200
+#define __NR_geteuid32		201
+#define __NR_getegid32		202
+#define __NR_setreuid32		203
+#define __NR_setregid32		204
+#define __NR_getgroups32	205
+#define __NR_setgroups32	206
+#define __NR_fchown32		207
+#define __NR_setresuid32	208
+#define __NR_getresuid32	209
+#define __NR_setresgid32	210
+#define __NR_getresgid32	211
+#define __NR_lchown32		212
+#define __NR_setuid32		213
+#define __NR_setgid32		214
+#define __NR_setfsuid32		215
+#define __NR_setfsgid32		216
+#define __NR_pivot_root		217
+#define __NR_getdents64		220
+#define __NR_gettid		221
+#define __NR_tkill		222
+#define __NR_setxattr		223
+#define __NR_lsetxattr		224
+#define __NR_fsetxattr		225
+#define __NR_getxattr		226
+#define __NR_lgetxattr		227
+#define __NR_fgetxattr		228
+#define __NR_listxattr		229
+#define __NR_llistxattr		230
+#define __NR_flistxattr		231
+#define __NR_removexattr	232
+#define __NR_lremovexattr	233
+#define __NR_fremovexattr	234
+#define __NR_futex		235
+#define __NR_sendfile64		236
+#define __NR_mincore		237
+#define __NR_madvise		238
+#define __NR_fcntl64		239
+#define __NR_readahead		240
+#define __NR_io_setup		241
+#define __NR_io_destroy		242
+#define __NR_io_getevents	243
+#define __NR_io_submit		244
+#define __NR_io_cancel		245
+#define __NR_fadvise64		246
+#define __NR_exit_group		247
+#define __NR_lookup_dcookie	248
+#define __NR_epoll_create	249
+#define __NR_epoll_ctl		250
+#define __NR_epoll_wait		251
+#define __NR_remap_file_pages	252
+#define __NR_set_tid_address	253
+#define __NR_timer_create	254
+#define __NR_timer_settime32	255
+#define __NR_timer_gettime32	256
+#define __NR_timer_getoverrun	257
+#define __NR_timer_delete	258
+#define __NR_clock_settime32	259
+#define __NR_clock_gettime32	260
+#define __NR_clock_getres_time32	261
+#define __NR_clock_nanosleep_time32	262
+#define __NR_statfs64		263
+#define __NR_fstatfs64		264
+#define __NR_tgkill		265
+#define __NR_utimes		266
+#define __NR_fadvise64_64	267
+#define __NR_mbind		268
+#define __NR_get_mempolicy	269
+#define __NR_set_mempolicy	270
+#define __NR_mq_open		271
+#define __NR_mq_unlink		272
+#define __NR_mq_timedsend	273
+#define __NR_mq_timedreceive	274
+#define __NR_mq_notify		275
+#define __NR_mq_getsetattr	276
+#define __NR_waitid		277
+#define __NR_add_key		279
+#define __NR_request_key	280
+#define __NR_keyctl		281
+#define __NR_ioprio_set		282
+#define __NR_ioprio_get		283
+#define __NR_inotify_init	284
+#define __NR_inotify_add_watch	285
+#define __NR_inotify_rm_watch	286
+#define __NR_migrate_pages	287
+#define __NR_openat		288
+#define __NR_mkdirat		289
+#define __NR_mknodat		290
+#define __NR_fchownat		291
+#define __NR_futimesat		292
+#define __NR_fstatat64		293
+#define __NR_unlinkat		294
+#define __NR_renameat		295
+#define __NR_linkat		296
+#define __NR_symlinkat		297
+#define __NR_readlinkat		298
+#define __NR_fchmodat		299
+#define __NR_faccessat		300
+#define __NR_pselect6		301
+#define __NR_ppoll		302
+#define __NR_unshare		303
+#define __NR_set_robust_list	304
+#define __NR_get_robust_list	305
+#define __NR_splice		306
+#define __NR_sync_file_range	307
+#define __NR_tee		308
+#define __NR_vmsplice		309
+#define __NR_move_pages		310
+#define __NR_sched_setaffinity	311
+#define __NR_sched_getaffinity	312
+#define __NR_kexec_load		313
+#define __NR_getcpu		314
+#define __NR_epoll_pwait	315
+#define __NR_utimensat		316
+#define __NR_signalfd		317
+#define __NR_timerfd_create	318
+#define __NR_eventfd		319
+#define __NR_fallocate		320
+#define __NR_timerfd_settime32	321
+#define __NR_timerfd_gettime32	322
+#define __NR_signalfd4		323
+#define __NR_eventfd2		324
+#define __NR_epoll_create1	325
+#define __NR_dup3		326
+#define __NR_pipe2		327
+#define __NR_inotify_init1	328
+#define __NR_preadv		329
+#define __NR_pwritev		330
+#define __NR_rt_tgsigqueueinfo	331
+#define __NR_perf_event_open	332
+#define __NR_get_thread_area	333
+#define __NR_set_thread_area	334
+#define __NR_atomic_cmpxchg_32	335
+#define __NR_atomic_barrier	336
+#define __NR_fanotify_init	337
+#define __NR_fanotify_mark	338
+#define __NR_prlimit64		339
+#define __NR_name_to_handle_at	340
+#define __NR_open_by_handle_at	341
+#define __NR_clock_adjtime	342
+#define __NR_syncfs		343
+#define __NR_setns		344
+#define __NR_process_vm_readv	345
+#define __NR_process_vm_writev	346
+#define __NR_kcmp		347
+#define __NR_finit_module	348
+#define __NR_sched_setattr	349
+#define __NR_sched_getattr	350
+#define __NR_renameat2		351
+#define __NR_getrandom		352
+#define __NR_memfd_create	353
+#define __NR_bpf		354
+#define __NR_execveat		355
+#define __NR_socket		356
+#define __NR_socketpair		357
+#define __NR_bind		358
+#define __NR_connect		359
+#define __NR_listen		360
+#define __NR_accept4		361
+#define __NR_getsockopt		362
+#define __NR_setsockopt		363
+#define __NR_getsockname	364
+#define __NR_getpeername	365
+#define __NR_sendto		366
+#define __NR_sendmsg		367
+#define __NR_recvfrom		368
+#define __NR_recvmsg		369
+#define __NR_shutdown		370
+#define __NR_recvmmsg		371
+#define __NR_sendmmsg		372
+#define __NR_userfaultfd	373
+#define __NR_membarrier		374
+#define __NR_mlock2		375
+#define __NR_copy_file_range	376
+#define __NR_preadv2		377
+#define __NR_pwritev2		378
+#define __NR_statx		379
+#define __NR_seccomp		380
+#define __NR_pkey_mprotect	381
+#define __NR_pkey_alloc		382
+#define __NR_pkey_free		383
+#define __NR_rseq		384
+#define __NR_semget		393
+#define __NR_semctl		394
+#define __NR_shmget		395
+#define __NR_shmctl		396
+#define __NR_shmat		397
+#define __NR_shmdt		398
+#define __NR_msgget		399
+#define __NR_msgsnd		400
+#define __NR_msgrcv		401
+#define __NR_msgctl		402
+#define __NR_clock_gettime64	403
+#define __NR_clock_settime64	404
+#define __NR_clock_adjtime64	405
+#define __NR_clock_getres_time64 406
+#define __NR_clock_nanosleep_time64 407
+#define __NR_timer_gettime64	408
+#define __NR_timer_settime64	409
+#define __NR_timerfd_gettime64	410
+#define __NR_timerfd_settime64	411
+#define __NR_utimensat_time64	412
+#define __NR_pselect6_time64	413
+#define __NR_ppoll_time64	414
+#define __NR_io_pgetevents_time64 416
+#define __NR_recvmmsg_time64	417
+#define __NR_mq_timedsend_time64 418
+#define __NR_mq_timedreceive_time64 419
+#define __NR_semtimedop_time64	420
+#define __NR_rt_sigtimedwait_time64 421
+#define __NR_futex_time64	422
+#define __NR_sched_rr_get_interval_time64 423
+#define __NR_pidfd_send_signal	424
+#define __NR_io_uring_setup	425
+#define __NR_io_uring_enter	426
+#define __NR_io_uring_register	427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/user.h
new file mode 100644
index 0000000000..6a4439196b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/bits/user.h
@@ -0,0 +1,38 @@
+#undef __WORDSIZE
+#define __WORDSIZE 32
+
+struct user_m68kfp_struct {
+	unsigned long fpregs[24], fpcntl[3];
+};
+
+struct user_regs_struct {
+	long d1, d2, d3, d4, d5, d6, d7;
+	long a0, a1, a2, a3, a4, a5, a6;
+	long d0, usp, orig_d0;
+	short stkadj, sr;
+	long pc;
+	short fmtvec, __pad;
+};
+
+struct user {
+	struct user_regs_struct regs;
+	int u_fpvalid;
+	struct user_m68kfp_struct m68kfp;
+	unsigned long u_tsize, u_dsize, u_ssize, start_code, start_stack;
+	long signal;
+	int reserved;
+	unsigned long u_ar0;
+	struct user_m68kfp_struct *u_fpstate;
+	unsigned long magic;
+	char u_comm[32];
+};
+
+#define ELF_NGREG 20
+typedef unsigned long elf_greg_t;
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+typedef struct user_m68kfp_struct elf_fpregset_t;
+
+#define NBPG			4096
+#define UPAGES			1
+#define HOST_TEXT_START_ADDR	(u.start_code)
+#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/crt_arch.h
new file mode 100644
index 0000000000..48a42f29e2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/crt_arch.h
@@ -0,0 +1,14 @@
+__asm__(
+".text\n"
+".weak _DYNAMIC \n"
+".hidden _DYNAMIC \n"
+".global " START "\n"
+START ":\n"
+"	suba.l %fp,%fp \n"
+"	movea.l %sp,%a0 \n"
+"	lea _DYNAMIC-.-8,%a1 \n"
+"	pea (%pc,%a1) \n"
+"	pea (%a0) \n"
+"	lea " START "_c-.-8,%a1 \n"
+"	jsr (%pc,%a1) \n"
+);
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/kstat.h
new file mode 100644
index 0000000000..ac13e272ce
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	short __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	short __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	ino_t st_ino;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/pthread_arch.h
new file mode 100644
index 0000000000..02d5b8a089
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/pthread_arch.h
@@ -0,0 +1,13 @@
+static inline struct pthread *__pthread_self()
+{
+	uintptr_t tp = __syscall(SYS_get_thread_area);
+	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
+
+#define DTP_OFFSET 0x8000
+
+#define MC_PC gregs[R_PC]
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/reloc.h
new file mode 100644
index 0000000000..f920b39e03
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/reloc.h
@@ -0,0 +1,30 @@
+#if __HAVE_68881__
+#define FP_SUFFIX ""
+#elif __mcffpu__
+#define FP_SUFFIX "-fp64"
+#else
+#define FP_SUFFIX "-sf"
+#endif
+
+#define LDSO_ARCH "m68k" FP_SUFFIX
+
+#define TPOFF_K (-0x7000)
+
+#define REL_SYMBOLIC    R_68K_32
+#define REL_OFFSET      R_68K_PC32
+#define REL_GOT         R_68K_GLOB_DAT
+#define REL_PLT         R_68K_JMP_SLOT
+#define REL_RELATIVE    R_68K_RELATIVE
+#define REL_COPY        R_68K_COPY
+#define REL_DTPMOD      R_68K_TLS_DTPMOD32
+#define REL_DTPOFF      R_68K_TLS_DTPREL32
+#define REL_TPOFF       R_68K_TLS_TPREL32
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"move.l %1,%%sp ; jmp (%0)" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	"lea " #sym "-.-8,%0 \n" \
+	"lea (%%pc,%0),%0 \n" \
+	: "=a"(*fp) : : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/m68k/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/m68k/syscall_arch.h
new file mode 100644
index 0000000000..af79c30690
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/m68k/syscall_arch.h
@@ -0,0 +1,91 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
+
+static __inline long __syscall0(long n)
+{
+	register unsigned long d0 __asm__("d0") = n;
+	__asm__ __volatile__ ("trap #0" : "+r"(d0)
+		:
+		: "memory");
+	return d0;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register unsigned long d0 __asm__("d0") = n;
+	register unsigned long d1 __asm__("d1") = a;
+	__asm__ __volatile__ ("trap #0" : "+r"(d0)
+		: "r"(d1)
+		: "memory");
+	return d0;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register unsigned long d0 __asm__("d0") = n;
+	register unsigned long d1 __asm__("d1") = a;
+	register unsigned long d2 __asm__("d2") = b;
+	__asm__ __volatile__ ("trap #0" : "+r"(d0)
+		: "r"(d1), "r"(d2)
+		: "memory");
+	return d0;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register unsigned long d0 __asm__("d0") = n;
+	register unsigned long d1 __asm__("d1") = a;
+	register unsigned long d2 __asm__("d2") = b;
+	register unsigned long d3 __asm__("d3") = c;
+	__asm__ __volatile__ ("trap #0" : "+r"(d0)
+		: "r"(d1), "r"(d2), "r"(d3)
+		: "memory");
+	return d0;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register unsigned long d0 __asm__("d0") = n;
+	register unsigned long d1 __asm__("d1") = a;
+	register unsigned long d2 __asm__("d2") = b;
+	register unsigned long d3 __asm__("d3") = c;
+	register unsigned long d4 __asm__("d4") = d;
+	__asm__ __volatile__ ("trap #0" : "+r"(d0)
+		: "r"(d1), "r"(d2), "r"(d3), "r"(d4)
+		: "memory");
+	return d0;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register unsigned long d0 __asm__("d0") = n;
+	register unsigned long d1 __asm__("d1") = a;
+	register unsigned long d2 __asm__("d2") = b;
+	register unsigned long d3 __asm__("d3") = c;
+	register unsigned long d4 __asm__("d4") = d;
+	register unsigned long d5 __asm__("d5") = e;
+	__asm__ __volatile__ ("trap #0" : "+r"(d0)
+		: "r"(d1), "r"(d2), "r"(d3), "r"(d4), "r"(d5)
+		: "memory");
+	return d0;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register unsigned long d0 __asm__("d0") = n;
+	register unsigned long d1 __asm__("d1") = a;
+	register unsigned long d2 __asm__("d2") = b;
+	register unsigned long d3 __asm__("d3") = c;
+	register unsigned long d4 __asm__("d4") = d;
+	register unsigned long d5 __asm__("d5") = e;
+	register unsigned long a0 __asm__("a0") = f;
+	__asm__ __volatile__ ("trap #0" : "+r"(d0)
+		: "r"(d1), "r"(d2), "r"(d3), "r"(d4), "r"(d5), "r"(a0)
+		: "memory");
+	return d0;
+}
+
+#define SYSCALL_USE_SOCKETCALL
+#define SYSCALL_IPC_BROKEN_MODE
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/microblaze/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/atomic_arch.h
new file mode 100644
index 0000000000..1152e8cdc3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/atomic_arch.h
@@ -0,0 +1,53 @@
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	register int old, tmp;
+	__asm__ __volatile__ (
+		"	addi %0, r0, 0\n"
+		"1:	lwx %0, %2, r0\n"
+		"	rsubk %1, %0, %3\n"
+		"	bnei %1, 1f\n"
+		"	swx %4, %2, r0\n"
+		"	addic %1, r0, 0\n"
+		"	bnei %1, 1b\n"
+		"1:	"
+		: "=&r"(old), "=&r"(tmp)
+		: "r"(p), "r"(t), "r"(s)
+		: "cc", "memory" );
+	return old;
+}
+
+#define a_swap a_swap
+static inline int a_swap(volatile int *x, int v)
+{
+	register int old, tmp;
+	__asm__ __volatile__ (
+		"	addi %0, r0, 0\n"
+		"1:	lwx %0, %2, r0\n"
+		"	swx %3, %2, r0\n"
+		"	addic %1, r0, 0\n"
+		"	bnei %1, 1b\n"
+		"1:	"
+		: "=&r"(old), "=&r"(tmp)
+		: "r"(x), "r"(v)
+		: "cc", "memory" );
+	return old;
+}
+
+#define a_fetch_add a_fetch_add
+static inline int a_fetch_add(volatile int *x, int v)
+{
+	register int new, tmp;
+	__asm__ __volatile__ (
+		"	addi %0, r0, 0\n"
+		"1:	lwx %0, %2, r0\n"
+		"	addk %0, %0, %3\n"
+		"	swx %0, %2, r0\n"
+		"	addic %1, r0, 0\n"
+		"	bnei %1, 1b\n"
+		"1:	"
+		: "=&r"(new), "=&r"(tmp)
+		: "r"(x), "r"(v)
+		: "cc", "memory" );
+	return new-v;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/alltypes.h.in
new file mode 100644
index 0000000000..9a4ce29d0c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/alltypes.h.in
@@ -0,0 +1,21 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#if __MICROBLAZEEL__
+#define __BYTE_ORDER 1234
+#else
+#define __BYTE_ORDER 4321
+#endif
+
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/float.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/msg.h
new file mode 100644
index 0000000000..7bbbb2bf43
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/msg.h
@@ -0,0 +1,18 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/sem.h
new file mode 100644
index 0000000000..544e3d2a52
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/sem.h
@@ -0,0 +1,18 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_lo;
+	unsigned long __sem_ctime_hi;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+#else
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+#endif
+	long __unused3;
+	long __unused4;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/shm.h
new file mode 100644
index 0000000000..725fb46968
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/shm.h
@@ -0,0 +1,31 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_atime_hi;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_dtime_hi;
+	unsigned long __shm_ctime_lo;
+	unsigned long __shm_ctime_hi;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+	unsigned long __pad3;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/signal.h
new file mode 100644
index 0000000000..490f83bfd9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/signal.h
@@ -0,0 +1,88 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef unsigned long greg_t, gregset_t[38];
+typedef struct sigcontext {
+	struct {
+		unsigned long r0, r1, r2, r3, r4, r5, r6, r7;
+		unsigned long r8, r9, r10, r11, r12, r13, r14, r15;
+		unsigned long r16, r17, r18, r19, r20, r21, r22, r23;
+		unsigned long r24, r25, r26, r27, r28, r29, r30, r31;
+		unsigned long pc, msr, ear, esr, fsr;
+		int pt_mode;
+	} regs;
+	unsigned long oldmask;
+} mcontext_t;
+#else
+typedef struct {
+	unsigned long __regs[39];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  2
+#define SA_SIGINFO    4
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/stat.h
new file mode 100644
index 0000000000..8a4d509a8b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/stat.h
@@ -0,0 +1,25 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	long long __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __st_blksize_padding;
+	blkcnt_t st_blocks;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	unsigned __unused[2];
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/syscall.h.in
new file mode 100644
index 0000000000..963386a839
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/syscall.h.in
@@ -0,0 +1,430 @@
+#define __NR_restart_syscall 0
+#define __NR_exit 1
+#define __NR_fork 2
+#define __NR_read 3
+#define __NR_write 4
+#define __NR_open 5
+#define __NR_close 6
+#define __NR_waitpid 7
+#define __NR_creat 8
+#define __NR_link 9
+#define __NR_unlink 10
+#define __NR_execve 11
+#define __NR_chdir 12
+#define __NR_time 13
+#define __NR_mknod 14
+#define __NR_chmod 15
+#define __NR_lchown 16
+#define __NR_break 17
+#define __NR_oldstat 18
+#define __NR_lseek 19
+#define __NR_getpid 20
+#define __NR_mount 21
+#define __NR_umount 22
+#define __NR_setuid 23
+#define __NR_getuid 24
+#define __NR_stime 25
+#define __NR_ptrace 26
+#define __NR_alarm 27
+#define __NR_oldfstat 28
+#define __NR_pause 29
+#define __NR_utime 30
+#define __NR_stty 31
+#define __NR_gtty 32
+#define __NR_access 33
+#define __NR_nice 34
+#define __NR_ftime 35
+#define __NR_sync 36
+#define __NR_kill 37
+#define __NR_rename 38
+#define __NR_mkdir 39
+#define __NR_rmdir 40
+#define __NR_dup 41
+#define __NR_pipe 42
+#define __NR_times 43
+#define __NR_prof 44
+#define __NR_brk 45
+#define __NR_setgid 46
+#define __NR_getgid 47
+#define __NR_signal 48
+#define __NR_geteuid 49
+#define __NR_getegid 50
+#define __NR_acct 51
+#define __NR_umount2 52
+#define __NR_lock 53
+#define __NR_ioctl 54
+#define __NR_fcntl 55
+#define __NR_mpx 56
+#define __NR_setpgid 57
+#define __NR_ulimit 58
+#define __NR_oldolduname 59
+#define __NR_umask 60
+#define __NR_chroot 61
+#define __NR_ustat 62
+#define __NR_dup2 63
+#define __NR_getppid 64
+#define __NR_getpgrp 65
+#define __NR_setsid 66
+#define __NR_sigaction 67
+#define __NR_sgetmask 68
+#define __NR_ssetmask 69
+#define __NR_setreuid 70
+#define __NR_setregid 71
+#define __NR_sigsuspend 72
+#define __NR_sigpending 73
+#define __NR_sethostname 74
+#define __NR_setrlimit 75
+#define __NR_getrlimit 76
+#define __NR_getrusage 77
+#define __NR_gettimeofday_time32 78
+#define __NR_settimeofday_time32 79
+#define __NR_getgroups 80
+#define __NR_setgroups 81
+#define __NR_select 82
+#define __NR_symlink 83
+#define __NR_oldlstat 84
+#define __NR_readlink 85
+#define __NR_uselib 86
+#define __NR_swapon 87
+#define __NR_reboot 88
+#define __NR_readdir 89
+#define __NR_mmap 90
+#define __NR_munmap 91
+#define __NR_truncate 92
+#define __NR_ftruncate 93
+#define __NR_fchmod 94
+#define __NR_fchown 95
+#define __NR_getpriority 96
+#define __NR_setpriority 97
+#define __NR_profil 98
+#define __NR_statfs 99
+#define __NR_fstatfs 100
+#define __NR_ioperm 101
+#define __NR_socketcall 102
+#define __NR_syslog 103
+#define __NR_setitimer 104
+#define __NR_getitimer 105
+#define __NR_stat 106
+#define __NR_lstat 107
+#define __NR_fstat 108
+#define __NR_olduname 109
+#define __NR_iopl 110
+#define __NR_vhangup 111
+#define __NR_idle 112
+#define __NR_vm86old 113
+#define __NR_wait4 114
+#define __NR_swapoff 115
+#define __NR_sysinfo 116
+#define __NR_ipc 117
+#define __NR_fsync 118
+#define __NR_sigreturn 119
+#define __NR_clone 120
+#define __NR_setdomainname 121
+#define __NR_uname 122
+#define __NR_modify_ldt 123
+#define __NR_adjtimex 124
+#define __NR_mprotect 125
+#define __NR_sigprocmask 126
+#define __NR_create_module 127
+#define __NR_init_module 128
+#define __NR_delete_module 129
+#define __NR_get_kernel_syms 130
+#define __NR_quotactl 131
+#define __NR_getpgid 132
+#define __NR_fchdir 133
+#define __NR_bdflush 134
+#define __NR_sysfs 135
+#define __NR_personality 136
+#define __NR_afs_syscall 137
+#define __NR_setfsuid 138
+#define __NR_setfsgid 139
+#define __NR__llseek 140
+#define __NR_getdents 141
+#define __NR__newselect 142
+#define __NR_flock 143
+#define __NR_msync 144
+#define __NR_readv 145
+#define __NR_writev 146
+#define __NR_getsid 147
+#define __NR_fdatasync 148
+#define __NR__sysctl 149
+#define __NR_mlock 150
+#define __NR_munlock 151
+#define __NR_mlockall 152
+#define __NR_munlockall 153
+#define __NR_sched_setparam 154
+#define __NR_sched_getparam 155
+#define __NR_sched_setscheduler 156
+#define __NR_sched_getscheduler 157
+#define __NR_sched_yield 158
+#define __NR_sched_get_priority_max 159
+#define __NR_sched_get_priority_min 160
+#define __NR_sched_rr_get_interval 161
+#define __NR_nanosleep 162
+#define __NR_mremap 163
+#define __NR_setresuid 164
+#define __NR_getresuid 165
+#define __NR_vm86 166
+#define __NR_query_module 167
+#define __NR_poll 168
+#define __NR_nfsservctl 169
+#define __NR_setresgid 170
+#define __NR_getresgid 171
+#define __NR_prctl 172
+#define __NR_rt_sigreturn 173
+#define __NR_rt_sigaction 174
+#define __NR_rt_sigprocmask 175
+#define __NR_rt_sigpending 176
+#define __NR_rt_sigtimedwait 177
+#define __NR_rt_sigqueueinfo 178
+#define __NR_rt_sigsuspend 179
+#define __NR_pread64 180
+#define __NR_pwrite64 181
+#define __NR_chown 182
+#define __NR_getcwd 183
+#define __NR_capget 184
+#define __NR_capset 185
+#define __NR_sigaltstack 186
+#define __NR_sendfile 187
+#define __NR_getpmsg 188
+#define __NR_putpmsg 189
+#define __NR_vfork 190
+#define __NR_ugetrlimit 191
+#define __NR_mmap2 192
+#define __NR_truncate64 193
+#define __NR_ftruncate64 194
+#define __NR_stat64 195
+#define __NR_lstat64 196
+#define __NR_fstat64 197
+#define __NR_lchown32 198
+#define __NR_getuid32 199
+#define __NR_getgid32 200
+#define __NR_geteuid32 201
+#define __NR_getegid32 202
+#define __NR_setreuid32 203
+#define __NR_setregid32 204
+#define __NR_getgroups32 205
+#define __NR_setgroups32 206
+#define __NR_fchown32 207
+#define __NR_setresuid32 208
+#define __NR_getresuid32 209
+#define __NR_setresgid32 210
+#define __NR_getresgid32 211
+#define __NR_chown32 212
+#define __NR_setuid32 213
+#define __NR_setgid32 214
+#define __NR_setfsuid32 215
+#define __NR_setfsgid32 216
+#define __NR_pivot_root 217
+#define __NR_mincore 218
+#define __NR_madvise 219
+#define __NR_getdents64 220
+#define __NR_fcntl64 221
+#define __NR_gettid 224
+#define __NR_readahead 225
+#define __NR_setxattr 226
+#define __NR_lsetxattr 227
+#define __NR_fsetxattr 228
+#define __NR_getxattr 229
+#define __NR_lgetxattr 230
+#define __NR_fgetxattr 231
+#define __NR_listxattr 232
+#define __NR_llistxattr 233
+#define __NR_flistxattr 234
+#define __NR_removexattr 235
+#define __NR_lremovexattr 236
+#define __NR_fremovexattr 237
+#define __NR_tkill 238
+#define __NR_sendfile64 239
+#define __NR_futex 240
+#define __NR_sched_setaffinity 241
+#define __NR_sched_getaffinity 242
+#define __NR_set_thread_area 243
+#define __NR_get_thread_area 244
+#define __NR_io_setup 245
+#define __NR_io_destroy 246
+#define __NR_io_getevents 247
+#define __NR_io_submit 248
+#define __NR_io_cancel 249
+#define __NR_fadvise64 250
+#define __NR_exit_group 252
+#define __NR_lookup_dcookie 253
+#define __NR_epoll_create 254
+#define __NR_epoll_ctl 255
+#define __NR_epoll_wait 256
+#define __NR_remap_file_pages 257
+#define __NR_set_tid_address 258
+#define __NR_timer_create 259
+#define __NR_timer_settime32 260
+#define __NR_timer_gettime32 261
+#define __NR_timer_getoverrun 262
+#define __NR_timer_delete 263
+#define __NR_clock_settime32 264
+#define __NR_clock_gettime32 265
+#define __NR_clock_getres_time32 266
+#define __NR_clock_nanosleep_time32 267
+#define __NR_statfs64 268
+#define __NR_fstatfs64 269
+#define __NR_tgkill 270
+#define __NR_utimes 271
+#define __NR_fadvise64_64 272
+#define __NR_vserver 273
+#define __NR_mbind 274
+#define __NR_get_mempolicy 275
+#define __NR_set_mempolicy 276
+#define __NR_mq_open 277
+#define __NR_mq_unlink 278
+#define __NR_mq_timedsend 279
+#define __NR_mq_timedreceive 280
+#define __NR_mq_notify 281
+#define __NR_mq_getsetattr 282
+#define __NR_kexec_load 283
+#define __NR_waitid 284
+#define __NR_add_key 286
+#define __NR_request_key 287
+#define __NR_keyctl 288
+#define __NR_ioprio_set 289
+#define __NR_ioprio_get 290
+#define __NR_inotify_init 291
+#define __NR_inotify_add_watch 292
+#define __NR_inotify_rm_watch 293
+#define __NR_migrate_pages 294
+#define __NR_openat 295
+#define __NR_mkdirat 296
+#define __NR_mknodat 297
+#define __NR_fchownat 298
+#define __NR_futimesat 299
+#define __NR_fstatat64 300
+#define __NR_unlinkat 301
+#define __NR_renameat 302
+#define __NR_linkat 303
+#define __NR_symlinkat 304
+#define __NR_readlinkat 305
+#define __NR_fchmodat 306
+#define __NR_faccessat 307
+#define __NR_pselect6 308
+#define __NR_ppoll 309
+#define __NR_unshare 310
+#define __NR_set_robust_list 311
+#define __NR_get_robust_list 312
+#define __NR_splice 313
+#define __NR_sync_file_range 314
+#define __NR_tee 315
+#define __NR_vmsplice 316
+#define __NR_move_pages 317
+#define __NR_getcpu 318
+#define __NR_epoll_pwait 319
+#define __NR_utimensat 320
+#define __NR_signalfd 321
+#define __NR_timerfd_create 322
+#define __NR_eventfd 323
+#define __NR_fallocate 324
+#define __NR_semtimedop 325
+#define __NR_timerfd_settime32 326
+#define __NR_timerfd_gettime32 327
+#define __NR_semctl 328
+#define __NR_semget 329
+#define __NR_semop 330
+#define __NR_msgctl 331
+#define __NR_msgget 332
+#define __NR_msgrcv 333
+#define __NR_msgsnd 334
+#define __NR_shmat 335
+#define __NR_shmctl 336
+#define __NR_shmdt 337
+#define __NR_shmget 338
+#define __NR_signalfd4 339
+#define __NR_eventfd2 340
+#define __NR_epoll_create1 341
+#define __NR_dup3 342
+#define __NR_pipe2 343
+#define __NR_inotify_init1 344
+#define __NR_socket 345
+#define __NR_socketpair 346
+#define __NR_bind 347
+#define __NR_listen 348
+#define __NR_accept 349
+#define __NR_connect 350
+#define __NR_getsockname 351
+#define __NR_getpeername 352
+#define __NR_sendto 353
+#define __NR_send 354
+#define __NR_recvfrom 355
+#define __NR_recv 356
+#define __NR_setsockopt 357
+#define __NR_getsockopt 358
+#define __NR_shutdown 359
+#define __NR_sendmsg 360
+#define __NR_recvmsg 361
+#define __NR_accept4 362
+#define __NR_preadv 363
+#define __NR_pwritev 364
+#define __NR_rt_tgsigqueueinfo 365
+#define __NR_perf_event_open 366
+#define __NR_recvmmsg 367
+#define __NR_fanotify_init 368
+#define __NR_fanotify_mark 369
+#define __NR_prlimit64 370
+#define __NR_name_to_handle_at 371
+#define __NR_open_by_handle_at 372
+#define __NR_clock_adjtime 373
+#define __NR_syncfs 374
+#define __NR_setns 375
+#define __NR_sendmmsg 376
+#define __NR_process_vm_readv 377
+#define __NR_process_vm_writev 378
+#define __NR_kcmp 379
+#define __NR_finit_module 380
+#define __NR_sched_setattr 381
+#define __NR_sched_getattr 382
+#define __NR_renameat2 383
+#define __NR_seccomp 384
+#define __NR_getrandom 385
+#define __NR_memfd_create 386
+#define __NR_bpf 387
+#define __NR_execveat 388
+#define __NR_userfaultfd 389
+#define __NR_membarrier 390
+#define __NR_mlock2 391
+#define __NR_copy_file_range 392
+#define __NR_preadv2 393
+#define __NR_pwritev2 394
+#define __NR_pkey_mprotect 395
+#define __NR_pkey_alloc 396
+#define __NR_pkey_free 397
+#define __NR_statx 398
+#define __NR_io_pgetevents 399
+#define __NR_rseq 400
+#define __NR_clock_gettime64 403
+#define __NR_clock_settime64 404
+#define __NR_clock_adjtime64 405
+#define __NR_clock_getres_time64 406
+#define __NR_clock_nanosleep_time64 407
+#define __NR_timer_gettime64 408
+#define __NR_timer_settime64 409
+#define __NR_timerfd_gettime64 410
+#define __NR_timerfd_settime64 411
+#define __NR_utimensat_time64 412
+#define __NR_pselect6_time64 413
+#define __NR_ppoll_time64 414
+#define __NR_io_pgetevents_time64 416
+#define __NR_recvmmsg_time64 417
+#define __NR_mq_timedsend_time64 418
+#define __NR_mq_timedreceive_time64 419
+#define __NR_semtimedop_time64 420
+#define __NR_rt_sigtimedwait_time64 421
+#define __NR_futex_time64 422
+#define __NR_sched_rr_get_interval_time64 423
+#define __NR_pidfd_send_signal 424
+#define __NR_io_uring_setup 425
+#define __NR_io_uring_enter 426
+#define __NR_io_uring_register 427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/user.h
new file mode 100644
index 0000000000..dbc25e0459
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/bits/user.h
@@ -0,0 +1,25 @@
+struct user_fpregs_struct {
+	long cwd, swd, twd, fip, fcs, foo, fos, st_space[20];
+};
+
+struct user_regs_struct {
+	unsigned grp[32], pc, msr, ear, esr, fsr, btr, pvr[12];
+};
+
+struct user {
+	struct user_regs_struct regs;
+	int u_fpvalid;
+	struct user_fpregs_struct elf_fpregset_t;
+	unsigned long u_tsize, u_dsize, u_ssize, start_code, start_stack;
+	long signal;
+	int reserved;
+	struct user_regs_struct *u_ar0;
+	struct user_fpregs_struct *u_fpstate;
+	unsigned long magic;
+	char u_comm[32];
+	int u_debugreg[8];
+};
+
+#define ELF_NGREG 50
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+typedef struct user_fpregs_struct elf_fpregset_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/microblaze/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/kstat.h
new file mode 100644
index 0000000000..c144957968
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	long long __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __st_blksize_padding;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	unsigned __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/pthread_arch.h
new file mode 100644
index 0000000000..f6ba8de981
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/pthread_arch.h
@@ -0,0 +1,10 @@
+static inline struct pthread *__pthread_self()
+{
+	struct pthread *self;
+	__asm__ ("ori %0, r21, 0" : "=r" (self) );
+	return self;
+}
+
+#define TP_ADJ(p) (p)
+
+#define MC_PC regs.pc
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/reloc.h
new file mode 100644
index 0000000000..6302c6eea3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/reloc.h
@@ -0,0 +1,27 @@
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define ENDIAN_SUFFIX "el"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "microblaze" ENDIAN_SUFFIX
+
+#define TPOFF_K 0
+
+#define REL_SYMBOLIC    R_MICROBLAZE_32
+#define REL_GOT         R_MICROBLAZE_GLOB_DAT
+#define REL_PLT         R_MICROBLAZE_JUMP_SLOT
+#define REL_RELATIVE    R_MICROBLAZE_REL
+#define REL_COPY        R_MICROBLAZE_COPY
+#define REL_DTPMOD      R_MICROBLAZE_TLSDTPMOD32
+#define REL_DTPOFF      R_MICROBLAZE_TLSDTPREL32
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"addik r1,%1,0 ; bra %0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym " \n" \
+	"	mfs %0, rpc \n" \
+	"	addik %0, %0, _GLOBAL_OFFSET_TABLE_+8 \n" \
+	"	addik %0, %0, " #sym "@GOTOFF \n" \
+	: "=r"(*(fp)) : : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/microblaze/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/microblaze/syscall_arch.h
new file mode 100644
index 0000000000..169013f80e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/microblaze/syscall_arch.h
@@ -0,0 +1,97 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
+
+static __inline long __syscall0(long n)
+{
+	register unsigned long r12 __asm__("r12") = n;
+	register unsigned long r3 __asm__("r3");
+	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
+		: "r"(r12)
+		: "memory", "r4");
+	return r3;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register unsigned long r12 __asm__("r12") = n;
+	register unsigned long r3 __asm__("r3");
+	register unsigned long r5 __asm__("r5") = a;
+	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
+		: "r"(r12), "r"(r5)
+		: "memory", "r4");
+	return r3;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register unsigned long r12 __asm__("r12") = n;
+	register unsigned long r3 __asm__("r3");
+	register unsigned long r5 __asm__("r5") = a;
+	register unsigned long r6 __asm__("r6") = b;
+	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
+		: "r"(r12), "r"(r5), "r"(r6)
+		: "memory", "r4");
+	return r3;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register unsigned long r12 __asm__("r12") = n;
+	register unsigned long r3 __asm__("r3");
+	register unsigned long r5 __asm__("r5") = a;
+	register unsigned long r6 __asm__("r6") = b;
+	register unsigned long r7 __asm__("r7") = c;
+	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
+		: "r"(r12), "r"(r5), "r"(r6), "r"(r7)
+		: "memory", "r4");
+	return r3;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register unsigned long r12 __asm__("r12") = n;
+	register unsigned long r3 __asm__("r3");
+	register unsigned long r5 __asm__("r5") = a;
+	register unsigned long r6 __asm__("r6") = b;
+	register unsigned long r7 __asm__("r7") = c;
+	register unsigned long r8 __asm__("r8") = d;
+	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
+		: "r"(r12), "r"(r5), "r"(r6), "r"(r7), "r"(r8)
+		: "memory", "r4");
+	return r3;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register unsigned long r12 __asm__("r12") = n;
+	register unsigned long r3 __asm__("r3");
+	register unsigned long r5 __asm__("r5") = a;
+	register unsigned long r6 __asm__("r6") = b;
+	register unsigned long r7 __asm__("r7") = c;
+	register unsigned long r8 __asm__("r8") = d;
+	register unsigned long r9 __asm__("r9") = e;
+	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
+		: "r"(r12), "r"(r5), "r"(r6), "r"(r7), "r"(r8), "r"(r9)
+		: "memory", "r4");
+	return r3;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register unsigned long r12 __asm__("r12") = n;
+	register unsigned long r3 __asm__("r3");
+	register unsigned long r5 __asm__("r5") = a;
+	register unsigned long r6 __asm__("r6") = b;
+	register unsigned long r7 __asm__("r7") = c;
+	register unsigned long r8 __asm__("r8") = d;
+	register unsigned long r9 __asm__("r9") = e;
+	register unsigned long r10 __asm__("r10") = f;
+	__asm__ __volatile__ ("brki r14, 0x8" : "=r"(r3)
+		: "r"(r12), "r"(r5), "r"(r6), "r"(r7), "r"(r8), "r"(r9), "r"(r10)
+		: "memory", "r4");
+	return r3;
+}
+
+#define SYSCALL_IPC_BROKEN_MODE
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/mips/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips/atomic_arch.h
new file mode 100644
index 0000000000..1248d1770c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/atomic_arch.h
@@ -0,0 +1,58 @@
+#if __mips_isa_rev < 6
+#define LLSC_M "m"
+#else
+#define LLSC_M "ZC"
+#endif
+
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+#if __mips < 2
+	__asm__ __volatile__ (
+		".set push ; .set mips2\n\t"
+		"ll %0, %1"
+		"\n\t.set pop"
+		: "=r"(v) : "m"(*p));
+#else
+	__asm__ __volatile__ (
+		"ll %0, %1"
+		: "=r"(v) : LLSC_M(*p));
+#endif
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+#if __mips < 2
+	__asm__ __volatile__ (
+		".set push ; .set mips2\n\t"
+		"sc %0, %1"
+		"\n\t.set pop"
+		: "=r"(r), "=m"(*p) : "0"(v) : "memory");
+#else
+	__asm__ __volatile__ (
+		"sc %0, %1"
+		: "=r"(r), "="LLSC_M(*p) : "0"(v) : "memory");
+#endif
+	return r;
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+#if __mips < 2
+	/* mips2 sync, but using too many directives causes
+	 * gcc not to inline it, so encode with .long instead. */
+	__asm__ __volatile__ (".long 0xf" : : : "memory");
+#else
+	__asm__ __volatile__ ("sync" : : : "memory");
+#endif
+}
+
+#define a_pre_llsc a_barrier
+#define a_post_llsc a_barrier
+
+#undef LLSC_M
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/alltypes.h.in
new file mode 100644
index 0000000000..ff934a4c42
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/alltypes.h.in
@@ -0,0 +1,21 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#if _MIPSEL || __MIPSEL || __MIPSEL__
+#define __BYTE_ORDER 1234
+#else
+#define __BYTE_ORDER 4321
+#endif
+
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/errno.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/errno.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/errno.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/errno.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/fcntl.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/float.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/hwcap.h
new file mode 100644
index 0000000000..7986deb7f6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/hwcap.h
@@ -0,0 +1,14 @@
+#define HWCAP_MIPS_R6		(1 << 0)
+#define HWCAP_MIPS_MSA		(1 << 1)
+#define HWCAP_MIPS_CRC32	(1 << 2)
+#define HWCAP_MIPS_MIPS16	(1 << 3)
+#define HWCAP_MIPS_MDMX		(1 << 4)
+#define HWCAP_MIPS_MIPS3D	(1 << 5)
+#define HWCAP_MIPS_SMARTMIPS	(1 << 6)
+#define HWCAP_MIPS_DSP		(1 << 7)
+#define HWCAP_MIPS_DSP2		(1 << 8)
+#define HWCAP_MIPS_DSP3		(1 << 9)
+#define HWCAP_MIPS_MIPS16E2	(1 << 10)
+#define HWCAP_LOONGSON_MMI	(1 << 11)
+#define HWCAP_LOONGSON_EXT	(1 << 12)
+#define HWCAP_LOONGSON_EXT2	(1 << 13)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ioctl.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ioctl.h
new file mode 100644
index 0000000000..e20bf19eaa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ioctl.h
@@ -0,0 +1,114 @@
+#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  1U
+#define _IOC_READ  2U
+#define _IOC_WRITE 4U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+
+#define TCGETA		0x5401
+#define TCSETA		0x5402
+#define TCSETAW		0x5403
+#define TCSETAF		0x5404
+#define TCSBRK		0x5405
+#define TCXONC		0x5406
+#define TCFLSH		0x5407
+#define TCGETS		0x540D
+#define TCSETS		0x540E
+#define TCSETSW		0x540F
+#define TCSETSF		0x5410
+
+#define TIOCEXCL	0x740D
+#define TIOCNXCL	0x740E
+#define TIOCOUTQ	0x7472
+#define TIOCSTI		0x5472
+#define TIOCMGET	0x741D
+#define TIOCMBIS	0x741B
+#define TIOCMBIC	0x741C
+#define TIOCMSET	0x741A
+
+#define TIOCPKT		0x5470
+#define TIOCSWINSZ	_IOW('t', 103, struct winsize)
+#define TIOCGWINSZ	_IOR('t', 104, struct winsize)
+#define TIOCNOTTY	0x5471
+#define TIOCSETD	0x7401
+#define TIOCGETD	0x7400
+
+#define FIOCLEX		0x6601
+#define FIONCLEX	0x6602
+#define FIOASYNC	0x667D
+#define FIONBIO		0x667E
+#define FIOQSIZE	0x667F
+
+#define TIOCGLTC        0x7474
+#define TIOCSLTC        0x7475
+#define TIOCSPGRP	_IOW('t', 118, int)
+#define TIOCGPGRP	_IOR('t', 119, int)
+#define TIOCCONS	_IOW('t', 120, int)
+
+#define FIONREAD	0x467F
+#define TIOCINQ		FIONREAD
+
+#define TIOCGETP        0x7408
+#define TIOCSETP        0x7409
+#define TIOCSETN        0x740A
+
+#define TIOCSBRK	0x5427
+#define TIOCCBRK	0x5428
+#define TIOCGSID	0x7416
+#define TIOCGRS485	_IOR('T', 0x2E, char[32])
+#define TIOCSRS485	_IOWR('T', 0x2F, char[32])
+#define TIOCGPTN	_IOR('T', 0x30, unsigned int)
+#define TIOCSPTLCK	_IOW('T', 0x31, int)
+#define TIOCGDEV	_IOR('T', 0x32, unsigned int)
+#define TIOCSIG		_IOW('T', 0x36, int)
+#define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int)
+#define TIOCGPTLCK	_IOR('T', 0x39, int)
+#define TIOCGEXCL	_IOR('T', 0x40, int)
+#define TIOCGPTPEER	_IO('T', 0x41)
+
+#define TIOCSCTTY	0x5480
+#define TIOCGSOFTCAR	0x5481
+#define TIOCSSOFTCAR	0x5482
+#define TIOCLINUX	0x5483
+#define TIOCGSERIAL	0x5484
+#define TIOCSSERIAL	0x5485
+#define TCSBRKP		0x5486
+
+#define TIOCSERCONFIG	0x5488
+#define TIOCSERGWILD	0x5489
+#define TIOCSERSWILD	0x548A
+#define TIOCGLCKTRMIOS	0x548B
+#define TIOCSLCKTRMIOS	0x548C
+#define TIOCSERGSTRUCT	0x548D
+#define TIOCSERGETLSR   0x548E
+#define TIOCSERGETMULTI 0x548F
+#define TIOCSERSETMULTI 0x5490
+#define TIOCMIWAIT	0x5491
+#define TIOCGICOUNT	0x5492
+
+#define TIOCM_LE	0x001
+#define TIOCM_DTR	0x002
+#define TIOCM_RTS	0x004
+#define TIOCM_ST	0x010
+#define TIOCM_SR	0x020
+#define TIOCM_CTS	0x040
+#define TIOCM_CAR	0x100
+#define TIOCM_CD	TIOCM_CAR
+#define TIOCM_RNG	0x200
+#define TIOCM_RI	TIOCM_RNG
+#define TIOCM_DSR	0x400
+#define TIOCM_OUT1	0x2000
+#define TIOCM_OUT2	0x4000
+#define TIOCM_LOOP	0x8000
+
+#define FIOGETOWN       _IOR('f', 123, int)
+#define FIOSETOWN       _IOW('f', 124, int)
+#define SIOCATMARK      _IOR('s', 7, int)
+#define SIOCSPGRP       _IOW('s', 8, pid_t)
+#define SIOCGPGRP       _IOR('s', 9, pid_t)
+#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
+#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/mman.h
new file mode 100644
index 0000000000..9027bb6376
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/mman.h
@@ -0,0 +1,25 @@
+#undef MAP_ANON
+#define MAP_ANON       0x800
+#undef MAP_NORESERVE
+#define MAP_NORESERVE  0x0400
+#undef MAP_GROWSDOWN
+#define MAP_GROWSDOWN  0x1000
+#undef MAP_DENYWRITE
+#define MAP_DENYWRITE  0x2000
+#undef MAP_EXECUTABLE
+#define MAP_EXECUTABLE 0x4000
+#undef MAP_LOCKED
+#define MAP_LOCKED     0x8000
+#undef MAP_POPULATE
+#define MAP_POPULATE   0x10000
+#undef MAP_NONBLOCK
+#define MAP_NONBLOCK   0x20000
+#undef MAP_STACK
+#define MAP_STACK      0x40000
+#undef MAP_HUGETLB
+#define MAP_HUGETLB    0x80000
+#undef MAP_SYNC
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#undef MADV_SOFT_OFFLINE
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/msg.h
new file mode 100644
index 0000000000..c734dbb570
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/msg.h
@@ -0,0 +1,27 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+#if _MIPSEL || __MIPSEL || __MIPSEL__
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+#else
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long __msg_ctime_lo;
+#endif
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/poll.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/poll.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/poll.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/poll.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ptrace.h
new file mode 100644
index 0000000000..77a01c064e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/ptrace.h
@@ -0,0 +1,9 @@
+#define PTRACE_GET_THREAD_AREA	25
+#define PTRACE_SET_THREAD_AREA	26
+#define PTRACE_PEEKTEXT_3264	0xc0
+#define PTRACE_PEEKDATA_3264	0xc1
+#define PTRACE_POKETEXT_3264	0xc2
+#define PTRACE_POKEDATA_3264	0xc3
+#define PTRACE_GET_THREAD_AREA_3264	0xc4
+#define PTRACE_GET_WATCH_REGS	0xd0
+#define PTRACE_SET_WATCH_REGS	0xd1
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/resource.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/resource.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/resource.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/resource.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/sem.h
new file mode 100644
index 0000000000..fe6f094858
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_ctime_lo;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+#else
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+#endif
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_hi;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/shm.h
new file mode 100644
index 0000000000..ab8c642d82
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/shm.h
@@ -0,0 +1,29 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_ctime_lo;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned short __shm_atime_hi;
+	unsigned short __shm_dtime_hi;
+	unsigned short __shm_ctime_hi;
+	unsigned short __pad1;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/signal.h
new file mode 100644
index 0000000000..e1d97ac781
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/signal.h
@@ -0,0 +1,124 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef unsigned long long greg_t, gregset_t[32];
+typedef struct {
+	union {
+		double fp_dregs[32];
+		struct {
+			float _fp_fregs;
+			unsigned _fp_pad;
+		} fp_fregs[32];
+	} fp_r;
+} fpregset_t;
+struct sigcontext {
+	unsigned sc_regmask, sc_status;
+	unsigned long long sc_pc;
+	gregset_t sc_regs;
+	fpregset_t sc_fpregs;
+	unsigned sc_ownedfp, sc_fpc_csr, sc_fpc_eir, sc_used_math, sc_dsp;
+	unsigned long long sc_mdhi, sc_mdlo;
+	unsigned long sc_hi1, sc_lo1, sc_hi2, sc_lo2, sc_hi3, sc_lo3;
+};
+typedef struct {
+	unsigned regmask, status;
+	unsigned long long pc;
+	gregset_t gregs;
+	fpregset_t fpregs;
+	unsigned ownedfp, fpc_csr, fpc_eir, used_math, dsp;
+	unsigned long long mdhi, mdlo;
+	unsigned long hi1, lo1, hi2, lo2, hi3, lo3;
+} mcontext_t;
+#else
+typedef struct {
+	unsigned __mc1[2];
+	unsigned long long __mc2[65];
+	unsigned __mc3[5];
+	unsigned long long __mc4[2];
+	unsigned __mc5[6];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	size_t ss_size;
+	int ss_flags;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  0x10000
+#define SA_SIGINFO    8
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#undef SIG_BLOCK
+#undef SIG_UNBLOCK
+#undef SIG_SETMASK
+#define SIG_BLOCK     1
+#define SIG_UNBLOCK   2
+#define SIG_SETMASK   3
+
+#undef SI_ASYNCIO
+#undef SI_MESGQ
+#undef SI_TIMER
+#define SI_ASYNCIO (-2)
+#define SI_MESGQ (-4)
+#define SI_TIMER (-3)
+
+#define __SI_SWAP_ERRNO_CODE
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGSTKFLT 7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGBUS    10
+#define SIGSEGV   11
+#define SIGSYS    12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGUSR1   16
+#define SIGUSR2   17
+#define SIGCHLD   18
+#define SIGPWR    19
+#define SIGWINCH  20
+#define SIGURG    21
+#define SIGIO     22
+#define SIGPOLL   SIGIO
+#define SIGSTOP   23
+#define SIGTSTP   24
+#define SIGCONT   25
+#define SIGTTIN   26
+#define SIGTTOU   27
+#define SIGVTALRM 28
+#define SIGPROF   29
+#define SIGXCPU   30
+#define SIGXFSZ   31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 128
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/socket.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/socket.h
new file mode 100644
index 0000000000..02fbb88b4d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/socket.h
@@ -0,0 +1,35 @@
+#define SOCK_STREAM    2
+#define SOCK_DGRAM     1
+
+#define SOL_SOCKET     65535
+
+#define SO_DEBUG        1
+
+#define SO_REUSEADDR    0x0004
+#define SO_KEEPALIVE    0x0008
+#define SO_DONTROUTE    0x0010
+#define SO_BROADCAST    0x0020
+#define SO_LINGER       0x0080
+#define SO_OOBINLINE    0x0100
+#define SO_REUSEPORT    0x0200
+#define SO_SNDBUF       0x1001
+#define SO_RCVBUF       0x1002
+#define SO_SNDLOWAT     0x1003
+#define SO_RCVLOWAT     0x1004
+#define SO_ERROR        0x1007
+#define SO_TYPE         0x1008
+#define SO_ACCEPTCONN   0x1009
+#define SO_PROTOCOL     0x1028
+#define SO_DOMAIN       0x1029
+
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_BSDCOMPAT    14
+#define SO_PASSCRED     17
+#define SO_PEERCRED     18
+#define SO_PEERSEC      30
+#define SO_SNDBUFFORCE  31
+#define SO_RCVBUFFORCE  33
+
+#define SOCK_NONBLOCK     0200
+#define SOCK_CLOEXEC  02000000
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/stat.h
new file mode 100644
index 0000000000..48d4ac8044
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/stat.h
@@ -0,0 +1,26 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	long __st_padding1[2];
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	long __st_padding2[2];
+	off_t st_size;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	blksize_t st_blksize;
+	long __st_padding3;
+	blkcnt_t st_blocks;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+	long __st_padding4[2];
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/statfs.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/statfs.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/statfs.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/statfs.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/syscall.h.in
new file mode 100644
index 0000000000..86251bf31b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/syscall.h.in
@@ -0,0 +1,411 @@
+#define __NR_syscall                 4000
+#define __NR_exit                    4001
+#define __NR_fork                    4002
+#define __NR_read                    4003
+#define __NR_write                   4004
+#define __NR_open                    4005
+#define __NR_close                   4006
+#define __NR_waitpid                 4007
+#define __NR_creat                   4008
+#define __NR_link                    4009
+#define __NR_unlink                  4010
+#define __NR_execve                  4011
+#define __NR_chdir                   4012
+#define __NR_time                    4013
+#define __NR_mknod                   4014
+#define __NR_chmod                   4015
+#define __NR_lchown                  4016
+#define __NR_break                   4017
+#define __NR_unused18                4018
+#define __NR_lseek                   4019
+#define __NR_getpid                  4020
+#define __NR_mount                   4021
+#define __NR_umount                  4022
+#define __NR_setuid                  4023
+#define __NR_getuid                  4024
+#define __NR_stime                   4025
+#define __NR_ptrace                  4026
+#define __NR_alarm                   4027
+#define __NR_unused28                4028
+#define __NR_pause                   4029
+#define __NR_utime                   4030
+#define __NR_stty                    4031
+#define __NR_gtty                    4032
+#define __NR_access                  4033
+#define __NR_nice                    4034
+#define __NR_ftime                   4035
+#define __NR_sync                    4036
+#define __NR_kill                    4037
+#define __NR_rename                  4038
+#define __NR_mkdir                   4039
+#define __NR_rmdir                   4040
+#define __NR_dup                     4041
+#define __NR_pipe                    4042
+#define __NR_times                   4043
+#define __NR_prof                    4044
+#define __NR_brk                     4045
+#define __NR_setgid                  4046
+#define __NR_getgid                  4047
+#define __NR_signal                  4048
+#define __NR_geteuid                 4049
+#define __NR_getegid                 4050
+#define __NR_acct                    4051
+#define __NR_umount2                 4052
+#define __NR_lock                    4053
+#define __NR_ioctl                   4054
+#define __NR_fcntl                   4055
+#define __NR_mpx                     4056
+#define __NR_setpgid                 4057
+#define __NR_ulimit                  4058
+#define __NR_unused59                4059
+#define __NR_umask                   4060
+#define __NR_chroot                  4061
+#define __NR_ustat                   4062
+#define __NR_dup2                    4063
+#define __NR_getppid                 4064
+#define __NR_getpgrp                 4065
+#define __NR_setsid                  4066
+#define __NR_sigaction               4067
+#define __NR_sgetmask                4068
+#define __NR_ssetmask                4069
+#define __NR_setreuid                4070
+#define __NR_setregid                4071
+#define __NR_sigsuspend              4072
+#define __NR_sigpending              4073
+#define __NR_sethostname             4074
+#define __NR_setrlimit               4075
+#define __NR_getrlimit               4076
+#define __NR_getrusage               4077
+#define __NR_gettimeofday_time32            4078
+#define __NR_settimeofday_time32            4079
+#define __NR_getgroups               4080
+#define __NR_setgroups               4081
+#define __NR_reserved82              4082
+#define __NR_symlink                 4083
+#define __NR_unused84                4084
+#define __NR_readlink                4085
+#define __NR_uselib                  4086
+#define __NR_swapon                  4087
+#define __NR_reboot                  4088
+#define __NR_readdir                 4089
+#define __NR_mmap                    4090
+#define __NR_munmap                  4091
+#define __NR_truncate                4092
+#define __NR_ftruncate               4093
+#define __NR_fchmod                  4094
+#define __NR_fchown                  4095
+#define __NR_getpriority             4096
+#define __NR_setpriority             4097
+#define __NR_profil                  4098
+#define __NR_statfs                  4099
+#define __NR_fstatfs                 4100
+#define __NR_ioperm                  4101
+#define __NR_socketcall              4102
+#define __NR_syslog                  4103
+#define __NR_setitimer               4104
+#define __NR_getitimer               4105
+#define __NR_stat                    4106
+#define __NR_lstat                   4107
+#define __NR_fstat                   4108
+#define __NR_unused109               4109
+#define __NR_iopl                    4110
+#define __NR_vhangup                 4111
+#define __NR_idle                    4112
+#define __NR_vm86                    4113
+#define __NR_wait4                   4114
+#define __NR_swapoff                 4115
+#define __NR_sysinfo                 4116
+#define __NR_ipc                     4117
+#define __NR_fsync                   4118
+#define __NR_sigreturn               4119
+#define __NR_clone                   4120
+#define __NR_setdomainname           4121
+#define __NR_uname                   4122
+#define __NR_modify_ldt              4123
+#define __NR_adjtimex                4124
+#define __NR_mprotect                4125
+#define __NR_sigprocmask             4126
+#define __NR_create_module           4127
+#define __NR_init_module             4128
+#define __NR_delete_module           4129
+#define __NR_get_kernel_syms         4130
+#define __NR_quotactl                4131
+#define __NR_getpgid                 4132
+#define __NR_fchdir                  4133
+#define __NR_bdflush                 4134
+#define __NR_sysfs                   4135
+#define __NR_personality             4136
+#define __NR_afs_syscall             4137
+#define __NR_setfsuid                4138
+#define __NR_setfsgid                4139
+#define __NR__llseek                 4140
+#define __NR_getdents                4141
+#define __NR__newselect              4142
+#define __NR_flock                   4143
+#define __NR_msync                   4144
+#define __NR_readv                   4145
+#define __NR_writev                  4146
+#define __NR_cacheflush              4147
+#define __NR_cachectl                4148
+#define __NR_sysmips                 4149
+#define __NR_unused150               4150
+#define __NR_getsid                  4151
+#define __NR_fdatasync               4152
+#define __NR__sysctl                 4153
+#define __NR_mlock                   4154
+#define __NR_munlock                 4155
+#define __NR_mlockall                4156
+#define __NR_munlockall              4157
+#define __NR_sched_setparam          4158
+#define __NR_sched_getparam          4159
+#define __NR_sched_setscheduler      4160
+#define __NR_sched_getscheduler      4161
+#define __NR_sched_yield             4162
+#define __NR_sched_get_priority_max  4163
+#define __NR_sched_get_priority_min  4164
+#define __NR_sched_rr_get_interval   4165
+#define __NR_nanosleep               4166
+#define __NR_mremap                  4167
+#define __NR_accept                  4168
+#define __NR_bind                    4169
+#define __NR_connect                 4170
+#define __NR_getpeername             4171
+#define __NR_getsockname             4172
+#define __NR_getsockopt              4173
+#define __NR_listen                  4174
+#define __NR_recv                    4175
+#define __NR_recvfrom                4176
+#define __NR_recvmsg                 4177
+#define __NR_send                    4178
+#define __NR_sendmsg                 4179
+#define __NR_sendto                  4180
+#define __NR_setsockopt              4181
+#define __NR_shutdown                4182
+#define __NR_socket                  4183
+#define __NR_socketpair              4184
+#define __NR_setresuid               4185
+#define __NR_getresuid               4186
+#define __NR_query_module            4187
+#define __NR_poll                    4188
+#define __NR_nfsservctl              4189
+#define __NR_setresgid               4190
+#define __NR_getresgid               4191
+#define __NR_prctl                   4192
+#define __NR_rt_sigreturn            4193
+#define __NR_rt_sigaction            4194
+#define __NR_rt_sigprocmask          4195
+#define __NR_rt_sigpending           4196
+#define __NR_rt_sigtimedwait         4197
+#define __NR_rt_sigqueueinfo         4198
+#define __NR_rt_sigsuspend           4199
+#define __NR_pread64                 4200
+#define __NR_pwrite64                4201
+#define __NR_chown                   4202
+#define __NR_getcwd                  4203
+#define __NR_capget                  4204
+#define __NR_capset                  4205
+#define __NR_sigaltstack             4206
+#define __NR_sendfile                4207
+#define __NR_getpmsg                 4208
+#define __NR_putpmsg                 4209
+#define __NR_mmap2                   4210
+#define __NR_truncate64              4211
+#define __NR_ftruncate64             4212
+#define __NR_stat64                  4213
+#define __NR_lstat64                 4214
+#define __NR_fstat64                 4215
+#define __NR_pivot_root              4216
+#define __NR_mincore                 4217
+#define __NR_madvise                 4218
+#define __NR_getdents64              4219
+#define __NR_fcntl64                 4220
+#define __NR_reserved221             4221
+#define __NR_gettid                  4222
+#define __NR_readahead               4223
+#define __NR_setxattr                4224
+#define __NR_lsetxattr               4225
+#define __NR_fsetxattr               4226
+#define __NR_getxattr                4227
+#define __NR_lgetxattr               4228
+#define __NR_fgetxattr               4229
+#define __NR_listxattr               4230
+#define __NR_llistxattr              4231
+#define __NR_flistxattr              4232
+#define __NR_removexattr             4233
+#define __NR_lremovexattr            4234
+#define __NR_fremovexattr            4235
+#define __NR_tkill                   4236
+#define __NR_sendfile64              4237
+#define __NR_futex                   4238
+#define __NR_sched_setaffinity       4239
+#define __NR_sched_getaffinity       4240
+#define __NR_io_setup                4241
+#define __NR_io_destroy              4242
+#define __NR_io_getevents            4243
+#define __NR_io_submit               4244
+#define __NR_io_cancel               4245
+#define __NR_exit_group              4246
+#define __NR_lookup_dcookie          4247
+#define __NR_epoll_create            4248
+#define __NR_epoll_ctl               4249
+#define __NR_epoll_wait              4250
+#define __NR_remap_file_pages        4251
+#define __NR_set_tid_address         4252
+#define __NR_restart_syscall         4253
+#define __NR_fadvise64               4254
+#define __NR_statfs64                4255
+#define __NR_fstatfs64               4256
+#define __NR_timer_create            4257
+#define __NR_timer_settime32           4258
+#define __NR_timer_gettime32           4259
+#define __NR_timer_getoverrun        4260
+#define __NR_timer_delete            4261
+#define __NR_clock_settime32           4262
+#define __NR_clock_gettime32           4263
+#define __NR_clock_getres_time32            4264
+#define __NR_clock_nanosleep_time32         4265
+#define __NR_tgkill                  4266
+#define __NR_utimes                  4267
+#define __NR_mbind                   4268
+#define __NR_get_mempolicy           4269
+#define __NR_set_mempolicy           4270
+#define __NR_mq_open                 4271
+#define __NR_mq_unlink               4272
+#define __NR_mq_timedsend            4273
+#define __NR_mq_timedreceive         4274
+#define __NR_mq_notify               4275
+#define __NR_mq_getsetattr           4276
+#define __NR_vserver                 4277
+#define __NR_waitid                  4278
+#define __NR_add_key                 4280
+#define __NR_request_key             4281
+#define __NR_keyctl                  4282
+#define __NR_set_thread_area         4283
+#define __NR_inotify_init            4284
+#define __NR_inotify_add_watch       4285
+#define __NR_inotify_rm_watch        4286
+#define __NR_migrate_pages           4287
+#define __NR_openat                  4288
+#define __NR_mkdirat                 4289
+#define __NR_mknodat                 4290
+#define __NR_fchownat                4291
+#define __NR_futimesat               4292
+#define __NR_fstatat64               4293
+#define __NR_unlinkat                4294
+#define __NR_renameat                4295
+#define __NR_linkat                  4296
+#define __NR_symlinkat               4297
+#define __NR_readlinkat              4298
+#define __NR_fchmodat                4299
+#define __NR_faccessat               4300
+#define __NR_pselect6                4301
+#define __NR_ppoll                   4302
+#define __NR_unshare                 4303
+#define __NR_splice                  4304
+#define __NR_sync_file_range         4305
+#define __NR_tee                     4306
+#define __NR_vmsplice                4307
+#define __NR_move_pages              4308
+#define __NR_set_robust_list         4309
+#define __NR_get_robust_list         4310
+#define __NR_kexec_load              4311
+#define __NR_getcpu                  4312
+#define __NR_epoll_pwait             4313
+#define __NR_ioprio_set              4314
+#define __NR_ioprio_get              4315
+#define __NR_utimensat               4316
+#define __NR_signalfd                4317
+#define __NR_timerfd                 4318
+#define __NR_eventfd                 4319
+#define __NR_fallocate               4320
+#define __NR_timerfd_create          4321
+#define __NR_timerfd_gettime32         4322
+#define __NR_timerfd_settime32         4323
+#define __NR_signalfd4               4324
+#define __NR_eventfd2                4325
+#define __NR_epoll_create1           4326
+#define __NR_dup3                    4327
+#define __NR_pipe2                   4328
+#define __NR_inotify_init1           4329
+#define __NR_preadv                  4330
+#define __NR_pwritev                 4331
+#define __NR_rt_tgsigqueueinfo       4332
+#define __NR_perf_event_open         4333
+#define __NR_accept4                 4334
+#define __NR_recvmmsg                4335
+#define __NR_fanotify_init           4336
+#define __NR_fanotify_mark           4337
+#define __NR_prlimit64               4338
+#define __NR_name_to_handle_at       4339
+#define __NR_open_by_handle_at       4340
+#define __NR_clock_adjtime           4341
+#define __NR_syncfs                  4342
+#define __NR_sendmmsg                4343
+#define __NR_setns                   4344
+#define __NR_process_vm_readv        4345
+#define __NR_process_vm_writev       4346
+#define __NR_kcmp                    4347
+#define __NR_finit_module            4348
+#define __NR_sched_setattr           4349
+#define __NR_sched_getattr           4350
+#define __NR_renameat2               4351
+#define __NR_seccomp                 4352
+#define __NR_getrandom               4353
+#define __NR_memfd_create            4354
+#define __NR_bpf                     4355
+#define __NR_execveat                4356
+#define __NR_userfaultfd             4357
+#define __NR_membarrier              4358
+#define __NR_mlock2                  4359
+#define __NR_copy_file_range         4360
+#define __NR_preadv2                 4361
+#define __NR_pwritev2                4362
+#define __NR_pkey_mprotect           4363
+#define __NR_pkey_alloc              4364
+#define __NR_pkey_free               4365
+#define __NR_statx                   4366
+#define __NR_rseq                    4367
+#define __NR_io_pgetevents           4368
+#define __NR_semget                  4393
+#define __NR_semctl                  4394
+#define __NR_shmget                  4395
+#define __NR_shmctl                  4396
+#define __NR_shmat                   4397
+#define __NR_shmdt                   4398
+#define __NR_msgget                  4399
+#define __NR_msgsnd                  4400
+#define __NR_msgrcv                  4401
+#define __NR_msgctl                  4402
+#define __NR_clock_gettime64         4403
+#define __NR_clock_settime64         4404
+#define __NR_clock_adjtime64         4405
+#define __NR_clock_getres_time64     4406
+#define __NR_clock_nanosleep_time64  4407
+#define __NR_timer_gettime64         4408
+#define __NR_timer_settime64         4409
+#define __NR_timerfd_gettime64       4410
+#define __NR_timerfd_settime64       4411
+#define __NR_utimensat_time64        4412
+#define __NR_pselect6_time64         4413
+#define __NR_ppoll_time64            4414
+#define __NR_io_pgetevents_time64    4416
+#define __NR_recvmmsg_time64         4417
+#define __NR_mq_timedsend_time64     4418
+#define __NR_mq_timedreceive_time64  4419
+#define __NR_semtimedop_time64       4420
+#define __NR_rt_sigtimedwait_time64  4421
+#define __NR_futex_time64            4422
+#define __NR_sched_rr_get_interval_time64 4423
+#define __NR_pidfd_send_signal       4424
+#define __NR_io_uring_setup          4425
+#define __NR_io_uring_enter          4426
+#define __NR_io_uring_register       4427
+#define __NR_open_tree		4428
+#define __NR_move_mount		4429
+#define __NR_fsopen		4430
+#define __NR_fsconfig		4431
+#define __NR_fsmount		4432
+#define __NR_fspick		4433
+#define __NR_pidfd_open		4434
+#define __NR_clone3		4435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/bits/termios.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/termios.h
new file mode 100644
index 0000000000..9d571f78f6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/termios.h
@@ -0,0 +1,169 @@
+struct termios {
+	tcflag_t c_iflag;
+	tcflag_t c_oflag;
+	tcflag_t c_cflag;
+	tcflag_t c_lflag;
+	cc_t c_line;
+	cc_t c_cc[NCCS];
+	speed_t __c_ispeed;
+	speed_t __c_ospeed;
+};
+
+#define VINTR     0
+#define VQUIT     1
+#define VERASE    2
+#define VKILL     3
+#define VMIN      4
+#define VTIME     5
+#define VEOL2     6
+#define VSWTC     7
+#define VSWTCH    7
+#define VSTART    8
+#define VSTOP     9
+#define VSUSP    10
+#define VREPRINT 12
+#define VDISCARD 13
+#define VWERASE  14
+#define VLNEXT   15
+#define VEOF     16
+#define VEOL     17
+
+#define IGNBRK  0000001
+#define BRKINT  0000002
+#define IGNPAR  0000004
+#define PARMRK  0000010
+#define INPCK   0000020
+#define ISTRIP  0000040
+#define INLCR   0000100
+#define IGNCR   0000200
+#define ICRNL   0000400
+#define IUCLC   0001000
+#define IXON    0002000
+#define IXANY   0004000
+#define IXOFF   0010000
+#define IMAXBEL 0020000
+#define IUTF8   0040000
+
+#define OPOST  0000001
+#define OLCUC  0000002
+#define ONLCR  0000004
+#define OCRNL  0000010
+#define ONOCR  0000020
+#define ONLRET 0000040
+#define OFILL  0000100
+#define OFDEL  0000200
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE)
+#define NLDLY  0000400
+#define NL0    0000000
+#define NL1    0000400
+#define CRDLY  0003000
+#define CR0    0000000
+#define CR1    0001000
+#define CR2    0002000
+#define CR3    0003000
+#define TABDLY 0014000
+#define TAB0   0000000
+#define TAB1   0004000
+#define TAB2   0010000
+#define TAB3   0014000
+#define BSDLY  0020000
+#define BS0    0000000
+#define BS1    0020000
+#define FFDLY  0100000
+#define FF0    0000000
+#define FF1    0100000
+#endif
+
+#define VTDLY  0040000
+#define VT0    0000000
+#define VT1    0040000
+
+#define B0       0000000
+#define B50      0000001
+#define B75      0000002
+#define B110     0000003
+#define B134     0000004
+#define B150     0000005
+#define B200     0000006
+#define B300     0000007
+#define B600     0000010
+#define B1200    0000011
+#define B1800    0000012
+#define B2400    0000013
+#define B4800    0000014
+#define B9600    0000015
+#define B19200   0000016
+#define B38400   0000017
+
+#define B57600   0010001
+#define B115200  0010002
+#define B230400  0010003
+#define B460800  0010004
+#define B500000  0010005
+#define B576000  0010006
+#define B921600  0010007
+#define B1000000 0010010
+#define B1152000 0010011
+#define B1500000 0010012
+#define B2000000 0010013
+#define B2500000 0010014
+#define B3000000 0010015
+#define B3500000 0010016
+#define B4000000 0010017
+
+#define CSIZE  0000060
+#define CS5    0000000
+#define CS6    0000020
+#define CS7    0000040
+#define CS8    0000060
+#define CSTOPB 0000100
+#define CREAD  0000200
+#define PARENB 0000400
+#define PARODD 0001000
+#define HUPCL  0002000
+#define CLOCAL 0004000
+
+#define ISIG   0000001
+#define ICANON 0000002
+#define ECHO   0000010
+#define ECHOE  0000020
+#define ECHOK  0000040
+#define ECHONL 0000100
+#define NOFLSH 0000200
+#define IEXTEN 0000400
+#define TOSTOP 0100000
+#define ITOSTOP 0100000
+
+#define TCOOFF 0
+#define TCOON  1
+#define TCIOFF 2
+#define TCION  3
+
+#define TCIFLUSH  0
+#define TCOFLUSH  1
+#define TCIOFLUSH 2
+
+#define TCSANOW   0
+#define TCSADRAIN 1
+#define TCSAFLUSH 2
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA    0000016
+#define EXTB    0000017
+#define CBAUD   0010017
+#define CBAUDEX 0010000
+#define CIBAUD  002003600000
+#define CMSPAR  010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE   0000004
+#define ECHOCTL 0001000
+#define ECHOPRT 0002000
+#define ECHOKE  0004000
+#define FLUSHO  0020000
+#define PENDIN  0040000
+#define EXTPROC 0200000
+
+#define XTABS  0014000
+#define TIOCSER_TEMT 1
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/arch/mips/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/mips/bits/user.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/mips/bits/user.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips/bits/user.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips/crt_arch.h
new file mode 100644
index 0000000000..9fc50d7cac
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/crt_arch.h
@@ -0,0 +1,29 @@
+__asm__(
+".set push\n"
+".set noreorder\n"
+".text \n"
+".global _" START "\n"
+".global " START "\n"
+".type   _" START ", @function\n"
+".type   " START ", @function\n"
+"_" START ":\n"
+"" START ":\n"
+"	bal 1f \n"
+"	 move $fp, $0 \n"
+"	.gpword . \n"
+"	.gpword " START "_c \n"
+".weak _DYNAMIC \n"
+".hidden _DYNAMIC \n"
+"	.gpword _DYNAMIC \n"
+"1:	lw $gp, 0($ra) \n"
+"	subu $gp, $ra, $gp \n"
+"	move $4, $sp \n"
+"	lw $5, 8($ra) \n"
+"	addu $5, $5, $gp \n"
+"	lw $25, 4($ra) \n"
+"	addu $25, $25, $gp \n"
+"	and $sp, $sp, -8 \n"
+"	jalr $25 \n"
+"	 subu $sp, $sp, 16 \n"
+".set pop \n"
+);
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/ksigaction.h b/src/components/lib/libc/musl-1.2.0/arch/mips/ksigaction.h
new file mode 100644
index 0000000000..63fdfab00b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/ksigaction.h
@@ -0,0 +1,13 @@
+#include <features.h>
+
+struct k_sigaction {
+	unsigned flags;
+	void (*handler)(int);
+	unsigned long mask[4];
+	/* The following field is past the end of the structure the
+	 * kernel will read or write, and exists only to avoid having
+	 * mips-specific preprocessor conditionals in sigaction.c. */
+	void (*restorer)();
+};
+
+hidden void __restore(), __restore_rt();
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/mips/kstat.h
new file mode 100644
index 0000000000..5e637eabfa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/kstat.h
@@ -0,0 +1,22 @@
+struct kstat {
+	unsigned st_dev;
+	long __st_padding1[3];
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	unsigned st_rdev;
+	long __st_padding2[3];
+	off_t st_size;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	blksize_t st_blksize;
+	long __st_padding3;
+	blkcnt_t st_blocks;
+        long __st_padding4[14];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips/pthread_arch.h
new file mode 100644
index 0000000000..1e7839ea67
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/pthread_arch.h
@@ -0,0 +1,19 @@
+static inline struct pthread *__pthread_self()
+{
+#if __mips_isa_rev < 2
+	register char *tp __asm__("$3");
+	__asm__ (".word 0x7c03e83b" : "=r" (tp) );
+#else
+	char *tp;
+	__asm__ ("rdhwr %0, $29" : "=r" (tp) );
+#endif
+	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
+
+#define DTP_OFFSET 0x8000
+
+#define MC_PC pc
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/mips/reloc.h
new file mode 100644
index 0000000000..88d236390e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/reloc.h
@@ -0,0 +1,50 @@
+#if __mips_isa_rev >= 6
+#define ISA_SUFFIX "r6"
+#else
+#define ISA_SUFFIX ""
+#endif
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define ENDIAN_SUFFIX "el"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#ifdef __mips_soft_float
+#define FP_SUFFIX "-sf"
+#else
+#define FP_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "mips" ISA_SUFFIX ENDIAN_SUFFIX FP_SUFFIX
+
+#define TPOFF_K (-0x7000)
+
+#define REL_SYM_OR_REL  R_MIPS_REL32
+#define REL_PLT         R_MIPS_JUMP_SLOT
+#define REL_COPY        R_MIPS_COPY
+#define REL_DTPMOD      R_MIPS_TLS_DTPMOD32
+#define REL_DTPOFF      R_MIPS_TLS_DTPREL32
+#define REL_TPOFF       R_MIPS_TLS_TPREL32
+
+#define NEED_MIPS_GOT_RELOCS 1
+#define DT_DEBUG_INDIRECT DT_MIPS_RLD_MAP
+#define ARCH_SYM_REJECT_UND(s) (!((s)->st_other & STO_MIPS_PLT))
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"move $sp,%1 ; jr %0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	".set push \n" \
+	".set noreorder \n" \
+	"	bal 1f \n" \
+	"	 nop \n" \
+	"	.gpword . \n" \
+	"	.gpword " #sym " \n" \
+	"1:	lw %0, ($ra) \n" \
+	"	subu %0, $ra, %0 \n" \
+	"	lw $ra, 4($ra) \n" \
+	"	addu %0, %0, $ra \n" \
+	".set pop \n" \
+	: "=r"(*(fp)) : : "memory", "ra" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips/syscall_arch.h
new file mode 100644
index 0000000000..f821e73fcc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips/syscall_arch.h
@@ -0,0 +1,151 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
+
+#define SYSCALL_RLIM_INFINITY (-1UL/2)
+
+#if __mips_isa_rev >= 6
+#define SYSCALL_CLOBBERLIST \
+	"$1", "$3", "$11", "$12", "$13", \
+	"$14", "$15", "$24", "$25", "memory"
+#else
+#define SYSCALL_CLOBBERLIST \
+	"$1", "$3", "$11", "$12", "$13", \
+	"$14", "$15", "$24", "$25", "hi", "lo", "memory"
+#endif
+
+static inline long __syscall0(long n)
+{
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+r"(r2), "=r"(r7)
+		:
+		: SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long r4 __asm__("$4") = a;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+r"(r2), "=r"(r7)
+		: "r"(r4)
+		: SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+r"(r2), "=r"(r7)
+		: "r"(r4), "r"(r5)
+		: SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+r"(r2), "=r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+r"(r2), "+r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r8 __asm__("$8") = e;
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"subu $sp,$sp,32 ; sw $8,16($sp) ; "
+		"syscall ;"
+		"addu $sp,$sp,32"
+		: "+r"(r2), "+r"(r7), "+r"(r8)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST, "$9", "$10");
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r8 __asm__("$8") = e;
+	register long r9 __asm__("$9") = f;
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"subu $sp,$sp,32 ; sw $8,16($sp) ; sw $9,20($sp) ; "
+		"syscall ;"
+		"addu $sp,$sp,32"
+		: "+r"(r2), "+r"(r7), "+r"(r8), "+r"(r9)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST, "$10");
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall7(long n, long a, long b, long c, long d, long e, long f, long g)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r8 __asm__("$8") = e;
+	register long r9 __asm__("$9") = f;
+	register long r10 __asm__("$10") = g;
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"subu $sp,$sp,32 ; sw $8,16($sp) ; sw $9,20($sp) ; sw $10,24($sp) ; "
+		"syscall ;"
+		"addu $sp,$sp,32"
+		: "+r"(r2), "+r"(r7), "+r"(r8), "+r"(r9), "+r"(r10)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+#define VDSO_USEFUL
+#define VDSO_CGT32_SYM "__vdso_clock_gettime"
+#define VDSO_CGT32_VER "LINUX_2.6"
+#define VDSO_CGT_SYM "__vdso_clock_gettime64"
+#define VDSO_CGT_VER "LINUX_2.6"
+
+#define SO_SNDTIMEO_OLD 0x1005
+#define SO_RCVTIMEO_OLD 0x1006
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/atomic_arch.h
new file mode 100644
index 0000000000..d0f8b4ad23
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/atomic_arch.h
@@ -0,0 +1,56 @@
+#if __mips_isa_rev < 6
+#define LLSC_M "m"
+#else
+#define LLSC_M "ZC"
+#endif
+
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+	__asm__ __volatile__ (
+		"ll %0, %1"
+		: "=r"(v) : LLSC_M(*p));
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+	__asm__ __volatile__ (
+		"sc %0, %1"
+		: "=r"(r), "="LLSC_M(*p) : "0"(v) : "memory");
+	return r;
+}
+
+#define a_ll_p a_ll_p
+static inline void *a_ll_p(volatile void *p)
+{
+	void *v;
+	__asm__ __volatile__ (
+		"lld %0, %1"
+		: "=r"(v) : LLSC_M(*(void *volatile *)p));
+	return v;
+}
+
+#define a_sc_p a_sc_p
+static inline int a_sc_p(volatile void *p, void *v)
+{
+	long r;
+	__asm__ __volatile__ (
+		"scd %0, %1"
+		: "=r"(r), "="LLSC_M(*(void *volatile *)p) : "0"(v) : "memory");
+	return r;
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("sync" : : : "memory");
+}
+
+#define a_pre_llsc a_barrier
+#define a_post_llsc a_barrier
+
+#undef LLSC_M
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/alltypes.h.in
new file mode 100644
index 0000000000..fcd61ee853
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/alltypes.h.in
@@ -0,0 +1,22 @@
+#define _Addr long
+#define _Int64 long
+#define _Reg long
+
+#if _MIPSEL || __MIPSEL || __MIPSEL__
+#define __BYTE_ORDER 1234
+#else
+#define __BYTE_ORDER 4321
+#endif
+
+#define __LONG_MAX 0x7fffffffffffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
+
+TYPEDEF unsigned nlink_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/errno.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/errno.h
new file mode 100644
index 0000000000..1bb91e3d77
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/errno.h
@@ -0,0 +1,134 @@
+#define EPERM            1
+#define ENOENT           2
+#define ESRCH            3
+#define EINTR            4
+#define EIO              5
+#define ENXIO            6
+#define E2BIG            7
+#define ENOEXEC          8
+#define EBADF            9
+#define ECHILD          10
+#define EAGAIN          11
+#define ENOMEM          12
+#define EACCES          13
+#define EFAULT          14
+#define ENOTBLK         15
+#define EBUSY           16
+#define EEXIST          17
+#define EXDEV           18
+#define ENODEV          19
+#define ENOTDIR         20
+#define EISDIR          21
+#define EINVAL          22
+#define ENFILE          23
+#define EMFILE          24
+#define ENOTTY          25
+#define ETXTBSY         26
+#define EFBIG           27
+#define ENOSPC          28
+#define ESPIPE          29
+#define EROFS           30
+#define EMLINK          31
+#define EPIPE           32
+#define EDOM            33
+#define ERANGE          34
+#define ENOMSG          35
+#define EIDRM           36
+#define ECHRNG          37
+#define EL2NSYNC        38
+#define EL3HLT          39
+#define EL3RST          40
+#define ELNRNG          41
+#define EUNATCH         42
+#define ENOCSI          43
+#define EL2HLT          44
+#define EDEADLK         45
+#define ENOLCK          46
+#define EBADE           50
+#define EBADR           51
+#define EXFULL          52
+#define ENOANO          53
+#define EBADRQC         54
+#define EBADSLT         55
+#define EDEADLOCK       56
+#define EBFONT          59
+#define ENOSTR          60
+#define ENODATA         61
+#define ETIME           62
+#define ENOSR           63
+#define ENONET          64
+#define ENOPKG          65
+#define EREMOTE         66
+#define ENOLINK         67
+#define EADV            68
+#define ESRMNT          69
+#define ECOMM           70
+#define EPROTO          71
+#define EDOTDOT         73
+#define EMULTIHOP       74
+#define EBADMSG         77
+#define ENAMETOOLONG    78
+#define EOVERFLOW       79
+#define ENOTUNIQ        80
+#define EBADFD          81
+#define EREMCHG         82
+#define ELIBACC         83
+#define ELIBBAD         84
+#define ELIBSCN         85
+#define ELIBMAX         86
+#define ELIBEXEC        87
+#define EILSEQ          88
+#define ENOSYS          89
+#define ELOOP           90
+#define ERESTART        91
+#define ESTRPIPE        92
+#define ENOTEMPTY       93
+#define EUSERS          94
+#define ENOTSOCK        95
+#define EDESTADDRREQ    96
+#define EMSGSIZE        97
+#define EPROTOTYPE      98
+#define ENOPROTOOPT     99
+#define EPROTONOSUPPORT 120
+#define ESOCKTNOSUPPORT 121
+#define EOPNOTSUPP      122
+#define ENOTSUP         EOPNOTSUPP
+#define EPFNOSUPPORT    123
+#define EAFNOSUPPORT    124
+#define EADDRINUSE      125
+#define EADDRNOTAVAIL   126
+#define ENETDOWN        127
+#define ENETUNREACH     128
+#define ENETRESET       129
+#define ECONNABORTED    130
+#define ECONNRESET      131
+#define ENOBUFS         132
+#define EISCONN         133
+#define ENOTCONN        134
+#define EUCLEAN         135
+#define ENOTNAM         137
+#define ENAVAIL         138
+#define EISNAM          139
+#define EREMOTEIO       140
+#define ESHUTDOWN       143
+#define ETOOMANYREFS    144
+#define ETIMEDOUT       145
+#define ECONNREFUSED    146
+#define EHOSTDOWN       147
+#define EHOSTUNREACH    148
+#define EWOULDBLOCK     EAGAIN
+#define EALREADY        149
+#define EINPROGRESS     150
+#define ESTALE          151
+#define ECANCELED       158
+#define ENOMEDIUM       159
+#define EMEDIUMTYPE     160
+#define ENOKEY          161
+#define EKEYEXPIRED     162
+#define EKEYREVOKED     163
+#define EKEYREJECTED    164
+#define EOWNERDEAD      165
+#define ENOTRECOVERABLE 166
+#define ERFKILL         167
+#define EHWPOISON       168
+#define EDQUOT          1133
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/fcntl.h
new file mode 100644
index 0000000000..3bcec15e0d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/fcntl.h
@@ -0,0 +1,40 @@
+#define O_CREAT        0400
+#define O_EXCL        02000
+#define O_NOCTTY      04000
+#define O_TRUNC       01000
+#define O_APPEND       0010
+#define O_NONBLOCK     0200
+#define O_DSYNC        0020
+#define O_SYNC       040020
+#define O_RSYNC      040020
+#define O_DIRECTORY 0200000
+#define O_NOFOLLOW  0400000
+#define O_CLOEXEC  02000000
+
+#define O_ASYNC      010000
+#define O_DIRECT    0100000
+#define O_LARGEFILE       0
+#define O_NOATIME  01000000
+#define O_PATH    010000000
+#define O_TMPFILE 020200000
+#define O_NDELAY O_NONBLOCK
+
+#define F_DUPFD  0
+#define F_GETFD  1
+#define F_SETFD  2
+#define F_GETFL  3
+#define F_SETFL  4
+
+#define F_SETOWN 24
+#define F_GETOWN 23
+#define F_SETSIG 10
+#define F_GETSIG 11
+
+#define F_GETLK 14
+#define F_SETLK  6
+#define F_SETLKW 7
+
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
+
+#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/fenv.h
new file mode 100644
index 0000000000..2762089694
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/fenv.h
@@ -0,0 +1,25 @@
+#ifdef __mips_soft_float
+#define FE_ALL_EXCEPT 0
+#define FE_TONEAREST  0
+#else
+#define FE_INEXACT    4
+#define FE_UNDERFLOW  8
+#define FE_OVERFLOW   16
+#define FE_DIVBYZERO  32
+#define FE_INVALID    64
+
+#define FE_ALL_EXCEPT 124
+
+#define FE_TONEAREST  0
+#define FE_TOWARDZERO 1
+#define FE_UPWARD     2
+#define FE_DOWNWARD   3
+#endif
+
+typedef unsigned short fexcept_t;
+
+typedef struct {
+	unsigned __cw;
+} fenv_t;
+
+#define FE_DFL_ENV ((const fenv_t *) -1)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/float.h
new file mode 100644
index 0000000000..719c79085a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/float.h
@@ -0,0 +1,16 @@
+#define FLT_EVAL_METHOD 0
+
+#define LDBL_TRUE_MIN 6.47517511943802511092443895822764655e-4966L
+#define LDBL_MIN 3.36210314311209350626267781732175260e-4932L
+#define LDBL_MAX 1.18973149535723176508575932662800702e+4932L
+#define LDBL_EPSILON 1.92592994438723585305597794258492732e-34L
+
+#define LDBL_MANT_DIG 113
+#define LDBL_MIN_EXP (-16381)
+#define LDBL_MAX_EXP 16384
+
+#define LDBL_DIG 33
+#define LDBL_MIN_10_EXP (-4931)
+#define LDBL_MAX_10_EXP 4932
+
+#define DECIMAL_DIG 36
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/hwcap.h
new file mode 100644
index 0000000000..13e86fe702
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/hwcap.h
@@ -0,0 +1,3 @@
+#define HWCAP_MIPS_R6		(1 << 0)
+#define HWCAP_MIPS_MSA		(1 << 1)
+#define HWCAP_MIPS_CRC32	(1 << 2)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ioctl.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ioctl.h
new file mode 100644
index 0000000000..e277c3f05c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ioctl.h
@@ -0,0 +1,114 @@
+#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  1U
+#define _IOC_READ  2U
+#define _IOC_WRITE 4U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+
+#define TCGETA		0x5401
+#define TCSETA		0x5402
+#define TCSETAW		0x5403
+#define TCSETAF		0x5404
+#define TCSBRK		0x5405
+#define TCXONC		0x5406
+#define TCFLSH		0x5407
+#define TCGETS		0x540D
+#define TCSETS		0x540E
+#define TCSETSW		0x540F
+#define TCSETSF		0x5410
+
+#define TIOCEXCL	0x740D
+#define TIOCNXCL	0x740E
+#define TIOCOUTQ	0x7472
+#define TIOCSTI		0x5472
+#define TIOCMGET	0x741D
+#define TIOCMBIS	0x741B
+#define TIOCMBIC	0x741C
+#define TIOCMSET	0x741A
+
+#define TIOCPKT		0x5470
+#define TIOCSWINSZ	_IOW('t', 103, struct winsize)
+#define TIOCGWINSZ	_IOR('t', 104, struct winsize)
+#define TIOCNOTTY	0x5471
+#define TIOCSETD	0x7401
+#define TIOCGETD	0x7400
+
+#define FIOCLEX		0x6601
+#define FIONCLEX	0x6602
+#define FIOASYNC	0x667D
+#define FIONBIO		0x667E
+#define FIOQSIZE	0x667F
+
+#define TIOCGLTC        0x7474
+#define TIOCSLTC        0x7475
+#define TIOCSPGRP	_IOW('t', 118, int)
+#define TIOCGPGRP	_IOR('t', 119, int)
+#define TIOCCONS	_IOW('t', 120, int)
+
+#define FIONREAD	0x467F
+#define TIOCINQ		FIONREAD
+
+#define TIOCGETP        0x7408
+#define TIOCSETP        0x7409
+#define TIOCSETN        0x740A
+
+#define TIOCSBRK	0x5427
+#define TIOCCBRK	0x5428
+#define TIOCGSID	0x7416
+#define TIOCGRS485	_IOR('T', 0x2E, char[32])
+#define TIOCSRS485	_IOWR('T', 0x2F, char[32])
+#define TIOCGPTN	_IOR('T', 0x30, unsigned int)
+#define TIOCSPTLCK	_IOW('T', 0x31, int)
+#define TIOCGDEV	_IOR('T', 0x32, unsigned int)
+#define TIOCSIG		_IOW('T', 0x36, int)
+#define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int)
+#define TIOCGPTLCK	_IOR('T', 0x39, int)
+#define TIOCGEXCL	_IOR('T', 0x40, int)
+#define TIOCGPTPEER	_IO('T', 0x41)
+
+#define TIOCSCTTY	0x5480
+#define TIOCGSOFTCAR	0x5481
+#define TIOCSSOFTCAR	0x5482
+#define TIOCLINUX	0x5483
+#define TIOCGSERIAL	0x5484
+#define TIOCSSERIAL	0x5485
+#define TCSBRKP		0x5486
+
+#define TIOCSERCONFIG	0x5488
+#define TIOCSERGWILD	0x5489
+#define TIOCSERSWILD	0x548A
+#define TIOCGLCKTRMIOS	0x548B
+#define TIOCSLCKTRMIOS	0x548C
+#define TIOCSERGSTRUCT	0x548D
+#define TIOCSERGETLSR   0x548E
+#define TIOCSERGETMULTI 0x548F
+#define TIOCSERSETMULTI 0x5490
+#define TIOCMIWAIT	0x5491
+#define TIOCGICOUNT	0x5492
+
+#define TIOCM_LE	0x001
+#define TIOCM_DTR	0x002
+#define TIOCM_RTS	0x004
+#define TIOCM_ST	0x010
+#define TIOCM_SR	0x020
+#define TIOCM_CTS	0x040
+#define TIOCM_CAR	0x100
+#define TIOCM_CD	TIOCM_CAR
+#define TIOCM_RNG	0x200
+#define TIOCM_RI	TIOCM_RNG
+#define TIOCM_DSR	0x400
+#define TIOCM_OUT1	0x2000
+#define TIOCM_OUT2	0x4000
+#define TIOCM_LOOP	0x8000
+
+#define FIOGETOWN       _IOR('f', 123, int)
+#define FIOSETOWN       _IOW('f', 124, int)
+#define SIOCATMARK      _IOR('s', 7, int)
+#define SIOCSPGRP       _IOW('s', 8, pid_t)
+#define SIOCGPGRP       _IOR('s', 9, pid_t)
+#define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ipc.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ipc.h
new file mode 100644
index 0000000000..df2271686a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ipc.h
@@ -0,0 +1,12 @@
+struct ipc_perm {
+	key_t __ipc_perm_key;
+	uid_t uid;
+	gid_t gid;
+	uid_t cuid;
+	gid_t cgid;
+	mode_t mode;
+	int __ipc_perm_seq;
+	int __pad1;
+	unsigned long __unused1;
+	unsigned long __unused2;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/mman.h
new file mode 100644
index 0000000000..9027bb6376
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/mman.h
@@ -0,0 +1,25 @@
+#undef MAP_ANON
+#define MAP_ANON       0x800
+#undef MAP_NORESERVE
+#define MAP_NORESERVE  0x0400
+#undef MAP_GROWSDOWN
+#define MAP_GROWSDOWN  0x1000
+#undef MAP_DENYWRITE
+#define MAP_DENYWRITE  0x2000
+#undef MAP_EXECUTABLE
+#define MAP_EXECUTABLE 0x4000
+#undef MAP_LOCKED
+#define MAP_LOCKED     0x8000
+#undef MAP_POPULATE
+#define MAP_POPULATE   0x10000
+#undef MAP_NONBLOCK
+#define MAP_NONBLOCK   0x20000
+#undef MAP_STACK
+#define MAP_STACK      0x40000
+#undef MAP_HUGETLB
+#define MAP_HUGETLB    0x80000
+#undef MAP_SYNC
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#undef MADV_SOFT_OFFLINE
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/poll.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/poll.h
new file mode 100644
index 0000000000..b0b1ed621e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/poll.h
@@ -0,0 +1,2 @@
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND 0x100
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/posix.h
new file mode 100644
index 0000000000..acf429449b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/posix.h
@@ -0,0 +1,2 @@
+#define _POSIX_V6_LP64_OFFBIG 1
+#define _POSIX_V7_LP64_OFFBIG 1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ptrace.h
new file mode 100644
index 0000000000..77a01c064e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/ptrace.h
@@ -0,0 +1,9 @@
+#define PTRACE_GET_THREAD_AREA	25
+#define PTRACE_SET_THREAD_AREA	26
+#define PTRACE_PEEKTEXT_3264	0xc0
+#define PTRACE_PEEKDATA_3264	0xc1
+#define PTRACE_POKETEXT_3264	0xc2
+#define PTRACE_POKEDATA_3264	0xc3
+#define PTRACE_GET_THREAD_AREA_3264	0xc4
+#define PTRACE_GET_WATCH_REGS	0xd0
+#define PTRACE_SET_WATCH_REGS	0xd1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/reg.h
new file mode 100644
index 0000000000..a3f63accf7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/reg.h
@@ -0,0 +1,47 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
+
+#define EF_R0 0
+#define EF_R1 1
+#define EF_R2 2
+#define EF_R3 3
+#define EF_R4 4
+#define EF_R5 5
+#define EF_R6 6
+#define EF_R7 7
+#define EF_R8 8
+#define EF_R9 9
+#define EF_R10 10
+#define EF_R11 11
+#define EF_R12 12
+#define EF_R13 13
+#define EF_R14 14
+#define EF_R15 15
+#define EF_R16 16
+#define EF_R17 17
+#define EF_R18 18
+#define EF_R19 19
+#define EF_R20 20
+#define EF_R21 21
+#define EF_R22 22
+#define EF_R23 23
+#define EF_R24 24
+#define EF_R25 25
+
+#define EF_R26 26
+#define EF_R27 27
+#define EF_R28 28
+#define EF_R29 29
+#define EF_R30 30
+#define EF_R31 31
+
+#define EF_LO 32
+#define EF_HI 33
+
+#define EF_CP0_EPC 34
+#define EF_CP0_BADVADDR 35
+#define EF_CP0_STATUS 36
+#define EF_CP0_CAUSE 37
+#define EF_UNUSED0 38
+
+#define EF_SIZE 304
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/resource.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/resource.h
new file mode 100644
index 0000000000..414a405417
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/resource.h
@@ -0,0 +1,5 @@
+#define RLIMIT_NOFILE  5
+#define RLIMIT_AS      6
+#define RLIMIT_RSS     7
+#define RLIMIT_NPROC   8
+#define RLIMIT_MEMLOCK 9
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/setjmp.h
new file mode 100644
index 0000000000..4d93267e61
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/setjmp.h
@@ -0,0 +1 @@
+typedef unsigned long long __jmp_buf[23];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/signal.h
new file mode 100644
index 0000000000..c31ad07ec5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/signal.h
@@ -0,0 +1,143 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef unsigned long long greg_t, gregset_t[32];
+
+typedef struct {
+	union {
+		double fp_dregs[32];
+		struct {
+			float _fp_fregs;
+			unsigned _fp_pad;
+		} fp_fregs[32];
+	} fp_r;
+} fpregset_t;
+
+struct sigcontext {
+	unsigned long long sc_regs[32];
+	unsigned long long sc_fpregs[32];
+	unsigned long long sc_mdhi;
+	unsigned long long sc_hi1;
+	unsigned long long sc_hi2;
+	unsigned long long sc_hi3;
+	unsigned long long sc_mdlo;
+	unsigned long long sc_lo1;
+	unsigned long long sc_lo2;
+	unsigned long long sc_lo3;
+	unsigned long long sc_pc;
+	unsigned int sc_fpc_csr;
+	unsigned int sc_used_math;
+	unsigned int sc_dsp;
+	unsigned int sc_reserved;
+};
+
+typedef struct {
+	gregset_t gregs;
+	fpregset_t fpregs;
+	greg_t mdhi;
+	greg_t hi1;
+	greg_t hi2;
+	greg_t hi3;
+	greg_t mdlo;
+	greg_t lo1;
+	greg_t lo2;
+	greg_t lo3;
+	greg_t pc;
+	unsigned int fpc_csr;
+	unsigned int used_math;
+	unsigned int dsp;
+	unsigned int reserved;
+} mcontext_t;
+
+#else
+typedef struct {
+	unsigned long long __mc1[32];
+	double __mc2[32];
+	unsigned long long __mc3[9];
+	unsigned __mc4[4];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	size_t ss_size;
+	int ss_flags;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  0x10000
+#define SA_SIGINFO    8
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#undef SIG_BLOCK
+#undef SIG_UNBLOCK
+#undef SIG_SETMASK
+#define SIG_BLOCK     1
+#define SIG_UNBLOCK   2
+#define SIG_SETMASK   3
+
+#undef SI_ASYNCIO
+#undef SI_MESGQ
+#undef SI_TIMER
+#define SI_ASYNCIO (-2)
+#define SI_MESGQ (-4)
+#define SI_TIMER (-3)
+
+#define __SI_SWAP_ERRNO_CODE
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGSTKFLT 7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGBUS    10
+#define SIGSEGV   11
+#define SIGSYS    12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGUSR1   16
+#define SIGUSR2   17
+#define SIGCHLD   18
+#define SIGPWR    19
+#define SIGWINCH  20
+#define SIGURG    21
+#define SIGIO     22
+#define SIGPOLL   SIGIO
+#define SIGSTOP   23
+#define SIGTSTP   24
+#define SIGCONT   25
+#define SIGTTIN   26
+#define SIGTTOU   27
+#define SIGVTALRM 28
+#define SIGPROF   29
+#define SIGXCPU   30
+#define SIGXFSZ   31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 128
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/socket.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/socket.h
new file mode 100644
index 0000000000..519b9c8ead
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/socket.h
@@ -0,0 +1,35 @@
+#define SOCK_STREAM    2
+#define SOCK_DGRAM     1
+#define SOL_SOCKET     65535
+#define SO_DEBUG       1
+
+#define SO_REUSEADDR    0x0004
+#define SO_KEEPALIVE    0x0008
+#define SO_DONTROUTE    0x0010
+#define SO_BROADCAST    0x0020
+#define SO_LINGER       0x0080
+#define SO_OOBINLINE    0x0100
+#define SO_REUSEPORT    0x0200
+#define SO_SNDBUF       0x1001
+#define SO_RCVBUF       0x1002
+#define SO_SNDLOWAT     0x1003
+#define SO_RCVLOWAT     0x1004
+#define SO_RCVTIMEO     0x1006
+#define SO_SNDTIMEO     0x1005
+#define SO_ERROR        0x1007
+#define SO_TYPE         0x1008
+#define SO_ACCEPTCONN   0x1009
+#define SO_PROTOCOL     0x1028
+#define SO_DOMAIN       0x1029
+
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_BSDCOMPAT    14
+#define SO_PASSCRED     17
+#define SO_PEERCRED     18
+#define SO_PEERSEC      30
+#define SO_SNDBUFFORCE  31
+#define SO_RCVBUFFORCE  33
+
+#define SOCK_NONBLOCK     0200
+#define SOCK_CLOEXEC  02000000
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/stat.h
new file mode 100644
index 0000000000..b620e142da
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/stat.h
@@ -0,0 +1,20 @@
+struct stat {
+	dev_t st_dev;
+	int __pad1[3];
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	unsigned int __pad2[2];
+	off_t st_size;
+	int __pad3;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+	blksize_t st_blksize;
+	unsigned int __pad4;
+	blkcnt_t st_blocks;
+	int __pad5[14];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/statfs.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/statfs.h
new file mode 100644
index 0000000000..a73bd547cd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/statfs.h
@@ -0,0 +1,8 @@
+struct statfs {
+	unsigned long f_type, f_bsize, f_frsize;
+	fsblkcnt_t f_blocks, f_bfree;
+	fsfilcnt_t f_files, f_ffree;
+	fsblkcnt_t f_bavail;
+	fsid_t f_fsid;
+	unsigned long f_namelen, f_flags, f_spare[5];
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/mips64/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/syscall.h.in
new file mode 100644
index 0000000000..9b406e9a4d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/syscall.h.in
@@ -0,0 +1,341 @@
+#define __NR_read			5000
+#define __NR_write			5001
+#define __NR_open			5002
+#define __NR_close			5003
+#define __NR_stat			5004
+#define __NR_fstat			5005
+#define __NR_lstat			5006
+#define __NR_poll			5007
+#define __NR_lseek			5008
+#define __NR_mmap			5009
+#define __NR_mprotect			5010
+#define __NR_munmap			5011
+#define __NR_brk			5012
+#define __NR_rt_sigaction		5013
+#define __NR_rt_sigprocmask		5014
+#define __NR_ioctl			5015
+#define __NR_pread64			5016
+#define __NR_pwrite64			5017
+#define __NR_readv			5018
+#define __NR_writev			5019
+#define __NR_access			5020
+#define __NR_pipe			5021
+#define __NR__newselect			5022
+#define __NR_sched_yield		5023
+#define __NR_mremap			5024
+#define __NR_msync			5025
+#define __NR_mincore			5026
+#define __NR_madvise			5027
+#define __NR_shmget			5028
+#define __NR_shmat			5029
+#define __NR_shmctl			5030
+#define __NR_dup			5031
+#define __NR_dup2			5032
+#define __NR_pause			5033
+#define __NR_nanosleep			5034
+#define __NR_getitimer			5035
+#define __NR_setitimer			5036
+#define __NR_alarm			5037
+#define __NR_getpid			5038
+#define __NR_sendfile			5039
+#define __NR_socket			5040
+#define __NR_connect			5041
+#define __NR_accept			5042
+#define __NR_sendto			5043
+#define __NR_recvfrom			5044
+#define __NR_sendmsg			5045
+#define __NR_recvmsg			5046
+#define __NR_shutdown			5047
+#define __NR_bind			5048
+#define __NR_listen			5049
+#define __NR_getsockname		5050
+#define __NR_getpeername		5051
+#define __NR_socketpair			5052
+#define __NR_setsockopt			5053
+#define __NR_getsockopt			5054
+#define __NR_clone			5055
+#define __NR_fork			5056
+#define __NR_execve			5057
+#define __NR_exit			5058
+#define __NR_wait4			5059
+#define __NR_kill			5060
+#define __NR_uname			5061
+#define __NR_semget			5062
+#define __NR_semop			5063
+#define __NR_semctl			5064
+#define __NR_shmdt			5065
+#define __NR_msgget			5066
+#define __NR_msgsnd			5067
+#define __NR_msgrcv			5068
+#define __NR_msgctl			5069
+#define __NR_fcntl			5070
+#define __NR_flock			5071
+#define __NR_fsync			5072
+#define __NR_fdatasync			5073
+#define __NR_truncate			5074
+#define __NR_ftruncate			5075
+#define __NR_getdents			5076
+#define __NR_getcwd			5077
+#define __NR_chdir			5078
+#define __NR_fchdir			5079
+#define __NR_rename			5080
+#define __NR_mkdir			5081
+#define __NR_rmdir			5082
+#define __NR_creat			5083
+#define __NR_link			5084
+#define __NR_unlink			5085
+#define __NR_symlink			5086
+#define __NR_readlink			5087
+#define __NR_chmod			5088
+#define __NR_fchmod			5089
+#define __NR_chown			5090
+#define __NR_fchown			5091
+#define __NR_lchown			5092
+#define __NR_umask			5093
+#define __NR_gettimeofday		5094
+#define __NR_getrlimit			5095
+#define __NR_getrusage			5096
+#define __NR_sysinfo			5097
+#define __NR_times			5098
+#define __NR_ptrace			5099
+#define __NR_getuid			5100
+#define __NR_syslog			5101
+#define __NR_getgid			5102
+#define __NR_setuid			5103
+#define __NR_setgid			5104
+#define __NR_geteuid			5105
+#define __NR_getegid			5106
+#define __NR_setpgid			5107
+#define __NR_getppid			5108
+#define __NR_getpgrp			5109
+#define __NR_setsid			5110
+#define __NR_setreuid			5111
+#define __NR_setregid			5112
+#define __NR_getgroups			5113
+#define __NR_setgroups			5114
+#define __NR_setresuid			5115
+#define __NR_getresuid			5116
+#define __NR_setresgid			5117
+#define __NR_getresgid			5118
+#define __NR_getpgid			5119
+#define __NR_setfsuid			5120
+#define __NR_setfsgid			5121
+#define __NR_getsid			5122
+#define __NR_capget			5123
+#define __NR_capset			5124
+#define __NR_rt_sigpending		5125
+#define __NR_rt_sigtimedwait		5126
+#define __NR_rt_sigqueueinfo		5127
+#define __NR_rt_sigsuspend		5128
+#define __NR_sigaltstack		5129
+#define __NR_utime			5130
+#define __NR_mknod			5131
+#define __NR_personality		5132
+#define __NR_ustat			5133
+#define __NR_statfs			5134
+#define __NR_fstatfs			5135
+#define __NR_sysfs			5136
+#define __NR_getpriority		5137
+#define __NR_setpriority		5138
+#define __NR_sched_setparam		5139
+#define __NR_sched_getparam		5140
+#define __NR_sched_setscheduler		5141
+#define __NR_sched_getscheduler		5142
+#define __NR_sched_get_priority_max	5143
+#define __NR_sched_get_priority_min	5144
+#define __NR_sched_rr_get_interval	5145
+#define __NR_mlock			5146
+#define __NR_munlock			5147
+#define __NR_mlockall			5148
+#define __NR_munlockall			5149
+#define __NR_vhangup			5150
+#define __NR_pivot_root			5151
+#define __NR__sysctl			5152
+#define __NR_prctl			5153
+#define __NR_adjtimex			5154
+#define __NR_setrlimit			5155
+#define __NR_chroot			5156
+#define __NR_sync			5157
+#define __NR_acct			5158
+#define __NR_settimeofday		5159
+#define __NR_mount			5160
+#define __NR_umount2			5161
+#define __NR_swapon			5162
+#define __NR_swapoff			5163
+#define __NR_reboot			5164
+#define __NR_sethostname		5165
+#define __NR_setdomainname		5166
+#define __NR_create_module		5167
+#define __NR_init_module		5168
+#define __NR_delete_module		5169
+#define __NR_get_kernel_syms		5170
+#define __NR_query_module		5171
+#define __NR_quotactl			5172
+#define __NR_nfsservctl			5173
+#define __NR_getpmsg			5174
+#define __NR_putpmsg			5175
+#define __NR_afs_syscall		5176
+#define __NR_reserved177		5177
+#define __NR_gettid			5178
+#define __NR_readahead			5179
+#define __NR_setxattr			5180
+#define __NR_lsetxattr			5181
+#define __NR_fsetxattr			5182
+#define __NR_getxattr			5183
+#define __NR_lgetxattr			5184
+#define __NR_fgetxattr			5185
+#define __NR_listxattr			5186
+#define __NR_llistxattr			5187
+#define __NR_flistxattr			5188
+#define __NR_removexattr		5189
+#define __NR_lremovexattr		5190
+#define __NR_fremovexattr		5191
+#define __NR_tkill			5192
+#define __NR_reserved193		5193
+#define __NR_futex			5194
+#define __NR_sched_setaffinity		5195
+#define __NR_sched_getaffinity		5196
+#define __NR_cacheflush			5197
+#define __NR_cachectl			5198
+#define __NR_sysmips			5199
+#define __NR_io_setup			5200
+#define __NR_io_destroy			5201
+#define __NR_io_getevents		5202
+#define __NR_io_submit			5203
+#define __NR_io_cancel			5204
+#define __NR_exit_group			5205
+#define __NR_lookup_dcookie		5206
+#define __NR_epoll_create		5207
+#define __NR_epoll_ctl			5208
+#define __NR_epoll_wait			5209
+#define __NR_remap_file_pages		5210
+#define __NR_rt_sigreturn		5211
+#define __NR_set_tid_address		5212
+#define __NR_restart_syscall		5213
+#define __NR_semtimedop			5214
+#define __NR_fadvise64			5215
+#define __NR_timer_create		5216
+#define __NR_timer_settime		5217
+#define __NR_timer_gettime		5218
+#define __NR_timer_getoverrun		5219
+#define __NR_timer_delete		5220
+#define __NR_clock_settime		5221
+#define __NR_clock_gettime		5222
+#define __NR_clock_getres		5223
+#define __NR_clock_nanosleep		5224
+#define __NR_tgkill			5225
+#define __NR_utimes			5226
+#define __NR_mbind			5227
+#define __NR_get_mempolicy		5228
+#define __NR_set_mempolicy		5229
+#define __NR_mq_open			5230
+#define __NR_mq_unlink			5231
+#define __NR_mq_timedsend		5232
+#define __NR_mq_timedreceive		5233
+#define __NR_mq_notify			5234
+#define __NR_mq_getsetattr		5235
+#define __NR_vserver			5236
+#define __NR_waitid			5237
+#define __NR_add_key			5239
+#define __NR_request_key		5240
+#define __NR_keyctl			5241
+#define __NR_set_thread_area		5242
+#define __NR_inotify_init		5243
+#define __NR_inotify_add_watch		5244
+#define __NR_inotify_rm_watch		5245
+#define __NR_migrate_pages		5246
+#define __NR_openat			5247
+#define __NR_mkdirat			5248
+#define __NR_mknodat			5249
+#define __NR_fchownat			5250
+#define __NR_futimesat			5251
+#define __NR_newfstatat			5252
+#define __NR_unlinkat			5253
+#define __NR_renameat			5254
+#define __NR_linkat			5255
+#define __NR_symlinkat			5256
+#define __NR_readlinkat			5257
+#define __NR_fchmodat			5258
+#define __NR_faccessat			5259
+#define __NR_pselect6			5260
+#define __NR_ppoll			5261
+#define __NR_unshare			5262
+#define __NR_splice			5263
+#define __NR_sync_file_range		5264
+#define __NR_tee			5265
+#define __NR_vmsplice			5266
+#define __NR_move_pages			5267
+#define __NR_set_robust_list		5268
+#define __NR_get_robust_list		5269
+#define __NR_kexec_load			5270
+#define __NR_getcpu			5271
+#define __NR_epoll_pwait		5272
+#define __NR_ioprio_set			5273
+#define __NR_ioprio_get			5274
+#define __NR_utimensat			5275
+#define __NR_signalfd			5276
+#define __NR_timerfd			5277
+#define __NR_eventfd			5278
+#define __NR_fallocate			5279
+#define __NR_timerfd_create		5280
+#define __NR_timerfd_gettime		5281
+#define __NR_timerfd_settime		5282
+#define __NR_signalfd4			5283
+#define __NR_eventfd2			5284
+#define __NR_epoll_create1		5285
+#define __NR_dup3			5286
+#define __NR_pipe2			5287
+#define __NR_inotify_init1		5288
+#define __NR_preadv			5289
+#define __NR_pwritev			5290
+#define __NR_rt_tgsigqueueinfo		5291
+#define __NR_perf_event_open		5292
+#define __NR_accept4			5293
+#define __NR_recvmmsg			5294
+#define __NR_fanotify_init		5295
+#define __NR_fanotify_mark		5296
+#define __NR_prlimit64			5297
+#define __NR_name_to_handle_at		5298
+#define __NR_open_by_handle_at		5299
+#define __NR_clock_adjtime		5300
+#define __NR_syncfs			5301
+#define __NR_sendmmsg			5302
+#define __NR_setns			5303
+#define __NR_process_vm_readv		5304
+#define __NR_process_vm_writev		5305
+#define __NR_kcmp			5306
+#define __NR_finit_module		5307
+#define __NR_getdents64			5308
+#define __NR_sched_setattr		5309
+#define __NR_sched_getattr		5310
+#define __NR_renameat2			5311
+#define __NR_seccomp			5312
+#define __NR_getrandom			5313
+#define __NR_memfd_create		5314
+#define __NR_bpf			5315
+#define __NR_execveat			5316
+#define __NR_userfaultfd		5317
+#define __NR_membarrier			5318
+#define __NR_mlock2			5319
+#define __NR_copy_file_range		5320
+#define __NR_preadv2			5321
+#define __NR_pwritev2			5322
+#define __NR_pkey_mprotect		5323
+#define __NR_pkey_alloc			5324
+#define __NR_pkey_free			5325
+#define __NR_statx			5326
+#define __NR_rseq			5327
+#define __NR_io_pgetevents		5328
+#define __NR_pidfd_send_signal		5424
+#define __NR_io_uring_setup		5425
+#define __NR_io_uring_enter		5426
+#define __NR_io_uring_register		5427
+#define __NR_open_tree		5428
+#define __NR_move_mount		5429
+#define __NR_fsopen		5430
+#define __NR_fsconfig		5431
+#define __NR_fsmount		5432
+#define __NR_fspick		5433
+#define __NR_pidfd_open		5434
+#define __NR_clone3		5435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/termios.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/termios.h
new file mode 100644
index 0000000000..9d571f78f6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/termios.h
@@ -0,0 +1,169 @@
+struct termios {
+	tcflag_t c_iflag;
+	tcflag_t c_oflag;
+	tcflag_t c_cflag;
+	tcflag_t c_lflag;
+	cc_t c_line;
+	cc_t c_cc[NCCS];
+	speed_t __c_ispeed;
+	speed_t __c_ospeed;
+};
+
+#define VINTR     0
+#define VQUIT     1
+#define VERASE    2
+#define VKILL     3
+#define VMIN      4
+#define VTIME     5
+#define VEOL2     6
+#define VSWTC     7
+#define VSWTCH    7
+#define VSTART    8
+#define VSTOP     9
+#define VSUSP    10
+#define VREPRINT 12
+#define VDISCARD 13
+#define VWERASE  14
+#define VLNEXT   15
+#define VEOF     16
+#define VEOL     17
+
+#define IGNBRK  0000001
+#define BRKINT  0000002
+#define IGNPAR  0000004
+#define PARMRK  0000010
+#define INPCK   0000020
+#define ISTRIP  0000040
+#define INLCR   0000100
+#define IGNCR   0000200
+#define ICRNL   0000400
+#define IUCLC   0001000
+#define IXON    0002000
+#define IXANY   0004000
+#define IXOFF   0010000
+#define IMAXBEL 0020000
+#define IUTF8   0040000
+
+#define OPOST  0000001
+#define OLCUC  0000002
+#define ONLCR  0000004
+#define OCRNL  0000010
+#define ONOCR  0000020
+#define ONLRET 0000040
+#define OFILL  0000100
+#define OFDEL  0000200
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE)
+#define NLDLY  0000400
+#define NL0    0000000
+#define NL1    0000400
+#define CRDLY  0003000
+#define CR0    0000000
+#define CR1    0001000
+#define CR2    0002000
+#define CR3    0003000
+#define TABDLY 0014000
+#define TAB0   0000000
+#define TAB1   0004000
+#define TAB2   0010000
+#define TAB3   0014000
+#define BSDLY  0020000
+#define BS0    0000000
+#define BS1    0020000
+#define FFDLY  0100000
+#define FF0    0000000
+#define FF1    0100000
+#endif
+
+#define VTDLY  0040000
+#define VT0    0000000
+#define VT1    0040000
+
+#define B0       0000000
+#define B50      0000001
+#define B75      0000002
+#define B110     0000003
+#define B134     0000004
+#define B150     0000005
+#define B200     0000006
+#define B300     0000007
+#define B600     0000010
+#define B1200    0000011
+#define B1800    0000012
+#define B2400    0000013
+#define B4800    0000014
+#define B9600    0000015
+#define B19200   0000016
+#define B38400   0000017
+
+#define B57600   0010001
+#define B115200  0010002
+#define B230400  0010003
+#define B460800  0010004
+#define B500000  0010005
+#define B576000  0010006
+#define B921600  0010007
+#define B1000000 0010010
+#define B1152000 0010011
+#define B1500000 0010012
+#define B2000000 0010013
+#define B2500000 0010014
+#define B3000000 0010015
+#define B3500000 0010016
+#define B4000000 0010017
+
+#define CSIZE  0000060
+#define CS5    0000000
+#define CS6    0000020
+#define CS7    0000040
+#define CS8    0000060
+#define CSTOPB 0000100
+#define CREAD  0000200
+#define PARENB 0000400
+#define PARODD 0001000
+#define HUPCL  0002000
+#define CLOCAL 0004000
+
+#define ISIG   0000001
+#define ICANON 0000002
+#define ECHO   0000010
+#define ECHOE  0000020
+#define ECHOK  0000040
+#define ECHONL 0000100
+#define NOFLSH 0000200
+#define IEXTEN 0000400
+#define TOSTOP 0100000
+#define ITOSTOP 0100000
+
+#define TCOOFF 0
+#define TCOON  1
+#define TCIOFF 2
+#define TCION  3
+
+#define TCIFLUSH  0
+#define TCOFLUSH  1
+#define TCIOFLUSH 2
+
+#define TCSANOW   0
+#define TCSADRAIN 1
+#define TCSAFLUSH 2
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA    0000016
+#define EXTB    0000017
+#define CBAUD   0010017
+#define CBAUDEX 0010000
+#define CIBAUD  002003600000
+#define CMSPAR  010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE   0000004
+#define ECHOCTL 0001000
+#define ECHOPRT 0002000
+#define ECHOKE  0004000
+#define FLUSHO  0020000
+#define PENDIN  0040000
+#define EXTPROC 0200000
+
+#define XTABS  0014000
+#define TIOCSER_TEMT 1
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/user.h
new file mode 100644
index 0000000000..60fa1fda93
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/bits/user.h
@@ -0,0 +1,15 @@
+struct user {
+	unsigned long regs[102];
+	unsigned long u_tsize, u_dsize, u_ssize;
+	unsigned long long start_code, start_data, start_stack;
+	long long signal;
+	unsigned long long *u_ar0;
+	unsigned long long magic;
+	char u_comm[32];
+};
+
+#define ELF_NGREG 45
+#define ELF_NFPREG 33
+
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+typedef double elf_fpreg_t, elf_fpregset_t[ELF_NFPREG];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/crt_arch.h
new file mode 100644
index 0000000000..d148f97736
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/crt_arch.h
@@ -0,0 +1,33 @@
+__asm__(
+".set push\n"
+".set noreorder\n"
+".text \n"
+".global _" START "\n"
+".global " START "\n"
+".global " START "_data\n"
+".type   _" START ", @function\n"
+".type   " START ", @function\n"
+".type   " START "_data, @function\n"
+"_" START ":\n"
+"" START ":\n"
+".align 8 \n"
+"	bal 1f \n"
+"	 move $fp, $0 \n"
+"" START "_data: \n"
+"	.gpdword " START "_data \n"
+"	.gpdword " START "_c \n"
+".weak _DYNAMIC \n"
+".hidden _DYNAMIC \n"
+"	.gpdword _DYNAMIC \n"
+"1:	ld $gp, 0($ra) \n"
+"	dsubu $gp, $ra, $gp \n"
+"	move $4, $sp \n"
+"	ld $5, 16($ra) \n"
+"	daddu $5, $5, $gp \n"
+"	ld $25, 8($ra) \n"
+"	daddu $25, $25, $gp \n"
+"	and $sp, $sp, -16 \n"
+"	jalr $25 \n"
+"	nop \n"
+".set pop \n"
+);
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/ksigaction.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/ksigaction.h
new file mode 100644
index 0000000000..c16e4731d8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/ksigaction.h
@@ -0,0 +1,10 @@
+#include <features.h>
+
+struct k_sigaction {
+	unsigned flags;
+	void (*handler)(int);
+	unsigned long mask[2];
+	void (*restorer)();
+};
+
+hidden void __restore(), __restore_rt();
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/kstat.h
new file mode 100644
index 0000000000..9a4468b4ff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	unsigned st_dev;
+	int __pad1[3];
+	ino_t st_ino;
+	mode_t st_mode;
+	unsigned st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	unsigned st_rdev;
+	int __pad2[3];
+	off_t st_size;
+	int st_atime_sec;
+	int st_atime_nsec;
+	int st_mtime_sec;
+	int st_mtime_nsec;
+	int st_ctime_sec;
+	int st_ctime_nsec;
+	unsigned st_blksize;
+	unsigned __pad3;
+	blkcnt_t st_blocks;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/pthread_arch.h
new file mode 100644
index 0000000000..1e7839ea67
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/pthread_arch.h
@@ -0,0 +1,19 @@
+static inline struct pthread *__pthread_self()
+{
+#if __mips_isa_rev < 2
+	register char *tp __asm__("$3");
+	__asm__ (".word 0x7c03e83b" : "=r" (tp) );
+#else
+	char *tp;
+	__asm__ ("rdhwr %0, $29" : "=r" (tp) );
+#endif
+	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
+
+#define DTP_OFFSET 0x8000
+
+#define MC_PC pc
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/reloc.h
new file mode 100644
index 0000000000..fdb5edc9ca
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/reloc.h
@@ -0,0 +1,60 @@
+#if __mips_isa_rev >= 6
+#define ISA_SUFFIX "r6"
+#else
+#define ISA_SUFFIX ""
+#endif
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define ENDIAN_SUFFIX "el"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#ifdef __mips_soft_float
+#define FP_SUFFIX "-sf"
+#else
+#define FP_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "mips64" ISA_SUFFIX ENDIAN_SUFFIX FP_SUFFIX
+
+#define TPOFF_K (-0x7000)
+
+#define REL_SYM_OR_REL  4611
+#define REL_PLT         R_MIPS_JUMP_SLOT
+#define REL_COPY        R_MIPS_COPY
+#define REL_DTPMOD      R_MIPS_TLS_DTPMOD64
+#define REL_DTPOFF      R_MIPS_TLS_DTPREL64
+#define REL_TPOFF       R_MIPS_TLS_TPREL64
+
+#include <endian.h>
+
+#undef R_TYPE
+#undef R_SYM
+#undef R_INFO
+#define R_TYPE(x) (be64toh(x)&0x7fffffff)
+#define R_SYM(x) (be32toh(be64toh(x)>>32))
+#define R_INFO(s,t) (htobe64((uint64_t)htobe32(s)<<32 | (uint64_t)t))
+
+#define NEED_MIPS_GOT_RELOCS 1
+#define DT_DEBUG_INDIRECT DT_MIPS_RLD_MAP
+#define ARCH_SYM_REJECT_UND(s) (!((s)->st_other & STO_MIPS_PLT))
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"move $sp,%1 ; jr %0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	".set push \n" \
+	".set noreorder \n" \
+	".align 8 \n" \
+	"	bal 1f \n" \
+	"	 nop \n" \
+	"	.gpdword . \n" \
+	"	.gpdword " #sym " \n" \
+	"1:	ld %0, ($ra) \n" \
+	"	dsubu %0, $ra, %0 \n" \
+	"	ld $ra, 8($ra) \n" \
+	"	daddu %0, %0, $ra \n" \
+	".set pop \n" \
+	: "=r"(*(fp)) : : "memory", "ra" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mips64/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mips64/syscall_arch.h
new file mode 100644
index 0000000000..69c429b865
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mips64/syscall_arch.h
@@ -0,0 +1,128 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+
+#define SYSCALL_RLIM_INFINITY (-1UL/2)
+
+#if __mips_isa_rev >= 6
+#define SYSCALL_CLOBBERLIST \
+	"$1", "$3", "$10", "$11", "$12", "$13", \
+	"$14", "$15", "$24", "$25", "memory"
+#else
+#define SYSCALL_CLOBBERLIST \
+	"$1", "$3", "$10", "$11", "$12", "$13", \
+	"$14", "$15", "$24", "$25", "hi", "lo", "memory"
+#endif
+
+static inline long __syscall0(long n)
+{
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		:
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long r4 __asm__("$4") = a;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		: "r"(r4)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		: "r"(r4), "r"(r5)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r2 __asm__("$2") = n;
+
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "+r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r8 __asm__("$8") = e;
+	register long r2 __asm__("$2") = n;
+
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "+r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6), "r"(r8)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r8 __asm__("$8") = e;
+	register long r9 __asm__("$9") = f;
+	register long r2 __asm__("$2") = n;
+
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "+r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+#define VDSO_USEFUL
+#define VDSO_CGT_SYM "__vdso_clock_gettime"
+#define VDSO_CGT_VER "LINUX_2.6"
+
+#define SO_SNDTIMEO_OLD 0x1005
+#define SO_RCVTIMEO_OLD 0x1006
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/atomic_arch.h
new file mode 100644
index 0000000000..ccc3878cc5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/atomic_arch.h
@@ -0,0 +1,52 @@
+#if __mips_isa_rev < 6
+#define LLSC_M "m"
+#else
+#define LLSC_M "ZC"
+#endif
+
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+#if __mips < 2
+	__asm__ __volatile__ (
+		".set push ; .set mips2\n\t"
+		"ll %0, %1"
+		"\n\t.set pop"
+		: "=r"(v) : "m"(*p));
+#else
+	__asm__ __volatile__ (
+		"ll %0, %1"
+		: "=r"(v) : LLSC_M(*p));
+#endif
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+#if __mips < 2
+	__asm__ __volatile__ (
+		".set push ; .set mips2\n\t"
+		"sc %0, %1"
+		"\n\t.set pop"
+		: "=r"(r), "=m"(*p) : "0"(v) : "memory");
+#else
+	__asm__ __volatile__ (
+		"sc %0, %1"
+		: "=r"(r), "="LLSC_M(*p) : "0"(v) : "memory");
+#endif
+	return r;
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("sync" : : : "memory");
+}
+
+#define a_pre_llsc a_barrier
+#define a_post_llsc a_barrier
+
+#undef LLSC_M
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/alltypes.h.in
new file mode 100644
index 0000000000..ff934a4c42
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/alltypes.h.in
@@ -0,0 +1,21 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#if _MIPSEL || __MIPSEL || __MIPSEL__
+#define __BYTE_ORDER 1234
+#else
+#define __BYTE_ORDER 4321
+#endif
+
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/errno.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/errno.h
new file mode 100644
index 0000000000..1bb91e3d77
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/errno.h
@@ -0,0 +1,134 @@
+#define EPERM            1
+#define ENOENT           2
+#define ESRCH            3
+#define EINTR            4
+#define EIO              5
+#define ENXIO            6
+#define E2BIG            7
+#define ENOEXEC          8
+#define EBADF            9
+#define ECHILD          10
+#define EAGAIN          11
+#define ENOMEM          12
+#define EACCES          13
+#define EFAULT          14
+#define ENOTBLK         15
+#define EBUSY           16
+#define EEXIST          17
+#define EXDEV           18
+#define ENODEV          19
+#define ENOTDIR         20
+#define EISDIR          21
+#define EINVAL          22
+#define ENFILE          23
+#define EMFILE          24
+#define ENOTTY          25
+#define ETXTBSY         26
+#define EFBIG           27
+#define ENOSPC          28
+#define ESPIPE          29
+#define EROFS           30
+#define EMLINK          31
+#define EPIPE           32
+#define EDOM            33
+#define ERANGE          34
+#define ENOMSG          35
+#define EIDRM           36
+#define ECHRNG          37
+#define EL2NSYNC        38
+#define EL3HLT          39
+#define EL3RST          40
+#define ELNRNG          41
+#define EUNATCH         42
+#define ENOCSI          43
+#define EL2HLT          44
+#define EDEADLK         45
+#define ENOLCK          46
+#define EBADE           50
+#define EBADR           51
+#define EXFULL          52
+#define ENOANO          53
+#define EBADRQC         54
+#define EBADSLT         55
+#define EDEADLOCK       56
+#define EBFONT          59
+#define ENOSTR          60
+#define ENODATA         61
+#define ETIME           62
+#define ENOSR           63
+#define ENONET          64
+#define ENOPKG          65
+#define EREMOTE         66
+#define ENOLINK         67
+#define EADV            68
+#define ESRMNT          69
+#define ECOMM           70
+#define EPROTO          71
+#define EDOTDOT         73
+#define EMULTIHOP       74
+#define EBADMSG         77
+#define ENAMETOOLONG    78
+#define EOVERFLOW       79
+#define ENOTUNIQ        80
+#define EBADFD          81
+#define EREMCHG         82
+#define ELIBACC         83
+#define ELIBBAD         84
+#define ELIBSCN         85
+#define ELIBMAX         86
+#define ELIBEXEC        87
+#define EILSEQ          88
+#define ENOSYS          89
+#define ELOOP           90
+#define ERESTART        91
+#define ESTRPIPE        92
+#define ENOTEMPTY       93
+#define EUSERS          94
+#define ENOTSOCK        95
+#define EDESTADDRREQ    96
+#define EMSGSIZE        97
+#define EPROTOTYPE      98
+#define ENOPROTOOPT     99
+#define EPROTONOSUPPORT 120
+#define ESOCKTNOSUPPORT 121
+#define EOPNOTSUPP      122
+#define ENOTSUP         EOPNOTSUPP
+#define EPFNOSUPPORT    123
+#define EAFNOSUPPORT    124
+#define EADDRINUSE      125
+#define EADDRNOTAVAIL   126
+#define ENETDOWN        127
+#define ENETUNREACH     128
+#define ENETRESET       129
+#define ECONNABORTED    130
+#define ECONNRESET      131
+#define ENOBUFS         132
+#define EISCONN         133
+#define ENOTCONN        134
+#define EUCLEAN         135
+#define ENOTNAM         137
+#define ENAVAIL         138
+#define EISNAM          139
+#define EREMOTEIO       140
+#define ESHUTDOWN       143
+#define ETOOMANYREFS    144
+#define ETIMEDOUT       145
+#define ECONNREFUSED    146
+#define EHOSTDOWN       147
+#define EHOSTUNREACH    148
+#define EWOULDBLOCK     EAGAIN
+#define EALREADY        149
+#define EINPROGRESS     150
+#define ESTALE          151
+#define ECANCELED       158
+#define ENOMEDIUM       159
+#define EMEDIUMTYPE     160
+#define ENOKEY          161
+#define EKEYEXPIRED     162
+#define EKEYREVOKED     163
+#define EKEYREJECTED    164
+#define EOWNERDEAD      165
+#define ENOTRECOVERABLE 166
+#define ERFKILL         167
+#define EHWPOISON       168
+#define EDQUOT          1133
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/fcntl.h
new file mode 100644
index 0000000000..9fd8c23e27
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/fcntl.h
@@ -0,0 +1,40 @@
+#define O_CREAT        0400
+#define O_EXCL        02000
+#define O_NOCTTY      04000
+#define O_TRUNC       01000
+#define O_APPEND       0010
+#define O_NONBLOCK     0200
+#define O_DSYNC        0020
+#define O_SYNC       040020
+#define O_RSYNC      040020
+#define O_DIRECTORY 0200000
+#define O_NOFOLLOW  0400000
+#define O_CLOEXEC  02000000
+
+#define O_ASYNC      010000
+#define O_DIRECT    0100000
+#define O_LARGEFILE  020000
+#define O_NOATIME  01000000
+#define O_PATH    010000000
+#define O_TMPFILE 020200000
+#define O_NDELAY O_NONBLOCK
+
+#define F_DUPFD  0
+#define F_GETFD  1
+#define F_SETFD  2
+#define F_GETFL  3
+#define F_SETFL  4
+
+#define F_SETOWN 24
+#define F_GETOWN 23
+#define F_SETSIG 10
+#define F_GETSIG 11
+
+#define F_GETLK 33
+#define F_SETLK 34
+#define F_SETLKW 35
+
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
+
+#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/fenv.h
new file mode 100644
index 0000000000..589e71c1bf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/fenv.h
@@ -0,0 +1,25 @@
+#ifdef __mips_soft_float
+#define FE_ALL_EXCEPT 0
+#define FE_TONEAREST  0
+#else
+#define FE_INEXACT    4
+#define FE_UNDERFLOW  8
+#define FE_OVERFLOW   16
+#define FE_DIVBYZERO  32
+#define FE_INVALID    64
+
+#define FE_ALL_EXCEPT 124
+
+#define FE_TONEAREST  0
+#define FE_TOWARDZERO 1
+#define FE_UPWARD     2
+#define FE_DOWNWARD   3
+#endif
+
+typedef unsigned short fexcept_t;
+
+typedef struct {
+	unsigned __cw;
+} fenv_t;
+
+#define FE_DFL_ENV      ((const fenv_t *) -1)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/float.h
new file mode 100644
index 0000000000..719c79085a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/float.h
@@ -0,0 +1,16 @@
+#define FLT_EVAL_METHOD 0
+
+#define LDBL_TRUE_MIN 6.47517511943802511092443895822764655e-4966L
+#define LDBL_MIN 3.36210314311209350626267781732175260e-4932L
+#define LDBL_MAX 1.18973149535723176508575932662800702e+4932L
+#define LDBL_EPSILON 1.92592994438723585305597794258492732e-34L
+
+#define LDBL_MANT_DIG 113
+#define LDBL_MIN_EXP (-16381)
+#define LDBL_MAX_EXP 16384
+
+#define LDBL_DIG 33
+#define LDBL_MIN_10_EXP (-4931)
+#define LDBL_MAX_10_EXP 4932
+
+#define DECIMAL_DIG 36
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/hwcap.h
new file mode 100644
index 0000000000..13e86fe702
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/hwcap.h
@@ -0,0 +1,3 @@
+#define HWCAP_MIPS_R6		(1 << 0)
+#define HWCAP_MIPS_MSA		(1 << 1)
+#define HWCAP_MIPS_CRC32	(1 << 2)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ioctl.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ioctl.h
new file mode 100644
index 0000000000..e20bf19eaa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ioctl.h
@@ -0,0 +1,114 @@
+#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  1U
+#define _IOC_READ  2U
+#define _IOC_WRITE 4U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+
+#define TCGETA		0x5401
+#define TCSETA		0x5402
+#define TCSETAW		0x5403
+#define TCSETAF		0x5404
+#define TCSBRK		0x5405
+#define TCXONC		0x5406
+#define TCFLSH		0x5407
+#define TCGETS		0x540D
+#define TCSETS		0x540E
+#define TCSETSW		0x540F
+#define TCSETSF		0x5410
+
+#define TIOCEXCL	0x740D
+#define TIOCNXCL	0x740E
+#define TIOCOUTQ	0x7472
+#define TIOCSTI		0x5472
+#define TIOCMGET	0x741D
+#define TIOCMBIS	0x741B
+#define TIOCMBIC	0x741C
+#define TIOCMSET	0x741A
+
+#define TIOCPKT		0x5470
+#define TIOCSWINSZ	_IOW('t', 103, struct winsize)
+#define TIOCGWINSZ	_IOR('t', 104, struct winsize)
+#define TIOCNOTTY	0x5471
+#define TIOCSETD	0x7401
+#define TIOCGETD	0x7400
+
+#define FIOCLEX		0x6601
+#define FIONCLEX	0x6602
+#define FIOASYNC	0x667D
+#define FIONBIO		0x667E
+#define FIOQSIZE	0x667F
+
+#define TIOCGLTC        0x7474
+#define TIOCSLTC        0x7475
+#define TIOCSPGRP	_IOW('t', 118, int)
+#define TIOCGPGRP	_IOR('t', 119, int)
+#define TIOCCONS	_IOW('t', 120, int)
+
+#define FIONREAD	0x467F
+#define TIOCINQ		FIONREAD
+
+#define TIOCGETP        0x7408
+#define TIOCSETP        0x7409
+#define TIOCSETN        0x740A
+
+#define TIOCSBRK	0x5427
+#define TIOCCBRK	0x5428
+#define TIOCGSID	0x7416
+#define TIOCGRS485	_IOR('T', 0x2E, char[32])
+#define TIOCSRS485	_IOWR('T', 0x2F, char[32])
+#define TIOCGPTN	_IOR('T', 0x30, unsigned int)
+#define TIOCSPTLCK	_IOW('T', 0x31, int)
+#define TIOCGDEV	_IOR('T', 0x32, unsigned int)
+#define TIOCSIG		_IOW('T', 0x36, int)
+#define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int)
+#define TIOCGPTLCK	_IOR('T', 0x39, int)
+#define TIOCGEXCL	_IOR('T', 0x40, int)
+#define TIOCGPTPEER	_IO('T', 0x41)
+
+#define TIOCSCTTY	0x5480
+#define TIOCGSOFTCAR	0x5481
+#define TIOCSSOFTCAR	0x5482
+#define TIOCLINUX	0x5483
+#define TIOCGSERIAL	0x5484
+#define TIOCSSERIAL	0x5485
+#define TCSBRKP		0x5486
+
+#define TIOCSERCONFIG	0x5488
+#define TIOCSERGWILD	0x5489
+#define TIOCSERSWILD	0x548A
+#define TIOCGLCKTRMIOS	0x548B
+#define TIOCSLCKTRMIOS	0x548C
+#define TIOCSERGSTRUCT	0x548D
+#define TIOCSERGETLSR   0x548E
+#define TIOCSERGETMULTI 0x548F
+#define TIOCSERSETMULTI 0x5490
+#define TIOCMIWAIT	0x5491
+#define TIOCGICOUNT	0x5492
+
+#define TIOCM_LE	0x001
+#define TIOCM_DTR	0x002
+#define TIOCM_RTS	0x004
+#define TIOCM_ST	0x010
+#define TIOCM_SR	0x020
+#define TIOCM_CTS	0x040
+#define TIOCM_CAR	0x100
+#define TIOCM_CD	TIOCM_CAR
+#define TIOCM_RNG	0x200
+#define TIOCM_RI	TIOCM_RNG
+#define TIOCM_DSR	0x400
+#define TIOCM_OUT1	0x2000
+#define TIOCM_OUT2	0x4000
+#define TIOCM_LOOP	0x8000
+
+#define FIOGETOWN       _IOR('f', 123, int)
+#define FIOSETOWN       _IOW('f', 124, int)
+#define SIOCATMARK      _IOR('s', 7, int)
+#define SIOCSPGRP       _IOW('s', 8, pid_t)
+#define SIOCGPGRP       _IOR('s', 9, pid_t)
+#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
+#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/mman.h
new file mode 100644
index 0000000000..9027bb6376
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/mman.h
@@ -0,0 +1,25 @@
+#undef MAP_ANON
+#define MAP_ANON       0x800
+#undef MAP_NORESERVE
+#define MAP_NORESERVE  0x0400
+#undef MAP_GROWSDOWN
+#define MAP_GROWSDOWN  0x1000
+#undef MAP_DENYWRITE
+#define MAP_DENYWRITE  0x2000
+#undef MAP_EXECUTABLE
+#define MAP_EXECUTABLE 0x4000
+#undef MAP_LOCKED
+#define MAP_LOCKED     0x8000
+#undef MAP_POPULATE
+#define MAP_POPULATE   0x10000
+#undef MAP_NONBLOCK
+#define MAP_NONBLOCK   0x20000
+#undef MAP_STACK
+#define MAP_STACK      0x40000
+#undef MAP_HUGETLB
+#define MAP_HUGETLB    0x80000
+#undef MAP_SYNC
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#undef MADV_SOFT_OFFLINE
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/msg.h
new file mode 100644
index 0000000000..c734dbb570
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/msg.h
@@ -0,0 +1,27 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+#if _MIPSEL || __MIPSEL || __MIPSEL__
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+#else
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long __msg_ctime_lo;
+#endif
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/poll.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/poll.h
new file mode 100644
index 0000000000..b0b1ed621e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/poll.h
@@ -0,0 +1,2 @@
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND 0x100
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ptrace.h
new file mode 100644
index 0000000000..77a01c064e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/ptrace.h
@@ -0,0 +1,9 @@
+#define PTRACE_GET_THREAD_AREA	25
+#define PTRACE_SET_THREAD_AREA	26
+#define PTRACE_PEEKTEXT_3264	0xc0
+#define PTRACE_PEEKDATA_3264	0xc1
+#define PTRACE_POKETEXT_3264	0xc2
+#define PTRACE_POKEDATA_3264	0xc3
+#define PTRACE_GET_THREAD_AREA_3264	0xc4
+#define PTRACE_GET_WATCH_REGS	0xd0
+#define PTRACE_SET_WATCH_REGS	0xd1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/reg.h
new file mode 100644
index 0000000000..a3f63accf7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/reg.h
@@ -0,0 +1,47 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
+
+#define EF_R0 0
+#define EF_R1 1
+#define EF_R2 2
+#define EF_R3 3
+#define EF_R4 4
+#define EF_R5 5
+#define EF_R6 6
+#define EF_R7 7
+#define EF_R8 8
+#define EF_R9 9
+#define EF_R10 10
+#define EF_R11 11
+#define EF_R12 12
+#define EF_R13 13
+#define EF_R14 14
+#define EF_R15 15
+#define EF_R16 16
+#define EF_R17 17
+#define EF_R18 18
+#define EF_R19 19
+#define EF_R20 20
+#define EF_R21 21
+#define EF_R22 22
+#define EF_R23 23
+#define EF_R24 24
+#define EF_R25 25
+
+#define EF_R26 26
+#define EF_R27 27
+#define EF_R28 28
+#define EF_R29 29
+#define EF_R30 30
+#define EF_R31 31
+
+#define EF_LO 32
+#define EF_HI 33
+
+#define EF_CP0_EPC 34
+#define EF_CP0_BADVADDR 35
+#define EF_CP0_STATUS 36
+#define EF_CP0_CAUSE 37
+#define EF_UNUSED0 38
+
+#define EF_SIZE 304
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/resource.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/resource.h
new file mode 100644
index 0000000000..414a405417
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/resource.h
@@ -0,0 +1,5 @@
+#define RLIMIT_NOFILE  5
+#define RLIMIT_AS      6
+#define RLIMIT_RSS     7
+#define RLIMIT_NPROC   8
+#define RLIMIT_MEMLOCK 9
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/sem.h
new file mode 100644
index 0000000000..fe6f094858
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/sem.h
@@ -0,0 +1,16 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_ctime_lo;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+#else
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+#endif
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_hi;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/setjmp.h
new file mode 100644
index 0000000000..4d93267e61
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/setjmp.h
@@ -0,0 +1 @@
+typedef unsigned long long __jmp_buf[23];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/shm.h
new file mode 100644
index 0000000000..ab8c642d82
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/shm.h
@@ -0,0 +1,29 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_ctime_lo;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned short __shm_atime_hi;
+	unsigned short __shm_dtime_hi;
+	unsigned short __shm_ctime_hi;
+	unsigned short __pad1;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/signal.h
new file mode 100644
index 0000000000..c31ad07ec5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/signal.h
@@ -0,0 +1,143 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef unsigned long long greg_t, gregset_t[32];
+
+typedef struct {
+	union {
+		double fp_dregs[32];
+		struct {
+			float _fp_fregs;
+			unsigned _fp_pad;
+		} fp_fregs[32];
+	} fp_r;
+} fpregset_t;
+
+struct sigcontext {
+	unsigned long long sc_regs[32];
+	unsigned long long sc_fpregs[32];
+	unsigned long long sc_mdhi;
+	unsigned long long sc_hi1;
+	unsigned long long sc_hi2;
+	unsigned long long sc_hi3;
+	unsigned long long sc_mdlo;
+	unsigned long long sc_lo1;
+	unsigned long long sc_lo2;
+	unsigned long long sc_lo3;
+	unsigned long long sc_pc;
+	unsigned int sc_fpc_csr;
+	unsigned int sc_used_math;
+	unsigned int sc_dsp;
+	unsigned int sc_reserved;
+};
+
+typedef struct {
+	gregset_t gregs;
+	fpregset_t fpregs;
+	greg_t mdhi;
+	greg_t hi1;
+	greg_t hi2;
+	greg_t hi3;
+	greg_t mdlo;
+	greg_t lo1;
+	greg_t lo2;
+	greg_t lo3;
+	greg_t pc;
+	unsigned int fpc_csr;
+	unsigned int used_math;
+	unsigned int dsp;
+	unsigned int reserved;
+} mcontext_t;
+
+#else
+typedef struct {
+	unsigned long long __mc1[32];
+	double __mc2[32];
+	unsigned long long __mc3[9];
+	unsigned __mc4[4];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	size_t ss_size;
+	int ss_flags;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  0x10000
+#define SA_SIGINFO    8
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#undef SIG_BLOCK
+#undef SIG_UNBLOCK
+#undef SIG_SETMASK
+#define SIG_BLOCK     1
+#define SIG_UNBLOCK   2
+#define SIG_SETMASK   3
+
+#undef SI_ASYNCIO
+#undef SI_MESGQ
+#undef SI_TIMER
+#define SI_ASYNCIO (-2)
+#define SI_MESGQ (-4)
+#define SI_TIMER (-3)
+
+#define __SI_SWAP_ERRNO_CODE
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGSTKFLT 7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGBUS    10
+#define SIGSEGV   11
+#define SIGSYS    12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGUSR1   16
+#define SIGUSR2   17
+#define SIGCHLD   18
+#define SIGPWR    19
+#define SIGWINCH  20
+#define SIGURG    21
+#define SIGIO     22
+#define SIGPOLL   SIGIO
+#define SIGSTOP   23
+#define SIGTSTP   24
+#define SIGCONT   25
+#define SIGTTIN   26
+#define SIGTTOU   27
+#define SIGVTALRM 28
+#define SIGPROF   29
+#define SIGXCPU   30
+#define SIGXFSZ   31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 128
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/socket.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/socket.h
new file mode 100644
index 0000000000..02fbb88b4d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/socket.h
@@ -0,0 +1,35 @@
+#define SOCK_STREAM    2
+#define SOCK_DGRAM     1
+
+#define SOL_SOCKET     65535
+
+#define SO_DEBUG        1
+
+#define SO_REUSEADDR    0x0004
+#define SO_KEEPALIVE    0x0008
+#define SO_DONTROUTE    0x0010
+#define SO_BROADCAST    0x0020
+#define SO_LINGER       0x0080
+#define SO_OOBINLINE    0x0100
+#define SO_REUSEPORT    0x0200
+#define SO_SNDBUF       0x1001
+#define SO_RCVBUF       0x1002
+#define SO_SNDLOWAT     0x1003
+#define SO_RCVLOWAT     0x1004
+#define SO_ERROR        0x1007
+#define SO_TYPE         0x1008
+#define SO_ACCEPTCONN   0x1009
+#define SO_PROTOCOL     0x1028
+#define SO_DOMAIN       0x1029
+
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_BSDCOMPAT    14
+#define SO_PASSCRED     17
+#define SO_PEERCRED     18
+#define SO_PEERSEC      30
+#define SO_SNDBUFFORCE  31
+#define SO_RCVBUFFORCE  33
+
+#define SOCK_NONBLOCK     0200
+#define SOCK_CLOEXEC  02000000
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/stat.h
new file mode 100644
index 0000000000..6e2f280868
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/stat.h
@@ -0,0 +1,23 @@
+struct stat {
+	dev_t st_dev;
+	long __pad1[2];
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	long __pad2[2];
+	off_t st_size;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	blksize_t st_blksize;
+	long __pad3;
+	blkcnt_t st_blocks;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+	long __pad4[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/statfs.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/statfs.h
new file mode 100644
index 0000000000..a73bd547cd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/statfs.h
@@ -0,0 +1,8 @@
+struct statfs {
+	unsigned long f_type, f_bsize, f_frsize;
+	fsblkcnt_t f_blocks, f_bfree;
+	fsfilcnt_t f_files, f_ffree;
+	fsblkcnt_t f_bavail;
+	fsid_t f_fsid;
+	unsigned long f_namelen, f_flags, f_spare[5];
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/syscall.h.in
new file mode 100644
index 0000000000..2ad48d10d9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/syscall.h.in
@@ -0,0 +1,365 @@
+#define __NR_read			6000
+#define __NR_write			6001
+#define __NR_open			6002
+#define __NR_close			6003
+#define __NR_stat			6004
+#define __NR_fstat			6005
+#define __NR_lstat			6006
+#define __NR_poll			6007
+#define __NR_lseek			6008
+#define __NR_mmap			6009
+#define __NR_mprotect			6010
+#define __NR_munmap			6011
+#define __NR_brk			6012
+#define __NR_rt_sigaction		6013
+#define __NR_rt_sigprocmask		6014
+#define __NR_ioctl			6015
+#define __NR_pread64			6016
+#define __NR_pwrite64			6017
+#define __NR_readv			6018
+#define __NR_writev			6019
+#define __NR_access			6020
+#define __NR_pipe			6021
+#define __NR__newselect			6022
+#define __NR_sched_yield		6023
+#define __NR_mremap			6024
+#define __NR_msync			6025
+#define __NR_mincore			6026
+#define __NR_madvise			6027
+#define __NR_shmget			6028
+#define __NR_shmat			6029
+#define __NR_shmctl			6030
+#define __NR_dup			6031
+#define __NR_dup2			6032
+#define __NR_pause			6033
+#define __NR_nanosleep			6034
+#define __NR_getitimer			6035
+#define __NR_setitimer			6036
+#define __NR_alarm			6037
+#define __NR_getpid			6038
+#define __NR_sendfile			6039
+#define __NR_socket			6040
+#define __NR_connect			6041
+#define __NR_accept			6042
+#define __NR_sendto			6043
+#define __NR_recvfrom			6044
+#define __NR_sendmsg			6045
+#define __NR_recvmsg			6046
+#define __NR_shutdown			6047
+#define __NR_bind			6048
+#define __NR_listen			6049
+#define __NR_getsockname		6050
+#define __NR_getpeername		6051
+#define __NR_socketpair			6052
+#define __NR_setsockopt			6053
+#define __NR_getsockopt			6054
+#define __NR_clone			6055
+#define __NR_fork			6056
+#define __NR_execve			6057
+#define __NR_exit			6058
+#define __NR_wait4			6059
+#define __NR_kill			6060
+#define __NR_uname			6061
+#define __NR_semget			6062
+#define __NR_semop			6063
+#define __NR_semctl			6064
+#define __NR_shmdt			6065
+#define __NR_msgget			6066
+#define __NR_msgsnd			6067
+#define __NR_msgrcv			6068
+#define __NR_msgctl			6069
+#define __NR_fcntl			6070
+#define __NR_flock			6071
+#define __NR_fsync			6072
+#define __NR_fdatasync			6073
+#define __NR_truncate			6074
+#define __NR_ftruncate			6075
+#define __NR_getdents			6076
+#define __NR_getcwd			6077
+#define __NR_chdir			6078
+#define __NR_fchdir			6079
+#define __NR_rename			6080
+#define __NR_mkdir			6081
+#define __NR_rmdir			6082
+#define __NR_creat			6083
+#define __NR_link			6084
+#define __NR_unlink			6085
+#define __NR_symlink			6086
+#define __NR_readlink			6087
+#define __NR_chmod			6088
+#define __NR_fchmod			6089
+#define __NR_chown			6090
+#define __NR_fchown			6091
+#define __NR_lchown			6092
+#define __NR_umask			6093
+#define __NR_gettimeofday_time32		6094
+#define __NR_getrlimit			6095
+#define __NR_getrusage			6096
+#define __NR_sysinfo			6097
+#define __NR_times			6098
+#define __NR_ptrace			6099
+#define __NR_getuid			6100
+#define __NR_syslog			6101
+#define __NR_getgid			6102
+#define __NR_setuid			6103
+#define __NR_setgid			6104
+#define __NR_geteuid			6105
+#define __NR_getegid			6106
+#define __NR_setpgid			6107
+#define __NR_getppid			6108
+#define __NR_getpgrp			6109
+#define __NR_setsid			6110
+#define __NR_setreuid			6111
+#define __NR_setregid			6112
+#define __NR_getgroups			6113
+#define __NR_setgroups			6114
+#define __NR_setresuid			6115
+#define __NR_getresuid			6116
+#define __NR_setresgid			6117
+#define __NR_getresgid			6118
+#define __NR_getpgid			6119
+#define __NR_setfsuid			6120
+#define __NR_setfsgid			6121
+#define __NR_getsid			6122
+#define __NR_capget			6123
+#define __NR_capset			6124
+#define __NR_rt_sigpending		6125
+#define __NR_rt_sigtimedwait		6126
+#define __NR_rt_sigqueueinfo		6127
+#define __NR_rt_sigsuspend		6128
+#define __NR_sigaltstack		6129
+#define __NR_utime			6130
+#define __NR_mknod			6131
+#define __NR_personality		6132
+#define __NR_ustat			6133
+#define __NR_statfs			6134
+#define __NR_fstatfs			6135
+#define __NR_sysfs			6136
+#define __NR_getpriority		6137
+#define __NR_setpriority		6138
+#define __NR_sched_setparam		6139
+#define __NR_sched_getparam		6140
+#define __NR_sched_setscheduler		6141
+#define __NR_sched_getscheduler		6142
+#define __NR_sched_get_priority_max	6143
+#define __NR_sched_get_priority_min	6144
+#define __NR_sched_rr_get_interval	6145
+#define __NR_mlock			6146
+#define __NR_munlock			6147
+#define __NR_mlockall			6148
+#define __NR_munlockall			6149
+#define __NR_vhangup			6150
+#define __NR_pivot_root			6151
+#define __NR__sysctl			6152
+#define __NR_prctl			6153
+#define __NR_adjtimex			6154
+#define __NR_setrlimit			6155
+#define __NR_chroot			6156
+#define __NR_sync			6157
+#define __NR_acct			6158
+#define __NR_settimeofday_time32		6159
+#define __NR_mount			6160
+#define __NR_umount2			6161
+#define __NR_swapon			6162
+#define __NR_swapoff			6163
+#define __NR_reboot			6164
+#define __NR_sethostname		6165
+#define __NR_setdomainname		6166
+#define __NR_create_module		6167
+#define __NR_init_module		6168
+#define __NR_delete_module		6169
+#define __NR_get_kernel_syms		6170
+#define __NR_query_module		6171
+#define __NR_quotactl			6172
+#define __NR_nfsservctl			6173
+#define __NR_getpmsg			6174
+#define __NR_putpmsg			6175
+#define __NR_afs_syscall		6176
+#define __NR_reserved177		6177
+#define __NR_gettid			6178
+#define __NR_readahead			6179
+#define __NR_setxattr			6180
+#define __NR_lsetxattr			6181
+#define __NR_fsetxattr			6182
+#define __NR_getxattr			6183
+#define __NR_lgetxattr			6184
+#define __NR_fgetxattr			6185
+#define __NR_listxattr			6186
+#define __NR_llistxattr			6187
+#define __NR_flistxattr			6188
+#define __NR_removexattr		6189
+#define __NR_lremovexattr		6190
+#define __NR_fremovexattr		6191
+#define __NR_tkill			6192
+#define __NR_reserved193		6193
+#define __NR_futex			6194
+#define __NR_sched_setaffinity		6195
+#define __NR_sched_getaffinity		6196
+#define __NR_cacheflush			6197
+#define __NR_cachectl			6198
+#define __NR_sysmips			6199
+#define __NR_io_setup			6200
+#define __NR_io_destroy			6201
+#define __NR_io_getevents		6202
+#define __NR_io_submit			6203
+#define __NR_io_cancel			6204
+#define __NR_exit_group			6205
+#define __NR_lookup_dcookie		6206
+#define __NR_epoll_create		6207
+#define __NR_epoll_ctl			6208
+#define __NR_epoll_wait			6209
+#define __NR_remap_file_pages		6210
+#define __NR_rt_sigreturn		6211
+#define __NR_fcntl64			6212
+#define __NR_set_tid_address		6213
+#define __NR_restart_syscall		6214
+#define __NR_semtimedop			6215
+#define __NR_fadvise64			6216
+#define __NR_statfs64			6217
+#define __NR_fstatfs64			6218
+#define __NR_sendfile64			6219
+#define __NR_timer_create		6220
+#define __NR_timer_settime32		6221
+#define __NR_timer_gettime32		6222
+#define __NR_timer_getoverrun		6223
+#define __NR_timer_delete		6224
+#define __NR_clock_settime32		6225
+#define __NR_clock_gettime32		6226
+#define __NR_clock_getres_time32		6227
+#define __NR_clock_nanosleep_time32		6228
+#define __NR_tgkill			6229
+#define __NR_utimes			6230
+#define __NR_mbind			6231
+#define __NR_get_mempolicy		6232
+#define __NR_set_mempolicy		6233
+#define __NR_mq_open			6234
+#define __NR_mq_unlink			6235
+#define __NR_mq_timedsend		6236
+#define __NR_mq_timedreceive		6237
+#define __NR_mq_notify			6238
+#define __NR_mq_getsetattr		6239
+#define __NR_vserver			6240
+#define __NR_waitid			6241
+#define __NR_add_key			6243
+#define __NR_request_key		6244
+#define __NR_keyctl			6245
+#define __NR_set_thread_area		6246
+#define __NR_inotify_init		6247
+#define __NR_inotify_add_watch		6248
+#define __NR_inotify_rm_watch		6249
+#define __NR_migrate_pages		6250
+#define __NR_openat			6251
+#define __NR_mkdirat			6252
+#define __NR_mknodat			6253
+#define __NR_fchownat			6254
+#define __NR_futimesat			6255
+#define __NR_newfstatat			6256
+#define __NR_unlinkat			6257
+#define __NR_renameat			6258
+#define __NR_linkat			6259
+#define __NR_symlinkat			6260
+#define __NR_readlinkat			6261
+#define __NR_fchmodat			6262
+#define __NR_faccessat			6263
+#define __NR_pselect6			6264
+#define __NR_ppoll			6265
+#define __NR_unshare			6266
+#define __NR_splice			6267
+#define __NR_sync_file_range		6268
+#define __NR_tee			6269
+#define __NR_vmsplice			6270
+#define __NR_move_pages			6271
+#define __NR_set_robust_list		6272
+#define __NR_get_robust_list		6273
+#define __NR_kexec_load			6274
+#define __NR_getcpu			6275
+#define __NR_epoll_pwait		6276
+#define __NR_ioprio_set			6277
+#define __NR_ioprio_get			6278
+#define __NR_utimensat			6279
+#define __NR_signalfd			6280
+#define __NR_timerfd			6281
+#define __NR_eventfd			6282
+#define __NR_fallocate			6283
+#define __NR_timerfd_create		6284
+#define __NR_timerfd_gettime32		6285
+#define __NR_timerfd_settime32		6286
+#define __NR_signalfd4			6287
+#define __NR_eventfd2			6288
+#define __NR_epoll_create1		6289
+#define __NR_dup3			6290
+#define __NR_pipe2			6291
+#define __NR_inotify_init1		6292
+#define __NR_preadv			6293
+#define __NR_pwritev			6294
+#define __NR_rt_tgsigqueueinfo		6295
+#define __NR_perf_event_open		6296
+#define __NR_accept4			6297
+#define __NR_recvmmsg			6298
+#define __NR_getdents64			6299
+#define __NR_fanotify_init		6300
+#define __NR_fanotify_mark		6301
+#define __NR_prlimit64			6302
+#define __NR_name_to_handle_at		6303
+#define __NR_open_by_handle_at		6304
+#define __NR_clock_adjtime		6305
+#define __NR_syncfs			6306
+#define __NR_sendmmsg			6307
+#define __NR_setns			6308
+#define __NR_process_vm_readv		6309
+#define __NR_process_vm_writev		6310
+#define __NR_kcmp			6311
+#define __NR_finit_module		6312
+#define __NR_sched_setattr		6313
+#define __NR_sched_getattr		6314
+#define __NR_renameat2			6315
+#define __NR_seccomp			6316
+#define __NR_getrandom			6317
+#define __NR_memfd_create		6318
+#define __NR_bpf			6319
+#define __NR_execveat			6320
+#define __NR_userfaultfd		6321
+#define __NR_membarrier			6322
+#define __NR_mlock2			6323
+#define __NR_copy_file_range		6324
+#define __NR_preadv2			6325
+#define __NR_pwritev2			6326
+#define __NR_pkey_mprotect		6327
+#define __NR_pkey_alloc			6328
+#define __NR_pkey_free			6329
+#define __NR_statx			6330
+#define __NR_rseq			6331
+#define __NR_io_pgetevents		6332
+#define __NR_clock_gettime64		6403
+#define __NR_clock_settime64		6404
+#define __NR_clock_adjtime64		6405
+#define __NR_clock_getres_time64	6406
+#define __NR_clock_nanosleep_time64	6407
+#define __NR_timer_gettime64		6408
+#define __NR_timer_settime64		6409
+#define __NR_timerfd_gettime64		6410
+#define __NR_timerfd_settime64		6411
+#define __NR_utimensat_time64		6412
+#define __NR_pselect6_time64		6413
+#define __NR_ppoll_time64		6414
+#define __NR_io_pgetevents_time64	6416
+#define __NR_recvmmsg_time64		6417
+#define __NR_mq_timedsend_time64	6418
+#define __NR_mq_timedreceive_time64	6419
+#define __NR_semtimedop_time64		6420
+#define __NR_rt_sigtimedwait_time64	6421
+#define __NR_futex_time64		6422
+#define __NR_sched_rr_get_interval_time64 6423
+#define __NR_pidfd_send_signal		6424
+#define __NR_io_uring_setup		6425
+#define __NR_io_uring_enter		6426
+#define __NR_io_uring_register		6427
+#define __NR_open_tree		6428
+#define __NR_move_mount		6429
+#define __NR_fsopen		6430
+#define __NR_fsconfig		6431
+#define __NR_fsmount		6432
+#define __NR_fspick		6433
+#define __NR_pidfd_open		6434
+#define __NR_clone3		6435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/termios.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/termios.h
new file mode 100644
index 0000000000..9d571f78f6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/termios.h
@@ -0,0 +1,169 @@
+struct termios {
+	tcflag_t c_iflag;
+	tcflag_t c_oflag;
+	tcflag_t c_cflag;
+	tcflag_t c_lflag;
+	cc_t c_line;
+	cc_t c_cc[NCCS];
+	speed_t __c_ispeed;
+	speed_t __c_ospeed;
+};
+
+#define VINTR     0
+#define VQUIT     1
+#define VERASE    2
+#define VKILL     3
+#define VMIN      4
+#define VTIME     5
+#define VEOL2     6
+#define VSWTC     7
+#define VSWTCH    7
+#define VSTART    8
+#define VSTOP     9
+#define VSUSP    10
+#define VREPRINT 12
+#define VDISCARD 13
+#define VWERASE  14
+#define VLNEXT   15
+#define VEOF     16
+#define VEOL     17
+
+#define IGNBRK  0000001
+#define BRKINT  0000002
+#define IGNPAR  0000004
+#define PARMRK  0000010
+#define INPCK   0000020
+#define ISTRIP  0000040
+#define INLCR   0000100
+#define IGNCR   0000200
+#define ICRNL   0000400
+#define IUCLC   0001000
+#define IXON    0002000
+#define IXANY   0004000
+#define IXOFF   0010000
+#define IMAXBEL 0020000
+#define IUTF8   0040000
+
+#define OPOST  0000001
+#define OLCUC  0000002
+#define ONLCR  0000004
+#define OCRNL  0000010
+#define ONOCR  0000020
+#define ONLRET 0000040
+#define OFILL  0000100
+#define OFDEL  0000200
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE)
+#define NLDLY  0000400
+#define NL0    0000000
+#define NL1    0000400
+#define CRDLY  0003000
+#define CR0    0000000
+#define CR1    0001000
+#define CR2    0002000
+#define CR3    0003000
+#define TABDLY 0014000
+#define TAB0   0000000
+#define TAB1   0004000
+#define TAB2   0010000
+#define TAB3   0014000
+#define BSDLY  0020000
+#define BS0    0000000
+#define BS1    0020000
+#define FFDLY  0100000
+#define FF0    0000000
+#define FF1    0100000
+#endif
+
+#define VTDLY  0040000
+#define VT0    0000000
+#define VT1    0040000
+
+#define B0       0000000
+#define B50      0000001
+#define B75      0000002
+#define B110     0000003
+#define B134     0000004
+#define B150     0000005
+#define B200     0000006
+#define B300     0000007
+#define B600     0000010
+#define B1200    0000011
+#define B1800    0000012
+#define B2400    0000013
+#define B4800    0000014
+#define B9600    0000015
+#define B19200   0000016
+#define B38400   0000017
+
+#define B57600   0010001
+#define B115200  0010002
+#define B230400  0010003
+#define B460800  0010004
+#define B500000  0010005
+#define B576000  0010006
+#define B921600  0010007
+#define B1000000 0010010
+#define B1152000 0010011
+#define B1500000 0010012
+#define B2000000 0010013
+#define B2500000 0010014
+#define B3000000 0010015
+#define B3500000 0010016
+#define B4000000 0010017
+
+#define CSIZE  0000060
+#define CS5    0000000
+#define CS6    0000020
+#define CS7    0000040
+#define CS8    0000060
+#define CSTOPB 0000100
+#define CREAD  0000200
+#define PARENB 0000400
+#define PARODD 0001000
+#define HUPCL  0002000
+#define CLOCAL 0004000
+
+#define ISIG   0000001
+#define ICANON 0000002
+#define ECHO   0000010
+#define ECHOE  0000020
+#define ECHOK  0000040
+#define ECHONL 0000100
+#define NOFLSH 0000200
+#define IEXTEN 0000400
+#define TOSTOP 0100000
+#define ITOSTOP 0100000
+
+#define TCOOFF 0
+#define TCOON  1
+#define TCIOFF 2
+#define TCION  3
+
+#define TCIFLUSH  0
+#define TCOFLUSH  1
+#define TCIOFLUSH 2
+
+#define TCSANOW   0
+#define TCSADRAIN 1
+#define TCSAFLUSH 2
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA    0000016
+#define EXTB    0000017
+#define CBAUD   0010017
+#define CBAUDEX 0010000
+#define CIBAUD  002003600000
+#define CMSPAR  010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE   0000004
+#define ECHOCTL 0001000
+#define ECHOPRT 0002000
+#define ECHOKE  0004000
+#define FLUSHO  0020000
+#define PENDIN  0040000
+#define EXTPROC 0200000
+
+#define XTABS  0014000
+#define TIOCSER_TEMT 1
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/user.h
new file mode 100644
index 0000000000..60fa1fda93
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/bits/user.h
@@ -0,0 +1,15 @@
+struct user {
+	unsigned long regs[102];
+	unsigned long u_tsize, u_dsize, u_ssize;
+	unsigned long long start_code, start_data, start_stack;
+	long long signal;
+	unsigned long long *u_ar0;
+	unsigned long long magic;
+	char u_comm[32];
+};
+
+#define ELF_NGREG 45
+#define ELF_NFPREG 33
+
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+typedef double elf_fpreg_t, elf_fpregset_t[ELF_NFPREG];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/crt_arch.h
new file mode 100644
index 0000000000..eb5928ccb2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/crt_arch.h
@@ -0,0 +1,32 @@
+__asm__(
+".set push\n"
+".set noreorder\n"
+".text \n"
+".global _" START "\n"
+".global " START "\n"
+".global " START "_data\n"
+".type   _" START ", @function\n"
+".type   " START ", @function\n"
+".type   " START "_data, @function\n"
+"_" START ":\n"
+"" START ":\n"
+"	bal 1f \n"
+"	move $fp, $0 \n"
+"" START "_data: \n"
+"	.gpword " START "_data \n"
+"	.gpword " START "_c \n"
+".weak _DYNAMIC \n"
+".hidden _DYNAMIC \n"
+"	.gpword _DYNAMIC \n"
+"1:	lw $gp, 0($ra) \n"
+"	subu $gp, $ra, $gp \n"
+"	move $4, $sp \n"
+"	lw $5, 8($ra) \n"
+"	addu $5, $5, $gp \n"
+"	lw $25, 4($ra) \n"
+"	addu $25, $25, $gp \n"
+"	and $sp, $sp, -8 \n"
+"	jalr $25 \n"
+"	subu $sp, $sp, 16 \n"
+".set pop \n"
+);
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/ksigaction.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/ksigaction.h
new file mode 100644
index 0000000000..b565f1fc93
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/ksigaction.h
@@ -0,0 +1,10 @@
+#include <features.h>
+
+struct k_sigaction {
+	unsigned flags;
+	void (*handler)(int);
+	unsigned long mask[4];
+	void (*restorer)();
+};
+
+hidden void __restore(), __restore_rt();
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/kstat.h
new file mode 100644
index 0000000000..3841559c2c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/kstat.h
@@ -0,0 +1,22 @@
+struct kstat {
+	unsigned st_dev;
+	long __pad1[3];
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	unsigned st_rdev;
+	long __pad2[3];
+	off_t st_size;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	blksize_t st_blksize;
+	long __pad3;
+	blkcnt_t st_blocks;
+	long __pad4[14];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/pthread_arch.h
new file mode 100644
index 0000000000..1e7839ea67
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/pthread_arch.h
@@ -0,0 +1,19 @@
+static inline struct pthread *__pthread_self()
+{
+#if __mips_isa_rev < 2
+	register char *tp __asm__("$3");
+	__asm__ (".word 0x7c03e83b" : "=r" (tp) );
+#else
+	char *tp;
+	__asm__ ("rdhwr %0, $29" : "=r" (tp) );
+#endif
+	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
+
+#define DTP_OFFSET 0x8000
+
+#define MC_PC pc
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/reloc.h
new file mode 100644
index 0000000000..47c6e591f8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/reloc.h
@@ -0,0 +1,50 @@
+#if __mips_isa_rev >= 6
+#define ISA_SUFFIX "r6"
+#else
+#define ISA_SUFFIX ""
+#endif
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define ENDIAN_SUFFIX "el"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#ifdef __mips_soft_float
+#define FP_SUFFIX "-sf"
+#else
+#define FP_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "mipsn32" ISA_SUFFIX ENDIAN_SUFFIX FP_SUFFIX
+
+#define TPOFF_K (-0x7000)
+
+#define REL_SYM_OR_REL  R_MIPS_REL32
+#define REL_PLT         R_MIPS_JUMP_SLOT
+#define REL_COPY        R_MIPS_COPY
+#define REL_DTPMOD      R_MIPS_TLS_DTPMOD32
+#define REL_DTPOFF      R_MIPS_TLS_DTPREL32
+#define REL_TPOFF       R_MIPS_TLS_TPREL32
+
+#define NEED_MIPS_GOT_RELOCS 1
+#define DT_DEBUG_INDIRECT DT_MIPS_RLD_MAP
+#define ARCH_SYM_REJECT_UND(s) (!((s)->st_other & STO_MIPS_PLT))
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"move $sp,%1 ; jr %0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	".set push \n" \
+	".set noreorder \n" \
+	"	bal 1f \n" \
+	"	nop \n" \
+	"	.gpword . \n" \
+	"	.gpword " #sym " \n" \
+	"1:	lw %0, ($ra) \n" \
+	"	subu %0, $ra, %0 \n" \
+	"	lw $ra, 4($ra) \n" \
+	"	addu %0, %0, $ra \n" \
+	".set pop \n" \
+	: "=r"(*(fp)) : : "memory", "ra" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/mipsn32/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/syscall_arch.h
new file mode 100644
index 0000000000..c1a4b7da30
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/mipsn32/syscall_arch.h
@@ -0,0 +1,125 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+
+#define SYSCALL_RLIM_INFINITY (-1UL/2)
+
+#if __mips_isa_rev >= 6
+#define SYSCALL_CLOBBERLIST \
+	"$1", "$3", "$10", "$11", "$12", "$13", \
+	"$14", "$15", "$24", "$25", "memory"
+#else
+#define SYSCALL_CLOBBERLIST \
+	"$1", "$3", "$10", "$11", "$12", "$13", \
+	"$14", "$15", "$24", "$25", "hi", "lo", "memory"
+#endif
+
+static inline long __syscall0(long n)
+{
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		:
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long r4 __asm__("$4") = a;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		: "r"(r4)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		: "r"(r4), "r"(r5)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7");
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "+r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r8 __asm__("$8") = e;
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "+r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6), "r"(r8)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long r4 __asm__("$4") = a;
+	register long r5 __asm__("$5") = b;
+	register long r6 __asm__("$6") = c;
+	register long r7 __asm__("$7") = d;
+	register long r8 __asm__("$8") = e;
+	register long r9 __asm__("$9") = f;
+	register long r2 __asm__("$2") = n;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "+r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? -r2 : r2;
+}
+
+#define VDSO_USEFUL
+#define VDSO_CGT32_SYM "__vdso_clock_gettime"
+#define VDSO_CGT32_VER "LINUX_2.6"
+#define VDSO_CGT_SYM "__vdso_clock_gettime64"
+#define VDSO_CGT_VER "LINUX_2.6"
+
+#define SO_SNDTIMEO_OLD 0x1005
+#define SO_RCVTIMEO_OLD 0x1006
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/or1k/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/atomic_arch.h
new file mode 100644
index 0000000000..11a542927b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/atomic_arch.h
@@ -0,0 +1,14 @@
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__("1:	l.lwa %0, %1\n"
+		"	l.sfeq %0, %2\n"
+		"	l.bnf 1f\n"
+		"	 l.nop\n"
+		"	l.swa %1, %3\n"
+		"	l.bnf 1b\n"
+		"	 l.nop\n"
+		"1:	\n"
+		: "=&r"(t), "+m"(*p) : "r"(t), "r"(s) : "cc", "memory" );
+        return t;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/alltypes.h.in
new file mode 100644
index 0000000000..7d3e291a05
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/alltypes.h.in
@@ -0,0 +1,16 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#define __BYTE_ORDER 4321
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+TYPEDEF unsigned wchar_t;
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/bits/float.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/limits.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/limits.h
new file mode 100644
index 0000000000..fac47aadfe
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/limits.h
@@ -0,0 +1 @@
+#define PAGESIZE 8192
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/msg.h
new file mode 100644
index 0000000000..7bbbb2bf43
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/msg.h
@@ -0,0 +1,18 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/sh/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/sem.h
new file mode 100644
index 0000000000..d88338e695
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/sem.h
@@ -0,0 +1,13 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_lo;
+	unsigned long __sem_ctime_hi;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+	long __unused3;
+	long __unused4;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/shm.h
new file mode 100644
index 0000000000..725fb46968
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/shm.h
@@ -0,0 +1,31 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_atime_hi;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_dtime_hi;
+	unsigned long __shm_ctime_lo;
+	unsigned long __shm_ctime_hi;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+	unsigned long __pad3;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/signal.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/bits/signal.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/bits/signal.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/stat.h
new file mode 100644
index 0000000000..cde3fd027b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/stat.h
@@ -0,0 +1,25 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	long long __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __st_blksize_padding;
+	blkcnt_t st_blocks;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	unsigned __unused[2];
+ 	struct timespec st_atim;
+ 	struct timespec st_mtim;
+ 	struct timespec st_ctim;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/sh/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/syscall.h.in
new file mode 100644
index 0000000000..e9c925e41f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/syscall.h.in
@@ -0,0 +1,314 @@
+#define __NR_io_setup 0
+#define __NR_io_destroy 1
+#define __NR_io_submit 2
+#define __NR_io_cancel 3
+#define __NR_io_getevents 4
+#define __NR_setxattr 5
+#define __NR_lsetxattr 6
+#define __NR_fsetxattr 7
+#define __NR_getxattr 8
+#define __NR_lgetxattr 9
+#define __NR_fgetxattr 10
+#define __NR_listxattr 11
+#define __NR_llistxattr 12
+#define __NR_flistxattr 13
+#define __NR_removexattr 14
+#define __NR_lremovexattr 15
+#define __NR_fremovexattr 16
+#define __NR_getcwd 17
+#define __NR_lookup_dcookie 18
+#define __NR_eventfd2 19
+#define __NR_epoll_create1 20
+#define __NR_epoll_ctl 21
+#define __NR_epoll_pwait 22
+#define __NR_dup 23
+#define __NR_dup3 24
+#define __NR_fcntl64 25
+#define __NR_inotify_init1 26
+#define __NR_inotify_add_watch 27
+#define __NR_inotify_rm_watch 28
+#define __NR_ioctl 29
+#define __NR_ioprio_set 30
+#define __NR_ioprio_get 31
+#define __NR_flock 32
+#define __NR_mknodat 33
+#define __NR_mkdirat 34
+#define __NR_unlinkat 35
+#define __NR_symlinkat 36
+#define __NR_linkat 37
+#define __NR_renameat 38
+#define __NR_umount2 39
+#define __NR_mount 40
+#define __NR_pivot_root 41
+#define __NR_nfsservctl 42
+#define __NR_statfs64 43
+#define __NR_fstatfs64 44
+#define __NR_truncate64 45
+#define __NR_ftruncate64 46
+#define __NR_fallocate 47
+#define __NR_faccessat 48
+#define __NR_chdir 49
+#define __NR_fchdir 50
+#define __NR_chroot 51
+#define __NR_fchmod 52
+#define __NR_fchmodat 53
+#define __NR_fchownat 54
+#define __NR_fchown 55
+#define __NR_openat 56
+#define __NR_close 57
+#define __NR_vhangup 58
+#define __NR_pipe2 59
+#define __NR_quotactl 60
+#define __NR_getdents64 61
+#define __NR__llseek 62
+#define __NR_llseek 62
+#define __NR_read 63
+#define __NR_write 64
+#define __NR_readv 65
+#define __NR_writev 66
+#define __NR_pread64 67
+#define __NR_pwrite64 68
+#define __NR_preadv 69
+#define __NR_pwritev 70
+#define __NR_sendfile64 71
+#define __NR_pselect6 72
+#define __NR_ppoll 73
+#define __NR_signalfd4 74
+#define __NR_vmsplice 75
+#define __NR_splice 76
+#define __NR_tee 77
+#define __NR_readlinkat 78
+#define __NR_fstatat64 79
+#define __NR_fstat64 80
+#define __NR_sync 81
+#define __NR_fsync 82
+#define __NR_fdatasync 83
+#define __NR_sync_file_range 84
+#define __NR_timerfd_create 85
+#define __NR_timerfd_settime32 86
+#define __NR_timerfd_gettime32 87
+#define __NR_utimensat 88
+#define __NR_acct 89
+#define __NR_capget 90
+#define __NR_capset 91
+#define __NR_personality 92
+#define __NR_exit 93
+#define __NR_exit_group 94
+#define __NR_waitid 95
+#define __NR_set_tid_address 96
+#define __NR_unshare 97
+#define __NR_futex 98
+#define __NR_set_robust_list 99
+#define __NR_get_robust_list 100
+#define __NR_nanosleep 101
+#define __NR_getitimer 102
+#define __NR_setitimer 103
+#define __NR_kexec_load 104
+#define __NR_init_module 105
+#define __NR_delete_module 106
+#define __NR_timer_create 107
+#define __NR_timer_gettime32 108
+#define __NR_timer_getoverrun 109
+#define __NR_timer_settime32 110
+#define __NR_timer_delete 111
+#define __NR_clock_settime32 112
+#define __NR_clock_gettime32 113
+#define __NR_clock_getres_time32 114
+#define __NR_clock_nanosleep_time32 115
+#define __NR_syslog 116
+#define __NR_ptrace 117
+#define __NR_sched_setparam 118
+#define __NR_sched_setscheduler 119
+#define __NR_sched_getscheduler 120
+#define __NR_sched_getparam 121
+#define __NR_sched_setaffinity 122
+#define __NR_sched_getaffinity 123
+#define __NR_sched_yield 124
+#define __NR_sched_get_priority_max 125
+#define __NR_sched_get_priority_min 126
+#define __NR_sched_rr_get_interval 127
+#define __NR_restart_syscall 128
+#define __NR_kill 129
+#define __NR_tkill 130
+#define __NR_tgkill 131
+#define __NR_sigaltstack 132
+#define __NR_rt_sigsuspend 133
+#define __NR_rt_sigaction 134
+#define __NR_rt_sigprocmask 135
+#define __NR_rt_sigpending 136
+#define __NR_rt_sigtimedwait 137
+#define __NR_rt_sigqueueinfo 138
+#define __NR_rt_sigreturn 139
+#define __NR_setpriority 140
+#define __NR_getpriority 141
+#define __NR_reboot 142
+#define __NR_setregid 143
+#define __NR_setgid 144
+#define __NR_setreuid 145
+#define __NR_setuid 146
+#define __NR_setresuid 147
+#define __NR_getresuid 148
+#define __NR_setresgid 149
+#define __NR_getresgid 150
+#define __NR_setfsuid 151
+#define __NR_setfsgid 152
+#define __NR_times 153
+#define __NR_setpgid 154
+#define __NR_getpgid 155
+#define __NR_getsid 156
+#define __NR_setsid 157
+#define __NR_getgroups 158
+#define __NR_setgroups 159
+#define __NR_uname 160
+#define __NR_sethostname 161
+#define __NR_setdomainname 162
+#define __NR_getrlimit 163
+#define __NR_setrlimit 164
+#define __NR_getrusage 165
+#define __NR_umask 166
+#define __NR_prctl 167
+#define __NR_getcpu 168
+#define __NR_gettimeofday_time32 169
+#define __NR_settimeofday_time32 170
+#define __NR_adjtimex 171
+#define __NR_getpid 172
+#define __NR_getppid 173
+#define __NR_getuid 174
+#define __NR_geteuid 175
+#define __NR_getgid 176
+#define __NR_getegid 177
+#define __NR_gettid 178
+#define __NR_sysinfo 179
+#define __NR_mq_open 180
+#define __NR_mq_unlink 181
+#define __NR_mq_timedsend 182
+#define __NR_mq_timedreceive 183
+#define __NR_mq_notify 184
+#define __NR_mq_getsetattr 185
+#define __NR_msgget 186
+#define __NR_msgctl 187
+#define __NR_msgrcv 188
+#define __NR_msgsnd 189
+#define __NR_semget 190
+#define __NR_semctl 191
+#define __NR_semtimedop 192
+#define __NR_semop 193
+#define __NR_shmget 194
+#define __NR_shmctl 195
+#define __NR_shmat 196
+#define __NR_shmdt 197
+#define __NR_socket 198
+#define __NR_socketpair 199
+#define __NR_bind 200
+#define __NR_listen 201
+#define __NR_accept 202
+#define __NR_connect 203
+#define __NR_getsockname 204
+#define __NR_getpeername 205
+#define __NR_sendto 206
+#define __NR_recvfrom 207
+#define __NR_setsockopt 208
+#define __NR_getsockopt 209
+#define __NR_shutdown 210
+#define __NR_sendmsg 211
+#define __NR_recvmsg 212
+#define __NR_readahead 213
+#define __NR_brk 214
+#define __NR_munmap 215
+#define __NR_mremap 216
+#define __NR_add_key 217
+#define __NR_request_key 218
+#define __NR_keyctl 219
+#define __NR_clone 220
+#define __NR_execve 221
+#define __NR_mmap2 222
+#define __NR_fadvise64_64 223
+#define __NR_swapon 224
+#define __NR_swapoff 225
+#define __NR_mprotect 226
+#define __NR_msync 227
+#define __NR_mlock 228
+#define __NR_munlock 229
+#define __NR_mlockall 230
+#define __NR_munlockall 231
+#define __NR_mincore 232
+#define __NR_madvise 233
+#define __NR_remap_file_pages 234
+#define __NR_mbind 235
+#define __NR_get_mempolicy 236
+#define __NR_set_mempolicy 237
+#define __NR_migrate_pages 238
+#define __NR_move_pages 239
+#define __NR_rt_tgsigqueueinfo 240
+#define __NR_perf_event_open 241
+#define __NR_accept4 242
+#define __NR_recvmmsg 243
+#define __NR_or1k_atomic 244
+#define __NR_wait4 260
+#define __NR_prlimit64 261
+#define __NR_fanotify_init 262
+#define __NR_fanotify_mark 263
+#define __NR_name_to_handle_at 264
+#define __NR_open_by_handle_at 265
+#define __NR_clock_adjtime 266
+#define __NR_syncfs 267
+#define __NR_setns 268
+#define __NR_sendmmsg 269
+#define __NR_process_vm_readv 270
+#define __NR_process_vm_writev 271
+#define __NR_kcmp 272
+#define __NR_finit_module 273
+#define __NR_sched_setattr 274
+#define __NR_sched_getattr 275
+#define __NR_renameat2 276
+#define __NR_seccomp 277
+#define __NR_getrandom 278
+#define __NR_memfd_create 279
+#define __NR_bpf 280
+#define __NR_execveat 281
+#define __NR_userfaultfd 282
+#define __NR_membarrier 283
+#define __NR_mlock2 284
+#define __NR_copy_file_range 285
+#define __NR_preadv2 286
+#define __NR_pwritev2 287
+#define __NR_pkey_mprotect 288
+#define __NR_pkey_alloc 289
+#define __NR_pkey_free 290
+#define __NR_statx 291
+#define __NR_io_pgetevents 292
+#define __NR_rseq 293
+#define __NR_kexec_file_load 294
+#define __NR_clock_gettime64 403
+#define __NR_clock_settime64 404
+#define __NR_clock_adjtime64 405
+#define __NR_clock_getres_time64 406
+#define __NR_clock_nanosleep_time64 407
+#define __NR_timer_gettime64 408
+#define __NR_timer_settime64 409
+#define __NR_timerfd_gettime64 410
+#define __NR_timerfd_settime64 411
+#define __NR_utimensat_time64 412
+#define __NR_pselect6_time64 413
+#define __NR_ppoll_time64 414
+#define __NR_io_pgetevents_time64 416
+#define __NR_recvmmsg_time64 417
+#define __NR_mq_timedsend_time64 418
+#define __NR_mq_timedreceive_time64 419
+#define __NR_semtimedop_time64 420
+#define __NR_rt_sigtimedwait_time64 421
+#define __NR_futex_time64 422
+#define __NR_sched_rr_get_interval_time64 423
+#define __NR_pidfd_send_signal 424
+#define __NR_io_uring_setup 425
+#define __NR_io_uring_enter 426
+#define __NR_io_uring_register 427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/bits/user.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/bits/user.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/bits/user.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/or1k/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/or1k/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/or1k/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/kstat.h
new file mode 100644
index 0000000000..c144957968
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	long long __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __st_blksize_padding;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	unsigned __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/pthread_arch.h
new file mode 100644
index 0000000000..1b806f8917
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/pthread_arch.h
@@ -0,0 +1,18 @@
+/* or1k use variant I, but with the twist that tp points to the end of TCB */
+static inline struct pthread *__pthread_self()
+{
+#ifdef __clang__
+	char *tp;
+	__asm__ ("l.ori %0, r10, 0" : "=r" (tp) );
+#else
+	register char *tp __asm__("r10");
+	__asm__ ("" : "=r" (tp) );
+#endif
+	return (struct pthread *) (tp - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
+
+#define MC_PC regs.pc
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/reloc.h
new file mode 100644
index 0000000000..128089cac2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/reloc.h
@@ -0,0 +1,24 @@
+#define LDSO_ARCH "or1k"
+
+#define TPOFF_K 0
+
+#define REL_SYMBOLIC    R_OR1K_32
+#define REL_GOT         R_OR1K_GLOB_DAT
+#define REL_PLT         R_OR1K_JMP_SLOT
+#define REL_RELATIVE    R_OR1K_RELATIVE
+#define REL_COPY        R_OR1K_COPY
+#define REL_DTPMOD      R_OR1K_TLS_DTPMOD
+#define REL_DTPOFF      R_OR1K_TLS_DTPOFF
+#define REL_TPOFF       R_OR1K_TLS_TPOFF
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"l.jr %0 ; l.ori r1,%1,0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym " \n" \
+	"	l.jal 1f \n" \
+	"	 l.nop \n" \
+	"	.word " #sym "-. \n" \
+	"1:	l.lwz %0, 0(r9) \n" \
+	"	l.add %0, %0, r9 \n" \
+	: "=r"(*(fp)) : : "memory", "r9" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/or1k/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/or1k/syscall_arch.h
new file mode 100644
index 0000000000..21738ce07e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/or1k/syscall_arch.h
@@ -0,0 +1,115 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
+
+#define SYSCALL_MMAP2_UNIT 8192ULL
+
+static __inline long __syscall0(long n)
+{
+	register unsigned long r11 __asm__("r11") = n;
+	__asm__ __volatile__ ("l.sys 1"
+			      : "=r"(r11)
+			      : "r"(r11)
+			      : "memory", "r3", "r4", "r5", "r6", "r7", "r8",
+				"r12", "r13", "r15", "r17", "r19", "r21",
+				"r23", "r25", "r27", "r29", "r31");
+	return r11;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register unsigned long r11 __asm__("r11") = n;
+	register unsigned long r3 __asm__("r3") = a;
+	__asm__ __volatile__ ("l.sys 1"
+			      : "=r"(r11)
+			      : "r"(r11), "r"(r3)
+			      : "memory", "r4", "r5", "r6", "r7", "r8",
+				"r12", "r13", "r15", "r17", "r19", "r21",
+				"r23", "r25", "r27", "r29", "r31");
+	return r11;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register unsigned long r11 __asm__("r11") = n;
+	register unsigned long r3 __asm__("r3") = a;
+	register unsigned long r4 __asm__("r4") = b;
+	__asm__ __volatile__ ("l.sys 1"
+			      : "=r"(r11)
+			      : "r"(r11), "r"(r3), "r"(r4)
+			      : "memory", "r5", "r6", "r7", "r8",
+				"r12", "r13", "r15", "r17", "r19", "r21",
+				"r23", "r25", "r27", "r29", "r31");
+	return r11;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register unsigned long r11 __asm__("r11") = n;
+	register unsigned long r3 __asm__("r3") = a;
+	register unsigned long r4 __asm__("r4") = b;
+	register unsigned long r5 __asm__("r5") = c;
+	__asm__ __volatile__ ("l.sys 1"
+			      : "=r"(r11)
+			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5)
+			      : "memory", "r6", "r7", "r8",
+				"r12", "r13", "r15", "r17", "r19", "r21",
+				"r23", "r25", "r27", "r29", "r31");
+	return r11;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register unsigned long r11 __asm__("r11") = n;
+	register unsigned long r3 __asm__("r3") = a;
+	register unsigned long r4 __asm__("r4") = b;
+	register unsigned long r5 __asm__("r5") = c;
+	register unsigned long r6 __asm__("r6") = d;
+	__asm__ __volatile__ ("l.sys 1"
+			      : "=r"(r11)
+			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5), "r"(r6)
+			      : "memory", "r7", "r8",
+				"r12", "r13", "r15", "r17", "r19", "r21",
+				"r23", "r25", "r27", "r29", "r31");
+	return r11;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register unsigned long r11 __asm__("r11") = n;
+	register unsigned long r3 __asm__("r3") = a;
+	register unsigned long r4 __asm__("r4") = b;
+	register unsigned long r5 __asm__("r5") = c;
+	register unsigned long r6 __asm__("r6") = d;
+	register unsigned long r7 __asm__("r7") = e;
+	__asm__ __volatile__ ("l.sys 1"
+			      : "=r"(r11)
+			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5), "r"(r6),
+				"r"(r7)
+			      : "memory", "r8",
+				"r12", "r13", "r15", "r17", "r19", "r21",
+				"r23", "r25", "r27", "r29", "r31");
+	return r11;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register unsigned long r11 __asm__("r11") = n;
+	register unsigned long r3 __asm__("r3") = a;
+	register unsigned long r4 __asm__("r4") = b;
+	register unsigned long r5 __asm__("r5") = c;
+	register unsigned long r6 __asm__("r6") = d;
+	register unsigned long r7 __asm__("r7") = e;
+	register unsigned long r8 __asm__("r8") = f;
+	__asm__ __volatile__ ("l.sys 1"
+			      : "=r"(r11)
+			      : "r"(r11), "r"(r3), "r"(r4), "r"(r5), "r"(r6),
+				"r"(r7), "r"(r8)
+			      : "memory",
+				"r12", "r13", "r15", "r17", "r19", "r21",
+				"r23", "r25", "r27", "r29", "r31");
+	return r11;
+}
+
+#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/powerpc/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/atomic_arch.h
new file mode 100644
index 0000000000..c267391975
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/atomic_arch.h
@@ -0,0 +1,38 @@
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+	__asm__ __volatile__ ("lwarx %0, 0, %2" : "=r"(v) : "m"(*p), "r"(p));
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+	__asm__ __volatile__ (
+		"stwcx. %2, 0, %3 ; mfcr %0"
+		: "=r"(r), "=m"(*p) : "r"(v), "r"(p) : "memory", "cc");
+	return r & 0x20000000; /* "bit 2" of "cr0" (backwards bit order) */
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("sync" : : : "memory");
+}
+
+#define a_pre_llsc a_barrier
+
+#define a_post_llsc a_post_llsc
+static inline void a_post_llsc()
+{
+	__asm__ __volatile__ ("isync" : : : "memory");
+}
+
+#define a_clz_32 a_clz_32
+static inline int a_clz_32(uint32_t x)
+{
+	__asm__ ("cntlzw %0, %1" : "=r"(x) : "r"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/alltypes.h.in
new file mode 100644
index 0000000000..b48df6a625
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/alltypes.h.in
@@ -0,0 +1,20 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#define __BYTE_ORDER 4321
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+#ifdef __WCHAR_TYPE__
+TYPEDEF __WCHAR_TYPE__ wchar_t;
+#else
+TYPEDEF long wchar_t;
+#endif
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/errno.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/errno.h
new file mode 100644
index 0000000000..cae3f38650
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/errno.h
@@ -0,0 +1,134 @@
+#define EPERM            1
+#define ENOENT           2
+#define ESRCH            3
+#define EINTR            4
+#define EIO              5
+#define ENXIO            6
+#define E2BIG            7
+#define ENOEXEC          8
+#define EBADF            9
+#define ECHILD          10
+#define EAGAIN          11
+#define ENOMEM          12
+#define EACCES          13
+#define EFAULT          14
+#define ENOTBLK         15
+#define EBUSY           16
+#define EEXIST          17
+#define EXDEV           18
+#define ENODEV          19
+#define ENOTDIR         20
+#define EISDIR          21
+#define EINVAL          22
+#define ENFILE          23
+#define EMFILE          24
+#define ENOTTY          25
+#define ETXTBSY         26
+#define EFBIG           27
+#define ENOSPC          28
+#define ESPIPE          29
+#define EROFS           30
+#define EMLINK          31
+#define EPIPE           32
+#define EDOM            33
+#define ERANGE          34
+#define EDEADLK         35
+#define ENAMETOOLONG    36
+#define ENOLCK          37
+#define ENOSYS          38
+#define ENOTEMPTY       39
+#define ELOOP           40
+#define EWOULDBLOCK     EAGAIN
+#define ENOMSG          42
+#define EIDRM           43
+#define ECHRNG          44
+#define EL2NSYNC        45
+#define EL3HLT          46
+#define EL3RST          47
+#define ELNRNG          48
+#define EUNATCH         49
+#define ENOCSI          50
+#define EL2HLT          51
+#define EBADE           52
+#define EBADR           53
+#define EXFULL          54
+#define ENOANO          55
+#define EBADRQC         56
+#define EBADSLT         57
+#define EDEADLOCK       58
+#define EBFONT          59
+#define ENOSTR          60
+#define ENODATA         61
+#define ETIME           62
+#define ENOSR           63
+#define ENONET          64
+#define ENOPKG          65
+#define EREMOTE         66
+#define ENOLINK         67
+#define EADV            68
+#define ESRMNT          69
+#define ECOMM           70
+#define EPROTO          71
+#define EMULTIHOP       72
+#define EDOTDOT         73
+#define EBADMSG         74
+#define EOVERFLOW       75
+#define ENOTUNIQ        76
+#define EBADFD          77
+#define EREMCHG         78
+#define ELIBACC         79
+#define ELIBBAD         80
+#define ELIBSCN         81
+#define ELIBMAX         82
+#define ELIBEXEC        83
+#define EILSEQ          84
+#define ERESTART        85
+#define ESTRPIPE        86
+#define EUSERS          87
+#define ENOTSOCK        88
+#define EDESTADDRREQ    89
+#define EMSGSIZE        90
+#define EPROTOTYPE      91
+#define ENOPROTOOPT     92
+#define EPROTONOSUPPORT 93
+#define ESOCKTNOSUPPORT 94
+#define EOPNOTSUPP      95
+#define ENOTSUP         EOPNOTSUPP
+#define EPFNOSUPPORT    96
+#define EAFNOSUPPORT    97
+#define EADDRINUSE      98
+#define EADDRNOTAVAIL   99
+#define ENETDOWN        100
+#define ENETUNREACH     101
+#define ENETRESET       102
+#define ECONNABORTED    103
+#define ECONNRESET      104
+#define ENOBUFS         105
+#define EISCONN         106
+#define ENOTCONN        107
+#define ESHUTDOWN       108
+#define ETOOMANYREFS    109
+#define ETIMEDOUT       110
+#define ECONNREFUSED    111
+#define EHOSTDOWN       112
+#define EHOSTUNREACH    113
+#define EALREADY        114
+#define EINPROGRESS     115
+#define ESTALE          116
+#define EUCLEAN         117
+#define ENOTNAM         118
+#define ENAVAIL         119
+#define EISNAM          120
+#define EREMOTEIO       121
+#define EDQUOT          122
+#define ENOMEDIUM       123
+#define EMEDIUMTYPE     124
+#define ECANCELED       125
+#define ENOKEY          126
+#define EKEYEXPIRED     127
+#define EKEYREVOKED     128
+#define EKEYREJECTED    129
+#define EOWNERDEAD      130
+#define ENOTRECOVERABLE 131
+#define ERFKILL         132
+#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/fcntl.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/fenv.h
new file mode 100644
index 0000000000..c5a3e5c5c7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/fenv.h
@@ -0,0 +1,36 @@
+#ifdef _SOFT_FLOAT
+#define FE_ALL_EXCEPT 0
+#define FE_TONEAREST  0
+#else
+#define FE_TONEAREST	0
+#define FE_TOWARDZERO	1
+#define FE_UPWARD	2
+#define FE_DOWNWARD	3
+
+#define FE_INEXACT	0x02000000
+#define FE_DIVBYZERO	0x04000000
+#define FE_UNDERFLOW	0x08000000
+#define FE_OVERFLOW	0x10000000
+#define FE_INVALID	0x20000000
+
+#define FE_ALL_EXCEPT	0x3e000000
+
+#ifdef _GNU_SOURCE
+#define FE_INVALID_SNAN		0x01000000
+#define FE_INVALID_ISI		0x00800000
+#define FE_INVALID_IDI		0x00400000
+#define FE_INVALID_ZDZ		0x00200000
+#define FE_INVALID_IMZ		0x00100000
+#define FE_INVALID_COMPARE	0x00080000
+#define FE_INVALID_SOFTWARE	0x00000400
+#define FE_INVALID_SQRT		0x00000200
+#define FE_INVALID_INTEGER_CONVERSION	0x00000100
+
+#define FE_ALL_INVALID		0x01f80700
+#endif
+#endif
+
+typedef unsigned fexcept_t;
+typedef double fenv_t;
+
+#define FE_DFL_ENV ((const fenv_t *)-1)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/float.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/hwcap.h
new file mode 100644
index 0000000000..803de9b5be
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/hwcap.h
@@ -0,0 +1,43 @@
+#define PPC_FEATURE_32			0x80000000
+#define PPC_FEATURE_64			0x40000000
+#define PPC_FEATURE_601_INSTR		0x20000000
+#define PPC_FEATURE_HAS_ALTIVEC		0x10000000
+#define PPC_FEATURE_HAS_FPU		0x08000000
+#define PPC_FEATURE_HAS_MMU		0x04000000
+#define PPC_FEATURE_HAS_4xxMAC		0x02000000
+#define PPC_FEATURE_UNIFIED_CACHE	0x01000000
+#define PPC_FEATURE_HAS_SPE		0x00800000
+#define PPC_FEATURE_HAS_EFP_SINGLE	0x00400000
+#define PPC_FEATURE_HAS_EFP_DOUBLE	0x00200000
+#define PPC_FEATURE_NO_TB		0x00100000
+#define PPC_FEATURE_POWER4		0x00080000
+#define PPC_FEATURE_POWER5		0x00040000
+#define PPC_FEATURE_POWER5_PLUS		0x00020000
+#define PPC_FEATURE_CELL		0x00010000
+#define PPC_FEATURE_BOOKE		0x00008000
+#define PPC_FEATURE_SMT			0x00004000
+#define PPC_FEATURE_ICACHE_SNOOP	0x00002000
+#define PPC_FEATURE_ARCH_2_05		0x00001000
+#define PPC_FEATURE_PA6T		0x00000800
+#define PPC_FEATURE_HAS_DFP		0x00000400
+#define PPC_FEATURE_POWER6_EXT		0x00000200
+#define PPC_FEATURE_ARCH_2_06		0x00000100
+#define PPC_FEATURE_HAS_VSX		0x00000080
+#define PPC_FEATURE_PSERIES_PERFMON_COMPAT 0x00000040
+
+#define PPC_FEATURE_TRUE_LE		0x00000002
+#define PPC_FEATURE_PPC_LE		0x00000001
+
+#define PPC_FEATURE2_ARCH_2_07		0x80000000
+#define PPC_FEATURE2_HTM		0x40000000
+#define PPC_FEATURE2_DSCR		0x20000000
+#define PPC_FEATURE2_EBB		0x10000000
+#define PPC_FEATURE2_ISEL		0x08000000
+#define PPC_FEATURE2_TAR		0x04000000
+#define PPC_FEATURE2_VEC_CRYPTO		0x02000000
+#define PPC_FEATURE2_HTM_NOSC		0x01000000
+#define PPC_FEATURE2_ARCH_3_00		0x00800000
+#define PPC_FEATURE2_HAS_IEEE128	0x00400000
+#define PPC_FEATURE2_DARN		0x00200000
+#define PPC_FEATURE2_SCV		0x00100000
+#define PPC_FEATURE2_HTM_NO_SUSPEND	0x00080000
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ioctl.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ioctl.h
new file mode 100644
index 0000000000..ac9bfd204a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ioctl.h
@@ -0,0 +1,120 @@
+#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  1U
+#define _IOC_WRITE 4U
+#define _IOC_READ  2U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+
+#define FIONCLEX	_IO('f', 2)
+#define FIOCLEX		_IO('f', 1)
+#define FIOASYNC	_IOW('f', 125, int)
+#define FIONBIO		_IOW('f', 126, int)
+#define FIONREAD	_IOR('f', 127, int)
+#define TIOCINQ		FIONREAD
+#define FIOQSIZE	_IOR('f', 128, char[8])
+#define TIOCGETP	_IOR('t', 8, char[6])
+#define TIOCSETP	_IOW('t', 9, char[6])
+#define TIOCSETN	_IOW('t', 10, char[6])
+
+#define TIOCSETC	_IOW('t', 17, char[6])
+#define TIOCGETC	_IOR('t', 18, char[6])
+#define TCGETS		_IOR('t', 19, char[44])
+#define TCSETS		_IOW('t', 20, char[44])
+#define TCSETSW		_IOW('t', 21, char[44])
+#define TCSETSF		_IOW('t', 22, char[44])
+
+#define TCGETA		_IOR('t', 23, char[20])
+#define TCSETA		_IOW('t', 24, char[20])
+#define TCSETAW		_IOW('t', 25, char[20])
+#define TCSETAF		_IOW('t', 28, char[20])
+
+#define TCSBRK		_IO('t', 29)
+#define TCXONC		_IO('t', 30)
+#define TCFLSH		_IO('t', 31)
+
+#define TIOCSWINSZ	_IOW('t', 103, char[8])
+#define TIOCGWINSZ	_IOR('t', 104, char[8])
+#define TIOCSTART	_IO('t', 110)
+#define TIOCSTOP	_IO('t', 111)
+
+#define TIOCOUTQ	_IOR('t', 115, int)
+
+#define TIOCGLTC	_IOR('t', 116, char[6])
+#define TIOCSLTC	_IOW('t', 117, char[6])
+#define TIOCSPGRP	_IOW('t', 118, int)
+#define TIOCGPGRP	_IOR('t', 119, int)
+
+#define TIOCEXCL	0x540C
+#define TIOCNXCL	0x540D
+#define TIOCSCTTY	0x540E
+
+#define TIOCSTI		0x5412
+#define TIOCMGET	0x5415
+#define TIOCMBIS	0x5416
+#define TIOCMBIC	0x5417
+#define TIOCMSET	0x5418
+#define TIOCM_LE	0x001
+#define TIOCM_DTR	0x002
+#define TIOCM_RTS	0x004
+#define TIOCM_ST	0x008
+#define TIOCM_SR	0x010
+#define TIOCM_CTS	0x020
+#define TIOCM_CAR	0x040
+#define TIOCM_RNG	0x080
+#define TIOCM_DSR	0x100
+#define TIOCM_CD	TIOCM_CAR
+#define TIOCM_RI	TIOCM_RNG
+#define TIOCM_OUT1	0x2000
+#define TIOCM_OUT2	0x4000
+#define TIOCM_LOOP	0x8000
+
+#define TIOCGSOFTCAR	0x5419
+#define TIOCSSOFTCAR	0x541A
+#define TIOCLINUX	0x541C
+#define TIOCCONS	0x541D
+#define TIOCGSERIAL	0x541E
+#define TIOCSSERIAL	0x541F
+#define TIOCPKT	0x5420
+
+#define TIOCNOTTY	0x5422
+#define TIOCSETD	0x5423
+#define TIOCGETD	0x5424
+#define TCSBRKP		0x5425
+#define TIOCSBRK	0x5427
+#define TIOCCBRK	0x5428
+#define TIOCGSID	0x5429
+#define TIOCGRS485	0x542e
+#define TIOCSRS485	0x542f
+#define TIOCGPTN	_IOR('T',0x30, unsigned int)
+#define TIOCSPTLCK	_IOW('T',0x31, int)
+#define TIOCGDEV	_IOR('T',0x32, unsigned int)
+#define TIOCSIG		_IOW('T',0x36, int)
+#define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int)
+#define TIOCGPTLCK	_IOR('T', 0x39, int)
+#define TIOCGEXCL	_IOR('T', 0x40, int)
+#define TIOCGPTPEER	_IO('T', 0x41)
+
+#define TIOCSERCONFIG	0x5453
+#define TIOCSERGWILD	0x5454
+#define TIOCSERSWILD	0x5455
+#define TIOCGLCKTRMIOS	0x5456
+#define TIOCSLCKTRMIOS	0x5457
+#define TIOCSERGSTRUCT	0x5458
+#define TIOCSERGETLSR	0x5459
+#define TIOCSERGETMULTI	0x545A
+#define TIOCSERSETMULTI	0x545B
+
+#define TIOCMIWAIT	0x545C
+#define TIOCGICOUNT	0x545D
+
+#define FIOSETOWN       0x8901
+#define SIOCSPGRP       0x8902
+#define FIOGETOWN       0x8903
+#define SIOCGPGRP       0x8904
+#define SIOCATMARK      0x8905
+#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
+#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ipc.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ipc.h
new file mode 100644
index 0000000000..a388d56b5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ipc.h
@@ -0,0 +1,12 @@
+struct ipc_perm {
+	key_t __ipc_perm_key;
+	uid_t uid;
+	gid_t gid;
+	uid_t cuid;
+	gid_t cgid;
+	mode_t mode;
+	int __ipc_perm_seq;
+	int __pad1;
+	long long __pad2;
+	long long __pad3;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/mman.h
new file mode 100644
index 0000000000..b3a675a822
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/mman.h
@@ -0,0 +1,14 @@
+#define PROT_SAO       0x10
+
+#undef MAP_NORESERVE
+#define MAP_NORESERVE   0x40
+#undef MAP_LOCKED
+#define MAP_LOCKED	0x80
+#undef MAP_SYNC
+
+#undef MCL_CURRENT
+#define MCL_CURRENT     0x2000
+#undef MCL_FUTURE
+#define MCL_FUTURE      0x4000
+#undef MCL_ONFAULT
+#define MCL_ONFAULT     0x8000
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/msg.h
new file mode 100644
index 0000000000..9fb15dccb2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/msg.h
@@ -0,0 +1,18 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/posix.h
new file mode 100644
index 0000000000..30a38714f3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/posix.h
@@ -0,0 +1,2 @@
+#define _POSIX_V6_ILP32_OFFBIG  1
+#define _POSIX_V7_ILP32_OFFBIG  1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ptrace.h
new file mode 100644
index 0000000000..303a0735ef
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/ptrace.h
@@ -0,0 +1,25 @@
+#define PTRACE_GETVRREGS	0x12
+#define PTRACE_SETVRREGS	0x13
+#define PTRACE_GETEVRREGS	0x14
+#define PTRACE_SETEVRREGS	0x15
+#define PTRACE_GETREGS64	0x16
+#define PTRACE_SETREGS64	0x17
+#define PTRACE_GET_DEBUGREG	0x19
+#define PTRACE_SET_DEBUGREG	0x1a
+#define PTRACE_GETVSRREGS	0x1b
+#define PTRACE_SETVSRREGS	0x1c
+#define PTRACE_SYSEMU		0x1d
+#define PTRACE_SYSEMU_SINGLESTEP	0x1e
+#define PTRACE_SINGLEBLOCK	0x100
+
+#define PT_GETVRREGS PTRACE_GETVRREGS
+#define PT_SETVRREGS PTRACE_SETVRREGS
+#define PT_GETEVRREGS PTRACE_GETEVRREGS
+#define PT_SETEVRREGS PTRACE_SETEVRREGS
+#define PT_GETREGS64 PTRACE_GETREGS64
+#define PT_SETREGS64 PTRACE_SETREGS64
+#define PT_GET_DEBUGREG PTRACE_GET_DEBUGREG
+#define PT_SET_DEBUGREG PTRACE_SET_DEBUGREG
+#define PT_GETVSRREGS PTRACE_GETVSRREGS
+#define PT_SETVSRREGS PTRACE_SETVSRREGS
+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/sem.h
new file mode 100644
index 0000000000..28be484528
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/sem.h
@@ -0,0 +1,12 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_ctime_hi;
+	unsigned long __sem_ctime_lo;
+	unsigned short __sem_nsems_pad, sem_nsems;
+	long __unused3;
+	long __unused4;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/shm.h
new file mode 100644
index 0000000000..fb1d4020f6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/shm.h
@@ -0,0 +1,30 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	unsigned long __shm_atime_hi;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_dtime_hi;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_ctime_hi;
+	unsigned long __shm_ctime_lo;
+	size_t shm_segsz;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/signal.h
new file mode 100644
index 0000000000..c1bf3caf34
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/signal.h
@@ -0,0 +1,119 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 4096
+#define SIGSTKSZ 10240
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+typedef unsigned long greg_t, gregset_t[48];
+
+typedef struct {
+	double fpregs[32];
+	double fpscr;
+	unsigned _pad[2];
+} fpregset_t;
+
+typedef struct {
+	unsigned vrregs[32][4];
+	unsigned vrsave;
+	unsigned _pad[2];
+	unsigned vscr;
+} vrregset_t;
+
+struct sigcontext {
+	unsigned long _unused[4];
+	int signal;
+	unsigned long handler;
+	unsigned long oldmask;
+	struct pt_regs *regs;
+};
+
+typedef struct {
+	gregset_t gregs;
+	fpregset_t fpregs;
+	vrregset_t vrregs
+#ifdef __GNUC__
+	__attribute__((__aligned__(16)))
+#endif
+	;
+} mcontext_t;
+
+#else
+
+typedef struct {
+	long __regs[48+68+4*32+4]
+#ifdef __GNUC__
+	__attribute__((__aligned__(16)))
+#endif
+	;
+} mcontext_t;
+
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	int uc_pad[7];
+	mcontext_t *uc_regs;
+	sigset_t uc_sigmask;
+        int             uc_pad2[3];
+	mcontext_t uc_mcontext;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1U
+#define SA_NOCLDWAIT  2U
+#define SA_SIGINFO    4U
+#define SA_ONSTACK    0x08000000U
+#define SA_RESTART    0x10000000U
+#define SA_NODEFER    0x40000000U
+#define SA_RESETHAND  0x80000000U
+#define SA_RESTORER   0x04000000U
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/socket.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/socket.h
new file mode 100644
index 0000000000..b19ed42bfa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/socket.h
@@ -0,0 +1,25 @@
+#define SO_DEBUG        1
+#define SO_REUSEADDR    2
+#define SO_TYPE         3
+#define SO_ERROR        4
+#define SO_DONTROUTE    5
+#define SO_BROADCAST    6
+#define SO_SNDBUF       7
+#define SO_RCVBUF       8
+#define SO_KEEPALIVE    9
+#define SO_OOBINLINE    10
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_LINGER       13
+#define SO_BSDCOMPAT    14
+#define SO_REUSEPORT    15
+#define SO_RCVLOWAT     16
+#define SO_SNDLOWAT     17
+#define SO_PASSCRED     20
+#define SO_PEERCRED     21
+#define SO_ACCEPTCONN   30
+#define SO_PEERSEC      31
+#define SO_SNDBUFFORCE  32
+#define SO_RCVBUFFORCE  33
+#define SO_PROTOCOL     38
+#define SO_DOMAIN       39
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/stat.h
new file mode 100644
index 0000000000..585d98e908
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/stat.h
@@ -0,0 +1,24 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	short __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	unsigned __unused[2];
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/stdint.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/syscall.h.in
new file mode 100644
index 0000000000..8d4f79b524
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/syscall.h.in
@@ -0,0 +1,418 @@
+#define __NR_restart_syscall          0
+#define __NR_exit                     1
+#define __NR_fork                     2
+#define __NR_read                     3
+#define __NR_write                    4
+#define __NR_open                     5
+#define __NR_close                    6
+#define __NR_waitpid                  7
+#define __NR_creat                    8
+#define __NR_link                     9
+#define __NR_unlink                  10
+#define __NR_execve                  11
+#define __NR_chdir                   12
+#define __NR_time                    13
+#define __NR_mknod                   14
+#define __NR_chmod                   15
+#define __NR_lchown                  16
+#define __NR_break                   17
+#define __NR_oldstat                 18
+#define __NR_lseek                   19
+#define __NR_getpid                  20
+#define __NR_mount                   21
+#define __NR_umount                  22
+#define __NR_setuid                  23
+#define __NR_getuid                  24
+#define __NR_stime                   25
+#define __NR_ptrace                  26
+#define __NR_alarm                   27
+#define __NR_oldfstat                28
+#define __NR_pause                   29
+#define __NR_utime                   30
+#define __NR_stty                    31
+#define __NR_gtty                    32
+#define __NR_access                  33
+#define __NR_nice                    34
+#define __NR_ftime                   35
+#define __NR_sync                    36
+#define __NR_kill                    37
+#define __NR_rename                  38
+#define __NR_mkdir                   39
+#define __NR_rmdir                   40
+#define __NR_dup                     41
+#define __NR_pipe                    42
+#define __NR_times                   43
+#define __NR_prof                    44
+#define __NR_brk                     45
+#define __NR_setgid                  46
+#define __NR_getgid                  47
+#define __NR_signal                  48
+#define __NR_geteuid                 49
+#define __NR_getegid                 50
+#define __NR_acct                    51
+#define __NR_umount2                 52
+#define __NR_lock                    53
+#define __NR_ioctl                   54
+#define __NR_fcntl                   55
+#define __NR_mpx                     56
+#define __NR_setpgid                 57
+#define __NR_ulimit                  58
+#define __NR_oldolduname             59
+#define __NR_umask                   60
+#define __NR_chroot                  61
+#define __NR_ustat                   62
+#define __NR_dup2                    63
+#define __NR_getppid                 64
+#define __NR_getpgrp                 65
+#define __NR_setsid                  66
+#define __NR_sigaction               67
+#define __NR_sgetmask                68
+#define __NR_ssetmask                69
+#define __NR_setreuid                70
+#define __NR_setregid                71
+#define __NR_sigsuspend              72
+#define __NR_sigpending              73
+#define __NR_sethostname             74
+#define __NR_setrlimit               75
+#define __NR_getrlimit               76
+#define __NR_getrusage               77
+#define __NR_gettimeofday_time32            78
+#define __NR_settimeofday_time32            79
+#define __NR_getgroups               80
+#define __NR_setgroups               81
+#define __NR_select                  82
+#define __NR_symlink                 83
+#define __NR_oldlstat                84
+#define __NR_readlink                85
+#define __NR_uselib                  86
+#define __NR_swapon                  87
+#define __NR_reboot                  88
+#define __NR_readdir                 89
+#define __NR_mmap                    90
+#define __NR_munmap                  91
+#define __NR_truncate                92
+#define __NR_ftruncate               93
+#define __NR_fchmod                  94
+#define __NR_fchown                  95
+#define __NR_getpriority             96
+#define __NR_setpriority             97
+#define __NR_profil                  98
+#define __NR_statfs                  99
+#define __NR_fstatfs                100
+#define __NR_ioperm                 101
+#define __NR_socketcall             102
+#define __NR_syslog                 103
+#define __NR_setitimer              104
+#define __NR_getitimer              105
+#define __NR_stat                   106
+#define __NR_lstat                  107
+#define __NR_fstat                  108
+#define __NR_olduname               109
+#define __NR_iopl                   110
+#define __NR_vhangup                111
+#define __NR_idle                   112
+#define __NR_vm86                   113
+#define __NR_wait4                  114
+#define __NR_swapoff                115
+#define __NR_sysinfo                116
+#define __NR_ipc                    117
+#define __NR_fsync                  118
+#define __NR_sigreturn              119
+#define __NR_clone                  120
+#define __NR_setdomainname          121
+#define __NR_uname                  122
+#define __NR_modify_ldt             123
+#define __NR_adjtimex               124
+#define __NR_mprotect               125
+#define __NR_sigprocmask            126
+#define __NR_create_module          127
+#define __NR_init_module            128
+#define __NR_delete_module          129
+#define __NR_get_kernel_syms        130
+#define __NR_quotactl               131
+#define __NR_getpgid                132
+#define __NR_fchdir                 133
+#define __NR_bdflush                134
+#define __NR_sysfs                  135
+#define __NR_personality            136
+#define __NR_afs_syscall            137
+#define __NR_setfsuid               138
+#define __NR_setfsgid               139
+#define __NR__llseek                140
+#define __NR_getdents               141
+#define __NR__newselect             142
+#define __NR_flock                  143
+#define __NR_msync                  144
+#define __NR_readv                  145
+#define __NR_writev                 146
+#define __NR_getsid                 147
+#define __NR_fdatasync              148
+#define __NR__sysctl                149
+#define __NR_mlock                  150
+#define __NR_munlock                151
+#define __NR_mlockall               152
+#define __NR_munlockall             153
+#define __NR_sched_setparam         154
+#define __NR_sched_getparam         155
+#define __NR_sched_setscheduler     156
+#define __NR_sched_getscheduler     157
+#define __NR_sched_yield            158
+#define __NR_sched_get_priority_max 159
+#define __NR_sched_get_priority_min 160
+#define __NR_sched_rr_get_interval  161
+#define __NR_nanosleep              162
+#define __NR_mremap                 163
+#define __NR_setresuid              164
+#define __NR_getresuid              165
+#define __NR_query_module           166
+#define __NR_poll                   167
+#define __NR_nfsservctl             168
+#define __NR_setresgid              169
+#define __NR_getresgid              170
+#define __NR_prctl                  171
+#define __NR_rt_sigreturn           172
+#define __NR_rt_sigaction           173
+#define __NR_rt_sigprocmask         174
+#define __NR_rt_sigpending          175
+#define __NR_rt_sigtimedwait        176
+#define __NR_rt_sigqueueinfo        177
+#define __NR_rt_sigsuspend          178
+#define __NR_pread64                179
+#define __NR_pwrite64               180
+#define __NR_chown                  181
+#define __NR_getcwd                 182
+#define __NR_capget                 183
+#define __NR_capset                 184
+#define __NR_sigaltstack            185
+#define __NR_sendfile               186
+#define __NR_getpmsg                187
+#define __NR_putpmsg                188
+#define __NR_vfork                  189
+#define __NR_ugetrlimit             190
+#define __NR_readahead              191
+#define __NR_mmap2                  192
+#define __NR_truncate64             193
+#define __NR_ftruncate64            194
+#define __NR_stat64                 195
+#define __NR_lstat64                196
+#define __NR_fstat64                197
+#define __NR_pciconfig_read         198
+#define __NR_pciconfig_write        199
+#define __NR_pciconfig_iobase       200
+#define __NR_multiplexer            201
+#define __NR_getdents64             202
+#define __NR_pivot_root             203
+#define __NR_fcntl64                204
+#define __NR_madvise                205
+#define __NR_mincore                206
+#define __NR_gettid                 207
+#define __NR_tkill                  208
+#define __NR_setxattr               209
+#define __NR_lsetxattr              210
+#define __NR_fsetxattr              211
+#define __NR_getxattr               212
+#define __NR_lgetxattr              213
+#define __NR_fgetxattr              214
+#define __NR_listxattr              215
+#define __NR_llistxattr             216
+#define __NR_flistxattr             217
+#define __NR_removexattr            218
+#define __NR_lremovexattr           219
+#define __NR_fremovexattr           220
+#define __NR_futex                  221
+#define __NR_sched_setaffinity      222
+#define __NR_sched_getaffinity      223
+#define __NR_tuxcall                225
+#define __NR_sendfile64             226
+#define __NR_io_setup               227
+#define __NR_io_destroy             228
+#define __NR_io_getevents           229
+#define __NR_io_submit              230
+#define __NR_io_cancel              231
+#define __NR_set_tid_address        232
+#define __NR_fadvise64              233
+#define __NR_exit_group             234
+#define __NR_lookup_dcookie         235
+#define __NR_epoll_create           236
+#define __NR_epoll_ctl              237
+#define __NR_epoll_wait             238
+#define __NR_remap_file_pages       239
+#define __NR_timer_create           240
+#define __NR_timer_settime32          241
+#define __NR_timer_gettime32          242
+#define __NR_timer_getoverrun       243
+#define __NR_timer_delete           244
+#define __NR_clock_settime32          245
+#define __NR_clock_gettime32          246
+#define __NR_clock_getres_time32           247
+#define __NR_clock_nanosleep_time32        248
+#define __NR_swapcontext            249
+#define __NR_tgkill                 250
+#define __NR_utimes                 251
+#define __NR_statfs64               252
+#define __NR_fstatfs64              253
+#define __NR_fadvise64_64           254
+#define __NR_rtas		255
+#define __NR_sys_debug_setcontext 256
+#define __NR_migrate_pages	258
+#define __NR_mbind		259
+#define __NR_get_mempolicy	260
+#define __NR_set_mempolicy	261
+#define __NR_mq_open		262
+#define __NR_mq_unlink		263
+#define __NR_mq_timedsend	264
+#define __NR_mq_timedreceive	265
+#define __NR_mq_notify		266
+#define __NR_mq_getsetattr	267
+#define __NR_kexec_load		268
+#define __NR_add_key		269
+#define __NR_request_key	270
+#define __NR_keyctl		271
+#define __NR_waitid		272
+#define __NR_ioprio_set		273
+#define __NR_ioprio_get		274
+#define __NR_inotify_init	275
+#define __NR_inotify_add_watch	276
+#define __NR_inotify_rm_watch	277
+#define __NR_spu_run		278
+#define __NR_spu_create		279
+#define __NR_pselect6		280
+#define __NR_ppoll		281
+#define __NR_unshare		282
+#define __NR_splice		283
+#define __NR_tee		284
+#define __NR_vmsplice		285
+#define __NR_openat		286
+#define __NR_mkdirat		287
+#define __NR_mknodat		288
+#define __NR_fchownat		289
+#define __NR_futimesat		290
+#define __NR_fstatat64		291
+#define __NR_unlinkat		292
+#define __NR_renameat		293
+#define __NR_linkat		294
+#define __NR_symlinkat		295
+#define __NR_readlinkat		296
+#define __NR_fchmodat		297
+#define __NR_faccessat		298
+#define __NR_get_robust_list	299
+#define __NR_set_robust_list	300
+#define __NR_move_pages		301
+#define __NR_getcpu		302
+#define __NR_epoll_pwait	303
+#define __NR_utimensat		304
+#define __NR_signalfd		305
+#define __NR_timerfd_create     306
+#define __NR_eventfd		307
+#define __NR_sync_file_range2	308
+#define __NR_fallocate		309
+#define __NR_subpage_prot		310
+#define __NR_timerfd_settime32	311
+#define __NR_timerfd_gettime32	312
+#define __NR_signalfd4		313
+#define __NR_eventfd2		314
+#define __NR_epoll_create1	315
+#define __NR_dup3			316
+#define __NR_pipe2		317
+#define __NR_inotify_init1	318
+#define __NR_perf_event_open       319
+#define __NR_preadv                320
+#define __NR_pwritev               321
+#define __NR_rt_tgsigqueueinfo     322
+#define __NR_fanotify_init         323
+#define __NR_fanotify_mark         324
+#define __NR_prlimit64             325
+#define __NR_socket                326
+#define __NR_bind                  327
+#define __NR_connect               328
+#define __NR_listen                329
+#define __NR_accept                330
+#define __NR_getsockname           331
+#define __NR_getpeername           332
+#define __NR_socketpair            333
+#define __NR_send                  334
+#define __NR_sendto                335
+#define __NR_recv                  336
+#define __NR_recvfrom              337
+#define __NR_shutdown              338
+#define __NR_setsockopt            339
+#define __NR_getsockopt            340
+#define __NR_sendmsg               341
+#define __NR_recvmsg               342
+#define __NR_recvmmsg              343
+#define __NR_accept4               344
+#define __NR_name_to_handle_at     345
+#define __NR_open_by_handle_at     346
+#define __NR_clock_adjtime         347
+#define __NR_syncfs                348
+#define __NR_sendmmsg              349
+#define __NR_setns                 350
+#define __NR_process_vm_readv      351
+#define __NR_process_vm_writev     352
+#define __NR_finit_module          353
+#define __NR_kcmp                  354
+#define __NR_sched_setattr         355
+#define __NR_sched_getattr         356
+#define __NR_renameat2             357
+#define __NR_seccomp               358
+#define __NR_getrandom             359
+#define __NR_memfd_create          360
+#define __NR_bpf                   361
+#define __NR_execveat              362
+#define __NR_switch_endian         363
+#define __NR_userfaultfd           364
+#define __NR_membarrier            365
+#define __NR_mlock2                378
+#define __NR_copy_file_range       379
+#define __NR_preadv2               380
+#define __NR_pwritev2              381
+#define __NR_kexec_file_load       382
+#define __NR_statx                 383
+#define __NR_pkey_alloc            384
+#define __NR_pkey_free             385
+#define __NR_pkey_mprotect         386
+#define __NR_rseq                  387
+#define __NR_io_pgetevents         388
+#define __NR_semget                393
+#define __NR_semctl                394
+#define __NR_shmget                395
+#define __NR_shmctl                396
+#define __NR_shmat                 397
+#define __NR_shmdt                 398
+#define __NR_msgget                399
+#define __NR_msgsnd                400
+#define __NR_msgrcv                401
+#define __NR_msgctl                402
+#define __NR_clock_gettime64       403
+#define __NR_clock_settime64       404
+#define __NR_clock_adjtime64       405
+#define __NR_clock_getres_time64   406
+#define __NR_clock_nanosleep_time64 407
+#define __NR_timer_gettime64       408
+#define __NR_timer_settime64       409
+#define __NR_timerfd_gettime64     410
+#define __NR_timerfd_settime64     411
+#define __NR_utimensat_time64      412
+#define __NR_pselect6_time64       413
+#define __NR_ppoll_time64          414
+#define __NR_io_pgetevents_time64  416
+#define __NR_recvmmsg_time64       417
+#define __NR_mq_timedsend_time64   418
+#define __NR_mq_timedreceive_time64 419
+#define __NR_semtimedop_time64     420
+#define __NR_rt_sigtimedwait_time64 421
+#define __NR_futex_time64          422
+#define __NR_sched_rr_get_interval_time64 423
+#define __NR_pidfd_send_signal     424
+#define __NR_io_uring_setup        425
+#define __NR_io_uring_enter        426
+#define __NR_io_uring_register     427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/termios.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/termios.h
new file mode 100644
index 0000000000..da1f406bcb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/termios.h
@@ -0,0 +1,171 @@
+#undef NCCS
+#define NCCS 19
+struct termios {
+	tcflag_t c_iflag;
+	tcflag_t c_oflag;
+	tcflag_t c_cflag;
+	tcflag_t c_lflag;
+	cc_t c_cc[NCCS];
+	cc_t c_line;
+	speed_t __c_ispeed;
+	speed_t __c_ospeed;
+};
+
+#define VINTR     0
+#define VQUIT     1
+#define VERASE    2
+#define VKILL     3
+#define VEOF      4
+#define VMIN      5
+#define VEOL      6
+#define VTIME     7
+#define VEOL2     8
+#define VSWTC     9
+#define VWERASE  10
+#define VREPRINT 11
+#define VSUSP    12
+#define VSTART   13
+#define VSTOP    14
+#define VLNEXT   15
+#define VDISCARD 16
+
+#define IGNBRK  0000001
+#define BRKINT  0000002
+#define IGNPAR  0000004
+#define PARMRK  0000010
+#define INPCK   0000020
+#define ISTRIP  0000040
+#define INLCR   0000100
+#define IGNCR   0000200
+#define ICRNL   0000400
+#define IXON    0001000
+#define IXOFF   0002000
+#define IXANY   0004000
+#define IUCLC   0010000
+#define IMAXBEL 0020000
+#define IUTF8   0040000
+
+#define OPOST  0000001
+#define ONLCR  0000002
+#define OLCUC  0000004
+#define OCRNL  0000010
+#define ONOCR  0000020
+#define ONLRET 0000040
+#define OFILL  0000100
+#define OFDEL  0000200
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE)
+#define NLDLY  0001400
+#define NL0    0000000
+#define NL1    0000400
+#define NL2    0001000
+#define NL3    0001400
+#define TABDLY 0006000
+#define TAB0   0000000
+#define TAB1   0002000
+#define TAB2   0004000
+#define TAB3   0006000
+#define CRDLY  0030000
+#define CR0    0000000
+#define CR1    0010000
+#define CR2    0020000
+#define CR3    0030000
+#define FFDLY  0040000
+#define FF0    0000000
+#define FF1    0040000
+#define BSDLY  0100000
+#define BS0    0000000
+#define BS1    0100000
+#endif
+
+#define VTDLY  0200000
+#define VT0    0000000
+#define VT1    0200000
+
+#define B0       0000000
+#define B50      0000001
+#define B75      0000002
+#define B110     0000003
+#define B134     0000004
+#define B150     0000005
+#define B200     0000006
+#define B300     0000007
+#define B600     0000010
+#define B1200    0000011
+#define B1800    0000012
+#define B2400    0000013
+#define B4800    0000014
+#define B9600    0000015
+#define B19200   0000016
+#define B38400   0000017
+
+#define B57600   00020
+#define B115200  00021
+#define B230400  00022
+#define B460800  00023
+#define B500000  00024
+#define B576000  00025
+#define B921600  00026
+#define B1000000 00027
+#define B1152000 00030
+#define B1500000 00031
+#define B2000000 00032
+#define B2500000 00033
+#define B3000000 00034
+#define B3500000 00035
+#define B4000000 00036
+
+#define CSIZE  00001400
+#define CS5    00000000
+#define CS6    00000400
+#define CS7    00001000
+#define CS8    00001400
+#define CSTOPB 00002000
+#define CREAD  00004000
+#define PARENB 00010000
+#define PARODD 00020000
+#define HUPCL  00040000
+#define CLOCAL 00100000
+
+#define ECHOE   0x00000002
+#define ECHOK   0x00000004
+#define ECHO    0x00000008
+#define ECHONL  0x00000010
+#define ISIG    0x00000080
+#define ICANON  0x00000100
+#define IEXTEN  0x00000400
+#define TOSTOP  0x00400000
+#define NOFLSH  0x80000000
+
+#define TCOOFF 0
+#define TCOON  1
+#define TCIOFF 2
+#define TCION  3
+
+#define TCIFLUSH  0
+#define TCOFLUSH  1
+#define TCIOFLUSH 2
+
+#define TCSANOW   0
+#define TCSADRAIN 1
+#define TCSAFLUSH 2
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA    0000016
+#define EXTB    0000017
+#define CBAUD   00377
+#define CBAUDEX 0000020
+#define CIBAUD  077600000
+#define CMSPAR  010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE   0x00004000
+#define ECHOCTL 0x00000040
+#define ECHOPRT 0x00000020
+#define ECHOKE  0x00000001
+#define FLUSHO  0x00800000
+#define PENDIN  0x20000000
+#define EXTPROC 0x10000000
+
+#define XTABS   00006000
+#define TIOCSER_TEMT 1
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/user.h
new file mode 100644
index 0000000000..7f52874632
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/bits/user.h
@@ -0,0 +1,23 @@
+struct user {
+	struct {
+		unsigned long gpr[32], nip, msr, orig_gpr3, ctr, link, xer, ccr, mq;
+		unsigned long trap, dar, dsisr, result;
+	} regs;
+	unsigned long u_tsize, u_dsize, u_ssize;
+	unsigned long start_code, start_data, start_stack;
+	long signal;
+	void *u_ar0;
+	unsigned long magic;
+	char u_comm[32];
+};
+
+#define ELF_NGREG 48
+#define ELF_NFPREG 33
+#define ELF_NVRREG 33
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+typedef double elf_fpreg_t, elf_fpregset_t[ELF_NFPREG];
+typedef struct { unsigned u[4]; }
+#ifdef __GNUC__
+__attribute__((__aligned__(16)))
+#endif
+	elf_vrreg_t, elf_vrregset_t[ELF_NVRREG];
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/kstat.h
new file mode 100644
index 0000000000..5a611e7b38
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/kstat.h
@@ -0,0 +1,20 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	short __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	unsigned __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/pthread_arch.h
new file mode 100644
index 0000000000..ae0f28d6d1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/pthread_arch.h
@@ -0,0 +1,18 @@
+static inline struct pthread *__pthread_self()
+{
+	register char *tp __asm__("r2");
+	__asm__ ("" : "=r" (tp) );
+	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
+}
+                        
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
+
+#define DTP_OFFSET 0x8000
+
+// the kernel calls the ip "nip", it's the first saved value after the 32
+// GPRs.
+#define MC_PC gregs[32]
+
+#define CANARY canary_at_end
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/reloc.h
new file mode 100644
index 0000000000..527b6b7cdc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/reloc.h
@@ -0,0 +1,31 @@
+#ifdef _SOFT_FLOAT
+#define FP_SUFFIX "-sf"
+#else
+#define FP_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "powerpc" FP_SUFFIX
+
+#define TPOFF_K (-0x7000)
+
+#define REL_SYMBOLIC    R_PPC_ADDR32
+#define REL_USYMBOLIC   R_PPC_UADDR32
+#define REL_GOT         R_PPC_GLOB_DAT
+#define REL_PLT         R_PPC_JMP_SLOT
+#define REL_RELATIVE    R_PPC_RELATIVE
+#define REL_COPY        R_PPC_COPY
+#define REL_DTPMOD      R_PPC_DTPMOD32
+#define REL_DTPOFF      R_PPC_DTPREL32
+#define REL_TPOFF       R_PPC_TPREL32
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mr 1,%1 ; mtlr %0 ; blr" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym " \n" \
+	"	bl 1f \n" \
+	"	.long " #sym "-. \n" \
+	"1:	mflr %1 \n" \
+	"	lwz %0, 0(%1) \n" \
+	"	add %0, %0, %1 \n" \
+	: "=r"(*(fp)), "=r"((int){0}) : : "memory", "lr" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc/syscall_arch.h
new file mode 100644
index 0000000000..ede97c1c08
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc/syscall_arch.h
@@ -0,0 +1,94 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
+
+static inline long __syscall0(long n)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3");
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "=r"(r3)
+	:: "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3)
+	:: "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4)
+	:: "memory", "cr0", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5)
+	:: "memory", "cr0", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	register long r6 __asm__("r6") = d;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5), "+r"(r6)
+	:: "memory", "cr0", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	register long r6 __asm__("r6") = d;
+	register long r7 __asm__("r7") = e;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5), "+r"(r6), "+r"(r7)
+	:: "memory", "cr0", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	register long r6 __asm__("r6") = d;
+	register long r7 __asm__("r7") = e;
+	register long r8 __asm__("r8") = f;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5), "+r"(r6), "+r"(r7), "+r"(r8)
+	:: "memory", "cr0", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+#define SYSCALL_FADVISE_6_ARG
+
+#define SO_RCVTIMEO_OLD  18
+#define SO_SNDTIMEO_OLD  19
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/atomic_arch.h
new file mode 100644
index 0000000000..2bed82be2c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/atomic_arch.h
@@ -0,0 +1,62 @@
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+	__asm__ __volatile__ ("lwarx %0, 0, %2" : "=r"(v) : "m"(*p), "r"(p));
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+	__asm__ __volatile__ (
+		"stwcx. %2, 0, %3 ; mfcr %0"
+		: "=r"(r), "=m"(*p) : "r"(v), "r"(p) : "memory", "cc");
+	return r & 0x20000000; /* "bit 2" of "cr0" (backwards bit order) */
+}
+
+#define a_ll_p a_ll_p
+static inline void *a_ll_p(volatile void *p)
+{
+	void *v;
+	__asm__ __volatile__ ("ldarx %0, 0, %2" : "=r"(v) : "m"(*(void *volatile *)p), "r"(p));
+	return v;
+}
+
+#define a_sc_p a_sc_p
+static inline int a_sc_p(volatile void *p, void *v)
+{
+	int r;
+	__asm__ __volatile__ (
+		"stdcx. %2, 0, %3 ; mfcr %0"
+		: "=r"(r), "=m"(*(void *volatile *)p) : "r"(v), "r"(p) : "memory", "cc");
+	return r & 0x20000000; /* "bit 2" of "cr0" (backwards bit order) */
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("sync" : : : "memory");
+}
+
+#define a_pre_llsc a_barrier
+
+#define a_post_llsc a_post_llsc
+static inline void a_post_llsc()
+{
+	__asm__ __volatile__ ("isync" : : : "memory");
+}
+
+#define a_crash a_crash
+static inline void a_crash()
+{
+	__asm__ __volatile__ (".long 0");
+}
+
+#define a_clz_64 a_clz_64
+static inline int a_clz_64(uint64_t x)
+{
+	__asm__ ("cntlzd %0, %1" : "=r"(x) : "r"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/alltypes.h.in
new file mode 100644
index 0000000000..143ffa8d25
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/alltypes.h.in
@@ -0,0 +1,20 @@
+#define _Addr long
+#define _Int64 long
+#define _Reg long
+
+#if __BIG_ENDIAN__
+#define __BYTE_ORDER 4321
+#else
+#define __BYTE_ORDER 1234
+#endif
+
+#define __LONG_MAX 0x7fffffffffffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/errno.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/errno.h
new file mode 100644
index 0000000000..cae3f38650
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/errno.h
@@ -0,0 +1,134 @@
+#define EPERM            1
+#define ENOENT           2
+#define ESRCH            3
+#define EINTR            4
+#define EIO              5
+#define ENXIO            6
+#define E2BIG            7
+#define ENOEXEC          8
+#define EBADF            9
+#define ECHILD          10
+#define EAGAIN          11
+#define ENOMEM          12
+#define EACCES          13
+#define EFAULT          14
+#define ENOTBLK         15
+#define EBUSY           16
+#define EEXIST          17
+#define EXDEV           18
+#define ENODEV          19
+#define ENOTDIR         20
+#define EISDIR          21
+#define EINVAL          22
+#define ENFILE          23
+#define EMFILE          24
+#define ENOTTY          25
+#define ETXTBSY         26
+#define EFBIG           27
+#define ENOSPC          28
+#define ESPIPE          29
+#define EROFS           30
+#define EMLINK          31
+#define EPIPE           32
+#define EDOM            33
+#define ERANGE          34
+#define EDEADLK         35
+#define ENAMETOOLONG    36
+#define ENOLCK          37
+#define ENOSYS          38
+#define ENOTEMPTY       39
+#define ELOOP           40
+#define EWOULDBLOCK     EAGAIN
+#define ENOMSG          42
+#define EIDRM           43
+#define ECHRNG          44
+#define EL2NSYNC        45
+#define EL3HLT          46
+#define EL3RST          47
+#define ELNRNG          48
+#define EUNATCH         49
+#define ENOCSI          50
+#define EL2HLT          51
+#define EBADE           52
+#define EBADR           53
+#define EXFULL          54
+#define ENOANO          55
+#define EBADRQC         56
+#define EBADSLT         57
+#define EDEADLOCK       58
+#define EBFONT          59
+#define ENOSTR          60
+#define ENODATA         61
+#define ETIME           62
+#define ENOSR           63
+#define ENONET          64
+#define ENOPKG          65
+#define EREMOTE         66
+#define ENOLINK         67
+#define EADV            68
+#define ESRMNT          69
+#define ECOMM           70
+#define EPROTO          71
+#define EMULTIHOP       72
+#define EDOTDOT         73
+#define EBADMSG         74
+#define EOVERFLOW       75
+#define ENOTUNIQ        76
+#define EBADFD          77
+#define EREMCHG         78
+#define ELIBACC         79
+#define ELIBBAD         80
+#define ELIBSCN         81
+#define ELIBMAX         82
+#define ELIBEXEC        83
+#define EILSEQ          84
+#define ERESTART        85
+#define ESTRPIPE        86
+#define EUSERS          87
+#define ENOTSOCK        88
+#define EDESTADDRREQ    89
+#define EMSGSIZE        90
+#define EPROTOTYPE      91
+#define ENOPROTOOPT     92
+#define EPROTONOSUPPORT 93
+#define ESOCKTNOSUPPORT 94
+#define EOPNOTSUPP      95
+#define ENOTSUP         EOPNOTSUPP
+#define EPFNOSUPPORT    96
+#define EAFNOSUPPORT    97
+#define EADDRINUSE      98
+#define EADDRNOTAVAIL   99
+#define ENETDOWN        100
+#define ENETUNREACH     101
+#define ENETRESET       102
+#define ECONNABORTED    103
+#define ECONNRESET      104
+#define ENOBUFS         105
+#define EISCONN         106
+#define ENOTCONN        107
+#define ESHUTDOWN       108
+#define ETOOMANYREFS    109
+#define ETIMEDOUT       110
+#define ECONNREFUSED    111
+#define EHOSTDOWN       112
+#define EHOSTUNREACH    113
+#define EALREADY        114
+#define EINPROGRESS     115
+#define ESTALE          116
+#define EUCLEAN         117
+#define ENOTNAM         118
+#define ENAVAIL         119
+#define EISNAM          120
+#define EREMOTEIO       121
+#define EDQUOT          122
+#define ENOMEDIUM       123
+#define EMEDIUMTYPE     124
+#define ECANCELED       125
+#define ENOKEY          126
+#define EKEYEXPIRED     127
+#define EKEYREVOKED     128
+#define EKEYREJECTED    129
+#define EOWNERDEAD      130
+#define ENOTRECOVERABLE 131
+#define ERFKILL         132
+#define EHWPOISON       133
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/fcntl.h
new file mode 100644
index 0000000000..6f20bac582
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/fcntl.h
@@ -0,0 +1,40 @@
+#define O_CREAT        0100
+#define O_EXCL         0200
+#define O_NOCTTY       0400
+#define O_TRUNC       01000
+#define O_APPEND      02000
+#define O_NONBLOCK    04000
+#define O_DSYNC      010000
+#define O_SYNC     04010000
+#define O_RSYNC    04010000
+#define O_DIRECTORY  040000
+#define O_NOFOLLOW  0100000
+#define O_CLOEXEC  02000000
+
+#define O_ASYNC      020000
+#define O_DIRECT    0400000
+#define O_LARGEFILE 0200000
+#define O_NOATIME  01000000
+#define O_PATH    010000000
+#define O_TMPFILE 020040000
+#define O_NDELAY O_NONBLOCK
+
+#define F_DUPFD  0
+#define F_GETFD  1
+#define F_SETFD  2
+#define F_GETFL  3
+#define F_SETFL  4
+
+#define F_GETLK  5
+#define F_SETLK  6
+#define F_SETLKW 7
+
+#define F_SETOWN 8
+#define F_GETOWN 9
+#define F_SETSIG 10
+#define F_GETSIG 11
+
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
+
+#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/powerpc/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/sh/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/float.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/hwcap.h
new file mode 100644
index 0000000000..803de9b5be
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/hwcap.h
@@ -0,0 +1,43 @@
+#define PPC_FEATURE_32			0x80000000
+#define PPC_FEATURE_64			0x40000000
+#define PPC_FEATURE_601_INSTR		0x20000000
+#define PPC_FEATURE_HAS_ALTIVEC		0x10000000
+#define PPC_FEATURE_HAS_FPU		0x08000000
+#define PPC_FEATURE_HAS_MMU		0x04000000
+#define PPC_FEATURE_HAS_4xxMAC		0x02000000
+#define PPC_FEATURE_UNIFIED_CACHE	0x01000000
+#define PPC_FEATURE_HAS_SPE		0x00800000
+#define PPC_FEATURE_HAS_EFP_SINGLE	0x00400000
+#define PPC_FEATURE_HAS_EFP_DOUBLE	0x00200000
+#define PPC_FEATURE_NO_TB		0x00100000
+#define PPC_FEATURE_POWER4		0x00080000
+#define PPC_FEATURE_POWER5		0x00040000
+#define PPC_FEATURE_POWER5_PLUS		0x00020000
+#define PPC_FEATURE_CELL		0x00010000
+#define PPC_FEATURE_BOOKE		0x00008000
+#define PPC_FEATURE_SMT			0x00004000
+#define PPC_FEATURE_ICACHE_SNOOP	0x00002000
+#define PPC_FEATURE_ARCH_2_05		0x00001000
+#define PPC_FEATURE_PA6T		0x00000800
+#define PPC_FEATURE_HAS_DFP		0x00000400
+#define PPC_FEATURE_POWER6_EXT		0x00000200
+#define PPC_FEATURE_ARCH_2_06		0x00000100
+#define PPC_FEATURE_HAS_VSX		0x00000080
+#define PPC_FEATURE_PSERIES_PERFMON_COMPAT 0x00000040
+
+#define PPC_FEATURE_TRUE_LE		0x00000002
+#define PPC_FEATURE_PPC_LE		0x00000001
+
+#define PPC_FEATURE2_ARCH_2_07		0x80000000
+#define PPC_FEATURE2_HTM		0x40000000
+#define PPC_FEATURE2_DSCR		0x20000000
+#define PPC_FEATURE2_EBB		0x10000000
+#define PPC_FEATURE2_ISEL		0x08000000
+#define PPC_FEATURE2_TAR		0x04000000
+#define PPC_FEATURE2_VEC_CRYPTO		0x02000000
+#define PPC_FEATURE2_HTM_NOSC		0x01000000
+#define PPC_FEATURE2_ARCH_3_00		0x00800000
+#define PPC_FEATURE2_HAS_IEEE128	0x00400000
+#define PPC_FEATURE2_DARN		0x00200000
+#define PPC_FEATURE2_SCV		0x00100000
+#define PPC_FEATURE2_HTM_NO_SUSPEND	0x00080000
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ioctl.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ioctl.h
new file mode 100644
index 0000000000..b6cbb18f47
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ioctl.h
@@ -0,0 +1,120 @@
+#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  1U
+#define _IOC_WRITE 4U
+#define _IOC_READ  2U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+
+#define FIONCLEX	_IO('f', 2)
+#define FIOCLEX		_IO('f', 1)
+#define FIOASYNC	_IOW('f', 125, int)
+#define FIONBIO		_IOW('f', 126, int)
+#define FIONREAD	_IOR('f', 127, int)
+#define TIOCINQ		FIONREAD
+#define FIOQSIZE	_IOR('f', 128, char[8])
+#define TIOCGETP	_IOR('t', 8, char[6])
+#define TIOCSETP	_IOW('t', 9, char[6])
+#define TIOCSETN	_IOW('t', 10, char[6])
+
+#define TIOCSETC	_IOW('t', 17, char[6])
+#define TIOCGETC	_IOR('t', 18, char[6])
+#define TCGETS		_IOR('t', 19, char[44])
+#define TCSETS		_IOW('t', 20, char[44])
+#define TCSETSW		_IOW('t', 21, char[44])
+#define TCSETSF		_IOW('t', 22, char[44])
+
+#define TCGETA		_IOR('t', 23, char[20])
+#define TCSETA		_IOW('t', 24, char[20])
+#define TCSETAW		_IOW('t', 25, char[20])
+#define TCSETAF		_IOW('t', 28, char[20])
+
+#define TCSBRK		_IO('t', 29)
+#define TCXONC		_IO('t', 30)
+#define TCFLSH		_IO('t', 31)
+
+#define TIOCSWINSZ	_IOW('t', 103, char[8])
+#define TIOCGWINSZ	_IOR('t', 104, char[8])
+#define TIOCSTART	_IO('t', 110)
+#define TIOCSTOP	_IO('t', 111)
+
+#define TIOCOUTQ	_IOR('t', 115, int)
+
+#define TIOCGLTC	_IOR('t', 116, char[6])
+#define TIOCSLTC	_IOW('t', 117, char[6])
+#define TIOCSPGRP	_IOW('t', 118, int)
+#define TIOCGPGRP	_IOR('t', 119, int)
+
+#define TIOCEXCL	0x540C
+#define TIOCNXCL	0x540D
+#define TIOCSCTTY	0x540E
+
+#define TIOCSTI		0x5412
+#define TIOCMGET	0x5415
+#define TIOCMBIS	0x5416
+#define TIOCMBIC	0x5417
+#define TIOCMSET	0x5418
+#define TIOCM_LE	0x001
+#define TIOCM_DTR	0x002
+#define TIOCM_RTS	0x004
+#define TIOCM_ST	0x008
+#define TIOCM_SR	0x010
+#define TIOCM_CTS	0x020
+#define TIOCM_CAR	0x040
+#define TIOCM_RNG	0x080
+#define TIOCM_DSR	0x100
+#define TIOCM_CD	TIOCM_CAR
+#define TIOCM_RI	TIOCM_RNG
+#define TIOCM_OUT1	0x2000
+#define TIOCM_OUT2	0x4000
+#define TIOCM_LOOP	0x8000
+
+#define TIOCGSOFTCAR	0x5419
+#define TIOCSSOFTCAR	0x541A
+#define TIOCLINUX	0x541C
+#define TIOCCONS	0x541D
+#define TIOCGSERIAL	0x541E
+#define TIOCSSERIAL	0x541F
+#define TIOCPKT	0x5420
+
+#define TIOCNOTTY	0x5422
+#define TIOCSETD	0x5423
+#define TIOCGETD	0x5424
+#define TCSBRKP		0x5425
+#define TIOCSBRK	0x5427
+#define TIOCCBRK	0x5428
+#define TIOCGSID	0x5429
+#define TIOCGRS485	0x542e
+#define TIOCSRS485	0x542f
+#define TIOCGPTN	_IOR('T',0x30, unsigned int)
+#define TIOCSPTLCK	_IOW('T',0x31, int)
+#define TIOCGDEV	_IOR('T',0x32, unsigned int)
+#define TIOCSIG		_IOW('T',0x36, int)
+#define TIOCVHANGUP	0x5437
+#define TIOCGPKT	_IOR('T', 0x38, int)
+#define TIOCGPTLCK	_IOR('T', 0x39, int)
+#define TIOCGEXCL	_IOR('T', 0x40, int)
+#define TIOCGPTPEER	_IO('T', 0x41)
+
+#define TIOCSERCONFIG	0x5453
+#define TIOCSERGWILD	0x5454
+#define TIOCSERSWILD	0x5455
+#define TIOCGLCKTRMIOS	0x5456
+#define TIOCSLCKTRMIOS	0x5457
+#define TIOCSERGSTRUCT	0x5458
+#define TIOCSERGETLSR	0x5459
+#define TIOCSERGETMULTI	0x545A
+#define TIOCSERSETMULTI	0x545B
+
+#define TIOCMIWAIT	0x545C
+#define TIOCGICOUNT	0x545D
+
+#define FIOSETOWN       0x8901
+#define SIOCSPGRP       0x8902
+#define FIOGETOWN       0x8903
+#define SIOCGPGRP       0x8904
+#define SIOCATMARK      0x8905
+#define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ipc.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ipc.h
new file mode 100644
index 0000000000..a388d56b5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ipc.h
@@ -0,0 +1,12 @@
+struct ipc_perm {
+	key_t __ipc_perm_key;
+	uid_t uid;
+	gid_t gid;
+	uid_t cuid;
+	gid_t cgid;
+	mode_t mode;
+	int __ipc_perm_seq;
+	int __pad1;
+	long long __pad2;
+	long long __pad3;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/mman.h
new file mode 100644
index 0000000000..b3a675a822
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/mman.h
@@ -0,0 +1,14 @@
+#define PROT_SAO       0x10
+
+#undef MAP_NORESERVE
+#define MAP_NORESERVE   0x40
+#undef MAP_LOCKED
+#define MAP_LOCKED	0x80
+#undef MAP_SYNC
+
+#undef MCL_CURRENT
+#define MCL_CURRENT     0x2000
+#undef MCL_FUTURE
+#define MCL_FUTURE      0x4000
+#undef MCL_ONFAULT
+#define MCL_ONFAULT     0x8000
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ptrace.h
new file mode 100644
index 0000000000..303a0735ef
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/ptrace.h
@@ -0,0 +1,25 @@
+#define PTRACE_GETVRREGS	0x12
+#define PTRACE_SETVRREGS	0x13
+#define PTRACE_GETEVRREGS	0x14
+#define PTRACE_SETEVRREGS	0x15
+#define PTRACE_GETREGS64	0x16
+#define PTRACE_SETREGS64	0x17
+#define PTRACE_GET_DEBUGREG	0x19
+#define PTRACE_SET_DEBUGREG	0x1a
+#define PTRACE_GETVSRREGS	0x1b
+#define PTRACE_SETVSRREGS	0x1c
+#define PTRACE_SYSEMU		0x1d
+#define PTRACE_SYSEMU_SINGLESTEP	0x1e
+#define PTRACE_SINGLEBLOCK	0x100
+
+#define PT_GETVRREGS PTRACE_GETVRREGS
+#define PT_SETVRREGS PTRACE_SETVRREGS
+#define PT_GETEVRREGS PTRACE_GETEVRREGS
+#define PT_SETEVRREGS PTRACE_SETEVRREGS
+#define PT_GETREGS64 PTRACE_GETREGS64
+#define PT_SETREGS64 PTRACE_SETREGS64
+#define PT_GET_DEBUGREG PTRACE_GET_DEBUGREG
+#define PT_SET_DEBUGREG PTRACE_SET_DEBUGREG
+#define PT_GETVSRREGS PTRACE_GETVSRREGS
+#define PT_SETVSRREGS PTRACE_SETVSRREGS
+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/reg.h
new file mode 100644
index 0000000000..49382c8f7a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/reg.h
@@ -0,0 +1,3 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
+/* FIXME */
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/setjmp.h
new file mode 100644
index 0000000000..f7370e3e53
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/setjmp.h
@@ -0,0 +1 @@
+typedef unsigned __int128 __jmp_buf[32];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/shm.h
new file mode 100644
index 0000000000..b7f73a8deb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/shm.h
@@ -0,0 +1,23 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+	size_t shm_segsz;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __unused[2];
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/signal.h
new file mode 100644
index 0000000000..d5493b1856
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/signal.h
@@ -0,0 +1,110 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 4096
+#define SIGSTKSZ    10240
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+typedef unsigned long greg_t, gregset_t[48];
+typedef double fpregset_t[33];
+
+typedef struct {
+#ifdef __GNUC__
+	__attribute__((__aligned__(16)))
+#endif
+	unsigned vrregs[32][4];
+	struct {
+#if __BIG_ENDIAN__
+		unsigned _pad[3], vscr_word;
+#else
+		unsigned vscr_word, _pad[3];
+#endif
+	} vscr;
+	unsigned vrsave, _pad[3];
+} vrregset_t;
+
+typedef struct sigcontext {
+	unsigned long _unused[4];
+	int signal;
+	int _pad0;
+	unsigned long handler;
+	unsigned long oldmask;
+	struct pt_regs *regs;
+	gregset_t gp_regs;
+	fpregset_t fp_regs;
+	vrregset_t *v_regs;
+	long vmx_reserve[34+34+32+1];
+} mcontext_t;
+
+#else
+
+typedef struct {
+	long __regs[4+4+48+33+1+34+34+32+1];
+} mcontext_t;
+
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	sigset_t uc_sigmask;
+	mcontext_t uc_mcontext;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1U
+#define SA_NOCLDWAIT  2U
+#define SA_SIGINFO    4U
+#define SA_ONSTACK    0x08000000U
+#define SA_RESTART    0x10000000U
+#define SA_NODEFER    0x40000000U
+#define SA_RESETHAND  0x80000000U
+#define SA_RESTORER   0x04000000U
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   SIGIO
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/socket.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/socket.h
new file mode 100644
index 0000000000..557e324fde
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/socket.h
@@ -0,0 +1,27 @@
+#define SO_DEBUG        1
+#define SO_REUSEADDR    2
+#define SO_TYPE         3
+#define SO_ERROR        4
+#define SO_DONTROUTE    5
+#define SO_BROADCAST    6
+#define SO_SNDBUF       7
+#define SO_RCVBUF       8
+#define SO_KEEPALIVE    9
+#define SO_OOBINLINE    10
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_LINGER       13
+#define SO_BSDCOMPAT    14
+#define SO_REUSEPORT    15
+#define SO_RCVLOWAT     16
+#define SO_SNDLOWAT     17
+#define SO_RCVTIMEO     18
+#define SO_SNDTIMEO     19
+#define SO_PASSCRED     20
+#define SO_PEERCRED     21
+#define SO_ACCEPTCONN   30
+#define SO_PEERSEC      31
+#define SO_SNDBUFFORCE  32
+#define SO_RCVBUFFORCE  33
+#define SO_PROTOCOL     38
+#define SO_DOMAIN       39
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/stat.h
new file mode 100644
index 0000000000..320b49bb6c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/stat.h
@@ -0,0 +1,16 @@
+struct stat {
+	dev_t st_dev;
+	ino_t st_ino;
+	nlink_t st_nlink;
+	mode_t st_mode;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+	unsigned long __unused[3];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/stdint.h
new file mode 100644
index 0000000000..1bb147f24e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/stdint.h
@@ -0,0 +1,20 @@
+typedef int32_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+
+#define INT_FAST16_MIN  INT32_MIN
+#define INT_FAST32_MIN  INT32_MIN
+
+#define INT_FAST16_MAX  INT32_MAX
+#define INT_FAST32_MAX  INT32_MAX
+
+#define UINT_FAST16_MAX UINT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+
+#define INTPTR_MIN      INT64_MIN
+#define INTPTR_MAX      INT64_MAX
+#define UINTPTR_MAX     UINT64_MAX
+#define PTRDIFF_MIN     INT64_MIN
+#define PTRDIFF_MAX     INT64_MAX
+#define SIZE_MAX        UINT64_MAX
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/syscall.h.in
new file mode 100644
index 0000000000..b935864c41
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/syscall.h.in
@@ -0,0 +1,390 @@
+#define __NR_restart_syscall          0
+#define __NR_exit                     1
+#define __NR_fork                     2
+#define __NR_read                     3
+#define __NR_write                    4
+#define __NR_open                     5
+#define __NR_close                    6
+#define __NR_waitpid                  7
+#define __NR_creat                    8
+#define __NR_link                     9
+#define __NR_unlink                  10
+#define __NR_execve                  11
+#define __NR_chdir                   12
+#define __NR_time                    13
+#define __NR_mknod                   14
+#define __NR_chmod                   15
+#define __NR_lchown                  16
+#define __NR_break                   17
+#define __NR_oldstat                 18
+#define __NR_lseek                   19
+#define __NR_getpid                  20
+#define __NR_mount                   21
+#define __NR_umount                  22
+#define __NR_setuid                  23
+#define __NR_getuid                  24
+#define __NR_stime                   25
+#define __NR_ptrace                  26
+#define __NR_alarm                   27
+#define __NR_oldfstat                28
+#define __NR_pause                   29
+#define __NR_utime                   30
+#define __NR_stty                    31
+#define __NR_gtty                    32
+#define __NR_access                  33
+#define __NR_nice                    34
+#define __NR_ftime                   35
+#define __NR_sync                    36
+#define __NR_kill                    37
+#define __NR_rename                  38
+#define __NR_mkdir                   39
+#define __NR_rmdir                   40
+#define __NR_dup                     41
+#define __NR_pipe                    42
+#define __NR_times                   43
+#define __NR_prof                    44
+#define __NR_brk                     45
+#define __NR_setgid                  46
+#define __NR_getgid                  47
+#define __NR_signal                  48
+#define __NR_geteuid                 49
+#define __NR_getegid                 50
+#define __NR_acct                    51
+#define __NR_umount2                 52
+#define __NR_lock                    53
+#define __NR_ioctl                   54
+#define __NR_fcntl                   55
+#define __NR_mpx                     56
+#define __NR_setpgid                 57
+#define __NR_ulimit                  58
+#define __NR_oldolduname             59
+#define __NR_umask                   60
+#define __NR_chroot                  61
+#define __NR_ustat                   62
+#define __NR_dup2                    63
+#define __NR_getppid                 64
+#define __NR_getpgrp                 65
+#define __NR_setsid                  66
+#define __NR_sigaction               67
+#define __NR_sgetmask                68
+#define __NR_ssetmask                69
+#define __NR_setreuid                70
+#define __NR_setregid                71
+#define __NR_sigsuspend              72
+#define __NR_sigpending              73
+#define __NR_sethostname             74
+#define __NR_setrlimit               75
+#define __NR_getrlimit               76
+#define __NR_getrusage               77
+#define __NR_gettimeofday            78
+#define __NR_settimeofday            79
+#define __NR_getgroups               80
+#define __NR_setgroups               81
+#define __NR_select                  82
+#define __NR_symlink                 83
+#define __NR_oldlstat                84
+#define __NR_readlink                85
+#define __NR_uselib                  86
+#define __NR_swapon                  87
+#define __NR_reboot                  88
+#define __NR_readdir                 89
+#define __NR_mmap                    90
+#define __NR_munmap                  91
+#define __NR_truncate                92
+#define __NR_ftruncate               93
+#define __NR_fchmod                  94
+#define __NR_fchown                  95
+#define __NR_getpriority             96
+#define __NR_setpriority             97
+#define __NR_profil                  98
+#define __NR_statfs                  99
+#define __NR_fstatfs                100
+#define __NR_ioperm                 101
+#define __NR_socketcall             102
+#define __NR_syslog                 103
+#define __NR_setitimer              104
+#define __NR_getitimer              105
+#define __NR_stat                   106
+#define __NR_lstat                  107
+#define __NR_fstat                  108
+#define __NR_olduname               109
+#define __NR_iopl                   110
+#define __NR_vhangup                111
+#define __NR_idle                   112
+#define __NR_vm86                   113
+#define __NR_wait4                  114
+#define __NR_swapoff                115
+#define __NR_sysinfo                116
+#define __NR_ipc                    117
+#define __NR_fsync                  118
+#define __NR_sigreturn              119
+#define __NR_clone                  120
+#define __NR_setdomainname          121
+#define __NR_uname                  122
+#define __NR_modify_ldt             123
+#define __NR_adjtimex               124
+#define __NR_mprotect               125
+#define __NR_sigprocmask            126
+#define __NR_create_module          127
+#define __NR_init_module            128
+#define __NR_delete_module          129
+#define __NR_get_kernel_syms        130
+#define __NR_quotactl               131
+#define __NR_getpgid                132
+#define __NR_fchdir                 133
+#define __NR_bdflush                134
+#define __NR_sysfs                  135
+#define __NR_personality            136
+#define __NR_afs_syscall            137
+#define __NR_setfsuid               138
+#define __NR_setfsgid               139
+#define __NR__llseek                140
+#define __NR_getdents               141
+#define __NR__newselect             142
+#define __NR_flock                  143
+#define __NR_msync                  144
+#define __NR_readv                  145
+#define __NR_writev                 146
+#define __NR_getsid                 147
+#define __NR_fdatasync              148
+#define __NR__sysctl                149
+#define __NR_mlock                  150
+#define __NR_munlock                151
+#define __NR_mlockall               152
+#define __NR_munlockall             153
+#define __NR_sched_setparam         154
+#define __NR_sched_getparam         155
+#define __NR_sched_setscheduler     156
+#define __NR_sched_getscheduler     157
+#define __NR_sched_yield            158
+#define __NR_sched_get_priority_max 159
+#define __NR_sched_get_priority_min 160
+#define __NR_sched_rr_get_interval  161
+#define __NR_nanosleep              162
+#define __NR_mremap                 163
+#define __NR_setresuid              164
+#define __NR_getresuid              165
+#define __NR_query_module           166
+#define __NR_poll                   167
+#define __NR_nfsservctl             168
+#define __NR_setresgid              169
+#define __NR_getresgid              170
+#define __NR_prctl                  171
+#define __NR_rt_sigreturn           172
+#define __NR_rt_sigaction           173
+#define __NR_rt_sigprocmask         174
+#define __NR_rt_sigpending          175
+#define __NR_rt_sigtimedwait        176
+#define __NR_rt_sigqueueinfo        177
+#define __NR_rt_sigsuspend          178
+#define __NR_pread64                179
+#define __NR_pwrite64               180
+#define __NR_chown                  181
+#define __NR_getcwd                 182
+#define __NR_capget                 183
+#define __NR_capset                 184
+#define __NR_sigaltstack            185
+#define __NR_sendfile               186
+#define __NR_getpmsg                187
+#define __NR_putpmsg                188
+#define __NR_vfork                  189
+#define __NR_ugetrlimit             190
+#define __NR_readahead              191
+#define __NR_pciconfig_read         198
+#define __NR_pciconfig_write        199
+#define __NR_pciconfig_iobase       200
+#define __NR_multiplexer            201
+#define __NR_getdents64             202
+#define __NR_pivot_root             203
+#define __NR_madvise                205
+#define __NR_mincore                206
+#define __NR_gettid                 207
+#define __NR_tkill                  208
+#define __NR_setxattr               209
+#define __NR_lsetxattr              210
+#define __NR_fsetxattr              211
+#define __NR_getxattr               212
+#define __NR_lgetxattr              213
+#define __NR_fgetxattr              214
+#define __NR_listxattr              215
+#define __NR_llistxattr             216
+#define __NR_flistxattr             217
+#define __NR_removexattr            218
+#define __NR_lremovexattr           219
+#define __NR_fremovexattr           220
+#define __NR_futex                  221
+#define __NR_sched_setaffinity      222
+#define __NR_sched_getaffinity      223
+#define __NR_tuxcall                225
+#define __NR_io_setup               227
+#define __NR_io_destroy             228
+#define __NR_io_getevents           229
+#define __NR_io_submit              230
+#define __NR_io_cancel              231
+#define __NR_set_tid_address        232
+#define __NR_fadvise64              233
+#define __NR_exit_group             234
+#define __NR_lookup_dcookie         235
+#define __NR_epoll_create           236
+#define __NR_epoll_ctl              237
+#define __NR_epoll_wait             238
+#define __NR_remap_file_pages       239
+#define __NR_timer_create           240
+#define __NR_timer_settime          241
+#define __NR_timer_gettime          242
+#define __NR_timer_getoverrun       243
+#define __NR_timer_delete           244
+#define __NR_clock_settime          245
+#define __NR_clock_gettime          246
+#define __NR_clock_getres           247
+#define __NR_clock_nanosleep        248
+#define __NR_swapcontext            249
+#define __NR_tgkill                 250
+#define __NR_utimes                 251
+#define __NR_statfs64               252
+#define __NR_fstatfs64              253
+#define __NR_rtas                   255
+#define __NR_sys_debug_setcontext   256
+#define __NR_migrate_pages          258
+#define __NR_mbind                  259
+#define __NR_get_mempolicy          260
+#define __NR_set_mempolicy          261
+#define __NR_mq_open                262
+#define __NR_mq_unlink              263
+#define __NR_mq_timedsend           264
+#define __NR_mq_timedreceive        265
+#define __NR_mq_notify              266
+#define __NR_mq_getsetattr          267
+#define __NR_kexec_load             268
+#define __NR_add_key                269
+#define __NR_request_key            270
+#define __NR_keyctl                 271
+#define __NR_waitid                 272
+#define __NR_ioprio_set             273
+#define __NR_ioprio_get             274
+#define __NR_inotify_init           275
+#define __NR_inotify_add_watch      276
+#define __NR_inotify_rm_watch       277
+#define __NR_spu_run                278
+#define __NR_spu_create             279
+#define __NR_pselect6               280
+#define __NR_ppoll                  281
+#define __NR_unshare                282
+#define __NR_splice                 283
+#define __NR_tee                    284
+#define __NR_vmsplice               285
+#define __NR_openat                 286
+#define __NR_mkdirat                287
+#define __NR_mknodat                288
+#define __NR_fchownat               289
+#define __NR_futimesat              290
+#define __NR_newfstatat             291
+#define __NR_unlinkat               292
+#define __NR_renameat               293
+#define __NR_linkat                 294
+#define __NR_symlinkat              295
+#define __NR_readlinkat             296
+#define __NR_fchmodat               297
+#define __NR_faccessat              298
+#define __NR_get_robust_list        299
+#define __NR_set_robust_list        300
+#define __NR_move_pages             301
+#define __NR_getcpu                 302
+#define __NR_epoll_pwait            303
+#define __NR_utimensat              304
+#define __NR_signalfd               305
+#define __NR_timerfd_create         306
+#define __NR_eventfd                307
+#define __NR_sync_file_range2       308
+#define __NR_fallocate              309
+#define __NR_subpage_prot           310
+#define __NR_timerfd_settime        311
+#define __NR_timerfd_gettime        312
+#define __NR_signalfd4              313
+#define __NR_eventfd2               314
+#define __NR_epoll_create1          315
+#define __NR_dup3                   316
+#define __NR_pipe2                  317
+#define __NR_inotify_init1          318
+#define __NR_perf_event_open        319
+#define __NR_preadv                 320
+#define __NR_pwritev                321
+#define __NR_rt_tgsigqueueinfo      322
+#define __NR_fanotify_init          323
+#define __NR_fanotify_mark          324
+#define __NR_prlimit64              325
+#define __NR_socket                 326
+#define __NR_bind                   327
+#define __NR_connect                328
+#define __NR_listen                 329
+#define __NR_accept                 330
+#define __NR_getsockname            331
+#define __NR_getpeername            332
+#define __NR_socketpair             333
+#define __NR_send                   334
+#define __NR_sendto                 335
+#define __NR_recv                   336
+#define __NR_recvfrom               337
+#define __NR_shutdown               338
+#define __NR_setsockopt             339
+#define __NR_getsockopt             340
+#define __NR_sendmsg                341
+#define __NR_recvmsg                342
+#define __NR_recvmmsg               343
+#define __NR_accept4                344
+#define __NR_name_to_handle_at      345
+#define __NR_open_by_handle_at      346
+#define __NR_clock_adjtime          347
+#define __NR_syncfs                 348
+#define __NR_sendmmsg               349
+#define __NR_setns                  350
+#define __NR_process_vm_readv       351
+#define __NR_process_vm_writev      352
+#define __NR_finit_module           353
+#define __NR_kcmp                   354
+#define __NR_sched_setattr          355
+#define __NR_sched_getattr          356
+#define __NR_renameat2              357
+#define __NR_seccomp                358
+#define __NR_getrandom              359
+#define __NR_memfd_create           360
+#define __NR_bpf                    361
+#define __NR_execveat               362
+#define __NR_switch_endian          363
+#define __NR_userfaultfd            364
+#define __NR_membarrier             365
+#define __NR_mlock2                 378
+#define __NR_copy_file_range        379
+#define __NR_preadv2                380
+#define __NR_pwritev2               381
+#define __NR_kexec_file_load        382
+#define __NR_statx                  383
+#define __NR_pkey_alloc             384
+#define __NR_pkey_free              385
+#define __NR_pkey_mprotect          386
+#define __NR_rseq                   387
+#define __NR_io_pgetevents          388
+#define __NR_semtimedop             392
+#define __NR_semget                 393
+#define __NR_semctl                 394
+#define __NR_shmget                 395
+#define __NR_shmctl                 396
+#define __NR_shmat                  397
+#define __NR_shmdt                  398
+#define __NR_msgget                 399
+#define __NR_msgsnd                 400
+#define __NR_msgrcv                 401
+#define __NR_msgctl                 402
+#define __NR_pidfd_send_signal      424
+#define __NR_io_uring_setup         425
+#define __NR_io_uring_enter         426
+#define __NR_io_uring_register      427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/termios.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/termios.h
new file mode 100644
index 0000000000..da1f406bcb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/termios.h
@@ -0,0 +1,171 @@
+#undef NCCS
+#define NCCS 19
+struct termios {
+	tcflag_t c_iflag;
+	tcflag_t c_oflag;
+	tcflag_t c_cflag;
+	tcflag_t c_lflag;
+	cc_t c_cc[NCCS];
+	cc_t c_line;
+	speed_t __c_ispeed;
+	speed_t __c_ospeed;
+};
+
+#define VINTR     0
+#define VQUIT     1
+#define VERASE    2
+#define VKILL     3
+#define VEOF      4
+#define VMIN      5
+#define VEOL      6
+#define VTIME     7
+#define VEOL2     8
+#define VSWTC     9
+#define VWERASE  10
+#define VREPRINT 11
+#define VSUSP    12
+#define VSTART   13
+#define VSTOP    14
+#define VLNEXT   15
+#define VDISCARD 16
+
+#define IGNBRK  0000001
+#define BRKINT  0000002
+#define IGNPAR  0000004
+#define PARMRK  0000010
+#define INPCK   0000020
+#define ISTRIP  0000040
+#define INLCR   0000100
+#define IGNCR   0000200
+#define ICRNL   0000400
+#define IXON    0001000
+#define IXOFF   0002000
+#define IXANY   0004000
+#define IUCLC   0010000
+#define IMAXBEL 0020000
+#define IUTF8   0040000
+
+#define OPOST  0000001
+#define ONLCR  0000002
+#define OLCUC  0000004
+#define OCRNL  0000010
+#define ONOCR  0000020
+#define ONLRET 0000040
+#define OFILL  0000100
+#define OFDEL  0000200
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE)
+#define NLDLY  0001400
+#define NL0    0000000
+#define NL1    0000400
+#define NL2    0001000
+#define NL3    0001400
+#define TABDLY 0006000
+#define TAB0   0000000
+#define TAB1   0002000
+#define TAB2   0004000
+#define TAB3   0006000
+#define CRDLY  0030000
+#define CR0    0000000
+#define CR1    0010000
+#define CR2    0020000
+#define CR3    0030000
+#define FFDLY  0040000
+#define FF0    0000000
+#define FF1    0040000
+#define BSDLY  0100000
+#define BS0    0000000
+#define BS1    0100000
+#endif
+
+#define VTDLY  0200000
+#define VT0    0000000
+#define VT1    0200000
+
+#define B0       0000000
+#define B50      0000001
+#define B75      0000002
+#define B110     0000003
+#define B134     0000004
+#define B150     0000005
+#define B200     0000006
+#define B300     0000007
+#define B600     0000010
+#define B1200    0000011
+#define B1800    0000012
+#define B2400    0000013
+#define B4800    0000014
+#define B9600    0000015
+#define B19200   0000016
+#define B38400   0000017
+
+#define B57600   00020
+#define B115200  00021
+#define B230400  00022
+#define B460800  00023
+#define B500000  00024
+#define B576000  00025
+#define B921600  00026
+#define B1000000 00027
+#define B1152000 00030
+#define B1500000 00031
+#define B2000000 00032
+#define B2500000 00033
+#define B3000000 00034
+#define B3500000 00035
+#define B4000000 00036
+
+#define CSIZE  00001400
+#define CS5    00000000
+#define CS6    00000400
+#define CS7    00001000
+#define CS8    00001400
+#define CSTOPB 00002000
+#define CREAD  00004000
+#define PARENB 00010000
+#define PARODD 00020000
+#define HUPCL  00040000
+#define CLOCAL 00100000
+
+#define ECHOE   0x00000002
+#define ECHOK   0x00000004
+#define ECHO    0x00000008
+#define ECHONL  0x00000010
+#define ISIG    0x00000080
+#define ICANON  0x00000100
+#define IEXTEN  0x00000400
+#define TOSTOP  0x00400000
+#define NOFLSH  0x80000000
+
+#define TCOOFF 0
+#define TCOON  1
+#define TCIOFF 2
+#define TCION  3
+
+#define TCIFLUSH  0
+#define TCOFLUSH  1
+#define TCIOFLUSH 2
+
+#define TCSANOW   0
+#define TCSADRAIN 1
+#define TCSAFLUSH 2
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA    0000016
+#define EXTB    0000017
+#define CBAUD   00377
+#define CBAUDEX 0000020
+#define CIBAUD  077600000
+#define CMSPAR  010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE   0x00004000
+#define ECHOCTL 0x00000040
+#define ECHOPRT 0x00000020
+#define ECHOKE  0x00000001
+#define FLUSHO  0x00800000
+#define PENDIN  0x20000000
+#define EXTPROC 0x10000000
+
+#define XTABS   00006000
+#define TIOCSER_TEMT 1
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/user.h
new file mode 100644
index 0000000000..7e75d20156
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/bits/user.h
@@ -0,0 +1,23 @@
+struct user {
+	struct {
+		unsigned long gpr[32], nip, msr, orig_gpr3, ctr, link, xer, ccr, softe;
+		unsigned long trap, dar, dsisr, result;
+	} regs;
+	unsigned long u_tsize, u_dsize, u_ssize;
+	unsigned long start_code, start_data, start_stack;
+	long signal;
+	void *u_ar0;
+	unsigned long magic;
+	char u_comm[32];
+};
+
+#define ELF_NGREG 48
+#define ELF_NFPREG 33
+#define ELF_NVRREG 34
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+typedef double elf_fpreg_t, elf_fpregset_t[ELF_NFPREG];
+typedef struct { unsigned u[4]; }
+#ifdef __GNUC__
+__attribute__((__aligned__(16)))
+#endif
+	elf_vrreg_t, elf_vrregset_t[ELF_NVRREG];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/crt_arch.h
new file mode 100644
index 0000000000..168669a933
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/crt_arch.h
@@ -0,0 +1,19 @@
+__asm__(
+".text \n"
+".global " START " \n"
+".type   " START ", %function \n"
+START ": \n"
+"	addis  2, 12, .TOC.-" START "@ha \n"
+"	addi   2,  2, .TOC.-" START "@l \n"
+"	lwz    4, 1f-" START "(12)\n"
+"	add    4, 4, 12 \n"
+"	mr     3, 1 \n"
+"	clrrdi 1, 1, 4 \n"
+"	li     0, 0 \n"
+"	stdu   0, -32(1) \n"
+"	mtlr   0 \n"
+"	bl " START "_c \n"
+".weak   _DYNAMIC \n"
+".hidden _DYNAMIC \n"
+"1:	.long _DYNAMIC-" START "\n"
+);
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/kstat.h
new file mode 100644
index 0000000000..887b3e2666
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/kstat.h
@@ -0,0 +1,19 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	nlink_t st_nlink;
+	mode_t st_mode;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	unsigned long __unused[3];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/pthread_arch.h
new file mode 100644
index 0000000000..79c3ecd8af
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/pthread_arch.h
@@ -0,0 +1,18 @@
+static inline struct pthread *__pthread_self()
+{
+	register char *tp __asm__("r13");
+	__asm__ ("" : "=r" (tp) );
+	return (pthread_t)(tp - 0x7000 - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + 0x7000)
+
+#define DTP_OFFSET 0x8000
+
+// the kernel calls the ip "nip", it's the first saved value after the 32
+// GPRs.
+#define MC_PC gp_regs[32]
+
+#define CANARY canary_at_end
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/reloc.h
new file mode 100644
index 0000000000..2f1bba059f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/reloc.h
@@ -0,0 +1,31 @@
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define ENDIAN_SUFFIX "le"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "powerpc64" ENDIAN_SUFFIX
+
+#define TPOFF_K (-0x7000)
+
+#define REL_SYMBOLIC    R_PPC64_ADDR64
+#define REL_USYMBOLIC   R_PPC64_UADDR64
+#define REL_GOT         R_PPC64_GLOB_DAT
+#define REL_PLT         R_PPC64_JMP_SLOT
+#define REL_RELATIVE    R_PPC64_RELATIVE
+#define REL_COPY        R_PPC64_COPY
+#define REL_DTPMOD      R_PPC64_DTPMOD64
+#define REL_DTPOFF      R_PPC64_DTPREL64
+#define REL_TPOFF       R_PPC64_TPREL64
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mr 1,%1; mr 12,%0; mtctr 12; bctrl" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym " \n" \
+	"	bl 1f \n" \
+	"	.long " #sym "-. \n" \
+	"1:	mflr %1 \n" \
+	"	lwa %0, 0(%1) \n" \
+	"	add %0, %0, %1 \n" \
+	: "=r"(*(fp)), "=r"((long){0}) : : "memory", "lr" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/powerpc64/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/syscall_arch.h
new file mode 100644
index 0000000000..76b4e335cf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/powerpc64/syscall_arch.h
@@ -0,0 +1,90 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+
+static inline long __syscall0(long n)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3");
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "=r"(r3)
+	:: "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3)
+	:: "memory", "cr0", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4)
+	:: "memory", "cr0", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5)
+	:: "memory", "cr0", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	register long r6 __asm__("r6") = d;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5), "+r"(r6)
+	:: "memory", "cr0", "r7", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	register long r6 __asm__("r6") = d;
+	register long r7 __asm__("r7") = e;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5), "+r"(r6), "+r"(r7)
+	:: "memory", "cr0", "r8", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long r0 __asm__("r0") = n;
+	register long r3 __asm__("r3") = a;
+	register long r4 __asm__("r4") = b;
+	register long r5 __asm__("r5") = c;
+	register long r6 __asm__("r6") = d;
+	register long r7 __asm__("r7") = e;
+	register long r8 __asm__("r8") = f;
+	__asm__ __volatile__("sc ; bns+ 1f ; neg %1, %1 ; 1:"
+	: "+r"(r0), "+r"(r3), "+r"(r4), "+r"(r5), "+r"(r6), "+r"(r7), "+r"(r8)
+	:: "memory", "cr0", "r9", "r10", "r11", "r12");
+	return r3;
+}
+
+#define SO_RCVTIMEO_OLD  18
+#define SO_SNDTIMEO_OLD  19
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/atomic_arch.h
new file mode 100644
index 0000000000..0c38258868
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/atomic_arch.h
@@ -0,0 +1,38 @@
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("fence rw,rw" : : : "memory");
+}
+
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	int old, tmp;
+	__asm__ __volatile__ (
+		"\n1:	lr.w.aqrl %0, (%2)\n"
+		"	bne %0, %3, 1f\n"
+		"	sc.w.aqrl %1, %4, (%2)\n"
+		"	bnez %1, 1b\n"
+		"1:"
+		: "=&r"(old), "=&r"(tmp)
+		: "r"(p), "r"((long)t), "r"((long)s)
+		: "memory");
+	return old;
+}
+
+#define a_cas_p a_cas_p
+static inline void *a_cas_p(volatile void *p, void *t, void *s)
+{
+	void *old;
+	int tmp;
+	__asm__ __volatile__ (
+		"\n1:	lr.d.aqrl %0, (%2)\n"
+		"	bne %0, %3, 1f\n"
+		"	sc.d.aqrl %1, %4, (%2)\n"
+		"	bnez %1, 1b\n"
+		"1:"
+		: "=&r"(old), "=&r"(tmp)
+		: "r"(p), "r"(t), "r"(s)
+		: "memory");
+	return old;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/alltypes.h.in
new file mode 100644
index 0000000000..4579d1740b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/alltypes.h.in
@@ -0,0 +1,18 @@
+#define _Addr long
+#define _Int64 long
+#define _Reg long
+
+#define __BYTE_ORDER 1234
+#define __LONG_MAX 0x7fffffffffffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+TYPEDEF int blksize_t;
+TYPEDEF unsigned int nlink_t;
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/fcntl.h
new file mode 100644
index 0000000000..ecb4d18fd1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/fcntl.h
@@ -0,0 +1,38 @@
+#define O_CREAT        0100
+#define O_EXCL         0200
+#define O_NOCTTY       0400
+#define O_TRUNC       01000
+#define O_APPEND      02000
+#define O_NONBLOCK    04000
+#define O_DSYNC      010000
+#define O_SYNC     04010000
+#define O_RSYNC    04010000
+#define O_DIRECTORY 0200000
+#define O_NOFOLLOW  0400000
+#define O_CLOEXEC  02000000
+
+#define O_ASYNC      020000
+#define O_DIRECT     040000
+#define O_LARGEFILE 0100000
+#define O_NOATIME  01000000
+#define O_PATH    010000000
+#define O_TMPFILE 020200000
+#define O_NDELAY O_NONBLOCK
+
+#define F_DUPFD  0
+#define F_GETFD  1
+#define F_SETFD  2
+#define F_GETFL  3
+#define F_SETFL  4
+#define F_GETLK  5
+#define F_SETLK  6
+#define F_SETLKW 7
+#define F_SETOWN 8
+#define F_GETOWN 9
+#define F_SETSIG 10
+#define F_GETSIG 11
+
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
+
+#define F_GETOWNER_UIDS 17
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/fenv.h
new file mode 100644
index 0000000000..806ec40f15
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/fenv.h
@@ -0,0 +1,17 @@
+#define FE_INVALID      16
+#define FE_DIVBYZERO    8
+#define FE_OVERFLOW     4
+#define FE_UNDERFLOW    2
+#define FE_INEXACT      1
+
+#define FE_ALL_EXCEPT   31
+
+#define FE_TONEAREST    0
+#define FE_DOWNWARD     2
+#define FE_UPWARD       3
+#define FE_TOWARDZERO   1
+
+typedef unsigned int fexcept_t;
+typedef unsigned int fenv_t;
+
+#define FE_DFL_ENV      ((const fenv_t *) -1)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/float.h
new file mode 100644
index 0000000000..719c79085a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/float.h
@@ -0,0 +1,16 @@
+#define FLT_EVAL_METHOD 0
+
+#define LDBL_TRUE_MIN 6.47517511943802511092443895822764655e-4966L
+#define LDBL_MIN 3.36210314311209350626267781732175260e-4932L
+#define LDBL_MAX 1.18973149535723176508575932662800702e+4932L
+#define LDBL_EPSILON 1.92592994438723585305597794258492732e-34L
+
+#define LDBL_MANT_DIG 113
+#define LDBL_MIN_EXP (-16381)
+#define LDBL_MAX_EXP 16384
+
+#define LDBL_DIG 33
+#define LDBL_MIN_10_EXP (-4931)
+#define LDBL_MAX_10_EXP 4932
+
+#define DECIMAL_DIG 36
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/posix.h
new file mode 100644
index 0000000000..8068ce98dc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/posix.h
@@ -0,0 +1,2 @@
+#define _POSIX_V6_LP64_OFF64 1
+#define _POSIX_V7_LP64_OFF64 1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/reg.h
new file mode 100644
index 0000000000..2633f39d77
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/reg.h
@@ -0,0 +1,2 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/setjmp.h
new file mode 100644
index 0000000000..ad7e401606
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/setjmp.h
@@ -0,0 +1 @@
+typedef unsigned long __jmp_buf[26];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/signal.h
new file mode 100644
index 0000000000..b006334f78
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/signal.h
@@ -0,0 +1,118 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+# define MINSIGSTKSZ 2048
+# define SIGSTKSZ 8192
+#endif
+
+typedef unsigned long __riscv_mc_gp_state[32];
+
+struct __riscv_mc_f_ext_state {
+	unsigned int __f[32];
+	unsigned int __fcsr;
+};
+
+struct __riscv_mc_d_ext_state {
+	unsigned long long __f[32];
+	unsigned int __fcsr;
+};
+
+struct __riscv_mc_q_ext_state {
+	unsigned long long __f[64] __attribute__((aligned(16)));
+	unsigned int __fcsr;
+	unsigned int __reserved[3];
+};
+
+union __riscv_mc_fp_state {
+	struct __riscv_mc_f_ext_state __f;
+	struct __riscv_mc_d_ext_state __d;
+	struct __riscv_mc_q_ext_state __q;
+};
+
+typedef struct mcontext_t {
+	__riscv_mc_gp_state __gregs;
+	union __riscv_mc_fp_state __fpregs;
+} mcontext_t;
+
+#if defined(_GNU_SOURCE)
+#define REG_PC 0
+#define REG_RA 1
+#define REG_SP 2
+#define REG_TP 4
+#define REG_S0 8
+#define REG_A0 10
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef unsigned long greg_t;
+typedef unsigned long gregset_t[32];
+typedef union __riscv_mc_fp_state fpregset_t;
+struct sigcontext {
+	gregset_t gregs;
+	fpregset_t fpregs;
+};
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct ucontext_t
+{
+	unsigned long uc_flags;
+	struct ucontext_t *uc_link;
+	stack_t uc_stack;
+	sigset_t uc_sigmask;
+	mcontext_t uc_mcontext;
+} ucontext_t;
+
+#define SA_NOCLDSTOP 1
+#define SA_NOCLDWAIT 2
+#define SA_SIGINFO   4
+#define SA_ONSTACK   0x08000000
+#define SA_RESTART   0x10000000
+#define SA_NODEFER   0x40000000
+#define SA_RESETHAND 0x80000000
+#define SA_RESTORER  0x04000000
+
+#endif
+
+#define SIGHUP     1
+#define SIGINT     2
+#define SIGQUIT    3
+#define SIGILL     4
+#define SIGTRAP    5
+#define SIGABRT    6
+#define SIGIOT     SIGABRT
+#define SIGBUS     7
+#define SIGFPE     8
+#define SIGKILL    9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   SIGIO
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG     65
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/stat.h
new file mode 100644
index 0000000000..b7f4221be1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/stat.h
@@ -0,0 +1,18 @@
+struct stat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	unsigned long __pad;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __pad2;
+	blkcnt_t st_blocks;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+	unsigned __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/stdint.h
new file mode 100644
index 0000000000..1bb147f24e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/stdint.h
@@ -0,0 +1,20 @@
+typedef int32_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+
+#define INT_FAST16_MIN  INT32_MIN
+#define INT_FAST32_MIN  INT32_MIN
+
+#define INT_FAST16_MAX  INT32_MAX
+#define INT_FAST32_MAX  INT32_MAX
+
+#define UINT_FAST16_MAX UINT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+
+#define INTPTR_MIN      INT64_MIN
+#define INTPTR_MAX      INT64_MAX
+#define UINTPTR_MAX     UINT64_MAX
+#define PTRDIFF_MIN     INT64_MIN
+#define PTRDIFF_MAX     INT64_MAX
+#define SIZE_MAX        UINT64_MAX
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/syscall.h.in
new file mode 100644
index 0000000000..0043eeba3c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/syscall.h.in
@@ -0,0 +1,294 @@
+#define __NR_io_setup 0
+#define __NR_io_destroy 1
+#define __NR_io_submit 2
+#define __NR_io_cancel 3
+#define __NR_io_getevents 4
+#define __NR_setxattr 5
+#define __NR_lsetxattr 6
+#define __NR_fsetxattr 7
+#define __NR_getxattr 8
+#define __NR_lgetxattr 9
+#define __NR_fgetxattr 10
+#define __NR_listxattr 11
+#define __NR_llistxattr 12
+#define __NR_flistxattr 13
+#define __NR_removexattr 14
+#define __NR_lremovexattr 15
+#define __NR_fremovexattr 16
+#define __NR_getcwd 17
+#define __NR_lookup_dcookie 18
+#define __NR_eventfd2 19
+#define __NR_epoll_create1 20
+#define __NR_epoll_ctl 21
+#define __NR_epoll_pwait 22
+#define __NR_dup 23
+#define __NR_dup3 24
+#define __NR_fcntl 25
+#define __NR_inotify_init1 26
+#define __NR_inotify_add_watch 27
+#define __NR_inotify_rm_watch 28
+#define __NR_ioctl 29
+#define __NR_ioprio_set 30
+#define __NR_ioprio_get 31
+#define __NR_flock 32
+#define __NR_mknodat 33
+#define __NR_mkdirat 34
+#define __NR_unlinkat 35
+#define __NR_symlinkat 36
+#define __NR_linkat 37
+#define __NR_umount2 39
+#define __NR_mount 40
+#define __NR_pivot_root 41
+#define __NR_nfsservctl 42
+#define __NR_statfs 43
+#define __NR_fstatfs 44
+#define __NR_truncate 45
+#define __NR_ftruncate 46
+#define __NR_fallocate 47
+#define __NR_faccessat 48
+#define __NR_chdir 49
+#define __NR_fchdir 50
+#define __NR_chroot 51
+#define __NR_fchmod 52
+#define __NR_fchmodat 53
+#define __NR_fchownat 54
+#define __NR_fchown 55
+#define __NR_openat 56
+#define __NR_close 57
+#define __NR_vhangup 58
+#define __NR_pipe2 59
+#define __NR_quotactl 60
+#define __NR_getdents64 61
+#define __NR_lseek 62
+#define __NR_read 63
+#define __NR_write 64
+#define __NR_readv 65
+#define __NR_writev 66
+#define __NR_pread64 67
+#define __NR_pwrite64 68
+#define __NR_preadv 69
+#define __NR_pwritev 70
+#define __NR_sendfile 71
+#define __NR_pselect6 72
+#define __NR_ppoll 73
+#define __NR_signalfd4 74
+#define __NR_vmsplice 75
+#define __NR_splice 76
+#define __NR_tee 77
+#define __NR_readlinkat 78
+#define __NR_fstatat 79
+#define __NR_fstat 80
+#define __NR_sync 81
+#define __NR_fsync 82
+#define __NR_fdatasync 83
+#define __NR_sync_file_range 84
+#define __NR_timerfd_create 85
+#define __NR_timerfd_settime 86
+#define __NR_timerfd_gettime 87
+#define __NR_utimensat 88
+#define __NR_acct 89
+#define __NR_capget 90
+#define __NR_capset 91
+#define __NR_personality 92
+#define __NR_exit 93
+#define __NR_exit_group 94
+#define __NR_waitid 95
+#define __NR_set_tid_address 96
+#define __NR_unshare 97
+#define __NR_futex 98
+#define __NR_set_robust_list 99
+#define __NR_get_robust_list 100
+#define __NR_nanosleep 101
+#define __NR_getitimer 102
+#define __NR_setitimer 103
+#define __NR_kexec_load 104
+#define __NR_init_module 105
+#define __NR_delete_module 106
+#define __NR_timer_create 107
+#define __NR_timer_gettime 108
+#define __NR_timer_getoverrun 109
+#define __NR_timer_settime 110
+#define __NR_timer_delete 111
+#define __NR_clock_settime 112
+#define __NR_clock_gettime 113
+#define __NR_clock_getres 114
+#define __NR_clock_nanosleep 115
+#define __NR_syslog 116
+#define __NR_ptrace 117
+#define __NR_sched_setparam 118
+#define __NR_sched_setscheduler 119
+#define __NR_sched_getscheduler 120
+#define __NR_sched_getparam 121
+#define __NR_sched_setaffinity 122
+#define __NR_sched_getaffinity 123
+#define __NR_sched_yield 124
+#define __NR_sched_get_priority_max 125
+#define __NR_sched_get_priority_min 126
+#define __NR_sched_rr_get_interval 127
+#define __NR_restart_syscall 128
+#define __NR_kill 129
+#define __NR_tkill 130
+#define __NR_tgkill 131
+#define __NR_sigaltstack 132
+#define __NR_rt_sigsuspend 133
+#define __NR_rt_sigaction 134
+#define __NR_rt_sigprocmask 135
+#define __NR_rt_sigpending 136
+#define __NR_rt_sigtimedwait 137
+#define __NR_rt_sigqueueinfo 138
+#define __NR_rt_sigreturn 139
+#define __NR_setpriority 140
+#define __NR_getpriority 141
+#define __NR_reboot 142
+#define __NR_setregid 143
+#define __NR_setgid 144
+#define __NR_setreuid 145
+#define __NR_setuid 146
+#define __NR_setresuid 147
+#define __NR_getresuid 148
+#define __NR_setresgid 149
+#define __NR_getresgid 150
+#define __NR_setfsuid 151
+#define __NR_setfsgid 152
+#define __NR_times 153
+#define __NR_setpgid 154
+#define __NR_getpgid 155
+#define __NR_getsid 156
+#define __NR_setsid 157
+#define __NR_getgroups 158
+#define __NR_setgroups 159
+#define __NR_uname 160
+#define __NR_sethostname 161
+#define __NR_setdomainname 162
+#define __NR_getrlimit 163
+#define __NR_setrlimit 164
+#define __NR_getrusage 165
+#define __NR_umask 166
+#define __NR_prctl 167
+#define __NR_getcpu 168
+#define __NR_gettimeofday 169
+#define __NR_settimeofday 170
+#define __NR_adjtimex 171
+#define __NR_getpid 172
+#define __NR_getppid 173
+#define __NR_getuid 174
+#define __NR_geteuid 175
+#define __NR_getgid 176
+#define __NR_getegid 177
+#define __NR_gettid 178
+#define __NR_sysinfo 179
+#define __NR_mq_open 180
+#define __NR_mq_unlink 181
+#define __NR_mq_timedsend 182
+#define __NR_mq_timedreceive 183
+#define __NR_mq_notify 184
+#define __NR_mq_getsetattr 185
+#define __NR_msgget 186
+#define __NR_msgctl 187
+#define __NR_msgrcv 188
+#define __NR_msgsnd 189
+#define __NR_semget 190
+#define __NR_semctl 191
+#define __NR_semtimedop 192
+#define __NR_semop 193
+#define __NR_shmget 194
+#define __NR_shmctl 195
+#define __NR_shmat 196
+#define __NR_shmdt 197
+#define __NR_socket 198
+#define __NR_socketpair 199
+#define __NR_bind 200
+#define __NR_listen 201
+#define __NR_accept 202
+#define __NR_connect 203
+#define __NR_getsockname 204
+#define __NR_getpeername 205
+#define __NR_sendto 206
+#define __NR_recvfrom 207
+#define __NR_setsockopt 208
+#define __NR_getsockopt 209
+#define __NR_shutdown 210
+#define __NR_sendmsg 211
+#define __NR_recvmsg 212
+#define __NR_readahead 213
+#define __NR_brk 214
+#define __NR_munmap 215
+#define __NR_mremap 216
+#define __NR_add_key 217
+#define __NR_request_key 218
+#define __NR_keyctl 219
+#define __NR_clone 220
+#define __NR_execve 221
+#define __NR_mmap 222
+#define __NR_fadvise64 223
+#define __NR_swapon 224
+#define __NR_swapoff 225
+#define __NR_mprotect 226
+#define __NR_msync 227
+#define __NR_mlock 228
+#define __NR_munlock 229
+#define __NR_mlockall 230
+#define __NR_munlockall 231
+#define __NR_mincore 232
+#define __NR_madvise 233
+#define __NR_remap_file_pages 234
+#define __NR_mbind 235
+#define __NR_get_mempolicy 236
+#define __NR_set_mempolicy 237
+#define __NR_migrate_pages 238
+#define __NR_move_pages 239
+#define __NR_rt_tgsigqueueinfo 240
+#define __NR_perf_event_open 241
+#define __NR_accept4 242
+#define __NR_recvmmsg 243
+#define __NR_arch_specific_syscall 244
+#define __NR_wait4 260
+#define __NR_prlimit64 261
+#define __NR_fanotify_init 262
+#define __NR_fanotify_mark 263
+#define __NR_name_to_handle_at 264
+#define __NR_open_by_handle_at 265
+#define __NR_clock_adjtime 266
+#define __NR_syncfs 267
+#define __NR_setns 268
+#define __NR_sendmmsg 269
+#define __NR_process_vm_readv 270
+#define __NR_process_vm_writev 271
+#define __NR_kcmp 272
+#define __NR_finit_module 273
+#define __NR_sched_setattr 274
+#define __NR_sched_getattr 275
+#define __NR_renameat2 276
+#define __NR_seccomp 277
+#define __NR_getrandom 278
+#define __NR_memfd_create 279
+#define __NR_bpf 280
+#define __NR_execveat 281
+#define __NR_userfaultfd 282
+#define __NR_membarrier 283
+#define __NR_mlock2 284
+#define __NR_copy_file_range 285
+#define __NR_preadv2 286
+#define __NR_pwritev2 287
+#define __NR_pkey_mprotect 288
+#define __NR_pkey_alloc 289
+#define __NR_pkey_free 290
+#define __NR_statx 291
+#define __NR_io_pgetevents 292
+#define __NR_rseq 293
+#define __NR_kexec_file_load 294
+#define __NR_pidfd_send_signal 424
+#define __NR_io_uring_setup 425
+#define __NR_io_uring_enter 426
+#define __NR_io_uring_register 427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
+#define __NR_sysriscv __NR_arch_specific_syscall
+#define __NR_riscv_flush_icache (__NR_sysriscv + 15)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/user.h
new file mode 100644
index 0000000000..2da743eaf8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/bits/user.h
@@ -0,0 +1,5 @@
+#include <signal.h>
+
+#define ELF_NGREG 32
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+typedef union __riscv_mc_fp_state elf_fpregset_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/crt_arch.h
new file mode 100644
index 0000000000..6b93fcfd12
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/crt_arch.h
@@ -0,0 +1,19 @@
+__asm__(
+".section .sdata,\"aw\"\n"
+".text\n"
+".global " START "\n"
+".type " START ",%function\n"
+START ":\n"
+".weak __global_pointer$\n"
+".hidden __global_pointer$\n"
+".option push\n"
+".option norelax\n\t"
+"lla gp, __global_pointer$\n"
+".option pop\n\t"
+"mv a0, sp\n"
+".weak _DYNAMIC\n"
+".hidden _DYNAMIC\n\t"
+"lla a1, _DYNAMIC\n\t"
+"andi sp, sp, -16\n\t"
+"tail " START "_c"
+);
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/kstat.h
new file mode 100644
index 0000000000..92625f3639
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	unsigned long __pad;
+	off_t st_size;
+	blksize_t st_blksize;
+	int __pad2;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	unsigned __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/pthread_arch.h
new file mode 100644
index 0000000000..db414b1702
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/pthread_arch.h
@@ -0,0 +1,14 @@
+static inline struct pthread *__pthread_self()
+{
+	char *tp;
+	__asm__ __volatile__("mv %0, tp" : "=r"(tp));
+	return (void *)(tp - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 0
+#define TP_ADJ(p) ((char *)p + sizeof(struct pthread))
+
+#define DTP_OFFSET 0x800
+
+#define MC_PC __gregs[0]
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/reloc.h
new file mode 100644
index 0000000000..1ca138111b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/reloc.h
@@ -0,0 +1,22 @@
+#if defined __riscv_float_abi_soft
+#define RISCV_FP_SUFFIX "-sf"
+#elif defined __riscv_float_abi_single
+#define RISCV_FP_SUFFIX "-sp"
+#elif defined __riscv_float_abi_double
+#define RISCV_FP_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "riscv64" RISCV_FP_SUFFIX
+
+#define TPOFF_K 0
+
+#define REL_SYMBOLIC    R_RISCV_64
+#define REL_PLT         R_RISCV_JUMP_SLOT
+#define REL_RELATIVE    R_RISCV_RELATIVE
+#define REL_COPY        R_RISCV_COPY
+#define REL_DTPMOD      R_RISCV_TLS_DTPMOD64
+#define REL_DTPOFF      R_RISCV_TLS_DTPREL64
+#define REL_TPOFF       R_RISCV_TLS_TPREL64
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mv sp, %1 ; jr %0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/riscv64/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/riscv64/syscall_arch.h
new file mode 100644
index 0000000000..7fd042cd4a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/riscv64/syscall_arch.h
@@ -0,0 +1,78 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+
+#define __asm_syscall(...) \
+	__asm__ __volatile__ ("ecall\n\t" \
+	: "=r"(a0) : __VA_ARGS__ : "memory"); \
+	return a0; \
+
+static inline long __syscall0(long n)
+{
+	register long a7 __asm__("a7") = n;
+	register long a0 __asm__("a0");
+	__asm_syscall("r"(a7))
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long a7 __asm__("a7") = n;
+	register long a0 __asm__("a0") = a;
+	__asm_syscall("r"(a7), "0"(a0))
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long a7 __asm__("a7") = n;
+	register long a0 __asm__("a0") = a;
+	register long a1 __asm__("a1") = b;
+	__asm_syscall("r"(a7), "0"(a0), "r"(a1))
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long a7 __asm__("a7") = n;
+	register long a0 __asm__("a0") = a;
+	register long a1 __asm__("a1") = b;
+	register long a2 __asm__("a2") = c;
+	__asm_syscall("r"(a7), "0"(a0), "r"(a1), "r"(a2))
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long a7 __asm__("a7") = n;
+	register long a0 __asm__("a0") = a;
+	register long a1 __asm__("a1") = b;
+	register long a2 __asm__("a2") = c;
+	register long a3 __asm__("a3") = d;
+	__asm_syscall("r"(a7), "0"(a0), "r"(a1), "r"(a2), "r"(a3))
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long a7 __asm__("a7") = n;
+	register long a0 __asm__("a0") = a;
+	register long a1 __asm__("a1") = b;
+	register long a2 __asm__("a2") = c;
+	register long a3 __asm__("a3") = d;
+	register long a4 __asm__("a4") = e;
+	__asm_syscall("r"(a7), "0"(a0), "r"(a1), "r"(a2), "r"(a3), "r"(a4))
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long a7 __asm__("a7") = n;
+	register long a0 __asm__("a0") = a;
+	register long a1 __asm__("a1") = b;
+	register long a2 __asm__("a2") = c;
+	register long a3 __asm__("a3") = d;
+	register long a4 __asm__("a4") = e;
+	register long a5 __asm__("a5") = f;
+	__asm_syscall("r"(a7), "0"(a0), "r"(a1), "r"(a2), "r"(a3), "r"(a4), "r"(a5))
+}
+
+#define VDSO_USEFUL
+/* We don't have a clock_gettime function.
+#define VDSO_CGT_SYM "__vdso_clock_gettime"
+#define VDSO_CGT_VER "LINUX_2.6" */
+
+#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/atomic_arch.h
new file mode 100644
index 0000000000..9b0e1df9e6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/atomic_arch.h
@@ -0,0 +1,30 @@
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__ __volatile__ (
+		"cs %0, %2, %1"
+		: "+d"(t), "+Q"(*p) : "d"(s) : "memory", "cc");
+	return t;
+}
+
+#define a_cas_p a_cas_p
+static inline void *a_cas_p(volatile void *p, void *t, void *s)
+{
+	__asm__ __volatile__ (
+		"csg %0, %2, %1"
+		: "+d"(t), "+Q"(*(void *volatile *)p) : "d"(s)
+		: "memory", "cc");
+	return t;
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("bcr 15,0" : : : "memory");
+}
+
+#define a_crash a_crash
+static inline void a_crash()
+{
+	__asm__ __volatile__ (".insn e,0");
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/alltypes.h.in
new file mode 100644
index 0000000000..15d18c8f4a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/alltypes.h.in
@@ -0,0 +1,15 @@
+#define _Addr long
+#define _Int64 long
+#define _Reg long
+
+#define __BYTE_ORDER 4321
+#define __LONG_MAX 0x7fffffffffffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+TYPEDEF double float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/fcntl.h
new file mode 100644
index 0000000000..a231efb4a5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/fcntl.h
@@ -0,0 +1,43 @@
+#define O_CREAT        0100
+#define O_EXCL         0200
+#define O_NOCTTY       0400
+#define O_TRUNC       01000
+#define O_APPEND      02000
+#define O_NONBLOCK    04000
+#define O_DSYNC      010000
+#define O_SYNC     04010000
+#define O_RSYNC    04010000
+#define O_DIRECTORY 0200000
+#define O_NOFOLLOW  0400000
+#define O_CLOEXEC  02000000
+
+#define O_ASYNC      020000
+#define O_DIRECT     040000
+#define O_LARGEFILE 0100000
+#define O_NOATIME  01000000
+#define O_PATH    010000000
+#define O_TMPFILE 020200000
+#define O_NDELAY O_NONBLOCK
+
+#define F_DUPFD  0
+#define F_GETFD  1
+#define F_SETFD  2
+#define F_GETFL  3
+#define F_SETFL  4
+
+#define F_GETLK  5
+#define F_SETLK  6
+#define F_SETLKW 7
+
+#define F_SETOWN 8
+#define F_GETOWN 9
+#define F_SETSIG 10
+#define F_GETSIG 11
+
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
+
+#define F_GETOWNER_UIDS 17
+
+#define POSIX_FADV_DONTNEED   6
+#define POSIX_FADV_NOREUSE    7
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/fenv.h
new file mode 100644
index 0000000000..773dad9151
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/fenv.h
@@ -0,0 +1,17 @@
+#define FE_TONEAREST	0
+#define FE_TOWARDZERO	1
+#define FE_UPWARD	2
+#define FE_DOWNWARD	3
+
+#define FE_INEXACT	0x00080000
+#define FE_UNDERFLOW	0x00100000
+#define FE_OVERFLOW	0x00200000
+#define FE_DIVBYZERO	0x00400000
+#define FE_INVALID	0x00800000
+
+#define FE_ALL_EXCEPT	0x00f80000
+
+typedef unsigned fexcept_t;
+typedef unsigned fenv_t;
+
+#define FE_DFL_ENV ((const fenv_t *)-1)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/float.h
new file mode 100644
index 0000000000..90b73beed4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/float.h
@@ -0,0 +1,16 @@
+#define FLT_EVAL_METHOD 1
+
+#define LDBL_TRUE_MIN 6.47517511943802511092443895822764655e-4966L
+#define LDBL_MIN 3.36210314311209350626267781732175260e-4932L
+#define LDBL_MAX 1.18973149535723176508575932662800702e+4932L
+#define LDBL_EPSILON 1.92592994438723585305597794258492732e-34L
+
+#define LDBL_MANT_DIG 113
+#define LDBL_MIN_EXP (-16381)
+#define LDBL_MAX_EXP 16384
+
+#define LDBL_DIG 33
+#define LDBL_MIN_10_EXP (-4931)
+#define LDBL_MAX_10_EXP 4932
+
+#define DECIMAL_DIG 36
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/hwcap.h
new file mode 100644
index 0000000000..ecc6ce1fe3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/hwcap.h
@@ -0,0 +1,15 @@
+#define HWCAP_S390_ESAN3	1
+#define HWCAP_S390_ZARCH	2
+#define HWCAP_S390_STFLE	4
+#define HWCAP_S390_MSA		8
+#define HWCAP_S390_LDISP	16
+#define HWCAP_S390_EIMM		32
+#define HWCAP_S390_DFP		64
+#define HWCAP_S390_HPAGE	128
+#define HWCAP_S390_ETF3EH	256
+#define HWCAP_S390_HIGH_GPRS	512
+#define HWCAP_S390_TE		1024
+#define HWCAP_S390_VXRS		2048
+#define HWCAP_S390_VXRS_BCD	4096
+#define HWCAP_S390_VXRS_EXT	8192
+#define HWCAP_S390_GS		16384
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/ioctl_fix.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/ioctl_fix.h
new file mode 100644
index 0000000000..ebb383dafa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/ioctl_fix.h
@@ -0,0 +1,2 @@
+#undef FIOQSIZE
+#define FIOQSIZE 0x545e
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/limits.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/limits.h
new file mode 100644
index 0000000000..07743b6fd6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/limits.h
@@ -0,0 +1 @@
+#define PAGESIZE 4096
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/link.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/link.h
new file mode 100644
index 0000000000..923aac573c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/link.h
@@ -0,0 +1 @@
+typedef uint64_t Elf_Symndx;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/posix.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/posix.h
rename to src/components/lib/libc/musl-1.2.0/arch/s390x/bits/posix.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/ptrace.h
new file mode 100644
index 0000000000..d50e326211
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/ptrace.h
@@ -0,0 +1,9 @@
+#define PTRACE_SINGLEBLOCK		12
+#define PTRACE_PEEKUSR_AREA		0x5000
+#define PTRACE_POKEUSR_AREA		0x5001
+#define PTRACE_GET_LAST_BREAK		0x5006
+#define PTRACE_ENABLE_TE		0x5009
+#define PTRACE_DISABLE_TE		0x5010
+#define PTRACE_TE_ABORT_RAND		0x5011
+
+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/reg.h
new file mode 100644
index 0000000000..2633f39d77
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/reg.h
@@ -0,0 +1,2 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/setjmp.h
new file mode 100644
index 0000000000..b2bd9748c5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/setjmp.h
@@ -0,0 +1 @@
+typedef unsigned long __jmp_buf[18];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/signal.h
new file mode 100644
index 0000000000..e5aca4bac2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/signal.h
@@ -0,0 +1,121 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 4096
+#define SIGSTKSZ    10240
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+typedef unsigned long greg_t, gregset_t[27];
+
+typedef struct {
+	unsigned long mask;
+	unsigned long addr;
+} __psw_t;
+
+typedef union {
+	double d;
+	float f;
+} fpreg_t;
+
+typedef struct {
+	unsigned fpc;
+	fpreg_t fprs[16];
+} fpregset_t;
+
+typedef struct
+{
+	__psw_t psw;
+	unsigned long gregs[16];
+	unsigned aregs[16];
+	fpregset_t fpregs;
+} mcontext_t;
+
+struct sigcontext {
+	unsigned long oldmask[1];
+	struct {
+		struct {
+			__psw_t psw;
+			unsigned long gprs[16];
+			unsigned acrs[16];
+		} regs;
+		struct {
+			unsigned fpc;
+			double fprs[16];
+		} fpregs;
+	} *sregs;
+};
+
+#else
+
+typedef struct {
+	unsigned long __regs1[18];
+	unsigned __regs2[18];
+	double __regs3[16];
+} mcontext_t;
+
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1U
+#define SA_NOCLDWAIT  2U
+#define SA_SIGINFO    4U
+#define SA_ONSTACK    0x08000000U
+#define SA_RESTART    0x10000000U
+#define SA_NODEFER    0x40000000U
+#define SA_RESETHAND  0x80000000U
+#define SA_RESTORER   0x04000000U
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   SIGIO
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/stat.h
new file mode 100644
index 0000000000..2db4ad02f2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/stat.h
@@ -0,0 +1,16 @@
+struct stat {
+	dev_t st_dev;
+	ino_t st_ino;
+	nlink_t st_nlink;
+	mode_t st_mode;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	off_t st_size;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	unsigned long __unused[3];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/statfs.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/statfs.h
new file mode 100644
index 0000000000..6617358a2d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/statfs.h
@@ -0,0 +1,7 @@
+struct statfs {
+	unsigned f_type, f_bsize;
+	fsblkcnt_t f_blocks, f_bfree, f_bavail;
+	fsfilcnt_t f_files, f_ffree;
+	fsid_t f_fsid;
+	unsigned f_namelen, f_frsize, f_flags, f_spare[4];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/stdint.h
new file mode 100644
index 0000000000..1bb147f24e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/stdint.h
@@ -0,0 +1,20 @@
+typedef int32_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+
+#define INT_FAST16_MIN  INT32_MIN
+#define INT_FAST32_MIN  INT32_MIN
+
+#define INT_FAST16_MAX  INT32_MAX
+#define INT_FAST32_MAX  INT32_MAX
+
+#define UINT_FAST16_MAX UINT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+
+#define INTPTR_MIN      INT64_MIN
+#define INTPTR_MAX      INT64_MAX
+#define UINTPTR_MAX     UINT64_MAX
+#define PTRDIFF_MIN     INT64_MIN
+#define PTRDIFF_MAX     INT64_MAX
+#define SIZE_MAX        UINT64_MAX
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/syscall.h.in
new file mode 100644
index 0000000000..e89f378299
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/syscall.h.in
@@ -0,0 +1,355 @@
+#define __NR_exit                         1
+#define __NR_fork                         2
+#define __NR_read                         3
+#define __NR_write                        4
+#define __NR_open                         5
+#define __NR_close                        6
+#define __NR_restart_syscall              7
+#define __NR_creat                        8
+#define __NR_link                         9
+#define __NR_unlink                      10
+#define __NR_execve                      11
+#define __NR_chdir                       12
+#define __NR_mknod                       14
+#define __NR_chmod                       15
+#define __NR_lseek                       19
+#define __NR_getpid                      20
+#define __NR_mount                       21
+#define __NR_umount                      22
+#define __NR_ptrace                      26
+#define __NR_alarm                       27
+#define __NR_pause                       29
+#define __NR_utime                       30
+#define __NR_access                      33
+#define __NR_nice                        34
+#define __NR_sync                        36
+#define __NR_kill                        37
+#define __NR_rename                      38
+#define __NR_mkdir                       39
+#define __NR_rmdir                       40
+#define __NR_dup                         41
+#define __NR_pipe                        42
+#define __NR_times                       43
+#define __NR_brk                         45
+#define __NR_signal                      48
+#define __NR_acct                        51
+#define __NR_umount2                     52
+#define __NR_ioctl                       54
+#define __NR_fcntl                       55
+#define __NR_setpgid                     57
+#define __NR_umask                       60
+#define __NR_chroot                      61
+#define __NR_ustat                       62
+#define __NR_dup2                        63
+#define __NR_getppid                     64
+#define __NR_getpgrp                     65
+#define __NR_setsid                      66
+#define __NR_sigaction                   67
+#define __NR_sigsuspend                  72
+#define __NR_sigpending                  73
+#define __NR_sethostname                 74
+#define __NR_setrlimit                   75
+#define __NR_getrusage                   77
+#define __NR_gettimeofday                78
+#define __NR_settimeofday                79
+#define __NR_symlink                     83
+#define __NR_readlink                    85
+#define __NR_uselib                      86
+#define __NR_swapon                      87
+#define __NR_reboot                      88
+#define __NR_readdir                     89
+#define __NR_mmap                        90
+#define __NR_munmap                      91
+#define __NR_truncate                    92
+#define __NR_ftruncate                   93
+#define __NR_fchmod                      94
+#define __NR_getpriority                 96
+#define __NR_setpriority                 97
+#define __NR_statfs                      99
+#define __NR_fstatfs                    100
+#define __NR_socketcall                 102
+#define __NR_syslog                     103
+#define __NR_setitimer                  104
+#define __NR_getitimer                  105
+#define __NR_stat                       106
+#define __NR_lstat                      107
+#define __NR_fstat                      108
+#define __NR_lookup_dcookie             110
+#define __NR_vhangup                    111
+#define __NR_idle                       112
+#define __NR_wait4                      114
+#define __NR_swapoff                    115
+#define __NR_sysinfo                    116
+#define __NR_ipc                        117
+#define __NR_fsync                      118
+#define __NR_sigreturn                  119
+#define __NR_clone                      120
+#define __NR_setdomainname              121
+#define __NR_uname                      122
+#define __NR_adjtimex                   124
+#define __NR_mprotect                   125
+#define __NR_sigprocmask                126
+#define __NR_create_module              127
+#define __NR_init_module                128
+#define __NR_delete_module              129
+#define __NR_get_kernel_syms            130
+#define __NR_quotactl                   131
+#define __NR_getpgid                    132
+#define __NR_fchdir                     133
+#define __NR_bdflush                    134
+#define __NR_sysfs                      135
+#define __NR_personality                136
+#define __NR_afs_syscall                137
+#define __NR_getdents                   141
+#define __NR_select                     142
+#define __NR_flock                      143
+#define __NR_msync                      144
+#define __NR_readv                      145
+#define __NR_writev                     146
+#define __NR_getsid                     147
+#define __NR_fdatasync                  148
+#define __NR__sysctl                    149
+#define __NR_mlock                      150
+#define __NR_munlock                    151
+#define __NR_mlockall                   152
+#define __NR_munlockall                 153
+#define __NR_sched_setparam             154
+#define __NR_sched_getparam             155
+#define __NR_sched_setscheduler         156
+#define __NR_sched_getscheduler         157
+#define __NR_sched_yield                158
+#define __NR_sched_get_priority_max     159
+#define __NR_sched_get_priority_min     160
+#define __NR_sched_rr_get_interval      161
+#define __NR_nanosleep                  162
+#define __NR_mremap                     163
+#define __NR_query_module               167
+#define __NR_poll                       168
+#define __NR_nfsservctl                 169
+#define __NR_prctl                      172
+#define __NR_rt_sigreturn               173
+#define __NR_rt_sigaction               174
+#define __NR_rt_sigprocmask             175
+#define __NR_rt_sigpending              176
+#define __NR_rt_sigtimedwait            177
+#define __NR_rt_sigqueueinfo            178
+#define __NR_rt_sigsuspend              179
+#define __NR_pread64                    180
+#define __NR_pwrite64                   181
+#define __NR_getcwd                     183
+#define __NR_capget                     184
+#define __NR_capset                     185
+#define __NR_sigaltstack                186
+#define __NR_sendfile                   187
+#define __NR_getpmsg                    188
+#define __NR_putpmsg                    189
+#define __NR_vfork                      190
+#define __NR_getrlimit                  191
+#define __NR_lchown                     198
+#define __NR_getuid                     199
+#define __NR_getgid                     200
+#define __NR_geteuid                    201
+#define __NR_getegid                    202
+#define __NR_setreuid                   203
+#define __NR_setregid                   204
+#define __NR_getgroups                  205
+#define __NR_setgroups                  206
+#define __NR_fchown                     207
+#define __NR_setresuid                  208
+#define __NR_getresuid                  209
+#define __NR_setresgid                  210
+#define __NR_getresgid                  211
+#define __NR_chown                      212
+#define __NR_setuid                     213
+#define __NR_setgid                     214
+#define __NR_setfsuid                   215
+#define __NR_setfsgid                   216
+#define __NR_pivot_root                 217
+#define __NR_mincore                    218
+#define __NR_madvise                    219
+#define __NR_getdents64                 220
+#define __NR_readahead                  222
+#define __NR_setxattr                   224
+#define __NR_lsetxattr                  225
+#define __NR_fsetxattr                  226
+#define __NR_getxattr                   227
+#define __NR_lgetxattr                  228
+#define __NR_fgetxattr                  229
+#define __NR_listxattr                  230
+#define __NR_llistxattr                 231
+#define __NR_flistxattr                 232
+#define __NR_removexattr                233
+#define __NR_lremovexattr               234
+#define __NR_fremovexattr               235
+#define __NR_gettid                     236
+#define __NR_tkill                      237
+#define __NR_futex                      238
+#define __NR_sched_setaffinity          239
+#define __NR_sched_getaffinity          240
+#define __NR_tgkill                     241
+#define __NR_io_setup                   243
+#define __NR_io_destroy                 244
+#define __NR_io_getevents               245
+#define __NR_io_submit                  246
+#define __NR_io_cancel                  247
+#define __NR_exit_group                 248
+#define __NR_epoll_create               249
+#define __NR_epoll_ctl                  250
+#define __NR_epoll_wait                 251
+#define __NR_set_tid_address            252
+#define __NR_fadvise64                  253
+#define __NR_timer_create               254
+#define __NR_timer_settime              255
+#define __NR_timer_gettime              256
+#define __NR_timer_getoverrun           257
+#define __NR_timer_delete               258
+#define __NR_clock_settime              259
+#define __NR_clock_gettime              260
+#define __NR_clock_getres               261
+#define __NR_clock_nanosleep            262
+#define __NR_statfs64                   265
+#define __NR_fstatfs64                  266
+#define __NR_remap_file_pages           267
+#define __NR_mbind                      268
+#define __NR_get_mempolicy              269
+#define __NR_set_mempolicy              270
+#define __NR_mq_open                    271
+#define __NR_mq_unlink                  272
+#define __NR_mq_timedsend               273
+#define __NR_mq_timedreceive            274
+#define __NR_mq_notify                  275
+#define __NR_mq_getsetattr              276
+#define __NR_kexec_load                 277
+#define __NR_add_key                    278
+#define __NR_request_key                279
+#define __NR_keyctl                     280
+#define __NR_waitid                     281
+#define __NR_ioprio_set                 282
+#define __NR_ioprio_get                 283
+#define __NR_inotify_init               284
+#define __NR_inotify_add_watch          285
+#define __NR_inotify_rm_watch           286
+#define __NR_migrate_pages              287
+#define __NR_openat                     288
+#define __NR_mkdirat                    289
+#define __NR_mknodat                    290
+#define __NR_fchownat                   291
+#define __NR_futimesat                  292
+#define __NR_newfstatat                 293
+#define __NR_unlinkat                   294
+#define __NR_renameat                   295
+#define __NR_linkat                     296
+#define __NR_symlinkat                  297
+#define __NR_readlinkat                 298
+#define __NR_fchmodat                   299
+#define __NR_faccessat                  300
+#define __NR_pselect6                   301
+#define __NR_ppoll                      302
+#define __NR_unshare                    303
+#define __NR_set_robust_list            304
+#define __NR_get_robust_list            305
+#define __NR_splice                     306
+#define __NR_sync_file_range            307
+#define __NR_tee                        308
+#define __NR_vmsplice                   309
+#define __NR_move_pages                 310
+#define __NR_getcpu                     311
+#define __NR_epoll_pwait                312
+#define __NR_utimes                     313
+#define __NR_fallocate                  314
+#define __NR_utimensat                  315
+#define __NR_signalfd                   316
+#define __NR_timerfd                    317
+#define __NR_eventfd                    318
+#define __NR_timerfd_create             319
+#define __NR_timerfd_settime            320
+#define __NR_timerfd_gettime            321
+#define __NR_signalfd4                  322
+#define __NR_eventfd2                   323
+#define __NR_inotify_init1              324
+#define __NR_pipe2                      325
+#define __NR_dup3                       326
+#define __NR_epoll_create1              327
+#define __NR_preadv                     328
+#define __NR_pwritev                    329
+#define __NR_rt_tgsigqueueinfo          330
+#define __NR_perf_event_open            331
+#define __NR_fanotify_init              332
+#define __NR_fanotify_mark              333
+#define __NR_prlimit64                  334
+#define __NR_name_to_handle_at          335
+#define __NR_open_by_handle_at          336
+#define __NR_clock_adjtime              337
+#define __NR_syncfs                     338
+#define __NR_setns                      339
+#define __NR_process_vm_readv           340
+#define __NR_process_vm_writev          341
+#define __NR_s390_runtime_instr         342
+#define __NR_kcmp                       343
+#define __NR_finit_module               344
+#define __NR_sched_setattr              345
+#define __NR_sched_getattr              346
+#define __NR_renameat2                  347
+#define __NR_seccomp                    348
+#define __NR_getrandom                  349
+#define __NR_memfd_create               350
+#define __NR_bpf                        351
+#define __NR_s390_pci_mmio_write        352
+#define __NR_s390_pci_mmio_read         353
+#define __NR_execveat                   354
+#define __NR_userfaultfd                355
+#define __NR_membarrier                 356
+#define __NR_recvmmsg                   357
+#define __NR_sendmmsg                   358
+#define __NR_socket                     359
+#define __NR_socketpair                 360
+#define __NR_bind                       361
+#define __NR_connect                    362
+#define __NR_listen                     363
+#define __NR_accept4                    364
+#define __NR_getsockopt                 365
+#define __NR_setsockopt                 366
+#define __NR_getsockname                367
+#define __NR_getpeername                368
+#define __NR_sendto                     369
+#define __NR_sendmsg                    370
+#define __NR_recvfrom                   371
+#define __NR_recvmsg                    372
+#define __NR_shutdown                   373
+#define __NR_mlock2                     374
+#define __NR_copy_file_range            375
+#define __NR_preadv2                    376
+#define __NR_pwritev2                   377
+#define __NR_s390_guarded_storage       378
+#define __NR_statx                      379
+#define __NR_s390_sthyi                 380
+#define __NR_kexec_file_load            381
+#define __NR_io_pgetevents              382
+#define __NR_rseq                       383
+#define __NR_pkey_mprotect              384
+#define __NR_pkey_alloc                 385
+#define __NR_pkey_free                  386
+#define __NR_semtimedop                 392
+#define __NR_semget                     393
+#define __NR_semctl                     394
+#define __NR_shmget                     395
+#define __NR_shmctl                     396
+#define __NR_shmat                      397
+#define __NR_shmdt                      398
+#define __NR_msgget                     399
+#define __NR_msgsnd                     400
+#define __NR_msgrcv                     401
+#define __NR_msgctl                     402
+#define __NR_pidfd_send_signal          424
+#define __NR_io_uring_setup             425
+#define __NR_io_uring_enter             426
+#define __NR_io_uring_register          427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/user.h
new file mode 100644
index 0000000000..ff3f048380
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/bits/user.h
@@ -0,0 +1,62 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
+
+typedef union {
+	double d;
+	float f;
+} elf_fpreg_t;
+
+typedef struct {
+	unsigned fpc;
+	elf_fpreg_t fprs[16];
+} elf_fpregset_t;
+
+#define ELF_NGREG 27
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+
+struct _user_psw_struct {
+	unsigned long mask, addr;
+};
+
+struct _user_fpregs_struct {
+	unsigned fpc;
+	double fprs[16];
+};
+
+struct _user_per_struct {
+	unsigned long control_regs[3];
+	unsigned single_step       : 1;
+	unsigned instruction_fetch : 1;
+	unsigned                   : 30;
+	unsigned long starting_addr, ending_addr;
+	unsigned short perc_atmid;
+	unsigned long address;
+	unsigned char access_id;
+};
+
+struct _user_regs_struct {
+	struct _user_psw_struct psw;
+	unsigned long gprs[16];
+	unsigned acrs[16];
+	unsigned long orig_gpr2;
+	struct _user_fpregs_struct fp_regs;
+	struct _user_per_struct per_info;
+	unsigned long ieee_instruction_pointer;
+};
+
+struct user {
+	struct _user_regs_struct regs;
+	unsigned long u_tsize, u_dsize, u_ssize;
+	unsigned long start_code, start_stack;
+	long signal;
+	struct _user_regs_struct *u_ar0;
+	unsigned long magic;
+	char u_comm[32];
+};
+
+#define PAGE_MASK            (~(PAGESIZE-1))
+#define NBPG                 PAGESIZE
+#define UPAGES               1
+#define HOST_TEXT_START_ADDR (u.start_code)
+#define HOST_STACK_END_ADDR  (u.start_stack + u.u_ssize * NBPG)
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/crt_arch.h
new file mode 100644
index 0000000000..92091a100f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/crt_arch.h
@@ -0,0 +1,17 @@
+__asm__(
+".text\n"
+".global " START "\n"
+".type   " START ", %function\n"
+START ":\n"
+"	lgr  %r2, %r15\n"
+"	larl %r3, 1f\n"
+"	agf  %r3, 0(%r3)\n"
+"	aghi %r15, -160\n"
+"	lghi %r0, 0\n"
+"	stg  %r0, 0(%r15)\n"
+"	jg " START "_c\n"
+"	.align 8\n"
+".weak   _DYNAMIC\n"
+".hidden _DYNAMIC\n"
+"1:	.long _DYNAMIC-.\n"
+);
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/kstat.h
new file mode 100644
index 0000000000..001c10be3f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/kstat.h
@@ -0,0 +1,19 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	nlink_t st_nlink;
+	mode_t st_mode;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	off_t st_size;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	unsigned long __unused[3];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/pthread_arch.h
new file mode 100644
index 0000000000..e2251f1fa4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/pthread_arch.h
@@ -0,0 +1,14 @@
+static inline struct pthread *__pthread_self()
+{
+	struct pthread *self;
+	__asm__ (
+		"ear  %0, %%a0\n"
+		"sllg %0, %0, 32\n"
+		"ear  %0, %%a1\n"
+		: "=r"(self));
+	return self;
+}
+
+#define TP_ADJ(p) (p)
+
+#define MC_PC psw.addr
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/reloc.h
new file mode 100644
index 0000000000..6e5c1fb876
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/reloc.h
@@ -0,0 +1,13 @@
+#define LDSO_ARCH "s390x"
+
+#define REL_SYMBOLIC    R_390_64
+#define REL_GOT         R_390_GLOB_DAT
+#define REL_PLT         R_390_JMP_SLOT
+#define REL_RELATIVE    R_390_RELATIVE
+#define REL_COPY        R_390_COPY
+#define REL_DTPMOD      R_390_TLS_DTPMOD
+#define REL_DTPOFF      R_390_TLS_DTPOFF
+#define REL_TPOFF       R_390_TLS_TPOFF
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"lgr %%r15,%1; br %0" : : "r"(pc), "r"(sp) : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/s390x/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/s390x/syscall_arch.h
new file mode 100644
index 0000000000..afb99852eb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/s390x/syscall_arch.h
@@ -0,0 +1,76 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+
+#define __asm_syscall(ret, ...) do { \
+	__asm__ __volatile__ ("svc 0\n" \
+	: ret : __VA_ARGS__ : "memory"); \
+	return r2; \
+	} while (0)
+
+static inline long __syscall0(long n)
+{
+	register long r1 __asm__("r1") = n;
+	register long r2 __asm__("r2");
+	__asm_syscall("=r"(r2), "r"(r1));
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long r1 __asm__("r1") = n;
+	register long r2 __asm__("r2") = a;
+	__asm_syscall("+r"(r2), "r"(r1));
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long r1 __asm__("r1") = n;
+	register long r2 __asm__("r2") = a;
+	register long r3 __asm__("r3") = b;
+	__asm_syscall("+r"(r2), "r"(r1), "r"(r3));
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long r1 __asm__("r1") = n;
+	register long r2 __asm__("r2") = a;
+	register long r3 __asm__("r3") = b;
+	register long r4 __asm__("r4") = c;
+	__asm_syscall("+r"(r2), "r"(r1), "r"(r3), "r"(r4));
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long r1 __asm__("r1") = n;
+	register long r2 __asm__("r2") = a;
+	register long r3 __asm__("r3") = b;
+	register long r4 __asm__("r4") = c;
+	register long r5 __asm__("r5") = d;
+	__asm_syscall("+r"(r2), "r"(r1), "r"(r3), "r"(r4), "r"(r5));
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long r1 __asm__("r1") = n;
+	register long r2 __asm__("r2") = a;
+	register long r3 __asm__("r3") = b;
+	register long r4 __asm__("r4") = c;
+	register long r5 __asm__("r5") = d;
+	register long r6 __asm__("r6") = e;
+	__asm_syscall("+r"(r2), "r"(r1), "r"(r3), "r"(r4), "r"(r5), "r"(r6));
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	if (n == SYS_mmap) return __syscall1(n, (long)(long[]){a,b,c,d,e,f});
+
+	register long r1 __asm__("r1") = n;
+	register long r2 __asm__("r2") = a;
+	register long r3 __asm__("r3") = b;
+	register long r4 __asm__("r4") = c;
+	register long r5 __asm__("r5") = d;
+	register long r6 __asm__("r6") = e;
+	register long r7 __asm__("r7") = f;
+	__asm_syscall("+r"(r2), "r"(r1), "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7));
+}
+
+#define SYSCALL_USE_SOCKETCALL
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/arch.mak b/src/components/lib/libc/musl-1.2.0/arch/sh/arch.mak
new file mode 100644
index 0000000000..aa4d05ceff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/arch.mak
@@ -0,0 +1 @@
+COMPAT_SRC_DIRS = compat/time32
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/sh/atomic_arch.h
new file mode 100644
index 0000000000..0a4d0c1189
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/atomic_arch.h
@@ -0,0 +1,48 @@
+#include "libc.h"
+
+#if defined(__SH4A__)
+
+#define a_ll a_ll
+static inline int a_ll(volatile int *p)
+{
+	int v;
+	__asm__ __volatile__ ("movli.l @%1, %0" : "=z"(v) : "r"(p), "m"(*p));
+	return v;
+}
+
+#define a_sc a_sc
+static inline int a_sc(volatile int *p, int v)
+{
+	int r;
+	__asm__ __volatile__ (
+		"movco.l %2, @%3 ; movt %0"
+		: "=r"(r), "=m"(*p) : "z"(v), "r"(p) : "memory", "cc");
+	return r;
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__ ("synco" ::: "memory");
+}
+
+#define a_pre_llsc a_barrier
+#define a_post_llsc a_barrier
+
+#else
+
+#define a_cas a_cas
+extern hidden const void *__sh_cas_ptr;
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	register int r1 __asm__("r1");
+	register int r2 __asm__("r2") = t;
+	register int r3 __asm__("r3") = s;
+	__asm__ __volatile__ (
+		"jsr @%4 ; nop"
+		: "=r"(r1), "+r"(r3) : "z"(p), "r"(r2), "r"(__sh_cas_ptr)
+		: "memory", "pr", "cc");
+	return r3;
+}
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/alltypes.h.in
new file mode 100644
index 0000000000..6a5383526b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/alltypes.h.in
@@ -0,0 +1,25 @@
+#define _REDIR_TIME64 1
+#define _Addr int
+#define _Int64 long long
+#define _Reg int
+
+#if __BIG_ENDIAN__
+#define __BYTE_ORDER 4321
+#else
+#define __BYTE_ORDER 1234
+#endif
+
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+#ifdef __WCHAR_TYPE__
+TYPEDEF __WCHAR_TYPE__ wchar_t;
+#else
+TYPEDEF long wchar_t;
+#endif
+#endif
+
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/sh/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/sh/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/float.h
new file mode 100644
index 0000000000..c4a655e7b5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/float.h
@@ -0,0 +1,16 @@
+#define FLT_EVAL_METHOD 0
+
+#define LDBL_TRUE_MIN 4.94065645841246544177e-324L
+#define LDBL_MIN 2.22507385850720138309e-308L
+#define LDBL_MAX 1.79769313486231570815e+308L
+#define LDBL_EPSILON 2.22044604925031308085e-16L
+
+#define LDBL_MANT_DIG 53
+#define LDBL_MIN_EXP (-1021)
+#define LDBL_MAX_EXP 1024
+
+#define LDBL_DIG 15
+#define LDBL_MIN_10_EXP (-307)
+#define LDBL_MAX_10_EXP 308
+
+#define DECIMAL_DIG 17
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/hwcap.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/hwcap.h
new file mode 100644
index 0000000000..f85121d03f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/hwcap.h
@@ -0,0 +1,11 @@
+#define CPU_HAS_FPU		0x0001
+#define CPU_HAS_P2_FLUSH_BUG	0x0002
+#define CPU_HAS_MMU_PAGE_ASSOC	0x0004
+#define CPU_HAS_DSP		0x0008
+#define CPU_HAS_PERF_COUNTER	0x0010
+#define CPU_HAS_PTEA		0x0020
+#define CPU_HAS_LLSC		0x0040
+#define CPU_HAS_L2_CACHE	0x0080
+#define CPU_HAS_OP32		0x0100
+#define CPU_HAS_PTEAEX		0x0200
+#define CPU_HAS_CAS_L		0x0400
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ioctl.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ioctl.h
new file mode 100644
index 0000000000..370b6901e2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ioctl.h
@@ -0,0 +1,112 @@
+#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
+#define _IOC_NONE  0U
+#define _IOC_WRITE 1U
+#define _IOC_READ  2U
+
+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
+
+#define FIOCLEX             _IO('f',  1)
+#define FIONCLEX            _IO('f',  2)
+#define FIOASYNC            _IOW('f', 125, int)
+#define FIONBIO             _IOW('f', 126, int)
+#define FIONREAD            _IOR('f', 127, int)
+#define TIOCINQ             FIONREAD
+#define FIOQSIZE            _IOR('f', 128, char[8])
+
+#define TCGETA              _IOR('t', 23, char[18])
+#define TCSETA              _IOW('t', 24, char[18])
+#define TCSETAW             _IOW('t', 25, char[18])
+#define TCSETAF             _IOW('t', 28, char[18])
+
+#define TCSBRK              _IO('t', 29)
+#define TCXONC              _IO('t', 30)
+#define TCFLSH              _IO('t', 31)
+
+#define TIOCSWINSZ          _IOW('t', 103, char[8])
+#define TIOCGWINSZ          _IOR('t', 104, char[8])
+#define TIOCSTART           _IO('t',  110)
+#define TIOCSTOP            _IO('t',  111)
+#define TIOCOUTQ            _IOR('t', 115, int)
+
+#define TIOCSPGRP           _IOW('t', 118, int)
+#define TIOCGPGRP           _IOR('t', 119, int)
+
+#define TIOCEXCL            _IO('T', 12)
+#define TIOCNXCL            _IO('T', 13)
+#define TIOCSCTTY           _IO('T', 14)
+
+#define TIOCSTI             _IOW('T', 18, char)
+#define TIOCMGET            _IOR('T', 21, unsigned int)
+#define TIOCMBIS            _IOW('T', 22, unsigned int)
+#define TIOCMBIC            _IOW('T', 23, unsigned int)
+#define TIOCMSET            _IOW('T', 24, unsigned int)
+#define TIOCM_LE            0x001
+#define TIOCM_DTR           0x002
+#define TIOCM_RTS           0x004
+#define TIOCM_ST            0x008
+#define TIOCM_SR            0x010
+#define TIOCM_CTS           0x020
+#define TIOCM_CAR           0x040
+#define TIOCM_RNG           0x080
+#define TIOCM_DSR           0x100
+#define TIOCM_CD            TIOCM_CAR
+#define TIOCM_RI            TIOCM_RNG
+#define TIOCM_OUT1          0x2000
+#define TIOCM_OUT2          0x4000
+#define TIOCM_LOOP          0x8000
+
+#define TIOCGSOFTCAR        _IOR('T', 25, unsigned int)
+#define TIOCSSOFTCAR        _IOW('T', 26, unsigned int)
+#define TIOCLINUX           _IOW('T', 28, char)
+#define TIOCCONS            _IO('T',  29)
+#define TIOCGSERIAL         _IOR('T', 30, char[60])
+#define TIOCSSERIAL         _IOW('T', 31, char[60])
+#define TIOCPKT             _IOW('T', 32, int)
+
+#define TIOCNOTTY           _IO('T',  34)
+#define TIOCSETD            _IOW('T', 35, int)
+#define TIOCGETD            _IOR('T', 36, int)
+#define TCSBRKP             _IOW('T', 37, int)
+#define TIOCSBRK            _IO('T',  39)
+#define TIOCCBRK            _IO('T',  40)
+#define TIOCGSID            _IOR('T', 41, int)
+#define TCGETS              _IO('T', 1)
+#define TCSETS              _IO('T', 2)
+#define TCSETSW             _IO('T', 3)
+#define TCSETSF             _IO('T', 4)
+#define TIOCGRS485          _IOR('T', 46, char[32])
+#define TIOCSRS485          _IOWR('T', 47, char[32])
+#define TIOCGPTN            _IOR('T', 48, unsigned int)
+#define TIOCSPTLCK          _IOW('T', 49, int)
+#define TIOCGDEV            _IOR('T', 50, unsigned int)
+#define TIOCSIG             _IOW('T', 54, int)
+#define TIOCVHANGUP         _IO('T',  55)
+#define TIOCGPKT            _IOR('T', 56, int)
+#define TIOCGPTLCK          _IOR('T', 57, int)
+#define TIOCGEXCL           _IOR('T', 64, int)
+#define TIOCGPTPEER         _IO('T', 0x41)
+
+#define TIOCSERCONFIG       _IO('T',  83)
+#define TIOCSERGWILD        _IOR('T', 84, int)
+#define TIOCSERSWILD        _IOW('T', 85, int)
+#define TIOCGLCKTRMIOS      _IO('T',  86)
+#define TIOCSLCKTRMIOS      _IO('T',  87)
+#define TIOCSERGSTRUCT      _IOR('T', 88, char[216])
+#define TIOCSERGETLSR       _IOR('T', 89, unsigned int)
+#define TIOCSERGETMULTI     _IOR('T', 90, char[168])
+#define TIOCSERSETMULTI     _IOW('T', 91, char[168])
+
+#define TIOCMIWAIT          _IO('T', 92)
+#define TIOCGICOUNT         _IO('T', 93)
+
+#define FIOGETOWN       _IOR('f', 123, int)
+#define FIOSETOWN       _IOW('f', 124, int)
+
+#define SIOCATMARK      _IOR('s', 7, int)
+#define SIOCSPGRP       _IOW('s', 8, int)
+#define SIOCGPGRP       _IOW('s', 9, int)
+#define SIOCGSTAMP      _IOR(0x89, 6, char[16])
+#define SIOCGSTAMPNS    _IOR(0x89, 7, char[16])
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ipcstat.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ipcstat.h
new file mode 100644
index 0000000000..4f4fcb0c5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ipcstat.h
@@ -0,0 +1 @@
+#define IPC_STAT 0x102
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/limits.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/limits.h
new file mode 100644
index 0000000000..07743b6fd6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/limits.h
@@ -0,0 +1 @@
+#define PAGESIZE 4096
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/msg.h
new file mode 100644
index 0000000000..7bbbb2bf43
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/msg.h
@@ -0,0 +1,18 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	unsigned long __msg_stime_lo;
+	unsigned long __msg_stime_hi;
+	unsigned long __msg_rtime_lo;
+	unsigned long __msg_rtime_hi;
+	unsigned long __msg_ctime_lo;
+	unsigned long __msg_ctime_hi;
+	unsigned long msg_cbytes;
+	msgqnum_t msg_qnum;
+	msglen_t msg_qbytes;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long __unused[2];
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/posix.h
new file mode 100644
index 0000000000..30a38714f3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/posix.h
@@ -0,0 +1,2 @@
+#define _POSIX_V6_ILP32_OFFBIG  1
+#define _POSIX_V7_ILP32_OFFBIG  1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ptrace.h
new file mode 100644
index 0000000000..4435ca1f7a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/ptrace.h
@@ -0,0 +1,5 @@
+#define PTRACE_GETFDPIC		31
+#define PTRACE_GETFDPIC_EXEC	0
+#define PTRACE_GETFDPIC_INTERP	1
+#define PTRACE_GETDSPREGS	55
+#define PTRACE_SETDSPREGS	56
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/sem.h
new file mode 100644
index 0000000000..544e3d2a52
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/sem.h
@@ -0,0 +1,18 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	unsigned long __sem_otime_lo;
+	unsigned long __sem_otime_hi;
+	unsigned long __sem_ctime_lo;
+	unsigned long __sem_ctime_hi;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+#else
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	unsigned short sem_nsems;
+#endif
+	long __unused3;
+	long __unused4;
+	time_t sem_otime;
+	time_t sem_ctime;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/sh/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/sh/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/shm.h
new file mode 100644
index 0000000000..adc01e3426
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/shm.h
@@ -0,0 +1,31 @@
+#define SHMLBA 16384
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	unsigned long __shm_atime_lo;
+	unsigned long __shm_atime_hi;
+	unsigned long __shm_dtime_lo;
+	unsigned long __shm_dtime_hi;
+	unsigned long __shm_ctime_lo;
+	unsigned long __shm_ctime_hi;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad1;
+	unsigned long __pad2;
+	unsigned long __pad3;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+};
+
+struct shminfo {
+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	unsigned long shm_tot, shm_rss, shm_swp;
+	unsigned long __swap_attempts, __swap_successes;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/sh/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/signal.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/sh/bits/signal.h
rename to src/components/lib/libc/musl-1.2.0/arch/sh/bits/signal.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/stat.h
new file mode 100644
index 0000000000..5d7828cf79
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/stat.h
@@ -0,0 +1,25 @@
+/* copied from kernel definition, but with padding replaced
+ * by the corresponding correctly-sized userspace types. */
+
+struct stat {
+	dev_t st_dev;
+	int __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	int __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+	ino_t st_ino;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/stdint.h
new file mode 100644
index 0000000000..d1b2712199
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/stdint.h
@@ -0,0 +1,20 @@
+typedef int32_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+
+#define INT_FAST16_MIN  INT32_MIN
+#define INT_FAST32_MIN  INT32_MIN
+
+#define INT_FAST16_MAX  INT32_MAX
+#define INT_FAST32_MAX  INT32_MAX
+
+#define UINT_FAST16_MAX UINT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+
+#define INTPTR_MIN      INT32_MIN
+#define INTPTR_MAX      INT32_MAX
+#define UINTPTR_MAX     UINT32_MAX
+#define PTRDIFF_MIN     INT32_MIN
+#define PTRDIFF_MAX     INT32_MAX
+#define SIZE_MAX        UINT32_MAX
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/syscall.h.in
new file mode 100644
index 0000000000..0102ddaf8d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/syscall.h.in
@@ -0,0 +1,401 @@
+#define __NR_restart_syscall        0
+#define __NR_exit                   1
+#define __NR_fork                   2
+#define __NR_read                   3
+#define __NR_write                  4
+#define __NR_open                   5
+#define __NR_close                  6
+#define __NR_waitpid                7
+#define __NR_creat                  8
+#define __NR_link                   9
+#define __NR_unlink                 10
+#define __NR_execve                 11
+#define __NR_chdir                  12
+#define __NR_time                   13
+#define __NR_mknod                  14
+#define __NR_chmod                  15
+#define __NR_lchown                 16
+#define __NR_oldstat                18
+#define __NR_lseek                  19
+#define __NR_getpid                 20
+#define __NR_mount                  21
+#define __NR_umount                 22
+#define __NR_setuid                 23
+#define __NR_getuid                 24
+#define __NR_stime                  25
+#define __NR_ptrace                 26
+#define __NR_alarm                  27
+#define __NR_oldfstat               28
+#define __NR_pause                  29
+#define __NR_utime                  30
+#define __NR_access                 33
+#define __NR_nice                   34
+#define __NR_sync                   36
+#define __NR_kill                   37
+#define __NR_rename                 38
+#define __NR_mkdir                  39
+#define __NR_rmdir                  40
+#define __NR_dup                    41
+#define __NR_pipe                   42
+#define __NR_times                  43
+#define __NR_brk                    45
+#define __NR_setgid                 46
+#define __NR_getgid                 47
+#define __NR_signal                 48
+#define __NR_geteuid                49
+#define __NR_getegid                50
+#define __NR_acct                   51
+#define __NR_umount2                52
+#define __NR_ioctl                  54
+#define __NR_fcntl                  55
+#define __NR_setpgid                57
+#define __NR_umask                  60
+#define __NR_chroot                 61
+#define __NR_ustat                  62
+#define __NR_dup2                   63
+#define __NR_getppid                64
+#define __NR_getpgrp                65
+#define __NR_setsid                 66
+#define __NR_sigaction              67
+#define __NR_sgetmask               68
+#define __NR_ssetmask               69
+#define __NR_setreuid               70
+#define __NR_setregid               71
+#define __NR_sigsuspend             72
+#define __NR_sigpending             73
+#define __NR_sethostname            74
+#define __NR_setrlimit              75
+#define __NR_getrlimit              76
+#define __NR_getrusage              77
+#define __NR_gettimeofday_time32           78
+#define __NR_settimeofday_time32           79
+#define __NR_getgroups              80
+#define __NR_setgroups              81
+#define __NR_symlink                83
+#define __NR_oldlstat               84
+#define __NR_readlink               85
+#define __NR_uselib                 86
+#define __NR_swapon                 87
+#define __NR_reboot                 88
+#define __NR_readdir                89
+#define __NR_mmap                   90
+#define __NR_munmap                 91
+#define __NR_truncate               92
+#define __NR_ftruncate              93
+#define __NR_fchmod                 94
+#define __NR_fchown                 95
+#define __NR_getpriority            96
+#define __NR_setpriority            97
+#define __NR_statfs                 99
+#define __NR_fstatfs                100
+#define __NR_socketcall             102
+#define __NR_syslog                 103
+#define __NR_setitimer              104
+#define __NR_getitimer              105
+#define __NR_stat                   106
+#define __NR_lstat                  107
+#define __NR_fstat                  108
+#define __NR_olduname               109
+#define __NR_vhangup                111
+#define __NR_wait4                  114
+#define __NR_swapoff                115
+#define __NR_sysinfo                116
+#define __NR_ipc                    117
+#define __NR_fsync                  118
+#define __NR_sigreturn              119
+#define __NR_clone                  120
+#define __NR_setdomainname          121
+#define __NR_uname                  122
+#define __NR_cacheflush             123
+#define __NR_adjtimex               124
+#define __NR_mprotect               125
+#define __NR_sigprocmask            126
+#define __NR_init_module            128
+#define __NR_delete_module          129
+#define __NR_quotactl               131
+#define __NR_getpgid                132
+#define __NR_fchdir                 133
+#define __NR_bdflush                134
+#define __NR_sysfs                  135
+#define __NR_personality            136
+#define __NR_setfsuid               138
+#define __NR_setfsgid               139
+#define __NR__llseek                140
+#define __NR_getdents               141
+#define __NR__newselect             142
+#define __NR_flock                  143
+#define __NR_msync                  144
+#define __NR_readv                  145
+#define __NR_writev                 146
+#define __NR_getsid                 147
+#define __NR_fdatasync              148
+#define __NR__sysctl                149
+#define __NR_mlock                  150
+#define __NR_munlock                151
+#define __NR_mlockall               152
+#define __NR_munlockall             153
+#define __NR_sched_setparam         154
+#define __NR_sched_getparam         155
+#define __NR_sched_setscheduler     156
+#define __NR_sched_getscheduler     157
+#define __NR_sched_yield            158
+#define __NR_sched_get_priority_max 159
+#define __NR_sched_get_priority_min 160
+#define __NR_sched_rr_get_interval  161
+#define __NR_nanosleep              162
+#define __NR_mremap                 163
+#define __NR_setresuid              164
+#define __NR_getresuid              165
+#define __NR_poll                   168
+#define __NR_nfsservctl             169
+#define __NR_setresgid              170
+#define __NR_getresgid              171
+#define __NR_prctl                  172
+#define __NR_rt_sigreturn           173
+#define __NR_rt_sigaction           174
+#define __NR_rt_sigprocmask         175
+#define __NR_rt_sigpending          176
+#define __NR_rt_sigtimedwait        177
+#define __NR_rt_sigqueueinfo        178
+#define __NR_rt_sigsuspend          179
+#define __NR_pread64                180
+#define __NR_pwrite64               181
+#define __NR_chown                  182
+#define __NR_getcwd                 183
+#define __NR_capget                 184
+#define __NR_capset                 185
+#define __NR_sigaltstack            186
+#define __NR_sendfile               187
+#define __NR_vfork                  190
+#define __NR_ugetrlimit             191
+#define __NR_mmap2                  192
+#define __NR_truncate64             193
+#define __NR_ftruncate64            194
+#define __NR_stat64                 195
+#define __NR_lstat64                196
+#define __NR_fstat64                197
+#define __NR_lchown32               198
+#define __NR_getuid32               199
+#define __NR_getgid32               200
+#define __NR_geteuid32              201
+#define __NR_getegid32              202
+#define __NR_setreuid32             203
+#define __NR_setregid32             204
+#define __NR_getgroups32            205
+#define __NR_setgroups32            206
+#define __NR_fchown32               207
+#define __NR_setresuid32            208
+#define __NR_getresuid32            209
+#define __NR_setresgid32            210
+#define __NR_getresgid32            211
+#define __NR_chown32                212
+#define __NR_setuid32               213
+#define __NR_setgid32               214
+#define __NR_setfsuid32             215
+#define __NR_setfsgid32             216
+#define __NR_pivot_root             217
+#define __NR_mincore                218
+#define __NR_madvise                219
+#define __NR_getdents64             220
+#define __NR_fcntl64                221
+#define __NR_gettid                 224
+#define __NR_readahead              225
+#define __NR_setxattr               226
+#define __NR_lsetxattr              227
+#define __NR_fsetxattr              228
+#define __NR_getxattr               229
+#define __NR_lgetxattr              230
+#define __NR_fgetxattr              231
+#define __NR_listxattr              232
+#define __NR_llistxattr             233
+#define __NR_flistxattr             234
+#define __NR_removexattr            235
+#define __NR_lremovexattr           236
+#define __NR_fremovexattr           237
+#define __NR_tkill                  238
+#define __NR_sendfile64             239
+#define __NR_futex                  240
+#define __NR_sched_setaffinity      241
+#define __NR_sched_getaffinity      242
+#define __NR_io_setup               245
+#define __NR_io_destroy             246
+#define __NR_io_getevents           247
+#define __NR_io_submit              248
+#define __NR_io_cancel              249
+#define __NR_fadvise64              250
+#define __NR_exit_group             252
+#define __NR_lookup_dcookie         253
+#define __NR_epoll_create           254
+#define __NR_epoll_ctl              255
+#define __NR_epoll_wait             256
+#define __NR_remap_file_pages       257
+#define __NR_set_tid_address        258
+#define __NR_timer_create           259
+#define __NR_timer_settime32          260
+#define __NR_timer_gettime32          261
+#define __NR_timer_getoverrun       262
+#define __NR_timer_delete           263
+#define __NR_clock_settime32          264
+#define __NR_clock_gettime32          265
+#define __NR_clock_getres_time32           266
+#define __NR_clock_nanosleep_time32        267
+#define __NR_statfs64               268
+#define __NR_fstatfs64              269
+#define __NR_tgkill                 270
+#define __NR_utimes                 271
+#define __NR_fadvise64_64           272
+#define __NR_mbind                  274
+#define __NR_get_mempolicy          275
+#define __NR_set_mempolicy          276
+#define __NR_mq_open                277
+#define __NR_mq_unlink              278
+#define __NR_mq_timedsend           279
+#define __NR_mq_timedreceive        280
+#define __NR_mq_notify              281
+#define __NR_mq_getsetattr          282
+#define __NR_kexec_load             283
+#define __NR_waitid                 284
+#define __NR_add_key                285
+#define __NR_request_key            286
+#define __NR_keyctl                 287
+#define __NR_ioprio_set             288
+#define __NR_ioprio_get             289
+#define __NR_inotify_init           290
+#define __NR_inotify_add_watch      291
+#define __NR_inotify_rm_watch       292
+#define __NR_migrate_pages          294
+#define __NR_openat                 295
+#define __NR_mkdirat                296
+#define __NR_mknodat                297
+#define __NR_fchownat               298
+#define __NR_futimesat              299
+#define __NR_fstatat64              300
+#define __NR_unlinkat               301
+#define __NR_renameat               302
+#define __NR_linkat                 303
+#define __NR_symlinkat              304
+#define __NR_readlinkat             305
+#define __NR_fchmodat               306
+#define __NR_faccessat              307
+#define __NR_pselect6               308
+#define __NR_ppoll                  309
+#define __NR_unshare                310
+#define __NR_set_robust_list        311
+#define __NR_get_robust_list        312
+#define __NR_splice                 313
+#define __NR_sync_file_range        314
+#define __NR_tee                    315
+#define __NR_vmsplice               316
+#define __NR_move_pages             317
+#define __NR_getcpu                 318
+#define __NR_epoll_pwait            319
+#define __NR_utimensat              320
+#define __NR_signalfd               321
+#define __NR_timerfd_create         322
+#define __NR_eventfd                323
+#define __NR_fallocate              324
+#define __NR_timerfd_settime32        325
+#define __NR_timerfd_gettime32        326
+#define __NR_signalfd4              327
+#define __NR_eventfd2               328
+#define __NR_epoll_create1          329
+#define __NR_dup3                   330
+#define __NR_pipe2                  331
+#define __NR_inotify_init1          332
+#define __NR_preadv                 333
+#define __NR_pwritev                334
+#define __NR_rt_tgsigqueueinfo      335
+#define __NR_perf_event_open        336
+#define __NR_fanotify_init          337
+#define __NR_fanotify_mark          338
+#define __NR_prlimit64              339
+#define __NR_socket                 340
+#define __NR_bind                   341
+#define __NR_connect                342
+#define __NR_listen                 343
+#define __NR_accept                 344
+#define __NR_getsockname            345
+#define __NR_getpeername            346
+#define __NR_socketpair             347
+#define __NR_send                   348
+#define __NR_sendto                 349
+#define __NR_recv                   350
+#define __NR_recvfrom               351
+#define __NR_shutdown               352
+#define __NR_setsockopt             353
+#define __NR_getsockopt             354
+#define __NR_sendmsg                355
+#define __NR_recvmsg                356
+#define __NR_recvmmsg               357
+#define __NR_accept4                358
+#define __NR_name_to_handle_at      359
+#define __NR_open_by_handle_at      360
+#define __NR_clock_adjtime          361
+#define __NR_syncfs                 362
+#define __NR_sendmmsg               363
+#define __NR_setns                  364
+#define __NR_process_vm_readv       365
+#define __NR_process_vm_writev      366
+#define __NR_kcmp                   367
+#define __NR_finit_module           368
+#define __NR_sched_getattr          369
+#define __NR_sched_setattr          370
+#define __NR_renameat2              371
+#define __NR_seccomp                372
+#define __NR_getrandom              373
+#define __NR_memfd_create           374
+#define __NR_bpf                    375
+#define __NR_execveat               376
+#define __NR_userfaultfd            377
+#define __NR_membarrier             378
+#define __NR_mlock2                 379
+#define __NR_copy_file_range        380
+#define __NR_preadv2                381
+#define __NR_pwritev2               382
+#define __NR_statx                  383
+#define __NR_pkey_mprotect          384
+#define __NR_pkey_alloc             385
+#define __NR_pkey_free              386
+#define __NR_rseq                   387
+#define __NR_semget                 393
+#define __NR_semctl                 394
+#define __NR_shmget                 395
+#define __NR_shmctl                 396
+#define __NR_shmat                  397
+#define __NR_shmdt                  398
+#define __NR_msgget                 399
+#define __NR_msgsnd                 400
+#define __NR_msgrcv                 401
+#define __NR_msgctl                 402
+#define __NR_clock_gettime64        403
+#define __NR_clock_settime64        404
+#define __NR_clock_adjtime64        405
+#define __NR_clock_getres_time64    406
+#define __NR_clock_nanosleep_time64 407
+#define __NR_timer_gettime64        408
+#define __NR_timer_settime64        409
+#define __NR_timerfd_gettime64      410
+#define __NR_timerfd_settime64      411
+#define __NR_utimensat_time64       412
+#define __NR_pselect6_time64        413
+#define __NR_ppoll_time64           414
+#define __NR_io_pgetevents_time64   416
+#define __NR_recvmmsg_time64        417
+#define __NR_mq_timedsend_time64    418
+#define __NR_mq_timedreceive_time64 419
+#define __NR_semtimedop_time64      420
+#define __NR_rt_sigtimedwait_time64 421
+#define __NR_futex_time64           422
+#define __NR_sched_rr_get_interval_time64 423
+#define __NR_pidfd_send_signal      424
+#define __NR_io_uring_setup         425
+#define __NR_io_uring_enter         426
+#define __NR_io_uring_register      427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/user.h
new file mode 100644
index 0000000000..07fe843b6e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/bits/user.h
@@ -0,0 +1,51 @@
+#undef __WORDSIZE
+#define __WORDSIZE 32
+
+#define REG_REG0	 0
+#define REG_REG15	15
+#define REG_PC		16
+#define REG_PR		17
+#define REG_SR		18
+#define REG_GBR		19
+#define REG_MACH	20
+#define REG_MACL	21
+#define REG_SYSCALL	22
+#define REG_FPREG0	23
+#define REG_FPREG15	38
+#define REG_XFREG0	39
+#define REG_XFREG15	54
+#define REG_FPSCR	55
+#define REG_FPUL	56
+
+struct user_fpu_struct {
+	unsigned long fp_regs[16];
+	unsigned long xfp_regs[16];
+	unsigned long fpscr;
+	unsigned long fpul;
+};
+
+#define ELF_NGREG 23
+typedef unsigned long elf_greg_t;
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+typedef struct user_fpu_struct elf_fpregset_t;
+
+struct user {
+	struct {
+		unsigned long regs[16];
+		unsigned long pc, pr, sr, gbr, mach, macl;
+		long tra;
+	} regs;
+	struct user_fpu_struct fpu;
+	int u_fpvalid;
+	unsigned long u_tsize;
+	unsigned long u_dsize;
+	unsigned long u_ssize;
+	unsigned long start_code;
+	unsigned long start_data;
+	unsigned long start_stack;
+	long int signal;
+	unsigned long u_ar0;
+	struct user_fpu_struct *u_fpstate;
+	unsigned long magic;
+	char u_comm[32];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/sh/crt_arch.h
new file mode 100644
index 0000000000..f341c8fbc0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/crt_arch.h
@@ -0,0 +1,78 @@
+#ifdef __SH_FDPIC__
+
+__asm__(
+".text \n"
+".global " START " \n"
+START ": \n"
+"	tst r8, r8 \n"
+"	bf 1f \n"
+"	mov #68, r3 \n"
+"	add r3, r3 \n"
+"	mov #8, r4 \n"
+"	swap.w r4, r4 \n"
+"	trapa #31 \n"
+"	nop \n"
+"	nop \n"
+"	nop \n"
+"	nop \n"
+"1:	nop \n"
+#ifndef SHARED
+"	mov r8, r4 \n"
+"	mova 1f, r0 \n"
+"	mov.l 1f, r5 \n"
+"	mov.l 1f+4, r6 \n"
+"	add r0, r5 \n"
+"	mov.l 4f, r1 \n"
+"5:	bsrf r1 \n"
+"	 add r0, r6 \n"
+"	mov r0, r12 \n"
+#endif
+"	mov r10, r5 \n"
+"	mov r15, r4 \n"
+"	mov.l r9, @-r15 \n"
+"	mov.l r8, @-r15 \n"
+"	mov #-16, r0 \n"
+"	mov.l 2f, r1 \n"
+"3:	bsrf r1 \n"
+"	 and r0, r15 \n"
+".align 2 \n"
+"1:	.long __ROFIXUP_LIST__@PCREL \n"
+"	.long __ROFIXUP_END__@PCREL + 4 \n"
+"2:	.long " START "_c@PCREL - (3b+4-.) \n"
+#ifndef SHARED
+"4:	.long __fdpic_fixup@PCREL - (5b+4-.) \n"
+#endif
+);
+
+#ifndef SHARED
+#include "fdpic_crt.h"
+#endif
+
+#else
+
+__asm__(
+".text \n"
+".global " START " \n"
+START ": \n"
+"	mova 1f, r0 \n"
+"	mov.l 1f, r5 \n"
+"	add r0, r5 \n"
+"	mov r15, r4 \n"
+"	mov #-16, r0 \n"
+"	mov.l 2f, r1 \n"
+"3:	bsrf r1 \n"
+"	 and r0, r15 \n"
+".align 2 \n"
+".weak _DYNAMIC \n"
+".hidden _DYNAMIC \n"
+"1:	.long _DYNAMIC-. \n"
+"2:	.long " START "_c@PCREL - (3b+4-.) \n"
+);
+
+#endif
+
+/* used by gcc for switching the FPU between single and double precision */
+#ifdef SHARED
+__attribute__((__visibility__("hidden")))
+#endif
+const unsigned long __fpscr_values[2] = { 0, 0x80000 };
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/ksigaction.h b/src/components/lib/libc/musl-1.2.0/arch/sh/ksigaction.h
new file mode 100644
index 0000000000..714ae619b4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/ksigaction.h
@@ -0,0 +1,10 @@
+#include <features.h>
+
+struct k_sigaction {
+	void (*handler)(int);
+	unsigned long flags;
+	void *restorer;
+	unsigned mask[2];
+};
+
+extern hidden unsigned char __restore[], __restore_rt[];
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/sh/kstat.h
new file mode 100644
index 0000000000..af449c9509
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/kstat.h
@@ -0,0 +1,21 @@
+struct kstat {
+	dev_t st_dev;
+	int __st_dev_padding;
+	long __st_ino_truncated;
+	mode_t st_mode;
+	nlink_t st_nlink;
+	uid_t st_uid;
+	gid_t st_gid;
+	dev_t st_rdev;
+	int __st_rdev_padding;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	ino_t st_ino;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/sh/pthread_arch.h
new file mode 100644
index 0000000000..3ee9c1a930
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/pthread_arch.h
@@ -0,0 +1,17 @@
+static inline struct pthread *__pthread_self()
+{
+	char *self;
+	__asm__ ("stc gbr,%0" : "=r" (self) );
+	return (struct pthread *) (self - sizeof(struct pthread));
+}
+
+#define TLS_ABOVE_TP
+#define GAP_ABOVE_TP 8
+#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
+
+#define MC_PC sc_pc
+
+#ifdef __FDPIC__
+#define MC_GOT sc_regs[12]
+#define CANCEL_GOT (*(uintptr_t *)((char *)__syscall_cp_asm+sizeof(uintptr_t)))
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/sh/reloc.h
new file mode 100644
index 0000000000..17b1a9a978
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/reloc.h
@@ -0,0 +1,52 @@
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define ENDIAN_SUFFIX "eb"
+#else
+#define ENDIAN_SUFFIX ""
+#endif
+
+#if __SH_FPU_ANY__ || __SH4__
+#define FP_SUFFIX ""
+#else
+#define FP_SUFFIX "-nofpu"
+#endif
+
+#if __SH_FDPIC__
+#define ABI_SUFFIX "-fdpic"
+#else
+#define ABI_SUFFIX ""
+#endif
+
+#define LDSO_ARCH "sh" ENDIAN_SUFFIX FP_SUFFIX ABI_SUFFIX
+
+#define TPOFF_K 0
+
+#define REL_SYMBOLIC    R_SH_DIR32
+#define REL_OFFSET      R_SH_REL32
+#define REL_GOT         R_SH_GLOB_DAT
+#define REL_PLT         R_SH_JMP_SLOT
+#define REL_RELATIVE    R_SH_RELATIVE
+#define REL_COPY        R_SH_COPY
+#define REL_DTPMOD      R_SH_TLS_DTPMOD32
+#define REL_DTPOFF      R_SH_TLS_DTPOFF32
+#define REL_TPOFF       R_SH_TLS_TPOFF32
+
+#define DL_NOMMU_SUPPORT 1
+
+#if __SH_FDPIC__
+#define REL_FUNCDESC    R_SH_FUNCDESC
+#define REL_FUNCDESC_VAL R_SH_FUNCDESC_VALUE
+#undef  REL_RELATIVE
+#define DL_FDPIC 1
+#define FDPIC_CONSTDISP_FLAG 0x100
+#define CRTJMP(pc,sp) do { \
+	register size_t r8 __asm__("r8") = ((size_t *)(sp))[-2]; \
+	__asm__ __volatile__( "jmp @%0 ; mov %1,r15" \
+	: : "r"(pc), "r"(sp), "r"(r8) : "memory" ); } while(0)
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	"mov.l 1f,%0 ; add %1,%0 ; bra 2f ; nop ; .align 2 \n" \
+	"1:	.long " #sym "@GOTOFFFUNCDESC \n2:" \
+	: "=&r"(*fp) : "r"(got) : "memory" )
+#else
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"jmp @%0 ; mov %1,r15" : : "r"(pc), "r"(sp) : "memory" )
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/arch/sh/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/sh/syscall_arch.h
new file mode 100644
index 0000000000..628d8d3741
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/sh/syscall_arch.h
@@ -0,0 +1,93 @@
+#define __SYSCALL_LL_E(x) \
+((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
+((union { long long ll; long l[2]; }){ .ll = x }).l[1]
+#define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
+#define __SYSCALL_LL_PRW(x) 0, __SYSCALL_LL_E((x))
+
+/* The extra OR instructions are to work around a hardware bug:
+ * http://documentation.renesas.com/doc/products/mpumcu/tu/tnsh7456ae.pdf
+ */
+#define __asm_syscall(trapno, ...) do {   \
+	__asm__ __volatile__ (                \
+		"trapa #31\n"            \
+		"or r0, r0\n"                     \
+		"or r0, r0\n"                     \
+		"or r0, r0\n"                     \
+		"or r0, r0\n"                     \
+		"or r0, r0\n"                     \
+	: "=r"(r0) : __VA_ARGS__ : "memory"); \
+	return r0;                            \
+	} while (0)
+
+static inline long __syscall0(long n)
+{
+	register long r3 __asm__("r3") = n;
+	register long r0 __asm__("r0");
+	__asm_syscall(16, "r"(r3));
+}
+
+static inline long __syscall1(long n, long a)
+{
+	register long r3 __asm__("r3") = n;
+	register long r4 __asm__("r4") = a;
+	register long r0 __asm__("r0");
+	__asm_syscall(17, "r"(r3), "r"(r4));
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+	register long r3 __asm__("r3") = n;
+	register long r4 __asm__("r4") = a;
+	register long r5 __asm__("r5") = b;
+	register long r0 __asm__("r0");
+	__asm_syscall(18, "r"(r3), "r"(r4), "r"(r5));
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+	register long r3 __asm__("r3") = n;
+	register long r4 __asm__("r4") = a;
+	register long r5 __asm__("r5") = b;
+	register long r6 __asm__("r6") = c;
+	register long r0 __asm__("r0");
+	__asm_syscall(19, "r"(r3), "r"(r4), "r"(r5), "r"(r6));
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+	register long r3 __asm__("r3") = n;
+	register long r4 __asm__("r4") = a;
+	register long r5 __asm__("r5") = b;
+	register long r6 __asm__("r6") = c;
+	register long r7 __asm__("r7") = d;
+	register long r0 __asm__("r0");
+	__asm_syscall(20, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7));
+}
+
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+{
+	register long r3 __asm__("r3") = n;
+	register long r4 __asm__("r4") = a;
+	register long r5 __asm__("r5") = b;
+	register long r6 __asm__("r6") = c;
+	register long r7 __asm__("r7") = d;
+	register long r0 __asm__("r0") = e;
+	__asm_syscall(21, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "0"(r0));
+}
+
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+{
+	register long r3 __asm__("r3") = n;
+	register long r4 __asm__("r4") = a;
+	register long r5 __asm__("r5") = b;
+	register long r6 __asm__("r6") = c;
+	register long r7 __asm__("r7") = d;
+	register long r0 __asm__("r0") = e;
+	register long r1 __asm__("r1") = f;
+	__asm_syscall(22, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "0"(r0), "r"(r1));
+}
+
+#define SYSCALL_IPC_BROKEN_MODE
+
+#define SIOCGSTAMP_OLD   (2U<<30 | 's'<<8 | 100 | 8<<16)
+#define SIOCGSTAMPNS_OLD (2U<<30 | 's'<<8 | 101 | 8<<16)
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x32/atomic_arch.h
new file mode 100644
index 0000000000..918c2d4eec
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/atomic_arch.h
@@ -0,0 +1,121 @@
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__ __volatile__ (
+		"lock ; cmpxchg %3, %1"
+		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
+	return t;
+}
+
+#define a_swap a_swap
+static inline int a_swap(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"xchg %0, %1"
+		: "=r"(v), "=m"(*p) : "0"(v) : "memory" );
+	return v;
+}
+
+#define a_fetch_add a_fetch_add
+static inline int a_fetch_add(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; xadd %0, %1"
+		: "=r"(v), "=m"(*p) : "0"(v) : "memory" );
+	return v;
+}
+
+#define a_and a_and
+static inline void a_and(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; and %1, %0"
+		: "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_or a_or
+static inline void a_or(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; or %1, %0"
+		: "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_and_64 a_and_64
+static inline void a_and_64(volatile uint64_t *p, uint64_t v)
+{
+	__asm__ __volatile(
+		"lock ; and %1, %0"
+		 : "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_or_64 a_or_64
+static inline void a_or_64(volatile uint64_t *p, uint64_t v)
+{
+	__asm__ __volatile__(
+		"lock ; or %1, %0"
+		 : "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_inc a_inc
+static inline void a_inc(volatile int *p)
+{
+	__asm__ __volatile__(
+		"lock ; incl %0"
+		: "=m"(*p) : "m"(*p) : "memory" );
+}
+
+#define a_dec a_dec
+static inline void a_dec(volatile int *p)
+{
+	__asm__ __volatile__(
+		"lock ; decl %0"
+		: "=m"(*p) : "m"(*p) : "memory" );
+}
+
+#define a_store a_store
+static inline void a_store(volatile int *p, int x)
+{
+	__asm__ __volatile__(
+		"mov %1, %0 ; lock ; orl $0,(%%rsp)"
+		: "=m"(*p) : "r"(x) : "memory" );
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__( "" : : : "memory" );
+}
+
+#define a_spin a_spin
+static inline void a_spin()
+{
+	__asm__ __volatile__( "pause" : : : "memory" );
+}
+
+#define a_crash a_crash
+static inline void a_crash()
+{
+	__asm__ __volatile__( "hlt" : : : "memory" );
+}
+
+#define a_ctz_64 a_ctz_64
+static inline int a_ctz_64(uint64_t x)
+{
+	__asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
+	return x;
+}
+
+#define a_ctz_32 a_ctz_32
+static inline int a_ctz_32(uint32_t x)
+{
+	__asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
+	return x;
+}
+
+#define a_clz_64 a_clz_64
+static inline int a_clz_64(uint64_t x)
+{
+	__asm__( "bsr %1,%0 ; xor $63,%0" : "=r"(x) : "r"(x) );
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/alltypes.h.in
new file mode 100644
index 0000000000..9f9d241001
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/alltypes.h.in
@@ -0,0 +1,24 @@
+#define _Addr int
+#define _Int64 long long
+#define _Reg long long
+
+#define __BYTE_ORDER 1234
+#define __LONG_MAX 0x7fffffffL
+
+#ifndef __cplusplus
+#ifdef __WCHAR_TYPE__
+TYPEDEF __WCHAR_TYPE__ wchar_t;
+#else
+TYPEDEF long wchar_t;
+#endif
+#endif
+
+#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 2
+TYPEDEF long double float_t;
+TYPEDEF long double double_t;
+#else
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+#endif
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/fcntl.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/float.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/io.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/io.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/io.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/io.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ioctl_fix.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ioctl_fix.h
new file mode 100644
index 0000000000..83b957bddb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ioctl_fix.h
@@ -0,0 +1,4 @@
+#undef SIOCGSTAMP
+#undef SIOCGSTAMPNS
+#define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ipc.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ipc.h
new file mode 100644
index 0000000000..a12380f638
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ipc.h
@@ -0,0 +1,11 @@
+struct ipc_perm {
+	key_t __ipc_perm_key;
+	uid_t uid;
+	gid_t gid;
+	uid_t cuid;
+	gid_t cgid;
+	mode_t mode;
+	int __ipc_perm_seq;
+	long long __pad1;
+	long long __pad2;
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/limits.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/limits.h
new file mode 100644
index 0000000000..07743b6fd6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/limits.h
@@ -0,0 +1 @@
+#define PAGESIZE 4096
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/mman.h
new file mode 100644
index 0000000000..ba2d6f7a83
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/mman.h
@@ -0,0 +1 @@
+#define MAP_32BIT      0x40
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/msg.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/msg.h
new file mode 100644
index 0000000000..63ae987734
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/msg.h
@@ -0,0 +1,15 @@
+struct msqid_ds {
+	struct ipc_perm msg_perm;
+	time_t msg_stime;
+	time_t msg_rtime;
+	time_t msg_ctime;
+	unsigned long msg_cbytes;
+	long __unused1;
+	msgqnum_t msg_qnum;
+	long __unused2;
+	msglen_t msg_qbytes;
+	long __unused3;
+	pid_t msg_lspid;
+	pid_t msg_lrpid;
+	unsigned long long __unused[2];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/posix.h
new file mode 100644
index 0000000000..30a38714f3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/posix.h
@@ -0,0 +1,2 @@
+#define _POSIX_V6_ILP32_OFFBIG  1
+#define _POSIX_V7_ILP32_OFFBIG  1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ptrace.h
new file mode 100644
index 0000000000..7f8a09b521
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/ptrace.h
@@ -0,0 +1,13 @@
+#define PTRACE_GET_THREAD_AREA		25
+#define PTRACE_SET_THREAD_AREA		26
+#define PTRACE_ARCH_PRCTL		30
+#define PTRACE_SYSEMU			31
+#define PTRACE_SYSEMU_SINGLESTEP	32
+#define PTRACE_SINGLEBLOCK		33
+
+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
+#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA
+#define PT_ARCH_PRCTL PTRACE_ARCH_PRCTL
+#define PT_SYSEMU PTRACE_SYSEMU
+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP
+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/sem.h
new file mode 100644
index 0000000000..18745f4c84
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/sem.h
@@ -0,0 +1,11 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	time_t sem_otime;
+	long long __unused1;
+	time_t sem_ctime;
+	long long __unused2;
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long long)-sizeof(short)];
+	long long __unused3;
+	long long __unused4;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/shm.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/shm.h
new file mode 100644
index 0000000000..fa88c1e976
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/shm.h
@@ -0,0 +1,32 @@
+#define SHMLBA 4096
+
+struct shmid_ds {
+	struct ipc_perm shm_perm;
+	size_t shm_segsz;
+	time_t shm_atime;
+	time_t shm_dtime;
+	time_t shm_ctime;
+	pid_t shm_cpid;
+	pid_t shm_lpid;
+	unsigned long shm_nattch;
+	unsigned long __pad0;
+	unsigned long long __pad1;
+	unsigned long long __pad2;
+};
+
+struct shminfo {
+	unsigned long shmmax, __pad0, shmmin, __pad1, shmmni, __pad2,
+	              shmseg, __pad3, shmall, __pad4;
+	unsigned long long __unused[4];
+};
+
+struct shm_info {
+	int __used_ids;
+	int __pad_ids;
+	unsigned long shm_tot, __pad0, shm_rss, __pad1, shm_swp, __pad2;
+	unsigned long __swap_attempts, __pad3, __swap_successes, __pad4;
+}
+#ifdef __GNUC__
+__attribute__((__aligned__(8)))
+#endif
+;
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/signal.h
new file mode 100644
index 0000000000..097be6f457
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/signal.h
@@ -0,0 +1,153 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#ifdef _GNU_SOURCE
+enum { REG_R8 = 0 };
+#define REG_R8 REG_R8
+enum { REG_R9 = 1 };
+#define REG_R9 REG_R9
+enum { REG_R10 = 2 };
+#define REG_R10 REG_R10
+enum { REG_R11 = 3 };
+#define REG_R11 REG_R11
+enum { REG_R12 = 4 };
+#define REG_R12 REG_R12
+enum { REG_R13 = 5 };
+#define REG_R13 REG_R13
+enum { REG_R14 = 6 };
+#define REG_R14 REG_R14
+enum { REG_R15 = 7 };
+#define REG_R15 REG_R15
+enum { REG_RDI = 8 };
+#define REG_RDI REG_RDI
+enum { REG_RSI = 9 };
+#define REG_RSI REG_RSI
+enum { REG_RBP = 10 };
+#define REG_RBP REG_RBP
+enum { REG_RBX = 11 };
+#define REG_RBX REG_RBX
+enum { REG_RDX = 12 };
+#define REG_RDX REG_RDX
+enum { REG_RAX = 13 };
+#define REG_RAX REG_RAX
+enum { REG_RCX = 14 };
+#define REG_RCX REG_RCX
+enum { REG_RSP = 15 };
+#define REG_RSP REG_RSP
+enum { REG_RIP = 16 };
+#define REG_RIP REG_RIP
+enum { REG_EFL = 17 };
+#define REG_EFL REG_EFL
+enum { REG_CSGSFS = 18 };
+#define REG_CSGSFS REG_CSGSFS
+enum { REG_ERR = 19 };
+#define REG_ERR REG_ERR
+enum { REG_TRAPNO = 20 };
+#define REG_TRAPNO REG_TRAPNO
+enum { REG_OLDMASK = 21 };
+#define REG_OLDMASK REG_OLDMASK
+enum { REG_CR2 = 22 };
+#define REG_CR2 REG_CR2
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef long long greg_t, gregset_t[23];
+typedef struct _fpstate {
+	unsigned short cwd, swd, ftw, fop;
+	unsigned long long rip, rdp;
+	unsigned mxcsr, mxcr_mask;
+	struct {
+		unsigned short significand[4], exponent, padding[3];
+	} _st[8];
+	struct {
+		unsigned element[4];
+	} _xmm[16];
+	unsigned padding[24];
+} *fpregset_t;
+struct sigcontext {
+	unsigned long long r8, r9, r10, r11, r12, r13, r14, r15;
+	unsigned long long rdi, rsi, rbp, rbx, rdx, rax, rcx, rsp, rip, eflags;
+	unsigned short cs, gs, fs, __pad0;
+	unsigned long long err, trapno, oldmask, cr2;
+	struct _fpstate *fpstate;
+	unsigned long long __reserved1[8];
+};
+typedef struct {
+	gregset_t gregs;
+	fpregset_t fpregs;
+	unsigned long long __reserved1[8];
+} mcontext_t;
+#else
+typedef struct {
+	unsigned long long __space[32];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+	unsigned long long __fpregs_mem[64];
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  2
+#define SA_SIGINFO    4
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/socket.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/socket.h
new file mode 100644
index 0000000000..8d83001027
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/socket.h
@@ -0,0 +1,5 @@
+#define SO_RCVTIMEO     20
+#define SO_SNDTIMEO     21
+#define SO_TIMESTAMP    29
+#define SO_TIMESTAMPNS  35
+#define SO_TIMESTAMPING 37
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/stat.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/stat.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/stat.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/bits/statfs.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/statfs.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/bits/statfs.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/bits/statfs.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/stdint.h
new file mode 100644
index 0000000000..d1b2712199
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/stdint.h
@@ -0,0 +1,20 @@
+typedef int32_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+
+#define INT_FAST16_MIN  INT32_MIN
+#define INT_FAST32_MIN  INT32_MIN
+
+#define INT_FAST16_MAX  INT32_MAX
+#define INT_FAST32_MAX  INT32_MAX
+
+#define UINT_FAST16_MAX UINT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+
+#define INTPTR_MIN      INT32_MIN
+#define INTPTR_MAX      INT32_MAX
+#define UINTPTR_MAX     UINT32_MAX
+#define PTRDIFF_MIN     INT32_MIN
+#define PTRDIFF_MAX     INT32_MAX
+#define SIZE_MAX        UINT32_MAX
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/syscall.h.in
new file mode 100644
index 0000000000..f47bdee5bf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/syscall.h.in
@@ -0,0 +1,339 @@
+#define __NR_read (0x40000000 + 0)
+#define __NR_write (0x40000000 + 1)
+#define __NR_open (0x40000000 + 2)
+#define __NR_close (0x40000000 + 3)
+#define __NR_stat (0x40000000 + 4)
+#define __NR_fstat (0x40000000 + 5)
+#define __NR_lstat (0x40000000 + 6)
+#define __NR_poll (0x40000000 + 7)
+#define __NR_lseek (0x40000000 + 8)
+#define __NR_mmap (0x40000000 + 9)
+#define __NR_mprotect (0x40000000 + 10)
+#define __NR_munmap (0x40000000 + 11)
+#define __NR_brk (0x40000000 + 12)
+#define __NR_rt_sigprocmask (0x40000000 + 14)
+#define __NR_pread64 (0x40000000 + 17)
+#define __NR_pwrite64 (0x40000000 + 18)
+#define __NR_access (0x40000000 + 21)
+#define __NR_pipe (0x40000000 + 22)
+#define __NR_select (0x40000000 + 23)
+#define __NR_sched_yield (0x40000000 + 24)
+#define __NR_mremap (0x40000000 + 25)
+#define __NR_msync (0x40000000 + 26)
+#define __NR_mincore (0x40000000 + 27)
+#define __NR_madvise (0x40000000 + 28)
+#define __NR_shmget (0x40000000 + 29)
+#define __NR_shmat (0x40000000 + 30)
+#define __NR_shmctl (0x40000000 + 31)
+#define __NR_dup (0x40000000 + 32)
+#define __NR_dup2 (0x40000000 + 33)
+#define __NR_pause (0x40000000 + 34)
+#define __NR_nanosleep (0x40000000 + 35)
+#define __NR_getitimer (0x40000000 + 36)
+#define __NR_alarm (0x40000000 + 37)
+#define __NR_setitimer (0x40000000 + 38)
+#define __NR_getpid (0x40000000 + 39)
+#define __NR_sendfile (0x40000000 + 40)
+#define __NR_socket (0x40000000 + 41)
+#define __NR_connect (0x40000000 + 42)
+#define __NR_accept (0x40000000 + 43)
+#define __NR_sendto (0x40000000 + 44)
+#define __NR_shutdown (0x40000000 + 48)
+#define __NR_bind (0x40000000 + 49)
+#define __NR_listen (0x40000000 + 50)
+#define __NR_getsockname (0x40000000 + 51)
+#define __NR_getpeername (0x40000000 + 52)
+#define __NR_socketpair (0x40000000 + 53)
+#define __NR_clone (0x40000000 + 56)
+#define __NR_fork (0x40000000 + 57)
+#define __NR_vfork (0x40000000 + 58)
+#define __NR_exit (0x40000000 + 60)
+#define __NR_wait4 (0x40000000 + 61)
+#define __NR_kill (0x40000000 + 62)
+#define __NR_uname (0x40000000 + 63)
+#define __NR_semget (0x40000000 + 64)
+#define __NR_semop (0x40000000 + 65)
+#define __NR_semctl (0x40000000 + 66)
+#define __NR_shmdt (0x40000000 + 67)
+#define __NR_msgget (0x40000000 + 68)
+#define __NR_msgsnd (0x40000000 + 69)
+#define __NR_msgrcv (0x40000000 + 70)
+#define __NR_msgctl (0x40000000 + 71)
+#define __NR_fcntl (0x40000000 + 72)
+#define __NR_flock (0x40000000 + 73)
+#define __NR_fsync (0x40000000 + 74)
+#define __NR_fdatasync (0x40000000 + 75)
+#define __NR_truncate (0x40000000 + 76)
+#define __NR_ftruncate (0x40000000 + 77)
+#define __NR_getdents (0x40000000 + 78)
+#define __NR_getcwd (0x40000000 + 79)
+#define __NR_chdir (0x40000000 + 80)
+#define __NR_fchdir (0x40000000 + 81)
+#define __NR_rename (0x40000000 + 82)
+#define __NR_mkdir (0x40000000 + 83)
+#define __NR_rmdir (0x40000000 + 84)
+#define __NR_creat (0x40000000 + 85)
+#define __NR_link (0x40000000 + 86)
+#define __NR_unlink (0x40000000 + 87)
+#define __NR_symlink (0x40000000 + 88)
+#define __NR_readlink (0x40000000 + 89)
+#define __NR_chmod (0x40000000 + 90)
+#define __NR_fchmod (0x40000000 + 91)
+#define __NR_chown (0x40000000 + 92)
+#define __NR_fchown (0x40000000 + 93)
+#define __NR_lchown (0x40000000 + 94)
+#define __NR_umask (0x40000000 + 95)
+#define __NR_gettimeofday (0x40000000 + 96)
+#define __NR_getrlimit (0x40000000 + 97)
+#define __NR_getrusage (0x40000000 + 98)
+#define __NR_sysinfo (0x40000000 + 99)
+#define __NR_times (0x40000000 + 100)
+#define __NR_getuid (0x40000000 + 102)
+#define __NR_syslog (0x40000000 + 103)
+#define __NR_getgid (0x40000000 + 104)
+#define __NR_setuid (0x40000000 + 105)
+#define __NR_setgid (0x40000000 + 106)
+#define __NR_geteuid (0x40000000 + 107)
+#define __NR_getegid (0x40000000 + 108)
+#define __NR_setpgid (0x40000000 + 109)
+#define __NR_getppid (0x40000000 + 110)
+#define __NR_getpgrp (0x40000000 + 111)
+#define __NR_setsid (0x40000000 + 112)
+#define __NR_setreuid (0x40000000 + 113)
+#define __NR_setregid (0x40000000 + 114)
+#define __NR_getgroups (0x40000000 + 115)
+#define __NR_setgroups (0x40000000 + 116)
+#define __NR_setresuid (0x40000000 + 117)
+#define __NR_getresuid (0x40000000 + 118)
+#define __NR_setresgid (0x40000000 + 119)
+#define __NR_getresgid (0x40000000 + 120)
+#define __NR_getpgid (0x40000000 + 121)
+#define __NR_setfsuid (0x40000000 + 122)
+#define __NR_setfsgid (0x40000000 + 123)
+#define __NR_getsid (0x40000000 + 124)
+#define __NR_capget (0x40000000 + 125)
+#define __NR_capset (0x40000000 + 126)
+#define __NR_rt_sigsuspend (0x40000000 + 130)
+#define __NR_utime (0x40000000 + 132)
+#define __NR_mknod (0x40000000 + 133)
+#define __NR_personality (0x40000000 + 135)
+#define __NR_ustat (0x40000000 + 136)
+#define __NR_statfs (0x40000000 + 137)
+#define __NR_fstatfs (0x40000000 + 138)
+#define __NR_sysfs (0x40000000 + 139)
+#define __NR_getpriority (0x40000000 + 140)
+#define __NR_setpriority (0x40000000 + 141)
+#define __NR_sched_setparam (0x40000000 + 142)
+#define __NR_sched_getparam (0x40000000 + 143)
+#define __NR_sched_setscheduler (0x40000000 + 144)
+#define __NR_sched_getscheduler (0x40000000 + 145)
+#define __NR_sched_get_priority_max (0x40000000 + 146)
+#define __NR_sched_get_priority_min (0x40000000 + 147)
+#define __NR_sched_rr_get_interval (0x40000000 + 148)
+#define __NR_mlock (0x40000000 + 149)
+#define __NR_munlock (0x40000000 + 150)
+#define __NR_mlockall (0x40000000 + 151)
+#define __NR_munlockall (0x40000000 + 152)
+#define __NR_vhangup (0x40000000 + 153)
+#define __NR_modify_ldt (0x40000000 + 154)
+#define __NR_pivot_root (0x40000000 + 155)
+#define __NR_prctl (0x40000000 + 157)
+#define __NR_arch_prctl (0x40000000 + 158)
+#define __NR_adjtimex (0x40000000 + 159)
+#define __NR_setrlimit (0x40000000 + 160)
+#define __NR_chroot (0x40000000 + 161)
+#define __NR_sync (0x40000000 + 162)
+#define __NR_acct (0x40000000 + 163)
+#define __NR_settimeofday (0x40000000 + 164)
+#define __NR_mount (0x40000000 + 165)
+#define __NR_umount2 (0x40000000 + 166)
+#define __NR_swapon (0x40000000 + 167)
+#define __NR_swapoff (0x40000000 + 168)
+#define __NR_reboot (0x40000000 + 169)
+#define __NR_sethostname (0x40000000 + 170)
+#define __NR_setdomainname (0x40000000 + 171)
+#define __NR_iopl (0x40000000 + 172)
+#define __NR_ioperm (0x40000000 + 173)
+#define __NR_init_module (0x40000000 + 175)
+#define __NR_delete_module (0x40000000 + 176)
+#define __NR_quotactl (0x40000000 + 179)
+#define __NR_getpmsg (0x40000000 + 181)
+#define __NR_putpmsg (0x40000000 + 182)
+#define __NR_afs_syscall (0x40000000 + 183)
+#define __NR_tuxcall (0x40000000 + 184)
+#define __NR_security (0x40000000 + 185)
+#define __NR_gettid (0x40000000 + 186)
+#define __NR_readahead (0x40000000 + 187)
+#define __NR_setxattr (0x40000000 + 188)
+#define __NR_lsetxattr (0x40000000 + 189)
+#define __NR_fsetxattr (0x40000000 + 190)
+#define __NR_getxattr (0x40000000 + 191)
+#define __NR_lgetxattr (0x40000000 + 192)
+#define __NR_fgetxattr (0x40000000 + 193)
+#define __NR_listxattr (0x40000000 + 194)
+#define __NR_llistxattr (0x40000000 + 195)
+#define __NR_flistxattr (0x40000000 + 196)
+#define __NR_removexattr (0x40000000 + 197)
+#define __NR_lremovexattr (0x40000000 + 198)
+#define __NR_fremovexattr (0x40000000 + 199)
+#define __NR_tkill (0x40000000 + 200)
+#define __NR_time (0x40000000 + 201)
+#define __NR_futex (0x40000000 + 202)
+#define __NR_sched_setaffinity (0x40000000 + 203)
+#define __NR_sched_getaffinity (0x40000000 + 204)
+#define __NR_io_destroy (0x40000000 + 207)
+#define __NR_io_getevents (0x40000000 + 208)
+#define __NR_io_cancel (0x40000000 + 210)
+#define __NR_lookup_dcookie (0x40000000 + 212)
+#define __NR_epoll_create (0x40000000 + 213)
+#define __NR_remap_file_pages (0x40000000 + 216)
+#define __NR_getdents64 (0x40000000 + 217)
+#define __NR_set_tid_address (0x40000000 + 218)
+#define __NR_restart_syscall (0x40000000 + 219)
+#define __NR_semtimedop (0x40000000 + 220)
+#define __NR_fadvise64 (0x40000000 + 221)
+#define __NR_timer_settime (0x40000000 + 223)
+#define __NR_timer_gettime (0x40000000 + 224)
+#define __NR_timer_getoverrun (0x40000000 + 225)
+#define __NR_timer_delete (0x40000000 + 226)
+#define __NR_clock_settime (0x40000000 + 227)
+#define __NR_clock_gettime (0x40000000 + 228)
+#define __NR_clock_getres (0x40000000 + 229)
+#define __NR_clock_nanosleep (0x40000000 + 230)
+#define __NR_exit_group (0x40000000 + 231)
+#define __NR_epoll_wait (0x40000000 + 232)
+#define __NR_epoll_ctl (0x40000000 + 233)
+#define __NR_tgkill (0x40000000 + 234)
+#define __NR_utimes (0x40000000 + 235)
+#define __NR_mbind (0x40000000 + 237)
+#define __NR_set_mempolicy (0x40000000 + 238)
+#define __NR_get_mempolicy (0x40000000 + 239)
+#define __NR_mq_open (0x40000000 + 240)
+#define __NR_mq_unlink (0x40000000 + 241)
+#define __NR_mq_timedsend (0x40000000 + 242)
+#define __NR_mq_timedreceive (0x40000000 + 243)
+#define __NR_mq_getsetattr (0x40000000 + 245)
+#define __NR_add_key (0x40000000 + 248)
+#define __NR_request_key (0x40000000 + 249)
+#define __NR_keyctl (0x40000000 + 250)
+#define __NR_ioprio_set (0x40000000 + 251)
+#define __NR_ioprio_get (0x40000000 + 252)
+#define __NR_inotify_init (0x40000000 + 253)
+#define __NR_inotify_add_watch (0x40000000 + 254)
+#define __NR_inotify_rm_watch (0x40000000 + 255)
+#define __NR_migrate_pages (0x40000000 + 256)
+#define __NR_openat (0x40000000 + 257)
+#define __NR_mkdirat (0x40000000 + 258)
+#define __NR_mknodat (0x40000000 + 259)
+#define __NR_fchownat (0x40000000 + 260)
+#define __NR_futimesat (0x40000000 + 261)
+#define __NR_newfstatat (0x40000000 + 262)
+#define __NR_unlinkat (0x40000000 + 263)
+#define __NR_renameat (0x40000000 + 264)
+#define __NR_linkat (0x40000000 + 265)
+#define __NR_symlinkat (0x40000000 + 266)
+#define __NR_readlinkat (0x40000000 + 267)
+#define __NR_fchmodat (0x40000000 + 268)
+#define __NR_faccessat (0x40000000 + 269)
+#define __NR_pselect6 (0x40000000 + 270)
+#define __NR_ppoll (0x40000000 + 271)
+#define __NR_unshare (0x40000000 + 272)
+#define __NR_splice (0x40000000 + 275)
+#define __NR_tee (0x40000000 + 276)
+#define __NR_sync_file_range (0x40000000 + 277)
+#define __NR_utimensat (0x40000000 + 280)
+#define __NR_epoll_pwait (0x40000000 + 281)
+#define __NR_signalfd (0x40000000 + 282)
+#define __NR_timerfd_create (0x40000000 + 283)
+#define __NR_eventfd (0x40000000 + 284)
+#define __NR_fallocate (0x40000000 + 285)
+#define __NR_timerfd_settime (0x40000000 + 286)
+#define __NR_timerfd_gettime (0x40000000 + 287)
+#define __NR_accept4 (0x40000000 + 288)
+#define __NR_signalfd4 (0x40000000 + 289)
+#define __NR_eventfd2 (0x40000000 + 290)
+#define __NR_epoll_create1 (0x40000000 + 291)
+#define __NR_dup3 (0x40000000 + 292)
+#define __NR_pipe2 (0x40000000 + 293)
+#define __NR_inotify_init1 (0x40000000 + 294)
+#define __NR_perf_event_open (0x40000000 + 298)
+#define __NR_fanotify_init (0x40000000 + 300)
+#define __NR_fanotify_mark (0x40000000 + 301)
+#define __NR_prlimit64 (0x40000000 + 302)
+#define __NR_name_to_handle_at (0x40000000 + 303)
+#define __NR_open_by_handle_at (0x40000000 + 304)
+#define __NR_clock_adjtime (0x40000000 + 305)
+#define __NR_syncfs (0x40000000 + 306)
+#define __NR_setns (0x40000000 + 308)
+#define __NR_getcpu (0x40000000 + 309)
+#define __NR_kcmp (0x40000000 + 312)
+#define __NR_finit_module (0x40000000 + 313)
+#define __NR_sched_setattr (0x40000000 + 314)
+#define __NR_sched_getattr (0x40000000 + 315)
+#define __NR_renameat2 (0x40000000 + 316)
+#define __NR_seccomp (0x40000000 + 317)
+#define __NR_getrandom (0x40000000 + 318)
+#define __NR_memfd_create (0x40000000 + 319)
+#define __NR_kexec_file_load (0x40000000 + 320)
+#define __NR_bpf (0x40000000 + 321)
+#define __NR_userfaultfd (0x40000000 + 323)
+#define __NR_membarrier (0x40000000 + 324)
+#define __NR_mlock2 (0x40000000 + 325)
+#define __NR_copy_file_range (0x40000000 + 326)
+#define __NR_pkey_mprotect (0x40000000 + 329)
+#define __NR_pkey_alloc (0x40000000 + 330)
+#define __NR_pkey_free (0x40000000 + 331)
+#define __NR_statx (0x40000000 + 332)
+#define __NR_io_pgetevents (0x40000000 + 333)
+#define __NR_rseq (0x40000000 + 334)
+#define __NR_pidfd_send_signal (0x40000000 + 424)
+#define __NR_io_uring_setup (0x40000000 + 425)
+#define __NR_io_uring_enter (0x40000000 + 426)
+#define __NR_io_uring_register (0x40000000 + 427)
+#define __NR_open_tree		(0x40000000 + 428)
+#define __NR_move_mount		(0x40000000 + 429)
+#define __NR_fsopen		(0x40000000 + 430)
+#define __NR_fsconfig		(0x40000000 + 431)
+#define __NR_fsmount		(0x40000000 + 432)
+#define __NR_fspick		(0x40000000 + 433)
+#define __NR_pidfd_open		(0x40000000 + 434)
+#define __NR_clone3		(0x40000000 + 435)
+
+
+#define __NR_rt_sigaction (0x40000000 + 512)
+#define __NR_rt_sigreturn (0x40000000 + 513)
+#define __NR_ioctl (0x40000000 + 514)
+#define __NR_readv (0x40000000 + 515)
+#define __NR_writev (0x40000000 + 516)
+#define __NR_recvfrom (0x40000000 + 517)
+#define __NR_sendmsg (0x40000000 + 518)
+#define __NR_recvmsg (0x40000000 + 519)
+#define __NR_execve (0x40000000 + 520)
+#define __NR_ptrace (0x40000000 + 521)
+#define __NR_rt_sigpending (0x40000000 + 522)
+#define __NR_rt_sigtimedwait (0x40000000 + 523)
+#define __NR_rt_sigqueueinfo (0x40000000 + 524)
+#define __NR_sigaltstack (0x40000000 + 525)
+#define __NR_timer_create (0x40000000 + 526)
+#define __NR_mq_notify (0x40000000 + 527)
+#define __NR_kexec_load (0x40000000 + 528)
+#define __NR_waitid (0x40000000 + 529)
+#define __NR_set_robust_list (0x40000000 + 530)
+#define __NR_get_robust_list (0x40000000 + 531)
+#define __NR_vmsplice (0x40000000 + 532)
+#define __NR_move_pages (0x40000000 + 533)
+#define __NR_preadv (0x40000000 + 534)
+#define __NR_pwritev (0x40000000 + 535)
+#define __NR_rt_tgsigqueueinfo (0x40000000 + 536)
+#define __NR_recvmmsg (0x40000000 + 537)
+#define __NR_sendmmsg (0x40000000 + 538)
+#define __NR_process_vm_readv (0x40000000 + 539)
+#define __NR_process_vm_writev (0x40000000 + 540)
+#define __NR_setsockopt (0x40000000 + 541)
+#define __NR_getsockopt (0x40000000 + 542)
+#define __NR_io_setup (0x40000000 + 543)
+#define __NR_io_submit (0x40000000 + 544)
+#define __NR_execveat (0x40000000 + 545)
+#define __NR_preadv2 (0x40000000 + 546)
+#define __NR_pwritev2 (0x40000000 + 547)
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/user.h
new file mode 100644
index 0000000000..4073cc06ff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/bits/user.h
@@ -0,0 +1,41 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
+
+typedef struct user_fpregs_struct {
+	uint16_t cwd, swd, ftw, fop;
+	uint64_t rip, rdp;
+	uint32_t mxcsr, mxcr_mask;
+	uint32_t st_space[32], xmm_space[64], padding[24];
+} elf_fpregset_t;
+
+struct user_regs_struct {
+	unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
+	unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
+	unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
+};
+#define ELF_NGREG 27
+typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
+
+struct user {
+	struct user_regs_struct		regs;
+	int				u_fpvalid;
+	struct user_fpregs_struct	i387;
+	unsigned long			u_tsize;
+	unsigned long			u_dsize;
+	unsigned long			u_ssize;
+	unsigned long			start_code;
+	unsigned long			start_stack;
+	long				signal;
+	int				reserved;
+	struct user_regs_struct		*u_ar0;
+	struct user_fpregs_struct	*u_fpstate;
+	unsigned long			magic;
+	char				u_comm[32];
+	unsigned long			u_debugreg[8];
+};
+
+#define PAGE_MASK		(~(PAGESIZE-1))
+#define NBPG			PAGESIZE
+#define UPAGES			1
+#define HOST_TEXT_START_ADDR	(u.start_code)
+#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x32/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x32/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x32/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/x32/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/ksigaction.h b/src/components/lib/libc/musl-1.2.0/arch/x32/ksigaction.h
new file mode 100644
index 0000000000..c40e356842
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/ksigaction.h
@@ -0,0 +1,11 @@
+#include <features.h>
+
+struct k_sigaction {
+	void (*handler)(int);
+	unsigned long flags;
+	void (*restorer)(void);
+	unsigned mask[2];
+};
+
+hidden void __restore_rt();
+#define __restore __restore_rt
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/x32/kstat.h
new file mode 100644
index 0000000000..ce25fce35e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/kstat.h
@@ -0,0 +1,22 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	nlink_t st_nlink;
+
+	mode_t st_mode;
+	uid_t st_uid;
+	gid_t st_gid;
+	unsigned int    __pad0;
+	dev_t st_rdev;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+
+	long long st_atime_sec;
+	long st_atime_nsec;
+	long long st_mtime_sec;
+	long st_mtime_nsec;
+	long long st_ctime_sec;
+	long st_ctime_nsec;
+	long long __unused[3];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x32/pthread_arch.h
new file mode 100644
index 0000000000..f640a1a157
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/pthread_arch.h
@@ -0,0 +1,14 @@
+static inline struct pthread *__pthread_self()
+{
+	struct pthread *self;
+	__asm__ ("mov %%fs:0,%0" : "=r" (self) );
+	return self;
+}
+
+#define TP_ADJ(p) (p)
+
+#define MC_PC gregs[REG_RIP]
+
+#define CANARY canary2
+
+#define tls_mod_off_t unsigned long long
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/x32/reloc.h
new file mode 100644
index 0000000000..dc039adf5b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/reloc.h
@@ -0,0 +1,31 @@
+#define LDSO_ARCH "x32"
+
+/* FIXME: x32 is very strange in its use of 64-bit relocation types in
+ * a 32-bit environment. As long as the memory at reloc_addr is
+ * zero-filled prior to relocations, just treating 64-bit relocations
+ * as operating on 32-bit slots should be fine, but this should be
+ * checked. In particular, R_X86_64_64, R_X86_64_DTPOFF64, and
+ * R_X86_64_TPOFF64 may need checking. */
+
+/* The R_X86_64_64, R_X86_64_DTPOFF32, and R_X86_64_TPOFF32 reloc types
+ * were previously mapped in the switch table form of this file; however,
+ * they do not seem to be used/usable for anything. If needed, new
+ * mappings will have to be added. */
+
+#define REL_SYMBOLIC    R_X86_64_32
+#define REL_OFFSET      R_X86_64_PC32
+#define REL_GOT         R_X86_64_GLOB_DAT
+#define REL_PLT         R_X86_64_JUMP_SLOT
+#define REL_RELATIVE    R_X86_64_RELATIVE
+#define REL_COPY        R_X86_64_COPY
+#define REL_DTPMOD      R_X86_64_DTPMOD64
+#define REL_DTPOFF      R_X86_64_DTPOFF64
+#define REL_TPOFF       R_X86_64_TPOFF64
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mov %1,%%esp ; jmp *%0" : : "r"((uint64_t)(uintptr_t)pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	"	lea " #sym "(%%rip),%0\n" \
+	: "=r"(*fp) : : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x32/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x32/syscall_arch.h
new file mode 100644
index 0000000000..e0111cc0ea
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x32/syscall_arch.h
@@ -0,0 +1,93 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+
+#define __scc(X) sizeof(1?(X):0ULL) < 8 ? (unsigned long) (X) : (long long) (X)
+typedef long long syscall_arg_t;
+
+static __inline long __syscall0(long long n)
+{
+	unsigned long ret;
+	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n) : "rcx", "r11", "memory");
+	return ret;
+}
+
+static __inline long __syscall1(long long n, long long a1)
+{
+	unsigned long ret;
+	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1) : "rcx", "r11", "memory");
+	return ret;
+}
+
+static __inline long __syscall2(long long n, long long a1, long long a2)
+{
+	unsigned long ret;
+	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2)
+					: "rcx", "r11", "memory");
+	return ret;
+}
+
+static __inline long __syscall3(long long n, long long a1, long long a2, long long a3)
+{
+	unsigned long ret;
+	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
+						  "d"(a3) : "rcx", "r11", "memory");
+	return ret;
+}
+
+static __inline long __syscall4(long long n, long long a1, long long a2, long long a3,
+                                     long long a4_)
+{
+	unsigned long ret;
+	register long long a4 __asm__("r10") = a4_;
+	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
+					  "d"(a3), "r"(a4): "rcx", "r11", "memory");
+	return ret;
+}
+
+static __inline long __syscall5(long long n, long long a1, long long a2, long long a3,
+                                     long long a4_, long long a5_)
+{
+	unsigned long ret;
+	register long long a4 __asm__("r10") = a4_;
+	register long long a5 __asm__("r8") = a5_;
+	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
+					  "d"(a3), "r"(a4), "r"(a5) : "rcx", "r11", "memory");
+	return ret;
+}
+
+static __inline long __syscall6(long long n, long long a1, long long a2, long long a3,
+                                     long long a4_, long long a5_, long long a6_)
+{
+	unsigned long ret;
+	register long long a4 __asm__("r10") = a4_;
+	register long long a5 __asm__("r8") = a5_;
+	register long long a6 __asm__("r9") = a6_;
+	__asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
+					  "d"(a3), "r"(a4), "r"(a5), "r"(a6) : "rcx", "r11", "memory");
+	return ret;
+}
+
+#undef SYS_futimesat
+
+#define SYS_clock_gettime64 SYS_clock_gettime
+#define SYS_clock_settime64 SYS_clock_settime
+#define SYS_clock_adjtime64 SYS_clock_adjtime
+#define SYS_clock_nanosleep_time64 SYS_clock_nanosleep
+#define SYS_timer_gettime64 SYS_timer_gettime
+#define SYS_timer_settime64 SYS_timer_settime
+#define SYS_timerfd_gettime64 SYS_timerfd_gettime
+#define SYS_timerfd_settime64 SYS_timerfd_settime
+#define SYS_utimensat_time64 SYS_utimensat
+#define SYS_pselect6_time64 SYS_pselect6
+#define SYS_ppoll_time64 SYS_ppoll
+#define SYS_recvmmsg_time64 SYS_recvmmsg
+#define SYS_mq_timedsend_time64 SYS_mq_timedsend
+#define SYS_mq_timedreceive_time64 SYS_mq_timedreceive
+#define SYS_semtimedop_time64 SYS_semtimedop
+#define SYS_rt_sigtimedwait_time64 SYS_rt_sigtimedwait
+#define SYS_futex_time64 SYS_futex
+#define SYS_sched_rr_get_interval_time64 SYS_sched_rr_get_interval
+#define SYS_getrusage_time64 SYS_getrusage
+#define SYS_wait4_time64 SYS_wait4
+
+#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/atomic_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/atomic_arch.h
new file mode 100644
index 0000000000..da4e203754
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/atomic_arch.h
@@ -0,0 +1,123 @@
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__ __volatile__ (
+		"lock ; cmpxchg %3, %1"
+		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
+	return t;
+}
+
+#define a_cas_p a_cas_p
+static inline void *a_cas_p(volatile void *p, void *t, void *s)
+{
+	__asm__( "lock ; cmpxchg %3, %1"
+		: "=a"(t), "=m"(*(void *volatile *)p)
+		: "a"(t), "r"(s) : "memory" );
+	return t;
+}
+
+#define a_swap a_swap
+static inline int a_swap(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"xchg %0, %1"
+		: "=r"(v), "=m"(*p) : "0"(v) : "memory" );
+	return v;
+}
+
+#define a_fetch_add a_fetch_add
+static inline int a_fetch_add(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; xadd %0, %1"
+		: "=r"(v), "=m"(*p) : "0"(v) : "memory" );
+	return v;
+}
+
+#define a_and a_and
+static inline void a_and(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; and %1, %0"
+		: "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_or a_or
+static inline void a_or(volatile int *p, int v)
+{
+	__asm__ __volatile__(
+		"lock ; or %1, %0"
+		: "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_and_64 a_and_64
+static inline void a_and_64(volatile uint64_t *p, uint64_t v)
+{
+	__asm__ __volatile(
+		"lock ; and %1, %0"
+		 : "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_or_64 a_or_64
+static inline void a_or_64(volatile uint64_t *p, uint64_t v)
+{
+	__asm__ __volatile__(
+		"lock ; or %1, %0"
+		 : "=m"(*p) : "r"(v) : "memory" );
+}
+
+#define a_inc a_inc
+static inline void a_inc(volatile int *p)
+{
+	__asm__ __volatile__(
+		"lock ; incl %0"
+		: "=m"(*p) : "m"(*p) : "memory" );
+}
+
+#define a_dec a_dec
+static inline void a_dec(volatile int *p)
+{
+	__asm__ __volatile__(
+		"lock ; decl %0"
+		: "=m"(*p) : "m"(*p) : "memory" );
+}
+
+#define a_store a_store
+static inline void a_store(volatile int *p, int x)
+{
+	__asm__ __volatile__(
+		"mov %1, %0 ; lock ; orl $0,(%%rsp)"
+		: "=m"(*p) : "r"(x) : "memory" );
+}
+
+#define a_barrier a_barrier
+static inline void a_barrier()
+{
+	__asm__ __volatile__( "" : : : "memory" );
+}
+
+#define a_spin a_spin
+static inline void a_spin()
+{
+	__asm__ __volatile__( "pause" : : : "memory" );
+}
+
+#define a_crash a_crash
+static inline void a_crash()
+{
+	__asm__ __volatile__( "hlt" : : : "memory" );
+}
+
+#define a_ctz_64 a_ctz_64
+static inline int a_ctz_64(uint64_t x)
+{
+	__asm__( "bsf %1,%0" : "=r"(x) : "r"(x) );
+	return x;
+}
+
+#define a_clz_64 a_clz_64
+static inline int a_clz_64(uint64_t x)
+{
+	__asm__( "bsr %1,%0 ; xor $63,%0" : "=r"(x) : "r"(x) );
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/alltypes.h.in
new file mode 100644
index 0000000000..5cd8a2997f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/alltypes.h.in
@@ -0,0 +1,20 @@
+#define _Addr long
+#define _Int64 long
+#define _Reg long
+
+#define __BYTE_ORDER 1234
+#define __LONG_MAX 0x7fffffffffffffffL
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+
+#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 2
+TYPEDEF long double float_t;
+TYPEDEF long double double_t;
+#else
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+#endif
+
+TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/fcntl.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/fcntl.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/fenv.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/fenv.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/float.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/float.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/float.h
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/io.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/io.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/io.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/io.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/limits.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/limits.h
new file mode 100644
index 0000000000..07743b6fd6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/limits.h
@@ -0,0 +1 @@
+#define PAGESIZE 4096
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/mman.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/mman.h
new file mode 100644
index 0000000000..ba2d6f7a83
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/mman.h
@@ -0,0 +1 @@
+#define MAP_32BIT      0x40
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/posix.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/posix.h
new file mode 100644
index 0000000000..c37b94c142
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/posix.h
@@ -0,0 +1,2 @@
+#define _POSIX_V6_LP64_OFF64  1
+#define _POSIX_V7_LP64_OFF64  1
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/ptrace.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/ptrace.h
new file mode 100644
index 0000000000..7f8a09b521
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/ptrace.h
@@ -0,0 +1,13 @@
+#define PTRACE_GET_THREAD_AREA		25
+#define PTRACE_SET_THREAD_AREA		26
+#define PTRACE_ARCH_PRCTL		30
+#define PTRACE_SYSEMU			31
+#define PTRACE_SYSEMU_SINGLESTEP	32
+#define PTRACE_SINGLEBLOCK		33
+
+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
+#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA
+#define PT_ARCH_PRCTL PTRACE_ARCH_PRCTL
+#define PT_SYSEMU PTRACE_SYSEMU
+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP
+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/reg.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/reg.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/sem.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/sem.h
new file mode 100644
index 0000000000..e61571c121
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/sem.h
@@ -0,0 +1,11 @@
+struct semid_ds {
+	struct ipc_perm sem_perm;
+	time_t sem_otime;
+	long __unused1;
+	time_t sem_ctime;
+	long __unused2;
+	unsigned short sem_nsems;
+	char __sem_nsems_pad[sizeof(long)-sizeof(short)];
+	long __unused3;
+	long __unused4;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/setjmp.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/setjmp.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/signal.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/signal.h
new file mode 100644
index 0000000000..c99317d300
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/signal.h
@@ -0,0 +1,153 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+#endif
+
+#ifdef _GNU_SOURCE
+enum { REG_R8 = 0 };
+#define REG_R8 REG_R8
+enum { REG_R9 = 1 };
+#define REG_R9 REG_R9
+enum { REG_R10 = 2 };
+#define REG_R10 REG_R10
+enum { REG_R11 = 3 };
+#define REG_R11 REG_R11
+enum { REG_R12 = 4 };
+#define REG_R12 REG_R12
+enum { REG_R13 = 5 };
+#define REG_R13 REG_R13
+enum { REG_R14 = 6 };
+#define REG_R14 REG_R14
+enum { REG_R15 = 7 };
+#define REG_R15 REG_R15
+enum { REG_RDI = 8 };
+#define REG_RDI REG_RDI
+enum { REG_RSI = 9 };
+#define REG_RSI REG_RSI
+enum { REG_RBP = 10 };
+#define REG_RBP REG_RBP
+enum { REG_RBX = 11 };
+#define REG_RBX REG_RBX
+enum { REG_RDX = 12 };
+#define REG_RDX REG_RDX
+enum { REG_RAX = 13 };
+#define REG_RAX REG_RAX
+enum { REG_RCX = 14 };
+#define REG_RCX REG_RCX
+enum { REG_RSP = 15 };
+#define REG_RSP REG_RSP
+enum { REG_RIP = 16 };
+#define REG_RIP REG_RIP
+enum { REG_EFL = 17 };
+#define REG_EFL REG_EFL
+enum { REG_CSGSFS = 18 };
+#define REG_CSGSFS REG_CSGSFS
+enum { REG_ERR = 19 };
+#define REG_ERR REG_ERR
+enum { REG_TRAPNO = 20 };
+#define REG_TRAPNO REG_TRAPNO
+enum { REG_OLDMASK = 21 };
+#define REG_OLDMASK REG_OLDMASK
+enum { REG_CR2 = 22 };
+#define REG_CR2 REG_CR2
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+typedef long long greg_t, gregset_t[23];
+typedef struct _fpstate {
+	unsigned short cwd, swd, ftw, fop;
+	unsigned long long rip, rdp;
+	unsigned mxcsr, mxcr_mask;
+	struct {
+		unsigned short significand[4], exponent, padding[3];
+	} _st[8];
+	struct {
+		unsigned element[4];
+	} _xmm[16];
+	unsigned padding[24];
+} *fpregset_t;
+struct sigcontext {
+	unsigned long r8, r9, r10, r11, r12, r13, r14, r15;
+	unsigned long rdi, rsi, rbp, rbx, rdx, rax, rcx, rsp, rip, eflags;
+	unsigned short cs, gs, fs, __pad0;
+	unsigned long err, trapno, oldmask, cr2;
+	struct _fpstate *fpstate;
+	unsigned long __reserved1[8];
+};
+typedef struct {
+	gregset_t gregs;
+	fpregset_t fpregs;
+	unsigned long long __reserved1[8];
+} mcontext_t;
+#else
+typedef struct {
+	unsigned long __space[32];
+} mcontext_t;
+#endif
+
+struct sigaltstack {
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
+};
+
+typedef struct __ucontext {
+	unsigned long uc_flags;
+	struct __ucontext *uc_link;
+	stack_t uc_stack;
+	mcontext_t uc_mcontext;
+	sigset_t uc_sigmask;
+	unsigned long __fpregs_mem[64];
+} ucontext_t;
+
+#define SA_NOCLDSTOP  1
+#define SA_NOCLDWAIT  2
+#define SA_SIGINFO    4
+#define SA_ONSTACK    0x08000000
+#define SA_RESTART    0x10000000
+#define SA_NODEFER    0x40000000
+#define SA_RESETHAND  0x80000000
+#define SA_RESTORER   0x04000000
+
+#endif
+
+#define SIGHUP    1
+#define SIGINT    2
+#define SIGQUIT   3
+#define SIGILL    4
+#define SIGTRAP   5
+#define SIGABRT   6
+#define SIGIOT    SIGABRT
+#define SIGBUS    7
+#define SIGFPE    8
+#define SIGKILL   9
+#define SIGUSR1   10
+#define SIGSEGV   11
+#define SIGUSR2   12
+#define SIGPIPE   13
+#define SIGALRM   14
+#define SIGTERM   15
+#define SIGSTKFLT 16
+#define SIGCHLD   17
+#define SIGCONT   18
+#define SIGSTOP   19
+#define SIGTSTP   20
+#define SIGTTIN   21
+#define SIGTTOU   22
+#define SIGURG    23
+#define SIGXCPU   24
+#define SIGXFSZ   25
+#define SIGVTALRM 26
+#define SIGPROF   27
+#define SIGWINCH  28
+#define SIGIO     29
+#define SIGPOLL   29
+#define SIGPWR    30
+#define SIGSYS    31
+#define SIGUNUSED SIGSYS
+
+#define _NSIG 65
+
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/stat.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/stat.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/bits/stat.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/stat.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/stdint.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/stdint.h
new file mode 100644
index 0000000000..1bb147f24e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/stdint.h
@@ -0,0 +1,20 @@
+typedef int32_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+
+#define INT_FAST16_MIN  INT32_MIN
+#define INT_FAST32_MIN  INT32_MIN
+
+#define INT_FAST16_MAX  INT32_MAX
+#define INT_FAST32_MAX  INT32_MAX
+
+#define UINT_FAST16_MAX UINT32_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+
+#define INTPTR_MIN      INT64_MIN
+#define INTPTR_MAX      INT64_MAX
+#define UINTPTR_MAX     UINT64_MAX
+#define PTRDIFF_MIN     INT64_MIN
+#define PTRDIFF_MAX     INT64_MAX
+#define SIZE_MAX        UINT64_MAX
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/syscall.h.in b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/syscall.h.in
new file mode 100644
index 0000000000..6a646ad346
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/syscall.h.in
@@ -0,0 +1,348 @@
+#define __NR_read				0
+#define __NR_write				1
+#define __NR_open				2
+#define __NR_close				3
+#define __NR_stat				4
+#define __NR_fstat				5
+#define __NR_lstat				6
+#define __NR_poll				7
+#define __NR_lseek				8
+#define __NR_mmap				9
+#define __NR_mprotect			10
+#define __NR_munmap				11
+#define __NR_brk				12
+#define __NR_rt_sigaction		13
+#define __NR_rt_sigprocmask		14
+#define __NR_rt_sigreturn		15
+#define __NR_ioctl				16
+#define __NR_pread64			17
+#define __NR_pwrite64			18
+#define __NR_readv				19
+#define __NR_writev				20
+#define __NR_access				21
+#define __NR_pipe				22
+#define __NR_select				23
+#define __NR_sched_yield		24
+#define __NR_mremap				25
+#define __NR_msync				26
+#define __NR_mincore			27
+#define __NR_madvise			28
+#define __NR_shmget				29
+#define __NR_shmat				30
+#define __NR_shmctl				31
+#define __NR_dup				32
+#define __NR_dup2				33
+#define __NR_pause				34
+#define __NR_nanosleep			35
+#define __NR_getitimer			36
+#define __NR_alarm				37
+#define __NR_setitimer			38
+#define __NR_getpid				39
+#define __NR_sendfile			40
+#define __NR_socket				41
+#define __NR_connect			42
+#define __NR_accept				43
+#define __NR_sendto				44
+#define __NR_recvfrom			45
+#define __NR_sendmsg			46
+#define __NR_recvmsg			47
+#define __NR_shutdown			48
+#define __NR_bind				49
+#define __NR_listen				50
+#define __NR_getsockname		51
+#define __NR_getpeername		52
+#define __NR_socketpair			53
+#define __NR_setsockopt			54
+#define __NR_getsockopt			55
+#define __NR_clone				56
+#define __NR_fork				57
+#define __NR_vfork				58
+#define __NR_execve				59
+#define __NR_exit				60
+#define __NR_wait4				61
+#define __NR_kill				62
+#define __NR_uname				63
+#define __NR_semget				64
+#define __NR_semop				65
+#define __NR_semctl				66
+#define __NR_shmdt				67
+#define __NR_msgget				68
+#define __NR_msgsnd				69
+#define __NR_msgrcv				70
+#define __NR_msgctl				71
+#define __NR_fcntl				72
+#define __NR_flock				73
+#define __NR_fsync				74
+#define __NR_fdatasync			75
+#define __NR_truncate			76
+#define __NR_ftruncate			77
+#define __NR_getdents			78
+#define __NR_getcwd				79
+#define __NR_chdir				80
+#define __NR_fchdir				81
+#define __NR_rename				82
+#define __NR_mkdir				83
+#define __NR_rmdir				84
+#define __NR_creat				85
+#define __NR_link				86
+#define __NR_unlink				87
+#define __NR_symlink			88
+#define __NR_readlink			89
+#define __NR_chmod				90
+#define __NR_fchmod				91
+#define __NR_chown				92
+#define __NR_fchown				93
+#define __NR_lchown				94
+#define __NR_umask				95
+#define __NR_gettimeofday		96
+#define __NR_getrlimit			97
+#define __NR_getrusage			98
+#define __NR_sysinfo			99
+#define __NR_times				100
+#define __NR_ptrace				101
+#define __NR_getuid				102
+#define __NR_syslog				103
+#define __NR_getgid				104
+#define __NR_setuid				105
+#define __NR_setgid				106
+#define __NR_geteuid			107
+#define __NR_getegid			108
+#define __NR_setpgid			109
+#define __NR_getppid			110
+#define __NR_getpgrp			111
+#define __NR_setsid				112
+#define __NR_setreuid			113
+#define __NR_setregid			114
+#define __NR_getgroups			115
+#define __NR_setgroups			116
+#define __NR_setresuid			117
+#define __NR_getresuid			118
+#define __NR_setresgid			119
+#define __NR_getresgid			120
+#define __NR_getpgid			121
+#define __NR_setfsuid			122
+#define __NR_setfsgid			123
+#define __NR_getsid				124
+#define __NR_capget				125
+#define __NR_capset				126
+#define __NR_rt_sigpending		127
+#define __NR_rt_sigtimedwait	128
+#define __NR_rt_sigqueueinfo	129
+#define __NR_rt_sigsuspend		130
+#define __NR_sigaltstack		131
+#define __NR_utime				132
+#define __NR_mknod				133
+#define __NR_uselib				134
+#define __NR_personality		135
+#define __NR_ustat				136
+#define __NR_statfs				137
+#define __NR_fstatfs			138
+#define __NR_sysfs				139
+#define __NR_getpriority			140
+#define __NR_setpriority			141
+#define __NR_sched_setparam			142
+#define __NR_sched_getparam			143
+#define __NR_sched_setscheduler		144
+#define __NR_sched_getscheduler		145
+#define __NR_sched_get_priority_max	146
+#define __NR_sched_get_priority_min	147
+#define __NR_sched_rr_get_interval	148
+#define __NR_mlock					149
+#define __NR_munlock				150
+#define __NR_mlockall				151
+#define __NR_munlockall				152
+#define __NR_vhangup				153
+#define __NR_modify_ldt				154
+#define __NR_pivot_root				155
+#define __NR__sysctl				156
+#define __NR_prctl					157
+#define __NR_arch_prctl				158
+#define __NR_adjtimex				159
+#define __NR_setrlimit				160
+#define __NR_chroot					161
+#define __NR_sync					162
+#define __NR_acct					163
+#define __NR_settimeofday			164
+#define __NR_mount					165
+#define __NR_umount2				166
+#define __NR_swapon					167
+#define __NR_swapoff				168
+#define __NR_reboot					169
+#define __NR_sethostname			170
+#define __NR_setdomainname			171
+#define __NR_iopl					172
+#define __NR_ioperm					173
+#define __NR_create_module			174
+#define __NR_init_module			175
+#define __NR_delete_module			176
+#define __NR_get_kernel_syms		177
+#define __NR_query_module			178
+#define __NR_quotactl				179
+#define __NR_nfsservctl				180
+#define __NR_getpmsg				181
+#define __NR_putpmsg				182
+#define __NR_afs_syscall			183
+#define __NR_tuxcall				184
+#define __NR_security				185
+#define __NR_gettid					186
+#define __NR_readahead				187
+#define __NR_setxattr				188
+#define __NR_lsetxattr				189
+#define __NR_fsetxattr				190
+#define __NR_getxattr				191
+#define __NR_lgetxattr				192
+#define __NR_fgetxattr				193
+#define __NR_listxattr				194
+#define __NR_llistxattr				195
+#define __NR_flistxattr				196
+#define __NR_removexattr			197
+#define __NR_lremovexattr			198
+#define __NR_fremovexattr			199
+#define __NR_tkill					200
+#define __NR_time					201
+#define __NR_futex					202
+#define __NR_sched_setaffinity		203
+#define __NR_sched_getaffinity		204
+#define __NR_set_thread_area		205
+#define __NR_io_setup				206
+#define __NR_io_destroy				207
+#define __NR_io_getevents			208
+#define __NR_io_submit				209
+#define __NR_io_cancel				210
+#define __NR_get_thread_area		211
+#define __NR_lookup_dcookie			212
+#define __NR_epoll_create			213
+#define __NR_epoll_ctl_old			214
+#define __NR_epoll_wait_old			215
+#define __NR_remap_file_pages		216
+#define __NR_getdents64				217
+#define __NR_set_tid_address		218
+#define __NR_restart_syscall		219
+#define __NR_semtimedop				220
+#define __NR_fadvise64				221
+#define __NR_timer_create			222
+#define __NR_timer_settime			223
+#define __NR_timer_gettime			224
+#define __NR_timer_getoverrun		225
+#define __NR_timer_delete			226
+#define __NR_clock_settime			227
+#define __NR_clock_gettime			228
+#define __NR_clock_getres			229
+#define __NR_clock_nanosleep		230
+#define __NR_exit_group				231
+#define __NR_epoll_wait				232
+#define __NR_epoll_ctl				233
+#define __NR_tgkill					234
+#define __NR_utimes					235
+#define __NR_vserver				236
+#define __NR_mbind					237
+#define __NR_set_mempolicy			238
+#define __NR_get_mempolicy			239
+#define __NR_mq_open				240
+#define __NR_mq_unlink				241
+#define __NR_mq_timedsend			242
+#define __NR_mq_timedreceive		243
+#define __NR_mq_notify				244
+#define __NR_mq_getsetattr			245
+#define __NR_kexec_load				246
+#define __NR_waitid					247
+#define __NR_add_key				248
+#define __NR_request_key			249
+#define __NR_keyctl					250
+#define __NR_ioprio_set				251
+#define __NR_ioprio_get				252
+#define __NR_inotify_init			253
+#define __NR_inotify_add_watch		254
+#define __NR_inotify_rm_watch		255
+#define __NR_migrate_pages			256
+#define __NR_openat					257
+#define __NR_mkdirat				258
+#define __NR_mknodat				259
+#define __NR_fchownat				260
+#define __NR_futimesat				261
+#define __NR_newfstatat				262
+#define __NR_unlinkat				263
+#define __NR_renameat				264
+#define __NR_linkat					265
+#define __NR_symlinkat				266
+#define __NR_readlinkat				267
+#define __NR_fchmodat				268
+#define __NR_faccessat				269
+#define __NR_pselect6				270
+#define __NR_ppoll					271
+#define __NR_unshare				272
+#define __NR_set_robust_list		273
+#define __NR_get_robust_list		274
+#define __NR_splice					275
+#define __NR_tee					276
+#define __NR_sync_file_range		277
+#define __NR_vmsplice				278
+#define __NR_move_pages				279
+#define __NR_utimensat				280
+#define __NR_epoll_pwait			281
+#define __NR_signalfd				282
+#define __NR_timerfd_create			283
+#define __NR_eventfd				284
+#define __NR_fallocate				285
+#define __NR_timerfd_settime		286
+#define __NR_timerfd_gettime		287
+#define __NR_accept4				288
+#define __NR_signalfd4				289
+#define __NR_eventfd2				290
+#define __NR_epoll_create1			291
+#define __NR_dup3					292
+#define __NR_pipe2					293
+#define __NR_inotify_init1			294
+#define __NR_preadv					295
+#define __NR_pwritev				296
+#define __NR_rt_tgsigqueueinfo		297
+#define __NR_perf_event_open		298
+#define __NR_recvmmsg				299
+#define __NR_fanotify_init			300
+#define __NR_fanotify_mark			301
+#define __NR_prlimit64				302
+#define __NR_name_to_handle_at			303
+#define __NR_open_by_handle_at			304
+#define __NR_clock_adjtime			305
+#define __NR_syncfs				306
+#define __NR_sendmmsg				307
+#define __NR_setns				308
+#define __NR_getcpu				309
+#define __NR_process_vm_readv			310
+#define __NR_process_vm_writev			311
+#define __NR_kcmp				312
+#define __NR_finit_module			313
+#define __NR_sched_setattr			314
+#define __NR_sched_getattr			315
+#define __NR_renameat2				316
+#define __NR_seccomp				317
+#define __NR_getrandom				318
+#define __NR_memfd_create			319
+#define __NR_kexec_file_load			320
+#define __NR_bpf				321
+#define __NR_execveat				322
+#define __NR_userfaultfd			323
+#define __NR_membarrier				324
+#define __NR_mlock2				325
+#define __NR_copy_file_range			326
+#define __NR_preadv2				327
+#define __NR_pwritev2				328
+#define __NR_pkey_mprotect			329
+#define __NR_pkey_alloc				330
+#define __NR_pkey_free				331
+#define __NR_statx				332
+#define __NR_io_pgetevents			333
+#define __NR_rseq				334
+#define __NR_pidfd_send_signal			424
+#define __NR_io_uring_setup			425
+#define __NR_io_uring_enter			426
+#define __NR_io_uring_register			427
+#define __NR_open_tree		428
+#define __NR_move_mount		429
+#define __NR_fsopen		430
+#define __NR_fsconfig		431
+#define __NR_fsmount		432
+#define __NR_fspick		433
+#define __NR_pidfd_open		434
+#define __NR_clone3		435
+
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/user.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/user.h
new file mode 100644
index 0000000000..4073cc06ff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/bits/user.h
@@ -0,0 +1,41 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
+
+typedef struct user_fpregs_struct {
+	uint16_t cwd, swd, ftw, fop;
+	uint64_t rip, rdp;
+	uint32_t mxcsr, mxcr_mask;
+	uint32_t st_space[32], xmm_space[64], padding[24];
+} elf_fpregset_t;
+
+struct user_regs_struct {
+	unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
+	unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
+	unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
+};
+#define ELF_NGREG 27
+typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
+
+struct user {
+	struct user_regs_struct		regs;
+	int				u_fpvalid;
+	struct user_fpregs_struct	i387;
+	unsigned long			u_tsize;
+	unsigned long			u_dsize;
+	unsigned long			u_ssize;
+	unsigned long			start_code;
+	unsigned long			start_stack;
+	long				signal;
+	int				reserved;
+	struct user_regs_struct		*u_ar0;
+	struct user_fpregs_struct	*u_fpstate;
+	unsigned long			magic;
+	char				u_comm[32];
+	unsigned long			u_debugreg[8];
+};
+
+#define PAGE_MASK		(~(PAGESIZE-1))
+#define NBPG			PAGESIZE
+#define UPAGES			1
+#define HOST_TEXT_START_ADDR	(u.start_code)
+#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
diff --git a/src/components/lib/libc/musl-1.1.11/arch/x86_64/crt_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/crt_arch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/x86_64/crt_arch.h
rename to src/components/lib/libc/musl-1.2.0/arch/x86_64/crt_arch.h
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/ksigaction.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/ksigaction.h
new file mode 100644
index 0000000000..c40e356842
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/ksigaction.h
@@ -0,0 +1,11 @@
+#include <features.h>
+
+struct k_sigaction {
+	void (*handler)(int);
+	unsigned long flags;
+	void (*restorer)(void);
+	unsigned mask[2];
+};
+
+hidden void __restore_rt();
+#define __restore __restore_rt
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/kstat.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/kstat.h
new file mode 100644
index 0000000000..5976c04e10
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/kstat.h
@@ -0,0 +1,22 @@
+struct kstat {
+	dev_t st_dev;
+	ino_t st_ino;
+	nlink_t st_nlink;
+
+	mode_t st_mode;
+	uid_t st_uid;
+	gid_t st_gid;
+	unsigned int    __pad0;
+	dev_t st_rdev;
+	off_t st_size;
+	blksize_t st_blksize;
+	blkcnt_t st_blocks;
+
+	long st_atime_sec;
+	long st_atime_nsec;
+	long st_mtime_sec;
+	long st_mtime_nsec;
+	long st_ctime_sec;
+	long st_ctime_nsec;
+	long __unused[3];
+};
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/pthread_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/pthread_arch.h
new file mode 100644
index 0000000000..65e880c62e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/pthread_arch.h
@@ -0,0 +1,10 @@
+static inline struct pthread *__pthread_self()
+{
+	struct pthread *self;
+	__asm__ ("mov %%fs:0,%0" : "=r" (self) );
+	return self;
+}
+
+#define TP_ADJ(p) (p)
+
+#define MC_PC gregs[REG_RIP]
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/reloc.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/reloc.h
new file mode 100644
index 0000000000..fac0c0ae3e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/reloc.h
@@ -0,0 +1,20 @@
+#define LDSO_ARCH "x86_64"
+
+#define REL_SYMBOLIC    R_X86_64_64
+#define REL_OFFSET32    R_X86_64_PC32
+#define REL_GOT         R_X86_64_GLOB_DAT
+#define REL_PLT         R_X86_64_JUMP_SLOT
+#define REL_RELATIVE    R_X86_64_RELATIVE
+#define REL_COPY        R_X86_64_COPY
+#define REL_DTPMOD      R_X86_64_DTPMOD64
+#define REL_DTPOFF      R_X86_64_DTPOFF64
+#define REL_TPOFF       R_X86_64_TPOFF64
+#define REL_TLSDESC     R_X86_64_TLSDESC
+
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mov %1,%%rsp ; jmp *%0" : : "r"(pc), "r"(sp) : "memory" )
+
+#define GETFUNCSYM(fp, sym, got) __asm__ ( \
+	".hidden " #sym "\n" \
+	"	lea " #sym "(%%rip),%0\n" \
+	: "=r"(*fp) : : "memory" )
diff --git a/src/components/lib/libc/musl-1.2.0/arch/x86_64/syscall_arch.h b/src/components/lib/libc/musl-1.2.0/arch/x86_64/syscall_arch.h
new file mode 100644
index 0000000000..55c79dd6fc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/arch/x86_64/syscall_arch.h
@@ -0,0 +1,40 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
+extern __attribute__((regparm(1))) long __cos_syscall(int, long, long, long, long, long, long, long);
+static __inline long __syscall0(long n)
+{
+	return __cos_syscall(n, 0, 0, 0, 0, 0, 0, 0);
+}
+
+static __inline long __syscall1(long n, long a1)
+{
+	return __cos_syscall(n, a1, 0, 0, 0, 0, 0, 0);
+}
+
+static __inline long __syscall2(long n, long a1, long a2)
+{
+	return __cos_syscall(n, a1, a2, 0, 0, 0, 0, 0);
+}
+
+static __inline long __syscall3(long n, long a1, long a2, long a3)
+{
+	return __cos_syscall(n, a1, a2, a3, 0, 0, 0, 0);
+}
+
+static __inline long __syscall4(long n, long a1, long a2, long a3, long a4)
+{
+	return __cos_syscall(n, a1, a2, a3, a4, 0, 0, 0);
+}
+
+static __inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5)
+{
+	return __cos_syscall(n, a1, a2, a3, a4, a5, 0, 0);
+}
+
+static __inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6)
+{
+	return __cos_syscall(n, a1, a2, a3, a4, a5, a6, 0);
+}
+
+
+#define IPC_64 0
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/__xstat.c b/src/components/lib/libc/musl-1.2.0/compat/time32/__xstat.c
new file mode 100644
index 0000000000..acfbd3cc52
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/__xstat.c
@@ -0,0 +1,24 @@
+#include "time32.h"
+#include <sys/stat.h>
+
+struct stat32;
+
+int __fxstat64(int ver, int fd, struct stat32 *buf)
+{
+	return __fstat_time32(fd, buf);
+}
+
+int __fxstatat64(int ver, int fd, const char *path, struct stat32 *buf, int flag)
+{
+	return __fstatat_time32(fd, path, buf, flag);
+}
+
+int __lxstat64(int ver, const char *path, struct stat32 *buf)
+{
+	return __lstat_time32(path, buf);
+}
+
+int __xstat64(int ver, const char *path, struct stat32 *buf)
+{
+	return __stat_time32(path, buf);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/adjtime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/adjtime32.c
new file mode 100644
index 0000000000..b0042c6317
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/adjtime32.c
@@ -0,0 +1,21 @@
+#define _GNU_SOURCE
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+
+int __adjtime32(const struct timeval32 *in32, struct timeval32 *out32)
+{
+	struct timeval out;
+	int r = adjtime((&(struct timeval){
+		.tv_sec = in32->tv_sec,
+		.tv_usec = in32->tv_usec}), &out);
+	if (r) return r;
+	/* We can't range-check the result because success was already
+	 * committed by the above call. */
+	if (out32) {
+		out32->tv_sec = out.tv_sec;
+		out32->tv_usec = out.tv_usec;
+	}
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/adjtimex_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/adjtimex_time32.c
new file mode 100644
index 0000000000..9c6f190abe
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/adjtimex_time32.c
@@ -0,0 +1,10 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/timex.h>
+
+struct timex32;
+
+int __adjtimex_time32(struct timex32 *tx32)
+{
+	return __clock_adjtime32(CLOCK_REALTIME, tx32);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/aio_suspend_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/aio_suspend_time32.c
new file mode 100644
index 0000000000..ed5119bd7d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/aio_suspend_time32.c
@@ -0,0 +1,11 @@
+#include "time32.h"
+#include <time.h>
+#include <aio.h>
+
+int __aio_suspend_time32(const struct aiocb *const cbs[], int cnt, const struct timespec32 *ts32)
+{
+	return aio_suspend(cbs, cnt, ts32 ? (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}) : 0);
+}
+
+weak_alias(aio_suspend, aio_suspend64);
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/clock_adjtime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_adjtime32.c
new file mode 100644
index 0000000000..5a25b8ac02
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_adjtime32.c
@@ -0,0 +1,70 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <string.h>
+#include <stddef.h>
+
+struct timex32 {
+	unsigned modes;
+	long offset, freq, maxerror, esterror;
+	int status;
+	long constant, precision, tolerance;
+	struct timeval32 time;
+	long tick, ppsfreq, jitter;
+	int shift;
+	long stabil, jitcnt, calcnt, errcnt, stbcnt;
+	int tai;
+	int __padding[11];
+};
+
+int __clock_adjtime32(clockid_t clock_id, struct timex32 *tx32)
+{
+	struct timex utx = {
+		.modes = tx32->modes,
+		.offset = tx32->offset,
+		.freq = tx32->freq,
+		.maxerror = tx32->maxerror,
+		.esterror = tx32->esterror,
+		.status = tx32->status,
+		.constant = tx32->constant,
+		.precision = tx32->precision,
+		.tolerance = tx32->tolerance,
+		.time.tv_sec = tx32->time.tv_sec,
+		.time.tv_usec = tx32->time.tv_usec,
+		.tick = tx32->tick,
+		.ppsfreq = tx32->ppsfreq,
+		.jitter = tx32->jitter,
+		.shift = tx32->shift,
+		.stabil = tx32->stabil,
+		.jitcnt = tx32->jitcnt,
+		.calcnt = tx32->calcnt,
+		.errcnt = tx32->errcnt,
+		.stbcnt = tx32->stbcnt,
+		.tai = tx32->tai,
+	};
+	int r = clock_adjtime(clock_id, &utx);
+	if (r<0) return r;
+	tx32->modes = utx.modes;
+	tx32->offset = utx.offset;
+	tx32->freq = utx.freq;
+	tx32->maxerror = utx.maxerror;
+	tx32->esterror = utx.esterror;
+	tx32->status = utx.status;
+	tx32->constant = utx.constant;
+	tx32->precision = utx.precision;
+	tx32->tolerance = utx.tolerance;
+	tx32->time.tv_sec = utx.time.tv_sec;
+	tx32->time.tv_usec = utx.time.tv_usec;
+	tx32->tick = utx.tick;
+	tx32->ppsfreq = utx.ppsfreq;
+	tx32->jitter = utx.jitter;
+	tx32->shift = utx.shift;
+	tx32->stabil = utx.stabil;
+	tx32->jitcnt = utx.jitcnt;
+	tx32->calcnt = utx.calcnt;
+	tx32->errcnt = utx.errcnt;
+	tx32->stbcnt = utx.stbcnt;
+	tx32->tai = utx.tai;
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/clock_getres_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_getres_time32.c
new file mode 100644
index 0000000000..47a24c1350
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_getres_time32.c
@@ -0,0 +1,13 @@
+#include "time32.h"
+#include <time.h>
+
+int __clock_getres_time32(clockid_t clk, struct timespec32 *ts32)
+{
+	struct timespec ts;
+	int r = clock_getres(clk, &ts);
+	if (!r && ts32) {
+		ts32->tv_sec = ts.tv_sec;
+		ts32->tv_nsec = ts.tv_nsec;
+	}
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/clock_gettime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_gettime32.c
new file mode 100644
index 0000000000..0cac7bbdf6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_gettime32.c
@@ -0,0 +1,18 @@
+#include "time32.h"
+#include <time.h>
+#include <errno.h>
+#include <stdint.h>
+
+int __clock_gettime32(clockid_t clk, struct timespec32 *ts32)
+{
+	struct timespec ts;
+	int r = clock_gettime(clk, &ts);
+	if (r) return r;
+	if (ts.tv_sec < INT32_MIN || ts.tv_sec > INT32_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	ts32->tv_sec = ts.tv_sec;
+	ts32->tv_nsec = ts.tv_nsec;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/clock_nanosleep_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_nanosleep_time32.c
new file mode 100644
index 0000000000..91ef067d02
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_nanosleep_time32.c
@@ -0,0 +1,15 @@
+#include "time32.h"
+#include <time.h>
+#include <errno.h>
+
+int __clock_nanosleep_time32(clockid_t clk, int flags, const struct timespec32 *req32, struct timespec32 *rem32)
+{
+	struct timespec rem;
+	int ret = clock_nanosleep(clk, flags, (&(struct timespec){
+		.tv_sec = req32->tv_sec, .tv_nsec = req32->tv_nsec}), &rem);
+	if (ret==EINTR && rem32 && !(flags & TIMER_ABSTIME)) {
+		rem32->tv_sec = rem.tv_sec;
+		rem32->tv_nsec = rem.tv_nsec;
+	}
+	return ret;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/clock_settime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_settime32.c
new file mode 100644
index 0000000000..7ca4f0e9c7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/clock_settime32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+
+int __clock_settime32(clockid_t clk, const struct timespec32 *ts32)
+{
+	return clock_settime(clk, (&(struct timespec){
+		.tv_sec = ts32->tv_sec,
+		.tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/cnd_timedwait_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/cnd_timedwait_time32.c
new file mode 100644
index 0000000000..314251d1c1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/cnd_timedwait_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <threads.h>
+
+int __cnd_timedwait_time32(cnd_t *restrict c, mtx_t *restrict m, const struct timespec32 *restrict ts32)
+{
+	return cnd_timedwait(c, m, ts32 ? (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}) : 0);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/ctime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/ctime32.c
new file mode 100644
index 0000000000..a057274e15
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/ctime32.c
@@ -0,0 +1,7 @@
+#include "time32.h"
+#include <time.h>
+
+char *__ctime32(time32_t *t)
+{
+	return ctime(&(time_t){*t});
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/ctime32_r.c b/src/components/lib/libc/musl-1.2.0/compat/time32/ctime32_r.c
new file mode 100644
index 0000000000..e1ad2e283a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/ctime32_r.c
@@ -0,0 +1,7 @@
+#include "time32.h"
+#include <time.h>
+
+char *__ctime32_r(time32_t *t, char *buf)
+{
+	return ctime_r(&(time_t){*t}, buf);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/difftime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/difftime32.c
new file mode 100644
index 0000000000..5950943a00
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/difftime32.c
@@ -0,0 +1,7 @@
+#include "time32.h"
+#include <time.h>
+
+double __difftime32(time32_t t1, time32_t t2)
+{
+	return difftime(t1, t2);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/fstat_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/fstat_time32.c
new file mode 100644
index 0000000000..3e08439887
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/fstat_time32.c
@@ -0,0 +1,17 @@
+#include "time32.h"
+#include <time.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <stddef.h>
+
+struct stat32;
+
+int __fstat_time32(int fd, struct stat32 *restrict st32)
+{
+	struct stat st;
+	int r = fstat(fd, &st);
+	if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim));
+	return r;
+}
+
+weak_alias(fstat, fstat64);
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/fstatat_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/fstatat_time32.c
new file mode 100644
index 0000000000..85dcb008ed
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/fstatat_time32.c
@@ -0,0 +1,17 @@
+#include "time32.h"
+#include <time.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <stddef.h>
+
+struct stat32;
+
+int __fstatat_time32(int fd, const char *restrict path, struct stat32 *restrict st32, int flag)
+{
+	struct stat st;
+	int r = fstatat(fd, path, &st, flag);
+	if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim));
+	return r;
+}
+
+weak_alias(fstatat, fstatat64);
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/ftime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/ftime32.c
new file mode 100644
index 0000000000..166a6daeb6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/ftime32.c
@@ -0,0 +1,25 @@
+#include "time32.h"
+#include <sys/timeb.h>
+#include <errno.h>
+#include <stdint.h>
+
+struct timeb32 {
+	int32_t time;
+	unsigned short millitm;
+	short timezone, dstflag;
+};
+
+int __ftime32(struct timeb32 *tp)
+{
+	struct timeb tb;
+	if (ftime(&tb) < 0) return -1;
+	if (tb.time < INT32_MIN || tb.time > INT32_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	tp->time = tb.time;
+	tp->millitm = tb.millitm;
+	tp->timezone = tb.timezone;
+	tp->dstflag = tb.dstflag;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/futimens_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/futimens_time32.c
new file mode 100644
index 0000000000..7856f176e6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/futimens_time32.c
@@ -0,0 +1,10 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/stat.h>
+
+int __futimens_time32(int fd, const struct timespec32 *times32)
+{
+	return futimens(fd, !times32 ? 0 : ((struct timespec[2]){
+		{.tv_sec = times32[0].tv_sec,.tv_nsec = times32[0].tv_nsec},
+		{.tv_sec = times32[1].tv_sec,.tv_nsec = times32[1].tv_nsec}}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/futimes_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/futimes_time32.c
new file mode 100644
index 0000000000..f29533f12f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/futimes_time32.c
@@ -0,0 +1,12 @@
+#define _GNU_SOURCE
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+int __futimes_time32(int fd, const struct timeval32 times32[2])
+{
+	return futimes(fd, !times32 ? 0 : ((struct timeval[2]){
+		{.tv_sec = times32[0].tv_sec,.tv_usec = times32[0].tv_usec},
+		{.tv_sec = times32[1].tv_sec,.tv_usec = times32[1].tv_usec}}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/futimesat_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/futimesat_time32.c
new file mode 100644
index 0000000000..5a1295bde9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/futimesat_time32.c
@@ -0,0 +1,12 @@
+#define _GNU_SOURCE
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+int __futimesat_time32(int dirfd, const char *pathname, const struct timeval32 times32[2])
+{
+	return futimesat(dirfd, pathname, !times32 ? 0 : ((struct timeval[2]){
+		{.tv_sec = times32[0].tv_sec,.tv_usec = times32[0].tv_usec},
+		{.tv_sec = times32[1].tv_sec,.tv_usec = times32[1].tv_usec}}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/getitimer_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/getitimer_time32.c
new file mode 100644
index 0000000000..4bac4bf526
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/getitimer_time32.c
@@ -0,0 +1,15 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+
+int __getitimer_time32(int which, struct itimerval32 *old32)
+{
+	struct itimerval old;
+	int r = getitimer(which, &old);
+	if (r) return r;
+	old32->it_interval.tv_sec = old.it_interval.tv_sec;
+	old32->it_interval.tv_usec = old.it_interval.tv_usec;
+	old32->it_value.tv_sec = old.it_value.tv_sec;
+	old32->it_value.tv_usec = old.it_value.tv_usec;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/getrusage_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/getrusage_time32.c
new file mode 100644
index 0000000000..d7487dee6e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/getrusage_time32.c
@@ -0,0 +1,39 @@
+#include "time32.h"
+#include <string.h>
+#include <stddef.h>
+#include <sys/resource.h>
+
+struct compat_rusage {
+	struct timeval32 ru_utime;
+	struct timeval32 ru_stime;
+	long	ru_maxrss;
+	long	ru_ixrss;
+	long	ru_idrss;
+	long	ru_isrss;
+	long	ru_minflt;
+	long	ru_majflt;
+	long	ru_nswap;
+	long	ru_inblock;
+	long	ru_oublock;
+	long	ru_msgsnd;
+	long	ru_msgrcv;
+	long	ru_nsignals;
+	long	ru_nvcsw;
+	long	ru_nivcsw;
+};
+
+int __getrusage_time32(int who, struct compat_rusage *usage)
+{
+	struct rusage ru;
+	int r = getrusage(who, &ru);
+	if (!r) {
+		usage->ru_utime.tv_sec = ru.ru_utime.tv_sec;
+		usage->ru_utime.tv_usec = ru.ru_utime.tv_usec;
+		usage->ru_stime.tv_sec = ru.ru_stime.tv_sec;
+		usage->ru_stime.tv_usec = ru.ru_stime.tv_usec;
+		memcpy(&usage->ru_maxrss, &ru.ru_maxrss,
+			sizeof(struct compat_rusage) -
+			offsetof(struct compat_rusage, ru_maxrss));
+	}
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/gettimeofday_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/gettimeofday_time32.c
new file mode 100644
index 0000000000..1f3ce68e3e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/gettimeofday_time32.c
@@ -0,0 +1,19 @@
+#include "time32.h"
+#include <sys/time.h>
+#include <errno.h>
+#include <stdint.h>
+
+int __gettimeofday_time32(struct timeval32 *tv32, void *tz)
+{
+	struct timeval tv;
+	if (!tv32) return 0;
+	int r = gettimeofday(&tv, 0);
+	if (r) return r;
+	if (tv.tv_sec < INT32_MIN || tv.tv_sec > INT32_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	tv32->tv_sec = tv.tv_sec;
+	tv32->tv_usec = tv.tv_usec;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/gmtime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/gmtime32.c
new file mode 100644
index 0000000000..963f0e0525
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/gmtime32.c
@@ -0,0 +1,7 @@
+#include "time32.h"
+#include <time.h>
+
+struct tm *__gmtime32(time32_t *t)
+{
+	return gmtime(&(time_t){*t});
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/gmtime32_r.c b/src/components/lib/libc/musl-1.2.0/compat/time32/gmtime32_r.c
new file mode 100644
index 0000000000..7d72bfb320
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/gmtime32_r.c
@@ -0,0 +1,7 @@
+#include "time32.h"
+#include <time.h>
+
+struct tm *__gmtime32_r(time32_t *t, struct tm *tm)
+{
+	return gmtime_r(&(time_t){*t}, tm);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/localtime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/localtime32.c
new file mode 100644
index 0000000000..96bc303490
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/localtime32.c
@@ -0,0 +1,7 @@
+#include "time32.h"
+#include <time.h>
+
+struct tm *__localtime32(time32_t *t)
+{
+	return localtime(&(time_t){*t});
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/localtime32_r.c b/src/components/lib/libc/musl-1.2.0/compat/time32/localtime32_r.c
new file mode 100644
index 0000000000..633ec8293f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/localtime32_r.c
@@ -0,0 +1,7 @@
+#include "time32.h"
+#include <time.h>
+
+struct tm *__localtime32_r(time32_t *t, struct tm *tm)
+{
+	return localtime_r(&(time_t){*t}, tm);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/lstat_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/lstat_time32.c
new file mode 100644
index 0000000000..c1257a1449
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/lstat_time32.c
@@ -0,0 +1,17 @@
+#include "time32.h"
+#include <time.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <stddef.h>
+
+struct stat32;
+
+int __lstat_time32(const char *restrict path, struct stat32 *restrict st32)
+{
+	struct stat st;
+	int r = lstat(path, &st);
+	if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim));
+	return r;
+}
+
+weak_alias(lstat, lstat64);
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/lutimes_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/lutimes_time32.c
new file mode 100644
index 0000000000..7f75cd4a18
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/lutimes_time32.c
@@ -0,0 +1,12 @@
+#define _GNU_SOURCE
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+int __lutimes_time32(const char *path, const struct timeval32 times32[2])
+{
+	return lutimes(path, !times32 ? 0 : ((struct timeval[2]){
+		{.tv_sec = times32[0].tv_sec,.tv_usec = times32[0].tv_usec},
+		{.tv_sec = times32[1].tv_sec,.tv_usec = times32[1].tv_usec}}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/mktime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/mktime32.c
new file mode 100644
index 0000000000..e6f15d513a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/mktime32.c
@@ -0,0 +1,16 @@
+#include "time32.h"
+#include <time.h>
+#include <errno.h>
+#include <stdint.h>
+
+time32_t __mktime32(struct tm *tm)
+{
+	struct tm tmp = *tm;
+	time_t t = mktime(&tmp);
+	if (t < INT32_MIN || t > INT32_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	*tm = tmp;
+	return t;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/mq_timedreceive_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/mq_timedreceive_time32.c
new file mode 100644
index 0000000000..211cea4ba4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/mq_timedreceive_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <mqueue.h>
+#include <time.h>
+
+ssize_t __mq_timedreceive_time32(mqd_t mqd, char *restrict msg, size_t len, unsigned *restrict prio, const struct timespec32 *restrict ts32)
+{
+	return mq_timedreceive(mqd, msg, len, prio, ts32 ? (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}) : 0);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/mq_timedsend_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/mq_timedsend_time32.c
new file mode 100644
index 0000000000..93b697a7e1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/mq_timedsend_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <mqueue.h>
+#include <time.h>
+
+int __mq_timedsend_time32(mqd_t mqd, const char *msg, size_t len, unsigned prio, const struct timespec32 *ts32)
+{
+	return mq_timedsend(mqd, msg, len, prio, ts32 ? (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}) : 0);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/mtx_timedlock_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/mtx_timedlock_time32.c
new file mode 100644
index 0000000000..a01f09b89d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/mtx_timedlock_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <threads.h>
+
+int __mtx_timedlock_time32(mtx_t *restrict m, const struct timespec32 *restrict ts32)
+{
+	return mtx_timedlock(m, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/nanosleep_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/nanosleep_time32.c
new file mode 100644
index 0000000000..ea6bdd81b1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/nanosleep_time32.c
@@ -0,0 +1,15 @@
+#include "time32.h"
+#include <time.h>
+#include <errno.h>
+
+int __nanosleep_time32(const struct timespec32 *req32, struct timespec32 *rem32)
+{
+	struct timespec rem;
+	int ret = nanosleep((&(struct timespec){
+		.tv_sec = req32->tv_sec, .tv_nsec = req32->tv_nsec}), &rem);
+	if (ret<0 && errno==EINTR && rem32) {
+		rem32->tv_sec = rem.tv_sec;
+		rem32->tv_nsec = rem.tv_nsec;
+	}
+	return ret;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/ppoll_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/ppoll_time32.c
new file mode 100644
index 0000000000..43b4b0df6f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/ppoll_time32.c
@@ -0,0 +1,10 @@
+#include "time32.h"
+#define _GNU_SOURCE
+#include <time.h>
+#include <poll.h>
+
+int __ppoll_time32(struct pollfd *fds, nfds_t n, const struct timespec32 *ts32, const sigset_t *mask)
+{
+	return ppoll(fds, n, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}), mask);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/pselect_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/pselect_time32.c
new file mode 100644
index 0000000000..ecaa8f868d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/pselect_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/select.h>
+
+int __pselect_time32(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec32 *restrict ts32, const sigset_t *restrict mask)
+{
+	return pselect(n, rfds, wfds, efds, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}), mask);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_cond_timedwait_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_cond_timedwait_time32.c
new file mode 100644
index 0000000000..fba1f2a914
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_cond_timedwait_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <pthread.h>
+
+int __pthread_cond_timedwait_time32(pthread_cond_t *restrict c, pthread_mutex_t *restrict m, const struct timespec32 *restrict ts32)
+{
+	return pthread_cond_timedwait(c, m, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_mutex_timedlock_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_mutex_timedlock_time32.c
new file mode 100644
index 0000000000..2d29602cb7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_mutex_timedlock_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <pthread.h>
+
+int __pthread_mutex_timedlock_time32(pthread_mutex_t *restrict m, const struct timespec32 *restrict ts32)
+{
+	return pthread_mutex_timedlock(m, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_rwlock_timedrdlock_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_rwlock_timedrdlock_time32.c
new file mode 100644
index 0000000000..33df27a4ad
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_rwlock_timedrdlock_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <pthread.h>
+
+int __pthread_rwlock_timedrdlock_time32(pthread_rwlock_t *restrict rw, const struct timespec32 *restrict ts32)
+{
+	return pthread_rwlock_timedrdlock(rw, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_rwlock_timedwrlock_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_rwlock_timedwrlock_time32.c
new file mode 100644
index 0000000000..99f24f734d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_rwlock_timedwrlock_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <pthread.h>
+
+int __pthread_rwlock_timedwrlock_time32(pthread_rwlock_t *restrict rw, const struct timespec32 *restrict ts32)
+{
+	return pthread_rwlock_timedwrlock(rw, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_timedjoin_np_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_timedjoin_np_time32.c
new file mode 100644
index 0000000000..3ec2995115
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/pthread_timedjoin_np_time32.c
@@ -0,0 +1,10 @@
+#define _GNU_SOURCE
+#include "time32.h"
+#include <time.h>
+#include <pthread.h>
+
+int __pthread_timedjoin_np_time32(pthread_t t, void **res, const struct timespec32 *at32)
+{
+	return pthread_timedjoin_np(t, res, !at32 ? 0 : (&(struct timespec){
+		.tv_sec = at32->tv_sec, .tv_nsec = at32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/recvmmsg_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/recvmmsg_time32.c
new file mode 100644
index 0000000000..acf1cfb8c0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/recvmmsg_time32.c
@@ -0,0 +1,10 @@
+#include "time32.h"
+#define _GNU_SOURCE
+#include <time.h>
+#include <sys/socket.h>
+
+int __recvmmsg_time32(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags, struct timespec32 *ts32)
+{
+	return recvmmsg(fd, msgvec, vlen, flags, ts32 ? (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}) : 0);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/sched_rr_get_interval_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/sched_rr_get_interval_time32.c
new file mode 100644
index 0000000000..36cbbaca02
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/sched_rr_get_interval_time32.c
@@ -0,0 +1,13 @@
+#include "time32.h"
+#include <time.h>
+#include <sched.h>
+
+int __sched_rr_get_interval_time32(pid_t pid, struct timespec32 *ts32)
+{
+	struct timespec ts;
+	int r = sched_rr_get_interval(pid, &ts);
+	if (r) return r;
+	ts32->tv_sec = ts.tv_sec;
+	ts32->tv_nsec = ts.tv_nsec;
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/select_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/select_time32.c
new file mode 100644
index 0000000000..2d8df9acaf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/select_time32.c
@@ -0,0 +1,10 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+#include <sys/select.h>
+
+int __select_time32(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, struct timeval32 *restrict tv32)
+{
+	return select(n, rfds, wfds, efds, !tv32 ? 0 : (&(struct timeval){
+		.tv_sec = tv32->tv_sec, .tv_usec = tv32->tv_usec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/sem_timedwait_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/sem_timedwait_time32.c
new file mode 100644
index 0000000000..c3469f9bc3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/sem_timedwait_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <semaphore.h>
+
+int __sem_timedwait_time32(sem_t *sem, const struct timespec32 *restrict ts32)
+{
+	return sem_timedwait(sem, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/semtimedop_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/semtimedop_time32.c
new file mode 100644
index 0000000000..34ec528199
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/semtimedop_time32.c
@@ -0,0 +1,10 @@
+#include "time32.h"
+#define _GNU_SOURCE
+#include <sys/sem.h>
+#include <time.h>
+
+int __semtimedop_time32(int id, struct sembuf *buf, size_t n, const struct timespec32 *ts32)
+{
+	return semtimedop(id, buf, n, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/setitimer_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/setitimer_time32.c
new file mode 100644
index 0000000000..2475fd8c11
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/setitimer_time32.c
@@ -0,0 +1,25 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+
+int __setitimer_time32(int which, const struct itimerval32 *restrict new32, struct itimerval32 *restrict old32)
+{
+	struct itimerval old;
+	int r = setitimer(which, (&(struct itimerval){
+		.it_interval.tv_sec = new32->it_interval.tv_sec,
+		.it_interval.tv_usec = new32->it_interval.tv_usec,
+		.it_value.tv_sec = new32->it_value.tv_sec,
+		.it_value.tv_usec = new32->it_value.tv_usec}), &old);
+	if (r) return r;
+	/* The above call has already committed to success by changing the
+	 * timer setting, so we can't fail on out-of-range old value.
+	 * Since these are relative times, values large enough to overflow
+	 * don't make sense anyway. */
+	if (old32) {
+		old32->it_interval.tv_sec = old.it_interval.tv_sec;
+		old32->it_interval.tv_usec = old.it_interval.tv_usec;
+		old32->it_value.tv_sec = old.it_value.tv_sec;
+		old32->it_value.tv_usec = old.it_value.tv_usec;
+	}
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/settimeofday_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/settimeofday_time32.c
new file mode 100644
index 0000000000..09e625cba3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/settimeofday_time32.c
@@ -0,0 +1,10 @@
+#define _BSD_SOURCE
+#include "time32.h"
+#include <sys/time.h>
+
+int __settimeofday_time32(const struct timeval32 *tv32, const void *tz)
+{
+	return settimeofday(!tv32 ? 0 : (&(struct timeval){
+		.tv_sec = tv32->tv_sec,
+		.tv_usec = tv32->tv_usec}), 0);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/sigtimedwait_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/sigtimedwait_time32.c
new file mode 100644
index 0000000000..6b3aa39c72
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/sigtimedwait_time32.c
@@ -0,0 +1,9 @@
+#include "time32.h"
+#include <time.h>
+#include <signal.h>
+
+int __sigtimedwait_time32(const sigset_t *restrict set, siginfo_t *restrict si, const struct timespec32 *restrict ts32)
+{
+	return sigtimedwait(set, si, !ts32 ? 0 : (&(struct timespec){
+		.tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/stat_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/stat_time32.c
new file mode 100644
index 0000000000..8c6121dadd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/stat_time32.c
@@ -0,0 +1,17 @@
+#include "time32.h"
+#include <time.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <stddef.h>
+
+struct stat32;
+
+int __stat_time32(const char *restrict path, struct stat32 *restrict st32)
+{
+	struct stat st;
+	int r = stat(path, &st);
+	if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim));
+	return r;
+}
+
+weak_alias(stat, stat64);
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/stime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/stime32.c
new file mode 100644
index 0000000000..cc76364d3b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/stime32.c
@@ -0,0 +1,8 @@
+#define _GNU_SOURCE
+#include "time32.h"
+#include <time.h>
+
+int __stime32(const time32_t *t)
+{
+	return stime(&(time_t){*t});
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/thrd_sleep_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/thrd_sleep_time32.c
new file mode 100644
index 0000000000..59088001b2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/thrd_sleep_time32.c
@@ -0,0 +1,16 @@
+#include "time32.h"
+#include <time.h>
+#include <threads.h>
+#include <errno.h>
+
+int __thrd_sleep_time32(const struct timespec32 *req32, struct timespec32 *rem32)
+{
+	struct timespec rem;
+	int ret = thrd_sleep((&(struct timespec){
+		.tv_sec = req32->tv_sec, .tv_nsec = req32->tv_nsec}), &rem);
+	if (ret<0 && errno==EINTR && rem32) {
+		rem32->tv_sec = rem.tv_sec;
+		rem32->tv_nsec = rem.tv_nsec;
+	}
+	return ret;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/time32.c
new file mode 100644
index 0000000000..4b8fac1c29
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/time32.c
@@ -0,0 +1,15 @@
+#include "time32.h"
+#include <time.h>
+#include <errno.h>
+#include <stdint.h>
+
+time32_t __time32(time32_t *p)
+{
+	time_t t = time(0);
+	if (t < INT32_MIN || t > INT32_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	if (p) *p = t;
+	return t;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/time32.h b/src/components/lib/libc/musl-1.2.0/compat/time32/time32.h
new file mode 100644
index 0000000000..fdec17c345
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/time32.h
@@ -0,0 +1,91 @@
+#ifndef TIME32_H
+#define TIME32_H
+
+#include <sys/types.h>
+
+typedef long time32_t;
+
+struct timeval32 {
+	long tv_sec;
+	long tv_usec;
+};
+
+struct itimerval32 {
+	struct timeval32 it_interval;
+	struct timeval32 it_value;
+};
+
+struct timespec32 {
+	long tv_sec;
+	long tv_nsec;
+};
+
+struct itimerspec32 {
+	struct timespec32 it_interval;
+	struct timespec32 it_value;
+};
+
+int __adjtime32() __asm__("adjtime");
+int __adjtimex_time32() __asm__("adjtimex");
+int __aio_suspend_time32() __asm__("aio_suspend");
+int __clock_adjtime32() __asm__("clock_adjtime");
+int __clock_getres_time32() __asm__("clock_getres");
+int __clock_gettime32() __asm__("clock_gettime");
+int __clock_nanosleep_time32() __asm__("clock_nanosleep");
+int __clock_settime32() __asm__("clock_settime");
+int __cnd_timedwait_time32() __asm__("cnd_timedwait");
+char *__ctime32() __asm__("ctime");
+char *__ctime32_r() __asm__("ctime_r");
+double __difftime32() __asm__("difftime");
+int __fstat_time32() __asm__("fstat");
+int __fstatat_time32() __asm__("fstatat");
+int __ftime32() __asm__("ftime");
+int __futimens_time32() __asm__("futimens");
+int __futimes_time32() __asm__("futimes");
+int __futimesat_time32() __asm__("futimesat");
+int __getitimer_time32() __asm__("getitimer");
+int __getrusage_time32() __asm__("getrusage");
+int __gettimeofday_time32() __asm__("gettimeofday");
+struct tm *__gmtime32() __asm__("gmtime");
+struct tm *__gmtime32_r() __asm__("gmtime_r");
+struct tm *__localtime32() __asm__("localtime");
+struct tm *__localtime32_r() __asm__("localtime_r");
+int __lstat_time32() __asm__("lstat");
+int __lutimes_time32() __asm__("lutimes");
+time32_t __mktime32() __asm__("mktime");
+ssize_t __mq_timedreceive_time32() __asm__("mq_timedreceive");
+int __mq_timedsend_time32() __asm__("mq_timedsend");
+int __mtx_timedlock_time32() __asm__("mtx_timedlock");
+int __nanosleep_time32() __asm__("nanosleep");
+int __ppoll_time32() __asm__("ppoll");
+int __pselect_time32() __asm__("pselect");
+int __pthread_cond_timedwait_time32() __asm__("pthread_cond_timedwait");
+int __pthread_mutex_timedlock_time32() __asm__("pthread_mutex_timedlock");
+int __pthread_rwlock_timedrdlock_time32() __asm__("pthread_rwlock_timedrdlock");
+int __pthread_rwlock_timedwrlock_time32() __asm__("pthread_rwlock_timedwrlock");
+int __pthread_timedjoin_np_time32() __asm__("pthread_timedjoin_np");
+int __recvmmsg_time32() __asm__("recvmmsg");
+int __sched_rr_get_interval_time32() __asm__("sched_rr_get_interval");
+int __select_time32() __asm__("select");
+int __sem_timedwait_time32() __asm__("sem_timedwait");
+int __semtimedop_time32() __asm__("semtimedop");
+int __setitimer_time32() __asm__("setitimer");
+int __settimeofday_time32() __asm__("settimeofday");
+int __sigtimedwait_time32() __asm__("sigtimedwait");
+int __stat_time32() __asm__("stat");
+int __stime32() __asm__("stime");
+int __thrd_sleep_time32() __asm__("thrd_sleep");
+time32_t __time32() __asm__("time");
+time32_t __time32gm() __asm__("timegm");
+int __timer_gettime32() __asm__("timer_gettime");
+int __timer_settime32() __asm__("timer_settime");
+int __timerfd_gettime32() __asm__("timerfd_gettime");
+int __timerfd_settime32() __asm__("timerfd_settime");
+int __timespec_get_time32() __asm__("timespec_get");
+int __utime_time32() __asm__("utime");
+int __utimensat_time32() __asm__("utimensat");
+int __utimes_time32() __asm__("utimes");
+pid_t __wait3_time32() __asm__("wait3");
+pid_t __wait4_time32() __asm__("wait4");
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/time32gm.c b/src/components/lib/libc/musl-1.2.0/compat/time32/time32gm.c
new file mode 100644
index 0000000000..60d68fbf84
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/time32gm.c
@@ -0,0 +1,15 @@
+#define _GNU_SOURCE
+#include "time32.h"
+#include <time.h>
+#include <errno.h>
+#include <stdint.h>
+
+time32_t __time32gm(struct tm *tm)
+{
+	time_t t = timegm(tm);
+	if (t < INT32_MIN || t > INT32_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	return t;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/timer_gettime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/timer_gettime32.c
new file mode 100644
index 0000000000..b4184cc283
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/timer_gettime32.c
@@ -0,0 +1,15 @@
+#include "time32.h"
+#include <time.h>
+
+int __timer_gettime32(timer_t t, struct itimerspec32 *val32)
+{
+	struct itimerspec old;
+	int r = timer_gettime(t, &old);
+	if (r) return r;
+	/* No range checking for consistency with settime */
+	val32->it_interval.tv_sec = old.it_interval.tv_sec;
+	val32->it_interval.tv_nsec = old.it_interval.tv_nsec;
+	val32->it_value.tv_sec = old.it_value.tv_sec;
+	val32->it_value.tv_nsec = old.it_value.tv_nsec;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/timer_settime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/timer_settime32.c
new file mode 100644
index 0000000000..a447e7d41a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/timer_settime32.c
@@ -0,0 +1,25 @@
+#include "time32.h"
+#include <time.h>
+
+int __timer_settime32(timer_t t, int flags, const struct itimerspec32 *restrict val32, struct itimerspec32 *restrict old32)
+{
+	struct itimerspec old;
+	int r = timer_settime(t, flags, (&(struct itimerspec){
+		.it_interval.tv_sec = val32->it_interval.tv_sec,
+		.it_interval.tv_nsec = val32->it_interval.tv_nsec,
+		.it_value.tv_sec = val32->it_value.tv_sec,
+		.it_value.tv_nsec = val32->it_value.tv_nsec}),
+		old32 ? &old : 0);
+	if (r) return r;
+	/* The above call has already committed to success by changing the
+	 * timer setting, so we can't fail on out-of-range old value.
+	 * Since these are relative times, values large enough to overflow
+	 * don't make sense anyway. */
+	if (old32) {
+		old32->it_interval.tv_sec = old.it_interval.tv_sec;
+		old32->it_interval.tv_nsec = old.it_interval.tv_nsec;
+		old32->it_value.tv_sec = old.it_value.tv_sec;
+		old32->it_value.tv_nsec = old.it_value.tv_nsec;
+	}
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/timerfd_gettime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/timerfd_gettime32.c
new file mode 100644
index 0000000000..75e5435f18
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/timerfd_gettime32.c
@@ -0,0 +1,16 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/timerfd.h>
+
+int __timerfd_gettime32(int t, struct itimerspec32 *val32)
+{
+	struct itimerspec old;
+	int r = timerfd_gettime(t, &old);
+	if (r) return r;
+	/* No range checking for consistency with settime */
+	val32->it_interval.tv_sec = old.it_interval.tv_sec;
+	val32->it_interval.tv_nsec = old.it_interval.tv_nsec;
+	val32->it_value.tv_sec = old.it_value.tv_sec;
+	val32->it_value.tv_nsec = old.it_value.tv_nsec;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/timerfd_settime32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/timerfd_settime32.c
new file mode 100644
index 0000000000..67830d3418
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/timerfd_settime32.c
@@ -0,0 +1,26 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/timerfd.h>
+
+int __timerfd_settime32(int t, int flags, const struct itimerspec32 *restrict val32, struct itimerspec32 *restrict old32)
+{
+	struct itimerspec old;
+	int r = timerfd_settime(t, flags, (&(struct itimerspec){
+		.it_interval.tv_sec = val32->it_interval.tv_sec,
+		.it_interval.tv_nsec = val32->it_interval.tv_nsec,
+		.it_value.tv_sec = val32->it_value.tv_sec,
+		.it_value.tv_nsec = val32->it_value.tv_nsec}),
+		old32 ? &old : 0);
+	if (r) return r;
+	/* The above call has already committed to success by changing the
+	 * timer setting, so we can't fail on out-of-range old value.
+	 * Since these are relative times, values large enough to overflow
+	 * don't make sense anyway. */
+	if (old32) {
+		old32->it_interval.tv_sec = old.it_interval.tv_sec;
+		old32->it_interval.tv_nsec = old.it_interval.tv_nsec;
+		old32->it_value.tv_sec = old.it_value.tv_sec;
+		old32->it_value.tv_nsec = old.it_value.tv_nsec;
+	}
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/timespec_get_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/timespec_get_time32.c
new file mode 100644
index 0000000000..e9ca94cb42
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/timespec_get_time32.c
@@ -0,0 +1,18 @@
+#include "time32.h"
+#include <time.h>
+#include <errno.h>
+#include <stdint.h>
+
+int __timespec_get_time32(struct timespec32 *ts32, int base)
+{
+	struct timespec ts;
+	int r = timespec_get(&ts, base);
+	if (!r) return r;
+	if (ts.tv_sec < INT32_MIN || ts.tv_sec > INT32_MAX) {
+		errno = EOVERFLOW;
+		return 0;
+	}
+	ts32->tv_sec = ts.tv_sec;
+	ts32->tv_nsec = ts.tv_nsec;
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/utime_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/utime_time32.c
new file mode 100644
index 0000000000..65f11d4634
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/utime_time32.c
@@ -0,0 +1,14 @@
+#include "time32.h"
+#include <time.h>
+#include <utime.h>
+
+struct utimbuf32 {
+	time32_t actime;
+	time32_t modtime;
+};
+
+int __utime_time32(const char *path, const struct utimbuf32 *times32)
+{
+	return utime(path, !times32 ? 0 : (&(struct utimbuf){
+		.actime = times32->actime, .modtime = times32->modtime}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/utimensat_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/utimensat_time32.c
new file mode 100644
index 0000000000..c687b8d1b4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/utimensat_time32.c
@@ -0,0 +1,11 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/stat.h>
+
+int __utimensat_time32(int fd, const char *path, const struct timespec32 times32[2], int flags)
+{
+	return utimensat(fd, path, !times32 ? 0 : ((struct timespec[2]){
+		{.tv_sec = times32[0].tv_sec,.tv_nsec = times32[0].tv_nsec},
+		{.tv_sec = times32[1].tv_sec,.tv_nsec = times32[1].tv_nsec}}),
+		flags);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/utimes_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/utimes_time32.c
new file mode 100644
index 0000000000..59248f623b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/utimes_time32.c
@@ -0,0 +1,11 @@
+#include "time32.h"
+#include <time.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+int __utimes_time32(const char *path, const struct timeval32 times32[2])
+{
+	return utimes(path, !times32 ? 0 : ((struct timeval[2]){
+		{.tv_sec = times32[0].tv_sec,.tv_usec = times32[0].tv_usec},
+		{.tv_sec = times32[1].tv_sec,.tv_usec = times32[1].tv_usec}}));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/wait3_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/wait3_time32.c
new file mode 100644
index 0000000000..8fe128edbf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/wait3_time32.c
@@ -0,0 +1,40 @@
+#define _BSD_SOURCE
+#include "time32.h"
+#include <string.h>
+#include <stddef.h>
+#include <sys/wait.h>
+
+struct compat_rusage {
+	struct timeval32 ru_utime;
+	struct timeval32 ru_stime;
+	long	ru_maxrss;
+	long	ru_ixrss;
+	long	ru_idrss;
+	long	ru_isrss;
+	long	ru_minflt;
+	long	ru_majflt;
+	long	ru_nswap;
+	long	ru_inblock;
+	long	ru_oublock;
+	long	ru_msgsnd;
+	long	ru_msgrcv;
+	long	ru_nsignals;
+	long	ru_nvcsw;
+	long	ru_nivcsw;
+};
+
+pid_t __wait3_time32(int *status, int options, struct compat_rusage *usage)
+{
+	struct rusage ru;
+	int r = wait3(status, options, usage ? &ru : 0);
+	if (!r && usage) {
+		usage->ru_utime.tv_sec = ru.ru_utime.tv_sec;
+		usage->ru_utime.tv_usec = ru.ru_utime.tv_usec;
+		usage->ru_stime.tv_sec = ru.ru_stime.tv_sec;
+		usage->ru_stime.tv_usec = ru.ru_stime.tv_usec;
+		memcpy(&usage->ru_maxrss, &ru.ru_maxrss,
+			sizeof(struct compat_rusage) -
+			offsetof(struct compat_rusage, ru_maxrss));
+	}
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/compat/time32/wait4_time32.c b/src/components/lib/libc/musl-1.2.0/compat/time32/wait4_time32.c
new file mode 100644
index 0000000000..918548e74f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/compat/time32/wait4_time32.c
@@ -0,0 +1,40 @@
+#define _BSD_SOURCE
+#include "time32.h"
+#include <string.h>
+#include <stddef.h>
+#include <sys/wait.h>
+
+struct compat_rusage {
+	struct timeval32 ru_utime;
+	struct timeval32 ru_stime;
+	long	ru_maxrss;
+	long	ru_ixrss;
+	long	ru_idrss;
+	long	ru_isrss;
+	long	ru_minflt;
+	long	ru_majflt;
+	long	ru_nswap;
+	long	ru_inblock;
+	long	ru_oublock;
+	long	ru_msgsnd;
+	long	ru_msgrcv;
+	long	ru_nsignals;
+	long	ru_nvcsw;
+	long	ru_nivcsw;
+};
+
+pid_t __wait4_time32(pid_t pid, int *status, int options, struct compat_rusage *usage)
+{
+	struct rusage ru;
+	int r = wait4(pid, status, options, usage ? &ru : 0);
+	if (!r && usage) {
+		usage->ru_utime.tv_sec = ru.ru_utime.tv_sec;
+		usage->ru_utime.tv_usec = ru.ru_utime.tv_usec;
+		usage->ru_stime.tv_sec = ru.ru_stime.tv_sec;
+		usage->ru_stime.tv_usec = ru.ru_stime.tv_usec;
+		memcpy(&usage->ru_maxrss, &ru.ru_maxrss,
+			sizeof(struct compat_rusage) -
+			offsetof(struct compat_rusage, ru_maxrss));
+	}
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/configure b/src/components/lib/libc/musl-1.2.0/configure
new file mode 100755
index 0000000000..1ed1b87d9d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/configure
@@ -0,0 +1,789 @@
+#!/bin/sh
+
+usage () {
+cat <<EOF
+Usage: $0 [OPTION]... [VAR=VALUE]... [TARGET]
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  --srcdir=DIR            source directory [detected]
+
+Installation directories:
+  --prefix=PREFIX         main installation prefix [/usr/local/musl]
+  --exec-prefix=EPREFIX   installation prefix for executable files [PREFIX]
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --libdir=DIR            library files for the linker [PREFIX/lib]
+  --includedir=DIR        include files for the C compiler [PREFIX/include]
+  --syslibdir=DIR         location for the dynamic linker [/lib]
+
+System types:
+  --target=TARGET         configure to run on target TARGET [detected]
+  --host=HOST             same as --target
+  --build=BUILD           build system type; used only to infer cross-compiling
+
+Optional features:
+  --enable-optimize=...   optimize listed components for speed over size [auto]
+  --enable-debug          build with debugging information [disabled]
+  --enable-warnings       build with recommended warnings flags [disabled]
+  --enable-wrapper=...    build given musl toolchain wrapper [auto]
+  --disable-shared        inhibit building shared library [enabled]
+  --disable-static        inhibit building static library [enabled]
+
+Some influential environment variables:
+  CC                      C compiler command [detected]
+  CFLAGS                  C compiler flags [-Os -pipe ...]
+  CROSS_COMPILE           prefix for cross compiler and tools [none]
+  LIBCC                   compiler runtime library [detected]
+
+Use these variables to override the choices made by configure.
+
+EOF
+exit 0
+}
+
+# Helper functions
+
+quote () {
+tr '\n' ' ' <<EOF | grep '^[-[:alnum:]_=,./:]* $' >/dev/null 2>&1 && { echo "$1" ; return 0 ; }
+$1
+EOF
+printf %s\\n "$1" | sed -e "s/'/'\\\\''/g" -e "1s/^/'/" -e "\$s/\$/'/" -e "s#^'\([-[:alnum:]_,./:]*\)=\(.*\)\$#\1='\2#"
+}
+echo () { printf "%s\n" "$*" ; }
+fail () { echo "$*" ; exit 1 ; }
+fnmatch () { eval "case \"\$2\" in $1) return 0 ;; *) return 1 ;; esac" ; }
+cmdexists () { type "$1" >/dev/null 2>&1 ; }
+trycc () { test -z "$CC" && cmdexists "$1" && CC=$1 ; }
+
+stripdir () {
+while eval "fnmatch '*/' \"\${$1}\"" ; do eval "$1=\${$1%/}" ; done
+}
+
+trycppif () {
+printf "checking preprocessor condition %s... " "$1"
+echo "typedef int x;" > "$tmpc"
+echo "#if $1" >> "$tmpc"
+echo "#error yes" >> "$tmpc"
+echo "#endif" >> "$tmpc"
+if $CC $2 -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "false\n"
+return 1
+else
+printf "true\n"
+return 0
+fi
+}
+
+tryflag () {
+printf "checking whether compiler accepts %s... " "$2"
+echo "typedef int x;" > "$tmpc"
+if $CC $CFLAGS_TRY $2 -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+eval "$1=\"\${$1} \$2\""
+eval "$1=\${$1# }"
+return 0
+else
+printf "no\n"
+return 1
+fi
+}
+
+tryldflag () {
+printf "checking whether linker accepts %s... " "$2"
+echo "typedef int x;" > "$tmpc"
+if $CC $LDFLAGS_TRY -nostdlib -shared "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+eval "$1=\"\${$1} \$2\""
+eval "$1=\${$1# }"
+return 0
+else
+printf "no\n"
+return 1
+fi
+}
+
+
+
+# Beginning of actual script
+
+CFLAGS_C99FSE=
+CFLAGS_AUTO=
+CFLAGS_MEMOPS=
+CFLAGS_NOSSP=
+CFLAGS_TRY=
+LDFLAGS_AUTO=
+LDFLAGS_TRY=
+OPTIMIZE_GLOBS=
+srcdir=
+prefix=$(pwd)
+exec_prefix='$(prefix)'
+bindir='$(exec_prefix)/bin'
+libdir='$(prefix)/lib'
+includedir='$(prefix)/include'
+syslibdir='/lib'
+tools=
+tool_libs=
+build=
+target=
+optimize=auto
+debug=no
+warnings=no
+shared=auto
+static=yes
+wrapper=auto
+gcc_wrapper=no
+clang_wrapper=no
+
+for arg ; do
+case "$arg" in
+--help|-h) usage ;;
+--srcdir=*) srcdir=${arg#*=} ;;
+--prefix=*) prefix=${arg#*=} ;;
+--exec-prefix=*) exec_prefix=${arg#*=} ;;
+--bindir=*) bindir=${arg#*=} ;;
+--libdir=*) libdir=${arg#*=} ;;
+--includedir=*) includedir=${arg#*=} ;;
+--syslibdir=*) syslibdir=${arg#*=} ;;
+--enable-shared|--enable-shared=yes) shared=yes ;;
+--disable-shared|--enable-shared=no) shared=no ;;
+--enable-static|--enable-static=yes) static=yes ;;
+--disable-static|--enable-static=no) static=no ;;
+--enable-optimize) optimize=yes ;;
+--enable-optimize=*) optimize=${arg#*=} ;;
+--disable-optimize) optimize=no ;;
+--enable-debug|--enable-debug=yes) debug=yes ;;
+--disable-debug|--enable-debug=no) debug=no ;;
+--enable-warnings|--enable-warnings=yes) warnings=yes ;;
+--disable-warnings|--enable-warnings=no) warnings=no ;;
+--enable-wrapper|--enable-wrapper=yes) wrapper=detect ;;
+--enable-wrapper=all) wrapper=yes ; gcc_wrapper=yes ; clang_wrapper=yes ;;
+--enable-wrapper=gcc) wrapper=yes ; gcc_wrapper=yes ;;
+--enable-wrapper=clang) wrapper=yes ; clang_wrapper=yes ;;
+--disable-wrapper|--enable-wrapper=no) wrapper=no ;;
+--enable-gcc-wrapper|--enable-gcc-wrapper=yes) wrapper=yes ; gcc_wrapper=yes ;;
+--disable-gcc-wrapper|--enable-gcc-wrapper=no) wrapper=no ;;
+--enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;;
+--host=*|--target=*) target=${arg#*=} ;;
+--build=*) build=${arg#*=} ;;
+-* ) echo "$0: unknown option $arg" ;;
+AR=*) AR=${arg#*=} ;;
+RANLIB=*) RANLIB=${arg#*=} ;;
+CC=*) CC=${arg#*=} ;;
+CFLAGS=*) CFLAGS=${arg#*=} ;;
+CPPFLAGS=*) CPPFLAGS=${arg#*=} ;;
+LDFLAGS=*) LDFLAGS=${arg#*=} ;;
+CROSS_COMPILE=*) CROSS_COMPILE=${arg#*=} ;;
+LIBCC=*) LIBCC=${arg#*=} ;;
+*=*) ;;
+*) build=$arg ; target=$arg ;;
+esac
+done
+
+for i in srcdir prefix exec_prefix bindir libdir includedir syslibdir ; do
+stripdir $i
+done
+
+#
+# Get the source dir for out-of-tree builds
+#
+if test -z "$srcdir" ; then
+srcdir="${0%/configure}"
+stripdir srcdir
+fi
+abs_builddir="$(pwd)" || fail "$0: cannot determine working directory"
+abs_srcdir="$(cd $srcdir && pwd)" || fail "$0: invalid source directory $srcdir"
+test "$abs_srcdir" = "$abs_builddir" && srcdir=.
+test "$srcdir" != "." -a -f Makefile -a ! -h Makefile && fail "$0: Makefile already exists in the working directory"
+
+#
+# Get a temp filename we can use
+#
+i=0
+set -C
+while : ; do i=$(($i+1))
+tmpc="./conf$$-$PPID-$i.c"
+2>|/dev/null > "$tmpc" && break
+test "$i" -gt 50 && fail "$0: cannot create temporary file $tmpc"
+done
+set +C
+trap 'rm "$tmpc"' EXIT INT QUIT TERM HUP
+
+#
+# Check whether we are cross-compiling, and set a default
+# CROSS_COMPILE prefix if none was provided.
+#
+test "$target" && \
+test "$target" != "$build" && \
+test -z "$CROSS_COMPILE" && \
+CROSS_COMPILE="$target-"
+
+# We don't need this CROSS_COMPILE flag since we do not need cross compile a new freestanding GNU tool chain
+# If you really need to compile a freestanding tool chain, please comment this flag setting below
+CROSS_COMPILE=""
+
+#
+# Find a C compiler to use
+#
+printf "checking for C compiler... "
+trycc ${CROSS_COMPILE}gcc
+trycc ${CROSS_COMPILE}c99
+trycc ${CROSS_COMPILE}cc
+printf "%s\n" "$CC"
+test -n "$CC" || { echo "$0: cannot find a C compiler" ; exit 1 ; }
+
+printf "checking whether C compiler works... "
+echo "typedef int x;" > "$tmpc"
+if output=$($CC $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" 2>&1) ; then
+printf "yes\n"
+else
+printf "no; compiler output follows:\n%s\n" "$output"
+exit 1
+fi
+
+#
+# Figure out options to force errors on unknown flags.
+#
+tryflag   CFLAGS_TRY  -Werror=unknown-warning-option
+tryflag   CFLAGS_TRY  -Werror=unused-command-line-argument
+tryflag   CFLAGS_TRY  -Werror=ignored-optimization-argument
+tryldflag LDFLAGS_TRY -Werror=unknown-warning-option
+tryldflag LDFLAGS_TRY -Werror=unused-command-line-argument
+
+#
+# Need to know if the compiler is gcc or clang to decide which toolchain
+# wrappers to build.
+#
+printf "checking for C compiler family... "
+cc_ver="$(LC_ALL=C $CC -v 2>&1)"
+cc_family=unknown
+if fnmatch '*gcc\ version*' "$cc_ver" ; then
+cc_family=gcc
+elif fnmatch '*clang\ version*' "$cc_ver" ; then
+cc_family=clang
+fi
+echo "$cc_family"
+
+#
+# Figure out toolchain wrapper to build
+#
+if test "$wrapper" = auto -o "$wrapper" = detect ; then
+echo "#include <stdlib.h>" > "$tmpc"
+echo "#if ! __GLIBC__" >> "$tmpc"
+echo "#error no" >> "$tmpc"
+echo "#endif" >> "$tmpc"
+printf "checking for toolchain wrapper to build... "
+if test "$wrapper" = auto && ! $CC -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+echo "none"
+elif test "$cc_family" = gcc ; then
+gcc_wrapper=yes
+echo "gcc"
+elif test "$cc_family" = clang ; then
+clang_wrapper=yes
+echo "clang"
+else
+echo "none"
+if test "$wrapper" = detect ; then
+fail "$0: could not find an appropriate toolchain wrapper"
+fi
+fi
+fi
+
+if test "$gcc_wrapper" = yes ; then
+tools="$tools obj/musl-gcc"
+tool_libs="$tool_libs lib/musl-gcc.specs"
+fi
+if test "$clang_wrapper" = yes ; then
+tools="$tools obj/musl-clang obj/ld.musl-clang"
+fi
+
+#
+# Find the target architecture
+#
+printf "checking target system type... "
+test -n "$target" || target=$($CC -dumpmachine 2>/dev/null) || target=unknown
+printf "%s\n" "$target"
+
+#
+# Convert to just ARCH
+#
+case "$target" in
+# Catch these early to simplify matching for 32-bit archs
+arm*) ARCH=arm ;;
+aarch64*) ARCH=aarch64 ;;
+i?86-nt32*) ARCH=nt32 ;;
+i?86*) ARCH=i386 ;;
+x86_64-x32*|x32*|x86_64*x32) ARCH=x32 ;;
+x86_64-nt64*) ARCH=nt64 ;;
+x86_64*) ARCH=x86_64 ;;
+m68k*) ARCH=m68k ;;
+mips64*|mipsisa64*) ARCH=mips64 ;;
+mips*) ARCH=mips ;;
+microblaze*) ARCH=microblaze ;;
+or1k*) ARCH=or1k ;;
+powerpc64*|ppc64*) ARCH=powerpc64 ;;
+powerpc*|ppc*) ARCH=powerpc ;;
+riscv64*) ARCH=riscv64 ;;
+sh[1-9bel-]*|sh|superh*) ARCH=sh ;;
+s390x*) ARCH=s390x ;;
+unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;;
+*) fail "$0: unknown or unsupported target \"$target\"" ;;
+esac
+
+#
+# Try to get a conforming C99 freestanding environment
+#
+tryflag CFLAGS_C99FSE -std=c99
+tryflag CFLAGS_C99FSE -nostdinc
+tryflag CFLAGS_C99FSE -ffreestanding \
+|| tryflag CFLAGS_C99FSE -fno-builtin
+tryflag CFLAGS_C99FSE -fexcess-precision=standard \
+|| { test "$ARCH" = i386 && tryflag CFLAGS_C99FSE -ffloat-store ; }
+tryflag CFLAGS_C99FSE -frounding-math
+
+#
+# We may use the may_alias attribute if __GNUC__ is defined, so
+# if the compiler defines __GNUC__ but does not provide it,
+# it must be defined away as part of the CFLAGS.
+#
+printf "checking whether compiler needs attribute((may_alias)) suppression... "
+cat > "$tmpc" <<EOF
+typedef int
+#ifdef __GNUC__
+__attribute__((__may_alias__))
+#endif
+x;
+EOF
+if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS \
+  -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "no\n"
+else
+printf "yes\n"
+CFLAGS_C99FSE="$CFLAGS_C99FSE -D__may_alias__="
+fi
+
+#
+# The GNU toolchain defaults to assuming unmarked files need an
+# executable stack, potentially exposing vulnerabilities in programs
+# linked with such object files. Fix this.
+#
+tryflag CFLAGS_C99FSE -Wa,--noexecstack
+
+#
+# Check for options to disable stack protector, which needs to be
+# disabled for a few early-bootstrap translation units. If not found,
+# this is not an error; we assume the toolchain does not do ssp.
+#
+tryflag CFLAGS_NOSSP -fno-stack-protector
+
+#
+# Check for options that may be needed to prevent the compiler from
+# generating self-referential versions of memcpy,, memmove, memcmp,
+# and memset. Really, we should add a check to determine if this
+# option is sufficient, and if not, add a macro to cripple these
+# functions with volatile...
+#
+tryflag CFLAGS_MEMOPS -fno-tree-loop-distribute-patterns
+
+#
+# Enable debugging if requessted.
+#
+test "$debug" = yes && CFLAGS_AUTO=-g
+
+#
+# Preprocess asm files to add extra debugging information if debug is
+# enabled, our assembler supports the needed directives, and the
+# preprocessing script has been written for our architecture.
+#
+printf "checking whether we should preprocess assembly to add debugging information... "
+if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" &&
+   test -f "tools/add-cfi.$ARCH.awk" &&
+   printf ".file 1 \"srcfile.s\"\n.line 1\n.cfi_startproc\n.cfi_endproc" | $CC -g -x assembler -c -o /dev/null 2>/dev/null -
+then
+  ADD_CFI=yes
+else
+  ADD_CFI=no
+fi
+printf "%s\n" "$ADD_CFI"
+
+#
+# Possibly add a -O option to CFLAGS and select modules to optimize with
+# -O3 based on the status of --enable-optimize and provided CFLAGS.
+#
+printf "checking for optimization settings... "
+case "x$optimize" in
+xauto)
+if fnmatch '-O*|*\ -O*' "$CFLAGS_AUTO $CFLAGS" ; then
+printf "using provided CFLAGS\n" ;optimize=no
+else
+printf "using defaults\n" ; optimize=yes
+fi
+;;
+xsize|xnone) printf "minimize size\n" ; optimize=size ;;
+xno|x) printf "disabled\n" ; optimize=no ;;
+*) printf "custom\n" ;;
+esac
+
+test "$optimize" = no || tryflag CFLAGS_AUTO -Os || tryflag CFLAGS_AUTO -O2
+test "$optimize" = yes && optimize="internal,malloc,string"
+
+if fnmatch 'no|size' "$optimize" ; then :
+else
+printf "components to be optimized for speed:"
+while test "$optimize" ; do
+case "$optimize" in
+*,*) this=${optimize%%,*} optimize=${optimize#*,} ;;
+*) this=$optimize optimize=
+esac
+printf " $this"
+case "$this" in
+*/*.c) ;;
+*/*) this=$this*.c ;;
+*) this=$this/*.c ;;
+esac
+OPTIMIZE_GLOBS="$OPTIMIZE_GLOBS $this"
+done
+OPTIMIZE_GLOBS=${OPTIMIZE_GLOBS# }
+printf "\n"
+fi
+
+# Always try -pipe
+tryflag CFLAGS_AUTO -pipe
+
+#
+# If debugging is disabled, omit frame pointer. Modern GCC does this
+# anyway on most archs even when debugging is enabled since the frame
+# pointer is no longer needed for debugging.
+#
+if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" ; then :
+else 
+tryflag CFLAGS_AUTO -fomit-frame-pointer
+fi
+
+#
+# Modern GCC wants to put DWARF tables (used for debugging and
+# unwinding) in the loaded part of the program where they are
+# unstrippable. These options force them back to debug sections (and
+# cause them not to get generated at all if debugging is off).
+#
+tryflag CFLAGS_AUTO -fno-unwind-tables
+tryflag CFLAGS_AUTO -fno-asynchronous-unwind-tables
+
+#
+# Attempt to put each function and each data object in its own
+# section. This both allows additional size optimizations at link
+# time and works around a dangerous class of compiler/assembler bugs
+# whereby relative address expressions are constant-folded by the
+# assembler even when one or more of the symbols involved is
+# replaceable. See gas pr 18561 and gcc pr 66609, 68178, etc.
+#
+tryflag CFLAGS_AUTO -ffunction-sections
+tryflag CFLAGS_AUTO -fdata-sections
+
+#
+# On x86, make sure we don't have incompatible instruction set
+# extensions enabled by default. This is bad for making static binaries.
+# We cheat and use i486 rather than i386 because i386 really does not
+# work anyway (issues with atomic ops).
+# Some build environments pass -march and -mtune options via CC, so
+# check both CC and CFLAGS.
+#
+if test "$ARCH" = "i386" ; then
+fnmatch '-march=*|*\ -march=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -march=i486
+fnmatch '-mtune=*|*\ -mtune=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -mtune=generic
+fi
+
+#
+# Even with -std=c99, gcc accepts some constructs which are constraint
+# violations. We want to treat these as errors regardless of whether
+# other purely stylistic warnings are enabled -- especially implicit
+# function declarations, which are a dangerous programming error.
+#
+tryflag CFLAGS_AUTO -Werror=implicit-function-declaration
+tryflag CFLAGS_AUTO -Werror=implicit-int
+tryflag CFLAGS_AUTO -Werror=pointer-sign
+tryflag CFLAGS_AUTO -Werror=pointer-arith
+
+#
+# GCC ignores unused arguements by default, but Clang needs this extra
+# parameter to stop printing warnings about LDFLAGS passed during
+# compiling stage and CFLAGS passed during linking stage.
+#
+test "$cc_family" = clang && tryflag CFLAGS_AUTO -Qunused-arguments
+
+if test "x$warnings" = xyes ; then
+tryflag CFLAGS_AUTO -Wall
+tryflag CFLAGS_AUTO -Wno-parentheses
+tryflag CFLAGS_AUTO -Wno-uninitialized
+tryflag CFLAGS_AUTO -Wno-missing-braces
+tryflag CFLAGS_AUTO -Wno-unused-value
+tryflag CFLAGS_AUTO -Wno-unused-but-set-variable
+tryflag CFLAGS_AUTO -Wno-unknown-pragmas
+tryflag CFLAGS_AUTO -Wno-pointer-to-int-cast
+fi
+
+# Determine if the compiler produces position-independent code (PIC)
+# by default. If so, we don't need to compile separate object files
+# for libc.a and libc.so.
+if trycppif __PIC__ "$CFLAGS_C99FSE $CPPFLAGS $CFLAGS" ; then
+pic_default=yes
+else
+pic_default=no
+fi
+
+# Reduce space lost to padding for alignment purposes by sorting data
+# objects according to their alignment reqirements. This approximates
+# optimal packing.
+tryldflag LDFLAGS_AUTO -Wl,--sort-section,alignment
+tryldflag LDFLAGS_AUTO -Wl,--sort-common
+
+# When linking shared library, drop dummy weak definitions that were
+# replaced by strong definitions from other translation units.
+tryldflag LDFLAGS_AUTO -Wl,--gc-sections
+
+# Some patched GCC builds have these defaults messed up...
+tryldflag LDFLAGS_AUTO -Wl,--hash-style=both
+
+# Prevent linking if there are undefined symbols; if any exist,
+# libc.so will crash at runtime during relocation processing.
+# The common way this can happen is failure to link the compiler
+# runtime library; implementation error is also a possibility.
+tryldflag LDFLAGS_AUTO -Wl,--no-undefined
+
+# Avoid exporting symbols from compiler runtime libraries. They
+# should be hidden anyway, but some toolchains including old gcc
+# versions built without shared library support and pcc are broken.
+tryldflag LDFLAGS_AUTO -Wl,--exclude-libs=ALL
+
+# Public data symbols must be interposable to allow for copy
+# relocations, but otherwise we want to bind symbols at libc link
+# time to eliminate startup relocations and PLT overhead. Use
+# --dynamic-list rather than -Bsymbolic-functions for greater
+# control over what symbols are left unbound.
+tryldflag LDFLAGS_AUTO -Wl,--dynamic-list="$srcdir/dynamic.list"
+
+# Find compiler runtime library
+test -z "$LIBCC" && tryldflag LIBCC -lgcc && tryldflag LIBCC -lgcc_eh
+test -z "$LIBCC" && tryldflag LIBCC -lcompiler_rt
+test -z "$LIBCC" && try_libcc=`$CC -print-libgcc-file-name 2>/dev/null` \
+                 && tryldflag LIBCC "$try_libcc"
+test -z "$LIBCC" && try_libcc=`$CC -print-file-name=libpcc.a 2>/dev/null` \
+                 && tryldflag LIBCC "$try_libcc"
+printf "using compiler runtime libraries: %s\n" "$LIBCC"
+
+# Figure out arch variants for archs with variants
+SUBARCH=
+t="$CFLAGS_C99FSE $CPPFLAGS $CFLAGS"
+
+if test "$ARCH" = "i386" ; then
+printf "checking whether compiler can use ebx in PIC asm constraints... "
+cat > "$tmpc" <<EOF
+int foo(int x) { __asm__ ( "" : "+b"(x) ); return x; }
+EOF
+if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -fPIC \
+  -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+else
+printf "no\n"
+CFLAGS_AUTO="$CFLAGS_AUTO -DBROKEN_EBX_ASM"
+fi
+fi
+
+if test "$ARCH" = "x86_64" ; then
+trycppif __ILP32__ "$t" && ARCH=x32
+fi
+
+if test "$ARCH" = "arm" ; then
+if trycppif __thumb2__ "$t" ; then
+tryflag CFLAGS_AUTO -mimplicit-it=always
+tryflag CFLAGS_AUTO -Wa,-mimplicit-it=always
+tryflag CFLAGS_AUTO -Wa,-mthumb
+fi
+trycppif __ARMEB__ "$t" && SUBARCH=${SUBARCH}eb
+trycppif __ARM_PCS_VFP "$t" && SUBARCH=${SUBARCH}hf
+# Versions of clang up until at least 3.8 have the wrong constraint codes
+# for floating point operands to inline asm. Detect this so the affected
+# source files can just disable the asm.
+if test "$cc_family" = clang ; then
+printf "checking whether clang's vfp asm constraints work... "
+echo 'float f(float x) { __asm__("":"+t"(x)); return x; }' > "$tmpc"
+if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+else
+printf "no\n"
+CFLAGS_AUTO="$CFLAGS_AUTO -DBROKEN_VFP_ASM"
+CFLAGS_AUTO="${CFLAGS_AUTO# }"
+fi
+fi
+fi
+
+if test "$ARCH" = "aarch64" ; then
+trycppif __AARCH64EB__ "$t" && SUBARCH=${SUBARCH}_be
+fi
+
+if test "$ARCH" = "m68k" ; then
+if trycppif "__HAVE_68881__" ; then : ;
+elif trycppif "__mcffpu__" ; then SUBARCH="-fp64"
+else SUBARCH="-sf"
+fi
+fi
+
+if test "$ARCH" = "mips" ; then
+trycppif "__mips_isa_rev >= 6" "$t" && SUBARCH=${SUBARCH}r6
+trycppif "_MIPSEL || __MIPSEL || __MIPSEL__" "$t" && SUBARCH=${SUBARCH}el
+trycppif __mips_soft_float "$t" && SUBARCH=${SUBARCH}-sf
+fi
+
+if test "$ARCH" = "mips64" ; then
+trycppif "_MIPS_SIM != _ABI64" "$t" && ARCH=mipsn32
+trycppif "__mips_isa_rev >= 6" "$t" && SUBARCH=${SUBARCH}r6
+trycppif "_MIPSEL || __MIPSEL || __MIPSEL__" "$t" && SUBARCH=${SUBARCH}el
+trycppif __mips_soft_float "$t" && SUBARCH=${SUBARCH}-sf
+fi
+
+if test "$ARCH" = "powerpc" ; then
+trycppif "__NO_FPRS__ && !_SOFT_FLOAT" "$t" && fail \
+  "$0: error: compiler's floating point configuration is unsupported"
+trycppif _SOFT_FLOAT "$t" && SUBARCH=${SUBARCH}-sf
+printf "checking whether compiler can use 'd' constraint in asm... "
+echo 'double f(double x) { __asm__ ("fabs %0, %1" : "=d"(x) : "d"(x)); return x; }' > "$tmpc"
+if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+else
+printf "no\n"
+CFLAGS_AUTO="$CFLAGS_AUTO -DBROKEN_PPC_D_ASM"
+CFLAGS_AUTO="${CFLAGS_AUTO# }"
+fi
+fi
+
+test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \
+&& SUBARCH=${SUBARCH}el
+
+if test "$ARCH" = "powerpc64" ; then
+trycppif "_CALL_ELF == 2" "$t" || fail "$0: error: unsupported powerpc64 ABI"
+trycppif __LITTLE_ENDIAN__ "$t" && SUBARCH=${SUBARCH}le
+trycppif _SOFT_FLOAT "$t" && fail "$0: error: soft-float not supported on powerpc64"
+fi
+
+if test "$ARCH" = "riscv64" ; then
+trycppif __riscv_float_abi_soft "$t" && SUBARCH=${SUBARCH}-sf
+trycppif __riscv_float_abi_single "$t" && SUBARCH=${SUBARCH}-sp
+fi
+
+if test "$ARCH" = "sh" ; then
+tryflag CFLAGS_AUTO -Wa,--isa=any
+trycppif __BIG_ENDIAN__ "$t" && SUBARCH=${SUBARCH}eb
+if trycppif "__SH_FPU_ANY__ || __SH4__" "$t" ; then
+# Some sh configurations are broken and replace double with float
+# rather than using softfloat when the fpu is present but only
+# supports single precision. Reject them.
+printf "checking whether compiler's double type is IEEE double... "
+echo 'typedef char dblcheck[(int)sizeof(double)-5];' > "$tmpc"
+if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+else
+printf "no\n"
+fail "$0: error: compiler's floating point configuration is unsupported"
+fi
+else
+SUBARCH=${SUBARCH}-nofpu
+fi
+if trycppif __SH_FDPIC__ "$t" ; then
+SUBARCH=${SUBARCH}-fdpic
+fi
+fi
+
+test "$SUBARCH" \
+&& printf "configured for %s variant: %s\n" "$ARCH" "$ARCH$SUBARCH"
+
+case "$ARCH$SUBARCH" in
+arm) ASMSUBARCH=el ;;
+*) ASMSUBARCH=$SUBARCH ;;
+esac
+
+#
+# Some archs (powerpc) have different possible long double formats
+# that the compiler can be configured for. The logic for whether this
+# is supported is in bits/float.h; in general, it is not. We need to
+# check for mismatches here or code in printf, strotd, and scanf will
+# be dangerously incorrect because it depends on (1) the macros being
+# correct, and (2) IEEE semantics.
+#
+printf "checking whether compiler's long double definition matches float.h... "
+echo '#include <float.h>' > "$tmpc"
+echo '#define C(m,s) (m==LDBL_MANT_DIG && s==sizeof(long double))' >> "$tmpc"
+echo 'typedef char ldcheck[(C(53,8)||C(64,12)||C(64,16)||C(113,16))*2-1];' >> "$tmpc"
+if $CC $CFLAGS_C99FSE \
+  -I$srcdir/arch/$ARCH -I$srcdir/arch/generic -I$srcdir/include \
+  $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+else
+printf "no\n"
+fail "$0: error: unsupported long double type"
+fi
+
+#
+# Some build systems globally pass in broken CFLAGS like -ffast-math
+# for all packages. On recent GCC we can detect this and error out
+# early rather than producing a seriously-broken math library.
+#
+if trycppif "__FAST_MATH__" \
+  "$CFLAGS_C99FSE $CPPFLAGS $CFLAGS" ; then
+fail "$0: error: compiler has broken floating point; check CFLAGS"
+fi
+
+printf "creating config.mak... "
+
+cmdline=$(quote "$0")
+for i ; do cmdline="$cmdline $(quote "$i")" ; done
+
+exec 3>&1 1>config.mak
+
+
+cat << EOF
+# This version of config.mak was generated by:
+# $cmdline
+# Any changes made here will be lost if configure is re-run
+AR = ${AR:-\$(CROSS_COMPILE)ar}
+RANLIB = ${RANLIB:-\$(CROSS_COMPILE)ranlib}
+ARCH = $ARCH
+SUBARCH = $SUBARCH
+ASMSUBARCH = $ASMSUBARCH
+srcdir = $srcdir
+prefix = $prefix
+exec_prefix = $exec_prefix
+bindir = $bindir
+libdir = $libdir
+includedir = $includedir
+syslibdir = $syslibdir
+CC = $CC
+CFLAGS = $CFLAGS
+CFLAGS_AUTO = $CFLAGS_AUTO
+CFLAGS_C99FSE = $CFLAGS_C99FSE
+CFLAGS_MEMOPS = $CFLAGS_MEMOPS
+CFLAGS_NOSSP = $CFLAGS_NOSSP
+CPPFLAGS = $CPPFLAGS
+LDFLAGS = $LDFLAGS
+LDFLAGS_AUTO = $LDFLAGS_AUTO
+CROSS_COMPILE = $CROSS_COMPILE
+LIBCC = $LIBCC
+OPTIMIZE_GLOBS = $OPTIMIZE_GLOBS
+ALL_TOOLS = $tools
+TOOL_LIBS = $tool_libs
+ADD_CFI = $ADD_CFI
+EOF
+test "x$static" = xno && echo "STATIC_LIBS ="
+test "x$shared" = xno && echo "SHARED_LIBS ="
+test "x$cc_family" = xgcc && echo 'WRAPCC_GCC = $(CC)'
+test "x$cc_family" = xclang && echo 'WRAPCC_CLANG = $(CC)'
+test "x$pic_default" = xyes && echo 'AOBJS = $(LOBJS)'
+exec 1>&3 3>&-
+
+test "$srcdir" = "." || ln -sf $srcdir/Makefile .
+
+printf "done\n"
diff --git a/src/components/lib/libc/musl-1.1.11/crt/Scrt1.c b/src/components/lib/libc/musl-1.2.0/crt/Scrt1.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/Scrt1.c
rename to src/components/lib/libc/musl-1.2.0/crt/Scrt1.c
diff --git a/src/components/lib/libc/musl-1.1.11/crt/aarch64/crti.s b/src/components/lib/libc/musl-1.2.0/crt/aarch64/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/aarch64/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/aarch64/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/aarch64/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/aarch64/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/aarch64/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/aarch64/crtn.s
diff --git a/src/components/lib/libc/musl-1.2.0/crt/arm/crti.s b/src/components/lib/libc/musl-1.2.0/crt/arm/crti.s
new file mode 100644
index 0000000000..18dc1e4197
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/arm/crti.s
@@ -0,0 +1,13 @@
+.syntax unified
+
+.section .init
+.global _init
+.type _init,%function
+_init:
+	push {r0,lr}
+
+.section .fini
+.global _fini
+.type _fini,%function
+_fini:
+	push {r0,lr}
diff --git a/src/components/lib/libc/musl-1.2.0/crt/arm/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/arm/crtn.s
new file mode 100644
index 0000000000..dc020f92ef
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/arm/crtn.s
@@ -0,0 +1,9 @@
+.syntax unified
+
+.section .init
+	pop {r0,lr}
+	bx lr
+
+.section .fini
+	pop {r0,lr}
+	bx lr
diff --git a/src/components/lib/libc/musl-1.2.0/crt/crt1.c b/src/components/lib/libc/musl-1.2.0/crt/crt1.c
new file mode 100644
index 0000000000..8fe8ab5d8c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/crt1.c
@@ -0,0 +1,19 @@
+#include <features.h>
+#include "libc.h"
+
+#define START "_start"
+
+#include "crt_arch.h"
+
+int main();
+weak void _init();
+weak void _fini();
+int __libc_start_main(int (*)(), int, char **,
+	void (*)(), void(*)(), void(*)());
+
+void _start_c(long *p)
+{
+	int argc = p[0];
+	char **argv = (void *)(p+1);
+	__libc_start_main(main, argc, argv, _init, _fini, 0);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/crt/crti.c b/src/components/lib/libc/musl-1.2.0/crt/crti.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/crti.c
rename to src/components/lib/libc/musl-1.2.0/crt/crti.c
diff --git a/src/components/lib/libc/musl-1.1.11/crt/crtn.c b/src/components/lib/libc/musl-1.2.0/crt/crtn.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/crtn.c
rename to src/components/lib/libc/musl-1.2.0/crt/crtn.c
diff --git a/src/components/lib/libc/musl-1.1.11/crt/i386/crti.s b/src/components/lib/libc/musl-1.2.0/crt/i386/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/i386/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/i386/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/i386/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/i386/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/i386/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/i386/crtn.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/microblaze/crti.s b/src/components/lib/libc/musl-1.2.0/crt/microblaze/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/microblaze/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/microblaze/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/microblaze/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/microblaze/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/microblaze/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/microblaze/crtn.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/mips/crti.s b/src/components/lib/libc/musl-1.2.0/crt/mips/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/mips/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/mips/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/mips/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/mips/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/mips/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/mips/crtn.s
diff --git a/src/components/lib/libc/musl-1.2.0/crt/mips64/crti.s b/src/components/lib/libc/musl-1.2.0/crt/mips64/crti.s
new file mode 100644
index 0000000000..c962dd099b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/mips64/crti.s
@@ -0,0 +1,17 @@
+.set noreorder
+
+.section .init
+.global _init
+.align 3
+_init:
+	dsubu	$sp, $sp, 32
+	sd	$gp, 16($sp)
+	sd	$ra, 24($sp)
+
+.section .fini
+.global _fini
+.align 3
+_fini:
+	dsubu	$sp, $sp, 32
+	sd	$gp, 16($sp)
+	sd	$ra, 24($sp)
diff --git a/src/components/lib/libc/musl-1.2.0/crt/mips64/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/mips64/crtn.s
new file mode 100644
index 0000000000..f3930b2406
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/mips64/crtn.s
@@ -0,0 +1,13 @@
+.set noreorder
+
+.section .init
+	ld $gp,16($sp)
+	ld $ra,24($sp)
+	j $ra
+	daddu $sp,$sp,32
+
+.section .fini
+	ld $gp,16($sp)
+	ld $ra,24($sp)
+	j $ra
+	daddu $sp,$sp,32
diff --git a/src/components/lib/libc/musl-1.2.0/crt/mipsn32/crti.s b/src/components/lib/libc/musl-1.2.0/crt/mipsn32/crti.s
new file mode 100644
index 0000000000..14fa28d99d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/mipsn32/crti.s
@@ -0,0 +1,18 @@
+.set	noreorder
+.section	.init
+.global	_init
+.type	_init,@function
+.align	2
+_init:
+	subu	$sp, $sp, 32
+	sd	$gp, 16($sp)
+	sd	$ra, 24($sp)
+
+.section	.fini
+.global	_fini
+.type	_fini,@function
+.align	2
+_fini:
+	subu	$sp, $sp, 32
+	sd	$gp, 16($sp)
+	sd	$ra, 24($sp)
diff --git a/src/components/lib/libc/musl-1.2.0/crt/mipsn32/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/mipsn32/crtn.s
new file mode 100644
index 0000000000..dccd7e8901
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/mipsn32/crtn.s
@@ -0,0 +1,12 @@
+.set	noreorder
+.section	.init
+	ld	$gp, 16($sp)
+	ld	$ra, 24($sp)
+	j	$ra
+	addu	$sp, $sp, 32
+
+.section	.fini
+	ld	$gp, 16($sp)
+	ld	$ra, 24($sp)
+	j	$ra
+	addu	$sp, $sp, 32
diff --git a/src/components/lib/libc/musl-1.1.11/crt/or1k/crti.s b/src/components/lib/libc/musl-1.2.0/crt/or1k/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/or1k/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/or1k/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/or1k/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/or1k/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/or1k/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/or1k/crtn.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/powerpc/crti.s b/src/components/lib/libc/musl-1.2.0/crt/powerpc/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/powerpc/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/powerpc/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/powerpc/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/powerpc/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/powerpc/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/powerpc/crtn.s
diff --git a/src/components/lib/libc/musl-1.2.0/crt/powerpc64/crti.s b/src/components/lib/libc/musl-1.2.0/crt/powerpc64/crti.s
new file mode 100644
index 0000000000..9f712f0e07
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/powerpc64/crti.s
@@ -0,0 +1,21 @@
+.section .init
+.align 2
+.global _init
+_init:
+	addis 2, 12, .TOC.-_init@ha
+	addi  2,  2, .TOC.-_init@l
+	.localentry _init,.-_init
+	mflr 0
+	std  0, 16(1)
+	stdu 1,-32(1)
+
+.section .fini
+.align 2
+.global _fini
+_fini:
+	addis 2, 12, .TOC.-_fini@ha
+	addi  2,  2, .TOC.-_fini@l
+	.localentry _fini,.-_fini
+	mflr 0
+	std  0, 16(1)
+	stdu 1,-32(1)
diff --git a/src/components/lib/libc/musl-1.2.0/crt/powerpc64/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/powerpc64/crtn.s
new file mode 100644
index 0000000000..a7a9f4a07d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/powerpc64/crtn.s
@@ -0,0 +1,13 @@
+.section .init
+.align 2
+	addi 1, 1, 32
+	ld   0, 16(1)
+	mtlr 0
+	blr
+
+.section .fini
+.align 2
+	addi 1, 1, 32
+	ld   0, 16(1)
+	mtlr 0
+	blr
diff --git a/src/components/lib/libc/musl-1.2.0/crt/rcrt1.c b/src/components/lib/libc/musl-1.2.0/crt/rcrt1.c
new file mode 100644
index 0000000000..901dff6819
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/rcrt1.c
@@ -0,0 +1,14 @@
+#define START "_start"
+#define _dlstart_c _start_c
+#include "../ldso/dlstart.c"
+
+int main();
+weak void _init();
+weak void _fini();
+int __libc_start_main(int (*)(), int, char **,
+	void (*)(), void(*)(), void(*)());
+
+hidden void __dls2(unsigned char *base, size_t *sp)
+{
+	__libc_start_main(main, *sp, (void *)(sp+1), _init, _fini, 0);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/crt/s390x/crti.s b/src/components/lib/libc/musl-1.2.0/crt/s390x/crti.s
new file mode 100644
index 0000000000..f453205bd0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/s390x/crti.s
@@ -0,0 +1,17 @@
+.section .init
+.align 2
+.global _init
+_init:
+	stmg %r14, %r15, 112(%r15)
+	lgr  %r0,  %r15
+	aghi %r15, -160
+	stg  %r0,  0(%r15)
+
+.section .fini
+.align 2
+.global _fini
+_fini:
+	stmg %r14, %r15, 112(%r15)
+	lgr  %r0,  %r15
+	aghi %r15, -160
+	stg  %r0,  0(%r15)
diff --git a/src/components/lib/libc/musl-1.2.0/crt/s390x/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/s390x/crtn.s
new file mode 100644
index 0000000000..06066dc994
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/s390x/crtn.s
@@ -0,0 +1,9 @@
+.section .init
+.align 2
+	lmg  %r14, %r15, 272(%r15)
+	br   %r14
+
+.section .fini
+.align 2
+	lmg  %r14, %r15, 272(%r15)
+	br   %r14
diff --git a/src/components/lib/libc/musl-1.2.0/crt/sh/crti.s b/src/components/lib/libc/musl-1.2.0/crt/sh/crti.s
new file mode 100644
index 0000000000..d99bfd5c82
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/sh/crti.s
@@ -0,0 +1,21 @@
+.section .init
+.global  _init
+.type    _init, @function
+_init:
+	add #-4, r15
+	mov.l r12, @-r15
+	mov.l r14, @-r15
+	sts.l pr, @-r15
+	mov r15, r14
+	nop
+
+.section .fini
+.global  _fini
+.type    _fini, @function
+_fini:
+	add #-4, r15
+	mov.l r12, @-r15
+	mov.l r14, @-r15
+	sts.l pr, @-r15
+	mov r15, r14
+	nop
diff --git a/src/components/lib/libc/musl-1.2.0/crt/sh/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/sh/crtn.s
new file mode 100644
index 0000000000..958ce951b6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/crt/sh/crtn.s
@@ -0,0 +1,13 @@
+.section .init
+	lds.l @r15+, pr
+	mov.l @r15+, r14
+	mov.l @r15+, r12
+	rts
+	 add #4, r15
+
+.section .fini
+	lds.l @r15+, pr
+	mov.l @r15+, r14
+	mov.l @r15+, r12
+	rts
+	 add #4, r15
diff --git a/src/components/lib/libc/musl-1.1.11/crt/x32/crti.s b/src/components/lib/libc/musl-1.2.0/crt/x32/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/x32/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/x32/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/x32/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/x32/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/x32/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/x32/crtn.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/x86_64/crti.s b/src/components/lib/libc/musl-1.2.0/crt/x86_64/crti.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/x86_64/crti.s
rename to src/components/lib/libc/musl-1.2.0/crt/x86_64/crti.s
diff --git a/src/components/lib/libc/musl-1.1.11/crt/x86_64/crtn.s b/src/components/lib/libc/musl-1.2.0/crt/x86_64/crtn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/crt/x86_64/crtn.s
rename to src/components/lib/libc/musl-1.2.0/crt/x86_64/crtn.s
diff --git a/src/components/lib/libc/musl-1.2.0/dynamic.list b/src/components/lib/libc/musl-1.2.0/dynamic.list
new file mode 100644
index 0000000000..ee0d363b64
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/dynamic.list
@@ -0,0 +1,45 @@
+{
+environ;
+__environ;
+
+stdin;
+stdout;
+stderr;
+
+malloc;
+calloc;
+realloc;
+free;
+memalign;
+posix_memalign;
+aligned_alloc;
+malloc_usable_size;
+
+timezone;
+daylight;
+tzname;
+__timezone;
+__daylight;
+__tzname;
+
+signgam;
+__signgam;
+
+optarg;
+optind;
+opterr;
+optopt;
+optreset;
+__optreset;
+
+getdate_err;
+
+h_errno;
+
+program_invocation_name;
+program_invocation_short_name;
+__progname;
+__progname_full;
+
+__stack_chk_guard;
+};
diff --git a/src/components/lib/libc/musl-1.1.11/include/aio.h b/src/components/lib/libc/musl-1.2.0/include/aio.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/aio.h
rename to src/components/lib/libc/musl-1.2.0/include/aio.h
index 19bc28a9b1..453c41b748 100644
--- a/src/components/lib/libc/musl-1.1.11/include/aio.h
+++ b/src/components/lib/libc/musl-1.2.0/include/aio.h
@@ -62,6 +62,10 @@ int lio_listio(int, struct aiocb *__restrict const *__restrict, int, struct sige
 #define off64_t off_t
 #endif
 
+#if _REDIR_TIME64
+__REDIR(aio_suspend, __aio_suspend_time64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/alloca.h b/src/components/lib/libc/musl-1.2.0/include/alloca.h
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/include/alloca.h
rename to src/components/lib/libc/musl-1.2.0/include/alloca.h
index d2e6f1c681..b8d183d144 100644
--- a/src/components/lib/libc/musl-1.1.11/include/alloca.h
+++ b/src/components/lib/libc/musl-1.2.0/include/alloca.h
@@ -10,9 +10,7 @@ extern "C" {
 
 void *alloca(size_t);
 
-#ifdef __GNUC__
 #define alloca __builtin_alloca
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/src/components/lib/libc/musl-1.2.0/include/alltypes.h.in b/src/components/lib/libc/musl-1.2.0/include/alltypes.h.in
new file mode 100644
index 0000000000..d9ff462e1e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/alltypes.h.in
@@ -0,0 +1,93 @@
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN 4321
+#define __USE_TIME_BITS64 1
+
+TYPEDEF unsigned _Addr size_t;
+TYPEDEF unsigned _Addr uintptr_t;
+TYPEDEF _Addr ptrdiff_t;
+TYPEDEF _Addr ssize_t;
+TYPEDEF _Addr intptr_t;
+TYPEDEF _Addr regoff_t;
+TYPEDEF _Reg register_t;
+TYPEDEF _Int64 time_t;
+TYPEDEF _Int64 suseconds_t;
+
+TYPEDEF signed char     int8_t;
+TYPEDEF signed short    int16_t;
+TYPEDEF signed int      int32_t;
+TYPEDEF signed _Int64   int64_t;
+TYPEDEF signed _Int64   intmax_t;
+TYPEDEF unsigned char   uint8_t;
+TYPEDEF unsigned short  uint16_t;
+TYPEDEF unsigned int    uint32_t;
+TYPEDEF unsigned _Int64 uint64_t;
+TYPEDEF unsigned _Int64 u_int64_t;
+TYPEDEF unsigned _Int64 uintmax_t;
+
+TYPEDEF unsigned mode_t;
+TYPEDEF unsigned _Reg nlink_t;
+TYPEDEF _Int64 off_t;
+TYPEDEF unsigned _Int64 ino_t;
+TYPEDEF unsigned _Int64 dev_t;
+TYPEDEF long blksize_t;
+TYPEDEF _Int64 blkcnt_t;
+TYPEDEF unsigned _Int64 fsblkcnt_t;
+TYPEDEF unsigned _Int64 fsfilcnt_t;
+
+TYPEDEF unsigned wint_t;
+TYPEDEF unsigned long wctype_t;
+
+TYPEDEF void * timer_t;
+TYPEDEF int clockid_t;
+TYPEDEF long clock_t;
+STRUCT timeval { time_t tv_sec; suseconds_t tv_usec; };
+STRUCT timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
+
+TYPEDEF int pid_t;
+TYPEDEF unsigned id_t;
+TYPEDEF unsigned uid_t;
+TYPEDEF unsigned gid_t;
+TYPEDEF int key_t;
+TYPEDEF unsigned useconds_t;
+
+#ifdef __cplusplus
+TYPEDEF unsigned long pthread_t;
+#else
+TYPEDEF struct __pthread * pthread_t;
+#endif
+TYPEDEF int pthread_once_t;
+TYPEDEF unsigned pthread_key_t;
+TYPEDEF int pthread_spinlock_t;
+TYPEDEF struct { unsigned __attr; } pthread_mutexattr_t;
+TYPEDEF struct { unsigned __attr; } pthread_condattr_t;
+TYPEDEF struct { unsigned __attr; } pthread_barrierattr_t;
+TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t;
+
+STRUCT _IO_FILE { char __x; };
+TYPEDEF struct _IO_FILE FILE;
+
+TYPEDEF __builtin_va_list va_list;
+TYPEDEF __builtin_va_list __isoc_va_list;
+
+TYPEDEF struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
+
+TYPEDEF struct __locale_struct * locale_t;
+
+TYPEDEF struct __sigset_t { unsigned long __bits[128/sizeof(long)]; } sigset_t;
+
+STRUCT iovec { void *iov_base; size_t iov_len; };
+
+TYPEDEF unsigned socklen_t;
+TYPEDEF unsigned short sa_family_t;
+
+TYPEDEF struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
+TYPEDEF struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
+TYPEDEF struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
+TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
+TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
+TYPEDEF struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
+TYPEDEF struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
+
+#undef _Addr
+#undef _Int64
+#undef _Reg
diff --git a/src/components/lib/libc/musl-1.1.11/include/ar.h b/src/components/lib/libc/musl-1.2.0/include/ar.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/ar.h
rename to src/components/lib/libc/musl-1.2.0/include/ar.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/arpa/ftp.h b/src/components/lib/libc/musl-1.2.0/include/arpa/ftp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/arpa/ftp.h
rename to src/components/lib/libc/musl-1.2.0/include/arpa/ftp.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/arpa/inet.h b/src/components/lib/libc/musl-1.2.0/include/arpa/inet.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/arpa/inet.h
rename to src/components/lib/libc/musl-1.2.0/include/arpa/inet.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/arpa/nameser.h b/src/components/lib/libc/musl-1.2.0/include/arpa/nameser.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/arpa/nameser.h
rename to src/components/lib/libc/musl-1.2.0/include/arpa/nameser.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/arpa/nameser_compat.h b/src/components/lib/libc/musl-1.2.0/include/arpa/nameser_compat.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/arpa/nameser_compat.h
rename to src/components/lib/libc/musl-1.2.0/include/arpa/nameser_compat.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/arpa/telnet.h b/src/components/lib/libc/musl-1.2.0/include/arpa/telnet.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/arpa/telnet.h
rename to src/components/lib/libc/musl-1.2.0/include/arpa/telnet.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/arpa/tftp.h b/src/components/lib/libc/musl-1.2.0/include/arpa/tftp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/arpa/tftp.h
rename to src/components/lib/libc/musl-1.2.0/include/arpa/tftp.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/assert.h b/src/components/lib/libc/musl-1.2.0/include/assert.h
new file mode 100644
index 0000000000..d14ec94e7a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/assert.h
@@ -0,0 +1,23 @@
+#include <features.h>
+
+#undef assert
+
+#ifdef NDEBUG
+#define	assert(x) (void)0
+#else
+#define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))
+#endif
+
+#if __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+#define static_assert _Static_assert
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_Noreturn void __assert_fail (const char *, const char *, int, const char *);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/byteswap.h b/src/components/lib/libc/musl-1.2.0/include/byteswap.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/byteswap.h
rename to src/components/lib/libc/musl-1.2.0/include/byteswap.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/complex.h b/src/components/lib/libc/musl-1.2.0/include/complex.h
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/include/complex.h
rename to src/components/lib/libc/musl-1.2.0/include/complex.h
index 4d21728ea9..008b3c7e3b 100644
--- a/src/components/lib/libc/musl-1.1.11/include/complex.h
+++ b/src/components/lib/libc/musl-1.2.0/include/complex.h
@@ -116,7 +116,7 @@ long double creall(long double complex);
 
 #if __STDC_VERSION__ >= 201112L
 #if defined(_Imaginary_I)
-#define __CMPLX(x, y, t) ((t)(x) + _Imaginary_I*(t)(y)))
+#define __CMPLX(x, y, t) ((t)(x) + _Imaginary_I*(t)(y))
 #elif defined(__clang__)
 #define __CMPLX(x, y, t) (+(_Complex t){ (t)(x), (t)(y) })
 #else
diff --git a/src/components/lib/libc/musl-1.1.11/include/cpio.h b/src/components/lib/libc/musl-1.2.0/include/cpio.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/cpio.h
rename to src/components/lib/libc/musl-1.2.0/include/cpio.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/crypt.h b/src/components/lib/libc/musl-1.2.0/include/crypt.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/crypt.h
rename to src/components/lib/libc/musl-1.2.0/include/crypt.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/ctype.h b/src/components/lib/libc/musl-1.2.0/include/ctype.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/ctype.h
rename to src/components/lib/libc/musl-1.2.0/include/ctype.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/dirent.h b/src/components/lib/libc/musl-1.2.0/include/dirent.h
new file mode 100644
index 0000000000..650ecf646a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/dirent.h
@@ -0,0 +1,75 @@
+#ifndef	_DIRENT_H
+#define	_DIRENT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_ino_t
+#define __NEED_off_t
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define __NEED_size_t
+#endif
+
+#include <bits/alltypes.h>
+
+#include <bits/dirent.h>
+
+typedef struct __dirstream DIR;
+
+#define d_fileno d_ino
+
+int            closedir(DIR *);
+DIR           *fdopendir(int);
+DIR           *opendir(const char *);
+struct dirent *readdir(DIR *);
+int            readdir_r(DIR *__restrict, struct dirent *__restrict, struct dirent **__restrict);
+void           rewinddir(DIR *);
+int            dirfd(DIR *);
+
+int alphasort(const struct dirent **, const struct dirent **);
+int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+void           seekdir(DIR *, long);
+long           telldir(DIR *);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define DT_UNKNOWN 0
+#define DT_FIFO 1
+#define DT_CHR 2
+#define DT_DIR 4
+#define DT_BLK 6
+#define DT_REG 8
+#define DT_LNK 10
+#define DT_SOCK 12
+#define DT_WHT 14
+#define IFTODT(x) ((x)>>12 & 017)
+#define DTTOIF(x) ((x)<<12)
+int getdents(int, struct dirent *, size_t);
+#endif
+
+#ifdef _GNU_SOURCE
+int versionsort(const struct dirent **, const struct dirent **);
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define dirent64 dirent
+#define readdir64 readdir
+#define readdir64_r readdir_r
+#define scandir64 scandir
+#define alphasort64 alphasort
+#define versionsort64 versionsort
+#define off64_t off_t
+#define ino64_t ino_t
+#define getdents64 getdents
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/dlfcn.h b/src/components/lib/libc/musl-1.2.0/include/dlfcn.h
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/include/dlfcn.h
rename to src/components/lib/libc/musl-1.2.0/include/dlfcn.h
index 78fb0733b2..13ab71dd07 100644
--- a/src/components/lib/libc/musl-1.1.11/include/dlfcn.h
+++ b/src/components/lib/libc/musl-1.2.0/include/dlfcn.h
@@ -35,6 +35,10 @@ int dladdr(const void *, Dl_info *);
 int dlinfo(void *, int, void *);
 #endif
 
+#if _REDIR_TIME64
+__REDIR(dlsym, __dlsym_time64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/elf.h b/src/components/lib/libc/musl-1.2.0/include/elf.h
similarity index 82%
rename from src/components/lib/libc/musl-1.1.11/include/elf.h
rename to src/components/lib/libc/musl-1.2.0/include/elf.h
index 1d43670c6e..549f92c1aa 100644
--- a/src/components/lib/libc/musl-1.1.11/include/elf.h
+++ b/src/components/lib/libc/musl-1.2.0/include/elf.h
@@ -210,13 +210,113 @@ typedef struct {
 #define EM_MN10200	90
 #define EM_PJ		91
 #define EM_OR1K		92
+#define EM_OPENRISC	92
 #define EM_ARC_A5	93
+#define EM_ARC_COMPACT	93
 #define EM_XTENSA	94
+#define EM_VIDEOCORE	95
+#define EM_TMM_GPP	96
+#define EM_NS32K	97
+#define EM_TPC		98
+#define EM_SNP1K	99
+#define EM_ST200	100
+#define EM_IP2K		101
+#define EM_MAX		102
+#define EM_CR		103
+#define EM_F2MC16	104
+#define EM_MSP430	105
+#define EM_BLACKFIN	106
+#define EM_SE_C33	107
+#define EM_SEP		108
+#define EM_ARCA		109
+#define EM_UNICORE	110
+#define EM_EXCESS	111
+#define EM_DXP		112
+#define EM_ALTERA_NIOS2 113
+#define EM_CRX		114
+#define EM_XGATE	115
+#define EM_C166		116
+#define EM_M16C		117
+#define EM_DSPIC30F	118
+#define EM_CE		119
+#define EM_M32C		120
+#define EM_TSK3000	131
+#define EM_RS08		132
+#define EM_SHARC	133
+#define EM_ECOG2	134
+#define EM_SCORE7	135
+#define EM_DSP24	136
+#define EM_VIDEOCORE3	137
+#define EM_LATTICEMICO32 138
+#define EM_SE_C17	139
+#define EM_TI_C6000	140
+#define EM_TI_C2000	141
+#define EM_TI_C5500	142
+#define EM_TI_ARP32	143
+#define EM_TI_PRU	144
+#define EM_MMDSP_PLUS	160
+#define EM_CYPRESS_M8C	161
+#define EM_R32C		162
+#define EM_TRIMEDIA	163
+#define EM_QDSP6	164
+#define EM_8051		165
+#define EM_STXP7X	166
+#define EM_NDS32	167
+#define EM_ECOG1X	168
+#define EM_MAXQ30	169
+#define EM_XIMO16	170
+#define EM_MANIK	171
+#define EM_CRAYNV2	172
+#define EM_RX		173
+#define EM_METAG	174
+#define EM_MCST_ELBRUS	175
+#define EM_ECOG16	176
+#define EM_CR16		177
+#define EM_ETPU		178
+#define EM_SLE9X	179
+#define EM_L10M		180
+#define EM_K10M		181
 #define EM_AARCH64	183
+#define EM_AVR32	185
+#define EM_STM8		186
+#define EM_TILE64	187
 #define EM_TILEPRO	188
 #define EM_MICROBLAZE	189
+#define EM_CUDA		190
 #define EM_TILEGX	191
-#define EM_NUM		192
+#define EM_CLOUDSHIELD	192
+#define EM_COREA_1ST	193
+#define EM_COREA_2ND	194
+#define EM_ARC_COMPACT2	195
+#define EM_OPEN8	196
+#define EM_RL78		197
+#define EM_VIDEOCORE5	198
+#define EM_78KOR	199
+#define EM_56800EX	200
+#define EM_BA1		201
+#define EM_BA2		202
+#define EM_XCORE	203
+#define EM_MCHP_PIC	204
+#define EM_KM32		210
+#define EM_KMX32	211
+#define EM_EMX16	212
+#define EM_EMX8		213
+#define EM_KVARC	214
+#define EM_CDP		215
+#define EM_COGE		216
+#define EM_COOL		217
+#define EM_NORC		218
+#define EM_CSR_KALIMBA	219
+#define EM_Z80		220
+#define EM_VISIUM	221
+#define EM_FT32		222
+#define EM_MOXIE	223
+#define EM_AMDGPU	224
+#define EM_RISCV	243
+#define EM_BPF		247
+#define EM_CSKY		252
+#define EM_NUM		253
+
 #define EM_ALPHA	0x9026
 
 #define EV_NONE		0
@@ -316,11 +416,32 @@ typedef struct {
 
 #define SHF_GROUP	     (1 << 9)
 #define SHF_TLS		     (1 << 10)
+#define SHF_COMPRESSED	     (1 << 11)
 #define SHF_MASKOS	     0x0ff00000
 #define SHF_MASKPROC	     0xf0000000
 #define SHF_ORDERED	     (1 << 30)
 #define SHF_EXCLUDE	     (1U << 31)
 
+typedef struct {
+  Elf32_Word	ch_type;
+  Elf32_Word	ch_size;
+  Elf32_Word	ch_addralign;
+} Elf32_Chdr;
+
+typedef struct {
+  Elf64_Word	ch_type;
+  Elf64_Word	ch_reserved;
+  Elf64_Xword	ch_size;
+  Elf64_Xword	ch_addralign;
+} Elf64_Chdr;
+
+#define ELFCOMPRESS_ZLIB	1
+#define ELFCOMPRESS_LOOS	0x60000000
+#define ELFCOMPRESS_HIOS	0x6fffffff
+#define ELFCOMPRESS_LOPROC	0x70000000
+#define ELFCOMPRESS_HIPROC	0x7fffffff
+
+
 #define GRP_COMDAT	0x1
 
 typedef struct {
@@ -409,8 +530,7 @@ typedef struct {
 
 
 
-typedef struct
-{
+typedef struct {
   Elf32_Addr	r_offset;
   Elf32_Word	r_info;
 } Elf32_Rel;
@@ -504,6 +624,7 @@ typedef struct {
 
 
 #define NT_PRSTATUS	1
+#define NT_PRFPREG	2
 #define NT_FPREGSET	2
 #define NT_PRPSINFO	3
 #define NT_PRXREG	4
@@ -525,6 +646,19 @@ typedef struct {
 #define NT_PPC_VMX	0x100
 #define NT_PPC_SPE	0x101
 #define NT_PPC_VSX	0x102
+#define NT_PPC_TAR	0x103
+#define NT_PPC_PPR	0x104
+#define NT_PPC_DSCR	0x105
+#define NT_PPC_EBB	0x106
+#define NT_PPC_PMU	0x107
+#define NT_PPC_TM_CGPR	0x108
+#define NT_PPC_TM_CFPR	0x109
+#define NT_PPC_TM_CVMX	0x10a
+#define NT_PPC_TM_CVSX	0x10b
+#define NT_PPC_TM_SPR	0x10c
+#define NT_PPC_TM_CTAR	0x10d
+#define NT_PPC_TM_CPPR	0x10e
+#define NT_PPC_TM_CDSCR	0x10f
 #define NT_386_TLS	0x200
 #define NT_386_IOPERM	0x201
 #define NT_X86_XSTATE	0x202
@@ -537,13 +671,28 @@ typedef struct {
 #define NT_S390_LAST_BREAK	0x306
 #define NT_S390_SYSTEM_CALL	0x307
 #define NT_S390_TDB	0x308
+#define NT_S390_VXRS_LOW	0x309
+#define NT_S390_VXRS_HIGH	0x30a
+#define NT_S390_GS_CB	0x30b
+#define NT_S390_GS_BC	0x30c
+#define NT_S390_RI_CB	0x30d
 #define NT_ARM_VFP	0x400
 #define NT_ARM_TLS	0x401
 #define NT_ARM_HW_BREAK	0x402
 #define NT_ARM_HW_WATCH	0x403
+#define NT_ARM_SYSTEM_CALL	0x404
+#define NT_ARM_SVE	0x405
+#define NT_ARM_PAC_MASK	0x406
+#define NT_ARM_PACA_KEYS	0x407
+#define NT_ARM_PACG_KEYS	0x408
 #define NT_METAG_CBUF	0x500
 #define NT_METAG_RPIPE	0x501
 #define NT_METAG_TLS	0x502
+#define NT_ARC_V2	0x600
+#define NT_VMCOREDD	0x700
+#define NT_MIPS_DSP	0x800
+#define NT_MIPS_FP_MODE	0x801
+#define NT_MIPS_MSA	0x802
 #define NT_VERSION	1
 
 
@@ -601,7 +750,8 @@ typedef struct {
 #define DT_ENCODING	32
 #define DT_PREINIT_ARRAY 32
 #define DT_PREINIT_ARRAYSZ 33
-#define	DT_NUM		34
+#define DT_SYMTAB_SHNDX	34
+#define	DT_NUM		35
 #define DT_LOOS		0x6000000d
 #define DT_HIOS		0x6ffff000
 #define DT_LOPROC	0x70000000
@@ -701,6 +851,8 @@ typedef struct {
 #define	DF_1_SYMINTPOSE	0x00800000
 #define	DF_1_GLOBAUDIT	0x01000000
 #define	DF_1_SINGLETON	0x02000000
+#define	DF_1_STUB	0x04000000
+#define	DF_1_PIE	0x08000000
 
 #define DTF_1_PARINIT	0x00000001
 #define DTF_1_CONFEXP	0x00000002
@@ -882,7 +1034,16 @@ typedef struct {
 #define AT_L2_CACHESHAPE	36
 #define AT_L3_CACHESHAPE	37
 
+#define AT_L1I_CACHESIZE	40
+#define AT_L1I_CACHEGEOMETRY	41
+#define AT_L1D_CACHESIZE	42
+#define AT_L1D_CACHEGEOMETRY	43
+#define AT_L2_CACHESIZE		44
+#define AT_L2_CACHEGEOMETRY	45
+#define AT_L3_CACHESIZE		46
+#define AT_L3_CACHEGEOMETRY	47
 
+#define AT_MINSIGSTKSZ		51
 
 
 typedef struct {
@@ -977,7 +1138,25 @@ typedef struct {
 #define R_68K_GLOB_DAT	20
 #define R_68K_JMP_SLOT	21
 #define R_68K_RELATIVE	22
-#define R_68K_NUM	23
+#define R_68K_TLS_GD32	25
+#define R_68K_TLS_GD16	26
+#define R_68K_TLS_GD8	27
+#define R_68K_TLS_LDM32	28
+#define R_68K_TLS_LDM16	29
+#define R_68K_TLS_LDM8	30
+#define R_68K_TLS_LDO32	31
+#define R_68K_TLS_LDO16	32
+#define R_68K_TLS_LDO8	33
+#define R_68K_TLS_IE32	34
+#define R_68K_TLS_IE16	35
+#define R_68K_TLS_IE8	36
+#define R_68K_TLS_LE32	37
+#define R_68K_TLS_LE16	38
+#define R_68K_TLS_LE8	39
+#define R_68K_TLS_DTPMOD32	40
+#define R_68K_TLS_DTPREL32	41
+#define R_68K_TLS_TPREL32	42
+#define R_68K_NUM	43
 
 #define R_386_NONE	   0
 #define R_386_32	   1
@@ -1020,7 +1199,8 @@ typedef struct {
 #define R_386_TLS_DESC_CALL 40
 #define R_386_TLS_DESC     41
 #define R_386_IRELATIVE	   42
-#define R_386_NUM	   43
+#define R_386_GOT32X	   43
+#define R_386_NUM	   44
 
 
 
@@ -1153,6 +1333,7 @@ typedef struct {
 #define EF_MIPS_64BIT_WHIRL 16
 #define EF_MIPS_ABI2	    32
 #define EF_MIPS_ABI_ON32    64
+#define EF_MIPS_FP64	    512
 #define EF_MIPS_NAN2008     1024
 #define EF_MIPS_ARCH	    0xf0000000
 
@@ -1397,6 +1578,7 @@ typedef struct {
 #define PT_MIPS_REGINFO	0x70000000
 #define PT_MIPS_RTPROC  0x70000001
 #define PT_MIPS_OPTIONS 0x70000002
+#define PT_MIPS_ABIFLAGS 0x70000003
 
 
 
@@ -1460,7 +1642,8 @@ typedef struct {
 #define DT_MIPS_PLTGOT	     0x70000032
 
 #define DT_MIPS_RWPLT        0x70000034
-#define DT_MIPS_NUM	     0x35
+#define DT_MIPS_RLD_MAP_REL  0x70000035
+#define DT_MIPS_NUM	     0x36
 
 
 
@@ -1483,8 +1666,7 @@ typedef struct {
 
 
 
-typedef struct
-{
+typedef struct {
   Elf32_Word l_name;
   Elf32_Word l_time_stamp;
   Elf32_Word l_checksum;
@@ -1492,8 +1674,7 @@ typedef struct
   Elf32_Word l_flags;
 } Elf32_Lib;
 
-typedef struct
-{
+typedef struct {
   Elf64_Word l_name;
   Elf64_Word l_time_stamp;
   Elf64_Word l_checksum;
@@ -1516,7 +1697,73 @@ typedef struct
 
 typedef Elf32_Addr Elf32_Conflict;
 
-
+typedef struct {
+  Elf32_Half version;
+  unsigned char isa_level;
+  unsigned char isa_rev;
+  unsigned char gpr_size;
+  unsigned char cpr1_size;
+  unsigned char cpr2_size;
+  unsigned char fp_abi;
+  Elf32_Word isa_ext;
+  Elf32_Word ases;
+  Elf32_Word flags1;
+  Elf32_Word flags2;
+} Elf_MIPS_ABIFlags_v0;
+
+#define MIPS_AFL_REG_NONE	0x00
+#define MIPS_AFL_REG_32		0x01
+#define MIPS_AFL_REG_64		0x02
+#define MIPS_AFL_REG_128	0x03
+
+#define MIPS_AFL_ASE_DSP	0x00000001
+#define MIPS_AFL_ASE_DSPR2	0x00000002
+#define MIPS_AFL_ASE_EVA	0x00000004
+#define MIPS_AFL_ASE_MCU	0x00000008
+#define MIPS_AFL_ASE_MDMX	0x00000010
+#define MIPS_AFL_ASE_MIPS3D	0x00000020
+#define MIPS_AFL_ASE_MT		0x00000040
+#define MIPS_AFL_ASE_SMARTMIPS	0x00000080
+#define MIPS_AFL_ASE_VIRT	0x00000100
+#define MIPS_AFL_ASE_MSA	0x00000200
+#define MIPS_AFL_ASE_MIPS16	0x00000400
+#define MIPS_AFL_ASE_MICROMIPS	0x00000800
+#define MIPS_AFL_ASE_XPA	0x00001000
+#define MIPS_AFL_ASE_MASK	0x00001fff
+
+#define MIPS_AFL_EXT_XLR	  1
+#define MIPS_AFL_EXT_OCTEON2	  2
+#define MIPS_AFL_EXT_OCTEONP	  3
+#define MIPS_AFL_EXT_LOONGSON_3A  4
+#define MIPS_AFL_EXT_OCTEON	  5
+#define MIPS_AFL_EXT_5900	  6
+#define MIPS_AFL_EXT_4650	  7
+#define MIPS_AFL_EXT_4010	  8
+#define MIPS_AFL_EXT_4100	  9
+#define MIPS_AFL_EXT_3900	  10
+#define MIPS_AFL_EXT_10000	  11
+#define MIPS_AFL_EXT_SB1	  12
+#define MIPS_AFL_EXT_4111	  13
+#define MIPS_AFL_EXT_4120	  14
+#define MIPS_AFL_EXT_5400	  15
+#define MIPS_AFL_EXT_5500	  16
+#define MIPS_AFL_EXT_LOONGSON_2E  17
+#define MIPS_AFL_EXT_LOONGSON_2F  18
+
+#define MIPS_AFL_FLAGS1_ODDSPREG  1
+
+enum
+{
+  Val_GNU_MIPS_ABI_FP_ANY = 0,
+  Val_GNU_MIPS_ABI_FP_DOUBLE = 1,
+  Val_GNU_MIPS_ABI_FP_SINGLE = 2,
+  Val_GNU_MIPS_ABI_FP_SOFT = 3,
+  Val_GNU_MIPS_ABI_FP_OLD_64 = 4,
+  Val_GNU_MIPS_ABI_FP_XX = 5,
+  Val_GNU_MIPS_ABI_FP_64 = 6,
+  Val_GNU_MIPS_ABI_FP_64A = 7,
+  Val_GNU_MIPS_ABI_FP_MAX = 7
+};
 
 
 
@@ -1857,7 +2104,8 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_PPC_GOT_DTPREL16_LO	92
 #define R_PPC_GOT_DTPREL16_HI	93
 #define R_PPC_GOT_DTPREL16_HA	94
-
+#define R_PPC_TLSGD		95
+#define R_PPC_TLSLD		96
 
 
 #define R_PPC_EMB_NADDR32	101
@@ -1900,7 +2148,10 @@ typedef Elf32_Addr Elf32_Conflict;
 
 
 #define DT_PPC_GOT		(DT_LOPROC + 0)
-#define DT_PPC_NUM		1
+#define DT_PPC_OPT		(DT_LOPROC + 1)
+#define DT_PPC_NUM		2
+
+#define PPC_OPT_TLS		1
 
 
 #define R_PPC64_NONE		R_PPC_NONE
@@ -2013,6 +2264,15 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_PPC64_DTPREL16_HIGHERA 104
 #define R_PPC64_DTPREL16_HIGHEST 105
 #define R_PPC64_DTPREL16_HIGHESTA 106
+#define R_PPC64_TLSGD		107
+#define R_PPC64_TLSLD		108
+#define R_PPC64_TOCSAVE		109
+#define R_PPC64_ADDR16_HIGH	110
+#define R_PPC64_ADDR16_HIGHA	111
+#define R_PPC64_TPREL16_HIGH	112
+#define R_PPC64_TPREL16_HIGHA	113
+#define R_PPC64_DTPREL16_HIGH	114
+#define R_PPC64_DTPREL16_HIGHA	115
 
 
 #define R_PPC64_JMP_IREL	247
@@ -2022,14 +2282,21 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_PPC64_REL16_HI	251
 #define R_PPC64_REL16_HA	252
 
+#define EF_PPC64_ABI	3
 
 #define DT_PPC64_GLINK  (DT_LOPROC + 0)
 #define DT_PPC64_OPD	(DT_LOPROC + 1)
 #define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
-#define DT_PPC64_NUM    3
-
+#define DT_PPC64_OPT	(DT_LOPROC + 3)
+#define DT_PPC64_NUM	4
 
+#define PPC64_OPT_TLS		1
+#define PPC64_OPT_MULTI_TOC	2
+#define PPC64_OPT_LOCALENTRY	4
 
+#define STO_PPC64_LOCAL_BIT	5
+#define STO_PPC64_LOCAL_MASK	0xe0
+#define PPC64_LOCAL_ENTRY_OFFSET(x) (1 << (((x)&0xe0)>>5) & 0xfc)
 
 
 #define EF_ARM_RELEXEC		0x01
@@ -2089,8 +2356,17 @@ typedef Elf32_Addr Elf32_Conflict;
 #define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2)
 #define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3)
 
-
 #define R_AARCH64_NONE            0
+#define R_AARCH64_P32_ABS32	1
+#define R_AARCH64_P32_COPY	180
+#define R_AARCH64_P32_GLOB_DAT	181
+#define R_AARCH64_P32_JUMP_SLOT	182
+#define R_AARCH64_P32_RELATIVE	183
+#define R_AARCH64_P32_TLS_DTPMOD 184
+#define R_AARCH64_P32_TLS_DTPREL 185
+#define R_AARCH64_P32_TLS_TPREL	186
+#define R_AARCH64_P32_TLSDESC	187
+#define R_AARCH64_P32_IRELATIVE	188
 #define R_AARCH64_ABS64         257
 #define R_AARCH64_ABS32         258
 #define R_AARCH64_ABS16		259
@@ -2208,8 +2484,11 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_AARCH64_GLOB_DAT     1025
 #define R_AARCH64_JUMP_SLOT    1026
 #define R_AARCH64_RELATIVE     1027
+#define R_AARCH64_TLS_DTPMOD   1028
 #define R_AARCH64_TLS_DTPMOD64 1028
+#define R_AARCH64_TLS_DTPREL   1029
 #define R_AARCH64_TLS_DTPREL64 1029
+#define R_AARCH64_TLS_TPREL    1030
 #define R_AARCH64_TLS_TPREL64  1030
 #define R_AARCH64_TLSDESC      1031
 
@@ -2347,6 +2626,61 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_ARM_NUM		256
 
 
+#define R_CKCORE_NONE               0
+#define R_CKCORE_ADDR32             1
+#define R_CKCORE_PCRELIMM8BY4       2
+#define R_CKCORE_PCRELIMM11BY2      3
+#define R_CKCORE_PCREL32            5
+#define R_CKCORE_PCRELJSR_IMM11BY2  6
+#define R_CKCORE_RELATIVE           9
+#define R_CKCORE_COPY               10
+#define R_CKCORE_GLOB_DAT           11
+#define R_CKCORE_JUMP_SLOT          12
+#define R_CKCORE_GOTOFF             13
+#define R_CKCORE_GOTPC              14
+#define R_CKCORE_GOT32              15
+#define R_CKCORE_PLT32              16
+#define R_CKCORE_ADDRGOT            17
+#define R_CKCORE_ADDRPLT            18
+#define R_CKCORE_PCREL_IMM26BY2     19
+#define R_CKCORE_PCREL_IMM16BY2     20
+#define R_CKCORE_PCREL_IMM16BY4     21
+#define R_CKCORE_PCREL_IMM10BY2     22
+#define R_CKCORE_PCREL_IMM10BY4     23
+#define R_CKCORE_ADDR_HI16          24
+#define R_CKCORE_ADDR_LO16          25
+#define R_CKCORE_GOTPC_HI16         26
+#define R_CKCORE_GOTPC_LO16         27
+#define R_CKCORE_GOTOFF_HI16        28
+#define R_CKCORE_GOTOFF_LO16        29
+#define R_CKCORE_GOT12              30
+#define R_CKCORE_GOT_HI16           31
+#define R_CKCORE_GOT_LO16           32
+#define R_CKCORE_PLT12              33
+#define R_CKCORE_PLT_HI16           34
+#define R_CKCORE_PLT_LO16           35
+#define R_CKCORE_ADDRGOT_HI16       36
+#define R_CKCORE_ADDRGOT_LO16       37
+#define R_CKCORE_ADDRPLT_HI16       38
+#define R_CKCORE_ADDRPLT_LO16       39
+#define R_CKCORE_PCREL_JSR_IMM26BY2 40
+#define R_CKCORE_TOFFSET_LO16       41
+#define R_CKCORE_DOFFSET_LO16       42
+#define R_CKCORE_PCREL_IMM18BY2     43
+#define R_CKCORE_DOFFSET_IMM18      44
+#define R_CKCORE_DOFFSET_IMM18BY2   45
+#define R_CKCORE_DOFFSET_IMM18BY4   46
+#define R_CKCORE_GOT_IMM18BY4       48
+#define R_CKCORE_PLT_IMM18BY4       49
+#define R_CKCORE_PCREL_IMM7BY4      50
+#define R_CKCORE_TLS_LE32           51
+#define R_CKCORE_TLS_IE32           52
+#define R_CKCORE_TLS_GD32           53
+#define R_CKCORE_TLS_LDM32          54
+#define R_CKCORE_TLS_LDO32          55
+#define R_CKCORE_TLS_DTPMOD32       56
+#define R_CKCORE_TLS_DTPOFF32       57
+#define R_CKCORE_TLS_TPOFF32        58
 
 
 #define EF_IA_64_MASKOS		0x0000000f
@@ -2459,7 +2793,28 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_IA64_LTOFF_DTPREL22	0xba
 
 
-
+#define EF_SH_MACH_MASK		0x1f
+#define EF_SH_UNKNOWN		0x0
+#define EF_SH1			0x1
+#define EF_SH2			0x2
+#define EF_SH3			0x3
+#define EF_SH_DSP		0x4
+#define EF_SH3_DSP		0x5
+#define EF_SH4AL_DSP		0x6
+#define EF_SH3E			0x8
+#define EF_SH4			0x9
+#define EF_SH2E			0xb
+#define EF_SH4A			0xc
+#define EF_SH2A			0xd
+#define EF_SH4_NOFPU		0x10
+#define EF_SH4A_NOFPU		0x11
+#define EF_SH4_NOMMU_NOFPU	0x12
+#define EF_SH2A_NOFPU		0x13
+#define EF_SH3_NOMMU		0x14
+#define EF_SH2A_SH4_NOFPU	0x15
+#define EF_SH2A_SH3_NOFPU	0x16
+#define EF_SH2A_SH4		0x17
+#define EF_SH2A_SH3E		0x18
 
 #define	R_SH_NONE		0
 #define	R_SH_DIR32		1
@@ -2498,6 +2853,14 @@ typedef Elf32_Addr Elf32_Conflict;
 #define	R_SH_RELATIVE		165
 #define	R_SH_GOTOFF		166
 #define	R_SH_GOTPC		167
+#define	R_SH_GOT20		201
+#define	R_SH_GOTOFF20		202
+#define	R_SH_GOTFUNCDESC	203
+#define	R_SH_GOTFUNCDEST20	204
+#define	R_SH_GOTOFFFUNCDESC	205
+#define	R_SH_GOTOFFFUNCDEST20	206
+#define	R_SH_FUNCDESC		207
+#define	R_SH_FUNCDESC_VALUE	208
 
 #define	R_SH_NUM		256
 
@@ -2657,7 +3020,9 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_X86_64_TLSDESC        36
 #define R_X86_64_IRELATIVE	37
 #define R_X86_64_RELATIVE64	38
-#define R_X86_64_NUM		39
+#define R_X86_64_GOTPCRELX	41
+#define R_X86_64_REX_GOTPCRELX	42
+#define R_X86_64_NUM		43
 
 
 
@@ -2775,6 +3140,55 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_MICROBLAZE_TLSGOTTPREL32 28
 #define R_MICROBLAZE_TLSTPREL32	 29
 
+#define DT_NIOS2_GP             0x70000002
+
+#define R_NIOS2_NONE		0
+#define R_NIOS2_S16		1
+#define R_NIOS2_U16		2
+#define R_NIOS2_PCREL16		3
+#define R_NIOS2_CALL26		4
+#define R_NIOS2_IMM5		5
+#define R_NIOS2_CACHE_OPX	6
+#define R_NIOS2_IMM6		7
+#define R_NIOS2_IMM8		8
+#define R_NIOS2_HI16		9
+#define R_NIOS2_LO16		10
+#define R_NIOS2_HIADJ16		11
+#define R_NIOS2_BFD_RELOC_32	12
+#define R_NIOS2_BFD_RELOC_16	13
+#define R_NIOS2_BFD_RELOC_8	14
+#define R_NIOS2_GPREL		15
+#define R_NIOS2_GNU_VTINHERIT	16
+#define R_NIOS2_GNU_VTENTRY	17
+#define R_NIOS2_UJMP		18
+#define R_NIOS2_CJMP		19
+#define R_NIOS2_CALLR		20
+#define R_NIOS2_ALIGN		21
+#define R_NIOS2_GOT16		22
+#define R_NIOS2_CALL16		23
+#define R_NIOS2_GOTOFF_LO	24
+#define R_NIOS2_GOTOFF_HA	25
+#define R_NIOS2_PCREL_LO	26
+#define R_NIOS2_PCREL_HA	27
+#define R_NIOS2_TLS_GD16	28
+#define R_NIOS2_TLS_LDM16	29
+#define R_NIOS2_TLS_LDO16	30
+#define R_NIOS2_TLS_IE16	31
+#define R_NIOS2_TLS_LE16	32
+#define R_NIOS2_TLS_DTPMOD	33
+#define R_NIOS2_TLS_DTPREL	34
+#define R_NIOS2_TLS_TPREL	35
+#define R_NIOS2_COPY		36
+#define R_NIOS2_GLOB_DAT	37
+#define R_NIOS2_JUMP_SLOT	38
+#define R_NIOS2_RELATIVE	39
+#define R_NIOS2_GOTOFF		40
+#define R_NIOS2_CALL26_NOAT	41
+#define R_NIOS2_GOT_LO		42
+#define R_NIOS2_GOT_HA		43
+#define R_NIOS2_CALL_LO		44
+#define R_NIOS2_CALL_HA		45
+
 #define R_OR1K_NONE		0
 #define R_OR1K_32		1
 #define R_OR1K_16		2
@@ -2811,6 +3225,65 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_OR1K_TLS_DTPOFF	33
 #define R_OR1K_TLS_DTPMOD	34
 
+#define R_BPF_NONE		0
+#define R_BPF_MAP_FD		1
+
+#define R_RISCV_NONE            0
+#define R_RISCV_32              1
+#define R_RISCV_64              2
+#define R_RISCV_RELATIVE        3
+#define R_RISCV_COPY            4
+#define R_RISCV_JUMP_SLOT       5
+#define R_RISCV_TLS_DTPMOD32    6
+#define R_RISCV_TLS_DTPMOD64    7
+#define R_RISCV_TLS_DTPREL32    8
+#define R_RISCV_TLS_DTPREL64    9
+#define R_RISCV_TLS_TPREL32     10
+#define R_RISCV_TLS_TPREL64     11
+
+#define R_RISCV_BRANCH          16
+#define R_RISCV_JAL             17
+#define R_RISCV_CALL            18
+#define R_RISCV_CALL_PLT        19
+#define R_RISCV_GOT_HI20        20
+#define R_RISCV_TLS_GOT_HI20    21
+#define R_RISCV_TLS_GD_HI20     22
+#define R_RISCV_PCREL_HI20      23
+#define R_RISCV_PCREL_LO12_I    24
+#define R_RISCV_PCREL_LO12_S    25
+#define R_RISCV_HI20            26
+#define R_RISCV_LO12_I          27
+#define R_RISCV_LO12_S          28
+#define R_RISCV_TPREL_HI20      29
+#define R_RISCV_TPREL_LO12_I    30
+#define R_RISCV_TPREL_LO12_S    31
+#define R_RISCV_TPREL_ADD       32
+#define R_RISCV_ADD8            33
+#define R_RISCV_ADD16           34
+#define R_RISCV_ADD32           35
+#define R_RISCV_ADD64           36
+#define R_RISCV_SUB8            37
+#define R_RISCV_SUB16           38
+#define R_RISCV_SUB32           39
+#define R_RISCV_SUB64           40
+#define R_RISCV_GNU_VTINHERIT   41
+#define R_RISCV_GNU_VTENTRY     42
+#define R_RISCV_ALIGN           43
+#define R_RISCV_RVC_BRANCH      44
+#define R_RISCV_RVC_JUMP        45
+#define R_RISCV_RVC_LUI         46
+#define R_RISCV_GPREL_I         47
+#define R_RISCV_GPREL_S         48
+#define R_RISCV_TPREL_I         49
+#define R_RISCV_TPREL_S         50
+#define R_RISCV_RELAX           51
+#define R_RISCV_SUB6            52
+#define R_RISCV_SET6            53
+#define R_RISCV_SET8            54
+#define R_RISCV_SET16           55
+#define R_RISCV_SET32           56
+#define R_RISCV_32_PCREL        57
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/endian.h b/src/components/lib/libc/musl-1.2.0/include/endian.h
new file mode 100644
index 0000000000..172c43203a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/endian.h
@@ -0,0 +1,80 @@
+#ifndef _ENDIAN_H
+#define _ENDIAN_H
+
+#include <features.h>
+
+#define __NEED_uint16_t
+#define __NEED_uint32_t
+#define __NEED_uint64_t
+
+#include <bits/alltypes.h>
+
+#define __PDP_ENDIAN 3412
+
+#define BIG_ENDIAN __BIG_ENDIAN
+#define LITTLE_ENDIAN __LITTLE_ENDIAN
+#define PDP_ENDIAN __PDP_ENDIAN
+#define BYTE_ORDER __BYTE_ORDER
+
+static __inline uint16_t __bswap16(uint16_t __x)
+{
+	return __x<<8 | __x>>8;
+}
+
+static __inline uint32_t __bswap32(uint32_t __x)
+{
+	return __x>>24 | __x>>8&0xff00 | __x<<8&0xff0000 | __x<<24;
+}
+
+static __inline uint64_t __bswap64(uint64_t __x)
+{
+	return __bswap32(__x)+0ULL<<32 | __bswap32(__x>>32);
+}
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define htobe16(x) __bswap16(x)
+#define be16toh(x) __bswap16(x)
+#define htobe32(x) __bswap32(x)
+#define be32toh(x) __bswap32(x)
+#define htobe64(x) __bswap64(x)
+#define be64toh(x) __bswap64(x)
+#define htole16(x) (uint16_t)(x)
+#define le16toh(x) (uint16_t)(x)
+#define htole32(x) (uint32_t)(x)
+#define le32toh(x) (uint32_t)(x)
+#define htole64(x) (uint64_t)(x)
+#define le64toh(x) (uint64_t)(x)
+#else
+#define htobe16(x) (uint16_t)(x)
+#define be16toh(x) (uint16_t)(x)
+#define htobe32(x) (uint32_t)(x)
+#define be32toh(x) (uint32_t)(x)
+#define htobe64(x) (uint64_t)(x)
+#define be64toh(x) (uint64_t)(x)
+#define htole16(x) __bswap16(x)
+#define le16toh(x) __bswap16(x)
+#define htole32(x) __bswap32(x)
+#define le32toh(x) __bswap32(x)
+#define htole64(x) __bswap64(x)
+#define le64toh(x) __bswap64(x)
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define betoh16(x) __bswap16(x)
+#define betoh32(x) __bswap32(x)
+#define betoh64(x) __bswap64(x)
+#define letoh16(x) (uint16_t)(x)
+#define letoh32(x) (uint32_t)(x)
+#define letoh64(x) (uint64_t)(x)
+#else
+#define betoh16(x) (uint16_t)(x)
+#define betoh32(x) (uint32_t)(x)
+#define betoh64(x) (uint64_t)(x)
+#define letoh16(x) __bswap16(x)
+#define letoh32(x) __bswap32(x)
+#define letoh64(x) __bswap64(x)
+#endif
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/err.h b/src/components/lib/libc/musl-1.2.0/include/err.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/err.h
rename to src/components/lib/libc/musl-1.2.0/include/err.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/errno.h b/src/components/lib/libc/musl-1.2.0/include/errno.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/errno.h
rename to src/components/lib/libc/musl-1.2.0/include/errno.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/fcntl.h b/src/components/lib/libc/musl-1.2.0/include/fcntl.h
new file mode 100644
index 0000000000..b664cdc441
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/fcntl.h
@@ -0,0 +1,216 @@
+#ifndef	_FCNTL_H
+#define	_FCNTL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_off_t
+#define __NEED_pid_t
+#define __NEED_mode_t
+
+#ifdef _GNU_SOURCE
+#define __NEED_size_t
+#define __NEED_ssize_t
+#define __NEED_struct_iovec
+#endif
+
+#include <bits/alltypes.h>
+
+#include <bits/fcntl.h>
+
+struct flock {
+	short l_type;
+	short l_whence;
+	off_t l_start;
+	off_t l_len;
+	pid_t l_pid;
+};
+
+int creat(const char *, mode_t);
+int fcntl(int, int, ...);
+int open(const char *, int, ...);
+int openat(int, const char *, int, ...);
+int posix_fadvise(int, off_t, off_t, int);
+int posix_fallocate(int, off_t, off_t);
+
+#define O_SEARCH   O_PATH
+#define O_EXEC     O_PATH
+#define O_TTY_INIT 0
+
+#define O_ACCMODE (03|O_SEARCH)
+#define O_RDONLY  00
+#define O_WRONLY  01
+#define O_RDWR    02
+
+#define F_OFD_GETLK 36
+#define F_OFD_SETLK 37
+#define F_OFD_SETLKW 38
+
+#define F_DUPFD_CLOEXEC 1030
+
+#define F_RDLCK 0
+#define F_WRLCK 1
+#define F_UNLCK 2
+
+#define FD_CLOEXEC 1
+
+#define AT_FDCWD (-100)
+#define AT_SYMLINK_NOFOLLOW 0x100
+#define AT_REMOVEDIR 0x200
+#define AT_SYMLINK_FOLLOW 0x400
+#define AT_EACCESS 0x200
+
+#define POSIX_FADV_NORMAL     0
+#define POSIX_FADV_RANDOM     1
+#define POSIX_FADV_SEQUENTIAL 2
+#define POSIX_FADV_WILLNEED   3
+#ifndef POSIX_FADV_DONTNEED
+#define POSIX_FADV_DONTNEED   4
+#define POSIX_FADV_NOREUSE    5
+#endif
+
+#undef SEEK_SET
+#undef SEEK_CUR
+#undef SEEK_END
+#define SEEK_SET 0
+#define SEEK_CUR 1
+#define SEEK_END 2
+
+#ifndef S_IRUSR
+#define S_ISUID 04000
+#define S_ISGID 02000
+#define S_ISVTX 01000
+#define S_IRUSR 0400
+#define S_IWUSR 0200
+#define S_IXUSR 0100
+#define S_IRWXU 0700
+#define S_IRGRP 0040
+#define S_IWGRP 0020
+#define S_IXGRP 0010
+#define S_IRWXG 0070
+#define S_IROTH 0004
+#define S_IWOTH 0002
+#define S_IXOTH 0001
+#define S_IRWXO 0007
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define AT_NO_AUTOMOUNT 0x800
+#define AT_EMPTY_PATH 0x1000
+#define AT_STATX_SYNC_TYPE 0x6000
+#define AT_STATX_SYNC_AS_STAT 0x0000
+#define AT_STATX_FORCE_SYNC 0x2000
+#define AT_STATX_DONT_SYNC 0x4000
+#define AT_RECURSIVE 0x8000
+
+#define FAPPEND O_APPEND
+#define FFSYNC O_SYNC
+#define FASYNC O_ASYNC
+#define FNONBLOCK O_NONBLOCK
+#define FNDELAY O_NDELAY
+
+#define F_OK 0
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+#define F_ULOCK 0
+#define F_LOCK  1
+#define F_TLOCK 2
+#define F_TEST  3
+
+#define F_SETLEASE	1024
+#define F_GETLEASE	1025
+#define F_NOTIFY	1026
+#define F_CANCELLK	1029
+#define F_SETPIPE_SZ	1031
+#define F_GETPIPE_SZ	1032
+#define F_ADD_SEALS	1033
+#define F_GET_SEALS	1034
+
+#define F_SEAL_SEAL	0x0001
+#define F_SEAL_SHRINK	0x0002
+#define F_SEAL_GROW	0x0004
+#define F_SEAL_WRITE	0x0008
+#define F_SEAL_FUTURE_WRITE	0x0010
+
+#define F_GET_RW_HINT		1035
+#define F_SET_RW_HINT		1036
+#define F_GET_FILE_RW_HINT	1037
+#define F_SET_FILE_RW_HINT	1038
+
+#define RWF_WRITE_LIFE_NOT_SET	0
+#define RWH_WRITE_LIFE_NONE	1
+#define RWH_WRITE_LIFE_SHORT	2
+#define RWH_WRITE_LIFE_MEDIUM	3
+#define RWH_WRITE_LIFE_LONG	4
+#define RWH_WRITE_LIFE_EXTREME	5
+
+#define DN_ACCESS	0x00000001
+#define DN_MODIFY	0x00000002
+#define DN_CREATE	0x00000004
+#define DN_DELETE	0x00000008
+#define DN_RENAME	0x00000010
+#define DN_ATTRIB	0x00000020
+#define DN_MULTISHOT	0x80000000
+
+int lockf(int, int, off_t);
+#endif
+
+#if defined(_GNU_SOURCE)
+#define F_OWNER_TID 0
+#define F_OWNER_PID 1
+#define F_OWNER_PGRP 2
+#define F_OWNER_GID 2
+struct file_handle {
+	unsigned handle_bytes;
+	int handle_type;
+	unsigned char f_handle[];
+};
+struct f_owner_ex {
+	int type;
+	pid_t pid;
+};
+#define FALLOC_FL_KEEP_SIZE 1
+#define FALLOC_FL_PUNCH_HOLE 2
+#define MAX_HANDLE_SZ 128
+#define SYNC_FILE_RANGE_WAIT_BEFORE 1
+#define SYNC_FILE_RANGE_WRITE 2
+#define SYNC_FILE_RANGE_WAIT_AFTER 4
+#define SPLICE_F_MOVE 1
+#define SPLICE_F_NONBLOCK 2
+#define SPLICE_F_MORE 4
+#define SPLICE_F_GIFT 8
+int fallocate(int, int, off_t, off_t);
+#define fallocate64 fallocate
+int name_to_handle_at(int, const char *, struct file_handle *, int *, int);
+int open_by_handle_at(int, struct file_handle *, int);
+ssize_t readahead(int, off_t, size_t);
+int sync_file_range(int, off_t, off_t, unsigned);
+ssize_t vmsplice(int, const struct iovec *, size_t, unsigned);
+ssize_t splice(int, off_t *, int, off_t *, size_t, unsigned);
+ssize_t tee(int, int, size_t, unsigned);
+#define loff_t off_t
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define F_GETLK64 F_GETLK
+#define F_SETLK64 F_SETLK
+#define F_SETLKW64 F_SETLKW
+#define flock64 flock
+#define open64 open
+#define openat64 openat
+#define creat64 creat
+#define lockf64 lockf
+#define posix_fadvise64 posix_fadvise
+#define posix_fallocate64 posix_fallocate
+#define off64_t off_t
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/features.h b/src/components/lib/libc/musl-1.2.0/include/features.h
new file mode 100644
index 0000000000..85cfb72a0d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/features.h
@@ -0,0 +1,40 @@
+#ifndef _FEATURES_H
+#define _FEATURES_H
+
+#if defined(_ALL_SOURCE) && !defined(_GNU_SOURCE)
+#define _GNU_SOURCE 1
+#endif
+
+#if defined(_DEFAULT_SOURCE) && !defined(_BSD_SOURCE)
+#define _BSD_SOURCE 1
+#endif
+
+#if !defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE) \
+ && !defined(_XOPEN_SOURCE) && !defined(_GNU_SOURCE) \
+ && !defined(_BSD_SOURCE) && !defined(__STRICT_ANSI__)
+#define _BSD_SOURCE 1
+#define _XOPEN_SOURCE 700
+#endif
+
+#if __STDC_VERSION__ >= 199901L
+#define __restrict restrict
+#elif !defined(__GNUC__)
+#define __restrict
+#endif
+
+#if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
+#define __inline inline
+#elif !defined(__GNUC__)
+#define __inline
+#endif
+
+#if __STDC_VERSION__ >= 201112L
+#elif defined(__GNUC__)
+#define _Noreturn __attribute__((__noreturn__))
+#else
+#define _Noreturn
+#endif
+
+#define __REDIR(x,y) __typeof__(x) x __asm__(#y)
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/fenv.h b/src/components/lib/libc/musl-1.2.0/include/fenv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/fenv.h
rename to src/components/lib/libc/musl-1.2.0/include/fenv.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/float.h b/src/components/lib/libc/musl-1.2.0/include/float.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/float.h
rename to src/components/lib/libc/musl-1.2.0/include/float.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/fmtmsg.h b/src/components/lib/libc/musl-1.2.0/include/fmtmsg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/fmtmsg.h
rename to src/components/lib/libc/musl-1.2.0/include/fmtmsg.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/fnmatch.h b/src/components/lib/libc/musl-1.2.0/include/fnmatch.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/fnmatch.h
rename to src/components/lib/libc/musl-1.2.0/include/fnmatch.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/ftw.h b/src/components/lib/libc/musl-1.2.0/include/ftw.h
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/include/ftw.h
rename to src/components/lib/libc/musl-1.2.0/include/ftw.h
index c8eadbc9dd..b15c062a83 100644
--- a/src/components/lib/libc/musl-1.1.11/include/ftw.h
+++ b/src/components/lib/libc/musl-1.2.0/include/ftw.h
@@ -21,8 +21,7 @@ extern "C" {
 #define FTW_CHDIR 4
 #define FTW_DEPTH 8
 
-struct FTW
-{
+struct FTW {
 	int base;
 	int level;
 };
diff --git a/src/components/lib/libc/musl-1.1.11/include/getopt.h b/src/components/lib/libc/musl-1.2.0/include/getopt.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/getopt.h
rename to src/components/lib/libc/musl-1.2.0/include/getopt.h
index c1d0df928f..35cbd358b5 100644
--- a/src/components/lib/libc/musl-1.1.11/include/getopt.h
+++ b/src/components/lib/libc/musl-1.2.0/include/getopt.h
@@ -9,8 +9,7 @@ int getopt(int, char * const [], const char *);
 extern char *optarg;
 extern int optind, opterr, optopt, optreset;
 
-struct option
-{
+struct option {
 	const char *name;
 	int has_arg;
 	int *flag;
diff --git a/src/components/lib/libc/musl-1.1.11/include/glob.h b/src/components/lib/libc/musl-1.2.0/include/glob.h
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/include/glob.h
rename to src/components/lib/libc/musl-1.2.0/include/glob.h
index 76f6c1c68a..4a562a206d 100644
--- a/src/components/lib/libc/musl-1.1.11/include/glob.h
+++ b/src/components/lib/libc/musl-1.2.0/include/glob.h
@@ -31,6 +31,9 @@ void globfree(glob_t *);
 #define GLOB_NOESCAPE 0x40
 #define	GLOB_PERIOD   0x80
 
+#define GLOB_TILDE       0x1000
+#define GLOB_TILDE_CHECK 0x4000
+
 #define GLOB_NOSPACE 1
 #define GLOB_ABORTED 2
 #define GLOB_NOMATCH 3
diff --git a/src/components/lib/libc/musl-1.1.11/include/grp.h b/src/components/lib/libc/musl-1.2.0/include/grp.h
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/include/grp.h
rename to src/components/lib/libc/musl-1.2.0/include/grp.h
index b331d3264c..27e8c5e6c6 100644
--- a/src/components/lib/libc/musl-1.1.11/include/grp.h
+++ b/src/components/lib/libc/musl-1.2.0/include/grp.h
@@ -16,8 +16,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct group
-{
+struct group {
 	char *gr_name;
 	char *gr_passwd;
 	gid_t gr_gid;
@@ -30,12 +29,14 @@ struct group  *getgrnam(const char *);
 int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
 int getgrnam_r(const char *, struct group *, char *, size_t, struct group **);
 
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 struct group  *getgrent(void);
 void           endgrent(void);
 void           setgrent(void);
+#endif
 
 #ifdef _GNU_SOURCE
-struct group  *fgetgrent(FILE *stream);
+struct group  *fgetgrent(FILE *);
 int putgrent(const struct group *, FILE *);
 #endif
 
diff --git a/src/components/lib/libc/musl-1.1.11/include/iconv.h b/src/components/lib/libc/musl-1.2.0/include/iconv.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/iconv.h
rename to src/components/lib/libc/musl-1.2.0/include/iconv.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/ifaddrs.h b/src/components/lib/libc/musl-1.2.0/include/ifaddrs.h
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/include/ifaddrs.h
rename to src/components/lib/libc/musl-1.2.0/include/ifaddrs.h
index 4726db6e09..c0328a8ea5 100644
--- a/src/components/lib/libc/musl-1.1.11/include/ifaddrs.h
+++ b/src/components/lib/libc/musl-1.2.0/include/ifaddrs.h
@@ -24,8 +24,8 @@ struct ifaddrs {
 #define ifa_broadaddr ifa_ifu.ifu_broadaddr
 #define ifa_dstaddr ifa_ifu.ifu_dstaddr
 
-void freeifaddrs(struct ifaddrs *ifp);
-int getifaddrs(struct ifaddrs **ifap);
+void freeifaddrs(struct ifaddrs *);
+int getifaddrs(struct ifaddrs **);
 
 #ifdef __cplusplus
 }
diff --git a/src/components/lib/libc/musl-1.1.11/include/inttypes.h b/src/components/lib/libc/musl-1.2.0/include/inttypes.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/inttypes.h
rename to src/components/lib/libc/musl-1.2.0/include/inttypes.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/iso646.h b/src/components/lib/libc/musl-1.2.0/include/iso646.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/iso646.h
rename to src/components/lib/libc/musl-1.2.0/include/iso646.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/langinfo.h b/src/components/lib/libc/musl-1.2.0/include/langinfo.h
new file mode 100644
index 0000000000..519c061294
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/langinfo.h
@@ -0,0 +1,98 @@
+#ifndef _LANGINFO_H
+#define _LANGINFO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+#include <nl_types.h>
+
+#define __NEED_locale_t
+
+#include <bits/alltypes.h>
+
+#define ABDAY_1 0x20000
+#define ABDAY_2 0x20001
+#define ABDAY_3 0x20002
+#define ABDAY_4 0x20003
+#define ABDAY_5 0x20004
+#define ABDAY_6 0x20005
+#define ABDAY_7 0x20006
+
+#define DAY_1 0x20007
+#define DAY_2 0x20008
+#define DAY_3 0x20009
+#define DAY_4 0x2000A
+#define DAY_5 0x2000B
+#define DAY_6 0x2000C
+#define DAY_7 0x2000D
+
+#define ABMON_1 0x2000E
+#define ABMON_2 0x2000F
+#define ABMON_3 0x20010
+#define ABMON_4 0x20011
+#define ABMON_5 0x20012
+#define ABMON_6 0x20013
+#define ABMON_7 0x20014
+#define ABMON_8 0x20015
+#define ABMON_9 0x20016
+#define ABMON_10 0x20017
+#define ABMON_11 0x20018
+#define ABMON_12 0x20019
+
+#define MON_1 0x2001A
+#define MON_2 0x2001B
+#define MON_3 0x2001C
+#define MON_4 0x2001D
+#define MON_5 0x2001E
+#define MON_6 0x2001F
+#define MON_7 0x20020
+#define MON_8 0x20021
+#define MON_9 0x20022
+#define MON_10 0x20023
+#define MON_11 0x20024
+#define MON_12 0x20025
+
+#define AM_STR 0x20026
+#define PM_STR 0x20027
+
+#define D_T_FMT 0x20028
+#define D_FMT 0x20029
+#define T_FMT 0x2002A
+#define T_FMT_AMPM 0x2002B
+
+#define ERA 0x2002C
+#define ERA_D_FMT 0x2002E
+#define ALT_DIGITS 0x2002F
+#define ERA_D_T_FMT 0x20030
+#define ERA_T_FMT 0x20031
+
+#define CODESET 14
+
+#define CRNCYSTR 0x4000F
+
+#define RADIXCHAR 0x10000
+#define THOUSEP 0x10001
+#define YESEXPR 0x50000
+#define NOEXPR 0x50001
+
+#define _NL_LOCALE_NAME(cat) (((cat)<<16) | 0xffff)
+
+#if defined(_GNU_SOURCE)
+#define NL_LOCALE_NAME(cat) _NL_LOCALE_NAME(cat)
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define YESSTR 0x50002
+#define NOSTR 0x50003
+#endif
+
+char *nl_langinfo(nl_item);
+char *nl_langinfo_l(nl_item, locale_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/lastlog.h b/src/components/lib/libc/musl-1.2.0/include/lastlog.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/lastlog.h
rename to src/components/lib/libc/musl-1.2.0/include/lastlog.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/libgen.h b/src/components/lib/libc/musl-1.2.0/include/libgen.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/libgen.h
rename to src/components/lib/libc/musl-1.2.0/include/libgen.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/libintl.h b/src/components/lib/libc/musl-1.2.0/include/libintl.h
new file mode 100644
index 0000000000..6a707bf0f0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/libintl.h
@@ -0,0 +1,33 @@
+#ifndef _LIBINTL_H
+#define _LIBINTL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define __USE_GNU_GETTEXT 1
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 1 : -1)
+
+#if __GNUC__ >= 3
+#define __fa(n) __attribute__ ((__format_arg__ (n)))
+#else
+#define __fa(n)
+#endif
+
+char *gettext(const char *) __fa(1);
+char *dgettext(const char *, const char *) __fa(2);
+char *dcgettext(const char *, const char *, int) __fa(2);
+char *ngettext(const char *, const char *, unsigned long) __fa(1) __fa(2);
+char *dngettext(const char *, const char *, const char *, unsigned long) __fa(2) __fa(3);
+char *dcngettext(const char *, const char *, const char *, unsigned long, int) __fa(2) __fa(3);
+char *textdomain(const char *);
+char *bindtextdomain (const char *, const char *);
+char *bind_textdomain_codeset(const char *, const char *);
+
+#undef __fa
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/limits.h b/src/components/lib/libc/musl-1.2.0/include/limits.h
new file mode 100644
index 0000000000..53a27b9de4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/limits.h
@@ -0,0 +1,166 @@
+#ifndef _LIMITS_H
+#define _LIMITS_H
+
+#include <features.h>
+
+#include <bits/alltypes.h> /* __LONG_MAX */
+
+/* Support signed or unsigned plain-char */
+
+#if '\xff' > 0
+#define CHAR_MIN 0
+#define CHAR_MAX 255
+#else
+#define CHAR_MIN (-128)
+#define CHAR_MAX 127
+#endif
+
+#define CHAR_BIT 8
+#define SCHAR_MIN (-128)
+#define SCHAR_MAX 127
+#define UCHAR_MAX 255
+#define SHRT_MIN  (-1-0x7fff)
+#define SHRT_MAX  0x7fff
+#define USHRT_MAX 0xffff
+#define INT_MIN  (-1-0x7fffffff)
+#define INT_MAX  0x7fffffff
+#define UINT_MAX 0xffffffffU
+#define LONG_MIN (-LONG_MAX-1)
+#define LONG_MAX __LONG_MAX
+#define ULONG_MAX (2UL*LONG_MAX+1)
+#define LLONG_MIN (-LLONG_MAX-1)
+#define LLONG_MAX  0x7fffffffffffffffLL
+#define ULLONG_MAX (2ULL*LLONG_MAX+1)
+
+#define MB_LEN_MAX 4
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+
+#include <bits/limits.h>
+
+#define PIPE_BUF 4096
+#define FILESIZEBITS 64
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+#define PATH_MAX 4096
+#define NGROUPS_MAX 32
+#define ARG_MAX 131072
+#define IOV_MAX 1024
+#define SYMLOOP_MAX 40
+#define WORD_BIT 32
+#define SSIZE_MAX LONG_MAX
+#define TZNAME_MAX 6
+#define TTY_NAME_MAX 32
+#define HOST_NAME_MAX 255
+
+#if LONG_MAX == 0x7fffffffL
+#define LONG_BIT 32
+#else
+#define LONG_BIT 64
+#endif
+
+/* Implementation choices... */
+
+#define PTHREAD_KEYS_MAX 128
+#define PTHREAD_STACK_MIN 2048
+#define PTHREAD_DESTRUCTOR_ITERATIONS 4
+#define SEM_VALUE_MAX 0x7fffffff
+#define SEM_NSEMS_MAX 256
+#define DELAYTIMER_MAX 0x7fffffff
+#define MQ_PRIO_MAX 32768
+#define LOGIN_NAME_MAX 256
+
+/* Arbitrary numbers... */
+
+#define BC_BASE_MAX 99
+#define BC_DIM_MAX 2048
+#define BC_SCALE_MAX 99
+#define BC_STRING_MAX 1000
+#define CHARCLASS_NAME_MAX 14
+#define COLL_WEIGHTS_MAX 2
+#define EXPR_NEST_MAX 32
+#define LINE_MAX 4096
+#define RE_DUP_MAX 255
+
+#define NL_ARGMAX 9
+#define NL_MSGMAX 32767
+#define NL_SETMAX 255
+#define NL_TEXTMAX 2048
+
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE)
+
+#ifdef PAGESIZE
+#define PAGE_SIZE PAGESIZE
+#endif
+#define NZERO 20
+#define NL_LANGMAX 32
+
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) \
+ || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
+
+#define NL_NMAX 16
+
+#endif
+
+/* POSIX/SUS requirements follow. These numbers come directly
+ * from SUS and have nothing to do with the host system. */
+
+#define _POSIX_AIO_LISTIO_MAX   2
+#define _POSIX_AIO_MAX          1
+#define _POSIX_ARG_MAX          4096
+#define _POSIX_CHILD_MAX        25
+#define _POSIX_CLOCKRES_MIN     20000000
+#define _POSIX_DELAYTIMER_MAX   32
+#define _POSIX_HOST_NAME_MAX    255
+#define _POSIX_LINK_MAX         8
+#define _POSIX_LOGIN_NAME_MAX   9
+#define _POSIX_MAX_CANON        255
+#define _POSIX_MAX_INPUT        255
+#define _POSIX_MQ_OPEN_MAX      8
+#define _POSIX_MQ_PRIO_MAX      32
+#define _POSIX_NAME_MAX         14
+#define _POSIX_NGROUPS_MAX      8
+#define _POSIX_OPEN_MAX         20
+#define _POSIX_PATH_MAX         256
+#define _POSIX_PIPE_BUF         512
+#define _POSIX_RE_DUP_MAX       255
+#define _POSIX_RTSIG_MAX        8
+#define _POSIX_SEM_NSEMS_MAX    256
+#define _POSIX_SEM_VALUE_MAX    32767
+#define _POSIX_SIGQUEUE_MAX     32
+#define _POSIX_SSIZE_MAX        32767
+#define _POSIX_STREAM_MAX       8
+#define _POSIX_SS_REPL_MAX      4
+#define _POSIX_SYMLINK_MAX      255
+#define _POSIX_SYMLOOP_MAX      8
+#define _POSIX_THREAD_DESTRUCTOR_ITERATIONS 4
+#define _POSIX_THREAD_KEYS_MAX  128
+#define _POSIX_THREAD_THREADS_MAX 64
+#define _POSIX_TIMER_MAX        32
+#define _POSIX_TRACE_EVENT_NAME_MAX 30
+#define _POSIX_TRACE_NAME_MAX   8
+#define _POSIX_TRACE_SYS_MAX    8
+#define _POSIX_TRACE_USER_EVENT_MAX 32
+#define _POSIX_TTY_NAME_MAX     9
+#define _POSIX_TZNAME_MAX       6
+#define _POSIX2_BC_BASE_MAX     99
+#define _POSIX2_BC_DIM_MAX      2048
+#define _POSIX2_BC_SCALE_MAX    99
+#define _POSIX2_BC_STRING_MAX   1000
+#define _POSIX2_CHARCLASS_NAME_MAX 14
+#define _POSIX2_COLL_WEIGHTS_MAX 2
+#define _POSIX2_EXPR_NEST_MAX   32
+#define _POSIX2_LINE_MAX        2048
+#define _POSIX2_RE_DUP_MAX      255
+
+#define _XOPEN_IOV_MAX          16
+#define _XOPEN_NAME_MAX         255
+#define _XOPEN_PATH_MAX         1024
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/link.h b/src/components/lib/libc/musl-1.2.0/include/link.h
new file mode 100644
index 0000000000..815018594c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/link.h
@@ -0,0 +1,53 @@
+#ifndef _LINK_H
+#define _LINK_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <elf.h>
+#define __NEED_size_t
+#define __NEED_uint32_t
+#include <bits/alltypes.h>
+
+#if UINTPTR_MAX > 0xffffffff
+#define ElfW(type) Elf64_ ## type
+#else
+#define ElfW(type) Elf32_ ## type
+#endif
+
+#include <bits/link.h>
+
+struct dl_phdr_info {
+	ElfW(Addr) dlpi_addr;
+	const char *dlpi_name;
+	const ElfW(Phdr) *dlpi_phdr;
+	ElfW(Half) dlpi_phnum;
+	unsigned long long int dlpi_adds;
+	unsigned long long int dlpi_subs;
+	size_t dlpi_tls_modid;
+	void *dlpi_tls_data;
+};
+
+struct link_map {
+	ElfW(Addr) l_addr;
+	char *l_name;
+	ElfW(Dyn) *l_ld;
+	struct link_map *l_next, *l_prev;
+};
+
+struct r_debug {
+	int r_version;
+	struct link_map *r_map;
+	ElfW(Addr) r_brk;
+	enum { RT_CONSISTENT, RT_ADD, RT_DELETE } r_state;
+	ElfW(Addr) r_ldbase;
+};
+
+int dl_iterate_phdr(int (*)(struct dl_phdr_info *, size_t, void *), void *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/locale.h b/src/components/lib/libc/musl-1.2.0/include/locale.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/locale.h
rename to src/components/lib/libc/musl-1.2.0/include/locale.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/malloc.h b/src/components/lib/libc/musl-1.2.0/include/malloc.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/malloc.h
rename to src/components/lib/libc/musl-1.2.0/include/malloc.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/math.h b/src/components/lib/libc/musl-1.2.0/include/math.h
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/include/math.h
rename to src/components/lib/libc/musl-1.2.0/include/math.h
index 6ac91da24f..14f28ec8c6 100644
--- a/src/components/lib/libc/musl-1.1.11/include/math.h
+++ b/src/components/lib/libc/musl-1.2.0/include/math.h
@@ -27,7 +27,7 @@ extern "C" {
 #define MATH_ERREXCEPT 2
 #define math_errhandling 2
 
-#define FP_ILOGBNAN (-1-(int)(((unsigned)-1)>>1))
+#define FP_ILOGBNAN (-1-0x7fffffff)
 #define FP_ILOGB0 FP_ILOGBNAN
 
 #define FP_NAN       0
@@ -36,6 +36,18 @@ extern "C" {
 #define FP_SUBNORMAL 3
 #define FP_NORMAL    4
 
+#ifdef __FP_FAST_FMA
+#define FP_FAST_FMA 1
+#endif
+
+#ifdef __FP_FAST_FMAF
+#define FP_FAST_FMAF 1
+#endif
+
+#ifdef __FP_FAST_FMAL
+#define FP_FAST_FMAL 1
+#endif
+
 int __fpclassify(double);
 int __fpclassifyf(float);
 int __fpclassifyl(long double);
diff --git a/src/components/lib/libc/musl-1.1.11/include/memory.h b/src/components/lib/libc/musl-1.2.0/include/memory.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/memory.h
rename to src/components/lib/libc/musl-1.2.0/include/memory.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/mntent.h b/src/components/lib/libc/musl-1.2.0/include/mntent.h
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/include/mntent.h
rename to src/components/lib/libc/musl-1.2.0/include/mntent.h
index d03c414a2b..3492a1d6da 100644
--- a/src/components/lib/libc/musl-1.1.11/include/mntent.h
+++ b/src/components/lib/libc/musl-1.2.0/include/mntent.h
@@ -20,8 +20,7 @@ extern "C" {
 #define MNTOPT_NOSUID	"nosuid"
 #define MNTOPT_NOAUTO	"noauto"
 
-struct mntent
-{
+struct mntent {
 	char *mnt_fsname;
 	char *mnt_dir;
 	char *mnt_type;
diff --git a/src/components/lib/libc/musl-1.1.11/include/monetary.h b/src/components/lib/libc/musl-1.2.0/include/monetary.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/monetary.h
rename to src/components/lib/libc/musl-1.2.0/include/monetary.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/mqueue.h b/src/components/lib/libc/musl-1.2.0/include/mqueue.h
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/include/mqueue.h
rename to src/components/lib/libc/musl-1.2.0/include/mqueue.h
index f5cbe79656..0c807ea0cb 100644
--- a/src/components/lib/libc/musl-1.1.11/include/mqueue.h
+++ b/src/components/lib/libc/musl-1.2.0/include/mqueue.h
@@ -30,6 +30,11 @@ ssize_t mq_timedreceive(mqd_t, char *__restrict, size_t, unsigned *__restrict, c
 int mq_timedsend(mqd_t, const char *, size_t, unsigned, const struct timespec *);
 int mq_unlink(const char *);
 
+#if _REDIR_TIME64
+__REDIR(mq_timedreceive, __mq_timedreceive_time64);
+__REDIR(mq_timedsend, __mq_timedsend_time64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/net/ethernet.h b/src/components/lib/libc/musl-1.2.0/include/net/ethernet.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/net/ethernet.h
rename to src/components/lib/libc/musl-1.2.0/include/net/ethernet.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/net/if.h b/src/components/lib/libc/musl-1.2.0/include/net/if.h
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/include/net/if.h
rename to src/components/lib/libc/musl-1.2.0/include/net/if.h
index 3f4fc09273..774cbff0b5 100644
--- a/src/components/lib/libc/musl-1.1.11/include/net/if.h
+++ b/src/components/lib/libc/musl-1.2.0/include/net/if.h
@@ -9,8 +9,7 @@ extern "C" {
 
 #define IF_NAMESIZE 16
 
-struct if_nameindex
-{
+struct if_nameindex {
 	unsigned int if_index;
 	char *if_name;
 };
@@ -90,7 +89,7 @@ struct ifreq {
 		struct ifmap ifru_map;
 		char ifru_slave[IFNAMSIZ];
 		char ifru_newname[IFNAMSIZ];
-		void *ifru_data;
+		char *ifru_data;
 	} ifr_ifru;
 };
 
@@ -117,7 +116,7 @@ struct ifreq {
 struct ifconf {
 	int ifc_len;		
 	union {
-		void *ifcu_buf;
+		char *ifcu_buf;
 		struct ifreq *ifcu_req;
 	} ifc_ifcu;
 };
@@ -126,6 +125,13 @@ struct ifconf {
 #define ifc_req		ifc_ifcu.ifcu_req
 #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)
 
+#define __UAPI_DEF_IF_IFCONF                                    0
+#define __UAPI_DEF_IF_IFMAP                                     0
+#define __UAPI_DEF_IF_IFNAMSIZ                                  0
+#define __UAPI_DEF_IF_IFREQ                                     0
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS                          0
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO    0
+
 #endif
 
 #ifdef __cplusplus
diff --git a/src/components/lib/libc/musl-1.1.11/include/net/if_arp.h b/src/components/lib/libc/musl-1.2.0/include/net/if_arp.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/net/if_arp.h
rename to src/components/lib/libc/musl-1.2.0/include/net/if_arp.h
index 18d5dcf977..27becc835e 100644
--- a/src/components/lib/libc/musl-1.1.11/include/net/if_arp.h
+++ b/src/components/lib/libc/musl-1.2.0/include/net/if_arp.h
@@ -59,6 +59,7 @@ struct arphdr {
 #define ARPHRD_LAPB	516
 #define ARPHRD_DDCMP	517
 #define	ARPHRD_RAWHDLC	518
+#define ARPHRD_RAWIP	519
 
 #define ARPHRD_TUNNEL	768
 #define ARPHRD_TUNNEL6	769
@@ -91,6 +92,8 @@ struct arphdr {
 #define ARPHRD_CAIF 822
 #define ARPHRD_IP6GRE 823
 #define ARPHRD_NETLINK 824
+#define ARPHRD_6LOWPAN 825
+#define ARPHRD_VSOCKMON 826
 
 #define ARPHRD_VOID	  0xFFFF
 #define ARPHRD_NONE	  0xFFFE
diff --git a/src/components/lib/libc/musl-1.1.11/include/net/route.h b/src/components/lib/libc/musl-1.2.0/include/net/route.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/net/route.h
rename to src/components/lib/libc/musl-1.2.0/include/net/route.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/netdb.h b/src/components/lib/libc/musl-1.2.0/include/netdb.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/netdb.h
rename to src/components/lib/libc/musl-1.2.0/include/netdb.h
index 703a4b2611..d096c78183 100644
--- a/src/components/lib/libc/musl-1.1.11/include/netdb.h
+++ b/src/components/lib/libc/musl-1.2.0/include/netdb.h
@@ -13,8 +13,7 @@ extern "C" {
 #include <bits/alltypes.h>
 #endif
 
-struct addrinfo
-{
+struct addrinfo {
 	int ai_flags;
 	int ai_family;
 	int ai_socktype;
@@ -25,8 +24,6 @@ struct addrinfo
 	struct addrinfo *ai_next;
 };
 
-#define IPPORT_RESERVED 1024
-
 #define AI_PASSIVE      0x01
 #define AI_CANONNAME    0x02
 #define AI_NUMERICHOST  0x04
@@ -62,16 +59,14 @@ const char *gai_strerror(int);
 
 /* Legacy functions follow (marked OBsolete in SUS) */
 
-struct netent
-{
+struct netent {
 	char *n_name;
 	char **n_aliases;
 	int n_addrtype;
 	uint32_t n_net;
 };
 
-struct hostent
-{
+struct hostent {
 	char *h_name;
 	char **h_aliases;
 	int h_addrtype;
@@ -80,16 +75,14 @@ struct hostent
 };
 #define h_addr h_addr_list[0]
 
-struct servent
-{
+struct servent {
 	char *s_name;
 	char **s_aliases;
 	int s_port;
 	char *s_proto;
 };
 
-struct protoent
-{
+struct protoent {
 	char *p_name;
 	char **p_aliases;
 	int p_proto;
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/ether.h b/src/components/lib/libc/musl-1.2.0/include/netinet/ether.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/ether.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/ether.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/icmp6.h b/src/components/lib/libc/musl-1.2.0/include/netinet/icmp6.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/icmp6.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/icmp6.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/if_ether.h b/src/components/lib/libc/musl-1.2.0/include/netinet/if_ether.h
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/if_ether.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/if_ether.h
index 4802f09fca..a08485e7f7 100644
--- a/src/components/lib/libc/musl-1.1.11/include/netinet/if_ether.h
+++ b/src/components/lib/libc/musl-1.2.0/include/netinet/if_ether.h
@@ -5,15 +5,20 @@
 #include <sys/types.h>
 
 #define ETH_ALEN	6
+#define ETH_TLEN	2
 #define ETH_HLEN	14
 #define ETH_ZLEN	60
 #define ETH_DATA_LEN	1500
 #define ETH_FRAME_LEN	1514
 #define ETH_FCS_LEN	4
+#define ETH_MIN_MTU	68
+#define ETH_MAX_MTU	0xFFFFU
 
 #define ETH_P_LOOP	0x0060
 #define ETH_P_PUP	0x0200
 #define ETH_P_PUPAT	0x0201
+#define ETH_P_TSN	0x22F0
+#define ETH_P_ERSPAN2	0x22EB
 #define ETH_P_IP	0x0800
 #define ETH_P_X25	0x0805
 #define ETH_P_ARP	0x0806
@@ -50,20 +55,30 @@
 #define ETH_P_AOE	0x88A2
 #define ETH_P_8021AD	0x88A8
 #define ETH_P_802_EX1	0x88B5
+#define ETH_P_ERSPAN	0x88BE
+#define ETH_P_PREAUTH	0x88C7
 #define ETH_P_TIPC	0x88CA
+#define ETH_P_LLDP	0x88CC
+#define ETH_P_MACSEC	0x88E5
 #define ETH_P_8021AH	0x88E7
 #define ETH_P_MVRP	0x88F5
 #define ETH_P_1588	0x88F7
+#define ETH_P_NCSI	0x88F8
 #define ETH_P_PRP	0x88FB
 #define ETH_P_FCOE	0x8906
 #define ETH_P_TDLS	0x890D
 #define ETH_P_FIP	0x8914
+#define ETH_P_IBOE	0x8915
 #define ETH_P_80221	0x8917
+#define ETH_P_HSR	0x892F
+#define ETH_P_NSH	0x894F
 #define ETH_P_LOOPBACK	0x9000
 #define ETH_P_QINQ1	0x9100
 #define ETH_P_QINQ2	0x9200
 #define ETH_P_QINQ3	0x9300
 #define ETH_P_EDSA	0xDADA
+#define ETH_P_DSA_8021Q	0xDADB
+#define ETH_P_IFE	0xED3E
 #define ETH_P_AF_IUCV	0xFBFB
 
 #define ETH_P_802_3_MIN	0x0600
@@ -92,6 +107,8 @@
 #define ETH_P_PHONET	0x00F5
 #define ETH_P_IEEE802154 0x00F6
 #define ETH_P_CAIF	0x00F7
+#define ETH_P_XDSA	0x00F8
+#define ETH_P_MAP	0x00F9
 
 struct ethhdr {
 	uint8_t h_dest[ETH_ALEN];
@@ -125,5 +142,6 @@ do { \
 	(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
 } while(0)
 
+#define __UAPI_DEF_ETHHDR       0
 
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/igmp.h b/src/components/lib/libc/musl-1.2.0/include/netinet/igmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/igmp.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/igmp.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/in.h b/src/components/lib/libc/musl-1.2.0/include/netinet/in.h
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/in.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/in.h
index 1ed3e6faac..5b8b21e641 100644
--- a/src/components/lib/libc/musl-1.1.11/include/netinet/in.h
+++ b/src/components/lib/libc/musl-1.2.0/include/netinet/in.h
@@ -13,16 +13,14 @@ typedef uint16_t in_port_t;
 typedef uint32_t in_addr_t;
 struct in_addr { in_addr_t s_addr; };
 
-struct sockaddr_in
-{
+struct sockaddr_in {
 	sa_family_t sin_family;
 	in_port_t sin_port;
 	struct in_addr sin_addr;
 	uint8_t sin_zero[8];
 };
 
-struct in6_addr
-{
+struct in6_addr {
 	union {
 		uint8_t __s6_addr[16];
 		uint16_t __s6_addr16[8];
@@ -33,8 +31,7 @@ struct in6_addr
 #define s6_addr16 __in6_union.__s6_addr16
 #define s6_addr32 __in6_union.__s6_addr32
 
-struct sockaddr_in6
-{
+struct sockaddr_in6 {
 	sa_family_t     sin6_family;
 	in_port_t       sin6_port;
 	uint32_t        sin6_flowinfo;
@@ -42,8 +39,7 @@ struct sockaddr_in6
 	uint32_t        sin6_scope_id;
 };
 
-struct ipv6_mreq
-{
+struct ipv6_mreq {
 	struct in6_addr ipv6mr_multiaddr;
 	unsigned        ipv6mr_interface;
 };
@@ -56,6 +52,7 @@ struct ipv6_mreq
 #define INADDR_UNSPEC_GROUP     ((in_addr_t) 0xe0000000)
 #define INADDR_ALLHOSTS_GROUP   ((in_addr_t) 0xe0000001)
 #define INADDR_ALLRTRS_GROUP    ((in_addr_t) 0xe0000002)
+#define INADDR_ALLSNOOPERS_GROUP ((in_addr_t) 0xe000006a)
 #define INADDR_MAX_LOCAL_GROUP  ((in_addr_t) 0xe00000ff)
 
 #define IN6ADDR_ANY_INIT      { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
@@ -73,6 +70,8 @@ uint16_t htons(uint16_t);
 uint32_t ntohl(uint32_t);
 uint16_t ntohs(uint16_t);
 
+#define IPPORT_RESERVED 1024
+
 #define IPPROTO_IP       0
 #define IPPROTO_HOPOPTS  0
 #define IPPROTO_ICMP     1
@@ -103,6 +102,7 @@ uint16_t ntohs(uint16_t);
 #define IPPROTO_SCTP     132
 #define IPPROTO_MH       135
 #define IPPROTO_UDPLITE  136
+#define IPPROTO_MPLS     137
 #define IPPROTO_RAW      255
 #define IPPROTO_MAX      256
 
@@ -200,6 +200,8 @@ uint16_t ntohs(uint16_t);
 #define IP_MINTTL          21
 #define IP_NODEFRAG        22
 #define IP_CHECKSUM        23
+#define IP_BIND_ADDRESS_NO_PORT 24
+#define IP_RECVFRAGSIZE    25
 #define IP_MULTICAST_IF    32
 #define IP_MULTICAST_TTL   33
 #define IP_MULTICAST_LOOP  34
@@ -226,8 +228,7 @@ uint16_t ntohs(uint16_t);
 #define IP_DEFAULT_MULTICAST_LOOP       1
 #define IP_MAX_MEMBERSHIPS              20
 
-struct ip_opts
-{
+struct ip_opts {
 	struct in_addr ip_dst;
 	char ip_opts[40];
 };
@@ -245,14 +246,12 @@ struct ip_opts
 #define MCAST_EXCLUDE 0
 #define MCAST_INCLUDE 1
 
-struct ip_mreq
-{
+struct ip_mreq {
 	struct in_addr imr_multiaddr;
 	struct in_addr imr_interface;
 };
 
-struct ip_mreqn
-{
+struct ip_mreqn {
 	struct in_addr imr_multiaddr;
 	struct in_addr imr_address;
 	int imr_ifindex;
@@ -297,21 +296,18 @@ struct group_filter {
 	(sizeof(struct group_filter) - sizeof(struct sockaddr_storage) \
 	+ (numsrc) * sizeof(struct sockaddr_storage))
 
-struct in_pktinfo
-{
+struct in_pktinfo {
 	int ipi_ifindex;
 	struct in_addr ipi_spec_dst;
 	struct in_addr ipi_addr;
 };
 
-struct in6_pktinfo
-{
+struct in6_pktinfo {
 	struct in6_addr ipi6_addr;
 	unsigned ipi6_ifindex;
 };
 
-struct ip6_mtuinfo
-{
+struct ip6_mtuinfo {
 	struct sockaddr_in6 ip6m_addr;
 	uint32_t ip6m_mtu;
 };
@@ -340,8 +336,11 @@ struct ip6_mtuinfo
 #define IPV6_V6ONLY             26
 #define IPV6_JOIN_ANYCAST       27
 #define IPV6_LEAVE_ANYCAST      28
+#define IPV6_MULTICAST_ALL      29
+#define IPV6_ROUTER_ALERT_ISOLATE 30
 #define IPV6_IPSEC_POLICY       34
 #define IPV6_XFRM_POLICY        35
+#define IPV6_HDRINCL            36
 
 #define IPV6_RECVPKTINFO        49
 #define IPV6_PKTINFO            50
@@ -366,6 +365,8 @@ struct ip6_mtuinfo
 #define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR
 #define IPV6_TRANSPARENT        75
 #define IPV6_UNICAST_IF         76
+#define IPV6_RECVFRAGSIZE       77
+#define IPV6_FREEBIND           78
 
 #define IPV6_ADD_MEMBERSHIP     IPV6_JOIN_GROUP
 #define IPV6_DROP_MEMBERSHIP    IPV6_LEAVE_GROUP
@@ -392,6 +393,21 @@ struct ip6_mtuinfo
 
 #define IPV6_RTHDR_TYPE_0       0
 
+#define __UAPI_DEF_IN_ADDR      0
+#define __UAPI_DEF_IN_IPPROTO   0
+#define __UAPI_DEF_IN_PKTINFO   0
+#define __UAPI_DEF_IP_MREQ      0
+#define __UAPI_DEF_SOCKADDR_IN  0
+#define __UAPI_DEF_IN_CLASS     0
+#define __UAPI_DEF_IN6_ADDR     0
+#define __UAPI_DEF_IN6_ADDR_ALT 0
+#define __UAPI_DEF_SOCKADDR_IN6 0
+#define __UAPI_DEF_IPV6_MREQ    0
+#define __UAPI_DEF_IPPROTO_V6   0
+#define __UAPI_DEF_IPV6_OPTIONS 0
+#define __UAPI_DEF_IN6_PKTINFO  0
+#define __UAPI_DEF_IP6_MTUINFO  0
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/in_systm.h b/src/components/lib/libc/musl-1.2.0/include/netinet/in_systm.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/in_systm.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/in_systm.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/ip.h b/src/components/lib/libc/musl-1.2.0/include/netinet/ip.h
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/ip.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/ip.h
index d7fa8d5e4e..0ae132a585 100644
--- a/src/components/lib/libc/musl-1.1.11/include/netinet/ip.h
+++ b/src/components/lib/libc/musl-1.2.0/include/netinet/ip.h
@@ -7,7 +7,6 @@ extern "C" {
 
 #include <stdint.h>
 #include <netinet/in.h>
-#include <endian.h>
 
 struct timestamp {
 	uint8_t len;
@@ -191,6 +190,8 @@ struct ip_timestamp {
 
 #define	IP_MSS		576
 
+#define __UAPI_DEF_IPHDR	0
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/ip6.h b/src/components/lib/libc/musl-1.2.0/include/netinet/ip6.h
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/ip6.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/ip6.h
index a4347a53fd..50c626a69c 100644
--- a/src/components/lib/libc/musl-1.1.11/include/netinet/ip6.h
+++ b/src/components/lib/libc/musl-1.2.0/include/netinet/ip6.h
@@ -7,7 +7,6 @@ extern "C" {
 
 #include <stdint.h>
 #include <netinet/in.h>
-#include <endian.h>
 
 struct ip6_hdr {
 	union {
diff --git a/src/components/lib/libc/musl-1.1.11/include/netinet/ip_icmp.h b/src/components/lib/libc/musl-1.2.0/include/netinet/ip_icmp.h
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/include/netinet/ip_icmp.h
rename to src/components/lib/libc/musl-1.2.0/include/netinet/ip_icmp.h
index 2f4a86ddd4..b9e0df8997 100644
--- a/src/components/lib/libc/musl-1.1.11/include/netinet/ip_icmp.h
+++ b/src/components/lib/libc/musl-1.2.0/include/netinet/ip_icmp.h
@@ -23,6 +23,7 @@ struct icmphdr {
 			uint16_t __unused;
 			uint16_t mtu;
 		} frag;
+		uint8_t reserved[4];
 	} un;
 };
 
diff --git a/src/components/lib/libc/musl-1.2.0/include/netinet/tcp.h b/src/components/lib/libc/musl-1.2.0/include/netinet/tcp.h
new file mode 100644
index 0000000000..44a007aaf5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/netinet/tcp.h
@@ -0,0 +1,282 @@
+#ifndef _NETINET_TCP_H
+#define _NETINET_TCP_H
+
+#include <features.h>
+
+#define TCP_NODELAY 1
+#define TCP_MAXSEG	 2
+#define TCP_CORK	 3
+#define TCP_KEEPIDLE	 4
+#define TCP_KEEPINTVL	 5
+#define TCP_KEEPCNT	 6
+#define TCP_SYNCNT	 7
+#define TCP_LINGER2	 8
+#define TCP_DEFER_ACCEPT 9
+#define TCP_WINDOW_CLAMP 10
+#define TCP_INFO	 11
+#define	TCP_QUICKACK	 12
+#define TCP_CONGESTION	 13
+#define TCP_MD5SIG	 14
+#define TCP_THIN_LINEAR_TIMEOUTS 16
+#define TCP_THIN_DUPACK  17
+#define TCP_USER_TIMEOUT 18
+#define TCP_REPAIR       19
+#define TCP_REPAIR_QUEUE 20
+#define TCP_QUEUE_SEQ    21
+#define TCP_REPAIR_OPTIONS 22
+#define TCP_FASTOPEN     23
+#define TCP_TIMESTAMP    24
+#define TCP_NOTSENT_LOWAT 25
+#define TCP_CC_INFO      26
+#define TCP_SAVE_SYN     27
+#define TCP_SAVED_SYN    28
+#define TCP_REPAIR_WINDOW 29
+#define TCP_FASTOPEN_CONNECT 30
+#define TCP_ULP          31
+#define TCP_MD5SIG_EXT   32
+#define TCP_FASTOPEN_KEY 33
+#define TCP_FASTOPEN_NO_COOKIE 34
+#define TCP_ZEROCOPY_RECEIVE   35
+#define TCP_INQ          36
+#define TCP_TX_DELAY     37
+
+#define TCP_CM_INQ TCP_INQ
+
+#define TCP_ESTABLISHED  1
+#define TCP_SYN_SENT     2
+#define TCP_SYN_RECV     3
+#define TCP_FIN_WAIT1    4
+#define TCP_FIN_WAIT2    5
+#define TCP_TIME_WAIT    6
+#define TCP_CLOSE        7
+#define TCP_CLOSE_WAIT   8
+#define TCP_LAST_ACK     9
+#define TCP_LISTEN       10
+#define TCP_CLOSING      11
+
+enum {
+	TCP_NLA_PAD,
+	TCP_NLA_BUSY,
+	TCP_NLA_RWND_LIMITED,
+	TCP_NLA_SNDBUF_LIMITED,
+	TCP_NLA_DATA_SEGS_OUT,
+	TCP_NLA_TOTAL_RETRANS,
+	TCP_NLA_PACING_RATE,
+	TCP_NLA_DELIVERY_RATE,
+	TCP_NLA_SND_CWND,
+	TCP_NLA_REORDERING,
+	TCP_NLA_MIN_RTT,
+	TCP_NLA_RECUR_RETRANS,
+	TCP_NLA_DELIVERY_RATE_APP_LMT,
+	TCP_NLA_SNDQ_SIZE,
+	TCP_NLA_CA_STATE,
+	TCP_NLA_SND_SSTHRESH,
+	TCP_NLA_DELIVERED,
+	TCP_NLA_DELIVERED_CE,
+	TCP_NLA_BYTES_SENT,
+	TCP_NLA_BYTES_RETRANS,
+	TCP_NLA_DSACK_DUPS,
+	TCP_NLA_REORD_SEEN,
+	TCP_NLA_SRTT,
+};
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define TCPOPT_EOL              0
+#define TCPOPT_NOP              1
+#define TCPOPT_MAXSEG           2
+#define TCPOPT_WINDOW           3
+#define TCPOPT_SACK_PERMITTED   4
+#define TCPOPT_SACK             5
+#define TCPOPT_TIMESTAMP        8
+#define TCPOLEN_SACK_PERMITTED  2
+#define TCPOLEN_WINDOW          3
+#define TCPOLEN_MAXSEG          4
+#define TCPOLEN_TIMESTAMP       10
+
+#define SOL_TCP 6
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdint.h>
+
+typedef uint32_t tcp_seq;
+
+#define TH_FIN 0x01
+#define TH_SYN 0x02
+#define TH_RST 0x04
+#define TH_PUSH 0x08
+#define TH_ACK 0x10
+#define TH_URG 0x20
+
+struct tcphdr {
+#ifdef _GNU_SOURCE
+#ifdef __GNUC__
+	__extension__
+#endif
+	union { struct {
+
+	uint16_t source;
+	uint16_t dest;
+	uint32_t seq;
+	uint32_t ack_seq;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	uint16_t res1:4;
+	uint16_t doff:4;
+	uint16_t fin:1;
+	uint16_t syn:1;
+	uint16_t rst:1;
+	uint16_t psh:1;
+	uint16_t ack:1;
+	uint16_t urg:1;
+	uint16_t res2:2;
+#else
+	uint16_t doff:4;
+	uint16_t res1:4;
+	uint16_t res2:2;
+	uint16_t urg:1;
+	uint16_t ack:1;
+	uint16_t psh:1;
+	uint16_t rst:1;
+	uint16_t syn:1;
+	uint16_t fin:1;
+#endif
+	uint16_t window;
+	uint16_t check;
+	uint16_t urg_ptr;
+
+	}; struct {
+#endif
+
+	uint16_t th_sport;
+	uint16_t th_dport;
+	uint32_t th_seq;
+	uint32_t th_ack;
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	uint8_t th_x2:4;
+	uint8_t th_off:4;
+#else
+	uint8_t th_off:4;
+	uint8_t th_x2:4;
+#endif
+	uint8_t th_flags;
+	uint16_t th_win;
+	uint16_t th_sum;
+	uint16_t th_urp;
+
+#ifdef _GNU_SOURCE
+	}; };
+#endif
+};
+#endif
+
+#ifdef _GNU_SOURCE
+#define TCPI_OPT_TIMESTAMPS	1
+#define TCPI_OPT_SACK		2
+#define TCPI_OPT_WSCALE		4
+#define TCPI_OPT_ECN		8
+
+#define TCP_CA_Open		0
+#define TCP_CA_Disorder		1
+#define TCP_CA_CWR		2
+#define TCP_CA_Recovery		3
+#define TCP_CA_Loss		4
+
+struct tcp_info {
+	uint8_t tcpi_state;
+	uint8_t tcpi_ca_state;
+	uint8_t tcpi_retransmits;
+	uint8_t tcpi_probes;
+	uint8_t tcpi_backoff;
+	uint8_t tcpi_options;
+	uint8_t tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+	uint8_t tcpi_delivery_rate_app_limited : 1;
+	uint32_t tcpi_rto;
+	uint32_t tcpi_ato;
+	uint32_t tcpi_snd_mss;
+	uint32_t tcpi_rcv_mss;
+	uint32_t tcpi_unacked;
+	uint32_t tcpi_sacked;
+	uint32_t tcpi_lost;
+	uint32_t tcpi_retrans;
+	uint32_t tcpi_fackets;
+	uint32_t tcpi_last_data_sent;
+	uint32_t tcpi_last_ack_sent;
+	uint32_t tcpi_last_data_recv;
+	uint32_t tcpi_last_ack_recv;
+	uint32_t tcpi_pmtu;
+	uint32_t tcpi_rcv_ssthresh;
+	uint32_t tcpi_rtt;
+	uint32_t tcpi_rttvar;
+	uint32_t tcpi_snd_ssthresh;
+	uint32_t tcpi_snd_cwnd;
+	uint32_t tcpi_advmss;
+	uint32_t tcpi_reordering;
+	uint32_t tcpi_rcv_rtt;
+	uint32_t tcpi_rcv_space;
+	uint32_t tcpi_total_retrans;
+	uint64_t tcpi_pacing_rate;
+	uint64_t tcpi_max_pacing_rate;
+	uint64_t tcpi_bytes_acked;
+	uint64_t tcpi_bytes_received;
+	uint32_t tcpi_segs_out;
+	uint32_t tcpi_segs_in;
+	uint32_t tcpi_notsent_bytes;
+	uint32_t tcpi_min_rtt;
+	uint32_t tcpi_data_segs_in;
+	uint32_t tcpi_data_segs_out;
+	uint64_t tcpi_delivery_rate;
+	uint64_t tcpi_busy_time;
+	uint64_t tcpi_rwnd_limited;
+	uint64_t tcpi_sndbuf_limited;
+	uint32_t tcpi_delivered;
+	uint32_t tcpi_delivered_ce;
+	uint64_t tcpi_bytes_sent;
+	uint64_t tcpi_bytes_retrans;
+	uint32_t tcpi_dsack_dups;
+	uint32_t tcpi_reord_seen;
+	uint32_t tcpi_rcv_ooopack;
+	uint32_t tcpi_snd_wnd;
+};
+
+#define TCP_MD5SIG_MAXKEYLEN    80
+
+#define TCP_MD5SIG_FLAG_PREFIX  1
+
+struct tcp_md5sig {
+	struct sockaddr_storage tcpm_addr;
+	uint8_t tcpm_flags;
+	uint8_t tcpm_prefixlen;
+	uint16_t tcpm_keylen;
+	uint32_t __tcpm_pad;
+	uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN];
+};
+
+struct tcp_diag_md5sig {
+	uint8_t tcpm_family;
+	uint8_t tcpm_prefixlen;
+	uint16_t tcpm_keylen;
+	uint32_t tcpm_addr[4];
+	uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN];
+};
+
+#define TCP_REPAIR_ON		1
+#define TCP_REPAIR_OFF		0
+#define TCP_REPAIR_OFF_NO_WP	-1
+
+struct tcp_repair_window {
+	uint32_t snd_wl1;
+	uint32_t snd_wnd;
+	uint32_t max_window;
+	uint32_t rcv_wnd;
+	uint32_t rcv_wup;
+};
+
+struct tcp_zerocopy_receive {
+	uint64_t address;
+	uint32_t length;
+	uint32_t recv_skip_hint;
+};
+
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/netinet/udp.h b/src/components/lib/libc/musl-1.2.0/include/netinet/udp.h
new file mode 100644
index 0000000000..ffd8907962
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/netinet/udp.h
@@ -0,0 +1,45 @@
+#ifndef _NETINET_UDP_H
+#define _NETINET_UDP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+#include <stdint.h>
+
+#ifdef _GNU_SOURCE
+#define uh_sport source
+#define uh_dport dest
+#define uh_ulen len
+#define uh_sum check
+#endif
+
+struct udphdr {
+	uint16_t uh_sport;
+	uint16_t uh_dport;
+	uint16_t uh_ulen;
+	uint16_t uh_sum;
+};
+
+#define UDP_CORK	1
+#define UDP_ENCAP	100
+#define UDP_NO_CHECK6_TX 101
+#define UDP_NO_CHECK6_RX 102
+#define UDP_SEGMENT	103
+#define UDP_GRO		104
+
+#define UDP_ENCAP_ESPINUDP_NON_IKE 1
+#define UDP_ENCAP_ESPINUDP	2
+#define UDP_ENCAP_L2TPINUDP	3
+#define UDP_ENCAP_GTP0		4
+#define UDP_ENCAP_GTP1U		5
+#define UDP_ENCAP_RXRPC		6
+
+#define SOL_UDP            17
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/netpacket/packet.h b/src/components/lib/libc/musl-1.2.0/include/netpacket/packet.h
new file mode 100644
index 0000000000..b36e092ad4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/netpacket/packet.h
@@ -0,0 +1,62 @@
+#ifndef _NETPACKET_PACKET_H
+#define _NETPACKET_PACKET_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct sockaddr_ll {
+	unsigned short sll_family, sll_protocol;
+	int sll_ifindex;
+	unsigned short sll_hatype;
+	unsigned char sll_pkttype, sll_halen;
+	unsigned char sll_addr[8];
+};
+
+struct packet_mreq {
+	int mr_ifindex;
+	unsigned short int mr_type,  mr_alen;
+	unsigned char mr_address[8];
+};
+
+#define PACKET_HOST		0
+#define PACKET_BROADCAST	1
+#define PACKET_MULTICAST	2
+#define PACKET_OTHERHOST	3
+#define PACKET_OUTGOING		4
+#define PACKET_LOOPBACK		5
+#define PACKET_FASTROUTE	6
+
+#define PACKET_ADD_MEMBERSHIP		1
+#define PACKET_DROP_MEMBERSHIP		2
+#define	PACKET_RECV_OUTPUT		3
+#define	PACKET_RX_RING			5
+#define	PACKET_STATISTICS		6
+#define PACKET_COPY_THRESH		7
+#define PACKET_AUXDATA			8
+#define PACKET_ORIGDEV			9
+#define PACKET_VERSION			10
+#define PACKET_HDRLEN			11
+#define PACKET_RESERVE			12
+#define PACKET_TX_RING			13
+#define PACKET_LOSS			14
+#define PACKET_VNET_HDR			15
+#define PACKET_TX_TIMESTAMP		16
+#define PACKET_TIMESTAMP		17
+#define PACKET_FANOUT			18
+#define PACKET_TX_HAS_OFF		19
+#define PACKET_QDISC_BYPASS		20
+#define PACKET_ROLLOVER_STATS		21
+#define PACKET_FANOUT_DATA		22
+#define PACKET_IGNORE_OUTGOING		23
+
+#define PACKET_MR_MULTICAST	0
+#define PACKET_MR_PROMISC	1
+#define PACKET_MR_ALLMULTI	2
+#define PACKET_MR_UNICAST	3
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/nl_types.h b/src/components/lib/libc/musl-1.2.0/include/nl_types.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/nl_types.h
rename to src/components/lib/libc/musl-1.2.0/include/nl_types.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/paths.h b/src/components/lib/libc/musl-1.2.0/include/paths.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/paths.h
rename to src/components/lib/libc/musl-1.2.0/include/paths.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/poll.h b/src/components/lib/libc/musl-1.2.0/include/poll.h
new file mode 100644
index 0000000000..472e4b8470
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/poll.h
@@ -0,0 +1,57 @@
+#ifndef	_POLL_H
+#define	_POLL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#include <bits/poll.h>
+
+#define POLLIN     0x001
+#define POLLPRI    0x002
+#define POLLOUT    0x004
+#define POLLERR    0x008
+#define POLLHUP    0x010
+#define POLLNVAL   0x020
+#define POLLRDNORM 0x040
+#define POLLRDBAND 0x080
+#ifndef POLLWRNORM
+#define POLLWRNORM 0x100
+#define POLLWRBAND 0x200
+#endif
+#ifndef POLLMSG
+#define POLLMSG    0x400
+#define POLLRDHUP  0x2000
+#endif
+
+typedef unsigned long nfds_t;
+
+struct pollfd {
+	int fd;
+	short events;
+	short revents;
+};
+
+int poll (struct pollfd *, nfds_t, int);
+
+#ifdef _GNU_SOURCE
+#define __NEED_time_t
+#define __NEED_struct_timespec
+#define __NEED_sigset_t
+#include <bits/alltypes.h>
+int ppoll(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *);
+#endif
+
+#if _REDIR_TIME64
+#ifdef _GNU_SOURCE
+__REDIR(ppoll, __ppoll_time64);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/pthread.h b/src/components/lib/libc/musl-1.2.0/include/pthread.h
new file mode 100644
index 0000000000..984db68064
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/pthread.h
@@ -0,0 +1,240 @@
+#ifndef _PTHREAD_H
+#define _PTHREAD_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_time_t
+#define __NEED_clockid_t
+#define __NEED_struct_timespec
+#define __NEED_sigset_t
+#define __NEED_pthread_t
+#define __NEED_pthread_attr_t
+#define __NEED_pthread_mutexattr_t
+#define __NEED_pthread_condattr_t
+#define __NEED_pthread_rwlockattr_t
+#define __NEED_pthread_barrierattr_t
+#define __NEED_pthread_mutex_t
+#define __NEED_pthread_cond_t
+#define __NEED_pthread_rwlock_t
+#define __NEED_pthread_barrier_t
+#define __NEED_pthread_spinlock_t
+#define __NEED_pthread_key_t
+#define __NEED_pthread_once_t
+#define __NEED_size_t
+
+#include <bits/alltypes.h>
+
+#include <sched.h>
+#include <time.h>
+
+#define PTHREAD_CREATE_JOINABLE 0
+#define PTHREAD_CREATE_DETACHED 1
+
+#define PTHREAD_MUTEX_NORMAL 0
+#define PTHREAD_MUTEX_DEFAULT 0
+#define PTHREAD_MUTEX_RECURSIVE 1
+#define PTHREAD_MUTEX_ERRORCHECK 2
+
+#define PTHREAD_MUTEX_STALLED 0
+#define PTHREAD_MUTEX_ROBUST 1
+
+#define PTHREAD_PRIO_NONE 0
+#define PTHREAD_PRIO_INHERIT 1
+#define PTHREAD_PRIO_PROTECT 2
+
+#define PTHREAD_INHERIT_SCHED 0
+#define PTHREAD_EXPLICIT_SCHED 1
+
+#define PTHREAD_SCOPE_SYSTEM 0
+#define PTHREAD_SCOPE_PROCESS 1
+
+#define PTHREAD_PROCESS_PRIVATE 0
+#define PTHREAD_PROCESS_SHARED 1
+
+
+#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
+#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
+#define PTHREAD_COND_INITIALIZER {{{0}}}
+#define PTHREAD_ONCE_INIT 0
+
+
+#define PTHREAD_CANCEL_ENABLE 0
+#define PTHREAD_CANCEL_DISABLE 1
+#define PTHREAD_CANCEL_MASKED 2
+
+#define PTHREAD_CANCEL_DEFERRED 0
+#define PTHREAD_CANCEL_ASYNCHRONOUS 1
+
+#define PTHREAD_CANCELED ((void *)-1)
+
+
+#define PTHREAD_BARRIER_SERIAL_THREAD (-1)
+
+
+int pthread_create(pthread_t *__restrict, const pthread_attr_t *__restrict, void *(*)(void *), void *__restrict);
+int pthread_detach(pthread_t);
+_Noreturn void pthread_exit(void *);
+int pthread_join(pthread_t, void **);
+
+#ifdef __GNUC__
+__attribute__((const))
+#endif
+pthread_t pthread_self(void);
+
+int pthread_equal(pthread_t, pthread_t);
+#ifndef __cplusplus
+#define pthread_equal(x,y) ((x)==(y))
+#endif
+
+int pthread_setcancelstate(int, int *);
+int pthread_setcanceltype(int, int *);
+void pthread_testcancel(void);
+int pthread_cancel(pthread_t);
+
+int pthread_getschedparam(pthread_t, int *__restrict, struct sched_param *__restrict);
+int pthread_setschedparam(pthread_t, int, const struct sched_param *);
+int pthread_setschedprio(pthread_t, int);
+
+int pthread_once(pthread_once_t *, void (*)(void));
+
+int pthread_mutex_init(pthread_mutex_t *__restrict, const pthread_mutexattr_t *__restrict);
+int pthread_mutex_lock(pthread_mutex_t *);
+int pthread_mutex_unlock(pthread_mutex_t *);
+int pthread_mutex_trylock(pthread_mutex_t *);
+int pthread_mutex_timedlock(pthread_mutex_t *__restrict, const struct timespec *__restrict);
+int pthread_mutex_destroy(pthread_mutex_t *);
+int pthread_mutex_consistent(pthread_mutex_t *);
+
+int pthread_mutex_getprioceiling(const pthread_mutex_t *__restrict, int *__restrict);
+int pthread_mutex_setprioceiling(pthread_mutex_t *__restrict, int, int *__restrict);
+
+int pthread_cond_init(pthread_cond_t *__restrict, const pthread_condattr_t *__restrict);
+int pthread_cond_destroy(pthread_cond_t *);
+int pthread_cond_wait(pthread_cond_t *__restrict, pthread_mutex_t *__restrict);
+int pthread_cond_timedwait(pthread_cond_t *__restrict, pthread_mutex_t *__restrict, const struct timespec *__restrict);
+int pthread_cond_broadcast(pthread_cond_t *);
+int pthread_cond_signal(pthread_cond_t *);
+
+int pthread_rwlock_init(pthread_rwlock_t *__restrict, const pthread_rwlockattr_t *__restrict);
+int pthread_rwlock_destroy(pthread_rwlock_t *);
+int pthread_rwlock_rdlock(pthread_rwlock_t *);
+int pthread_rwlock_tryrdlock(pthread_rwlock_t *);
+int pthread_rwlock_timedrdlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
+int pthread_rwlock_wrlock(pthread_rwlock_t *);
+int pthread_rwlock_trywrlock(pthread_rwlock_t *);
+int pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
+int pthread_rwlock_unlock(pthread_rwlock_t *);
+
+int pthread_spin_init(pthread_spinlock_t *, int);
+int pthread_spin_destroy(pthread_spinlock_t *);
+int pthread_spin_lock(pthread_spinlock_t *);
+int pthread_spin_trylock(pthread_spinlock_t *);
+int pthread_spin_unlock(pthread_spinlock_t *);
+
+int pthread_barrier_init(pthread_barrier_t *__restrict, const pthread_barrierattr_t *__restrict, unsigned);
+int pthread_barrier_destroy(pthread_barrier_t *);
+int pthread_barrier_wait(pthread_barrier_t *);
+
+int pthread_key_create(pthread_key_t *, void (*)(void *));
+int pthread_key_delete(pthread_key_t);
+void *pthread_getspecific(pthread_key_t);
+int pthread_setspecific(pthread_key_t, const void *);
+
+int pthread_attr_init(pthread_attr_t *);
+int pthread_attr_destroy(pthread_attr_t *);
+
+int pthread_attr_getguardsize(const pthread_attr_t *__restrict, size_t *__restrict);
+int pthread_attr_setguardsize(pthread_attr_t *, size_t);
+int pthread_attr_getstacksize(const pthread_attr_t *__restrict, size_t *__restrict);
+int pthread_attr_setstacksize(pthread_attr_t *, size_t);
+int pthread_attr_getdetachstate(const pthread_attr_t *, int *);
+int pthread_attr_setdetachstate(pthread_attr_t *, int);
+int pthread_attr_getstack(const pthread_attr_t *__restrict, void **__restrict, size_t *__restrict);
+int pthread_attr_setstack(pthread_attr_t *, void *, size_t);
+int pthread_attr_getscope(const pthread_attr_t *__restrict, int *__restrict);
+int pthread_attr_setscope(pthread_attr_t *, int);
+int pthread_attr_getschedpolicy(const pthread_attr_t *__restrict, int *__restrict);
+int pthread_attr_setschedpolicy(pthread_attr_t *, int);
+int pthread_attr_getschedparam(const pthread_attr_t *__restrict, struct sched_param *__restrict);
+int pthread_attr_setschedparam(pthread_attr_t *__restrict, const struct sched_param *__restrict);
+int pthread_attr_getinheritsched(const pthread_attr_t *__restrict, int *__restrict);
+int pthread_attr_setinheritsched(pthread_attr_t *, int);
+
+int pthread_mutexattr_destroy(pthread_mutexattr_t *);
+int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict, int *__restrict);
+int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict, int *__restrict);
+int pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict, int *__restrict);
+int pthread_mutexattr_getrobust(const pthread_mutexattr_t *__restrict, int *__restrict);
+int pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict, int *__restrict);
+int pthread_mutexattr_init(pthread_mutexattr_t *);
+int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *, int);
+int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
+int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
+int pthread_mutexattr_setrobust(pthread_mutexattr_t *, int);
+int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
+
+int pthread_condattr_init(pthread_condattr_t *);
+int pthread_condattr_destroy(pthread_condattr_t *);
+int pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
+int pthread_condattr_setpshared(pthread_condattr_t *, int);
+int pthread_condattr_getclock(const pthread_condattr_t *__restrict, clockid_t *__restrict);
+int pthread_condattr_getpshared(const pthread_condattr_t *__restrict, int *__restrict);
+
+int pthread_rwlockattr_init(pthread_rwlockattr_t *);
+int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
+int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
+int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *__restrict, int *__restrict);
+
+int pthread_barrierattr_destroy(pthread_barrierattr_t *);
+int pthread_barrierattr_getpshared(const pthread_barrierattr_t *__restrict, int *__restrict);
+int pthread_barrierattr_init(pthread_barrierattr_t *);
+int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
+
+int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
+
+int pthread_getconcurrency(void);
+int pthread_setconcurrency(int);
+
+int pthread_getcpuclockid(pthread_t, clockid_t *);
+
+struct __ptcb {
+	void (*__f)(void *);
+	void *__x;
+	struct __ptcb *__next;
+};
+
+void _pthread_cleanup_push(struct __ptcb *, void (*)(void *), void *);
+void _pthread_cleanup_pop(struct __ptcb *, int);
+
+#define pthread_cleanup_push(f, x) do { struct __ptcb __cb; _pthread_cleanup_push(&__cb, f, x);
+#define pthread_cleanup_pop(r) _pthread_cleanup_pop(&__cb, (r)); } while(0)
+
+#ifdef _GNU_SOURCE
+struct cpu_set_t;
+int pthread_getaffinity_np(pthread_t, size_t, struct cpu_set_t *);
+int pthread_setaffinity_np(pthread_t, size_t, const struct cpu_set_t *);
+int pthread_getattr_np(pthread_t, pthread_attr_t *);
+int pthread_setname_np(pthread_t, const char *);
+int pthread_getattr_default_np(pthread_attr_t *);
+int pthread_setattr_default_np(const pthread_attr_t *);
+int pthread_tryjoin_np(pthread_t, void **);
+int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);
+#endif
+
+#if _REDIR_TIME64
+__REDIR(pthread_mutex_timedlock, __pthread_mutex_timedlock_time64);
+__REDIR(pthread_cond_timedwait, __pthread_cond_timedwait_time64);
+__REDIR(pthread_rwlock_timedrdlock, __pthread_rwlock_timedrdlock_time64);
+__REDIR(pthread_rwlock_timedwrlock, __pthread_rwlock_timedwrlock_time64);
+#ifdef _GNU_SOURCE
+__REDIR(pthread_timedjoin_np, __pthread_timedjoin_np_time64);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/pty.h b/src/components/lib/libc/musl-1.2.0/include/pty.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/pty.h
rename to src/components/lib/libc/musl-1.2.0/include/pty.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/pwd.h b/src/components/lib/libc/musl-1.2.0/include/pwd.h
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/include/pwd.h
rename to src/components/lib/libc/musl-1.2.0/include/pwd.h
index 55d9d42d37..4f470b558b 100644
--- a/src/components/lib/libc/musl-1.1.11/include/pwd.h
+++ b/src/components/lib/libc/musl-1.2.0/include/pwd.h
@@ -17,8 +17,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct passwd
-{
+struct passwd {
 	char *pw_name;
 	char *pw_passwd;
 	uid_t pw_uid;
@@ -28,9 +27,11 @@ struct passwd
 	char *pw_shell;
 };
 
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 void setpwent (void);
 void endpwent (void);
 struct passwd *getpwent (void);
+#endif
 
 struct passwd *getpwuid (uid_t);
 struct passwd *getpwnam (const char *);
diff --git a/src/components/lib/libc/musl-1.1.11/include/regex.h b/src/components/lib/libc/musl-1.2.0/include/regex.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/regex.h
rename to src/components/lib/libc/musl-1.2.0/include/regex.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/resolv.h b/src/components/lib/libc/musl-1.2.0/include/resolv.h
new file mode 100644
index 0000000000..8b23ad66cc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/resolv.h
@@ -0,0 +1,142 @@
+#ifndef _RESOLV_H
+#define _RESOLV_H
+
+#include <stdint.h>
+#include <arpa/nameser.h>
+#include <netinet/in.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAXNS			3
+#define MAXDFLSRCH		3
+#define MAXDNSRCH		6
+#define LOCALDOMAINPARTS	2
+
+#define RES_TIMEOUT		5
+#define MAXRESOLVSORT		10
+#define RES_MAXNDOTS		15
+#define RES_MAXRETRANS		30
+#define RES_MAXRETRY		5
+#define RES_DFLRETRY		2
+#define RES_MAXTIME		65535
+
+/* unused; purely for broken apps */
+typedef struct __res_state {
+	int retrans;
+	int retry;
+	unsigned long options;
+	int nscount;
+	struct sockaddr_in nsaddr_list[MAXNS];
+# define nsaddr	nsaddr_list[0]
+	unsigned short id;
+	char *dnsrch[MAXDNSRCH+1];
+	char defdname[256];
+	unsigned long pfcode;
+	unsigned ndots:4;
+	unsigned nsort:4;
+	unsigned ipv6_unavail:1;
+	unsigned unused:23;
+	struct {
+		struct in_addr addr;
+		uint32_t mask;
+	} sort_list[MAXRESOLVSORT];
+	void *qhook;
+	void *rhook;
+	int res_h_errno;
+	int _vcsock;
+	unsigned _flags;
+	union {
+		char pad[52];
+		struct {
+			uint16_t		nscount;
+			uint16_t		nsmap[MAXNS];
+			int			nssocks[MAXNS];
+			uint16_t		nscount6;
+			uint16_t		nsinit;
+			struct sockaddr_in6	*nsaddrs[MAXNS];
+			unsigned int		_initstamp[2];
+		} _ext;
+	} _u;
+} *res_state;
+
+#define	__RES	19960801
+
+#ifndef _PATH_RESCONF
+#define _PATH_RESCONF        "/etc/resolv.conf"
+#endif
+
+struct res_sym {
+	int number;
+	char *name;
+	char *humanname;
+};
+
+#define	RES_F_VC	0x00000001
+#define	RES_F_CONN	0x00000002
+#define RES_F_EDNS0ERR	0x00000004
+
+#define	RES_EXHAUSTIVE	0x00000001
+
+#define RES_INIT	0x00000001
+#define RES_DEBUG	0x00000002
+#define RES_AAONLY	0x00000004
+#define RES_USEVC	0x00000008
+#define RES_PRIMARY	0x00000010
+#define RES_IGNTC	0x00000020
+#define RES_RECURSE	0x00000040
+#define RES_DEFNAMES	0x00000080
+#define RES_STAYOPEN	0x00000100
+#define RES_DNSRCH	0x00000200
+#define	RES_INSECURE1	0x00000400
+#define	RES_INSECURE2	0x00000800
+#define	RES_NOALIASES	0x00001000
+#define	RES_USE_INET6	0x00002000
+#define RES_ROTATE	0x00004000
+#define	RES_NOCHECKNAME	0x00008000
+#define	RES_KEEPTSIG	0x00010000
+#define	RES_BLAST	0x00020000
+#define RES_USEBSTRING	0x00040000
+#define RES_NOIP6DOTINT	0x00080000
+#define RES_USE_EDNS0	0x00100000
+#define RES_SNGLKUP	0x00200000
+#define RES_SNGLKUPREOP	0x00400000
+#define RES_USE_DNSSEC	0x00800000
+
+#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
+
+#define RES_PRF_STATS	0x00000001
+#define RES_PRF_UPDATE	0x00000002
+#define RES_PRF_CLASS   0x00000004
+#define RES_PRF_CMD	0x00000008
+#define RES_PRF_QUES	0x00000010
+#define RES_PRF_ANS	0x00000020
+#define RES_PRF_AUTH	0x00000040
+#define RES_PRF_ADD	0x00000080
+#define RES_PRF_HEAD1	0x00000100
+#define RES_PRF_HEAD2	0x00000200
+#define RES_PRF_TTLID	0x00000400
+#define RES_PRF_HEADX	0x00000800
+#define RES_PRF_QUERY	0x00001000
+#define RES_PRF_REPLY	0x00002000
+#define RES_PRF_INIT	0x00004000
+
+struct __res_state *__res_state(void);
+#define _res (*__res_state())
+
+int res_init(void);
+int res_query(const char *, int, int, unsigned char *, int);
+int res_querydomain(const char *, const char *, int, int, unsigned char *, int);
+int res_search(const char *, int, int, unsigned char *, int);
+int res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
+int res_send(const unsigned char *, int, unsigned char *, int);
+int dn_comp(const char *, unsigned char *, int, unsigned char **, unsigned char **);
+int dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
+int dn_skipname(const unsigned char *, const unsigned char *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sched.h b/src/components/lib/libc/musl-1.2.0/include/sched.h
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/include/sched.h
rename to src/components/lib/libc/musl-1.2.0/include/sched.h
index 3e34a72c0b..822f464efd 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sched.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sched.h
@@ -18,10 +18,16 @@ extern "C" {
 
 struct sched_param {
 	int sched_priority;
-	int sched_ss_low_priority;
-	struct timespec sched_ss_repl_period;
-	struct timespec sched_ss_init_budget;
-	int sched_ss_max_repl;
+	int __reserved1;
+#if _REDIR_TIME64
+	long __reserved2[4];
+#else
+	struct {
+		time_t __reserved1;
+		long __reserved2;
+	} __reserved2[2];
+#endif
+	int __reserved3;
 };
 
 int    sched_get_priority_max(int);
@@ -47,6 +53,7 @@ int     sched_yield(void);
 #define CLONE_FS	0x00000200
 #define CLONE_FILES	0x00000400
 #define CLONE_SIGHAND	0x00000800
+#define CLONE_PIDFD	0x00001000
 #define CLONE_PTRACE	0x00002000
 #define CLONE_VFORK	0x00004000
 #define CLONE_PARENT	0x00008000
@@ -59,6 +66,7 @@ int     sched_yield(void);
 #define CLONE_DETACHED	0x00400000
 #define CLONE_UNTRACED	0x00800000
 #define CLONE_CHILD_SETTID	0x01000000
+#define CLONE_NEWCGROUP	0x02000000
 #define CLONE_NEWUTS	0x04000000
 #define CLONE_NEWIPC	0x08000000
 #define CLONE_NEWUSER	0x10000000
@@ -71,16 +79,18 @@ int setns(int, int);
 
 void *memcpy(void *__restrict, const void *__restrict, size_t);
 int memcmp(const void *, const void *, size_t);
+void *memset (void *, int, size_t);
 void *calloc(size_t, size_t);
 void free(void *);
 
 typedef struct cpu_set_t { unsigned long __bits[128/sizeof(long)]; } cpu_set_t;
 int __sched_cpucount(size_t, const cpu_set_t *);
+int sched_getcpu(void);
 int sched_getaffinity(pid_t, size_t, cpu_set_t *);
 int sched_setaffinity(pid_t, size_t, const cpu_set_t *);
 
 #define __CPU_op_S(i, size, set, op) ( (i)/8U >= (size) ? 0 : \
-	((set)->__bits[(i)/8/sizeof(long)] op (1UL<<((i)%(8*sizeof(long))))) )
+	(((unsigned long *)(set))[(i)/8/sizeof(long)] op (1UL<<((i)%(8*sizeof(long))))) )
 
 #define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=)
 #define CPU_CLR_S(i, size, set) __CPU_op_S(i, size, set, &=~)
@@ -92,8 +102,8 @@ static __inline void __CPU_##func##_S(size_t __size, cpu_set_t *__dest, \
 { \
 	size_t __i; \
 	for (__i=0; __i<__size/sizeof(long); __i++) \
-		__dest->__bits[__i] = __src1->__bits[__i] \
-			op __src2->__bits[__i] ; \
+		((unsigned long *)__dest)[__i] = ((unsigned long *)__src1)[__i] \
+			op ((unsigned long *)__src2)[__i] ; \
 }
 
 __CPU_op_func_S(AND, &)
@@ -127,6 +137,10 @@ __CPU_op_func_S(XOR, ^)
 
 #endif
 
+#if _REDIR_TIME64
+__REDIR(sched_rr_get_interval, __sched_rr_get_interval_time64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/scsi/scsi.h b/src/components/lib/libc/musl-1.2.0/include/scsi/scsi.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/scsi/scsi.h
rename to src/components/lib/libc/musl-1.2.0/include/scsi/scsi.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/scsi/scsi_ioctl.h b/src/components/lib/libc/musl-1.2.0/include/scsi/scsi_ioctl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/scsi/scsi_ioctl.h
rename to src/components/lib/libc/musl-1.2.0/include/scsi/scsi_ioctl.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/scsi/sg.h b/src/components/lib/libc/musl-1.2.0/include/scsi/sg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/scsi/sg.h
rename to src/components/lib/libc/musl-1.2.0/include/scsi/sg.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/search.h b/src/components/lib/libc/musl-1.2.0/include/search.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/search.h
rename to src/components/lib/libc/musl-1.2.0/include/search.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/semaphore.h b/src/components/lib/libc/musl-1.2.0/include/semaphore.h
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/include/semaphore.h
rename to src/components/lib/libc/musl-1.2.0/include/semaphore.h
index 277c47d6f7..3690f49609 100644
--- a/src/components/lib/libc/musl-1.1.11/include/semaphore.h
+++ b/src/components/lib/libc/musl-1.2.0/include/semaphore.h
@@ -29,6 +29,10 @@ int    sem_trywait(sem_t *);
 int    sem_unlink(const char *);
 int    sem_wait(sem_t *);
 
+#if _REDIR_TIME64
+__REDIR(sem_timedwait, __sem_timedwait_time64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/setjmp.h b/src/components/lib/libc/musl-1.2.0/include/setjmp.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/setjmp.h
rename to src/components/lib/libc/musl-1.2.0/include/setjmp.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/shadow.h b/src/components/lib/libc/musl-1.2.0/include/shadow.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/shadow.h
rename to src/components/lib/libc/musl-1.2.0/include/shadow.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/signal.h b/src/components/lib/libc/musl-1.2.0/include/signal.h
new file mode 100644
index 0000000000..fbdf667b2f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/signal.h
@@ -0,0 +1,286 @@
+#ifndef _SIGNAL_H
+#define _SIGNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+
+#ifdef _GNU_SOURCE
+#define __ucontext ucontext
+#endif
+
+#define __NEED_size_t
+#define __NEED_pid_t
+#define __NEED_uid_t
+#define __NEED_struct_timespec
+#define __NEED_pthread_t
+#define __NEED_pthread_attr_t
+#define __NEED_time_t
+#define __NEED_clock_t
+#define __NEED_sigset_t
+
+#include <bits/alltypes.h>
+
+#define SIG_BLOCK     0
+#define SIG_UNBLOCK   1
+#define SIG_SETMASK   2
+
+#define SI_ASYNCNL (-60)
+#define SI_TKILL (-6)
+#define SI_SIGIO (-5)
+#define SI_ASYNCIO (-4)
+#define SI_MESGQ (-3)
+#define SI_TIMER (-2)
+#define SI_QUEUE (-1)
+#define SI_USER 0
+#define SI_KERNEL 128
+
+typedef struct sigaltstack stack_t;
+
+#endif
+
+#include <bits/signal.h>
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+
+#define SIG_HOLD ((void (*)(int)) 2)
+
+#define FPE_INTDIV 1
+#define FPE_INTOVF 2
+#define FPE_FLTDIV 3
+#define FPE_FLTOVF 4
+#define FPE_FLTUND 5
+#define FPE_FLTRES 6
+#define FPE_FLTINV 7
+#define FPE_FLTSUB 8
+
+#define ILL_ILLOPC 1
+#define ILL_ILLOPN 2
+#define ILL_ILLADR 3
+#define ILL_ILLTRP 4
+#define ILL_PRVOPC 5
+#define ILL_PRVREG 6
+#define ILL_COPROC 7
+#define ILL_BADSTK 8
+
+#define SEGV_MAPERR 1
+#define SEGV_ACCERR 2
+#define SEGV_BNDERR 3
+#define SEGV_PKUERR 4
+
+#define BUS_ADRALN 1
+#define BUS_ADRERR 2
+#define BUS_OBJERR 3
+#define BUS_MCEERR_AR 4
+#define BUS_MCEERR_AO 5
+
+#define CLD_EXITED 1
+#define CLD_KILLED 2
+#define CLD_DUMPED 3
+#define CLD_TRAPPED 4
+#define CLD_STOPPED 5
+#define CLD_CONTINUED 6
+
+union sigval {
+	int sival_int;
+	void *sival_ptr;
+};
+
+typedef struct {
+#ifdef __SI_SWAP_ERRNO_CODE
+	int si_signo, si_code, si_errno;
+#else
+	int si_signo, si_errno, si_code;
+#endif
+	union {
+		char __pad[128 - 2*sizeof(int) - sizeof(long)];
+		struct {
+			union {
+				struct {
+					pid_t si_pid;
+					uid_t si_uid;
+				} __piduid;
+				struct {
+					int si_timerid;
+					int si_overrun;
+				} __timer;
+			} __first;
+			union {
+				union sigval si_value;
+				struct {
+					int si_status;
+					clock_t si_utime, si_stime;
+				} __sigchld;
+			} __second;
+		} __si_common;
+		struct {
+			void *si_addr;
+			short si_addr_lsb;
+			union {
+				struct {
+					void *si_lower;
+					void *si_upper;
+				} __addr_bnd;
+				unsigned si_pkey;
+			} __first;
+		} __sigfault;
+		struct {
+			long si_band;
+			int si_fd;
+		} __sigpoll;
+		struct {
+			void *si_call_addr;
+			int si_syscall;
+			unsigned si_arch;
+		} __sigsys;
+	} __si_fields;
+} siginfo_t;
+#define si_pid     __si_fields.__si_common.__first.__piduid.si_pid
+#define si_uid     __si_fields.__si_common.__first.__piduid.si_uid
+#define si_status  __si_fields.__si_common.__second.__sigchld.si_status
+#define si_utime   __si_fields.__si_common.__second.__sigchld.si_utime
+#define si_stime   __si_fields.__si_common.__second.__sigchld.si_stime
+#define si_value   __si_fields.__si_common.__second.si_value
+#define si_addr    __si_fields.__sigfault.si_addr
+#define si_addr_lsb __si_fields.__sigfault.si_addr_lsb
+#define si_lower   __si_fields.__sigfault.__first.__addr_bnd.si_lower
+#define si_upper   __si_fields.__sigfault.__first.__addr_bnd.si_upper
+#define si_pkey    __si_fields.__sigfault.__first.si_pkey
+#define si_band    __si_fields.__sigpoll.si_band
+#define si_fd      __si_fields.__sigpoll.si_fd
+#define si_timerid __si_fields.__si_common.__first.__timer.si_timerid
+#define si_overrun __si_fields.__si_common.__first.__timer.si_overrun
+#define si_ptr     si_value.sival_ptr
+#define si_int     si_value.sival_int
+#define si_call_addr __si_fields.__sigsys.si_call_addr
+#define si_syscall __si_fields.__sigsys.si_syscall
+#define si_arch    __si_fields.__sigsys.si_arch
+
+struct sigaction {
+	union {
+		void (*sa_handler)(int);
+		void (*sa_sigaction)(int, siginfo_t *, void *);
+	} __sa_handler;
+	sigset_t sa_mask;
+	int sa_flags;
+	void (*sa_restorer)(void);
+};
+#define sa_handler   __sa_handler.sa_handler
+#define sa_sigaction __sa_handler.sa_sigaction
+
+struct sigevent {
+	union sigval sigev_value;
+	int sigev_signo;
+	int sigev_notify;
+	void (*sigev_notify_function)(union sigval);
+	pthread_attr_t *sigev_notify_attributes;
+	char __pad[56-3*sizeof(long)];
+};
+
+#define SIGEV_SIGNAL 0
+#define SIGEV_NONE 1
+#define SIGEV_THREAD 2
+
+int __libc_current_sigrtmin(void);
+int __libc_current_sigrtmax(void);
+
+#define SIGRTMIN  (__libc_current_sigrtmin())
+#define SIGRTMAX  (__libc_current_sigrtmax())
+
+int kill(pid_t, int);
+
+int sigemptyset(sigset_t *);
+int sigfillset(sigset_t *);
+int sigaddset(sigset_t *, int);
+int sigdelset(sigset_t *, int);
+int sigismember(const sigset_t *, int);
+
+int sigprocmask(int, const sigset_t *__restrict, sigset_t *__restrict);
+int sigsuspend(const sigset_t *);
+int sigaction(int, const struct sigaction *__restrict, struct sigaction *__restrict);
+int sigpending(sigset_t *);
+int sigwait(const sigset_t *__restrict, int *__restrict);
+int sigwaitinfo(const sigset_t *__restrict, siginfo_t *__restrict);
+int sigtimedwait(const sigset_t *__restrict, siginfo_t *__restrict, const struct timespec *__restrict);
+int sigqueue(pid_t, int, union sigval);
+
+int pthread_sigmask(int, const sigset_t *__restrict, sigset_t *__restrict);
+int pthread_kill(pthread_t, int);
+
+void psiginfo(const siginfo_t *, const char *);
+void psignal(int, const char *);
+
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+int killpg(pid_t, int);
+int sigaltstack(const stack_t *__restrict, stack_t *__restrict);
+int sighold(int);
+int sigignore(int);
+int siginterrupt(int, int);
+int sigpause(int);
+int sigrelse(int);
+void (*sigset(int, void (*)(int)))(int);
+#define TRAP_BRKPT 1
+#define TRAP_TRACE 2
+#define TRAP_BRANCH 3
+#define TRAP_HWBKPT 4
+#define TRAP_UNK 5
+#define POLL_IN 1
+#define POLL_OUT 2
+#define POLL_MSG 3
+#define POLL_ERR 4
+#define POLL_PRI 5
+#define POLL_HUP 6
+#define SS_ONSTACK    1
+#define SS_DISABLE    2
+#define SS_AUTODISARM (1U << 31)
+#define SS_FLAG_BITS SS_AUTODISARM
+#endif
+
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define NSIG _NSIG
+typedef void (*sig_t)(int);
+#endif
+
+#ifdef _GNU_SOURCE
+typedef void (*sighandler_t)(int);
+void (*bsd_signal(int, void (*)(int)))(int);
+int sigisemptyset(const sigset_t *);
+int sigorset (sigset_t *, const sigset_t *, const sigset_t *);
+int sigandset(sigset_t *, const sigset_t *, const sigset_t *);
+
+#define SA_NOMASK SA_NODEFER
+#define SA_ONESHOT SA_RESETHAND
+#endif
+
+#define SIG_ERR  ((void (*)(int))-1)
+#define SIG_DFL  ((void (*)(int)) 0)
+#define SIG_IGN  ((void (*)(int)) 1)
+
+typedef int sig_atomic_t;
+
+void (*signal(int, void (*)(int)))(int);
+int raise(int);
+
+#if _REDIR_TIME64
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+__REDIR(sigtimedwait, __sigtimedwait_time64);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/spawn.h b/src/components/lib/libc/musl-1.2.0/include/spawn.h
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/include/spawn.h
rename to src/components/lib/libc/musl-1.2.0/include/spawn.h
index 29c799ee91..8eb73e003a 100644
--- a/src/components/lib/libc/musl-1.1.11/include/spawn.h
+++ b/src/components/lib/libc/musl-1.2.0/include/spawn.h
@@ -21,12 +21,16 @@ struct sched_param;
 #define POSIX_SPAWN_SETSIGMASK 8
 #define POSIX_SPAWN_SETSCHEDPARAM 16
 #define POSIX_SPAWN_SETSCHEDULER 32
+#define POSIX_SPAWN_USEVFORK 64
+#define POSIX_SPAWN_SETSID 128
 
 typedef struct {
 	int __flags;
 	pid_t __pgrp;
 	sigset_t __def, __mask;
-	int __prio, __pol, __pad[16];
+	int __prio, __pol;
+	void *__fn;
+	char __pad[64-sizeof(void *)];
 } posix_spawnattr_t;
 
 typedef struct {
@@ -67,6 +71,11 @@ int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t *__restrict, int
 int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *, int);
 int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *, int, int);
 
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+int posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t *__restrict, const char *__restrict);
+int posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *, int);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdalign.h b/src/components/lib/libc/musl-1.2.0/include/stdalign.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/stdalign.h
rename to src/components/lib/libc/musl-1.2.0/include/stdalign.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/stdarg.h b/src/components/lib/libc/musl-1.2.0/include/stdarg.h
new file mode 100644
index 0000000000..3256f80500
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/stdarg.h
@@ -0,0 +1,21 @@
+#ifndef _STDARG_H
+#define _STDARG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define __NEED_va_list
+
+#include <bits/alltypes.h>
+
+#define va_start(v,l)   __builtin_va_start(v,l)
+#define va_end(v)       __builtin_va_end(v)
+#define va_arg(v,l)     __builtin_va_arg(v,l)
+#define va_copy(d,s)    __builtin_va_copy(d,s)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdbool.h b/src/components/lib/libc/musl-1.2.0/include/stdbool.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/stdbool.h
rename to src/components/lib/libc/musl-1.2.0/include/stdbool.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/stdc-predef.h b/src/components/lib/libc/musl-1.2.0/include/stdc-predef.h
new file mode 100644
index 0000000000..f8cd4b8911
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/stdc-predef.h
@@ -0,0 +1,10 @@
+#ifndef _STDC_PREDEF_H
+#define _STDC_PREDEF_H
+
+#define __STDC_ISO_10646__ 201206L
+
+#if !defined(__GCC_IEC_559) || __GCC_IEC_559 > 0
+#define __STDC_IEC_559__ 1
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stddef.h b/src/components/lib/libc/musl-1.2.0/include/stddef.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/stddef.h
rename to src/components/lib/libc/musl-1.2.0/include/stddef.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdint.h b/src/components/lib/libc/musl-1.2.0/include/stdint.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/stdint.h
rename to src/components/lib/libc/musl-1.2.0/include/stdint.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/stdio.h b/src/components/lib/libc/musl-1.2.0/include/stdio.h
new file mode 100644
index 0000000000..3604198c3e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/stdio.h
@@ -0,0 +1,222 @@
+#ifndef _STDIO_H
+#define _STDIO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_FILE
+#define __NEED___isoc_va_list
+#define __NEED_size_t
+
+#if __STDC_VERSION__ < 201112L
+#define __NEED_struct__IO_FILE
+#endif
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+#define __NEED_ssize_t
+#define __NEED_off_t
+#define __NEED_va_list
+#endif
+
+#include <bits/alltypes.h>
+
+#ifdef __cplusplus
+#define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
+
+#undef EOF
+#define EOF (-1)
+
+#undef SEEK_SET
+#undef SEEK_CUR
+#undef SEEK_END
+#define SEEK_SET 0
+#define SEEK_CUR 1
+#define SEEK_END 2
+
+#define _IOFBF 0
+#define _IOLBF 1
+#define _IONBF 2
+
+#define BUFSIZ 1024
+#define FILENAME_MAX 4096
+#define FOPEN_MAX 1000
+#define TMP_MAX 10000
+#define L_tmpnam 20
+
+typedef union _G_fpos64_t {
+	char __opaque[16];
+	long long __lldata;
+	double __align;
+} fpos_t;
+
+extern FILE *const stdin;
+extern FILE *const stdout;
+extern FILE *const stderr;
+
+#define stdin  (stdin)
+#define stdout (stdout)
+#define stderr (stderr)
+
+FILE *fopen(const char *__restrict, const char *__restrict);
+FILE *freopen(const char *__restrict, const char *__restrict, FILE *__restrict);
+int fclose(FILE *);
+
+int remove(const char *);
+int rename(const char *, const char *);
+
+int feof(FILE *);
+int ferror(FILE *);
+int fflush(FILE *);
+void clearerr(FILE *);
+
+int fseek(FILE *, long, int);
+long ftell(FILE *);
+void rewind(FILE *);
+
+int fgetpos(FILE *__restrict, fpos_t *__restrict);
+int fsetpos(FILE *, const fpos_t *);
+
+size_t fread(void *__restrict, size_t, size_t, FILE *__restrict);
+size_t fwrite(const void *__restrict, size_t, size_t, FILE *__restrict);
+
+int fgetc(FILE *);
+int getc(FILE *);
+int getchar(void);
+int ungetc(int, FILE *);
+
+int fputc(int, FILE *);
+int putc(int, FILE *);
+int putchar(int);
+
+char *fgets(char *__restrict, int, FILE *__restrict);
+#if __STDC_VERSION__ < 201112L
+char *gets(char *);
+#endif
+
+int fputs(const char *__restrict, FILE *__restrict);
+int puts(const char *);
+
+int printf(const char *__restrict, ...);
+int fprintf(FILE *__restrict, const char *__restrict, ...);
+int sprintf(char *__restrict, const char *__restrict, ...);
+int snprintf(char *__restrict, size_t, const char *__restrict, ...);
+
+int vprintf(const char *__restrict, __isoc_va_list);
+int vfprintf(FILE *__restrict, const char *__restrict, __isoc_va_list);
+int vsprintf(char *__restrict, const char *__restrict, __isoc_va_list);
+int vsnprintf(char *__restrict, size_t, const char *__restrict, __isoc_va_list);
+
+int scanf(const char *__restrict, ...);
+int fscanf(FILE *__restrict, const char *__restrict, ...);
+int sscanf(const char *__restrict, const char *__restrict, ...);
+int vscanf(const char *__restrict, __isoc_va_list);
+int vfscanf(FILE *__restrict, const char *__restrict, __isoc_va_list);
+int vsscanf(const char *__restrict, const char *__restrict, __isoc_va_list);
+
+void perror(const char *);
+
+int setvbuf(FILE *__restrict, char *__restrict, int, size_t);
+void setbuf(FILE *__restrict, char *__restrict);
+
+char *tmpnam(char *);
+FILE *tmpfile(void);
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+FILE *fmemopen(void *__restrict, size_t, const char *__restrict);
+FILE *open_memstream(char **, size_t *);
+FILE *fdopen(int, const char *);
+FILE *popen(const char *, const char *);
+int pclose(FILE *);
+int fileno(FILE *);
+int fseeko(FILE *, off_t, int);
+off_t ftello(FILE *);
+int dprintf(int, const char *__restrict, ...);
+int vdprintf(int, const char *__restrict, __isoc_va_list);
+void flockfile(FILE *);
+int ftrylockfile(FILE *);
+void funlockfile(FILE *);
+int getc_unlocked(FILE *);
+int getchar_unlocked(void);
+int putc_unlocked(int, FILE *);
+int putchar_unlocked(int);
+ssize_t getdelim(char **__restrict, size_t *__restrict, int, FILE *__restrict);
+ssize_t getline(char **__restrict, size_t *__restrict, FILE *__restrict);
+int renameat(int, const char *, int, const char *);
+char *ctermid(char *);
+#define L_ctermid 20
+#endif
+
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+#define P_tmpdir "/tmp"
+char *tempnam(const char *, const char *);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define L_cuserid 20
+char *cuserid(char *);
+void setlinebuf(FILE *);
+void setbuffer(FILE *, char *, size_t);
+int fgetc_unlocked(FILE *);
+int fputc_unlocked(int, FILE *);
+int fflush_unlocked(FILE *);
+size_t fread_unlocked(void *, size_t, size_t, FILE *);
+size_t fwrite_unlocked(const void *, size_t, size_t, FILE *);
+void clearerr_unlocked(FILE *);
+int feof_unlocked(FILE *);
+int ferror_unlocked(FILE *);
+int fileno_unlocked(FILE *);
+int getw(FILE *);
+int putw(int, FILE *);
+char *fgetln(FILE *, size_t *);
+int asprintf(char **, const char *, ...);
+int vasprintf(char **, const char *, __isoc_va_list);
+#endif
+
+#ifdef _GNU_SOURCE
+char *fgets_unlocked(char *, int, FILE *);
+int fputs_unlocked(const char *, FILE *);
+
+typedef ssize_t (cookie_read_function_t)(void *, char *, size_t);
+typedef ssize_t (cookie_write_function_t)(void *, const char *, size_t);
+typedef int (cookie_seek_function_t)(void *, off_t *, int);
+typedef int (cookie_close_function_t)(void *);
+
+typedef struct _IO_cookie_io_functions_t {
+	cookie_read_function_t *read;
+	cookie_write_function_t *write;
+	cookie_seek_function_t *seek;
+	cookie_close_function_t *close;
+} cookie_io_functions_t;
+
+FILE *fopencookie(void *, const char *, cookie_io_functions_t);
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define tmpfile64 tmpfile
+#define fopen64 fopen
+#define freopen64 freopen
+#define fseeko64 fseeko
+#define ftello64 ftello
+#define fgetpos64 fgetpos
+#define fsetpos64 fsetpos
+#define fpos64_t fpos_t
+#define off64_t off_t
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdio_ext.h b/src/components/lib/libc/musl-1.2.0/include/stdio_ext.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/stdio_ext.h
rename to src/components/lib/libc/musl-1.2.0/include/stdio_ext.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/stdlib.h b/src/components/lib/libc/musl-1.2.0/include/stdlib.h
new file mode 100644
index 0000000000..194c20339e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/stdlib.h
@@ -0,0 +1,175 @@
+#ifndef _STDLIB_H
+#define _STDLIB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#ifdef __cplusplus
+#define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
+
+#define __NEED_size_t
+#define __NEED_wchar_t
+
+#include <bits/alltypes.h>
+
+int atoi (const char *);
+long atol (const char *);
+long long atoll (const char *);
+double atof (const char *);
+
+float strtof (const char *__restrict, char **__restrict);
+double strtod (const char *__restrict, char **__restrict);
+long double strtold (const char *__restrict, char **__restrict);
+
+long strtol (const char *__restrict, char **__restrict, int);
+unsigned long strtoul (const char *__restrict, char **__restrict, int);
+long long strtoll (const char *__restrict, char **__restrict, int);
+unsigned long long strtoull (const char *__restrict, char **__restrict, int);
+
+int rand (void);
+void srand (unsigned);
+
+void *malloc (size_t);
+void *calloc (size_t, size_t);
+void *realloc (void *, size_t);
+void free (void *);
+void *aligned_alloc(size_t, size_t);
+
+_Noreturn void abort (void);
+int atexit (void (*) (void));
+_Noreturn void exit (int);
+_Noreturn void _Exit (int);
+int at_quick_exit (void (*) (void));
+_Noreturn void quick_exit (int);
+
+char *getenv (const char *);
+
+int system (const char *);
+
+void *bsearch (const void *, const void *, size_t, size_t, int (*)(const void *, const void *));
+void qsort (void *, size_t, size_t, int (*)(const void *, const void *));
+
+int abs (int);
+long labs (long);
+long long llabs (long long);
+
+typedef struct { int quot, rem; } div_t;
+typedef struct { long quot, rem; } ldiv_t;
+typedef struct { long long quot, rem; } lldiv_t;
+
+div_t div (int, int);
+ldiv_t ldiv (long, long);
+lldiv_t lldiv (long long, long long);
+
+int mblen (const char *, size_t);
+int mbtowc (wchar_t *__restrict, const char *__restrict, size_t);
+int wctomb (char *, wchar_t);
+size_t mbstowcs (wchar_t *__restrict, const char *__restrict, size_t);
+size_t wcstombs (char *__restrict, const wchar_t *__restrict, size_t);
+
+#define EXIT_FAILURE 1
+#define EXIT_SUCCESS 0
+
+size_t __ctype_get_mb_cur_max(void);
+#define MB_CUR_MAX (__ctype_get_mb_cur_max())
+
+#define RAND_MAX (0x7fffffff)
+
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+
+#define WNOHANG    1
+#define WUNTRACED  2
+
+#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
+#define WTERMSIG(s) ((s) & 0x7f)
+#define WSTOPSIG(s) WEXITSTATUS(s)
+#define WIFEXITED(s) (!WTERMSIG(s))
+#define WIFSTOPPED(s) ((short)((((s)&0xffff)*0x10001)>>8) > 0x7f00)
+#define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu)
+
+int posix_memalign (void **, size_t, size_t);
+int setenv (const char *, const char *, int);
+int unsetenv (const char *);
+int mkstemp (char *);
+int mkostemp (char *, int);
+char *mkdtemp (char *);
+int getsubopt (char **, char *const *, char **);
+int rand_r (unsigned *);
+
+#endif
+
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+char *realpath (const char *__restrict, char *__restrict);
+long int random (void);
+void srandom (unsigned int);
+char *initstate (unsigned int, char *, size_t);
+char *setstate (char *);
+int putenv (char *);
+int posix_openpt (int);
+int grantpt (int);
+int unlockpt (int);
+char *ptsname (int);
+char *l64a (long);
+long a64l (const char *);
+void setkey (const char *);
+double drand48 (void);
+double erand48 (unsigned short [3]);
+long int lrand48 (void);
+long int nrand48 (unsigned short [3]);
+long mrand48 (void);
+long jrand48 (unsigned short [3]);
+void srand48 (long);
+unsigned short *seed48 (unsigned short [3]);
+void lcong48 (unsigned short [7]);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#include <alloca.h>
+char *mktemp (char *);
+int mkstemps (char *, int);
+int mkostemps (char *, int, int);
+void *valloc (size_t);
+void *memalign(size_t, size_t);
+int getloadavg(double *, int);
+int clearenv(void);
+#define WCOREDUMP(s) ((s) & 0x80)
+#define WIFCONTINUED(s) ((s) == 0xffff)
+#endif
+
+#ifdef _GNU_SOURCE
+int ptsname_r(int, char *, size_t);
+char *ecvt(double, int, int *, int *);
+char *fcvt(double, int, int *, int *);
+char *gcvt(double, int, char *);
+char *secure_getenv(const char *);
+struct __locale_struct;
+float strtof_l(const char *__restrict, char **__restrict, struct __locale_struct *);
+double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *);
+long double strtold_l(const char *__restrict, char **__restrict, struct __locale_struct *);
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define mkstemp64 mkstemp
+#define mkostemp64 mkostemp
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define mkstemps64 mkstemps
+#define mkostemps64 mkostemps
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/stdnoreturn.h b/src/components/lib/libc/musl-1.2.0/include/stdnoreturn.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/stdnoreturn.h
rename to src/components/lib/libc/musl-1.2.0/include/stdnoreturn.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/string.h b/src/components/lib/libc/musl-1.2.0/include/string.h
new file mode 100644
index 0000000000..795a2abcd9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/string.h
@@ -0,0 +1,105 @@
+#ifndef	_STRING_H
+#define	_STRING_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#ifdef __cplusplus
+#define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
+
+#define __NEED_size_t
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+#define __NEED_locale_t
+#endif
+
+#include <bits/alltypes.h>
+
+void *memcpy (void *__restrict, const void *__restrict, size_t);
+void *memmove (void *, const void *, size_t);
+void *memset (void *, int, size_t);
+int memcmp (const void *, const void *, size_t);
+void *memchr (const void *, int, size_t);
+
+char *strcpy (char *__restrict, const char *__restrict);
+char *strncpy (char *__restrict, const char *__restrict, size_t);
+
+char *strcat (char *__restrict, const char *__restrict);
+char *strncat (char *__restrict, const char *__restrict, size_t);
+
+int strcmp (const char *, const char *);
+int strncmp (const char *, const char *, size_t);
+
+int strcoll (const char *, const char *);
+size_t strxfrm (char *__restrict, const char *__restrict, size_t);
+
+char *strchr (const char *, int);
+char *strrchr (const char *, int);
+
+size_t strcspn (const char *, const char *);
+size_t strspn (const char *, const char *);
+char *strpbrk (const char *, const char *);
+char *strstr (const char *, const char *);
+char *strtok (char *__restrict, const char *__restrict);
+
+size_t strlen (const char *);
+
+char *strerror (int);
+
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#include <strings.h>
+#endif
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+char *strtok_r (char *__restrict, const char *__restrict, char **__restrict);
+int strerror_r (int, char *, size_t);
+char *stpcpy(char *__restrict, const char *__restrict);
+char *stpncpy(char *__restrict, const char *__restrict, size_t);
+size_t strnlen (const char *, size_t);
+char *strdup (const char *);
+char *strndup (const char *, size_t);
+char *strsignal(int);
+char *strerror_l (int, locale_t);
+int strcoll_l (const char *, const char *, locale_t);
+size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t);
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+void *memccpy (void *__restrict, const void *__restrict, int, size_t);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+char *strsep(char **, const char *);
+size_t strlcat (char *, const char *, size_t);
+size_t strlcpy (char *, const char *, size_t);
+void explicit_bzero (void *, size_t);
+#endif
+
+#ifdef _GNU_SOURCE
+#define	strdupa(x)	strcpy(alloca(strlen(x)+1),x)
+int strverscmp (const char *, const char *);
+char *strchrnul(const char *, int);
+char *strcasestr(const char *, const char *);
+void *memmem(const void *, size_t, const void *, size_t);
+void *memrchr(const void *, int, size_t);
+void *mempcpy(void *, const void *, size_t);
+#ifndef __cplusplus
+char *basename();
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/strings.h b/src/components/lib/libc/musl-1.2.0/include/strings.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/strings.h
rename to src/components/lib/libc/musl-1.2.0/include/strings.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/stropts.h b/src/components/lib/libc/musl-1.2.0/include/stropts.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/stropts.h
rename to src/components/lib/libc/musl-1.2.0/include/stropts.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/acct.h b/src/components/lib/libc/musl-1.2.0/include/sys/acct.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/sys/acct.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/acct.h
index ee576c4ab3..fae9d0508f 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/acct.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/acct.h
@@ -6,7 +6,6 @@ extern "C" {
 #endif
 
 #include <features.h>
-#include <endian.h>
 #include <time.h>
 #include <stdint.h>
 
@@ -14,8 +13,7 @@ extern "C" {
 
 typedef uint16_t comp_t;
 
-struct acct
-{
+struct acct {
 	char ac_flag;
 	uint16_t ac_uid;
 	uint16_t ac_gid;
@@ -36,8 +34,7 @@ struct acct
 };
 
 
-struct acct_v3
-{
+struct acct_v3 {
 	char ac_flag;
 	char ac_version;
 	uint16_t ac_tty;
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/auxv.h b/src/components/lib/libc/musl-1.2.0/include/sys/auxv.h
new file mode 100644
index 0000000000..ddccf57ff6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/auxv.h
@@ -0,0 +1,17 @@
+#ifndef _SYS_AUXV_H
+#define _SYS_AUXV_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <elf.h>
+#include <bits/hwcap.h>
+
+unsigned long getauxval(unsigned long);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/cachectl.h b/src/components/lib/libc/musl-1.2.0/include/sys/cachectl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/cachectl.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/cachectl.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/dir.h b/src/components/lib/libc/musl-1.2.0/include/sys/dir.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/dir.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/dir.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/epoll.h b/src/components/lib/libc/musl-1.2.0/include/sys/epoll.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/sys/epoll.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/epoll.h
index 1f0312e59e..ac81a8418a 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/epoll.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/epoll.h
@@ -21,6 +21,7 @@ enum EPOLL_EVENTS { __EPOLL_DUMMY };
 #define EPOLLPRI 0x002
 #define EPOLLOUT 0x004
 #define EPOLLRDNORM 0x040
+#define EPOLLNVAL 0x020
 #define EPOLLRDBAND 0x080
 #define EPOLLWRNORM 0x100
 #define EPOLLWRBAND 0x200
@@ -28,6 +29,7 @@ enum EPOLL_EVENTS { __EPOLL_DUMMY };
 #define EPOLLERR 0x008
 #define EPOLLHUP 0x010
 #define EPOLLRDHUP 0x2000
+#define EPOLLEXCLUSIVE (1U<<28)
 #define EPOLLWAKEUP (1U<<29)
 #define EPOLLONESHOT (1U<<30)
 #define EPOLLET (1U<<31)
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/errno.h b/src/components/lib/libc/musl-1.2.0/include/sys/errno.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/errno.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/errno.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/eventfd.h b/src/components/lib/libc/musl-1.2.0/include/sys/eventfd.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/eventfd.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/eventfd.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/fanotify.h b/src/components/lib/libc/musl-1.2.0/include/sys/fanotify.h
new file mode 100644
index 0000000000..b637c8f58a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/fanotify.h
@@ -0,0 +1,105 @@
+#ifndef _FANOTIFY_H
+#define _FANOTIFY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/statfs.h>
+
+struct fanotify_event_metadata {
+	unsigned event_len;
+	unsigned char vers;
+	unsigned char reserved;
+	unsigned short metadata_len;
+	unsigned long long mask
+#ifdef __GNUC__
+	__attribute__((__aligned__(8)))
+#endif
+	;
+	int fd;
+	int pid;
+};
+
+struct fanotify_event_info_header {
+	unsigned char info_type;
+	unsigned char pad;
+	unsigned short len;
+};
+
+struct fanotify_event_info_fid {
+	struct fanotify_event_info_header hdr;
+	fsid_t fsid;
+	unsigned char handle[];
+};
+
+struct fanotify_response {
+	int fd;
+	unsigned response;
+};
+
+#define FAN_ACCESS 0x01
+#define FAN_MODIFY 0x02
+#define FAN_ATTRIB 0x04
+#define FAN_CLOSE_WRITE 0x08
+#define FAN_CLOSE_NOWRITE 0x10
+#define FAN_OPEN 0x20
+#define FAN_MOVED_FROM 0x40
+#define FAN_MOVED_TO 0x80
+#define FAN_CREATE 0x100
+#define FAN_DELETE 0x200
+#define FAN_DELETE_SELF 0x400
+#define FAN_MOVE_SELF 0x800
+#define FAN_OPEN_EXEC 0x1000
+#define FAN_Q_OVERFLOW 0x4000
+#define FAN_OPEN_PERM 0x10000
+#define FAN_ACCESS_PERM 0x20000
+#define FAN_OPEN_EXEC_PERM 0x40000
+#define FAN_ONDIR 0x40000000
+#define FAN_EVENT_ON_CHILD 0x08000000
+#define FAN_CLOSE (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE)
+#define FAN_MOVE (FAN_MOVED_FROM | FAN_MOVED_TO)
+#define FAN_CLOEXEC 0x01
+#define FAN_NONBLOCK 0x02
+#define FAN_CLASS_NOTIF 0
+#define FAN_CLASS_CONTENT 0x04
+#define FAN_CLASS_PRE_CONTENT 0x08
+#define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
+#define FAN_UNLIMITED_QUEUE 0x10
+#define FAN_UNLIMITED_MARKS 0x20
+#define FAN_ENABLE_AUDIT 0x40
+#define FAN_REPORT_TID 0x100
+#define FAN_REPORT_FID 0x200
+#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS)
+#define FAN_MARK_ADD 0x01
+#define FAN_MARK_REMOVE 0x02
+#define FAN_MARK_DONT_FOLLOW 0x04
+#define FAN_MARK_ONLYDIR 0x08
+#define FAN_MARK_IGNORED_MASK 0x20
+#define FAN_MARK_IGNORED_SURV_MODIFY 0x40
+#define FAN_MARK_FLUSH 0x80
+#define FAN_MARK_INODE 0x00
+#define FAN_MARK_MOUNT 0x10
+#define FAN_MARK_FILESYSTEM 0x100
+#define FAN_MARK_TYPE_MASK (FAN_MARK_INODE | FAN_MARK_MOUNT | FAN_MARK_FILESYSTEM)
+#define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD | FAN_MARK_REMOVE | FAN_MARK_DONT_FOLLOW | FAN_MARK_ONLYDIR | FAN_MARK_MOUNT | FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY | FAN_MARK_FLUSH)
+#define FAN_ALL_EVENTS (FAN_ACCESS | FAN_MODIFY | FAN_CLOSE | FAN_OPEN)
+#define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM | FAN_ACCESS_PERM)
+#define FAN_ALL_OUTGOING_EVENTS (FAN_ALL_EVENTS | FAN_ALL_PERM_EVENTS | FAN_Q_OVERFLOW)
+#define FANOTIFY_METADATA_VERSION 3
+#define FAN_EVENT_INFO_TYPE_FID 1
+#define FAN_ALLOW 0x01
+#define FAN_DENY 0x02
+#define FAN_AUDIT 0x10
+#define FAN_NOFD -1
+#define FAN_EVENT_METADATA_LEN (sizeof(struct fanotify_event_metadata))
+#define FAN_EVENT_NEXT(meta, len) ((len) -= (meta)->event_len, (struct fanotify_event_metadata*)(((char *)(meta)) + (meta)->event_len))
+#define FAN_EVENT_OK(meta, len) ((long)(len) >= (long)FAN_EVENT_METADATA_LEN && (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && (long)(meta)->event_len <= (long)(len))
+
+int fanotify_init(unsigned, unsigned);
+int fanotify_mark(int, unsigned, unsigned long long, int, const char *);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/fcntl.h b/src/components/lib/libc/musl-1.2.0/include/sys/fcntl.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/fcntl.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/fcntl.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/file.h b/src/components/lib/libc/musl-1.2.0/include/sys/file.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/file.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/file.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/fsuid.h b/src/components/lib/libc/musl-1.2.0/include/sys/fsuid.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/fsuid.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/fsuid.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/inotify.h b/src/components/lib/libc/musl-1.2.0/include/sys/inotify.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/sys/inotify.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/inotify.h
index 46638cac9d..69b5863199 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/inotify.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/inotify.h
@@ -40,6 +40,7 @@ struct inotify_event {
 #define IN_ONLYDIR       0x01000000
 #define IN_DONT_FOLLOW   0x02000000
 #define IN_EXCL_UNLINK   0x04000000
+#define IN_MASK_CREATE   0x10000000
 #define IN_MASK_ADD      0x20000000
 
 #define IN_ISDIR         0x40000000
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/io.h b/src/components/lib/libc/musl-1.2.0/include/sys/io.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/io.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/io.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/ioctl.h b/src/components/lib/libc/musl-1.2.0/include/sys/ioctl.h
new file mode 100644
index 0000000000..c2ce3b4840
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/ioctl.h
@@ -0,0 +1,125 @@
+#ifndef	_SYS_IOCTL_H
+#define	_SYS_IOCTL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <bits/alltypes.h>
+#include <bits/ioctl.h>
+
+#define N_TTY           0
+#define N_SLIP          1
+#define N_MOUSE         2
+#define N_PPP           3
+#define N_STRIP         4
+#define N_AX25          5
+#define N_X25           6
+#define N_6PACK         7
+#define N_MASC          8
+#define N_R3964         9
+#define N_PROFIBUS_FDL  10
+#define N_IRDA          11
+#define N_SMSBLOCK      12
+#define N_HDLC          13
+#define N_SYNC_PPP      14
+#define N_HCI           15
+#define N_GIGASET_M101  16
+#define N_SLCAN         17
+#define N_PPS           18
+#define N_V253          19
+#define N_CAIF          20
+#define N_GSM0710       21
+#define N_TI_WL         22
+#define N_TRACESINK     23
+#define N_TRACEROUTER   24
+#define N_NCI           25
+#define N_SPEAKUP       26
+#define N_NULL          27
+
+#define TIOCPKT_DATA       0
+#define TIOCPKT_FLUSHREAD  1
+#define TIOCPKT_FLUSHWRITE 2
+#define TIOCPKT_STOP       4
+#define TIOCPKT_START      8
+#define TIOCPKT_NOSTOP    16
+#define TIOCPKT_DOSTOP    32
+#define TIOCPKT_IOCTL     64
+
+#define TIOCSER_TEMT 1
+
+struct winsize {
+	unsigned short ws_row;
+	unsigned short ws_col;
+	unsigned short ws_xpixel;
+	unsigned short ws_ypixel;
+};
+
+#define SIOCADDRT          0x890B
+#define SIOCDELRT          0x890C
+#define SIOCRTMSG          0x890D
+
+#define SIOCGIFNAME        0x8910
+#define SIOCSIFLINK        0x8911
+#define SIOCGIFCONF        0x8912
+#define SIOCGIFFLAGS       0x8913
+#define SIOCSIFFLAGS       0x8914
+#define SIOCGIFADDR        0x8915
+#define SIOCSIFADDR        0x8916
+#define SIOCGIFDSTADDR     0x8917
+#define SIOCSIFDSTADDR     0x8918
+#define SIOCGIFBRDADDR     0x8919
+#define SIOCSIFBRDADDR     0x891a
+#define SIOCGIFNETMASK     0x891b
+#define SIOCSIFNETMASK     0x891c
+#define SIOCGIFMETRIC      0x891d
+#define SIOCSIFMETRIC      0x891e
+#define SIOCGIFMEM         0x891f
+#define SIOCSIFMEM         0x8920
+#define SIOCGIFMTU         0x8921
+#define SIOCSIFMTU         0x8922
+#define SIOCSIFNAME        0x8923
+#define SIOCSIFHWADDR      0x8924
+#define SIOCGIFENCAP       0x8925
+#define SIOCSIFENCAP       0x8926
+#define SIOCGIFHWADDR      0x8927
+#define SIOCGIFSLAVE       0x8929
+#define SIOCSIFSLAVE       0x8930
+#define SIOCADDMULTI       0x8931
+#define SIOCDELMULTI       0x8932
+#define SIOCGIFINDEX       0x8933
+#define SIOGIFINDEX        SIOCGIFINDEX
+#define SIOCSIFPFLAGS      0x8934
+#define SIOCGIFPFLAGS      0x8935
+#define SIOCDIFADDR        0x8936
+#define SIOCSIFHWBROADCAST 0x8937
+#define SIOCGIFCOUNT       0x8938
+
+#define SIOCGIFBR          0x8940
+#define SIOCSIFBR          0x8941
+
+#define SIOCGIFTXQLEN      0x8942
+#define SIOCSIFTXQLEN      0x8943
+
+#define SIOCDARP           0x8953
+#define SIOCGARP           0x8954
+#define SIOCSARP           0x8955
+
+#define SIOCDRARP          0x8960
+#define SIOCGRARP          0x8961
+#define SIOCSRARP          0x8962
+
+#define SIOCGIFMAP         0x8970
+#define SIOCSIFMAP         0x8971
+
+#define SIOCADDDLCI        0x8980
+#define SIOCDELDLCI        0x8981
+
+#define SIOCDEVPRIVATE     0x89F0
+#define SIOCPROTOPRIVATE   0x89E0
+
+int ioctl (int, int, ...);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/ipc.h b/src/components/lib/libc/musl-1.2.0/include/sys/ipc.h
new file mode 100644
index 0000000000..9e366b7bed
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/ipc.h
@@ -0,0 +1,42 @@
+#ifndef _SYS_IPC_H
+#define _SYS_IPC_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_uid_t
+#define __NEED_gid_t
+#define __NEED_mode_t
+#define __NEED_key_t
+
+#include <bits/alltypes.h>
+
+#define __ipc_perm_key __key
+#define __ipc_perm_seq __seq
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define __key key
+#define __seq seq
+#endif
+
+#include <bits/ipc.h>
+#include <bits/ipcstat.h>
+
+#define IPC_CREAT  01000
+#define IPC_EXCL   02000
+#define IPC_NOWAIT 04000
+
+#define IPC_RMID 0
+#define IPC_SET  1
+#define IPC_INFO 3
+
+#define IPC_PRIVATE ((key_t) 0)
+
+key_t ftok (const char *, int);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/kd.h b/src/components/lib/libc/musl-1.2.0/include/sys/kd.h
new file mode 100644
index 0000000000..42122b9c3a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/kd.h
@@ -0,0 +1 @@
+#include <bits/kd.h>
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/klog.h b/src/components/lib/libc/musl-1.2.0/include/sys/klog.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/klog.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/klog.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/membarrier.h b/src/components/lib/libc/musl-1.2.0/include/sys/membarrier.h
new file mode 100644
index 0000000000..10cb31083c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/membarrier.h
@@ -0,0 +1,17 @@
+#ifndef _SYS_MEMBARRIER_H
+#define _SYS_MEMBARRIER_H
+
+#define MEMBARRIER_CMD_QUERY 0
+#define MEMBARRIER_CMD_GLOBAL 1
+#define MEMBARRIER_CMD_GLOBAL_EXPEDITED 2
+#define MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED 4
+#define MEMBARRIER_CMD_PRIVATE_EXPEDITED 8
+#define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16
+#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE 32
+#define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE 64
+
+#define MEMBARRIER_CMD_SHARED MEMBARRIER_CMD_GLOBAL
+
+int membarrier(int, int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/mman.h b/src/components/lib/libc/musl-1.2.0/include/sys/mman.h
new file mode 100644
index 0000000000..3bade72720
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/mman.h
@@ -0,0 +1,150 @@
+#ifndef	_SYS_MMAN_H
+#define	_SYS_MMAN_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_mode_t
+#define __NEED_size_t
+#define __NEED_off_t
+
+#if defined(_GNU_SOURCE)
+#define __NEED_ssize_t
+#endif
+
+#include <bits/alltypes.h>
+
+#define MAP_FAILED ((void *) -1)
+
+#define MAP_SHARED     0x01
+#define MAP_PRIVATE    0x02
+#define MAP_SHARED_VALIDATE 0x03
+#define MAP_TYPE       0x0f
+#define MAP_FIXED      0x10
+#define MAP_ANON       0x20
+#define MAP_ANONYMOUS  MAP_ANON
+#define MAP_NORESERVE  0x4000
+#define MAP_GROWSDOWN  0x0100
+#define MAP_DENYWRITE  0x0800
+#define MAP_EXECUTABLE 0x1000
+#define MAP_LOCKED     0x2000
+#define MAP_POPULATE   0x8000
+#define MAP_NONBLOCK   0x10000
+#define MAP_STACK      0x20000
+#define MAP_HUGETLB    0x40000
+#define MAP_SYNC       0x80000
+#define MAP_FIXED_NOREPLACE 0x100000
+#define MAP_FILE       0
+
+#define MAP_HUGE_SHIFT 26
+#define MAP_HUGE_MASK  0x3f
+#define MAP_HUGE_64KB  (16 << 26)
+#define MAP_HUGE_512KB (19 << 26)
+#define MAP_HUGE_1MB   (20 << 26)
+#define MAP_HUGE_2MB   (21 << 26)
+#define MAP_HUGE_8MB   (23 << 26)
+#define MAP_HUGE_16MB  (24 << 26)
+#define MAP_HUGE_32MB  (25 << 26)
+#define MAP_HUGE_256MB (28 << 26)
+#define MAP_HUGE_512MB (29 << 26)
+#define MAP_HUGE_1GB   (30 << 26)
+#define MAP_HUGE_2GB   (31 << 26)
+#define MAP_HUGE_16GB  (34U << 26)
+
+#define PROT_NONE      0
+#define PROT_READ      1
+#define PROT_WRITE     2
+#define PROT_EXEC      4
+#define PROT_GROWSDOWN 0x01000000
+#define PROT_GROWSUP   0x02000000
+
+#define MS_ASYNC       1
+#define MS_INVALIDATE  2
+#define MS_SYNC        4
+
+#define MCL_CURRENT    1
+#define MCL_FUTURE     2
+#define MCL_ONFAULT    4
+
+#define POSIX_MADV_NORMAL     0
+#define POSIX_MADV_RANDOM     1
+#define POSIX_MADV_SEQUENTIAL 2
+#define POSIX_MADV_WILLNEED   3
+#define POSIX_MADV_DONTNEED   4
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MADV_NORMAL      0
+#define MADV_RANDOM      1
+#define MADV_SEQUENTIAL  2
+#define MADV_WILLNEED    3
+#define MADV_DONTNEED    4
+#define MADV_FREE        8
+#define MADV_REMOVE      9
+#define MADV_DONTFORK    10
+#define MADV_DOFORK      11
+#define MADV_MERGEABLE   12
+#define MADV_UNMERGEABLE 13
+#define MADV_HUGEPAGE    14
+#define MADV_NOHUGEPAGE  15
+#define MADV_DONTDUMP    16
+#define MADV_DODUMP      17
+#define MADV_WIPEONFORK  18
+#define MADV_KEEPONFORK  19
+#define MADV_COLD        20
+#define MADV_PAGEOUT     21
+#define MADV_HWPOISON    100
+#define MADV_SOFT_OFFLINE 101
+#endif
+
+#ifdef _GNU_SOURCE
+#define MREMAP_MAYMOVE 1
+#define MREMAP_FIXED 2
+
+#define MLOCK_ONFAULT 0x01
+
+#define MFD_CLOEXEC 0x0001U
+#define MFD_ALLOW_SEALING 0x0002U
+#define MFD_HUGETLB 0x0004U
+#endif
+
+#include <bits/mman.h>
+
+void *mmap (void *, size_t, int, int, int, off_t);
+int munmap (void *, size_t);
+
+int mprotect (void *, size_t, int);
+int msync (void *, size_t, int);
+
+int posix_madvise (void *, size_t, int);
+
+int mlock (const void *, size_t);
+int munlock (const void *, size_t);
+int mlockall (int);
+int munlockall (void);
+
+#ifdef _GNU_SOURCE
+void *mremap (void *, size_t, size_t, int, ...);
+int remap_file_pages (void *, size_t, int, size_t, int);
+int memfd_create (const char *, unsigned);
+int mlock2 (const void *, size_t, unsigned);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+int madvise (void *, size_t, int);
+int mincore (void *, size_t, unsigned char *);
+#endif
+
+int shm_open (const char *, int, mode_t);
+int shm_unlink (const char *);
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define mmap64 mmap
+#define off64_t off_t
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/mount.h b/src/components/lib/libc/musl-1.2.0/include/sys/mount.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/sys/mount.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/mount.h
index 1e1907f481..57a89c09ec 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/mount.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/mount.h
@@ -46,12 +46,14 @@ extern "C" {
 #define MS_KERNMOUNT   (1<<22)
 #define MS_I_VERSION   (1<<23)
 #define MS_STRICTATIME (1<<24)
+#define MS_LAZYTIME    (1<<25)
+#define MS_NOREMOTELOCK (1<<27)
 #define MS_NOSEC       (1<<28)
 #define MS_BORN        (1<<29)
 #define MS_ACTIVE      (1<<30)
 #define MS_NOUSER      (1U<<31)
 
-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION|MS_LAZYTIME)
 
 #define MS_MGC_VAL 0xc0ed0000
 #define MS_MGC_MSK 0xffff0000
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/msg.h b/src/components/lib/libc/musl-1.2.0/include/sys/msg.h
new file mode 100644
index 0000000000..db5c62a42f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/msg.h
@@ -0,0 +1,53 @@
+#ifndef _SYS_MSG_H
+#define _SYS_MSG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/ipc.h>
+
+#define __NEED_pid_t
+#define __NEED_key_t
+#define __NEED_time_t
+#define __NEED_size_t
+#define __NEED_ssize_t
+
+#include <bits/alltypes.h>
+
+typedef unsigned long msgqnum_t;
+typedef unsigned long msglen_t;
+
+#include <bits/msg.h>
+
+#define __msg_cbytes msg_cbytes
+
+#define MSG_NOERROR 010000
+#define MSG_EXCEPT  020000
+
+#define MSG_STAT (11 | (IPC_STAT & 0x100))
+#define MSG_INFO 12
+#define MSG_STAT_ANY (13 | (IPC_STAT & 0x100))
+
+struct msginfo {
+	int msgpool, msgmap, msgmax, msgmnb, msgmni, msgssz, msgtql;
+	unsigned short msgseg;
+};
+
+int msgctl (int, int, struct msqid_ds *);
+int msgget (key_t, int);
+ssize_t msgrcv (int, void *, size_t, long, int);
+int msgsnd (int, const void *, size_t, int);
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+struct msgbuf {
+	long mtype;
+	char mtext[1];
+};
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/mtio.h b/src/components/lib/libc/musl-1.2.0/include/sys/mtio.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/mtio.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/mtio.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/param.h b/src/components/lib/libc/musl-1.2.0/include/sys/param.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/sys/param.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/param.h
index 344c0d234b..ce6b801980 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/param.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/param.h
@@ -7,7 +7,7 @@
 #define MAXPATHLEN 4096
 #define NBBY 8
 #define NGROUPS 32
-#define CANBSIZE 255
+#define CANBSIZ 255
 #define NOFILE 256
 #define NCARGS 131072
 #define DEV_BSIZE 512
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/personality.h b/src/components/lib/libc/musl-1.2.0/include/sys/personality.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/personality.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/personality.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/poll.h b/src/components/lib/libc/musl-1.2.0/include/sys/poll.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/poll.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/poll.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/prctl.h b/src/components/lib/libc/musl-1.2.0/include/sys/prctl.h
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/include/sys/prctl.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/prctl.h
index ec92053d2c..d9c846e9c2 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/prctl.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/prctl.h
@@ -124,6 +124,40 @@ struct prctl_mm_map {
 #define PR_FP_MODE_FR (1 << 0)
 #define PR_FP_MODE_FRE (1 << 1)
 
+#define PR_CAP_AMBIENT          47
+#define PR_CAP_AMBIENT_IS_SET   1
+#define PR_CAP_AMBIENT_RAISE    2
+#define PR_CAP_AMBIENT_LOWER    3
+#define PR_CAP_AMBIENT_CLEAR_ALL 4
+
+#define PR_SVE_SET_VL           50
+#define PR_SVE_SET_VL_ONEXEC (1 << 18)
+#define PR_SVE_GET_VL           51
+#define PR_SVE_VL_LEN_MASK 0xffff
+#define PR_SVE_VL_INHERIT (1 << 17)
+
+#define PR_GET_SPECULATION_CTRL 52
+#define PR_SET_SPECULATION_CTRL 53
+#define PR_SPEC_STORE_BYPASS 0
+#define PR_SPEC_INDIRECT_BRANCH 1
+#define PR_SPEC_NOT_AFFECTED 0
+#define PR_SPEC_PRCTL (1UL << 0)
+#define PR_SPEC_ENABLE (1UL << 1)
+#define PR_SPEC_DISABLE (1UL << 2)
+#define PR_SPEC_FORCE_DISABLE (1UL << 3)
+#define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
+
+#define PR_PAC_RESET_KEYS       54
+#define PR_PAC_APIAKEY (1UL << 0)
+#define PR_PAC_APIBKEY (1UL << 1)
+#define PR_PAC_APDAKEY (1UL << 2)
+#define PR_PAC_APDBKEY (1UL << 3)
+#define PR_PAC_APGAKEY (1UL << 4)
+
+#define PR_SET_TAGGED_ADDR_CTRL 55
+#define PR_GET_TAGGED_ADDR_CTRL 56
+#define PR_TAGGED_ADDR_ENABLE (1UL << 0)
+
 int prctl (int, ...);
 
 #ifdef __cplusplus
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/procfs.h b/src/components/lib/libc/musl-1.2.0/include/sys/procfs.h
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/include/sys/procfs.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/procfs.h
index f7936c4323..38e58c168b 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/procfs.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/procfs.h
@@ -23,18 +23,16 @@ struct elf_prstatus {
 	pid_t pr_ppid;
 	pid_t pr_pgrp;
 	pid_t pr_sid;
-	struct timeval pr_utime;
-	struct timeval pr_stime;
-	struct timeval pr_cutime;
-	struct timeval pr_cstime;
+	struct {
+		long tv_sec, tv_usec;
+	} pr_utime, pr_stime, pr_cutime, pr_cstime;
 	elf_gregset_t pr_reg;
 	int pr_fpvalid;
 };
 
 #define ELF_PRARGSZ 80
 
-struct elf_prpsinfo
-	{
+struct elf_prpsinfo {
 	char pr_state;
 	char pr_sname;
 	char pr_zomb;
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/ptrace.h b/src/components/lib/libc/musl-1.2.0/include/sys/ptrace.h
new file mode 100644
index 0000000000..5d62a9859a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/ptrace.h
@@ -0,0 +1,138 @@
+#ifndef _SYS_PTRACE_H
+#define _SYS_PTRACE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+#define PTRACE_TRACEME 0
+#define PT_TRACE_ME PTRACE_TRACEME
+
+#define PTRACE_PEEKTEXT 1
+#define PTRACE_PEEKDATA 2
+#define PTRACE_PEEKUSER 3
+#define PTRACE_POKETEXT 4
+#define PTRACE_POKEDATA 5
+#define PTRACE_POKEUSER 6
+#define PTRACE_CONT 7
+#define PTRACE_KILL 8
+#define PTRACE_SINGLESTEP 9
+#define PTRACE_GETREGS 12
+#define PTRACE_SETREGS 13
+#define PTRACE_GETFPREGS 14
+#define PTRACE_SETFPREGS 15
+#define PTRACE_ATTACH 16
+#define PTRACE_DETACH 17
+#define PTRACE_GETFPXREGS 18
+#define PTRACE_SETFPXREGS 19
+#define PTRACE_SYSCALL 24
+#define PTRACE_SETOPTIONS 0x4200
+#define PTRACE_GETEVENTMSG 0x4201
+#define PTRACE_GETSIGINFO 0x4202
+#define PTRACE_SETSIGINFO 0x4203
+#define PTRACE_GETREGSET 0x4204
+#define PTRACE_SETREGSET 0x4205
+#define PTRACE_SEIZE 0x4206
+#define PTRACE_INTERRUPT 0x4207
+#define PTRACE_LISTEN 0x4208
+#define PTRACE_PEEKSIGINFO 0x4209
+#define PTRACE_GETSIGMASK 0x420a
+#define PTRACE_SETSIGMASK 0x420b
+#define PTRACE_SECCOMP_GET_FILTER 0x420c
+#define PTRACE_SECCOMP_GET_METADATA 0x420d
+#define PTRACE_GET_SYSCALL_INFO 0x420e
+
+#define PT_READ_I PTRACE_PEEKTEXT
+#define PT_READ_D PTRACE_PEEKDATA
+#define PT_READ_U PTRACE_PEEKUSER
+#define PT_WRITE_I PTRACE_POKETEXT
+#define PT_WRITE_D PTRACE_POKEDATA
+#define PT_WRITE_U PTRACE_POKEUSER
+#define PT_CONTINUE PTRACE_CONT
+#define PT_KILL PTRACE_KILL
+#define PT_STEP PTRACE_SINGLESTEP
+#define PT_GETREGS PTRACE_GETREGS
+#define PT_SETREGS PTRACE_SETREGS
+#define PT_GETFPREGS PTRACE_GETFPREGS
+#define PT_SETFPREGS PTRACE_SETFPREGS
+#define PT_ATTACH PTRACE_ATTACH
+#define PT_DETACH PTRACE_DETACH
+#define PT_GETFPXREGS PTRACE_GETFPXREGS
+#define PT_SETFPXREGS PTRACE_SETFPXREGS
+#define PT_SYSCALL PTRACE_SYSCALL
+#define PT_SETOPTIONS PTRACE_SETOPTIONS
+#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
+#define PT_GETSIGINFO PTRACE_GETSIGINFO
+#define PT_SETSIGINFO PTRACE_SETSIGINFO
+
+#define PTRACE_O_TRACESYSGOOD   0x00000001
+#define PTRACE_O_TRACEFORK      0x00000002
+#define PTRACE_O_TRACEVFORK     0x00000004
+#define PTRACE_O_TRACECLONE     0x00000008
+#define PTRACE_O_TRACEEXEC      0x00000010
+#define PTRACE_O_TRACEVFORKDONE 0x00000020
+#define PTRACE_O_TRACEEXIT      0x00000040
+#define PTRACE_O_TRACESECCOMP   0x00000080
+#define PTRACE_O_EXITKILL       0x00100000
+#define PTRACE_O_SUSPEND_SECCOMP 0x00200000
+#define PTRACE_O_MASK           0x003000ff
+
+#define PTRACE_EVENT_FORK 1
+#define PTRACE_EVENT_VFORK 2
+#define PTRACE_EVENT_CLONE 3
+#define PTRACE_EVENT_EXEC 4
+#define PTRACE_EVENT_VFORK_DONE 5
+#define PTRACE_EVENT_EXIT 6
+#define PTRACE_EVENT_SECCOMP 7
+#define PTRACE_EVENT_STOP 128
+
+#define PTRACE_PEEKSIGINFO_SHARED 1
+
+#define PTRACE_SYSCALL_INFO_NONE 0
+#define PTRACE_SYSCALL_INFO_ENTRY 1
+#define PTRACE_SYSCALL_INFO_EXIT 2
+#define PTRACE_SYSCALL_INFO_SECCOMP 3
+
+#include <bits/ptrace.h>
+
+struct __ptrace_peeksiginfo_args {
+	uint64_t off;
+	uint32_t flags;
+	int32_t nr;
+};
+
+struct __ptrace_seccomp_metadata {
+	uint64_t filter_off;
+	uint64_t flags;
+};
+
+struct __ptrace_syscall_info {
+	uint8_t op;
+	uint8_t __pad[3];
+	uint32_t arch;
+	uint64_t instruction_pointer;
+	uint64_t stack_pointer;
+	union {
+		struct {
+			uint64_t nr;
+			uint64_t args[6];
+		} entry;
+		struct {
+			int64_t rval;
+			uint8_t is_error;
+		} exit;
+		struct {
+			uint64_t nr;
+			uint64_t args[6];
+			uint32_t ret_data;
+		} seccomp;
+	};
+};
+
+long ptrace(int, ...);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/quota.h b/src/components/lib/libc/musl-1.2.0/include/sys/quota.h
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/include/sys/quota.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/quota.h
index a06f335ae3..3ed73785df 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/quota.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/quota.h
@@ -57,8 +57,7 @@ extern "C" {
 #define QIF_TIMES	(QIF_BTIME | QIF_ITIME)
 #define QIF_ALL		(QIF_LIMITS | QIF_USAGE | QIF_TIMES)
 
-struct dqblk
-{
+struct dqblk {
 	uint64_t dqb_bhardlimit;
 	uint64_t dqb_bsoftlimit;
 	uint64_t dqb_curspace;
@@ -87,8 +86,7 @@ struct dqblk
 #define IIF_FLAGS	4
 #define IIF_ALL		(IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
 
-struct dqinfo
-{
+struct dqinfo {
 	uint64_t dqi_bgrace;
 	uint64_t dqi_igrace;
 	uint32_t dqi_flags;
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/random.h b/src/components/lib/libc/musl-1.2.0/include/sys/random.h
new file mode 100644
index 0000000000..4ee7bf2cc4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/random.h
@@ -0,0 +1,19 @@
+#ifndef _SYS_RANDOM_H
+#define _SYS_RANDOM_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define __NEED_size_t
+#define __NEED_ssize_t
+#include <bits/alltypes.h>
+
+#define GRND_NONBLOCK	0x0001
+#define GRND_RANDOM	0x0002
+
+ssize_t getrandom(void *, size_t, unsigned);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/reboot.h b/src/components/lib/libc/musl-1.2.0/include/sys/reboot.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/reboot.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/reboot.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/reg.h b/src/components/lib/libc/musl-1.2.0/include/sys/reg.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/reg.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/reg.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/resource.h b/src/components/lib/libc/musl-1.2.0/include/sys/resource.h
new file mode 100644
index 0000000000..3068328d09
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/resource.h
@@ -0,0 +1,116 @@
+#ifndef	_SYS_RESOURCE_H
+#define	_SYS_RESOURCE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+#include <sys/time.h>
+
+#define __NEED_id_t
+
+#ifdef _GNU_SOURCE
+#define __NEED_pid_t
+#endif
+
+#include <bits/alltypes.h>
+#include <bits/resource.h>
+
+typedef unsigned long long rlim_t;
+
+struct rlimit {
+	rlim_t rlim_cur;
+	rlim_t rlim_max;
+};
+
+struct rusage {
+	struct timeval ru_utime;
+	struct timeval ru_stime;
+	/* linux extentions, but useful */
+	long	ru_maxrss;
+	long	ru_ixrss;
+	long	ru_idrss;
+	long	ru_isrss;
+	long	ru_minflt;
+	long	ru_majflt;
+	long	ru_nswap;
+	long	ru_inblock;
+	long	ru_oublock;
+	long	ru_msgsnd;
+	long	ru_msgrcv;
+	long	ru_nsignals;
+	long	ru_nvcsw;
+	long	ru_nivcsw;
+	/* room for more... */
+	long    __reserved[16];
+};
+
+int getrlimit (int, struct rlimit *);
+int setrlimit (int, const struct rlimit *);
+int getrusage (int, struct rusage *);
+
+int getpriority (int, id_t);
+int setpriority (int, id_t, int);
+
+#ifdef _GNU_SOURCE
+int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
+#define prlimit64 prlimit
+#endif
+
+#define PRIO_MIN (-20)
+#define PRIO_MAX 20
+
+#define PRIO_PROCESS 0
+#define PRIO_PGRP    1
+#define PRIO_USER    2
+
+#define RUSAGE_SELF     0
+#define RUSAGE_CHILDREN (-1)
+#define RUSAGE_THREAD   1
+
+#define RLIM_INFINITY (~0ULL)
+#define RLIM_SAVED_CUR RLIM_INFINITY
+#define RLIM_SAVED_MAX RLIM_INFINITY
+
+#define RLIMIT_CPU     0
+#define RLIMIT_FSIZE   1
+#define RLIMIT_DATA    2
+#define RLIMIT_STACK   3
+#define RLIMIT_CORE    4
+#ifndef RLIMIT_RSS
+#define RLIMIT_RSS     5
+#define RLIMIT_NPROC   6
+#define RLIMIT_NOFILE  7
+#define RLIMIT_MEMLOCK 8
+#define RLIMIT_AS      9
+#endif
+#define RLIMIT_LOCKS   10
+#define RLIMIT_SIGPENDING 11
+#define RLIMIT_MSGQUEUE 12
+#define RLIMIT_NICE    13
+#define RLIMIT_RTPRIO  14
+#define RLIMIT_RTTIME  15
+#define RLIMIT_NLIMITS 16
+
+#define RLIM_NLIMITS RLIMIT_NLIMITS
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define RLIM64_INFINITY RLIM_INFINITY
+#define RLIM64_SAVED_CUR RLIM_SAVED_CUR
+#define RLIM64_SAVED_MAX RLIM_SAVED_MAX
+#define getrlimit64 getrlimit
+#define setrlimit64 setrlimit
+#define rlimit64 rlimit
+#define rlim64_t rlim_t
+#endif
+
+#if _REDIR_TIME64
+__REDIR(getrusage, __getrusage_time64);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/select.h b/src/components/lib/libc/musl-1.2.0/include/sys/select.h
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/include/sys/select.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/select.h
index e25257d2f3..b3bab1d57b 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/select.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/select.h
@@ -19,8 +19,7 @@ extern "C" {
 
 typedef unsigned long fd_mask;
 
-typedef struct
-{
+typedef struct {
 	unsigned long fds_bits[FD_SETSIZE / 8 / sizeof(long)];
 } fd_set;
 
@@ -36,6 +35,11 @@ int pselect (int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict, co
 #define NFDBITS (8*(int)sizeof(long))
 #endif
 
+#if _REDIR_TIME64
+__REDIR(select, __select_time64);
+__REDIR(pselect, __pselect_time64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/sem.h b/src/components/lib/libc/musl-1.2.0/include/sys/sem.h
new file mode 100644
index 0000000000..a747784ede
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/sem.h
@@ -0,0 +1,72 @@
+#ifndef _SYS_SEM_H
+#define _SYS_SEM_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_size_t
+#define __NEED_pid_t
+#define __NEED_time_t
+#ifdef _GNU_SOURCE
+#define __NEED_struct_timespec
+#endif
+#include <bits/alltypes.h>
+
+#include <sys/ipc.h>
+
+#define SEM_UNDO	0x1000
+#define GETPID		11
+#define GETVAL		12
+#define GETALL		13
+#define GETNCNT		14
+#define GETZCNT		15
+#define SETVAL		16
+#define SETALL		17
+
+#include <bits/sem.h>
+
+#define _SEM_SEMUN_UNDEFINED 1
+
+#define SEM_STAT (18 | (IPC_STAT & 0x100))
+#define SEM_INFO 19
+#define SEM_STAT_ANY (20 | (IPC_STAT & 0x100))
+
+struct  seminfo {
+	int semmap;
+	int semmni;
+	int semmns;
+	int semmnu;
+	int semmsl;
+	int semopm;
+	int semume;
+	int semusz;
+	int semvmx;
+	int semaem;
+};
+
+struct sembuf {
+	unsigned short sem_num;
+	short sem_op;
+	short sem_flg;
+};
+
+int semctl(int, int, int, ...);
+int semget(key_t, int, int);
+int semop(int, struct sembuf *, size_t);
+
+#ifdef _GNU_SOURCE
+int semtimedop(int, struct sembuf *, size_t, const struct timespec *);
+#endif
+
+#if _REDIR_TIME64
+#ifdef _GNU_SOURCE
+__REDIR(semtimedop, __semtimedop_time64);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/sendfile.h b/src/components/lib/libc/musl-1.2.0/include/sys/sendfile.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/sendfile.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/sendfile.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/shm.h b/src/components/lib/libc/musl-1.2.0/include/sys/shm.h
new file mode 100644
index 0000000000..fd708cab1e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/shm.h
@@ -0,0 +1,70 @@
+#ifndef _SYS_SHM_H
+#define _SYS_SHM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_time_t
+#define __NEED_size_t
+#define __NEED_pid_t
+
+#include <bits/alltypes.h>
+
+#include <sys/ipc.h>
+
+#ifdef _GNU_SOURCE
+#define __used_ids used_ids
+#define __swap_attempts swap_attempts
+#define __swap_successes swap_successes
+#endif
+
+#include <bits/shm.h>
+
+#define SHM_R 0400
+#define SHM_W 0200
+
+#define SHM_RDONLY 010000
+#define SHM_RND    020000
+#define SHM_REMAP  040000
+#define SHM_EXEC   0100000
+
+#define SHM_LOCK 11
+#define SHM_UNLOCK 12
+#define SHM_STAT (13 | (IPC_STAT & 0x100))
+#define SHM_INFO 14
+#define SHM_STAT_ANY (15 | (IPC_STAT & 0x100))
+#define SHM_DEST 01000
+#define SHM_LOCKED 02000
+#define SHM_HUGETLB 04000
+#define SHM_NORESERVE 010000
+
+#define SHM_HUGE_SHIFT 26
+#define SHM_HUGE_MASK  0x3f
+#define SHM_HUGE_64KB  (16 << 26)
+#define SHM_HUGE_512KB (19 << 26)
+#define SHM_HUGE_1MB   (20 << 26)
+#define SHM_HUGE_2MB   (21 << 26)
+#define SHM_HUGE_8MB   (23 << 26)
+#define SHM_HUGE_16MB  (24 << 26)
+#define SHM_HUGE_32MB  (25 << 26)
+#define SHM_HUGE_256MB (28 << 26)
+#define SHM_HUGE_512MB (29 << 26)
+#define SHM_HUGE_1GB   (30 << 26)
+#define SHM_HUGE_2GB   (31 << 26)
+#define SHM_HUGE_16GB  (34U << 26)
+
+typedef unsigned long shmatt_t;
+
+void *shmat(int, const void *, int);
+int shmctl(int, int, struct shmid_ds *);
+int shmdt(const void *);
+int shmget(key_t, size_t, int);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/signal.h b/src/components/lib/libc/musl-1.2.0/include/sys/signal.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/signal.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/signal.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/signalfd.h b/src/components/lib/libc/musl-1.2.0/include/sys/signalfd.h
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/include/sys/signalfd.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/signalfd.h
index 55431b9167..e881e2cfdd 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/signalfd.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/signalfd.h
@@ -35,7 +35,11 @@ struct signalfd_siginfo {
 	uint64_t  ssi_stime;
 	uint64_t  ssi_addr;
 	uint16_t  ssi_addr_lsb;
-	uint8_t   pad[128-12*4-4*8-2];
+	uint16_t  __pad2;
+	int32_t   ssi_syscall;
+	uint64_t  ssi_call_addr;
+	uint32_t  ssi_arch;
+	uint8_t   __pad[128-14*4-5*8-2*2];
 };
 
 #ifdef __cplusplus
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/socket.h b/src/components/lib/libc/musl-1.2.0/include/sys/socket.h
new file mode 100644
index 0000000000..38f5bb17b3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/socket.h
@@ -0,0 +1,413 @@
+#ifndef	_SYS_SOCKET_H
+#define	_SYS_SOCKET_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_socklen_t
+#define __NEED_sa_family_t
+#define __NEED_size_t
+#define __NEED_ssize_t
+#define __NEED_uid_t
+#define __NEED_pid_t
+#define __NEED_gid_t
+#define __NEED_struct_iovec
+
+#include <bits/alltypes.h>
+
+#include <bits/socket.h>
+
+struct msghdr {
+	void *msg_name;
+	socklen_t msg_namelen;
+	struct iovec *msg_iov;
+#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
+	int __pad1;
+#endif
+	int msg_iovlen;
+#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
+	int __pad1;
+#endif
+	void *msg_control;
+#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
+	int __pad2;
+#endif
+	socklen_t msg_controllen;
+#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
+	int __pad2;
+#endif
+	int msg_flags;
+};
+
+struct cmsghdr {
+#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
+	int __pad1;
+#endif
+	socklen_t cmsg_len;
+#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
+	int __pad1;
+#endif
+	int cmsg_level;
+	int cmsg_type;
+};
+
+#ifdef _GNU_SOURCE
+struct ucred {
+	pid_t pid;
+	uid_t uid;
+	gid_t gid;
+};
+
+struct mmsghdr {
+	struct msghdr msg_hdr;
+	unsigned int  msg_len;
+};
+
+struct timespec;
+
+int sendmmsg (int, struct mmsghdr *, unsigned int, unsigned int);
+int recvmmsg (int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
+#endif
+
+struct linger {
+	int l_onoff;
+	int l_linger;
+};
+
+#define SHUT_RD 0
+#define SHUT_WR 1
+#define SHUT_RDWR 2
+
+#ifndef SOCK_STREAM
+#define SOCK_STREAM    1
+#define SOCK_DGRAM     2
+#endif
+
+#define SOCK_RAW       3
+#define SOCK_RDM       4
+#define SOCK_SEQPACKET 5
+#define SOCK_DCCP      6
+#define SOCK_PACKET    10
+
+#ifndef SOCK_CLOEXEC
+#define SOCK_CLOEXEC   02000000
+#define SOCK_NONBLOCK  04000
+#endif
+
+#define PF_UNSPEC       0
+#define PF_LOCAL        1
+#define PF_UNIX         PF_LOCAL
+#define PF_FILE         PF_LOCAL
+#define PF_INET         2
+#define PF_AX25         3
+#define PF_IPX          4
+#define PF_APPLETALK    5
+#define PF_NETROM       6
+#define PF_BRIDGE       7
+#define PF_ATMPVC       8
+#define PF_X25          9
+#define PF_INET6        10
+#define PF_ROSE         11
+#define PF_DECnet       12
+#define PF_NETBEUI      13
+#define PF_SECURITY     14
+#define PF_KEY          15
+#define PF_NETLINK      16
+#define PF_ROUTE        PF_NETLINK
+#define PF_PACKET       17
+#define PF_ASH          18
+#define PF_ECONET       19
+#define PF_ATMSVC       20
+#define PF_RDS          21
+#define PF_SNA          22
+#define PF_IRDA         23
+#define PF_PPPOX        24
+#define PF_WANPIPE      25
+#define PF_LLC          26
+#define PF_IB           27
+#define PF_MPLS         28
+#define PF_CAN          29
+#define PF_TIPC         30
+#define PF_BLUETOOTH    31
+#define PF_IUCV         32
+#define PF_RXRPC        33
+#define PF_ISDN         34
+#define PF_PHONET       35
+#define PF_IEEE802154   36
+#define PF_CAIF         37
+#define PF_ALG          38
+#define PF_NFC          39
+#define PF_VSOCK        40
+#define PF_KCM          41
+#define PF_QIPCRTR      42
+#define PF_SMC          43
+#define PF_XDP          44
+#define PF_MAX          45
+
+#define AF_UNSPEC       PF_UNSPEC
+#define AF_LOCAL        PF_LOCAL
+#define AF_UNIX         AF_LOCAL
+#define AF_FILE         AF_LOCAL
+#define AF_INET         PF_INET
+#define AF_AX25         PF_AX25
+#define AF_IPX          PF_IPX
+#define AF_APPLETALK    PF_APPLETALK
+#define AF_NETROM       PF_NETROM
+#define AF_BRIDGE       PF_BRIDGE
+#define AF_ATMPVC       PF_ATMPVC
+#define AF_X25          PF_X25
+#define AF_INET6        PF_INET6
+#define AF_ROSE         PF_ROSE
+#define AF_DECnet       PF_DECnet
+#define AF_NETBEUI      PF_NETBEUI
+#define AF_SECURITY     PF_SECURITY
+#define AF_KEY          PF_KEY
+#define AF_NETLINK      PF_NETLINK
+#define AF_ROUTE        PF_ROUTE
+#define AF_PACKET       PF_PACKET
+#define AF_ASH          PF_ASH
+#define AF_ECONET       PF_ECONET
+#define AF_ATMSVC       PF_ATMSVC
+#define AF_RDS          PF_RDS
+#define AF_SNA          PF_SNA
+#define AF_IRDA         PF_IRDA
+#define AF_PPPOX        PF_PPPOX
+#define AF_WANPIPE      PF_WANPIPE
+#define AF_LLC          PF_LLC
+#define AF_IB           PF_IB
+#define AF_MPLS         PF_MPLS
+#define AF_CAN          PF_CAN
+#define AF_TIPC         PF_TIPC
+#define AF_BLUETOOTH    PF_BLUETOOTH
+#define AF_IUCV         PF_IUCV
+#define AF_RXRPC        PF_RXRPC
+#define AF_ISDN         PF_ISDN
+#define AF_PHONET       PF_PHONET
+#define AF_IEEE802154   PF_IEEE802154
+#define AF_CAIF         PF_CAIF
+#define AF_ALG          PF_ALG
+#define AF_NFC          PF_NFC
+#define AF_VSOCK        PF_VSOCK
+#define AF_KCM          PF_KCM
+#define AF_QIPCRTR      PF_QIPCRTR
+#define AF_SMC          PF_SMC
+#define AF_XDP          PF_XDP
+#define AF_MAX          PF_MAX
+
+#ifndef SO_DEBUG
+#define SO_DEBUG        1
+#define SO_REUSEADDR    2
+#define SO_TYPE         3
+#define SO_ERROR        4
+#define SO_DONTROUTE    5
+#define SO_BROADCAST    6
+#define SO_SNDBUF       7
+#define SO_RCVBUF       8
+#define SO_KEEPALIVE    9
+#define SO_OOBINLINE    10
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_LINGER       13
+#define SO_BSDCOMPAT    14
+#define SO_REUSEPORT    15
+#define SO_PASSCRED     16
+#define SO_PEERCRED     17
+#define SO_RCVLOWAT     18
+#define SO_SNDLOWAT     19
+#define SO_ACCEPTCONN   30
+#define SO_PEERSEC      31
+#define SO_SNDBUFFORCE  32
+#define SO_RCVBUFFORCE  33
+#define SO_PROTOCOL     38
+#define SO_DOMAIN       39
+#endif
+
+#ifndef SO_RCVTIMEO
+#if __LONG_MAX == 0x7fffffff
+#define SO_RCVTIMEO     66
+#define SO_SNDTIMEO     67
+#else
+#define SO_RCVTIMEO     20
+#define SO_SNDTIMEO     21
+#endif
+#endif
+
+#ifndef SO_TIMESTAMP
+#if __LONG_MAX == 0x7fffffff
+#define SO_TIMESTAMP    63
+#define SO_TIMESTAMPNS  64
+#define SO_TIMESTAMPING 65
+#else
+#define SO_TIMESTAMP    29
+#define SO_TIMESTAMPNS  35
+#define SO_TIMESTAMPING 37
+#endif
+#endif
+
+#define SO_SECURITY_AUTHENTICATION              22
+#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
+#define SO_SECURITY_ENCRYPTION_NETWORK          24
+
+#define SO_BINDTODEVICE 25
+
+#define SO_ATTACH_FILTER        26
+#define SO_DETACH_FILTER        27
+#define SO_GET_FILTER           SO_ATTACH_FILTER
+
+#define SO_PEERNAME             28
+#define SCM_TIMESTAMP           SO_TIMESTAMP
+#define SO_PASSSEC              34
+#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
+#define SO_MARK                 36
+#define SCM_TIMESTAMPING        SO_TIMESTAMPING
+#define SO_RXQ_OVFL             40
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+#define SO_PEEK_OFF             42
+#define SO_NOFCS                43
+#define SO_LOCK_FILTER          44
+#define SO_SELECT_ERR_QUEUE     45
+#define SO_BUSY_POLL            46
+#define SO_MAX_PACING_RATE      47
+#define SO_BPF_EXTENSIONS       48
+#define SO_INCOMING_CPU         49
+#define SO_ATTACH_BPF           50
+#define SO_DETACH_BPF           SO_DETACH_FILTER
+#define SO_ATTACH_REUSEPORT_CBPF 51
+#define SO_ATTACH_REUSEPORT_EBPF 52
+#define SO_CNX_ADVICE           53
+#define SCM_TIMESTAMPING_OPT_STATS 54
+#define SO_MEMINFO              55
+#define SO_INCOMING_NAPI_ID     56
+#define SO_COOKIE               57
+#define SCM_TIMESTAMPING_PKTINFO 58
+#define SO_PEERGROUPS           59
+#define SO_ZEROCOPY             60
+#define SO_TXTIME               61
+#define SCM_TXTIME              SO_TXTIME
+#define SO_BINDTOIFINDEX        62
+#define SO_DETACH_REUSEPORT_BPF 68
+
+#ifndef SOL_SOCKET
+#define SOL_SOCKET      1
+#endif
+
+#define SOL_IP          0
+#define SOL_IPV6        41
+#define SOL_ICMPV6      58
+
+#define SOL_RAW         255
+#define SOL_DECNET      261
+#define SOL_X25         262
+#define SOL_PACKET      263
+#define SOL_ATM         264
+#define SOL_AAL         265
+#define SOL_IRDA        266
+#define SOL_NETBEUI     267
+#define SOL_LLC         268
+#define SOL_DCCP        269
+#define SOL_NETLINK     270
+#define SOL_TIPC        271
+#define SOL_RXRPC       272
+#define SOL_PPPOL2TP    273
+#define SOL_BLUETOOTH   274
+#define SOL_PNPIPE      275
+#define SOL_RDS         276
+#define SOL_IUCV        277
+#define SOL_CAIF        278
+#define SOL_ALG         279
+#define SOL_NFC         280
+#define SOL_KCM         281
+#define SOL_TLS         282
+#define SOL_XDP         283
+
+#define SOMAXCONN       128
+
+#define MSG_OOB       0x0001
+#define MSG_PEEK      0x0002
+#define MSG_DONTROUTE 0x0004
+#define MSG_CTRUNC    0x0008
+#define MSG_PROXY     0x0010
+#define MSG_TRUNC     0x0020
+#define MSG_DONTWAIT  0x0040
+#define MSG_EOR       0x0080
+#define MSG_WAITALL   0x0100
+#define MSG_FIN       0x0200
+#define MSG_SYN       0x0400
+#define MSG_CONFIRM   0x0800
+#define MSG_RST       0x1000
+#define MSG_ERRQUEUE  0x2000
+#define MSG_NOSIGNAL  0x4000
+#define MSG_MORE      0x8000
+#define MSG_WAITFORONE 0x10000
+#define MSG_BATCH     0x40000
+#define MSG_ZEROCOPY  0x4000000
+#define MSG_FASTOPEN  0x20000000
+#define MSG_CMSG_CLOEXEC 0x40000000
+
+#define __CMSG_LEN(cmsg) (((cmsg)->cmsg_len + sizeof(long) - 1) & ~(long)(sizeof(long) - 1))
+#define __CMSG_NEXT(cmsg) ((unsigned char *)(cmsg) + __CMSG_LEN(cmsg))
+#define __MHDR_END(mhdr) ((unsigned char *)(mhdr)->msg_control + (mhdr)->msg_controllen)
+
+#define CMSG_DATA(cmsg) ((unsigned char *) (((struct cmsghdr *)(cmsg)) + 1))
+#define CMSG_NXTHDR(mhdr, cmsg) ((cmsg)->cmsg_len < sizeof (struct cmsghdr) || \
+	__CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \
+	? 0 : (struct cmsghdr *)__CMSG_NEXT(cmsg))
+#define CMSG_FIRSTHDR(mhdr) ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
+
+#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) & (size_t) ~(sizeof (size_t) - 1))
+#define CMSG_SPACE(len) (CMSG_ALIGN (len) + CMSG_ALIGN (sizeof (struct cmsghdr)))
+#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+
+#define SCM_RIGHTS      0x01
+#define SCM_CREDENTIALS 0x02
+
+struct sockaddr {
+	sa_family_t sa_family;
+	char sa_data[14];
+};
+
+struct sockaddr_storage {
+	sa_family_t ss_family;
+	char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
+	unsigned long __ss_align;
+};
+
+int socket (int, int, int);
+int socketpair (int, int, int, int [2]);
+
+int shutdown (int, int);
+
+int bind (int, const struct sockaddr *, socklen_t);
+int connect (int, const struct sockaddr *, socklen_t);
+int listen (int, int);
+int accept (int, struct sockaddr *__restrict, socklen_t *__restrict);
+int accept4(int, struct sockaddr *__restrict, socklen_t *__restrict, int);
+
+int getsockname (int, struct sockaddr *__restrict, socklen_t *__restrict);
+int getpeername (int, struct sockaddr *__restrict, socklen_t *__restrict);
+
+ssize_t send (int, const void *, size_t, int);
+ssize_t recv (int, void *, size_t, int);
+ssize_t sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t);
+ssize_t recvfrom (int, void *__restrict, size_t, int, struct sockaddr *__restrict, socklen_t *__restrict);
+ssize_t sendmsg (int, const struct msghdr *, int);
+ssize_t recvmsg (int, struct msghdr *, int);
+
+int getsockopt (int, int, int, void *__restrict, socklen_t *__restrict);
+int setsockopt (int, int, int, const void *, socklen_t);
+
+int sockatmark (int);
+
+#if _REDIR_TIME64
+#ifdef _GNU_SOURCE
+__REDIR(recvmmsg, __recvmmsg_time64);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/soundcard.h b/src/components/lib/libc/musl-1.2.0/include/sys/soundcard.h
new file mode 100644
index 0000000000..5ca776461e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/soundcard.h
@@ -0,0 +1 @@
+#include <bits/soundcard.h>
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/stat.h b/src/components/lib/libc/musl-1.2.0/include/sys/stat.h
new file mode 100644
index 0000000000..10d446c463
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/stat.h
@@ -0,0 +1,127 @@
+#ifndef	_SYS_STAT_H
+#define	_SYS_STAT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_dev_t
+#define __NEED_ino_t
+#define __NEED_mode_t
+#define __NEED_nlink_t
+#define __NEED_uid_t
+#define __NEED_gid_t
+#define __NEED_off_t
+#define __NEED_time_t
+#define __NEED_blksize_t
+#define __NEED_blkcnt_t
+#define __NEED_struct_timespec
+
+#include <bits/alltypes.h>
+
+#include <bits/stat.h>
+
+#define st_atime st_atim.tv_sec
+#define st_mtime st_mtim.tv_sec
+#define st_ctime st_ctim.tv_sec
+
+#define S_IFMT  0170000
+
+#define S_IFDIR 0040000
+#define S_IFCHR 0020000
+#define S_IFBLK 0060000
+#define S_IFREG 0100000
+#define S_IFIFO 0010000
+#define S_IFLNK 0120000
+#define S_IFSOCK 0140000
+
+#define S_TYPEISMQ(buf)  0
+#define S_TYPEISSEM(buf) 0
+#define S_TYPEISSHM(buf) 0
+#define S_TYPEISTMO(buf) 0
+
+#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
+#define S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
+#define S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
+#define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
+#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)
+#define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
+#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
+
+#ifndef S_IRUSR
+#define S_ISUID 04000
+#define S_ISGID 02000
+#define S_ISVTX 01000
+#define S_IRUSR 0400
+#define S_IWUSR 0200
+#define S_IXUSR 0100
+#define S_IRWXU 0700
+#define S_IRGRP 0040
+#define S_IWGRP 0020
+#define S_IXGRP 0010
+#define S_IRWXG 0070
+#define S_IROTH 0004
+#define S_IWOTH 0002
+#define S_IXOTH 0001
+#define S_IRWXO 0007
+#endif
+
+#define UTIME_NOW  0x3fffffff
+#define UTIME_OMIT 0x3ffffffe
+
+int stat(const char *__restrict, struct stat *__restrict);
+int fstat(int, struct stat *);
+int lstat(const char *__restrict, struct stat *__restrict);
+int fstatat(int, const char *__restrict, struct stat *__restrict, int);
+int chmod(const char *, mode_t);
+int fchmod(int, mode_t);
+int fchmodat(int, const char *, mode_t, int);
+mode_t umask(mode_t);
+int mkdir(const char *, mode_t);
+int mkfifo(const char *, mode_t);
+int mkdirat(int, const char *, mode_t);
+int mkfifoat(int, const char *, mode_t);
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+int mknod(const char *, mode_t, dev_t);
+int mknodat(int, const char *, mode_t, dev_t);
+#endif
+
+int futimens(int, const struct timespec [2]);
+int utimensat(int, const char *, const struct timespec [2], int);
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+int lchmod(const char *, mode_t);
+#define S_IREAD S_IRUSR
+#define S_IWRITE S_IWUSR
+#define S_IEXEC S_IXUSR
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define stat64 stat
+#define fstat64 fstat
+#define lstat64 lstat
+#define fstatat64 fstatat
+#define blkcnt64_t blkcnt_t
+#define fsblkcnt64_t fsblkcnt_t
+#define fsfilcnt64_t fsfilcnt_t
+#define ino64_t ino_t
+#define off64_t off_t
+#endif
+
+#if _REDIR_TIME64
+__REDIR(stat, __stat_time64);
+__REDIR(fstat, __fstat_time64);
+__REDIR(lstat, __lstat_time64);
+__REDIR(fstatat, __fstatat_time64);
+__REDIR(futimens, __futimens_time64);
+__REDIR(utimensat, __utimensat_time64);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/statfs.h b/src/components/lib/libc/musl-1.2.0/include/sys/statfs.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/statfs.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/statfs.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/statvfs.h b/src/components/lib/libc/musl-1.2.0/include/sys/statvfs.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/sys/statvfs.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/statvfs.h
index e0839ecac3..793490b6dc 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/statvfs.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/statvfs.h
@@ -11,8 +11,6 @@ extern "C" {
 #define __NEED_fsfilcnt_t
 #include <bits/alltypes.h>
 
-#include <endian.h>
-
 struct statvfs {
 	unsigned long f_bsize, f_frsize;
 	fsblkcnt_t f_blocks, f_bfree, f_bavail;
@@ -42,6 +40,7 @@ int fstatvfs (int, struct statvfs *);
 #define ST_IMMUTABLE   512
 #define ST_NOATIME     1024
 #define ST_NODIRATIME  2048
+#define ST_RELATIME    4096
 
 #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
 #define statvfs64 statvfs
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/stropts.h b/src/components/lib/libc/musl-1.2.0/include/sys/stropts.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/stropts.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/stropts.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/swap.h b/src/components/lib/libc/musl-1.2.0/include/sys/swap.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/swap.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/swap.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/syscall.h b/src/components/lib/libc/musl-1.2.0/include/sys/syscall.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/syscall.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/syscall.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/sysinfo.h b/src/components/lib/libc/musl-1.2.0/include/sys/sysinfo.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/sysinfo.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/sysinfo.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/syslog.h b/src/components/lib/libc/musl-1.2.0/include/sys/syslog.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/syslog.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/syslog.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/sysmacros.h b/src/components/lib/libc/musl-1.2.0/include/sys/sysmacros.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/sysmacros.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/sysmacros.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/termios.h b/src/components/lib/libc/musl-1.2.0/include/sys/termios.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/termios.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/termios.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/time.h b/src/components/lib/libc/musl-1.2.0/include/sys/time.h
new file mode 100644
index 0000000000..cdc67ef650
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/time.h
@@ -0,0 +1,76 @@
+#ifndef _SYS_TIME_H
+#define _SYS_TIME_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#include <sys/select.h>
+
+int gettimeofday (struct timeval *__restrict, void *__restrict);
+
+#define ITIMER_REAL    0
+#define ITIMER_VIRTUAL 1
+#define ITIMER_PROF    2
+
+struct itimerval {
+	struct timeval it_interval;
+	struct timeval it_value;
+};
+
+int getitimer (int, struct itimerval *);
+int setitimer (int, const struct itimerval *__restrict, struct itimerval *__restrict);
+int utimes (const char *, const struct timeval [2]);
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+struct timezone {
+	int tz_minuteswest;
+	int tz_dsttime;
+};
+int futimes(int, const struct timeval [2]);
+int futimesat(int, const char *, const struct timeval [2]);
+int lutimes(const char *, const struct timeval [2]);
+int settimeofday(const struct timeval *, const struct timezone *);
+int adjtime (const struct timeval *, struct timeval *);
+#define timerisset(t) ((t)->tv_sec || (t)->tv_usec)
+#define timerclear(t) ((t)->tv_sec = (t)->tv_usec = 0)
+#define timercmp(s,t,op) ((s)->tv_sec == (t)->tv_sec ? \
+	(s)->tv_usec op (t)->tv_usec : (s)->tv_sec op (t)->tv_sec)
+#define timeradd(s,t,a) (void) ( (a)->tv_sec = (s)->tv_sec + (t)->tv_sec, \
+	((a)->tv_usec = (s)->tv_usec + (t)->tv_usec) >= 1000000 && \
+	((a)->tv_usec -= 1000000, (a)->tv_sec++) )
+#define timersub(s,t,a) (void) ( (a)->tv_sec = (s)->tv_sec - (t)->tv_sec, \
+	((a)->tv_usec = (s)->tv_usec - (t)->tv_usec) < 0 && \
+	((a)->tv_usec += 1000000, (a)->tv_sec--) )
+#endif
+
+#if defined(_GNU_SOURCE)
+#define TIMEVAL_TO_TIMESPEC(tv, ts) ( \
+	(ts)->tv_sec = (tv)->tv_sec, \
+	(ts)->tv_nsec = (tv)->tv_usec * 1000, \
+	(void)0 )
+#define TIMESPEC_TO_TIMEVAL(tv, ts) ( \
+	(tv)->tv_sec = (ts)->tv_sec, \
+	(tv)->tv_usec = (ts)->tv_nsec / 1000, \
+	(void)0 )
+#endif
+
+#if _REDIR_TIME64
+__REDIR(gettimeofday, __gettimeofday_time64);
+__REDIR(getitimer, __getitimer_time64);
+__REDIR(setitimer, __setitimer_time64);
+__REDIR(utimes, __utimes_time64);
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+__REDIR(futimes, __futimes_time64);
+__REDIR(futimesat, __futimesat_time64);
+__REDIR(lutimes, __lutimes_time64);
+__REDIR(settimeofday, __settimeofday_time64);
+__REDIR(adjtime, __adjtime64);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/timeb.h b/src/components/lib/libc/musl-1.2.0/include/sys/timeb.h
similarity index 78%
rename from src/components/lib/libc/musl-1.1.11/include/sys/timeb.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/timeb.h
index 108c1f5ccb..628239b7ed 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/timeb.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/timeb.h
@@ -4,6 +4,8 @@
 extern "C" {
 #endif
 
+#include <features.h>
+
 #define __NEED_time_t
 
 #include <bits/alltypes.h>
@@ -16,6 +18,10 @@ struct timeb {
 
 int ftime(struct timeb *);
 
+#if _REDIR_TIME64
+__REDIR(ftime, __ftime64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/timerfd.h b/src/components/lib/libc/musl-1.2.0/include/sys/timerfd.h
new file mode 100644
index 0000000000..1b832cdd8f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/timerfd.h
@@ -0,0 +1,32 @@
+#ifndef _SYS_TIMERFD_H
+#define _SYS_TIMERFD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <time.h>
+#include <fcntl.h>
+
+#define TFD_NONBLOCK O_NONBLOCK
+#define TFD_CLOEXEC O_CLOEXEC
+
+#define TFD_TIMER_ABSTIME 1
+#define TFD_TIMER_CANCEL_ON_SET (1 << 1)
+
+struct itimerspec;
+
+int timerfd_create(int, int);
+int timerfd_settime(int, int, const struct itimerspec *, struct itimerspec *);
+int timerfd_gettime(int, struct itimerspec *);
+
+#if _REDIR_TIME64
+__REDIR(timerfd_settime, __timerfd_settime64);
+__REDIR(timerfd_gettime, __timerfd_gettime64);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/times.h b/src/components/lib/libc/musl-1.2.0/include/sys/times.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/sys/times.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/times.h
index cc55e573fd..80a50522d7 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/times.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/times.h
@@ -8,8 +8,7 @@ extern "C" {
 #define __NEED_clock_t
 #include <bits/alltypes.h>
 
-struct tms
-{
+struct tms {
 	clock_t tms_utime;
 	clock_t tms_stime;
 	clock_t tms_cutime;
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/timex.h b/src/components/lib/libc/musl-1.2.0/include/sys/timex.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/sys/timex.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/timex.h
index 2e688880a8..8b417e1be2 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/timex.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/timex.h
@@ -91,6 +91,11 @@ struct timex {
 int adjtimex(struct timex *);
 int clock_adjtime(clockid_t, struct timex *);
 
+#if _REDIR_TIME64
+__REDIR(adjtimex, __adjtimex_time64);
+__REDIR(clock_adjtime, __clock_adjtime64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/ttydefaults.h b/src/components/lib/libc/musl-1.2.0/include/sys/ttydefaults.h
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/include/sys/ttydefaults.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/ttydefaults.h
index d251b715c6..edb55bc4d6 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/ttydefaults.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/ttydefaults.h
@@ -6,16 +6,11 @@
 #define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
 #define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL)
 #define TTYDEF_SPEED (B9600)
-#define CTRL(x) (x&037)
+#define CTRL(x) ((x)&037)
 #define CEOF CTRL('d')
 
-#ifdef _POSIX_VDISABLE
-#define CEOL _POSIX_VDISABLE
-#define CSTATUS _POSIX_VDISABLE
-#else
 #define CEOL '\0'
 #define CSTATUS '\0'
-#endif
 
 #define CERASE 0177
 #define CINTR CTRL('c')
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/types.h b/src/components/lib/libc/musl-1.2.0/include/sys/types.h
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/include/sys/types.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/types.h
index 75e489c573..0c35541da0 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/types.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/types.h
@@ -69,7 +69,6 @@ typedef long long quad_t;
 typedef unsigned long long u_quad_t;
 #include <endian.h>
 #include <sys/select.h>
-#include <sys/sysmacros.h>
 #endif
 
 #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/ucontext.h b/src/components/lib/libc/musl-1.2.0/include/sys/ucontext.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/ucontext.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/ucontext.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/uio.h b/src/components/lib/libc/musl-1.2.0/include/sys/uio.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/uio.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/uio.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/un.h b/src/components/lib/libc/musl-1.2.0/include/sys/un.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/sys/un.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/un.h
index 7494f1a382..1a3193ad20 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/un.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/un.h
@@ -14,8 +14,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct sockaddr_un
-{
+struct sockaddr_un {
 	sa_family_t sun_family;
 	char sun_path[108];
 };
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/user.h b/src/components/lib/libc/musl-1.2.0/include/sys/user.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/user.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/user.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/utsname.h b/src/components/lib/libc/musl-1.2.0/include/sys/utsname.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/include/sys/utsname.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/utsname.h
index 6b9ea97097..2c80fb5a2d 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/utsname.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/utsname.h
@@ -7,8 +7,7 @@ extern "C" {
 
 #include <features.h>
 
-struct utsname
-{
+struct utsname {
 	char sysname[65];
 	char nodename[65];
 	char release[65];
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/vfs.h b/src/components/lib/libc/musl-1.2.0/include/sys/vfs.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sys/vfs.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/vfs.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/sys/vt.h b/src/components/lib/libc/musl-1.2.0/include/sys/vt.h
new file mode 100644
index 0000000000..5000de499f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/vt.h
@@ -0,0 +1 @@
+#include <bits/vt.h>
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/wait.h b/src/components/lib/libc/musl-1.2.0/include/sys/wait.h
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/include/sys/wait.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/wait.h
index 50c5c709a6..d4b1f2e185 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/wait.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/wait.h
@@ -13,7 +13,8 @@ extern "C" {
 typedef enum {
 	P_ALL = 0,
 	P_PID = 1,
-	P_PGID = 2
+	P_PGID = 2,
+	P_PIDFD = 3
 } idtype_t;
 
 pid_t wait (int *);
@@ -53,6 +54,13 @@ pid_t wait4 (pid_t, int *, int, struct rusage *);
 #define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu)
 #define WIFCONTINUED(s) ((s) == 0xffff)
 
+#if _REDIR_TIME64
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+__REDIR(wait3, __wait3_time64);
+__REDIR(wait4, __wait4_time64);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/sys/xattr.h b/src/components/lib/libc/musl-1.2.0/include/sys/xattr.h
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/include/sys/xattr.h
rename to src/components/lib/libc/musl-1.2.0/include/sys/xattr.h
index f926493cbc..eeeaafc44f 100644
--- a/src/components/lib/libc/musl-1.1.11/include/sys/xattr.h
+++ b/src/components/lib/libc/musl-1.2.0/include/sys/xattr.h
@@ -13,10 +13,10 @@ extern "C" {
 
 ssize_t getxattr(const char *, const char *, void *, size_t);
 ssize_t lgetxattr(const char *, const char *, void *, size_t);
-ssize_t fgetxattr(int filedes, const char *, void *, size_t);
+ssize_t fgetxattr(int, const char *, void *, size_t);
 ssize_t listxattr(const char *, char *, size_t);
 ssize_t llistxattr(const char *, char *, size_t);
-ssize_t flistxattr(int filedes, char *, size_t);
+ssize_t flistxattr(int, char *, size_t);
 int setxattr(const char *, const char *, const void *, size_t, int);
 int lsetxattr(const char *, const char *, const void *, size_t, int);
 int fsetxattr(int, const char *, const void *, size_t, int);
@@ -24,6 +24,8 @@ int removexattr(const char *, const char *);
 int lremovexattr(const char *, const char *);
 int fremovexattr(int, const char *);
 
+#define __UAPI_DEF_XATTR        0
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/syscall.h b/src/components/lib/libc/musl-1.2.0/include/syscall.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/syscall.h
rename to src/components/lib/libc/musl-1.2.0/include/syscall.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/sysexits.h b/src/components/lib/libc/musl-1.2.0/include/sysexits.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/sysexits.h
rename to src/components/lib/libc/musl-1.2.0/include/sysexits.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/syslog.h b/src/components/lib/libc/musl-1.2.0/include/syslog.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/syslog.h
rename to src/components/lib/libc/musl-1.2.0/include/syslog.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/tar.h b/src/components/lib/libc/musl-1.2.0/include/tar.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/tar.h
rename to src/components/lib/libc/musl-1.2.0/include/tar.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/termios.h b/src/components/lib/libc/musl-1.2.0/include/termios.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/termios.h
rename to src/components/lib/libc/musl-1.2.0/include/termios.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/tgmath.h b/src/components/lib/libc/musl-1.2.0/include/tgmath.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/tgmath.h
rename to src/components/lib/libc/musl-1.2.0/include/tgmath.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/threads.h b/src/components/lib/libc/musl-1.2.0/include/threads.h
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/include/threads.h
rename to src/components/lib/libc/musl-1.2.0/include/threads.h
index 017948261e..52ec3100eb 100644
--- a/src/components/lib/libc/musl-1.1.11/include/threads.h
+++ b/src/components/lib/libc/musl-1.2.0/include/threads.h
@@ -75,11 +75,17 @@ int cnd_timedwait(cnd_t *__restrict, mtx_t *__restrict, const struct timespec *_
 int cnd_wait(cnd_t *, mtx_t *);
 
 int tss_create(tss_t *, tss_dtor_t);
-void tss_delete(tss_t key);
+void tss_delete(tss_t);
 
 int tss_set(tss_t, void *);
 void *tss_get(tss_t);
 
+#if _REDIR_TIME64
+__REDIR(thrd_sleep, __thrd_sleep_time64);
+__REDIR(mtx_timedlock, __mtx_timedlock_time64);
+__REDIR(cnd_timedwait, __cnd_timedwait_time64);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/time.h b/src/components/lib/libc/musl-1.2.0/include/time.h
new file mode 100644
index 0000000000..5494df1836
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/time.h
@@ -0,0 +1,166 @@
+#ifndef	_TIME_H
+#define _TIME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#ifdef __cplusplus
+#define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
+
+
+#define __NEED_size_t
+#define __NEED_time_t
+#define __NEED_clock_t
+#define __NEED_struct_timespec
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+#define __NEED_clockid_t
+#define __NEED_timer_t
+#define __NEED_pid_t
+#define __NEED_locale_t
+#endif
+
+#include <bits/alltypes.h>
+
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define __tm_gmtoff tm_gmtoff
+#define __tm_zone tm_zone
+#endif
+
+struct tm {
+	int tm_sec;
+	int tm_min;
+	int tm_hour;
+	int tm_mday;
+	int tm_mon;
+	int tm_year;
+	int tm_wday;
+	int tm_yday;
+	int tm_isdst;
+	long __tm_gmtoff;
+	const char *__tm_zone;
+};
+
+clock_t clock (void);
+time_t time (time_t *);
+double difftime (time_t, time_t);
+time_t mktime (struct tm *);
+size_t strftime (char *__restrict, size_t, const char *__restrict, const struct tm *__restrict);
+struct tm *gmtime (const time_t *);
+struct tm *localtime (const time_t *);
+char *asctime (const struct tm *);
+char *ctime (const time_t *);
+int timespec_get(struct timespec *, int);
+
+#define CLOCKS_PER_SEC 1000000L
+
+#define TIME_UTC 1
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+
+size_t strftime_l (char *  __restrict, size_t, const char *  __restrict, const struct tm *  __restrict, locale_t);
+
+struct tm *gmtime_r (const time_t *__restrict, struct tm *__restrict);
+struct tm *localtime_r (const time_t *__restrict, struct tm *__restrict);
+char *asctime_r (const struct tm *__restrict, char *__restrict);
+char *ctime_r (const time_t *, char *);
+
+void tzset (void);
+
+struct itimerspec {
+	struct timespec it_interval;
+	struct timespec it_value;
+};
+
+#define CLOCK_REALTIME           0
+#define CLOCK_MONOTONIC          1
+#define CLOCK_PROCESS_CPUTIME_ID 2
+#define CLOCK_THREAD_CPUTIME_ID  3
+#define CLOCK_MONOTONIC_RAW      4
+#define CLOCK_REALTIME_COARSE    5
+#define CLOCK_MONOTONIC_COARSE   6
+#define CLOCK_BOOTTIME           7
+#define CLOCK_REALTIME_ALARM     8
+#define CLOCK_BOOTTIME_ALARM     9
+#define CLOCK_SGI_CYCLE         10
+#define CLOCK_TAI               11
+
+#define TIMER_ABSTIME 1
+
+int nanosleep (const struct timespec *, struct timespec *);
+int clock_getres (clockid_t, struct timespec *);
+int clock_gettime (clockid_t, struct timespec *);
+int clock_settime (clockid_t, const struct timespec *);
+int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *);
+int clock_getcpuclockid (pid_t, clockid_t *);
+
+struct sigevent;
+int timer_create (clockid_t, struct sigevent *__restrict, timer_t *__restrict);
+int timer_delete (timer_t);
+int timer_settime (timer_t, int, const struct itimerspec *__restrict, struct itimerspec *__restrict);
+int timer_gettime (timer_t, struct itimerspec *);
+int timer_getoverrun (timer_t);
+
+extern char *tzname[2];
+
+#endif
+
+
+#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+char *strptime (const char *__restrict, const char *__restrict, struct tm *__restrict);
+extern int daylight;
+extern long timezone;
+extern int getdate_err;
+struct tm *getdate (const char *);
+#endif
+
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+int stime(const time_t *);
+time_t timegm(struct tm *);
+#endif
+
+#if _REDIR_TIME64
+__REDIR(time, __time64);
+__REDIR(difftime, __difftime64);
+__REDIR(mktime, __mktime64);
+__REDIR(gmtime, __gmtime64);
+__REDIR(localtime, __localtime64);
+__REDIR(ctime, __ctime64);
+__REDIR(timespec_get, __timespec_get_time64);
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+__REDIR(gmtime_r, __gmtime64_r);
+__REDIR(localtime_r, __localtime64_r);
+__REDIR(ctime_r, __ctime64_r);
+__REDIR(nanosleep, __nanosleep_time64);
+__REDIR(clock_getres, __clock_getres_time64);
+__REDIR(clock_gettime, __clock_gettime64);
+__REDIR(clock_settime, __clock_settime64);
+__REDIR(clock_nanosleep, __clock_nanosleep_time64);
+__REDIR(timer_settime, __timer_settime64);
+__REDIR(timer_gettime, __timer_gettime64);
+#endif
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+__REDIR(stime, __stime64);
+__REDIR(timegm, __timegm_time64);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/uchar.h b/src/components/lib/libc/musl-1.2.0/include/uchar.h
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/include/uchar.h
rename to src/components/lib/libc/musl-1.2.0/include/uchar.h
index 8dabf1ed9b..7e5c4d4068 100644
--- a/src/components/lib/libc/musl-1.1.11/include/uchar.h
+++ b/src/components/lib/libc/musl-1.2.0/include/uchar.h
@@ -3,7 +3,9 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
+#endif
+
+#if __cplusplus < 201103L
 typedef unsigned short char16_t;
 typedef unsigned char32_t;
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/ucontext.h b/src/components/lib/libc/musl-1.2.0/include/ucontext.h
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/include/ucontext.h
rename to src/components/lib/libc/musl-1.2.0/include/ucontext.h
index 3bb776ed6a..0f75712548 100644
--- a/src/components/lib/libc/musl-1.1.11/include/ucontext.h
+++ b/src/components/lib/libc/musl-1.2.0/include/ucontext.h
@@ -15,7 +15,7 @@ extern "C" {
 struct __ucontext;
 
 int  getcontext(struct __ucontext *);
-void makecontext(struct __ucontext *, void (*)(void), int, ...);
+void makecontext(struct __ucontext *, void (*)(), int, ...);
 int  setcontext(const struct __ucontext *);
 int  swapcontext(struct __ucontext *, const struct __ucontext *);
 
diff --git a/src/components/lib/libc/musl-1.1.11/include/ulimit.h b/src/components/lib/libc/musl-1.2.0/include/ulimit.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/ulimit.h
rename to src/components/lib/libc/musl-1.2.0/include/ulimit.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/unistd.h b/src/components/lib/libc/musl-1.2.0/include/unistd.h
new file mode 100644
index 0000000000..7bcbff943d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/unistd.h
@@ -0,0 +1,469 @@
+#ifndef	_UNISTD_H
+#define	_UNISTD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define STDIN_FILENO  0
+#define STDOUT_FILENO 1
+#define STDERR_FILENO 2
+
+#define SEEK_SET 0
+#define SEEK_CUR 1
+#define SEEK_END 2
+
+#ifdef __cplusplus
+#define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
+
+#define __NEED_size_t
+#define __NEED_ssize_t
+#define __NEED_uid_t
+#define __NEED_gid_t
+#define __NEED_off_t
+#define __NEED_pid_t
+#define __NEED_intptr_t
+#define __NEED_useconds_t
+
+#include <bits/alltypes.h>
+
+int pipe(int [2]);
+int pipe2(int [2], int);
+int close(int);
+int posix_close(int, int);
+int dup(int);
+int dup2(int, int);
+int dup3(int, int, int);
+off_t lseek(int, off_t, int);
+int fsync(int);
+int fdatasync(int);
+
+ssize_t read(int, void *, size_t);
+ssize_t write(int, const void *, size_t);
+ssize_t pread(int, void *, size_t, off_t);
+ssize_t pwrite(int, const void *, size_t, off_t);
+
+int chown(const char *, uid_t, gid_t);
+int fchown(int, uid_t, gid_t);
+int lchown(const char *, uid_t, gid_t);
+int fchownat(int, const char *, uid_t, gid_t, int);
+
+int link(const char *, const char *);
+int linkat(int, const char *, int, const char *, int);
+int symlink(const char *, const char *);
+int symlinkat(const char *, int, const char *);
+ssize_t readlink(const char *__restrict, char *__restrict, size_t);
+ssize_t readlinkat(int, const char *__restrict, char *__restrict, size_t);
+int unlink(const char *);
+int unlinkat(int, const char *, int);
+int rmdir(const char *);
+int truncate(const char *, off_t);
+int ftruncate(int, off_t);
+
+#define F_OK 0
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+
+int access(const char *, int);
+int faccessat(int, const char *, int, int);
+
+int chdir(const char *);
+int fchdir(int);
+char *getcwd(char *, size_t);
+
+unsigned alarm(unsigned);
+unsigned sleep(unsigned);
+int pause(void);
+
+pid_t fork(void);
+int execve(const char *, char *const [], char *const []);
+int execv(const char *, char *const []);
+int execle(const char *, const char *, ...);
+int execl(const char *, const char *, ...);
+int execvp(const char *, char *const []);
+int execlp(const char *, const char *, ...);
+int fexecve(int, char *const [], char *const []);
+_Noreturn void _exit(int);
+
+pid_t getpid(void);
+pid_t getppid(void);
+pid_t getpgrp(void);
+pid_t getpgid(pid_t);
+int setpgid(pid_t, pid_t);
+pid_t setsid(void);
+pid_t getsid(pid_t);
+char *ttyname(int);
+int ttyname_r(int, char *, size_t);
+int isatty(int);
+pid_t tcgetpgrp(int);
+int tcsetpgrp(int, pid_t);
+
+uid_t getuid(void);
+uid_t geteuid(void);
+gid_t getgid(void);
+gid_t getegid(void);
+int getgroups(int, gid_t []);
+int setuid(uid_t);
+int seteuid(uid_t);
+int setgid(gid_t);
+int setegid(gid_t);
+
+char *getlogin(void);
+int getlogin_r(char *, size_t);
+int gethostname(char *, size_t);
+char *ctermid(char *);
+
+int getopt(int, char * const [], const char *);
+extern char *optarg;
+extern int optind, opterr, optopt;
+
+long pathconf(const char *, int);
+long fpathconf(int, int);
+long sysconf(int);
+size_t confstr(int, char *, size_t);
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define F_ULOCK 0
+#define F_LOCK  1
+#define F_TLOCK 2
+#define F_TEST  3
+int setreuid(uid_t, uid_t);
+int setregid(gid_t, gid_t);
+int lockf(int, int, off_t);
+long gethostid(void);
+int nice(int);
+void sync(void);
+pid_t setpgrp(void);
+char *crypt(const char *, const char *);
+void encrypt(char *, int);
+void swab(const void *__restrict, void *__restrict, ssize_t);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) \
+ || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
+int usleep(unsigned);
+unsigned ualarm(unsigned, unsigned);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define L_SET 0
+#define L_INCR 1
+#define L_XTND 2
+int brk(void *);
+void *sbrk(intptr_t);
+pid_t vfork(void);
+int vhangup(void);
+int chroot(const char *);
+int getpagesize(void);
+int getdtablesize(void);
+int sethostname(const char *, size_t);
+int getdomainname(char *, size_t);
+int setdomainname(const char *, size_t);
+int setgroups(size_t, const gid_t *);
+char *getpass(const char *);
+int daemon(int, int);
+void setusershell(void);
+void endusershell(void);
+char *getusershell(void);
+int acct(const char *);
+long syscall(long, ...);
+int execvpe(const char *, char *const [], char *const []);
+int issetugid(void);
+int getentropy(void *, size_t);
+extern int optreset;
+#endif
+
+#ifdef _GNU_SOURCE
+extern char **environ;
+int setresuid(uid_t, uid_t, uid_t);
+int setresgid(gid_t, gid_t, gid_t);
+int getresuid(uid_t *, uid_t *, uid_t *);
+int getresgid(gid_t *, gid_t *, gid_t *);
+char *get_current_dir_name(void);
+int syncfs(int);
+int euidaccess(const char *, int);
+int eaccess(const char *, int);
+ssize_t copy_file_range(int, off_t *, int, off_t *, size_t, unsigned);
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#define lseek64 lseek
+#define pread64 pread
+#define pwrite64 pwrite
+#define truncate64 truncate
+#define ftruncate64 ftruncate
+#define lockf64 lockf
+#define off64_t off_t
+#endif
+
+#define POSIX_CLOSE_RESTART     0
+
+#define _XOPEN_VERSION          700
+#define _XOPEN_UNIX             1
+#define _XOPEN_ENH_I18N         1
+
+#define _POSIX_VERSION          200809L
+#define _POSIX2_VERSION         _POSIX_VERSION
+
+#define _POSIX_ADVISORY_INFO    _POSIX_VERSION
+#define _POSIX_CHOWN_RESTRICTED 1
+#define _POSIX_IPV6             _POSIX_VERSION
+#define _POSIX_JOB_CONTROL      1
+#define _POSIX_MAPPED_FILES     _POSIX_VERSION
+#define _POSIX_MEMLOCK          _POSIX_VERSION
+#define _POSIX_MEMLOCK_RANGE    _POSIX_VERSION
+#define _POSIX_MEMORY_PROTECTION _POSIX_VERSION
+#define _POSIX_MESSAGE_PASSING  _POSIX_VERSION
+#define _POSIX_FSYNC            _POSIX_VERSION
+#define _POSIX_NO_TRUNC         1
+#define _POSIX_RAW_SOCKETS      _POSIX_VERSION
+#define _POSIX_REALTIME_SIGNALS _POSIX_VERSION
+#define _POSIX_REGEXP           1
+#define _POSIX_SAVED_IDS        1
+#define _POSIX_SHELL            1
+#define _POSIX_SPAWN            _POSIX_VERSION
+#define _POSIX_VDISABLE         0
+
+#define _POSIX_THREADS          _POSIX_VERSION
+#define _POSIX_THREAD_PROCESS_SHARED _POSIX_VERSION
+#define _POSIX_THREAD_SAFE_FUNCTIONS _POSIX_VERSION
+#define _POSIX_THREAD_ATTR_STACKADDR _POSIX_VERSION
+#define _POSIX_THREAD_ATTR_STACKSIZE _POSIX_VERSION
+#define _POSIX_THREAD_PRIORITY_SCHEDULING _POSIX_VERSION
+#define _POSIX_THREAD_CPUTIME   _POSIX_VERSION
+#define _POSIX_TIMERS           _POSIX_VERSION
+#define _POSIX_TIMEOUTS         _POSIX_VERSION
+#define _POSIX_MONOTONIC_CLOCK  _POSIX_VERSION
+#define _POSIX_CPUTIME          _POSIX_VERSION
+#define _POSIX_CLOCK_SELECTION  _POSIX_VERSION
+#define _POSIX_BARRIERS         _POSIX_VERSION
+#define _POSIX_SPIN_LOCKS       _POSIX_VERSION
+#define _POSIX_READER_WRITER_LOCKS _POSIX_VERSION
+#define _POSIX_ASYNCHRONOUS_IO  _POSIX_VERSION
+#define _POSIX_SEMAPHORES       _POSIX_VERSION
+#define _POSIX_SHARED_MEMORY_OBJECTS _POSIX_VERSION
+
+#define _POSIX2_C_BIND          _POSIX_VERSION
+
+#include <bits/posix.h>
+
+
+
+#define _PC_LINK_MAX	0
+#define _PC_MAX_CANON	1
+#define _PC_MAX_INPUT	2
+#define _PC_NAME_MAX	3
+#define _PC_PATH_MAX	4
+#define _PC_PIPE_BUF	5
+#define _PC_CHOWN_RESTRICTED	6
+#define _PC_NO_TRUNC	7
+#define _PC_VDISABLE	8
+#define _PC_SYNC_IO	9
+#define _PC_ASYNC_IO	10
+#define _PC_PRIO_IO	11
+#define _PC_SOCK_MAXBUF	12
+#define _PC_FILESIZEBITS	13
+#define _PC_REC_INCR_XFER_SIZE	14
+#define _PC_REC_MAX_XFER_SIZE	15
+#define _PC_REC_MIN_XFER_SIZE	16
+#define _PC_REC_XFER_ALIGN	17
+#define _PC_ALLOC_SIZE_MIN	18
+#define _PC_SYMLINK_MAX	19
+#define _PC_2_SYMLINKS	20
+
+#define _SC_ARG_MAX	0
+#define _SC_CHILD_MAX	1
+#define _SC_CLK_TCK	2
+#define _SC_NGROUPS_MAX	3
+#define _SC_OPEN_MAX	4
+#define _SC_STREAM_MAX	5
+#define _SC_TZNAME_MAX	6
+#define _SC_JOB_CONTROL	7
+#define _SC_SAVED_IDS	8
+#define _SC_REALTIME_SIGNALS	9
+#define _SC_PRIORITY_SCHEDULING	10
+#define _SC_TIMERS	11
+#define _SC_ASYNCHRONOUS_IO	12
+#define _SC_PRIORITIZED_IO	13
+#define _SC_SYNCHRONIZED_IO	14
+#define _SC_FSYNC	15
+#define _SC_MAPPED_FILES	16
+#define _SC_MEMLOCK	17
+#define _SC_MEMLOCK_RANGE	18
+#define _SC_MEMORY_PROTECTION	19
+#define _SC_MESSAGE_PASSING	20
+#define _SC_SEMAPHORES	21
+#define _SC_SHARED_MEMORY_OBJECTS	22
+#define _SC_AIO_LISTIO_MAX	23
+#define _SC_AIO_MAX	24
+#define _SC_AIO_PRIO_DELTA_MAX	25
+#define _SC_DELAYTIMER_MAX	26
+#define _SC_MQ_OPEN_MAX	27
+#define _SC_MQ_PRIO_MAX	28
+#define _SC_VERSION	29
+#define _SC_PAGE_SIZE	30
+#define _SC_PAGESIZE	30 /* !! */
+#define _SC_RTSIG_MAX	31
+#define _SC_SEM_NSEMS_MAX	32
+#define _SC_SEM_VALUE_MAX	33
+#define _SC_SIGQUEUE_MAX	34
+#define _SC_TIMER_MAX	35
+#define _SC_BC_BASE_MAX	36
+#define _SC_BC_DIM_MAX	37
+#define _SC_BC_SCALE_MAX	38
+#define _SC_BC_STRING_MAX	39
+#define _SC_COLL_WEIGHTS_MAX	40
+#define _SC_EXPR_NEST_MAX	42
+#define _SC_LINE_MAX	43
+#define _SC_RE_DUP_MAX	44
+#define _SC_2_VERSION	46
+#define _SC_2_C_BIND	47
+#define _SC_2_C_DEV	48
+#define _SC_2_FORT_DEV	49
+#define _SC_2_FORT_RUN	50
+#define _SC_2_SW_DEV	51
+#define _SC_2_LOCALEDEF	52
+#define _SC_UIO_MAXIOV	60 /* !! */
+#define _SC_IOV_MAX	60
+#define _SC_THREADS	67
+#define _SC_THREAD_SAFE_FUNCTIONS	68
+#define _SC_GETGR_R_SIZE_MAX	69
+#define _SC_GETPW_R_SIZE_MAX	70
+#define _SC_LOGIN_NAME_MAX	71
+#define _SC_TTY_NAME_MAX	72
+#define _SC_THREAD_DESTRUCTOR_ITERATIONS	73
+#define _SC_THREAD_KEYS_MAX	74
+#define _SC_THREAD_STACK_MIN	75
+#define _SC_THREAD_THREADS_MAX	76
+#define _SC_THREAD_ATTR_STACKADDR	77
+#define _SC_THREAD_ATTR_STACKSIZE	78
+#define _SC_THREAD_PRIORITY_SCHEDULING	79
+#define _SC_THREAD_PRIO_INHERIT	80
+#define _SC_THREAD_PRIO_PROTECT	81
+#define _SC_THREAD_PROCESS_SHARED	82
+#define _SC_NPROCESSORS_CONF	83
+#define _SC_NPROCESSORS_ONLN	84
+#define _SC_PHYS_PAGES	85
+#define _SC_AVPHYS_PAGES	86
+#define _SC_ATEXIT_MAX	87
+#define _SC_PASS_MAX	88
+#define _SC_XOPEN_VERSION	89
+#define _SC_XOPEN_XCU_VERSION	90
+#define _SC_XOPEN_UNIX	91
+#define _SC_XOPEN_CRYPT	92
+#define _SC_XOPEN_ENH_I18N	93
+#define _SC_XOPEN_SHM	94
+#define _SC_2_CHAR_TERM	95
+#define _SC_2_UPE	97
+#define _SC_XOPEN_XPG2	98
+#define _SC_XOPEN_XPG3	99
+#define _SC_XOPEN_XPG4	100
+#define _SC_NZERO	109
+#define _SC_XBS5_ILP32_OFF32	125
+#define _SC_XBS5_ILP32_OFFBIG	126
+#define _SC_XBS5_LP64_OFF64	127
+#define _SC_XBS5_LPBIG_OFFBIG	128
+#define _SC_XOPEN_LEGACY	129
+#define _SC_XOPEN_REALTIME	130
+#define _SC_XOPEN_REALTIME_THREADS	131
+#define _SC_ADVISORY_INFO	132
+#define _SC_BARRIERS	133
+#define _SC_CLOCK_SELECTION	137
+#define _SC_CPUTIME	138
+#define _SC_THREAD_CPUTIME	139
+#define _SC_MONOTONIC_CLOCK	149
+#define _SC_READER_WRITER_LOCKS	153
+#define _SC_SPIN_LOCKS	154
+#define _SC_REGEXP	155
+#define _SC_SHELL	157
+#define _SC_SPAWN	159
+#define _SC_SPORADIC_SERVER	160
+#define _SC_THREAD_SPORADIC_SERVER	161
+#define _SC_TIMEOUTS	164
+#define _SC_TYPED_MEMORY_OBJECTS	165
+#define _SC_2_PBS	168
+#define _SC_2_PBS_ACCOUNTING	169
+#define _SC_2_PBS_LOCATE	170
+#define _SC_2_PBS_MESSAGE	171
+#define _SC_2_PBS_TRACK	172
+#define _SC_SYMLOOP_MAX	173
+#define _SC_STREAMS	174
+#define _SC_2_PBS_CHECKPOINT	175
+#define _SC_V6_ILP32_OFF32	176
+#define _SC_V6_ILP32_OFFBIG	177
+#define _SC_V6_LP64_OFF64	178
+#define _SC_V6_LPBIG_OFFBIG	179
+#define _SC_HOST_NAME_MAX	180
+#define _SC_TRACE	181
+#define _SC_TRACE_EVENT_FILTER	182
+#define _SC_TRACE_INHERIT	183
+#define _SC_TRACE_LOG	184
+
+#define _SC_IPV6	235
+#define _SC_RAW_SOCKETS	236
+#define _SC_V7_ILP32_OFF32	237
+#define _SC_V7_ILP32_OFFBIG	238
+#define _SC_V7_LP64_OFF64	239
+#define _SC_V7_LPBIG_OFFBIG	240
+#define _SC_SS_REPL_MAX	241
+#define _SC_TRACE_EVENT_NAME_MAX	242
+#define _SC_TRACE_NAME_MAX	243
+#define _SC_TRACE_SYS_MAX	244
+#define _SC_TRACE_USER_EVENT_MAX	245
+#define _SC_XOPEN_STREAMS	246
+#define _SC_THREAD_ROBUST_PRIO_INHERIT	247
+#define _SC_THREAD_ROBUST_PRIO_PROTECT	248
+
+#define _CS_PATH	0
+#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	1
+#define _CS_GNU_LIBC_VERSION	2
+#define _CS_GNU_LIBPTHREAD_VERSION	3
+#define _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS	4
+#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS	5
+
+#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS	1116
+#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS	1117
+#define _CS_POSIX_V6_ILP32_OFF32_LIBS	1118
+#define _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS	1119
+#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS	1120
+#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS	1121
+#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS	1122
+#define _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS	1123
+#define _CS_POSIX_V6_LP64_OFF64_CFLAGS	1124
+#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS	1125
+#define _CS_POSIX_V6_LP64_OFF64_LIBS	1126
+#define _CS_POSIX_V6_LP64_OFF64_LINTFLAGS	1127
+#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS	1128
+#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS	1129
+#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS	1130
+#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS	1131
+#define _CS_POSIX_V7_ILP32_OFF32_CFLAGS	1132
+#define _CS_POSIX_V7_ILP32_OFF32_LDFLAGS	1133
+#define _CS_POSIX_V7_ILP32_OFF32_LIBS	1134
+#define _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS	1135
+#define _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS	1136
+#define _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS	1137
+#define _CS_POSIX_V7_ILP32_OFFBIG_LIBS	1138
+#define _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS	1139
+#define _CS_POSIX_V7_LP64_OFF64_CFLAGS	1140
+#define _CS_POSIX_V7_LP64_OFF64_LDFLAGS	1141
+#define _CS_POSIX_V7_LP64_OFF64_LIBS	1142
+#define _CS_POSIX_V7_LP64_OFF64_LINTFLAGS	1143
+#define _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS	1144
+#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS	1145
+#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS	1146
+#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS	1147
+#define _CS_V6_ENV	1148
+#define _CS_V7_ENV	1149
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/include/utime.h b/src/components/lib/libc/musl-1.2.0/include/utime.h
new file mode 100644
index 0000000000..5755bd53ee
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/utime.h
@@ -0,0 +1,29 @@
+#ifndef	_UTIME_H
+#define	_UTIME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_time_t
+
+#include <bits/alltypes.h>
+
+struct utimbuf {
+	time_t actime;
+	time_t modtime;
+};
+
+int utime (const char *, const struct utimbuf *);
+
+#if _REDIR_TIME64
+__REDIR(utime, __utime64);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/utmp.h b/src/components/lib/libc/musl-1.2.0/include/utmp.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/utmp.h
rename to src/components/lib/libc/musl-1.2.0/include/utmp.h
index 24e2da7bf9..48a400d84d 100644
--- a/src/components/lib/libc/musl-1.1.11/include/utmp.h
+++ b/src/components/lib/libc/musl-1.2.0/include/utmp.h
@@ -22,7 +22,6 @@ struct lastlog {
 #define ut_name ut_user
 #define ut_addr ut_addr_v6[0]
 #define utmp utmpx
-#define utmpname(x) (-1)
 #define e_exit __e_exit
 #define e_termination __e_termination
 
@@ -34,6 +33,7 @@ struct utmp *pututline(const struct utmp *);
 void         setutent(void);
 
 void updwtmp(const char *, const struct utmp *);
+int utmpname(const char *);
 
 int login_tty(int);
 
diff --git a/src/components/lib/libc/musl-1.1.11/include/utmpx.h b/src/components/lib/libc/musl-1.2.0/include/utmpx.h
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/include/utmpx.h
rename to src/components/lib/libc/musl-1.2.0/include/utmpx.h
index f0c3b01370..b293f427e6 100644
--- a/src/components/lib/libc/musl-1.1.11/include/utmpx.h
+++ b/src/components/lib/libc/musl-1.2.0/include/utmpx.h
@@ -14,9 +14,9 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-struct utmpx
-{
+struct utmpx {
 	short ut_type;
+	short __ut_pad1;
 	pid_t ut_pid;
 	char ut_line[32];
 	char ut_id[4];
@@ -26,7 +26,11 @@ struct utmpx
 		short __e_termination;
 		short __e_exit;
 	} ut_exit;
-	long ut_session;
+#if __BYTE_ORDER == 1234
+	int ut_session, __ut_pad2;
+#else
+	int __ut_pad2, ut_session;
+#endif
 	struct timeval ut_tv;
 	unsigned ut_addr_v6[4];
 	char __unused[20];
@@ -39,10 +43,11 @@ struct utmpx *getutxline(const struct utmpx *);
 struct utmpx *pututxline(const struct utmpx *);
 void          setutxent(void);
 
-#if defined(_BSD_SOURCE) | defined(_GNU_SOURCE)
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #define e_exit __e_exit
 #define e_termination __e_termination
 void updwtmpx(const char *, const struct utmpx *);
+int utmpxname(const char *);
 #endif
 
 #define EMPTY           0
diff --git a/src/components/lib/libc/musl-1.1.11/include/values.h b/src/components/lib/libc/musl-1.2.0/include/values.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/values.h
rename to src/components/lib/libc/musl-1.2.0/include/values.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/wait.h b/src/components/lib/libc/musl-1.2.0/include/wait.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/wait.h
rename to src/components/lib/libc/musl-1.2.0/include/wait.h
diff --git a/src/components/lib/libc/musl-1.2.0/include/wchar.h b/src/components/lib/libc/musl-1.2.0/include/wchar.h
new file mode 100644
index 0000000000..88eb55b18c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/include/wchar.h
@@ -0,0 +1,205 @@
+#ifndef _WCHAR_H
+#define _WCHAR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <features.h>
+
+#define __NEED_FILE
+#define __NEED___isoc_va_list
+#define __NEED_size_t
+#define __NEED_wchar_t
+#define __NEED_wint_t
+#define __NEED_mbstate_t
+
+#if __STDC_VERSION__ < 201112L
+#define __NEED_struct__IO_FILE
+#endif
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define __NEED_locale_t
+#define __NEED_va_list
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define __NEED_wctype_t
+#endif
+
+#include <bits/alltypes.h>
+
+#if L'\0'-1 > 0
+#define WCHAR_MAX (0xffffffffu+L'\0')
+#define WCHAR_MIN (0+L'\0')
+#else
+#define WCHAR_MAX (0x7fffffff+L'\0')
+#define WCHAR_MIN (-1-0x7fffffff+L'\0')
+#endif
+
+#ifdef __cplusplus
+#define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
+
+#undef WEOF
+#define WEOF 0xffffffffU
+
+wchar_t *wcscpy (wchar_t *__restrict, const wchar_t *__restrict);
+wchar_t *wcsncpy (wchar_t *__restrict, const wchar_t *__restrict, size_t);
+
+wchar_t *wcscat (wchar_t *__restrict, const wchar_t *__restrict);
+wchar_t *wcsncat (wchar_t *__restrict, const wchar_t *__restrict, size_t);
+
+int wcscmp (const wchar_t *, const wchar_t *);
+int wcsncmp (const wchar_t *, const wchar_t *, size_t);
+
+int wcscoll(const wchar_t *, const wchar_t *);
+size_t wcsxfrm (wchar_t *__restrict, const wchar_t *__restrict, size_t);
+
+wchar_t *wcschr (const wchar_t *, wchar_t);
+wchar_t *wcsrchr (const wchar_t *, wchar_t);
+
+size_t wcscspn (const wchar_t *, const wchar_t *);
+size_t wcsspn (const wchar_t *, const wchar_t *);
+wchar_t *wcspbrk (const wchar_t *, const wchar_t *);
+
+wchar_t *wcstok (wchar_t *__restrict, const wchar_t *__restrict, wchar_t **__restrict);
+
+size_t wcslen (const wchar_t *);
+
+wchar_t *wcsstr (const wchar_t *__restrict, const wchar_t *__restrict);
+wchar_t *wcswcs (const wchar_t *, const wchar_t *);
+
+wchar_t *wmemchr (const wchar_t *, wchar_t, size_t);
+int wmemcmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t *wmemcpy (wchar_t *__restrict, const wchar_t *__restrict, size_t);
+wchar_t *wmemmove (wchar_t *, const wchar_t *, size_t);
+wchar_t *wmemset (wchar_t *, wchar_t, size_t);
+
+wint_t btowc (int);
+int wctob (wint_t);
+
+int mbsinit (const mbstate_t *);
+size_t mbrtowc (wchar_t *__restrict, const char *__restrict, size_t, mbstate_t *__restrict);
+size_t wcrtomb (char *__restrict, wchar_t, mbstate_t *__restrict);
+
+size_t mbrlen (const char *__restrict, size_t, mbstate_t *__restrict);
+
+size_t mbsrtowcs (wchar_t *__restrict, const char **__restrict, size_t, mbstate_t *__restrict);
+size_t wcsrtombs (char *__restrict, const wchar_t **__restrict, size_t, mbstate_t *__restrict);
+
+float wcstof (const wchar_t *__restrict, wchar_t **__restrict);
+double wcstod (const wchar_t *__restrict, wchar_t **__restrict);
+long double wcstold (const wchar_t *__restrict, wchar_t **__restrict);
+
+long wcstol (const wchar_t *__restrict, wchar_t **__restrict, int);
+unsigned long wcstoul (const wchar_t *__restrict, wchar_t **__restrict, int);
+
+long long wcstoll (const wchar_t *__restrict, wchar_t **__restrict, int);
+unsigned long long wcstoull (const wchar_t *__restrict, wchar_t **__restrict, int);
+
+
+
+int fwide (FILE *, int);
+
+
+int wprintf (const wchar_t *__restrict, ...);
+int fwprintf (FILE *__restrict, const wchar_t *__restrict, ...);
+int swprintf (wchar_t *__restrict, size_t, const wchar_t *__restrict, ...);
+
+int vwprintf (const wchar_t *__restrict, __isoc_va_list);
+int vfwprintf (FILE *__restrict, const wchar_t *__restrict, __isoc_va_list);
+int vswprintf (wchar_t *__restrict, size_t, const wchar_t *__restrict, __isoc_va_list);
+
+int wscanf (const wchar_t *__restrict, ...);
+int fwscanf (FILE *__restrict, const wchar_t *__restrict, ...);
+int swscanf (const wchar_t *__restrict, const wchar_t *__restrict, ...);
+
+int vwscanf (const wchar_t *__restrict, __isoc_va_list);
+int vfwscanf (FILE *__restrict, const wchar_t *__restrict, __isoc_va_list);
+int vswscanf (const wchar_t *__restrict, const wchar_t *__restrict, __isoc_va_list);
+
+wint_t fgetwc (FILE *);
+wint_t getwc (FILE *);
+wint_t getwchar (void);
+
+wint_t fputwc (wchar_t, FILE *);
+wint_t putwc (wchar_t, FILE *);
+wint_t putwchar (wchar_t);
+
+wchar_t *fgetws (wchar_t *__restrict, int, FILE *__restrict);
+int fputws (const wchar_t *__restrict, FILE *__restrict);
+
+wint_t ungetwc (wint_t, FILE *);
+
+struct tm;
+size_t wcsftime (wchar_t *__restrict, size_t, const wchar_t *__restrict, const struct tm *__restrict);
+
+#undef iswdigit
+
+#if defined(_GNU_SOURCE)
+wint_t fgetwc_unlocked (FILE *);
+wint_t getwc_unlocked (FILE *);
+wint_t getwchar_unlocked (void);
+wint_t fputwc_unlocked (wchar_t, FILE *);
+wint_t putwc_unlocked (wchar_t, FILE *);
+wint_t putwchar_unlocked (wchar_t);
+wchar_t *fgetws_unlocked (wchar_t *__restrict, int, FILE *__restrict);
+int fputws_unlocked (const wchar_t *__restrict, FILE *__restrict);
+#endif
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+size_t wcsftime_l (wchar_t *__restrict, size_t, const wchar_t *__restrict, const struct tm *__restrict, locale_t);
+#endif
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)  || defined(_BSD_SOURCE)
+FILE *open_wmemstream(wchar_t **, size_t *);
+size_t mbsnrtowcs(wchar_t *__restrict, const char **__restrict, size_t, size_t, mbstate_t *__restrict);
+size_t wcsnrtombs(char *__restrict, const wchar_t **__restrict, size_t, size_t, mbstate_t *__restrict);
+wchar_t *wcsdup(const wchar_t *);
+size_t wcsnlen (const wchar_t *, size_t);
+wchar_t *wcpcpy (wchar_t *__restrict, const wchar_t *__restrict);
+wchar_t *wcpncpy (wchar_t *__restrict, const wchar_t *__restrict, size_t);
+int wcscasecmp(const wchar_t *, const wchar_t *);
+int wcscasecmp_l(const wchar_t *, const wchar_t *, locale_t);
+int wcsncasecmp(const wchar_t *, const wchar_t *, size_t);
+int wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t, locale_t);
+int wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
+size_t wcsxfrm_l(wchar_t *__restrict, const wchar_t *__restrict, size_t, locale_t);
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+int wcwidth (wchar_t);
+int wcswidth (const wchar_t *, size_t);
+int       iswalnum(wint_t);
+int       iswalpha(wint_t);
+int       iswblank(wint_t);
+int       iswcntrl(wint_t);
+int       iswdigit(wint_t);
+int       iswgraph(wint_t);
+int       iswlower(wint_t);
+int       iswprint(wint_t);
+int       iswpunct(wint_t);
+int       iswspace(wint_t);
+int       iswupper(wint_t);
+int       iswxdigit(wint_t);
+int       iswctype(wint_t, wctype_t);
+wint_t    towlower(wint_t);
+wint_t    towupper(wint_t);
+wctype_t  wctype(const char *);
+
+#ifndef __cplusplus
+#undef iswdigit
+#define iswdigit(a) (0 ? iswdigit(a) : ((unsigned)(a)-'0') < 10)
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/include/wctype.h b/src/components/lib/libc/musl-1.2.0/include/wctype.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/include/wctype.h
rename to src/components/lib/libc/musl-1.2.0/include/wctype.h
diff --git a/src/components/lib/libc/musl-1.1.11/include/wordexp.h b/src/components/lib/libc/musl-1.2.0/include/wordexp.h
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/include/wordexp.h
rename to src/components/lib/libc/musl-1.2.0/include/wordexp.h
index d12081e801..5460002dee 100644
--- a/src/components/lib/libc/musl-1.1.11/include/wordexp.h
+++ b/src/components/lib/libc/musl-1.2.0/include/wordexp.h
@@ -18,8 +18,7 @@ extern "C" {
 #define WRDE_SHOWERR 16
 #define WRDE_UNDEF   32
 
-typedef struct
-{
+typedef struct {
 	size_t we_wordc;
 	char **we_wordv;
 	size_t we_offs;
diff --git a/src/components/lib/libc/musl-1.2.0/ldso/dlstart.c b/src/components/lib/libc/musl-1.2.0/ldso/dlstart.c
new file mode 100644
index 0000000000..20d50f2cbc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/ldso/dlstart.c
@@ -0,0 +1,148 @@
+#include <stddef.h>
+#include "dynlink.h"
+#include "libc.h"
+
+#ifndef START
+#define START "_dlstart"
+#endif
+
+#define SHARED
+
+#include "crt_arch.h"
+
+#ifndef GETFUNCSYM
+#define GETFUNCSYM(fp, sym, got) do { \
+	hidden void sym(); \
+	static void (*static_func_ptr)() = sym; \
+	__asm__ __volatile__ ( "" : "+m"(static_func_ptr) : : "memory"); \
+	*(fp) = static_func_ptr; } while(0)
+#endif
+
+hidden void _dlstart_c(size_t *sp, size_t *dynv)
+{
+	size_t i, aux[AUX_CNT], dyn[DYN_CNT];
+	size_t *rel, rel_size, base;
+
+	int argc = *sp;
+	char **argv = (void *)(sp+1);
+
+	for (i=argc+1; argv[i]; i++);
+	size_t *auxv = (void *)(argv+i+1);
+
+	for (i=0; i<AUX_CNT; i++) aux[i] = 0;
+	for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT)
+		aux[auxv[i]] = auxv[i+1];
+
+#if DL_FDPIC
+	struct fdpic_loadseg *segs, fakeseg;
+	size_t j;
+	if (dynv) {
+		/* crt_arch.h entry point asm is responsible for reserving
+		 * space and moving the extra fdpic arguments to the stack
+		 * vector where they are easily accessible from C. */
+		segs = ((struct fdpic_loadmap *)(sp[-1] ? sp[-1] : sp[-2]))->segs;
+	} else {
+		/* If dynv is null, the entry point was started from loader
+		 * that is not fdpic-aware. We can assume normal fixed-
+		 * displacement ELF loading was performed, but when ldso was
+		 * run as a command, finding the Ehdr is a heursitic: we
+		 * have to assume Phdrs start in the first 4k of the file. */
+		base = aux[AT_BASE];
+		if (!base) base = aux[AT_PHDR] & -4096;
+		segs = &fakeseg;
+		segs[0].addr = base;
+		segs[0].p_vaddr = 0;
+		segs[0].p_memsz = -1;
+		Ehdr *eh = (void *)base;
+		Phdr *ph = (void *)(base + eh->e_phoff);
+		size_t phnum = eh->e_phnum;
+		size_t phent = eh->e_phentsize;
+		while (phnum-- && ph->p_type != PT_DYNAMIC)
+			ph = (void *)((size_t)ph + phent);
+		dynv = (void *)(base + ph->p_vaddr);
+	}
+#endif
+
+	for (i=0; i<DYN_CNT; i++) dyn[i] = 0;
+	for (i=0; dynv[i]; i+=2) if (dynv[i]<DYN_CNT)
+		dyn[dynv[i]] = dynv[i+1];
+
+#if DL_FDPIC
+	for (i=0; i<DYN_CNT; i++) {
+		if (i==DT_RELASZ || i==DT_RELSZ) continue;
+		if (!dyn[i]) continue;
+		for (j=0; dyn[i]-segs[j].p_vaddr >= segs[j].p_memsz; j++);
+		dyn[i] += segs[j].addr - segs[j].p_vaddr;
+	}
+	base = 0;
+
+	const Sym *syms = (void *)dyn[DT_SYMTAB];
+
+	rel = (void *)dyn[DT_RELA];
+	rel_size = dyn[DT_RELASZ];
+	for (; rel_size; rel+=3, rel_size-=3*sizeof(size_t)) {
+		if (!IS_RELATIVE(rel[1], syms)) continue;
+		for (j=0; rel[0]-segs[j].p_vaddr >= segs[j].p_memsz; j++);
+		size_t *rel_addr = (void *)
+			(rel[0] + segs[j].addr - segs[j].p_vaddr);
+		if (R_TYPE(rel[1]) == REL_FUNCDESC_VAL) {
+			*rel_addr += segs[rel_addr[1]].addr
+				- segs[rel_addr[1]].p_vaddr
+				+ syms[R_SYM(rel[1])].st_value;
+			rel_addr[1] = dyn[DT_PLTGOT];
+		} else {
+			size_t val = syms[R_SYM(rel[1])].st_value;
+			for (j=0; val-segs[j].p_vaddr >= segs[j].p_memsz; j++);
+			*rel_addr = rel[2] + segs[j].addr - segs[j].p_vaddr + val;
+		}
+	}
+#else
+	/* If the dynamic linker is invoked as a command, its load
+	 * address is not available in the aux vector. Instead, compute
+	 * the load address as the difference between &_DYNAMIC and the
+	 * virtual address in the PT_DYNAMIC program header. */
+	base = aux[AT_BASE];
+	if (!base) {
+		size_t phnum = aux[AT_PHNUM];
+		size_t phentsize = aux[AT_PHENT];
+		Phdr *ph = (void *)aux[AT_PHDR];
+		for (i=phnum; i--; ph = (void *)((char *)ph + phentsize)) {
+			if (ph->p_type == PT_DYNAMIC) {
+				base = (size_t)dynv - ph->p_vaddr;
+				break;
+			}
+		}
+	}
+
+	/* MIPS uses an ugly packed form for GOT relocations. Since we
+	 * can't make function calls yet and the code is tiny anyway,
+	 * it's simply inlined here. */
+	if (NEED_MIPS_GOT_RELOCS) {
+		size_t local_cnt = 0;
+		size_t *got = (void *)(base + dyn[DT_PLTGOT]);
+		for (i=0; dynv[i]; i+=2) if (dynv[i]==DT_MIPS_LOCAL_GOTNO)
+			local_cnt = dynv[i+1];
+		for (i=0; i<local_cnt; i++) got[i] += base;
+	}
+
+	rel = (void *)(base+dyn[DT_REL]);
+	rel_size = dyn[DT_RELSZ];
+	for (; rel_size; rel+=2, rel_size-=2*sizeof(size_t)) {
+		if (!IS_RELATIVE(rel[1], 0)) continue;
+		size_t *rel_addr = (void *)(base + rel[0]);
+		*rel_addr += base;
+	}
+
+	rel = (void *)(base+dyn[DT_RELA]);
+	rel_size = dyn[DT_RELASZ];
+	for (; rel_size; rel+=3, rel_size-=3*sizeof(size_t)) {
+		if (!IS_RELATIVE(rel[1], 0)) continue;
+		size_t *rel_addr = (void *)(base + rel[0]);
+		*rel_addr = base + rel[2];
+	}
+#endif
+
+	stage2_func dls2;
+	GETFUNCSYM(&dls2, __dls2, base+dyn[DT_PLTGOT]);
+	dls2((void *)base, sp);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/ldso/dynlink.c b/src/components/lib/libc/musl-1.2.0/ldso/dynlink.c
new file mode 100644
index 0000000000..afec985a3d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/ldso/dynlink.c
@@ -0,0 +1,2314 @@
+#define _GNU_SOURCE
+#define SYSCALL_NO_TLS 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <elf.h>
+#include <sys/mman.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <link.h>
+#include <setjmp.h>
+#include <pthread.h>
+#include <ctype.h>
+#include <dlfcn.h>
+#include <semaphore.h>
+#include <sys/membarrier.h>
+#include "pthread_impl.h"
+#include "libc.h"
+#include "dynlink.h"
+#include "malloc_impl.h"
+
+static void error(const char *, ...);
+
+#define MAXP2(a,b) (-(-(a)&-(b)))
+#define ALIGN(x,y) ((x)+(y)-1 & -(y))
+
+#define container_of(p,t,m) ((t*)((char *)(p)-offsetof(t,m)))
+#define countof(a) ((sizeof (a))/(sizeof (a)[0]))
+
+struct debug {
+	int ver;
+	void *head;
+	void (*bp)(void);
+	int state;
+	void *base;
+};
+
+struct td_index {
+	size_t args[2];
+	struct td_index *next;
+};
+
+struct dso {
+#if DL_FDPIC
+	struct fdpic_loadmap *loadmap;
+#else
+	unsigned char *base;
+#endif
+	char *name;
+	size_t *dynv;
+	struct dso *next, *prev;
+
+	Phdr *phdr;
+	int phnum;
+	size_t phentsize;
+	Sym *syms;
+	Elf_Symndx *hashtab;
+	uint32_t *ghashtab;
+	int16_t *versym;
+	char *strings;
+	struct dso *syms_next, *lazy_next;
+	size_t *lazy, lazy_cnt;
+	unsigned char *map;
+	size_t map_len;
+	dev_t dev;
+	ino_t ino;
+	char relocated;
+	char constructed;
+	char kernel_mapped;
+	char mark;
+	char bfs_built;
+	char runtime_loaded;
+	struct dso **deps, *needed_by;
+	size_t ndeps_direct;
+	size_t next_dep;
+	int ctor_visitor;
+	char *rpath_orig, *rpath;
+	struct tls_module tls;
+	size_t tls_id;
+	size_t relro_start, relro_end;
+	uintptr_t *new_dtv;
+	unsigned char *new_tls;
+	struct td_index *td_index;
+	struct dso *fini_next;
+	char *shortname;
+#if DL_FDPIC
+	unsigned char *base;
+#else
+	struct fdpic_loadmap *loadmap;
+#endif
+	struct funcdesc {
+		void *addr;
+		size_t *got;
+	} *funcdescs;
+	size_t *got;
+	char buf[];
+};
+
+struct symdef {
+	Sym *sym;
+	struct dso *dso;
+};
+
+typedef void (*stage3_func)(size_t *, size_t *);
+
+static struct builtin_tls {
+	char c;
+	struct pthread pt;
+	void *space[16];
+} builtin_tls[1];
+#define MIN_TLS_ALIGN offsetof(struct builtin_tls, pt)
+
+#define ADDEND_LIMIT 4096
+static size_t *saved_addends, *apply_addends_to;
+
+static struct dso ldso;
+static struct dso *head, *tail, *fini_head, *syms_tail, *lazy_head;
+static char *env_path, *sys_path;
+static unsigned long long gencnt;
+static int runtime;
+static int ldd_mode;
+static int ldso_fail;
+static int noload;
+static int shutting_down;
+static jmp_buf *rtld_fail;
+static pthread_rwlock_t lock;
+static struct debug debug;
+static struct tls_module *tls_tail;
+static size_t tls_cnt, tls_offset, tls_align = MIN_TLS_ALIGN;
+static size_t static_tls_cnt;
+static pthread_mutex_t init_fini_lock;
+static pthread_cond_t ctor_cond;
+static struct dso *builtin_deps[2];
+static struct dso *const no_deps[1];
+static struct dso *builtin_ctor_queue[4];
+static struct dso **main_ctor_queue;
+static struct fdpic_loadmap *app_loadmap;
+static struct fdpic_dummy_loadmap app_dummy_loadmap;
+
+struct debug *_dl_debug_addr = &debug;
+
+extern hidden int __malloc_replaced;
+
+hidden void (*const __init_array_start)(void)=0, (*const __fini_array_start)(void)=0;
+
+extern hidden void (*const __init_array_end)(void), (*const __fini_array_end)(void);
+
+weak_alias(__init_array_start, __init_array_end);
+weak_alias(__fini_array_start, __fini_array_end);
+
+static int dl_strcmp(const char *l, const char *r)
+{
+	for (; *l==*r && *l; l++, r++);
+	return *(unsigned char *)l - *(unsigned char *)r;
+}
+#define strcmp(l,r) dl_strcmp(l,r)
+
+/* Compute load address for a virtual address in a given dso. */
+#if DL_FDPIC
+static void *laddr(const struct dso *p, size_t v)
+{
+	size_t j=0;
+	if (!p->loadmap) return p->base + v;
+	for (j=0; v-p->loadmap->segs[j].p_vaddr >= p->loadmap->segs[j].p_memsz; j++);
+	return (void *)(v - p->loadmap->segs[j].p_vaddr + p->loadmap->segs[j].addr);
+}
+static void *laddr_pg(const struct dso *p, size_t v)
+{
+	size_t j=0;
+	size_t pgsz = PAGE_SIZE;
+	if (!p->loadmap) return p->base + v;
+	for (j=0; ; j++) {
+		size_t a = p->loadmap->segs[j].p_vaddr;
+		size_t b = a + p->loadmap->segs[j].p_memsz;
+		a &= -pgsz;
+		b += pgsz-1;
+		b &= -pgsz;
+		if (v-a<b-a) break;
+	}
+	return (void *)(v - p->loadmap->segs[j].p_vaddr + p->loadmap->segs[j].addr);
+}
+static void (*fdbarrier(void *p))()
+{
+	void (*fd)();
+	__asm__("" : "=r"(fd) : "0"(p));
+	return fd;
+}
+#define fpaddr(p, v) fdbarrier((&(struct funcdesc){ \
+	laddr(p, v), (p)->got }))
+#else
+#define laddr(p, v) (void *)((p)->base + (v))
+#define laddr_pg(p, v) laddr(p, v)
+#define fpaddr(p, v) ((void (*)())laddr(p, v))
+#endif
+
+static void decode_vec(size_t *v, size_t *a, size_t cnt)
+{
+	size_t i;
+	for (i=0; i<cnt; i++) a[i] = 0;
+	for (; v[0]; v+=2) if (v[0]-1<cnt-1) {
+		a[0] |= 1UL<<v[0];
+		a[v[0]] = v[1];
+	}
+}
+
+static int search_vec(size_t *v, size_t *r, size_t key)
+{
+	for (; v[0]!=key; v+=2)
+		if (!v[0]) return 0;
+	*r = v[1];
+	return 1;
+}
+
+static uint32_t sysv_hash(const char *s0)
+{
+	const unsigned char *s = (void *)s0;
+	uint_fast32_t h = 0;
+	while (*s) {
+		h = 16*h + *s++;
+		h ^= h>>24 & 0xf0;
+	}
+	return h & 0xfffffff;
+}
+
+static uint32_t gnu_hash(const char *s0)
+{
+	const unsigned char *s = (void *)s0;
+	uint_fast32_t h = 5381;
+	for (; *s; s++)
+		h += h*32 + *s;
+	return h;
+}
+
+static Sym *sysv_lookup(const char *s, uint32_t h, struct dso *dso)
+{
+	size_t i;
+	Sym *syms = dso->syms;
+	Elf_Symndx *hashtab = dso->hashtab;
+	char *strings = dso->strings;
+	for (i=hashtab[2+h%hashtab[0]]; i; i=hashtab[2+hashtab[0]+i]) {
+		if ((!dso->versym || dso->versym[i] >= 0)
+		    && (!strcmp(s, strings+syms[i].st_name)))
+			return syms+i;
+	}
+	return 0;
+}
+
+static Sym *gnu_lookup(uint32_t h1, uint32_t *hashtab, struct dso *dso, const char *s)
+{
+	uint32_t nbuckets = hashtab[0];
+	uint32_t *buckets = hashtab + 4 + hashtab[2]*(sizeof(size_t)/4);
+	uint32_t i = buckets[h1 % nbuckets];
+
+	if (!i) return 0;
+
+	uint32_t *hashval = buckets + nbuckets + (i - hashtab[1]);
+
+	for (h1 |= 1; ; i++) {
+		uint32_t h2 = *hashval++;
+		if ((h1 == (h2|1)) && (!dso->versym || dso->versym[i] >= 0)
+		    && !strcmp(s, dso->strings + dso->syms[i].st_name))
+			return dso->syms+i;
+		if (h2 & 1) break;
+	}
+
+	return 0;
+}
+
+static Sym *gnu_lookup_filtered(uint32_t h1, uint32_t *hashtab, struct dso *dso, const char *s, uint32_t fofs, size_t fmask)
+{
+	const size_t *bloomwords = (const void *)(hashtab+4);
+	size_t f = bloomwords[fofs & (hashtab[2]-1)];
+	if (!(f & fmask)) return 0;
+
+	f >>= (h1 >> hashtab[3]) % (8 * sizeof f);
+	if (!(f & 1)) return 0;
+
+	return gnu_lookup(h1, hashtab, dso, s);
+}
+
+#define OK_TYPES (1<<STT_NOTYPE | 1<<STT_OBJECT | 1<<STT_FUNC | 1<<STT_COMMON | 1<<STT_TLS)
+#define OK_BINDS (1<<STB_GLOBAL | 1<<STB_WEAK | 1<<STB_GNU_UNIQUE)
+
+#ifndef ARCH_SYM_REJECT_UND
+#define ARCH_SYM_REJECT_UND(s) 0
+#endif
+
+#if defined(__GNUC__)
+__attribute__((always_inline))
+#endif
+static inline struct symdef find_sym2(struct dso *dso, const char *s, int need_def, int use_deps)
+{
+	uint32_t h = 0, gh = gnu_hash(s), gho = gh / (8*sizeof(size_t)), *ght;
+	size_t ghm = 1ul << gh % (8*sizeof(size_t));
+	struct symdef def = {0};
+	struct dso **deps = use_deps ? dso->deps : 0;
+	for (; dso; dso=use_deps ? *deps++ : dso->syms_next) {
+		Sym *sym;
+		if ((ght = dso->ghashtab)) {
+			sym = gnu_lookup_filtered(gh, ght, dso, s, gho, ghm);
+		} else {
+			if (!h) h = sysv_hash(s);
+			sym = sysv_lookup(s, h, dso);
+		}
+		if (!sym) continue;
+		if (!sym->st_shndx)
+			if (need_def || (sym->st_info&0xf) == STT_TLS
+			    || ARCH_SYM_REJECT_UND(sym))
+				continue;
+		if (!sym->st_value)
+			if ((sym->st_info&0xf) != STT_TLS)
+				continue;
+		if (!(1<<(sym->st_info&0xf) & OK_TYPES)) continue;
+		if (!(1<<(sym->st_info>>4) & OK_BINDS)) continue;
+		def.sym = sym;
+		def.dso = dso;
+		break;
+	}
+	return def;
+}
+
+static struct symdef find_sym(struct dso *dso, const char *s, int need_def)
+{
+	return find_sym2(dso, s, need_def, 0);
+}
+
+static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stride)
+{
+	unsigned char *base = dso->base;
+	Sym *syms = dso->syms;
+	char *strings = dso->strings;
+	Sym *sym;
+	const char *name;
+	void *ctx;
+	int type;
+	int sym_index;
+	struct symdef def;
+	size_t *reloc_addr;
+	size_t sym_val;
+	size_t tls_val;
+	size_t addend;
+	int skip_relative = 0, reuse_addends = 0, save_slot = 0;
+
+	if (dso == &ldso) {
+		/* Only ldso's REL table needs addend saving/reuse. */
+		if (rel == apply_addends_to)
+			reuse_addends = 1;
+		skip_relative = 1;
+	}
+
+	for (; rel_size; rel+=stride, rel_size-=stride*sizeof(size_t)) {
+		if (skip_relative && IS_RELATIVE(rel[1], dso->syms)) continue;
+		type = R_TYPE(rel[1]);
+		if (type == REL_NONE) continue;
+		reloc_addr = laddr(dso, rel[0]);
+
+		if (stride > 2) {
+			addend = rel[2];
+		} else if (type==REL_GOT || type==REL_PLT|| type==REL_COPY) {
+			addend = 0;
+		} else if (reuse_addends) {
+			/* Save original addend in stage 2 where the dso
+			 * chain consists of just ldso; otherwise read back
+			 * saved addend since the inline one was clobbered. */
+			if (head==&ldso)
+				saved_addends[save_slot] = *reloc_addr;
+			addend = saved_addends[save_slot++];
+		} else {
+			addend = *reloc_addr;
+		}
+
+		sym_index = R_SYM(rel[1]);
+		if (sym_index) {
+			sym = syms + sym_index;
+			name = strings + sym->st_name;
+			ctx = type==REL_COPY ? head->syms_next : head;
+			def = (sym->st_info>>4) == STB_LOCAL
+				? (struct symdef){ .dso = dso, .sym = sym }
+				: find_sym(ctx, name, type==REL_PLT);
+			if (!def.sym && (sym->st_shndx != SHN_UNDEF
+			    || sym->st_info>>4 != STB_WEAK)) {
+				if (dso->lazy && (type==REL_PLT || type==REL_GOT)) {
+					dso->lazy[3*dso->lazy_cnt+0] = rel[0];
+					dso->lazy[3*dso->lazy_cnt+1] = rel[1];
+					dso->lazy[3*dso->lazy_cnt+2] = addend;
+					dso->lazy_cnt++;
+					continue;
+				}
+				error("Error relocating %s: %s: symbol not found",
+					dso->name, name);
+				if (runtime) longjmp(*rtld_fail, 1);
+				continue;
+			}
+		} else {
+			sym = 0;
+			def.sym = 0;
+			def.dso = dso;
+		}
+
+		sym_val = def.sym ? (size_t)laddr(def.dso, def.sym->st_value) : 0;
+		tls_val = def.sym ? def.sym->st_value : 0;
+
+		if ((type == REL_TPOFF || type == REL_TPOFF_NEG)
+		    && def.dso->tls_id > static_tls_cnt) {
+			error("Error relocating %s: %s: initial-exec TLS "
+				"resolves to dynamic definition in %s",
+				dso->name, name, def.dso->name);
+			longjmp(*rtld_fail, 1);
+		}
+
+		switch(type) {
+		case REL_NONE:
+			break;
+		case REL_OFFSET:
+			addend -= (size_t)reloc_addr;
+		case REL_SYMBOLIC:
+		case REL_GOT:
+		case REL_PLT:
+			*reloc_addr = sym_val + addend;
+			break;
+		case REL_USYMBOLIC:
+			memcpy(reloc_addr, &(size_t){sym_val + addend}, sizeof(size_t));
+			break;
+		case REL_RELATIVE:
+			*reloc_addr = (size_t)base + addend;
+			break;
+		case REL_SYM_OR_REL:
+			if (sym) *reloc_addr = sym_val + addend;
+			else *reloc_addr = (size_t)base + addend;
+			break;
+		case REL_COPY:
+			memcpy(reloc_addr, (void *)sym_val, sym->st_size);
+			break;
+		case REL_OFFSET32:
+			*(uint32_t *)reloc_addr = sym_val + addend
+				- (size_t)reloc_addr;
+			break;
+		case REL_FUNCDESC:
+			*reloc_addr = def.sym ? (size_t)(def.dso->funcdescs
+				+ (def.sym - def.dso->syms)) : 0;
+			break;
+		case REL_FUNCDESC_VAL:
+			if ((sym->st_info&0xf) == STT_SECTION) *reloc_addr += sym_val;
+			else *reloc_addr = sym_val;
+			reloc_addr[1] = def.sym ? (size_t)def.dso->got : 0;
+			break;
+		case REL_DTPMOD:
+			*reloc_addr = def.dso->tls_id;
+			break;
+		case REL_DTPOFF:
+			*reloc_addr = tls_val + addend - DTP_OFFSET;
+			break;
+#ifdef TLS_ABOVE_TP
+		case REL_TPOFF:
+			*reloc_addr = tls_val + def.dso->tls.offset + TPOFF_K + addend;
+			break;
+#else
+		case REL_TPOFF:
+			*reloc_addr = tls_val - def.dso->tls.offset + addend;
+			break;
+		case REL_TPOFF_NEG:
+			*reloc_addr = def.dso->tls.offset - tls_val + addend;
+			break;
+#endif
+		case REL_TLSDESC:
+			if (stride<3) addend = reloc_addr[1];
+			if (def.dso->tls_id > static_tls_cnt) {
+				struct td_index *new = malloc(sizeof *new);
+				if (!new) {
+					error(
+					"Error relocating %s: cannot allocate TLSDESC for %s",
+					dso->name, sym ? name : "(local)" );
+					longjmp(*rtld_fail, 1);
+				}
+				new->next = dso->td_index;
+				dso->td_index = new;
+				new->args[0] = def.dso->tls_id;
+				new->args[1] = tls_val + addend - DTP_OFFSET;
+				reloc_addr[0] = (size_t)__tlsdesc_dynamic;
+				reloc_addr[1] = (size_t)new;
+			} else {
+				reloc_addr[0] = (size_t)__tlsdesc_static;
+#ifdef TLS_ABOVE_TP
+				reloc_addr[1] = tls_val + def.dso->tls.offset
+					+ TPOFF_K + addend;
+#else
+				reloc_addr[1] = tls_val - def.dso->tls.offset
+					+ addend;
+#endif
+			}
+#ifdef TLSDESC_BACKWARDS
+			/* Some archs (32-bit ARM at least) invert the order of
+			 * the descriptor members. Fix them up here. */
+			size_t tmp = reloc_addr[0];
+			reloc_addr[0] = reloc_addr[1];
+			reloc_addr[1] = tmp;
+#endif
+			break;
+		default:
+			error("Error relocating %s: unsupported relocation type %d",
+				dso->name, type);
+			if (runtime) longjmp(*rtld_fail, 1);
+			continue;
+		}
+	}
+}
+
+static void redo_lazy_relocs()
+{
+	struct dso *p = lazy_head, *next;
+	lazy_head = 0;
+	for (; p; p=next) {
+		next = p->lazy_next;
+		size_t size = p->lazy_cnt*3*sizeof(size_t);
+		p->lazy_cnt = 0;
+		do_relocs(p, p->lazy, size, 3);
+		if (p->lazy_cnt) {
+			p->lazy_next = lazy_head;
+			lazy_head = p;
+		} else {
+			free(p->lazy);
+			p->lazy = 0;
+			p->lazy_next = 0;
+		}
+	}
+}
+
+/* A huge hack: to make up for the wastefulness of shared libraries
+ * needing at least a page of dirty memory even if they have no global
+ * data, we reclaim the gaps at the beginning and end of writable maps
+ * and "donate" them to the heap. */
+
+static void reclaim(struct dso *dso, size_t start, size_t end)
+{
+	if (start >= dso->relro_start && start < dso->relro_end) start = dso->relro_end;
+	if (end   >= dso->relro_start && end   < dso->relro_end) end = dso->relro_start;
+	if (start >= end) return;
+	char *base = laddr_pg(dso, start);
+	__malloc_donate(base, base+(end-start));
+}
+
+static void reclaim_gaps(struct dso *dso)
+{
+	Phdr *ph = dso->phdr;
+	size_t phcnt = dso->phnum;
+
+	for (; phcnt--; ph=(void *)((char *)ph+dso->phentsize)) {
+		if (ph->p_type!=PT_LOAD) continue;
+		if ((ph->p_flags&(PF_R|PF_W))!=(PF_R|PF_W)) continue;
+		reclaim(dso, ph->p_vaddr & -PAGE_SIZE, ph->p_vaddr);
+		reclaim(dso, ph->p_vaddr+ph->p_memsz,
+			ph->p_vaddr+ph->p_memsz+PAGE_SIZE-1 & -PAGE_SIZE);
+	}
+}
+
+static void *mmap_fixed(void *p, size_t n, int prot, int flags, int fd, off_t off)
+{
+	static int no_map_fixed;
+	char *q;
+	if (!no_map_fixed) {
+		q = mmap(p, n, prot, flags|MAP_FIXED, fd, off);
+		if (!DL_NOMMU_SUPPORT || q != MAP_FAILED || errno != EINVAL)
+			return q;
+		no_map_fixed = 1;
+	}
+	/* Fallbacks for MAP_FIXED failure on NOMMU kernels. */
+	if (flags & MAP_ANONYMOUS) {
+		memset(p, 0, n);
+		return p;
+	}
+	ssize_t r;
+	if (lseek(fd, off, SEEK_SET) < 0) return MAP_FAILED;
+	for (q=p; n; q+=r, off+=r, n-=r) {
+		r = read(fd, q, n);
+		if (r < 0 && errno != EINTR) return MAP_FAILED;
+		if (!r) {
+			memset(q, 0, n);
+			break;
+		}
+	}
+	return p;
+}
+
+static void unmap_library(struct dso *dso)
+{
+	if (dso->loadmap) {
+		size_t i;
+		for (i=0; i<dso->loadmap->nsegs; i++) {
+			if (!dso->loadmap->segs[i].p_memsz)
+				continue;
+			munmap((void *)dso->loadmap->segs[i].addr,
+				dso->loadmap->segs[i].p_memsz);
+		}
+		free(dso->loadmap);
+	} else if (dso->map && dso->map_len) {
+		munmap(dso->map, dso->map_len);
+	}
+}
+
+static void *map_library(int fd, struct dso *dso)
+{
+	Ehdr buf[(896+sizeof(Ehdr))/sizeof(Ehdr)];
+	void *allocated_buf=0;
+	size_t phsize;
+	size_t addr_min=SIZE_MAX, addr_max=0, map_len;
+	size_t this_min, this_max;
+	size_t nsegs = 0;
+	off_t off_start;
+	Ehdr *eh;
+	Phdr *ph, *ph0;
+	unsigned prot;
+	unsigned char *map=MAP_FAILED, *base;
+	size_t dyn=0;
+	size_t tls_image=0;
+	size_t i;
+
+	ssize_t l = read(fd, buf, sizeof buf);
+	eh = buf;
+	if (l<0) return 0;
+	if (l<sizeof *eh || (eh->e_type != ET_DYN && eh->e_type != ET_EXEC))
+		goto noexec;
+	phsize = eh->e_phentsize * eh->e_phnum;
+	if (phsize > sizeof buf - sizeof *eh) {
+		allocated_buf = malloc(phsize);
+		if (!allocated_buf) return 0;
+		l = pread(fd, allocated_buf, phsize, eh->e_phoff);
+		if (l < 0) goto error;
+		if (l != phsize) goto noexec;
+		ph = ph0 = allocated_buf;
+	} else if (eh->e_phoff + phsize > l) {
+		l = pread(fd, buf+1, phsize, eh->e_phoff);
+		if (l < 0) goto error;
+		if (l != phsize) goto noexec;
+		ph = ph0 = (void *)(buf + 1);
+	} else {
+		ph = ph0 = (void *)((char *)buf + eh->e_phoff);
+	}
+	for (i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
+		if (ph->p_type == PT_DYNAMIC) {
+			dyn = ph->p_vaddr;
+		} else if (ph->p_type == PT_TLS) {
+			tls_image = ph->p_vaddr;
+			dso->tls.align = ph->p_align;
+			dso->tls.len = ph->p_filesz;
+			dso->tls.size = ph->p_memsz;
+		} else if (ph->p_type == PT_GNU_RELRO) {
+			dso->relro_start = ph->p_vaddr & -PAGE_SIZE;
+			dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
+		} else if (ph->p_type == PT_GNU_STACK) {
+			if (!runtime && ph->p_memsz > __default_stacksize) {
+				__default_stacksize =
+					ph->p_memsz < DEFAULT_STACK_MAX ?
+					ph->p_memsz : DEFAULT_STACK_MAX;
+			}
+		}
+		if (ph->p_type != PT_LOAD) continue;
+		nsegs++;
+		if (ph->p_vaddr < addr_min) {
+			addr_min = ph->p_vaddr;
+			off_start = ph->p_offset;
+			prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) |
+				((ph->p_flags&PF_W) ? PROT_WRITE: 0) |
+				((ph->p_flags&PF_X) ? PROT_EXEC : 0));
+		}
+		if (ph->p_vaddr+ph->p_memsz > addr_max) {
+			addr_max = ph->p_vaddr+ph->p_memsz;
+		}
+	}
+	if (!dyn) goto noexec;
+	if (DL_FDPIC && !(eh->e_flags & FDPIC_CONSTDISP_FLAG)) {
+		dso->loadmap = calloc(1, sizeof *dso->loadmap
+			+ nsegs * sizeof *dso->loadmap->segs);
+		if (!dso->loadmap) goto error;
+		dso->loadmap->nsegs = nsegs;
+		for (ph=ph0, i=0; i<nsegs; ph=(void *)((char *)ph+eh->e_phentsize)) {
+			if (ph->p_type != PT_LOAD) continue;
+			prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) |
+				((ph->p_flags&PF_W) ? PROT_WRITE: 0) |
+				((ph->p_flags&PF_X) ? PROT_EXEC : 0));
+			map = mmap(0, ph->p_memsz + (ph->p_vaddr & PAGE_SIZE-1),
+				prot, MAP_PRIVATE,
+				fd, ph->p_offset & -PAGE_SIZE);
+			if (map == MAP_FAILED) {
+				unmap_library(dso);
+				goto error;
+			}
+			dso->loadmap->segs[i].addr = (size_t)map +
+				(ph->p_vaddr & PAGE_SIZE-1);
+			dso->loadmap->segs[i].p_vaddr = ph->p_vaddr;
+			dso->loadmap->segs[i].p_memsz = ph->p_memsz;
+			i++;
+			if (prot & PROT_WRITE) {
+				size_t brk = (ph->p_vaddr & PAGE_SIZE-1)
+					+ ph->p_filesz;
+				size_t pgbrk = brk + PAGE_SIZE-1 & -PAGE_SIZE;
+				size_t pgend = brk + ph->p_memsz - ph->p_filesz
+					+ PAGE_SIZE-1 & -PAGE_SIZE;
+				if (pgend > pgbrk && mmap_fixed(map+pgbrk,
+					pgend-pgbrk, prot,
+					MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS,
+					-1, off_start) == MAP_FAILED)
+					goto error;
+				memset(map + brk, 0, pgbrk-brk);
+			}
+		}
+		map = (void *)dso->loadmap->segs[0].addr;
+		map_len = 0;
+		goto done_mapping;
+	}
+	addr_max += PAGE_SIZE-1;
+	addr_max &= -PAGE_SIZE;
+	addr_min &= -PAGE_SIZE;
+	off_start &= -PAGE_SIZE;
+	map_len = addr_max - addr_min + off_start;
+	/* The first time, we map too much, possibly even more than
+	 * the length of the file. This is okay because we will not
+	 * use the invalid part; we just need to reserve the right
+	 * amount of virtual address space to map over later. */
+	map = DL_NOMMU_SUPPORT
+		? mmap((void *)addr_min, map_len, PROT_READ|PROT_WRITE|PROT_EXEC,
+			MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
+		: mmap((void *)addr_min, map_len, prot,
+			MAP_PRIVATE, fd, off_start);
+	if (map==MAP_FAILED) goto error;
+	dso->map = map;
+	dso->map_len = map_len;
+	/* If the loaded file is not relocatable and the requested address is
+	 * not available, then the load operation must fail. */
+	if (eh->e_type != ET_DYN && addr_min && map!=(void *)addr_min) {
+		errno = EBUSY;
+		goto error;
+	}
+	base = map - addr_min;
+	dso->phdr = 0;
+	dso->phnum = 0;
+	for (ph=ph0, i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
+		if (ph->p_type != PT_LOAD) continue;
+		/* Check if the programs headers are in this load segment, and
+		 * if so, record the address for use by dl_iterate_phdr. */
+		if (!dso->phdr && eh->e_phoff >= ph->p_offset
+		    && eh->e_phoff+phsize <= ph->p_offset+ph->p_filesz) {
+			dso->phdr = (void *)(base + ph->p_vaddr
+				+ (eh->e_phoff-ph->p_offset));
+			dso->phnum = eh->e_phnum;
+			dso->phentsize = eh->e_phentsize;
+		}
+		this_min = ph->p_vaddr & -PAGE_SIZE;
+		this_max = ph->p_vaddr+ph->p_memsz+PAGE_SIZE-1 & -PAGE_SIZE;
+		off_start = ph->p_offset & -PAGE_SIZE;
+		prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) |
+			((ph->p_flags&PF_W) ? PROT_WRITE: 0) |
+			((ph->p_flags&PF_X) ? PROT_EXEC : 0));
+		/* Reuse the existing mapping for the lowest-address LOAD */
+		if ((ph->p_vaddr & -PAGE_SIZE) != addr_min || DL_NOMMU_SUPPORT)
+			if (mmap_fixed(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED)
+				goto error;
+		if (ph->p_memsz > ph->p_filesz && (ph->p_flags&PF_W)) {
+			size_t brk = (size_t)base+ph->p_vaddr+ph->p_filesz;
+			size_t pgbrk = brk+PAGE_SIZE-1 & -PAGE_SIZE;
+			memset((void *)brk, 0, pgbrk-brk & PAGE_SIZE-1);
+			if (pgbrk-(size_t)base < this_max && mmap_fixed((void *)pgbrk, (size_t)base+this_max-pgbrk, prot, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) == MAP_FAILED)
+				goto error;
+		}
+	}
+	for (i=0; ((size_t *)(base+dyn))[i]; i+=2)
+		if (((size_t *)(base+dyn))[i]==DT_TEXTREL) {
+			if (mprotect(map, map_len, PROT_READ|PROT_WRITE|PROT_EXEC)
+			    && errno != ENOSYS)
+				goto error;
+			break;
+		}
+done_mapping:
+	dso->base = base;
+	dso->dynv = laddr(dso, dyn);
+	if (dso->tls.size) dso->tls.image = laddr(dso, tls_image);
+	free(allocated_buf);
+	return map;
+noexec:
+	errno = ENOEXEC;
+error:
+	if (map!=MAP_FAILED) unmap_library(dso);
+	free(allocated_buf);
+	return 0;
+}
+
+static int path_open(const char *name, const char *s, char *buf, size_t buf_size)
+{
+	size_t l;
+	int fd;
+	for (;;) {
+		s += strspn(s, ":\n");
+		l = strcspn(s, ":\n");
+		if (l-1 >= INT_MAX) return -1;
+		if (snprintf(buf, buf_size, "%.*s/%s", (int)l, s, name) < buf_size) {
+			if ((fd = open(buf, O_RDONLY|O_CLOEXEC))>=0) return fd;
+			switch (errno) {
+			case ENOENT:
+			case ENOTDIR:
+			case EACCES:
+			case ENAMETOOLONG:
+				break;
+			default:
+				/* Any negative value but -1 will inhibit
+				 * futher path search. */
+				return -2;
+			}
+		}
+		s += l;
+	}
+}
+
+static int fixup_rpath(struct dso *p, char *buf, size_t buf_size)
+{
+	size_t n, l;
+	const char *s, *t, *origin;
+	char *d;
+	if (p->rpath || !p->rpath_orig) return 0;
+	if (!strchr(p->rpath_orig, '$')) {
+		p->rpath = p->rpath_orig;
+		return 0;
+	}
+	n = 0;
+	s = p->rpath_orig;
+	while ((t=strchr(s, '$'))) {
+		if (strncmp(t, "$ORIGIN", 7) && strncmp(t, "${ORIGIN}", 9))
+			return 0;
+		s = t+1;
+		n++;
+	}
+	if (n > SSIZE_MAX/PATH_MAX) return 0;
+
+	if (p->kernel_mapped) {
+		/* $ORIGIN searches cannot be performed for the main program
+		 * when it is suid/sgid/AT_SECURE. This is because the
+		 * pathname is under the control of the caller of execve.
+		 * For libraries, however, $ORIGIN can be processed safely
+		 * since the library's pathname came from a trusted source
+		 * (either system paths or a call to dlopen). */
+		if (libc.secure)
+			return 0;
+		l = readlink("/proc/self/exe", buf, buf_size);
+		if (l == -1) switch (errno) {
+		case ENOENT:
+		case ENOTDIR:
+		case EACCES:
+			break;
+		default:
+			return -1;
+		}
+		if (l >= buf_size)
+			return 0;
+		buf[l] = 0;
+		origin = buf;
+	} else {
+		origin = p->name;
+	}
+	t = strrchr(origin, '/');
+	if (t) {
+		l = t-origin;
+	} else {
+		/* Normally p->name will always be an absolute or relative
+		 * pathname containing at least one '/' character, but in the
+		 * case where ldso was invoked as a command to execute a
+		 * program in the working directory, app.name may not. Fix. */
+		origin = ".";
+		l = 1;
+	}
+	/* Disallow non-absolute origins for suid/sgid/AT_SECURE. */
+	if (libc.secure && *origin != '/')
+		return 0;
+	p->rpath = malloc(strlen(p->rpath_orig) + n*l + 1);
+	if (!p->rpath) return -1;
+
+	d = p->rpath;
+	s = p->rpath_orig;
+	while ((t=strchr(s, '$'))) {
+		memcpy(d, s, t-s);
+		d += t-s;
+		memcpy(d, origin, l);
+		d += l;
+		/* It was determined previously that the '$' is followed
+		 * either by "ORIGIN" or "{ORIGIN}". */
+		s = t + 7 + 2*(t[1]=='{');
+	}
+	strcpy(d, s);
+	return 0;
+}
+
+static void decode_dyn(struct dso *p)
+{
+	size_t dyn[DYN_CNT];
+	decode_vec(p->dynv, dyn, DYN_CNT);
+	p->syms = laddr(p, dyn[DT_SYMTAB]);
+	p->strings = laddr(p, dyn[DT_STRTAB]);
+	if (dyn[0]&(1<<DT_HASH))
+		p->hashtab = laddr(p, dyn[DT_HASH]);
+	if (dyn[0]&(1<<DT_RPATH))
+		p->rpath_orig = p->strings + dyn[DT_RPATH];
+	if (dyn[0]&(1<<DT_RUNPATH))
+		p->rpath_orig = p->strings + dyn[DT_RUNPATH];
+	if (dyn[0]&(1<<DT_PLTGOT))
+		p->got = laddr(p, dyn[DT_PLTGOT]);
+	if (search_vec(p->dynv, dyn, DT_GNU_HASH))
+		p->ghashtab = laddr(p, *dyn);
+	if (search_vec(p->dynv, dyn, DT_VERSYM))
+		p->versym = laddr(p, *dyn);
+}
+
+static size_t count_syms(struct dso *p)
+{
+	if (p->hashtab) return p->hashtab[1];
+
+	size_t nsym, i;
+	uint32_t *buckets = p->ghashtab + 4 + (p->ghashtab[2]*sizeof(size_t)/4);
+	uint32_t *hashval;
+	for (i = nsym = 0; i < p->ghashtab[0]; i++) {
+		if (buckets[i] > nsym)
+			nsym = buckets[i];
+	}
+	if (nsym) {
+		hashval = buckets + p->ghashtab[0] + (nsym - p->ghashtab[1]);
+		do nsym++;
+		while (!(*hashval++ & 1));
+	}
+	return nsym;
+}
+
+static void *dl_mmap(size_t n)
+{
+	void *p;
+	int prot = PROT_READ|PROT_WRITE, flags = MAP_ANONYMOUS|MAP_PRIVATE;
+#ifdef SYS_mmap2
+	p = (void *)__syscall(SYS_mmap2, 0, n, prot, flags, -1, 0);
+#else
+	p = (void *)__syscall(SYS_mmap, 0, n, prot, flags, -1, 0);
+#endif
+	return (unsigned long)p > -4096UL ? 0 : p;
+}
+
+static void makefuncdescs(struct dso *p)
+{
+	static int self_done;
+	size_t nsym = count_syms(p);
+	size_t i, size = nsym * sizeof(*p->funcdescs);
+
+	if (!self_done) {
+		p->funcdescs = dl_mmap(size);
+		self_done = 1;
+	} else {
+		p->funcdescs = malloc(size);
+	}
+	if (!p->funcdescs) {
+		if (!runtime) a_crash();
+		error("Error allocating function descriptors for %s", p->name);
+		longjmp(*rtld_fail, 1);
+	}
+	for (i=0; i<nsym; i++) {
+		if ((p->syms[i].st_info&0xf)==STT_FUNC && p->syms[i].st_shndx) {
+			p->funcdescs[i].addr = laddr(p, p->syms[i].st_value);
+			p->funcdescs[i].got = p->got;
+		} else {
+			p->funcdescs[i].addr = 0;
+			p->funcdescs[i].got = 0;
+		}
+	}
+}
+
+static struct dso *load_library(const char *name, struct dso *needed_by)
+{
+	char buf[2*NAME_MAX+2];
+	const char *pathname;
+	unsigned char *map;
+	struct dso *p, temp_dso = {0};
+	int fd;
+	struct stat st;
+	size_t alloc_size;
+	int n_th = 0;
+	int is_self = 0;
+
+	if (!*name) {
+		errno = EINVAL;
+		return 0;
+	}
+
+	/* Catch and block attempts to reload the implementation itself */
+	if (name[0]=='l' && name[1]=='i' && name[2]=='b') {
+		static const char reserved[] =
+			"c.pthread.rt.m.dl.util.xnet.";
+		const char *rp, *next;
+		for (rp=reserved; *rp; rp=next) {
+			next = strchr(rp, '.') + 1;
+			if (strncmp(name+3, rp, next-rp) == 0)
+				break;
+		}
+		if (*rp) {
+			if (ldd_mode) {
+				/* Track which names have been resolved
+				 * and only report each one once. */
+				static unsigned reported;
+				unsigned mask = 1U<<(rp-reserved);
+				if (!(reported & mask)) {
+					reported |= mask;
+					dprintf(1, "\t%s => %s (%p)\n",
+						name, ldso.name,
+						ldso.base);
+				}
+			}
+			is_self = 1;
+		}
+	}
+	if (!strcmp(name, ldso.name)) is_self = 1;
+	if (is_self) {
+		if (!ldso.prev) {
+			tail->next = &ldso;
+			ldso.prev = tail;
+			tail = &ldso;
+		}
+		return &ldso;
+	}
+	if (strchr(name, '/')) {
+		pathname = name;
+		fd = open(name, O_RDONLY|O_CLOEXEC);
+	} else {
+		/* Search for the name to see if it's already loaded */
+		for (p=head->next; p; p=p->next) {
+			if (p->shortname && !strcmp(p->shortname, name)) {
+				return p;
+			}
+		}
+		if (strlen(name) > NAME_MAX) return 0;
+		fd = -1;
+		if (env_path) fd = path_open(name, env_path, buf, sizeof buf);
+		for (p=needed_by; fd == -1 && p; p=p->needed_by) {
+			if (fixup_rpath(p, buf, sizeof buf) < 0)
+				fd = -2; /* Inhibit further search. */
+			if (p->rpath)
+				fd = path_open(name, p->rpath, buf, sizeof buf);
+		}
+		if (fd == -1) {
+			if (!sys_path) {
+				char *prefix = 0;
+				size_t prefix_len;
+				if (ldso.name[0]=='/') {
+					char *s, *t, *z;
+					for (s=t=z=ldso.name; *s; s++)
+						if (*s=='/') z=t, t=s;
+					prefix_len = z-ldso.name;
+					if (prefix_len < PATH_MAX)
+						prefix = ldso.name;
+				}
+				if (!prefix) {
+					prefix = "";
+					prefix_len = 0;
+				}
+				char etc_ldso_path[prefix_len + 1
+					+ sizeof "/etc/ld-musl-" LDSO_ARCH ".path"];
+				snprintf(etc_ldso_path, sizeof etc_ldso_path,
+					"%.*s/etc/ld-musl-" LDSO_ARCH ".path",
+					(int)prefix_len, prefix);
+				FILE *f = fopen(etc_ldso_path, "rbe");
+				if (f) {
+					if (getdelim(&sys_path, (size_t[1]){0}, 0, f) <= 0) {
+						free(sys_path);
+						sys_path = "";
+					}
+					fclose(f);
+				} else if (errno != ENOENT) {
+					sys_path = "";
+				}
+			}
+			if (!sys_path) sys_path = "/lib:/usr/local/lib:/usr/lib";
+			fd = path_open(name, sys_path, buf, sizeof buf);
+		}
+		pathname = buf;
+	}
+	if (fd < 0) return 0;
+	if (fstat(fd, &st) < 0) {
+		close(fd);
+		return 0;
+	}
+	for (p=head->next; p; p=p->next) {
+		if (p->dev == st.st_dev && p->ino == st.st_ino) {
+			/* If this library was previously loaded with a
+			 * pathname but a search found the same inode,
+			 * setup its shortname so it can be found by name. */
+			if (!p->shortname && pathname != name)
+				p->shortname = strrchr(p->name, '/')+1;
+			close(fd);
+			return p;
+		}
+	}
+	map = noload ? 0 : map_library(fd, &temp_dso);
+	close(fd);
+	if (!map) return 0;
+
+	/* Avoid the danger of getting two versions of libc mapped into the
+	 * same process when an absolute pathname was used. The symbols
+	 * checked are chosen to catch both musl and glibc, and to avoid
+	 * false positives from interposition-hack libraries. */
+	decode_dyn(&temp_dso);
+	if (find_sym(&temp_dso, "__libc_start_main", 1).sym &&
+	    find_sym(&temp_dso, "stdin", 1).sym) {
+		unmap_library(&temp_dso);
+		return load_library("libc.so", needed_by);
+	}
+	/* Past this point, if we haven't reached runtime yet, ldso has
+	 * committed either to use the mapped library or to abort execution.
+	 * Unmapping is not possible, so we can safely reclaim gaps. */
+	if (!runtime) reclaim_gaps(&temp_dso);
+
+	/* Allocate storage for the new DSO. When there is TLS, this
+	 * storage must include a reservation for all pre-existing
+	 * threads to obtain copies of both the new TLS, and an
+	 * extended DTV capable of storing an additional slot for
+	 * the newly-loaded DSO. */
+	alloc_size = sizeof *p + strlen(pathname) + 1;
+	if (runtime && temp_dso.tls.image) {
+		size_t per_th = temp_dso.tls.size + temp_dso.tls.align
+			+ sizeof(void *) * (tls_cnt+3);
+		n_th = libc.threads_minus_1 + 1;
+		if (n_th > SSIZE_MAX / per_th) alloc_size = SIZE_MAX;
+		else alloc_size += n_th * per_th;
+	}
+	p = calloc(1, alloc_size);
+	if (!p) {
+		unmap_library(&temp_dso);
+		return 0;
+	}
+	memcpy(p, &temp_dso, sizeof temp_dso);
+	p->dev = st.st_dev;
+	p->ino = st.st_ino;
+	p->needed_by = needed_by;
+	p->name = p->buf;
+	p->runtime_loaded = runtime;
+	strcpy(p->name, pathname);
+	/* Add a shortname only if name arg was not an explicit pathname. */
+	if (pathname != name) p->shortname = strrchr(p->name, '/')+1;
+	if (p->tls.image) {
+		p->tls_id = ++tls_cnt;
+		tls_align = MAXP2(tls_align, p->tls.align);
+#ifdef TLS_ABOVE_TP
+		p->tls.offset = tls_offset + ( (p->tls.align-1) &
+			(-tls_offset + (uintptr_t)p->tls.image) );
+		tls_offset = p->tls.offset + p->tls.size;
+#else
+		tls_offset += p->tls.size + p->tls.align - 1;
+		tls_offset -= (tls_offset + (uintptr_t)p->tls.image)
+			& (p->tls.align-1);
+		p->tls.offset = tls_offset;
+#endif
+		p->new_dtv = (void *)(-sizeof(size_t) &
+			(uintptr_t)(p->name+strlen(p->name)+sizeof(size_t)));
+		p->new_tls = (void *)(p->new_dtv + n_th*(tls_cnt+1));
+		if (tls_tail) tls_tail->next = &p->tls;
+		else libc.tls_head = &p->tls;
+		tls_tail = &p->tls;
+	}
+
+	tail->next = p;
+	p->prev = tail;
+	tail = p;
+
+	if (DL_FDPIC) makefuncdescs(p);
+
+	if (ldd_mode) dprintf(1, "\t%s => %s (%p)\n", name, pathname, p->base);
+
+	return p;
+}
+
+static void load_direct_deps(struct dso *p)
+{
+	size_t i, cnt=0;
+
+	if (p->deps) return;
+	/* For head, all preloads are direct pseudo-dependencies.
+	 * Count and include them now to avoid realloc later. */
+	if (p==head) for (struct dso *q=p->next; q; q=q->next)
+		cnt++;
+	for (i=0; p->dynv[i]; i+=2)
+		if (p->dynv[i] == DT_NEEDED) cnt++;
+	/* Use builtin buffer for apps with no external deps, to
+	 * preserve property of no runtime failure paths. */
+	p->deps = (p==head && cnt<2) ? builtin_deps :
+		calloc(cnt+1, sizeof *p->deps);
+	if (!p->deps) {
+		error("Error loading dependencies for %s", p->name);
+		if (runtime) longjmp(*rtld_fail, 1);
+	}
+	cnt=0;
+	if (p==head) for (struct dso *q=p->next; q; q=q->next)
+		p->deps[cnt++] = q;
+	for (i=0; p->dynv[i]; i+=2) {
+		if (p->dynv[i] != DT_NEEDED) continue;
+		struct dso *dep = load_library(p->strings + p->dynv[i+1], p);
+		if (!dep) {
+			error("Error loading shared library %s: %m (needed by %s)",
+				p->strings + p->dynv[i+1], p->name);
+			if (runtime) longjmp(*rtld_fail, 1);
+			continue;
+		}
+		p->deps[cnt++] = dep;
+	}
+	p->deps[cnt] = 0;
+	p->ndeps_direct = cnt;
+}
+
+static void load_deps(struct dso *p)
+{
+	if (p->deps) return;
+	for (; p; p=p->next)
+		load_direct_deps(p);
+}
+
+static void extend_bfs_deps(struct dso *p)
+{
+	size_t i, j, cnt, ndeps_all;
+	struct dso **tmp;
+
+	/* Can't use realloc if the original p->deps was allocated at
+	 * program entry and malloc has been replaced, or if it's
+	 * the builtin non-allocated trivial main program deps array. */
+	int no_realloc = (__malloc_replaced && !p->runtime_loaded)
+		|| p->deps == builtin_deps;
+
+	if (p->bfs_built) return;
+	ndeps_all = p->ndeps_direct;
+
+	/* Mark existing (direct) deps so they won't be duplicated. */
+	for (i=0; p->deps[i]; i++)
+		p->deps[i]->mark = 1;
+
+	/* For each dependency already in the list, copy its list of direct
+	 * dependencies to the list, excluding any items already in the
+	 * list. Note that the list this loop iterates over will grow during
+	 * the loop, but since duplicates are excluded, growth is bounded. */
+	for (i=0; p->deps[i]; i++) {
+		struct dso *dep = p->deps[i];
+		for (j=cnt=0; j<dep->ndeps_direct; j++)
+			if (!dep->deps[j]->mark) cnt++;
+		tmp = no_realloc ? 
+			malloc(sizeof(*tmp) * (ndeps_all+cnt+1)) :
+			realloc(p->deps, sizeof(*tmp) * (ndeps_all+cnt+1));
+		if (!tmp) {
+			error("Error recording dependencies for %s", p->name);
+			if (runtime) longjmp(*rtld_fail, 1);
+			continue;
+		}
+		if (no_realloc) {
+			memcpy(tmp, p->deps, sizeof(*tmp) * (ndeps_all+1));
+			no_realloc = 0;
+		}
+		p->deps = tmp;
+		for (j=0; j<dep->ndeps_direct; j++) {
+			if (dep->deps[j]->mark) continue;
+			dep->deps[j]->mark = 1;
+			p->deps[ndeps_all++] = dep->deps[j];
+		}
+		p->deps[ndeps_all] = 0;
+	}
+	p->bfs_built = 1;
+	for (p=head; p; p=p->next)
+		p->mark = 0;
+}
+
+static void load_preload(char *s)
+{
+	int tmp;
+	char *z;
+	for (z=s; *z; s=z) {
+		for (   ; *s && (isspace(*s) || *s==':'); s++);
+		for (z=s; *z && !isspace(*z) && *z!=':'; z++);
+		tmp = *z;
+		*z = 0;
+		load_library(s, 0);
+		*z = tmp;
+	}
+}
+
+static void add_syms(struct dso *p)
+{
+	if (!p->syms_next && syms_tail != p) {
+		syms_tail->syms_next = p;
+		syms_tail = p;
+	}
+}
+
+static void revert_syms(struct dso *old_tail)
+{
+	struct dso *p, *next;
+	/* Chop off the tail of the list of dsos that participate in
+	 * the global symbol table, reverting them to RTLD_LOCAL. */
+	for (p=old_tail; p; p=next) {
+		next = p->syms_next;
+		p->syms_next = 0;
+	}
+	syms_tail = old_tail;
+}
+
+static void do_mips_relocs(struct dso *p, size_t *got)
+{
+	size_t i, j, rel[2];
+	unsigned char *base = p->base;
+	i=0; search_vec(p->dynv, &i, DT_MIPS_LOCAL_GOTNO);
+	if (p==&ldso) {
+		got += i;
+	} else {
+		while (i--) *got++ += (size_t)base;
+	}
+	j=0; search_vec(p->dynv, &j, DT_MIPS_GOTSYM);
+	i=0; search_vec(p->dynv, &i, DT_MIPS_SYMTABNO);
+	Sym *sym = p->syms + j;
+	rel[0] = (unsigned char *)got - base;
+	for (i-=j; i; i--, sym++, rel[0]+=sizeof(size_t)) {
+		rel[1] = R_INFO(sym-p->syms, R_MIPS_JUMP_SLOT);
+		do_relocs(p, rel, sizeof rel, 2);
+	}
+}
+
+static void reloc_all(struct dso *p)
+{
+	size_t dyn[DYN_CNT];
+	for (; p; p=p->next) {
+		if (p->relocated) continue;
+		decode_vec(p->dynv, dyn, DYN_CNT);
+		if (NEED_MIPS_GOT_RELOCS)
+			do_mips_relocs(p, laddr(p, dyn[DT_PLTGOT]));
+		do_relocs(p, laddr(p, dyn[DT_JMPREL]), dyn[DT_PLTRELSZ],
+			2+(dyn[DT_PLTREL]==DT_RELA));
+		do_relocs(p, laddr(p, dyn[DT_REL]), dyn[DT_RELSZ], 2);
+		do_relocs(p, laddr(p, dyn[DT_RELA]), dyn[DT_RELASZ], 3);
+
+		if (head != &ldso && p->relro_start != p->relro_end &&
+		    mprotect(laddr(p, p->relro_start), p->relro_end-p->relro_start, PROT_READ)
+		    && errno != ENOSYS) {
+			error("Error relocating %s: RELRO protection failed: %m",
+				p->name);
+			if (runtime) longjmp(*rtld_fail, 1);
+		}
+
+		p->relocated = 1;
+	}
+}
+
+static void kernel_mapped_dso(struct dso *p)
+{
+	size_t min_addr = -1, max_addr = 0, cnt;
+	Phdr *ph = p->phdr;
+	for (cnt = p->phnum; cnt--; ph = (void *)((char *)ph + p->phentsize)) {
+		if (ph->p_type == PT_DYNAMIC) {
+			p->dynv = laddr(p, ph->p_vaddr);
+		} else if (ph->p_type == PT_GNU_RELRO) {
+			p->relro_start = ph->p_vaddr & -PAGE_SIZE;
+			p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
+		} else if (ph->p_type == PT_GNU_STACK) {
+			if (!runtime && ph->p_memsz > __default_stacksize) {
+				__default_stacksize =
+					ph->p_memsz < DEFAULT_STACK_MAX ?
+					ph->p_memsz : DEFAULT_STACK_MAX;
+			}
+		}
+		if (ph->p_type != PT_LOAD) continue;
+		if (ph->p_vaddr < min_addr)
+			min_addr = ph->p_vaddr;
+		if (ph->p_vaddr+ph->p_memsz > max_addr)
+			max_addr = ph->p_vaddr+ph->p_memsz;
+	}
+	min_addr &= -PAGE_SIZE;
+	max_addr = (max_addr + PAGE_SIZE-1) & -PAGE_SIZE;
+	p->map = p->base + min_addr;
+	p->map_len = max_addr - min_addr;
+	p->kernel_mapped = 1;
+}
+
+void __libc_exit_fini()
+{
+	struct dso *p;
+	size_t dyn[DYN_CNT];
+	int self = __pthread_self()->tid;
+
+	/* Take both locks before setting shutting_down, so that
+	 * either lock is sufficient to read its value. The lock
+	 * order matches that in dlopen to avoid deadlock. */
+	pthread_rwlock_wrlock(&lock);
+	pthread_mutex_lock(&init_fini_lock);
+	shutting_down = 1;
+	pthread_rwlock_unlock(&lock);
+	for (p=fini_head; p; p=p->fini_next) {
+		while (p->ctor_visitor && p->ctor_visitor!=self)
+			pthread_cond_wait(&ctor_cond, &init_fini_lock);
+		if (!p->constructed) continue;
+		decode_vec(p->dynv, dyn, DYN_CNT);
+		if (dyn[0] & (1<<DT_FINI_ARRAY)) {
+			size_t n = dyn[DT_FINI_ARRAYSZ]/sizeof(size_t);
+			size_t *fn = (size_t *)laddr(p, dyn[DT_FINI_ARRAY])+n;
+			while (n--) ((void (*)(void))*--fn)();
+		}
+#ifndef NO_LEGACY_INITFINI
+		if ((dyn[0] & (1<<DT_FINI)) && dyn[DT_FINI])
+			fpaddr(p, dyn[DT_FINI])();
+#endif
+	}
+}
+
+static struct dso **queue_ctors(struct dso *dso)
+{
+	size_t cnt, qpos, spos, i;
+	struct dso *p, **queue, **stack;
+
+	if (ldd_mode) return 0;
+
+	/* Bound on queue size is the total number of indirect deps.
+	 * If a bfs deps list was built, we can use it. Otherwise,
+	 * bound by the total number of DSOs, which is always safe and
+	 * is reasonable we use it (for main app at startup). */
+	if (dso->bfs_built) {
+		for (cnt=0; dso->deps[cnt]; cnt++)
+			dso->deps[cnt]->mark = 0;
+		cnt++; /* self, not included in deps */
+	} else {
+		for (cnt=0, p=head; p; cnt++, p=p->next)
+			p->mark = 0;
+	}
+	cnt++; /* termination slot */
+	if (dso==head && cnt <= countof(builtin_ctor_queue))
+		queue = builtin_ctor_queue;
+	else
+		queue = calloc(cnt, sizeof *queue);
+
+	if (!queue) {
+		error("Error allocating constructor queue: %m\n");
+		if (runtime) longjmp(*rtld_fail, 1);
+		return 0;
+	}
+
+	/* Opposite ends of the allocated buffer serve as an output queue
+	 * and a working stack. Setup initial stack with just the argument
+	 * dso and initial queue empty... */
+	stack = queue;
+	qpos = 0;
+	spos = cnt;
+	stack[--spos] = dso;
+	dso->next_dep = 0;
+	dso->mark = 1;
+
+	/* Then perform pseudo-DFS sort, but ignoring circular deps. */
+	while (spos<cnt) {
+		p = stack[spos++];
+		while (p->next_dep < p->ndeps_direct) {
+			if (p->deps[p->next_dep]->mark) {
+				p->next_dep++;
+			} else {
+				stack[--spos] = p;
+				p = p->deps[p->next_dep];
+				p->next_dep = 0;
+				p->mark = 1;
+			}
+		}
+		queue[qpos++] = p;
+	}
+	queue[qpos] = 0;
+	for (i=0; i<qpos; i++) queue[i]->mark = 0;
+
+	return queue;
+}
+
+static void do_init_fini(struct dso **queue)
+{
+	struct dso *p;
+	size_t dyn[DYN_CNT], i;
+	int self = __pthread_self()->tid;
+
+	pthread_mutex_lock(&init_fini_lock);
+	for (i=0; (p=queue[i]); i++) {
+		while ((p->ctor_visitor && p->ctor_visitor!=self) || shutting_down)
+			pthread_cond_wait(&ctor_cond, &init_fini_lock);
+		if (p->ctor_visitor || p->constructed)
+			continue;
+		p->ctor_visitor = self;
+		
+		decode_vec(p->dynv, dyn, DYN_CNT);
+		if (dyn[0] & ((1<<DT_FINI) | (1<<DT_FINI_ARRAY))) {
+			p->fini_next = fini_head;
+			fini_head = p;
+		}
+
+		pthread_mutex_unlock(&init_fini_lock);
+
+#ifndef NO_LEGACY_INITFINI
+		if ((dyn[0] & (1<<DT_INIT)) && dyn[DT_INIT])
+			fpaddr(p, dyn[DT_INIT])();
+#endif
+		if (dyn[0] & (1<<DT_INIT_ARRAY)) {
+			size_t n = dyn[DT_INIT_ARRAYSZ]/sizeof(size_t);
+			size_t *fn = laddr(p, dyn[DT_INIT_ARRAY]);
+			while (n--) ((void (*)(void))*fn++)();
+		}
+
+		pthread_mutex_lock(&init_fini_lock);
+		p->ctor_visitor = 0;
+		p->constructed = 1;
+		pthread_cond_broadcast(&ctor_cond);
+	}
+	pthread_mutex_unlock(&init_fini_lock);
+}
+
+void __libc_start_init(void)
+{
+	do_init_fini(main_ctor_queue);
+	if (!__malloc_replaced && main_ctor_queue != builtin_ctor_queue)
+		free(main_ctor_queue);
+	main_ctor_queue = 0;
+}
+
+static void dl_debug_state(void)
+{
+}
+
+weak_alias(dl_debug_state, _dl_debug_state);
+
+void __init_tls(size_t *auxv)
+{
+}
+
+static void update_tls_size()
+{
+	libc.tls_cnt = tls_cnt;
+	libc.tls_align = tls_align;
+	libc.tls_size = ALIGN(
+		(1+tls_cnt) * sizeof(void *) +
+		tls_offset +
+		sizeof(struct pthread) +
+		tls_align * 2,
+	tls_align);
+}
+
+static void install_new_tls(void)
+{
+	sigset_t set;
+	pthread_t self = __pthread_self(), td;
+	struct dso *dtv_provider = container_of(tls_tail, struct dso, tls);
+	uintptr_t (*newdtv)[tls_cnt+1] = (void *)dtv_provider->new_dtv;
+	struct dso *p;
+	size_t i, j;
+	size_t old_cnt = self->dtv[0];
+
+	__block_app_sigs(&set);
+	__tl_lock();
+	/* Copy existing dtv contents from all existing threads. */
+	for (i=0, td=self; !i || td!=self; i++, td=td->next) {
+		memcpy(newdtv+i, td->dtv,
+			(old_cnt+1)*sizeof(uintptr_t));
+		newdtv[i][0] = tls_cnt;
+	}
+	/* Install new dtls into the enlarged, uninstalled dtv copies. */
+	for (p=head; ; p=p->next) {
+		if (p->tls_id <= old_cnt) continue;
+		unsigned char *mem = p->new_tls;
+		for (j=0; j<i; j++) {
+			unsigned char *new = mem;
+			new += ((uintptr_t)p->tls.image - (uintptr_t)mem)
+				& (p->tls.align-1);
+			memcpy(new, p->tls.image, p->tls.len);
+			newdtv[j][p->tls_id] =
+				(uintptr_t)new + DTP_OFFSET;
+			mem += p->tls.size + p->tls.align;
+		}
+		if (p->tls_id == tls_cnt) break;
+	}
+
+	/* Broadcast barrier to ensure contents of new dtv is visible
+	 * if the new dtv pointer is. The __membarrier function has a
+	 * fallback emulation using signals for kernels that lack the
+	 * feature at the syscall level. */
+
+	__membarrier(MEMBARRIER_CMD_PRIVATE_EXPEDITED, 0);
+
+	/* Install new dtv for each thread. */
+	for (j=0, td=self; !j || td!=self; j++, td=td->next) {
+		td->dtv = td->dtv_copy = newdtv[j];
+	}
+
+	__tl_unlock();
+	__restore_sigs(&set);
+}
+
+/* Stage 1 of the dynamic linker is defined in dlstart.c. It calls the
+ * following stage 2 and stage 3 functions via primitive symbolic lookup
+ * since it does not have access to their addresses to begin with. */
+
+/* Stage 2 of the dynamic linker is called after relative relocations 
+ * have been processed. It can make function calls to static functions
+ * and access string literals and static data, but cannot use extern
+ * symbols. Its job is to perform symbolic relocations on the dynamic
+ * linker itself, but some of the relocations performed may need to be
+ * replaced later due to copy relocations in the main program. */
+
+hidden void __dls2(unsigned char *base, size_t *sp)
+{
+	size_t *auxv;
+	for (auxv=sp+1+*sp+1; *auxv; auxv++);
+	auxv++;
+	if (DL_FDPIC) {
+		void *p1 = (void *)sp[-2];
+		void *p2 = (void *)sp[-1];
+		if (!p1) {
+			size_t aux[AUX_CNT];
+			decode_vec(auxv, aux, AUX_CNT);
+			if (aux[AT_BASE]) ldso.base = (void *)aux[AT_BASE];
+			else ldso.base = (void *)(aux[AT_PHDR] & -4096);
+		}
+		app_loadmap = p2 ? p1 : 0;
+		ldso.loadmap = p2 ? p2 : p1;
+		ldso.base = laddr(&ldso, 0);
+	} else {
+		ldso.base = base;
+	}
+	Ehdr *ehdr = (void *)ldso.base;
+	ldso.name = ldso.shortname = "libc.so";
+	ldso.phnum = ehdr->e_phnum;
+	ldso.phdr = laddr(&ldso, ehdr->e_phoff);
+	ldso.phentsize = ehdr->e_phentsize;
+	kernel_mapped_dso(&ldso);
+	decode_dyn(&ldso);
+
+	if (DL_FDPIC) makefuncdescs(&ldso);
+
+	/* Prepare storage for to save clobbered REL addends so they
+	 * can be reused in stage 3. There should be very few. If
+	 * something goes wrong and there are a huge number, abort
+	 * instead of risking stack overflow. */
+	size_t dyn[DYN_CNT];
+	decode_vec(ldso.dynv, dyn, DYN_CNT);
+	size_t *rel = laddr(&ldso, dyn[DT_REL]);
+	size_t rel_size = dyn[DT_RELSZ];
+	size_t symbolic_rel_cnt = 0;
+	apply_addends_to = rel;
+	for (; rel_size; rel+=2, rel_size-=2*sizeof(size_t))
+		if (!IS_RELATIVE(rel[1], ldso.syms)) symbolic_rel_cnt++;
+	if (symbolic_rel_cnt >= ADDEND_LIMIT) a_crash();
+	size_t addends[symbolic_rel_cnt+1];
+	saved_addends = addends;
+
+	head = &ldso;
+	reloc_all(&ldso);
+
+	ldso.relocated = 0;
+
+	/* Call dynamic linker stage-2b, __dls2b, looking it up
+	 * symbolically as a barrier against moving the address
+	 * load across the above relocation processing. */
+	struct symdef dls2b_def = find_sym(&ldso, "__dls2b", 0);
+	if (DL_FDPIC) ((stage3_func)&ldso.funcdescs[dls2b_def.sym-ldso.syms])(sp, auxv);
+	else ((stage3_func)laddr(&ldso, dls2b_def.sym->st_value))(sp, auxv);
+}
+
+/* Stage 2b sets up a valid thread pointer, which requires relocations
+ * completed in stage 2, and on which stage 3 is permitted to depend.
+ * This is done as a separate stage, with symbolic lookup as a barrier,
+ * so that loads of the thread pointer and &errno can be pure/const and
+ * thereby hoistable. */
+
+void __dls2b(size_t *sp, size_t *auxv)
+{
+	/* Setup early thread pointer in builtin_tls for ldso/libc itself to
+	 * use during dynamic linking. If possible it will also serve as the
+	 * thread pointer at runtime. */
+	search_vec(auxv, &__hwcap, AT_HWCAP);
+	libc.auxv = auxv;
+	libc.tls_size = sizeof builtin_tls;
+	libc.tls_align = tls_align;
+	if (__init_tp(__copy_tls((void *)builtin_tls)) < 0) {
+		a_crash();
+	}
+
+	struct symdef dls3_def = find_sym(&ldso, "__dls3", 0);
+	if (DL_FDPIC) ((stage3_func)&ldso.funcdescs[dls3_def.sym-ldso.syms])(sp, auxv);
+	else ((stage3_func)laddr(&ldso, dls3_def.sym->st_value))(sp, auxv);
+}
+
+/* Stage 3 of the dynamic linker is called with the dynamic linker/libc
+ * fully functional. Its job is to load (if not already loaded) and
+ * process dependencies and relocations for the main application and
+ * transfer control to its entry point. */
+
+void __dls3(size_t *sp, size_t *auxv)
+{
+	static struct dso app, vdso;
+	size_t aux[AUX_CNT];
+	size_t i;
+	char *env_preload=0;
+	char *replace_argv0=0;
+	size_t vdso_base;
+	int argc = *sp;
+	char **argv = (void *)(sp+1);
+	char **argv_orig = argv;
+	char **envp = argv+argc+1;
+
+	/* Find aux vector just past environ[] and use it to initialize
+	 * global data that may be needed before we can make syscalls. */
+	__environ = envp;
+	decode_vec(auxv, aux, AUX_CNT);
+	search_vec(auxv, &__sysinfo, AT_SYSINFO);
+	__pthread_self()->sysinfo = __sysinfo;
+	libc.page_size = aux[AT_PAGESZ];
+	libc.secure = ((aux[0]&0x7800)!=0x7800 || aux[AT_UID]!=aux[AT_EUID]
+		|| aux[AT_GID]!=aux[AT_EGID] || aux[AT_SECURE]);
+
+	/* Only trust user/env if kernel says we're not suid/sgid */
+	if (!libc.secure) {
+		env_path = getenv("LD_LIBRARY_PATH");
+		env_preload = getenv("LD_PRELOAD");
+	}
+
+	/* If the main program was already loaded by the kernel,
+	 * AT_PHDR will point to some location other than the dynamic
+	 * linker's program headers. */
+	if (aux[AT_PHDR] != (size_t)ldso.phdr) {
+		size_t interp_off = 0;
+		size_t tls_image = 0;
+		/* Find load address of the main program, via AT_PHDR vs PT_PHDR. */
+		Phdr *phdr = app.phdr = (void *)aux[AT_PHDR];
+		app.phnum = aux[AT_PHNUM];
+		app.phentsize = aux[AT_PHENT];
+		for (i=aux[AT_PHNUM]; i; i--, phdr=(void *)((char *)phdr + aux[AT_PHENT])) {
+			if (phdr->p_type == PT_PHDR)
+				app.base = (void *)(aux[AT_PHDR] - phdr->p_vaddr);
+			else if (phdr->p_type == PT_INTERP)
+				interp_off = (size_t)phdr->p_vaddr;
+			else if (phdr->p_type == PT_TLS) {
+				tls_image = phdr->p_vaddr;
+				app.tls.len = phdr->p_filesz;
+				app.tls.size = phdr->p_memsz;
+				app.tls.align = phdr->p_align;
+			}
+		}
+		if (DL_FDPIC) app.loadmap = app_loadmap;
+		if (app.tls.size) app.tls.image = laddr(&app, tls_image);
+		if (interp_off) ldso.name = laddr(&app, interp_off);
+		if ((aux[0] & (1UL<<AT_EXECFN))
+		    && strncmp((char *)aux[AT_EXECFN], "/proc/", 6))
+			app.name = (char *)aux[AT_EXECFN];
+		else
+			app.name = argv[0];
+		kernel_mapped_dso(&app);
+	} else {
+		int fd;
+		char *ldname = argv[0];
+		size_t l = strlen(ldname);
+		if (l >= 3 && !strcmp(ldname+l-3, "ldd")) ldd_mode = 1;
+		argv++;
+		while (argv[0] && argv[0][0]=='-' && argv[0][1]=='-') {
+			char *opt = argv[0]+2;
+			*argv++ = (void *)-1;
+			if (!*opt) {
+				break;
+			} else if (!memcmp(opt, "list", 5)) {
+				ldd_mode = 1;
+			} else if (!memcmp(opt, "library-path", 12)) {
+				if (opt[12]=='=') env_path = opt+13;
+				else if (opt[12]) *argv = 0;
+				else if (*argv) env_path = *argv++;
+			} else if (!memcmp(opt, "preload", 7)) {
+				if (opt[7]=='=') env_preload = opt+8;
+				else if (opt[7]) *argv = 0;
+				else if (*argv) env_preload = *argv++;
+			} else if (!memcmp(opt, "argv0", 5)) {
+				if (opt[5]=='=') replace_argv0 = opt+6;
+				else if (opt[5]) *argv = 0;
+				else if (*argv) replace_argv0 = *argv++;
+			} else {
+				argv[0] = 0;
+			}
+		}
+		argv[-1] = (void *)(argc - (argv-argv_orig));
+		if (!argv[0]) {
+			dprintf(2, "musl libc (" LDSO_ARCH ")\n"
+				"Version %s\n"
+				"Dynamic Program Loader\n"
+				"Usage: %s [options] [--] pathname%s\n",
+				__libc_version, ldname,
+				ldd_mode ? "" : " [args]");
+			_exit(1);
+		}
+		fd = open(argv[0], O_RDONLY);
+		if (fd < 0) {
+			dprintf(2, "%s: cannot load %s: %s\n", ldname, argv[0], strerror(errno));
+			_exit(1);
+		}
+		Ehdr *ehdr = (void *)map_library(fd, &app);
+		if (!ehdr) {
+			dprintf(2, "%s: %s: Not a valid dynamic program\n", ldname, argv[0]);
+			_exit(1);
+		}
+		close(fd);
+		ldso.name = ldname;
+		app.name = argv[0];
+		aux[AT_ENTRY] = (size_t)laddr(&app, ehdr->e_entry);
+		/* Find the name that would have been used for the dynamic
+		 * linker had ldd not taken its place. */
+		if (ldd_mode) {
+			for (i=0; i<app.phnum; i++) {
+				if (app.phdr[i].p_type == PT_INTERP)
+					ldso.name = laddr(&app, app.phdr[i].p_vaddr);
+			}
+			dprintf(1, "\t%s (%p)\n", ldso.name, ldso.base);
+		}
+	}
+	if (app.tls.size) {
+		libc.tls_head = tls_tail = &app.tls;
+		app.tls_id = tls_cnt = 1;
+#ifdef TLS_ABOVE_TP
+		app.tls.offset = GAP_ABOVE_TP;
+		app.tls.offset += (-GAP_ABOVE_TP + (uintptr_t)app.tls.image)
+			& (app.tls.align-1);
+		tls_offset = app.tls.offset + app.tls.size;
+#else
+		tls_offset = app.tls.offset = app.tls.size
+			+ ( -((uintptr_t)app.tls.image + app.tls.size)
+			& (app.tls.align-1) );
+#endif
+		tls_align = MAXP2(tls_align, app.tls.align);
+	}
+	decode_dyn(&app);
+	if (DL_FDPIC) {
+		makefuncdescs(&app);
+		if (!app.loadmap) {
+			app.loadmap = (void *)&app_dummy_loadmap;
+			app.loadmap->nsegs = 1;
+			app.loadmap->segs[0].addr = (size_t)app.map;
+			app.loadmap->segs[0].p_vaddr = (size_t)app.map
+				- (size_t)app.base;
+			app.loadmap->segs[0].p_memsz = app.map_len;
+		}
+		argv[-3] = (void *)app.loadmap;
+	}
+
+	/* Initial dso chain consists only of the app. */
+	head = tail = syms_tail = &app;
+
+	/* Donate unused parts of app and library mapping to malloc */
+	reclaim_gaps(&app);
+	reclaim_gaps(&ldso);
+
+	/* Load preload/needed libraries, add symbols to global namespace. */
+	ldso.deps = (struct dso **)no_deps;
+	if (env_preload) load_preload(env_preload);
+ 	load_deps(&app);
+	for (struct dso *p=head; p; p=p->next)
+		add_syms(p);
+
+	/* Attach to vdso, if provided by the kernel, last so that it does
+	 * not become part of the global namespace.  */
+	if (search_vec(auxv, &vdso_base, AT_SYSINFO_EHDR) && vdso_base) {
+		Ehdr *ehdr = (void *)vdso_base;
+		Phdr *phdr = vdso.phdr = (void *)(vdso_base + ehdr->e_phoff);
+		vdso.phnum = ehdr->e_phnum;
+		vdso.phentsize = ehdr->e_phentsize;
+		for (i=ehdr->e_phnum; i; i--, phdr=(void *)((char *)phdr + ehdr->e_phentsize)) {
+			if (phdr->p_type == PT_DYNAMIC)
+				vdso.dynv = (void *)(vdso_base + phdr->p_offset);
+			if (phdr->p_type == PT_LOAD)
+				vdso.base = (void *)(vdso_base - phdr->p_vaddr + phdr->p_offset);
+		}
+		vdso.name = "";
+		vdso.shortname = "linux-gate.so.1";
+		vdso.relocated = 1;
+		vdso.deps = (struct dso **)no_deps;
+		decode_dyn(&vdso);
+		vdso.prev = tail;
+		tail->next = &vdso;
+		tail = &vdso;
+	}
+
+	for (i=0; app.dynv[i]; i+=2) {
+		if (!DT_DEBUG_INDIRECT && app.dynv[i]==DT_DEBUG)
+			app.dynv[i+1] = (size_t)&debug;
+		if (DT_DEBUG_INDIRECT && app.dynv[i]==DT_DEBUG_INDIRECT) {
+			size_t *ptr = (size_t *) app.dynv[i+1];
+			*ptr = (size_t)&debug;
+		}
+	}
+
+	/* This must be done before final relocations, since it calls
+	 * malloc, which may be provided by the application. Calling any
+	 * application code prior to the jump to its entry point is not
+	 * valid in our model and does not work with FDPIC, where there
+	 * are additional relocation-like fixups that only the entry point
+	 * code can see to perform. */
+	main_ctor_queue = queue_ctors(&app);
+
+	/* Initial TLS must also be allocated before final relocations
+	 * might result in calloc being a call to application code. */
+	update_tls_size();
+	void *initial_tls = builtin_tls;
+	if (libc.tls_size > sizeof builtin_tls || tls_align > MIN_TLS_ALIGN) {
+		initial_tls = calloc(libc.tls_size, 1);
+		if (!initial_tls) {
+			dprintf(2, "%s: Error getting %zu bytes thread-local storage: %m\n",
+				argv[0], libc.tls_size);
+			_exit(127);
+		}
+	}
+	static_tls_cnt = tls_cnt;
+
+	/* The main program must be relocated LAST since it may contain
+	 * copy relocations which depend on libraries' relocations. */
+	reloc_all(app.next);
+	reloc_all(&app);
+
+	/* Actual copying to new TLS needs to happen after relocations,
+	 * since the TLS images might have contained relocated addresses. */
+	if (initial_tls != builtin_tls) {
+		if (__init_tp(__copy_tls(initial_tls)) < 0) {
+			a_crash();
+		}
+	} else {
+		size_t tmp_tls_size = libc.tls_size;
+		pthread_t self = __pthread_self();
+		/* Temporarily set the tls size to the full size of
+		 * builtin_tls so that __copy_tls will use the same layout
+		 * as it did for before. Then check, just to be safe. */
+		libc.tls_size = sizeof builtin_tls;
+		if (__copy_tls((void*)builtin_tls) != self) a_crash();
+		libc.tls_size = tmp_tls_size;
+	}
+
+	if (ldso_fail) _exit(127);
+	if (ldd_mode) _exit(0);
+
+	/* Determine if malloc was interposed by a replacement implementation
+	 * so that calloc and the memalign family can harden against the
+	 * possibility of incomplete replacement. */
+	if (find_sym(head, "malloc", 1).dso != &ldso)
+		__malloc_replaced = 1;
+
+	/* Switch to runtime mode: any further failures in the dynamic
+	 * linker are a reportable failure rather than a fatal startup
+	 * error. */
+	runtime = 1;
+
+	debug.ver = 1;
+	debug.bp = dl_debug_state;
+	debug.head = head;
+	debug.base = ldso.base;
+	debug.state = 0;
+	_dl_debug_state();
+
+	if (replace_argv0) argv[0] = replace_argv0;
+
+	errno = 0;
+
+	CRTJMP((void *)aux[AT_ENTRY], argv-1);
+	for(;;);
+}
+
+static void prepare_lazy(struct dso *p)
+{
+	size_t dyn[DYN_CNT], n, flags1=0;
+	decode_vec(p->dynv, dyn, DYN_CNT);
+	search_vec(p->dynv, &flags1, DT_FLAGS_1);
+	if (dyn[DT_BIND_NOW] || (dyn[DT_FLAGS] & DF_BIND_NOW) || (flags1 & DF_1_NOW))
+		return;
+	n = dyn[DT_RELSZ]/2 + dyn[DT_RELASZ]/3 + dyn[DT_PLTRELSZ]/2 + 1;
+	if (NEED_MIPS_GOT_RELOCS) {
+		size_t j=0; search_vec(p->dynv, &j, DT_MIPS_GOTSYM);
+		size_t i=0; search_vec(p->dynv, &i, DT_MIPS_SYMTABNO);
+		n += i-j;
+	}
+	p->lazy = calloc(n, 3*sizeof(size_t));
+	if (!p->lazy) {
+		error("Error preparing lazy relocation for %s: %m", p->name);
+		longjmp(*rtld_fail, 1);
+	}
+	p->lazy_next = lazy_head;
+	lazy_head = p;
+}
+
+void *dlopen(const char *file, int mode)
+{
+	struct dso *volatile p, *orig_tail, *orig_syms_tail, *orig_lazy_head, *next;
+	struct tls_module *orig_tls_tail;
+	size_t orig_tls_cnt, orig_tls_offset, orig_tls_align;
+	size_t i;
+	int cs;
+	jmp_buf jb;
+	struct dso **volatile ctor_queue = 0;
+
+	if (!file) return head;
+
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	pthread_rwlock_wrlock(&lock);
+	__inhibit_ptc();
+
+	p = 0;
+	if (shutting_down) {
+		error("Cannot dlopen while program is exiting.");
+		goto end;
+	}
+	orig_tls_tail = tls_tail;
+	orig_tls_cnt = tls_cnt;
+	orig_tls_offset = tls_offset;
+	orig_tls_align = tls_align;
+	orig_lazy_head = lazy_head;
+	orig_syms_tail = syms_tail;
+	orig_tail = tail;
+	noload = mode & RTLD_NOLOAD;
+
+	rtld_fail = &jb;
+	if (setjmp(*rtld_fail)) {
+		/* Clean up anything new that was (partially) loaded */
+		revert_syms(orig_syms_tail);
+		for (p=orig_tail->next; p; p=next) {
+			next = p->next;
+			while (p->td_index) {
+				void *tmp = p->td_index->next;
+				free(p->td_index);
+				p->td_index = tmp;
+			}
+			free(p->funcdescs);
+			if (p->rpath != p->rpath_orig)
+				free(p->rpath);
+			free(p->deps);
+			unmap_library(p);
+			free(p);
+		}
+		free(ctor_queue);
+		ctor_queue = 0;
+		if (!orig_tls_tail) libc.tls_head = 0;
+		tls_tail = orig_tls_tail;
+		if (tls_tail) tls_tail->next = 0;
+		tls_cnt = orig_tls_cnt;
+		tls_offset = orig_tls_offset;
+		tls_align = orig_tls_align;
+		lazy_head = orig_lazy_head;
+		tail = orig_tail;
+		tail->next = 0;
+		p = 0;
+		goto end;
+	} else p = load_library(file, head);
+
+	if (!p) {
+		error(noload ?
+			"Library %s is not already loaded" :
+			"Error loading shared library %s: %m",
+			file);
+		goto end;
+	}
+
+	/* First load handling */
+	load_deps(p);
+	extend_bfs_deps(p);
+	pthread_mutex_lock(&init_fini_lock);
+	if (!p->constructed) ctor_queue = queue_ctors(p);
+	pthread_mutex_unlock(&init_fini_lock);
+	if (!p->relocated && (mode & RTLD_LAZY)) {
+		prepare_lazy(p);
+		for (i=0; p->deps[i]; i++)
+			if (!p->deps[i]->relocated)
+				prepare_lazy(p->deps[i]);
+	}
+	if (!p->relocated || (mode & RTLD_GLOBAL)) {
+		/* Make new symbols global, at least temporarily, so we can do
+		 * relocations. If not RTLD_GLOBAL, this is reverted below. */
+		add_syms(p);
+		for (i=0; p->deps[i]; i++)
+			add_syms(p->deps[i]);
+	}
+	if (!p->relocated) {
+		reloc_all(p);
+	}
+
+	/* If RTLD_GLOBAL was not specified, undo any new additions
+	 * to the global symbol table. This is a nop if the library was
+	 * previously loaded and already global. */
+	if (!(mode & RTLD_GLOBAL))
+		revert_syms(orig_syms_tail);
+
+	/* Processing of deferred lazy relocations must not happen until
+	 * the new libraries are committed; otherwise we could end up with
+	 * relocations resolved to symbol definitions that get removed. */
+	redo_lazy_relocs();
+
+	update_tls_size();
+	if (tls_cnt != orig_tls_cnt)
+		install_new_tls();
+	_dl_debug_state();
+	orig_tail = tail;
+end:
+	__release_ptc();
+	if (p) gencnt++;
+	pthread_rwlock_unlock(&lock);
+	if (ctor_queue) {
+		do_init_fini(ctor_queue);
+		free(ctor_queue);
+	}
+	pthread_setcancelstate(cs, 0);
+	return p;
+}
+
+hidden int __dl_invalid_handle(void *h)
+{
+	struct dso *p;
+	for (p=head; p; p=p->next) if (h==p) return 0;
+	error("Invalid library handle %p", (void *)h);
+	return 1;
+}
+
+static void *addr2dso(size_t a)
+{
+	struct dso *p;
+	size_t i;
+	if (DL_FDPIC) for (p=head; p; p=p->next) {
+		i = count_syms(p);
+		if (a-(size_t)p->funcdescs < i*sizeof(*p->funcdescs))
+			return p;
+	}
+	for (p=head; p; p=p->next) {
+		if (DL_FDPIC && p->loadmap) {
+			for (i=0; i<p->loadmap->nsegs; i++) {
+				if (a-p->loadmap->segs[i].p_vaddr
+				    < p->loadmap->segs[i].p_memsz)
+					return p;
+			}
+		} else {
+			Phdr *ph = p->phdr;
+			size_t phcnt = p->phnum;
+			size_t entsz = p->phentsize;
+			size_t base = (size_t)p->base;
+			for (; phcnt--; ph=(void *)((char *)ph+entsz)) {
+				if (ph->p_type != PT_LOAD) continue;
+				if (a-base-ph->p_vaddr < ph->p_memsz)
+					return p;
+			}
+			if (a-(size_t)p->map < p->map_len)
+				return 0;
+		}
+	}
+	return 0;
+}
+
+static void *do_dlsym(struct dso *p, const char *s, void *ra)
+{
+	int use_deps = 0;
+	if (p == head || p == RTLD_DEFAULT) {
+		p = head;
+	} else if (p == RTLD_NEXT) {
+		p = addr2dso((size_t)ra);
+		if (!p) p=head;
+		p = p->next;
+	} else if (__dl_invalid_handle(p)) {
+		return 0;
+	} else
+		use_deps = 1;
+	struct symdef def = find_sym2(p, s, 0, use_deps);
+	if (!def.sym) {
+		error("Symbol not found: %s", s);
+		return 0;
+	}
+	if ((def.sym->st_info&0xf) == STT_TLS)
+		return __tls_get_addr((tls_mod_off_t []){def.dso->tls_id, def.sym->st_value-DTP_OFFSET});
+	if (DL_FDPIC && (def.sym->st_info&0xf) == STT_FUNC)
+		return def.dso->funcdescs + (def.sym - def.dso->syms);
+	return laddr(def.dso, def.sym->st_value);
+}
+
+int dladdr(const void *addr_arg, Dl_info *info)
+{
+	size_t addr = (size_t)addr_arg;
+	struct dso *p;
+	Sym *sym, *bestsym;
+	uint32_t nsym;
+	char *strings;
+	size_t best = 0;
+	size_t besterr = -1;
+
+	pthread_rwlock_rdlock(&lock);
+	p = addr2dso(addr);
+	pthread_rwlock_unlock(&lock);
+
+	if (!p) return 0;
+
+	sym = p->syms;
+	strings = p->strings;
+	nsym = count_syms(p);
+
+	if (DL_FDPIC) {
+		size_t idx = (addr-(size_t)p->funcdescs)
+			/ sizeof(*p->funcdescs);
+		if (idx < nsym && (sym[idx].st_info&0xf) == STT_FUNC) {
+			best = (size_t)(p->funcdescs + idx);
+			bestsym = sym + idx;
+			besterr = 0;
+		}
+	}
+
+	if (!best) for (; nsym; nsym--, sym++) {
+		if (sym->st_value
+		 && (1<<(sym->st_info&0xf) & OK_TYPES)
+		 && (1<<(sym->st_info>>4) & OK_BINDS)) {
+			size_t symaddr = (size_t)laddr(p, sym->st_value);
+			if (symaddr > addr || symaddr <= best)
+				continue;
+			best = symaddr;
+			bestsym = sym;
+			besterr = addr - symaddr;
+			if (addr == symaddr)
+				break;
+		}
+	}
+
+	if (best && besterr > bestsym->st_size-1) {
+		best = 0;
+		bestsym = 0;
+	}
+
+	info->dli_fname = p->name;
+	info->dli_fbase = p->map;
+
+	if (!best) {
+		info->dli_sname = 0;
+		info->dli_saddr = 0;
+		return 1;
+	}
+
+	if (DL_FDPIC && (bestsym->st_info&0xf) == STT_FUNC)
+		best = (size_t)(p->funcdescs + (bestsym - p->syms));
+	info->dli_sname = strings + bestsym->st_name;
+	info->dli_saddr = (void *)best;
+
+	return 1;
+}
+
+hidden void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra)
+{
+	void *res;
+	pthread_rwlock_rdlock(&lock);
+	res = do_dlsym(p, s, ra);
+	pthread_rwlock_unlock(&lock);
+	return res;
+}
+
+hidden void *__dlsym_redir_time64(void *restrict p, const char *restrict s, void *restrict ra)
+{
+#if _REDIR_TIME64
+	const char *suffix, *suffix2 = "";
+	char redir[36];
+
+	/* Map the symbol name to a time64 version of itself according to the
+	 * pattern used for naming the redirected time64 symbols. */
+	size_t l = strnlen(s, sizeof redir);
+	if (l<4 || l==sizeof redir) goto no_redir;
+	if (s[l-2]=='_' && s[l-1]=='r') {
+		l -= 2;
+		suffix2 = s+l;
+	}
+	if (l<4) goto no_redir;
+	if (!strcmp(s+l-4, "time")) suffix = "64";
+	else suffix = "_time64";
+
+	/* Use the presence of the remapped symbol name in libc to determine
+	 * whether it's one that requires time64 redirection; replace if so. */
+	snprintf(redir, sizeof redir, "__%.*s%s%s", (int)l, s, suffix, suffix2);
+	if (find_sym(&ldso, redir, 1).sym) s = redir;
+no_redir:
+#endif
+	return __dlsym(p, s, ra);
+}
+
+int dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data)
+{
+	struct dso *current;
+	struct dl_phdr_info info;
+	int ret = 0;
+	for(current = head; current;) {
+		info.dlpi_addr      = (uintptr_t)current->base;
+		info.dlpi_name      = current->name;
+		info.dlpi_phdr      = current->phdr;
+		info.dlpi_phnum     = current->phnum;
+		info.dlpi_adds      = gencnt;
+		info.dlpi_subs      = 0;
+		info.dlpi_tls_modid = current->tls_id;
+		info.dlpi_tls_data  = current->tls.image;
+
+		ret = (callback)(&info, sizeof (info), data);
+
+		if (ret != 0) break;
+
+		pthread_rwlock_rdlock(&lock);
+		current = current->next;
+		pthread_rwlock_unlock(&lock);
+	}
+	return ret;
+}
+
+static void error(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	if (!runtime) {
+		vdprintf(2, fmt, ap);
+		dprintf(2, "\n");
+		ldso_fail = 1;
+		va_end(ap);
+		return;
+	}
+	__dl_vseterr(fmt, ap);
+	va_end(ap);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/aio/aio.c b/src/components/lib/libc/musl-1.2.0/src/aio/aio.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/aio/aio.c
rename to src/components/lib/libc/musl-1.2.0/src/aio/aio.c
index aafd8e8cb7..6d34fa8693 100644
--- a/src/components/lib/libc/musl-1.1.11/src/aio/aio.c
+++ b/src/components/lib/libc/musl-1.2.0/src/aio/aio.c
@@ -5,9 +5,9 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/auxv.h>
 #include "syscall.h"
 #include "atomic.h"
-#include "libc.h"
 #include "pthread_impl.h"
 
 /* The following is a threads-based implementation of AIO with minimal
@@ -41,13 +41,6 @@
  * blocked permanently.
  */
 
-struct aio_args {
-	struct aiocb *cb;
-	int op;
-	int err;
-	sem_t sem;
-};
-
 struct aio_thread {
 	pthread_t td;
 	struct aiocb *cb;
@@ -65,6 +58,13 @@ struct aio_queue {
 	struct aio_thread *head;
 };
 
+struct aio_args {
+	struct aiocb *cb;
+	struct aio_queue *q;
+	int op;
+	sem_t sem;
+};
+
 static pthread_rwlock_t maplock = PTHREAD_RWLOCK_INITIALIZER;
 static struct aio_queue *****map;
 static volatile int aio_fd_cnt;
@@ -72,13 +72,17 @@ volatile int __aio_fut;
 
 static struct aio_queue *__aio_get_queue(int fd, int need)
 {
-	if (fd < 0) return 0;
+	if (fd < 0) {
+		errno = EBADF;
+		return 0;
+	}
 	int a=fd>>24;
 	unsigned char b=fd>>16, c=fd>>8, d=fd;
 	struct aio_queue *q = 0;
 	pthread_rwlock_rdlock(&maplock);
 	if ((!map || !map[a] || !map[a][b] || !map[a][b][c] || !(q=map[a][b][c][d])) && need) {
 		pthread_rwlock_unlock(&maplock);
+		if (fcntl(fd, F_GETFD) < 0) return 0;
 		pthread_rwlock_wrlock(&maplock);
 		if (!map) map = calloc(sizeof *map, (-1U/2+1)>>24);
 		if (!map) goto out;
@@ -196,12 +200,11 @@ static void *io_thread_func(void *ctx)
 	size_t len = cb->aio_nbytes;
 	off_t off = cb->aio_offset;
 
-	struct aio_queue *q = __aio_get_queue(fd, 1);
+	struct aio_queue *q = args->q;
 	ssize_t ret;
 
-	args->err = q ? 0 : EAGAIN;
+	pthread_mutex_lock(&q->lock);
 	sem_post(&args->sem);
-	if (!q) return 0;
 
 	at.op = op;
 	at.running = 1;
@@ -213,7 +216,6 @@ static void *io_thread_func(void *ctx)
 	at.prev = 0;
 	if ((at.next = q->head)) at.next->prev = &at;
 	q->head = &at;
-	q->ref++;
 
 	if (!q->init) {
 		int seekable = lseek(fd, 0, SEEK_CUR) >= 0;
@@ -257,23 +259,43 @@ static void *io_thread_func(void *ctx)
 	return 0;
 }
 
+static size_t io_thread_stack_size = MINSIGSTKSZ+2048;
+static pthread_once_t init_stack_size_once;
+
+static void init_stack_size()
+{
+	unsigned long val = __getauxval(AT_MINSIGSTKSZ);
+	if (val > MINSIGSTKSZ) io_thread_stack_size = val + 512;
+}
+
 static int submit(struct aiocb *cb, int op)
 {
 	int ret = 0;
 	pthread_attr_t a;
 	sigset_t allmask, origmask;
 	pthread_t td;
-	struct aio_args args = { .cb = cb, .op = op };
+	struct aio_queue *q = __aio_get_queue(cb->aio_fildes, 1);
+	struct aio_args args = { .cb = cb, .op = op, .q = q };
 	sem_init(&args.sem, 0, 0);
 
+	if (!q) {
+		if (errno != EBADF) errno = EAGAIN;
+		cb->__ret = -1;
+		cb->__err = errno;
+		return -1;
+	}
+	q->ref++;
+	pthread_mutex_unlock(&q->lock);
+
 	if (cb->aio_sigevent.sigev_notify == SIGEV_THREAD) {
 		if (cb->aio_sigevent.sigev_notify_attributes)
 			a = *cb->aio_sigevent.sigev_notify_attributes;
 		else
 			pthread_attr_init(&a);
 	} else {
+		pthread_once(&init_stack_size_once, init_stack_size);
 		pthread_attr_init(&a);
-		pthread_attr_setstacksize(&a, PTHREAD_STACK_MIN);
+		pthread_attr_setstacksize(&a, io_thread_stack_size);
 		pthread_attr_setguardsize(&a, 0);
 	}
 	pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED);
@@ -281,17 +303,15 @@ static int submit(struct aiocb *cb, int op)
 	pthread_sigmask(SIG_BLOCK, &allmask, &origmask);
 	cb->__err = EINPROGRESS;
 	if (pthread_create(&td, &a, io_thread_func, &args)) {
-		errno = EAGAIN;
-		ret = -1;
+		pthread_mutex_lock(&q->lock);
+		__aio_unref_queue(q);
+		cb->__err = errno = EAGAIN;
+		cb->__ret = ret = -1;
 	}
 	pthread_sigmask(SIG_SETMASK, &origmask, 0);
 
 	if (!ret) {
 		while (sem_wait(&args.sem));
-		if (args.err) {
-			errno = args.err;
-			ret = -1;
-		}
 	}
 
 	return ret;
@@ -343,8 +363,9 @@ int aio_cancel(int fd, struct aiocb *cb)
 	sigfillset(&allmask);
 	pthread_sigmask(SIG_BLOCK, &allmask, &origmask);
 
+	errno = ENOENT;
 	if (!(q = __aio_get_queue(fd, 0))) {
-		if (fcntl(fd, F_GETFD) < 0) ret = -1;
+		if (errno == EBADF) ret = -1;
 		goto done;
 	}
 
@@ -371,9 +392,9 @@ int __aio_close(int fd)
 	return fd;
 }
 
-LFS64(aio_cancel);
-LFS64(aio_error);
-LFS64(aio_fsync);
-LFS64(aio_read);
-LFS64(aio_write);
-LFS64(aio_return);
+weak_alias(aio_cancel, aio_cancel64);
+weak_alias(aio_error, aio_error64);
+weak_alias(aio_fsync, aio_fsync64);
+weak_alias(aio_read, aio_read64);
+weak_alias(aio_write, aio_write64);
+weak_alias(aio_return, aio_return64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/aio/aio_suspend.c b/src/components/lib/libc/musl-1.2.0/src/aio/aio_suspend.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/aio/aio_suspend.c
rename to src/components/lib/libc/musl-1.2.0/src/aio/aio_suspend.c
index 08fb5ddcf1..34b66f8787 100644
--- a/src/components/lib/libc/musl-1.1.11/src/aio/aio_suspend.c
+++ b/src/components/lib/libc/musl-1.2.0/src/aio/aio_suspend.c
@@ -2,11 +2,8 @@
 #include <errno.h>
 #include <time.h>
 #include "atomic.h"
-#include "libc.h"
 #include "pthread_impl.h"
 
-extern volatile int __aio_fut;
-
 int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec *ts)
 {
 	int i, tid = 0, ret, expect = 0;
@@ -76,4 +73,6 @@ int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec
 	}
 }
 
-LFS64(aio_suspend);
+#if !_REDIR_TIME64
+weak_alias(aio_suspend, aio_suspend64);
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/aio/lio_listio.c b/src/components/lib/libc/musl-1.2.0/src/aio/lio_listio.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/aio/lio_listio.c
rename to src/components/lib/libc/musl-1.2.0/src/aio/lio_listio.c
index bd37767ebf..0799c15d8b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/aio/lio_listio.c
+++ b/src/components/lib/libc/musl-1.2.0/src/aio/lio_listio.c
@@ -3,7 +3,6 @@
 #include <unistd.h>
 #include <string.h>
 #include "pthread_impl.h"
-#include "libc.h"
 
 struct lio_state {
 	struct sigevent *sev;
@@ -114,7 +113,7 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st
 
 	if (st) {
 		pthread_attr_t a;
-		sigset_t set;
+		sigset_t set, set_old;
 		pthread_t td;
 
 		if (sev->sigev_notify == SIGEV_THREAD) {
@@ -129,16 +128,16 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st
 		}
 		pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED);
 		sigfillset(&set);
-		pthread_sigmask(SIG_BLOCK, &set, &set);
+		pthread_sigmask(SIG_BLOCK, &set, &set_old);
 		if (pthread_create(&td, &a, wait_thread, st)) {
 			free(st);
 			errno = EAGAIN;
 			return -1;
 		}
-		pthread_sigmask(SIG_SETMASK, &set, 0);
+		pthread_sigmask(SIG_SETMASK, &set_old, 0);
 	}
 
 	return 0;
 }
 
-LFS64(lio_listio);
+weak_alias(lio_listio, lio_listio64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/__cexp.c b/src/components/lib/libc/musl-1.2.0/src/complex/__cexp.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/__cexp.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/__cexp.c
index 05ac28c75c..003d20af6e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/__cexp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/__cexp.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const uint32_t k = 1799; /* constant for reduction */
 static const double kln2 = 1246.97177782734161156; /* k * ln2 */
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/__cexpf.c b/src/components/lib/libc/musl-1.2.0/src/complex/__cexpf.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/complex/__cexpf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/__cexpf.c
index 69b54045af..ee5ff2bce7 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/__cexpf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/__cexpf.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const uint32_t k = 235; /* constant for reduction */
 static const float kln2 = 162.88958740F; /* k * ln2 */
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cabs.c b/src/components/lib/libc/musl-1.2.0/src/complex/cabs.c
new file mode 100644
index 0000000000..c5ad58ab93
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cabs.c
@@ -0,0 +1,6 @@
+#include "complex_impl.h"
+
+double cabs(double complex z)
+{
+	return hypot(creal(z), cimag(z));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cabsf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cabsf.c
new file mode 100644
index 0000000000..619f28d39d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cabsf.c
@@ -0,0 +1,6 @@
+#include "complex_impl.h"
+
+float cabsf(float complex z)
+{
+	return hypotf(crealf(z), cimagf(z));
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cabsl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cabsl.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cabsl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cabsl.c
index 40a067c1c5..d37e3f2ea5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cabsl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cabsl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double cabsl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cacos.c b/src/components/lib/libc/musl-1.2.0/src/complex/cacos.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cacos.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cacos.c
index 27c356364c..c39d257b44 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cacos.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cacos.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 // FIXME: Hull et al. "Implementing the complex arcsine and arccosine functions using exception handling" 1997
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cacosf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cacosf.c
similarity index 82%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cacosf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cacosf.c
index 1185265952..2e048540fa 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cacosf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cacosf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 // FIXME
 
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cacosh.c b/src/components/lib/libc/musl-1.2.0/src/complex/cacosh.c
new file mode 100644
index 0000000000..76127f75f4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cacosh.c
@@ -0,0 +1,12 @@
+#include "complex_impl.h"
+
+/* acosh(z) = i acos(z) */
+
+double complex cacosh(double complex z)
+{
+	int zineg = signbit(cimag(z));
+
+	z = cacos(z);
+	if (zineg) return CMPLX(cimag(z), -creal(z));
+	else       return CMPLX(-cimag(z), creal(z));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cacoshf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cacoshf.c
new file mode 100644
index 0000000000..8bd80581ae
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cacoshf.c
@@ -0,0 +1,10 @@
+#include "complex_impl.h"
+
+float complex cacoshf(float complex z)
+{
+	int zineg = signbit(cimagf(z));
+
+	z = cacosf(z);
+	if (zineg) return CMPLXF(cimagf(z), -crealf(z));
+	else       return CMPLXF(-cimagf(z), crealf(z));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cacoshl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cacoshl.c
new file mode 100644
index 0000000000..3a284be9c6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cacoshl.c
@@ -0,0 +1,17 @@
+#include "complex_impl.h"
+
+#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
+long double complex cacoshl(long double complex z)
+{
+	return cacosh(z);
+}
+#else
+long double complex cacoshl(long double complex z)
+{
+	int zineg = signbit(cimagl(z));
+
+	z = cacosl(z);
+	if (zineg) return CMPLXL(cimagl(z), -creall(z));
+	else       return CMPLXL(-cimagl(z), creall(z));
+}
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cacosl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cacosl.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cacosl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cacosl.c
index 7fd4a2f6b4..cc20dcd7d9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cacosl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cacosl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex cacosl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/carg.c b/src/components/lib/libc/musl-1.2.0/src/complex/carg.c
new file mode 100644
index 0000000000..dfe9b97a09
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/carg.c
@@ -0,0 +1,6 @@
+#include "complex_impl.h"
+
+double carg(double complex z)
+{
+	return atan2(cimag(z), creal(z));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cargf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cargf.c
new file mode 100644
index 0000000000..9a6c19b638
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cargf.c
@@ -0,0 +1,6 @@
+#include "complex_impl.h"
+
+float cargf(float complex z)
+{
+	return atan2f(cimagf(z), crealf(z));
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cargl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cargl.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cargl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cargl.c
index e0d504782f..88f95f96e9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cargl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cargl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double cargl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/casin.c b/src/components/lib/libc/musl-1.2.0/src/complex/casin.c
new file mode 100644
index 0000000000..3244bebb16
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/casin.c
@@ -0,0 +1,17 @@
+#include "complex_impl.h"
+
+// FIXME
+
+/* asin(z) = -i log(i z + sqrt(1 - z*z)) */
+
+double complex casin(double complex z)
+{
+	double complex w;
+	double x, y;
+
+	x = creal(z);
+	y = cimag(z);
+	w = CMPLX(1.0 - (x - y)*(x + y), -2.0*x*y);
+	double complex r = clog(CMPLX(-y, x) + csqrt(w));
+	return CMPLX(cimag(r), -creal(r));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/casinf.c b/src/components/lib/libc/musl-1.2.0/src/complex/casinf.c
new file mode 100644
index 0000000000..2cda2f086b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/casinf.c
@@ -0,0 +1,15 @@
+#include "complex_impl.h"
+
+// FIXME
+
+float complex casinf(float complex z)
+{
+	float complex w;
+	float x, y;
+
+	x = crealf(z);
+	y = cimagf(z);
+	w = CMPLXF(1.0 - (x - y)*(x + y), -2.0*x*y);
+	float complex r = clogf(CMPLXF(-y, x) + csqrtf(w));
+	return CMPLXF(cimagf(r), -crealf(r));
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/casinh.c b/src/components/lib/libc/musl-1.2.0/src/complex/casinh.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/complex/casinh.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/casinh.c
index b57fe8c40b..50bf27ce88 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/casinh.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/casinh.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 /* asinh(z) = -i asin(i z) */
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/casinhf.c b/src/components/lib/libc/musl-1.2.0/src/complex/casinhf.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/complex/casinhf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/casinhf.c
index a11bf902d8..93d82e5f4f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/casinhf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/casinhf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex casinhf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/casinhl.c b/src/components/lib/libc/musl-1.2.0/src/complex/casinhl.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/casinhl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/casinhl.c
index 714f189359..68ba3ddfce 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/casinhl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/casinhl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex casinhl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/casinl.c b/src/components/lib/libc/musl-1.2.0/src/complex/casinl.c
new file mode 100644
index 0000000000..072adc450d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/casinl.c
@@ -0,0 +1,21 @@
+#include "complex_impl.h"
+
+#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
+long double complex casinl(long double complex z)
+{
+	return casin(z);
+}
+#else
+// FIXME
+long double complex casinl(long double complex z)
+{
+	long double complex w;
+	long double x, y;
+
+	x = creall(z);
+	y = cimagl(z);
+	w = CMPLXL(1.0 - (x - y)*(x + y), -2.0*x*y);
+	long double complex r = clogl(CMPLXL(-y, x) + csqrtl(w));
+	return CMPLXL(cimagl(r), -creall(r));
+}
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/catan.c b/src/components/lib/libc/musl-1.2.0/src/complex/catan.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/complex/catan.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/catan.c
index 39ce6cf2ff..ccc2fb539a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/catan.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/catan.c
@@ -58,7 +58,7 @@
  * 2.9e-17.  See also clog().
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 #define MAXNUM 1.0e308
 
@@ -91,29 +91,17 @@ double complex catan(double complex z)
 	x = creal(z);
 	y = cimag(z);
 
-	if (x == 0.0 && y > 1.0)
-		goto ovrf;
-
 	x2 = x * x;
 	a = 1.0 - x2 - (y * y);
-	if (a == 0.0)
-		goto ovrf;
 
 	t = 0.5 * atan2(2.0 * x, a);
 	w = _redupi(t);
 
 	t = y - 1.0;
 	a = x2 + (t * t);
-	if (a == 0.0)
-		goto ovrf;
 
 	t = y + 1.0;
 	a = (x2 + t * t)/a;
-	w = w + (0.25 * log(a)) * I;
-	return w;
-
-ovrf:
-	// FIXME
-	w = MAXNUM + MAXNUM * I;
+	w = CMPLX(w, 0.25 * log(a));
 	return w;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/catanf.c b/src/components/lib/libc/musl-1.2.0/src/complex/catanf.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/catanf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/catanf.c
index 8533bde397..ef3907a506 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/catanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/catanf.c
@@ -53,7 +53,7 @@
  *    IEEE      -10,+10     30000        2.3e-6      5.2e-8
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 #define MAXNUMF 1.0e38F
 
@@ -87,29 +87,17 @@ float complex catanf(float complex z)
 	x = crealf(z);
 	y = cimagf(z);
 
-	if ((x == 0.0f) && (y > 1.0f))
-		goto ovrf;
-
 	x2 = x * x;
 	a = 1.0f - x2 - (y * y);
-	if (a == 0.0f)
-		goto ovrf;
 
 	t = 0.5f * atan2f(2.0f * x, a);
 	w = _redupif(t);
 
 	t = y - 1.0f;
 	a = x2 + (t * t);
-	if (a == 0.0f)
-		goto ovrf;
 
 	t = y + 1.0f;
 	a = (x2 + (t * t))/a;
-	w = w + (0.25f * logf (a)) * I;
-	return w;
-
-ovrf:
-	// FIXME
-	w = MAXNUMF + MAXNUMF * I;
+	w = CMPLXF(w, 0.25f * logf(a));
 	return w;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/catanh.c b/src/components/lib/libc/musl-1.2.0/src/complex/catanh.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/complex/catanh.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/catanh.c
index e248d9b934..c324c7f2bc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/catanh.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/catanh.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 /* atanh = -i atan(i z) */
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/catanhf.c b/src/components/lib/libc/musl-1.2.0/src/complex/catanhf.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/complex/catanhf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/catanhf.c
index 4a5eb04079..b0505f6054 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/catanhf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/catanhf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex catanhf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/catanhl.c b/src/components/lib/libc/musl-1.2.0/src/complex/catanhl.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/catanhl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/catanhl.c
index a5dd538e44..6025c41405 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/catanhl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/catanhl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex catanhl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/catanl.c b/src/components/lib/libc/musl-1.2.0/src/complex/catanl.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/complex/catanl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/catanl.c
index 5ace7704fd..e62526c006 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/catanl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/catanl.c
@@ -59,7 +59,7 @@
 
 #include <complex.h>
 #include <float.h>
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex catanl(long double complex z)
@@ -97,30 +97,18 @@ long double complex catanl(long double complex z)
 	x = creall(z);
 	y = cimagl(z);
 
-	if ((x == 0.0L) && (y > 1.0L))
-		goto ovrf;
-
 	x2 = x * x;
 	a = 1.0L - x2 - (y * y);
-	if (a == 0.0L)
-		goto ovrf;
 
 	t = atan2l(2.0L * x, a) * 0.5L;
 	w = redupil(t);
 
 	t = y - 1.0L;
 	a = x2 + (t * t);
-	if (a == 0.0L)
-		goto ovrf;
 
 	t = y + 1.0L;
 	a = (x2 + (t * t)) / a;
-	w = w + (0.25L * logl(a)) * I;
-	return w;
-
-ovrf:
-	// FIXME
-	w = LDBL_MAX + LDBL_MAX * I;
+	w = CMPLXF(w, 0.25L * logl(a));
 	return w;
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ccos.c b/src/components/lib/libc/musl-1.2.0/src/complex/ccos.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ccos.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ccos.c
index 645aec29a9..f32e1fadfb 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ccos.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ccos.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 /* cos(z) = cosh(i z) */
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ccosf.c b/src/components/lib/libc/musl-1.2.0/src/complex/ccosf.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ccosf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ccosf.c
index 9a67241f1c..490be9b3f2 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ccosf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ccosf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex ccosf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ccosh.c b/src/components/lib/libc/musl-1.2.0/src/complex/ccosh.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ccosh.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ccosh.c
index 401f3c6042..c995da7bb2 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ccosh.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ccosh.c
@@ -34,7 +34,7 @@
  * These values and the return value were taken from n1124.pdf.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const double huge = 0x1p1023;
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ccoshf.c b/src/components/lib/libc/musl-1.2.0/src/complex/ccoshf.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ccoshf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ccoshf.c
index 90acfe0582..189ce946dd 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ccoshf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ccoshf.c
@@ -28,7 +28,7 @@
  * Hyperbolic cosine of a complex argument.  See s_ccosh.c for details.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const float huge = 0x1p127;
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ccoshl.c b/src/components/lib/libc/musl-1.2.0/src/complex/ccoshl.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ccoshl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ccoshl.c
index 9b2aed9ef1..ffb4d8a146 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ccoshl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ccoshl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 //FIXME
 long double complex ccoshl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ccosl.c b/src/components/lib/libc/musl-1.2.0/src/complex/ccosl.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ccosl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ccosl.c
index d787047fec..2530006bfc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ccosl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ccosl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex ccosl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cexp.c b/src/components/lib/libc/musl-1.2.0/src/complex/cexp.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cexp.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cexp.c
index 5118e00ea5..7fb489bb93 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cexp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cexp.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const uint32_t
 exp_ovfl  = 0x40862e42,  /* high bits of MAX_EXP * ln2 ~= 710 */
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cexpf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cexpf.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cexpf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cexpf.c
index 1a09964cbb..00d258f3fc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cexpf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cexpf.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const uint32_t
 exp_ovfl  = 0x42b17218,  /* MAX_EXP * ln2 ~= 88.722839355 */
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cexpl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cexpl.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cexpl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cexpl.c
index a27f85c052..d4df950e33 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cexpl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cexpl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 //FIXME
 long double complex cexpl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cimag.c b/src/components/lib/libc/musl-1.2.0/src/complex/cimag.c
new file mode 100644
index 0000000000..d6b0e6838c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cimag.c
@@ -0,0 +1,6 @@
+#include "complex_impl.h"
+
+double (cimag)(double complex z)
+{
+	return cimag(z);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cimagf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cimagf.c
new file mode 100644
index 0000000000..b7166dcfa9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cimagf.c
@@ -0,0 +1,6 @@
+#include "complex_impl.h"
+
+float (cimagf)(float complex z)
+{
+	return cimagf(z);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/complex/cimagl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cimagl.c
new file mode 100644
index 0000000000..4db77f201e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cimagl.c
@@ -0,0 +1,6 @@
+#include "complex_impl.h"
+
+long double (cimagl)(long double complex z)
+{
+	return cimagl(z);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/clog.c b/src/components/lib/libc/musl-1.2.0/src/complex/clog.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/complex/clog.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/clog.c
index 12aae9c7e9..b587c2915a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/clog.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/clog.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 // FIXME
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/clogf.c b/src/components/lib/libc/musl-1.2.0/src/complex/clogf.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/complex/clogf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/clogf.c
index e9b32e6087..0389d47230 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/clogf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/clogf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 // FIXME
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/clogl.c b/src/components/lib/libc/musl-1.2.0/src/complex/clogl.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/clogl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/clogl.c
index 18f16088d7..88e83e87c9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/clogl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/clogl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex clogl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/conj.c b/src/components/lib/libc/musl-1.2.0/src/complex/conj.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/complex/conj.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/conj.c
index 0b3f5f4630..a3b19a4aa9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/conj.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/conj.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 double complex conj(double complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/conjf.c b/src/components/lib/libc/musl-1.2.0/src/complex/conjf.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/complex/conjf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/conjf.c
index 9af6b2c3b4..b2195c8401 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/conjf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/conjf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex conjf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/conjl.c b/src/components/lib/libc/musl-1.2.0/src/complex/conjl.c
similarity index 78%
rename from src/components/lib/libc/musl-1.1.11/src/complex/conjl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/conjl.c
index 67f11b9dde..87a4ebecc3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/conjl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/conjl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 long double complex conjl(long double complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cpow.c b/src/components/lib/libc/musl-1.2.0/src/complex/cpow.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cpow.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cpow.c
index f863588fe7..1137d39117 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cpow.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cpow.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 /* pow(z, c) = exp(c log(z)), See C99 G.6.4.1 */
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cpowf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cpowf.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cpowf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cpowf.c
index 53c65dcb11..f3fd4b7b77 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cpowf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cpowf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex cpowf(float complex z, float complex c)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cpowl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cpowl.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cpowl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cpowl.c
index c1a80a7b25..be36f04613 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cpowl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cpowl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex cpowl(long double complex z, long double complex c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cproj.c b/src/components/lib/libc/musl-1.2.0/src/complex/cproj.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cproj.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cproj.c
index 15f358a14f..9ae1e17c0d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cproj.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cproj.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 double complex cproj(double complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cprojf.c b/src/components/lib/libc/musl-1.2.0/src/complex/cprojf.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cprojf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cprojf.c
index 653be5e87c..03fab339d9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cprojf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cprojf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex cprojf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/cprojl.c b/src/components/lib/libc/musl-1.2.0/src/complex/cprojl.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/cprojl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/cprojl.c
index 6731aaa2aa..38a494c5c4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/cprojl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/cprojl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex cprojl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/creal.c b/src/components/lib/libc/musl-1.2.0/src/complex/creal.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/complex/creal.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/creal.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/crealf.c b/src/components/lib/libc/musl-1.2.0/src/complex/crealf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/complex/crealf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/crealf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/creall.c b/src/components/lib/libc/musl-1.2.0/src/complex/creall.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/complex/creall.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/creall.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csin.c b/src/components/lib/libc/musl-1.2.0/src/complex/csin.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csin.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csin.c
index ad8ae67ad9..535c4bf8b0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csin.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csin.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 /* sin(z) = -i sinh(i z) */
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csinf.c b/src/components/lib/libc/musl-1.2.0/src/complex/csinf.c
similarity index 82%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csinf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csinf.c
index 60b3cbaa86..69f5164eb9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csinf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csinf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex csinf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csinh.c b/src/components/lib/libc/musl-1.2.0/src/complex/csinh.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csinh.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csinh.c
index 0f8035d1ca..eda0ab59f4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csinh.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csinh.c
@@ -34,7 +34,7 @@
  * These values and the return value were taken from n1124.pdf.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const double huge = 0x1p1023;
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csinhf.c b/src/components/lib/libc/musl-1.2.0/src/complex/csinhf.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csinhf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csinhf.c
index 49697f02f4..eb1d98c524 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csinhf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csinhf.c
@@ -28,7 +28,7 @@
  * Hyperbolic sine of a complex argument z.  See s_csinh.c for details.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 static const float huge = 0x1p127;
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csinhl.c b/src/components/lib/libc/musl-1.2.0/src/complex/csinhl.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csinhl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csinhl.c
index c566653b33..09fd18f931 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csinhl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csinhl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 //FIXME
 long double complex csinhl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csinl.c b/src/components/lib/libc/musl-1.2.0/src/complex/csinl.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csinl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csinl.c
index 4e9f86c3ae..90a4eb3777 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csinl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csinl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex csinl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csqrt.c b/src/components/lib/libc/musl-1.2.0/src/complex/csqrt.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csqrt.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csqrt.c
index 8a2ba60801..c36de00196 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csqrt.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csqrt.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 /*
  * gcc doesn't implement complex multiplication or division correctly,
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csqrtf.c b/src/components/lib/libc/musl-1.2.0/src/complex/csqrtf.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csqrtf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csqrtf.c
index ab5102f035..a6163974da 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csqrtf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csqrtf.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 /*
  * gcc doesn't implement complex multiplication or division correctly,
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/csqrtl.c b/src/components/lib/libc/musl-1.2.0/src/complex/csqrtl.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/complex/csqrtl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/csqrtl.c
index 0600ef3beb..2253937904 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/csqrtl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/csqrtl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 //FIXME
 long double complex csqrtl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ctan.c b/src/components/lib/libc/musl-1.2.0/src/complex/ctan.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ctan.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ctan.c
index c09263744b..918717bfcc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ctan.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ctan.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 /* tan(z) = -i tanh(i z) */
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ctanf.c b/src/components/lib/libc/musl-1.2.0/src/complex/ctanf.c
similarity index 82%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ctanf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ctanf.c
index 009b1921ba..04c3ff198a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ctanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ctanf.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex ctanf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ctanh.c b/src/components/lib/libc/musl-1.2.0/src/complex/ctanh.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ctanh.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ctanh.c
index 3ba3a8997d..54004cd7dc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ctanh.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ctanh.c
@@ -63,7 +63,7 @@
  *   precision.  I also handle large x differently.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 double complex ctanh(double complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ctanhf.c b/src/components/lib/libc/musl-1.2.0/src/complex/ctanhf.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ctanhf.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ctanhf.c
index 72b76da075..7f422ba7fd 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ctanhf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ctanhf.c
@@ -28,7 +28,7 @@
  * Hyperbolic tangent of a complex argument z.  See s_ctanh.c for details.
  */
 
-#include "libm.h"
+#include "complex_impl.h"
 
 float complex ctanhf(float complex z)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ctanhl.c b/src/components/lib/libc/musl-1.2.0/src/complex/ctanhl.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ctanhl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ctanhl.c
index 89a75d1334..45d5862c8b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ctanhl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ctanhl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 //FIXME
 long double complex ctanhl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/complex/ctanl.c b/src/components/lib/libc/musl-1.2.0/src/complex/ctanl.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/complex/ctanl.c
rename to src/components/lib/libc/musl-1.2.0/src/complex/ctanl.c
index ac1c3e0ad8..4b87420d8a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/complex/ctanl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/complex/ctanl.c
@@ -1,4 +1,4 @@
-#include "libm.h"
+#include "complex_impl.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double complex ctanl(long double complex z)
diff --git a/src/components/lib/libc/musl-1.1.11/src/conf/confstr.c b/src/components/lib/libc/musl-1.2.0/src/conf/confstr.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/conf/confstr.c
rename to src/components/lib/libc/musl-1.2.0/src/conf/confstr.c
index 6e9c23a081..02cb1aa252 100644
--- a/src/components/lib/libc/musl-1.1.11/src/conf/confstr.c
+++ b/src/components/lib/libc/musl-1.2.0/src/conf/confstr.c
@@ -7,7 +7,7 @@ size_t confstr(int name, char *buf, size_t len)
 	const char *s = "";
 	if (!name) {
 		s = "/bin:/usr/bin";
-	} else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>31U) {
+	} else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>33U) {
 		errno = EINVAL;
 		return 0;
 	}
diff --git a/src/components/lib/libc/musl-1.1.11/src/conf/fpathconf.c b/src/components/lib/libc/musl-1.2.0/src/conf/fpathconf.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/conf/fpathconf.c
rename to src/components/lib/libc/musl-1.2.0/src/conf/fpathconf.c
index 8eb037e6b1..e6aca5cffe 100644
--- a/src/components/lib/libc/musl-1.1.11/src/conf/fpathconf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/conf/fpathconf.c
@@ -24,7 +24,7 @@ long fpathconf(int fd, int name)
 		[_PC_REC_MIN_XFER_SIZE] = 4096,
 		[_PC_REC_XFER_ALIGN] = 4096,
 		[_PC_ALLOC_SIZE_MIN] = 4096,
-		[_PC_SYMLINK_MAX] = SYMLINK_MAX,
+		[_PC_SYMLINK_MAX] = -1,
 		[_PC_2_SYMLINKS] = 1
 	};
 	if (name >= sizeof(values)/sizeof(values[0])) {
diff --git a/src/components/lib/libc/musl-1.1.11/src/conf/legacy.c b/src/components/lib/libc/musl-1.2.0/src/conf/legacy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/conf/legacy.c
rename to src/components/lib/libc/musl-1.2.0/src/conf/legacy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/conf/pathconf.c b/src/components/lib/libc/musl-1.2.0/src/conf/pathconf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/conf/pathconf.c
rename to src/components/lib/libc/musl-1.2.0/src/conf/pathconf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/conf/sysconf.c b/src/components/lib/libc/musl-1.2.0/src/conf/sysconf.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/conf/sysconf.c
rename to src/components/lib/libc/musl-1.2.0/src/conf/sysconf.c
index b8b761d01a..3baaed3226 100644
--- a/src/components/lib/libc/musl-1.1.11/src/conf/sysconf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/conf/sysconf.c
@@ -18,6 +18,7 @@
 #define JT_PHYS_PAGES JT(8)
 #define JT_AVPHYS_PAGES JT(9)
 #define JT_ZERO JT(10)
+#define JT_DELAYTIMER_MAX JT(11)
 
 #define RLIM(x) (-32768|(RLIMIT_ ## x))
 
@@ -33,7 +34,7 @@ long sysconf(int name)
 		[_SC_TZNAME_MAX] = TZNAME_MAX,
 		[_SC_JOB_CONTROL] = 1,
 		[_SC_SAVED_IDS] = 1,
-		[_SC_REALTIME_SIGNALS] = 1,
+		[_SC_REALTIME_SIGNALS] = VER,
 		[_SC_PRIORITY_SCHEDULING] = -1,
 		[_SC_TIMERS] = VER,
 		[_SC_ASYNCHRONOUS_IO] = VER,
@@ -50,7 +51,7 @@ long sysconf(int name)
 		[_SC_AIO_LISTIO_MAX] = -1,
 		[_SC_AIO_MAX] = -1,
 		[_SC_AIO_PRIO_DELTA_MAX] = JT_ZERO, /* ?? */
-		[_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX,
+		[_SC_DELAYTIMER_MAX] = JT_DELAYTIMER_MAX,
 		[_SC_MQ_OPEN_MAX] = -1,
 		[_SC_MQ_PRIO_MAX] = JT_MQ_PRIO_MAX,
 		[_SC_VERSION] = VER,
@@ -111,8 +112,8 @@ long sysconf(int name)
 		[_SC_XOPEN_XPG4] = -1,
 		[_SC_NZERO] = NZERO,
 		[_SC_XBS5_ILP32_OFF32] = -1,
-		[_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-		[_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+		[_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+		[_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
 		[_SC_XBS5_LPBIG_OFFBIG] = -1,
 		[_SC_XOPEN_LEGACY] = -1,
 		[_SC_XOPEN_REALTIME] = -1,
@@ -141,8 +142,8 @@ long sysconf(int name)
 		[_SC_STREAMS] = JT_ZERO,
 		[_SC_2_PBS_CHECKPOINT] = -1,
 		[_SC_V6_ILP32_OFF32] = -1,
-		[_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-		[_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+		[_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+		[_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
 		[_SC_V6_LPBIG_OFFBIG] = -1,
 		[_SC_HOST_NAME_MAX] = HOST_NAME_MAX,
 		[_SC_TRACE] = -1,
@@ -153,8 +154,8 @@ long sysconf(int name)
 		[_SC_IPV6] = VER,
 		[_SC_RAW_SOCKETS] = VER,
 		[_SC_V7_ILP32_OFF32] = -1,
-		[_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO,
-		[_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO,
+		[_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+		[_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
 		[_SC_V7_LPBIG_OFFBIG] = -1,
 		[_SC_SS_REPL_MAX] = -1,
 		[_SC_TRACE_EVENT_NAME_MAX] = -1,
@@ -174,6 +175,8 @@ long sysconf(int name)
 	} else if (values[name] < -256) {
 		struct rlimit lim;
 		getrlimit(values[name]&16383, &lim);
+		if (lim.rlim_cur == RLIM_INFINITY)
+			return -1;
 		return lim.rlim_cur > LONG_MAX ? LONG_MAX : lim.rlim_cur;
 	}
 
@@ -188,6 +191,8 @@ long sysconf(int name)
 		return PAGE_SIZE;
 	case JT_SEM_VALUE_MAX & 255:
 		return SEM_VALUE_MAX;
+	case JT_DELAYTIMER_MAX & 255:
+		return DELAYTIMER_MAX;
 	case JT_NPROCESSORS_CONF & 255:
 	case JT_NPROCESSORS_ONLN & 255: ;
 		unsigned char set[128] = {1};
@@ -199,7 +204,6 @@ long sysconf(int name)
 	case JT_PHYS_PAGES & 255:
 	case JT_AVPHYS_PAGES & 255: ;
 		unsigned long long mem;
-		int __lsysinfo(struct sysinfo *);
 		struct sysinfo si;
 		__lsysinfo(&si);
 		if (!si.mem_unit) si.mem_unit = 1;
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt.c b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/crypt/crypt.c
rename to src/components/lib/libc/musl-1.2.0/src/crypt/crypt.c
index 46500737b6..e6237e397f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt.c
+++ b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt.c
@@ -1,8 +1,6 @@
 #include <unistd.h>
 #include <crypt.h>
 
-char *__crypt_r(const char *, const char *, struct crypt_data *);
-
 char *crypt(const char *key, const char *salt)
 {
 	/* This buffer is sufficiently large for all
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_blowfish.c b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_blowfish.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/crypt/crypt_blowfish.c
rename to src/components/lib/libc/musl-1.2.0/src/crypt/crypt_blowfish.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_des.c b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_des.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/crypt/crypt_des.c
rename to src/components/lib/libc/musl-1.2.0/src/crypt/crypt_des.c
index d5766a7afc..338a8f3715 100644
--- a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_des.c
+++ b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_des.c
@@ -56,9 +56,7 @@
 #include <stdint.h>
 #include <string.h>
 
-struct expanded_key {
-	uint32_t l[16], r[16];
-};
+#include "crypt_des.h"
 
 #define _PASSWORD_EFMT1 '_'
 
diff --git a/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_des.h b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_des.h
new file mode 100644
index 0000000000..96748b5630
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_des.h
@@ -0,0 +1,14 @@
+#ifndef CRYPT_DES_H
+#define CRYPT_DES_H
+
+#include <stdint.h>
+
+struct expanded_key {
+	uint32_t l[16], r[16];
+};
+
+hidden void __des_setkey(const unsigned char *, struct expanded_key *);
+hidden void __do_des(uint32_t, uint32_t, uint32_t *, uint32_t *,
+                     uint32_t, uint32_t, const struct expanded_key *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_md5.c b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_md5.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/crypt/crypt_md5.c
rename to src/components/lib/libc/musl-1.2.0/src/crypt/crypt_md5.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_r.c b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_r.c
new file mode 100644
index 0000000000..db6015e236
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_r.c
@@ -0,0 +1,23 @@
+#include <crypt.h>
+
+char *__crypt_r(const char *key, const char *salt, struct crypt_data *data)
+{
+	/* Per the crypt_r API, the caller has provided a pointer to
+	 * struct crypt_data; however, this implementation does not
+	 * use the structure to store any internal state, and treats
+	 * it purely as a char buffer for storing the result. */
+	char *output = (char *)data;
+	if (salt[0] == '$' && salt[1] && salt[2]) {
+		if (salt[1] == '1' && salt[2] == '$')
+			return __crypt_md5(key, salt, output);
+		if (salt[1] == '2' && salt[3] == '$')
+			return __crypt_blowfish(key, salt, output);
+		if (salt[1] == '5' && salt[2] == '$')
+			return __crypt_sha256(key, salt, output);
+		if (salt[1] == '6' && salt[2] == '$')
+			return __crypt_sha512(key, salt, output);
+	}
+	return __crypt_des(key, salt, output);
+}
+
+weak_alias(__crypt_r, crypt_r);
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_sha256.c b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_sha256.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/crypt/crypt_sha256.c
rename to src/components/lib/libc/musl-1.2.0/src/crypt/crypt_sha256.c
index d5f0b786df..e885dc68e3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_sha256.c
+++ b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_sha256.c
@@ -230,7 +230,7 @@ static char *sha256crypt(const char *key, const char *setting, char *output)
 		if (u < ROUNDS_MIN)
 			r = ROUNDS_MIN;
 		else if (u > ROUNDS_MAX)
-			r = ROUNDS_MAX;
+			return 0;
 		else
 			r = u;
 		/* needed when rounds is zero prefixed or out of bounds */
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_sha512.c b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_sha512.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/crypt/crypt_sha512.c
rename to src/components/lib/libc/musl-1.2.0/src/crypt/crypt_sha512.c
index 1294e98be7..39970cafe8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/crypt/crypt_sha512.c
+++ b/src/components/lib/libc/musl-1.2.0/src/crypt/crypt_sha512.c
@@ -252,7 +252,7 @@ static char *sha512crypt(const char *key, const char *setting, char *output)
 		if (u < ROUNDS_MIN)
 			r = ROUNDS_MIN;
 		else if (u > ROUNDS_MAX)
-			r = ROUNDS_MAX;
+			return 0;
 		else
 			r = u;
 		/* needed when rounds is zero prefixed or out of bounds */
diff --git a/src/components/lib/libc/musl-1.1.11/src/crypt/encrypt.c b/src/components/lib/libc/musl-1.2.0/src/crypt/encrypt.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/crypt/encrypt.c
rename to src/components/lib/libc/musl-1.2.0/src/crypt/encrypt.c
index 9332a6dee1..216abc919b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/crypt/encrypt.c
+++ b/src/components/lib/libc/musl-1.2.0/src/crypt/encrypt.c
@@ -2,15 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-struct expanded_key {
-        uint32_t l[16], r[16];
-};
-
-void __des_setkey(const unsigned char *key, struct expanded_key *ekey);
-void __do_des(uint32_t l_in, uint32_t r_in,
-    uint32_t *l_out, uint32_t *r_out,
-    uint32_t count, uint32_t saltbits, const struct expanded_key *ekey);
-
+#include "crypt_des.h"
 
 static struct expanded_key __encrypt_key;
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_b_loc.c b/src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_b_loc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_b_loc.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_b_loc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_get_mb_cur_max.c b/src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_get_mb_cur_max.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_get_mb_cur_max.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_get_mb_cur_max.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_tolower_loc.c b/src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_tolower_loc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_tolower_loc.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_tolower_loc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_toupper_loc.c b/src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_toupper_loc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/__ctype_toupper_loc.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/__ctype_toupper_loc.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/ctype/alpha.h b/src/components/lib/libc/musl-1.2.0/src/ctype/alpha.h
new file mode 100644
index 0000000000..4167f3876c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/alpha.h
@@ -0,0 +1,172 @@
+18,17,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,17,34,35,36,17,37,38,39,40,
+41,42,43,44,17,45,46,47,16,16,48,16,16,16,16,16,16,16,49,50,51,16,52,53,16,16,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,54,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,55,17,17,17,17,56,17,57,58,59,60,61,62,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,63,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,64,65,17,66,67,
+68,69,70,71,72,73,74,17,75,76,77,78,79,80,81,16,82,83,84,85,86,87,88,89,90,91,
+92,93,16,94,95,96,16,17,17,17,97,98,99,16,16,16,16,16,16,16,16,16,16,17,17,17,
+17,100,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,101,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,17,17,102,103,16,16,104,105,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,106,17,17,107,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,
+108,109,16,16,16,16,16,16,16,16,16,110,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,111,112,113,114,16,16,16,16,16,16,16,16,115,116,
+117,16,16,16,16,16,118,119,16,16,16,16,120,16,16,121,16,16,16,16,16,16,16,16,
+16,16,16,16,16,
+16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,254,255,255,7,254,
+255,255,7,0,0,0,0,0,4,32,4,255,255,127,255,255,255,127,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,195,255,3,0,31,80,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,223,188,64,215,255,255,
+251,255,255,255,255,255,255,255,255,255,191,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,3,252,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,254,255,255,255,127,2,255,255,255,
+255,255,1,0,0,0,0,255,191,182,0,255,255,255,135,7,0,0,0,255,7,255,255,255,255,
+255,255,255,254,255,195,255,255,255,255,255,255,255,255,255,255,255,255,239,
+31,254,225,255,
+159,0,0,255,255,255,255,255,255,0,224,255,255,255,255,255,255,255,255,255,255,
+255,255,3,0,255,255,255,255,255,7,48,4,255,255,255,252,255,31,0,0,255,255,255,
+1,255,7,0,0,0,0,0,0,255,255,223,63,0,0,240,255,248,3,255,255,255,255,255,255,
+255,255,255,239,255,223,225,255,207,255,254,255,239,159,249,255,255,253,197,
+227,159,89,128,176,207,255,3,16,238,135,249,255,255,253,109,195,135,25,2,94,
+192,255,63,0,238,191,251,255,255,253,237,227,191,27,1,0,207,255,0,30,238,159,
+249,255,255,253,237,227,159,25,192,176,207,255,2,0,236,199,61,214,24,199,255,
+195,199,29,129,0,192,255,0,0,239,223,253,255,255,253,255,227,223,29,96,7,207,
+255,0,0,239,223,253,255,255,253,239,227,223,29,96,64,207,255,6,0,239,223,253,
+255,255,255,255,231,223,93,240,128,207,255,0,252,236,255,127,252,255,255,251,
+47,127,128,95,255,192,255,12,0,254,255,255,255,255,127,255,7,63,32,255,3,0,0,
+0,0,214,247,255,255,175,255,255,59,95,32,255,243,0,0,0,
+0,1,0,0,0,255,3,0,0,255,254,255,255,255,31,254,255,3,255,255,254,255,255,255,
+31,0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,249,255,3,255,255,255,255,255,
+255,255,255,255,63,255,255,255,255,191,32,255,255,255,255,255,247,255,255,255,
+255,255,255,255,255,255,61,127,61,255,255,255,255,255,61,255,255,255,255,61,
+127,61,255,127,255,255,255,255,255,255,255,61,255,255,255,255,255,255,255,255,
+7,0,0,0,0,255,255,0,0,255,255,255,255,255,255,255,255,255,255,63,63,254,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,159,255,255,254,255,255,7,255,255,255,255,255,255,255,255,
+255,199,255,1,255,223,15,0,255,255,15,0,255,255,15,0,255,223,13,0,255,255,255,
+255,255,255,207,255,255,1,128,16,255,3,0,0,0,0,255,3,255,255,255,255,255,255,
+255,255,255,255,255,1,255,255,255,255,255,7,255,255,255,255,255,255,255,255,
+63,
+0,255,255,255,127,255,15,255,1,192,255,255,255,255,63,31,0,255,255,255,255,
+255,15,255,255,255,3,255,3,0,0,0,0,255,255,255,15,255,255,255,255,255,255,255,
+127,254,255,31,0,255,3,255,3,128,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,
+255,239,255,239,15,255,3,0,0,0,0,255,255,255,255,255,243,255,255,255,255,255,
+255,191,255,3,0,255,255,255,255,255,255,127,0,255,227,255,255,255,255,255,63,
+255,1,255,255,255,255,255,231,0,0,0,0,0,222,111,4,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,
+128,255,31,0,255,255,63,63,255,255,255,255,63,63,255,170,255,255,255,63,255,
+255,255,255,255,255,223,95,220,31,207,15,255,31,220,31,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2,128,0,0,255,31,0,0,0,0,0,0,0,0,0,0,0,0,132,252,47,62,80,189,255,243,
+224,67,0,0,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,255,255,255,255,255,255,3,0,
+0,255,255,255,255,255,127,255,255,255,255,255,127,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,31,120,12,0,255,255,255,255,191,32,255,
+255,255,255,255,255,255,128,0,0,255,255,127,0,127,127,127,127,127,127,127,127,
+255,255,255,255,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,224,0,0,0,254,3,62,31,254,255,255,255,255,255,255,255,255,255,127,224,254,
+255,255,255,255,255,255,255,255,255,255,247,224,255,255,255,255,255,254,255,
+255,255,255,255,255,255,255,255,255,127,0,0,255,255,255,7,0,0,0,0,0,0,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,63,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,
+0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,31,0,0,
+0,0,0,0,0,0,255,255,255,255,255,63,255,31,255,255,255,15,0,0,255,255,255,255,
+255,127,240,143,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,
+0,128,255,252,255,255,255,255,255,255,255,255,255,255,255,255,249,255,255,255,
+255,255,255,124,0,0,0,0,0,128,255,191,255,255,255,255,0,0,0,255,255,255,255,
+255,255,15,0,255,255,255,255,255,255,255,255,47,0,255,3,0,0,252,232,255,255,
+255,255,255,7,255,255,255,255,7,0,255,255,255,31,255,255,255,255,255,255,247,
+255,0,128,255,3,255,255,255,127,255,255,255,255,255,255,127,0,255,63,255,3,
+255,255,127,252,255,255,255,255,255,255,255,127,5,0,0,56,255,255,60,0,126,126,
+126,0,127,127,255,255,255,255,255,247,255,0,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,7,255,3,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,15,0,255,255,127,248,255,255,255,255,
+255,
+15,255,255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255,255,255,
+255,255,255,255,255,255,255,255,3,0,0,0,0,127,0,248,224,255,253,127,95,219,
+255,255,255,255,255,255,255,255,255,255,255,255,255,3,0,0,0,248,255,255,255,
+255,255,255,255,255,255,255,255,255,63,0,0,255,255,255,255,255,255,255,255,
+252,255,255,255,255,255,255,0,0,0,0,0,255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,223,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,31,0,0,255,3,
+254,255,255,7,254,255,255,7,192,255,255,255,255,255,255,255,255,255,255,127,
+252,252,252,28,0,0,0,0,255,239,255,255,127,255,255,183,255,63,255,63,0,0,0,0,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,7,0,0,0,0,0,0,0,0,
+255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,255,255,255,31,255,255,255,255,255,255,1,0,0,0,0,
+0,255,255,255,255,0,224,255,255,255,7,255,255,255,255,255,7,255,255,255,63,
+255,255,255,255,15,255,62,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,63,255,3,255,255,255,255,15,255,255,255,
+255,15,255,255,255,255,255,0,255,255,255,255,255,255,15,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,0,255,255,63,0,255,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,63,253,255,255,255,255,191,145,255,255,63,0,255,255,
+127,0,255,255,255,127,0,0,0,0,0,0,0,0,255,255,55,0,255,255,63,0,255,255,255,3,
+0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,192,0,0,0,0,0,0,0,0,111,240,239,
+254,255,255,63,0,0,0,0,0,255,255,255,31,255,255,255,31,0,0,0,0,255,254,255,
+255,31,0,0,0,255,255,255,255,255,255,63,0,255,255,63,0,255,255,7,0,255,255,3,
+0,0,0,0,0,0,0,0,0,0,0,0,
+0,255,255,255,255,255,255,255,255,255,1,0,0,0,0,0,0,255,255,255,255,255,255,7,
+0,255,255,255,255,255,255,7,0,255,255,255,255,255,0,255,3,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,31,128,0,255,255,63,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,255,255,127,0,255,255,255,255,255,255,255,255,63,0,0,0,
+192,255,0,0,252,255,255,255,255,255,255,1,0,0,255,255,255,1,255,3,255,255,255,
+255,255,255,199,255,112,0,255,255,255,255,71,0,255,255,255,255,255,255,255,
+255,30,0,255,23,0,0,0,0,255,255,251,255,255,255,159,64,0,0,0,0,0,0,0,0,127,
+189,255,191,255,1,255,255,255,255,255,255,255,1,255,3,239,159,249,255,255,253,
+237,227,159,25,129,224,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,
+255,255,255,255,255,187,7,255,131,0,0,0,0,255,255,255,255,255,255,255,255,179,
+0,255,3,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,63,127,0,0,0,63,0,0,
+0,0,255,255,255,255,255,255,255,127,17,0,255,3,0,0,0,0,255,255,255,255,255,
+255,63,1,255,3,0,0,0,0,0,0,255,255,255,231,255,7,255,3,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,
+0,255,255,255,255,255,255,255,255,255,3,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,255,252,255,255,255,255,255,252,26,0,0,0,255,255,255,255,255,255,231,
+127,0,0,255,255,255,255,255,255,255,255,255,32,0,0,0,0,255,255,255,255,255,
+255,255,1,255,253,255,255,255,255,127,127,1,0,255,3,0,0,252,255,255,255,252,
+255,255,254,127,0,0,0,0,0,0,0,0,0,127,251,255,255,255,255,127,180,203,0,255,3,
+191,253,255,255,255,127,123,1,255,3,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,127,0,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,3,0,0,
+0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,127,0,
+0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,
+255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,
+255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,
+255,255,255,255,255,255,1,255,255,255,127,255,3,0,0,0,0,0,0,0,0,0,0,0,0,255,
+255,255,63,0,0,255,255,255,255,255,255,0,0,15,0,255,3,248,255,255,224,255,255,
+0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,255,255,255,255,255,255,255,255,255,135,255,255,255,255,255,255,255,128,
+255,255,0,0,0,0,0,0,0,0,11,0,0,0,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,7,0,255,255,255,127,0,0,0,0,0,
+0,7,0,240,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,255,255,255,255,
+255,255,255,255,255,255,255,255,255,7,255,31,255,1,255,67,0,0,0,0,0,0,0,0,0,0,
+0,0,255,255,255,255,255,255,255,255,255,255,223,255,255,255,255,255,255,255,
+255,223,100,222,255,235,239,255,255,255,255,255,255,
+255,191,231,223,223,255,255,255,123,95,252,253,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255,
+253,255,255,247,255,255,255,247,255,255,223,255,255,255,223,255,255,127,255,
+255,255,127,255,255,255,253,255,255,255,253,255,255,247,207,255,255,255,255,
+255,255,127,255,255,249,219,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,255,255,255,255,255,31,128,63,255,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,
+15,255,3,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,31,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,
+143,8,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,239,255,255,255,150,254,247,10,132,234,150,170,150,247,247,94,255,251,255,
+15,238,251,255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,3,255,
+255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.2.0/src/ctype/casemap.h b/src/components/lib/libc/musl-1.2.0/src/ctype/casemap.h
new file mode 100644
index 0000000000..6ee1209b96
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/casemap.h
@@ -0,0 +1,297 @@
+static const unsigned char tab[] = {
+	7, 8, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	13, 6, 6, 14, 6, 6, 6, 6, 6, 6, 6, 6, 15, 16, 17, 18,
+	6, 19, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 20, 21, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 22, 23, 6, 6, 6, 24, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 25,
+	6, 6, 6, 6, 26, 6, 6, 6, 6, 6, 6, 6, 27, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 28, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 29, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 30, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36,
+	43, 43, 43, 43, 43, 43, 43, 43, 1, 0, 84, 86, 86, 86, 86, 86,
+	86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 43, 43, 43, 43, 43, 43,
+	43, 7, 43, 43, 91, 86, 86, 86, 86, 86, 86, 86, 74, 86, 86, 5,
+	49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80,
+	36, 80, 121, 49, 80, 49, 80, 49, 56, 80, 49, 80, 49, 80, 49, 80,
+	49, 80, 49, 80, 49, 80, 49, 80, 78, 49, 2, 78, 13, 13, 78, 3,
+	78, 0, 36, 110, 0, 78, 49, 38, 110, 81, 78, 36, 80, 78, 57, 20,
+	129, 27, 29, 29, 83, 49, 80, 49, 80, 13, 49, 80, 49, 80, 49, 80,
+	27, 83, 36, 80, 49, 2, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123,
+	20, 121, 92, 123, 92, 123, 92, 45, 43, 73, 3, 72, 3, 120, 92, 123,
+	20, 0, 150, 10, 1, 43, 40, 6, 6, 0, 42, 6, 42, 42, 43, 7,
+	187, 181, 43, 30, 0, 43, 7, 43, 43, 43, 1, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 205, 70, 205, 43, 0, 37, 43, 7, 1, 6, 1, 85, 86, 86, 86,
+	86, 86, 85, 86, 86, 2, 36, 129, 129, 129, 129, 129, 21, 129, 129, 129,
+	0, 0, 43, 0, 178, 209, 178, 209, 178, 209, 178, 209, 0, 0, 205, 204,
+	1, 0, 215, 215, 215, 215, 215, 131, 129, 129, 129, 129, 129, 129, 129, 129,
+	129, 129, 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, 28, 0, 0, 0,
+	0, 0, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 2, 0, 0,
+	49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80,
+	49, 80, 78, 49, 80, 49, 80, 78, 49, 80, 49, 80, 49, 80, 49, 80,
+	49, 80, 49, 80, 49, 80, 49, 2, 135, 166, 135, 166, 135, 166, 135, 166,
+	135, 166, 135, 166, 135, 166, 135, 166, 42, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 0, 0, 0, 84, 86, 86, 86, 86, 86, 86, 86,
+	86, 86, 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 84, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+	12, 0, 12, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 7, 42, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 86, 86, 108, 129, 21, 0, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 7, 108, 3, 65, 43, 43, 86, 86, 86, 86, 86, 86,
+	86, 86, 86, 86, 86, 86, 86, 86, 44, 86, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 12, 108, 0, 0, 0, 0, 0, 6,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37,
+	6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37,
+	6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37,
+	6, 37, 6, 37, 6, 37, 6, 37, 86, 122, 158, 38, 6, 37, 6, 37,
+	6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37,
+	6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 1, 43, 43, 79, 86,
+	86, 44, 43, 127, 86, 86, 57, 43, 43, 85, 86, 86, 43, 43, 79, 86,
+	86, 44, 43, 127, 86, 86, 129, 55, 117, 91, 123, 92, 43, 43, 79, 86,
+	86, 2, 172, 4, 0, 0, 57, 43, 43, 85, 86, 86, 43, 43, 79, 86,
+	86, 44, 43, 43, 86, 86, 50, 19, 129, 87, 0, 111, 129, 126, 201, 215,
+	126, 45, 129, 129, 14, 126, 57, 127, 111, 87, 0, 129, 129, 126, 21, 0,
+	126, 3, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 43,
+	36, 43, 151, 43, 43, 43, 43, 43, 43, 43, 43, 43, 42, 43, 43, 43,
+	43, 43, 86, 86, 86, 86, 86, 128, 129, 129, 129, 129, 57, 187, 42, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 1, 129, 129, 129, 129, 129, 129, 129, 129,
+	129, 129, 129, 129, 129, 129, 129, 201, 172, 172, 172, 172, 172, 172, 172, 172,
+	172, 172, 172, 172, 172, 172, 172, 208, 13, 0, 78, 49, 2, 180, 193, 193,
+	215, 215, 36, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80,
+	49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80,
+	49, 80, 49, 80, 215, 215, 83, 193, 71, 212, 215, 215, 215, 5, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 1, 0, 1, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 49, 80, 49, 80, 49, 80,
+	49, 80, 49, 80, 49, 80, 49, 80, 13, 0, 0, 0, 0, 0, 36, 80,
+	49, 80, 49, 80, 49, 80, 49, 80, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 121, 92, 123, 92, 123, 79, 123, 92, 123, 92, 123,
+	92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 45,
+	43, 43, 121, 20, 92, 123, 92, 45, 121, 42, 92, 39, 92, 123, 92, 123,
+	92, 123, 164, 0, 10, 180, 92, 123, 92, 123, 79, 3, 42, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 43, 43, 43, 43, 43, 43, 43, 43, 7, 0, 72, 86, 86, 86, 86,
+	86, 86, 86, 86, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 85, 86, 86, 86, 86, 86, 86,
+	86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 36, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 7, 0, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 0, 0,
+	0, 0, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+	86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43, 86, 86, 86, 86, 86, 86, 86, 86,
+	86, 86, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 86, 86,
+	86, 86, 86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 85,
+	86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+static const int rules[] = {
+	0x0, 0x2001, -0x2000, 0x1dbf00, 0x2e700, 0x7900,
+	0x2402, 0x101, -0x100, 0x0, 0x201, -0x200,
+	-0xc6ff, -0xe800, -0x78ff, -0x12c00, 0xc300, 0xd201,
+	0xce01, 0xcd01, 0x4f01, 0xca01, 0xcb01, 0xcf01,
+	0x6100, 0xd301, 0xd101, 0xa300, 0xd501, 0x8200,
+	0xd601, 0xda01, 0xd901, 0xdb01, 0x3800, 0x3,
+	-0x4f00, -0x60ff, -0x37ff, 0x242802, 0x0, 0x101,
+	-0x100, -0xcd00, -0xda00, -0x81ff, 0x2a2b01, -0xa2ff,
+	0x2a2801, 0x2a3f00, -0xc2ff, 0x4501, 0x4701, 0x2a1f00,
+	0x2a1c00, 0x2a1e00, -0xd200, -0xce00, -0xca00, -0xcb00,
+	0xa54f00, 0xa54b00, -0xcf00, 0xa52800, 0xa54400, -0xd100,
+	-0xd300, 0x29f700, 0xa54100, 0x29fd00, -0xd500, -0xd600,
+	0x29e700, 0xa54300, 0xa52a00, -0x4500, -0xd900, -0x4700,
+	-0xdb00, 0xa51500, 0xa51200, 0x4c2402, 0x0, 0x2001,
+	-0x2000, 0x101, -0x100, 0x5400, 0x7401, 0x2601,
+	0x2501, 0x4001, 0x3f01, -0x2600, -0x2500, -0x1f00,
+	-0x4000, -0x3f00, 0x801, -0x3e00, -0x3900, -0x2f00,
+	-0x3600, -0x800, -0x5600, -0x5000, 0x700, -0x7400,
+	-0x3bff, -0x6000, -0x6ff, 0x701a02, 0x101, -0x100,
+	0x2001, -0x2000, 0x5001, 0xf01, -0xf00, 0x0,
+	0x3001, -0x3000, 0x101, -0x100, 0x0, 0xbc000,
+	0x1c6001, 0x0, 0x97d001, 0x801, -0x800, 0x8a0502,
+	0x0, -0xbbfff, -0x186200, 0x89c200, -0x182500, -0x186e00,
+	-0x186d00, -0x186400, -0x186300, -0x185c00, 0x0, 0x8a3800,
+	0x8a0400, 0xee600, 0x101, -0x100, 0x0, -0x3b00,
+	-0x1dbeff, 0x8f1d02, 0x800, -0x7ff, 0x0, 0x5600,
+	-0x55ff, 0x4a00, 0x6400, 0x8000, 0x7000, 0x7e00,
+	0x900, -0x49ff, -0x8ff, -0x1c2500, -0x63ff, -0x6fff,
+	-0x7fff, -0x7dff, 0xac0502, 0x0, 0x1001, -0x1000,
+	0x1c01, 0x101, -0x1d5cff, -0x20beff, -0x2045ff, -0x1c00,
+	0xb10b02, 0x101, -0x100, 0x3001, -0x3000, 0x0,
+	-0x29f6ff, -0xee5ff, -0x29e6ff, -0x2a2b00, -0x2a2800, -0x2a1bff,
+	-0x29fcff, -0x2a1eff, -0x2a1dff, -0x2a3eff, 0x0, -0x1c6000,
+	0x0, 0x101, -0x100, 0xbc0c02, 0x0, 0x101,
+	-0x100, -0xa543ff, 0x3a001, -0x8a03ff, -0xa527ff, 0x3000,
+	-0xa54eff, -0xa54aff, -0xa540ff, -0xa511ff, -0xa529ff, -0xa514ff,
+	-0x2fff, -0xa542ff, -0x8a37ff, 0x0, -0x97d000, -0x3a000,
+	0x0, 0x2001, -0x2000, 0x0, 0x2801, -0x2800,
+	0x0, 0x4001, -0x4000, 0x0, 0x2001, -0x2000,
+	0x0, 0x2001, -0x2000, 0x0, 0x2201, -0x2200,
+};
+static const unsigned char rulebases[] = {
+	0, 6, 39, 81, 111, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	124, 0, 0, 127, 0, 0, 0, 0, 0, 0, 0, 0, 131, 142, 146, 151,
+	0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, 196, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 198, 201, 0, 0, 0, 219, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222,
+	0, 0, 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, 228, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 231, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 234, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+static const unsigned char exceptions[][2] = {
+	{ 48, 12 }, { 49, 13 }, { 120, 14 }, { 127, 15 },
+	{ 128, 16 }, { 129, 17 }, { 134, 18 }, { 137, 19 },
+	{ 138, 19 }, { 142, 20 }, { 143, 21 }, { 144, 22 },
+	{ 147, 19 }, { 148, 23 }, { 149, 24 }, { 150, 25 },
+	{ 151, 26 }, { 154, 27 }, { 156, 25 }, { 157, 28 },
+	{ 158, 29 }, { 159, 30 }, { 166, 31 }, { 169, 31 },
+	{ 174, 31 }, { 177, 32 }, { 178, 32 }, { 183, 33 },
+	{ 191, 34 }, { 197, 35 }, { 200, 35 }, { 203, 35 },
+	{ 221, 36 }, { 242, 35 }, { 246, 37 }, { 247, 38 },
+	{ 32, 45 }, { 58, 46 }, { 61, 47 }, { 62, 48 },
+	{ 63, 49 }, { 64, 49 }, { 67, 50 }, { 68, 51 },
+	{ 69, 52 }, { 80, 53 }, { 81, 54 }, { 82, 55 },
+	{ 83, 56 }, { 84, 57 }, { 89, 58 }, { 91, 59 },
+	{ 92, 60 }, { 97, 61 }, { 99, 62 }, { 101, 63 },
+	{ 102, 64 }, { 104, 65 }, { 105, 66 }, { 106, 64 },
+	{ 107, 67 }, { 108, 68 }, { 111, 66 }, { 113, 69 },
+	{ 114, 70 }, { 117, 71 }, { 125, 72 }, { 130, 73 },
+	{ 135, 74 }, { 137, 75 }, { 138, 76 }, { 139, 76 },
+	{ 140, 77 }, { 146, 78 }, { 157, 79 }, { 158, 80 },
+	{ 69, 87 }, { 123, 29 }, { 124, 29 }, { 125, 29 },
+	{ 127, 88 }, { 134, 89 }, { 136, 90 }, { 137, 90 },
+	{ 138, 90 }, { 140, 91 }, { 142, 92 }, { 143, 92 },
+	{ 172, 93 }, { 173, 94 }, { 174, 94 }, { 175, 94 },
+	{ 194, 95 }, { 204, 96 }, { 205, 97 }, { 206, 97 },
+	{ 207, 98 }, { 208, 99 }, { 209, 100 }, { 213, 101 },
+	{ 214, 102 }, { 215, 103 }, { 240, 104 }, { 241, 105 },
+	{ 242, 106 }, { 243, 107 }, { 244, 108 }, { 245, 109 },
+	{ 249, 110 }, { 253, 45 }, { 254, 45 }, { 255, 45 },
+	{ 80, 105 }, { 81, 105 }, { 82, 105 }, { 83, 105 },
+	{ 84, 105 }, { 85, 105 }, { 86, 105 }, { 87, 105 },
+	{ 88, 105 }, { 89, 105 }, { 90, 105 }, { 91, 105 },
+	{ 92, 105 }, { 93, 105 }, { 94, 105 }, { 95, 105 },
+	{ 130, 0 }, { 131, 0 }, { 132, 0 }, { 133, 0 },
+	{ 134, 0 }, { 135, 0 }, { 136, 0 }, { 137, 0 },
+	{ 192, 117 }, { 207, 118 }, { 128, 137 }, { 129, 138 },
+	{ 130, 139 }, { 133, 140 }, { 134, 141 }, { 112, 157 },
+	{ 113, 157 }, { 118, 158 }, { 119, 158 }, { 120, 159 },
+	{ 121, 159 }, { 122, 160 }, { 123, 160 }, { 124, 161 },
+	{ 125, 161 }, { 179, 162 }, { 186, 163 }, { 187, 163 },
+	{ 188, 164 }, { 190, 165 }, { 195, 162 }, { 204, 164 },
+	{ 218, 166 }, { 219, 166 }, { 229, 106 }, { 234, 167 },
+	{ 235, 167 }, { 236, 110 }, { 243, 162 }, { 248, 168 },
+	{ 249, 168 }, { 250, 169 }, { 251, 169 }, { 252, 164 },
+	{ 38, 176 }, { 42, 177 }, { 43, 178 }, { 78, 179 },
+	{ 132, 8 }, { 98, 186 }, { 99, 187 }, { 100, 188 },
+	{ 101, 189 }, { 102, 190 }, { 109, 191 }, { 110, 192 },
+	{ 111, 193 }, { 112, 194 }, { 126, 195 }, { 127, 195 },
+	{ 125, 207 }, { 141, 208 }, { 148, 209 }, { 171, 210 },
+	{ 172, 211 }, { 173, 212 }, { 176, 213 }, { 177, 214 },
+	{ 178, 215 }, { 196, 216 }, { 197, 217 }, { 198, 218 },
+};
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isalnum.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isalnum.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isalnum.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isalnum.c
index 2214936f2b..8018a2bc7e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isalnum.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isalnum.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 
 int isalnum(int c)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isalpha.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isalpha.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isalpha.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isalpha.c
index f155d3aa97..a87a937598 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isalpha.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isalpha.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 #undef isalpha
 
 int isalpha(int c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isascii.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isascii.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isascii.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isascii.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isblank.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isblank.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isblank.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isblank.c
index 299120e96d..716da23a56 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isblank.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isblank.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 
 int isblank(int c)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iscntrl.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iscntrl.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iscntrl.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iscntrl.c
index cb4114a060..f27837ea53 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iscntrl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iscntrl.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 
 int iscntrl(int c)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isdigit.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isdigit.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isdigit.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isdigit.c
index 4d8a103e61..16beddb4ca 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isdigit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isdigit.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 #undef isdigit
 
 int isdigit(int c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isgraph.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isgraph.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isgraph.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isgraph.c
index a0aae08aab..292d1983ec 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isgraph.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isgraph.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 #undef isgraph
 
 int isgraph(int c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/islower.c b/src/components/lib/libc/musl-1.2.0/src/ctype/islower.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/islower.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/islower.c
index 02640213e5..c3fa74c4cb 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/islower.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/islower.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 #undef islower
 
 int islower(int c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isprint.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isprint.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isprint.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isprint.c
index 067275fa03..b950816bcb 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isprint.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isprint.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 #undef isprint
 
 int isprint(int c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/ispunct.c b/src/components/lib/libc/musl-1.2.0/src/ctype/ispunct.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/ispunct.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/ispunct.c
index e772d76a03..a491d5dc4b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/ispunct.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/ispunct.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 
 int ispunct(int c)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isspace.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isspace.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isspace.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isspace.c
index 231e90793d..428813e798 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isspace.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isspace.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 #undef isspace
 
 int isspace(int c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isupper.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isupper.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isupper.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isupper.c
index 68c36f4a42..bfd15acdbe 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isupper.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isupper.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 #undef isupper
 
 int isupper(int c)
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswalnum.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswalnum.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswalnum.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswalnum.c
index a6082da437..046c399c37 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswalnum.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswalnum.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 int iswalnum(wint_t wc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswalpha.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswalpha.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswalpha.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswalpha.c
index 00f9d81f5a..1c5485d2bf 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswalpha.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswalpha.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 static const unsigned char table[] = {
 #include "alpha.h"
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswblank.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswblank.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswblank.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswblank.c
index d9b33ef472..68c8800202 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswblank.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswblank.c
@@ -1,6 +1,5 @@
 #include <wctype.h>
 #include <ctype.h>
-#include "libc.h"
 
 int iswblank(wint_t wc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswcntrl.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswcntrl.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswcntrl.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswcntrl.c
index daace82a37..feccfcd5bc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswcntrl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswcntrl.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 int iswcntrl(wint_t wc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswctype.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswctype.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswctype.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswctype.c
index 3d9c2cc7c2..71b09b8d24 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswctype.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswctype.c
@@ -1,6 +1,5 @@
 #include <wctype.h>
 #include <string.h>
-#include "libc.h"
 
 #define WCTYPE_ALNUM  1
 #define WCTYPE_ALPHA  2
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswdigit.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswdigit.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswdigit.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswdigit.c
index ed9a88e740..db817edf7d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswdigit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswdigit.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 #undef iswdigit
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswgraph.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswgraph.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswgraph.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswgraph.c
index 0ea5ca3a4d..ecdf466c65 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswgraph.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswgraph.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 int iswgraph(wint_t wc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswlower.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswlower.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswlower.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswlower.c
index 79df44a3d6..f02a4362a8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswlower.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswlower.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 int iswlower(wint_t wc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswprint.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswprint.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswprint.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswprint.c
index 69856e0d8e..86f9d646ac 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswprint.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswprint.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 /* Consider all legal codepoints as printable except for:
  * - C0 and C1 control characters
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswpunct.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswpunct.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswpunct.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswpunct.c
index d88010463c..f0b9ea0a4b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswpunct.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswpunct.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 static const unsigned char table[] = {
 #include "punct.h"
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswspace.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswspace.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswspace.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswspace.c
index 75ae7e8ee3..263afa15c5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswspace.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswspace.c
@@ -1,6 +1,5 @@
 #include <wchar.h>
 #include <wctype.h>
-#include "libc.h"
 
 /* Our definition of whitespace is the Unicode White_Space property,
  * minus non-breaking spaces (U+00A0, U+2007, and U+202F) and script-
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswupper.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswupper.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswupper.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswupper.c
index 6e1e029c49..7e486665ee 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswupper.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswupper.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 int iswupper(wint_t wc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/iswxdigit.c b/src/components/lib/libc/musl-1.2.0/src/ctype/iswxdigit.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/iswxdigit.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/iswxdigit.c
index 1e27f1f0f9..62bc9e7439 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/iswxdigit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/iswxdigit.c
@@ -1,5 +1,4 @@
 #include <wctype.h>
-#include "libc.h"
 
 int iswxdigit(wint_t wc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/isxdigit.c b/src/components/lib/libc/musl-1.2.0/src/ctype/isxdigit.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/isxdigit.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/isxdigit.c
index 0e9152a7b0..aab1a745b6 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/isxdigit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/isxdigit.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 
 int isxdigit(int c)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/ctype/nonspacing.h b/src/components/lib/libc/musl-1.2.0/src/ctype/nonspacing.h
new file mode 100644
index 0000000000..5d05a3d1a0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/nonspacing.h
@@ -0,0 +1,89 @@
+16,16,16,18,19,20,21,22,23,24,25,26,27,28,29,30,31,16,16,32,16,16,16,33,34,35,
+36,37,38,39,16,16,40,16,16,16,16,16,16,16,16,16,16,16,41,42,16,16,43,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,44,16,45,46,47,48,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,49,16,16,50,
+51,16,52,53,54,16,16,16,16,16,16,55,16,16,56,16,57,58,59,60,61,62,63,64,65,66,
+67,68,16,69,70,71,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,72,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,73,74,16,16,16,75,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,76,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,77,78,16,16,16,16,16,16,16,79,16,16,16,16,16,80,81,82,16,16,16,16,16,83,
+84,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,248,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,254,255,255,255,255,191,182,0,0,0,0,0,0,0,63,0,255,23,0,0,0,0,0,248,255,
+255,0,0,1,0,0,0,0,0,0,0,0,0,0,0,192,191,159,61,0,0,0,128,2,0,0,0,255,255,255,
+7,0,0,0,0,0,0,0,0,0,0,192,255,1,0,0,0,0,0,0,248,15,32,0,0,192,251,239,62,0,0,
+0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,255,255,255,255,
+255,7,0,0,0,0,0,0,20,254,33,254,0,12,0,0,0,2,0,0,0,0,0,0,16,30,32,0,0,12,0,0,
+64,6,0,0,0,0,0,0,16,134,57,2,0,0,0,35,0,6,0,0,0,0,0,0,16,190,33,0,0,12,0,0,
+252,2,0,0,0,0,0,0,144,30,32,64,0,12,0,0,0,4,0,0,0,0,0,0,0,1,32,0,0,0,0,0,0,17,
+0,0,0,0,0,0,192,193,61,96,0,12,0,0,0,2,0,0,0,0,0,0,144,64,48,0,0,12,0,0,0,3,0,
+0,0,0,0,0,24,30,32,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,4,92,0,0,0,0,0,0,0,0,0,0,0,
+242,7,128,127,0,0,0,0,0,0,0,0,0,0,0,0,242,31,0,63,0,0,0,0,0,0,0,0,0,3,0,0,160,
+2,0,0,0,0,0,0,254,127,223,224,255,254,255,255,255,31,64,0,0,0,0,0,0,0,0,0,0,0,
+0,224,253,102,0,0,0,195,1,0,30,0,100,32,0,32,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,
+0,0,28,0,0,0,12,0,0,0,12,0,0,0,0,0,0,0,176,63,64,254,15,32,0,0,0,0,0,120,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,1,4,14,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,9,0,0,0,0,0,0,64,127,
+229,31,248,159,0,0,0,0,0,0,255,127,0,0,0,0,0,0,0,0,15,0,0,0,0,0,208,23,4,0,0,
+0,0,248,15,0,3,0,0,0,60,59,0,0,0,0,0,0,64,163,3,0,0,0,0,0,0,240,207,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,247,255,253,33,16,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,
+251,0,248,0,0,0,124,0,0,0,0,0,0,223,255,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,
+255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,3,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,
+0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,128,247,63,0,0,0,192,0,0,0,0,0,0,0,0,0,0,3,0,68,8,0,0,96,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,255,255,3,128,0,0,0,0,192,63,0,0,128,255,3,0,
+0,0,0,0,7,0,0,0,0,0,200,51,0,0,0,0,32,0,0,0,0,0,0,0,0,126,102,0,8,16,0,0,0,0,
+0,16,0,0,0,0,0,0,157,193,2,0,0,0,0,48,64,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,33,0,0,0,0,0,64,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,0,0,255,255,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,110,240,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,
+0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,192,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,255,
+127,0,0,0,0,0,0,128,3,0,0,0,0,0,120,38,0,32,0,0,0,0,0,0,7,0,0,0,128,239,31,0,
+0,0,0,0,0,0,8,0,3,0,0,0,0,0,192,127,0,30,0,0,0,0,0,0,0,0,0,0,0,128,211,64,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,248,7,0,0,3,0,0,0,0,0,0,24,1,0,0,0,192,
+31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,92,0,0,64,0,0,0,0,0,
+0,0,0,0,0,248,133,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,60,176,1,0,0,48,0,0,0,
+0,0,0,0,0,0,0,248,167,1,0,0,0,0,0,0,0,0,0,0,0,0,40,191,0,0,0,0,0,0,0,0,0,0,0,
+0,224,188,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+128,255,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,12,1,0,0,0,254,7,0,0,0,0,248,121,128,0,
+126,14,0,0,0,0,0,252,127,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,191,0,0,0,
+0,0,0,0,0,0,0,252,255,255,252,109,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,126,180,191,0,
+0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
+0,0,0,0,0,0,0,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,127,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,
+0,128,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,15,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,3,248,255,231,15,0,0,0,60,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,255,255,255,255,255,255,127,248,255,255,255,255,255,31,32,0,16,0,0,248,
+254,255,0,0,0,0,0,0,0,0,0,
+0,127,255,255,249,219,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,127,0,0,0,0,0,0,0,0,0,0,0,0,0,240,7,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.2.0/src/ctype/punct.h b/src/components/lib/libc/musl-1.2.0/src/ctype/punct.h
new file mode 100644
index 0000000000..67929470c9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/punct.h
@@ -0,0 +1,141 @@
+18,16,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,16,16,34,35,16,36,37,38,39,
+40,41,42,43,16,44,45,46,17,17,47,17,17,17,17,17,17,48,49,50,51,52,53,54,55,17,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,56,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,57,16,58,59,60,61,62,63,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,64,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,65,16,16,66,16,67,68,
+69,16,70,71,72,16,73,16,16,74,75,76,77,78,16,79,80,81,82,83,84,85,86,87,88,89,
+90,91,16,92,93,94,95,16,16,16,16,96,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,97,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,98,99,16,16,100,101,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,102,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,103,104,105,106,16,16,107,108,17,17,109,16,16,16,16,16,16,110,111,16,
+16,16,16,16,112,113,16,16,114,115,116,16,117,118,119,17,17,17,120,121,122,123,
+124,16,16,16,16,
+16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,254,255,0,252,1,0,0,248,1,
+0,0,120,0,0,0,0,255,251,223,251,0,0,128,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,60,0,252,255,224,175,255,255,255,255,255,255,255,255,
+255,255,223,255,255,255,255,255,32,64,176,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,252,0,0,0,0,0,230,254,255,255,255,0,64,73,0,0,0,0,0,24,0,255,255,0,216,
+0,0,0,0,0,0,0,1,0,60,0,0,0,0,0,0,0,0,0,0,0,0,16,224,1,30,0,
+96,255,191,0,0,0,0,0,0,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,207,
+227,0,0,0,3,0,32,255,127,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,7,252,0,0,0,
+0,0,0,0,0,0,16,0,32,30,0,48,0,1,0,0,0,0,0,0,0,0,16,0,32,0,0,0,0,252,111,0,0,0,
+0,0,0,0,16,0,32,0,0,0,0,64,0,0,0,0,0,0,0,0,16,0,32,0,0,0,0,3,224,0,0,0,0,0,0,
+0,16,0,32,0,0,0,0,253,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,255,7,16,0,0,0,0,0,0,0,0,
+32,0,0,0,0,128,255,16,0,0,0,0,0,0,16,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,160,
+0,127,0,0,255,3,0,0,0,0,0,0,0,0,0,4,0,0,0,0,16,0,0,0,0,0,0,128,0,128,192,223,
+0,12,0,0,0,0,0,0,0,0,0,0,0,4,0,31,0,0,0,0,0,
+0,254,255,255,255,0,252,255,255,0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,192,255,223,
+255,7,0,0,0,0,0,0,0,0,0,0,128,6,0,252,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0,0,
+0,0,8,0,0,0,0,0,0,0,0,0,0,0,224,255,255,255,31,0,0,255,3,0,0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,96,0,0,1,0,0,24,0,0,0,0,0,0,0,0,0,56,0,0,0,0,16,0,0,0,112,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,254,127,47,0,0,255,3,255,127,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,49,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,196,255,255,255,
+255,0,0,0,192,0,0,0,0,0,0,0,0,1,0,224,159,0,0,0,0,127,63,255,127,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,16,0,16,0,0,252,255,255,255,31,0,0,0,0,0,12,0,0,0,0,0,0,64,0,
+12,240,0,0,0,0,0,0,128,248,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0,255,0,255,255,
+255,33,144,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,
+127,0,224,251,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,160,3,224,0,224,0,
+224,0,96,128,248,255,255,255,252,255,255,255,255,255,127,223,255,241,127,255,
+127,0,0,255,255,255,255,0,0,255,255,255,255,1,0,123,3,208,193,175,66,0,12,31,
+188,255,255,0,0,0,0,0,14,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,127,0,0,0,255,7,0,0,255,255,255,255,255,255,255,255,255,
+255,63,0,0,0,0,0,0,252,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,207,255,255,255,
+63,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,135,3,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,127,255,255,255,255,0,
+0,0,0,0,0,255,255,255,251,255,255,255,255,255,255,255,255,255,255,15,0,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,63,0,0,0,255,15,30,255,255,255,1,252,193,224,0,0,0,0,
+0,0,0,0,0,0,0,30,1,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+255,255,0,0,0,0,255,255,255,255,15,0,0,0,255,255,255,127,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,
+255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,
+255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,0,0,0,
+0,0,0,192,0,224,0,0,0,0,0,0,0,0,0,0,0,128,15,112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+255,0,255,255,127,0,3,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+64,0,0,0,0,15,255,3,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,16,192,0,0,255,255,3,23,
+0,0,0,0,0,248,0,0,0,0,8,128,0,0,0,0,0,0,0,0,0,0,8,0,255,63,0,192,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,240,0,0,128,3,0,0,0,0,0,0,0,128,2,0,0,192,0,0,67,0,0,0,0,0,
+0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,0,
+0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,2,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,252,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,255,255,255,3,255,255,255,255,255,255,247,
+255,127,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,254,255,0,252,1,0,0,248,1,0,
+0,248,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,127,0,48,135,255,255,255,255,255,
+143,255,0,0,0,0,0,0,224,255,255,127,255,15,1,0,0,0,0,0,255,255,255,255,255,63,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,
+15,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+128,255,0,0,128,255,0,0,0,0,128,255,0,0,0,0,0,0,0,0,0,248,0,0,192,143,0,0,0,
+128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,255,255,252,255,255,255,255,255,0,0,0,0,
+0,0,0,135,255,1,255,1,0,0,0,224,0,0,0,224,0,0,0,0,0,1,0,0,96,248,127,0,0,0,0,
+0,0,0,0,254,0,0,0,255,0,0,0,255,0,0,0,30,0,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,0,0,0,0,0,
+0,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,224,127,0,0,0,192,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,192,63,252,255,63,0,0,128,3,0,0,0,0,0,0,254,3,32,0,0,0,0,0,0,0,
+0,0,0,0,0,24,0,15,0,0,0,0,0,56,0,0,0,0,0,0,0,0,0,225,63,0,232,254,255,31,0,0,
+0,0,0,0,0,96,63,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,
+24,0,32,0,0,192,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,
+248,0,104,0,0,0,0,0,0,0,0,0,0,0,0,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,128,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,128,14,0,0,0,255,
+31,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,8,0,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,7,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,24,128,255,0,0,0,0,0,
+0,0,0,0,0,223,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,62,0,0,252,255,31,3,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,0,0,0,0,0,0,0,0,0,128,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,128,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,
+255,3,
+128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,63,0,0,0,0,0,0,0,255,255,48,0,0,248,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,
+255,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,15,0,0,0,0,0,0,
+0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,63,
+0,255,255,255,255,127,254,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,1,0,0,255,255,255,255,255,255,255,255,
+63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,15,0,255,255,255,255,255,255,
+255,255,255,255,127,0,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,8,0,0,0,8,0,0,32,0,0,0,32,0,0,128,
+0,0,0,128,0,0,0,2,0,0,0,2,0,0,8,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,15,0,248,254,255,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,127,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0,
+128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,255,127,0,0,0,0,0,0,0,
+0,0,0,0,0,0,112,7,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,254,255,255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,0,254,255,
+255,255,255,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,255,255,255,255,255,
+15,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,127,254,255,254,
+255,254,255,255,255,63,0,255,31,255,255,255,255,0,0,0,252,0,0,0,28,0,0,0,252,
+255,255,255,31,0,0,0,0,0,0,192,255,255,255,7,0,255,255,255,255,255,15,255,1,3,
+0,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,63,0,255,31,255,7,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,15,0,255,255,255,255,255,255,255,255,255,255,255,1,
+255,15,0,0,255,15,255,255,255,255,255,255,255,0,255,3,255,255,255,255,255,0,
+255,255,255,63,0,0,0,0,0,0,0,0,0,0,255,239,255,255,255,255,255,255,255,255,
+255,255,255,255,123,252,255,255,255,255,231,199,255,255,255,231,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,63,15,7,7,0,63,0,
+0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/toascii.c b/src/components/lib/libc/musl-1.2.0/src/ctype/toascii.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/toascii.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/toascii.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/tolower.c b/src/components/lib/libc/musl-1.2.0/src/ctype/tolower.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/tolower.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/tolower.c
index 362d6b2bec..f10132ec2b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/tolower.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/tolower.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 
 int tolower(int c)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/toupper.c b/src/components/lib/libc/musl-1.2.0/src/ctype/toupper.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/toupper.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/toupper.c
index bbf4e06e81..4e74a55c60 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/toupper.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/toupper.c
@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include "libc.h"
 
 int toupper(int c)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/ctype/towctrans.c b/src/components/lib/libc/musl-1.2.0/src/ctype/towctrans.c
new file mode 100644
index 0000000000..76d137696e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/towctrans.c
@@ -0,0 +1,84 @@
+#include <wctype.h>
+
+static const unsigned char tab[];
+
+static const unsigned char rulebases[512];
+static const int rules[];
+
+static const unsigned char exceptions[][2];
+
+#include "casemap.h"
+
+static int casemap(unsigned c, int dir)
+{
+	unsigned b, x, y, v, rt, xb, xn;
+	int r, rd, c0 = c;
+
+	if (c >= 0x20000) return c;
+
+	b = c>>8;
+	c &= 255;
+	x = c/3;
+	y = c%3;
+
+	/* lookup entry in two-level base-6 table */
+	v = tab[tab[b]*86+x];
+	static const int mt[] = { 2048, 342, 57 };
+	v = (v*mt[y]>>11)%6;
+
+	/* use the bit vector out of the tables as an index into
+	 * a block-specific set of rules and decode the rule into
+	 * a type and a case-mapping delta. */
+	r = rules[rulebases[b]+v];
+	rt = r & 255;
+	rd = r >> 8;
+
+	/* rules 0/1 are simple lower/upper case with a delta.
+	 * apply according to desired mapping direction. */
+	if (rt < 2) return c0 + (rd & -(rt^dir));
+
+	/* binary search. endpoints of the binary search for
+	 * this block are stored in the rule delta field. */
+	xn = rd & 0xff;
+	xb = (unsigned)rd >> 8;
+	while (xn) {
+		unsigned try = exceptions[xb+xn/2][0];
+		if (try == c) {
+			r = rules[exceptions[xb+xn/2][1]];
+			rt = r & 255;
+			rd = r >> 8;
+			if (rt < 2) return c0 + (rd & -(rt^dir));
+			/* Hard-coded for the four exceptional titlecase */
+			return c0 + (dir ? -1 : 1);
+		} else if (try > c) {
+			xn /= 2;
+		} else {
+			xb += xn/2;
+			xn -= xn/2;
+		}
+	}
+	return c0;
+}
+
+wint_t towlower(wint_t wc)
+{
+	return casemap(wc, 0);
+}
+
+wint_t towupper(wint_t wc)
+{
+	return casemap(wc, 1);
+}
+
+wint_t __towupper_l(wint_t c, locale_t l)
+{
+	return towupper(c);
+}
+
+wint_t __towlower_l(wint_t c, locale_t l)
+{
+	return towlower(c);
+}
+
+weak_alias(__towupper_l, towupper_l);
+weak_alias(__towlower_l, towlower_l);
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/wcswidth.c b/src/components/lib/libc/musl-1.2.0/src/ctype/wcswidth.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/wcswidth.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/wcswidth.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/wctrans.c b/src/components/lib/libc/musl-1.2.0/src/ctype/wctrans.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/wctrans.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/wctrans.c
index b1b1265481..d3eda52167 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/wctrans.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/wctrans.c
@@ -1,6 +1,5 @@
 #include <wctype.h>
 #include <string.h>
-#include "libc.h"
 
 wctrans_t wctrans(const char *class)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/ctype/wcwidth.c b/src/components/lib/libc/musl-1.2.0/src/ctype/wcwidth.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/ctype/wcwidth.c
rename to src/components/lib/libc/musl-1.2.0/src/ctype/wcwidth.c
index 49c40eea8c..36256a5385 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ctype/wcwidth.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/wcwidth.c
@@ -23,7 +23,7 @@ int wcwidth(wchar_t wc)
 		return -1;
 	if (wc-0x20000U < 0x20000)
 		return 2;
-	if (wc == 0xe0001 || wc-0xe0020U < 0x5f || wc-0xe0100 < 0xef)
+	if (wc == 0xe0001 || wc-0xe0020U < 0x5f || wc-0xe0100U < 0xef)
 		return 0;
 	return 1;
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/ctype/wide.h b/src/components/lib/libc/musl-1.2.0/src/ctype/wide.h
new file mode 100644
index 0000000000..e403c9a5a2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ctype/wide.h
@@ -0,0 +1,65 @@
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,18,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,19,16,20,21,22,16,16,16,23,16,16,24,25,26,27,28,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,29,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,30,16,16,16,16,31,16,16,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,16,16,16,33,
+34,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,35,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,36,17,17,37,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,38,39,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+16,16,16,16,16,16,16,40,41,42,43,44,45,46,47,16,48,49,16,16,16,16,
+16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,6,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,48,0,0,0,0,0,0,255,15,0,0,0,0,128,0,0,8,
+0,2,12,0,96,48,64,16,0,0,4,44,36,32,12,0,0,0,1,0,0,0,80,184,0,0,0,0,0,0,0,224,
+0,0,0,1,128,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,251,255,255,255,255,255,255,255,
+255,255,255,15,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,63,0,0,0,255,15,255,255,255,255,
+255,255,255,127,254,255,255,255,255,255,255,255,255,255,127,254,255,255,255,
+255,255,255,255,255,255,255,255,255,224,255,255,255,255,255,254,255,255,255,
+255,255,255,255,255,255,255,127,255,255,255,255,255,7,255,255,255,255,15,0,
+255,255,255,255,255,127,255,255,255,255,255,0,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,
+0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,31,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,
+255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,255,3,0,0,255,255,255,255,247,255,127,15,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,255,255,255,255,255,255,255,255,255,255,
+255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,7,0,255,255,255,127,0,0,0,0,0,
+0,7,0,240,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+15,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,64,254,7,0,0,0,0,0,0,0,0,0,0,0,0,7,0,255,255,255,
+255,255,15,255,1,3,0,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,
+1,224,191,255,255,255,255,255,255,255,255,223,255,255,15,0,255,255,255,255,
+255,135,15,0,255,255,17,255,255,255,255,255,255,255,255,127,253,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+159,255,255,255,255,255,255,255,63,0,120,255,255,255,0,0,4,0,0,96,0,16,0,0,0,
+0,0,0,0,0,0,0,248,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,255,255,
+255,255,255,255,255,255,63,16,39,0,0,24,240,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,255,15,0,
+0,0,224,255,255,255,255,255,255,255,255,255,255,255,255,123,252,255,255,255,
+255,231,199,255,255,255,231,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,15,7,7,0,63,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.2.0/src/dirent/__dirent.h b/src/components/lib/libc/musl-1.2.0/src/dirent/__dirent.h
new file mode 100644
index 0000000000..828a5f1789
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/__dirent.h
@@ -0,0 +1,11 @@
+struct __dirstream
+{
+	off_t tell;
+	int fd;
+	int buf_pos;
+	int buf_end;
+	volatile int lock[1];
+	/* Any changes to this struct must preserve the property:
+	 * offsetof(struct __dirent, buf) % sizeof(off_t) == 0 */
+	char buf[2048];
+};
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/alphasort.c b/src/components/lib/libc/musl-1.2.0/src/dirent/alphasort.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/alphasort.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/alphasort.c
index 42050fb7cb..bee672ebda 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/alphasort.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/alphasort.c
@@ -1,10 +1,9 @@
 #include <string.h>
 #include <dirent.h>
-#include "libc.h"
 
 int alphasort(const struct dirent **a, const struct dirent **b)
 {
 	return strcoll((*a)->d_name, (*b)->d_name);
 }
 
-LFS64(alphasort);
+weak_alias(alphasort, alphasort64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/closedir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/closedir.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/closedir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/closedir.c
index 81e9591c60..e794ae9ca4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/closedir.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/closedir.c
@@ -1,7 +1,7 @@
 #include <dirent.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include "__dirent.h"
-#include "libc.h"
 
 int closedir(DIR *dir)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/dirfd.c b/src/components/lib/libc/musl-1.2.0/src/dirent/dirfd.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/dirfd.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/dirfd.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/fdopendir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/fdopendir.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/fdopendir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/fdopendir.c
index c377271da5..d78fb87f9b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/fdopendir.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/fdopendir.c
@@ -13,6 +13,10 @@ DIR *fdopendir(int fd)
 	if (fstat(fd, &st) < 0) {
 		return 0;
 	}
+	if (fcntl(fd, F_GETFL) & O_PATH) {
+		errno = EBADF;
+		return 0;
+	}
 	if (!S_ISDIR(st.st_mode)) {
 		errno = ENOTDIR;
 		return 0;
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/opendir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/opendir.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/opendir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/opendir.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/readdir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/readdir.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/readdir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/readdir.c
index 2cf0632c20..569fc70577 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/readdir.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/readdir.c
@@ -1,10 +1,11 @@
 #include <dirent.h>
 #include <errno.h>
+#include <stddef.h>
 #include "__dirent.h"
 #include "syscall.h"
-#include "libc.h"
 
-int __getdents(int, struct dirent *, size_t);
+typedef char dirstream_buf_alignment_check[1-2*(int)(
+	offsetof(struct __dirstream, buf) % sizeof(off_t))];
 
 struct dirent *readdir(DIR *dir)
 {
@@ -25,4 +26,4 @@ struct dirent *readdir(DIR *dir)
 	return de;
 }
 
-LFS64(readdir);
+weak_alias(readdir, readdir64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/readdir_r.c b/src/components/lib/libc/musl-1.2.0/src/dirent/readdir_r.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/readdir_r.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/readdir_r.c
index daa6c6ed60..e2a818f36a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/readdir_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/readdir_r.c
@@ -2,7 +2,7 @@
 #include <errno.h>
 #include <string.h>
 #include "__dirent.h"
-#include "libc.h"
+#include "lock.h"
 
 int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **restrict result)
 {
@@ -26,4 +26,4 @@ int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **re
 	return 0;
 }
 
-LFS64_2(readdir_r, readdir64_r);
+weak_alias(readdir_r, readdir64_r);
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/rewinddir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/rewinddir.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/rewinddir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/rewinddir.c
index f2053008b3..7ddda43721 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/rewinddir.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/rewinddir.c
@@ -1,7 +1,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include "__dirent.h"
-#include "libc.h"
+#include "lock.h"
 
 void rewinddir(DIR *dir)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/scandir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/scandir.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/scandir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/scandir.c
index 3af2b50f81..7ee195dd8a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/scandir.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/scandir.c
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <errno.h>
 #include <stddef.h>
-#include "libc.h"
 
 int scandir(const char *path, struct dirent ***res,
 	int (*sel)(const struct dirent *),
@@ -45,4 +44,4 @@ int scandir(const char *path, struct dirent ***res,
 	return cnt;
 }
 
-LFS64(scandir);
+weak_alias(scandir, scandir64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/seekdir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/seekdir.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/seekdir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/seekdir.c
index 5be47d4a15..bf6cc6ec40 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/seekdir.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/seekdir.c
@@ -1,7 +1,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include "__dirent.h"
-#include "libc.h"
+#include "lock.h"
 
 void seekdir(DIR *dir, long off)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/telldir.c b/src/components/lib/libc/musl-1.2.0/src/dirent/telldir.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/telldir.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/telldir.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/dirent/versionsort.c b/src/components/lib/libc/musl-1.2.0/src/dirent/versionsort.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/dirent/versionsort.c
rename to src/components/lib/libc/musl-1.2.0/src/dirent/versionsort.c
index 410cb70345..d4c489230a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/dirent/versionsort.c
+++ b/src/components/lib/libc/musl-1.2.0/src/dirent/versionsort.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <string.h>
 #include <dirent.h>
-#include "libc.h"
 
 int versionsort(const struct dirent **a, const struct dirent **b)
 {
@@ -9,4 +8,4 @@ int versionsort(const struct dirent **a, const struct dirent **b)
 }
 
 #undef versionsort64
-LFS64(versionsort);
+weak_alias(versionsort, versionsort64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/__environ.c b/src/components/lib/libc/musl-1.2.0/src/env/__environ.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/env/__environ.c
rename to src/components/lib/libc/musl-1.2.0/src/env/__environ.c
index e6c6faa5fd..fe8abcf990 100644
--- a/src/components/lib/libc/musl-1.1.11/src/env/__environ.c
+++ b/src/components/lib/libc/musl-1.2.0/src/env/__environ.c
@@ -1,4 +1,4 @@
-#include "libc.h"
+#include <unistd.h>
 
 char **__environ = 0;
 weak_alias(__environ, ___environ);
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/__init_tls.c b/src/components/lib/libc/musl-1.2.0/src/env/__init_tls.c
new file mode 100644
index 0000000000..772baba32d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/__init_tls.c
@@ -0,0 +1,153 @@
+#define SYSCALL_NO_TLS 1
+#include <elf.h>
+#include <limits.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <stddef.h>
+#include "pthread_impl.h"
+#include "libc.h"
+#include "atomic.h"
+#include "syscall.h"
+
+volatile int __thread_list_lock;
+
+int __init_tp(void *p)
+{
+	pthread_t td = p;
+	td->self = td;
+	int r = __set_thread_area(TP_ADJ(p));
+	if (r < 0) return -1;
+	if (!r) libc.can_do_threads = 1;
+	td->detach_state = DT_JOINABLE;
+	td->tid = __syscall(SYS_set_tid_address, &__thread_list_lock);
+	td->locale = &libc.global_locale;
+	td->robust_list.head = &td->robust_list.head;
+	td->sysinfo = __sysinfo;
+	td->next = td->prev = td;
+	return 0;
+}
+
+static struct builtin_tls {
+	char c;
+	struct pthread pt;
+	void *space[16];
+} builtin_tls[1];
+#define MIN_TLS_ALIGN offsetof(struct builtin_tls, pt)
+
+static struct tls_module main_tls;
+
+void *__copy_tls(unsigned char *mem)
+{
+	pthread_t td;
+	struct tls_module *p;
+	size_t i;
+	uintptr_t *dtv;
+
+#ifdef TLS_ABOVE_TP
+	dtv = (uintptr_t*)(mem + libc.tls_size) - (libc.tls_cnt + 1);
+
+	mem += -((uintptr_t)mem + sizeof(struct pthread)) & (libc.tls_align-1);
+	td = (pthread_t)mem;
+	mem += sizeof(struct pthread);
+
+	for (i=1, p=libc.tls_head; p; i++, p=p->next) {
+		dtv[i] = (uintptr_t)(mem + p->offset) + DTP_OFFSET;
+		memcpy(mem + p->offset, p->image, p->len);
+	}
+#else
+	dtv = (uintptr_t *)mem;
+
+	mem += libc.tls_size - sizeof(struct pthread);
+	mem -= (uintptr_t)mem & (libc.tls_align-1);
+	td = (pthread_t)mem;
+
+	for (i=1, p=libc.tls_head; p; i++, p=p->next) {
+		dtv[i] = (uintptr_t)(mem - p->offset) + DTP_OFFSET;
+		memcpy(mem - p->offset, p->image, p->len);
+	}
+#endif
+	dtv[0] = libc.tls_cnt;
+	td->dtv = td->dtv_copy = dtv;
+	return td;
+}
+
+#if ULONG_MAX == 0xffffffff
+typedef Elf32_Phdr Phdr;
+#else
+typedef Elf64_Phdr Phdr;
+#endif
+
+extern weak hidden const size_t _DYNAMIC[];
+
+static void static_init_tls(size_t *aux)
+{
+	unsigned char *p;
+	size_t n;
+	Phdr *phdr, *tls_phdr=0;
+	size_t base = 0;
+	void *mem;
+
+	for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) {
+		phdr = (void *)p;
+		if (phdr->p_type == PT_PHDR)
+			base = aux[AT_PHDR] - phdr->p_vaddr;
+		if (phdr->p_type == PT_DYNAMIC && _DYNAMIC)
+			base = (size_t)_DYNAMIC - phdr->p_vaddr;
+		if (phdr->p_type == PT_TLS)
+			tls_phdr = phdr;
+		if (phdr->p_type == PT_GNU_STACK &&
+		    phdr->p_memsz > __default_stacksize)
+			__default_stacksize =
+				phdr->p_memsz < DEFAULT_STACK_MAX ?
+				phdr->p_memsz : DEFAULT_STACK_MAX;
+	}
+
+	if (tls_phdr) {
+		main_tls.image = (void *)(base + tls_phdr->p_vaddr);
+		main_tls.len = tls_phdr->p_filesz;
+		main_tls.size = tls_phdr->p_memsz;
+		main_tls.align = tls_phdr->p_align;
+		libc.tls_cnt = 1;
+		libc.tls_head = &main_tls;
+	}
+
+	main_tls.size += (-main_tls.size - (uintptr_t)main_tls.image)
+		& (main_tls.align-1);
+#ifdef TLS_ABOVE_TP
+	main_tls.offset = GAP_ABOVE_TP;
+	main_tls.offset += (-GAP_ABOVE_TP + (uintptr_t)main_tls.image)
+		& (main_tls.align-1);
+#else
+	main_tls.offset = main_tls.size;
+#endif
+	if (main_tls.align < MIN_TLS_ALIGN) main_tls.align = MIN_TLS_ALIGN;
+
+	libc.tls_align = main_tls.align;
+	libc.tls_size = 2*sizeof(void *) + sizeof(struct pthread)
+#ifdef TLS_ABOVE_TP
+		+ main_tls.offset
+#endif
+		+ main_tls.size + main_tls.align
+		+ MIN_TLS_ALIGN-1 & -MIN_TLS_ALIGN;
+
+	if (libc.tls_size > sizeof builtin_tls) {
+#ifndef SYS_mmap2
+#define SYS_mmap2 SYS_mmap
+#endif
+		mem = (void *)__syscall(
+			SYS_mmap2,
+			0, libc.tls_size, PROT_READ|PROT_WRITE,
+			MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+		/* -4095...-1 cast to void * will crash on dereference anyway,
+		 * so don't bloat the init code checking for error codes and
+		 * explicitly calling a_crash(). */
+	} else {
+		mem = builtin_tls;
+	}
+
+	/* Failure to initialize thread pointer is always fatal. */
+	if (__init_tp(__copy_tls(mem)) < 0)
+		a_crash();
+}
+
+weak_alias(static_init_tls, __init_tls);
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/__libc_start_main.c b/src/components/lib/libc/musl-1.2.0/src/env/__libc_start_main.c
new file mode 100644
index 0000000000..8fbe526271
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/__libc_start_main.c
@@ -0,0 +1,96 @@
+#include <elf.h>
+#include <poll.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#include "syscall.h"
+#include "atomic.h"
+#include "libc.h"
+
+static void dummy(void) {}
+weak_alias(dummy, _init);
+
+extern weak hidden void (*const __init_array_start)(void), (*const __init_array_end)(void);
+
+static void dummy1(void *p) {}
+weak_alias(dummy1, __init_ssp);
+
+#define AUX_CNT 38
+
+#ifdef __GNUC__
+__attribute__((__noinline__))
+#endif
+void __init_libc(char **envp, char *pn)
+{
+	size_t i, *auxv, aux[AUX_CNT] = { 0 };
+	__environ = envp;
+	for (i=0; envp[i]; i++);
+	libc.auxv = auxv = (void *)(envp+i+1);
+	for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT) aux[auxv[i]] = auxv[i+1];
+	__hwcap = aux[AT_HWCAP];
+	if (aux[AT_SYSINFO]) __sysinfo = aux[AT_SYSINFO];
+	libc.page_size = aux[AT_PAGESZ];
+
+	if (!pn) pn = (void*)aux[AT_EXECFN];
+	if (!pn) pn = "";
+	__progname = __progname_full = pn;
+	for (i=0; pn[i]; i++) if (pn[i]=='/') __progname = pn+i+1;
+
+	__init_tls(aux);
+	__init_ssp((void *)aux[AT_RANDOM]);
+
+	if (aux[AT_UID]==aux[AT_EUID] && aux[AT_GID]==aux[AT_EGID]
+		&& !aux[AT_SECURE]) return;
+
+	struct pollfd pfd[3] = { {.fd=0}, {.fd=1}, {.fd=2} };
+	int r =
+#ifdef SYS_poll
+	__syscall(SYS_poll, pfd, 3, 0);
+#else
+	__syscall(SYS_ppoll, pfd, 3, &(struct timespec){0}, 0, _NSIG/8);
+#endif
+	if (r<0) a_crash();
+	for (i=0; i<3; i++) if (pfd[i].revents&POLLNVAL)
+		if (__sys_open("/dev/null", O_RDWR)<0)
+			a_crash();
+	libc.secure = 1;
+}
+
+static void libc_start_init(void)
+{
+	_init();
+	uintptr_t a = (uintptr_t)&__init_array_start;
+	for (; a<(uintptr_t)&__init_array_end; a+=sizeof(void(*)()))
+		(*(void (**)(void))a)();
+}
+
+weak_alias(libc_start_init, __libc_start_init);
+
+typedef int lsm2_fn(int (*)(int,char **,char **), int, char **);
+static lsm2_fn libc_start_main_stage2;
+
+int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv)
+{
+	char **envp = argv+argc+1;
+
+	/* External linkage, and explicit noinline attribute if available,
+	 * are used to prevent the stack frame used during init from
+	 * persisting for the entire process lifetime. */
+	__init_libc(envp, argv[0]);
+
+	/* Barrier against hoisting application code or anything using ssp
+	 * or thread pointer prior to its initialization above. */
+	lsm2_fn *stage2 = libc_start_main_stage2;
+	__asm__ ( "" : "+r"(stage2) : : "memory" );
+	return stage2(main, argc, argv);
+}
+
+static int libc_start_main_stage2(int (*main)(int,char **,char **), int argc, char **argv)
+{
+	char **envp = argv+argc+1;
+	__libc_start_init();
+
+	/* Pass control to the application */
+	exit(main(argc, argv, envp));
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/__reset_tls.c b/src/components/lib/libc/musl-1.2.0/src/env/__reset_tls.c
new file mode 100644
index 0000000000..15685bc666
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/__reset_tls.c
@@ -0,0 +1,15 @@
+#include <string.h>
+#include "pthread_impl.h"
+#include "libc.h"
+
+void __reset_tls()
+{
+	pthread_t self = __pthread_self();
+	struct tls_module *p;
+	size_t i, n = self->dtv[0];
+	if (n) for (p=libc.tls_head, i=1; i<=n; i++, p=p->next) {
+		char *mem = (char *)(self->dtv[i] - DTP_OFFSET);
+		memcpy(mem, p->image, p->len);
+		memset(mem+p->len, 0, p->size - p->len);
+	}
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/env/__stack_chk_fail.c b/src/components/lib/libc/musl-1.2.0/src/env/__stack_chk_fail.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/env/__stack_chk_fail.c
rename to src/components/lib/libc/musl-1.2.0/src/env/__stack_chk_fail.c
index be0c184a63..e32596d10f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/env/__stack_chk_fail.c
+++ b/src/components/lib/libc/musl-1.2.0/src/env/__stack_chk_fail.c
@@ -17,16 +17,6 @@ void __stack_chk_fail(void)
 	a_crash();
 }
 
-#ifdef SHARED
-
-__attribute__((__visibility__("hidden")))
-void __stack_chk_fail_local(void)
-{
-	a_crash();
-}
-
-#else
+hidden void __stack_chk_fail_local(void);
 
 weak_alias(__stack_chk_fail, __stack_chk_fail_local);
-
-#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/clearenv.c b/src/components/lib/libc/musl-1.2.0/src/env/clearenv.c
new file mode 100644
index 0000000000..db8e8e94b8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/clearenv.c
@@ -0,0 +1,14 @@
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <unistd.h>
+
+static void dummy(char *old, char *new) {}
+weak_alias(dummy, __env_rm_add);
+
+int clearenv()
+{
+	char **e = __environ;
+	__environ = 0;
+	if (e) while (*e) __env_rm_add(*e++, 0);
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/getenv.c b/src/components/lib/libc/musl-1.2.0/src/env/getenv.c
new file mode 100644
index 0000000000..a90d39cf74
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/getenv.c
@@ -0,0 +1,13 @@
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+char *getenv(const char *name)
+{
+	size_t l = __strchrnul(name, '=') - name;
+	if (l && !name[l] && __environ)
+		for (char **e = __environ; *e; e++)
+			if (!strncmp(name, *e, l) && l[*e] == '=')
+				return *e + l+1;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/putenv.c b/src/components/lib/libc/musl-1.2.0/src/env/putenv.c
new file mode 100644
index 0000000000..dce8c8288a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/putenv.c
@@ -0,0 +1,46 @@
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void dummy(char *old, char *new) {}
+weak_alias(dummy, __env_rm_add);
+
+int __putenv(char *s, size_t l, char *r)
+{
+	size_t i=0;
+	if (__environ) {
+		for (char **e = __environ; *e; e++, i++)
+			if (!strncmp(s, *e, l+1)) {
+				char *tmp = *e;
+				*e = s;
+				__env_rm_add(tmp, r);
+				return 0;
+			}
+	}
+	static char **oldenv;
+	char **newenv;
+	if (__environ == oldenv) {
+		newenv = realloc(oldenv, sizeof *newenv * (i+2));
+		if (!newenv) goto oom;
+	} else {
+		newenv = malloc(sizeof *newenv * (i+2));
+		if (!newenv) goto oom;
+		if (i) memcpy(newenv, __environ, sizeof *newenv * i);
+		free(oldenv);
+	}
+	newenv[i] = s;
+	newenv[i+1] = 0;
+	__environ = oldenv = newenv;
+	if (r) __env_rm_add(0, r);
+	return 0;
+oom:
+	free(r);
+	return -1;
+}
+
+int putenv(char *s)
+{
+	size_t l = __strchrnul(s, '=') - s;
+	if (!l || !s[l]) return unsetenv(s);
+	return __putenv(s, l, 0);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/secure_getenv.c b/src/components/lib/libc/musl-1.2.0/src/env/secure_getenv.c
new file mode 100644
index 0000000000..72322f811b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/secure_getenv.c
@@ -0,0 +1,8 @@
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include "libc.h"
+
+char *secure_getenv(const char *name)
+{
+	return libc.secure ? NULL : getenv(name);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/setenv.c b/src/components/lib/libc/musl-1.2.0/src/env/setenv.c
new file mode 100644
index 0000000000..c5226b6d3c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/setenv.c
@@ -0,0 +1,42 @@
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+void __env_rm_add(char *old, char *new)
+{
+	static char **env_alloced;
+	static size_t env_alloced_n;
+	for (size_t i=0; i < env_alloced_n; i++)
+		if (env_alloced[i] == old) {
+			env_alloced[i] = new;
+			free(old);
+			return;
+		} else if (!env_alloced[i] && new) {
+			env_alloced[i] = new;
+			new = 0;
+		}
+	if (!new) return;
+	char **t = realloc(env_alloced, sizeof *t * (env_alloced_n+1));
+	if (!t) return;
+	(env_alloced = t)[env_alloced_n++] = new;
+}
+
+int setenv(const char *var, const char *value, int overwrite)
+{
+	char *s;
+	size_t l1, l2;
+
+	if (!var || !(l1 = __strchrnul(var, '=') - var) || var[l1]) {
+		errno = EINVAL;
+		return -1;
+	}
+	if (!overwrite && getenv(var)) return 0;
+
+	l2 = strlen(value);
+	s = malloc(l1+l2+2);
+	if (!s) return -1;
+	memcpy(s, var, l1);
+	s[l1] = '=';
+	memcpy(s+l1+1, value, l2+1);
+	return __putenv(s, l1, s);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/env/unsetenv.c b/src/components/lib/libc/musl-1.2.0/src/env/unsetenv.c
new file mode 100644
index 0000000000..b14c4c929b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/env/unsetenv.c
@@ -0,0 +1,28 @@
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+static void dummy(char *old, char *new) {}
+weak_alias(dummy, __env_rm_add);
+
+int unsetenv(const char *name)
+{
+	size_t l = __strchrnul(name, '=') - name;
+	if (!l || name[l]) {
+		errno = EINVAL;
+		return -1;
+	}
+	if (__environ) {
+		char **e = __environ, **eo = e;
+		for (; *e; e++)
+			if (!strncmp(name, *e, l) && l[*e] == '=')
+				__env_rm_add(*e, 0);
+			else if (eo != e)
+				*eo++ = *e;
+			else
+				eo++;
+		if (eo != e) *eo = 0;
+	}
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/errno/__errno_location.c b/src/components/lib/libc/musl-1.2.0/src/errno/__errno_location.c
new file mode 100644
index 0000000000..a87eeaa72a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/errno/__errno_location.c
@@ -0,0 +1,10 @@
+#include <errno.h>
+#include "pthread_impl.h"
+
+int *__errno_location(void)
+{
+	static int e;
+	return &e;
+}
+
+weak_alias(__errno_location, ___errno_location);
diff --git a/src/components/lib/libc/musl-1.1.11/src/errno/__strerror.h b/src/components/lib/libc/musl-1.2.0/src/errno/__strerror.h
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/errno/__strerror.h
rename to src/components/lib/libc/musl-1.2.0/src/errno/__strerror.h
index 915044b5ca..2f04d400b3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/errno/__strerror.h
+++ b/src/components/lib/libc/musl-1.2.0/src/errno/__strerror.h
@@ -100,5 +100,6 @@ E(EREMOTEIO,    "Remote I/O error")
 E(EDQUOT,       "Quota exceeded")
 E(ENOMEDIUM,    "No medium found")
 E(EMEDIUMTYPE,  "Wrong medium type")
+E(EMULTIHOP,    "Multihop attempted")
 
 E(0,            "No error information")
diff --git a/src/components/lib/libc/musl-1.1.11/src/errno/strerror.c b/src/components/lib/libc/musl-1.2.0/src/errno/strerror.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/errno/strerror.c
rename to src/components/lib/libc/musl-1.2.0/src/errno/strerror.c
index 24c94d3742..e3ed771a71 100644
--- a/src/components/lib/libc/musl-1.1.11/src/errno/strerror.c
+++ b/src/components/lib/libc/musl-1.2.0/src/errno/strerror.c
@@ -1,7 +1,6 @@
 #include <errno.h>
 #include <string.h>
 #include "locale_impl.h"
-#include "libc.h"
 
 #define E(a,b) ((unsigned char)a),
 static const unsigned char errid[] = {
diff --git a/src/components/lib/libc/musl-1.1.11/src/exit/_Exit.c b/src/components/lib/libc/musl-1.2.0/src/exit/_Exit.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/exit/_Exit.c
rename to src/components/lib/libc/musl-1.2.0/src/exit/_Exit.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/exit/abort.c b/src/components/lib/libc/musl-1.2.0/src/exit/abort.c
new file mode 100644
index 0000000000..e1980f10a5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/exit/abort.c
@@ -0,0 +1,32 @@
+#include <stdlib.h>
+#include <signal.h>
+#include "syscall.h"
+#include "pthread_impl.h"
+#include "atomic.h"
+#include "lock.h"
+#include "ksigaction.h"
+
+hidden volatile int __abort_lock[1];
+
+_Noreturn void abort(void)
+{
+	raise(SIGABRT);
+
+	/* If there was a SIGABRT handler installed and it returned, or if
+	 * SIGABRT was blocked or ignored, take an AS-safe lock to prevent
+	 * sigaction from installing a new SIGABRT handler, uninstall any
+	 * handler that may be present, and re-raise the signal to generate
+	 * the default action of abnormal termination. */
+	__block_all_sigs(0);
+	LOCK(__abort_lock);
+	__syscall(SYS_rt_sigaction, SIGABRT,
+		&(struct k_sigaction){.handler = SIG_DFL}, 0, _NSIG/8);
+	__syscall(SYS_tkill, __pthread_self()->tid, SIGABRT);
+	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+		&(long[_NSIG/(8*sizeof(long))]){1UL<<(SIGABRT-1)}, 0, _NSIG/8);
+
+	/* Beyond this point should be unreachable. */
+	a_crash();
+	raise(SIGKILL);
+	_Exit(127);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/src/__aeabi_atexit.c b/src/components/lib/libc/musl-1.2.0/src/exit/arm/__aeabi_atexit.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/src/__aeabi_atexit.c
rename to src/components/lib/libc/musl-1.2.0/src/exit/arm/__aeabi_atexit.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/exit/assert.c b/src/components/lib/libc/musl-1.2.0/src/exit/assert.c
new file mode 100644
index 0000000000..49b0dc3ec4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/exit/assert.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+_Noreturn void __assert_fail(const char *expr, const char *file, int line, const char *func)
+{
+	fprintf(stderr, "Assertion failed: %s (%s: %s: %d)\n", expr, file, func, line);
+	fflush(NULL);
+	abort();
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/exit/at_quick_exit.c b/src/components/lib/libc/musl-1.2.0/src/exit/at_quick_exit.c
new file mode 100644
index 0000000000..d3ce6522df
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/exit/at_quick_exit.c
@@ -0,0 +1,31 @@
+#include <stdlib.h>
+#include "libc.h"
+#include "lock.h"
+
+#define COUNT 32
+
+static void (*funcs[COUNT])(void);
+static int count;
+static volatile int lock[1];
+
+void __funcs_on_quick_exit()
+{
+	void (*func)(void);
+	LOCK(lock);
+	while (count > 0) {
+		func = funcs[--count];
+		UNLOCK(lock);
+		func();
+		LOCK(lock);
+	}
+}
+
+int at_quick_exit(void (*func)(void))
+{
+	int r = 0;
+	LOCK(lock);
+	if (count == 32) r = -1;
+	else funcs[count++] = func;
+	UNLOCK(lock);
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/exit/atexit.c b/src/components/lib/libc/musl-1.2.0/src/exit/atexit.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/exit/atexit.c
rename to src/components/lib/libc/musl-1.2.0/src/exit/atexit.c
index 2b58b8bbf7..160d277aeb 100644
--- a/src/components/lib/libc/musl-1.1.11/src/exit/atexit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/exit/atexit.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include "libc.h"
+#include "lock.h"
 
 /* Ensure that at least 32 atexit handlers can be registered without malloc */
 #define COUNT 32
@@ -13,7 +14,7 @@ static struct fl
 } builtin, *head;
 
 static int slot;
-static volatile int lock[2];
+static volatile int lock[1];
 
 void __funcs_on_exit()
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/exit/exit.c b/src/components/lib/libc/musl-1.2.0/src/exit/exit.c
new file mode 100644
index 0000000000..a6869b3759
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/exit/exit.c
@@ -0,0 +1,33 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include "libc.h"
+
+static void dummy()
+{
+}
+
+/* atexit.c and __stdio_exit.c override these. the latter is linked
+ * as a consequence of linking either __toread.c or __towrite.c. */
+weak_alias(dummy, __funcs_on_exit);
+weak_alias(dummy, __stdio_exit);
+weak_alias(dummy, _fini);
+
+extern weak hidden void (*const __fini_array_start)(void), (*const __fini_array_end)(void);
+
+static void libc_exit_fini(void)
+{
+	uintptr_t a = (uintptr_t)&__fini_array_end;
+	for (; a>(uintptr_t)&__fini_array_start; a-=sizeof(void(*)()))
+		(*(void (**)())(a-sizeof(void(*)())))();
+	_fini();
+}
+
+weak_alias(libc_exit_fini, __libc_exit_fini);
+
+_Noreturn void exit(int code)
+{
+	__funcs_on_exit();
+	__libc_exit_fini();
+	__stdio_exit();
+	_Exit(code);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/exit/quick_exit.c b/src/components/lib/libc/musl-1.2.0/src/exit/quick_exit.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/exit/quick_exit.c
rename to src/components/lib/libc/musl-1.2.0/src/exit/quick_exit.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fcntl/creat.c b/src/components/lib/libc/musl-1.2.0/src/fcntl/creat.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/fcntl/creat.c
rename to src/components/lib/libc/musl-1.2.0/src/fcntl/creat.c
index be05faae96..8f8aab6463 100644
--- a/src/components/lib/libc/musl-1.1.11/src/fcntl/creat.c
+++ b/src/components/lib/libc/musl-1.2.0/src/fcntl/creat.c
@@ -1,9 +1,8 @@
 #include <fcntl.h>
-#include "libc.h"
 
 int creat(const char *filename, mode_t mode)
 {
 	return open(filename, O_CREAT|O_WRONLY|O_TRUNC, mode);
 }
 
-LFS64(creat);
+weak_alias(creat, creat64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/fcntl/fcntl.c b/src/components/lib/libc/musl-1.2.0/src/fcntl/fcntl.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/fcntl/fcntl.c
rename to src/components/lib/libc/musl-1.2.0/src/fcntl/fcntl.c
index ce615d0e5d..d3bff5c486 100644
--- a/src/components/lib/libc/musl-1.1.11/src/fcntl/fcntl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/fcntl/fcntl.c
@@ -3,7 +3,6 @@
 #include <stdarg.h>
 #include <errno.h>
 #include "syscall.h"
-#include "libc.h"
 
 int fcntl(int fd, int cmd, ...)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/fcntl/open.c b/src/components/lib/libc/musl-1.2.0/src/fcntl/open.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/fcntl/open.c
rename to src/components/lib/libc/musl-1.2.0/src/fcntl/open.c
index 3928a6e669..1d817a2d6c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/fcntl/open.c
+++ b/src/components/lib/libc/musl-1.2.0/src/fcntl/open.c
@@ -1,7 +1,6 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include "syscall.h"
-#include "libc.h"
 
 int open(const char *filename, int flags, ...)
 {
@@ -21,4 +20,4 @@ int open(const char *filename, int flags, ...)
 	return __syscall_ret(fd);
 }
 
-LFS64(open);
+weak_alias(open, open64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/fcntl/openat.c b/src/components/lib/libc/musl-1.2.0/src/fcntl/openat.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/fcntl/openat.c
rename to src/components/lib/libc/musl-1.2.0/src/fcntl/openat.c
index e741336c6f..ad165ec323 100644
--- a/src/components/lib/libc/musl-1.1.11/src/fcntl/openat.c
+++ b/src/components/lib/libc/musl-1.2.0/src/fcntl/openat.c
@@ -1,7 +1,6 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include "syscall.h"
-#include "libc.h"
 
 int openat(int fd, const char *filename, int flags, ...)
 {
@@ -17,4 +16,4 @@ int openat(int fd, const char *filename, int flags, ...)
 	return syscall_cp(SYS_openat, fd, filename, flags|O_LARGEFILE, mode);
 }
 
-LFS64(openat);
+weak_alias(openat, openat64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/fcntl/posix_fadvise.c b/src/components/lib/libc/musl-1.2.0/src/fcntl/posix_fadvise.c
new file mode 100644
index 0000000000..75b8e1aed8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fcntl/posix_fadvise.c
@@ -0,0 +1,18 @@
+#include <fcntl.h>
+#include "syscall.h"
+
+int posix_fadvise(int fd, off_t base, off_t len, int advice)
+{
+#if defined(SYSCALL_FADVISE_6_ARG)
+	/* Some archs, at least arm and powerpc, have the syscall
+	 * arguments reordered to avoid needing 7 argument registers
+	 * due to 64-bit argument alignment. */
+	return -__syscall(SYS_fadvise, fd, advice,
+		__SYSCALL_LL_E(base), __SYSCALL_LL_E(len));
+#else
+	return -__syscall(SYS_fadvise, fd, __SYSCALL_LL_O(base),
+		__SYSCALL_LL_E(len), advice);
+#endif
+}
+
+weak_alias(posix_fadvise, posix_fadvise64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/fcntl/posix_fallocate.c b/src/components/lib/libc/musl-1.2.0/src/fcntl/posix_fallocate.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/fcntl/posix_fallocate.c
rename to src/components/lib/libc/musl-1.2.0/src/fcntl/posix_fallocate.c
index 91d8063ca4..c57a24aef4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/fcntl/posix_fallocate.c
+++ b/src/components/lib/libc/musl-1.2.0/src/fcntl/posix_fallocate.c
@@ -1,6 +1,5 @@
 #include <fcntl.h>
 #include "syscall.h"
-#include "libc.h"
 
 int posix_fallocate(int fd, off_t base, off_t len)
 {
@@ -8,4 +7,4 @@ int posix_fallocate(int fd, off_t base, off_t len)
 		__SYSCALL_LL_E(len));
 }
 
-LFS64(posix_fallocate);
+weak_alias(posix_fallocate, posix_fallocate64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/__flt_rounds.c b/src/components/lib/libc/musl-1.2.0/src/fenv/__flt_rounds.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/fenv/__flt_rounds.c
rename to src/components/lib/libc/musl-1.2.0/src/fenv/__flt_rounds.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/aarch64/fenv.s b/src/components/lib/libc/musl-1.2.0/src/fenv/aarch64/fenv.s
new file mode 100644
index 0000000000..8f3ec9653c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/aarch64/fenv.s
@@ -0,0 +1,68 @@
+.global fegetround
+.type fegetround,%function
+fegetround:
+	mrs x0, fpcr
+	and w0, w0, #0xc00000
+	ret
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,%function
+__fesetround:
+	mrs x1, fpcr
+	bic w1, w1, #0xc00000
+	orr w1, w1, w0
+	msr fpcr, x1
+	mov w0, #0
+	ret
+
+.global fetestexcept
+.type fetestexcept,%function
+fetestexcept:
+	and w0, w0, #0x1f
+	mrs x1, fpsr
+	and w0, w0, w1
+	ret
+
+.global feclearexcept
+.type feclearexcept,%function
+feclearexcept:
+	and w0, w0, #0x1f
+	mrs x1, fpsr
+	bic w1, w1, w0
+	msr fpsr, x1
+	mov w0, #0
+	ret
+
+.global feraiseexcept
+.type feraiseexcept,%function
+feraiseexcept:
+	and w0, w0, #0x1f
+	mrs x1, fpsr
+	orr w1, w1, w0
+	msr fpsr, x1
+	mov w0, #0
+	ret
+
+.global fegetenv
+.type fegetenv,%function
+fegetenv:
+	mrs x1, fpcr
+	mrs x2, fpsr
+	stp w1, w2, [x0]
+	mov w0, #0
+	ret
+
+// TODO preserve some bits
+.global fesetenv
+.type fesetenv,%function
+fesetenv:
+	mov x1, #0
+	mov x2, #0
+	cmn x0, #1
+	b.eq 1f
+	ldp w1, w2, [x0]
+1:	msr fpcr, x1
+	msr fpsr, x2
+	mov w0, #0
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/arm/fenv-hf.S b/src/components/lib/libc/musl-1.2.0/src/fenv/arm/fenv-hf.S
new file mode 100644
index 0000000000..2a1de0d168
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/arm/fenv-hf.S
@@ -0,0 +1,70 @@
+#if __ARM_PCS_VFP
+
+.syntax unified
+.fpu vfp
+
+.global fegetround
+.type fegetround,%function
+fegetround:
+	fmrx r0, fpscr
+	and r0, r0, #0xc00000
+	bx lr
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,%function
+__fesetround:
+	fmrx r3, fpscr
+	bic r3, r3, #0xc00000
+	orr r3, r3, r0
+	fmxr fpscr, r3
+	mov r0, #0
+	bx lr
+
+.global fetestexcept
+.type fetestexcept,%function
+fetestexcept:
+	and r0, r0, #0x1f
+	fmrx r3, fpscr
+	and r0, r0, r3
+	bx lr
+
+.global feclearexcept
+.type feclearexcept,%function
+feclearexcept:
+	and r0, r0, #0x1f
+	fmrx r3, fpscr
+	bic r3, r3, r0
+	fmxr fpscr, r3
+	mov r0, #0
+	bx lr
+
+.global feraiseexcept
+.type feraiseexcept,%function
+feraiseexcept:
+	and r0, r0, #0x1f
+	fmrx r3, fpscr
+	orr r3, r3, r0
+	fmxr fpscr, r3
+	mov r0, #0
+	bx lr
+
+.global fegetenv
+.type fegetenv,%function
+fegetenv:
+	fmrx r3, fpscr
+	str r3, [r0]
+	mov r0, #0
+	bx lr
+
+.global fesetenv
+.type fesetenv,%function
+fesetenv:
+	cmn r0, #1
+	moveq r3, #0
+	ldrne r3, [r0]
+	fmxr fpscr, r3
+	mov r0, #0
+	bx lr
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/arm/fenv.c b/src/components/lib/libc/musl-1.2.0/src/fenv/arm/fenv.c
new file mode 100644
index 0000000000..ad295f58cc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/arm/fenv.c
@@ -0,0 +1,3 @@
+#if !__ARM_PCS_VFP
+#include "../fenv.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/fegetexceptflag.c b/src/components/lib/libc/musl-1.2.0/src/fenv/fegetexceptflag.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/fenv/fegetexceptflag.c
rename to src/components/lib/libc/musl-1.2.0/src/fenv/fegetexceptflag.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/feholdexcept.c b/src/components/lib/libc/musl-1.2.0/src/fenv/feholdexcept.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/fenv/feholdexcept.c
rename to src/components/lib/libc/musl-1.2.0/src/fenv/feholdexcept.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/fenv.c b/src/components/lib/libc/musl-1.2.0/src/fenv/fenv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/fenv/fenv.c
rename to src/components/lib/libc/musl-1.2.0/src/fenv/fenv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/fesetexceptflag.c b/src/components/lib/libc/musl-1.2.0/src/fenv/fesetexceptflag.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/fenv/fesetexceptflag.c
rename to src/components/lib/libc/musl-1.2.0/src/fenv/fesetexceptflag.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/fesetround.c b/src/components/lib/libc/musl-1.2.0/src/fenv/fesetround.c
new file mode 100644
index 0000000000..4e2f164dd5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/fesetround.c
@@ -0,0 +1,23 @@
+#include <fenv.h>
+#include <features.h>
+
+/* __fesetround wrapper for arch independent argument check */
+
+hidden int __fesetround(int);
+
+int fesetround(int r)
+{
+	if (r != FE_TONEAREST
+#ifdef FE_DOWNWARD
+		&& r != FE_DOWNWARD
+#endif
+#ifdef FE_UPWARD
+		&& r != FE_UPWARD
+#endif
+#ifdef FE_TOWARDZERO
+		&& r != FE_TOWARDZERO
+#endif
+	)
+		return -1;
+	return __fesetround(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/fenv/feupdateenv.c b/src/components/lib/libc/musl-1.2.0/src/fenv/feupdateenv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/fenv/feupdateenv.c
rename to src/components/lib/libc/musl-1.2.0/src/fenv/feupdateenv.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/i386/fenv.s b/src/components/lib/libc/musl-1.2.0/src/fenv/i386/fenv.s
new file mode 100644
index 0000000000..e7f7932a1c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/i386/fenv.s
@@ -0,0 +1,164 @@
+.hidden __hwcap
+
+.global feclearexcept
+.type feclearexcept,@function
+feclearexcept:	
+	mov 4(%esp),%ecx
+	and $0x3f,%ecx
+	fnstsw %ax
+		# consider sse fenv as well if the cpu has XMM capability
+	call 1f
+1:	addl $__hwcap-1b,(%esp)
+	pop %edx
+	testl $0x02000000,(%edx)
+	jz 2f
+		# maintain exceptions in the sse mxcsr, clear x87 exceptions
+	test %eax,%ecx
+	jz 1f
+	fnclex
+1:	push %edx
+	stmxcsr (%esp)
+	pop %edx
+	and $0x3f,%eax
+	or %eax,%edx
+	test %edx,%ecx
+	jz 1f
+	not %ecx
+	and %ecx,%edx
+	push %edx
+	ldmxcsr (%esp)
+	pop %edx
+1:	xor %eax,%eax
+	ret
+		# only do the expensive x87 fenv load/store when needed
+2:	test %eax,%ecx
+	jz 1b
+	not %ecx
+	and %ecx,%eax
+	test $0x3f,%eax
+	jz 1f
+	fnclex
+	jmp 1b
+1:	sub $32,%esp
+	fnstenv (%esp)
+	mov %al,4(%esp)
+	fldenv (%esp)
+	add $32,%esp
+	xor %eax,%eax
+	ret
+
+.global feraiseexcept
+.type feraiseexcept,@function
+feraiseexcept:	
+	mov 4(%esp),%eax
+	and $0x3f,%eax
+	sub $32,%esp
+	fnstenv (%esp)
+	or %al,4(%esp)
+	fldenv (%esp)
+	add $32,%esp
+	xor %eax,%eax
+	ret
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,@function
+__fesetround:
+	mov 4(%esp),%ecx
+	push %eax
+	xor %eax,%eax
+	fnstcw (%esp)
+	andb $0xf3,1(%esp)
+	or %ch,1(%esp)
+	fldcw (%esp)
+		# consider sse fenv as well if the cpu has XMM capability
+	call 1f
+1:	addl $__hwcap-1b,(%esp)
+	pop %edx
+	testl $0x02000000,(%edx)
+	jz 1f
+	stmxcsr (%esp)
+	shl $3,%ch
+	andb $0x9f,1(%esp)
+	or %ch,1(%esp)
+	ldmxcsr (%esp)
+1:	pop %ecx
+	ret
+
+.global fegetround
+.type fegetround,@function
+fegetround:
+	push %eax
+	fnstcw (%esp)
+	pop %eax
+	and $0xc00,%eax
+	ret
+
+.global fegetenv
+.type fegetenv,@function
+fegetenv:
+	mov 4(%esp),%ecx
+	xor %eax,%eax
+	fnstenv (%ecx)
+		# consider sse fenv as well if the cpu has XMM capability
+	call 1f
+1:	addl $__hwcap-1b,(%esp)
+	pop %edx
+	testl $0x02000000,(%edx)
+	jz 1f
+	push %eax
+	stmxcsr (%esp)
+	pop %edx
+	and $0x3f,%edx
+	or %edx,4(%ecx)
+1:	ret
+
+.global fesetenv
+.type fesetenv,@function
+fesetenv:
+	mov 4(%esp),%ecx
+	xor %eax,%eax
+	inc %ecx
+	jz 1f
+	fldenv -1(%ecx)
+	movl -1(%ecx),%ecx
+	jmp 2f
+1:	push %eax
+	push %eax
+	push %eax
+	push %eax
+	pushl $0xffff
+	push %eax
+	pushl $0x37f
+	fldenv (%esp)
+	add $28,%esp
+		# consider sse fenv as well if the cpu has XMM capability
+2:	call 1f
+1:	addl $__hwcap-1b,(%esp)
+	pop %edx
+	testl $0x02000000,(%edx)
+	jz 1f
+		# mxcsr := same rounding mode, cleared exceptions, default mask
+	and $0xc00,%ecx
+	shl $3,%ecx
+	or $0x1f80,%ecx
+	mov %ecx,4(%esp)
+	ldmxcsr 4(%esp)
+1:	ret
+
+.global fetestexcept
+.type fetestexcept,@function
+fetestexcept:
+	mov 4(%esp),%ecx
+	and $0x3f,%ecx
+	fnstsw %ax
+		# consider sse fenv as well if the cpu has XMM capability
+	call 1f
+1:	addl $__hwcap-1b,(%esp)
+	pop %edx
+	testl $0x02000000,(%edx)
+	jz 1f
+	stmxcsr 4(%esp)
+	or 4(%esp),%eax
+1:	and %ecx,%eax
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/m68k/fenv.c b/src/components/lib/libc/musl-1.2.0/src/fenv/m68k/fenv.c
new file mode 100644
index 0000000000..d0658e6784
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/m68k/fenv.c
@@ -0,0 +1,85 @@
+#include <fenv.h>
+#include <features.h>
+
+#if __HAVE_68881__ || __mcffpu__
+
+static unsigned getsr()
+{
+	unsigned v;
+	__asm__ __volatile__ ("fmove.l %%fpsr,%0" : "=dm"(v));
+	return v;
+}
+
+static void setsr(unsigned v)
+{
+	__asm__ __volatile__ ("fmove.l %0,%%fpsr" : : "dm"(v));
+}
+
+static unsigned getcr()
+{
+	unsigned v;
+	__asm__ __volatile__ ("fmove.l %%fpcr,%0" : "=dm"(v));
+	return v;
+}
+
+static void setcr(unsigned v)
+{
+	__asm__ __volatile__ ("fmove.l %0,%%fpcr" : : "dm"(v));
+}
+
+int feclearexcept(int mask)
+{
+	if (mask & ~FE_ALL_EXCEPT) return -1;
+	setsr(getsr() & ~mask);
+	return 0;
+}
+
+int feraiseexcept(int mask)
+{
+	if (mask & ~FE_ALL_EXCEPT) return -1;
+	setsr(getsr() | mask);
+	return 0;
+}
+
+int fetestexcept(int mask)
+{
+	return getsr() & mask;
+}
+
+int fegetround(void)
+{
+	return getcr() & FE_UPWARD;
+}
+
+hidden int __fesetround(int r)
+{
+	setcr((getcr() & ~FE_UPWARD) | r);
+	return 0;
+}
+
+int fegetenv(fenv_t *envp)
+{
+	envp->__control_register = getcr();
+	envp->__status_register = getsr();
+	__asm__ __volatile__ ("fmove.l %%fpiar,%0"
+		: "=dm"(envp->__instruction_address));
+	return 0;
+}
+
+int fesetenv(const fenv_t *envp)
+{
+	static const fenv_t default_env = { 0 };
+	if (envp == FE_DFL_ENV)
+		envp = &default_env;
+	setcr(envp->__control_register);
+	setsr(envp->__status_register);
+	__asm__ __volatile__ ("fmove.l %0,%%fpiar"
+		: : "dm"(envp->__instruction_address));
+	return 0;
+}
+
+#else
+
+#include "../fenv.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/mips/fenv-sf.c b/src/components/lib/libc/musl-1.2.0/src/fenv/mips/fenv-sf.c
new file mode 100644
index 0000000000..4aa3dbf127
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/mips/fenv-sf.c
@@ -0,0 +1,3 @@
+#ifdef __mips_soft_float
+#include "../fenv.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/mips/fenv.S b/src/components/lib/libc/musl-1.2.0/src/fenv/mips/fenv.S
new file mode 100644
index 0000000000..ffa92971c0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/mips/fenv.S
@@ -0,0 +1,72 @@
+#ifndef __mips_soft_float
+
+.set noreorder
+
+.global feclearexcept
+.type  feclearexcept,@function
+feclearexcept:
+	and     $4, $4, 0x7c
+	cfc1    $5, $31
+	or      $5, $5, $4
+	xor     $5, $5, $4
+	ctc1    $5, $31
+	jr      $ra
+	li      $2, 0
+
+.global feraiseexcept
+.type  feraiseexcept,@function
+feraiseexcept:
+	and     $4, $4, 0x7c
+	cfc1    $5, $31
+	or      $5, $5, $4
+	ctc1    $5, $31
+	jr      $ra
+	li      $2, 0
+
+.global fetestexcept
+.type  fetestexcept,@function
+fetestexcept:
+	and     $4, $4, 0x7c
+	cfc1    $2, $31
+	jr      $ra
+	and     $2, $2, $4
+
+.global fegetround
+.type  fegetround,@function
+fegetround:
+	cfc1    $2, $31
+	jr      $ra
+	andi    $2, $2, 3
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,@function
+__fesetround:
+	cfc1    $5, $31
+	li      $6, -4
+	and     $5, $5, $6
+	or      $5, $5, $4
+	ctc1    $5, $31
+	jr      $ra
+	li      $2, 0
+
+.global fegetenv
+.type  fegetenv,@function
+fegetenv:
+	cfc1    $5, $31
+	sw      $5, 0($4)
+	jr      $ra
+	li      $2, 0
+
+.global fesetenv
+.type  fesetenv,@function
+fesetenv:
+	addiu   $5, $4, 1
+	beq     $5, $0, 1f
+	 nop
+	lw      $5, 0($4)
+1:	ctc1    $5, $31
+	jr      $ra
+	li      $2, 0
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/mips64/fenv-sf.c b/src/components/lib/libc/musl-1.2.0/src/fenv/mips64/fenv-sf.c
new file mode 100644
index 0000000000..4aa3dbf127
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/mips64/fenv-sf.c
@@ -0,0 +1,3 @@
+#ifdef __mips_soft_float
+#include "../fenv.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/mips64/fenv.S b/src/components/lib/libc/musl-1.2.0/src/fenv/mips64/fenv.S
new file mode 100644
index 0000000000..d5e0a6201c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/mips64/fenv.S
@@ -0,0 +1,72 @@
+#ifndef __mips_soft_float
+
+.set	noreorder
+
+.global	feclearexcept
+.type	feclearexcept,@function
+feclearexcept:
+	and	$4, $4, 0x7c
+	cfc1	$5, $31
+	or	$5, $5, $4
+	xor	$5, $5, $4
+	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+.global	feraiseexcept
+.type	feraiseexcept,@function
+feraiseexcept:
+	and	$4, $4, 0x7c
+	cfc1	$5, $31
+	or	$5, $5, $4
+	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+.global	fetestexcept
+.type	fetestexcept,@function
+fetestexcept:
+	and	$4, $4, 0x7c
+	cfc1	$2, $31
+	jr	$ra
+	and	$2, $2, $4
+
+.global	fegetround
+.type	fegetround,@function
+fegetround:
+	cfc1	$2, $31
+	jr	$ra
+	andi	$2, $2, 3
+
+.global	__fesetround
+.hidden __fesetround
+.type	__fesetround,@function
+__fesetround:
+	cfc1	$5, $31
+	li	$6, -4
+	and	$5, $5, $6
+	or	$5, $5, $4
+	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+.global	fegetenv
+.type	fegetenv,@function
+fegetenv:
+	cfc1	$5, $31
+	sw	$5, 0($4)
+	jr	$ra
+	li	$2, 0
+
+.global	fesetenv
+.type	fesetenv,@function
+fesetenv:
+	daddiu	$5, $4, 1
+	beq	$5, $0, 1f
+	nop
+	lw	$5, 0($4)
+1:	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/mipsn32/fenv-sf.c b/src/components/lib/libc/musl-1.2.0/src/fenv/mipsn32/fenv-sf.c
new file mode 100644
index 0000000000..4aa3dbf127
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/mipsn32/fenv-sf.c
@@ -0,0 +1,3 @@
+#ifdef __mips_soft_float
+#include "../fenv.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/mipsn32/fenv.S b/src/components/lib/libc/musl-1.2.0/src/fenv/mipsn32/fenv.S
new file mode 100644
index 0000000000..563d322073
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/mipsn32/fenv.S
@@ -0,0 +1,71 @@
+#ifndef __mips_soft_float
+
+.set	noreorder
+.global	feclearexcept
+.type	feclearexcept,@function
+feclearexcept:
+	and	$4, $4, 0x7c
+	cfc1	$5, $31
+	or	$5, $5, $4
+	xor	$5, $5, $4
+	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+.global feraiseexcept
+.type  feraiseexcept,@function
+feraiseexcept:
+	and	$4, $4, 0x7c
+	cfc1	$5, $31
+	or	$5, $5, $4
+	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+.global fetestexcept
+.type  fetestexcept,@function
+fetestexcept:
+	and	$4, $4, 0x7c
+	cfc1	$2, $31
+	jr	$ra
+	and	$2, $2, $4
+
+.global fegetround
+.type  fegetround,@function
+fegetround:
+	cfc1	$2, $31
+	jr	$ra
+	andi	$2, $2, 3
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,@function
+__fesetround:
+	cfc1	$5, $31
+	li	$6, -4
+	and	$5, $5, $6
+	or	$5, $5, $4
+	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+.global fegetenv
+.type  fegetenv,@function
+fegetenv:
+	cfc1	$5, $31
+	sw	$5, 0($4)
+	jr	$ra
+	li	$2, 0
+
+.global fesetenv
+.type  fesetenv,@function
+fesetenv:
+	addiu   $5, $4, 1
+	beq	$5, $0, 1f
+	nop
+	lw	$5, 0($4)
+1:	ctc1	$5, $31
+	jr	$ra
+	li	$2, 0
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc/fenv-sf.c b/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc/fenv-sf.c
new file mode 100644
index 0000000000..85bef40f10
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc/fenv-sf.c
@@ -0,0 +1,3 @@
+#ifdef _SOFT_FLOAT
+#include "../fenv.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc/fenv.S b/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc/fenv.S
new file mode 100644
index 0000000000..22cea216a0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc/fenv.S
@@ -0,0 +1,130 @@
+#ifndef _SOFT_FLOAT
+.global feclearexcept
+.type feclearexcept,@function
+feclearexcept:
+	andis. 3,3,0x3e00
+	/* if (r3 & FE_INVALID) r3 |= all_invalid_flags */
+	andis. 0,3,0x2000
+	stwu 1,-16(1)
+	beq- 0,1f
+	oris 3,3,0x01f8
+	ori  3,3,0x0700
+1:
+	/*
+	 * note: fpscr contains various fpu status and control
+	 * flags and we dont check if r3 may alter other flags
+	 * than the exception related ones
+	 * ufpscr &= ~r3
+	 */
+	mffs 0
+	stfd 0,8(1)
+	lwz 9,12(1)
+	andc 9,9,3
+	stw 9,12(1)
+	lfd 0,8(1)
+	mtfsf 255,0
+
+	/* return 0 */
+	li 3,0
+	addi 1,1,16
+	blr
+
+.global feraiseexcept
+.type feraiseexcept,@function
+feraiseexcept:
+	andis. 3,3,0x3e00
+	/* if (r3 & FE_INVALID) r3 |= software_invalid_flag */
+	andis. 0,3,0x2000
+	stwu 1,-16(1)
+	beq- 0,1f
+	ori 3,3,0x0400
+1:
+	/* fpscr |= r3 */
+	mffs 0
+	stfd 0,8(1)
+	lwz 9,12(1)
+	or 9,9,3
+	stw 9,12(1)
+	lfd 0,8(1)
+	mtfsf 255,0
+
+	/* return 0 */
+	li 3,0
+	addi 1,1,16
+	blr
+
+.global fetestexcept
+.type fetestexcept,@function
+fetestexcept:
+	andis. 3,3,0x3e00
+	/* return r3 & fpscr */
+	stwu 1,-16(1)
+	mffs 0
+	stfd 0,8(1)
+	lwz 9,12(1)
+	addi 1,1,16
+	and 3,3,9
+	blr
+
+.global fegetround
+.type fegetround,@function
+fegetround:
+	/* return fpscr & 3 */
+	stwu 1,-16(1)
+	mffs 0
+	stfd 0,8(1)
+	lwz 3,12(1)
+	addi 1,1,16
+	clrlwi 3,3,30
+	blr
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,@function
+__fesetround:
+	/*
+	 * note: invalid input is not checked, r3 < 4 must hold
+	 * fpscr = (fpscr & -4U) | r3
+	 */
+	stwu 1,-16(1)
+	mffs 0
+	stfd 0,8(1)
+	lwz 9,12(1)
+	clrrwi 9,9,2
+	or 9,9,3
+	stw 9,12(1)
+	lfd 0,8(1)
+	mtfsf 255,0
+
+	/* return 0 */
+	li 3,0
+	addi 1,1,16
+	blr
+
+.global fegetenv
+.type fegetenv,@function
+fegetenv:
+	/* *r3 = fpscr */
+	mffs 0
+	stfd 0,0(3)
+	/* return 0 */
+	li 3,0
+	blr
+
+.global fesetenv
+.type fesetenv,@function
+fesetenv:
+	cmpwi 3, -1
+	bne 1f
+	mflr 4
+	bl 2f
+	.zero 8
+2:	mflr 3
+	mtlr 4
+1:	/* fpscr = *r3 */
+	lfd 0,0(3)
+	mtfsf 255,0
+	/* return 0 */
+	li 3,0
+	blr
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc64/fenv.c b/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc64/fenv.c
new file mode 100644
index 0000000000..90dabdc8c9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/powerpc64/fenv.c
@@ -0,0 +1,69 @@
+#define _GNU_SOURCE
+#include <fenv.h>
+#include <features.h>
+
+static inline double get_fpscr_f(void)
+{
+	double d;
+	__asm__ __volatile__("mffs %0" : "=d"(d));
+	return d;
+}
+
+static inline long get_fpscr(void)
+{
+	return (union {double f; long i;}) {get_fpscr_f()}.i;
+}
+
+static inline void set_fpscr_f(double fpscr)
+{
+	__asm__ __volatile__("mtfsf 255, %0" : : "d"(fpscr));
+}
+
+static void set_fpscr(long fpscr)
+{
+	set_fpscr_f((union {long i; double f;}) {fpscr}.f);
+}
+
+int feclearexcept(int mask)
+{
+	mask &= FE_ALL_EXCEPT;
+	if (mask & FE_INVALID) mask |= FE_ALL_INVALID;
+	set_fpscr(get_fpscr() & ~mask);
+	return 0;
+}
+
+int feraiseexcept(int mask)
+{
+	mask &= FE_ALL_EXCEPT;
+	if (mask & FE_INVALID) mask |= FE_INVALID_SOFTWARE;
+	set_fpscr(get_fpscr() | mask);
+	return 0;
+}
+
+int fetestexcept(int mask)
+{
+	return get_fpscr() & mask & FE_ALL_EXCEPT;
+}
+
+int fegetround(void)
+{
+	return get_fpscr() & 3;
+}
+
+hidden int __fesetround(int r)
+{
+	set_fpscr(get_fpscr() & ~3L | r);
+	return 0;
+}
+
+int fegetenv(fenv_t *envp)
+{
+	*envp = get_fpscr_f();
+	return 0;
+}
+
+int fesetenv(const fenv_t *envp)
+{
+	set_fpscr_f(envp != FE_DFL_ENV ? *envp : 0);
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/riscv64/fenv-sf.c b/src/components/lib/libc/musl-1.2.0/src/fenv/riscv64/fenv-sf.c
new file mode 100644
index 0000000000..ecd3cb5cad
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/riscv64/fenv-sf.c
@@ -0,0 +1,3 @@
+#ifndef __riscv_flen
+#include "../fenv.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/riscv64/fenv.S b/src/components/lib/libc/musl-1.2.0/src/fenv/riscv64/fenv.S
new file mode 100644
index 0000000000..0ea78bf9ac
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/riscv64/fenv.S
@@ -0,0 +1,56 @@
+#ifdef __riscv_flen
+
+.global feclearexcept
+.type feclearexcept, %function
+feclearexcept:
+	csrc fflags, a0
+	li a0, 0
+	ret
+
+.global feraiseexcept
+.type feraiseexcept, %function
+feraiseexcept:
+	csrs fflags, a0
+	li a0, 0
+	ret
+
+.global fetestexcept
+.type fetestexcept, %function
+fetestexcept:
+	frflags t0
+	and a0, t0, a0
+	ret
+
+.global fegetround
+.type fegetround, %function
+fegetround:
+	frrm a0
+	ret
+
+.global __fesetround
+.type __fesetround, %function
+__fesetround:
+	fsrm t0, a0
+	li a0, 0
+	ret
+
+.global fegetenv
+.type fegetenv, %function
+fegetenv:
+	frcsr t0
+	sw t0, 0(a0)
+	li a0, 0
+	ret
+
+.global fesetenv
+.type fesetenv, %function
+fesetenv:
+	li t2, -1
+	li t1, 0
+	beq a0, t2, 1f
+	lw t1, 0(a0)
+1:	fscsr t1
+	li a0, 0
+	ret
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/s390x/fenv.c b/src/components/lib/libc/musl-1.2.0/src/fenv/s390x/fenv.c
new file mode 100644
index 0000000000..fd4e60c5eb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/s390x/fenv.c
@@ -0,0 +1,56 @@
+#include <fenv.h>
+#include <features.h>
+
+static inline unsigned get_fpc(void)
+{
+	unsigned fpc;
+	__asm__ __volatile__("efpc %0" : "=r"(fpc));
+	return fpc;
+}
+
+static inline void set_fpc(unsigned fpc)
+{
+	__asm__ __volatile__("sfpc %0" :: "r"(fpc));
+}
+
+int feclearexcept(int mask)
+{
+	mask &= FE_ALL_EXCEPT;
+	set_fpc(get_fpc() & ~mask);
+	return 0;
+}
+
+int feraiseexcept(int mask)
+{
+	mask &= FE_ALL_EXCEPT;
+	set_fpc(get_fpc() | mask);
+	return 0;
+}
+
+int fetestexcept(int mask)
+{
+	return get_fpc() & mask & FE_ALL_EXCEPT;
+}
+
+int fegetround(void)
+{
+	return get_fpc() & 3;
+}
+
+hidden int __fesetround(int r)
+{
+	set_fpc(get_fpc() & ~3L | r);
+	return 0;
+}
+
+int fegetenv(fenv_t *envp)
+{
+	*envp = get_fpc();
+	return 0;
+}
+
+int fesetenv(const fenv_t *envp)
+{
+	set_fpc(envp != FE_DFL_ENV ? *envp : 0);
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/sh/fenv-nofpu.c b/src/components/lib/libc/musl-1.2.0/src/fenv/sh/fenv-nofpu.c
new file mode 100644
index 0000000000..b2495a6583
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/sh/fenv-nofpu.c
@@ -0,0 +1,3 @@
+#if !__SH_FPU_ANY__ && !__SH4__
+#include "../fenv.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/sh/fenv.S b/src/components/lib/libc/musl-1.2.0/src/fenv/sh/fenv.S
new file mode 100644
index 0000000000..907aefc0d9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/sh/fenv.S
@@ -0,0 +1,79 @@
+#if __SH_FPU_ANY__ || __SH4__
+
+.global fegetround
+.type   fegetround, @function
+fegetround:
+	sts fpscr, r0
+	rts
+	 and #3, r0
+
+.global __fesetround
+.hidden __fesetround
+.type   __fesetround, @function
+__fesetround:
+	sts fpscr, r0
+	or  r4, r0
+	lds r0, fpscr
+	rts
+	 mov #0, r0
+
+.global fetestexcept
+.type   fetestexcept, @function
+fetestexcept:
+	sts fpscr, r0
+	and r4, r0
+	rts
+	 and #0x7c, r0
+
+.global feclearexcept
+.type   feclearexcept, @function
+feclearexcept:
+	mov r4, r0
+	and #0x7c, r0
+	not r0, r4
+	sts fpscr, r0
+	and r4, r0
+	lds r0, fpscr
+	rts
+	 mov #0, r0
+
+.global feraiseexcept
+.type   feraiseexcept, @function
+feraiseexcept:
+	mov r4, r0
+	and #0x7c, r0
+	sts fpscr, r4
+	or  r4, r0
+	lds r0, fpscr
+	rts
+	 mov #0, r0
+
+.global fegetenv
+.type   fegetenv, @function
+fegetenv:
+	sts fpscr, r0
+	mov.l r0, @r4
+	rts
+	 mov #0, r0
+
+.global fesetenv
+.type   fesetenv, @function
+fesetenv:
+	mov r4, r0
+	cmp/eq #-1, r0
+	bf 1f
+
+	! the default environment is complicated by the fact that we need to
+	! preserve the current precision bit, which we do not know a priori
+	sts fpscr, r0
+	mov #8, r1
+	swap.w r1, r1
+	bra 2f
+	 and r1, r0
+
+1:	mov.l @r4, r0      ! non-default environment
+2:	lds r0, fpscr
+	rts
+	 mov #0, r0
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/x32/fenv.s b/src/components/lib/libc/musl-1.2.0/src/fenv/x32/fenv.s
new file mode 100644
index 0000000000..835f23b615
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/x32/fenv.s
@@ -0,0 +1,98 @@
+.global feclearexcept
+.type feclearexcept,@function
+feclearexcept:
+		# maintain exceptions in the sse mxcsr, clear x87 exceptions
+	mov %edi,%ecx
+	and $0x3f,%ecx
+	fnstsw %ax
+	test %eax,%ecx
+	jz 1f
+	fnclex
+1:	stmxcsr -8(%esp)
+	and $0x3f,%eax
+	or %eax,-8(%esp)
+	test %ecx,-8(%esp)
+	jz 1f
+	not %ecx
+	and %ecx,-8(%esp)
+	ldmxcsr -8(%esp)
+1:	xor %eax,%eax
+	ret
+
+.global feraiseexcept
+.type feraiseexcept,@function
+feraiseexcept:
+	and $0x3f,%edi
+	stmxcsr -8(%esp)
+	or %edi,-8(%esp)
+	ldmxcsr -8(%esp)
+	xor %eax,%eax
+	ret
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,@function
+__fesetround:
+	push %rax
+	xor %eax,%eax
+	mov %edi,%ecx
+	fnstcw (%esp)
+	andb $0xf3,1(%esp)
+	or %ch,1(%esp)
+	fldcw (%esp)
+	stmxcsr (%esp)
+	shl $3,%ch
+	andb $0x9f,1(%esp)
+	or %ch,1(%esp)
+	ldmxcsr (%esp)
+	pop %rcx
+	ret
+
+.global fegetround
+.type fegetround,@function
+fegetround:
+	push %rax
+	stmxcsr (%esp)
+	pop %rax
+	shr $3,%eax
+	and $0xc00,%eax
+	ret
+
+.global fegetenv
+.type fegetenv,@function
+fegetenv:
+	xor %eax,%eax
+	fnstenv (%edi)
+	stmxcsr 28(%edi)
+	ret
+
+.global fesetenv
+.type fesetenv,@function
+fesetenv:
+	xor %eax,%eax
+	inc %edi
+	jz 1f
+	fldenv -1(%edi)
+	ldmxcsr 27(%edi)
+	ret
+1:	push %rax
+	push %rax
+	pushq $0xffff
+	pushq $0x37f
+	fldenv (%esp)
+	pushq $0x1f80
+	ldmxcsr (%esp)
+	add $40,%esp
+	ret
+
+.global fetestexcept
+.type fetestexcept,@function
+fetestexcept:
+	and $0x3f,%edi
+	push %rax
+	stmxcsr (%esp)
+	pop %rsi
+	fnstsw %ax
+	or %esi,%eax
+	and %edi,%eax
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/fenv/x86_64/fenv.s b/src/components/lib/libc/musl-1.2.0/src/fenv/x86_64/fenv.s
new file mode 100644
index 0000000000..98d876da26
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/fenv/x86_64/fenv.s
@@ -0,0 +1,98 @@
+.global feclearexcept
+.type feclearexcept,@function
+feclearexcept:
+		# maintain exceptions in the sse mxcsr, clear x87 exceptions
+	mov %edi,%ecx
+	and $0x3f,%ecx
+	fnstsw %ax
+	test %eax,%ecx
+	jz 1f
+	fnclex
+1:	stmxcsr -8(%rsp)
+	and $0x3f,%eax
+	or %eax,-8(%rsp)
+	test %ecx,-8(%rsp)
+	jz 1f
+	not %ecx
+	and %ecx,-8(%rsp)
+	ldmxcsr -8(%rsp)
+1:	xor %eax,%eax
+	ret
+
+.global feraiseexcept
+.type feraiseexcept,@function
+feraiseexcept:
+	and $0x3f,%edi
+	stmxcsr -8(%rsp)
+	or %edi,-8(%rsp)
+	ldmxcsr -8(%rsp)
+	xor %eax,%eax
+	ret
+
+.global __fesetround
+.hidden __fesetround
+.type __fesetround,@function
+__fesetround:
+	push %rax
+	xor %eax,%eax
+	mov %edi,%ecx
+	fnstcw (%rsp)
+	andb $0xf3,1(%rsp)
+	or %ch,1(%rsp)
+	fldcw (%rsp)
+	stmxcsr (%rsp)
+	shl $3,%ch
+	andb $0x9f,1(%rsp)
+	or %ch,1(%rsp)
+	ldmxcsr (%rsp)
+	pop %rcx
+	ret
+
+.global fegetround
+.type fegetround,@function
+fegetround:
+	push %rax
+	stmxcsr (%rsp)
+	pop %rax
+	shr $3,%eax
+	and $0xc00,%eax
+	ret
+
+.global fegetenv
+.type fegetenv,@function
+fegetenv:
+	xor %eax,%eax
+	fnstenv (%rdi)
+	stmxcsr 28(%rdi)
+	ret
+
+.global fesetenv
+.type fesetenv,@function
+fesetenv:
+	xor %eax,%eax
+	inc %rdi
+	jz 1f
+	fldenv -1(%rdi)
+	ldmxcsr 27(%rdi)
+	ret
+1:	push %rax
+	push %rax
+	pushq $0xffff
+	pushq $0x37f
+	fldenv (%rsp)
+	pushq $0x1f80
+	ldmxcsr (%rsp)
+	add $40,%rsp
+	ret
+
+.global fetestexcept
+.type fetestexcept,@function
+fetestexcept:
+	and $0x3f,%edi
+	push %rax
+	stmxcsr (%rsp)
+	pop %rsi
+	fnstsw %ax
+	or %esi,%eax
+	and %edi,%eax
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/arpa/inet.h b/src/components/lib/libc/musl-1.2.0/src/include/arpa/inet.h
new file mode 100644
index 0000000000..1e6debf496
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/arpa/inet.h
@@ -0,0 +1,8 @@
+#ifndef ARPA_INET_H
+#define ARPA_INET_H
+
+#include "../../../include/arpa/inet.h"
+
+hidden int __inet_aton(const char *, struct in_addr *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/crypt.h b/src/components/lib/libc/musl-1.2.0/src/include/crypt.h
new file mode 100644
index 0000000000..f6c6309533
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/crypt.h
@@ -0,0 +1,16 @@
+#ifndef CRYPT_H
+#define CRYPT_H
+
+#include "../../include/crypt.h"
+
+#include <features.h>
+
+hidden char *__crypt_r(const char *, const char *, struct crypt_data *);
+
+hidden char *__crypt_des(const char *, const char *, char *);
+hidden char *__crypt_md5(const char *, const char *, char *);
+hidden char *__crypt_blowfish(const char *, const char *, char *);
+hidden char *__crypt_sha256(const char *, const char *, char *);
+hidden char *__crypt_sha512(const char *, const char *, char *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/errno.h b/src/components/lib/libc/musl-1.2.0/src/include/errno.h
new file mode 100644
index 0000000000..8ec493777d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/errno.h
@@ -0,0 +1,14 @@
+#ifndef ERRNO_H
+#define ERRNO_H
+
+#include "../../include/errno.h"
+
+#ifdef __GNUC__
+__attribute__((const))
+#endif
+hidden int *___errno_location(void);
+
+#undef errno
+#define errno (*___errno_location())
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/features.h b/src/components/lib/libc/musl-1.2.0/src/include/features.h
new file mode 100644
index 0000000000..f17bd1516c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/features.h
@@ -0,0 +1,11 @@
+#ifndef FEATURES_H
+#define FEATURES_H
+
+#include "../../include/features.h"
+
+#define weak __attribute__((__weak__))
+#define hidden __attribute__((__visibility__("hidden")))
+#define weak_alias(old, new) \
+	extern __typeof(old) new __attribute__((__weak__, __alias__(#old)))
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/langinfo.h b/src/components/lib/libc/musl-1.2.0/src/include/langinfo.h
new file mode 100644
index 0000000000..ab32b880fb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/langinfo.h
@@ -0,0 +1,8 @@
+#ifndef LANGINFO_H
+#define LANGINFO_H
+
+#include "../../include/langinfo.h"
+
+char *__nl_langinfo_l(nl_item, locale_t);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/pthread.h b/src/components/lib/libc/musl-1.2.0/src/include/pthread.h
new file mode 100644
index 0000000000..7167d3e11a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/pthread.h
@@ -0,0 +1,29 @@
+#ifndef PTHREAD_H
+#define PTHREAD_H
+
+#include "../../include/pthread.h"
+
+hidden int __pthread_once(pthread_once_t *, void (*)(void));
+hidden void __pthread_testcancel(void);
+hidden int __pthread_setcancelstate(int, int *);
+hidden int __pthread_create(pthread_t *restrict, const pthread_attr_t *restrict, void *(*)(void *), void *restrict);
+hidden _Noreturn void __pthread_exit(void *);
+hidden int __pthread_join(pthread_t, void **);
+hidden int __pthread_mutex_lock(pthread_mutex_t *);
+hidden int __pthread_mutex_trylock(pthread_mutex_t *);
+hidden int __pthread_mutex_trylock_owner(pthread_mutex_t *);
+hidden int __pthread_mutex_timedlock(pthread_mutex_t *restrict, const struct timespec *restrict);
+hidden int __pthread_mutex_unlock(pthread_mutex_t *);
+hidden int __private_cond_signal(pthread_cond_t *, int);
+hidden int __pthread_cond_timedwait(pthread_cond_t *restrict, pthread_mutex_t *restrict, const struct timespec *restrict);
+hidden int __pthread_key_create(pthread_key_t *, void (*)(void *));
+hidden int __pthread_key_delete(pthread_key_t);
+hidden int __pthread_rwlock_rdlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_tryrdlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_timedrdlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
+hidden int __pthread_rwlock_wrlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_trywrlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
+hidden int __pthread_rwlock_unlock(pthread_rwlock_t *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/resolv.h b/src/components/lib/libc/musl-1.2.0/src/include/resolv.h
new file mode 100644
index 0000000000..945e89e635
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/resolv.h
@@ -0,0 +1,12 @@
+#ifndef RESOLV_H
+#define RESOLV_H
+
+#include "../../include/resolv.h"
+
+hidden int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
+
+hidden int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
+hidden int __res_send(const unsigned char *, int, unsigned char *, int);
+hidden int __res_msend(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/signal.h b/src/components/lib/libc/musl-1.2.0/src/include/signal.h
new file mode 100644
index 0000000000..bb5667841a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/signal.h
@@ -0,0 +1,14 @@
+#ifndef SIGNAL_H
+#define SIGNAL_H
+
+#include "../../include/signal.h"
+
+hidden int __sigaction(int, const struct sigaction *, struct sigaction *);
+
+hidden void __block_all_sigs(void *);
+hidden void __block_app_sigs(void *);
+hidden void __restore_sigs(void *);
+
+hidden void __get_handler_set(sigset_t *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/stdio.h b/src/components/lib/libc/musl-1.2.0/src/include/stdio.h
new file mode 100644
index 0000000000..fae3755b4a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/stdio.h
@@ -0,0 +1,20 @@
+#ifndef STDIO_H
+#define STDIO_H
+
+#define __DEFINED_struct__IO_FILE
+
+#include "../../include/stdio.h"
+
+#undef stdin
+#undef stdout
+#undef stderr
+
+extern hidden FILE __stdin_FILE;
+extern hidden FILE __stdout_FILE;
+extern hidden FILE __stderr_FILE;
+
+#define stdin (&__stdin_FILE)
+#define stdout (&__stdout_FILE)
+#define stderr (&__stderr_FILE)
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/stdlib.h b/src/components/lib/libc/musl-1.2.0/src/include/stdlib.h
new file mode 100644
index 0000000000..d38a5417f1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/stdlib.h
@@ -0,0 +1,12 @@
+#ifndef STDLIB_H
+#define STDLIB_H
+
+#include "../../include/stdlib.h"
+
+hidden int __putenv(char *, size_t, char *);
+hidden void __env_rm_add(char *, char *);
+hidden int __mkostemps(char *, int, int);
+hidden int __ptsname_r(int, char *, size_t);
+hidden char *__randname(char *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/string.h b/src/components/lib/libc/musl-1.2.0/src/include/string.h
new file mode 100644
index 0000000000..2133b5c1ee
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/string.h
@@ -0,0 +1,11 @@
+#ifndef STRING_H
+#define STRING_H
+
+#include "../../include/string.h"
+
+hidden void *__memrchr(const void *, int, size_t);
+hidden char *__stpcpy(char *, const char *);
+hidden char *__stpncpy(char *, const char *, size_t);
+hidden char *__strchrnul(const char *, int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/sys/auxv.h b/src/components/lib/libc/musl-1.2.0/src/include/sys/auxv.h
new file mode 100644
index 0000000000..9358a4a5d8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/sys/auxv.h
@@ -0,0 +1,10 @@
+#ifndef SYS_AUXV_H
+#define SYS_AUXV_H
+
+#include "../../../include/sys/auxv.h"
+
+#include <features.h>
+
+hidden unsigned long __getauxval(unsigned long);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/sys/membarrier.h b/src/components/lib/libc/musl-1.2.0/src/include/sys/membarrier.h
new file mode 100644
index 0000000000..3654491c2d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/sys/membarrier.h
@@ -0,0 +1,9 @@
+#ifndef SYS_MEMBARRIER_H
+#define SYS_MEMBARRIER_H
+
+#include "../../../include/sys/membarrier.h"
+#include <features.h>
+
+hidden int __membarrier(int, int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/sys/mman.h b/src/components/lib/libc/musl-1.2.0/src/include/sys/mman.h
new file mode 100644
index 0000000000..57c5bd3d96
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/sys/mman.h
@@ -0,0 +1,20 @@
+#ifndef SYS_MMAN_H
+#define SYS_MMAN_H
+
+#include "../../../include/sys/mman.h"
+
+hidden void __vm_wait(void);
+hidden void __vm_lock(void);
+hidden void __vm_unlock(void);
+
+hidden void *__mmap(void *, size_t, int, int, int, off_t);
+hidden int __munmap(void *, size_t);
+hidden void *__mremap(void *, size_t, size_t, int, ...);
+hidden int __madvise(void *, size_t, int);
+hidden int __mprotect(void *, size_t, int);
+
+hidden const unsigned char *__map_file(const char *, size_t *);
+
+hidden char *__shm_mapname(const char *, char *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/sys/sysinfo.h b/src/components/lib/libc/musl-1.2.0/src/include/sys/sysinfo.h
new file mode 100644
index 0000000000..10be8a48f7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/sys/sysinfo.h
@@ -0,0 +1,9 @@
+#ifndef SYS_SYSINFO_H
+#define SYS_SYSINFO_H
+
+#include "../../../include/sys/sysinfo.h"
+#include <features.h>
+
+hidden int __lsysinfo(struct sysinfo *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/sys/time.h b/src/components/lib/libc/musl-1.2.0/src/include/sys/time.h
new file mode 100644
index 0000000000..fb9622e51f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/sys/time.h
@@ -0,0 +1,8 @@
+#ifndef SYS_TIME_H
+#define SYS_TIME_H
+
+#include "../../../include/sys/time.h"
+
+hidden int __futimesat(int, const char *, const struct timeval [2]);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/time.h b/src/components/lib/libc/musl-1.2.0/src/include/time.h
new file mode 100644
index 0000000000..cbabde4767
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/time.h
@@ -0,0 +1,15 @@
+#ifndef TIME_H
+#define TIME_H
+
+#include "../../include/time.h"
+
+hidden int __clock_gettime(clockid_t, struct timespec *);
+hidden int __clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *);
+
+hidden char *__asctime_r(const struct tm *, char *);
+hidden struct tm *__gmtime_r(const time_t *restrict, struct tm *restrict);
+hidden struct tm *__localtime_r(const time_t *restrict, struct tm *restrict);
+
+hidden size_t __strftime_l(char *restrict, size_t, const char *restrict, const struct tm *restrict, locale_t);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/unistd.h b/src/components/lib/libc/musl-1.2.0/src/include/unistd.h
new file mode 100644
index 0000000000..1b4605c7c6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/unistd.h
@@ -0,0 +1,14 @@
+#ifndef UNISTD_H
+#define UNISTD_H
+
+#include "../../include/unistd.h"
+
+extern char **__environ;
+
+hidden int __dup3(int, int, int);
+hidden int __mkostemps(char *, int, int);
+hidden int __execvpe(const char *, char *const *, char *const *);
+hidden int __aio_close(int);
+hidden off_t __lseek(int, off_t, int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/include/wchar.h b/src/components/lib/libc/musl-1.2.0/src/include/wchar.h
new file mode 100644
index 0000000000..79f5d0e711
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/include/wchar.h
@@ -0,0 +1,9 @@
+#ifndef WCHAR_H
+#define WCHAR_H
+
+#define __DEFINED_struct__IO_FILE
+
+#include "../../include/wchar.h"
+
+#endif
+
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/atomic.h b/src/components/lib/libc/musl-1.2.0/src/internal/atomic.h
new file mode 100644
index 0000000000..f938879b07
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/atomic.h
@@ -0,0 +1,318 @@
+#ifndef _ATOMIC_H
+#define _ATOMIC_H
+
+#include <stdint.h>
+
+#include "atomic_arch.h"
+
+#ifdef a_ll
+
+#ifndef a_pre_llsc
+#define a_pre_llsc()
+#endif
+
+#ifndef a_post_llsc
+#define a_post_llsc()
+#endif
+
+#ifndef a_cas
+#define a_cas a_cas
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	int old;
+	a_pre_llsc();
+	do old = a_ll(p);
+	while (old==t && !a_sc(p, s));
+	a_post_llsc();
+	return old;
+}
+#endif
+
+#ifndef a_swap
+#define a_swap a_swap
+static inline int a_swap(volatile int *p, int v)
+{
+	int old;
+	a_pre_llsc();
+	do old = a_ll(p);
+	while (!a_sc(p, v));
+	a_post_llsc();
+	return old;
+}
+#endif
+
+#ifndef a_fetch_add
+#define a_fetch_add a_fetch_add
+static inline int a_fetch_add(volatile int *p, int v)
+{
+	int old;
+	a_pre_llsc();
+	do old = a_ll(p);
+	while (!a_sc(p, (unsigned)old + v));
+	a_post_llsc();
+	return old;
+}
+#endif
+
+#ifndef a_fetch_and
+#define a_fetch_and a_fetch_and
+static inline int a_fetch_and(volatile int *p, int v)
+{
+	int old;
+	a_pre_llsc();
+	do old = a_ll(p);
+	while (!a_sc(p, old & v));
+	a_post_llsc();
+	return old;
+}
+#endif
+
+#ifndef a_fetch_or
+#define a_fetch_or a_fetch_or
+static inline int a_fetch_or(volatile int *p, int v)
+{
+	int old;
+	a_pre_llsc();
+	do old = a_ll(p);
+	while (!a_sc(p, old | v));
+	a_post_llsc();
+	return old;
+}
+#endif
+
+#endif
+
+#ifdef a_ll_p
+
+#ifndef a_cas_p
+#define a_cas_p a_cas_p
+static inline void *a_cas_p(volatile void *p, void *t, void *s)
+{
+	void *old;
+	a_pre_llsc();
+	do old = a_ll_p(p);
+	while (old==t && !a_sc_p(p, s));
+	a_post_llsc();
+	return old;
+}
+#endif
+
+#endif
+
+#ifndef a_cas
+#error missing definition of a_cas
+#endif
+
+#ifndef a_swap
+#define a_swap a_swap
+static inline int a_swap(volatile int *p, int v)
+{
+	int old;
+	do old = *p;
+	while (a_cas(p, old, v) != old);
+	return old;
+}
+#endif
+
+#ifndef a_fetch_add
+#define a_fetch_add a_fetch_add
+static inline int a_fetch_add(volatile int *p, int v)
+{
+	int old;
+	do old = *p;
+	while (a_cas(p, old, (unsigned)old+v) != old);
+	return old;
+}
+#endif
+
+#ifndef a_fetch_and
+#define a_fetch_and a_fetch_and
+static inline int a_fetch_and(volatile int *p, int v)
+{
+	int old;
+	do old = *p;
+	while (a_cas(p, old, old&v) != old);
+	return old;
+}
+#endif
+#ifndef a_fetch_or
+#define a_fetch_or a_fetch_or
+static inline int a_fetch_or(volatile int *p, int v)
+{
+	int old;
+	do old = *p;
+	while (a_cas(p, old, old|v) != old);
+	return old;
+}
+#endif
+
+#ifndef a_and
+#define a_and a_and
+static inline void a_and(volatile int *p, int v)
+{
+	a_fetch_and(p, v);
+}
+#endif
+
+#ifndef a_or
+#define a_or a_or
+static inline void a_or(volatile int *p, int v)
+{
+	a_fetch_or(p, v);
+}
+#endif
+
+#ifndef a_inc
+#define a_inc a_inc
+static inline void a_inc(volatile int *p)
+{
+	a_fetch_add(p, 1);
+}
+#endif
+
+#ifndef a_dec
+#define a_dec a_dec
+static inline void a_dec(volatile int *p)
+{
+	a_fetch_add(p, -1);
+}
+#endif
+
+#ifndef a_store
+#define a_store a_store
+static inline void a_store(volatile int *p, int v)
+{
+#ifdef a_barrier
+	a_barrier();
+	*p = v;
+	a_barrier();
+#else
+	a_swap(p, v);
+#endif
+}
+#endif
+
+#ifndef a_barrier
+#define a_barrier a_barrier
+static void a_barrier()
+{
+	volatile int tmp = 0;
+	a_cas(&tmp, 0, 0);
+}
+#endif
+
+#ifndef a_spin
+#define a_spin a_barrier
+#endif
+
+#ifndef a_and_64
+#define a_and_64 a_and_64
+static inline void a_and_64(volatile uint64_t *p, uint64_t v)
+{
+	union { uint64_t v; uint32_t r[2]; } u = { v };
+	if (u.r[0]+1) a_and((int *)p, u.r[0]);
+	if (u.r[1]+1) a_and((int *)p+1, u.r[1]);
+}
+#endif
+
+#ifndef a_or_64
+#define a_or_64 a_or_64
+static inline void a_or_64(volatile uint64_t *p, uint64_t v)
+{
+	union { uint64_t v; uint32_t r[2]; } u = { v };
+	if (u.r[0]) a_or((int *)p, u.r[0]);
+	if (u.r[1]) a_or((int *)p+1, u.r[1]);
+}
+#endif
+
+#ifndef a_cas_p
+typedef char a_cas_p_undefined_but_pointer_not_32bit[-sizeof(char) == 0xffffffff ? 1 : -1];
+#define a_cas_p a_cas_p
+static inline void *a_cas_p(volatile void *p, void *t, void *s)
+{
+	return (void *)a_cas((volatile int *)p, (int)t, (int)s);
+}
+#endif
+
+#ifndef a_or_l
+#define a_or_l a_or_l
+static inline void a_or_l(volatile void *p, long v)
+{
+	if (sizeof(long) == sizeof(int)) a_or(p, v);
+	else a_or_64(p, v);
+}
+#endif
+
+#ifndef a_crash
+#define a_crash a_crash
+static inline void a_crash()
+{
+	*(volatile char *)0=0;
+}
+#endif
+
+#ifndef a_ctz_32
+#define a_ctz_32 a_ctz_32
+static inline int a_ctz_32(uint32_t x)
+{
+#ifdef a_clz_32
+	return 31-a_clz_32(x&-x);
+#else
+	static const char debruijn32[32] = {
+		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
+		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
+	};
+	return debruijn32[(x&-x)*0x076be629 >> 27];
+#endif
+}
+#endif
+
+#ifndef a_ctz_64
+#define a_ctz_64 a_ctz_64
+static inline int a_ctz_64(uint64_t x)
+{
+	static const char debruijn64[64] = {
+		0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28,
+		62, 5, 39, 46, 44, 42, 22, 9, 24, 35, 59, 56, 49, 18, 29, 11,
+		63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10,
+		51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12
+	};
+	if (sizeof(long) < 8) {
+		uint32_t y = x;
+		if (!y) {
+			y = x>>32;
+			return 32 + a_ctz_32(y);
+		}
+		return a_ctz_32(y);
+	}
+	return debruijn64[(x&-x)*0x022fdd63cc95386dull >> 58];
+}
+#endif
+
+static inline int a_ctz_l(unsigned long x)
+{
+	return (sizeof(long) < 8) ? a_ctz_32(x) : a_ctz_64(x);
+}
+
+#ifndef a_clz_64
+#define a_clz_64 a_clz_64
+static inline int a_clz_64(uint64_t x)
+{
+#ifdef a_clz_32
+	if (x>>32)
+		return a_clz_32(x>>32);
+	return a_clz_32(x) + 32;
+#else
+	uint32_t y;
+	int r;
+	if (x>>32) y=x>>32, r=0; else y=x, r=32;
+	if (y>>16) y>>=16; else r |= 16;
+	if (y>>8) y>>=8; else r |= 8;
+	if (y>>4) y>>=4; else r |= 4;
+	if (y>>2) y>>=2; else r |= 2;
+	return r | !(y>>1);
+#endif
+}
+#endif
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/complex_impl.h b/src/components/lib/libc/musl-1.2.0/src/internal/complex_impl.h
new file mode 100644
index 0000000000..51fb298acd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/complex_impl.h
@@ -0,0 +1,22 @@
+#ifndef _COMPLEX_IMPL_H
+#define _COMPLEX_IMPL_H
+
+#include <complex.h>
+#include "libm.h"
+
+#undef __CMPLX
+#undef CMPLX
+#undef CMPLXF
+#undef CMPLXL
+
+#define __CMPLX(x, y, t) \
+	((union { _Complex t __z; t __xy[2]; }){.__xy = {(x),(y)}}.__z)
+
+#define CMPLX(x, y) __CMPLX(x, y, double)
+#define CMPLXF(x, y) __CMPLX(x, y, float)
+#define CMPLXL(x, y) __CMPLX(x, y, long double)
+
+hidden double complex __ldexp_cexp(double complex,int);
+hidden float complex __ldexp_cexpf(float complex,int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/defsysinfo.c b/src/components/lib/libc/musl-1.2.0/src/internal/defsysinfo.c
new file mode 100644
index 0000000000..6d4117dbfa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/defsysinfo.c
@@ -0,0 +1,3 @@
+#include "libc.h"
+
+size_t __sysinfo;
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/dynlink.h b/src/components/lib/libc/musl-1.2.0/src/internal/dynlink.h
new file mode 100644
index 0000000000..764e3a1a8f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/dynlink.h
@@ -0,0 +1,108 @@
+#ifndef _INTERNAL_RELOC_H
+#define _INTERNAL_RELOC_H
+
+#include <features.h>
+#include <elf.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdarg.h>
+
+#if UINTPTR_MAX == 0xffffffff
+typedef Elf32_Ehdr Ehdr;
+typedef Elf32_Phdr Phdr;
+typedef Elf32_Sym Sym;
+#define R_TYPE(x) ((x)&255)
+#define R_SYM(x) ((x)>>8)
+#define R_INFO ELF32_R_INFO
+#else
+typedef Elf64_Ehdr Ehdr;
+typedef Elf64_Phdr Phdr;
+typedef Elf64_Sym Sym;
+#define R_TYPE(x) ((x)&0x7fffffff)
+#define R_SYM(x) ((x)>>32)
+#define R_INFO ELF64_R_INFO
+#endif
+
+/* These enum constants provide unmatchable default values for
+ * any relocation type the arch does not use. */
+enum {
+	REL_NONE = 0,
+	REL_SYMBOLIC = -100,
+	REL_USYMBOLIC,
+	REL_GOT,
+	REL_PLT,
+	REL_RELATIVE,
+	REL_OFFSET,
+	REL_OFFSET32,
+	REL_COPY,
+	REL_SYM_OR_REL,
+	REL_DTPMOD,
+	REL_DTPOFF,
+	REL_TPOFF,
+	REL_TPOFF_NEG,
+	REL_TLSDESC,
+	REL_FUNCDESC,
+	REL_FUNCDESC_VAL,
+};
+
+struct fdpic_loadseg {
+	uintptr_t addr, p_vaddr, p_memsz;
+};
+
+struct fdpic_loadmap {
+	unsigned short version, nsegs;
+	struct fdpic_loadseg segs[];
+};
+
+struct fdpic_dummy_loadmap {
+	unsigned short version, nsegs;
+	struct fdpic_loadseg segs[1];
+};
+
+#include "reloc.h"
+
+#ifndef FDPIC_CONSTDISP_FLAG
+#define FDPIC_CONSTDISP_FLAG 0
+#endif
+
+#ifndef DL_FDPIC
+#define DL_FDPIC 0
+#endif
+
+#ifndef DL_NOMMU_SUPPORT
+#define DL_NOMMU_SUPPORT 0
+#endif
+
+#if !DL_FDPIC
+#define IS_RELATIVE(x,s) ( \
+	(R_TYPE(x) == REL_RELATIVE) || \
+	(R_TYPE(x) == REL_SYM_OR_REL && !R_SYM(x)) )
+#else
+#define IS_RELATIVE(x,s) ( ( \
+	(R_TYPE(x) == REL_FUNCDESC_VAL) || \
+	(R_TYPE(x) == REL_SYMBOLIC) ) \
+	&& (((s)[R_SYM(x)].st_info & 0xf) == STT_SECTION) )
+#endif
+
+#ifndef NEED_MIPS_GOT_RELOCS
+#define NEED_MIPS_GOT_RELOCS 0
+#endif
+
+#ifndef DT_DEBUG_INDIRECT
+#define DT_DEBUG_INDIRECT 0
+#endif
+
+#define AUX_CNT 32
+#define DYN_CNT 32
+
+typedef void (*stage2_func)(unsigned char *, size_t *);
+
+hidden void *__dlsym(void *restrict, const char *restrict, void *restrict);
+
+hidden void __dl_seterr(const char *, ...);
+hidden int __dl_invalid_handle(void *);
+hidden void __dl_vseterr(const char *, va_list);
+
+hidden ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic();
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/fdpic_crt.h b/src/components/lib/libc/musl-1.2.0/src/internal/fdpic_crt.h
new file mode 100644
index 0000000000..7e9632bb7f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/fdpic_crt.h
@@ -0,0 +1,28 @@
+#include <stdint.h>
+#include <features.h>
+
+hidden void *__fdpic_fixup(void *map, uintptr_t *a, uintptr_t *z)
+{
+	/* If map is a null pointer, the program was loaded by a
+	 * non-FDPIC-aware ELF loader, and fixups are not needed,
+	 * but the value for the GOT pointer is. */
+	if (!map) return (void *)z[-1];
+
+	struct {
+		unsigned short version, nsegs;
+		struct fdpic_loadseg {
+			uintptr_t addr, p_vaddr, p_memsz;
+		} segs[];
+	} *lm = map;
+	int nsegs = lm->nsegs, rseg = 0, vseg = 0;
+	for (;;) {
+		while (*a-lm->segs[rseg].p_vaddr >= lm->segs[rseg].p_memsz)
+			if (++rseg == nsegs) rseg = 0;
+		uintptr_t *r = (uintptr_t *)
+			(*a + lm->segs[rseg].addr - lm->segs[rseg].p_vaddr);
+		if (++a == z) return r;
+		while (*r-lm->segs[vseg].p_vaddr >= lm->segs[vseg].p_memsz)
+			if (++vseg == nsegs) vseg = 0;
+		*r += lm->segs[vseg].addr - lm->segs[vseg].p_vaddr;
+	}
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/floatscan.c b/src/components/lib/libc/musl-1.2.0/src/internal/floatscan.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/internal/floatscan.c
rename to src/components/lib/libc/musl-1.2.0/src/internal/floatscan.c
index eef70df9d6..8c0828fcb3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/internal/floatscan.c
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/floatscan.c
@@ -33,9 +33,6 @@
 
 #define MASK (KMAX-1)
 
-#define CONCAT2(x,y) x ## y
-#define CONCAT(x,y) CONCAT2(x,y)
-
 static long long scanexp(FILE *f, int pok)
 {
 	int c;
@@ -110,7 +107,10 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 			gotdig=1;
 		} else {
 			dc++;
-			if (c!='0') x[KMAX-4] |= 1;
+			if (c!='0') {
+				lnz = (KMAX-4)*9;
+				x[KMAX-4] |= 1;
+			}
 		}
 	}
 	if (!gotrad) lrp=dc;
@@ -172,6 +172,9 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 			return sign * (long double)x[0] * p10s[rp-10];
 	}
 
+	/* Drop trailing zeros */
+	for (; !x[z-1]; z--);
+
 	/* Align radix point to B1B digit boundary */
 	if (rp % 9) {
 		int rpm9 = rp>=0 ? rp%9 : rp%9+9;
@@ -295,7 +298,7 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 	y -= bias;
 
 	if ((e2+LDBL_MANT_DIG & INT_MAX) > emax-5) {
-		if (fabs(y) >= CONCAT(0x1p, LDBL_MANT_DIG)) {
+		if (fabsl(y) >= 2/LDBL_EPSILON) {
 			if (denormal && bits==LDBL_MANT_DIG+e2-emin)
 				denormal = 0;
 			y *= 0.5;
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/floatscan.h b/src/components/lib/libc/musl-1.2.0/src/internal/floatscan.h
new file mode 100644
index 0000000000..f2b1dcf459
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/floatscan.h
@@ -0,0 +1,8 @@
+#ifndef FLOATSCAN_H
+#define FLOATSCAN_H
+
+#include <stdio.h>
+
+hidden long double __floatscan(FILE *, int, int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/futex.h b/src/components/lib/libc/musl-1.2.0/src/internal/futex.h
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/internal/futex.h
rename to src/components/lib/libc/musl-1.2.0/src/internal/futex.h
index cf4c79513e..dafbc24dbd 100644
--- a/src/components/lib/libc/musl-1.1.11/src/internal/futex.h
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/futex.h
@@ -16,6 +16,4 @@
 
 #define FUTEX_CLOCK_REALTIME 256
 
-int __futex(volatile int *, int, int, void *);
-
 #endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/i386/defsysinfo.s b/src/components/lib/libc/musl-1.2.0/src/internal/i386/defsysinfo.s
new file mode 100644
index 0000000000..f1b5b0f2f8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/i386/defsysinfo.s
@@ -0,0 +1,9 @@
+1:	int $128
+	ret
+
+.data
+.align 4
+.hidden __sysinfo
+.global __sysinfo
+__sysinfo:
+	.long 1b
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/intscan.c b/src/components/lib/libc/musl-1.2.0/src/internal/intscan.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/internal/intscan.c
rename to src/components/lib/libc/musl-1.2.0/src/internal/intscan.c
index 65d497ec8a..a4a5ae8612 100644
--- a/src/components/lib/libc/musl-1.1.11/src/internal/intscan.c
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/intscan.c
@@ -29,7 +29,7 @@ unsigned long long __intscan(FILE *f, unsigned base, int pok, unsigned long long
 	int c, neg=0;
 	unsigned x;
 	unsigned long long y;
-	if (base > 36) {
+	if (base > 36 || base == 1) {
 		errno = EINVAL;
 		return 0;
 	}
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/intscan.h b/src/components/lib/libc/musl-1.2.0/src/internal/intscan.h
new file mode 100644
index 0000000000..ccf9f112a9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/intscan.h
@@ -0,0 +1,8 @@
+#ifndef INTSCAN_H
+#define INTSCAN_H
+
+#include <stdio.h>
+
+hidden unsigned long long __intscan(FILE *, unsigned, int, unsigned long long);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/ksigaction.h b/src/components/lib/libc/musl-1.2.0/src/internal/ksigaction.h
new file mode 100644
index 0000000000..8ebd593835
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/ksigaction.h
@@ -0,0 +1,13 @@
+#include <features.h>
+
+/* This is the structure used for the rt_sigaction syscall on most archs,
+ * but it can be overridden by a file with the same name in the top-level
+ * arch dir for a given arch, if necessary. */
+struct k_sigaction {
+	void (*handler)(int);
+	unsigned long flags;
+	void (*restorer)(void);
+	unsigned mask[2];
+};
+
+hidden void __restore(), __restore_rt();
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/libc.c b/src/components/lib/libc/musl-1.2.0/src/internal/libc.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/internal/libc.c
rename to src/components/lib/libc/musl-1.2.0/src/internal/libc.c
index 2e10942df1..cb05181084 100644
--- a/src/components/lib/libc/musl-1.1.11/src/internal/libc.c
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/libc.c
@@ -3,7 +3,6 @@
 struct __libc __libc;
 
 size_t __hwcap;
-size_t __sysinfo;
 char *__progname=0, *__progname_full=0;
 
 weak_alias(__progname, program_invocation_short_name);
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/libc.h b/src/components/lib/libc/musl-1.2.0/src/internal/libc.h
new file mode 100644
index 0000000000..ac97dc7ebb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/libc.h
@@ -0,0 +1,57 @@
+#ifndef LIBC_H
+#define LIBC_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
+
+struct __locale_map;
+
+struct __locale_struct {
+	const struct __locale_map *cat[6];
+};
+
+struct tls_module {
+	struct tls_module *next;
+	void *image;
+	size_t len, size, align, offset;
+};
+
+struct __libc {
+	int can_do_threads;
+	int threaded;
+	int secure;
+	volatile int threads_minus_1;
+	size_t *auxv;
+	struct tls_module *tls_head;
+	size_t tls_size, tls_align, tls_cnt;
+	size_t page_size;
+	struct __locale_struct global_locale;
+};
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE libc.page_size
+#endif
+
+extern hidden struct __libc __libc;
+#define libc __libc
+
+hidden void __init_libc(char **, char *);
+hidden void __init_tls(size_t *);
+hidden void __init_ssp(void *);
+hidden void __libc_start_init(void);
+hidden void __funcs_on_exit(void);
+hidden void __funcs_on_quick_exit(void);
+hidden void __libc_exit_fini(void);
+hidden void __fork_handler(int);
+
+extern hidden size_t __hwcap;
+extern hidden size_t __sysinfo;
+extern char *__progname, *__progname_full;
+
+extern hidden const char __libc_version[];
+
+hidden void __synccall(void (*)(void *), void *);
+hidden int __setxid(int, int, int, int);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/libm.h b/src/components/lib/libc/musl-1.2.0/src/internal/libm.h
new file mode 100644
index 0000000000..b5bd26b840
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/libm.h
@@ -0,0 +1,271 @@
+#ifndef _LIBM_H
+#define _LIBM_H
+
+#include <stdint.h>
+#include <float.h>
+#include <math.h>
+#include <endian.h>
+#include "fp_arch.h"
+
+#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
+#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN
+union ldshape {
+	long double f;
+	struct {
+		uint64_t m;
+		uint16_t se;
+	} i;
+};
+#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __BIG_ENDIAN
+/* This is the m68k variant of 80-bit long double, and this definition only works
+ * on archs where the alignment requirement of uint64_t is <= 4. */
+union ldshape {
+	long double f;
+	struct {
+		uint16_t se;
+		uint16_t pad;
+		uint64_t m;
+	} i;
+};
+#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN
+union ldshape {
+	long double f;
+	struct {
+		uint64_t lo;
+		uint32_t mid;
+		uint16_t top;
+		uint16_t se;
+	} i;
+	struct {
+		uint64_t lo;
+		uint64_t hi;
+	} i2;
+};
+#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __BIG_ENDIAN
+union ldshape {
+	long double f;
+	struct {
+		uint16_t se;
+		uint16_t top;
+		uint32_t mid;
+		uint64_t lo;
+	} i;
+	struct {
+		uint64_t hi;
+		uint64_t lo;
+	} i2;
+};
+#else
+#error Unsupported long double representation
+#endif
+
+/* Support non-nearest rounding mode.  */
+#define WANT_ROUNDING 1
+/* Support signaling NaNs.  */
+#define WANT_SNAN 0
+
+#if WANT_SNAN
+#error SNaN is unsupported
+#else
+#define issignalingf_inline(x) 0
+#define issignaling_inline(x) 0
+#endif
+
+#ifndef TOINT_INTRINSICS
+#define TOINT_INTRINSICS 0
+#endif
+
+#if TOINT_INTRINSICS
+/* Round x to nearest int in all rounding modes, ties have to be rounded
+   consistently with converttoint so the results match.  If the result
+   would be outside of [-2^31, 2^31-1] then the semantics is unspecified.  */
+static double_t roundtoint(double_t);
+
+/* Convert x to nearest int in all rounding modes, ties have to be rounded
+   consistently with roundtoint.  If the result is not representible in an
+   int32_t then the semantics is unspecified.  */
+static int32_t converttoint(double_t);
+#endif
+
+/* Helps static branch prediction so hot path can be better optimized.  */
+#ifdef __GNUC__
+#define predict_true(x) __builtin_expect(!!(x), 1)
+#define predict_false(x) __builtin_expect(x, 0)
+#else
+#define predict_true(x) (x)
+#define predict_false(x) (x)
+#endif
+
+/* Evaluate an expression as the specified type. With standard excess
+   precision handling a type cast or assignment is enough (with
+   -ffloat-store an assignment is required, in old compilers argument
+   passing and return statement may not drop excess precision).  */
+
+static inline float eval_as_float(float x)
+{
+	float y = x;
+	return y;
+}
+
+static inline double eval_as_double(double x)
+{
+	double y = x;
+	return y;
+}
+
+/* fp_barrier returns its input, but limits code transformations
+   as if it had a side-effect (e.g. observable io) and returned
+   an arbitrary value.  */
+
+#ifndef fp_barrierf
+#define fp_barrierf fp_barrierf
+static inline float fp_barrierf(float x)
+{
+	volatile float y = x;
+	return y;
+}
+#endif
+
+#ifndef fp_barrier
+#define fp_barrier fp_barrier
+static inline double fp_barrier(double x)
+{
+	volatile double y = x;
+	return y;
+}
+#endif
+
+#ifndef fp_barrierl
+#define fp_barrierl fp_barrierl
+static inline long double fp_barrierl(long double x)
+{
+	volatile long double y = x;
+	return y;
+}
+#endif
+
+/* fp_force_eval ensures that the input value is computed when that's
+   otherwise unused.  To prevent the constant folding of the input
+   expression, an additional fp_barrier may be needed or a compilation
+   mode that does so (e.g. -frounding-math in gcc). Then it can be
+   used to evaluate an expression for its fenv side-effects only.   */
+
+#ifndef fp_force_evalf
+#define fp_force_evalf fp_force_evalf
+static inline void fp_force_evalf(float x)
+{
+	volatile float y;
+	y = x;
+}
+#endif
+
+#ifndef fp_force_eval
+#define fp_force_eval fp_force_eval
+static inline void fp_force_eval(double x)
+{
+	volatile double y;
+	y = x;
+}
+#endif
+
+#ifndef fp_force_evall
+#define fp_force_evall fp_force_evall
+static inline void fp_force_evall(long double x)
+{
+	volatile long double y;
+	y = x;
+}
+#endif
+
+#define FORCE_EVAL(x) do {                        \
+	if (sizeof(x) == sizeof(float)) {         \
+		fp_force_evalf(x);                \
+	} else if (sizeof(x) == sizeof(double)) { \
+		fp_force_eval(x);                 \
+	} else {                                  \
+		fp_force_evall(x);                \
+	}                                         \
+} while(0)
+
+#define asuint(f) ((union{float _f; uint32_t _i;}){f})._i
+#define asfloat(i) ((union{uint32_t _i; float _f;}){i})._f
+#define asuint64(f) ((union{double _f; uint64_t _i;}){f})._i
+#define asdouble(i) ((union{uint64_t _i; double _f;}){i})._f
+
+#define EXTRACT_WORDS(hi,lo,d)                    \
+do {                                              \
+  uint64_t __u = asuint64(d);                     \
+  (hi) = __u >> 32;                               \
+  (lo) = (uint32_t)__u;                           \
+} while (0)
+
+#define GET_HIGH_WORD(hi,d)                       \
+do {                                              \
+  (hi) = asuint64(d) >> 32;                       \
+} while (0)
+
+#define GET_LOW_WORD(lo,d)                        \
+do {                                              \
+  (lo) = (uint32_t)asuint64(d);                   \
+} while (0)
+
+#define INSERT_WORDS(d,hi,lo)                     \
+do {                                              \
+  (d) = asdouble(((uint64_t)(hi)<<32) | (uint32_t)(lo)); \
+} while (0)
+
+#define SET_HIGH_WORD(d,hi)                       \
+  INSERT_WORDS(d, hi, (uint32_t)asuint64(d))
+
+#define SET_LOW_WORD(d,lo)                        \
+  INSERT_WORDS(d, asuint64(d)>>32, lo)
+
+#define GET_FLOAT_WORD(w,d)                       \
+do {                                              \
+  (w) = asuint(d);                                \
+} while (0)
+
+#define SET_FLOAT_WORD(d,w)                       \
+do {                                              \
+  (d) = asfloat(w);                               \
+} while (0)
+
+hidden int    __rem_pio2_large(double*,double*,int,int,int);
+
+hidden int    __rem_pio2(double,double*);
+hidden double __sin(double,double,int);
+hidden double __cos(double,double);
+hidden double __tan(double,double,int);
+hidden double __expo2(double);
+
+hidden int    __rem_pio2f(float,double*);
+hidden float  __sindf(double);
+hidden float  __cosdf(double);
+hidden float  __tandf(double,int);
+hidden float  __expo2f(float);
+
+hidden int __rem_pio2l(long double, long double *);
+hidden long double __sinl(long double, long double, int);
+hidden long double __cosl(long double, long double);
+hidden long double __tanl(long double, long double, int);
+
+hidden long double __polevll(long double, const long double *, int);
+hidden long double __p1evll(long double, const long double *, int);
+
+extern int __signgam;
+hidden double __lgamma_r(double, int *);
+hidden float __lgammaf_r(float, int *);
+
+/* error handling functions */
+hidden float __math_xflowf(uint32_t, float);
+hidden float __math_uflowf(uint32_t);
+hidden float __math_oflowf(uint32_t);
+hidden float __math_divzerof(uint32_t);
+hidden float __math_invalidf(float);
+hidden double __math_xflow(uint32_t, double);
+hidden double __math_uflow(uint32_t);
+hidden double __math_oflow(uint32_t);
+hidden double __math_divzero(uint32_t);
+hidden double __math_invalid(double);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/locale_impl.h b/src/components/lib/libc/musl-1.2.0/src/internal/locale_impl.h
new file mode 100644
index 0000000000..741a71c4d1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/locale_impl.h
@@ -0,0 +1,45 @@
+#ifndef _LOCALE_IMPL_H
+#define _LOCALE_IMPL_H
+
+#include <locale.h>
+#include <stdlib.h>
+#include "libc.h"
+#include "pthread_impl.h"
+
+#define LOCALE_NAME_MAX 23
+
+struct __locale_map {
+	const void *map;
+	size_t map_size;
+	char name[LOCALE_NAME_MAX+1];
+	const struct __locale_map *next;
+};
+
+extern hidden const struct __locale_map __c_dot_utf8;
+extern hidden const struct __locale_struct __c_locale;
+extern hidden const struct __locale_struct __c_dot_utf8_locale;
+
+hidden const struct __locale_map *__get_locale(int, const char *);
+hidden const char *__mo_lookup(const void *, size_t, const char *);
+hidden const char *__lctrans(const char *, const struct __locale_map *);
+hidden const char *__lctrans_cur(const char *);
+hidden const char *__lctrans_impl(const char *, const struct __locale_map *);
+hidden int __loc_is_allocated(locale_t);
+hidden char *__gettextdomain(void);
+
+#define LOC_MAP_FAILED ((const struct __locale_map *)-1)
+
+#define LCTRANS(msg, lc, loc) __lctrans(msg, (loc)->cat[(lc)])
+#define LCTRANS_CUR(msg) __lctrans_cur(msg)
+
+#define C_LOCALE ((locale_t)&__c_locale)
+#define UTF8_LOCALE ((locale_t)&__c_dot_utf8_locale)
+
+#define CURRENT_LOCALE (__pthread_self()->locale)
+
+#define CURRENT_UTF8 (!!__pthread_self()->locale->cat[LC_CTYPE])
+
+#undef MB_CUR_MAX
+#define MB_CUR_MAX (CURRENT_UTF8 ? 4 : 1)
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/lock.h b/src/components/lib/libc/musl-1.2.0/src/internal/lock.h
new file mode 100644
index 0000000000..c77db6f7be
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/lock.h
@@ -0,0 +1,9 @@
+#ifndef LOCK_H
+#define LOCK_H
+
+hidden void __lock(volatile int *);
+hidden void __unlock(volatile int *);
+#define LOCK(x) __lock(x)
+#define UNLOCK(x) __unlock(x)
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/malloc_impl.h b/src/components/lib/libc/musl-1.2.0/src/internal/malloc_impl.h
new file mode 100644
index 0000000000..59785a7fe1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/malloc_impl.h
@@ -0,0 +1,46 @@
+#ifndef MALLOC_IMPL_H
+#define MALLOC_IMPL_H
+
+#include <sys/mman.h>
+
+hidden void *__expand_heap(size_t *);
+
+hidden void __malloc_donate(char *, char *);
+
+hidden void *__memalign(size_t, size_t);
+
+struct chunk {
+	size_t psize, csize;
+	struct chunk *next, *prev;
+};
+
+struct bin {
+	volatile int lock[2];
+	struct chunk *head;
+	struct chunk *tail;
+};
+
+#define SIZE_ALIGN (4*sizeof(size_t))
+#define SIZE_MASK (-SIZE_ALIGN)
+#define OVERHEAD (2*sizeof(size_t))
+#define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN)
+#define DONTCARE 16
+#define RECLAIM 163840
+
+#define CHUNK_SIZE(c) ((c)->csize & -2)
+#define CHUNK_PSIZE(c) ((c)->psize & -2)
+#define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c)))
+#define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c)))
+#define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD)
+#define CHUNK_TO_MEM(c) (void *)((char *)(c) + OVERHEAD)
+#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head))
+
+#define C_INUSE  ((size_t)1)
+
+#define IS_MMAPPED(c) !((c)->csize & (C_INUSE))
+
+hidden void __bin_chunk(struct chunk *);
+
+hidden extern int __malloc_replaced;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/procfdname.c b/src/components/lib/libc/musl-1.2.0/src/internal/procfdname.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/internal/procfdname.c
rename to src/components/lib/libc/musl-1.2.0/src/internal/procfdname.c
index 697e0bdc2e..fd7306ab69 100644
--- a/src/components/lib/libc/musl-1.1.11/src/internal/procfdname.c
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/procfdname.c
@@ -1,3 +1,5 @@
+#include "syscall.h"
+
 void __procfdname(char *buf, unsigned fd)
 {
 	unsigned i, j;
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/pthread_impl.h b/src/components/lib/libc/musl-1.2.0/src/internal/pthread_impl.h
new file mode 100644
index 0000000000..3dd6df1473
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/pthread_impl.h
@@ -0,0 +1,190 @@
+#ifndef _PTHREAD_IMPL_H
+#define _PTHREAD_IMPL_H
+
+#include <pthread.h>
+#include <signal.h>
+#include <errno.h>
+#include <limits.h>
+#include <sys/mman.h>
+#include "libc.h"
+#include "syscall.h"
+#include "atomic.h"
+#include "futex.h"
+
+#define pthread __pthread
+
+struct pthread {
+	/* Part 1 -- these fields may be external or
+	 * internal (accessed via asm) ABI. Do not change. */
+	struct pthread *self;
+	uintptr_t *dtv;
+	struct pthread *prev, *next; /* non-ABI */
+	uintptr_t sysinfo;
+	uintptr_t canary, canary2;
+
+	/* Part 2 -- implementation details, non-ABI. */
+	int tid;
+	int errno_val;
+	volatile int detach_state;
+	volatile int cancel;
+	volatile unsigned char canceldisable, cancelasync;
+	unsigned char tsd_used:1;
+	unsigned char dlerror_flag:1;
+	unsigned char *map_base;
+	size_t map_size;
+	void *stack;
+	size_t stack_size;
+	size_t guard_size;
+	void *result;
+	struct __ptcb *cancelbuf;
+	void **tsd;
+	struct {
+		volatile void *volatile head;
+		long off;
+		volatile void *volatile pending;
+	} robust_list;
+	volatile int timer_id;
+	locale_t locale;
+	volatile int killlock[1];
+	char *dlerror_buf;
+	void *stdio_locks;
+
+	/* Part 3 -- the positions of these fields relative to
+	 * the end of the structure is external and internal ABI. */
+	uintptr_t canary_at_end;
+	uintptr_t *dtv_copy;
+};
+
+enum {
+	DT_EXITING = 0,
+	DT_JOINABLE,
+	DT_DETACHED,
+};
+
+struct __timer {
+	int timerid;
+	pthread_t thread;
+};
+
+#define __SU (sizeof(size_t)/sizeof(int))
+
+#define _a_stacksize __u.__s[0]
+#define _a_guardsize __u.__s[1]
+#define _a_stackaddr __u.__s[2]
+#define _a_detach __u.__i[3*__SU+0]
+#define _a_sched __u.__i[3*__SU+1]
+#define _a_policy __u.__i[3*__SU+2]
+#define _a_prio __u.__i[3*__SU+3]
+#define _m_type __u.__i[0]
+#define _m_lock __u.__vi[1]
+#define _m_waiters __u.__vi[2]
+#define _m_prev __u.__p[3]
+#define _m_next __u.__p[4]
+#define _m_count __u.__i[5]
+#define _c_shared __u.__p[0]
+#define _c_seq __u.__vi[2]
+#define _c_waiters __u.__vi[3]
+#define _c_clock __u.__i[4]
+#define _c_lock __u.__vi[8]
+#define _c_head __u.__p[1]
+#define _c_tail __u.__p[5]
+#define _rw_lock __u.__vi[0]
+#define _rw_waiters __u.__vi[1]
+#define _rw_shared __u.__i[2]
+#define _b_lock __u.__vi[0]
+#define _b_waiters __u.__vi[1]
+#define _b_limit __u.__i[2]
+#define _b_count __u.__vi[3]
+#define _b_waiters2 __u.__vi[4]
+#define _b_inst __u.__p[3]
+
+#include "pthread_arch.h"
+
+#ifndef CANARY
+#define CANARY canary
+#endif
+
+#ifndef DTP_OFFSET
+#define DTP_OFFSET 0
+#endif
+
+#ifndef tls_mod_off_t
+#define tls_mod_off_t size_t
+#endif
+
+#define SIGTIMER 32
+#define SIGCANCEL 33
+#define SIGSYNCCALL 34
+
+#define SIGALL_SET ((sigset_t *)(const unsigned long long [2]){ -1,-1 })
+#define SIGPT_SET \
+	((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \
+	[sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
+#define SIGTIMER_SET \
+	((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \
+	 0x80000000 })
+
+void *__tls_get_addr(tls_mod_off_t *);
+hidden int __init_tp(void *);
+hidden void *__copy_tls(unsigned char *);
+hidden void __reset_tls();
+
+hidden void __membarrier_init(void);
+hidden void __dl_thread_cleanup(void);
+hidden void __testcancel();
+hidden void __do_cleanup_push(struct __ptcb *);
+hidden void __do_cleanup_pop(struct __ptcb *);
+hidden void __pthread_tsd_run_dtors();
+
+hidden void __pthread_key_delete_synccall(void (*)(void *), void *);
+hidden int __pthread_key_delete_impl(pthread_key_t);
+
+extern hidden volatile size_t __pthread_tsd_size;
+extern hidden void *__pthread_tsd_main[];
+extern hidden volatile int __aio_fut;
+extern hidden volatile int __eintr_valid_flag;
+
+hidden int __clone(int (*a)(void *), void *b, int c, void *d, void *e, void* f, void* g);
+hidden int __set_thread_area(void *);
+hidden int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
+hidden void __unmapself(void *, size_t);
+
+hidden int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int);
+hidden int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int);
+hidden void __wait(volatile int *, volatile int *, int, int);
+static inline void __wake(volatile void *addr, int cnt, int priv)
+{
+	if (priv) priv = FUTEX_PRIVATE;
+	if (cnt<0) cnt = INT_MAX;
+	__syscall(SYS_futex, addr, FUTEX_WAKE|priv, cnt) != -ENOSYS ||
+	__syscall(SYS_futex, addr, FUTEX_WAKE, cnt);
+}
+static inline void __futexwait(volatile void *addr, int val, int priv)
+{
+	if (priv) priv = FUTEX_PRIVATE;
+	__syscall(SYS_futex, addr, FUTEX_WAIT|priv, val, 0) != -ENOSYS ||
+	__syscall(SYS_futex, addr, FUTEX_WAIT, val, 0);
+}
+
+hidden void __acquire_ptc(void);
+hidden void __release_ptc(void);
+hidden void __inhibit_ptc(void);
+
+hidden void __tl_lock(void);
+hidden void __tl_unlock(void);
+hidden void __tl_sync(pthread_t);
+
+extern hidden volatile int __thread_list_lock;
+
+extern hidden unsigned __default_stacksize;
+extern hidden unsigned __default_guardsize;
+
+#define DEFAULT_STACK_SIZE 131072
+#define DEFAULT_GUARD_SIZE 8192
+
+#define DEFAULT_STACK_MAX (8<<20)
+#define DEFAULT_GUARD_MAX (1<<20)
+
+#define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1)
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/sh/__shcall.c b/src/components/lib/libc/musl-1.2.0/src/internal/sh/__shcall.c
new file mode 100644
index 0000000000..4e073e8ff4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/sh/__shcall.c
@@ -0,0 +1,6 @@
+#include <features.h>
+
+hidden int __shcall(void *arg, int (*func)(void *))
+{
+	return func(arg);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/shgetc.c b/src/components/lib/libc/musl-1.2.0/src/internal/shgetc.c
new file mode 100644
index 0000000000..a4a9c633dc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/shgetc.c
@@ -0,0 +1,37 @@
+#include "shgetc.h"
+
+/* The shcnt field stores the number of bytes read so far, offset by
+ * the value of buf-rpos at the last function call (__shlim or __shgetc),
+ * so that between calls the inline shcnt macro can add rpos-buf to get
+ * the actual count. */
+
+void __shlim(FILE *f, off_t lim)
+{
+	f->shlim = lim;
+	f->shcnt = f->buf - f->rpos;
+	/* If lim is nonzero, rend must be a valid pointer. */
+	if (lim && f->rend - f->rpos > lim)
+		f->shend = f->rpos + lim;
+	else
+		f->shend = f->rend;
+}
+
+int __shgetc(FILE *f)
+{
+	int c;
+	off_t cnt = shcnt(f);
+	if (f->shlim && cnt >= f->shlim || (c=__uflow(f)) < 0) {
+		f->shcnt = f->buf - f->rpos + cnt;
+		f->shend = f->rpos;
+		f->shlim = -1;
+		return EOF;
+	}
+	cnt++;
+	if (f->shlim && f->rend - f->rpos > f->shlim - cnt)
+		f->shend = f->rpos + (f->shlim - cnt);
+	else
+		f->shend = f->rend;
+	f->shcnt = f->buf - f->rpos + cnt;
+	if (f->rpos[-1] != c) f->rpos[-1] = c;
+	return c;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/shgetc.h b/src/components/lib/libc/musl-1.2.0/src/internal/shgetc.h
new file mode 100644
index 0000000000..9435381a61
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/shgetc.h
@@ -0,0 +1,32 @@
+#include "stdio_impl.h"
+
+/* Scan helper "stdio" functions for use by scanf-family and strto*-family
+ * functions. These accept either a valid stdio FILE, or a minimal pseudo
+ * FILE whose buffer pointers point into a null-terminated string. In the
+ * latter case, the sh_fromstring macro should be used to setup the FILE;
+ * the rest of the structure can be left uninitialized.
+ *
+ * To begin using these functions, shlim must first be called on the FILE
+ * to set a field width limit, or 0 for no limit. For string pseudo-FILEs,
+ * a nonzero limit is not valid and produces undefined behavior. After that,
+ * shgetc, shunget, and shcnt are valid as long as no other stdio functions
+ * are called on the stream.
+ *
+ * When used with a real FILE object, shunget has only one byte of pushback
+ * available. Further shunget (up to a limit of the stdio UNGET buffer size)
+ * will adjust the position but will not restore the data to be read again.
+ * This functionality is needed for the wcsto*-family functions, where it's
+ * okay because the FILE will be discarded immediately anyway. When used
+ * with string pseudo-FILEs, shunget has unlimited pushback, back to the
+ * beginning of the string. */
+
+hidden void __shlim(FILE *, off_t);
+hidden int __shgetc(FILE *);
+
+#define shcnt(f) ((f)->shcnt + ((f)->rpos - (f)->buf))
+#define shlim(f, lim) __shlim((f), (lim))
+#define shgetc(f) (((f)->rpos != (f)->shend) ? *(f)->rpos++ : __shgetc(f))
+#define shunget(f) ((f)->shlim>=0 ? (void)(f)->rpos-- : (void)0)
+
+#define sh_fromstring(f, s) \
+	((f)->buf = (f)->rpos = (void *)(s), (f)->rend = (void*)-1)
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/stdio_impl.h b/src/components/lib/libc/musl-1.2.0/src/internal/stdio_impl.h
new file mode 100644
index 0000000000..d7398f5913
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/stdio_impl.h
@@ -0,0 +1,114 @@
+#ifndef _STDIO_IMPL_H
+#define _STDIO_IMPL_H
+
+#include <stdio.h>
+#include "syscall.h"
+
+#define UNGET 8
+
+#define FFINALLOCK(f) ((f)->lock>=0 ? __lockfile((f)) : 0)
+#define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0)
+#define FUNLOCK(f) do { if (__need_unlock) __unlockfile((f)); } while (0)
+
+#define F_PERM 1
+#define F_NORD 4
+#define F_NOWR 8
+#define F_EOF 16
+#define F_ERR 32
+#define F_SVB 64
+#define F_APP 128
+
+struct _IO_FILE {
+	unsigned flags;
+	unsigned char *rpos, *rend;
+	int (*close)(FILE *);
+	unsigned char *wend, *wpos;
+	unsigned char *mustbezero_1;
+	unsigned char *wbase;
+	size_t (*read)(FILE *, unsigned char *, size_t);
+	size_t (*write)(FILE *, const unsigned char *, size_t);
+	off_t (*seek)(FILE *, off_t, int);
+	unsigned char *buf;
+	size_t buf_size;
+	FILE *prev, *next;
+	int fd;
+	int pipe_pid;
+	long lockcount;
+	int mode;
+	volatile int lock;
+	int lbf;
+	void *cookie;
+	off_t off;
+	char *getln_buf;
+	void *mustbezero_2;
+	unsigned char *shend;
+	off_t shlim, shcnt;
+	FILE *prev_locked, *next_locked;
+	struct __locale_struct *locale;
+};
+
+extern hidden FILE *volatile __stdin_used;
+extern hidden FILE *volatile __stdout_used;
+extern hidden FILE *volatile __stderr_used;
+
+hidden int __lockfile(FILE *);
+hidden void __unlockfile(FILE *);
+
+hidden size_t __stdio_read(FILE *, unsigned char *, size_t);
+hidden size_t __stdio_write(FILE *, const unsigned char *, size_t);
+hidden size_t __stdout_write(FILE *, const unsigned char *, size_t);
+hidden off_t __stdio_seek(FILE *, off_t, int);
+hidden int __stdio_close(FILE *);
+
+hidden size_t __string_read(FILE *, unsigned char *, size_t);
+
+hidden int __toread(FILE *);
+hidden int __towrite(FILE *);
+
+hidden void __stdio_exit(void);
+hidden void __stdio_exit_needed(void);
+
+#if defined(__PIC__) && (100*__GNUC__+__GNUC_MINOR__ >= 303)
+__attribute__((visibility("protected")))
+#endif
+int __overflow(FILE *, int), __uflow(FILE *);
+
+hidden int __fseeko(FILE *, off_t, int);
+hidden int __fseeko_unlocked(FILE *, off_t, int);
+hidden off_t __ftello(FILE *);
+hidden off_t __ftello_unlocked(FILE *);
+hidden size_t __fwritex(const unsigned char *, size_t, FILE *);
+hidden int __putc_unlocked(int, FILE *);
+
+hidden FILE *__fdopen(int, const char *);
+hidden int __fmodeflags(const char *);
+
+hidden FILE *__ofl_add(FILE *f);
+hidden FILE **__ofl_lock(void);
+hidden void __ofl_unlock(void);
+
+struct __pthread;
+hidden void __register_locked_file(FILE *, struct __pthread *);
+hidden void __unlist_locked_file(FILE *);
+hidden void __do_orphaned_stdio_locks(void);
+
+#define MAYBE_WAITERS 0x40000000
+
+hidden void __getopt_msg(const char *, const char *, const char *, size_t);
+
+#define feof(f) ((f)->flags & F_EOF)
+#define ferror(f) ((f)->flags & F_ERR)
+
+#define getc_unlocked(f) \
+	( ((f)->rpos != (f)->rend) ? *(f)->rpos++ : __uflow((f)) )
+
+#define putc_unlocked(c, f) \
+	( (((unsigned char)(c)!=(f)->lbf && (f)->wpos!=(f)->wend)) \
+	? *(f)->wpos++ = (unsigned char)(c) \
+	: __overflow((f),(unsigned char)(c)) )
+
+/* Caller-allocated FILE * operations */
+hidden FILE *__fopen_rb_ca(const char *, FILE *, unsigned char *, size_t);
+hidden int __fclose_ca(FILE *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/syscall.h b/src/components/lib/libc/musl-1.2.0/src/internal/syscall.h
new file mode 100644
index 0000000000..975a0031d4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/syscall.h
@@ -0,0 +1,384 @@
+#ifndef _INTERNAL_SYSCALL_H
+#define _INTERNAL_SYSCALL_H
+
+#include <features.h>
+#include <sys/syscall.h>
+#include "syscall_arch.h"
+
+#ifndef SYSCALL_RLIM_INFINITY
+#define SYSCALL_RLIM_INFINITY (~0ULL)
+#endif
+
+#ifndef SYSCALL_MMAP2_UNIT
+#define SYSCALL_MMAP2_UNIT 4096ULL
+#endif
+
+#ifndef __SYSCALL_LL_PRW
+#define __SYSCALL_LL_PRW(x) __SYSCALL_LL_O(x)
+#endif
+
+#ifndef __scc
+#define __scc(X) ((long) (X))
+typedef long syscall_arg_t;
+#endif
+
+hidden long __syscall_ret(unsigned long),
+	__syscall_cp(syscall_arg_t, syscall_arg_t, syscall_arg_t, syscall_arg_t,
+	             syscall_arg_t, syscall_arg_t, syscall_arg_t);
+
+#define __syscall1(n,a) __syscall1(n,__scc(a))
+#define __syscall2(n,a,b) __syscall2(n,__scc(a),__scc(b))
+#define __syscall3(n,a,b,c) __syscall3(n,__scc(a),__scc(b),__scc(c))
+#define __syscall4(n,a,b,c,d) __syscall4(n,__scc(a),__scc(b),__scc(c),__scc(d))
+#define __syscall5(n,a,b,c,d,e) __syscall5(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
+#define __syscall6(n,a,b,c,d,e,f) __syscall6(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
+#define __syscall7(n,a,b,c,d,e,f,g) __syscall7(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f),__scc(g))
+
+#define __SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n
+#define __SYSCALL_NARGS(...) __SYSCALL_NARGS_X(__VA_ARGS__,7,6,5,4,3,2,1,0,)
+#define __SYSCALL_CONCAT_X(a,b) a##b
+#define __SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X(a,b)
+#define __SYSCALL_DISP(b,...) __SYSCALL_CONCAT(b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
+
+#define __syscall(...) __SYSCALL_DISP(__syscall,__VA_ARGS__)
+#define syscall(...) __syscall_ret(__syscall(__VA_ARGS__))
+
+#define socketcall(nm,a,b,c,d,e,f) __syscall_ret(__socketcall(nm,a,b,c,d,e,f))
+#define socketcall_cp(nm,a,b,c,d,e,f) __syscall_ret(__socketcall_cp(nm,a,b,c,d,e,f))
+
+#define __syscall_cp0(n) (__syscall_cp)(n,0,0,0,0,0,0)
+#define __syscall_cp1(n,a) (__syscall_cp)(n,__scc(a),0,0,0,0,0)
+#define __syscall_cp2(n,a,b) (__syscall_cp)(n,__scc(a),__scc(b),0,0,0,0)
+#define __syscall_cp3(n,a,b,c) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),0,0,0)
+#define __syscall_cp4(n,a,b,c,d) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),0,0)
+#define __syscall_cp5(n,a,b,c,d,e) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),0)
+#define __syscall_cp6(n,a,b,c,d,e,f) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
+
+#define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp,__VA_ARGS__)
+#define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
+
+#ifndef SYSCALL_USE_SOCKETCALL
+#define __socketcall(nm,a,b,c,d,e,f) __syscall(SYS_##nm, a, b, c, d, e, f)
+#define __socketcall_cp(nm,a,b,c,d,e,f) __syscall_cp(SYS_##nm, a, b, c, d, e, f)
+#else
+#define __socketcall(nm,a,b,c,d,e,f) __syscall(SYS_socketcall, __SC_##nm, \
+    ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f }))
+#define __socketcall_cp(nm,a,b,c,d,e,f) __syscall_cp(SYS_socketcall, __SC_##nm, \
+    ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f }))
+#endif
+
+/* fixup legacy 16-bit junk */
+
+#ifdef SYS_getuid32
+#undef SYS_lchown
+#undef SYS_getuid
+#undef SYS_getgid
+#undef SYS_geteuid
+#undef SYS_getegid
+#undef SYS_setreuid
+#undef SYS_setregid
+#undef SYS_getgroups
+#undef SYS_setgroups
+#undef SYS_fchown
+#undef SYS_setresuid
+#undef SYS_getresuid
+#undef SYS_setresgid
+#undef SYS_getresgid
+#undef SYS_chown
+#undef SYS_setuid
+#undef SYS_setgid
+#undef SYS_setfsuid
+#undef SYS_setfsgid
+#define SYS_lchown SYS_lchown32
+#define SYS_getuid SYS_getuid32
+#define SYS_getgid SYS_getgid32
+#define SYS_geteuid SYS_geteuid32
+#define SYS_getegid SYS_getegid32
+#define SYS_setreuid SYS_setreuid32
+#define SYS_setregid SYS_setregid32
+#define SYS_getgroups SYS_getgroups32
+#define SYS_setgroups SYS_setgroups32
+#define SYS_fchown SYS_fchown32
+#define SYS_setresuid SYS_setresuid32
+#define SYS_getresuid SYS_getresuid32
+#define SYS_setresgid SYS_setresgid32
+#define SYS_getresgid SYS_getresgid32
+#define SYS_chown SYS_chown32
+#define SYS_setuid SYS_setuid32
+#define SYS_setgid SYS_setgid32
+#define SYS_setfsuid SYS_setfsuid32
+#define SYS_setfsgid SYS_setfsgid32
+#endif
+
+
+/* fixup legacy 32-bit-vs-lfs64 junk */
+
+#ifdef SYS_fcntl64
+#undef SYS_fcntl
+#define SYS_fcntl SYS_fcntl64
+#endif
+
+#ifdef SYS_getdents64
+#undef SYS_getdents
+#define SYS_getdents SYS_getdents64
+#endif
+
+#ifdef SYS_ftruncate64
+#undef SYS_ftruncate
+#undef SYS_truncate
+#define SYS_ftruncate SYS_ftruncate64
+#define SYS_truncate SYS_truncate64
+#endif
+
+#ifdef SYS_stat64
+#undef SYS_stat
+#define SYS_stat SYS_stat64
+#endif
+
+#ifdef SYS_fstat64
+#undef SYS_fstat
+#define SYS_fstat SYS_fstat64
+#endif
+
+#ifdef SYS_lstat64
+#undef SYS_lstat
+#define SYS_lstat SYS_lstat64
+#endif
+
+#ifdef SYS_statfs64
+#undef SYS_statfs
+#define SYS_statfs SYS_statfs64
+#endif
+
+#ifdef SYS_fstatfs64
+#undef SYS_fstatfs
+#define SYS_fstatfs SYS_fstatfs64
+#endif
+
+#if defined(SYS_newfstatat)
+#undef SYS_fstatat
+#define SYS_fstatat SYS_newfstatat
+#elif defined(SYS_fstatat64)
+#undef SYS_fstatat
+#define SYS_fstatat SYS_fstatat64
+#endif
+
+#ifdef SYS_ugetrlimit
+#undef SYS_getrlimit
+#define SYS_getrlimit SYS_ugetrlimit
+#endif
+
+#ifdef SYS__newselect
+#undef SYS_select
+#define SYS_select SYS__newselect
+#endif
+
+#ifdef SYS_pread64
+#undef SYS_pread
+#undef SYS_pwrite
+#define SYS_pread SYS_pread64
+#define SYS_pwrite SYS_pwrite64
+#endif
+
+#ifdef SYS_fadvise64_64
+#undef SYS_fadvise
+#define SYS_fadvise SYS_fadvise64_64
+#elif defined(SYS_fadvise64)
+#undef SYS_fadvise
+#define SYS_fadvise SYS_fadvise64
+#endif
+
+#ifdef SYS_sendfile64
+#undef SYS_sendfile
+#define SYS_sendfile SYS_sendfile64
+#endif
+
+#ifndef SYS_timer_settime
+#define SYS_timer_settime SYS_timer_settime32
+#endif
+
+#ifndef SYS_timer_gettime
+#define SYS_timer_gettime SYS_timer_gettime32
+#endif
+
+#ifndef SYS_timerfd_settime
+#define SYS_timerfd_settime SYS_timerfd_settime32
+#endif
+
+#ifndef SYS_timerfd_gettime
+#define SYS_timerfd_gettime SYS_timerfd_gettime32
+#endif
+
+#ifndef SYS_clock_settime
+#define SYS_clock_settime SYS_clock_settime32
+#endif
+
+#ifndef SYS_clock_gettime
+#define SYS_clock_gettime SYS_clock_gettime32
+#endif
+
+#ifndef SYS_clock_getres
+#define SYS_clock_getres SYS_clock_getres_time32
+#endif
+
+#ifndef SYS_clock_nanosleep
+#define SYS_clock_nanosleep SYS_clock_nanosleep_time32
+#endif
+
+#ifndef SYS_gettimeofday
+#define SYS_gettimeofday SYS_gettimeofday_time32
+#endif
+
+#ifndef SYS_settimeofday
+#define SYS_settimeofday SYS_settimeofday_time32
+#endif
+
+/* Ensure that the plain syscall names are defined even for "time64-only"
+ * archs. These facilitate callers passing null time arguments, and make
+ * tests for establishing which to use/fallback-to more consistent when
+ * they do need to be called with time arguments. */
+
+#ifndef SYS_clock_gettime
+#define SYS_clock_gettime SYS_clock_gettime64
+#endif
+
+#ifndef SYS_clock_settime
+#define SYS_clock_settime SYS_clock_settime64
+#endif
+
+#ifndef SYS_clock_adjtime
+#define SYS_clock_adjtime SYS_clock_adjtime64
+#endif
+
+#ifndef SYS_clock_getres
+#define SYS_clock_getres SYS_clock_getres_time64
+#endif
+
+#ifndef SYS_clock_nanosleep
+#define SYS_clock_nanosleep SYS_clock_nanosleep_time64
+#endif
+
+#ifndef SYS_timer_gettime
+#define SYS_timer_gettime SYS_timer_gettime64
+#endif
+
+#ifndef SYS_timer_settime
+#define SYS_timer_settime SYS_timer_settime64
+#endif
+
+#ifndef SYS_timerfd_gettime
+#define SYS_timerfd_gettime SYS_timerfd_gettime64
+#endif
+
+#ifndef SYS_timerfd_settime
+#define SYS_timerfd_settime SYS_timerfd_settime64
+#endif
+
+#ifndef SYS_utimensat
+#define SYS_utimensat SYS_utimensat_time64
+#endif
+
+#ifndef SYS_pselect6
+#define SYS_pselect6 SYS_pselect6_time64
+#endif
+
+#ifndef SYS_ppoll
+#define SYS_ppoll SYS_ppoll_time64
+#endif
+
+#ifndef SYS_recvmmsg
+#define SYS_recvmmsg SYS_recvmmsg_time64
+#endif
+
+#ifndef SYS_mq_timedsend
+#define SYS_mq_timedsend SYS_mq_timedsend_time64
+#endif
+
+#ifndef SYS_mq_timedreceive
+#define SYS_mq_timedreceive SYS_mq_timedreceive_time64
+#endif
+
+/* SYS_semtimedop omitted because SYS_ipc may provide it */
+
+#ifndef SYS_rt_sigtimedwait
+#define SYS_rt_sigtimedwait SYS_rt_sigtimedwait_time64
+#endif
+
+#ifndef SYS_futex
+#define SYS_futex SYS_futex_time64
+#endif
+
+#ifndef SYS_sched_rr_get_interval
+#define SYS_sched_rr_get_interval SYS_sched_rr_get_interval_time64
+#endif
+
+
+
+
+/* socketcall calls */
+
+#define __SC_socket      1
+#define __SC_bind        2
+#define __SC_connect     3
+#define __SC_listen      4
+#define __SC_accept      5
+#define __SC_getsockname 6
+#define __SC_getpeername 7
+#define __SC_socketpair  8
+#define __SC_send        9
+#define __SC_recv        10
+#define __SC_sendto      11
+#define __SC_recvfrom    12
+#define __SC_shutdown    13
+#define __SC_setsockopt  14
+#define __SC_getsockopt  15
+#define __SC_sendmsg     16
+#define __SC_recvmsg     17
+#define __SC_accept4     18
+#define __SC_recvmmsg    19
+#define __SC_sendmmsg    20
+
+#ifndef SO_RCVTIMEO_OLD
+#define SO_RCVTIMEO_OLD  20
+#endif
+#ifndef SO_SNDTIMEO_OLD
+#define SO_SNDTIMEO_OLD  21
+#endif
+
+#define SO_TIMESTAMP_OLD    29
+#define SO_TIMESTAMPNS_OLD  35
+#define SO_TIMESTAMPING_OLD 37
+#define SCM_TIMESTAMP_OLD    SO_TIMESTAMP_OLD
+#define SCM_TIMESTAMPNS_OLD  SO_TIMESTAMPNS_OLD
+#define SCM_TIMESTAMPING_OLD SO_TIMESTAMPING_OLD
+
+#ifndef SIOCGSTAMP_OLD
+#define SIOCGSTAMP_OLD 0x8906
+#endif
+#ifndef SIOCGSTAMPNS_OLD
+#define SIOCGSTAMPNS_OLD 0x8907
+#endif
+
+#ifdef SYS_open
+#define __sys_open2(x,pn,fl) __syscall2(SYS_open, pn, (fl)|O_LARGEFILE)
+#define __sys_open3(x,pn,fl,mo) __syscall3(SYS_open, pn, (fl)|O_LARGEFILE, mo)
+#define __sys_open_cp2(x,pn,fl) __syscall_cp2(SYS_open, pn, (fl)|O_LARGEFILE)
+#define __sys_open_cp3(x,pn,fl,mo) __syscall_cp3(SYS_open, pn, (fl)|O_LARGEFILE, mo)
+#else
+#define __sys_open2(x,pn,fl) __syscall3(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE)
+#define __sys_open3(x,pn,fl,mo) __syscall4(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE, mo)
+#define __sys_open_cp2(x,pn,fl) __syscall_cp3(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE)
+#define __sys_open_cp3(x,pn,fl,mo) __syscall_cp4(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE, mo)
+#endif
+
+#define __sys_open(...) __SYSCALL_DISP(__sys_open,,__VA_ARGS__)
+#define sys_open(...) __syscall_ret(__sys_open(__VA_ARGS__))
+
+#define __sys_open_cp(...) __SYSCALL_DISP(__sys_open_cp,,__VA_ARGS__)
+#define sys_open_cp(...) __syscall_ret(__sys_open_cp(__VA_ARGS__))
+
+hidden void __procfdname(char __buf[static 15+3*sizeof(int)], unsigned);
+
+hidden void *__vdsosym(const char *, const char *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/syscall_ret.c b/src/components/lib/libc/musl-1.2.0/src/internal/syscall_ret.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/internal/syscall_ret.c
rename to src/components/lib/libc/musl-1.2.0/src/internal/syscall_ret.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/internal/vdso.c b/src/components/lib/libc/musl-1.2.0/src/internal/vdso.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/internal/vdso.c
rename to src/components/lib/libc/musl-1.2.0/src/internal/vdso.c
index 6ae0212e5c..d46d32281e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/internal/vdso.c
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/vdso.c
@@ -1,4 +1,5 @@
 #include <elf.h>
+#include <link.h>
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
@@ -44,6 +45,7 @@ void *__vdsosym(const char *vername, const char *name)
 	size_t i;
 	for (i=0; libc.auxv[i] != AT_SYSINFO_EHDR; i+=2)
 		if (!libc.auxv[i]) return 0;
+	if (!libc.auxv[i+1]) return 0;
 	Ehdr *eh = (void *)libc.auxv[i+1];
 	Phdr *ph = (void *)((char *)eh + eh->e_phoff);
 	size_t *dynv=0, base=-1;
@@ -57,7 +59,7 @@ void *__vdsosym(const char *vername, const char *name)
 
 	char *strings = 0;
 	Sym *syms = 0;
-	uint32_t *hashtab = 0;
+	Elf_Symndx *hashtab = 0;
 	uint16_t *versym = 0;
 	Verdef *verdef = 0;
 	
diff --git a/src/components/lib/libc/musl-1.2.0/src/internal/version.c b/src/components/lib/libc/musl-1.2.0/src/internal/version.c
new file mode 100644
index 0000000000..08bbf5b2b7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/internal/version.c
@@ -0,0 +1,4 @@
+#include "version.h"
+#include "libc.h"
+
+const char __libc_version[] = VERSION;
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/ftok.c b/src/components/lib/libc/musl-1.2.0/src/ipc/ftok.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/ftok.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/ftok.c
index cd6002ed18..c36b4b6003 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/ftok.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/ftok.c
@@ -6,5 +6,5 @@ key_t ftok(const char *path, int id)
 	struct stat st;
 	if (stat(path, &st) < 0) return -1;
 
-	return ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | ((id & 0xff) << 24));
+	return ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | ((id & 0xffu) << 24));
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/ipc/ipc.h b/src/components/lib/libc/musl-1.2.0/src/ipc/ipc.h
new file mode 100644
index 0000000000..746a905c98
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/ipc.h
@@ -0,0 +1,24 @@
+#include "syscall.h"
+
+#define IPCOP_semop      1
+#define IPCOP_semget     2
+#define IPCOP_semctl     3
+#define IPCOP_semtimedop 4
+#define IPCOP_msgsnd    11
+#define IPCOP_msgrcv    12
+#define IPCOP_msgget    13
+#define IPCOP_msgctl    14
+#define IPCOP_shmat     21
+#define IPCOP_shmdt     22
+#define IPCOP_shmget    23
+#define IPCOP_shmctl    24
+
+#ifndef IPC_64
+#define IPC_64 0x100
+#endif
+
+#define IPC_TIME64 (IPC_STAT & 0x100)
+
+#define IPC_CMD(cmd) (((cmd) & ~IPC_TIME64) | IPC_64)
+
+#define IPC_HILO(b,t) ((b)->t = (b)->__##t##_lo | 0LL+(b)->__##t##_hi<<32)
diff --git a/src/components/lib/libc/musl-1.2.0/src/ipc/msgctl.c b/src/components/lib/libc/musl-1.2.0/src/ipc/msgctl.c
new file mode 100644
index 0000000000..b043041a56
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/msgctl.c
@@ -0,0 +1,41 @@
+#include <sys/msg.h>
+#include <endian.h>
+#include "syscall.h"
+#include "ipc.h"
+
+#if __BYTE_ORDER != __BIG_ENDIAN
+#undef SYSCALL_IPC_BROKEN_MODE
+#endif
+
+int msgctl(int q, int cmd, struct msqid_ds *buf)
+{
+#ifdef SYSCALL_IPC_BROKEN_MODE
+	struct msqid_ds tmp;
+	if (cmd == IPC_SET) {
+		tmp = *buf;
+		tmp.msg_perm.mode *= 0x10000U;
+		buf = &tmp;
+	}
+#endif
+#ifndef SYS_ipc
+	int r = __syscall(SYS_msgctl, q, IPC_CMD(cmd), buf);
+#else
+	int r = __syscall(SYS_ipc, IPCOP_msgctl, q, IPC_CMD(cmd), 0, buf, 0);
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+	if (r >= 0) switch (cmd | IPC_TIME64) {
+	case IPC_STAT:
+	case MSG_STAT:
+	case MSG_STAT_ANY:
+		buf->msg_perm.mode >>= 16;
+	}
+#endif
+#if IPC_TIME64
+	if (r >= 0 && (cmd&IPC_TIME64)) {
+		IPC_HILO(buf, msg_stime);
+		IPC_HILO(buf, msg_rtime);
+		IPC_HILO(buf, msg_ctime);
+	}
+#endif
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/msgget.c b/src/components/lib/libc/musl-1.2.0/src/ipc/msgget.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/msgget.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/msgget.c
index 9dfbc4eabc..30a4b42b85 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/msgget.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/msgget.c
@@ -4,7 +4,7 @@
 
 int msgget(key_t k, int flag)
 {
-#ifdef SYS_msgget
+#ifndef SYS_ipc
 	return syscall(SYS_msgget, k, flag);
 #else
 	return syscall(SYS_ipc, IPCOP_msgget, k, flag);
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/msgrcv.c b/src/components/lib/libc/musl-1.2.0/src/ipc/msgrcv.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/msgrcv.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/msgrcv.c
index ed4a448a7e..9d1034b145 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/msgrcv.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/msgrcv.c
@@ -1,11 +1,10 @@
 #include <sys/msg.h>
 #include "syscall.h"
 #include "ipc.h"
-#include "libc.h"
 
 ssize_t msgrcv(int q, void *m, size_t len, long type, int flag)
 {
-#ifdef SYS_msgrcv
+#ifndef SYS_ipc
 	return syscall_cp(SYS_msgrcv, q, m, len, type, flag);
 #else
 	return syscall_cp(SYS_ipc, IPCOP_msgrcv, q, len, flag, ((long[]){ (long)m, type }));
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/msgsnd.c b/src/components/lib/libc/musl-1.2.0/src/ipc/msgsnd.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/msgsnd.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/msgsnd.c
index 23f4a4cbf5..99bb17e94a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/msgsnd.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/msgsnd.c
@@ -1,11 +1,10 @@
 #include <sys/msg.h>
 #include "syscall.h"
 #include "ipc.h"
-#include "libc.h"
 
 int msgsnd(int q, const void *m, size_t len, int flag)
 {
-#ifdef SYS_msgsnd
+#ifndef SYS_ipc
 	return syscall_cp(SYS_msgsnd, q, m, len, flag);
 #else
 	return syscall_cp(SYS_ipc, IPCOP_msgsnd, q, len, flag, m);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ipc/semctl.c b/src/components/lib/libc/musl-1.2.0/src/ipc/semctl.c
new file mode 100644
index 0000000000..ed9827477a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/semctl.c
@@ -0,0 +1,59 @@
+#include <sys/sem.h>
+#include <stdarg.h>
+#include <endian.h>
+#include "syscall.h"
+#include "ipc.h"
+
+#if __BYTE_ORDER != __BIG_ENDIAN
+#undef SYSCALL_IPC_BROKEN_MODE
+#endif
+
+union semun {
+	int val;
+	struct semid_ds *buf;
+	unsigned short *array;
+};
+
+int semctl(int id, int num, int cmd, ...)
+{
+	union semun arg = {0};
+	va_list ap;
+	switch (cmd & ~IPC_TIME64) {
+	case SETVAL: case GETALL: case SETALL: case IPC_SET:
+	case IPC_INFO: case SEM_INFO:
+	case IPC_STAT & ~IPC_TIME64:
+	case SEM_STAT & ~IPC_TIME64:
+	case SEM_STAT_ANY & ~IPC_TIME64:
+		va_start(ap, cmd);
+		arg = va_arg(ap, union semun);
+		va_end(ap);
+	}
+#ifdef SYSCALL_IPC_BROKEN_MODE
+	struct semid_ds tmp;
+	if (cmd == IPC_SET) {
+		tmp = *arg.buf;
+		tmp.sem_perm.mode *= 0x10000U;
+		arg.buf = &tmp;
+	}
+#endif
+#ifndef SYS_ipc
+	int r = __syscall(SYS_semctl, id, num, IPC_CMD(cmd), arg.buf);
+#else
+	int r = __syscall(SYS_ipc, IPCOP_semctl, id, num, IPC_CMD(cmd), &arg.buf);
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+	if (r >= 0) switch (cmd | IPC_TIME64) {
+	case IPC_STAT:
+	case SEM_STAT:
+	case SEM_STAT_ANY:
+		arg.buf->sem_perm.mode >>= 16;
+	}
+#endif
+#if IPC_TIME64
+	if (r >= 0 && (cmd&IPC_TIME64)) {
+		IPC_HILO(arg.buf, sem_otime);
+		IPC_HILO(arg.buf, sem_ctime);
+	}
+#endif
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/semget.c b/src/components/lib/libc/musl-1.2.0/src/ipc/semget.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/semget.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/semget.c
index c4a559db1b..2cdf626b50 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/semget.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/semget.c
@@ -11,7 +11,7 @@ int semget(key_t key, int n, int fl)
 	 * n fits in the correct (per POSIX) userspace type, so
 	 * we have to check here. */
 	if (n > USHRT_MAX) return __syscall_ret(-EINVAL);
-#ifdef SYS_semget
+#ifndef SYS_ipc
 	return syscall(SYS_semget, key, n, fl);
 #else
 	return syscall(SYS_ipc, IPCOP_semget, key, n, fl);
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/semop.c b/src/components/lib/libc/musl-1.2.0/src/ipc/semop.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/semop.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/semop.c
index 8046e43714..5f0c7deaf3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/semop.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/semop.c
@@ -4,7 +4,7 @@
 
 int semop(int id, struct sembuf *buf, size_t n)
 {
-#ifdef SYS_semop
+#ifndef SYS_ipc
 	return syscall(SYS_semop, id, buf, n);
 #else
 	return syscall(SYS_ipc, IPCOP_semop, id, n, 0, buf);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ipc/semtimedop.c b/src/components/lib/libc/musl-1.2.0/src/ipc/semtimedop.c
new file mode 100644
index 0000000000..1632e7b03f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/semtimedop.c
@@ -0,0 +1,35 @@
+#define _GNU_SOURCE
+#include <sys/sem.h>
+#include <errno.h>
+#include "syscall.h"
+#include "ipc.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+#if !defined(SYS_semtimedop) && !defined(SYS_ipc)
+#define NO_TIME32 1
+#else
+#define NO_TIME32 0
+#endif
+
+int semtimedop(int id, struct sembuf *buf, size_t n, const struct timespec *ts)
+{
+#ifdef SYS_semtimedop_time64
+	time_t s = ts ? ts->tv_sec : 0;
+	long ns = ts ? ts->tv_nsec : 0;
+	int r = -ENOSYS;
+	if (NO_TIME32 || !IS32BIT(s))
+		r = __syscall(SYS_semtimedop_time64, id, buf, n,
+			ts ? ((long long[]){s, ns}) : 0);
+	if (NO_TIME32 || r!=-ENOSYS) return __syscall_ret(r);
+	ts = ts ? (void *)(long[]){CLAMP(s), ns} : 0;
+#endif
+#if defined(SYS_ipc)
+	return syscall(SYS_ipc, IPCOP_semtimedop, id, n, 0, buf, ts);
+#elif defined(SYS_semtimedop)
+	return syscall(SYS_semtimedop, id, buf, n, ts);
+#else
+	return __syscall_ret(-ENOSYS);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/shmat.c b/src/components/lib/libc/musl-1.2.0/src/ipc/shmat.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/shmat.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/shmat.c
index 38db92f951..8c7407d13f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/shmat.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/shmat.c
@@ -2,7 +2,7 @@
 #include "syscall.h"
 #include "ipc.h"
 
-#ifdef SYS_shmat
+#ifndef SYS_ipc
 void *shmat(int id, const void *addr, int flag)
 {
 	return (void *)syscall(SYS_shmat, id, addr, flag);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ipc/shmctl.c b/src/components/lib/libc/musl-1.2.0/src/ipc/shmctl.c
new file mode 100644
index 0000000000..de3ce9d4d7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/shmctl.c
@@ -0,0 +1,41 @@
+#include <sys/shm.h>
+#include <endian.h>
+#include "syscall.h"
+#include "ipc.h"
+
+#if __BYTE_ORDER != __BIG_ENDIAN
+#undef SYSCALL_IPC_BROKEN_MODE
+#endif
+
+int shmctl(int id, int cmd, struct shmid_ds *buf)
+{
+#ifdef SYSCALL_IPC_BROKEN_MODE
+	struct shmid_ds tmp;
+	if (cmd == IPC_SET) {
+		tmp = *buf;
+		tmp.shm_perm.mode *= 0x10000U;
+		buf = &tmp;
+	}
+#endif
+#ifndef SYS_ipc
+	int r = __syscall(SYS_shmctl, id, IPC_CMD(cmd), buf);
+#else
+	int r = __syscall(SYS_ipc, IPCOP_shmctl, id, IPC_CMD(cmd), 0, buf, 0);
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+	if (r >= 0) switch (cmd | IPC_TIME64) {
+	case IPC_STAT:
+	case SHM_STAT:
+	case SHM_STAT_ANY:
+		buf->shm_perm.mode >>= 16;
+	}
+#endif
+#if IPC_TIME64
+	if (r >= 0 && (cmd&IPC_TIME64)) {
+		IPC_HILO(buf, shm_atime);
+		IPC_HILO(buf, shm_dtime);
+		IPC_HILO(buf, shm_ctime);
+	}
+#endif
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/shmdt.c b/src/components/lib/libc/musl-1.2.0/src/ipc/shmdt.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/shmdt.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/shmdt.c
index d4fac8f183..572381378e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/shmdt.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/shmdt.c
@@ -4,7 +4,7 @@
 
 int shmdt(const void *addr)
 {
-#ifdef SYS_shmdt
+#ifndef SYS_ipc
 	return syscall(SYS_shmdt, addr);
 #else
 	return syscall(SYS_ipc, IPCOP_shmdt, 0, 0, 0, addr);
diff --git a/src/components/lib/libc/musl-1.1.11/src/ipc/shmget.c b/src/components/lib/libc/musl-1.2.0/src/ipc/shmget.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/ipc/shmget.c
rename to src/components/lib/libc/musl-1.2.0/src/ipc/shmget.c
index b44f9d680a..7521b5fa3f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/ipc/shmget.c
+++ b/src/components/lib/libc/musl-1.2.0/src/ipc/shmget.c
@@ -6,7 +6,7 @@
 int shmget(key_t key, size_t size, int flag)
 {
 	if (size > PTRDIFF_MAX) size = SIZE_MAX;
-#ifdef SYS_shmget
+#ifndef SYS_ipc
 	return syscall(SYS_shmget, key, size, flag);
 #else
 	return syscall(SYS_ipc, IPCOP_shmget, key, size, flag);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/__dlsym.c b/src/components/lib/libc/musl-1.2.0/src/ldso/__dlsym.c
new file mode 100644
index 0000000000..0384f97e96
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/__dlsym.c
@@ -0,0 +1,14 @@
+#include <dlfcn.h>
+#include "dynlink.h"
+
+static void *stub_dlsym(void *restrict p, const char *restrict s, void *restrict ra)
+{
+	__dl_seterr("Symbol not found: %s", s);
+	return 0;
+}
+
+weak_alias(stub_dlsym, __dlsym);
+
+#if _REDIR_TIME64
+weak_alias(stub_dlsym, __dlsym_redir_time64);
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/aarch64/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/aarch64/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/aarch64/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/aarch64/dlsym.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/aarch64/tlsdesc.s b/src/components/lib/libc/musl-1.2.0/src/ldso/aarch64/tlsdesc.s
new file mode 100644
index 0000000000..c6c685b3d7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/aarch64/tlsdesc.s
@@ -0,0 +1,31 @@
+// size_t __tlsdesc_static(size_t *a)
+// {
+// 	return a[1];
+// }
+.global __tlsdesc_static
+.hidden __tlsdesc_static
+.type __tlsdesc_static,@function
+__tlsdesc_static:
+	ldr x0,[x0,#8]
+	ret
+
+// size_t __tlsdesc_dynamic(size_t *a)
+// {
+// 	struct {size_t modidx,off;} *p = (void*)a[1];
+// 	size_t *dtv = *(size_t**)(tp - 8);
+// 	return dtv[p->modidx] + p->off - tp;
+// }
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+.type __tlsdesc_dynamic,@function
+__tlsdesc_dynamic:
+	stp x1,x2,[sp,#-16]!
+	mrs x1,tpidr_el0      // tp
+	ldr x0,[x0,#8]        // p
+	ldp x0,x2,[x0]        // p->modidx, p->off
+	sub x2,x2,x1          // p->off - tp
+	ldr x1,[x1,#-8]       // dtv
+	ldr x1,[x1,x0,lsl #3] // dtv[p->modidx]
+	add x0,x1,x2          // dtv[p->modidx] + p->off - tp
+	ldp x1,x2,[sp],#16
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/arm/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/arm/dlsym.s
new file mode 100644
index 0000000000..2652c348d7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/arm/dlsym.s
@@ -0,0 +1,8 @@
+.syntax unified
+.text
+.global dlsym
+.hidden __dlsym
+.type dlsym,%function
+dlsym:
+	mov r2,lr
+	b __dlsym
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/arm/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/arm/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/arm/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.1.11/arch/arm/src/find_exidx.c b/src/components/lib/libc/musl-1.2.0/src/ldso/arm/find_exidx.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/arm/src/find_exidx.c
rename to src/components/lib/libc/musl-1.2.0/src/ldso/arm/find_exidx.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/arm/tlsdesc.S b/src/components/lib/libc/musl-1.2.0/src/ldso/arm/tlsdesc.S
new file mode 100644
index 0000000000..3ae133c96b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/arm/tlsdesc.S
@@ -0,0 +1,55 @@
+.syntax unified
+
+.text
+.global __tlsdesc_static
+.hidden __tlsdesc_static
+.type __tlsdesc_static,%function
+__tlsdesc_static:
+	ldr r0,[r0]
+	bx lr
+
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+.type __tlsdesc_dynamic,%function
+__tlsdesc_dynamic:
+	push {r2,r3,ip,lr}
+	ldr r1,[r0]
+	ldr r2,[r1,#4]  // r2 = offset
+	ldr r1,[r1]     // r1 = modid
+
+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
+	mrc p15,0,r0,c13,c0,3
+#else
+	ldr r0,1f
+	add r0,r0,pc
+	ldr r0,[r0]
+2:
+#if __ARM_ARCH >= 5
+	blx r0          // r0 = tp
+#else
+#if __thumb__
+	add lr,pc,#1
+#else
+	mov lr,pc
+#endif
+	bx r0
+#endif
+#endif
+	ldr r3,[r0,#-4] // r3 = dtv
+	ldr ip,[r3,r1,LSL #2]
+	sub r0,ip,r0
+	add r0,r0,r2    // r0 = r3[r1]-r0+r2
+#if __ARM_ARCH >= 5
+	pop {r2,r3,ip,pc}
+#else
+	pop {r2,r3,ip,lr}
+	bx lr
+#endif
+
+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
+#else
+	.align 2
+1:	.word __a_gettp_ptr - 2b
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/dl_iterate_phdr.c b/src/components/lib/libc/musl-1.2.0/src/ldso/dl_iterate_phdr.c
new file mode 100644
index 0000000000..86c87ef835
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/dl_iterate_phdr.c
@@ -0,0 +1,46 @@
+#include <elf.h>
+#include <link.h>
+#include "libc.h"
+
+#define AUX_CNT 38
+
+extern weak hidden const size_t _DYNAMIC[];
+
+static int static_dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data)
+{
+	unsigned char *p;
+	ElfW(Phdr) *phdr, *tls_phdr=0;
+	size_t base = 0;
+	size_t n;
+	struct dl_phdr_info info;
+	size_t i, aux[AUX_CNT] = {0};
+
+	for (i=0; libc.auxv[i]; i+=2)
+		if (libc.auxv[i]<AUX_CNT) aux[libc.auxv[i]] = libc.auxv[i+1];
+
+	for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) {
+		phdr = (void *)p;
+		if (phdr->p_type == PT_PHDR)
+			base = aux[AT_PHDR] - phdr->p_vaddr;
+		if (phdr->p_type == PT_DYNAMIC && _DYNAMIC)
+			base = (size_t)_DYNAMIC - phdr->p_vaddr;
+		if (phdr->p_type == PT_TLS)
+			tls_phdr = phdr;
+	}
+	info.dlpi_addr  = base;
+	info.dlpi_name  = "/proc/self/exe";
+	info.dlpi_phdr  = (void *)aux[AT_PHDR];
+	info.dlpi_phnum = aux[AT_PHNUM];
+	info.dlpi_adds  = 0;
+	info.dlpi_subs  = 0;
+	if (tls_phdr) {
+		info.dlpi_tls_modid = 1;
+		info.dlpi_tls_data = (void *)(base + tls_phdr->p_vaddr);
+	} else {
+		info.dlpi_tls_modid = 0;
+		info.dlpi_tls_data = 0;
+	}
+	return (callback)(&info, sizeof (info), data);
+}
+
+weak_alias(static_dl_iterate_phdr, dl_iterate_phdr);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/dladdr.c b/src/components/lib/libc/musl-1.2.0/src/ldso/dladdr.c
new file mode 100644
index 0000000000..e5c80206a8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/dladdr.c
@@ -0,0 +1,9 @@
+#define _GNU_SOURCE
+#include <dlfcn.h>
+
+static int stub_dladdr(const void *addr, Dl_info *info)
+{
+	return 0;
+}
+
+weak_alias(stub_dladdr, dladdr);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/dlclose.c b/src/components/lib/libc/musl-1.2.0/src/ldso/dlclose.c
new file mode 100644
index 0000000000..e437422a67
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/dlclose.c
@@ -0,0 +1,7 @@
+#include <dlfcn.h>
+#include "dynlink.h"
+
+int dlclose(void *p)
+{
+	return __dl_invalid_handle(p);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/dlerror.c b/src/components/lib/libc/musl-1.2.0/src/ldso/dlerror.c
new file mode 100644
index 0000000000..3fcc777953
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/dlerror.c
@@ -0,0 +1,77 @@
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include "pthread_impl.h"
+#include "dynlink.h"
+#include "lock.h"
+
+char *dlerror()
+{
+	pthread_t self = __pthread_self();
+	if (!self->dlerror_flag) return 0;
+	self->dlerror_flag = 0;
+	char *s = self->dlerror_buf;
+	if (s == (void *)-1)
+		return "Dynamic linker failed to allocate memory for error message";
+	else
+		return s;
+}
+
+static volatile int freebuf_queue_lock[1];
+static void **freebuf_queue;
+
+void __dl_thread_cleanup(void)
+{
+	pthread_t self = __pthread_self();
+	if (self->dlerror_buf && self->dlerror_buf != (void *)-1) {
+		LOCK(freebuf_queue_lock);
+		void **p = (void **)self->dlerror_buf;
+		*p = freebuf_queue;
+		freebuf_queue = p;
+		UNLOCK(freebuf_queue_lock);
+	}
+}
+
+hidden void __dl_vseterr(const char *fmt, va_list ap)
+{
+	LOCK(freebuf_queue_lock);
+	while (freebuf_queue) {
+		void **p = freebuf_queue;
+		freebuf_queue = *p;
+		free(p);
+	}
+	UNLOCK(freebuf_queue_lock);
+
+	va_list ap2;
+	va_copy(ap2, ap);
+	pthread_t self = __pthread_self();
+	if (self->dlerror_buf != (void *)-1)
+		free(self->dlerror_buf);
+	size_t len = vsnprintf(0, 0, fmt, ap2);
+	if (len < sizeof(void *)) len = sizeof(void *);
+	va_end(ap2);
+	char *buf = malloc(len+1);
+	if (buf) {
+		vsnprintf(buf, len+1, fmt, ap);
+	} else {
+		buf = (void *)-1;	
+	}
+	self->dlerror_buf = buf;
+	self->dlerror_flag = 1;
+}
+
+hidden void __dl_seterr(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	__dl_vseterr(fmt, ap);
+	va_end(ap);
+}
+
+static int stub_invalid_handle(void *h)
+{
+	__dl_seterr("Invalid library handle %p", (void *)h);
+	return 1;
+}
+
+weak_alias(stub_invalid_handle, __dl_invalid_handle);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/dlinfo.c b/src/components/lib/libc/musl-1.2.0/src/ldso/dlinfo.c
new file mode 100644
index 0000000000..b55f5fe6cf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/dlinfo.c
@@ -0,0 +1,14 @@
+#define _GNU_SOURCE
+#include <dlfcn.h>
+#include "dynlink.h"
+
+int dlinfo(void *dso, int req, void *res)
+{
+	if (__dl_invalid_handle(dso)) return -1;
+	if (req != RTLD_DI_LINKMAP) {
+		__dl_seterr("Unsupported request %d", req);
+		return -1;
+	}
+	*(struct link_map **)res = dso;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/dlopen.c b/src/components/lib/libc/musl-1.2.0/src/ldso/dlopen.c
new file mode 100644
index 0000000000..69372a220b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/dlopen.c
@@ -0,0 +1,10 @@
+#include <dlfcn.h>
+#include "dynlink.h"
+
+static void *stub_dlopen(const char *file, int mode)
+{
+	__dl_seterr("Dynamic loading not supported");
+	return 0;
+}
+
+weak_alias(stub_dlopen, dlopen);
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/dlsym.c b/src/components/lib/libc/musl-1.2.0/src/ldso/dlsym.c
new file mode 100644
index 0000000000..65eb27659f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/dlsym.c
@@ -0,0 +1,7 @@
+#include <dlfcn.h>
+#include "dynlink.h"
+
+void *dlsym(void *restrict p, const char *restrict s)
+{
+	return __dlsym(p, s, 0);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/i386/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/i386/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/i386/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/i386/dlsym.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/i386/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/i386/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/i386/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/i386/tlsdesc.s b/src/components/lib/libc/musl-1.2.0/src/ldso/i386/tlsdesc.s
new file mode 100644
index 0000000000..32c8176691
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/i386/tlsdesc.s
@@ -0,0 +1,23 @@
+.text
+.global __tlsdesc_static
+.hidden __tlsdesc_static
+.type __tlsdesc_static,@function
+__tlsdesc_static:
+	mov 4(%eax),%eax
+	ret
+
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+.type __tlsdesc_dynamic,@function
+__tlsdesc_dynamic:
+	mov 4(%eax),%eax
+	push %edx
+	mov %gs:4,%edx
+	push %ecx
+	mov (%eax),%ecx
+	mov 4(%eax),%eax
+	add (%edx,%ecx,4),%eax
+	pop %ecx
+	sub %gs:0,%eax
+	pop %edx
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/m68k/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/m68k/dlsym.s
new file mode 100644
index 0000000000..5209ae1b59
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/m68k/dlsym.s
@@ -0,0 +1,12 @@
+.text
+.global dlsym
+.hidden __dlsym
+.type dlsym,@function
+dlsym:
+	move.l (%sp),-(%sp)
+	move.l 12(%sp),-(%sp)
+	move.l 12(%sp),-(%sp)
+	lea __dlsym-.-8,%a1
+	jsr (%pc,%a1)
+	add.l #12,%sp
+	rts
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/m68k/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/m68k/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/m68k/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/microblaze/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/microblaze/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/microblaze/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/microblaze/dlsym.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/microblaze/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/microblaze/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/microblaze/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/mips/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/mips/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/mips/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/mips/dlsym.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/mips/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/mips/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/mips/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/mips64/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/mips64/dlsym.s
new file mode 100644
index 0000000000..32e0dddc40
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/mips64/dlsym.s
@@ -0,0 +1,17 @@
+.set	noreorder
+.global	dlsym
+.hidden	__dlsym
+.type	dlsym,@function
+dlsym:
+	lui	$3, %hi(%neg(%gp_rel(dlsym)))
+	daddiu	$3, $3, %lo(%neg(%gp_rel(dlsym)))
+	daddu	$3, $3, $25
+	move	$6, $ra
+	ld	$25, %got_disp(__dlsym)($3)
+	daddiu	$sp, $sp, -32
+	sd	$ra, 24($sp)
+	jalr	$25
+	nop
+	ld	$ra, 24($sp)
+	jr	$ra
+	daddiu	$sp, $sp, 32
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/mipsn32/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/mipsn32/dlsym.s
new file mode 100644
index 0000000000..1c82da3003
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/mipsn32/dlsym.s
@@ -0,0 +1,17 @@
+.set	noreorder
+.global	dlsym
+.hidden	__dlsym
+.type	dlsym,@function
+dlsym:
+	lui	$3, %hi(%neg(%gp_rel(dlsym)))
+	addiu	$3, $3, %lo(%neg(%gp_rel(dlsym)))
+	addu	$3, $3, $25
+	move	$6, $ra
+	lw	$25, %got_disp(__dlsym)($3)
+	addiu	$sp, $sp, -32
+	sd	$ra, 16($sp)
+	jalr	$25
+	nop
+	ld	$ra, 16($sp)
+	jr	$ra
+	addiu	$sp, $sp, 32
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/mipsn32/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/mipsn32/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/mipsn32/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/or1k/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/or1k/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/or1k/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/or1k/dlsym.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/or1k/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/or1k/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/or1k/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc/dlsym.s
new file mode 100644
index 0000000000..cfe308ef57
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc/dlsym.s
@@ -0,0 +1,8 @@
+	.text
+	.global dlsym
+	.hidden __dlsym
+	.type   dlsym,@function
+dlsym:
+	mflr    5                      # The return address is arg3.
+	b       __dlsym
+	.size   dlsym, .-dlsym
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc64/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc64/dlsym.s
new file mode 100644
index 0000000000..a14715fd4d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/powerpc64/dlsym.s
@@ -0,0 +1,11 @@
+	.text
+	.global dlsym
+	.hidden __dlsym
+	.type   dlsym,@function
+dlsym:
+	addis   2, 12, .TOC.-dlsym@ha
+	addi    2,  2, .TOC.-dlsym@l
+	.localentry dlsym,.-dlsym
+	mflr    5                      # The return address is arg3.
+	b       __dlsym
+	.size   dlsym, .-dlsym
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/riscv64/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/riscv64/dlsym.s
new file mode 100644
index 0000000000..2bafd72d3e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/riscv64/dlsym.s
@@ -0,0 +1,6 @@
+.global dlsym
+.hidden __dlsym
+.type dlsym, %function
+dlsym:
+	mv a2, ra
+	tail __dlsym
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/s390x/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/s390x/dlsym.s
new file mode 100644
index 0000000000..2e9fa8fb4b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/s390x/dlsym.s
@@ -0,0 +1,6 @@
+	.global dlsym
+	.hidden __dlsym
+	.type   dlsym,@function
+dlsym:
+	lgr %r4, %r14
+	jg __dlsym
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/sh/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/sh/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/sh/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/sh/dlsym.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/sh/dlsym_time64.S b/src/components/lib/libc/musl-1.2.0/src/ldso/sh/dlsym_time64.S
new file mode 100644
index 0000000000..bb2e70408f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/sh/dlsym_time64.S
@@ -0,0 +1,3 @@
+#define __dlsym __dlsym_redir_time64
+#define dlsym __dlsym_time64
+#include "dlsym.s"
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/tlsdesc.c b/src/components/lib/libc/musl-1.2.0/src/ldso/tlsdesc.c
new file mode 100644
index 0000000000..49a1f18c03
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/tlsdesc.c
@@ -0,0 +1,9 @@
+#include <stddef.h>
+#include <dynlink.h>
+
+ptrdiff_t __tlsdesc_static()
+{
+	return 0;
+}
+
+weak_alias(__tlsdesc_static, __tlsdesc_dynamic);
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/x32/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/x32/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/x32/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/x32/dlsym.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/ldso/x86_64/dlsym.s b/src/components/lib/libc/musl-1.2.0/src/ldso/x86_64/dlsym.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/ldso/x86_64/dlsym.s
rename to src/components/lib/libc/musl-1.2.0/src/ldso/x86_64/dlsym.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/ldso/x86_64/tlsdesc.s b/src/components/lib/libc/musl-1.2.0/src/ldso/x86_64/tlsdesc.s
new file mode 100644
index 0000000000..e08f1d7df5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/ldso/x86_64/tlsdesc.s
@@ -0,0 +1,23 @@
+.text
+.global __tlsdesc_static
+.hidden __tlsdesc_static
+.type __tlsdesc_static,@function
+__tlsdesc_static:
+	mov 8(%rax),%rax
+	ret
+
+.global __tlsdesc_dynamic
+.hidden __tlsdesc_dynamic
+.type __tlsdesc_dynamic,@function
+__tlsdesc_dynamic:
+	mov 8(%rax),%rax
+	push %rdx
+	mov %fs:8,%rdx
+	push %rcx
+	mov (%rax),%rcx
+	mov 8(%rax),%rax
+	add (%rdx,%rcx,8),%rax
+	pop %rcx
+	sub %fs:0,%rax
+	pop %rdx
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/cuserid.c b/src/components/lib/libc/musl-1.2.0/src/legacy/cuserid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/cuserid.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/cuserid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/daemon.c b/src/components/lib/libc/musl-1.2.0/src/legacy/daemon.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/daemon.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/daemon.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/err.c b/src/components/lib/libc/musl-1.2.0/src/legacy/err.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/err.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/err.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/euidaccess.c b/src/components/lib/libc/musl-1.2.0/src/legacy/euidaccess.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/euidaccess.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/euidaccess.c
index 73072513a8..6e1f39855e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/legacy/euidaccess.c
+++ b/src/components/lib/libc/musl-1.2.0/src/legacy/euidaccess.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <unistd.h>
 #include <fcntl.h>
-#include "libc.h"
 
 int euidaccess(const char *filename, int amode)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/ftw.c b/src/components/lib/libc/musl-1.2.0/src/legacy/ftw.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/ftw.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/ftw.c
index 0429aba495..506bd29ced 100644
--- a/src/components/lib/libc/musl-1.1.11/src/legacy/ftw.c
+++ b/src/components/lib/libc/musl-1.2.0/src/legacy/ftw.c
@@ -1,5 +1,4 @@
 #include <ftw.h>
-#include "libc.h"
 
 int ftw(const char *path, int (*fn)(const char *, const struct stat *, int), int fd_limit)
 {
@@ -9,4 +8,4 @@ int ftw(const char *path, int (*fn)(const char *, const struct stat *, int), int
 	return nftw(path, (int (*)())fn, fd_limit, FTW_PHYS);
 }
 
-LFS64(ftw);
+weak_alias(ftw, ftw64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/futimes.c b/src/components/lib/libc/musl-1.2.0/src/legacy/futimes.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/futimes.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/futimes.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/getdtablesize.c b/src/components/lib/libc/musl-1.2.0/src/legacy/getdtablesize.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/getdtablesize.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/getdtablesize.c
index 682da6d067..b30c1933a2 100644
--- a/src/components/lib/libc/musl-1.1.11/src/legacy/getdtablesize.c
+++ b/src/components/lib/libc/musl-1.2.0/src/legacy/getdtablesize.c
@@ -7,5 +7,5 @@ int getdtablesize(void)
 {
 	struct rlimit rl;
 	getrlimit(RLIMIT_NOFILE, &rl);
-	return rl.rlim_max < INT_MAX ? rl.rlim_max : INT_MAX;
+	return rl.rlim_cur < INT_MAX ? rl.rlim_cur : INT_MAX;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/getloadavg.c b/src/components/lib/libc/musl-1.2.0/src/legacy/getloadavg.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/getloadavg.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/getloadavg.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/getpagesize.c b/src/components/lib/libc/musl-1.2.0/src/legacy/getpagesize.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/getpagesize.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/getpagesize.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/getpass.c b/src/components/lib/libc/musl-1.2.0/src/legacy/getpass.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/getpass.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/getpass.c
index 15ab9851e8..d51286c0b0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/legacy/getpass.c
+++ b/src/components/lib/libc/musl-1.2.0/src/legacy/getpass.c
@@ -27,7 +27,7 @@ char *getpass(const char *prompt)
 
 	l = read(fd, password, sizeof password);
 	if (l >= 0) {
-		if (l > 0 && password[l-1] == '\n') l--;
+		if (l > 0 && password[l-1] == '\n' || l==sizeof password) l--;
 		password[l] = 0;
 	}
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/getusershell.c b/src/components/lib/libc/musl-1.2.0/src/legacy/getusershell.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/getusershell.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/getusershell.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/isastream.c b/src/components/lib/libc/musl-1.2.0/src/legacy/isastream.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/isastream.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/isastream.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/lutimes.c b/src/components/lib/libc/musl-1.2.0/src/legacy/lutimes.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/lutimes.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/lutimes.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/ulimit.c b/src/components/lib/libc/musl-1.2.0/src/legacy/ulimit.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/ulimit.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/ulimit.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/utmpx.c b/src/components/lib/libc/musl-1.2.0/src/legacy/utmpx.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/utmpx.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/utmpx.c
index c483e4ed1d..7aa65da335 100644
--- a/src/components/lib/libc/musl-1.1.11/src/legacy/utmpx.c
+++ b/src/components/lib/libc/musl-1.2.0/src/legacy/utmpx.c
@@ -1,6 +1,7 @@
+#define _GNU_SOURCE
 #include <utmpx.h>
 #include <stddef.h>
-#include "libc.h"
+#include <errno.h>
 
 void endutxent(void)
 {
@@ -34,6 +35,12 @@ void updwtmpx(const char *f, const struct utmpx *u)
 {
 }
 
+static int __utmpxname(const char *f)
+{
+	errno = ENOTSUP;
+	return -1;
+}
+
 weak_alias(endutxent, endutent);
 weak_alias(setutxent, setutent);
 weak_alias(getutxent, getutent);
@@ -41,3 +48,5 @@ weak_alias(getutxid, getutid);
 weak_alias(getutxline, getutline);
 weak_alias(pututxline, pututline);
 weak_alias(updwtmpx, updwtmp);
+weak_alias(__utmpxname, utmpname);
+weak_alias(__utmpxname, utmpxname);
diff --git a/src/components/lib/libc/musl-1.1.11/src/legacy/valloc.c b/src/components/lib/libc/musl-1.2.0/src/legacy/valloc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/legacy/valloc.c
rename to src/components/lib/libc/musl-1.2.0/src/legacy/valloc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/adjtime.c b/src/components/lib/libc/musl-1.2.0/src/linux/adjtime.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/linux/adjtime.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/adjtime.c
index fa8af9f021..5a707f2f21 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/adjtime.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/adjtime.c
@@ -15,7 +15,7 @@ int adjtime(const struct timeval *in, struct timeval *out)
 		tx.offset = in->tv_sec*1000000 + in->tv_usec;
 		tx.modes = ADJ_OFFSET_SINGLESHOT;
 	}
-	if (syscall(SYS_adjtimex, &tx) < 0) return -1;
+	if (adjtimex(&tx) < 0) return -1;
 	if (out) {
 		out->tv_sec = tx.offset / 1000000;
 		if ((out->tv_usec = tx.offset % 1000000) < 0) {
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/adjtimex.c b/src/components/lib/libc/musl-1.2.0/src/linux/adjtimex.c
new file mode 100644
index 0000000000..e9d727cf3a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/adjtimex.c
@@ -0,0 +1,7 @@
+#include <sys/timex.h>
+#include <time.h>
+
+int adjtimex(struct timex *tx)
+{
+	return clock_adjtime(CLOCK_REALTIME, tx);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/arch_prctl.c b/src/components/lib/libc/musl-1.2.0/src/linux/arch_prctl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/arch_prctl.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/arch_prctl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/brk.c b/src/components/lib/libc/musl-1.2.0/src/linux/brk.c
new file mode 100644
index 0000000000..a6173e07f3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/brk.c
@@ -0,0 +1,9 @@
+#define _BSD_SOURCE
+#include <unistd.h>
+#include <errno.h>
+#include "syscall.h"
+
+int brk(void *end)
+{
+	return __syscall_ret(-ENOMEM);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/cache.c b/src/components/lib/libc/musl-1.2.0/src/linux/cache.c
new file mode 100644
index 0000000000..0eb051c2d4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/cache.c
@@ -0,0 +1,50 @@
+#include <errno.h>
+#include "syscall.h"
+#include "atomic.h"
+
+#ifdef SYS_cacheflush
+int _flush_cache(void *addr, int len, int op)
+{
+	return syscall(SYS_cacheflush, addr, len, op);
+}
+weak_alias(_flush_cache, cacheflush);
+#endif
+
+#ifdef SYS_cachectl
+int __cachectl(void *addr, int len, int op)
+{
+	return syscall(SYS_cachectl, addr, len, op);
+}
+weak_alias(__cachectl, cachectl);
+#endif
+
+#ifdef SYS_riscv_flush_icache
+
+#define VDSO_FLUSH_ICACHE_SYM "__vdso_flush_icache"
+#define VDSO_FLUSH_ICACHE_VER "LINUX_4.5"
+
+static void *volatile vdso_func;
+
+static int flush_icache_init(void *start, void *end, unsigned long int flags)
+{
+	void *p = __vdsosym(VDSO_FLUSH_ICACHE_VER, VDSO_FLUSH_ICACHE_SYM);
+	int (*f)(void *, void *, unsigned long int) =
+		(int (*)(void *, void *, unsigned long int))p;
+	a_cas_p(&vdso_func, (void *)flush_icache_init, p);
+	return f ? f(start, end, flags) : -ENOSYS;
+}
+
+static void *volatile vdso_func = (void *)flush_icache_init;
+
+int __riscv_flush_icache(void *start, void *end, unsigned long int flags) 
+{
+	int (*f)(void *, void *, unsigned long int) =
+		(int (*)(void *, void *, unsigned long int))vdso_func;
+	if (f) {
+		int r = f(start, end, flags);
+		if (!r) return r;
+		if (r != -ENOSYS) return __syscall_ret(r);
+	}
+}
+weak_alias(__riscv_flush_icache, riscv_flush_icache);
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/cap.c b/src/components/lib/libc/musl-1.2.0/src/linux/cap.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/cap.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/cap.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/chroot.c b/src/components/lib/libc/musl-1.2.0/src/linux/chroot.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/chroot.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/chroot.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/clock_adjtime.c b/src/components/lib/libc/musl-1.2.0/src/linux/clock_adjtime.c
new file mode 100644
index 0000000000..23eb8729db
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/clock_adjtime.c
@@ -0,0 +1,154 @@
+#include <sys/timex.h>
+#include <time.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+
+struct ktimex64 {
+	unsigned modes;
+	int :32;
+	long long offset, freq, maxerror, esterror;
+	int status;
+	int :32;
+	long long constant, precision, tolerance;
+	long long time_sec, time_usec;
+	long long tick, ppsfreq, jitter;
+	int shift;
+	int :32;
+	long long stabil, jitcnt, calcnt, errcnt, stbcnt;
+	int tai;
+	int __padding[11];
+};
+
+struct ktimex {
+	unsigned modes;
+	long offset, freq, maxerror, esterror;
+	int status;
+	long constant, precision, tolerance;
+	long time_sec, time_usec;
+	long tick, ppsfreq, jitter;
+	int shift;
+	long stabil, jitcnt, calcnt, errcnt, stbcnt;
+	int tai;
+	int __padding[11];
+};
+
+int clock_adjtime (clockid_t clock_id, struct timex *utx)
+{
+	int r = -ENOSYS;
+#ifdef SYS_clock_adjtime64
+	if (SYS_clock_adjtime == SYS_clock_adjtime64 ||
+	    (utx->modes & ADJ_SETOFFSET) && !IS32BIT(utx->time.tv_sec)) {
+		struct ktimex64 ktx = {
+			.modes = utx->modes,
+			.offset = utx->offset,
+			.freq = utx->freq,
+			.maxerror = utx->maxerror,
+			.esterror = utx->esterror,
+			.status = utx->status,
+			.constant = utx->constant,
+			.precision = utx->precision,
+			.tolerance = utx->tolerance,
+			.time_sec = utx->time.tv_sec,
+			.time_usec = utx->time.tv_usec,
+			.tick = utx->tick,
+			.ppsfreq = utx->ppsfreq,
+			.jitter = utx->jitter,
+			.shift = utx->shift,
+			.stabil = utx->stabil,
+			.jitcnt = utx->jitcnt,
+			.calcnt = utx->calcnt,
+			.errcnt = utx->errcnt,
+			.stbcnt = utx->stbcnt,
+			.tai = utx->tai,
+		};
+		r = __syscall(SYS_clock_adjtime, clock_id, &ktx);
+		if (r>=0) {
+			utx->modes = ktx.modes;
+			utx->offset = ktx.offset;
+			utx->freq = ktx.freq;
+			utx->maxerror = ktx.maxerror;
+			utx->esterror = ktx.esterror;
+			utx->status = ktx.status;
+			utx->constant = ktx.constant;
+			utx->precision = ktx.precision;
+			utx->tolerance = ktx.tolerance;
+			utx->time.tv_sec = ktx.time_sec;
+			utx->time.tv_usec = ktx.time_usec;
+			utx->tick = ktx.tick;
+			utx->ppsfreq = ktx.ppsfreq;
+			utx->jitter = ktx.jitter;
+			utx->shift = ktx.shift;
+			utx->stabil = ktx.stabil;
+			utx->jitcnt = ktx.jitcnt;
+			utx->calcnt = ktx.calcnt;
+			utx->errcnt = ktx.errcnt;
+			utx->stbcnt = ktx.stbcnt;
+			utx->tai = ktx.tai;
+		}
+	}
+	if (SYS_clock_adjtime == SYS_clock_adjtime64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	if ((utx->modes & ADJ_SETOFFSET) && !IS32BIT(utx->time.tv_sec))
+		return __syscall_ret(-ENOTSUP);
+#endif
+	if (sizeof(time_t) > sizeof(long)) {
+		struct ktimex ktx = {
+			.modes = utx->modes,
+			.offset = utx->offset,
+			.freq = utx->freq,
+			.maxerror = utx->maxerror,
+			.esterror = utx->esterror,
+			.status = utx->status,
+			.constant = utx->constant,
+			.precision = utx->precision,
+			.tolerance = utx->tolerance,
+			.time_sec = utx->time.tv_sec,
+			.time_usec = utx->time.tv_usec,
+			.tick = utx->tick,
+			.ppsfreq = utx->ppsfreq,
+			.jitter = utx->jitter,
+			.shift = utx->shift,
+			.stabil = utx->stabil,
+			.jitcnt = utx->jitcnt,
+			.calcnt = utx->calcnt,
+			.errcnt = utx->errcnt,
+			.stbcnt = utx->stbcnt,
+			.tai = utx->tai,
+		};
+#ifdef SYS_adjtimex
+		if (clock_id==CLOCK_REALTIME) r = __syscall(SYS_adjtimex, &ktx);
+		else
+#endif
+		r = __syscall(SYS_clock_adjtime, clock_id, &ktx);
+		if (r>=0) {
+			utx->modes = ktx.modes;
+			utx->offset = ktx.offset;
+			utx->freq = ktx.freq;
+			utx->maxerror = ktx.maxerror;
+			utx->esterror = ktx.esterror;
+			utx->status = ktx.status;
+			utx->constant = ktx.constant;
+			utx->precision = ktx.precision;
+			utx->tolerance = ktx.tolerance;
+			utx->time.tv_sec = ktx.time_sec;
+			utx->time.tv_usec = ktx.time_usec;
+			utx->tick = ktx.tick;
+			utx->ppsfreq = ktx.ppsfreq;
+			utx->jitter = ktx.jitter;
+			utx->shift = ktx.shift;
+			utx->stabil = ktx.stabil;
+			utx->jitcnt = ktx.jitcnt;
+			utx->calcnt = ktx.calcnt;
+			utx->errcnt = ktx.errcnt;
+			utx->stbcnt = ktx.stbcnt;
+			utx->tai = ktx.tai;
+		}
+		return __syscall_ret(r);
+	}
+#ifdef SYS_adjtimex
+	if (clock_id==CLOCK_REALTIME) return syscall(SYS_adjtimex, utx);
+#endif
+	return syscall(SYS_clock_adjtime, clock_id, utx);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/clone.c b/src/components/lib/libc/musl-1.2.0/src/linux/clone.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/linux/clone.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/clone.c
index b9e5594530..8c1af7d3dc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/clone.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/clone.c
@@ -1,5 +1,7 @@
+#define _GNU_SOURCE
 #include <stdarg.h>
 #include <unistd.h>
+#include <sched.h>
 #include "pthread_impl.h"
 #include "syscall.h"
 
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/copy_file_range.c b/src/components/lib/libc/musl-1.2.0/src/linux/copy_file_range.c
new file mode 100644
index 0000000000..dd4b133336
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/copy_file_range.c
@@ -0,0 +1,8 @@
+#define _GNU_SOURCE
+#include <unistd.h>
+#include "syscall.h"
+
+ssize_t copy_file_range(int fd_in, off_t *off_in, int fd_out, off_t *off_out, size_t len, unsigned flags)
+{
+	return syscall(SYS_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/epoll.c b/src/components/lib/libc/musl-1.2.0/src/linux/epoll.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/epoll.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/epoll.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/eventfd.c b/src/components/lib/libc/musl-1.2.0/src/linux/eventfd.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/eventfd.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/eventfd.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/fallocate.c b/src/components/lib/libc/musl-1.2.0/src/linux/fallocate.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/linux/fallocate.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/fallocate.c
index ae766d5e5f..7d68bc8f64 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/fallocate.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/fallocate.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <fcntl.h>
 #include "syscall.h"
-#include "libc.h"
 
 int fallocate(int fd, int mode, off_t base, off_t len)
 {
@@ -10,4 +9,4 @@ int fallocate(int fd, int mode, off_t base, off_t len)
 }
 
 #undef fallocate64
-LFS64(fallocate);
+weak_alias(fallocate, fallocate64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/fanotify.c b/src/components/lib/libc/musl-1.2.0/src/linux/fanotify.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/fanotify.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/fanotify.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/flock.c b/src/components/lib/libc/musl-1.2.0/src/linux/flock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/flock.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/flock.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/getdents.c b/src/components/lib/libc/musl-1.2.0/src/linux/getdents.c
new file mode 100644
index 0000000000..796c1e5c92
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/getdents.c
@@ -0,0 +1,12 @@
+#define _BSD_SOURCE
+#include <dirent.h>
+#include <limits.h>
+#include "syscall.h"
+
+int getdents(int fd, struct dirent *buf, size_t len)
+{
+	if (len>INT_MAX) len = INT_MAX;
+	return syscall(SYS_getdents, fd, buf, len);
+}
+
+weak_alias(getdents, getdents64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/getrandom.c b/src/components/lib/libc/musl-1.2.0/src/linux/getrandom.c
new file mode 100644
index 0000000000..6cc6f6b047
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/getrandom.c
@@ -0,0 +1,7 @@
+#include <sys/random.h>
+#include "syscall.h"
+
+ssize_t getrandom(void *buf, size_t buflen, unsigned flags)
+{
+	return syscall_cp(SYS_getrandom, buf, buflen, flags);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/inotify.c b/src/components/lib/libc/musl-1.2.0/src/linux/inotify.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/inotify.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/inotify.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/ioperm.c b/src/components/lib/libc/musl-1.2.0/src/linux/ioperm.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/ioperm.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/ioperm.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/iopl.c b/src/components/lib/libc/musl-1.2.0/src/linux/iopl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/iopl.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/iopl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/klogctl.c b/src/components/lib/libc/musl-1.2.0/src/linux/klogctl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/klogctl.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/klogctl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/membarrier.c b/src/components/lib/libc/musl-1.2.0/src/linux/membarrier.c
new file mode 100644
index 0000000000..9ebe906ed8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/membarrier.c
@@ -0,0 +1,77 @@
+#include <sys/membarrier.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <string.h>
+#include "pthread_impl.h"
+#include "syscall.h"
+
+static void dummy_0(void)
+{
+}
+
+static void dummy_1(pthread_t t)
+{
+}
+
+weak_alias(dummy_0, __tl_lock);
+weak_alias(dummy_0, __tl_unlock);
+weak_alias(dummy_1, __tl_sync);
+
+static sem_t barrier_sem;
+
+static void bcast_barrier(int s)
+{
+	sem_post(&barrier_sem);
+}
+
+int __membarrier(int cmd, int flags)
+{
+	int r = __syscall(SYS_membarrier, cmd, flags);
+	/* Emulate the private expedited command, which is needed by the
+	 * dynamic linker for installation of dynamic TLS, for older
+	 * kernels that lack the syscall. Unlike the syscall, this only
+	 * synchronizes with threads of the process, not other processes
+	 * sharing the VM, but such sharing is not a supported usage
+	 * anyway. */
+	if (r && cmd == MEMBARRIER_CMD_PRIVATE_EXPEDITED && !flags) {
+		pthread_t self=__pthread_self(), td;
+		sigset_t set;
+		__block_app_sigs(&set);
+		__tl_lock();
+		sem_init(&barrier_sem, 0, 0);
+		struct sigaction sa = {
+			.sa_flags = SA_RESTART,
+			.sa_handler = bcast_barrier
+		};
+		memset(&sa.sa_mask, -1, sizeof sa.sa_mask);
+		if (!__libc_sigaction(SIGSYNCCALL, &sa, 0)) {
+			for (td=self->next; td!=self; td=td->next)
+				__syscall(SYS_tkill, td->tid, SIGSYNCCALL);
+			for (td=self->next; td!=self; td=td->next)
+				sem_wait(&barrier_sem);
+			r = 0;
+			sa.sa_handler = SIG_IGN;
+			__libc_sigaction(SIGSYNCCALL, &sa, 0);
+		}
+		sem_destroy(&barrier_sem);
+		__tl_unlock();
+		__restore_sigs(&set);
+	}
+	return __syscall_ret(r);
+}
+
+void __membarrier_init(void)
+{
+	/* If membarrier is linked, attempt to pre-register to be able to use
+	 * the private expedited command before the process becomes multi-
+	 * threaded, since registering later has bad, potentially unbounded
+	 * latency. This syscall should be essentially free, and it's arguably
+	 * a mistake in the API design that registration was even required.
+	 * For other commands, registration may impose some cost, so it's left
+	 * to the application to do so if desired. Unfortunately this means
+	 * library code initialized after the process becomes multi-threaded
+	 * cannot use these features without accepting registration latency. */
+	__syscall(SYS_membarrier, MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED, 0);
+}
+
+weak_alias(__membarrier, membarrier);
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/memfd_create.c b/src/components/lib/libc/musl-1.2.0/src/linux/memfd_create.c
new file mode 100644
index 0000000000..1649fe5548
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/memfd_create.c
@@ -0,0 +1,8 @@
+#define _GNU_SOURCE 1
+#include <sys/mman.h>
+#include "syscall.h"
+
+int memfd_create(const char *name, unsigned flags)
+{
+	return syscall(SYS_memfd_create, name, flags);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/mlock2.c b/src/components/lib/libc/musl-1.2.0/src/linux/mlock2.c
new file mode 100644
index 0000000000..10132742d0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/mlock2.c
@@ -0,0 +1,10 @@
+#define _GNU_SOURCE 1
+#include <sys/mman.h>
+#include "syscall.h"
+
+int mlock2(const void *addr, size_t len, unsigned flags)
+{
+	if (flags == 0)
+		return mlock(addr, len);
+	return syscall(SYS_mlock2, addr, len, flags);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/module.c b/src/components/lib/libc/musl-1.2.0/src/linux/module.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/module.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/module.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/mount.c b/src/components/lib/libc/musl-1.2.0/src/linux/mount.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/mount.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/mount.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/name_to_handle_at.c b/src/components/lib/libc/musl-1.2.0/src/linux/name_to_handle_at.c
new file mode 100644
index 0000000000..cd4075bd7e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/name_to_handle_at.c
@@ -0,0 +1,10 @@
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include "syscall.h"
+
+int name_to_handle_at(int dirfd, const char *pathname,
+	struct file_handle *handle, int *mount_id, int flags)
+{
+	return syscall(SYS_name_to_handle_at, dirfd,
+		pathname, handle, mount_id, flags);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/open_by_handle_at.c b/src/components/lib/libc/musl-1.2.0/src/linux/open_by_handle_at.c
new file mode 100644
index 0000000000..1c9b6a2be4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/open_by_handle_at.c
@@ -0,0 +1,8 @@
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include "syscall.h"
+
+int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags)
+{
+	return syscall(SYS_open_by_handle_at, mount_fd, handle, flags);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/personality.c b/src/components/lib/libc/musl-1.2.0/src/linux/personality.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/personality.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/personality.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/pivot_root.c b/src/components/lib/libc/musl-1.2.0/src/linux/pivot_root.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/pivot_root.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/pivot_root.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/ppoll.c b/src/components/lib/libc/musl-1.2.0/src/linux/ppoll.c
new file mode 100644
index 0000000000..e614600ab8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/ppoll.c
@@ -0,0 +1,26 @@
+#define _GNU_SOURCE
+#include <poll.h>
+#include <signal.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+int ppoll(struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask)
+{
+	time_t s = to ? to->tv_sec : 0;
+	long ns = to ? to->tv_nsec : 0;
+#ifdef SYS_ppoll_time64
+	int r = -ENOSYS;
+	if (SYS_ppoll == SYS_ppoll_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_ppoll_time64, fds, n,
+			to ? ((long long[]){s, ns}) : 0,
+			mask, _NSIG/8);
+	if (SYS_ppoll == SYS_ppoll_time64 || r != -ENOSYS)
+		return __syscall_ret(r);
+	s = CLAMP(s);
+#endif
+	return syscall_cp(SYS_ppoll, fds, n,
+		to ? ((long[]){s, ns}) : 0, mask, _NSIG/8);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/prctl.c b/src/components/lib/libc/musl-1.2.0/src/linux/prctl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/prctl.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/prctl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/prlimit.c b/src/components/lib/libc/musl-1.2.0/src/linux/prlimit.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/linux/prlimit.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/prlimit.c
index 0fe28e1066..3df9ffba7a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/prlimit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/prlimit.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <sys/resource.h>
 #include "syscall.h"
-#include "libc.h"
 
 #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0)
 
@@ -24,4 +23,4 @@ int prlimit(pid_t pid, int resource, const struct rlimit *new_limit, struct rlim
 }
 
 #undef prlimit64
-LFS64(prlimit);
+weak_alias(prlimit, prlimit64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/process_vm.c b/src/components/lib/libc/musl-1.2.0/src/linux/process_vm.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/process_vm.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/process_vm.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/ptrace.c b/src/components/lib/libc/musl-1.2.0/src/linux/ptrace.c
new file mode 100644
index 0000000000..a3f393d956
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/ptrace.c
@@ -0,0 +1,29 @@
+#include <sys/ptrace.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "syscall.h"
+
+long ptrace(int req, ...)
+{
+	va_list ap;
+	pid_t pid;
+	void *addr, *data, *addr2 = 0;
+	long ret, result;
+
+	va_start(ap, req);
+	pid = va_arg(ap, pid_t);
+	addr = va_arg(ap, void *);
+	data = va_arg(ap, void *);
+	/* PTRACE_{READ,WRITE}{DATA,TEXT} (16...19) are specific to SPARC. */
+#ifdef PTRACE_READDATA
+	if ((unsigned)req - PTRACE_READDATA < 4)
+		addr2 = va_arg(ap, void *);
+#endif
+	va_end(ap);
+
+	if (req-1U < 3) data = &result;
+	ret = syscall(SYS_ptrace, req, pid, addr, data, addr2);
+
+	if (ret < 0 || req-1U >= 3) return ret;
+	return result;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/quotactl.c b/src/components/lib/libc/musl-1.2.0/src/linux/quotactl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/quotactl.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/quotactl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/readahead.c b/src/components/lib/libc/musl-1.2.0/src/linux/readahead.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/readahead.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/readahead.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/reboot.c b/src/components/lib/libc/musl-1.2.0/src/linux/reboot.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/reboot.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/reboot.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/remap_file_pages.c b/src/components/lib/libc/musl-1.2.0/src/linux/remap_file_pages.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/remap_file_pages.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/remap_file_pages.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/sbrk.c b/src/components/lib/libc/musl-1.2.0/src/linux/sbrk.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/linux/sbrk.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/sbrk.c
index 1e82d64377..bb86630584 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/sbrk.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/sbrk.c
@@ -1,3 +1,5 @@
+#define _BSD_SOURCE
+#include <unistd.h>
 #include <stdint.h>
 #include <errno.h>
 #include "syscall.h"
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/sendfile.c b/src/components/lib/libc/musl-1.2.0/src/linux/sendfile.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/linux/sendfile.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/sendfile.c
index d63f4197bb..9afe6dd61c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/sendfile.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/sendfile.c
@@ -1,10 +1,9 @@
 #include <sys/sendfile.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t sendfile(int out_fd, int in_fd, off_t *ofs, size_t count)
 {
 	return syscall(SYS_sendfile, out_fd, in_fd, ofs, count);
 }
 
-LFS64(sendfile);
+weak_alias(sendfile, sendfile64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/setfsgid.c b/src/components/lib/libc/musl-1.2.0/src/linux/setfsgid.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/linux/setfsgid.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/setfsgid.c
index ad80422503..e29d9c0069 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/setfsgid.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/setfsgid.c
@@ -1,6 +1,5 @@
 #include <sys/fsuid.h>
 #include "syscall.h"
-#include "libc.h"
 
 int setfsgid(gid_t gid)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/setfsuid.c b/src/components/lib/libc/musl-1.2.0/src/linux/setfsuid.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/linux/setfsuid.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/setfsuid.c
index 86358731dc..1bae44186f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/linux/setfsuid.c
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/setfsuid.c
@@ -1,6 +1,5 @@
 #include <sys/fsuid.h>
 #include "syscall.h"
-#include "libc.h"
 
 int setfsuid(uid_t uid)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/setgroups.c b/src/components/lib/libc/musl-1.2.0/src/linux/setgroups.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/setgroups.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/setgroups.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/sethostname.c b/src/components/lib/libc/musl-1.2.0/src/linux/sethostname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/sethostname.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/sethostname.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/setns.c b/src/components/lib/libc/musl-1.2.0/src/linux/setns.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/setns.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/setns.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/settimeofday.c b/src/components/lib/libc/musl-1.2.0/src/linux/settimeofday.c
new file mode 100644
index 0000000000..860fb5de97
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/settimeofday.c
@@ -0,0 +1,13 @@
+#define _BSD_SOURCE
+#include <sys/time.h>
+#include <time.h>
+#include <errno.h>
+#include "syscall.h"
+
+int settimeofday(const struct timeval *tv, const struct timezone *tz)
+{
+	if (!tv) return 0;
+	if (tv->tv_usec >= 1000000ULL) return __syscall_ret(-EINVAL);
+	return clock_settime(CLOCK_REALTIME, &((struct timespec){
+		.tv_sec = tv->tv_sec, .tv_nsec = tv->tv_usec * 1000}));
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/signalfd.c b/src/components/lib/libc/musl-1.2.0/src/linux/signalfd.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/signalfd.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/signalfd.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/splice.c b/src/components/lib/libc/musl-1.2.0/src/linux/splice.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/splice.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/splice.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/stime.c b/src/components/lib/libc/musl-1.2.0/src/linux/stime.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/stime.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/stime.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/swap.c b/src/components/lib/libc/musl-1.2.0/src/linux/swap.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/swap.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/swap.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/sync_file_range.c b/src/components/lib/libc/musl-1.2.0/src/linux/sync_file_range.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/sync_file_range.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/sync_file_range.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/syncfs.c b/src/components/lib/libc/musl-1.2.0/src/linux/syncfs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/syncfs.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/syncfs.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/sysinfo.c b/src/components/lib/libc/musl-1.2.0/src/linux/sysinfo.c
new file mode 100644
index 0000000000..db86476d0f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/sysinfo.c
@@ -0,0 +1,9 @@
+#include <sys/sysinfo.h>
+#include "syscall.h"
+
+int __lsysinfo(struct sysinfo *info)
+{
+	return syscall(SYS_sysinfo, info);
+}
+
+weak_alias(__lsysinfo, sysinfo);
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/tee.c b/src/components/lib/libc/musl-1.2.0/src/linux/tee.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/tee.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/tee.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/timerfd.c b/src/components/lib/libc/musl-1.2.0/src/linux/timerfd.c
new file mode 100644
index 0000000000..5bdfaf1656
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/timerfd.c
@@ -0,0 +1,59 @@
+#include <sys/timerfd.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+
+int timerfd_create(int clockid, int flags)
+{
+	return syscall(SYS_timerfd_create, clockid, flags);
+}
+
+int timerfd_settime(int fd, int flags, const struct itimerspec *new, struct itimerspec *old)
+{
+#ifdef SYS_timerfd_settime64
+	time_t is = new->it_interval.tv_sec, vs = new->it_value.tv_sec;
+	long ins = new->it_interval.tv_nsec, vns = new->it_value.tv_nsec;
+	int r = -ENOSYS;
+	if (SYS_timerfd_settime == SYS_timerfd_settime64
+	    || !IS32BIT(is) || !IS32BIT(vs) || (sizeof(time_t)>4 && old))
+		r = __syscall(SYS_timerfd_settime64, fd, flags,
+			((long long[]){is, ins, vs, vns}), old);
+	if (SYS_timerfd_settime == SYS_timerfd_settime64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	if (!IS32BIT(is) || !IS32BIT(vs))
+		return __syscall_ret(-ENOTSUP);
+	long old32[4];
+	r = __syscall(SYS_timerfd_settime, fd, flags,
+		((long[]){is, ins, vs, vns}), old32);
+	if (!r && old) {
+		old->it_interval.tv_sec = old32[0];
+		old->it_interval.tv_nsec = old32[1];
+		old->it_value.tv_sec = old32[2];
+		old->it_value.tv_nsec = old32[3];
+	}
+	return __syscall_ret(r);
+#endif
+	return syscall(SYS_timerfd_settime, fd, flags, new, old);
+}
+
+int timerfd_gettime(int fd, struct itimerspec *cur)
+{
+#ifdef SYS_timerfd_gettime64
+	int r = -ENOSYS;
+	if (sizeof(time_t) > 4)
+		r = __syscall(SYS_timerfd_gettime64, fd, cur);
+	if (SYS_timerfd_gettime == SYS_timerfd_gettime64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	long cur32[4];
+	r = __syscall(SYS_timerfd_gettime, fd, cur32);
+	if (!r) {
+		cur->it_interval.tv_sec = cur32[0];
+		cur->it_interval.tv_nsec = cur32[1];
+		cur->it_value.tv_sec = cur32[2];
+		cur->it_value.tv_nsec = cur32[3];
+	}
+	return __syscall_ret(r);
+#endif
+	return syscall(SYS_timerfd_gettime, fd, cur);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/unshare.c b/src/components/lib/libc/musl-1.2.0/src/linux/unshare.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/unshare.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/unshare.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/utimes.c b/src/components/lib/libc/musl-1.2.0/src/linux/utimes.c
new file mode 100644
index 0000000000..6ca025d95a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/utimes.c
@@ -0,0 +1,8 @@
+#include <sys/time.h>
+#include "fcntl.h"
+#include "syscall.h"
+
+int utimes(const char *path, const struct timeval times[2])
+{
+	return __futimesat(AT_FDCWD, path, times);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/vhangup.c b/src/components/lib/libc/musl-1.2.0/src/linux/vhangup.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/vhangup.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/vhangup.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/vmsplice.c b/src/components/lib/libc/musl-1.2.0/src/linux/vmsplice.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/vmsplice.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/vmsplice.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/wait3.c b/src/components/lib/libc/musl-1.2.0/src/linux/wait3.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/wait3.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/wait3.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/wait4.c b/src/components/lib/libc/musl-1.2.0/src/linux/wait4.c
new file mode 100644
index 0000000000..83650e34a8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/wait4.c
@@ -0,0 +1,39 @@
+#define _GNU_SOURCE
+#include <sys/wait.h>
+#include <sys/resource.h>
+#include <string.h>
+#include <errno.h>
+#include "syscall.h"
+
+pid_t wait4(pid_t pid, int *status, int options, struct rusage *ru)
+{
+	int r;
+#ifdef SYS_wait4_time64
+	if (ru) {
+		long long kru64[18];
+		r = __syscall(SYS_wait4_time64, pid, status, options, kru64);
+		if (!r) {
+			ru->ru_utime = (struct timeval)
+				{ .tv_sec = kru64[0], .tv_usec = kru64[1] };
+			ru->ru_stime = (struct timeval)
+				{ .tv_sec = kru64[2], .tv_usec = kru64[3] };
+			char *slots = (char *)&ru->ru_maxrss;
+			for (int i=0; i<14; i++)
+				*(long *)(slots + i*sizeof(long)) = kru64[4+i];
+		}
+		if (SYS_wait4_time64 == SYS_wait4 || r != -ENOSYS)
+			return __syscall_ret(r);
+	}
+#endif
+	char *dest = ru ? (char *)&ru->ru_maxrss - 4*sizeof(long) : 0;
+	r = __syscall(SYS_wait4, pid, status, options, dest);
+	if (r>0 && ru && sizeof(time_t) > sizeof(long)) {
+		long kru[4];
+		memcpy(kru, dest, 4*sizeof(long));
+		ru->ru_utime = (struct timeval)
+			{ .tv_sec = kru[0], .tv_usec = kru[1] };
+		ru->ru_stime = (struct timeval)
+			{ .tv_sec = kru[2], .tv_usec = kru[3] };
+	}
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/linux/x32/sysinfo.c b/src/components/lib/libc/musl-1.2.0/src/linux/x32/sysinfo.c
new file mode 100644
index 0000000000..59b3bb708f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/linux/x32/sysinfo.c
@@ -0,0 +1,49 @@
+#include <sys/sysinfo.h>
+#include "syscall.h"
+
+#define klong long long
+#define kulong unsigned long long
+
+struct kernel_sysinfo {
+	klong uptime;
+	kulong loads[3];
+	kulong totalram;
+	kulong freeram;
+	kulong sharedram;
+	kulong bufferram;
+	kulong totalswap;
+	kulong freeswap;
+	short procs;
+	short pad;
+	kulong totalhigh;
+	kulong freehigh;
+	unsigned mem_unit;
+};
+
+int __lsysinfo(struct sysinfo *info)
+{
+	struct kernel_sysinfo tmp;
+	int ret = syscall(SYS_sysinfo, &tmp);
+	if(ret == -1) return ret;
+	info->uptime = tmp.uptime;
+	info->loads[0] = tmp.loads[0];
+	info->loads[1] = tmp.loads[1];
+	info->loads[2] = tmp.loads[2];
+	kulong shifts;
+	kulong max = tmp.totalram | tmp.totalswap;
+	__asm__("bsr %1,%0" : "=r"(shifts) : "r"(max));
+	shifts = shifts >= 32 ? shifts - 31 : 0;
+	info->totalram = tmp.totalram >> shifts;
+	info->freeram = tmp.freeram >> shifts;
+	info->sharedram = tmp.sharedram >> shifts;
+	info->bufferram = tmp.bufferram >> shifts;
+	info->totalswap = tmp.totalswap >> shifts;
+	info->freeswap = tmp.freeswap >> shifts;
+	info->procs = tmp.procs ;
+	info->totalhigh = tmp.totalhigh >> shifts;
+	info->freehigh = tmp.freehigh >> shifts;
+	info->mem_unit = (tmp.mem_unit ? tmp.mem_unit : 1) << shifts;
+	return ret;
+}
+
+weak_alias(__lsysinfo, sysinfo);
diff --git a/src/components/lib/libc/musl-1.1.11/src/linux/xattr.c b/src/components/lib/libc/musl-1.2.0/src/linux/xattr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/linux/xattr.c
rename to src/components/lib/libc/musl-1.2.0/src/linux/xattr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/__lctrans.c b/src/components/lib/libc/musl-1.2.0/src/locale/__lctrans.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/locale/__lctrans.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/__lctrans.c
index 107fe14a3a..9fbe762ad0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/__lctrans.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/__lctrans.c
@@ -1,6 +1,5 @@
 #include <locale.h>
 #include "locale_impl.h"
-#include "libc.h"
 
 static const char *dummy(const char *msg, const struct __locale_map *lm)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/__mo_lookup.c b/src/components/lib/libc/musl-1.2.0/src/locale/__mo_lookup.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/__mo_lookup.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/__mo_lookup.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/big5.h b/src/components/lib/libc/musl-1.2.0/src/locale/big5.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/big5.h
rename to src/components/lib/libc/musl-1.2.0/src/locale/big5.h
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/bind_textdomain_codeset.c b/src/components/lib/libc/musl-1.2.0/src/locale/bind_textdomain_codeset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/bind_textdomain_codeset.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/bind_textdomain_codeset.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/c_locale.c b/src/components/lib/libc/musl-1.2.0/src/locale/c_locale.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/c_locale.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/c_locale.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/catclose.c b/src/components/lib/libc/musl-1.2.0/src/locale/catclose.c
new file mode 100644
index 0000000000..54e24dd216
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/catclose.c
@@ -0,0 +1,14 @@
+#define _BSD_SOURCE
+#include <nl_types.h>
+#include <stdint.h>
+#include <endian.h>
+#include <sys/mman.h>
+
+#define V(p) be32toh(*(uint32_t *)(p))
+
+int catclose (nl_catd catd)
+{
+	char *map = (char *)catd;
+	munmap(map, V(map+8)+20);
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/catgets.c b/src/components/lib/libc/musl-1.2.0/src/locale/catgets.c
new file mode 100644
index 0000000000..71c31c1d6d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/catgets.c
@@ -0,0 +1,38 @@
+#define _BSD_SOURCE
+#include <nl_types.h>
+#include <endian.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
+
+#define V(p) be32toh(*(uint32_t *)(p))
+
+static int cmp(const void *a, const void *b)
+{
+	uint32_t x = V(a), y = V(b);
+	return x<y ? -1 : x>y ? 1 : 0;
+}
+
+char *catgets (nl_catd catd, int set_id, int msg_id, const char *s)
+{
+	const char *map = (const char *)catd;
+	uint32_t nsets = V(map+4);
+	const char *sets = map+20;
+	const char *msgs = map+20+V(map+12);
+	const char *strings = map+20+V(map+16);
+	uint32_t set_id_be = htobe32(set_id);
+	uint32_t msg_id_be = htobe32(msg_id);
+	const char *set = bsearch(&set_id_be, sets, nsets, 12, cmp);
+	if (!set) {
+		errno = ENOMSG;
+		return (char *)s;
+	}
+	uint32_t nmsgs = V(set+4);
+	msgs += 12*V(set+8);
+	const char *msg = bsearch(&msg_id_be, msgs, nmsgs, 12, cmp);
+	if (!msg) {
+		errno = ENOMSG;
+		return (char *)s;
+	}
+	return (char *)(strings + V(msg+8));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/catopen.c b/src/components/lib/libc/musl-1.2.0/src/locale/catopen.c
new file mode 100644
index 0000000000..97f2446d37
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/catopen.c
@@ -0,0 +1,79 @@
+#define _BSD_SOURCE
+#include <nl_types.h>
+#include <string.h>
+#include <stdint.h>
+#include <endian.h>
+#include <errno.h>
+#include <langinfo.h>
+#include <locale.h>
+#include <sys/mman.h>
+#include "libc.h"
+
+#define V(p) be32toh(*(uint32_t *)(p))
+
+static nl_catd do_catopen(const char *name)
+{
+	size_t size;
+	const unsigned char *map = __map_file(name, &size);
+	/* Size recorded in the file must match file size; otherwise
+	 * the information needed to unmap the file will be lost. */
+	if (!map || V(map) != 0xff88ff89 || 20+V(map+8) != size) {
+		if(map) munmap((void *)map, size);
+		errno = ENOENT;
+		return (nl_catd)-1;
+	}
+	return (nl_catd)map;
+}
+
+nl_catd catopen(const char *name, int oflag)
+{
+	nl_catd catd;
+
+	if (strchr(name, '/')) return do_catopen(name);
+
+	char buf[PATH_MAX];
+	size_t i;
+	const char *path, *lang, *p, *z;
+	if (libc.secure || !(path = getenv("NLSPATH"))) {
+		errno = ENOENT;
+		return (nl_catd)-1;
+	}
+	lang = oflag ? nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)) : getenv("LANG");
+	if (!lang) lang = "";
+	for (p=path; *p; p=z) {
+		i = 0;
+		z = __strchrnul(p, ':');
+		for (; p<z; p++) {
+			const char *v;
+			size_t l;
+			if (*p!='%') v=p, l=1;
+			else switch (*++p) {
+			case 'N': v=name; l=strlen(v); break;
+			case 'L': v=lang; l=strlen(v); break;
+			case 'l': v=lang; l=strcspn(v,"_.@"); break;
+			case 't':
+				v=__strchrnul(lang,'_');
+				if (*v) v++;
+				l=strcspn(v,".@");
+				break;
+			case 'c': v="UTF-8"; l=5; break;
+			case '%': v="%"; l=1; break;
+			default: v=0;
+			}
+			if (!v || l >= sizeof buf - i) {
+				break;
+			}
+			memcpy(buf+i, v, l);
+			i += l;
+		}
+		if (!*z && (p<z || !i)) break;
+		if (p<z) continue;
+		if (*z) z++;
+		buf[i] = 0;
+		/* Leading : or :: in NLSPATH is same as %N */
+		catd = do_catopen(i ? buf : name);
+		if (catd != (nl_catd)-1) return catd;
+	}
+	errno = ENOENT;
+	return (nl_catd)-1;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/codepages.h b/src/components/lib/libc/musl-1.2.0/src/locale/codepages.h
new file mode 100644
index 0000000000..4e236ef3ab
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/codepages.h
@@ -0,0 +1,320 @@
+"iso88591\0"
+"latin1\0"
+"\0\100"
+
+"iso88592\0"
+"\0\50"
+"\240\20\364\127\116\244\334\364\324\51\250\124\65\125\126\156\265\42\27\134"
+"\260\24\24\230\116\264\340\4\225\137\270\130\105\225\126\157\15\66\127\134"
+"\111\5\43\214\100\304\314\144\320\61\14\45\143\321\62\30\65\343\214\103"
+"\20\355\364\323\64\324\24\145\315\65\115\215\245\115\131\334\164\163\325\67"
+"\112\205\43\316\100\344\320\164\320\71\15\245\163\321\72\31\265\343\316\103"
+"\21\361\4\324\74\364\30\145\317\75\116\221\245\217\131\374\364\203\25\140"
+
+"iso88593\0"
+"\0\50"
+"\240\220\364\327\50\244\0\40\322\51\250\260\64\25\107\56\265\2\0\134"
+"\260\224\44\313\54\264\324\62\322\55\270\264\104\125\107\57\365\2\100\134"
+"\300\4\43\14\0\304\50\204\320\61\310\44\243\314\62\314\64\343\314\63"
+"\0\104\43\315\64\324\170\144\315\65\32\145\243\315\66\334\204\25\325\67"
+"\340\204\43\16\0\344\54\224\320\71\350\244\243\316\72\354\264\343\316\73"
+"\0\304\43\317\74\364\174\144\317\75\33\345\243\317\76\374\210\45\25\140"
+
+"iso88594\0"
+"\0\50"
+"\240\20\44\323\122\244\230\124\323\51\250\124\45\21\110\133\265\42\327\53"
+"\260\24\24\30\123\264\234\144\223\137\270\130\65\121\110\134\5\65\227\120"
+"\0\5\43\314\60\304\24\143\214\112\14\45\143\321\62\24\65\343\14\112"
+"\20\365\64\24\114\324\124\143\315\65\330\234\245\315\66\334\164\365\325\67"
+"\1\205\43\316\70\344\224\143\316\112\15\245\163\321\72\25\265\343\116\112"
+"\21\371\104\124\114\364\324\143\317\75\370\240\245\317\76\374\170\5\26\140"
+
+"iso88595\0"
+"\0\50"
+"\240\104\47\335\164\324\125\147\335\165\330\145\247\335\166"
+"\334\265\322\235\167\337\201\27\236\170\343\221\127\236\171"
+"\347\241\227\236\172\353\261\327\236\173\357\301\27\237\174"
+"\363\321\127\237\175\367\341\227\237\176\373\361\327\237\177\377\1\30\240\200"
+"\3\22\130\240\201\7\42\230\240\202\13\62\330\240\203\17\102\30\241\204"
+"\23\122\130\241\205\27\142\230\241\206\33\162\330\241\207\46\177\10\142\210"
+"\42\216\110\142\211\46\236\210\142\212\52\236\262\42\213"
+
+"iso88596\0"
+"\0\50"
+"\240\0\0\0\0\244\0\0\0\0\0\0\0\0\0\142\266\2\0\0\0\0\0\0\0\0\0\0\0\0"
+"\0\0\0\300\230\0\0\0\0\231\0\224\151\346\231\150\246\251\346\232"
+"\154\266\351\346\233\160\306\51\347\234\164\326\151\347\235"
+"\170\346\251\347\236\174\366\351\47\0\0\0\0\0\0\177\2\32\250\240"
+"\203\22\132\250\241\207\42\232\250\242\213\62\332\250\243\217\102\32\51\0"
+"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+
+"iso88597\0"
+"\0\50"
+"\240\114\114\361\50\44\227\154\312\51\250\244\222\330\52\254\264\2\100\304"
+"\260\304\42\313\54\212\55\306\330\55\215\71\366\330\56\220\365\22\231\144"
+"\223\121\126\231\145\227\141\226\231\146\233\161\326\231\147"
+"\237\201\26\232\150\243\221\6\100\151\246\235\206\132\152\252\255\306\132\153"
+"\256\275\6\133\154\262\315\106\133\155\266\335\206\133\156\272\355\306\133\157"
+"\276\375\6\134\160\302\15\107\134\161\306\35\207\134\162\312\55\307\134\163"
+"\316\75\7\35\0"
+
+"iso88598\0"
+"\0\50"
+"\240\0\40\312\50\244\224\142\312\51\250\244\162\315\52\254\264\342\312\53"
+"\260\304\42\313\54\264\324\142\313\55\270\344\162\317\56\274\364\342\13\0"
+"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+"\0\0\0\200\304\102\16\111\144\221\106\36\211\144\222\112\56\311\144\223"
+"\116\76\11\145\224\122\116\111\145\225\126\136\211\145\226\132\156\311\45\0"
+"\0\64\354\60\0"
+
+"iso88599\0"
+"\0\64"
+"\34\105\43\315\64\324\124\143\315\65\330\144\243\315\66\334\260\64\325\67"
+"\340\204\43\316\70\344\224\143\316\71\350\244\243\316\72\354\264\343\316\73"
+"\35\305\43\317\74\364\324\143\317\75\370\344\243\317\76\374\264\104\325\77"
+
+"iso885910\0"
+"\0\50"
+"\240\20\44\21\110\50\231\4\323\51\65\101\124\325\126\162\265\362\125\120"
+"\260\24\64\121\110\51\235\24\323\55\66\105\144\25\127\163\105\14\226\120"
+"\0\5\43\314\60\304\24\143\214\112\14\45\143\321\62\24\65\343\314\63"
+"\320\364\64\324\64\324\124\143\115\127\330\234\245\315\66\334\164\343\315\67"
+"\1\205\43\316\70\344\224\143\316\112\15\245\163\321\72\25\265\343\316\73"
+"\360\370\104\324\74\364\324\143\217\127\370\240\245\317\76\374\364\343\217\114"
+
+"iso885911\0"
+"tis620\0"
+"\0\50"
+"\240\170\372\51\250\241\212\72\52\251\245\232\172\52\252\251\252\272\52\253"
+"\255\272\372\52\254\261\312\72\53\255\265\332\172\53\256\271\352\272\53\257"
+"\275\372\372\53\260\301\12\73\54\261\305\32\173\54\262\311\52\273\54\263"
+"\315\72\373\54\264\321\112\73\55\265\325\132\173\55\0\0\0\0\0\266"
+"\331\152\273\55\267\335\172\373\55\270\341\212\73\56\271\345\232\173\56\272"
+"\351\252\273\56\273\355\272\373\56\274\361\312\73\57\275\0\0\0\0\0"
+
+"iso885913\0"
+"\0\50"
+"\240\134\54\312\50\244\140\154\312\51\330\244\262\324\52\254\264\342\212\61"
+"\260\304\42\313\54\26\327\142\313\55\370\344\302\324\56\274\364\342\213\71"
+"\4\251\4\220\101\304\24\143\221\104\14\45\343\26\105\40\301\204\122\115"
+"\125\355\324\323\64\103\125\143\315\65\147\345\364\324\127\334\300\45\327\67"
+"\5\255\24\320\101\344\224\163\321\104\15\245\363\126\105\41\305\224\222\115"
+"\126\361\344\323\74\104\325\143\317\75\150\351\4\25\130\374\304\65\27\305"
+
+"iso885914\0"
+"\0\50"
+"\240\324\153\357\50\12\55\164\357\51\3\247\122\60\276\11\267\342\112\133"
+"\371\352\353\321\107\373\362\153\113\277\4\373\153\360\277\12\37\214\60\300"
+"\300\4\43\314\60\304\24\143\314\61\310\44\243\314\62\314\64\343\314\63"
+"\151\105\43\315\64\324\124\143\115\300\330\144\243\315\66\334\164\263\326\67"
+"\340\204\43\316\70\344\224\143\316\71\350\244\243\316\72\354\264\343\316\73"
+"\152\305\43\317\74\364\324\143\217\300\370\344\243\317\76\374\364\303\326\77"
+
+"iso885915\0"
+"latin9\0"
+"\0\51"
+"\44\227\122\325\51\126\245\242\312\52\254\264\342\312\53\260\304\42\313\54"
+"\162\325\142\313\55\163\345\242\313\56\107\41\325\326\57\300\4\43\314\60"
+"\304\24\143\314\61\310\44\243\314\62\314\64\343\314\63\320\104\43\315\64"
+"\324\124\143\315\65\330\144\243\315\66\334\164\343\315\67\340\204\43\316\70"
+"\344\224\143\316\71\350\244\243\316\72\354\264\343\316\73\360\304\43\317\74"
+"\364\324\143\317\75\370\344\243\317\76\374\364\343\317\77"
+
+"iso885916\0"
+"\0\50"
+"\240\20\124\120\116\44\143\134\325\51\126\245\222\327\52\156\265\362\26\134"
+"\260\304\302\220\116\162\135\154\313\55\163\65\244\327\56\107\41\325\126\134"
+"\300\4\43\214\100\304\30\144\314\61\310\44\243\314\62\314\64\343\314\63"
+"\20\355\44\315\64\324\24\145\315\123\145\145\243\315\66\334\130\264\327\67"
+"\340\204\43\316\100\344\34\144\316\71\350\244\243\316\72\354\264\343\316\73"
+"\21\361\44\317\74\364\30\145\17\124\146\345\243\317\76\374\134\304\327\77"
+
+"cp1250\0"
+"windows1250\0"
+"\0\40"
+"\44\3\120\61\0\30\163\234\261\306\0\164\134\225\307\117\145\45\227\133"
+"\0\114\114\261\305\27\157\374\60\304\0\234\154\325\307\120\151\65\327\133"
+"\240\370\365\127\116\244\20\144\312\51\250\244\62\325\52\254\264\342\12\134"
+"\260\304\22\230\116\264\324\142\313\55\270\24\104\325\56\67\15\206\123\134"
+"\111\5\43\214\100\304\314\144\320\61\14\45\143\321\62\30\65\343\214\103"
+"\20\355\364\323\64\324\24\145\315\65\115\215\245\115\131\334\164\163\325\67"
+"\112\205\43\316\100\344\320\164\320\71\15\245\163\321\72\31\265\343\316\103"
+"\21\361\4\324\74\364\30\145\317\75\116\221\245\217\131\374\364\203\25\140"
+
+"cp1251\0"
+"windows1251\0"
+"\0\40"
+"\322\115\127\161\210\30\163\234\261\306\44\167\234\235\307\332\161\267\235\167"
+"\40\116\114\261\305\27\157\374\60\304\0\234\174\342\307\50\252\230\42\213"
+"\240\164\267\42\166\244\264\150\312\51\321\245\102\335\52\254\264\342\312\165"
+"\260\304\142\35\211\56\326\142\313\55\37\232\54\342\56\46\126\67\142\211"
+"\337\201\27\236\170\343\221\127\236\171\347\241\227\236\172"
+"\353\261\327\236\173\357\301\27\237\174\363\321\127\237\175"
+"\367\341\227\237\176\373\361\327\237\177\377\1\30\240\200\3\22\130\240\201"
+"\7\42\230\240\202\13\62\330\240\203\17\102\30\241\204\23\122\130\241\205"
+"\27\142\230\241\206\33\162\330\241\207"
+
+"cp1252\0"
+"windows1252\0"
+"\0\40"
+"\44\3\120\61\135\30\163\234\261\306\175\165\134\225\307\107\1\40\27\0"
+"\0\114\114\261\305\27\157\374\60\304\202\235\154\325\307\110\1\60\127\133"
+"\240\204\42\312\50\244\224\142\312\51\250\244\242\312\52\254\264\342\312\53"
+"\260\304\42\313\54\264\324\142\313\55\270\344\242\313\56\274\364\342\313\57"
+"\300\4\43\314\60\304\24\143\314\61\310\44\243\314\62\314\64\343\314\63"
+"\320\104\43\315\64\324\124\143\315\65\330\144\243\315\66\334\164\343\315\67"
+"\340\204\43\316\70\344\224\143\316\71\350\244\243\316\72\354\264\343\316\73"
+"\360\304\43\317\74\364\324\143\317\75\370\344\243\317\76\374\364\343\317\77"
+
+"cp1253\0"
+"windows1253\0"
+"\0\40"
+"\44\3\120\61\135\30\163\234\261\306\0\164\14\200\307\0\0\0\0\0"
+"\0\114\114\261\305\27\157\374\60\304\0\234\14\300\307\0\0\0\0\0"
+"\240\54\306\330\50\244\224\142\312\51\250\244\2\300\52\254\264\342\112\304"
+"\260\304\42\313\54\212\325\142\313\55\215\71\366\330\56\220\365\22\231\144"
+"\223\121\126\231\145\227\141\226\231\146\233\161\326\231\147"
+"\237\201\26\232\150\243\221\6\100\151\246\235\206\132\152\252\255\306\132\153"
+"\256\275\6\133\154\262\315\106\133\155\266\335\206\133\156\272\355\306\133\157"
+"\276\375\6\134\160\302\15\107\134\161\306\35\207\134\162\312\55\307\134\163"
+"\316\75\7\35\0"
+
+"cp1254\0"
+"windows1254\0"
+"\0\40"
+"\44\3\120\61\135\30\163\234\261\306\175\165\134\225\307\107\1\0\0\0"
+"\0\114\114\261\305\27\157\374\60\304\202\235\154\325\307\110\1\0\100\133"
+"\240\204\42\312\50\244\224\142\312\51\250\244\242\312\52\254\264\342\312\53"
+"\260\304\42\313\54\264\324\142\313\55\270\344\242\313\56\274\364\342\313\57"
+"\300\4\43\314\60\304\24\143\314\61\310\44\243\314\62\314\64\343\314\63"
+"\34\105\43\315\64\324\124\143\315\65\330\144\243\315\66\334\260\64\325\67"
+"\340\204\43\316\70\344\224\143\316\71\350\244\243\316\72\354\264\343\316\73"
+"\35\305\43\317\74\364\324\143\317\75\370\344\243\317\76\374\264\104\325\77"
+
+"cp1255\0"
+"windows1255\0"
+"\0\40"
+"\44\3\120\61\135\30\163\234\261\306\175\165\14\200\307\0\0\0\0\0"
+"\0\114\114\261\305\27\157\374\60\304\202\235\14\300\307\0\0\0\0\0"
+"\240\204\42\312\50\42\227\142\312\51\250\244\162\315\52\254\264\342\312\53"
+"\260\304\42\313\54\264\324\142\313\55\270\344\162\317\56\274\364\342\313\57"
+"\57\302\30\243\214\63\322\130\243\215\67\342\10\100\216\72\356\310\143\217"
+"\76\376\10\144\220\135\172\371\45\230\141\2\0\0\0\0\0\0\0\0\102\16\111\144\221"
+"\106\36\211\144\222\112\56\311\144\223\116\76\11\145\224\122\116\111\145\225"
+"\126\136\211\145\226\132\156\311\45\0\0\64\354\60\0"
+
+"cp1256\0"
+"windows1256\0"
+"\0\40"
+"\44\117\132\61\135\30\163\234\261\306\175\165\54\251\307\107\121\172\151\245"
+"\231\116\114\261\305\27\157\374\60\304\230\236\154\351\307\110\55\314\260\246"
+"\240\210\51\312\50\244\224\142\312\51\250\244\262\351\52\254\264\342\312\53"
+"\260\304\42\313\54\264\324\142\313\55\270\344\62\346\56\274\364\342\13\231"
+"\234\226\151\346\231\150\246\251\346\232\154\266\351\346\233"
+"\160\306\51\347\234\164\326\151\347\235\170\346\251\347\65\173\362\331\247\237"
+"\177\2\32\250\240\340\14\52\16\241\205\32\172\350\71\350\244\243\316\72"
+"\210\46\352\316\73\212\56\312\150\243\364\70\372\350\75\220\346\23\351\76"
+"\374\64\354\160\247"
+
+"cp1257\0"
+"windows1257\0"
+"\0\40"
+"\44\3\120\61\0\30\163\234\261\306\0\164\14\200\307\0\240\342\27\56"
+"\0\114\114\261\305\27\157\374\60\304\0\234\14\300\307\0\274\22\30\0"
+"\240\0\40\312\50\244\0\140\312\51\330\244\262\324\52\254\264\342\212\61"
+"\260\304\42\313\54\264\324\142\313\55\370\344\302\324\56\274\364\342\213\71"
+"\4\251\4\220\101\304\24\143\221\104\14\45\343\26\105\40\301\204\122\115"
+"\125\355\324\323\64\103\125\143\315\65\147\345\364\324\127\334\300\45\327\67"
+"\5\255\24\320\101\344\224\163\321\104\15\245\363\126\105\41\305\224\222\115"
+"\126\361\344\323\74\104\325\143\317\75\150\351\4\25\130\374\304\65\27\140"
+
+"cp1258\0"
+"windows1258\0"
+"\0\40"
+"\44\3\120\61\135\30\163\234\261\306\175\165\14\200\307\107\1\0\0\0"
+"\0\114\114\261\305\27\157\374\60\304\202\235\14\300\307\110\1\0\100\133"
+"\240\204\42\312\50\244\224\142\312\51\250\244\242\312\52\254\264\342\312\53"
+"\260\304\42\313\54\264\324\142\313\55\270\344\242\313\56\274\364\342\313\57"
+"\300\4\43\214\100\304\24\143\314\61\310\44\243\314\62\204\65\343\314\63"
+"\20\105\163\330\64\324\324\145\315\65\330\144\243\315\66\334\334\145\330\67"
+"\340\204\43\316\100\344\224\143\316\71\350\244\243\316\72\205\265\343\316\73"
+"\21\305\203\330\74\364\330\145\317\75\370\344\243\317\76\374\340\65\362\77"
+
+"koi8r\0"
+"\0\40"
+"\63\323\134\263\315\67\343\234\263\316\73\363\334\363\326\134\167\355\365\327"
+"\140\207\55\166\314\143\243\234\62\313\56\277\14\212\314\260\310\162\313\75"
+"\76\377\14\364\207\101\13\75\64\321\105\33\175\64\322\111\53\275\64\323"
+"\115\73\375\164\164\120\107\55\365\324\124\127\155\365\325\130\147\255\165\52"
+"\35\376\7\140\205\3\22\70\241\200\24\36\210\140\202\12\56\310\140\203"
+"\16\172\370\40\204\21\112\130\140\200\33\152\150\340\205\34\142\150\141\206"
+"\375\175\7\136\175\343\221\67\237\170\364\235\207\136\172\352\255\307\136\173"
+"\356\371\367\36\174\361\311\127\136\170\373\351\147\336\175"
+"\374\341\147\137\176"
+
+"koi8u\0"
+"\0\40"
+"\63\323\134\263\315\67\343\234\263\316\73\363\334\363\326\134\167\355\365\327"
+"\140\207\55\166\314\143\243\234\62\313\56\277\14\212\314\260\310\162\313\75"
+"\76\377\14\364\207\42\12\115\142\211\105\33\175\64\322\111\273\270\64\323"
+"\115\73\375\164\164\324\105\155\335\165\124\127\155\365\325\130\267\250\165\52"
+"\35\376\7\140\205\3\22\70\241\200\24\36\210\140\202\12\56\310\140\203"
+"\16\172\370\40\204\21\112\130\140\200\33\152\150\340\205\34\142\150\141\206"
+"\375\175\7\136\175\343\221\67\237\170\364\235\207\136\172\352\255\307\136\173"
+"\356\371\367\36\174\361\311\127\136\170\373\351\147\336\175"
+"\374\341\147\137\176"
+
+"cp437\0"
+"\0\40"
+"\307\360\223\216\70\344\200\123\316\71\352\254\203\316\73\356\260\103\114\61"
+"\311\230\143\14\75\366\310\263\117\76\377\130\303\215\50\243\224\22\62\135"
+"\341\264\63\217\76\361\104\243\212\56\277\300\314\112\57\274\204\262\312\56"
+"\140\207\55\66\315\72\77\15\65\321\103\107\375\163\321\113\53\235\264\315"
+"\67\363\274\163\316\63\367\314\164\323\110\13\175\65\325\116\373\254\165\325"
+"\126\113\75\365\321\106\3\35\164\326\130\343\134\163\327\134\173\375\365\326"
+"\263\175\143\231\160\245\25\127\213\161\250\155\266\232\155\52\43\167\333\312"
+"\55\307\362\262\313\61\313\174\17\313\260\240\174\113\312\40\313\62\66\50"
+
+"cp850\0"
+"\0\40"
+"\307\360\223\216\70\344\200\123\316\71\352\254\203\316\73\356\260\103\114\61"
+"\311\230\143\14\75\366\310\263\117\76\377\130\303\15\76\243\140\163\15\135"
+"\341\264\63\217\76\361\104\243\212\56\277\270\302\112\57\274\204\262\312\56"
+"\140\207\55\66\315\72\7\43\14\60\251\104\375\163\321\113\213\122\212\315"
+"\67\363\274\163\316\63\367\74\316\60\110\13\175\65\325\116\373\254\65\51"
+"\360\100\243\314\62\310\264\324\214\63\317\340\134\163\327\134\233\302\314\326"
+"\323\174\103\215\64\365\124\123\213\77\336\150\263\115\66\375\164\363\12\55"
+"\255\304\42\261\57\266\234\162\17\56\260\240\162\113\56\263\310\62\66\50"
+
+"cp866\0"
+"\0\40"
+"\337\201\27\236\170\343\221\127\236\171\347\241\227\236\172"
+"\353\261\327\236\173\357\301\27\237\174\363\321\127\237\175"
+"\367\341\227\237\176\373\361\327\237\177\377\1\30\240\200\3\22\130\240\201"
+"\7\42\230\240\202\13\62\330\240\203\140\207\55\66\315\72\77\15\65\321"
+"\103\107\375\163\321\113\53\235\264\315\67\363\274\163\316\63\367\314\164\323"
+"\110\13\175\65\325\116\373\254\165\325\126\113\75\365\321\106\3\35\164\326"
+"\130\343\134\163\327\134\173\375\365\326\17\102\30\241\204\23\122\130\241\205"
+"\27\142\230\241\206\33\162\330\241\207\321\175\110\235\210\327\225\330\335\212"
+"\260\240\174\113\312\46\223\62\66\50"
+
+"ibm1047\0"
+"cp1047\0"
+"\0\1"
+"\234\44\140\310\37\227\64\342\310\2\14\64\340\300\3\20\104\40\301\4"
+"\235\24\202\300\41\30\144\40\311\43\34\164\340\301\7\200\4\42\310\40"
+"\204\50\160\301\6\210\44\242\310\42\214\24\140\300\1\220\104\142\301\44"
+"\224\124\142\11\1\230\144\242\311\46\24\124\340\211\6\40\200\42\16\71"
+"\340\204\63\116\71\347\304\43\212\13\74\240\260\2\37\46\244\243\316\72"
+"\350\264\343\316\73\354\174\23\2\11\52\244\260\203\27\55\274\40\14\61"
+"\300\4\63\114\61\307\104\143\12\13\45\174\341\303\17\370\44\243\314\62"
+"\310\64\343\314\63\314\200\241\303\10\100\234\320\203\10\330\204\41\306\30"
+"\144\224\141\306\31\150\244\261\312\56\360\364\343\117\54\260\250\261\6\33"
+"\155\270\361\6\34\161\310\241\212\56\346\340\142\14\51\265\370\61\7\35"
+"\165\330\161\7\36\171\350\21\312\57\320\154\341\215\53\254\214\122\312\55"
+"\251\234\142\13\57\275\370\322\15\52\257\164\101\313\65\173\4\41\304\20"
+"\104\24\141\304\21\110\44\321\12\75\366\310\63\117\75\175\50\261\4\23"
+"\115\70\361\4\24\121\110\221\313\76\374\344\243\317\77\134\334\63\5\25"
+"\125\130\161\5\26\131\150\41\13\65\326\110\63\115\65\60\304\40\303\14"
+"\64\324\140\303\15\70\344\60\313\66\334\144\243\315\47"
+
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/dcngettext.c b/src/components/lib/libc/musl-1.2.0/src/locale/dcngettext.c
new file mode 100644
index 0000000000..4c30439389
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/dcngettext.c
@@ -0,0 +1,272 @@
+#include <libintl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <ctype.h>
+#include "locale_impl.h"
+#include "atomic.h"
+#include "pleval.h"
+#include "lock.h"
+
+struct binding {
+	struct binding *next;
+	int dirlen;
+	volatile int active;
+	char *domainname;
+	char *dirname;
+	char buf[];
+};
+
+static void *volatile bindings;
+
+static char *gettextdir(const char *domainname, size_t *dirlen)
+{
+	struct binding *p;
+	for (p=bindings; p; p=p->next) {
+		if (!strcmp(p->domainname, domainname) && p->active) {
+			*dirlen = p->dirlen;
+			return (char *)p->dirname;
+		}
+	}
+	return 0;
+}
+
+char *bindtextdomain(const char *domainname, const char *dirname)
+{
+	static volatile int lock[1];
+	struct binding *p, *q;
+
+	if (!domainname) return 0;
+	if (!dirname) return gettextdir(domainname, &(size_t){0});
+
+	size_t domlen = strnlen(domainname, NAME_MAX+1);
+	size_t dirlen = strnlen(dirname, PATH_MAX);
+	if (domlen > NAME_MAX || dirlen >= PATH_MAX) {
+		errno = EINVAL;
+		return 0;
+	}
+
+	LOCK(lock);
+
+	for (p=bindings; p; p=p->next) {
+		if (!strcmp(p->domainname, domainname) &&
+		    !strcmp(p->dirname, dirname)) {
+			break;
+		}
+	}
+
+	if (!p) {
+		p = calloc(sizeof *p + domlen + dirlen + 2, 1);
+		if (!p) {
+			UNLOCK(lock);
+			return 0;
+		}
+		p->next = bindings;
+		p->dirlen = dirlen;
+		p->domainname = p->buf;
+		p->dirname = p->buf + domlen + 1;
+		memcpy(p->domainname, domainname, domlen+1);
+		memcpy(p->dirname, dirname, dirlen+1);
+		a_cas_p(&bindings, bindings, p);
+	}
+
+	a_store(&p->active, 1);
+
+	for (q=bindings; q; q=q->next) {
+		if (!strcmp(q->domainname, domainname) && q != p)
+			a_store(&q->active, 0);
+	}
+
+	UNLOCK(lock);
+	
+	return (char *)p->dirname;
+}
+
+static const char catnames[][12] = {
+	"LC_CTYPE",
+	"LC_NUMERIC",
+	"LC_TIME",
+	"LC_COLLATE",
+	"LC_MONETARY",
+	"LC_MESSAGES",
+};
+
+static const char catlens[] = { 8, 10, 7, 10, 11, 11 };
+
+struct msgcat {
+	struct msgcat *next;
+	const void *map;
+	size_t map_size;
+	const char *plural_rule;
+	int nplurals;
+	struct binding *binding;
+	const struct __locale_map *lm;
+	int cat;
+};
+
+static char *dummy_gettextdomain()
+{
+	return "messages";
+}
+
+weak_alias(dummy_gettextdomain, __gettextdomain);
+
+char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n, int category)
+{
+	static struct msgcat *volatile cats;
+	struct msgcat *p;
+	struct __locale_struct *loc = CURRENT_LOCALE;
+	const struct __locale_map *lm;
+	size_t domlen;
+	struct binding *q;
+	int old_errno = errno;
+
+	if ((unsigned)category >= LC_ALL) goto notrans;
+
+	if (!domainname) domainname = __gettextdomain();
+
+	domlen = strnlen(domainname, NAME_MAX+1);
+	if (domlen > NAME_MAX) goto notrans;
+
+	for (q=bindings; q; q=q->next)
+		if (!strcmp(q->domainname, domainname) && q->active)
+			break;
+	if (!q) goto notrans;
+
+	lm = loc->cat[category];
+	if (!lm) {
+notrans:
+		errno = old_errno;
+		return (char *) ((n == 1) ? msgid1 : msgid2);
+	}
+
+	for (p=cats; p; p=p->next)
+		if (p->binding == q && p->lm == lm && p->cat == category)
+			break;
+
+	if (!p) {
+		const char *dirname, *locname, *catname, *modname, *locp;
+		size_t dirlen, loclen, catlen, modlen, alt_modlen;
+		void *old_cats;
+		size_t map_size;
+
+		dirname = q->dirname;
+		locname = lm->name;
+		catname = catnames[category];
+
+		dirlen = q->dirlen;
+		loclen = strlen(locname);
+		catlen = catlens[category];
+
+		/* Logically split @mod suffix from locale name. */
+		modname = memchr(locname, '@', loclen);
+		if (!modname) modname = locname + loclen;
+		alt_modlen = modlen = loclen - (modname-locname);
+		loclen = modname-locname;
+
+		/* Drop .charset identifier; it is not used. */
+		const char *csp = memchr(locname, '.', loclen);
+		if (csp) loclen = csp-locname;
+
+		char name[dirlen+1 + loclen+modlen+1 + catlen+1 + domlen+3 + 1];
+		const void *map;
+
+		for (;;) {
+			snprintf(name, sizeof name, "%s/%.*s%.*s/%s/%s.mo\0",
+				dirname, (int)loclen, locname,
+				(int)alt_modlen, modname, catname, domainname);
+			if (map = __map_file(name, &map_size)) break;
+
+			/* Try dropping @mod, _YY, then both. */
+			if (alt_modlen) {
+				alt_modlen = 0;
+			} else if ((locp = memchr(locname, '_', loclen))) {
+				loclen = locp-locname;
+				alt_modlen = modlen;
+			} else {
+				break;
+			}
+		}
+		if (!map) goto notrans;
+
+		p = calloc(sizeof *p, 1);
+		if (!p) {
+			__munmap((void *)map, map_size);
+			goto notrans;
+		}
+		p->cat = category;
+		p->binding = q;
+		p->lm = lm;
+		p->map = map;
+		p->map_size = map_size;
+
+		const char *rule = "n!=1;";
+		unsigned long np = 2;
+		const char *r = __mo_lookup(p->map, p->map_size, "");
+		char *z;
+		while (r && strncmp(r, "Plural-Forms:", 13)) {
+			z = strchr(r, '\n');
+			r = z ? z+1 : 0;
+		}
+		if (r) {
+			r += 13;
+			while (isspace(*r)) r++;
+			if (!strncmp(r, "nplurals=", 9)) {
+				np = strtoul(r+9, &z, 10);
+				r = z;
+			}
+			while (*r && *r != ';') r++;
+			if (*r) {
+				r++;
+				while (isspace(*r)) r++;
+				if (!strncmp(r, "plural=", 7))
+					rule = r+7;
+			}
+		}
+		p->nplurals = np;
+		p->plural_rule = rule;
+
+		do {
+			old_cats = cats;
+			p->next = old_cats;
+		} while (a_cas_p(&cats, old_cats, p) != old_cats);
+	}
+
+	const char *trans = __mo_lookup(p->map, p->map_size, msgid1);
+	if (!trans) goto notrans;
+
+	/* Non-plural-processing gettext forms pass a null pointer as
+	 * msgid2 to request that dcngettext suppress plural processing. */
+
+	if (msgid2 && p->nplurals) {
+		unsigned long plural = __pleval(p->plural_rule, n);
+		if (plural > p->nplurals) goto notrans;
+		while (plural--) {
+			size_t rem = p->map_size - (trans - (char *)p->map);
+			size_t l = strnlen(trans, rem);
+			if (l+1 >= rem)
+				goto notrans;
+			trans += l+1;
+		}
+	}
+	errno = old_errno;
+	return (char *)trans;
+}
+
+char *dcgettext(const char *domainname, const char *msgid, int category)
+{
+	return dcngettext(domainname, msgid, 0, 1, category);
+}
+
+char *dngettext(const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n)
+{
+	return dcngettext(domainname, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+char *dgettext(const char *domainname, const char *msgid)
+{
+	return dcngettext(domainname, msgid, 0, 1, LC_MESSAGES);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/duplocale.c b/src/components/lib/libc/musl-1.2.0/src/locale/duplocale.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/duplocale.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/duplocale.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/freelocale.c b/src/components/lib/libc/musl-1.2.0/src/locale/freelocale.c
new file mode 100644
index 0000000000..802b8bfe1c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/freelocale.c
@@ -0,0 +1,9 @@
+#include <stdlib.h>
+#include "locale_impl.h"
+
+void freelocale(locale_t l)
+{
+	if (__loc_is_allocated(l)) free(l);
+}
+
+weak_alias(freelocale, __freelocale);
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/gb18030.h b/src/components/lib/libc/musl-1.2.0/src/locale/gb18030.h
new file mode 100644
index 0000000000..8f300e9b69
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/gb18030.h
@@ -0,0 +1,1866 @@
+19970,19972,19973,19974,19983,19986,19991,19999,20000,20001,20003,20006,20009,
+20014,20015,20017,20019,20021,20023,20028,20032,20033,20034,20036,20038,20042,
+20049,20053,20055,20058,20059,20066,20067,20068,20069,20071,20072,20074,20075,
+20076,20077,20078,20079,20082,20084,20085,20086,20087,20088,20089,20090,20091,
+20092,20093,20095,20096,20097,20098,20099,20100,20101,20103,20106,20112,20118,
+20119,20121,20124,20125,20126,20131,20138,20143,20144,20145,20148,20150,20151,
+20152,20153,20156,20157,20158,20168,20172,20175,20176,20178,20186,20187,20188,
+20192,20194,20198,20199,20201,20205,20206,20207,20209,20212,20216,20217,20218,
+20220,20222,20224,20226,20227,20228,20229,20230,20231,20232,20235,20236,20242,
+20243,20244,20245,20246,20252,20253,20257,20259,20264,20265,20268,20269,20270,
+20273,20275,20277,20279,20281,20283,20286,20287,20288,20289,20290,20292,20293,
+20295,20296,20297,20298,20299,20300,20306,20308,20310,20321,20322,20326,20328,
+20330,20331,20333,20334,20337,20338,20341,20343,20344,20345,20346,20349,20352,
+20353,20354,20357,20358,20359,20362,20364,20366,20368,20370,20371,20373,20374,
+20376,20377,20378,20380,20382,20383,20385,20386,20388,20395,20397,20400,20401,
+20402,20403,20404,20406,20407,20408,20409,20410,20411,20412,20413,20414,20416,
+20417,20418,20422,20423,20424,20425,20427,20428,20429,20434,20435,20436,20437,
+20438,20441,20443,20448,20450,20452,20453,20455,20459,20460,20464,20466,20468,
+20469,20470,20471,20473,20475,20476,20477,20479,20480,20481,20482,20483,20484,
+20485,20486,20487,20488,20489,20490,20491,20494,
+20496,20497,20499,20501,20502,20503,20507,20509,20510,20512,20514,20515,20516,
+20519,20523,20527,20528,20529,20530,20531,20532,20533,20534,20535,20536,20537,
+20539,20541,20543,20544,20545,20546,20548,20549,20550,20553,20554,20555,20557,
+20560,20561,20562,20563,20564,20566,20567,20568,20569,20571,20573,20574,20575,
+20576,20577,20578,20579,20580,20582,20583,20584,20585,20586,20587,20589,20590,
+20591,20592,20593,20594,20595,20596,20597,20600,20601,20602,20604,20605,20609,
+20610,20611,20612,20614,20615,20617,20618,20619,20620,20622,20623,20624,20625,
+20626,20627,20628,20629,20630,20631,20632,20633,20634,20635,20636,20637,20638,
+20639,20640,20641,20642,20644,20646,20650,20651,20653,20654,20655,20656,20657,
+20659,20660,20661,20662,20663,20664,20665,20668,20669,20670,20671,20672,20673,
+20674,20675,20676,20677,20678,20679,20680,20681,20682,20683,20684,20685,20686,
+20688,20689,20690,20691,20692,20693,20695,20696,20697,20699,20700,20701,20702,
+20703,20704,20705,20706,20707,20708,20709,20712,20713,20714,20715,20719,20720,
+20721,20722,20724,20726,20727,20728,20729,20730,20732,20733,20734,20735,20736,
+20737,20738,20739,20740,20741,20744,20745,20746,20748,20749,20750,20751,20752,
+20753,20755,20756,20757,20758,20759,20760,20761,20762,20763,20764,20765,20766,
+20767,20768,20770,20771,20772,20773,20774,20775,20776,20777,20778,20779,20780,
+20781,20782,20783,20784,20785,20786,20787,20788,20789,20790,20791,20792,20793,
+20794,20795,20796,20797,20798,20802,20807,20810,20812,20814,20815,20816,20818,
+20819,20823,20824,20825,20827,20829,20830,20831,20832,
+20833,20835,20836,20838,20839,20841,20842,20847,20850,20858,20862,20863,20867,
+20868,20870,20871,20874,20875,20878,20879,20880,20881,20883,20884,20888,20890,
+20893,20894,20895,20897,20899,20902,20903,20904,20905,20906,20909,20910,20916,
+20920,20921,20922,20926,20927,20929,20930,20931,20933,20936,20938,20941,20942,
+20944,20946,20947,20948,20949,20950,20951,20952,20953,20954,20956,20958,20959,
+20962,20963,20965,20966,20967,20968,20969,20970,20972,20974,20977,20978,20980,
+20983,20990,20996,20997,21001,21003,21004,21007,21008,21011,21012,21013,21020,
+21022,21023,21025,21026,21027,21029,21030,21031,21034,21036,21039,21041,21042,
+21044,21045,21052,21054,21060,21061,21062,21063,21064,21065,21067,21070,21071,
+21074,21075,21077,21079,21080,21081,21082,21083,21085,21087,21088,21090,21091,
+21092,21094,21096,21099,21100,21101,21102,21104,21105,21107,21108,21109,21110,
+21111,21112,21113,21114,21115,21116,21118,21120,21123,21124,21125,21126,21127,
+21129,21130,21131,21132,21133,21134,21135,21137,21138,21140,21141,21142,21143,
+21144,21145,21146,21148,21156,21157,21158,21159,21166,21167,21168,21172,21173,
+21174,21175,21176,21177,21178,21179,21180,21181,21184,21185,21186,21188,21189,
+21190,21192,21194,21196,21197,21198,21199,21201,21203,21204,21205,21207,21209,
+21210,21211,21212,21213,21214,21216,21217,21218,21219,21221,21222,21223,21224,
+21225,21226,21227,21228,21229,21230,21231,21233,21234,21235,21236,21237,21238,
+21239,21240,21243,21244,21245,21249,21250,21251,21252,21255,21257,21258,21259,
+21260,21262,21265,21266,21267,21268,21272,21275,21276,
+21278,21279,21282,21284,21285,21287,21288,21289,21291,21292,21293,21295,21296,
+21297,21298,21299,21300,21301,21302,21303,21304,21308,21309,21312,21314,21316,
+21318,21323,21324,21325,21328,21332,21336,21337,21339,21341,21349,21352,21354,
+21356,21357,21362,21366,21369,21371,21372,21373,21374,21376,21377,21379,21383,
+21384,21386,21390,21391,21392,21393,21394,21395,21396,21398,21399,21401,21403,
+21404,21406,21408,21409,21412,21415,21418,21419,21420,21421,21423,21424,21425,
+21426,21427,21428,21429,21431,21432,21433,21434,21436,21437,21438,21440,21443,
+21444,21445,21446,21447,21454,21455,21456,21458,21459,21461,21466,21468,21469,
+21470,21473,21474,21479,21492,21498,21502,21503,21504,21506,21509,21511,21515,
+21524,21528,21529,21530,21532,21538,21540,21541,21546,21552,21555,21558,21559,
+21562,21565,21567,21569,21570,21572,21573,21575,21577,21580,21581,21582,21583,
+21585,21594,21597,21598,21599,21600,21601,21603,21605,21607,21609,21610,21611,
+21612,21613,21614,21615,21616,21620,21625,21626,21630,21631,21633,21635,21637,
+21639,21640,21641,21642,21645,21649,21651,21655,21656,21660,21662,21663,21664,
+21665,21666,21669,21678,21680,21682,21685,21686,21687,21689,21690,21692,21694,
+21699,21701,21706,21707,21718,21720,21723,21728,21729,21730,21731,21732,21739,
+21740,21743,21744,21745,21748,21749,21750,21751,21752,21753,21755,21758,21760,
+21762,21763,21764,21765,21768,21770,21771,21772,21773,21774,21778,21779,21781,
+21782,21783,21784,21785,21786,21788,21789,21790,21791,21793,21797,21798,21800,
+21801,21803,21805,21810,21812,21813,21814,21816,21817,
+21818,21819,21821,21824,21826,21829,21831,21832,21835,21836,21837,21838,21839,
+21841,21842,21843,21844,21847,21848,21849,21850,21851,21853,21854,21855,21856,
+21858,21859,21864,21865,21867,21871,21872,21873,21874,21875,21876,21881,21882,
+21885,21887,21893,21894,21900,21901,21902,21904,21906,21907,21909,21910,21911,
+21914,21915,21918,21920,21921,21922,21923,21924,21925,21926,21928,21929,21930,
+21931,21932,21933,21934,21935,21936,21938,21940,21942,21944,21946,21948,21951,
+21952,21953,21954,21955,21958,21959,21960,21962,21963,21966,21967,21968,21973,
+21975,21976,21977,21978,21979,21982,21984,21986,21991,21993,21997,21998,22000,
+22001,22004,22006,22008,22009,22010,22011,22012,22015,22018,22019,22020,22021,
+22022,22023,22026,22027,22029,22032,22033,22034,22035,22036,22037,22038,22039,
+22041,22042,22044,22045,22048,22049,22050,22053,22054,22056,22057,22058,22059,
+22062,22063,22064,22067,22069,22071,22072,22074,22076,22077,22078,22080,22081,
+22082,22083,22084,22085,22086,22087,22088,22089,22090,22091,22095,22096,22097,
+22098,22099,22101,22102,22106,22107,22109,22110,22111,22112,22113,22115,22117,
+22118,22119,22125,22126,22127,22128,22130,22131,22132,22133,22135,22136,22137,
+22138,22141,22142,22143,22144,22145,22146,22147,22148,22151,22152,22153,22154,
+22155,22156,22157,22160,22161,22162,22164,22165,22166,22167,22168,22169,22170,
+22171,22172,22173,22174,22175,22176,22177,22178,22180,22181,22182,22183,22184,
+22185,22186,22187,22188,22189,22190,22192,22193,22194,22195,22196,22197,22198,
+22200,22201,22202,22203,22205,22206,22207,22208,22209,
+22210,22211,22212,22213,22214,22215,22216,22217,22219,22220,22221,22222,22223,
+22224,22225,22226,22227,22229,22230,22232,22233,22236,22243,22245,22246,22247,
+22248,22249,22250,22252,22254,22255,22258,22259,22262,22263,22264,22267,22268,
+22272,22273,22274,22277,22279,22283,22284,22285,22286,22287,22288,22289,22290,
+22291,22292,22293,22294,22295,22296,22297,22298,22299,22301,22302,22304,22305,
+22306,22308,22309,22310,22311,22315,22321,22322,22324,22325,22326,22327,22328,
+22332,22333,22335,22337,22339,22340,22341,22342,22344,22345,22347,22354,22355,
+22356,22357,22358,22360,22361,22370,22371,22373,22375,22380,22382,22384,22385,
+22386,22388,22389,22392,22393,22394,22397,22398,22399,22400,22401,22407,22408,
+22409,22410,22413,22414,22415,22416,22417,22420,22421,22422,22423,22424,22425,
+22426,22428,22429,22430,22431,22437,22440,22442,22444,22447,22448,22449,22451,
+22453,22454,22455,22457,22458,22459,22460,22461,22462,22463,22464,22465,22468,
+22469,22470,22471,22472,22473,22474,22476,22477,22480,22481,22483,22486,22487,
+22491,22492,22494,22497,22498,22499,22501,22502,22503,22504,22505,22506,22507,
+22508,22510,22512,22513,22514,22515,22517,22518,22519,22523,22524,22526,22527,
+22529,22531,22532,22533,22536,22537,22538,22540,22542,22543,22544,22546,22547,
+22548,22550,22551,22552,22554,22555,22556,22557,22559,22562,22563,22565,22566,
+22567,22568,22569,22571,22572,22573,22574,22575,22577,22578,22579,22580,22582,
+22583,22584,22585,22586,22587,22588,22589,22590,22591,22592,22593,22594,22595,
+22597,22598,22599,22600,22601,22602,22603,22606,22607,
+22608,22610,22611,22613,22614,22615,22617,22618,22619,22620,22621,22623,22624,
+22625,22626,22627,22628,22630,22631,22632,22633,22634,22637,22638,22639,22640,
+22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,22652,22653,
+22655,22658,22660,22662,22663,22664,22666,22667,22668,22669,22670,22671,22672,
+22673,22676,22677,22678,22679,22680,22683,22684,22685,22688,22689,22690,22691,
+22692,22693,22694,22695,22698,22699,22700,22701,22702,22703,22704,22705,22706,
+22707,22708,22709,22710,22711,22712,22713,22714,22715,22717,22718,22719,22720,
+22722,22723,22724,22726,22727,22728,22729,22730,22731,22732,22733,22734,22735,
+22736,22738,22739,22740,22742,22743,22744,22745,22746,22747,22748,22749,22750,
+22751,22752,22753,22754,22755,22757,22758,22759,22760,22761,22762,22765,22767,
+22769,22770,22772,22773,22775,22776,22778,22779,22780,22781,22782,22783,22784,
+22785,22787,22789,22790,22792,22793,22794,22795,22796,22798,22800,22801,22802,
+22803,22807,22808,22811,22813,22814,22816,22817,22818,22819,22822,22824,22828,
+22832,22834,22835,22837,22838,22843,22845,22846,22847,22848,22851,22853,22854,
+22858,22860,22861,22864,22866,22867,22873,22875,22876,22877,22878,22879,22881,
+22883,22884,22886,22887,22888,22889,22890,22891,22892,22893,22894,22895,22896,
+22897,22898,22901,22903,22906,22907,22908,22910,22911,22912,22917,22921,22923,
+22924,22926,22927,22928,22929,22932,22933,22936,22938,22939,22940,22941,22943,
+22944,22945,22946,22950,22951,22956,22957,22960,22961,22963,22964,22965,22966,
+22967,22968,22970,22972,22973,22975,22976,22977,22978,
+22979,22980,22981,22983,22984,22985,22988,22989,22990,22991,22997,22998,23001,
+23003,23006,23007,23008,23009,23010,23012,23014,23015,23017,23018,23019,23021,
+23022,23023,23024,23025,23026,23027,23028,23029,23030,23031,23032,23034,23036,
+23037,23038,23040,23042,23050,23051,23053,23054,23055,23056,23058,23060,23061,
+23062,23063,23065,23066,23067,23069,23070,23073,23074,23076,23078,23079,23080,
+23082,23083,23084,23085,23086,23087,23088,23091,23093,23095,23096,23097,23098,
+23099,23101,23102,23103,23105,23106,23107,23108,23109,23111,23112,23115,23116,
+23117,23118,23119,23120,23121,23122,23123,23124,23126,23127,23128,23129,23131,
+23132,23133,23134,23135,23136,23137,23139,23140,23141,23142,23144,23145,23147,
+23148,23149,23150,23151,23152,23153,23154,23155,23160,23161,23163,23164,23165,
+23166,23168,23169,23170,23171,23172,23173,23174,23175,23176,23177,23178,23179,
+23180,23181,23182,23183,23184,23185,23187,23188,23189,23190,23191,23192,23193,
+23196,23197,23198,23199,23200,23201,23202,23203,23204,23205,23206,23207,23208,
+23209,23211,23212,23213,23214,23215,23216,23217,23220,23222,23223,23225,23226,
+23227,23228,23229,23231,23232,23235,23236,23237,23238,23239,23240,23242,23243,
+23245,23246,23247,23248,23249,23251,23253,23255,23257,23258,23259,23261,23262,
+23263,23266,23268,23269,23271,23272,23274,23276,23277,23278,23279,23280,23282,
+23283,23284,23285,23286,23287,23288,23289,23290,23291,23292,23293,23294,23295,
+23296,23297,23298,23299,23300,23301,23302,23303,23304,23306,23307,23308,23309,
+23310,23311,23312,23313,23314,23315,23316,23317,23320,
+23321,23322,23323,23324,23325,23326,23327,23328,23329,23330,23331,23332,23333,
+23334,23335,23336,23337,23338,23339,23340,23341,23342,23343,23344,23345,23347,
+23349,23350,23352,23353,23354,23355,23356,23357,23358,23359,23361,23362,23363,
+23364,23365,23366,23367,23368,23369,23370,23371,23372,23373,23374,23375,23378,
+23382,23390,23392,23393,23399,23400,23403,23405,23406,23407,23410,23412,23414,
+23415,23416,23417,23419,23420,23422,23423,23426,23430,23434,23437,23438,23440,
+23441,23442,23444,23446,23455,23463,23464,23465,23468,23469,23470,23471,23473,
+23474,23479,23482,23483,23484,23488,23489,23491,23496,23497,23498,23499,23501,
+23502,23503,23505,23508,23509,23510,23511,23512,23513,23514,23515,23516,23520,
+23522,23523,23526,23527,23529,23530,23531,23532,23533,23535,23537,23538,23539,
+23540,23541,23542,23543,23549,23550,23552,23554,23555,23557,23559,23560,23563,
+23564,23565,23566,23568,23570,23571,23575,23577,23579,23582,23583,23584,23585,
+23587,23590,23592,23593,23594,23595,23597,23598,23599,23600,23602,23603,23605,
+23606,23607,23619,23620,23622,23623,23628,23629,23634,23635,23636,23638,23639,
+23640,23642,23643,23644,23645,23647,23650,23652,23655,23656,23657,23658,23659,
+23660,23661,23664,23666,23667,23668,23669,23670,23671,23672,23675,23676,23677,
+23678,23680,23683,23684,23685,23686,23687,23689,23690,23691,23694,23695,23698,
+23699,23701,23709,23710,23711,23712,23713,23716,23717,23718,23719,23720,23722,
+23726,23727,23728,23730,23732,23734,23737,23738,23739,23740,23742,23744,23746,
+23747,23749,23750,23751,23752,23753,23754,23756,23757,
+23758,23759,23760,23761,23763,23764,23765,23766,23767,23768,23770,23771,23772,
+23773,23774,23775,23776,23778,23779,23783,23785,23787,23788,23790,23791,23793,
+23794,23795,23796,23797,23798,23799,23800,23801,23802,23804,23805,23806,23807,
+23808,23809,23812,23813,23816,23817,23818,23819,23820,23821,23823,23824,23825,
+23826,23827,23829,23831,23832,23833,23834,23836,23837,23839,23840,23841,23842,
+23843,23845,23848,23850,23851,23852,23855,23856,23857,23858,23859,23861,23862,
+23863,23864,23865,23866,23867,23868,23871,23872,23873,23874,23875,23876,23877,
+23878,23880,23881,23885,23886,23887,23888,23889,23890,23891,23892,23893,23894,
+23895,23897,23898,23900,23902,23903,23904,23905,23906,23907,23908,23909,23910,
+23911,23912,23914,23917,23918,23920,23921,23922,23923,23925,23926,23927,23928,
+23929,23930,23931,23932,23933,23934,23935,23936,23937,23939,23940,23941,23942,
+23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953,23954,23955,
+23956,23957,23958,23959,23960,23962,23963,23964,23966,23967,23968,23969,23970,
+23971,23972,23973,23974,23975,23976,23977,23978,23979,23980,23981,23982,23983,
+23984,23985,23986,23987,23988,23989,23990,23992,23993,23994,23995,23996,23997,
+23998,23999,24000,24001,24002,24003,24004,24006,24007,24008,24009,24010,24011,
+24012,24014,24015,24016,24017,24018,24019,24020,24021,24022,24023,24024,24025,
+24026,24028,24031,24032,24035,24036,24042,24044,24045,24048,24053,24054,24056,
+24057,24058,24059,24060,24063,24064,24068,24071,24073,24074,24075,24077,24078,
+24082,24083,24087,24094,24095,24096,24097,24098,24099,
+24100,24101,24104,24105,24106,24107,24108,24111,24112,24114,24115,24116,24117,
+24118,24121,24122,24126,24127,24128,24129,24131,24134,24135,24136,24137,24138,
+24139,24141,24142,24143,24144,24145,24146,24147,24150,24151,24152,24153,24154,
+24156,24157,24159,24160,24163,24164,24165,24166,24167,24168,24169,24170,24171,
+24172,24173,24174,24175,24176,24177,24181,24183,24185,24190,24193,24194,24195,
+24197,24200,24201,24204,24205,24206,24210,24216,24219,24221,24225,24226,24227,
+24228,24232,24233,24234,24235,24236,24238,24239,24240,24241,24242,24244,24250,
+24251,24252,24253,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264,
+24267,24268,24269,24270,24271,24272,24276,24277,24279,24280,24281,24282,24284,
+24285,24286,24287,24288,24289,24290,24291,24292,24293,24294,24295,24297,24299,
+24300,24301,24302,24303,24304,24305,24306,24307,24309,24312,24313,24315,24316,
+24317,24325,24326,24327,24329,24332,24333,24334,24336,24338,24340,24342,24345,
+24346,24348,24349,24350,24353,24354,24355,24356,24360,24363,24364,24366,24368,
+24370,24371,24372,24373,24374,24375,24376,24379,24381,24382,24383,24385,24386,
+24387,24388,24389,24390,24391,24392,24393,24394,24395,24396,24397,24398,24399,
+24401,24404,24409,24410,24411,24412,24414,24415,24416,24419,24421,24423,24424,
+24427,24430,24431,24434,24436,24437,24438,24440,24442,24445,24446,24447,24451,
+24454,24461,24462,24463,24465,24467,24468,24470,24474,24475,24477,24478,24479,
+24480,24482,24483,24484,24485,24486,24487,24489,24491,24492,24495,24496,24497,
+24498,24499,24500,24502,24504,24505,24506,24507,24510,
+24511,24512,24513,24514,24519,24520,24522,24523,24526,24531,24532,24533,24538,
+24539,24540,24542,24543,24546,24547,24549,24550,24552,24553,24556,24559,24560,
+24562,24563,24564,24566,24567,24569,24570,24572,24583,24584,24585,24587,24588,
+24592,24593,24595,24599,24600,24602,24606,24607,24610,24611,24612,24620,24621,
+24622,24624,24625,24626,24627,24628,24630,24631,24632,24633,24634,24637,24638,
+24640,24644,24645,24646,24647,24648,24649,24650,24652,24654,24655,24657,24659,
+24660,24662,24663,24664,24667,24668,24670,24671,24672,24673,24677,24678,24686,
+24689,24690,24692,24693,24695,24702,24704,24705,24706,24709,24710,24711,24712,
+24714,24715,24718,24719,24720,24721,24723,24725,24727,24728,24729,24732,24734,
+24737,24738,24740,24741,24743,24745,24746,24750,24752,24755,24757,24758,24759,
+24761,24762,24765,24766,24767,24768,24769,24770,24771,24772,24775,24776,24777,
+24780,24781,24782,24783,24784,24786,24787,24788,24790,24791,24793,24795,24798,
+24801,24802,24803,24804,24805,24810,24817,24818,24821,24823,24824,24827,24828,
+24829,24830,24831,24834,24835,24836,24837,24839,24842,24843,24844,24848,24849,
+24850,24851,24852,24854,24855,24856,24857,24859,24860,24861,24862,24865,24866,
+24869,24872,24873,24874,24876,24877,24878,24879,24880,24881,24882,24883,24884,
+24885,24886,24887,24888,24889,24890,24891,24892,24893,24894,24896,24897,24898,
+24899,24900,24901,24902,24903,24905,24907,24909,24911,24912,24914,24915,24916,
+24918,24919,24920,24921,24922,24923,24924,24926,24927,24928,24929,24931,24932,
+24933,24934,24937,24938,24939,24940,24941,24942,24943,
+24945,24946,24947,24948,24950,24952,24953,24954,24955,24956,24957,24958,24959,
+24960,24961,24962,24963,24964,24965,24966,24967,24968,24969,24970,24972,24973,
+24975,24976,24977,24978,24979,24981,24982,24983,24984,24985,24986,24987,24988,
+24990,24991,24992,24993,24994,24995,24996,24997,24998,25002,25003,25005,25006,
+25007,25008,25009,25010,25011,25012,25013,25014,25016,25017,25018,25019,25020,
+25021,25023,25024,25025,25027,25028,25029,25030,25031,25033,25036,25037,25038,
+25039,25040,25043,25045,25046,25047,25048,25049,25050,25051,25052,25053,25054,
+25055,25056,25057,25058,25059,25060,25061,25063,25064,25065,25066,25067,25068,
+25069,25070,25071,25072,25073,25074,25075,25076,25078,25079,25080,25081,25082,
+25083,25084,25085,25086,25088,25089,25090,25091,25092,25093,25095,25097,25107,
+25108,25113,25116,25117,25118,25120,25123,25126,25127,25128,25129,25131,25133,
+25135,25136,25137,25138,25141,25142,25144,25145,25146,25147,25148,25154,25156,
+25157,25158,25162,25167,25168,25173,25174,25175,25177,25178,25180,25181,25182,
+25183,25184,25185,25186,25188,25189,25192,25201,25202,25204,25205,25207,25208,
+25210,25211,25213,25217,25218,25219,25221,25222,25223,25224,25227,25228,25229,
+25230,25231,25232,25236,25241,25244,25245,25246,25251,25254,25255,25257,25258,
+25261,25262,25263,25264,25266,25267,25268,25270,25271,25272,25274,25278,25280,
+25281,25283,25291,25295,25297,25301,25309,25310,25312,25313,25316,25322,25323,
+25328,25330,25333,25336,25337,25338,25339,25344,25347,25348,25349,25350,25354,
+25355,25356,25357,25359,25360,25362,25363,25364,25365,
+25367,25368,25369,25372,25382,25383,25385,25388,25389,25390,25392,25393,25395,
+25396,25397,25398,25399,25400,25403,25404,25406,25407,25408,25409,25412,25415,
+25416,25418,25425,25426,25427,25428,25430,25431,25432,25433,25434,25435,25436,
+25437,25440,25444,25445,25446,25448,25450,25451,25452,25455,25456,25458,25459,
+25460,25461,25464,25465,25468,25469,25470,25471,25473,25475,25476,25477,25478,
+25483,25485,25489,25491,25492,25493,25495,25497,25498,25499,25500,25501,25502,
+25503,25505,25508,25510,25515,25519,25521,25522,25525,25526,25529,25531,25533,
+25535,25536,25537,25538,25539,25541,25543,25544,25546,25547,25548,25553,25555,
+25556,25557,25559,25560,25561,25562,25563,25564,25565,25567,25570,25572,25573,
+25574,25575,25576,25579,25580,25582,25583,25584,25585,25587,25589,25591,25593,
+25594,25595,25596,25598,25603,25604,25606,25607,25608,25609,25610,25613,25614,
+25617,25618,25621,25622,25623,25624,25625,25626,25629,25631,25634,25635,25636,
+25637,25639,25640,25641,25643,25646,25647,25648,25649,25650,25651,25653,25654,
+25655,25656,25657,25659,25660,25662,25664,25666,25667,25673,25675,25676,25677,
+25678,25679,25680,25681,25683,25685,25686,25687,25689,25690,25691,25692,25693,
+25695,25696,25697,25698,25699,25700,25701,25702,25704,25706,25707,25708,25710,
+25711,25712,25713,25714,25715,25716,25717,25718,25719,25723,25724,25725,25726,
+25727,25728,25729,25731,25734,25736,25737,25738,25739,25740,25741,25742,25743,
+25744,25747,25748,25751,25752,25754,25755,25756,25757,25759,25760,25761,25762,
+25763,25765,25766,25767,25768,25770,25771,25775,25777,
+25778,25779,25780,25782,25785,25787,25789,25790,25791,25793,25795,25796,25798,
+25799,25800,25801,25802,25803,25804,25807,25809,25811,25812,25813,25814,25817,
+25818,25819,25820,25821,25823,25824,25825,25827,25829,25831,25832,25833,25834,
+25835,25836,25837,25838,25839,25840,25841,25842,25843,25844,25845,25846,25847,
+25848,25849,25850,25851,25852,25853,25854,25855,25857,25858,25859,25860,25861,
+25862,25863,25864,25866,25867,25868,25869,25870,25871,25872,25873,25875,25876,
+25877,25878,25879,25881,25882,25883,25884,25885,25886,25887,25888,25889,25890,
+25891,25892,25894,25895,25896,25897,25898,25900,25901,25904,25905,25906,25907,
+25911,25914,25916,25917,25920,25921,25922,25923,25924,25926,25927,25930,25931,
+25933,25934,25936,25938,25939,25940,25943,25944,25946,25948,25951,25952,25953,
+25956,25957,25959,25960,25961,25962,25965,25966,25967,25969,25971,25973,25974,
+25976,25977,25978,25979,25980,25981,25982,25983,25984,25985,25986,25987,25988,
+25989,25990,25992,25993,25994,25997,25998,25999,26002,26004,26005,26006,26008,
+26010,26013,26014,26016,26018,26019,26022,26024,26026,26028,26030,26033,26034,
+26035,26036,26037,26038,26039,26040,26042,26043,26046,26047,26048,26050,26055,
+26056,26057,26058,26061,26064,26065,26067,26068,26069,26072,26073,26074,26075,
+26076,26077,26078,26079,26081,26083,26084,26090,26091,26098,26099,26100,26101,
+26104,26105,26107,26108,26109,26110,26111,26113,26116,26117,26119,26120,26121,
+26123,26125,26128,26129,26130,26134,26135,26136,26138,26139,26140,26142,26145,
+26146,26147,26148,26150,26153,26154,26155,26156,26158,
+26160,26162,26163,26167,26168,26169,26170,26171,26173,26175,26176,26178,26180,
+26181,26182,26183,26184,26185,26186,26189,26190,26192,26193,26200,26201,26203,
+26204,26205,26206,26208,26210,26211,26213,26215,26217,26218,26219,26220,26221,
+26225,26226,26227,26229,26232,26233,26235,26236,26237,26239,26240,26241,26243,
+26245,26246,26248,26249,26250,26251,26253,26254,26255,26256,26258,26259,26260,
+26261,26264,26265,26266,26267,26268,26270,26271,26272,26273,26274,26275,26276,
+26277,26278,26281,26282,26283,26284,26285,26287,26288,26289,26290,26291,26293,
+26294,26295,26296,26298,26299,26300,26301,26303,26304,26305,26306,26307,26308,
+26309,26310,26311,26312,26313,26314,26315,26316,26317,26318,26319,26320,26321,
+26322,26323,26324,26325,26326,26327,26328,26330,26334,26335,26336,26337,26338,
+26339,26340,26341,26343,26344,26346,26347,26348,26349,26350,26351,26353,26357,
+26358,26360,26362,26363,26365,26369,26370,26371,26372,26373,26374,26375,26380,
+26382,26383,26385,26386,26387,26390,26392,26393,26394,26396,26398,26400,26401,
+26402,26403,26404,26405,26407,26409,26414,26416,26418,26419,26422,26423,26424,
+26425,26427,26428,26430,26431,26433,26436,26437,26439,26442,26443,26445,26450,
+26452,26453,26455,26456,26457,26458,26459,26461,26466,26467,26468,26470,26471,
+26475,26476,26478,26481,26484,26486,26488,26489,26490,26491,26493,26496,26498,
+26499,26501,26502,26504,26506,26508,26509,26510,26511,26513,26514,26515,26516,
+26518,26521,26523,26527,26528,26529,26532,26534,26537,26540,26542,26545,26546,
+26548,26553,26554,26555,26556,26557,26558,26559,26560,
+26562,26565,26566,26567,26568,26569,26570,26571,26572,26573,26574,26581,26582,
+26583,26587,26591,26593,26595,26596,26598,26599,26600,26602,26603,26605,26606,
+26610,26613,26614,26615,26616,26617,26618,26619,26620,26622,26625,26626,26627,
+26628,26630,26637,26640,26642,26644,26645,26648,26649,26650,26651,26652,26654,
+26655,26656,26658,26659,26660,26661,26662,26663,26664,26667,26668,26669,26670,
+26671,26672,26673,26676,26677,26678,26682,26683,26687,26695,26699,26701,26703,
+26706,26710,26711,26712,26713,26714,26715,26716,26717,26718,26719,26730,26732,
+26733,26734,26735,26736,26737,26738,26739,26741,26744,26745,26746,26747,26748,
+26749,26750,26751,26752,26754,26756,26759,26760,26761,26762,26763,26764,26765,
+26766,26768,26769,26770,26772,26773,26774,26776,26777,26778,26779,26780,26781,
+26782,26783,26784,26785,26787,26788,26789,26793,26794,26795,26796,26798,26801,
+26802,26804,26806,26807,26808,26809,26810,26811,26812,26813,26814,26815,26817,
+26819,26820,26821,26822,26823,26824,26826,26828,26830,26831,26832,26833,26835,
+26836,26838,26839,26841,26843,26844,26845,26846,26847,26849,26850,26852,26853,
+26854,26855,26856,26857,26858,26859,26860,26861,26863,26866,26867,26868,26870,
+26871,26872,26875,26877,26878,26879,26880,26882,26883,26884,26886,26887,26888,
+26889,26890,26892,26895,26897,26899,26900,26901,26902,26903,26904,26905,26906,
+26907,26908,26909,26910,26913,26914,26915,26917,26918,26919,26920,26921,26922,
+26923,26924,26926,26927,26929,26930,26931,26933,26934,26935,26936,26938,26939,
+26940,26942,26944,26945,26947,26948,26949,26950,26951,
+26952,26953,26954,26955,26956,26957,26958,26959,26960,26961,26962,26963,26965,
+26966,26968,26969,26971,26972,26975,26977,26978,26980,26981,26983,26984,26985,
+26986,26988,26989,26991,26992,26994,26995,26996,26997,26998,27002,27003,27005,
+27006,27007,27009,27011,27013,27018,27019,27020,27022,27023,27024,27025,27026,
+27027,27030,27031,27033,27034,27037,27038,27039,27040,27041,27042,27043,27044,
+27045,27046,27049,27050,27052,27054,27055,27056,27058,27059,27061,27062,27064,
+27065,27066,27068,27069,27070,27071,27072,27074,27075,27076,27077,27078,27079,
+27080,27081,27083,27085,27087,27089,27090,27091,27093,27094,27095,27096,27097,
+27098,27100,27101,27102,27105,27106,27107,27108,27109,27110,27111,27112,27113,
+27114,27115,27116,27118,27119,27120,27121,27123,27124,27125,27126,27127,27128,
+27129,27130,27131,27132,27134,27136,27137,27138,27139,27140,27141,27142,27143,
+27144,27145,27147,27148,27149,27150,27151,27152,27153,27154,27155,27156,27157,
+27158,27161,27162,27163,27164,27165,27166,27168,27170,27171,27172,27173,27174,
+27175,27177,27179,27180,27181,27182,27184,27186,27187,27188,27190,27191,27192,
+27193,27194,27195,27196,27199,27200,27201,27202,27203,27205,27206,27208,27209,
+27210,27211,27212,27213,27214,27215,27217,27218,27219,27220,27221,27222,27223,
+27226,27228,27229,27230,27231,27232,27234,27235,27236,27238,27239,27240,27241,
+27242,27243,27244,27245,27246,27247,27248,27250,27251,27252,27253,27254,27255,
+27256,27258,27259,27261,27262,27263,27265,27266,27267,27269,27270,27271,27272,
+27273,27274,27275,27276,27277,27279,27282,27283,27284,
+27285,27286,27288,27289,27290,27291,27292,27293,27294,27295,27297,27298,27299,
+27300,27301,27302,27303,27304,27306,27309,27310,27311,27312,27313,27314,27315,
+27316,27317,27318,27319,27320,27321,27322,27323,27324,27325,27326,27327,27328,
+27329,27330,27331,27332,27333,27334,27335,27336,27337,27338,27339,27340,27341,
+27342,27343,27344,27345,27346,27347,27348,27349,27350,27351,27352,27353,27354,
+27355,27356,27357,27358,27359,27360,27361,27362,27363,27364,27365,27366,27367,
+27368,27369,27370,27371,27372,27373,27374,27375,27376,27377,27378,27379,27380,
+27381,27382,27383,27384,27385,27386,27387,27388,27389,27390,27391,27392,27393,
+27394,27395,27396,27397,27398,27399,27400,27401,27402,27403,27404,27405,27406,
+27407,27408,27409,27410,27411,27412,27413,27414,27415,27416,27417,27418,27419,
+27420,27421,27422,27423,27429,27430,27432,27433,27434,27435,27436,27437,27438,
+27439,27440,27441,27443,27444,27445,27446,27448,27451,27452,27453,27455,27456,
+27457,27458,27460,27461,27464,27466,27467,27469,27470,27471,27472,27473,27474,
+27475,27476,27477,27478,27479,27480,27482,27483,27484,27485,27486,27487,27488,
+27489,27496,27497,27499,27500,27501,27502,27503,27504,27505,27506,27507,27508,
+27509,27510,27511,27512,27514,27517,27518,27519,27520,27525,27528,27532,27534,
+27535,27536,27537,27540,27541,27543,27544,27545,27548,27549,27550,27551,27552,
+27554,27555,27556,27557,27558,27559,27560,27561,27563,27564,27565,27566,27567,
+27568,27569,27570,27574,27576,27577,27578,27579,27580,27581,27582,27584,27587,
+27588,27590,27591,27592,27593,27594,27596,27598,27600,
+27601,27608,27610,27612,27613,27614,27615,27616,27618,27619,27620,27621,27622,
+27623,27624,27625,27628,27629,27630,27632,27633,27634,27636,27638,27639,27640,
+27642,27643,27644,27646,27647,27648,27649,27650,27651,27652,27656,27657,27658,
+27659,27660,27662,27666,27671,27676,27677,27678,27680,27683,27685,27691,27692,
+27693,27697,27699,27702,27703,27705,27706,27707,27708,27710,27711,27715,27716,
+27717,27720,27723,27724,27725,27726,27727,27729,27730,27731,27734,27736,27737,
+27738,27746,27747,27749,27750,27751,27755,27756,27757,27758,27759,27761,27763,
+27765,27767,27768,27770,27771,27772,27775,27776,27780,27783,27786,27787,27789,
+27790,27793,27794,27797,27798,27799,27800,27802,27804,27805,27806,27808,27810,
+27816,27820,27823,27824,27828,27829,27830,27831,27834,27840,27841,27842,27843,
+27846,27847,27848,27851,27853,27854,27855,27857,27858,27864,27865,27866,27868,
+27869,27871,27876,27878,27879,27881,27884,27885,27890,27892,27897,27903,27904,
+27906,27907,27909,27910,27912,27913,27914,27917,27919,27920,27921,27923,27924,
+27925,27926,27928,27932,27933,27935,27936,27937,27938,27939,27940,27942,27944,
+27945,27948,27949,27951,27952,27956,27958,27959,27960,27962,27967,27968,27970,
+27972,27977,27980,27984,27989,27990,27991,27992,27995,27997,27999,28001,28002,
+28004,28005,28007,28008,28011,28012,28013,28016,28017,28018,28019,28021,28022,
+28025,28026,28027,28029,28030,28031,28032,28033,28035,28036,28038,28039,28042,
+28043,28045,28047,28048,28050,28054,28055,28056,28057,28058,28060,28066,28069,
+28076,28077,28080,28081,28083,28084,28086,28087,28089,
+28090,28091,28092,28093,28094,28097,28098,28099,28104,28105,28106,28109,28110,
+28111,28112,28114,28115,28116,28117,28119,28122,28123,28124,28127,28130,28131,
+28133,28135,28136,28137,28138,28141,28143,28144,28146,28148,28149,28150,28152,
+28154,28157,28158,28159,28160,28161,28162,28163,28164,28166,28167,28168,28169,
+28171,28175,28178,28179,28181,28184,28185,28187,28188,28190,28191,28194,28198,
+28199,28200,28202,28204,28206,28208,28209,28211,28213,28214,28215,28217,28219,
+28220,28221,28222,28223,28224,28225,28226,28229,28230,28231,28232,28233,28234,
+28235,28236,28239,28240,28241,28242,28245,28247,28249,28250,28252,28253,28254,
+28256,28257,28258,28259,28260,28261,28262,28263,28264,28265,28266,28268,28269,
+28271,28272,28273,28274,28275,28276,28277,28278,28279,28280,28281,28282,28283,
+28284,28285,28288,28289,28290,28292,28295,28296,28298,28299,28300,28301,28302,
+28305,28306,28307,28308,28309,28310,28311,28313,28314,28315,28317,28318,28320,
+28321,28323,28324,28326,28328,28329,28331,28332,28333,28334,28336,28339,28341,
+28344,28345,28348,28350,28351,28352,28355,28356,28357,28358,28360,28361,28362,
+28364,28365,28366,28368,28370,28374,28376,28377,28379,28380,28381,28387,28391,
+28394,28395,28396,28397,28398,28399,28400,28401,28402,28403,28405,28406,28407,
+28408,28410,28411,28412,28413,28414,28415,28416,28417,28419,28420,28421,28423,
+28424,28426,28427,28428,28429,28430,28432,28433,28434,28438,28439,28440,28441,
+28442,28443,28444,28445,28446,28447,28449,28450,28451,28453,28454,28455,28456,
+28460,28462,28464,28466,28468,28469,28471,28472,28473,
+28474,28475,28476,28477,28479,28480,28481,28482,28483,28484,28485,28488,28489,
+28490,28492,28494,28495,28496,28497,28498,28499,28500,28501,28502,28503,28505,
+28506,28507,28509,28511,28512,28513,28515,28516,28517,28519,28520,28521,28522,
+28523,28524,28527,28528,28529,28531,28533,28534,28535,28537,28539,28541,28542,
+28543,28544,28545,28546,28547,28549,28550,28551,28554,28555,28559,28560,28561,
+28562,28563,28564,28565,28566,28567,28568,28569,28570,28571,28573,28574,28575,
+28576,28578,28579,28580,28581,28582,28584,28585,28586,28587,28588,28589,28590,
+28591,28592,28593,28594,28596,28597,28599,28600,28602,28603,28604,28605,28606,
+28607,28609,28611,28612,28613,28614,28615,28616,28618,28619,28620,28621,28622,
+28623,28624,28627,28628,28629,28630,28631,28632,28633,28634,28635,28636,28637,
+28639,28642,28643,28644,28645,28646,28647,28648,28649,28650,28651,28652,28653,
+28656,28657,28658,28659,28660,28661,28662,28663,28664,28665,28666,28667,28668,
+28669,28670,28671,28672,28673,28674,28675,28676,28677,28678,28679,28680,28681,
+28682,28683,28684,28685,28686,28687,28688,28690,28691,28692,28693,28694,28695,
+28696,28697,28700,28701,28702,28703,28704,28705,28706,28708,28709,28710,28711,
+28712,28713,28714,28715,28716,28717,28718,28719,28720,28721,28722,28723,28724,
+28726,28727,28728,28730,28731,28732,28733,28734,28735,28736,28737,28738,28739,
+28740,28741,28742,28743,28744,28745,28746,28747,28749,28750,28752,28753,28754,
+28755,28756,28757,28758,28759,28760,28761,28762,28763,28764,28765,28767,28768,
+28769,28770,28771,28772,28773,28774,28775,28776,28777,
+28778,28782,28785,28786,28787,28788,28791,28793,28794,28795,28797,28801,28802,
+28803,28804,28806,28807,28808,28811,28812,28813,28815,28816,28817,28819,28823,
+28824,28826,28827,28830,28831,28832,28833,28834,28835,28836,28837,28838,28839,
+28840,28841,28842,28848,28850,28852,28853,28854,28858,28862,28863,28868,28869,
+28870,28871,28873,28875,28876,28877,28878,28879,28880,28881,28882,28883,28884,
+28885,28886,28887,28890,28892,28893,28894,28896,28897,28898,28899,28901,28906,
+28910,28912,28913,28914,28915,28916,28917,28918,28920,28922,28923,28924,28926,
+28927,28928,28929,28930,28931,28932,28933,28934,28935,28936,28939,28940,28941,
+28942,28943,28945,28946,28948,28951,28955,28956,28957,28958,28959,28960,28961,
+28962,28963,28964,28965,28967,28968,28969,28970,28971,28972,28973,28974,28978,
+28979,28980,28981,28983,28984,28985,28986,28987,28988,28989,28990,28991,28992,
+28993,28994,28995,28996,28998,28999,29000,29001,29003,29005,29007,29008,29009,
+29010,29011,29012,29013,29014,29015,29016,29017,29018,29019,29021,29023,29024,
+29025,29026,29027,29029,29033,29034,29035,29036,29037,29039,29040,29041,29044,
+29045,29046,29047,29049,29051,29052,29054,29055,29056,29057,29058,29059,29061,
+29062,29063,29064,29065,29067,29068,29069,29070,29072,29073,29074,29075,29077,
+29078,29079,29082,29083,29084,29085,29086,29089,29090,29091,29092,29093,29094,
+29095,29097,29098,29099,29101,29102,29103,29104,29105,29106,29108,29110,29111,
+29112,29114,29115,29116,29117,29118,29119,29120,29121,29122,29124,29125,29126,
+29127,29128,29129,29130,29131,29132,29133,29135,29136,
+29137,29138,29139,29142,29143,29144,29145,29146,29147,29148,29149,29150,29151,
+29153,29154,29155,29156,29158,29160,29161,29162,29163,29164,29165,29167,29168,
+29169,29170,29171,29172,29173,29174,29175,29176,29178,29179,29180,29181,29182,
+29183,29184,29185,29186,29187,29188,29189,29191,29192,29193,29194,29195,29196,
+29197,29198,29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209,
+29210,29211,29212,29214,29215,29216,29217,29218,29219,29220,29221,29222,29223,
+29225,29227,29229,29230,29231,29234,29235,29236,29242,29244,29246,29248,29249,
+29250,29251,29252,29253,29254,29257,29258,29259,29262,29263,29264,29265,29267,
+29268,29269,29271,29272,29274,29276,29278,29280,29283,29284,29285,29288,29290,
+29291,29292,29293,29296,29297,29299,29300,29302,29303,29304,29307,29308,29309,
+29314,29315,29317,29318,29319,29320,29321,29324,29326,29328,29329,29331,29332,
+29333,29334,29335,29336,29337,29338,29339,29340,29341,29342,29344,29345,29346,
+29347,29348,29349,29350,29351,29352,29353,29354,29355,29358,29361,29362,29363,
+29365,29370,29371,29372,29373,29374,29375,29376,29381,29382,29383,29385,29386,
+29387,29388,29391,29393,29395,29396,29397,29398,29400,29402,29403,58566,58567,
+58568,58569,58570,58571,58572,58573,58574,58575,58576,58577,58578,58579,58580,
+58581,58582,58583,58584,58585,58586,58587,58588,58589,58590,58591,58592,58593,
+58594,58595,58596,58597,58598,58599,58600,58601,58602,58603,58604,58605,58606,
+58607,58608,58609,58610,58611,58612,58613,58614,58615,58616,58617,58618,58619,
+58620,58621,58622,58623,58624,58625,58626,58627,58628,
+58629,58630,58631,58632,58633,58634,58635,58636,58637,58638,58639,58640,58641,
+58642,58643,58644,58645,58646,58647,58648,58649,58650,58651,58652,58653,58654,
+58655,58656,58657,58658,58659,58660,58661,12288,12289,12290,183,713,711,168,
+12291,12293,8212,65374,8214,8230,8216,8217,8220,8221,12308,12309,12296,12297,
+12298,12299,12300,12301,12302,12303,12310,12311,12304,12305,177,215,247,8758,
+8743,8744,8721,8719,8746,8745,8712,8759,8730,8869,8741,8736,8978,8857,8747,
+8750,8801,8780,8776,8765,8733,8800,8814,8815,8804,8805,8734,8757,8756,9794,
+9792,176,8242,8243,8451,65284,164,65504,65505,8240,167,8470,9734,9733,9675,
+9679,9678,9671,9670,9633,9632,9651,9650,8251,8594,8592,8593,8595,12307,58662,
+58663,58664,58665,58666,58667,58668,58669,58670,58671,58672,58673,58674,58675,
+58676,58677,58678,58679,58680,58681,58682,58683,58684,58685,58686,58687,58688,
+58689,58690,58691,58692,58693,58694,58695,58696,58697,58698,58699,58700,58701,
+58702,58703,58704,58705,58706,58707,58708,58709,58710,58711,58712,58713,58714,
+58715,58716,58717,58718,58719,58720,58721,58722,58723,58724,58725,58726,58727,
+58728,58729,58730,58731,58732,58733,58734,58735,58736,58737,58738,58739,58740,
+58741,58742,58743,58744,58745,58746,58747,58748,58749,58750,58751,58752,58753,
+58754,58755,58756,58757,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,
+59238,59239,59240,59241,59242,59243,9352,9353,9354,9355,9356,9357,9358,9359,
+9360,9361,9362,9363,9364,9365,9366,9367,9368,
+9369,9370,9371,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,
+9344,9345,9346,9347,9348,9349,9350,9351,9312,9313,9314,9315,9316,9317,9318,
+9319,9320,9321,8364,59245,12832,12833,12834,12835,12836,12837,12838,12839,
+12840,12841,59246,59247,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,
+8554,8555,59248,59249,58758,58759,58760,58761,58762,58763,58764,58765,58766,
+58767,58768,58769,58770,58771,58772,58773,58774,58775,58776,58777,58778,58779,
+58780,58781,58782,58783,58784,58785,58786,58787,58788,58789,58790,58791,58792,
+58793,58794,58795,58796,58797,58798,58799,58800,58801,58802,58803,58804,58805,
+58806,58807,58808,58809,58810,58811,58812,58813,58814,58815,58816,58817,58818,
+58819,58820,58821,58822,58823,58824,58825,58826,58827,58828,58829,58830,58831,
+58832,58833,58834,58835,58836,58837,58838,58839,58840,58841,58842,58843,58844,
+58845,58846,58847,58848,58849,58850,58851,58852,58853,65281,65282,65283,65509,
+65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,
+65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,
+65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,
+65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,
+65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348,65349,
+65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,
+65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,58854,
+58855,58856,58857,58858,
+58859,58860,58861,58862,58863,58864,58865,58866,58867,58868,58869,58870,58871,
+58872,58873,58874,58875,58876,58877,58878,58879,58880,58881,58882,58883,58884,
+58885,58886,58887,58888,58889,58890,58891,58892,58893,58894,58895,58896,58897,
+58898,58899,58900,58901,58902,58903,58904,58905,58906,58907,58908,58909,58910,
+58911,58912,58913,58914,58915,58916,58917,58918,58919,58920,58921,58922,58923,
+58924,58925,58926,58927,58928,58929,58930,58931,58932,58933,58934,58935,58936,
+58937,58938,58939,58940,58941,58942,58943,58944,58945,58946,58947,58948,58949,
+12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,
+12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,
+12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,
+12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,
+12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,
+12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,
+12431,12432,12433,12434,12435,59250,59251,59252,59253,59254,59255,59256,59257,
+59258,59259,59260,58950,58951,58952,58953,58954,58955,58956,58957,58958,58959,
+58960,58961,58962,58963,58964,58965,58966,58967,58968,58969,58970,58971,58972,
+58973,58974,58975,58976,58977,58978,58979,58980,58981,58982,58983,58984,58985,
+58986,58987,58988,58989,58990,58991,58992,58993,58994,58995,58996,58997,58998,
+58999,59000,59001,59002,59003,59004,59005,59006,59007,59008,59009,59010,59011,
+59012,59013,59014,59015,59016,59017,59018,59019,59020,
+59021,59022,59023,59024,59025,59026,59027,59028,59029,59030,59031,59032,59033,
+59034,59035,59036,59037,59038,59039,59040,59041,59042,59043,59044,59045,12449,
+12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,
+12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,
+12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,
+12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,
+12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,
+12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,
+12528,12529,12530,12531,12532,12533,12534,59261,59262,59263,59264,59265,59266,
+59267,59268,59046,59047,59048,59049,59050,59051,59052,59053,59054,59055,59056,
+59057,59058,59059,59060,59061,59062,59063,59064,59065,59066,59067,59068,59069,
+59070,59071,59072,59073,59074,59075,59076,59077,59078,59079,59080,59081,59082,
+59083,59084,59085,59086,59087,59088,59089,59090,59091,59092,59093,59094,59095,
+59096,59097,59098,59099,59100,59101,59102,59103,59104,59105,59106,59107,59108,
+59109,59110,59111,59112,59113,59114,59115,59116,59117,59118,59119,59120,59121,
+59122,59123,59124,59125,59126,59127,59128,59129,59130,59131,59132,59133,59134,
+59135,59136,59137,59138,59139,59140,59141,913,914,915,916,917,918,919,920,921,
+922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,59269,59270,59271,
+59272,59273,59274,59275,59276,945,946,947,948,949,950,951,952,953,
+954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,59277,59278,59279,
+59280,59281,59282,59283,65077,65078,65081,65082,65087,65088,65085,65086,65089,
+65090,65091,65092,59284,59285,65083,65084,65079,65080,65073,59286,65075,65076,
+59287,59288,59289,59290,59291,59292,59293,59294,59295,59142,59143,59144,59145,
+59146,59147,59148,59149,59150,59151,59152,59153,59154,59155,59156,59157,59158,
+59159,59160,59161,59162,59163,59164,59165,59166,59167,59168,59169,59170,59171,
+59172,59173,59174,59175,59176,59177,59178,59179,59180,59181,59182,59183,59184,
+59185,59186,59187,59188,59189,59190,59191,59192,59193,59194,59195,59196,59197,
+59198,59199,59200,59201,59202,59203,59204,59205,59206,59207,59208,59209,59210,
+59211,59212,59213,59214,59215,59216,59217,59218,59219,59220,59221,59222,59223,
+59224,59225,59226,59227,59228,59229,59230,59231,59232,59233,59234,59235,59236,
+59237,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,
+1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,
+1068,1069,1070,1071,59296,59297,59298,59299,59300,59301,59302,59303,59304,
+59305,59306,59307,59308,59309,59310,1072,1073,1074,1075,1076,1077,1105,1078,
+1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,
+1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,59311,59312,59313,59314,
+59315,59316,59317,59318,59319,59320,59321,59322,59323,714,715,729,8211,8213,
+8229,8245,8453,8457,8598,8599,8600,8601,
+8725,8735,8739,8786,8806,8807,8895,9552,9553,9554,9555,9556,9557,9558,9559,
+9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,
+9575,9576,9577,9578,9579,9580,9581,9582,9583,9584,9585,9586,9587,9601,9602,
+9603,9604,9605,9606,9607,9608,9609,9610,9611,9612,9613,9614,9615,9619,9620,
+9621,9660,9661,9698,9699,9700,9701,9737,8853,12306,12317,12318,59324,59325,
+59326,59327,59328,59329,59330,59331,59332,59333,59334,257,225,462,224,275,233,
+283,232,299,237,464,236,333,243,466,242,363,250,468,249,470,472,474,476,252,
+234,593,59335,324,328,505,609,59337,59338,59339,59340,12549,12550,12551,12552,
+12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,
+12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,12578,
+12579,12580,12581,12582,12583,12584,12585,59341,59342,59343,59344,59345,59346,
+59347,59348,59349,59350,59351,59352,59353,59354,59355,59356,59357,59358,59359,
+59360,59361,12321,12322,12323,12324,12325,12326,12327,12328,12329,12963,13198,
+13199,13212,13213,13214,13217,13252,13262,13265,13266,13269,65072,65506,65508,
+59362,8481,12849,59363,8208,59364,59365,59366,12540,12443,12444,12541,12542,
+12294,12445,12446,65097,65098,65099,65100,65101,65102,65103,65104,65105,65106,
+65108,65109,65110,65111,65113,65114,65115,65116,65117,65118,65119,65120,65121,
+65122,65123,65124,65125,65126,65128,65129,65130,65131,12350,12272,12273,12274,
+12275,12276,12277,
+12278,12279,12280,12281,12282,12283,12295,59380,59381,59382,59383,59384,59385,
+59386,59387,59388,59389,59390,59391,59392,9472,9473,9474,9475,9476,9477,9478,
+9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,9489,9490,9491,9492,9493,
+9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506,9507,9508,
+9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,9521,9522,9523,
+9524,9525,9526,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536,9537,9538,
+9539,9540,9541,9542,9543,9544,9545,9546,9547,59393,59394,59395,59396,59397,
+59398,59399,59400,59401,59402,59403,59404,59405,59406,59407,29404,29405,29407,
+29410,29411,29412,29413,29414,29415,29418,29419,29429,29430,29433,29437,29438,
+29439,29440,29442,29444,29445,29446,29447,29448,29449,29451,29452,29453,29455,
+29456,29457,29458,29460,29464,29465,29466,29471,29472,29475,29476,29478,29479,
+29480,29485,29487,29488,29490,29491,29493,29494,29498,29499,29500,29501,29504,
+29505,29506,29507,29508,29509,29510,29511,29512,29513,29514,29515,29516,29518,
+29519,29521,29523,29524,29525,29526,29528,29529,29530,29531,29532,29533,29534,
+29535,29537,29538,29539,29540,29541,29542,29543,29544,29545,29546,29547,29550,
+29552,29553,57344,57345,57346,57347,57348,57349,57350,57351,57352,57353,57354,
+57355,57356,57357,57358,57359,57360,57361,57362,57363,57364,57365,57366,57367,
+57368,57369,57370,57371,57372,57373,57374,57375,57376,57377,57378,57379,57380,
+57381,57382,57383,57384,57385,57386,57387,57388,57389,57390,57391,57392,
+57393,57394,57395,57396,57397,57398,57399,57400,57401,57402,57403,57404,57405,
+57406,57407,57408,57409,57410,57411,57412,57413,57414,57415,57416,57417,57418,
+57419,57420,57421,57422,57423,57424,57425,57426,57427,57428,57429,57430,57431,
+57432,57433,57434,57435,57436,57437,29554,29555,29556,29557,29558,29559,29560,
+29561,29562,29563,29564,29565,29567,29568,29569,29570,29571,29573,29574,29576,
+29578,29580,29581,29583,29584,29586,29587,29588,29589,29591,29592,29593,29594,
+29596,29597,29598,29600,29601,29603,29604,29605,29606,29607,29608,29610,29612,
+29613,29617,29620,29621,29622,29624,29625,29628,29629,29630,29631,29633,29635,
+29636,29637,29638,29639,29643,29644,29646,29650,29651,29652,29653,29654,29655,
+29656,29658,29659,29660,29661,29663,29665,29666,29667,29668,29670,29672,29674,
+29675,29676,29678,29679,29680,29681,29683,29684,29685,29686,29687,57438,57439,
+57440,57441,57442,57443,57444,57445,57446,57447,57448,57449,57450,57451,57452,
+57453,57454,57455,57456,57457,57458,57459,57460,57461,57462,57463,57464,57465,
+57466,57467,57468,57469,57470,57471,57472,57473,57474,57475,57476,57477,57478,
+57479,57480,57481,57482,57483,57484,57485,57486,57487,57488,57489,57490,57491,
+57492,57493,57494,57495,57496,57497,57498,57499,57500,57501,57502,57503,57504,
+57505,57506,57507,57508,57509,57510,57511,57512,57513,57514,57515,57516,57517,
+57518,57519,57520,57521,57522,57523,57524,57525,57526,57527,57528,57529,57530,
+57531,29688,29689,29690,29691,29692,29693,29694,29695,29696,29697,29698,29700,
+29703,29704,29707,29708,29709,29710,29713,29714,29715,
+29716,29717,29718,29719,29720,29721,29724,29725,29726,29727,29728,29729,29731,
+29732,29735,29737,29739,29741,29743,29745,29746,29751,29752,29753,29754,29755,
+29757,29758,29759,29760,29762,29763,29764,29765,29766,29767,29768,29769,29770,
+29771,29772,29773,29774,29775,29776,29777,29778,29779,29780,29782,29784,29789,
+29792,29793,29794,29795,29796,29797,29798,29799,29800,29801,29802,29803,29804,
+29806,29807,29809,29810,29811,29812,29813,29816,29817,29818,57532,57533,57534,
+57535,57536,57537,57538,57539,57540,57541,57542,57543,57544,57545,57546,57547,
+57548,57549,57550,57551,57552,57553,57554,57555,57556,57557,57558,57559,57560,
+57561,57562,57563,57564,57565,57566,57567,57568,57569,57570,57571,57572,57573,
+57574,57575,57576,57577,57578,57579,57580,57581,57582,57583,57584,57585,57586,
+57587,57588,57589,57590,57591,57592,57593,57594,57595,57596,57597,57598,57599,
+57600,57601,57602,57603,57604,57605,57606,57607,57608,57609,57610,57611,57612,
+57613,57614,57615,57616,57617,57618,57619,57620,57621,57622,57623,57624,57625,
+29819,29820,29821,29823,29826,29828,29829,29830,29832,29833,29834,29836,29837,
+29839,29841,29842,29843,29844,29845,29846,29847,29848,29849,29850,29851,29853,
+29855,29856,29857,29858,29859,29860,29861,29862,29866,29867,29868,29869,29870,
+29871,29872,29873,29874,29875,29876,29877,29878,29879,29880,29881,29883,29884,
+29885,29886,29887,29888,29889,29890,29891,29892,29893,29894,29895,29896,29897,
+29898,29899,29900,29901,29902,29903,29904,29905,29907,29908,29909,29910,29911,
+29912,29913,29914,29915,29917,29919,29921,29925,29927,
+29928,29929,29930,29931,29932,29933,29936,29937,29938,57626,57627,57628,57629,
+57630,57631,57632,57633,57634,57635,57636,57637,57638,57639,57640,57641,57642,
+57643,57644,57645,57646,57647,57648,57649,57650,57651,57652,57653,57654,57655,
+57656,57657,57658,57659,57660,57661,57662,57663,57664,57665,57666,57667,57668,
+57669,57670,57671,57672,57673,57674,57675,57676,57677,57678,57679,57680,57681,
+57682,57683,57684,57685,57686,57687,57688,57689,57690,57691,57692,57693,57694,
+57695,57696,57697,57698,57699,57700,57701,57702,57703,57704,57705,57706,57707,
+57708,57709,57710,57711,57712,57713,57714,57715,57716,57717,57718,57719,29939,
+29941,29944,29945,29946,29947,29948,29949,29950,29952,29953,29954,29955,29957,
+29958,29959,29960,29961,29962,29963,29964,29966,29968,29970,29972,29973,29974,
+29975,29979,29981,29982,29984,29985,29986,29987,29988,29990,29991,29994,29998,
+30004,30006,30009,30012,30013,30015,30017,30018,30019,30020,30022,30023,30025,
+30026,30029,30032,30033,30034,30035,30037,30038,30039,30040,30045,30046,30047,
+30048,30049,30050,30051,30052,30055,30056,30057,30059,30060,30061,30062,30063,
+30064,30065,30067,30069,30070,30071,30074,30075,30076,30077,30078,30080,30081,
+30082,30084,30085,30087,57720,57721,57722,57723,57724,57725,57726,57727,57728,
+57729,57730,57731,57732,57733,57734,57735,57736,57737,57738,57739,57740,57741,
+57742,57743,57744,57745,57746,57747,57748,57749,57750,57751,57752,57753,57754,
+57755,57756,57757,57758,57759,57760,57761,57762,57763,57764,57765,57766,57767,
+57768,57769,57770,57771,57772,57773,57774,57775,57776,
+57777,57778,57779,57780,57781,57782,57783,57784,57785,57786,57787,57788,57789,
+57790,57791,57792,57793,57794,57795,57796,57797,57798,57799,57800,57801,57802,
+57803,57804,57805,57806,57807,57808,57809,57810,57811,57812,57813,30088,30089,
+30090,30092,30093,30094,30096,30099,30101,30104,30107,30108,30110,30114,30118,
+30119,30120,30121,30122,30125,30134,30135,30138,30139,30143,30144,30145,30150,
+30155,30156,30158,30159,30160,30161,30163,30167,30169,30170,30172,30173,30175,
+30176,30177,30181,30185,30188,30189,30190,30191,30194,30195,30197,30198,30199,
+30200,30202,30203,30205,30206,30210,30212,30214,30215,30216,30217,30219,30221,
+30222,30223,30225,30226,30227,30228,30230,30234,30236,30237,30238,30241,30243,
+30247,30248,30252,30254,30255,30257,30258,30262,30263,30265,30266,30267,30269,
+30273,30274,30276,57814,57815,57816,57817,57818,57819,57820,57821,57822,57823,
+57824,57825,57826,57827,57828,57829,57830,57831,57832,57833,57834,57835,57836,
+57837,57838,57839,57840,57841,57842,57843,57844,57845,57846,57847,57848,57849,
+57850,57851,57852,57853,57854,57855,57856,57857,57858,57859,57860,57861,57862,
+57863,57864,57865,57866,57867,57868,57869,57870,57871,57872,57873,57874,57875,
+57876,57877,57878,57879,57880,57881,57882,57883,57884,57885,57886,57887,57888,
+57889,57890,57891,57892,57893,57894,57895,57896,57897,57898,57899,57900,57901,
+57902,57903,57904,57905,57906,57907,30277,30278,30279,30280,30281,30282,30283,
+30286,30287,30288,30289,30290,30291,30293,30295,30296,30297,30298,30299,30301,
+30303,30304,30305,30306,30308,30309,30310,30311,30312,
+30313,30314,30316,30317,30318,30320,30321,30322,30323,30324,30325,30326,30327,
+30329,30330,30332,30335,30336,30337,30339,30341,30345,30346,30348,30349,30351,
+30352,30354,30356,30357,30359,30360,30362,30363,30364,30365,30366,30367,30368,
+30369,30370,30371,30373,30374,30375,30376,30377,30378,30379,30380,30381,30383,
+30384,30387,30389,30390,30391,30392,30393,30394,30395,30396,30397,30398,30400,
+30401,30403,21834,38463,22467,25384,21710,21769,21696,30353,30284,34108,30702,
+33406,30861,29233,38552,38797,27688,23433,20474,25353,26263,23736,33018,26696,
+32942,26114,30414,20985,25942,29100,32753,34948,20658,22885,25034,28595,33453,
+25420,25170,21485,21543,31494,20843,30116,24052,25300,36299,38774,25226,32793,
+22365,38712,32610,29240,30333,26575,30334,25670,20336,36133,25308,31255,26001,
+29677,25644,25203,33324,39041,26495,29256,25198,25292,20276,29923,21322,21150,
+32458,37030,24110,26758,27036,33152,32465,26834,30917,34444,38225,20621,35876,
+33502,32990,21253,35090,21093,30404,30407,30409,30411,30412,30419,30421,30425,
+30426,30428,30429,30430,30432,30433,30434,30435,30436,30438,30439,30440,30441,
+30442,30443,30444,30445,30448,30451,30453,30454,30455,30458,30459,30461,30463,
+30464,30466,30467,30469,30470,30474,30476,30478,30479,30480,30481,30482,30483,
+30484,30485,30486,30487,30488,30491,30492,30493,30494,30497,30499,30500,30501,
+30503,30506,30507,30508,30510,30512,30513,30514,30515,30516,30521,30523,30525,
+30526,30527,30530,30532,30533,30534,30536,30537,30538,30539,30540,30541,30542,
+30543,30546,30547,30548,30549,30550,30551,30552,30553,
+30556,34180,38649,20445,22561,39281,23453,25265,25253,26292,35961,40077,29190,
+26479,30865,24754,21329,21271,36744,32972,36125,38049,20493,29384,22791,24811,
+28953,34987,22868,33519,26412,31528,23849,32503,29997,27893,36454,36856,36924,
+40763,27604,37145,31508,24444,30887,34006,34109,27605,27609,27606,24065,24199,
+30201,38381,25949,24330,24517,36767,22721,33218,36991,38491,38829,36793,32534,
+36140,25153,20415,21464,21342,36776,36777,36779,36941,26631,24426,33176,34920,
+40150,24971,21035,30250,24428,25996,28626,28392,23486,25672,20853,20912,26564,
+19993,31177,39292,28851,30557,30558,30559,30560,30564,30567,30569,30570,30573,
+30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,30584,30586,30587,
+30588,30593,30594,30595,30598,30599,30600,30601,30602,30603,30607,30608,30611,
+30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622,30625,30627,
+30628,30630,30632,30635,30637,30638,30639,30641,30642,30644,30646,30647,30648,
+30649,30650,30652,30654,30656,30657,30658,30659,30660,30661,30662,30663,30664,
+30665,30666,30667,30668,30670,30671,30672,30673,30674,30675,30676,30677,30678,
+30680,30681,30682,30685,30686,30687,30688,30689,30692,30149,24182,29627,33760,
+25773,25320,38069,27874,21338,21187,25615,38082,31636,20271,24091,33334,33046,
+33162,28196,27850,39539,25429,21340,21754,34917,22496,19981,24067,27493,31807,
+37096,24598,25830,29468,35009,26448,25165,36130,30572,36393,37319,24425,33756,
+34081,39184,21442,34453,27531,24813,24808,28799,33485,33329,20179,27815,34255,
+25805,31961,27133,26361,33609,21397,31574,20391,20876,
+27979,23618,36461,25554,21449,33580,33590,26597,30900,25661,23519,23700,24046,
+35815,25286,26612,35962,25600,25530,34633,39307,35863,32544,38130,20135,38416,
+39076,26124,29462,30694,30696,30698,30703,30704,30705,30706,30708,30709,30711,
+30713,30714,30715,30716,30723,30724,30725,30726,30727,30728,30730,30731,30734,
+30735,30736,30739,30741,30745,30747,30750,30752,30753,30754,30756,30760,30762,
+30763,30766,30767,30769,30770,30771,30773,30774,30781,30783,30785,30786,30787,
+30788,30790,30792,30793,30794,30795,30797,30799,30801,30803,30804,30808,30809,
+30810,30811,30812,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823,
+30824,30825,30831,30832,30833,30834,30835,30836,30837,30838,30840,30841,30842,
+30843,30845,30846,30847,30848,30849,30850,30851,22330,23581,24120,38271,20607,
+32928,21378,25950,30021,21809,20513,36229,25220,38046,26397,22066,28526,24034,
+21557,28818,36710,25199,25764,25507,24443,28552,37108,33251,36784,23576,26216,
+24561,27785,38472,36225,34924,25745,31216,22478,27225,25104,21576,20056,31243,
+24809,28548,35802,25215,36894,39563,31204,21507,30196,25345,21273,27744,36831,
+24347,39536,32827,40831,20360,23610,36196,32709,26021,28861,20805,20914,34411,
+23815,23456,25277,37228,30068,36364,31264,24833,31609,20167,32504,30597,19985,
+33261,21021,20986,27249,21416,36487,38148,38607,28353,38500,26970,30852,30853,
+30854,30856,30858,30859,30863,30864,30866,30868,30869,30870,30873,30877,30878,
+30880,30882,30884,30886,30888,30889,30890,30891,30892,30893,30894,30895,30901,
+30902,30903,30904,30906,30907,30908,30909,30911,30912,
+30914,30915,30916,30918,30919,30920,30924,30925,30926,30927,30929,30930,30931,
+30934,30935,30936,30938,30939,30940,30941,30942,30943,30944,30945,30946,30947,
+30948,30949,30950,30951,30953,30954,30955,30957,30958,30959,30960,30961,30963,
+30965,30966,30968,30969,30971,30972,30973,30974,30975,30976,30978,30979,30980,
+30982,30983,30984,30985,30986,30987,30988,30784,20648,30679,25616,35302,22788,
+25571,24029,31359,26941,20256,33337,21912,20018,30126,31383,24162,24202,38383,
+21019,21561,28810,25462,38180,22402,26149,26943,37255,21767,28147,32431,34850,
+25139,32496,30133,33576,30913,38604,36766,24904,29943,35789,27492,21050,36176,
+27425,32874,33905,22257,21254,20174,19995,20945,31895,37259,31751,20419,36479,
+31713,31388,25703,23828,20652,33030,30209,31929,28140,32736,26449,23384,23544,
+30923,25774,25619,25514,25387,38169,25645,36798,31572,30249,25171,22823,21574,
+27513,20643,25140,24102,27526,20195,36151,34955,24453,36910,30989,30990,30991,
+30992,30993,30994,30996,30997,30998,30999,31000,31001,31002,31003,31004,31005,
+31007,31008,31009,31010,31011,31013,31014,31015,31016,31017,31018,31019,31020,
+31021,31022,31023,31024,31025,31026,31027,31029,31030,31031,31032,31033,31037,
+31039,31042,31043,31044,31045,31047,31050,31051,31052,31053,31054,31055,31056,
+31057,31058,31060,31061,31064,31065,31073,31075,31076,31078,31081,31082,31083,
+31084,31086,31088,31089,31090,31091,31092,31093,31094,31097,31099,31100,31101,
+31102,31103,31106,31107,31110,31111,31112,31113,31115,31116,31117,31118,31120,
+31121,31122,24608,32829,25285,20025,21333,37112,25528,
+32966,26086,27694,20294,24814,28129,35806,24377,34507,24403,25377,20826,33633,
+26723,20992,25443,36424,20498,23707,31095,23548,21040,31291,24764,36947,30423,
+24503,24471,30340,36460,28783,30331,31561,30634,20979,37011,22564,20302,28404,
+36842,25932,31515,29380,28068,32735,23265,25269,24213,22320,33922,31532,24093,
+24351,36882,32532,39072,25474,28359,30872,28857,20856,38747,22443,30005,20291,
+30008,24215,24806,22880,28096,27583,30857,21500,38613,20939,20993,25481,21514,
+38035,35843,36300,29241,30879,34678,36845,35853,21472,31123,31124,31125,31126,
+31127,31128,31129,31131,31132,31133,31134,31135,31136,31137,31138,31139,31140,
+31141,31142,31144,31145,31146,31147,31148,31149,31150,31151,31152,31153,31154,
+31156,31157,31158,31159,31160,31164,31167,31170,31172,31173,31175,31176,31178,
+31180,31182,31183,31184,31187,31188,31190,31191,31193,31194,31195,31196,31197,
+31198,31200,31201,31202,31205,31208,31210,31212,31214,31217,31218,31219,31220,
+31221,31222,31223,31225,31226,31228,31230,31231,31233,31236,31237,31239,31240,
+31241,31242,31244,31247,31248,31249,31250,31251,31253,31254,31256,31257,31259,
+31260,19969,30447,21486,38025,39030,40718,38189,23450,35746,20002,19996,20908,
+33891,25026,21160,26635,20375,24683,20923,27934,20828,25238,26007,38497,35910,
+36887,30168,37117,30563,27602,29322,29420,35835,22581,30585,36172,26460,38208,
+32922,24230,28193,22930,31471,30701,38203,27573,26029,32526,22534,20817,38431,
+23545,22697,21544,36466,25958,39039,22244,38045,30462,36929,25479,21702,22810,
+22842,22427,36530,26421,36346,33333,21057,24816,22549,
+34558,23784,40517,20420,39069,35769,23077,24694,21380,25212,36943,37122,39295,
+24681,32780,20799,32819,23572,39285,27953,20108,31261,31263,31265,31266,31268,
+31269,31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281,
+31282,31284,31285,31286,31288,31290,31294,31296,31297,31298,31299,31300,31301,
+31303,31304,31305,31306,31307,31308,31309,31310,31311,31312,31314,31315,31316,
+31317,31318,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330,
+31331,31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,31343,
+31345,31346,31347,31349,31355,31356,31357,31358,31362,31365,31367,31369,31370,
+31371,31372,31374,31375,31376,31379,31380,31385,31386,31387,31390,31393,31394,
+36144,21457,32602,31567,20240,20047,38400,27861,29648,34281,24070,30058,32763,
+27146,30718,38034,32321,20961,28902,21453,36820,33539,36137,29359,39277,27867,
+22346,33459,26041,32938,25151,38450,22952,20223,35775,32442,25918,33778,38750,
+21857,39134,32933,21290,35837,21536,32954,24223,27832,36153,33452,37210,21545,
+27675,20998,32439,22367,28954,27774,31881,22859,20221,24575,24868,31914,20016,
+23553,26539,34562,23792,38155,39118,30127,28925,36898,20911,32541,35773,22857,
+20964,20315,21542,22827,25975,32932,23413,25206,25282,36752,24133,27679,31526,
+20239,20440,26381,31395,31396,31399,31401,31402,31403,31406,31407,31408,31409,
+31410,31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31424,
+31425,31426,31427,31428,31429,31430,31431,31432,31433,31434,31436,31437,31438,
+31439,31440,31441,31442,31443,31444,31445,31447,31448,
+31450,31451,31452,31453,31457,31458,31460,31463,31464,31465,31466,31467,31468,
+31470,31472,31473,31474,31475,31476,31477,31478,31479,31480,31483,31484,31486,
+31488,31489,31490,31493,31495,31497,31500,31501,31502,31504,31506,31507,31510,
+31511,31512,31514,31516,31517,31519,31521,31522,31523,31527,31529,31533,28014,
+28074,31119,34993,24343,29995,25242,36741,20463,37340,26023,33071,33105,24220,
+33104,36212,21103,35206,36171,22797,20613,20184,38428,29238,33145,36127,23500,
+35747,38468,22919,32538,21648,22134,22030,35813,25913,27010,38041,30422,28297,
+24178,29976,26438,26577,31487,32925,36214,24863,31174,25954,36195,20872,21018,
+38050,32568,32923,32434,23703,28207,26464,31705,30347,39640,33167,32660,31957,
+25630,38224,31295,21578,21733,27468,25601,25096,40509,33011,30105,21106,38761,
+33883,26684,34532,38401,38548,38124,20010,21508,32473,26681,36319,32789,26356,
+24218,32697,31535,31536,31538,31540,31541,31542,31543,31545,31547,31549,31551,
+31552,31553,31554,31555,31556,31558,31560,31562,31565,31566,31571,31573,31575,
+31577,31580,31582,31583,31585,31587,31588,31589,31590,31591,31592,31593,31594,
+31595,31596,31597,31599,31600,31603,31604,31606,31608,31610,31612,31613,31615,
+31617,31618,31619,31620,31622,31623,31624,31625,31626,31627,31628,31630,31631,
+31633,31634,31635,31638,31640,31641,31642,31643,31646,31647,31648,31651,31652,
+31653,31662,31663,31664,31666,31667,31669,31670,31671,31673,31674,31675,31676,
+31677,31678,31679,31680,31682,31683,31684,22466,32831,26775,24037,25915,21151,
+24685,40858,20379,36524,20844,23467,24339,24041,27742,
+25329,36129,20849,38057,21246,27807,33503,29399,22434,26500,36141,22815,36764,
+33735,21653,31629,20272,27837,23396,22993,40723,21476,34506,39592,35895,32929,
+25925,39038,22266,38599,21038,29916,21072,23521,25346,35074,20054,25296,24618,
+26874,20851,23448,20896,35266,31649,39302,32592,24815,28748,36143,20809,24191,
+36891,29808,35268,22317,30789,24402,40863,38394,36712,39740,35809,30328,26690,
+26588,36330,36149,21053,36746,28378,26829,38149,37101,22269,26524,35065,36807,
+21704,31685,31688,31689,31690,31691,31693,31694,31695,31696,31698,31700,31701,
+31702,31703,31704,31707,31708,31710,31711,31712,31714,31715,31716,31719,31720,
+31721,31723,31724,31725,31727,31728,31730,31731,31732,31733,31734,31736,31737,
+31738,31739,31741,31743,31744,31745,31746,31747,31748,31749,31750,31752,31753,
+31754,31757,31758,31760,31761,31762,31763,31764,31765,31767,31768,31769,31770,
+31771,31772,31773,31774,31776,31777,31778,31779,31780,31781,31784,31785,31787,
+31788,31789,31790,31791,31792,31793,31794,31795,31796,31797,31798,31799,31801,
+31802,31803,31804,31805,31806,31810,39608,23401,28023,27686,20133,23475,39559,
+37219,25000,37039,38889,21547,28085,23506,20989,21898,32597,32752,25788,25421,
+26097,25022,24717,28938,27735,27721,22831,26477,33322,22741,22158,35946,27627,
+37085,22909,32791,21495,28009,21621,21917,33655,33743,26680,31166,21644,20309,
+21512,30418,35977,38402,27827,28088,36203,35088,40548,36154,22079,40657,30165,
+24456,29408,24680,21756,20136,27178,34913,24658,36720,21700,28888,34425,40511,
+27946,23439,24344,32418,21897,20399,29492,21564,21402,
+20505,21518,21628,20046,24573,29786,22774,33899,32993,34676,29392,31946,28246,
+31811,31812,31813,31814,31815,31816,31817,31818,31819,31820,31822,31823,31824,
+31825,31826,31827,31828,31829,31830,31831,31832,31833,31834,31835,31836,31837,
+31838,31839,31840,31841,31842,31843,31844,31845,31846,31847,31848,31849,31850,
+31851,31852,31853,31854,31855,31856,31857,31858,31861,31862,31863,31864,31865,
+31866,31870,31871,31872,31873,31874,31875,31876,31877,31878,31879,31880,31882,
+31883,31884,31885,31886,31887,31888,31891,31892,31894,31897,31898,31899,31904,
+31905,31907,31910,31911,31912,31913,31915,31916,31917,31919,31920,31924,31925,
+31926,31927,31928,31930,31931,24359,34382,21804,25252,20114,27818,25143,33457,
+21719,21326,29502,28369,30011,21010,21270,35805,27088,24458,24576,28142,22351,
+27426,29615,26707,36824,32531,25442,24739,21796,30186,35938,28949,28067,23462,
+24187,33618,24908,40644,30970,34647,31783,30343,20976,24822,29004,26179,24140,
+24653,35854,28784,25381,36745,24509,24674,34516,22238,27585,24724,24935,21321,
+24800,26214,36159,31229,20250,28905,27719,35763,35826,32472,33636,26127,23130,
+39746,27985,28151,35905,27963,20249,28779,33719,25110,24785,38669,36135,31096,
+20987,22334,22522,26426,30072,31293,31215,31637,31935,31936,31938,31939,31940,
+31942,31945,31947,31950,31951,31952,31953,31954,31955,31956,31960,31962,31963,
+31965,31966,31969,31970,31971,31972,31973,31974,31975,31977,31978,31979,31980,
+31981,31982,31984,31985,31986,31987,31988,31989,31990,31991,31993,31994,31996,
+31997,31998,31999,32000,32001,32002,32003,32004,32005,
+32006,32007,32008,32009,32011,32012,32013,32014,32015,32016,32017,32018,32019,
+32020,32021,32022,32023,32024,32025,32026,32027,32028,32029,32030,32031,32033,
+32035,32036,32037,32038,32040,32041,32042,32044,32045,32046,32048,32049,32050,
+32051,32052,32053,32054,32908,39269,36857,28608,35749,40481,23020,32489,32521,
+21513,26497,26840,36753,31821,38598,21450,24613,30142,27762,21363,23241,32423,
+25380,20960,33034,24049,34015,25216,20864,23395,20238,31085,21058,24760,27982,
+23492,23490,35745,35760,26082,24524,38469,22931,32487,32426,22025,26551,22841,
+20339,23478,21152,33626,39050,36158,30002,38078,20551,31292,20215,26550,39550,
+23233,27516,30417,22362,23574,31546,38388,29006,20860,32937,33392,22904,32516,
+33575,26816,26604,30897,30839,25315,25441,31616,20461,21098,20943,33616,27099,
+37492,36341,36145,35265,38190,31661,20214,32055,32056,32057,32058,32059,32060,
+32061,32062,32063,32064,32065,32066,32067,32068,32069,32070,32071,32072,32073,
+32074,32075,32076,32077,32078,32079,32080,32081,32082,32083,32084,32085,32086,
+32087,32088,32089,32090,32091,32092,32093,32094,32095,32096,32097,32098,32099,
+32100,32101,32102,32103,32104,32105,32106,32107,32108,32109,32111,32112,32113,
+32114,32115,32116,32117,32118,32120,32121,32122,32123,32124,32125,32126,32127,
+32128,32129,32130,32131,32132,32133,32134,32135,32136,32137,32138,32139,32140,
+32141,32142,32143,32144,32145,32146,32147,32148,32149,32150,32151,32152,20581,
+33328,21073,39279,28176,28293,28071,24314,20725,23004,23558,27974,27743,30086,
+33931,26728,22870,35762,21280,37233,38477,34121,26898,
+30977,28966,33014,20132,37066,27975,39556,23047,22204,25605,38128,30699,20389,
+33050,29409,35282,39290,32564,32478,21119,25945,37237,36735,36739,21483,31382,
+25581,25509,30342,31224,34903,38454,25130,21163,33410,26708,26480,25463,30571,
+31469,27905,32467,35299,22992,25106,34249,33445,30028,20511,20171,30117,35819,
+23626,24062,31563,26020,37329,20170,27941,35167,32039,38182,20165,35880,36827,
+38771,26187,31105,36817,28908,28024,32153,32154,32155,32156,32157,32158,32159,
+32160,32161,32162,32163,32164,32165,32167,32168,32169,32170,32171,32172,32173,
+32175,32176,32177,32178,32179,32180,32181,32182,32183,32184,32185,32186,32187,
+32188,32189,32190,32191,32192,32193,32194,32195,32196,32197,32198,32199,32200,
+32201,32202,32203,32204,32205,32206,32207,32208,32209,32210,32211,32212,32213,
+32214,32215,32216,32217,32218,32219,32220,32221,32222,32223,32224,32225,32226,
+32227,32228,32229,32230,32231,32232,32233,32234,32235,32236,32237,32238,32239,
+32240,32241,32242,32243,32244,32245,32246,32247,32248,32249,32250,23613,21170,
+33606,20834,33550,30555,26230,40120,20140,24778,31934,31923,32463,20117,35686,
+26223,39048,38745,22659,25964,38236,24452,30153,38742,31455,31454,20928,28847,
+31384,25578,31350,32416,29590,38893,20037,28792,20061,37202,21417,25937,26087,
+33276,33285,21646,23601,30106,38816,25304,29401,30141,23621,39545,33738,23616,
+21632,30697,20030,27822,32858,25298,25454,24040,20855,36317,36382,38191,20465,
+21477,24807,28844,21095,25424,40515,23071,20518,30519,21367,32482,25733,25899,
+25225,25496,20500,29237,35273,20915,35776,32477,22343,
+33740,38055,20891,21531,23803,32251,32252,32253,32254,32255,32256,32257,32258,
+32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,32270,32271,
+32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,32282,32283,32284,
+32285,32286,32287,32288,32289,32290,32291,32292,32293,32294,32295,32296,32297,
+32298,32299,32300,32301,32302,32303,32304,32305,32306,32307,32308,32309,32310,
+32311,32312,32313,32314,32316,32317,32318,32319,32320,32322,32323,32324,32325,
+32326,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338,32339,
+32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,20426,31459,27994,
+37089,39567,21888,21654,21345,21679,24320,25577,26999,20975,24936,21002,22570,
+21208,22350,30733,30475,24247,24951,31968,25179,25239,20130,28821,32771,25335,
+28900,38752,22391,33499,26607,26869,30933,39063,31185,22771,21683,21487,28212,
+20811,21051,23458,35838,32943,21827,22438,24691,22353,21549,31354,24656,23380,
+25511,25248,21475,25187,23495,26543,21741,31391,33510,37239,24211,35044,22840,
+22446,25358,36328,33007,22359,31607,20393,24555,23485,27454,21281,31568,29378,
+26694,30719,30518,26103,20917,20111,30420,23743,31397,33909,22862,39745,20608,
+32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361,32362,
+32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374,32375,
+32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32387,32388,32389,
+32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401,32402,
+32403,32404,32405,32406,32407,32408,32409,32410,32412,
+32413,32414,32430,32436,32443,32444,32470,32484,32492,32505,32522,32528,32542,
+32567,32569,32571,32572,32573,32574,32575,32576,32577,32579,32582,32583,32584,
+32585,32586,32587,32588,32589,32590,32591,32594,32595,39304,24871,28291,22372,
+26118,25414,22256,25324,25193,24275,38420,22403,25289,21895,34593,33098,36771,
+21862,33713,26469,36182,34013,23146,26639,25318,31726,38417,20848,28572,35888,
+25597,35272,25042,32518,28866,28389,29701,27028,29436,24266,37070,26391,28010,
+25438,21171,29282,32769,20332,23013,37226,28889,28061,21202,20048,38647,38253,
+34174,30922,32047,20769,22418,25794,32907,31867,27882,26865,26974,20919,21400,
+26792,29313,40654,31729,29432,31163,28435,29702,26446,37324,40100,31036,33673,
+33620,21519,26647,20029,21385,21169,30782,21382,21033,20616,20363,20432,32598,
+32601,32603,32604,32605,32606,32608,32611,32612,32613,32614,32615,32619,32620,
+32621,32623,32624,32627,32629,32630,32631,32632,32634,32635,32636,32637,32639,
+32640,32642,32643,32644,32645,32646,32647,32648,32649,32651,32653,32655,32656,
+32657,32658,32659,32661,32662,32663,32664,32665,32667,32668,32672,32674,32675,
+32677,32678,32680,32681,32682,32683,32684,32685,32686,32689,32691,32692,32693,
+32694,32695,32698,32699,32702,32704,32706,32707,32708,32710,32711,32712,32713,
+32715,32717,32719,32720,32721,32722,32723,32726,32727,32729,32730,32731,32732,
+32733,32734,32738,32739,30178,31435,31890,27813,38582,21147,29827,21737,20457,
+32852,33714,36830,38256,24265,24604,28063,24088,25947,33080,38142,24651,28860,
+32451,31918,20937,26753,31921,33391,20004,36742,37327,
+26238,20142,35845,25769,32842,20698,30103,29134,23525,36797,28518,20102,25730,
+38243,24278,26009,21015,35010,28872,21155,29454,29747,26519,30967,38678,20020,
+37051,40158,28107,20955,36161,21533,25294,29618,33777,38646,40836,38083,20278,
+32666,20940,28789,38517,23725,39046,21478,20196,28316,29705,27060,30827,39311,
+30041,21016,30244,27969,26611,20845,40857,32843,21657,31548,31423,32740,32743,
+32744,32746,32747,32748,32749,32751,32754,32756,32757,32758,32759,32760,32761,
+32762,32765,32766,32767,32770,32775,32776,32777,32778,32782,32783,32785,32787,
+32794,32795,32797,32798,32799,32801,32803,32804,32811,32812,32813,32814,32815,
+32816,32818,32820,32825,32826,32828,32830,32832,32833,32836,32837,32839,32840,
+32841,32846,32847,32848,32849,32851,32853,32854,32855,32857,32859,32860,32861,
+32862,32863,32864,32865,32866,32867,32868,32869,32870,32871,32872,32875,32876,
+32877,32878,32879,32880,32882,32883,32884,32885,32886,32887,32888,32889,32890,
+32891,32892,32893,38534,22404,25314,38471,27004,23044,25602,31699,28431,38475,
+33446,21346,39045,24208,28809,25523,21348,34383,40065,40595,30860,38706,36335,
+36162,40575,28510,31108,24405,38470,25134,39540,21525,38109,20387,26053,23653,
+23649,32533,34385,27695,24459,29575,28388,32511,23782,25371,23402,28390,21365,
+20081,25504,30053,25249,36718,20262,20177,27814,32438,35770,33821,34746,32599,
+36923,38179,31657,39585,35064,33853,27931,39558,32476,22920,40635,29595,30721,
+34434,39532,39554,22043,21527,22475,20080,40614,21334,36808,33033,30610,39314,
+34542,28385,34067,26364,24930,28459,32894,32897,32898,
+32901,32904,32906,32909,32910,32911,32912,32913,32914,32916,32917,32919,32921,
+32926,32931,32934,32935,32936,32940,32944,32947,32949,32950,32952,32953,32955,
+32965,32967,32968,32969,32970,32971,32975,32976,32977,32978,32979,32980,32981,
+32984,32991,32992,32994,32995,32998,33006,33013,33015,33017,33019,33022,33023,
+33024,33025,33027,33028,33029,33031,33032,33035,33036,33045,33047,33049,33051,
+33052,33053,33055,33056,33057,33058,33059,33060,33061,33062,33063,33064,33065,
+33066,33067,33069,33070,33072,33075,33076,33077,33079,33081,33082,33083,33084,
+33085,33087,35881,33426,33579,30450,27667,24537,33725,29483,33541,38170,27611,
+30683,38086,21359,33538,20882,24125,35980,36152,20040,29611,26522,26757,37238,
+38665,29028,27809,30473,23186,38209,27599,32654,26151,23504,22969,23194,38376,
+38391,20204,33804,33945,27308,30431,38192,29467,26790,23391,30511,37274,38753,
+31964,36855,35868,24357,31859,31192,35269,27852,34588,23494,24130,26825,30496,
+32501,20885,20813,21193,23081,32517,38754,33495,25551,30596,34256,31186,28218,
+24217,22937,34065,28781,27665,25279,30399,25935,24751,38397,26126,34719,40483,
+38125,21517,21629,35884,25720,33088,33089,33090,33091,33092,33093,33095,33097,
+33101,33102,33103,33106,33110,33111,33112,33115,33116,33117,33118,33119,33121,
+33122,33123,33124,33126,33128,33130,33131,33132,33135,33138,33139,33141,33142,
+33143,33144,33153,33155,33156,33157,33158,33159,33161,33163,33164,33165,33166,
+33168,33170,33171,33172,33173,33174,33175,33177,33178,33182,33183,33184,33185,
+33186,33188,33189,33191,33193,33195,33196,33197,33198,
+33199,33200,33201,33202,33204,33205,33206,33207,33208,33209,33212,33213,33214,
+33215,33220,33221,33223,33224,33225,33227,33229,33230,33231,33232,33233,33234,
+33235,25721,34321,27169,33180,30952,25705,39764,25273,26411,33707,22696,40664,
+27819,28448,23518,38476,35851,29279,26576,25287,29281,20137,22982,27597,22675,
+26286,24149,21215,24917,26408,30446,30566,29287,31302,25343,21738,21584,38048,
+37027,23068,32435,27670,20035,22902,32784,22856,21335,30007,38590,22218,25376,
+33041,24700,38393,28118,21602,39297,20869,23273,33021,22958,38675,20522,27877,
+23612,25311,20320,21311,33147,36870,28346,34091,25288,24180,30910,25781,25467,
+24565,23064,37247,40479,23615,25423,32834,23421,21870,38218,38221,28037,24744,
+26592,29406,20957,23425,33236,33237,33238,33239,33240,33241,33242,33243,33244,
+33245,33246,33247,33248,33249,33250,33252,33253,33254,33256,33257,33259,33262,
+33263,33264,33265,33266,33269,33270,33271,33272,33273,33274,33277,33279,33283,
+33287,33288,33289,33290,33291,33294,33295,33297,33299,33301,33302,33303,33304,
+33305,33306,33309,33312,33316,33317,33318,33319,33321,33326,33330,33338,33340,
+33341,33343,33344,33345,33346,33347,33349,33350,33352,33354,33356,33357,33358,
+33360,33361,33362,33363,33364,33365,33366,33367,33369,33371,33372,33373,33374,
+33376,33377,33378,33379,33380,33381,33382,33383,33385,25319,27870,29275,25197,
+38062,32445,33043,27987,20892,24324,22900,21162,24594,22899,26262,34384,30111,
+25386,25062,31983,35834,21734,27431,40485,27572,34261,21589,20598,27812,21866,
+36276,29228,24085,24597,29750,25293,25490,29260,24472,
+28227,27966,25856,28504,30424,30928,30460,30036,21028,21467,20051,24222,26049,
+32810,32982,25243,21638,21032,28846,34957,36305,27873,21624,32986,22521,35060,
+36180,38506,37197,20329,27803,21943,30406,30768,25256,28921,28558,24429,34028,
+26842,30844,31735,33192,26379,40527,25447,30896,22383,30738,38713,25209,25259,
+21128,29749,27607,33386,33387,33388,33389,33393,33397,33398,33399,33400,33403,
+33404,33408,33409,33411,33413,33414,33415,33417,33420,33424,33427,33428,33429,
+33430,33434,33435,33438,33440,33442,33443,33447,33458,33461,33462,33466,33467,
+33468,33471,33472,33474,33475,33477,33478,33481,33488,33494,33497,33498,33501,
+33506,33511,33512,33513,33514,33516,33517,33518,33520,33522,33523,33525,33526,
+33528,33530,33532,33533,33534,33535,33536,33546,33547,33549,33552,33554,33555,
+33558,33560,33561,33565,33566,33567,33568,33569,33570,33571,33572,33573,33574,
+33577,33578,33582,33584,33586,33591,33595,33597,21860,33086,30130,30382,21305,
+30174,20731,23617,35692,31687,20559,29255,39575,39128,28418,29922,31080,25735,
+30629,25340,39057,36139,21697,32856,20050,22378,33529,33805,24179,20973,29942,
+35780,23631,22369,27900,39047,23110,30772,39748,36843,31893,21078,25169,38138,
+20166,33670,33889,33769,33970,22484,26420,22275,26222,28006,35889,26333,28689,
+26399,27450,26646,25114,22971,19971,20932,28422,26578,27791,20854,26827,22855,
+27495,30054,23822,33040,40784,26071,31048,31041,39569,36215,23682,20062,20225,
+21551,22865,30732,22120,27668,36804,24323,27773,27875,35755,25488,33598,33599,
+33601,33602,33604,33605,33608,33610,33611,33612,33613,
+33614,33619,33621,33622,33623,33624,33625,33629,33634,33648,33649,33650,33651,
+33652,33653,33654,33657,33658,33662,33663,33664,33665,33666,33667,33668,33671,
+33672,33674,33675,33676,33677,33679,33680,33681,33684,33685,33686,33687,33689,
+33690,33693,33695,33697,33698,33699,33700,33701,33702,33703,33708,33709,33710,
+33711,33717,33723,33726,33727,33730,33731,33732,33734,33736,33737,33739,33741,
+33742,33744,33745,33746,33747,33749,33751,33753,33754,33755,33758,33762,33763,
+33764,33766,33767,33768,33771,33772,33773,24688,27965,29301,25190,38030,38085,
+21315,36801,31614,20191,35878,20094,40660,38065,38067,21069,28508,36963,27973,
+35892,22545,23884,27424,27465,26538,21595,33108,32652,22681,34103,24378,25250,
+27207,38201,25970,24708,26725,30631,20052,20392,24039,38808,25772,32728,23789,
+20431,31373,20999,33540,19988,24623,31363,38054,20405,20146,31206,29748,21220,
+33465,25810,31165,23517,27777,38738,36731,27682,20542,21375,28165,25806,26228,
+27696,24773,39031,35831,24198,29756,31351,31179,19992,37041,29699,27714,22234,
+37195,27845,36235,21306,34502,26354,36527,23624,39537,28192,33774,33775,33779,
+33780,33781,33782,33783,33786,33787,33788,33790,33791,33792,33794,33797,33799,
+33800,33801,33802,33808,33810,33811,33812,33813,33814,33815,33817,33818,33819,
+33822,33823,33824,33825,33826,33827,33833,33834,33835,33836,33837,33838,33839,
+33840,33842,33843,33844,33845,33846,33847,33849,33850,33851,33854,33855,33856,
+33857,33858,33859,33860,33861,33863,33864,33865,33866,33867,33868,33869,33870,
+33871,33872,33874,33875,33876,33877,33878,33880,33885,
+33886,33887,33888,33890,33892,33893,33894,33895,33896,33898,33902,33903,33904,
+33906,33908,33911,33913,33915,33916,21462,23094,40843,36259,21435,22280,39079,
+26435,37275,27849,20840,30154,25331,29356,21048,21149,32570,28820,30264,21364,
+40522,27063,30830,38592,35033,32676,28982,29123,20873,26579,29924,22756,25880,
+22199,35753,39286,25200,32469,24825,28909,22764,20161,20154,24525,38887,20219,
+35748,20995,22922,32427,25172,20173,26085,25102,33592,33993,33635,34701,29076,
+28342,23481,32466,20887,25545,26580,32905,33593,34837,20754,23418,22914,36785,
+20083,27741,20837,35109,36719,38446,34122,29790,38160,38384,28070,33509,24369,
+25746,27922,33832,33134,40131,22622,36187,19977,21441,33917,33918,33919,33920,
+33921,33923,33924,33925,33926,33930,33933,33935,33936,33937,33938,33939,33940,
+33941,33942,33944,33946,33947,33949,33950,33951,33952,33954,33955,33956,33957,
+33958,33959,33960,33961,33962,33963,33964,33965,33966,33968,33969,33971,33973,
+33974,33975,33979,33980,33982,33984,33986,33987,33989,33990,33991,33992,33995,
+33996,33998,33999,34002,34004,34005,34007,34008,34009,34010,34011,34012,34014,
+34017,34018,34020,34023,34024,34025,34026,34027,34029,34030,34031,34033,34034,
+34035,34036,34037,34038,34039,34040,34041,34042,34043,34045,34046,34048,34049,
+34050,20254,25955,26705,21971,20007,25620,39578,25195,23234,29791,33394,28073,
+26862,20711,33678,30722,26432,21049,27801,32433,20667,21861,29022,31579,26194,
+29642,33515,26441,23665,21024,29053,34923,38378,38485,25797,36193,33203,21892,
+27733,25159,32558,22674,20260,21830,36175,26188,19978,
+23578,35059,26786,25422,31245,28903,33421,21242,38902,23569,21736,37045,32461,
+22882,36170,34503,33292,33293,36198,25668,23556,24913,28041,31038,35774,30775,
+30003,21627,20280,36523,28145,23072,32453,31070,27784,23457,23158,29978,32958,
+24910,28183,22768,29983,29989,29298,21319,32499,34051,34052,34053,34054,34055,
+34056,34057,34058,34059,34061,34062,34063,34064,34066,34068,34069,34070,34072,
+34073,34075,34076,34077,34078,34080,34082,34083,34084,34085,34086,34087,34088,
+34089,34090,34093,34094,34095,34096,34097,34098,34099,34100,34101,34102,34110,
+34111,34112,34113,34114,34116,34117,34118,34119,34123,34124,34125,34126,34127,
+34128,34129,34130,34131,34132,34133,34135,34136,34138,34139,34140,34141,34143,
+34144,34145,34146,34147,34149,34150,34151,34153,34154,34155,34156,34157,34158,
+34159,34160,34161,34163,34165,34166,34167,34168,34172,34173,34175,34176,34177,
+30465,30427,21097,32988,22307,24072,22833,29422,26045,28287,35799,23608,34417,
+21313,30707,25342,26102,20160,39135,34432,23454,35782,21490,30690,20351,23630,
+39542,22987,24335,31034,22763,19990,26623,20107,25325,35475,36893,21183,26159,
+21980,22124,36866,20181,20365,37322,39280,27663,24066,24643,23460,35270,35797,
+25910,25163,39318,23432,23551,25480,21806,21463,30246,20861,34092,26530,26803,
+27530,25234,36755,21460,33298,28113,30095,20070,36174,23408,29087,34223,26257,
+26329,32626,34560,40653,40736,23646,26415,36848,26641,26463,25101,31446,22661,
+24246,25968,28465,34178,34179,34182,34184,34185,34186,34187,34188,34189,34190,
+34192,34193,34194,34195,34196,34197,34198,34199,34200,
+34201,34202,34205,34206,34207,34208,34209,34210,34211,34213,34214,34215,34217,
+34219,34220,34221,34225,34226,34227,34228,34229,34230,34232,34234,34235,34236,
+34237,34238,34239,34240,34242,34243,34244,34245,34246,34247,34248,34250,34251,
+34252,34253,34254,34257,34258,34260,34262,34263,34264,34265,34266,34267,34269,
+34270,34271,34272,34273,34274,34275,34277,34278,34279,34280,34282,34283,34284,
+34285,34286,34287,34288,34289,34290,34291,34292,34293,34294,34295,34296,24661,
+21047,32781,25684,34928,29993,24069,26643,25332,38684,21452,29245,35841,27700,
+30561,31246,21550,30636,39034,33308,35828,30805,26388,28865,26031,25749,22070,
+24605,31169,21496,19997,27515,32902,23546,21987,22235,20282,20284,39282,24051,
+26494,32824,24578,39042,36865,23435,35772,35829,25628,33368,25822,22013,33487,
+37221,20439,32032,36895,31903,20723,22609,28335,23487,35785,32899,37240,33948,
+31639,34429,38539,38543,32485,39635,30862,23681,31319,36930,38567,31071,23385,
+25439,31499,34001,26797,21766,32553,29712,32034,38145,25152,22604,20182,23427,
+22905,22612,34297,34298,34300,34301,34302,34304,34305,34306,34307,34308,34310,
+34311,34312,34313,34314,34315,34316,34317,34318,34319,34320,34322,34323,34324,
+34325,34327,34328,34329,34330,34331,34332,34333,34334,34335,34336,34337,34338,
+34339,34340,34341,34342,34344,34346,34347,34348,34349,34350,34351,34352,34353,
+34354,34355,34356,34357,34358,34359,34361,34362,34363,34365,34366,34367,34368,
+34369,34370,34371,34372,34373,34374,34375,34376,34377,34378,34379,34380,34386,
+34387,34389,34390,34391,34392,34393,34395,34396,34397,
+34399,34400,34401,34403,34404,34405,34406,34407,34408,34409,34410,29549,25374,
+36427,36367,32974,33492,25260,21488,27888,37214,22826,24577,27760,22349,25674,
+36138,30251,28393,22363,27264,30192,28525,35885,35848,22374,27631,34962,30899,
+25506,21497,28845,27748,22616,25642,22530,26848,33179,21776,31958,20504,36538,
+28108,36255,28907,25487,28059,28372,32486,33796,26691,36867,28120,38518,35752,
+22871,29305,34276,33150,30140,35466,26799,21076,36386,38161,25552,39064,36420,
+21884,20307,26367,22159,24789,28053,21059,23625,22825,28155,22635,30000,29980,
+24684,33300,33094,25361,26465,36834,30522,36339,36148,38081,24086,21381,21548,
+28867,34413,34415,34416,34418,34419,34420,34421,34422,34423,34424,34435,34436,
+34437,34438,34439,34440,34441,34446,34447,34448,34449,34450,34452,34454,34455,
+34456,34457,34458,34459,34462,34463,34464,34465,34466,34469,34470,34475,34477,
+34478,34482,34483,34487,34488,34489,34491,34492,34493,34494,34495,34497,34498,
+34499,34501,34504,34508,34509,34514,34515,34517,34518,34519,34522,34524,34525,
+34528,34529,34530,34531,34533,34534,34535,34536,34538,34539,34540,34543,34549,
+34550,34551,34554,34555,34556,34557,34559,34561,34564,34565,34566,34571,34572,
+34574,34575,34576,34577,34580,34582,27712,24311,20572,20141,24237,25402,33351,
+36890,26704,37230,30643,21516,38108,24420,31461,26742,25413,31570,32479,30171,
+20599,25237,22836,36879,20984,31171,31361,22270,24466,36884,28034,23648,22303,
+21520,20820,28237,22242,25512,39059,33151,34581,35114,36864,21534,23663,33216,
+25302,25176,33073,40501,38464,39534,39548,26925,22949,
+25299,21822,25366,21703,34521,27964,23043,29926,34972,27498,22806,35916,24367,
+28286,29609,39037,20024,28919,23436,30871,25405,26202,30358,24779,23451,23113,
+19975,33109,27754,29579,20129,26505,32593,24448,26106,26395,24536,22916,23041,
+34585,34587,34589,34591,34592,34596,34598,34599,34600,34602,34603,34604,34605,
+34607,34608,34610,34611,34613,34614,34616,34617,34618,34620,34621,34624,34625,
+34626,34627,34628,34629,34630,34634,34635,34637,34639,34640,34641,34642,34644,
+34645,34646,34648,34650,34651,34652,34653,34654,34655,34657,34658,34662,34663,
+34664,34665,34666,34667,34668,34669,34671,34673,34674,34675,34677,34679,34680,
+34681,34682,34687,34688,34689,34692,34694,34695,34697,34698,34700,34702,34703,
+34704,34705,34706,34708,34709,34710,34712,34713,34714,34715,34716,34717,34718,
+34720,34721,34722,34723,34724,24013,24494,21361,38886,36829,26693,22260,21807,
+24799,20026,28493,32500,33479,33806,22996,20255,20266,23614,32428,26410,34074,
+21619,30031,32963,21890,39759,20301,28205,35859,23561,24944,21355,30239,28201,
+34442,25991,38395,32441,21563,31283,32010,38382,21985,32705,29934,25373,34583,
+28065,31389,25105,26017,21351,25569,27779,24043,21596,38056,20044,27745,35820,
+23627,26080,33436,26791,21566,21556,27595,27494,20116,25410,21320,33310,20237,
+20398,22366,25098,38654,26212,29289,21247,21153,24735,35823,26132,29081,26512,
+35199,30802,30717,26224,22075,21560,38177,29306,34725,34726,34727,34729,34730,
+34734,34736,34737,34738,34740,34742,34743,34744,34745,34747,34748,34750,34751,
+34753,34754,34755,34756,34757,34759,34760,34761,34764,
+34765,34766,34767,34768,34772,34773,34774,34775,34776,34777,34778,34780,34781,
+34782,34783,34785,34786,34787,34788,34790,34791,34792,34793,34795,34796,34797,
+34799,34800,34801,34802,34803,34804,34805,34806,34807,34808,34810,34811,34812,
+34813,34815,34816,34817,34818,34820,34821,34822,34823,34824,34825,34827,34828,
+34829,34830,34831,34832,34833,34834,34836,34839,34840,34841,34842,34844,34845,
+34846,34847,34848,34851,31232,24687,24076,24713,33181,22805,24796,29060,28911,
+28330,27728,29312,27268,34989,24109,20064,23219,21916,38115,27927,31995,38553,
+25103,32454,30606,34430,21283,38686,36758,26247,23777,20384,29421,19979,21414,
+22799,21523,25472,38184,20808,20185,40092,32420,21688,36132,34900,33335,38386,
+28046,24358,23244,26174,38505,29616,29486,21439,33146,39301,32673,23466,38519,
+38480,32447,30456,21410,38262,39321,31665,35140,28248,20065,32724,31077,35814,
+24819,21709,20139,39033,24055,27233,20687,21521,35937,33831,30813,38660,21066,
+21742,22179,38144,28040,23477,28102,26195,34852,34853,34854,34855,34856,34857,
+34858,34859,34860,34861,34862,34863,34864,34865,34867,34868,34869,34870,34871,
+34872,34874,34875,34877,34878,34879,34881,34882,34883,34886,34887,34888,34889,
+34890,34891,34894,34895,34896,34897,34898,34899,34901,34902,34904,34906,34907,
+34908,34909,34910,34911,34912,34918,34919,34922,34925,34927,34929,34931,34932,
+34933,34934,34936,34937,34938,34939,34940,34944,34947,34950,34951,34953,34954,
+34956,34958,34959,34960,34961,34963,34964,34965,34967,34968,34969,34970,34971,
+34973,34974,34975,34976,34977,34979,34981,34982,34983,
+34984,34985,34986,23567,23389,26657,32918,21880,31505,25928,26964,20123,27463,
+34638,38795,21327,25375,25658,37034,26012,32961,35856,20889,26800,21368,34809,
+25032,27844,27899,35874,23633,34218,33455,38156,27427,36763,26032,24571,24515,
+20449,34885,26143,33125,29481,24826,20852,21009,22411,24418,37026,34892,37266,
+24184,26447,24615,22995,20804,20982,33016,21256,27769,38596,29066,20241,20462,
+32670,26429,21957,38152,31168,34966,32483,22687,25100,38656,34394,22040,39035,
+24464,35768,33988,37207,21465,26093,24207,30044,24676,32110,23167,32490,32493,
+36713,21927,23459,24748,26059,29572,34988,34990,34991,34992,34994,34995,34996,
+34997,34998,35000,35001,35002,35003,35005,35006,35007,35008,35011,35012,35015,
+35016,35018,35019,35020,35021,35023,35024,35025,35027,35030,35031,35034,35035,
+35036,35037,35038,35040,35041,35046,35047,35049,35050,35051,35052,35053,35054,
+35055,35058,35061,35062,35063,35066,35067,35069,35071,35072,35073,35075,35076,
+35077,35078,35079,35080,35081,35083,35084,35085,35086,35087,35089,35092,35093,
+35094,35095,35096,35100,35101,35102,35103,35104,35106,35107,35108,35110,35111,
+35112,35113,35116,35117,35118,35119,35121,35122,35123,35125,35127,36873,30307,
+30505,32474,38772,34203,23398,31348,38634,34880,21195,29071,24490,26092,35810,
+23547,39535,24033,27529,27739,35757,35759,36874,36805,21387,25276,40486,40493,
+21568,20011,33469,29273,34460,23830,34905,28079,38597,21713,20122,35766,28937,
+21693,38409,28895,28153,30416,20005,30740,34578,23721,24310,35328,39068,38414,
+28814,27839,22852,25513,30524,34893,28436,33395,22576,
+29141,21388,30746,38593,21761,24422,28976,23476,35866,39564,27523,22830,40495,
+31207,26472,25196,20335,30113,32650,27915,38451,27687,20208,30162,20859,26679,
+28478,36992,33136,22934,29814,35128,35129,35130,35131,35132,35133,35134,35135,
+35136,35138,35139,35141,35142,35143,35144,35145,35146,35147,35148,35149,35150,
+35151,35152,35153,35154,35155,35156,35157,35158,35159,35160,35161,35162,35163,
+35164,35165,35168,35169,35170,35171,35172,35173,35175,35176,35177,35178,35179,
+35180,35181,35182,35183,35184,35185,35186,35187,35188,35189,35190,35191,35192,
+35193,35194,35196,35197,35198,35200,35202,35204,35205,35207,35208,35209,35210,
+35211,35212,35213,35214,35215,35216,35217,35218,35219,35220,35221,35222,35223,
+35224,35225,35226,35227,35228,35229,35230,35231,35232,35233,25671,23591,36965,
+31377,35875,23002,21676,33280,33647,35201,32768,26928,22094,32822,29239,37326,
+20918,20063,39029,25494,19994,21494,26355,33099,22812,28082,19968,22777,21307,
+25558,38129,20381,20234,34915,39056,22839,36951,31227,20202,33008,30097,27778,
+23452,23016,24413,26885,34433,20506,24050,20057,30691,20197,33402,25233,26131,
+37009,23673,20159,24441,33222,36920,32900,30123,20134,35028,24847,27589,24518,
+20041,30410,28322,35811,35758,35850,35793,24322,32764,32716,32462,33589,33643,
+22240,27575,38899,38452,23035,21535,38134,28139,23493,39278,23609,24341,38544,
+35234,35235,35236,35237,35238,35239,35240,35241,35242,35243,35244,35245,35246,
+35247,35248,35249,35250,35251,35252,35253,35254,35255,35256,35257,35258,35259,
+35260,35261,35262,35263,35264,35267,35277,35283,35284,
+35285,35287,35288,35289,35291,35293,35295,35296,35297,35298,35300,35303,35304,
+35305,35306,35308,35309,35310,35312,35313,35314,35316,35317,35318,35319,35320,
+35321,35322,35323,35324,35325,35326,35327,35329,35330,35331,35332,35333,35334,
+35336,35337,35338,35339,35340,35341,35342,35343,35344,35345,35346,35347,35348,
+35349,35350,35351,35352,35353,35354,35355,35356,35357,21360,33521,27185,23156,
+40560,24212,32552,33721,33828,33829,33639,34631,36814,36194,30408,24433,39062,
+30828,26144,21727,25317,20323,33219,30152,24248,38605,36362,34553,21647,27891,
+28044,27704,24703,21191,29992,24189,20248,24736,24551,23588,30001,37038,38080,
+29369,27833,28216,37193,26377,21451,21491,20305,37321,35825,21448,24188,36802,
+28132,20110,30402,27014,34398,24858,33286,20313,20446,36926,40060,24841,28189,
+28180,38533,20104,23089,38632,19982,23679,31161,23431,35821,32701,29577,22495,
+33419,37057,21505,36935,21947,23786,24481,24840,27442,29425,32946,35465,35358,
+35359,35360,35361,35362,35363,35364,35365,35366,35367,35368,35369,35370,35371,
+35372,35373,35374,35375,35376,35377,35378,35379,35380,35381,35382,35383,35384,
+35385,35386,35387,35388,35389,35391,35392,35393,35394,35395,35396,35397,35398,
+35399,35401,35402,35403,35404,35405,35406,35407,35408,35409,35410,35411,35412,
+35413,35414,35415,35416,35417,35418,35419,35420,35421,35422,35423,35424,35425,
+35426,35427,35428,35429,35430,35431,35432,35433,35434,35435,35436,35437,35438,
+35439,35440,35441,35442,35443,35444,35445,35446,35447,35448,35450,35451,35452,
+35453,35454,35455,35456,28020,23507,35029,39044,35947,
+39533,40499,28170,20900,20803,22435,34945,21407,25588,36757,22253,21592,22278,
+29503,28304,32536,36828,33489,24895,24616,38498,26352,32422,36234,36291,38053,
+23731,31908,26376,24742,38405,32792,20113,37095,21248,38504,20801,36816,34164,
+37213,26197,38901,23381,21277,30776,26434,26685,21705,28798,23472,36733,20877,
+22312,21681,25874,26242,36190,36163,33039,33900,36973,31967,20991,34299,26531,
+26089,28577,34468,36481,22122,36896,30338,28790,29157,36131,25321,21017,27901,
+36156,24590,22686,24974,26366,36192,25166,21939,28195,26413,36711,35457,35458,
+35459,35460,35461,35462,35463,35464,35467,35468,35469,35470,35471,35472,35473,
+35474,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485,35486,35487,
+35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,35498,35499,35500,
+35501,35502,35503,35504,35505,35506,35507,35508,35509,35510,35511,35512,35513,
+35514,35515,35516,35517,35518,35519,35520,35521,35522,35523,35524,35525,35526,
+35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537,35538,35539,
+35540,35541,35542,35543,35544,35545,35546,35547,35548,35549,35550,35551,35552,
+35553,35554,35555,38113,38392,30504,26629,27048,21643,20045,28856,35784,25688,
+25995,23429,31364,20538,23528,30651,27617,35449,31896,27838,30415,26025,36759,
+23853,23637,34360,26632,21344,25112,31449,28251,32509,27167,31456,24432,28467,
+24352,25484,28072,26454,19976,24080,36134,20183,32960,30260,38556,25307,26157,
+25214,27836,36213,29031,32617,20806,32903,21484,36974,25240,21746,34544,36761,
+32773,38167,34071,36825,27993,29645,26015,30495,29956,
+30759,33275,36126,38024,20390,26517,30137,35786,38663,25391,38215,38453,33976,
+25379,30529,24449,29424,20105,24596,25972,25327,27491,25919,35556,35557,35558,
+35559,35560,35561,35562,35563,35564,35565,35566,35567,35568,35569,35570,35571,
+35572,35573,35574,35575,35576,35577,35578,35579,35580,35581,35582,35583,35584,
+35585,35586,35587,35588,35589,35590,35592,35593,35594,35595,35596,35597,35598,
+35599,35600,35601,35602,35603,35604,35605,35606,35607,35608,35609,35610,35611,
+35612,35613,35614,35615,35616,35617,35618,35619,35620,35621,35623,35624,35625,
+35626,35627,35628,35629,35630,35631,35632,35633,35634,35635,35636,35637,35638,
+35639,35640,35641,35642,35643,35644,35645,35646,35647,35648,35649,35650,35651,
+35652,35653,24103,30151,37073,35777,33437,26525,25903,21553,34584,30693,32930,
+33026,27713,20043,32455,32844,30452,26893,27542,25191,20540,20356,22336,25351,
+27490,36286,21482,26088,32440,24535,25370,25527,33267,33268,32622,24092,23769,
+21046,26234,31209,31258,36136,28825,30164,28382,27835,31378,20013,30405,24544,
+38047,34935,32456,31181,32959,37325,20210,20247,33311,21608,24030,27954,35788,
+31909,36724,32920,24090,21650,30385,23449,26172,39588,29664,26666,34523,26417,
+29482,35832,35803,36880,31481,28891,29038,25284,30633,22065,20027,33879,26609,
+21161,34496,36142,38136,31569,35654,35655,35656,35657,35658,35659,35660,35661,
+35662,35663,35664,35665,35666,35667,35668,35669,35670,35671,35672,35673,35674,
+35675,35676,35677,35678,35679,35680,35681,35682,35683,35684,35685,35687,35688,
+35689,35690,35691,35693,35694,35695,35696,35697,35698,
+35699,35700,35701,35702,35703,35704,35705,35706,35707,35708,35709,35710,35711,
+35712,35713,35714,35715,35716,35717,35718,35719,35720,35721,35722,35723,35724,
+35725,35726,35727,35728,35729,35730,35731,35732,35733,35734,35735,35736,35737,
+35738,35739,35740,35741,35742,35743,35756,35761,35771,35783,35792,35818,35849,
+35870,20303,27880,31069,39547,25235,29226,25341,19987,30742,36716,25776,36186,
+31686,26729,24196,35013,22918,25758,22766,29366,26894,38181,36861,36184,22368,
+32512,35846,20934,25417,25305,21331,26700,29730,33537,37196,21828,30528,28796,
+27978,20857,21672,36164,23039,28363,28100,23388,32043,20180,31869,28371,23376,
+33258,28173,23383,39683,26837,36394,23447,32508,24635,32437,37049,36208,22863,
+25549,31199,36275,21330,26063,31062,35781,38459,32452,38075,32386,22068,37257,
+26368,32618,23562,36981,26152,24038,20304,26590,20570,20316,22352,24231,59408,
+59409,59410,59411,59412,35896,35897,35898,35899,35900,35901,35902,35903,35904,
+35906,35907,35908,35909,35912,35914,35915,35917,35918,35919,35920,35921,35922,
+35923,35924,35926,35927,35928,35929,35931,35932,35933,35934,35935,35936,35939,
+35940,35941,35942,35943,35944,35945,35948,35949,35950,35951,35952,35953,35954,
+35956,35957,35958,35959,35963,35964,35965,35966,35967,35968,35969,35971,35972,
+35974,35975,35976,35979,35981,35982,35983,35984,35985,35986,35987,35989,35990,
+35991,35993,35994,35995,35996,35997,35998,35999,36000,36001,36002,36003,36004,
+36005,36006,36007,36008,36009,36010,36011,36012,36013,20109,19980,20800,19984,
+24319,21317,19989,20120,19998,39730,23404,22121,20008,
+31162,20031,21269,20039,22829,29243,21358,27664,22239,32996,39319,27603,30590,
+40727,20022,20127,40720,20060,20073,20115,33416,23387,21868,22031,20164,21389,
+21405,21411,21413,21422,38757,36189,21274,21493,21286,21294,21310,36188,21350,
+21347,20994,21000,21006,21037,21043,21055,21056,21068,21086,21089,21084,33967,
+21117,21122,21121,21136,21139,20866,32596,20155,20163,20169,20162,20200,20193,
+20203,20190,20251,20211,20258,20324,20213,20261,20263,20233,20267,20318,20327,
+25912,20314,20317,36014,36015,36016,36017,36018,36019,36020,36021,36022,36023,
+36024,36025,36026,36027,36028,36029,36030,36031,36032,36033,36034,36035,36036,
+36037,36038,36039,36040,36041,36042,36043,36044,36045,36046,36047,36048,36049,
+36050,36051,36052,36053,36054,36055,36056,36057,36058,36059,36060,36061,36062,
+36063,36064,36065,36066,36067,36068,36069,36070,36071,36072,36073,36074,36075,
+36076,36077,36078,36079,36080,36081,36082,36083,36084,36085,36086,36087,36088,
+36089,36090,36091,36092,36093,36094,36095,36096,36097,36098,36099,36100,36101,
+36102,36103,36104,36105,36106,36107,36108,36109,20319,20311,20274,20285,20342,
+20340,20369,20361,20355,20367,20350,20347,20394,20348,20396,20372,20454,20456,
+20458,20421,20442,20451,20444,20433,20447,20472,20521,20556,20467,20524,20495,
+20526,20525,20478,20508,20492,20517,20520,20606,20547,20565,20552,20558,20588,
+20603,20645,20647,20649,20666,20694,20742,20717,20716,20710,20718,20743,20747,
+20189,27709,20312,20325,20430,40864,27718,31860,20846,24061,40649,39320,20865,
+22804,21241,21261,35335,21264,20971,22809,20821,20128,
+20822,20147,34926,34980,20149,33044,35026,31104,23348,34819,32696,20907,20913,
+20925,20924,36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120,
+36121,36122,36123,36124,36128,36177,36178,36183,36191,36197,36200,36201,36202,
+36204,36206,36207,36209,36210,36216,36217,36218,36219,36220,36221,36222,36223,
+36224,36226,36227,36230,36231,36232,36233,36236,36237,36238,36239,36240,36242,
+36243,36245,36246,36247,36248,36249,36250,36251,36252,36253,36254,36256,36257,
+36258,36260,36261,36262,36263,36264,36265,36266,36267,36268,36269,36270,36271,
+36272,36274,36278,36279,36281,36283,36285,36288,36289,36290,36293,36295,36296,
+36297,36298,36301,36304,36306,36307,36308,20935,20886,20898,20901,35744,35750,
+35751,35754,35764,35765,35767,35778,35779,35787,35791,35790,35794,35795,35796,
+35798,35800,35801,35804,35807,35808,35812,35816,35817,35822,35824,35827,35830,
+35833,35836,35839,35840,35842,35844,35847,35852,35855,35857,35858,35860,35861,
+35862,35865,35867,35864,35869,35871,35872,35873,35877,35879,35882,35883,35886,
+35887,35890,35891,35893,35894,21353,21370,38429,38434,38433,38449,38442,38461,
+38460,38466,38473,38484,38495,38503,38508,38514,38516,38536,38541,38551,38576,
+37015,37019,37021,37017,37036,37025,37044,37043,37046,37050,36309,36312,36313,
+36316,36320,36321,36322,36325,36326,36327,36329,36333,36334,36336,36337,36338,
+36340,36342,36348,36350,36351,36352,36353,36354,36355,36356,36358,36359,36360,
+36363,36365,36366,36368,36369,36370,36371,36373,36374,36375,36376,36377,36378,
+36379,36380,36384,36385,36388,36389,36390,36391,36392,
+36395,36397,36400,36402,36403,36404,36406,36407,36408,36411,36412,36414,36415,
+36419,36421,36422,36428,36429,36430,36431,36432,36435,36436,36437,36438,36439,
+36440,36442,36443,36444,36445,36446,36447,36448,36449,36450,36451,36452,36453,
+36455,36456,36458,36459,36462,36465,37048,37040,37071,37061,37054,37072,37060,
+37063,37075,37094,37090,37084,37079,37083,37099,37103,37118,37124,37154,37150,
+37155,37169,37167,37177,37187,37190,21005,22850,21154,21164,21165,21182,21759,
+21200,21206,21232,21471,29166,30669,24308,20981,20988,39727,21430,24321,30042,
+24047,22348,22441,22433,22654,22716,22725,22737,22313,22316,22314,22323,22329,
+22318,22319,22364,22331,22338,22377,22405,22379,22406,22396,22395,22376,22381,
+22390,22387,22445,22436,22412,22450,22479,22439,22452,22419,22432,22485,22488,
+22490,22489,22482,22456,22516,22511,22520,22500,22493,36467,36469,36471,36472,
+36473,36474,36475,36477,36478,36480,36482,36483,36484,36486,36488,36489,36490,
+36491,36492,36493,36494,36497,36498,36499,36501,36502,36503,36504,36505,36506,
+36507,36509,36511,36512,36513,36514,36515,36516,36517,36518,36519,36520,36521,
+36522,36525,36526,36528,36529,36531,36532,36533,36534,36535,36536,36537,36539,
+36540,36541,36542,36543,36544,36545,36546,36547,36548,36549,36550,36551,36552,
+36553,36554,36555,36556,36557,36559,36560,36561,36562,36563,36564,36565,36566,
+36567,36568,36569,36570,36571,36572,36573,36574,36575,36576,36577,36578,36579,
+36580,22539,22541,22525,22509,22528,22558,22553,22596,22560,22629,22636,22657,
+22665,22682,22656,39336,40729,25087,33401,33405,33407,
+33423,33418,33448,33412,33422,33425,33431,33433,33451,33464,33470,33456,33480,
+33482,33507,33432,33463,33454,33483,33484,33473,33449,33460,33441,33450,33439,
+33476,33486,33444,33505,33545,33527,33508,33551,33543,33500,33524,33490,33496,
+33548,33531,33491,33553,33562,33542,33556,33557,33504,33493,33564,33617,33627,
+33628,33544,33682,33596,33588,33585,33691,33630,33583,33615,33607,33603,33631,
+33600,33559,33632,33581,33594,33587,33638,33637,36581,36582,36583,36584,36585,
+36586,36587,36588,36589,36590,36591,36592,36593,36594,36595,36596,36597,36598,
+36599,36600,36601,36602,36603,36604,36605,36606,36607,36608,36609,36610,36611,
+36612,36613,36614,36615,36616,36617,36618,36619,36620,36621,36622,36623,36624,
+36625,36626,36627,36628,36629,36630,36631,36632,36633,36634,36635,36636,36637,
+36638,36639,36640,36641,36642,36643,36644,36645,36646,36647,36648,36649,36650,
+36651,36652,36653,36654,36655,36656,36657,36658,36659,36660,36661,36662,36663,
+36664,36665,36666,36667,36668,36669,36670,36671,36672,36673,36674,36675,36676,
+33640,33563,33641,33644,33642,33645,33646,33712,33656,33715,33716,33696,33706,
+33683,33692,33669,33660,33718,33705,33661,33720,33659,33688,33694,33704,33722,
+33724,33729,33793,33765,33752,22535,33816,33803,33757,33789,33750,33820,33848,
+33809,33798,33748,33759,33807,33795,33784,33785,33770,33733,33728,33830,33776,
+33761,33884,33873,33882,33881,33907,33927,33928,33914,33929,33912,33852,33862,
+33897,33910,33932,33934,33841,33901,33985,33997,34000,34022,33981,34003,33994,
+33983,33978,34016,33953,33977,33972,33943,34021,34019,
+34060,29965,34104,34032,34105,34079,34106,36677,36678,36679,36680,36681,36682,
+36683,36684,36685,36686,36687,36688,36689,36690,36691,36692,36693,36694,36695,
+36696,36697,36698,36699,36700,36701,36702,36703,36704,36705,36706,36707,36708,
+36709,36714,36736,36748,36754,36765,36768,36769,36770,36772,36773,36774,36775,
+36778,36780,36781,36782,36783,36786,36787,36788,36789,36791,36792,36794,36795,
+36796,36799,36800,36803,36806,36809,36810,36811,36812,36813,36815,36818,36822,
+36823,36826,36832,36833,36835,36839,36844,36847,36849,36850,36852,36853,36854,
+36858,36859,36860,36862,36863,36871,36872,36876,36878,36883,36885,36888,34134,
+34107,34047,34044,34137,34120,34152,34148,34142,34170,30626,34115,34162,34171,
+34212,34216,34183,34191,34169,34222,34204,34181,34233,34231,34224,34259,34241,
+34268,34303,34343,34309,34345,34326,34364,24318,24328,22844,22849,32823,22869,
+22874,22872,21263,23586,23589,23596,23604,25164,25194,25247,25275,25290,25306,
+25303,25326,25378,25334,25401,25419,25411,25517,25590,25457,25466,25486,25524,
+25453,25516,25482,25449,25518,25532,25586,25592,25568,25599,25540,25566,25550,
+25682,25542,25534,25669,25665,25611,25627,25632,25612,25638,25633,25694,25732,
+25709,25750,36889,36892,36899,36900,36901,36903,36904,36905,36906,36907,36908,
+36912,36913,36914,36915,36916,36919,36921,36922,36925,36927,36928,36931,36933,
+36934,36936,36937,36938,36939,36940,36942,36948,36949,36950,36953,36954,36956,
+36957,36958,36959,36960,36961,36964,36966,36967,36969,36970,36971,36972,36975,
+36976,36977,36978,36979,36982,36983,36984,36985,36986,
+36987,36988,36990,36993,36996,36997,36998,36999,37001,37002,37004,37005,37006,
+37007,37008,37010,37012,37014,37016,37018,37020,37022,37023,37024,37028,37029,
+37031,37032,37033,37035,37037,37042,37047,37052,37053,37055,37056,25722,25783,
+25784,25753,25786,25792,25808,25815,25828,25826,25865,25893,25902,24331,24530,
+29977,24337,21343,21489,21501,21481,21480,21499,21522,21526,21510,21579,21586,
+21587,21588,21590,21571,21537,21591,21593,21539,21554,21634,21652,21623,21617,
+21604,21658,21659,21636,21622,21606,21661,21712,21677,21698,21684,21714,21671,
+21670,21715,21716,21618,21667,21717,21691,21695,21708,21721,21722,21724,21673,
+21674,21668,21725,21711,21726,21787,21735,21792,21757,21780,21747,21794,21795,
+21775,21777,21799,21802,21863,21903,21941,21833,21869,21825,21845,21823,21840,
+21820,37058,37059,37062,37064,37065,37067,37068,37069,37074,37076,37077,37078,
+37080,37081,37082,37086,37087,37088,37091,37092,37093,37097,37098,37100,37102,
+37104,37105,37106,37107,37109,37110,37111,37113,37114,37115,37116,37119,37120,
+37121,37123,37125,37126,37127,37128,37129,37130,37131,37132,37133,37134,37135,
+37136,37137,37138,37139,37140,37141,37142,37143,37144,37146,37147,37148,37149,
+37151,37152,37153,37156,37157,37158,37159,37160,37161,37162,37163,37164,37165,
+37166,37168,37170,37171,37172,37173,37174,37175,37176,37178,37179,37180,37181,
+37182,37183,37184,37185,37186,37188,21815,21846,21877,21878,21879,21811,21808,
+21852,21899,21970,21891,21937,21945,21896,21889,21919,21886,21974,21905,21883,
+21983,21949,21950,21908,21913,21994,22007,21961,22047,
+21969,21995,21996,21972,21990,21981,21956,21999,21989,22002,22003,21964,21965,
+21992,22005,21988,36756,22046,22024,22028,22017,22052,22051,22014,22016,22055,
+22061,22104,22073,22103,22060,22093,22114,22105,22108,22092,22100,22150,22116,
+22129,22123,22139,22140,22149,22163,22191,22228,22231,22237,22241,22261,22251,
+22265,22271,22276,22282,22281,22300,24079,24089,24084,24081,24113,24123,24124,
+37189,37191,37192,37201,37203,37204,37205,37206,37208,37209,37211,37212,37215,
+37216,37222,37223,37224,37227,37229,37235,37242,37243,37244,37248,37249,37250,
+37251,37252,37254,37256,37258,37262,37263,37267,37268,37269,37270,37271,37272,
+37273,37276,37277,37278,37279,37280,37281,37284,37285,37286,37287,37288,37289,
+37291,37292,37296,37297,37298,37299,37302,37303,37304,37305,37307,37308,37309,
+37310,37311,37312,37313,37314,37315,37316,37317,37318,37320,37323,37328,37330,
+37331,37332,37333,37334,37335,37336,37337,37338,37339,37341,37342,37343,37344,
+37345,37346,37347,37348,37349,24119,24132,24148,24155,24158,24161,23692,23674,
+23693,23696,23702,23688,23704,23705,23697,23706,23708,23733,23714,23741,23724,
+23723,23729,23715,23745,23735,23748,23762,23780,23755,23781,23810,23811,23847,
+23846,23854,23844,23838,23814,23835,23896,23870,23860,23869,23916,23899,23919,
+23901,23915,23883,23882,23913,23924,23938,23961,23965,35955,23991,24005,24435,
+24439,24450,24455,24457,24460,24469,24473,24476,24488,24493,24501,24508,34914,
+24417,29357,29360,29364,29367,29368,29379,29377,29390,29389,29394,29416,29423,
+29417,29426,29428,29431,29441,29427,29443,29434,37350,
+37351,37352,37353,37354,37355,37356,37357,37358,37359,37360,37361,37362,37363,
+37364,37365,37366,37367,37368,37369,37370,37371,37372,37373,37374,37375,37376,
+37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37387,37388,37389,
+37390,37391,37392,37393,37394,37395,37396,37397,37398,37399,37400,37401,37402,
+37403,37404,37405,37406,37407,37408,37409,37410,37411,37412,37413,37414,37415,
+37416,37417,37418,37419,37420,37421,37422,37423,37424,37425,37426,37427,37428,
+37429,37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440,37441,
+37442,37443,37444,37445,29435,29463,29459,29473,29450,29470,29469,29461,29474,
+29497,29477,29484,29496,29489,29520,29517,29527,29536,29548,29551,29566,33307,
+22821,39143,22820,22786,39267,39271,39272,39273,39274,39275,39276,39284,39287,
+39293,39296,39300,39303,39306,39309,39312,39313,39315,39316,39317,24192,24209,
+24203,24214,24229,24224,24249,24245,24254,24243,36179,24274,24273,24283,24296,
+24298,33210,24516,24521,24534,24527,24579,24558,24580,24545,24548,24574,24581,
+24582,24554,24557,24568,24601,24629,24614,24603,24591,24589,24617,24619,24586,
+24639,24609,24696,24697,24699,24698,24642,37446,37447,37448,37449,37450,37451,
+37452,37453,37454,37455,37456,37457,37458,37459,37460,37461,37462,37463,37464,
+37465,37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476,37477,
+37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489,37490,
+37491,37493,37494,37495,37496,37497,37498,37499,37500,37501,37502,37503,37504,
+37505,37506,37507,37508,37509,37510,37511,37512,37513,
+37514,37515,37516,37517,37519,37520,37521,37522,37523,37524,37525,37526,37527,
+37528,37529,37530,37531,37532,37533,37534,37535,37536,37537,37538,37539,37540,
+37541,37542,37543,24682,24701,24726,24730,24749,24733,24707,24722,24716,24731,
+24812,24763,24753,24797,24792,24774,24794,24756,24864,24870,24853,24867,24820,
+24832,24846,24875,24906,24949,25004,24980,24999,25015,25044,25077,24541,38579,
+38377,38379,38385,38387,38389,38390,38396,38398,38403,38404,38406,38408,38410,
+38411,38412,38413,38415,38418,38421,38422,38423,38425,38426,20012,29247,25109,
+27701,27732,27740,27722,27811,27781,27792,27796,27788,27752,27753,27764,27766,
+27782,27817,27856,27860,27821,27895,27896,27889,27863,27826,27872,27862,27898,
+27883,27886,27825,27859,27887,27902,37544,37545,37546,37547,37548,37549,37551,
+37552,37553,37554,37555,37556,37557,37558,37559,37560,37561,37562,37563,37564,
+37565,37566,37567,37568,37569,37570,37571,37572,37573,37574,37575,37577,37578,
+37579,37580,37581,37582,37583,37584,37585,37586,37587,37588,37589,37590,37591,
+37592,37593,37594,37595,37596,37597,37598,37599,37600,37601,37602,37603,37604,
+37605,37606,37607,37608,37609,37610,37611,37612,37613,37614,37615,37616,37617,
+37618,37619,37620,37621,37622,37623,37624,37625,37626,37627,37628,37629,37630,
+37631,37632,37633,37634,37635,37636,37637,37638,37639,37640,37641,27961,27943,
+27916,27971,27976,27911,27908,27929,27918,27947,27981,27950,27957,27930,27983,
+27986,27988,27955,28049,28015,28062,28064,27998,28051,28052,27996,28000,28028,
+28003,28186,28103,28101,28126,28174,28095,28128,28177,
+28134,28125,28121,28182,28075,28172,28078,28203,28270,28238,28267,28338,28255,
+28294,28243,28244,28210,28197,28228,28383,28337,28312,28384,28461,28386,28325,
+28327,28349,28347,28343,28375,28340,28367,28303,28354,28319,28514,28486,28487,
+28452,28437,28409,28463,28470,28491,28532,28458,28425,28457,28553,28557,28556,
+28536,28530,28540,28538,28625,37642,37643,37644,37645,37646,37647,37648,37649,
+37650,37651,37652,37653,37654,37655,37656,37657,37658,37659,37660,37661,37662,
+37663,37664,37665,37666,37667,37668,37669,37670,37671,37672,37673,37674,37675,
+37676,37677,37678,37679,37680,37681,37682,37683,37684,37685,37686,37687,37688,
+37689,37690,37691,37692,37693,37695,37696,37697,37698,37699,37700,37701,37702,
+37703,37704,37705,37706,37707,37708,37709,37710,37711,37712,37713,37714,37715,
+37716,37717,37718,37719,37720,37721,37722,37723,37724,37725,37726,37727,37728,
+37729,37730,37731,37732,37733,37734,37735,37736,37737,37739,28617,28583,28601,
+28598,28610,28641,28654,28638,28640,28655,28698,28707,28699,28729,28725,28751,
+28766,23424,23428,23445,23443,23461,23480,29999,39582,25652,23524,23534,35120,
+23536,36423,35591,36790,36819,36821,36837,36846,36836,36841,36838,36851,36840,
+36869,36868,36875,36902,36881,36877,36886,36897,36917,36918,36909,36911,36932,
+36945,36946,36944,36968,36952,36962,36955,26297,36980,36989,36994,37000,36995,
+37003,24400,24407,24406,24408,23611,21675,23632,23641,23409,23651,23654,32700,
+24362,24361,24365,33396,24380,39739,23662,22913,22915,22925,22953,22954,22947,
+37740,37741,37742,37743,37744,37745,37746,37747,37748,
+37749,37750,37751,37752,37753,37754,37755,37756,37757,37758,37759,37760,37761,
+37762,37763,37764,37765,37766,37767,37768,37769,37770,37771,37772,37773,37774,
+37776,37777,37778,37779,37780,37781,37782,37783,37784,37785,37786,37787,37788,
+37789,37790,37791,37792,37793,37794,37795,37796,37797,37798,37799,37800,37801,
+37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812,37813,37814,
+37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825,37826,37827,
+37828,37829,37830,37831,37832,37833,37835,37836,37837,22935,22986,22955,22942,
+22948,22994,22962,22959,22999,22974,23045,23046,23005,23048,23011,23000,23033,
+23052,23049,23090,23092,23057,23075,23059,23104,23143,23114,23125,23100,23138,
+23157,33004,23210,23195,23159,23162,23230,23275,23218,23250,23252,23224,23264,
+23267,23281,23254,23270,23256,23260,23305,23319,23318,23346,23351,23360,23573,
+23580,23386,23397,23411,23377,23379,23394,39541,39543,39544,39546,39551,39549,
+39552,39553,39557,39560,39562,39568,39570,39571,39574,39576,39579,39580,39581,
+39583,39584,39586,39587,39589,39591,32415,32417,32419,32421,32424,32425,37838,
+37839,37840,37841,37842,37843,37844,37845,37847,37848,37849,37850,37851,37852,
+37853,37854,37855,37856,37857,37858,37859,37860,37861,37862,37863,37864,37865,
+37866,37867,37868,37869,37870,37871,37872,37873,37874,37875,37876,37877,37878,
+37879,37880,37881,37882,37883,37884,37885,37886,37887,37888,37889,37890,37891,
+37892,37893,37894,37895,37896,37897,37898,37899,37900,37901,37902,37903,37904,
+37905,37906,37907,37908,37909,37910,37911,37912,37913,
+37914,37915,37916,37917,37918,37919,37920,37921,37922,37923,37924,37925,37926,
+37927,37928,37929,37930,37931,37932,37933,37934,32429,32432,32446,32448,32449,
+32450,32457,32459,32460,32464,32468,32471,32475,32480,32481,32488,32491,32494,
+32495,32497,32498,32525,32502,32506,32507,32510,32513,32514,32515,32519,32520,
+32523,32524,32527,32529,32530,32535,32537,32540,32539,32543,32545,32546,32547,
+32548,32549,32550,32551,32554,32555,32556,32557,32559,32560,32561,32562,32563,
+32565,24186,30079,24027,30014,37013,29582,29585,29614,29602,29599,29647,29634,
+29649,29623,29619,29632,29641,29640,29669,29657,39036,29706,29673,29671,29662,
+29626,29682,29711,29738,29787,29734,29733,29736,29744,29742,29740,37935,37936,
+37937,37938,37939,37940,37941,37942,37943,37944,37945,37946,37947,37948,37949,
+37951,37952,37953,37954,37955,37956,37957,37958,37959,37960,37961,37962,37963,
+37964,37965,37966,37967,37968,37969,37970,37971,37972,37973,37974,37975,37976,
+37977,37978,37979,37980,37981,37982,37983,37984,37985,37986,37987,37988,37989,
+37990,37991,37992,37993,37994,37996,37997,37998,37999,38000,38001,38002,38003,
+38004,38005,38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016,
+38017,38018,38019,38020,38033,38038,38040,38087,38095,38099,38100,38106,38118,
+38139,38172,38176,29723,29722,29761,29788,29783,29781,29785,29815,29805,29822,
+29852,29838,29824,29825,29831,29835,29854,29864,29865,29840,29863,29906,29882,
+38890,38891,38892,26444,26451,26462,26440,26473,26533,26503,26474,26483,26520,
+26535,26485,26536,26526,26541,26507,26487,26492,26608,
+26633,26584,26634,26601,26544,26636,26585,26549,26586,26547,26589,26624,26563,
+26552,26594,26638,26561,26621,26674,26675,26720,26721,26702,26722,26692,26724,
+26755,26653,26709,26726,26689,26727,26688,26686,26698,26697,26665,26805,26767,
+26740,26743,26771,26731,26818,26990,26876,26911,26912,26873,38183,38195,38205,
+38211,38216,38219,38229,38234,38240,38254,38260,38261,38263,38264,38265,38266,
+38267,38268,38269,38270,38272,38273,38274,38275,38276,38277,38278,38279,38280,
+38281,38282,38283,38284,38285,38286,38287,38288,38289,38290,38291,38292,38293,
+38294,38295,38296,38297,38298,38299,38300,38301,38302,38303,38304,38305,38306,
+38307,38308,38309,38310,38311,38312,38313,38314,38315,38316,38317,38318,38319,
+38320,38321,38322,38323,38324,38325,38326,38327,38328,38329,38330,38331,38332,
+38333,38334,38335,38336,38337,38338,38339,38340,38341,38342,38343,38344,38345,
+38346,38347,26916,26864,26891,26881,26967,26851,26896,26993,26937,26976,26946,
+26973,27012,26987,27008,27032,27000,26932,27084,27015,27016,27086,27017,26982,
+26979,27001,27035,27047,27067,27051,27053,27092,27057,27073,27082,27103,27029,
+27104,27021,27135,27183,27117,27159,27160,27237,27122,27204,27198,27296,27216,
+27227,27189,27278,27257,27197,27176,27224,27260,27281,27280,27305,27287,27307,
+29495,29522,27521,27522,27527,27524,27538,27539,27533,27546,27547,27553,27562,
+36715,36717,36721,36722,36723,36725,36726,36728,36727,36729,36730,36732,36734,
+36737,36738,36740,36743,36747,38348,38349,38350,38351,38352,38353,38354,38355,
+38356,38357,38358,38359,38360,38361,38362,38363,38364,
+38365,38366,38367,38368,38369,38370,38371,38372,38373,38374,38375,38380,38399,
+38407,38419,38424,38427,38430,38432,38435,38436,38437,38438,38439,38440,38441,
+38443,38444,38445,38447,38448,38455,38456,38457,38458,38462,38465,38467,38474,
+38478,38479,38481,38482,38483,38486,38487,38488,38489,38490,38492,38493,38494,
+38496,38499,38501,38502,38507,38509,38510,38511,38512,38513,38515,38520,38521,
+38522,38523,38524,38525,38526,38527,38528,38529,38530,38531,38532,38535,38537,
+38538,36749,36750,36751,36760,36762,36558,25099,25111,25115,25119,25122,25121,
+25125,25124,25132,33255,29935,29940,29951,29967,29969,29971,25908,26094,26095,
+26096,26122,26137,26482,26115,26133,26112,28805,26359,26141,26164,26161,26166,
+26165,32774,26207,26196,26177,26191,26198,26209,26199,26231,26244,26252,26279,
+26269,26302,26331,26332,26342,26345,36146,36147,36150,36155,36157,36160,36165,
+36166,36168,36169,36167,36173,36181,36185,35271,35274,35275,35276,35278,35279,
+35280,35281,29294,29343,29277,29286,29295,29310,29311,29316,29323,29325,29327,
+29330,25352,25394,25520,38540,38542,38545,38546,38547,38549,38550,38554,38555,
+38557,38558,38559,38560,38561,38562,38563,38564,38565,38566,38568,38569,38570,
+38571,38572,38573,38574,38575,38577,38578,38580,38581,38583,38584,38586,38587,
+38591,38594,38595,38600,38602,38603,38608,38609,38611,38612,38614,38615,38616,
+38617,38618,38619,38620,38621,38622,38623,38625,38626,38627,38628,38629,38630,
+38631,38635,38636,38637,38638,38640,38641,38642,38644,38645,38648,38650,38651,
+38652,38653,38655,38658,38659,38661,38666,38667,38668,
+38672,38673,38674,38676,38677,38679,38680,38681,38682,38683,38685,38687,38688,
+25663,25816,32772,27626,27635,27645,27637,27641,27653,27655,27654,27661,27669,
+27672,27673,27674,27681,27689,27684,27690,27698,25909,25941,25963,29261,29266,
+29270,29232,34402,21014,32927,32924,32915,32956,26378,32957,32945,32939,32941,
+32948,32951,32999,33000,33001,33002,32987,32962,32964,32985,32973,32983,26384,
+32989,33003,33009,33012,33005,33037,33038,33010,33020,26389,33042,35930,33078,
+33054,33068,33048,33074,33096,33100,33107,33140,33113,33114,33137,33120,33129,
+33148,33149,33133,33127,22605,23221,33160,33154,33169,28373,33187,33194,33228,
+26406,33226,33211,38689,38690,38691,38692,38693,38694,38695,38696,38697,38699,
+38700,38702,38703,38705,38707,38708,38709,38710,38711,38714,38715,38716,38717,
+38719,38720,38721,38722,38723,38724,38725,38726,38727,38728,38729,38730,38731,
+38732,38733,38734,38735,38736,38737,38740,38741,38743,38744,38746,38748,38749,
+38751,38755,38756,38758,38759,38760,38762,38763,38764,38765,38766,38767,38768,
+38769,38770,38773,38775,38776,38777,38778,38779,38781,38782,38783,38784,38785,
+38786,38787,38788,38790,38791,38792,38793,38794,38796,38798,38799,38800,38803,
+38805,38806,38807,38809,38810,38811,38812,38813,33217,33190,27428,27447,27449,
+27459,27462,27481,39121,39122,39123,39125,39129,39130,27571,24384,27586,35315,
+26000,40785,26003,26044,26054,26052,26051,26060,26062,26066,26070,28800,28828,
+28822,28829,28859,28864,28855,28843,28849,28904,28874,28944,28947,28950,28975,
+28977,29043,29020,29032,28997,29042,29002,29048,29050,
+29080,29107,29109,29096,29088,29152,29140,29159,29177,29213,29224,28780,28952,
+29030,29113,25150,25149,25155,25160,25161,31035,31040,31046,31049,31067,31068,
+31059,31066,31074,31063,31072,31087,31079,31098,31109,31114,31130,31143,31155,
+24529,24528,38814,38815,38817,38818,38820,38821,38822,38823,38824,38825,38826,
+38828,38830,38832,38833,38835,38837,38838,38839,38840,38841,38842,38843,38844,
+38845,38846,38847,38848,38849,38850,38851,38852,38853,38854,38855,38856,38857,
+38858,38859,38860,38861,38862,38863,38864,38865,38866,38867,38868,38869,38870,
+38871,38872,38873,38874,38875,38876,38877,38878,38879,38880,38881,38882,38883,
+38884,38885,38888,38894,38895,38896,38897,38898,38900,38903,38904,38905,38906,
+38907,38908,38909,38910,38911,38912,38913,38914,38915,38916,38917,38918,38919,
+38920,38921,38922,38923,38924,38925,38926,24636,24669,24666,24679,24641,24665,
+24675,24747,24838,24845,24925,25001,24989,25035,25041,25094,32896,32895,27795,
+27894,28156,30710,30712,30720,30729,30743,30744,30737,26027,30765,30748,30749,
+30777,30778,30779,30751,30780,30757,30764,30755,30761,30798,30829,30806,30807,
+30758,30800,30791,30796,30826,30875,30867,30874,30855,30876,30881,30883,30898,
+30905,30885,30932,30937,30921,30956,30962,30981,30964,30995,31012,31006,31028,
+40859,40697,40699,40700,30449,30468,30477,30457,30471,30472,30490,30498,30489,
+30509,30502,30517,30520,30544,30545,30535,30531,30554,30568,38927,38928,38929,
+38930,38931,38932,38933,38934,38935,38936,38937,38938,38939,38940,38941,38942,
+38943,38944,38945,38946,38947,38948,38949,38950,38951,
+38952,38953,38954,38955,38956,38957,38958,38959,38960,38961,38962,38963,38964,
+38965,38966,38967,38968,38969,38970,38971,38972,38973,38974,38975,38976,38977,
+38978,38979,38980,38981,38982,38983,38984,38985,38986,38987,38988,38989,38990,
+38991,38992,38993,38994,38995,38996,38997,38998,38999,39000,39001,39002,39003,
+39004,39005,39006,39007,39008,39009,39010,39011,39012,39013,39014,39015,39016,
+39017,39018,39019,39020,39021,39022,30562,30565,30591,30605,30589,30592,30604,
+30609,30623,30624,30640,30645,30653,30010,30016,30030,30027,30024,30043,30066,
+30073,30083,32600,32609,32607,35400,32616,32628,32625,32633,32641,32638,30413,
+30437,34866,38021,38022,38023,38027,38026,38028,38029,38031,38032,38036,38039,
+38037,38042,38043,38044,38051,38052,38059,38058,38061,38060,38063,38064,38066,
+38068,38070,38071,38072,38073,38074,38076,38077,38079,38084,38088,38089,38090,
+38091,38092,38093,38094,38096,38097,38098,38101,38102,38103,38105,38104,38107,
+38110,38111,38112,38114,38116,38117,38119,38120,38122,39023,39024,39025,39026,
+39027,39028,39051,39054,39058,39061,39065,39075,39080,39081,39082,39083,39084,
+39085,39086,39087,39088,39089,39090,39091,39092,39093,39094,39095,39096,39097,
+39098,39099,39100,39101,39102,39103,39104,39105,39106,39107,39108,39109,39110,
+39111,39112,39113,39114,39115,39116,39117,39119,39120,39124,39126,39127,39131,
+39132,39133,39136,39137,39138,39139,39140,39141,39142,39145,39146,39147,39148,
+39149,39150,39151,39152,39153,39154,39155,39156,39157,39158,39159,39160,39161,
+39162,39163,39164,39165,39166,39167,39168,39169,39170,
+39171,39172,39173,39174,39175,38121,38123,38126,38127,38131,38132,38133,38135,
+38137,38140,38141,38143,38147,38146,38150,38151,38153,38154,38157,38158,38159,
+38162,38163,38164,38165,38166,38168,38171,38173,38174,38175,38178,38186,38187,
+38185,38188,38193,38194,38196,38198,38199,38200,38204,38206,38207,38210,38197,
+38212,38213,38214,38217,38220,38222,38223,38226,38227,38228,38230,38231,38232,
+38233,38235,38238,38239,38237,38241,38242,38244,38245,38246,38247,38248,38249,
+38250,38251,38252,38255,38257,38258,38259,38202,30695,30700,38601,31189,31213,
+31203,31211,31238,23879,31235,31234,31262,31252,39176,39177,39178,39179,39180,
+39182,39183,39185,39186,39187,39188,39189,39190,39191,39192,39193,39194,39195,
+39196,39197,39198,39199,39200,39201,39202,39203,39204,39205,39206,39207,39208,
+39209,39210,39211,39212,39213,39215,39216,39217,39218,39219,39220,39221,39222,
+39223,39224,39225,39226,39227,39228,39229,39230,39231,39232,39233,39234,39235,
+39236,39237,39238,39239,39240,39241,39242,39243,39244,39245,39246,39247,39248,
+39249,39250,39251,39254,39255,39256,39257,39258,39259,39260,39261,39262,39263,
+39264,39265,39266,39268,39270,39283,39288,39289,39291,39294,39298,39299,39305,
+31289,31287,31313,40655,39333,31344,30344,30350,30355,30361,30372,29918,29920,
+29996,40480,40482,40488,40489,40490,40491,40492,40498,40497,40502,40504,40503,
+40505,40506,40510,40513,40514,40516,40518,40519,40520,40521,40523,40524,40526,
+40529,40533,40535,40538,40539,40540,40542,40547,40550,40551,40552,40553,40554,
+40555,40556,40561,40557,40563,30098,30100,30102,30112,
+30109,30124,30115,30131,30132,30136,30148,30129,30128,30147,30146,30166,30157,
+30179,30184,30182,30180,30187,30183,30211,30193,30204,30207,30224,30208,30213,
+30220,30231,30218,30245,30232,30229,30233,39308,39310,39322,39323,39324,39325,
+39326,39327,39328,39329,39330,39331,39332,39334,39335,39337,39338,39339,39340,
+39341,39342,39343,39344,39345,39346,39347,39348,39349,39350,39351,39352,39353,
+39354,39355,39356,39357,39358,39359,39360,39361,39362,39363,39364,39365,39366,
+39367,39368,39369,39370,39371,39372,39373,39374,39375,39376,39377,39378,39379,
+39380,39381,39382,39383,39384,39385,39386,39387,39388,39389,39390,39391,39392,
+39393,39394,39395,39396,39397,39398,39399,39400,39401,39402,39403,39404,39405,
+39406,39407,39408,39409,39410,39411,39412,39413,39414,39415,39416,39417,30235,
+30268,30242,30240,30272,30253,30256,30271,30261,30275,30270,30259,30285,30302,
+30292,30300,30294,30315,30319,32714,31462,31352,31353,31360,31366,31368,31381,
+31398,31392,31404,31400,31405,31411,34916,34921,34930,34941,34943,34946,34978,
+35014,34999,35004,35017,35042,35022,35043,35045,35057,35098,35068,35048,35070,
+35056,35105,35097,35091,35099,35082,35124,35115,35126,35137,35174,35195,30091,
+32997,30386,30388,30684,32786,32788,32790,32796,32800,32802,32805,32806,32807,
+32809,32808,32817,32779,32821,32835,32838,32845,32850,32873,32881,35203,39032,
+39040,39043,39418,39419,39420,39421,39422,39423,39424,39425,39426,39427,39428,
+39429,39430,39431,39432,39433,39434,39435,39436,39437,39438,39439,39440,39441,
+39442,39443,39444,39445,39446,39447,39448,39449,39450,
+39451,39452,39453,39454,39455,39456,39457,39458,39459,39460,39461,39462,39463,
+39464,39465,39466,39467,39468,39469,39470,39471,39472,39473,39474,39475,39476,
+39477,39478,39479,39480,39481,39482,39483,39484,39485,39486,39487,39488,39489,
+39490,39491,39492,39493,39494,39495,39496,39497,39498,39499,39500,39501,39502,
+39503,39504,39505,39506,39507,39508,39509,39510,39511,39512,39513,39049,39052,
+39053,39055,39060,39066,39067,39070,39071,39073,39074,39077,39078,34381,34388,
+34412,34414,34431,34426,34428,34427,34472,34445,34443,34476,34461,34471,34467,
+34474,34451,34473,34486,34500,34485,34510,34480,34490,34481,34479,34505,34511,
+34484,34537,34545,34546,34541,34547,34512,34579,34526,34548,34527,34520,34513,
+34563,34567,34552,34568,34570,34573,34569,34595,34619,34590,34597,34606,34586,
+34622,34632,34612,34609,34601,34615,34623,34690,34594,34685,34686,34683,34656,
+34672,34636,34670,34699,34643,34659,34684,34660,34649,34661,34707,34735,34728,
+34770,39514,39515,39516,39517,39518,39519,39520,39521,39522,39523,39524,39525,
+39526,39527,39528,39529,39530,39531,39538,39555,39561,39565,39566,39572,39573,
+39577,39590,39593,39594,39595,39596,39597,39598,39599,39602,39603,39604,39605,
+39609,39611,39613,39614,39615,39619,39620,39622,39623,39624,39625,39626,39629,
+39630,39631,39632,39634,39636,39637,39638,39639,39641,39642,39643,39644,39645,
+39646,39648,39650,39651,39652,39653,39655,39656,39657,39658,39660,39662,39664,
+39665,39666,39667,39668,39669,39670,39671,39672,39674,39676,39677,39678,39679,
+39680,39681,39682,39684,39685,39686,34758,34696,34693,
+34733,34711,34691,34731,34789,34732,34741,34739,34763,34771,34749,34769,34752,
+34762,34779,34794,34784,34798,34838,34835,34814,34826,34843,34849,34873,34876,
+32566,32578,32580,32581,33296,31482,31485,31496,31491,31492,31509,31498,31531,
+31503,31559,31544,31530,31513,31534,31537,31520,31525,31524,31539,31550,31518,
+31576,31578,31557,31605,31564,31581,31584,31598,31611,31586,31602,31601,31632,
+31654,31655,31672,31660,31645,31656,31621,31658,31644,31650,31659,31668,31697,
+31681,31692,31709,31706,31717,31718,31722,31756,31742,31740,31759,31766,31755,
+39687,39689,39690,39691,39692,39693,39694,39696,39697,39698,39700,39701,39702,
+39703,39704,39705,39706,39707,39708,39709,39710,39712,39713,39714,39716,39717,
+39718,39719,39720,39721,39722,39723,39724,39725,39726,39728,39729,39731,39732,
+39733,39734,39735,39736,39737,39738,39741,39742,39743,39744,39750,39754,39755,
+39756,39758,39760,39762,39763,39765,39766,39767,39768,39769,39770,39771,39772,
+39773,39774,39775,39776,39777,39778,39779,39780,39781,39782,39783,39784,39785,
+39786,39787,39788,39789,39790,39791,39792,39793,39794,39795,39796,39797,39798,
+39799,39800,39801,39802,39803,31775,31786,31782,31800,31809,31808,33278,33281,
+33282,33284,33260,34884,33313,33314,33315,33325,33327,33320,33323,33336,33339,
+33331,33332,33342,33348,33353,33355,33359,33370,33375,33384,34942,34949,34952,
+35032,35039,35166,32669,32671,32679,32687,32688,32690,31868,25929,31889,31901,
+31900,31902,31906,31922,31932,31933,31937,31943,31948,31949,31944,31941,31959,
+31976,33390,26280,32703,32718,32725,32741,32737,32742,
+32745,32750,32755,31992,32119,32166,32174,32327,32411,40632,40628,36211,36228,
+36244,36241,36273,36199,36205,35911,35913,37194,37200,37198,37199,37220,39804,
+39805,39806,39807,39808,39809,39810,39811,39812,39813,39814,39815,39816,39817,
+39818,39819,39820,39821,39822,39823,39824,39825,39826,39827,39828,39829,39830,
+39831,39832,39833,39834,39835,39836,39837,39838,39839,39840,39841,39842,39843,
+39844,39845,39846,39847,39848,39849,39850,39851,39852,39853,39854,39855,39856,
+39857,39858,39859,39860,39861,39862,39863,39864,39865,39866,39867,39868,39869,
+39870,39871,39872,39873,39874,39875,39876,39877,39878,39879,39880,39881,39882,
+39883,39884,39885,39886,39887,39888,39889,39890,39891,39892,39893,39894,39895,
+39896,39897,39898,39899,37218,37217,37232,37225,37231,37245,37246,37234,37236,
+37241,37260,37253,37264,37261,37265,37282,37283,37290,37293,37294,37295,37301,
+37300,37306,35925,40574,36280,36331,36357,36441,36457,36277,36287,36284,36282,
+36292,36310,36311,36314,36318,36302,36303,36315,36294,36332,36343,36344,36323,
+36345,36347,36324,36361,36349,36372,36381,36383,36396,36398,36387,36399,36410,
+36416,36409,36405,36413,36401,36425,36417,36418,36433,36434,36426,36464,36470,
+36476,36463,36468,36485,36495,36500,36496,36508,36510,35960,35970,35978,35973,
+35992,35988,26011,35286,35294,35290,35292,39900,39901,39902,39903,39904,39905,
+39906,39907,39908,39909,39910,39911,39912,39913,39914,39915,39916,39917,39918,
+39919,39920,39921,39922,39923,39924,39925,39926,39927,39928,39929,39930,39931,
+39932,39933,39934,39935,39936,39937,39938,39939,39940,
+39941,39942,39943,39944,39945,39946,39947,39948,39949,39950,39951,39952,39953,
+39954,39955,39956,39957,39958,39959,39960,39961,39962,39963,39964,39965,39966,
+39967,39968,39969,39970,39971,39972,39973,39974,39975,39976,39977,39978,39979,
+39980,39981,39982,39983,39984,39985,39986,39987,39988,39989,39990,39991,39992,
+39993,39994,39995,35301,35307,35311,35390,35622,38739,38633,38643,38639,38662,
+38657,38664,38671,38670,38698,38701,38704,38718,40832,40835,40837,40838,40839,
+40840,40841,40842,40844,40702,40715,40717,38585,38588,38589,38606,38610,30655,
+38624,37518,37550,37576,37694,37738,37834,37775,37950,37995,40063,40066,40069,
+40070,40071,40072,31267,40075,40078,40080,40081,40082,40084,40085,40090,40091,
+40094,40095,40096,40097,40098,40099,40101,40102,40103,40104,40105,40107,40109,
+40110,40112,40113,40114,40115,40116,40117,40118,40119,40122,40123,40124,40125,
+40132,40133,40134,40135,40138,40139,39996,39997,39998,39999,40000,40001,40002,
+40003,40004,40005,40006,40007,40008,40009,40010,40011,40012,40013,40014,40015,
+40016,40017,40018,40019,40020,40021,40022,40023,40024,40025,40026,40027,40028,
+40029,40030,40031,40032,40033,40034,40035,40036,40037,40038,40039,40040,40041,
+40042,40043,40044,40045,40046,40047,40048,40049,40050,40051,40052,40053,40054,
+40055,40056,40057,40058,40059,40061,40062,40064,40067,40068,40073,40074,40076,
+40079,40083,40086,40087,40088,40089,40093,40106,40108,40111,40121,40126,40127,
+40128,40129,40130,40136,40137,40145,40146,40154,40155,40160,40161,40140,40141,
+40142,40143,40144,40147,40148,40149,40151,40152,40153,
+40156,40157,40159,40162,38780,38789,38801,38802,38804,38831,38827,38819,38834,
+38836,39601,39600,39607,40536,39606,39610,39612,39617,39616,39621,39618,39627,
+39628,39633,39749,39747,39751,39753,39752,39757,39761,39144,39181,39214,39253,
+39252,39647,39649,39654,39663,39659,39675,39661,39673,39688,39695,39699,39711,
+39715,40637,40638,32315,40578,40583,40584,40587,40594,37846,40605,40607,40667,
+40668,40669,40672,40671,40674,40681,40679,40677,40682,40687,40738,40748,40751,
+40761,40759,40765,40766,40772,40163,40164,40165,40166,40167,40168,40169,40170,
+40171,40172,40173,40174,40175,40176,40177,40178,40179,40180,40181,40182,40183,
+40184,40185,40186,40187,40188,40189,40190,40191,40192,40193,40194,40195,40196,
+40197,40198,40199,40200,40201,40202,40203,40204,40205,40206,40207,40208,40209,
+40210,40211,40212,40213,40214,40215,40216,40217,40218,40219,40220,40221,40222,
+40223,40224,40225,40226,40227,40228,40229,40230,40231,40232,40233,40234,40235,
+40236,40237,40238,40239,40240,40241,40242,40243,40244,40245,40246,40247,40248,
+40249,40250,40251,40252,40253,40254,40255,40256,40257,40258,57908,57909,57910,
+57911,57912,57913,57914,57915,57916,57917,57918,57919,57920,57921,57922,57923,
+57924,57925,57926,57927,57928,57929,57930,57931,57932,57933,57934,57935,57936,
+57937,57938,57939,57940,57941,57942,57943,57944,57945,57946,57947,57948,57949,
+57950,57951,57952,57953,57954,57955,57956,57957,57958,57959,57960,57961,57962,
+57963,57964,57965,57966,57967,57968,57969,57970,57971,57972,57973,57974,57975,
+57976,57977,57978,57979,57980,57981,57982,57983,57984,
+57985,57986,57987,57988,57989,57990,57991,57992,57993,57994,57995,57996,57997,
+57998,57999,58000,58001,40259,40260,40261,40262,40263,40264,40265,40266,40267,
+40268,40269,40270,40271,40272,40273,40274,40275,40276,40277,40278,40279,40280,
+40281,40282,40283,40284,40285,40286,40287,40288,40289,40290,40291,40292,40293,
+40294,40295,40296,40297,40298,40299,40300,40301,40302,40303,40304,40305,40306,
+40307,40308,40309,40310,40311,40312,40313,40314,40315,40316,40317,40318,40319,
+40320,40321,40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332,
+40333,40334,40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345,
+40346,40347,40348,40349,40350,40351,40352,40353,40354,58002,58003,58004,58005,
+58006,58007,58008,58009,58010,58011,58012,58013,58014,58015,58016,58017,58018,
+58019,58020,58021,58022,58023,58024,58025,58026,58027,58028,58029,58030,58031,
+58032,58033,58034,58035,58036,58037,58038,58039,58040,58041,58042,58043,58044,
+58045,58046,58047,58048,58049,58050,58051,58052,58053,58054,58055,58056,58057,
+58058,58059,58060,58061,58062,58063,58064,58065,58066,58067,58068,58069,58070,
+58071,58072,58073,58074,58075,58076,58077,58078,58079,58080,58081,58082,58083,
+58084,58085,58086,58087,58088,58089,58090,58091,58092,58093,58094,58095,40355,
+40356,40357,40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368,
+40369,40370,40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381,
+40382,40383,40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,40394,
+40395,40396,40397,40398,40399,40400,40401,40402,40403,
+40404,40405,40406,40407,40408,40409,40410,40411,40412,40413,40414,40415,40416,
+40417,40418,40419,40420,40421,40422,40423,40424,40425,40426,40427,40428,40429,
+40430,40431,40432,40433,40434,40435,40436,40437,40438,40439,40440,40441,40442,
+40443,40444,40445,40446,40447,40448,40449,40450,58096,58097,58098,58099,58100,
+58101,58102,58103,58104,58105,58106,58107,58108,58109,58110,58111,58112,58113,
+58114,58115,58116,58117,58118,58119,58120,58121,58122,58123,58124,58125,58126,
+58127,58128,58129,58130,58131,58132,58133,58134,58135,58136,58137,58138,58139,
+58140,58141,58142,58143,58144,58145,58146,58147,58148,58149,58150,58151,58152,
+58153,58154,58155,58156,58157,58158,58159,58160,58161,58162,58163,58164,58165,
+58166,58167,58168,58169,58170,58171,58172,58173,58174,58175,58176,58177,58178,
+58179,58180,58181,58182,58183,58184,58185,58186,58187,58188,58189,40451,40452,
+40453,40454,40455,40456,40457,40458,40459,40460,40461,40462,40463,40464,40465,
+40466,40467,40468,40469,40470,40471,40472,40473,40474,40475,40476,40477,40478,
+40484,40487,40494,40496,40500,40507,40508,40512,40525,40528,40530,40531,40532,
+40534,40537,40541,40543,40544,40545,40546,40549,40558,40559,40562,40564,40565,
+40566,40567,40568,40569,40570,40571,40572,40573,40576,40577,40579,40580,40581,
+40582,40585,40586,40588,40589,40590,40591,40592,40593,40596,40597,40598,40599,
+40600,40601,40602,40603,40604,40606,40608,40609,40610,40611,40612,40613,40615,
+40616,40617,40618,58190,58191,58192,58193,58194,58195,58196,58197,58198,58199,
+58200,58201,58202,58203,58204,58205,58206,58207,58208,
+58209,58210,58211,58212,58213,58214,58215,58216,58217,58218,58219,58220,58221,
+58222,58223,58224,58225,58226,58227,58228,58229,58230,58231,58232,58233,58234,
+58235,58236,58237,58238,58239,58240,58241,58242,58243,58244,58245,58246,58247,
+58248,58249,58250,58251,58252,58253,58254,58255,58256,58257,58258,58259,58260,
+58261,58262,58263,58264,58265,58266,58267,58268,58269,58270,58271,58272,58273,
+58274,58275,58276,58277,58278,58279,58280,58281,58282,58283,40619,40620,40621,
+40622,40623,40624,40625,40626,40627,40629,40630,40631,40633,40634,40636,40639,
+40640,40641,40642,40643,40645,40646,40647,40648,40650,40651,40652,40656,40658,
+40659,40661,40662,40663,40665,40666,40670,40673,40675,40676,40678,40680,40683,
+40684,40685,40686,40688,40689,40690,40691,40692,40693,40694,40695,40696,40698,
+40701,40703,40704,40705,40706,40707,40708,40709,40710,40711,40712,40713,40714,
+40716,40719,40721,40722,40724,40725,40726,40728,40730,40731,40732,40733,40734,
+40735,40737,40739,40740,40741,40742,40743,40744,40745,40746,40747,40749,40750,
+40752,40753,58284,58285,58286,58287,58288,58289,58290,58291,58292,58293,58294,
+58295,58296,58297,58298,58299,58300,58301,58302,58303,58304,58305,58306,58307,
+58308,58309,58310,58311,58312,58313,58314,58315,58316,58317,58318,58319,58320,
+58321,58322,58323,58324,58325,58326,58327,58328,58329,58330,58331,58332,58333,
+58334,58335,58336,58337,58338,58339,58340,58341,58342,58343,58344,58345,58346,
+58347,58348,58349,58350,58351,58352,58353,58354,58355,58356,58357,58358,58359,
+58360,58361,58362,58363,58364,58365,58366,58367,58368,
+58369,58370,58371,58372,58373,58374,58375,58376,58377,40754,40755,40756,40757,
+40758,40760,40762,40764,40767,40768,40769,40770,40771,40773,40774,40775,40776,
+40777,40778,40779,40780,40781,40782,40783,40786,40787,40788,40789,40790,40791,
+40792,40793,40794,40795,40796,40797,40798,40799,40800,40801,40802,40803,40804,
+40805,40806,40807,40808,40809,40810,40811,40812,40813,40814,40815,40816,40817,
+40818,40819,40820,40821,40822,40823,40824,40825,40826,40827,40828,40829,40830,
+40833,40834,40845,40846,40847,40848,40849,40850,40851,40852,40853,40854,40855,
+40856,40860,40861,40862,40865,40866,40867,40868,40869,63788,63865,63893,63975,
+63985,58378,58379,58380,58381,58382,58383,58384,58385,58386,58387,58388,58389,
+58390,58391,58392,58393,58394,58395,58396,58397,58398,58399,58400,58401,58402,
+58403,58404,58405,58406,58407,58408,58409,58410,58411,58412,58413,58414,58415,
+58416,58417,58418,58419,58420,58421,58422,58423,58424,58425,58426,58427,58428,
+58429,58430,58431,58432,58433,58434,58435,58436,58437,58438,58439,58440,58441,
+58442,58443,58444,58445,58446,58447,58448,58449,58450,58451,58452,58453,58454,
+58455,58456,58457,58458,58459,58460,58461,58462,58463,58464,58465,58466,58467,
+58468,58469,58470,58471,64012,64013,64014,64015,64017,64019,64020,64024,64031,
+64032,64033,64035,64036,64039,64040,64041,11905,59414,59415,59416,11908,13427,
+13383,11912,11915,59422,13726,13850,13838,11916,11927,14702,14616,59430,14799,
+14815,14963,14800,59435,59436,15182,15470,15584,11943,59441,59442,11946,16470,
+16735,11950,17207,11955,11958,11959,59451,17329,17324,
+11963,17373,17622,18017,17996,59459,18211,18217,18300,18317,11978,18759,18810,
+18813,18818,18819,18821,18822,18847,18843,18871,18870,59476,59477,19619,19615,
+19616,19617,19575,19618,19731,19732,19733,19734,19735,19736,19737,19886,59492,
+58472,58473,58474,58475,58476,58477,58478,58479,58480,58481,58482,58483,58484,
+58485,58486,58487,58488,58489,58490,58491,58492,58493,58494,58495,58496,58497,
+58498,58499,58500,58501,58502,58503,58504,58505,58506,58507,58508,58509,58510,
+58511,58512,58513,58514,58515,58516,58517,58518,58519,58520,58521,58522,58523,
+58524,58525,58526,58527,58528,58529,58530,58531,58532,58533,58534,58535,58536,
+58537,58538,58539,58540,58541,58542,58543,58544,58545,58546,58547,58548,58549,
+58550,58551,58552,58553,58554,58555,58556,58557,58558,58559,58560,58561,58562,
+58563,58564,58565,
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/hkscs.h b/src/components/lib/libc/musl-1.2.0/src/locale/hkscs.h
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/hkscs.h
rename to src/components/lib/libc/musl-1.2.0/src/locale/hkscs.h
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/iconv.c b/src/components/lib/libc/musl-1.2.0/src/locale/iconv.c
new file mode 100644
index 0000000000..3047c27b2e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/iconv.c
@@ -0,0 +1,685 @@
+#include <iconv.h>
+#include <errno.h>
+#include <wchar.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <stdint.h>
+#include "locale_impl.h"
+
+#define UTF_32BE    0300
+#define UTF_16LE    0301
+#define UTF_16BE    0302
+#define UTF_32LE    0303
+#define UCS2BE      0304
+#define UCS2LE      0305
+#define WCHAR_T     0306
+#define US_ASCII    0307
+#define UTF_8       0310
+#define UTF_16      0312
+#define UTF_32      0313
+#define UCS2        0314
+#define EUC_JP      0320
+#define SHIFT_JIS   0321
+#define ISO2022_JP  0322
+#define GB18030     0330
+#define GBK         0331
+#define GB2312      0332
+#define BIG5        0340
+#define EUC_KR      0350
+
+/* Definitions of charmaps. Each charmap consists of:
+ * 1. Empty-string-terminated list of null-terminated aliases.
+ * 2. Special type code or number of elided quads of entries.
+ * 3. Character table (size determined by field 2), consisting
+ *    of 5 bytes for every 4 characters, interpreted as 10-bit
+ *    indices into the legacy_chars table. */
+
+static const unsigned char charmaps[] =
+"utf8\0char\0\0\310"
+"wchart\0\0\306"
+"ucs2be\0\0\304"
+"ucs2le\0\0\305"
+"utf16be\0\0\302"
+"utf16le\0\0\301"
+"ucs4be\0utf32be\0\0\300"
+"ucs4le\0utf32le\0\0\303"
+"ascii\0usascii\0iso646\0iso646us\0\0\307"
+"utf16\0\0\312"
+"ucs4\0utf32\0\0\313"
+"ucs2\0\0\314"
+"eucjp\0\0\320"
+"shiftjis\0sjis\0\0\321"
+"iso2022jp\0\0\322"
+"gb18030\0\0\330"
+"gbk\0\0\331"
+"gb2312\0\0\332"
+"big5\0bigfive\0cp950\0big5hkscs\0\0\340"
+"euckr\0ksc5601\0ksx1001\0cp949\0\0\350"
+#include "codepages.h"
+;
+
+/* Table of characters that appear in legacy 8-bit codepages,
+ * limited to 1024 slots (10 bit indices). The first 256 entries
+ * are elided since those characters are obviously all included. */
+static const unsigned short legacy_chars[] = {
+#include "legacychars.h"
+};
+
+static const unsigned short jis0208[84][94] = {
+#include "jis0208.h"
+};
+
+static const unsigned short gb18030[126][190] = {
+#include "gb18030.h"
+};
+
+static const unsigned short big5[89][157] = {
+#include "big5.h"
+};
+
+static const unsigned short hkscs[] = {
+#include "hkscs.h"
+};
+
+static const unsigned short ksc[93][94] = {
+#include "ksc.h"
+};
+
+static const unsigned short rev_jis[] = {
+#include "revjis.h"
+};
+
+static int fuzzycmp(const unsigned char *a, const unsigned char *b)
+{
+	for (; *a && *b; a++, b++) {
+		while (*a && (*a|32U)-'a'>26 && *a-'0'>10U) a++;
+		if ((*a|32U) != *b) return 1;
+	}
+	return *a != *b;
+}
+
+static size_t find_charmap(const void *name)
+{
+	const unsigned char *s;
+	if (!*(char *)name) name=charmaps; /* "utf8" */
+	for (s=charmaps; *s; ) {
+		if (!fuzzycmp(name, s)) {
+			for (; *s; s+=strlen((void *)s)+1);
+			return s+1-charmaps;
+		}
+		s += strlen((void *)s)+1;
+		if (!*s) {
+			if (s[1] > 0200) s+=2;
+			else s+=2+(64U-s[1])*5;
+		}
+	}
+	return -1;
+}
+
+struct stateful_cd {
+	iconv_t base_cd;
+	unsigned state;
+};
+
+static iconv_t combine_to_from(size_t t, size_t f)
+{
+	return (void *)(f<<16 | t<<1 | 1);
+}
+
+static size_t extract_from(iconv_t cd)
+{
+	return (size_t)cd >> 16;
+}
+
+static size_t extract_to(iconv_t cd)
+{
+	return (size_t)cd >> 1 & 0x7fff;
+}
+
+iconv_t iconv_open(const char *to, const char *from)
+{
+	size_t f, t;
+	struct stateful_cd *scd;
+
+	if ((t = find_charmap(to))==-1
+	 || (f = find_charmap(from))==-1
+	 || (charmaps[t] >= 0330)) {
+		errno = EINVAL;
+		return (iconv_t)-1;
+	}
+	iconv_t cd = combine_to_from(t, f);
+
+	switch (charmaps[f]) {
+	case UTF_16:
+	case UTF_32:
+	case UCS2:
+	case ISO2022_JP:
+		scd = malloc(sizeof *scd);
+		if (!scd) return (iconv_t)-1;
+		scd->base_cd = cd;
+		scd->state = 0;
+		cd = (iconv_t)scd;
+	}
+
+	return cd;
+}
+
+static unsigned get_16(const unsigned char *s, int e)
+{
+	e &= 1;
+	return s[e]<<8 | s[1-e];
+}
+
+static void put_16(unsigned char *s, unsigned c, int e)
+{
+	e &= 1;
+	s[e] = c>>8;
+	s[1-e] = c;
+}
+
+static unsigned get_32(const unsigned char *s, int e)
+{
+	e &= 3;
+	return s[e]+0U<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
+}
+
+static void put_32(unsigned char *s, unsigned c, int e)
+{
+	e &= 3;
+	s[e^0] = c>>24;
+	s[e^1] = c>>16;
+	s[e^2] = c>>8;
+	s[e^3] = c;
+}
+
+/* Adapt as needed */
+#define mbrtowc_utf8 mbrtowc
+#define wctomb_utf8 wctomb
+
+static unsigned legacy_map(const unsigned char *map, unsigned c)
+{
+	if (c < 4*map[-1]) return c;
+	unsigned x = c - 4*map[-1];
+	x = map[x*5/4]>>2*x%8 | map[x*5/4+1]<<8-2*x%8 & 1023;
+	return x < 256 ? x : legacy_chars[x-256];
+}
+
+static unsigned uni_to_jis(unsigned c)
+{
+	unsigned nel = sizeof rev_jis / sizeof *rev_jis;
+	unsigned d, j, i, b = 0;
+	for (;;) {
+		i = nel/2;
+		j = rev_jis[b+i];
+		d = jis0208[j/256][j%256];
+		if (d==c) return j + 0x2121;
+		else if (nel == 1) return 0;
+		else if (c < d)
+			nel /= 2;
+		else {
+			b += i;
+			nel -= nel/2;
+		}
+	}
+}
+
+size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restrict out, size_t *restrict outb)
+{
+	size_t x=0;
+	struct stateful_cd *scd=0;
+	if (!((size_t)cd & 1)) {
+		scd = (void *)cd;
+		cd = scd->base_cd;
+	}
+	unsigned to = extract_to(cd);
+	unsigned from = extract_from(cd);
+	const unsigned char *map = charmaps+from+1;
+	const unsigned char *tomap = charmaps+to+1;
+	mbstate_t st = {0};
+	wchar_t wc;
+	unsigned c, d;
+	size_t k, l;
+	int err;
+	unsigned char type = map[-1];
+	unsigned char totype = tomap[-1];
+	locale_t *ploc = &CURRENT_LOCALE, loc = *ploc;
+
+	if (!in || !*in || !*inb) return 0;
+
+	*ploc = UTF8_LOCALE;
+
+	for (; *inb; *in+=l, *inb-=l) {
+		c = *(unsigned char *)*in;
+		l = 1;
+
+		switch (type) {
+		case UTF_8:
+			if (c < 128) break;
+			l = mbrtowc_utf8(&wc, *in, *inb, &st);
+			if (l == (size_t)-1) goto ilseq;
+			if (l == (size_t)-2) goto starved;
+			c = wc;
+			break;
+		case US_ASCII:
+			if (c >= 128) goto ilseq;
+			break;
+		case WCHAR_T:
+			l = sizeof(wchar_t);
+			if (*inb < l) goto starved;
+			c = *(wchar_t *)*in;
+			if (0) {
+		case UTF_32BE:
+		case UTF_32LE:
+			l = 4;
+			if (*inb < 4) goto starved;
+			c = get_32((void *)*in, type);
+			}
+			if (c-0xd800u < 0x800u || c >= 0x110000u) goto ilseq;
+			break;
+		case UCS2BE:
+		case UCS2LE:
+		case UTF_16BE:
+		case UTF_16LE:
+			l = 2;
+			if (*inb < 2) goto starved;
+			c = get_16((void *)*in, type);
+			if ((unsigned)(c-0xdc00) < 0x400) goto ilseq;
+			if ((unsigned)(c-0xd800) < 0x400) {
+				if (type-UCS2BE < 2U) goto ilseq;
+				l = 4;
+				if (*inb < 4) goto starved;
+				d = get_16((void *)(*in + 2), type);
+				if ((unsigned)(d-0xdc00) >= 0x400) goto ilseq;
+				c = ((c-0xd7c0)<<10) + (d-0xdc00);
+			}
+			break;
+		case UCS2:
+		case UTF_16:
+			l = 0;
+			if (!scd->state) {
+				if (*inb < 2) goto starved;
+				c = get_16((void *)*in, 0);
+				scd->state = type==UCS2
+					? c==0xfffe ? UCS2LE : UCS2BE
+					: c==0xfffe ? UTF_16LE : UTF_16BE;
+				if (c == 0xfffe || c == 0xfeff)
+					l = 2;
+			}
+			type = scd->state;
+			continue;
+		case UTF_32:
+			l = 0;
+			if (!scd->state) {
+				if (*inb < 4) goto starved;
+				c = get_32((void *)*in, 0);
+				scd->state = c==0xfffe0000 ? UTF_32LE : UTF_32BE;
+				if (c == 0xfffe0000 || c == 0xfeff)
+					l = 4;
+			}
+			type = scd->state;
+			continue;
+		case SHIFT_JIS:
+			if (c < 128) break;
+			if (c-0xa1 <= 0xdf-0xa1) {
+				c += 0xff61-0xa1;
+				break;
+			}
+			l = 2;
+			if (*inb < 2) goto starved;
+			d = *((unsigned char *)*in + 1);
+			if (c-129 <= 159-129) c -= 129;
+			else if (c-224 <= 239-224) c -= 193;
+			else goto ilseq;
+			c *= 2;
+			if (d-64 <= 158-64) {
+				if (d==127) goto ilseq;
+				if (d>127) d--;
+				d -= 64;
+			} else if (d-159 <= 252-159) {
+				c++;
+				d -= 159;
+			}
+			c = jis0208[c][d];
+			if (!c) goto ilseq;
+			break;
+		case EUC_JP:
+			if (c < 128) break;
+			l = 2;
+			if (*inb < 2) goto starved;
+			d = *((unsigned char *)*in + 1);
+			if (c==0x8e) {
+				c = d;
+				if (c-0xa1 > 0xdf-0xa1) goto ilseq;
+				c += 0xff61 - 0xa1;
+				break;
+			}
+			c -= 0xa1;
+			d -= 0xa1;
+			if (c >= 84 || d >= 94) goto ilseq;
+			c = jis0208[c][d];
+			if (!c) goto ilseq;
+			break;
+		case ISO2022_JP:
+			if (c >= 128) goto ilseq;
+			if (c == '\033') {
+				l = 3;
+				if (*inb < 3) goto starved;
+				c = *((unsigned char *)*in + 1);
+				d = *((unsigned char *)*in + 2);
+				if (c != '(' && c != '$') goto ilseq;
+				switch (128*(c=='$') + d) {
+				case 'B': scd->state=0; continue;
+				case 'J': scd->state=1; continue;
+				case 'I': scd->state=4; continue;
+				case 128+'@': scd->state=2; continue;
+				case 128+'B': scd->state=3; continue;
+				}
+				goto ilseq;
+			}
+			switch (scd->state) {
+			case 1:
+				if (c=='\\') c = 0xa5;
+				if (c=='~') c = 0x203e;
+				break;
+			case 2:
+			case 3:
+				l = 2;
+				if (*inb < 2) goto starved;
+				d = *((unsigned char *)*in + 1);
+				c -= 0x21;
+				d -= 0x21;
+				if (c >= 84 || d >= 94) goto ilseq;
+				c = jis0208[c][d];
+				if (!c) goto ilseq;
+				break;
+			case 4:
+				if (c-0x60 < 0x1f) goto ilseq;
+				if (c-0x21 < 0x5e) c += 0xff61-0x21;
+				break;
+			}
+			break;
+		case GB2312:
+			if (c < 128) break;
+			if (c < 0xa1) goto ilseq;
+		case GBK:
+		case GB18030:
+			if (c < 128) break;
+			c -= 0x81;
+			if (c >= 126) goto ilseq;
+			l = 2;
+			if (*inb < 2) goto starved;
+			d = *((unsigned char *)*in + 1);
+			if (d < 0xa1 && type == GB2312) goto ilseq;
+			if (d-0x40>=191 || d==127) {
+				if (d-'0'>9 || type != GB18030)
+					goto ilseq;
+				l = 4;
+				if (*inb < 4) goto starved;
+				c = (10*c + d-'0') * 1260;
+				d = *((unsigned char *)*in + 2);
+				if (d-0x81>126) goto ilseq;
+				c += 10*(d-0x81);
+				d = *((unsigned char *)*in + 3);
+				if (d-'0'>9) goto ilseq;
+				c += d-'0';
+				c += 128;
+				for (d=0; d<=c; ) {
+					k = 0;
+					for (int i=0; i<126; i++)
+						for (int j=0; j<190; j++)
+							if (gb18030[i][j]-d <= c-d)
+								k++;
+					d = c+1;
+					c += k;
+				}
+				break;
+			}
+			d -= 0x40;
+			if (d>63) d--;
+			c = gb18030[c][d];
+			break;
+		case BIG5:
+			if (c < 128) break;
+			l = 2;
+			if (*inb < 2) goto starved;
+			d = *((unsigned char *)*in + 1);
+			if (d-0x40>=0xff-0x40 || d-0x7f<0xa1-0x7f) goto ilseq;
+			d -= 0x40;
+			if (d > 0x3e) d -= 0x22;
+			if (c-0xa1>=0xfa-0xa1) {
+				if (c-0x87>=0xff-0x87) goto ilseq;
+				if (c < 0xa1) c -= 0x87;
+				else c -= 0x87 + (0xfa-0xa1);
+				c = (hkscs[4867+(c*157+d)/16]>>(c*157+d)%16)%2<<17
+					| hkscs[c*157+d];
+				/* A few HKSCS characters map to pairs of UCS
+				 * characters. These are mapped to surrogate
+				 * range in the hkscs table then hard-coded
+				 * here. Ugly, yes. */
+				if (c/256 == 0xdc) {
+					union {
+						char c[8];
+						wchar_t wc[2];
+					} tmp;
+					char *ptmp = tmp.c;
+					size_t tmpx = iconv(combine_to_from(to, find_charmap("utf8")),
+						&(char *){"\303\212\314\204"
+						"\303\212\314\214"
+						"\303\252\314\204"
+						"\303\252\314\214"
+						+c%256}, &(size_t){4},
+						&ptmp, &(size_t){sizeof tmp});
+					size_t tmplen = ptmp - tmp.c;
+					if (tmplen > *outb) goto toobig;
+					if (tmpx) x++;
+					memcpy(*out, &tmp, tmplen);
+					*out += tmplen;
+					*outb -= tmplen;
+					continue;
+				}
+				if (!c) goto ilseq;
+				break;
+			}
+			c -= 0xa1;
+			c = big5[c][d]|(c==0x27&&(d==0x3a||d==0x3c||d==0x42))<<17;
+			if (!c) goto ilseq;
+			break;
+		case EUC_KR:
+			if (c < 128) break;
+			l = 2;
+			if (*inb < 2) goto starved;
+			d = *((unsigned char *)*in + 1);
+			c -= 0xa1;
+			d -= 0xa1;
+			if (c >= 93 || d >= 94) {
+				c += (0xa1-0x81);
+				d += 0xa1;
+				if (c >= 93 || c>=0xc6-0x81 && d>0x52)
+					goto ilseq;
+				if (d-'A'<26) d = d-'A';
+				else if (d-'a'<26) d = d-'a'+26;
+				else if (d-0x81<0xff-0x81) d = d-0x81+52;
+				else goto ilseq;
+				if (c < 0x20) c = 178*c + d;
+				else c = 178*0x20 + 84*(c-0x20) + d;
+				c += 0xac00;
+				for (d=0xac00; d<=c; ) {
+					k = 0;
+					for (int i=0; i<93; i++)
+						for (int j=0; j<94; j++)
+							if (ksc[i][j]-d <= c-d)
+								k++;
+					d = c+1;
+					c += k;
+				}
+				break;
+			}
+			c = ksc[c][d];
+			if (!c) goto ilseq;
+			break;
+		default:
+			if (!c) break;
+			c = legacy_map(map, c);
+			if (!c) goto ilseq;
+		}
+
+		switch (totype) {
+		case WCHAR_T:
+			if (*outb < sizeof(wchar_t)) goto toobig;
+			*(wchar_t *)*out = c;
+			*out += sizeof(wchar_t);
+			*outb -= sizeof(wchar_t);
+			break;
+		case UTF_8:
+			if (*outb < 4) {
+				char tmp[4];
+				k = wctomb_utf8(tmp, c);
+				if (*outb < k) goto toobig;
+				memcpy(*out, tmp, k);
+			} else k = wctomb_utf8(*out, c);
+			*out += k;
+			*outb -= k;
+			break;
+		case US_ASCII:
+			if (c > 0x7f) subst: x++, c='*';
+		default:
+			if (*outb < 1) goto toobig;
+			if (c<256 && c==legacy_map(tomap, c)) {
+			revout:
+				if (*outb < 1) goto toobig;
+				*(*out)++ = c;
+				*outb -= 1;
+				break;
+			}
+			d = c;
+			for (c=4*totype; c<256; c++) {
+				if (d == legacy_map(tomap, c)) {
+					goto revout;
+				}
+			}
+			goto subst;
+		case SHIFT_JIS:
+			if (c < 128) goto revout;
+			if (c == 0xa5) {
+				x++;
+				c = '\\';
+				goto revout;
+			}
+			if (c == 0x203e) {
+				x++;
+				c = '~';
+				goto revout;
+			}
+			if (c-0xff61 <= 0xdf-0xa1) {
+				c += 0xa1 - 0xff61;
+				goto revout;
+			}
+			c = uni_to_jis(c);
+			if (!c) goto subst;
+			if (*outb < 2) goto toobig;
+			d = c%256;
+			c = c/256;
+			*(*out)++ = (c+1)/2 + (c<95 ? 112 : 176);
+			*(*out)++ = c%2 ? d + 31 + d/96 : d + 126;
+			*outb -= 2;
+			break;
+		case EUC_JP:
+			if (c < 128) goto revout;
+			if (c-0xff61 <= 0xdf-0xa1) {
+				c += 0x0e00 + 0x21 - 0xff61;
+			} else {
+				c = uni_to_jis(c);
+			}
+			if (!c) goto subst;
+			if (*outb < 2) goto toobig;
+			*(*out)++ = c/256 + 0x80;
+			*(*out)++ = c%256 + 0x80;
+			*outb -= 2;
+			break;
+		case ISO2022_JP:
+			if (c < 128) goto revout;
+			if (c-0xff61 <= 0xdf-0xa1 || c==0xa5 || c==0x203e) {
+				if (*outb < 7) goto toobig;
+				*(*out)++ = '\033';
+				*(*out)++ = '(';
+				if (c==0xa5) {
+					*(*out)++ = 'J';
+					*(*out)++ = '\\';
+				} else if (c==0x203e) {
+					*(*out)++ = 'J';
+					*(*out)++ = '~';
+				} else {
+					*(*out)++ = 'I';
+					*(*out)++ = c-0xff61+0x21;
+				}
+				*(*out)++ = '\033';
+				*(*out)++ = '(';
+				*(*out)++ = 'B';
+				*outb -= 7;
+				break;
+			}
+			c = uni_to_jis(c);
+			if (!c) goto subst;
+			if (*outb < 8) goto toobig;
+			*(*out)++ = '\033';
+			*(*out)++ = '$';
+			*(*out)++ = 'B';
+			*(*out)++ = c/256;
+			*(*out)++ = c%256;
+			*(*out)++ = '\033';
+			*(*out)++ = '(';
+			*(*out)++ = 'B';
+			*outb -= 8;
+			break;
+		case UCS2:
+			totype = UCS2BE;
+		case UCS2BE:
+		case UCS2LE:
+		case UTF_16:
+		case UTF_16BE:
+		case UTF_16LE:
+			if (c < 0x10000 || totype-UCS2BE < 2U) {
+				if (c >= 0x10000) c = 0xFFFD;
+				if (*outb < 2) goto toobig;
+				put_16((void *)*out, c, totype);
+				*out += 2;
+				*outb -= 2;
+				break;
+			}
+			if (*outb < 4) goto toobig;
+			c -= 0x10000;
+			put_16((void *)*out, (c>>10)|0xd800, totype);
+			put_16((void *)(*out + 2), (c&0x3ff)|0xdc00, totype);
+			*out += 4;
+			*outb -= 4;
+			break;
+		case UTF_32:
+			totype = UTF_32BE;
+		case UTF_32BE:
+		case UTF_32LE:
+			if (*outb < 4) goto toobig;
+			put_32((void *)*out, c, totype);
+			*out += 4;
+			*outb -= 4;
+			break;
+		}
+	}
+	*ploc = loc;
+	return x;
+ilseq:
+	err = EILSEQ;
+	x = -1;
+	goto end;
+toobig:
+	err = E2BIG;
+	x = -1;
+	goto end;
+starved:
+	err = EINVAL;
+	x = -1;
+end:
+	errno = err;
+	*ploc = loc;
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/iconv_close.c b/src/components/lib/libc/musl-1.2.0/src/locale/iconv_close.c
new file mode 100644
index 0000000000..28b2956594
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/iconv_close.c
@@ -0,0 +1,8 @@
+#include <iconv.h>
+#include <stdlib.h>
+
+int iconv_close(iconv_t cd)
+{
+	if (!((size_t)cd & 1)) free((void *)cd);
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/jis0208.h b/src/components/lib/libc/musl-1.2.0/src/locale/jis0208.h
new file mode 100644
index 0000000000..de9c5f26a6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/jis0208.h
@@ -0,0 +1,563 @@
+12288,12289,12290,65292,65294,12539,65306,65307,65311,65281,12443,12444,180,
+65344,168,65342,65507,65343,12541,12542,12445,12446,12291,20189,12293,12294,
+12295,12540,8213,8208,65295,92,12316,8214,65372,8230,8229,8216,8217,8220,8221,
+65288,65289,12308,12309,65339,65341,65371,65373,12296,12297,12298,12299,12300,
+12301,12302,12303,12304,12305,65291,8722,177,215,247,65309,8800,65308,65310,
+8806,8807,8734,8756,9794,9792,176,8242,8243,8451,65509,65284,162,163,65285,
+65283,65286,65290,65312,167,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651,
+9650,9661,9660,8251,12306,8594,8592,8593,8595,12307,0,0,0,0,0,0,0,0,0,0,0,
+8712,8715,8838,8839,8834,8835,8746,8745,0,0,0,0,0,0,0,0,8743,8744,172,8658,
+8660,8704,8707,0,0,0,0,0,0,0,0,0,0,0,8736,8869,8978,8706,8711,8801,8786,8810,
+8811,8730,8765,8733,8757,8747,8748,0,0,0,0,0,0,0,8491,8240,9839,9837,9834,
+8224,8225,182,0,0,0,0,9711,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65296,65297,65298,
+65299,65300,65301,65302,65303,65304,65305,0,0,0,0,0,0,0,65313,65314,65315,
+65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,
+65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,0,0,0,0,0,0,65345,
+65346,65347,
+65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,
+65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,0,0,0,0,12353,
+12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,
+12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,
+12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,
+12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,
+12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,
+12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,
+12432,12433,12434,12435,0,0,0,0,0,0,0,0,0,0,0,12449,12450,12451,12452,12453,
+12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,
+12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,
+12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,
+12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,
+12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,
+12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,
+12532,12533,12534,0,0,0,0,0,0,0,0,913,914,915,916,917,918,919,920,921,922,923,
+924,925,926,927,928,929,931,932,933,934,935,936,937,0,0,0,0,0,0,0,0,945,946,
+947,948,949,950,951,952,953,
+954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1040,1041,1042,1043,
+1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,
+1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,
+1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,
+1097,1098,1099,1100,1101,1102,1103,0,0,0,0,0,0,0,0,0,0,0,0,0,9472,9474,9484,
+9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,
+9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,20124,21782,23043,38463,21696,24859,25384,23030,
+36898,33909,33564,31312,24746,25569,28197,26093,33894,33446,39925,26771,22311,
+26017,25201,23451,22992,34427,39156,32098,32190,39822,25110,31903,34999,23433,
+24245,25353,26263,26696,38343,38797,26447,20197,20234,20301,20381,20553,22258,
+22839,22996,23041,23561,24799,24847,24944,26131,26885,28858,30031,30064,31227,
+32173,32239,32963,33806,34915,35586,36949,36986,21307,20117,20133,22495,32946,
+37057,30959,19968,22769,28322,36920,31282,33576,33419,39983,20801,21360,21693,
+21729,22240,23035,24341,39154,28139,32996,34093,38498,38512,38560,38907,21515,
+21491,23431,28879,32701,36802,38632,21359,40284,31418,19985,30867,33276,28198,
+22040,21764,27421,34074,39995,23013,21417,28006,29916,38287,22082,20113,36939,
+38642,33615,39180,21473,21942,23344,24433,26144,26355,26628,27704,27891,27945,
+29787,30408,31310,38964,33521,34907,35424,37613,28082,30123,30410,39365,24742,
+35585,36234,38322,27022,21421,20870,22290,22576,22852,23476,24310,24616,25513,
+25588,27839,28436,28814,28948,29017,29141,29503,32257,33398,33489,34199,36960,
+37467,40219,22633,26044,27738,29989,20985,22830,22885,24448,24540,25276,26106,
+27178,27431,27572,29579,32705,35158,40236,40206,40644,23713,27798,33659,20740,
+23627,25014,33222,26742,29281,20057,20474,21368,24681,28201,31311,38899,19979,
+21270,20206,20309,20285,20385,20339,21152,21487,22025,22799,23233,23478,23521,
+31185,26247,26524,26550,27468,27827,28779,29634,31117,31166,31292,31623,33457,
+33499,33540,33655,33775,33747,34662,35506,22057,36008,36838,36942,38686,34442,
+20420,23784,25105,29273,30011,33253,33469,34558,36032,38597,39187,39381,20171,
+20250,35299,22238,22602,22730,24315,24555,24618,24724,24674,25040,25106,25296,
+25913,39745,26214,26800,28023,28784,30028,30342,32117,33445,34809,38283,38542,
+35997,20977,21182,22806,21683,23475,23830,24936,27010,28079,30861,33995,34903,
+35442,37799,39608,28012,39336,34521,22435,26623,34510,37390,21123,22151,21508,
+24275,25313,25785,26684,26680,27579,29554,30906,31339,35226,35282,36203,36611,
+37101,38307,38548,38761,23398,23731,27005,38989,38990,25499,31520,27179,27263,
+26806,39949,28511,21106,21917,24688,25324,27963,28167,28369,33883,35088,36676,
+19988,39993,21494,26907,27194,38788,26666,20828,31427,33970,37340,37772,22107,
+40232,26658,33541,33841,31909,21000,33477,29926,20094,
+20355,20896,23506,21002,21208,21223,24059,21914,22570,23014,23436,23448,23515,
+24178,24185,24739,24863,24931,25022,25563,25954,26577,26707,26874,27454,27475,
+27735,28450,28567,28485,29872,29976,30435,30475,31487,31649,31777,32233,32566,
+32752,32925,33382,33694,35251,35532,36011,36996,37969,38291,38289,38306,38501,
+38867,39208,33304,20024,21547,23736,24012,29609,30284,30524,23721,32747,36107,
+38593,38929,38996,39000,20225,20238,21361,21916,22120,22522,22855,23305,23492,
+23696,24076,24190,24524,25582,26426,26071,26082,26399,26827,26820,27231,24112,
+27589,27671,27773,30079,31048,23395,31232,32000,24509,35215,35352,36020,36215,
+36556,36637,39138,39438,39740,20096,20605,20736,22931,23452,25135,25216,25836,
+27450,29344,30097,31047,32681,34811,35516,35696,25516,33738,38816,21513,21507,
+21931,26708,27224,35440,30759,26485,40653,21364,23458,33050,34384,36870,19992,
+20037,20167,20241,21450,21560,23470,24339,24613,25937,26429,27714,27762,27875,
+28792,29699,31350,31406,31496,32026,31998,32102,26087,29275,21435,23621,24040,
+25298,25312,25369,28192,34394,35377,36317,37624,28417,31142,39770,20136,20139,
+20140,20379,20384,20689,20807,31478,20849,20982,21332,21281,21375,21483,21932,
+22659,23777,24375,24394,24623,24656,24685,25375,25945,27211,27841,29378,29421,
+30703,33016,33029,33288,34126,37111,37857,38911,39255,39514,20208,20957,23597,
+26241,26989,23616,26354,26997,29577,26704,31873,20677,21220,22343,24062,37670,
+26020,27427,27453,29748,31105,31165,31563,32202,33465,33740,34943,35167,35641,
+36817,37329,21535,37504,20061,20534,21477,21306,29399,
+29590,30697,33510,36527,39366,39368,39378,20855,24858,34398,21936,31354,20598,
+23507,36935,38533,20018,27355,37351,23633,23624,25496,31391,27795,38772,36705,
+31402,29066,38536,31874,26647,32368,26705,37740,21234,21531,34219,35347,32676,
+36557,37089,21350,34952,31041,20418,20670,21009,20804,21843,22317,29674,22411,
+22865,24418,24452,24693,24950,24935,25001,25522,25658,25964,26223,26690,28179,
+30054,31293,31995,32076,32153,32331,32619,33550,33610,34509,35336,35427,35686,
+36605,38938,40335,33464,36814,39912,21127,25119,25731,28608,38553,26689,20625,
+27424,27770,28500,31348,32080,34880,35363,26376,20214,20537,20518,20581,20860,
+21048,21091,21927,22287,22533,23244,24314,25010,25080,25331,25458,26908,27177,
+29309,29356,29486,30740,30831,32121,30476,32937,35211,35609,36066,36562,36963,
+37749,38522,38997,39443,40568,20803,21407,21427,24187,24358,28187,28304,29572,
+29694,32067,33335,35328,35578,38480,20046,20491,21476,21628,22266,22993,23396,
+24049,24235,24359,25144,25925,26543,28246,29392,31946,34996,32929,32993,33776,
+34382,35463,36328,37431,38599,39015,40723,20116,20114,20237,21320,21577,21566,
+23087,24460,24481,24735,26791,27278,29786,30849,35486,35492,35703,37264,20062,
+39881,20132,20348,20399,20505,20502,20809,20844,21151,21177,21246,21402,21475,
+21521,21518,21897,22353,22434,22909,23380,23389,23439,24037,24039,24055,24184,
+24195,24218,24247,24344,24658,24908,25239,25304,25511,25915,26114,26179,26356,
+26477,26657,26775,27083,27743,27946,28009,28207,28317,30002,30343,30828,31295,
+31968,32005,32024,32094,32177,32789,32771,32943,32945,
+33108,33167,33322,33618,34892,34913,35611,36002,36092,37066,37237,37489,30783,
+37628,38308,38477,38917,39321,39640,40251,21083,21163,21495,21512,22741,25335,
+28640,35946,36703,40633,20811,21051,21578,22269,31296,37239,40288,40658,29508,
+28425,33136,29969,24573,24794,39592,29403,36796,27492,38915,20170,22256,22372,
+22718,23130,24680,25031,26127,26118,26681,26801,28151,30165,32058,33390,39746,
+20123,20304,21449,21766,23919,24038,24046,26619,27801,29811,30722,35408,37782,
+35039,22352,24231,25387,20661,20652,20877,26368,21705,22622,22971,23472,24425,
+25165,25505,26685,27507,28168,28797,37319,29312,30741,30758,31085,25998,32048,
+33756,35009,36617,38555,21092,22312,26448,32618,36001,20916,22338,38442,22586,
+27018,32948,21682,23822,22524,30869,40442,20316,21066,21643,25662,26152,26388,
+26613,31364,31574,32034,37679,26716,39853,31545,21273,20874,21047,23519,25334,
+25774,25830,26413,27578,34217,38609,30352,39894,25420,37638,39851,30399,26194,
+19977,20632,21442,23665,24808,25746,25955,26719,29158,29642,29987,31639,32386,
+34453,35715,36059,37240,39184,26028,26283,27531,20181,20180,20282,20351,21050,
+21496,21490,21987,22235,22763,22987,22985,23039,23376,23629,24066,24107,24535,
+24605,25351,25903,23388,26031,26045,26088,26525,27490,27515,27663,29509,31049,
+31169,31992,32025,32043,32930,33026,33267,35222,35422,35433,35430,35468,35566,
+36039,36060,38604,39164,27503,20107,20284,20365,20816,23383,23546,24904,25345,
+26178,27425,28363,27835,29246,29885,30164,30913,31034,32780,32819,33258,33940,
+36766,27728,40575,24335,35672,40235,31482,36600,23437,
+38635,19971,21489,22519,22833,23241,23460,24713,28287,28422,30142,36074,23455,
+34048,31712,20594,26612,33437,23649,34122,32286,33294,20889,23556,25448,36198,
+26012,29038,31038,32023,32773,35613,36554,36974,34503,37034,20511,21242,23610,
+26451,28796,29237,37196,37320,37675,33509,23490,24369,24825,20027,21462,23432,
+25163,26417,27530,29417,29664,31278,33131,36259,37202,39318,20754,21463,21610,
+23551,25480,27193,32172,38656,22234,21454,21608,23447,23601,24030,20462,24833,
+25342,27954,31168,31179,32066,32333,32722,33261,33311,33936,34886,35186,35728,
+36468,36655,36913,37195,37228,38598,37276,20160,20303,20805,21313,24467,25102,
+26580,27713,28171,29539,32294,37325,37507,21460,22809,23487,28113,31069,32302,
+31899,22654,29087,20986,34899,36848,20426,23803,26149,30636,31459,33308,39423,
+20934,24490,26092,26991,27529,28147,28310,28516,30462,32020,24033,36981,37255,
+38918,20966,21021,25152,26257,26329,28186,24246,32210,32626,26360,34223,34295,
+35576,21161,21465,22899,24207,24464,24661,37604,38500,20663,20767,21213,21280,
+21319,21484,21736,21830,21809,22039,22888,22974,23100,23477,23558,23567,23569,
+23578,24196,24202,24288,24432,25215,25220,25307,25484,25463,26119,26124,26157,
+26230,26494,26786,27167,27189,27836,28040,28169,28248,28988,28966,29031,30151,
+30465,30813,30977,31077,31216,31456,31505,31911,32057,32918,33750,33931,34121,
+34909,35059,35359,35388,35412,35443,35937,36062,37284,37478,37758,37912,38556,
+38808,19978,19976,19998,20055,20887,21104,22478,22580,22732,23330,24120,24773,
+25854,26465,26454,27972,29366,30067,31331,33976,35698,
+37304,37664,22065,22516,39166,25325,26893,27542,29165,32340,32887,33394,35302,
+39135,34645,36785,23611,20280,20449,20405,21767,23072,23517,23529,24515,24910,
+25391,26032,26187,26862,27035,28024,28145,30003,30137,30495,31070,31206,32051,
+33251,33455,34218,35242,35386,36523,36763,36914,37341,38663,20154,20161,20995,
+22645,22764,23563,29978,23613,33102,35338,36805,38499,38765,31525,35535,38920,
+37218,22259,21416,36887,21561,22402,24101,25512,27700,28810,30561,31883,32736,
+34928,36930,37204,37648,37656,38543,29790,39620,23815,23913,25968,26530,36264,
+38619,25454,26441,26905,33733,38935,38592,35070,28548,25722,23544,19990,28716,
+30045,26159,20932,21046,21218,22995,24449,24615,25104,25919,25972,26143,26228,
+26866,26646,27491,28165,29298,29983,30427,31934,32854,22768,35069,35199,35488,
+35475,35531,36893,37266,38738,38745,25993,31246,33030,38587,24109,24796,25114,
+26021,26132,26512,30707,31309,31821,32318,33034,36012,36196,36321,36447,30889,
+20999,25305,25509,25666,25240,35373,31363,31680,35500,38634,32118,33292,34633,
+20185,20808,21315,21344,23459,23554,23574,24029,25126,25159,25776,26643,26676,
+27849,27973,27927,26579,28508,29006,29053,26059,31359,31661,32218,32330,32680,
+33146,33307,33337,34214,35438,36046,36341,36984,36983,37549,37521,38275,39854,
+21069,21892,28472,28982,20840,31109,32341,33203,31950,22092,22609,23720,25514,
+26366,26365,26970,29401,30095,30094,30990,31062,31199,31895,32032,32068,34311,
+35380,38459,36961,40736,20711,21109,21452,21474,20489,21930,22766,22863,29245,
+23435,23652,21277,24803,24819,25436,25475,25407,25531,
+25805,26089,26361,24035,27085,27133,28437,29157,20105,30185,30456,31379,31967,
+32207,32156,32865,33609,33624,33900,33980,34299,35013,36208,36865,36973,37783,
+38684,39442,20687,22679,24974,33235,34101,36104,36896,20419,20596,21063,21363,
+24687,25417,26463,28204,36275,36895,20439,23646,36042,26063,32154,21330,34966,
+20854,25539,23384,23403,23562,25613,26449,36956,20182,22810,22826,27760,35409,
+21822,22549,22949,24816,25171,26561,33333,26965,38464,39364,39464,20307,22534,
+23550,32784,23729,24111,24453,24608,24907,25140,26367,27888,28382,32974,33151,
+33492,34955,36024,36864,36910,38538,40667,39899,20195,21488,22823,31532,37261,
+38988,40441,28381,28711,21331,21828,23429,25176,25246,25299,27810,28655,29730,
+35351,37944,28609,35582,33592,20967,34552,21482,21481,20294,36948,36784,22890,
+33073,24061,31466,36799,26842,35895,29432,40008,27197,35504,20025,21336,22022,
+22374,25285,25506,26086,27470,28129,28251,28845,30701,31471,31658,32187,32829,
+32966,34507,35477,37723,22243,22727,24382,26029,26262,27264,27573,30007,35527,
+20516,30693,22320,24347,24677,26234,27744,30196,31258,32622,33268,34584,36933,
+39347,31689,30044,31481,31569,33988,36880,31209,31378,33590,23265,30528,20013,
+20210,23449,24544,25277,26172,26609,27880,34411,34935,35387,37198,37619,39376,
+27159,28710,29482,33511,33879,36015,19969,20806,20939,21899,23541,24086,24115,
+24193,24340,24373,24427,24500,25074,25361,26274,26397,28526,29266,30010,30522,
+32884,33081,33144,34678,35519,35548,36229,36339,37530,38263,38914,40165,21189,
+25431,30452,26389,27784,29645,36035,37806,38515,27941,
+22684,26894,27084,36861,37786,30171,36890,22618,26626,25524,27131,20291,28460,
+26584,36795,34086,32180,37716,26943,28528,22378,22775,23340,32044,29226,21514,
+37347,40372,20141,20302,20572,20597,21059,35998,21576,22564,23450,24093,24213,
+24237,24311,24351,24716,25269,25402,25552,26799,27712,30855,31118,31243,32224,
+33351,35330,35558,36420,36883,37048,37165,37336,40718,27877,25688,25826,25973,
+28404,30340,31515,36969,37841,28346,21746,24505,25764,36685,36845,37444,20856,
+22635,22825,23637,24215,28155,32399,29980,36028,36578,39003,28857,20253,27583,
+28593,30000,38651,20814,21520,22581,22615,22956,23648,24466,26007,26460,28193,
+30331,33759,36077,36884,37117,37709,30757,30778,21162,24230,22303,22900,24594,
+20498,20826,20908,20941,20992,21776,22612,22616,22871,23445,23798,23947,24764,
+25237,25645,26481,26691,26812,26847,30423,28120,28271,28059,28783,29128,24403,
+30168,31095,31561,31572,31570,31958,32113,21040,33891,34153,34276,35342,35588,
+35910,36367,36867,36879,37913,38518,38957,39472,38360,20685,21205,21516,22530,
+23566,24999,25758,27934,30643,31461,33012,33796,36947,37509,23776,40199,21311,
+24471,24499,28060,29305,30563,31167,31716,27602,29420,35501,26627,27233,20984,
+31361,26932,23626,40182,33515,23493,37193,28702,22136,23663,24775,25958,27788,
+35930,36929,38931,21585,26311,37389,22856,37027,20869,20045,20970,34201,35598,
+28760,25466,37707,26978,39348,32260,30071,21335,26976,36575,38627,27741,20108,
+23612,24336,36841,21250,36049,32905,34425,24319,26085,20083,20837,22914,23615,
+38894,20219,22922,24525,35469,28641,31152,31074,23527,
+33905,29483,29105,24180,24565,25467,25754,29123,31896,20035,24316,20043,22492,
+22178,24745,28611,32013,33021,33075,33215,36786,35223,34468,24052,25226,25773,
+35207,26487,27874,27966,29750,30772,23110,32629,33453,39340,20467,24259,25309,
+25490,25943,26479,30403,29260,32972,32954,36649,37197,20493,22521,23186,26757,
+26995,29028,29437,36023,22770,36064,38506,36889,34687,31204,30695,33833,20271,
+21093,21338,25293,26575,27850,30333,31636,31893,33334,34180,36843,26333,28448,
+29190,32283,33707,39361,40614,20989,31665,30834,31672,32903,31560,27368,24161,
+32908,30033,30048,20843,37474,28300,30330,37271,39658,20240,32624,25244,31567,
+38309,40169,22138,22617,34532,38588,20276,21028,21322,21453,21467,24070,25644,
+26001,26495,27710,27726,29256,29359,29677,30036,32321,33324,34281,36009,31684,
+37318,29033,38930,39151,25405,26217,30058,30436,30928,34115,34542,21290,21329,
+21542,22915,24199,24444,24754,25161,25209,25259,26000,27604,27852,30130,30382,
+30865,31192,32203,32631,32933,34987,35513,36027,36991,38750,39131,27147,31800,
+20633,23614,24494,26503,27608,29749,30473,32654,40763,26570,31255,21305,30091,
+39661,24422,33181,33777,32920,24380,24517,30050,31558,36924,26727,23019,23195,
+32016,30334,35628,20469,24426,27161,27703,28418,29922,31080,34920,35413,35961,
+24287,25551,30149,31186,33495,37672,37618,33948,34541,39981,21697,24428,25996,
+27996,28693,36007,36051,38971,25935,29942,19981,20184,22496,22827,23142,23500,
+20904,24067,24220,24598,25206,25975,26023,26222,28014,29238,31526,33104,33178,
+33433,35676,36000,36070,36212,38428,38468,20398,25771,
+27494,33310,33889,34154,37096,23553,26963,39080,33914,34135,20239,21103,24489,
+24133,26381,31119,33145,35079,35206,28149,24343,25173,27832,20175,29289,39826,
+20998,21563,22132,22707,24996,25198,28954,22894,31881,31966,32027,38640,25991,
+32862,19993,20341,20853,22592,24163,24179,24330,26564,20006,34109,38281,38491,
+31859,38913,20731,22721,30294,30887,21029,30629,34065,31622,20559,22793,29255,
+31687,32232,36794,36820,36941,20415,21193,23081,24321,38829,20445,33303,37610,
+22275,25429,27497,29995,35036,36628,31298,21215,22675,24917,25098,26286,27597,
+31807,33769,20515,20472,21253,21574,22577,22857,23453,23792,23791,23849,24214,
+25265,25447,25918,26041,26379,27861,27873,28921,30770,32299,32990,33459,33804,
+34028,34562,35090,35370,35914,37030,37586,39165,40179,40300,20047,20129,20621,
+21078,22346,22952,24125,24536,24537,25151,26292,26395,26576,26834,20882,32033,
+32938,33192,35584,35980,36031,37502,38450,21536,38956,21271,20693,21340,22696,
+25778,26420,29287,30566,31302,37350,21187,27809,27526,22528,24140,22868,26412,
+32763,20961,30406,25705,30952,39764,40635,22475,22969,26151,26522,27598,21737,
+27097,24149,33180,26517,39850,26622,40018,26717,20134,20451,21448,25273,26411,
+27819,36804,20397,32365,40639,19975,24930,28288,28459,34067,21619,26410,39749,
+24051,31637,23724,23494,34588,28234,34001,31252,33032,22937,31885,27665,30496,
+21209,22818,28961,29279,30683,38695,40289,26891,23167,23064,20901,21517,21629,
+26126,30431,36855,37528,40180,23018,29277,28357,20813,26825,32191,32236,38754,
+40634,25720,27169,33538,22916,23391,27611,29467,30450,
+32178,32791,33945,20786,26408,40665,30446,26466,21247,39173,23588,25147,31870,
+36016,21839,24758,32011,38272,21249,20063,20918,22812,29242,32822,37326,24357,
+30690,21380,24441,32004,34220,35379,36493,38742,26611,34222,37971,24841,24840,
+27833,30290,35565,36664,21807,20305,20778,21191,21451,23461,24189,24736,24962,
+25558,26377,26586,28263,28044,29494,29495,30001,31056,35029,35480,36938,37009,
+37109,38596,34701,22805,20104,20313,19982,35465,36671,38928,20653,24188,22934,
+23481,24248,25562,25594,25793,26332,26954,27096,27915,28342,29076,29992,31407,
+32650,32768,33865,33993,35201,35617,36362,36965,38525,39178,24958,25233,27442,
+27779,28020,32716,32764,28096,32645,34746,35064,26469,33713,38972,38647,27931,
+32097,33853,37226,20081,21365,23888,27396,28651,34253,34349,35239,21033,21519,
+23653,26446,26792,29702,29827,30178,35023,35041,37324,38626,38520,24459,29575,
+31435,33870,25504,30053,21129,27969,28316,29705,30041,30827,31890,38534,31452,
+40845,20406,24942,26053,34396,20102,20142,20698,20001,20940,23534,26009,26753,
+28092,29471,30274,30637,31260,31975,33391,35538,36988,37327,38517,38936,21147,
+32209,20523,21400,26519,28107,29136,29747,33256,36650,38563,40023,40607,29792,
+22593,28057,32047,39006,20196,20278,20363,20919,21169,23994,24604,29618,31036,
+33491,37428,38583,38646,38666,40599,40802,26278,27508,21015,21155,28872,35010,
+24265,24651,24976,28451,29001,31806,32244,32879,34030,36899,37676,21570,39791,
+27347,28809,36034,36335,38706,21172,23105,24266,24324,26391,27004,27028,28010,
+28431,29282,29436,31725,32769,32894,34635,37070,20845,
+40595,31108,32907,37682,35542,20525,21644,35441,27498,36036,33031,24785,26528,
+40434,20121,20120,39952,35435,34241,34152,26880,28286,30871,33109,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+24332,19984,19989,20010,20017,20022,20028,20031,20034,20054,20056,20098,20101,
+35947,20106,33298,24333,20110,20126,20127,20128,20130,20144,20147,20150,20174,
+20173,20164,20166,20162,20183,20190,20205,20191,20215,20233,20314,20272,20315,
+20317,20311,20295,20342,20360,20367,20376,20347,20329,20336,20369,20335,20358,
+20374,20760,20436,20447,20430,20440,20443,20433,20442,20432,20452,20453,20506,
+20520,20500,20522,20517,20485,20252,20470,20513,20521,20524,20478,20463,20497,
+20486,20547,20551,26371,20565,20560,20552,20570,20566,20588,20600,20608,20634,
+20613,20660,20658,20681,20682,20659,20674,20694,20702,20709,20717,20707,20718,
+20729,20725,20745,20737,20738,20758,20757,20756,20762,20769,20794,20791,20796,
+20795,20799,20800,20818,20812,20820,20834,31480,20841,20842,20846,20864,20866,
+22232,20876,20873,20879,20881,20883,20885,20886,20900,20902,20898,20905,20906,
+20907,20915,20913,20914,20912,20917,20925,20933,20937,20955,20960,34389,20969,
+20973,20976,20981,20990,20996,21003,21012,21006,21031,21034,21038,21043,21049,
+21071,21060,21067,21068,21086,21076,21098,21108,21097,21107,21119,21117,21133,
+21140,21138,21105,21128,21137,36776,36775,
+21164,21165,21180,21173,21185,21197,21207,21214,21219,21222,39149,21216,21235,
+21237,21240,21241,21254,21256,30008,21261,21264,21263,21269,21274,21283,21295,
+21297,21299,21304,21312,21318,21317,19991,21321,21325,20950,21342,21353,21358,
+22808,21371,21367,21378,21398,21408,21414,21413,21422,21424,21430,21443,31762,
+38617,21471,26364,29166,21486,21480,21485,21498,21505,21565,21568,21548,21549,
+21564,21550,21558,21545,21533,21582,21647,21621,21646,21599,21617,21623,21616,
+21650,21627,21632,21622,21636,21648,21638,21703,21666,21688,21669,21676,21700,
+21704,21672,21675,21698,21668,21694,21692,21720,21733,21734,21775,21780,21757,
+21742,21741,21754,21730,21817,21824,21859,21836,21806,21852,21829,21846,21847,
+21816,21811,21853,21913,21888,21679,21898,21919,21883,21886,21912,21918,21934,
+21884,21891,21929,21895,21928,21978,21957,21983,21956,21980,21988,21972,22036,
+22007,22038,22014,22013,22043,22009,22094,22096,29151,22068,22070,22066,22072,
+22123,22116,22063,22124,22122,22150,22144,22154,22176,22164,22159,22181,22190,
+22198,22196,22210,22204,22209,22211,22208,22216,22222,22225,22227,22231,22254,
+22265,22272,22271,22276,22281,22280,22283,22285,22291,22296,22294,21959,22300,
+22310,22327,22328,22350,22331,22336,22351,22377,22464,22408,22369,22399,22409,
+22419,22432,22451,22436,22442,22448,22467,22470,22484,22482,22483,22538,22486,
+22499,22539,22553,22557,22642,22561,22626,22603,22640,27584,22610,22589,22649,
+22661,22713,22687,22699,22714,22750,22715,22712,22702,22725,22739,22737,22743,
+22745,22744,22757,22748,22756,22751,22767,22778,22777,
+22779,22780,22781,22786,22794,22800,22811,26790,22821,22828,22829,22834,22840,
+22846,31442,22869,22864,22862,22874,22872,22882,22880,22887,22892,22889,22904,
+22913,22941,20318,20395,22947,22962,22982,23016,23004,22925,23001,23002,23077,
+23071,23057,23068,23049,23066,23104,23148,23113,23093,23094,23138,23146,23194,
+23228,23230,23243,23234,23229,23267,23255,23270,23273,23254,23290,23291,23308,
+23307,23318,23346,23248,23338,23350,23358,23363,23365,23360,23377,23381,23386,
+23387,23397,23401,23408,23411,23413,23416,25992,23418,23424,23427,23462,23480,
+23491,23495,23497,23508,23504,23524,23526,23522,23518,23525,23531,23536,23542,
+23539,23557,23559,23560,23565,23571,23584,23586,23592,23608,23609,23617,23622,
+23630,23635,23632,23631,23409,23660,23662,20066,23670,23673,23692,23697,23700,
+22939,23723,23739,23734,23740,23735,23749,23742,23751,23769,23785,23805,23802,
+23789,23948,23786,23819,23829,23831,23900,23839,23835,23825,23828,23842,23834,
+23833,23832,23884,23890,23886,23883,23916,23923,23926,23943,23940,23938,23970,
+23965,23980,23982,23997,23952,23991,23996,24009,24013,24019,24018,24022,24027,
+24043,24050,24053,24075,24090,24089,24081,24091,24118,24119,24132,24131,24128,
+24142,24151,24148,24159,24162,24164,24135,24181,24182,24186,40636,24191,24224,
+24257,24258,24264,24272,24271,24278,24291,24285,24282,24283,24290,24289,24296,
+24297,24300,24305,24307,24304,24308,24312,24318,24323,24329,24413,24412,24331,
+24337,24342,24361,24365,24376,24385,24392,24396,24398,24367,24401,24406,24407,
+24409,24417,24429,24435,24439,24451,24450,24447,24458,
+24456,24465,24455,24478,24473,24472,24480,24488,24493,24508,24534,24571,24548,
+24568,24561,24541,24755,24575,24609,24672,24601,24592,24617,24590,24625,24603,
+24597,24619,24614,24591,24634,24666,24641,24682,24695,24671,24650,24646,24653,
+24675,24643,24676,24642,24684,24683,24665,24705,24717,24807,24707,24730,24708,
+24731,24726,24727,24722,24743,24715,24801,24760,24800,24787,24756,24560,24765,
+24774,24757,24792,24909,24853,24838,24822,24823,24832,24820,24826,24835,24865,
+24827,24817,24845,24846,24903,24894,24872,24871,24906,24895,24892,24876,24884,
+24893,24898,24900,24947,24951,24920,24921,24922,24939,24948,24943,24933,24945,
+24927,24925,24915,24949,24985,24982,24967,25004,24980,24986,24970,24977,25003,
+25006,25036,25034,25033,25079,25032,25027,25030,25018,25035,32633,25037,25062,
+25059,25078,25082,25076,25087,25085,25084,25086,25088,25096,25097,25101,25100,
+25108,25115,25118,25121,25130,25134,25136,25138,25139,25153,25166,25182,25187,
+25179,25184,25192,25212,25218,25225,25214,25234,25235,25238,25300,25219,25236,
+25303,25297,25275,25295,25343,25286,25812,25288,25308,25292,25290,25282,25287,
+25243,25289,25356,25326,25329,25383,25346,25352,25327,25333,25424,25406,25421,
+25628,25423,25494,25486,25472,25515,25462,25507,25487,25481,25503,25525,25451,
+25449,25534,25577,25536,25542,25571,25545,25554,25590,25540,25622,25652,25606,
+25619,25638,25654,25885,25623,25640,25615,25703,25711,25718,25678,25898,25749,
+25747,25765,25769,25736,25788,25818,25810,25797,25799,25787,25816,25794,25841,
+25831,33289,25824,25825,25260,25827,25839,25900,25846,
+25844,25842,25850,25856,25853,25880,25884,25861,25892,25891,25899,25908,25909,
+25911,25910,25912,30027,25928,25942,25941,25933,25944,25950,25949,25970,25976,
+25986,25987,35722,26011,26015,26027,26039,26051,26054,26049,26052,26060,26066,
+26075,26073,26080,26081,26097,26482,26122,26115,26107,26483,26165,26166,26164,
+26140,26191,26180,26185,26177,26206,26205,26212,26215,26216,26207,26210,26224,
+26243,26248,26254,26249,26244,26264,26269,26305,26297,26313,26302,26300,26308,
+26296,26326,26330,26336,26175,26342,26345,26352,26357,26359,26383,26390,26398,
+26406,26407,38712,26414,26431,26422,26433,26424,26423,26438,26462,26464,26457,
+26467,26468,26505,26480,26537,26492,26474,26508,26507,26534,26529,26501,26551,
+26607,26548,26604,26547,26601,26552,26596,26590,26589,26594,26606,26553,26574,
+26566,26599,27292,26654,26694,26665,26688,26701,26674,26702,26803,26667,26713,
+26723,26743,26751,26783,26767,26797,26772,26781,26779,26755,27310,26809,26740,
+26805,26784,26810,26895,26765,26750,26881,26826,26888,26840,26914,26918,26849,
+26892,26829,26836,26855,26837,26934,26898,26884,26839,26851,26917,26873,26848,
+26863,26920,26922,26906,26915,26913,26822,27001,26999,26972,27000,26987,26964,
+27006,26990,26937,26996,26941,26969,26928,26977,26974,26973,27009,26986,27058,
+27054,27088,27071,27073,27091,27070,27086,23528,27082,27101,27067,27075,27047,
+27182,27025,27040,27036,27029,27060,27102,27112,27138,27163,27135,27402,27129,
+27122,27111,27141,27057,27166,27117,27156,27115,27146,27154,27329,27171,27155,
+27204,27148,27250,27190,27256,27207,27234,27225,27238,
+27208,27192,27170,27280,27277,27296,27268,27298,27299,27287,34327,27323,27331,
+27330,27320,27315,27308,27358,27345,27359,27306,27354,27370,27387,27397,34326,
+27386,27410,27414,39729,27423,27448,27447,30428,27449,39150,27463,27459,27465,
+27472,27481,27476,27483,27487,27489,27512,27513,27519,27520,27524,27523,27533,
+27544,27541,27550,27556,27562,27563,27567,27570,27569,27571,27575,27580,27590,
+27595,27603,27615,27628,27627,27635,27631,40638,27656,27667,27668,27675,27684,
+27683,27742,27733,27746,27754,27778,27789,27802,27777,27803,27774,27752,27763,
+27794,27792,27844,27889,27859,27837,27863,27845,27869,27822,27825,27838,27834,
+27867,27887,27865,27882,27935,34893,27958,27947,27965,27960,27929,27957,27955,
+27922,27916,28003,28051,28004,27994,28025,27993,28046,28053,28644,28037,28153,
+28181,28170,28085,28103,28134,28088,28102,28140,28126,28108,28136,28114,28101,
+28154,28121,28132,28117,28138,28142,28205,28270,28206,28185,28274,28255,28222,
+28195,28267,28203,28278,28237,28191,28227,28218,28238,28196,28415,28189,28216,
+28290,28330,28312,28361,28343,28371,28349,28335,28356,28338,28372,28373,28303,
+28325,28354,28319,28481,28433,28748,28396,28408,28414,28479,28402,28465,28399,
+28466,28364,28478,28435,28407,28550,28538,28536,28545,28544,28527,28507,28659,
+28525,28546,28540,28504,28558,28561,28610,28518,28595,28579,28577,28580,28601,
+28614,28586,28639,28629,28652,28628,28632,28657,28654,28635,28681,28683,28666,
+28689,28673,28687,28670,28699,28698,28532,28701,28696,28703,28720,28734,28722,
+28753,28771,28825,28818,28847,28913,28844,28856,28851,
+28846,28895,28875,28893,28889,28937,28925,28956,28953,29029,29013,29064,29030,
+29026,29004,29014,29036,29071,29179,29060,29077,29096,29100,29143,29113,29118,
+29138,29129,29140,29134,29152,29164,29159,29173,29180,29177,29183,29197,29200,
+29211,29224,29229,29228,29232,29234,29243,29244,29247,29248,29254,29259,29272,
+29300,29310,29314,29313,29319,29330,29334,29346,29351,29369,29362,29379,29382,
+29380,29390,29394,29410,29408,29409,29433,29431,20495,29463,29450,29468,29462,
+29469,29492,29487,29481,29477,29502,29518,29519,40664,29527,29546,29544,29552,
+29560,29557,29563,29562,29640,29619,29646,29627,29632,29669,29678,29662,29858,
+29701,29807,29733,29688,29746,29754,29781,29759,29791,29785,29761,29788,29801,
+29808,29795,29802,29814,29822,29835,29854,29863,29898,29903,29908,29681,29920,
+29923,29927,29929,29934,29938,29936,29937,29944,29943,29956,29955,29957,29964,
+29966,29965,29973,29971,29982,29990,29996,30012,30020,30029,30026,30025,30043,
+30022,30042,30057,30052,30055,30059,30061,30072,30070,30086,30087,30068,30090,
+30089,30082,30100,30106,30109,30117,30115,30146,30131,30147,30133,30141,30136,
+30140,30129,30157,30154,30162,30169,30179,30174,30206,30207,30204,30209,30192,
+30202,30194,30195,30219,30221,30217,30239,30247,30240,30241,30242,30244,30260,
+30256,30267,30279,30280,30278,30300,30296,30305,30306,30312,30313,30314,30311,
+30316,30320,30322,30326,30328,30332,30336,30339,30344,30347,30350,30358,30355,
+30361,30362,30384,30388,30392,30393,30394,30402,30413,30422,30418,30430,30433,
+30437,30439,30442,34351,30459,30472,30471,30468,30505,
+30500,30494,30501,30502,30491,30519,30520,30535,30554,30568,30571,30555,30565,
+30591,30590,30585,30606,30603,30609,30624,30622,30640,30646,30649,30655,30652,
+30653,30651,30663,30669,30679,30682,30684,30691,30702,30716,30732,30738,31014,
+30752,31018,30789,30862,30836,30854,30844,30874,30860,30883,30901,30890,30895,
+30929,30918,30923,30932,30910,30908,30917,30922,30956,30951,30938,30973,30964,
+30983,30994,30993,31001,31020,31019,31040,31072,31063,31071,31066,31061,31059,
+31098,31103,31114,31133,31143,40779,31146,31150,31155,31161,31162,31177,31189,
+31207,31212,31201,31203,31240,31245,31256,31257,31264,31263,31104,31281,31291,
+31294,31287,31299,31319,31305,31329,31330,31337,40861,31344,31353,31357,31368,
+31383,31381,31384,31382,31401,31432,31408,31414,31429,31428,31423,36995,31431,
+31434,31437,31439,31445,31443,31449,31450,31453,31457,31458,31462,31469,31472,
+31490,31503,31498,31494,31539,31512,31513,31518,31541,31528,31542,31568,31610,
+31492,31565,31499,31564,31557,31605,31589,31604,31591,31600,31601,31596,31598,
+31645,31640,31647,31629,31644,31642,31627,31634,31631,31581,31641,31691,31681,
+31692,31695,31668,31686,31709,31721,31761,31764,31718,31717,31840,31744,31751,
+31763,31731,31735,31767,31757,31734,31779,31783,31786,31775,31799,31787,31805,
+31820,31811,31828,31823,31808,31824,31832,31839,31844,31830,31845,31852,31861,
+31875,31888,31908,31917,31906,31915,31905,31912,31923,31922,31921,31918,31929,
+31933,31936,31941,31938,31960,31954,31964,31970,39739,31983,31986,31988,31990,
+31994,32006,32002,32028,32021,32010,32069,32075,32046,
+32050,32063,32053,32070,32115,32086,32078,32114,32104,32110,32079,32099,32147,
+32137,32091,32143,32125,32155,32186,32174,32163,32181,32199,32189,32171,32317,
+32162,32175,32220,32184,32159,32176,32216,32221,32228,32222,32251,32242,32225,
+32261,32266,32291,32289,32274,32305,32287,32265,32267,32290,32326,32358,32315,
+32309,32313,32323,32311,32306,32314,32359,32349,32342,32350,32345,32346,32377,
+32362,32361,32380,32379,32387,32213,32381,36782,32383,32392,32393,32396,32402,
+32400,32403,32404,32406,32398,32411,32412,32568,32570,32581,32588,32589,32590,
+32592,32593,32597,32596,32600,32607,32608,32616,32617,32615,32632,32642,32646,
+32643,32648,32647,32652,32660,32670,32669,32666,32675,32687,32690,32697,32686,
+32694,32696,35697,32709,32710,32714,32725,32724,32737,32742,32745,32755,32761,
+39132,32774,32772,32779,32786,32792,32793,32796,32801,32808,32831,32827,32842,
+32838,32850,32856,32858,32863,32866,32872,32883,32882,32880,32886,32889,32893,
+32895,32900,32902,32901,32923,32915,32922,32941,20880,32940,32987,32997,32985,
+32989,32964,32986,32982,33033,33007,33009,33051,33065,33059,33071,33099,38539,
+33094,33086,33107,33105,33020,33137,33134,33125,33126,33140,33155,33160,33162,
+33152,33154,33184,33173,33188,33187,33119,33171,33193,33200,33205,33214,33208,
+33213,33216,33218,33210,33225,33229,33233,33241,33240,33224,33242,33247,33248,
+33255,33274,33275,33278,33281,33282,33285,33287,33290,33293,33296,33302,33321,
+33323,33336,33331,33344,33369,33368,33373,33370,33375,33380,33378,33384,33386,
+33387,33326,33393,33399,33400,33406,33421,33426,33451,
+33439,33467,33452,33505,33507,33503,33490,33524,33523,33530,33683,33539,33531,
+33529,33502,33542,33500,33545,33497,33589,33588,33558,33586,33585,33600,33593,
+33616,33605,33583,33579,33559,33560,33669,33690,33706,33695,33698,33686,33571,
+33678,33671,33674,33660,33717,33651,33653,33696,33673,33704,33780,33811,33771,
+33742,33789,33795,33752,33803,33729,33783,33799,33760,33778,33805,33826,33824,
+33725,33848,34054,33787,33901,33834,33852,34138,33924,33911,33899,33965,33902,
+33922,33897,33862,33836,33903,33913,33845,33994,33890,33977,33983,33951,34009,
+33997,33979,34010,34000,33985,33990,34006,33953,34081,34047,34036,34071,34072,
+34092,34079,34069,34068,34044,34112,34147,34136,34120,34113,34306,34123,34133,
+34176,34212,34184,34193,34186,34216,34157,34196,34203,34282,34183,34204,34167,
+34174,34192,34249,34234,34255,34233,34256,34261,34269,34277,34268,34297,34314,
+34323,34315,34302,34298,34310,34338,34330,34352,34367,34381,20053,34388,34399,
+34407,34417,34451,34467,34473,34474,34443,34444,34486,34479,34500,34502,34480,
+34505,34851,34475,34516,34526,34537,34540,34527,34523,34543,34578,34566,34568,
+34560,34563,34555,34577,34569,34573,34553,34570,34612,34623,34615,34619,34597,
+34601,34586,34656,34655,34680,34636,34638,34676,34647,34664,34670,34649,34643,
+34659,34666,34821,34722,34719,34690,34735,34763,34749,34752,34768,38614,34731,
+34756,34739,34759,34758,34747,34799,34802,34784,34831,34829,34814,34806,34807,
+34830,34770,34833,34838,34837,34850,34849,34865,34870,34873,34855,34875,34884,
+34882,34898,34905,34910,34914,34923,34945,34942,34974,
+34933,34941,34997,34930,34946,34967,34962,34990,34969,34978,34957,34980,34992,
+35007,34993,35011,35012,35028,35032,35033,35037,35065,35074,35068,35060,35048,
+35058,35076,35084,35082,35091,35139,35102,35109,35114,35115,35137,35140,35131,
+35126,35128,35148,35101,35168,35166,35174,35172,35181,35178,35183,35188,35191,
+35198,35203,35208,35210,35219,35224,35233,35241,35238,35244,35247,35250,35258,
+35261,35263,35264,35290,35292,35293,35303,35316,35320,35331,35350,35344,35340,
+35355,35357,35365,35382,35393,35419,35410,35398,35400,35452,35437,35436,35426,
+35461,35458,35460,35496,35489,35473,35493,35494,35482,35491,35524,35533,35522,
+35546,35563,35571,35559,35556,35569,35604,35552,35554,35575,35550,35547,35596,
+35591,35610,35553,35606,35600,35607,35616,35635,38827,35622,35627,35646,35624,
+35649,35660,35663,35662,35657,35670,35675,35674,35691,35679,35692,35695,35700,
+35709,35712,35724,35726,35730,35731,35734,35737,35738,35898,35905,35903,35912,
+35916,35918,35920,35925,35938,35948,35960,35962,35970,35977,35973,35978,35981,
+35982,35988,35964,35992,25117,36013,36010,36029,36018,36019,36014,36022,36040,
+36033,36068,36067,36058,36093,36090,36091,36100,36101,36106,36103,36111,36109,
+36112,40782,36115,36045,36116,36118,36199,36205,36209,36211,36225,36249,36290,
+36286,36282,36303,36314,36310,36300,36315,36299,36330,36331,36319,36323,36348,
+36360,36361,36351,36381,36382,36368,36383,36418,36405,36400,36404,36426,36423,
+36425,36428,36432,36424,36441,36452,36448,36394,36451,36437,36470,36466,36476,
+36481,36487,36485,36484,36491,36490,36499,36497,36500,
+36505,36522,36513,36524,36528,36550,36529,36542,36549,36552,36555,36571,36579,
+36604,36603,36587,36606,36618,36613,36629,36626,36633,36627,36636,36639,36635,
+36620,36646,36659,36667,36665,36677,36674,36670,36684,36681,36678,36686,36695,
+36700,36706,36707,36708,36764,36767,36771,36781,36783,36791,36826,36837,36834,
+36842,36847,36999,36852,36869,36857,36858,36881,36885,36897,36877,36894,36886,
+36875,36903,36918,36917,36921,36856,36943,36944,36945,36946,36878,36937,36926,
+36950,36952,36958,36968,36975,36982,38568,36978,36994,36989,36993,36992,37002,
+37001,37007,37032,37039,37041,37045,37090,37092,25160,37083,37122,37138,37145,
+37170,37168,37194,37206,37208,37219,37221,37225,37235,37234,37259,37257,37250,
+37282,37291,37295,37290,37301,37300,37306,37312,37313,37321,37323,37328,37334,
+37343,37345,37339,37372,37365,37366,37406,37375,37396,37420,37397,37393,37470,
+37463,37445,37449,37476,37448,37525,37439,37451,37456,37532,37526,37523,37531,
+37466,37583,37561,37559,37609,37647,37626,37700,37678,37657,37666,37658,37667,
+37690,37685,37691,37724,37728,37756,37742,37718,37808,37804,37805,37780,37817,
+37846,37847,37864,37861,37848,37827,37853,37840,37832,37860,37914,37908,37907,
+37891,37895,37904,37942,37931,37941,37921,37946,37953,37970,37956,37979,37984,
+37986,37982,37994,37417,38000,38005,38007,38013,37978,38012,38014,38017,38015,
+38274,38279,38282,38292,38294,38296,38297,38304,38312,38311,38317,38332,38331,
+38329,38334,38346,28662,38339,38349,38348,38357,38356,38358,38364,38369,38373,
+38370,38433,38440,38446,38447,38466,38476,38479,38475,
+38519,38492,38494,38493,38495,38502,38514,38508,38541,38552,38549,38551,38570,
+38567,38577,38578,38576,38580,38582,38584,38585,38606,38603,38601,38605,35149,
+38620,38669,38613,38649,38660,38662,38664,38675,38670,38673,38671,38678,38681,
+38692,38698,38704,38713,38717,38718,38724,38726,38728,38722,38729,38748,38752,
+38756,38758,38760,21202,38763,38769,38777,38789,38780,38785,38778,38790,38795,
+38799,38800,38812,38824,38822,38819,38835,38836,38851,38854,38856,38859,38876,
+38893,40783,38898,31455,38902,38901,38927,38924,38968,38948,38945,38967,38973,
+38982,38991,38987,39019,39023,39024,39025,39028,39027,39082,39087,39089,39094,
+39108,39107,39110,39145,39147,39171,39177,39186,39188,39192,39201,39197,39198,
+39204,39200,39212,39214,39229,39230,39234,39241,39237,39248,39243,39249,39250,
+39244,39253,39319,39320,39333,39341,39342,39356,39391,39387,39389,39384,39377,
+39405,39406,39409,39410,39419,39416,39425,39439,39429,39394,39449,39467,39479,
+39493,39490,39488,39491,39486,39509,39501,39515,39511,39519,39522,39525,39524,
+39529,39531,39530,39597,39600,39612,39616,39631,39633,39635,39636,39646,39647,
+39650,39651,39654,39663,39659,39662,39668,39665,39671,39675,39686,39704,39706,
+39711,39714,39715,39717,39719,39720,39721,39722,39726,39727,39730,39748,39747,
+39759,39757,39758,39761,39768,39796,39827,39811,39825,39830,39831,39839,39840,
+39848,39860,39872,39882,39865,39878,39887,39889,39890,39907,39906,39908,39892,
+39905,39994,39922,39921,39920,39957,39956,39945,39955,39948,39942,39944,39954,
+39946,39940,39982,39963,39973,39972,39969,39984,40007,
+39986,40006,39998,40026,40032,40039,40054,40056,40167,40172,40176,40201,40200,
+40171,40195,40198,40234,40230,40367,40227,40223,40260,40213,40210,40257,40255,
+40254,40262,40264,40285,40286,40292,40273,40272,40281,40306,40329,40327,40363,
+40303,40314,40346,40356,40361,40370,40388,40385,40379,40376,40378,40390,40399,
+40386,40409,40403,40440,40422,40429,40431,40445,40474,40475,40478,40565,40569,
+40573,40577,40584,40587,40588,40594,40597,40593,40605,40613,40617,40632,40618,
+40621,38753,40652,40654,40655,40656,40660,40668,40670,40669,40672,40677,40680,
+40687,40692,40694,40695,40697,40699,40700,40701,40711,40712,30391,40725,40737,
+40748,40766,40778,40786,40788,40803,40799,40800,40801,40806,40807,40812,40810,
+40823,40818,40822,40853,40860,40864,22575,27079,36953,29796,20956,29081,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/ksc.h b/src/components/lib/libc/musl-1.2.0/src/locale/ksc.h
new file mode 100644
index 0000000000..cf2ec68909
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/ksc.h
@@ -0,0 +1,650 @@
+12288,12289,12290,183,8229,8230,168,12291,173,8213,8741,65340,8764,8216,8217,
+8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303,12304,
+12305,177,215,247,8800,8804,8805,8734,8756,176,8242,8243,8451,8491,65504,
+65505,65509,9794,9792,8736,8869,8978,8706,8711,8801,8786,167,8251,9734,9733,
+9675,9679,9678,9671,9670,9633,9632,9651,9650,9661,9660,8594,8592,8593,8595,
+8596,12307,8810,8811,8730,8765,8733,8757,8747,8748,8712,8715,8838,8839,8834,
+8835,8746,8745,8743,8744,65506,8658,8660,8704,8707,180,65374,711,728,733,730,
+729,184,731,161,191,720,8750,8721,8719,164,8457,8240,9665,9664,9655,9654,9828,
+9824,9825,9829,9831,9827,8857,9672,9635,9680,9681,9618,9636,9637,9640,9639,
+9638,9641,9832,9743,9742,9756,9758,182,8224,8225,8597,8599,8601,8598,8600,
+9837,9833,9834,9836,12927,12828,8470,13255,8482,13250,13272,8481,8364,174,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65281,65282,65283,65284,65285,65286,
+65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297,65298,65299,
+65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312,
+65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,
+65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,
+65339,65510,65341,65342,65343,65344,65345,65346,65347,
+65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,
+65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,
+65507,12593,12594,12595,12596,12597,12598,12599,12600,12601,12602,12603,12604,
+12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,
+12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,
+12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,
+12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,
+12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,
+12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,
+12683,12684,12685,12686,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,0,0,
+0,0,0,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,0,0,0,0,0,0,0,913,914,
+915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,
+935,936,937,0,0,0,0,0,0,0,0,945,946,947,948,949,950,951,952,953,954,955,956,
+957,958,959,960,961,963,964,965,966,967,968,969,0,0,0,0,0,0,9472,9474,9484,
+9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,
+9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,9490,
+9489,9498,9497,9494,9493,9486,9485,9502,
+9503,9505,9506,9510,9511,9513,9514,9517,9518,9521,9522,9525,9526,9529,9530,
+9533,9534,9536,9537,9539,9540,9541,9542,9543,9544,9545,9546,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13205,13206,13207,8467,13208,13252,13219,
+13220,13221,13222,13209,13210,13211,13212,13213,13214,13215,13216,13217,13218,
+13258,13197,13198,13199,13263,13192,13193,13256,13223,13224,13232,13233,13234,
+13235,13236,13237,13238,13239,13240,13241,13184,13185,13186,13187,13188,13242,
+13243,13244,13245,13246,13247,13200,13201,13202,13203,13204,8486,13248,13249,
+13194,13195,13196,13270,13253,13229,13230,13231,13275,13225,13226,13227,13228,
+13277,13264,13267,13251,13257,13276,13254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,198,
+208,170,294,0,306,0,319,321,216,338,186,222,358,330,0,12896,12897,12898,12899,
+12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911,12912,
+12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,9424,9425,
+9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437,9438,9439,9440,
+9441,9442,9443,9444,9445,9446,9447,9448,9449,9312,9313,9314,9315,9316,9317,
+9318,9319,9320,9321,9322,9323,9324,9325,9326,189,8531,8532,188,190,8539,8540,
+8541,8542,230,273,240,295,305,307,312,320,322,248,339,223,254,359,331,
+329,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,12811,
+12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,12824,
+12825,12826,12827,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,9383,
+9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9332,
+9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,185,178,
+179,8308,8319,8321,8322,8323,8324,12353,12354,12355,12356,12357,12358,12359,
+12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,
+12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,
+12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,
+12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,
+12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,
+12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,0,0,0,0,0,0,
+0,0,0,0,0,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,
+12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,
+12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,
+12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,
+12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,
+12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,
+12525,12526,12527,12528,12529,12530,12531,
+12532,12533,12534,0,0,0,0,0,0,0,0,1040,1041,1042,1043,1044,1045,1025,1046,
+1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,
+1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,
+1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,
+1101,1102,1103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,44032,44033,44036,44039,44040,44041,44042,44048,
+44049,44050,44051,44052,44053,44054,44055,44057,44058,44059,44060,44061,44064,
+44068,44076,44077,44079,44080,44081,44088,44089,44092,44096,44107,44109,44116,
+44120,44124,44144,44145,44148,44151,44152,44154,44160,44161,44163,44164,44165,
+44166,44169,44170,44171,44172,44176,44180,44188,44189,44191,44192,44193,44200,
+44201,44202,44204,44207,44208,44216,44217,44219,44220,44221,44225,44228,44232,
+44236,44245,44247,44256,44257,44260,44263,44264,44266,44268,44271,44272,44273,
+44275,44277,44278,44284,44285,44288,44292,44294,44300,44301,44303,44305,44312,
+44316,44320,44329,44332,44333,44340,44341,44344,44348,44356,44357,44359,44361,
+44368,44372,44376,44385,44387,44396,44397,44400,44403,44404,44405,44406,44411,
+44412,44413,44415,44417,44418,44424,44425,44428,44432,44444,44445,44452,44471,
+44480,44481,44484,44488,44496,44497,44499,44508,44512,44516,44536,44537,44540,
+44543,44544,44545,44552,44553,44555,44557,44564,44592,44593,44596,44599,44600,
+44602,44608,44609,44611,44613,44614,44618,44620,44621,44622,44624,44628,44630,
+44636,44637,44639,44640,44641,44645,44648,44649,44652,44656,44664,44665,44667,
+44668,44669,44676,44677,44684,44732,44733,44734,44736,44740,44748,44749,44751,
+44752,44753,44760,44761,44764,44776,44779,44781,44788,44792,44796,44807,44808,
+44813,44816,44844,44845,44848,44850,44852,44860,44861,44863,44865,44866,44867,
+44872,44873,44880,44892,44893,44900,44901,44921,44928,44932,44936,44944,44945,
+44949,44956,44984,44985,44988,44992,44999,45000,45001,45003,45005,45006,45012,
+45020,45032,45033,45040,45041,45044,45048,45056,45057,45060,45068,45072,45076,
+45084,45085,45096,45124,45125,45128,45130,45132,45134,45139,45140,45141,45143,
+45145,45149,45180,45181,45184,45188,45196,45197,45199,45201,45208,45209,45210,
+45212,45215,45216,45217,45218,45224,45225,45227,45228,45229,45230,45231,45233,
+45235,45236,45237,45240,45244,45252,45253,45255,45256,45257,45264,45265,45268,
+45272,45280,45285,45320,45321,45323,45324,45328,45330,45331,45336,45337,45339,
+45340,45341,45347,45348,45349,45352,45356,45364,45365,45367,45368,45369,45376,
+45377,45380,45384,45392,45393,45396,45397,45400,45404,45408,45432,45433,45436,
+45440,45442,45448,45449,45451,45453,45458,45459,45460,45464,45468,45480,45516,
+45520,45524,45532,45533,45535,45544,45545,45548,45552,
+45561,45563,45565,45572,45573,45576,45579,45580,45588,45589,45591,45593,45600,
+45620,45628,45656,45660,45664,45672,45673,45684,45685,45692,45700,45701,45705,
+45712,45713,45716,45720,45721,45722,45728,45729,45731,45733,45734,45738,45740,
+45744,45748,45768,45769,45772,45776,45778,45784,45785,45787,45789,45794,45796,
+45797,45798,45800,45803,45804,45805,45806,45807,45811,45812,45813,45815,45816,
+45817,45818,45819,45823,45824,45825,45828,45832,45840,45841,45843,45844,45845,
+45852,45908,45909,45910,45912,45915,45916,45918,45919,45924,45925,45927,45929,
+45931,45934,45936,45937,45940,45944,45952,45953,45955,45956,45957,45964,45968,
+45972,45984,45985,45992,45996,46020,46021,46024,46027,46028,46030,46032,46036,
+46037,46039,46041,46043,46045,46048,46052,46056,46076,46096,46104,46108,46112,
+46120,46121,46123,46132,46160,46161,46164,46168,46176,46177,46179,46181,46188,
+46208,46216,46237,46244,46248,46252,46261,46263,46265,46272,46276,46280,46288,
+46293,46300,46301,46304,46307,46308,46310,46316,46317,46319,46321,46328,46356,
+46357,46360,46363,46364,46372,46373,46375,46376,46377,46378,46384,46385,46388,
+46392,46400,46401,46403,46404,46405,46411,46412,46413,46416,46420,46428,46429,
+46431,46432,46433,46496,46497,46500,46504,46506,46507,46512,46513,46515,46516,
+46517,46523,46524,46525,46528,46532,46540,46541,46543,46544,46545,46552,46572,
+46608,46609,46612,46616,46629,46636,46644,46664,46692,46696,46748,46749,46752,
+46756,46763,46764,46769,46804,46832,46836,46840,46848,46849,46853,46888,46889,
+46892,46895,46896,46904,46905,46907,46916,46920,46924,
+46932,46933,46944,46948,46952,46960,46961,46963,46965,46972,46973,46976,46980,
+46988,46989,46991,46992,46993,46994,46998,46999,47000,47001,47004,47008,47016,
+47017,47019,47020,47021,47028,47029,47032,47047,47049,47084,47085,47088,47092,
+47100,47101,47103,47104,47105,47111,47112,47113,47116,47120,47128,47129,47131,
+47133,47140,47141,47144,47148,47156,47157,47159,47160,47161,47168,47172,47185,
+47187,47196,47197,47200,47204,47212,47213,47215,47217,47224,47228,47245,47272,
+47280,47284,47288,47296,47297,47299,47301,47308,47312,47316,47325,47327,47329,
+47336,47337,47340,47344,47352,47353,47355,47357,47364,47384,47392,47420,47421,
+47424,47428,47436,47439,47441,47448,47449,47452,47456,47464,47465,47467,47469,
+47476,47477,47480,47484,47492,47493,47495,47497,47498,47501,47502,47532,47533,
+47536,47540,47548,47549,47551,47553,47560,47561,47564,47566,47567,47568,47569,
+47570,47576,47577,47579,47581,47582,47585,47587,47588,47589,47592,47596,47604,
+47605,47607,47608,47609,47610,47616,47617,47624,47637,47672,47673,47676,47680,
+47682,47688,47689,47691,47693,47694,47699,47700,47701,47704,47708,47716,47717,
+47719,47720,47721,47728,47729,47732,47736,47747,47748,47749,47751,47756,47784,
+47785,47787,47788,47792,47794,47800,47801,47803,47805,47812,47816,47832,47833,
+47868,47872,47876,47885,47887,47889,47896,47900,47904,47913,47915,47924,47925,
+47926,47928,47931,47932,47933,47934,47940,47941,47943,47945,47949,47951,47952,
+47956,47960,47969,47971,47980,48008,48012,48016,48036,48040,48044,48052,48055,
+48064,48068,48072,48080,48083,48120,48121,48124,48127,
+48128,48130,48136,48137,48139,48140,48141,48143,48145,48148,48149,48150,48151,
+48152,48155,48156,48157,48158,48159,48164,48165,48167,48169,48173,48176,48177,
+48180,48184,48192,48193,48195,48196,48197,48201,48204,48205,48208,48221,48260,
+48261,48264,48267,48268,48270,48276,48277,48279,48281,48282,48288,48289,48292,
+48295,48296,48304,48305,48307,48308,48309,48316,48317,48320,48324,48333,48335,
+48336,48337,48341,48344,48348,48372,48373,48374,48376,48380,48388,48389,48391,
+48393,48400,48404,48420,48428,48448,48456,48457,48460,48464,48472,48473,48484,
+48488,48512,48513,48516,48519,48520,48521,48522,48528,48529,48531,48533,48537,
+48538,48540,48548,48560,48568,48596,48597,48600,48604,48617,48624,48628,48632,
+48640,48643,48645,48652,48653,48656,48660,48668,48669,48671,48708,48709,48712,
+48716,48718,48724,48725,48727,48729,48730,48731,48736,48737,48740,48744,48746,
+48752,48753,48755,48756,48757,48763,48764,48765,48768,48772,48780,48781,48783,
+48784,48785,48792,48793,48808,48848,48849,48852,48855,48856,48864,48867,48868,
+48869,48876,48897,48904,48905,48920,48921,48923,48924,48925,48960,48961,48964,
+48968,48976,48977,48981,49044,49072,49093,49100,49101,49104,49108,49116,49119,
+49121,49212,49233,49240,49244,49248,49256,49257,49296,49297,49300,49304,49312,
+49313,49315,49317,49324,49325,49327,49328,49331,49332,49333,49334,49340,49341,
+49343,49344,49345,49349,49352,49353,49356,49360,49368,49369,49371,49372,49373,
+49380,49381,49384,49388,49396,49397,49399,49401,49408,49412,49416,49424,49429,
+49436,49437,49438,49439,49440,49443,49444,49446,49447,
+49452,49453,49455,49456,49457,49462,49464,49465,49468,49472,49480,49481,49483,
+49484,49485,49492,49493,49496,49500,49508,49509,49511,49512,49513,49520,49524,
+49528,49541,49548,49549,49550,49552,49556,49558,49564,49565,49567,49569,49573,
+49576,49577,49580,49584,49597,49604,49608,49612,49620,49623,49624,49632,49636,
+49640,49648,49649,49651,49660,49661,49664,49668,49676,49677,49679,49681,49688,
+49689,49692,49695,49696,49704,49705,49707,49709,49711,49713,49714,49716,49736,
+49744,49745,49748,49752,49760,49765,49772,49773,49776,49780,49788,49789,49791,
+49793,49800,49801,49808,49816,49819,49821,49828,49829,49832,49836,49837,49844,
+49845,49847,49849,49884,49885,49888,49891,49892,49899,49900,49901,49903,49905,
+49910,49912,49913,49915,49916,49920,49928,49929,49932,49933,49939,49940,49941,
+49944,49948,49956,49957,49960,49961,49989,50024,50025,50028,50032,50034,50040,
+50041,50044,50045,50052,50056,50060,50112,50136,50137,50140,50143,50144,50146,
+50152,50153,50157,50164,50165,50168,50184,50192,50212,50220,50224,50228,50236,
+50237,50248,50276,50277,50280,50284,50292,50293,50297,50304,50324,50332,50360,
+50364,50409,50416,50417,50420,50424,50426,50431,50432,50433,50444,50448,50452,
+50460,50472,50473,50476,50480,50488,50489,50491,50493,50500,50501,50504,50505,
+50506,50508,50509,50510,50515,50516,50517,50519,50520,50521,50525,50526,50528,
+50529,50532,50536,50544,50545,50547,50548,50549,50556,50557,50560,50564,50567,
+50572,50573,50575,50577,50581,50583,50584,50588,50592,50601,50612,50613,50616,
+50617,50619,50620,50621,50622,50628,50629,50630,50631,
+50632,50633,50634,50636,50638,50640,50641,50644,50648,50656,50657,50659,50661,
+50668,50669,50670,50672,50676,50678,50679,50684,50685,50686,50687,50688,50689,
+50693,50694,50695,50696,50700,50704,50712,50713,50715,50716,50724,50725,50728,
+50732,50733,50734,50736,50739,50740,50741,50743,50745,50747,50752,50753,50756,
+50760,50768,50769,50771,50772,50773,50780,50781,50784,50796,50799,50801,50808,
+50809,50812,50816,50824,50825,50827,50829,50836,50837,50840,50844,50852,50853,
+50855,50857,50864,50865,50868,50872,50873,50874,50880,50881,50883,50885,50892,
+50893,50896,50900,50908,50909,50912,50913,50920,50921,50924,50928,50936,50937,
+50941,50948,50949,50952,50956,50964,50965,50967,50969,50976,50977,50980,50984,
+50992,50993,50995,50997,50999,51004,51005,51008,51012,51018,51020,51021,51023,
+51025,51026,51027,51028,51029,51030,51031,51032,51036,51040,51048,51051,51060,
+51061,51064,51068,51069,51070,51075,51076,51077,51079,51080,51081,51082,51086,
+51088,51089,51092,51094,51095,51096,51098,51104,51105,51107,51108,51109,51110,
+51116,51117,51120,51124,51132,51133,51135,51136,51137,51144,51145,51148,51150,
+51152,51160,51165,51172,51176,51180,51200,51201,51204,51208,51210,51216,51217,
+51219,51221,51222,51228,51229,51232,51236,51244,51245,51247,51249,51256,51260,
+51264,51272,51273,51276,51277,51284,51312,51313,51316,51320,51322,51328,51329,
+51331,51333,51334,51335,51339,51340,51341,51348,51357,51359,51361,51368,51388,
+51389,51396,51400,51404,51412,51413,51415,51417,51424,51425,51428,51445,51452,
+51453,51456,51460,51461,51462,51468,51469,51471,51473,
+51480,51500,51508,51536,51537,51540,51544,51552,51553,51555,51564,51568,51572,
+51580,51592,51593,51596,51600,51608,51609,51611,51613,51648,51649,51652,51655,
+51656,51658,51664,51665,51667,51669,51670,51673,51674,51676,51677,51680,51682,
+51684,51687,51692,51693,51695,51696,51697,51704,51705,51708,51712,51720,51721,
+51723,51724,51725,51732,51736,51753,51788,51789,51792,51796,51804,51805,51807,
+51808,51809,51816,51837,51844,51864,51900,51901,51904,51908,51916,51917,51919,
+51921,51923,51928,51929,51936,51948,51956,51976,51984,51988,51992,52000,52001,
+52033,52040,52041,52044,52048,52056,52057,52061,52068,52088,52089,52124,52152,
+52180,52196,52199,52201,52236,52237,52240,52244,52252,52253,52257,52258,52263,
+52264,52265,52268,52270,52272,52280,52281,52283,52284,52285,52286,52292,52293,
+52296,52300,52308,52309,52311,52312,52313,52320,52324,52326,52328,52336,52341,
+52376,52377,52380,52384,52392,52393,52395,52396,52397,52404,52405,52408,52412,
+52420,52421,52423,52425,52432,52436,52452,52460,52464,52481,52488,52489,52492,
+52496,52504,52505,52507,52509,52516,52520,52524,52537,52572,52576,52580,52588,
+52589,52591,52593,52600,52616,52628,52629,52632,52636,52644,52645,52647,52649,
+52656,52676,52684,52688,52712,52716,52720,52728,52729,52731,52733,52740,52744,
+52748,52756,52761,52768,52769,52772,52776,52784,52785,52787,52789,52824,52825,
+52828,52831,52832,52833,52840,52841,52843,52845,52852,52853,52856,52860,52868,
+52869,52871,52873,52880,52881,52884,52888,52896,52897,52899,52900,52901,52908,
+52909,52929,52964,52965,52968,52971,52972,52980,52981,
+52983,52984,52985,52992,52993,52996,53000,53008,53009,53011,53013,53020,53024,
+53028,53036,53037,53039,53040,53041,53048,53076,53077,53080,53084,53092,53093,
+53095,53097,53104,53105,53108,53112,53120,53125,53132,53153,53160,53168,53188,
+53216,53217,53220,53224,53232,53233,53235,53237,53244,53248,53252,53265,53272,
+53293,53300,53301,53304,53308,53316,53317,53319,53321,53328,53332,53336,53344,
+53356,53357,53360,53364,53372,53373,53377,53412,53413,53416,53420,53428,53429,
+53431,53433,53440,53441,53444,53448,53449,53456,53457,53459,53460,53461,53468,
+53469,53472,53476,53484,53485,53487,53488,53489,53496,53517,53552,53553,53556,
+53560,53562,53568,53569,53571,53572,53573,53580,53581,53584,53588,53596,53597,
+53599,53601,53608,53612,53628,53636,53640,53664,53665,53668,53672,53680,53681,
+53683,53685,53690,53692,53696,53720,53748,53752,53767,53769,53776,53804,53805,
+53808,53812,53820,53821,53823,53825,53832,53852,53860,53888,53889,53892,53896,
+53904,53905,53909,53916,53920,53924,53932,53937,53944,53945,53948,53951,53952,
+53954,53960,53961,53963,53972,53976,53980,53988,53989,54000,54001,54004,54008,
+54016,54017,54019,54021,54028,54029,54030,54032,54036,54038,54044,54045,54047,
+54048,54049,54053,54056,54057,54060,54064,54072,54073,54075,54076,54077,54084,
+54085,54140,54141,54144,54148,54156,54157,54159,54160,54161,54168,54169,54172,
+54176,54184,54185,54187,54189,54196,54200,54204,54212,54213,54216,54217,54224,
+54232,54241,54243,54252,54253,54256,54260,54268,54269,54271,54273,54280,54301,
+54336,54340,54364,54368,54372,54381,54383,54392,54393,
+54396,54399,54400,54402,54408,54409,54411,54413,54420,54441,54476,54480,54484,
+54492,54495,54504,54508,54512,54520,54523,54525,54532,54536,54540,54548,54549,
+54551,54588,54589,54592,54596,54604,54605,54607,54609,54616,54617,54620,54624,
+54629,54632,54633,54635,54637,54644,54645,54648,54652,54660,54661,54663,54664,
+54665,54672,54693,54728,54729,54732,54736,54738,54744,54745,54747,54749,54756,
+54757,54760,54764,54772,54773,54775,54777,54784,54785,54788,54792,54800,54801,
+54803,54804,54805,54812,54816,54820,54829,54840,54841,54844,54848,54853,54856,
+54857,54859,54861,54865,54868,54869,54872,54876,54887,54889,54896,54897,54900,
+54915,54917,54924,54925,54928,54932,54941,54943,54945,54952,54956,54960,54969,
+54971,54980,54981,54984,54988,54993,54996,54999,55001,55008,55012,55016,55024,
+55029,55036,55037,55040,55044,55057,55064,55065,55068,55072,55080,55081,55083,
+55085,55092,55093,55096,55100,55108,55111,55113,55120,55121,55124,55126,55127,
+55128,55129,55136,55137,55139,55141,55145,55148,55152,55156,55164,55165,55169,
+55176,55177,55180,55184,55192,55193,55195,55197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20285,20339,20551,20729,21152,21487,21621,21733,
+22025,23233,23478,26247,26550,26551,26607,27468,29634,30146,31292,33499,33540,
+34903,34952,35382,36040,36303,36603,36838,39381,21051,21364,21508,24682,24932,
+27580,29647,33050,35258,35282,38307,20355,21002,22718,22904,23014,24178,24185,
+25031,25536,26438,26604,26751,28567,30286,30475,30965,31240,31487,31777,32925,
+33390,33393,35563,38291,20075,21917,26359,28212,30883,31469,33883,35088,34638,
+38824,21208,22350,22570,23884,24863,25022,25121,25954,26577,27204,28187,29976,
+30131,30435,30640,32058,37039,37969,37970,40853,21283,23724,30002,32987,37440,
+38296,21083,22536,23004,23713,23831,24247,24378,24394,24951,27743,30074,30086,
+31968,32115,32177,32652,33108,33313,34193,35137,35611,37628,38477,40007,20171,
+20215,20491,20977,22607,24887,24894,24936,25913,27114,28433,30117,30342,30422,
+31623,33445,33995,63744,37799,38283,21888,23458,22353,63745,31923,32697,37301,
+20520,21435,23621,24040,25298,25454,25818,25831,28192,28844,31067,36317,36382,
+63746,36989,37445,37624,20094,20214,20581,24062,24314,24838,26967,33137,34388,
+36423,37749,39467,20062,20625,26480,26688,20745,21133,21138,27298,30652,37392,
+40660,21163,24623,36850,20552,25001,25581,25802,26684,27268,28608,33160,35233,
+38548,22533,29309,29356,29956,32121,32365,32937,35211,35700,36963,40273,25225,
+27770,28500,32080,32570,35363,20860,24906,31645,35609,37463,37772,20140,20435,
+20510,20670,20742,21185,21197,21375,22384,22659,24218,24465,24950,25004,
+25806,25964,26223,26299,26356,26775,28039,28805,28913,29855,29861,29898,30169,
+30828,30956,31455,31478,32069,32147,32789,32831,33051,33686,35686,36629,36885,
+37857,38915,38968,39514,39912,20418,21843,22586,22865,23395,23622,24760,25106,
+26690,26800,26856,28330,30028,30328,30926,31293,31995,32363,32380,35336,35489,
+35903,38542,40388,21476,21481,21578,21617,22266,22993,23396,23611,24235,25335,
+25911,25925,25970,26272,26543,27073,27837,30204,30352,30590,31295,32660,32771,
+32929,33167,33510,33533,33776,34241,34865,34996,35493,63747,36764,37678,38599,
+39015,39640,40723,21741,26011,26354,26767,31296,35895,40288,22256,22372,23825,
+26118,26801,26829,28414,29736,34974,39908,27752,63748,39592,20379,20844,20849,
+21151,23380,24037,24656,24685,25329,25511,25915,29657,31354,34467,36002,38799,
+20018,23521,25096,26524,29916,31185,33747,35463,35506,36328,36942,37707,38982,
+24275,27112,34303,37101,63749,20896,23448,23532,24931,26874,27454,28748,29743,
+29912,31649,32592,33733,35264,36011,38364,39208,21038,24669,25324,36866,20362,
+20809,21281,22745,24291,26336,27960,28826,29378,29654,31568,33009,37979,21350,
+25499,32619,20054,20608,22602,22750,24618,24871,25296,27088,39745,23439,32024,
+32945,36703,20132,20689,21676,21932,23308,23968,24039,25898,25934,26657,27211,
+29409,30350,30703,32094,32761,33184,34126,34527,36611,36686,37066,39171,39509,
+39851,19992,20037,20061,20167,20465,20855,21246,21312,21475,21477,21646,22036,
+22389,22434,23495,23943,24272,25084,25304,25937,26552,26601,27083,27472,27590,
+27628,27714,28317,28792,29399,29590,29699,30655,30697,
+31350,32127,32777,33276,33285,33290,33503,34914,35635,36092,36544,36881,37041,
+37476,37558,39378,39493,40169,40407,40860,22283,23616,33738,38816,38827,40628,
+21531,31384,32676,35033,36557,37089,22528,23624,25496,31391,23470,24339,31353,
+31406,33422,36524,20518,21048,21240,21367,22280,25331,25458,27402,28099,30519,
+21413,29527,34152,36470,38357,26426,27331,28528,35437,36556,39243,63750,26231,
+27512,36020,39740,63751,21483,22317,22862,25542,27131,29674,30789,31418,31429,
+31998,33909,35215,36211,36917,38312,21243,22343,30023,31584,33740,37406,63752,
+27224,20811,21067,21127,25119,26840,26997,38553,20677,21156,21220,25027,26020,
+26681,27135,29822,31563,33465,33771,35250,35641,36817,39241,63753,20170,22935,
+25810,26129,27278,29748,31105,31165,33449,34942,34943,35167,63754,37670,20235,
+21450,24613,25201,27762,32026,32102,20120,20834,30684,32943,20225,20238,20854,
+20864,21980,22120,22331,22522,22524,22804,22855,22931,23492,23696,23822,24049,
+24190,24524,25216,26071,26083,26398,26399,26462,26827,26820,27231,27450,27683,
+27773,27778,28103,29592,29734,29738,29826,29859,30072,30079,30849,30959,31041,
+31047,31048,31098,31637,32000,32186,32648,32774,32813,32908,35352,35663,35912,
+36215,37665,37668,39138,39249,39438,39439,39525,40594,32202,20342,21513,25326,
+26708,37329,21931,20794,63755,63756,23068,25062,63757,25295,25343,63758,63759,
+63760,63761,63762,63763,37027,63764,63765,63766,63767,63768,35582,63769,63770,
+63771,63772,26262,63773,29014,63774,63775,38627,63776,25423,25466,21335,63777,
+26511,26976,28275,63778,30007,63779,63780,63781,32013,
+63782,63783,34930,22218,23064,63784,63785,63786,63787,63788,20035,63789,20839,
+22856,26608,32784,63790,22899,24180,25754,31178,24565,24684,25288,25467,23527,
+23511,21162,63791,22900,24361,24594,63792,63793,63794,29785,63795,63796,63797,
+63798,63799,63800,39377,63801,63802,63803,63804,63805,63806,63807,63808,63809,
+63810,63811,28611,63812,63813,33215,36786,24817,63814,63815,33126,63816,63817,
+23615,63818,63819,63820,63821,63822,63823,63824,63825,23273,35365,26491,32016,
+63826,63827,63828,63829,63830,63831,33021,63832,63833,23612,27877,21311,28346,
+22810,33590,20025,20150,20294,21934,22296,22727,24406,26039,26086,27264,27573,
+28237,30701,31471,31774,32222,34507,34962,37170,37723,25787,28606,29562,30136,
+36948,21846,22349,25018,25812,26311,28129,28251,28525,28601,30192,32835,33213,
+34113,35203,35527,35674,37663,27795,30035,31572,36367,36957,21776,22530,22616,
+24162,25095,25758,26848,30070,31958,34739,40680,20195,22408,22382,22823,23565,
+23729,24118,24453,25140,25825,29619,33274,34955,36024,38538,40667,23429,24503,
+24755,20498,20992,21040,22294,22581,22615,23566,23648,23798,23947,24230,24466,
+24764,25361,25481,25623,26691,26873,27330,28120,28193,28372,28644,29182,30428,
+30585,31153,31291,33796,35241,36077,36339,36424,36867,36884,36947,37117,37709,
+38518,38876,27602,28678,29272,29346,29544,30563,31167,31716,32411,35712,22697,
+24775,25958,26109,26302,27788,28958,29129,35930,38931,20077,31361,20189,20908,
+20941,21205,21516,24999,26481,26704,26847,27934,28540,30140,30643,31461,33012,
+33891,37509,20828,26007,26460,26515,30168,31431,33651,
+63834,35910,36887,38957,23663,33216,33434,36929,36975,37389,24471,23965,27225,
+29128,30331,31561,34276,35588,37159,39472,21895,25078,63835,30313,32645,34367,
+34746,35064,37007,63836,27931,28889,29662,32097,33853,63837,37226,39409,63838,
+20098,21365,27396,27410,28734,29211,34349,40478,21068,36771,23888,25829,25900,
+27414,28651,31811,32412,34253,35172,35261,25289,33240,34847,24266,26391,28010,
+29436,29701,29807,34690,37086,20358,23821,24480,33802,20919,25504,30053,20142,
+20486,20841,20937,26753,27153,31918,31921,31975,33391,35538,36635,37327,20406,
+20791,21237,21570,24300,24942,25150,26053,27354,28670,31018,34268,34851,38317,
+39522,39530,40599,40654,21147,26310,27511,28701,31019,36706,38722,24976,25088,
+25891,28451,29001,29833,32244,32879,34030,36646,36899,37706,20925,21015,21155,
+27916,28872,35010,24265,25986,27566,28610,31806,29557,20196,20278,22265,63839,
+23738,23994,24604,29618,31533,32666,32718,32838,36894,37428,38646,38728,38936,
+40801,20363,28583,31150,37300,38583,21214,63840,25736,25796,27347,28510,28696,
+29200,30439,32769,34310,34396,36335,36613,38706,39791,40442,40565,30860,31103,
+32160,33737,37636,40575,40595,35542,22751,24324,26407,28711,29903,31840,32894,
+20769,28712,29282,30922,36034,36058,36084,38647,20102,20698,23534,24278,26009,
+29134,30274,30637,32842,34044,36988,39719,40845,22744,23105,23650,27155,28122,
+28431,30267,32047,32311,34078,35128,37860,38475,21129,26066,26611,27060,27969,
+28316,28687,29705,29792,30041,30244,30827,35628,39006,20845,25134,38520,20374,
+20523,23833,28138,32184,36650,24459,24900,26647,63841,
+38534,21202,32907,20956,20940,26974,31260,32190,33777,38517,20442,21033,21400,
+21519,21774,23653,24743,26446,26792,28012,29313,29432,29702,29827,63842,30178,
+31852,32633,32696,33673,35023,35041,37324,37328,38626,39881,21533,28542,29136,
+29848,34298,36522,38563,40023,40607,26519,28107,29747,33256,38678,30764,31435,
+31520,31890,25705,29802,30194,30908,30952,39340,39764,40635,23518,24149,28448,
+33180,33707,37000,19975,21325,23081,24018,24398,24930,25405,26217,26364,28415,
+28459,28771,30622,33836,34067,34875,36627,39237,39995,21788,25273,26411,27819,
+33545,35178,38778,20129,22916,24536,24537,26395,32178,32596,33426,33579,33725,
+36638,37017,22475,22969,23186,23504,26151,26522,26757,27599,29028,32629,36023,
+36067,36993,39749,33032,35978,38476,39488,40613,23391,27667,29467,30450,30431,
+33804,20906,35219,20813,20885,21193,26825,27796,30468,30496,32191,32236,38754,
+40629,28357,34065,20901,21517,21629,26126,26269,26919,28319,30399,30609,33559,
+33986,34719,37225,37528,40180,34946,20398,20882,21215,22982,24125,24917,25720,
+25721,26286,26576,27169,27597,27611,29279,29281,29761,30520,30683,32791,33468,
+33541,35584,35624,35980,26408,27792,29287,30446,30566,31302,40361,27519,27794,
+22818,26406,33945,21359,22675,22937,24287,25551,26164,26483,28218,29483,31447,
+33495,37672,21209,24043,25006,25035,25098,25287,25771,26080,26969,27494,27595,
+28961,29687,30045,32326,33310,33538,34154,35491,36031,38695,40289,22696,40664,
+20497,21006,21563,21839,25991,27766,32010,32011,32862,34442,38272,38639,21247,
+27797,29289,21619,23194,23614,23883,24396,24494,26410,
+26806,26979,28220,28228,30473,31859,32654,34183,35598,36855,38753,40692,23735,
+24758,24845,25003,25935,26107,26108,27665,27887,29599,29641,32225,38292,23494,
+34588,35600,21085,21338,25293,25615,25778,26420,27192,27850,29632,29854,31636,
+31893,32283,33162,33334,34180,36843,38649,39361,20276,21322,21453,21467,25292,
+25644,25856,26001,27075,27886,28504,29677,30036,30242,30436,30460,30928,30971,
+31020,32070,33324,34784,36820,38930,39151,21187,25300,25765,28196,28497,30332,
+36299,37297,37474,39662,39747,20515,20621,22346,22952,23592,24135,24439,25151,
+25918,26041,26049,26121,26507,27036,28354,30917,32033,32938,33152,33323,33459,
+33953,34444,35370,35607,37030,38450,40848,20493,20467,63843,22521,24472,25308,
+25490,26479,28227,28953,30403,32972,32986,35060,35061,35097,36064,36649,37197,
+38506,20271,20336,24091,26575,26658,30333,30334,39748,24161,27146,29033,29140,
+30058,63844,32321,34115,34281,39132,20240,31567,32624,38309,20961,24070,26805,
+27710,27726,27867,29359,31684,33539,27861,29754,20731,21128,22721,25816,27287,
+29863,30294,30887,34327,38370,38713,63845,21342,24321,35722,36776,36783,37002,
+21029,30629,40009,40712,19993,20482,20853,23643,24183,26142,26170,26564,26821,
+28851,29953,30149,31177,31453,36647,39200,39432,20445,22561,22577,23542,26222,
+27493,27921,28282,28541,29668,29995,33769,35036,35091,35676,36628,20239,20693,
+21264,21340,23443,24489,26381,31119,33145,33583,34068,35079,35206,36665,36667,
+39333,39954,26412,20086,20472,22857,23553,23791,23792,25447,26834,28925,29090,
+29739,32299,34028,34562,36898,37586,40179,19981,20184,
+20463,20613,21078,21103,21542,21648,22496,22827,23142,23386,23413,23500,24220,
+63846,25206,25975,26023,28014,28325,29238,31526,31807,32566,33104,33105,33178,
+33344,33433,33705,35331,36000,36070,36091,36212,36282,37096,37340,38428,38468,
+39385,40167,21271,20998,21545,22132,22707,22868,22894,24575,24996,25198,26128,
+27774,28954,30406,31881,31966,32027,33452,36033,38640,63847,20315,24343,24447,
+25282,23849,26379,26842,30844,32323,40300,19989,20633,21269,21290,21329,22915,
+23138,24199,24754,24970,25161,25209,26000,26503,27047,27604,27606,27607,27608,
+27832,63848,29749,30202,30738,30865,31189,31192,31875,32203,32737,32933,33086,
+33218,33778,34586,35048,35513,35692,36027,37145,38750,39131,40763,22188,23338,
+24428,25996,27315,27567,27996,28657,28693,29277,29613,36007,36051,38971,24977,
+27703,32856,39425,20045,20107,20123,20181,20282,20284,20351,20447,20735,21490,
+21496,21766,21987,22235,22763,22882,23057,23531,23546,23556,24051,24107,24473,
+24605,25448,26012,26031,26614,26619,26797,27515,27801,27863,28195,28681,29509,
+30722,31038,31040,31072,31169,31721,32023,32114,32902,33293,33678,34001,34503,
+35039,35408,35422,35613,36060,36198,36781,37034,39164,39391,40605,21066,63849,
+26388,63850,20632,21034,23665,25955,27733,29642,29987,30109,31639,33948,37240,
+38704,20087,25746,27578,29022,34217,19977,63851,26441,26862,28183,33439,34072,
+34923,25591,28545,37394,39087,19978,20663,20687,20767,21830,21930,22039,23360,
+23577,23776,24120,24202,24224,24258,24819,26705,27233,28248,29245,29248,29376,
+30456,31077,31665,32724,35059,35316,35443,35937,36062,
+38684,22622,29885,36093,21959,63852,31329,32034,33394,29298,29983,29989,63853,
+31513,22661,22779,23996,24207,24246,24464,24661,25234,25471,25933,26257,26329,
+26360,26646,26866,29312,29790,31598,32110,32214,32626,32997,33298,34223,35199,
+35475,36893,37604,40653,40736,22805,22893,24109,24796,26132,26227,26512,27728,
+28101,28511,30707,30889,33990,37323,37675,20185,20682,20808,21892,23307,23459,
+25159,25982,26059,28210,29053,29697,29764,29831,29887,30316,31146,32218,32341,
+32680,33146,33203,33337,34330,34796,35445,36323,36984,37521,37925,39245,39854,
+21352,23633,26964,27844,27945,28203,33292,34203,35131,35373,35498,38634,40807,
+21089,26297,27570,32406,34814,36109,38275,38493,25885,28041,29166,63854,22478,
+22995,23468,24615,24826,25104,26143,26207,29481,29689,30427,30465,31596,32854,
+32882,33125,35488,37266,19990,21218,27506,27927,31237,31545,32048,63855,36016,
+21484,22063,22609,23477,23567,23569,24034,25152,25475,25620,26157,26803,27836,
+28040,28335,28703,28836,29138,29990,30095,30094,30233,31505,31712,31787,32032,
+32057,34092,34157,34311,35380,36877,36961,37045,37559,38902,39479,20439,23660,
+26463,28049,31903,32396,35606,36118,36895,23403,24061,25613,33984,36956,39137,
+29575,23435,24730,26494,28126,35359,35494,36865,38924,21047,63856,28753,30862,
+37782,34928,37335,20462,21463,22013,22234,22402,22781,23234,23432,23723,23744,
+24101,24833,25101,25163,25480,25628,25910,25976,27193,27530,27700,27929,28465,
+29159,29417,29560,29703,29874,30246,30561,31168,31319,31466,31929,32143,32172,
+32353,32670,33065,33585,33936,34010,34282,34966,35504,
+35728,36664,36930,36995,37228,37526,37561,38539,38567,38568,38614,38656,38920,
+39318,39635,39706,21460,22654,22809,23408,23487,28113,28506,29087,29729,29881,
+32901,33789,24033,24455,24490,24642,26092,26642,26991,27219,27529,27957,28147,
+29667,30462,30636,31565,32020,33059,33308,33600,34036,34147,35426,35524,37255,
+37662,38918,39348,25100,34899,36848,37477,23815,23847,23913,29791,33181,34664,
+28629,25342,32722,35126,35186,19998,20056,20711,21213,21319,25215,26119,32361,
+34821,38494,20365,21273,22070,22987,23204,23608,23630,23629,24066,24337,24643,
+26045,26159,26178,26558,26612,29468,30690,31034,32709,33940,33997,35222,35430,
+35433,35553,35925,35962,22516,23508,24335,24687,25325,26893,27542,28252,29060,
+31698,34645,35672,36606,39135,39166,20280,20353,20449,21627,23072,23480,24892,
+26032,26216,29180,30003,31070,32051,33102,33251,33688,34218,34254,34563,35338,
+36523,36763,63857,36805,22833,23460,23526,24713,23529,23563,24515,27777,63858,
+28145,28683,29978,33455,35574,20160,21313,63859,38617,27663,20126,20420,20818,
+21854,23077,23784,25105,29273,33469,33706,34558,34905,35357,38463,38597,39187,
+40201,40285,22538,23731,23997,24132,24801,24853,25569,27138,28197,37122,37716,
+38990,39952,40823,23433,23736,25353,26191,26696,30524,38593,38797,38996,39839,
+26017,35585,36555,38332,21813,23721,24022,24245,26263,30284,33780,38343,22739,
+25276,29390,40232,20208,22830,24591,26171,27523,31207,40230,21395,21696,22467,
+23830,24859,26326,28079,30861,33406,38552,38724,21380,25212,25494,28082,32266,
+33099,38989,27387,32588,40367,40474,20063,20539,20918,
+22812,24825,25590,26928,29242,32822,63860,37326,24369,63861,63862,32004,33509,
+33903,33979,34277,36493,63863,20335,63864,63865,22756,23363,24665,25562,25880,
+25965,26264,63866,26954,27171,27915,28673,29036,30162,30221,31155,31344,63867,
+32650,63868,35140,63869,35731,37312,38525,63870,39178,22276,24481,26044,28417,
+30208,31142,35486,39341,39770,40812,20740,25014,25233,27277,33222,20547,22576,
+24422,28937,35328,35578,23420,34326,20474,20796,22196,22852,25513,28153,23978,
+26989,20870,20104,20313,63871,63872,63873,22914,63874,63875,27487,27741,63876,
+29877,30998,63877,33287,33349,33593,36671,36701,63878,39192,63879,63880,63881,
+20134,63882,22495,24441,26131,63883,63884,30123,32377,35695,63885,36870,39515,
+22181,22567,23032,23071,23476,63886,24310,63887,63888,25424,25403,63889,26941,
+27783,27839,28046,28051,28149,28436,63890,28895,28982,29017,63891,29123,29141,
+63892,30799,30831,63893,31605,32227,63894,32303,63895,34893,36575,63896,63897,
+63898,37467,63899,40182,63900,63901,63902,24709,28037,63903,29105,63904,63905,
+38321,21421,63906,63907,63908,26579,63909,28814,28976,29744,33398,33490,63910,
+38331,39653,40573,26308,63911,29121,33865,63912,63913,22603,63914,63915,23992,
+24433,63916,26144,26254,27001,27054,27704,27891,28214,28481,28634,28699,28719,
+29008,29151,29552,63917,29787,63918,29908,30408,31310,32403,63919,63920,33521,
+35424,36814,63921,37704,63922,38681,63923,63924,20034,20522,63925,21000,21473,
+26355,27757,28618,29450,30591,31330,33454,34269,34306,63926,35028,35427,35709,
+35947,63927,37555,63928,38675,38928,20116,20237,20425,
+20658,21320,21566,21555,21978,22626,22714,22887,23067,23524,24735,63929,25034,
+25942,26111,26212,26791,27738,28595,28879,29100,29522,31613,34568,35492,39986,
+40711,23627,27779,29508,29577,37434,28331,29797,30239,31337,32277,34314,20800,
+22725,25793,29934,29973,30320,32705,37013,38605,39252,28198,29926,31401,31402,
+33253,34521,34680,35355,23113,23436,23451,26785,26880,28003,29609,29715,29740,
+30871,32233,32747,33048,33109,33694,35916,38446,38929,26352,24448,26106,26505,
+27754,29579,20525,23043,27498,30702,22806,23916,24013,29477,30031,63930,63931,
+20709,20985,22575,22829,22934,23002,23525,63932,63933,23970,25303,25622,25747,
+25854,63934,26332,63935,27208,63936,29183,29796,63937,31368,31407,32327,32350,
+32768,33136,63938,34799,35201,35616,36953,63939,36992,39250,24958,27442,28020,
+32287,35109,36785,20433,20653,20887,21191,22471,22665,23481,24248,24898,27029,
+28044,28263,28342,29076,29794,29992,29996,32883,33592,33993,36362,37780,37854,
+63940,20110,20305,20598,20778,21448,21451,21491,23431,23507,23588,24858,24962,
+26100,29275,29591,29760,30402,31056,31121,31161,32006,32701,33419,34261,34398,
+36802,36935,37109,37354,38533,38632,38633,21206,24423,26093,26161,26671,29020,
+31286,37057,38922,20113,63941,27218,27550,28560,29065,32792,33464,34131,36939,
+38549,38642,38907,34074,39729,20112,29066,38596,20803,21407,21729,22291,22290,
+22435,23195,23236,23491,24616,24895,25588,27781,27961,28274,28304,29232,29503,
+29783,33489,34945,36677,36960,63942,38498,39000,40219,26376,36234,37470,20301,
+20553,20702,21361,22285,22996,23041,23561,24944,26256,
+28205,29234,29771,32239,32963,33806,33894,34111,34655,34907,35096,35586,36949,
+38859,39759,20083,20369,20754,20842,63943,21807,21929,23418,23461,24188,24189,
+24254,24736,24799,24840,24841,25540,25912,26377,63944,26580,26586,63945,26977,
+26978,27833,27943,63946,28216,63947,28641,29494,29495,63948,29788,30001,63949,
+30290,63950,63951,32173,33278,33848,35029,35480,35547,35565,36400,36418,36938,
+36926,36986,37193,37321,37742,63952,63953,22537,63954,27603,32905,32946,63955,
+63956,20801,22891,23609,63957,63958,28516,29607,32996,36103,63959,37399,38287,
+63960,63961,63962,63963,32895,25102,28700,32104,34701,63964,22432,24681,24903,
+27575,35518,37504,38577,20057,21535,28139,34093,38512,38899,39150,25558,27875,
+37009,20957,25033,33210,40441,20381,20506,20736,23452,24847,25087,25836,26885,
+27589,30097,30691,32681,33380,34191,34811,34915,35516,35696,37291,20108,20197,
+20234,63965,63966,22839,23016,63967,24050,24347,24411,24609,63968,63969,63970,
+63971,29246,29669,63972,30064,30157,63973,31227,63974,32780,32819,32900,33505,
+33617,63975,63976,36029,36019,36999,63977,63978,39156,39180,63979,63980,28727,
+30410,32714,32716,32764,35610,20154,20161,20995,21360,63981,21693,22240,23035,
+23493,24341,24525,28270,63982,63983,32106,33589,63984,34451,35469,63985,38765,
+38775,63986,63987,19968,20314,20350,22777,26085,28322,36920,37808,39353,20219,
+22764,22922,23001,24641,63988,63989,31252,63990,33615,36035,20837,21316,63991,
+63992,63993,20173,21097,23381,33471,20180,21050,21672,22985,23039,23376,23383,
+23388,24675,24904,28363,28825,29038,29574,29943,30133,
+30913,32043,32773,33258,33576,34071,34249,35566,36039,38604,20316,21242,22204,
+26027,26152,28796,28856,29237,32189,33421,37196,38592,40306,23409,26855,27544,
+28538,30430,23697,26283,28507,31668,31786,34870,38620,19976,20183,21280,22580,
+22715,22767,22892,23559,24115,24196,24373,25484,26290,26454,27167,27299,27404,
+28479,29254,63994,29520,29835,31456,31911,33144,33247,33255,33674,33900,34083,
+34196,34255,35037,36115,37292,38263,38556,20877,21705,22312,23472,25165,26448,
+26685,26771,28221,28371,28797,32289,35009,36001,36617,40779,40782,29229,31631,
+35533,37658,20295,20302,20786,21632,22992,24213,25269,26485,26990,27159,27822,
+28186,29401,29482,30141,31672,32053,33511,33785,33879,34295,35419,36015,36487,
+36889,37048,38606,40799,21219,21514,23265,23490,25688,25973,28404,29380,63995,
+30340,31309,31515,31821,32318,32735,33659,35627,36042,36196,36321,36447,36842,
+36857,36969,37841,20291,20346,20659,20840,20856,21069,21098,22625,22652,22880,
+23560,23637,24283,24731,25136,26643,27583,27656,28593,29006,29728,30000,30008,
+30033,30322,31564,31627,31661,31686,32399,35438,36670,36681,37439,37523,37666,
+37931,38651,39002,39019,39198,20999,25130,25240,27993,30308,31434,31680,32118,
+21344,23742,24215,28472,28857,31896,38673,39822,40670,25509,25722,34678,19969,
+20117,20141,20572,20597,21576,22979,23450,24128,24237,24311,24449,24773,25402,
+25919,25972,26060,26230,26232,26622,26984,27273,27491,27712,28096,28136,28191,
+28254,28702,28833,29582,29693,30010,30555,30855,31118,31243,31357,31934,32142,
+33351,35330,35562,35998,37165,37194,37336,37478,37580,
+37664,38662,38742,38748,38914,40718,21046,21137,21884,22564,24093,24351,24716,
+25552,26799,28639,31085,31532,33229,34234,35069,35576,36420,37261,38500,38555,
+38717,38988,40778,20430,20806,20939,21161,22066,24340,24427,25514,25805,26089,
+26177,26362,26361,26397,26781,26839,27133,28437,28526,29031,29157,29226,29866,
+30522,31062,31066,31199,31264,31381,31895,31967,32068,32368,32903,34299,34468,
+35412,35519,36249,36481,36896,36973,37347,38459,38613,40165,26063,31751,36275,
+37827,23384,23562,21330,25305,29469,20519,23447,24478,24752,24939,26837,28121,
+29742,31278,32066,32156,32305,33131,36394,36405,37758,37912,20304,22352,24038,
+24231,25387,32618,20027,20303,20367,20570,23005,32964,21610,21608,22014,22863,
+23449,24030,24282,26205,26417,26609,26666,27880,27954,28234,28557,28855,29664,
+30087,31820,32002,32044,32162,33311,34523,35387,35461,36208,36490,36659,36913,
+37198,37202,37956,39376,31481,31909,20426,20737,20934,22472,23535,23803,26201,
+27197,27994,28310,28652,28940,30063,31459,34850,36897,36981,38603,39423,33537,
+20013,20210,34886,37325,21373,27355,26987,27713,33914,22686,24974,26366,25327,
+28893,29969,30151,32338,33976,35657,36104,20043,21482,21675,22320,22336,24535,
+25345,25351,25711,25903,26088,26234,26525,26547,27490,27744,27802,28460,30693,
+30757,31049,31063,32025,32930,33026,33267,33437,33463,34584,35468,63996,36100,
+36286,36978,30452,31257,31287,32340,32887,21767,21972,22645,25391,25634,26185,
+26187,26733,27035,27524,27941,28337,29645,29800,29857,30043,30137,30433,30494,
+30603,31206,32265,32285,33275,34095,34967,35386,36049,
+36587,36784,36914,37805,38499,38515,38663,20356,21489,23018,23241,24089,26702,
+29894,30142,31209,31378,33187,34541,36074,36300,36845,26015,26389,63997,22519,
+28503,32221,36655,37878,38598,24501,25074,28548,19988,20376,20511,21449,21983,
+23919,24046,27425,27492,30923,31642,63998,36425,36554,36974,25417,25662,30528,
+31364,37679,38015,40810,25776,28591,29158,29864,29914,31428,31762,32386,31922,
+32408,35738,36106,38013,39184,39244,21049,23519,25830,26413,32046,20717,21443,
+22649,24920,24921,25082,26028,31449,35730,35734,20489,20513,21109,21809,23100,
+24288,24432,24884,25950,26124,26166,26274,27085,28356,28466,29462,30241,31379,
+33081,33369,33750,33980,20661,22512,23488,23528,24425,25505,30758,32181,33756,
+34081,37319,37365,20874,26613,31574,36012,20932,22971,24765,34389,20508,63999,
+21076,23610,24957,25114,25299,25842,26021,28364,30240,33034,36448,38495,38587,
+20191,21315,21912,22825,24029,25797,27849,28154,29588,31359,33307,34214,36068,
+36368,36983,37351,38369,38433,38854,20984,21746,21894,24505,25764,28552,32180,
+36639,36685,37941,20681,23574,27838,28155,29979,30651,31805,31844,35449,35522,
+22558,22974,24086,25463,29266,30090,30571,35548,36028,36626,24307,26228,28152,
+32893,33729,35531,38737,39894,64000,21059,26367,28053,28399,32224,35558,36910,
+36958,39636,21021,21119,21736,24980,25220,25307,26786,26898,26970,27189,28818,
+28966,30813,30977,30990,31186,31245,32918,33400,33493,33609,34121,35970,36229,
+37218,37259,37294,20419,22225,29165,30679,34560,35320,23544,24534,26449,37032,
+21474,22618,23541,24740,24961,25696,32317,32880,34085,
+37507,25774,20652,23828,26368,22684,25277,25512,26894,27000,27166,28267,30394,
+31179,33467,33833,35535,36264,36861,37138,37195,37276,37648,37656,37786,38619,
+39478,39949,19985,30044,31069,31482,31569,31689,32302,33988,36441,36468,36600,
+36880,26149,26943,29763,20986,26414,40668,20805,24544,27798,34802,34909,34935,
+24756,33205,33795,36101,21462,21561,22068,23094,23601,28810,32736,32858,33030,
+33261,36259,37257,39519,40434,20596,20164,21408,24827,28204,23652,20360,20516,
+21988,23769,24159,24677,26772,27835,28100,29118,30164,30196,30305,31258,31305,
+32199,32251,32622,33268,34473,36636,38601,39347,40786,21063,21189,39149,35242,
+19971,26578,28422,20405,23522,26517,27784,28024,29723,30759,37341,37756,34756,
+31204,31281,24555,20182,21668,21822,22702,22949,24816,25171,25302,26422,26965,
+33333,38464,39345,39389,20524,21331,21828,22396,64001,25176,64002,25826,26219,
+26589,28609,28655,29730,29752,35351,37944,21585,22022,22374,24392,24986,27470,
+28760,28845,32187,35477,22890,33067,25506,30472,32829,36010,22612,25645,27067,
+23445,24081,28271,64003,34153,20812,21488,22826,24608,24907,27526,27760,27888,
+31518,32974,33492,36294,37040,39089,64004,25799,28580,25745,25860,20814,21520,
+22303,35342,24927,26742,64005,30171,31570,32113,36890,22534,27084,33151,35114,
+36864,38969,20600,22871,22956,25237,36879,39722,24925,29305,38358,22369,23110,
+24052,25226,25773,25850,26487,27874,27966,29228,29750,30772,32631,33453,36315,
+38935,21028,22338,26495,29256,29923,36009,36774,37393,38442,20843,21485,25420,
+20329,21764,24726,25943,27803,28031,29260,29437,31255,
+35207,35997,24429,28558,28921,33192,24846,20415,20559,25153,29255,31687,32232,
+32745,36941,38829,39449,36022,22378,24179,26544,33805,35413,21536,23318,24163,
+24290,24330,25987,32954,34109,38281,38491,20296,21253,21261,21263,21638,21754,
+22275,24067,24598,25243,25265,25429,64006,27873,28006,30129,30770,32990,33071,
+33502,33889,33970,34957,35090,36875,37610,39165,39825,24133,26292,26333,28689,
+29190,64007,20469,21117,24426,24915,26451,27161,28418,29922,31080,34920,35961,
+39111,39108,39491,21697,31263,26963,35575,35914,39080,39342,24444,25259,30130,
+30382,34987,36991,38466,21305,24380,24517,27852,29644,30050,30091,31558,33534,
+39325,20047,36924,19979,20309,21414,22799,24264,26160,27827,29781,33655,34662,
+36032,36944,38686,39957,22737,23416,34384,35604,40372,23506,24680,24717,26097,
+27735,28450,28579,28698,32597,32752,38289,38290,38480,38867,21106,36676,20989,
+21547,21688,21859,21898,27323,28085,32216,33382,37532,38519,40569,21512,21704,
+30418,34532,38308,38356,38492,20130,20233,23022,23270,24055,24658,25239,26477,
+26689,27782,28207,32568,32923,33322,64008,64009,38917,20133,20565,21683,22419,
+22874,23401,23475,25032,26999,28023,28707,34809,35299,35442,35559,36994,39405,
+39608,21182,26680,20502,24184,26447,33607,34892,20139,21521,22190,29670,37141,
+38911,39177,39255,39321,22099,22687,34395,35377,25010,27382,29563,36562,27463,
+38570,39511,22869,29184,36203,38761,20436,23796,24358,25080,26203,27883,28843,
+29572,29625,29694,30505,30541,32067,32098,32291,33335,34898,64010,36066,37449,
+39023,23377,31348,34880,38913,23244,20448,21332,22846,
+23805,25406,28025,29433,33029,33031,33698,37583,38960,20136,20804,21009,22411,
+24418,27842,28366,28677,28752,28847,29074,29673,29801,33610,34722,34913,36872,
+37026,37795,39336,20846,24407,24800,24935,26291,34137,36426,37295,38795,20046,
+20114,21628,22741,22778,22909,23733,24359,25142,25160,26122,26215,27627,28009,
+28111,28246,28408,28564,28640,28649,28765,29392,29733,29786,29920,30355,31068,
+31946,32286,32993,33446,33899,33983,34382,34399,34676,35703,35946,37804,38912,
+39013,24785,25110,37239,23130,26127,28151,28222,29759,39746,24573,24794,31503,
+21700,24344,27742,27859,27946,28888,32005,34425,35340,40251,21270,21644,23301,
+27194,28779,30069,31117,31166,33457,33775,35441,35649,36008,38772,64011,25844,
+25899,30906,30907,31339,20024,21914,22864,23462,24187,24739,25563,27489,26213,
+26707,28185,29029,29872,32008,36996,39529,39973,27963,28369,29502,35905,38346,
+20976,24140,24488,24653,24822,24880,24908,26179,26180,27045,27841,28255,28361,
+28514,29004,29852,30343,31681,31783,33618,34647,36945,38541,40643,21295,22238,
+24315,24458,24674,24724,25079,26214,26371,27292,28142,28590,28784,29546,32362,
+33214,33588,34516,35496,36036,21123,29554,23446,27243,37892,21742,22150,23389,
+25928,25989,26313,26783,28045,28102,29243,32948,37237,39501,20399,20505,21402,
+21518,21564,21897,21957,24127,24460,26429,29030,29661,36869,21211,21235,22628,
+22734,28932,29071,29179,34224,35347,26248,34216,21927,26244,29002,33841,21321,
+21913,27585,24409,24509,25582,26249,28999,35569,36637,40638,20241,25658,28875,
+30054,34407,24676,35662,40440,20807,20982,21256,27958,
+33016,40657,26133,27427,28824,30165,21507,23673,32007,35350,27424,27453,27462,
+21560,24688,27965,32725,33288,20694,20958,21916,22123,22221,23020,23305,24076,
+24985,24984,25137,26206,26342,29081,29113,29114,29351,31143,31232,32690,35440,
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/langinfo.c b/src/components/lib/libc/musl-1.2.0/src/locale/langinfo.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/locale/langinfo.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/langinfo.c
index 776b447861..14773093b8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/langinfo.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/langinfo.c
@@ -1,7 +1,6 @@
 #include <locale.h>
 #include <langinfo.h>
 #include "locale_impl.h"
-#include "libc.h"
 
 static const char c_time[] =
 	"Sun\0" "Mon\0" "Tue\0" "Wed\0" "Thu\0" "Fri\0" "Sat\0"
@@ -33,28 +32,31 @@ char *__nl_langinfo_l(nl_item item, locale_t loc)
 	int idx = item & 65535;
 	const char *str;
 
-	if (item == CODESET)
-		return MB_CUR_MAX==1 ? "UTF-8-CODE-UNITS" : "UTF-8";
+	if (item == CODESET) return loc->cat[LC_CTYPE] ? "UTF-8" : "ASCII";
+
+	/* _NL_LOCALE_NAME extension */
+	if (idx == 65535 && cat < LC_ALL)
+		return loc->cat[cat] ? (char *)loc->cat[cat]->name : "C";
 	
 	switch (cat) {
 	case LC_NUMERIC:
-		if (idx > 1) return NULL;
+		if (idx > 1) return "";
 		str = c_numeric;
 		break;
 	case LC_TIME:
-		if (idx > 0x31) return NULL;
+		if (idx > 0x31) return "";
 		str = c_time;
 		break;
 	case LC_MONETARY:
-		if (idx > 0) return NULL;
+		if (idx > 0) return "";
 		str = "";
 		break;
 	case LC_MESSAGES:
-		if (idx > 3) return NULL;
+		if (idx > 3) return "";
 		str = c_messages;
 		break;
 	default:
-		return NULL;
+		return "";
 	}
 
 	for (; idx; idx--, str++) for (; *str; str++);
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/legacychars.h b/src/components/lib/libc/musl-1.2.0/src/locale/legacychars.h
new file mode 100644
index 0000000000..9639b4af96
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/legacychars.h
@@ -0,0 +1,40 @@
+256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,
+275,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,
+296,297,298,299,302,303,304,305,308,309,310,311,312,313,314,315,316,317,318,
+321,322,323,324,325,326,327,328,330,331,332,333,336,337,338,339,340,341,342,
+343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,
+362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,
+381,382,402,416,417,431,432,536,537,538,539,710,711,728,729,731,732,733,768,
+769,771,777,803,890,900,901,902,904,905,906,908,910,911,912,913,914,915,916,
+917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,
+937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,
+956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,
+1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1038,1039,1040,
+1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,
+1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,
+1071,
+1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,
+1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,
+1102,1103,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1118,
+1119,1168,1169,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1467,1468,
+1469,1470,1471,1472,1473,1474,1475,1488,1489,1490,1491,1492,1493,1494,1495,
+1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,
+1511,1512,1513,1514,1520,1521,1522,1523,1524,1548,1563,1567,1569,1570,1571,
+1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,
+1587,1588,1589,1590,1591,1592,1593,1594,1600,1601,1602,1603,1604,1605,1606,
+1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,1657,1662,1670,
+1672,1681,1688,1705,1711,1722,1726,1729,1746,3585,3586,3587,3588,3589,3590,
+3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,
+3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,
+3621,3622,3623,3624,3625,3626,3627,3628,3629,3630,3631,3632,3633,3634,3635,
+3636,3637,3638,3639,3640,3641,3642,3647,3648,3649,3650,3651,3652,3653,3654,
+3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669,
+3670,3671,3672,3673,3674,3675,7682,7683,7690,7691,7710,7711,7744,7745,7766,
+7767,
+7776,7777,7786,7787,7808,7809,7810,7811,7812,7813,7922,7923,8204,8205,8206,
+8207,8211,8212,8213,8215,8216,8217,8218,8220,8221,8222,8224,8225,8226,8230,
+8240,8249,8250,8319,8359,8362,8363,8364,8367,8470,8482,8729,8730,8734,8745,
+8776,8801,8804,8805,8976,8992,8993,9472,9474,9484,9488,9492,9496,9500,9508,
+9516,9524,9532,9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,
+9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,
+9579,9580,9600,9604,9608,9612,9616,9617,9618,9619,9632,
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/locale_map.c b/src/components/lib/libc/musl-1.2.0/src/locale/locale_map.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/locale/locale_map.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/locale_map.c
index c3e591746f..2321bac0ea 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/locale_map.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/locale_map.c
@@ -1,8 +1,9 @@
 #include <locale.h>
 #include <string.h>
+#include <sys/mman.h>
 #include "locale_impl.h"
 #include "libc.h"
-#include "atomic.h"
+#include "lock.h"
 
 const char *__lctrans_impl(const char *msg, const struct __locale_map *lm)
 {
@@ -11,10 +12,6 @@ const char *__lctrans_impl(const char *msg, const struct __locale_map *lm)
 	return trans ? trans : msg;
 }
 
-const unsigned char *__map_file(const char *, size_t *);
-int __munmap(void *, size_t);
-char *__strchrnul(const char *, int);
-
 static const char envvars[][12] = {
 	"LC_CTYPE",
 	"LC_NUMERIC",
@@ -26,7 +23,7 @@ static const char envvars[][12] = {
 
 const struct __locale_map *__get_locale(int cat, const char *val)
 {
-	static int lock[2];
+	static volatile int lock[1];
 	static void *volatile loc_head;
 	const struct __locale_map *p;
 	struct __locale_map *new = 0;
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/localeconv.c b/src/components/lib/libc/musl-1.2.0/src/locale/localeconv.c
new file mode 100644
index 0000000000..4cbb9dc52d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/localeconv.c
@@ -0,0 +1,34 @@
+#include <locale.h>
+#include <limits.h>
+
+static const struct lconv posix_lconv = {
+	.decimal_point = ".",
+	.thousands_sep = "",
+	.grouping = "",
+	.int_curr_symbol = "",
+	.currency_symbol = "",
+	.mon_decimal_point = "",
+	.mon_thousands_sep = "",
+	.mon_grouping = "",
+	.positive_sign = "",
+	.negative_sign = "",
+	.int_frac_digits = CHAR_MAX,
+	.frac_digits = CHAR_MAX,
+	.p_cs_precedes = CHAR_MAX,
+	.p_sep_by_space = CHAR_MAX,
+	.n_cs_precedes = CHAR_MAX,
+	.n_sep_by_space = CHAR_MAX,
+	.p_sign_posn = CHAR_MAX,
+	.n_sign_posn = CHAR_MAX,
+	.int_p_cs_precedes = CHAR_MAX,
+	.int_p_sep_by_space = CHAR_MAX,
+	.int_n_cs_precedes = CHAR_MAX,
+	.int_n_sep_by_space = CHAR_MAX,
+	.int_p_sign_posn = CHAR_MAX,
+	.int_n_sign_posn = CHAR_MAX,
+};
+
+struct lconv *localeconv(void)
+{
+	return (void *)&posix_lconv;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/newlocale.c b/src/components/lib/libc/musl-1.2.0/src/locale/newlocale.c
new file mode 100644
index 0000000000..d20a848983
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/newlocale.c
@@ -0,0 +1,58 @@
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+#include "locale_impl.h"
+
+static pthread_once_t default_locale_once;
+static struct __locale_struct default_locale, default_ctype_locale;
+
+static void default_locale_init(void)
+{
+	for (int i=0; i<LC_ALL; i++)
+		default_locale.cat[i] = __get_locale(i, "");
+	default_ctype_locale.cat[LC_CTYPE] = default_locale.cat[LC_CTYPE];
+}
+
+int __loc_is_allocated(locale_t loc)
+{
+	return loc && loc != C_LOCALE && loc != UTF8_LOCALE
+		&& loc != &default_locale && loc != &default_ctype_locale;
+}
+
+locale_t __newlocale(int mask, const char *name, locale_t loc)
+{
+	struct __locale_struct tmp;
+
+	for (int i=0; i<LC_ALL; i++) {
+		tmp.cat[i] = (!(mask & (1<<i)) && loc) ? loc->cat[i] :
+			__get_locale(i, (mask & (1<<i)) ? name : "");
+		if (tmp.cat[i] == LOC_MAP_FAILED)
+			return 0;
+	}
+
+	/* For locales with allocated storage, modify in-place. */
+	if (__loc_is_allocated(loc)) {
+		*loc = tmp;
+		return loc;
+	}
+
+	/* Otherwise, first see if we can use one of the builtin locales.
+	 * This makes the common usage case for newlocale, getting a C locale
+	 * with predictable behavior, very fast, and more importantly, fail-safe. */
+	if (!memcmp(&tmp, C_LOCALE, sizeof tmp)) return C_LOCALE;
+	if (!memcmp(&tmp, UTF8_LOCALE, sizeof tmp)) return UTF8_LOCALE;
+
+	/* And provide builtins for the initial default locale, and a
+	 * variant of the C locale honoring the default locale's encoding. */
+	pthread_once(&default_locale_once, default_locale_init);
+	if (!memcmp(&tmp, &default_locale, sizeof tmp)) return &default_locale;
+	if (!memcmp(&tmp, &default_ctype_locale, sizeof tmp))
+		return &default_ctype_locale;
+
+	/* If no builtin locale matched, attempt to allocate and copy. */
+	if ((loc = malloc(sizeof *loc))) *loc = tmp;
+
+	return loc;
+}
+
+weak_alias(__newlocale, newlocale);
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/pleval.c b/src/components/lib/libc/musl-1.2.0/src/locale/pleval.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/locale/pleval.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/pleval.c
index d60058da6c..04da1c45e8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/pleval.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/pleval.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <ctype.h>
+#include "pleval.h"
 
 /*
 grammar:
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/pleval.h b/src/components/lib/libc/musl-1.2.0/src/locale/pleval.h
new file mode 100644
index 0000000000..cc515f42f4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/pleval.h
@@ -0,0 +1,8 @@
+#ifndef PLEVAL_H
+#define PLEVAL_H
+
+#include <features.h>
+
+hidden unsigned long __pleval(const char *, unsigned long);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/revjis.h b/src/components/lib/libc/musl-1.2.0/src/locale/revjis.h
new file mode 100644
index 0000000000..3ab369f6ef
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/revjis.h
@@ -0,0 +1,515 @@
+31,80,81,87,14,299,74,61,12,344,62,63,1280,1281,1282,1283,1284,1285,1286,1287,
+1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,
+1303,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,
+1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1542,1536,1537,1538,1539,
+1540,1541,1543,1544,1545,1546,1547,1548,1549,1550,1551,1552,1553,1554,1555,
+1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1584,1585,
+1586,1587,1588,1589,1591,1592,1593,1594,1595,1596,1597,1598,1599,1600,1601,
+1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,
+1590,29,28,33,37,38,39,40,342,343,36,35,338,75,76,263,77,337,266,267,265,268,
+300,301,302,318,303,319,281,282,60,324,326,70,315,297,298,288,287,328,329,71,
+327,325,321,65,320,68,69,322,323,285,286,283,284,316,317,1792,1803,1793,1804,
+1794,1805,1795,1806,1797,1808,1796,1807,1798,1819,1814,1809,1800,1821,1816,
+1811,1799,1815,1820,1810,1801,1817,1822,1812,1802,1818,1823,1813,258,257,260,
+259,262,261,256,93,90,92,91,349,89,88,73,72,341,340,339,0,1,2,22,24,25,26,49,
+50,51,52,53,54,55,56,57,58,264,269,43,44,32,
+768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,
+787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,
+806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,
+825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,
+844,845,846,847,848,849,850,10,11,20,21,1024,1025,1026,1027,1028,1029,1030,
+1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,
+1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,
+1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,
+1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,
+1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,
+1106,1107,1108,1109,5,27,18,19,3915,8793,6934,10843,7493,6671,7492,4379,10291,
+11294,12033,4110,4685,12034,7939,12577,5173,10521,7494,11549,10529,12035,8773,
+12036,5465,12037,4924,8719,6982,12038,12039,12040,9748,5174,9750,9538,5922,
+10770,18472,12041,7495,12042,4372,5444,5967,11080,13573,11343,9564,4868,5140,
+12043,12044,11546,11292,8263,12046,6741,9554,12049,4125,5950,5949,3909,11818,
+11817,6418,3840,12050,12051,12052,10771,12053,5969,3910,10833,5211,5212,5213,
+9025,11547,12054,12055,12056,7724,7193,7725,12061,12059,12060,5175,6402,4431,
+12058,12057,10504,6693,6692,8477,12062,10292,8006,23,12063,12065,8516,11584,
+3881,12064,4381,5411,8774,5710,12066,9731,4938,12067,3882,5951,4939,10329,
+10001,5176,4432,12102,9248,9803,12069,10011,11585,7692,6694,6742,4383,9008,
+8705,12073,3883,9026,7194,6419,11267,8493,4382,12072,11293,12068,12070,6477,
+12071,13315,12079,12082,12080,4385,10522,12074,12078,5970,6695,4869,12083,
+12075,11586,6743,12076,12081,12084,12077,5376,3884,5377,4384,13316,10840,
+10317,5971,7694,11542,10551,5655,8452,4419,7218,12088,12093,12091,12086,8462,
+12089,12092,12090,10556,12087,7693,10834,12094,12095,7171,12108,9775,10261,
+12103,10575,4373,12107,12101,12110,8241,5923,9787,16166,12109,9276,12098,5973,
+5972,12096,6969,12104,10574,8748,12100,5712,12097,12105,12099,11568,12106,
+11808,5445,5711,12111,12112,12116,3885,10543,12115,12114,12118,12117,9027,
+5713,12119,6948,8453,9028,5461,12120,5141,12121,12123,10772,5701,6672,10070,
+12122,6436,11298,12125,12290,12124,6435,7260,5656,12291,5422,12288,12289,9486,
+8283,5378,10796,12292,11548,12293,12296,12294,8237,12295,12297,12299,12298,
+10535,5142,12301,12302,4366,12300,6995,12305,12304,12303,12085,12306,7261,
+12307,11268,11064,12309,12308,12311,12310,12312,12313,3923,5908,5658,7195,
+8794,5379,8007,5974,6221,12315,11047,9253,6744,12314,12316,9277,4692,12317,
+9565,8211,12319,12320,9995,5975,11802,12321,5381,10523,8469,5456,
+9236,5714,12322,12323,9537,4158,12326,6492,12325,6437,12327,17741,12328,10784,
+12329,12330,12331,7496,6955,4870,12334,12332,11036,12333,10297,12335,12336,
+12337,9278,12341,12339,12340,12338,6466,12342,11081,11587,12343,7943,12344,
+7225,12345,8795,11550,9279,12580,12346,21252,5412,12347,10813,7239,8539,12349,
+9539,12350,12351,4621,12352,5382,9515,4185,7215,9984,12353,9280,7726,12354,
+10507,7993,4865,4872,12355,12357,5657,12356,11602,7240,10012,10539,12358,
+11351,12359,12360,9309,12361,7944,6493,5715,12362,6696,6222,9029,12364,8454,
+6478,12365,12366,8207,12363,12368,10773,6211,12367,5716,6461,9804,12371,12369,
+10330,7497,12378,4675,12372,12370,8238,12374,12373,4643,5695,12379,11532,
+12375,12380,12377,12376,11566,5976,4386,11603,7252,9271,6212,12545,12546,
+11588,11786,12548,5977,12547,4622,12549,10805,8987,11269,10552,12550,20276,
+9487,12551,4873,11026,7424,12552,10566,12556,7945,12553,5423,12554,4874,5645,
+12557,12558,12559,12560,6970,5978,11069,11079,9558,10576,12561,12562,12564,
+12566,12565,12567,4380,10795,6491,12568,8248,7425,5384,12569,10042,12570,
+12571,12572,12573,10243,5447,3908,9502,12574,7196,8008,12576,12575,7426,5952,
+12578,10013,12579,10043,8467,8525,5383,9549,8720,9805,10797,12581,8009,5652,
+12582,12583,4107,3924,4940,8455,5168,11344,12586,4374,12585,5385,12587,11088,
+12588,11569,5979,5909,12589,12591,12590,7742,4120,4157,12592,12593,5910,12594,
+5197,6673,12595,10835,6420,5177,11270,8239,10014,7004,7206,6983,
+6996,7253,10015,12598,4130,8240,5980,5924,5446,12602,8704,8541,5386,7427,
+12603,12601,4387,8517,6935,6698,4101,4687,6213,6697,12604,12605,5160,4645,
+6214,5159,9022,4100,9488,11037,6144,11352,9254,5981,5646,12614,5442,10793,
+10044,12613,4925,12608,12609,12611,12612,5178,7744,10508,12610,12606,5954,
+12607,11779,10577,9031,5953,6223,12615,9532,12619,7005,6997,12622,12620,11010,
+12617,12626,12621,12624,5925,11038,12625,12627,12629,6479,11809,12618,12616,
+12628,12623,12631,12802,12633,12637,12800,12634,12829,6472,4624,12632,12804,
+3925,12803,3844,10281,12801,12635,12630,12636,6439,12805,3926,12814,12806,
+12807,7428,10824,12812,12811,9230,12813,12810,4115,6421,7695,12808,9281,12809,
+3841,12819,11266,7430,12825,12824,12815,8482,12816,8526,12821,7429,12818,
+11075,5659,12822,12823,12820,12826,12817,12832,12837,12833,12828,12838,8208,
+12840,6145,12830,8796,12834,12827,4876,4941,4676,12835,12831,5717,12841,12839,
+8242,5161,5387,12836,5459,4131,12845,12843,13062,12848,12842,12846,12844,6699,
+12847,12850,12855,12853,12852,8721,4388,12849,12851,7431,4114,12854,4413,
+12865,7515,12861,12859,12860,12862,4124,8216,12856,12857,4697,12864,4942,
+12867,12863,12866,10509,9524,10007,12869,12868,4644,12870,12873,12872,12871,
+9752,12874,12875,12877,12876,12879,12882,12880,12878,12881,12883,12884,12885,
+12886,12887,12324,7003,6700,4434,3927,8739,12888,6403,3886,7741,12889,5926,
+6224,12891,12890,10559,12892,13056,12893,13057,13058,5718,4159,13059,13061,
+13060,
+13063,9273,13064,3860,6462,5660,8750,13065,13066,13068,13069,6467,5424,10774,
+13067,13070,6432,6146,13074,6404,8722,13071,9017,13075,7745,13073,13076,5662,
+13077,13078,6147,4639,13080,13081,13082,13079,13072,13083,13084,10819,7498,
+13086,13087,13085,13089,9751,3911,10293,13090,7516,6936,9788,4943,6474,10808,
+9489,5719,8494,13088,13091,8483,13092,13093,13095,9032,4877,21248,4160,10578,
+7499,9255,6469,13101,10524,11580,4435,13097,8217,13100,9282,9256,9283,10008,
+9004,6440,13096,4181,9237,13098,13094,7727,13102,7213,5388,13103,10567,8284,
+8997,13105,10798,13106,13111,10510,13110,13104,13107,13109,6405,10536,13112,
+8740,4436,7500,13114,13113,6215,13115,13117,13116,13119,13108,13121,13120,
+13118,6701,7728,8243,13122,7963,3916,9795,9018,13124,13123,13125,13126,13127,
+13128,10544,13129,4389,13130,11291,4623,12584,7207,8478,13131,11082,11027,
+13133,8518,9238,8479,10294,13134,13135,4186,6937,13136,3887,13137,13138,4161,
+4944,9535,10579,13142,8244,13141,5663,10810,13140,9284,13144,13143,13146,
+13145,4187,13147,7432,13149,8708,13148,10514,7254,9274,13312,6148,13313,9728,
+10045,11056,9732,13322,5143,11300,11022,13579,13314,13317,8484,10775,9257,
+13318,10820,6441,7433,13319,6703,6702,3864,5927,7946,3888,13323,13324,13321,
+4119,4878,13320,11044,10256,3847,3928,6704,3889,3842,13329,13327,11035,13330,
+13328,13326,7696,13325,10553,5955,13334,13335,7434,13331,11787,9771,13333,
+6406,13336,10295,13337,13332,11034,9789,13338,10257,13339,13343,
+13340,4390,13342,6938,13341,5720,13355,13348,13345,8771,13344,13346,13347,
+13349,13350,4945,13352,13351,13353,7501,13356,9019,4132,13354,13357,13358,
+13361,13359,13360,6705,13362,6149,13363,6745,8471,13364,13365,6713,6150,11057,
+5127,5928,13366,4663,13367,8472,13368,13570,13369,13370,13371,13373,13374,
+13375,8527,4102,6984,3873,8246,4879,6932,6151,9285,7168,4880,8775,9033,3863,
+5144,10580,6945,5169,8010,6939,11271,13376,5179,6442,4625,4162,7435,4391,
+13377,11301,7208,6979,13378,4946,9521,11016,13379,13380,10296,13382,4871,5462,
+13381,4881,7697,13386,6656,4392,13385,13383,13387,13384,9738,15148,7698,13388,
+11551,13389,13391,8797,13390,7938,6746,8495,6998,10324,8011,6956,13392,7436,
+13393,13394,3890,8473,7729,13395,9490,7437,7438,13396,8012,7439,13397,13398,
+11071,13399,5413,7169,13400,13401,6971,7691,9555,7731,10071,9729,5416,13402,
+5198,13403,5469,9518,4367,6706,13404,13569,13568,5468,13405,9239,8463,9258,
+6951,8247,11353,13571,13572,9525,6674,13574,13575,13576,4947,13577,13578,4363,
+8218,4931,13580,11015,8497,4664,13582,13584,4926,13581,13583,13586,13585,
+13587,13588,9500,5389,4420,13589,13594,13592,10582,10581,9286,13591,7219,
+13590,7761,13595,6473,13601,13602,13596,4626,13597,13606,13605,13604,13600,
+13599,13603,10583,13610,13607,13609,11345,13608,13598,7762,13611,6422,13612,
+13613,13616,13615,13614,9287,13593,13622,13618,13617,13619,13620,13623,11589,
+13624,13621,13625,4927,13626,13628,13627,13629,13630,8013,7170,
+7235,8258,6152,6423,6153,5199,13631,6424,5929,13632,11013,9762,13633,6154,
+4875,8710,5425,6707,10298,10016,13634,4948,13637,8960,13636,13635,13638,9034,
+7746,6708,7977,8498,5121,8961,13639,13640,7502,10776,13643,13642,13641,10332,
+13650,10809,13644,13646,10826,13645,13647,9991,13648,10525,13649,4882,10526,
+9742,13651,13652,6155,4883,13653,5911,11299,11272,4949,13655,8962,6156,7440,
+10046,7441,7255,9035,10584,9240,6157,10299,13656,9272,6433,5930,9036,3874,
+7245,6158,11302,13657,13658,9776,13659,11606,11788,13661,13660,4646,13824,
+13827,13828,13826,10271,7442,13830,13829,13825,13831,13832,13833,13836,13834,
+13835,13837,4163,9037,13838,5721,4437,9749,13839,9562,10554,13840,11789,13841,
+10527,13844,12032,12048,6927,9556,13845,5180,8963,3929,13846,10501,6159,8751,
+9038,11086,5912,5931,13847,13848,13854,6980,8964,5390,13849,10250,8741,13850,
+13851,5391,13852,13853,13855,9301,13856,13857,13858,13843,13842,13859,5664,
+10246,6443,10262,8965,10282,13860,7443,4133,13861,13862,11089,10047,13865,
+4188,7947,13864,13863,5665,8499,13869,13867,13866,11526,5956,7256,13868,9259,
+7197,9503,13872,13871,13870,13873,5957,13874,10331,7226,13875,10072,9504,8966,
+9231,13876,5130,7699,10251,4950,9733,13877,6709,10777,10778,4189,13882,8776,
+13879,4438,14092,13881,9743,13880,13878,6233,13884,13890,13896,13888,9275,
+13893,10300,13887,13892,11590,6710,8500,13885,5181,13895,7948,4164,13889,4439,
+13894,5392,13891,13897,13899,13909,13907,13904,13903,11607,
+13905,5393,6160,7257,13912,13898,13902,13886,4441,13906,13908,8752,6407,4375,
+13900,13911,13910,5394,8456,4677,5666,13901,13913,13916,14080,6940,14086,9039,
+13914,14084,4440,14082,14083,13917,14081,5958,11273,4884,4152,14085,9753,3852,
+10048,13883,14091,14095,11076,14088,9288,14093,7503,14094,9526,11814,14090,
+14096,6234,7978,3891,14089,14087,8249,13915,6675,8485,14108,8250,14103,14100,
+14101,6981,14104,14107,14102,7172,14105,14099,11099,11098,14109,14110,3892,
+14098,5457,3845,4885,14106,14114,14113,14118,14119,14117,14120,14112,14116,
+14121,14122,14111,6747,14115,8501,6161,14097,7700,14135,10568,14125,14126,
+14127,14134,14133,10844,4886,14131,5668,4627,14128,11543,14130,3893,14132,
+14123,14129,14136,5667,14124,11324,11274,14139,14143,8285,11608,14144,14141,
+14138,14137,14142,10511,9491,5669,14145,14140,14146,5722,4368,14154,4887,
+14152,14153,6408,14151,14149,14148,14155,14147,14157,4442,14159,14158,8967,
+14162,14160,14150,5723,14161,14165,14164,14166,14163,14167,14168,14169,10569,
+14171,14170,7198,7949,4421,4443,14172,3870,7979,14173,19234,14336,5696,14337,
+8014,14338,14339,5145,14340,14341,14342,8502,5932,11072,10779,7241,14343,8015,
+19740,10049,6985,6444,14344,8486,10502,8528,14347,14345,14348,14346,14349,
+10512,3862,10301,10050,14350,14353,7444,5146,14351,14358,7445,14352,9763,
+11325,14354,14355,14359,9289,14356,6162,7997,14373,10003,8529,10051,14604,
+10585,9040,10836,14362,4352,8777,14371,8723,14365,14372,14367,14374,14370,
+14369,9806,14363,
+4444,14361,5200,8530,14357,14360,6163,7994,7446,14368,9777,5201,4647,4678,
+7680,14376,14381,14377,5724,14382,6657,6216,7173,14364,6748,14379,6711,14380,
+3875,14375,8968,5202,5395,14378,3846,6434,7701,9041,10035,14384,8253,8457,
+6666,14385,14387,14383,10560,8988,8251,10586,6957,14399,14398,7767,5725,14392,
+7448,9543,9744,14390,8252,6999,14395,7447,14389,14394,9778,14388,5632,4668,
+14396,11530,6445,8724,14393,7995,6164,7747,4165,8219,14391,5156,5670,9006,
+14397,8254,14400,14402,8470,14408,14403,14405,10272,9042,14406,11275,11303,
+4888,3853,14404,14401,4951,4166,14407,11304,14411,8474,14418,14412,14409,
+14416,14386,14413,14417,10017,9290,14410,14414,5671,6480,7996,14422,9221,
+14419,10815,14420,14421,11053,7937,5697,14428,6676,14425,14424,9745,9492,9232,
+14426,14427,10318,9764,6658,8016,10799,4648,14596,14429,11305,14598,14594,
+14595,8255,14593,14366,14597,14592,14602,14603,9222,14605,6659,14600,5147,
+14606,14599,14610,14609,14608,14611,14613,7504,14612,14616,14614,14615,14415,
+14618,14617,14423,14619,14607,6712,14620,14621,14623,14622,14624,4445,6165,
+10587,7950,5933,14626,14629,10289,5182,14628,14627,9779,14630,5396,14632,
+14631,4889,6677,9527,5672,7763,14633,7951,9223,10302,14634,14635,14636,10519,
+13372,7973,10283,6455,10052,10018,9260,11552,14638,6959,14639,3861,5427,7980,
+10303,14640,6689,8742,6714,7702,14641,10588,4182,6715,14644,14642,14645,11544,
+14643,8026,14646,8465,14647,4953,14649,14648,14650,14651,4954,9563,
+8725,5195,6716,8256,7227,3855,14652,4353,14656,6166,14655,6410,7449,14654,
+7450,11039,6409,3894,7981,14661,7952,4134,7220,10821,6481,7451,7942,14660,
+14658,14659,8778,14853,14665,6749,6167,14663,14664,7703,14662,6670,14667,
+14666,14671,14672,14668,4609,14669,14670,10036,10304,5673,14673,7953,7452,
+8753,5414,14674,14678,4394,14675,14677,14676,7242,8743,3876,14679,14680,8969,
+11600,6690,10570,10780,14849,14682,14685,14684,14681,14848,9533,14683,14850,
+7243,14851,11306,9815,14852,14854,14855,14856,5417,4135,6168,14857,14858,7248,
+8257,12599,8221,8220,8503,6438,12113,5709,11276,10589,10333,14859,6482,8990,
+14860,11790,10781,8970,14861,4955,14862,14863,11065,11011,10837,10811,6660,
+14865,6986,10800,14867,14870,14869,4952,5183,14866,14868,14871,7768,11354,
+3880,6463,8475,6972,7506,14874,9261,14872,8458,14873,7505,11068,14875,14876,
+11335,14881,6169,9780,14878,9291,14653,14657,5166,9766,14880,7453,10019,14886,
+10073,14877,14883,14882,7982,10828,11570,10822,4395,6717,11815,14885,7764,
+14884,14879,5934,14891,14889,4396,14887,14893,14899,8487,10528,14901,10241,
+14900,9807,10782,4890,8022,7199,9010,11277,14896,14895,14897,14894,14902,
+14892,14890,14898,14888,8779,11095,6949,6483,6425,10830,4640,9005,9513,4136,
+8017,7955,5641,14904,6170,4699,14906,4691,14912,14909,8018,4650,6411,4649,
+6446,14907,5700,5674,9292,14905,3877,14908,14910,5420,5643,4891,5162,14913,
+6488,10832,6678,14914,10255,14926,4370,14915,14932,14916,11553,14923,
+9790,14931,14918,3859,14920,6171,14922,14921,14917,14928,7454,13132,5959,
+11355,14919,9043,4610,6412,14911,14927,4672,14925,14929,9293,4957,15121,11048,
+14934,4956,14941,10783,15104,15106,15110,14936,8713,9294,15114,14939,15111,
+15105,7704,15115,7954,15113,4892,11823,14933,15109,3895,14935,11033,14940,
+7681,8998,14930,15108,7769,15118,4688,5888,15120,14937,15119,15112,14938,
+15116,15117,15134,9517,15107,15130,15132,9015,11307,10325,15127,8489,15133,
+8222,15124,15137,15136,9550,15135,9545,15139,15126,5415,15129,7228,9791,15131,
+5418,15123,15125,15122,11791,4665,15128,15138,4628,6470,4156,15155,11792,
+15158,7705,15157,15156,15153,15141,15170,15140,15159,15151,15146,15143,15144,
+15152,21249,15149,6172,8999,8259,15147,15142,15145,11308,10825,15150,15160,
+15168,15161,15174,15172,15167,15166,9007,8260,15164,15162,15169,15175,10068,
+15181,15176,15179,15173,8787,10263,15163,15171,7455,11054,15191,15178,5889,
+4354,4670,15154,7456,15183,15190,7000,4689,8717,15180,15185,15189,5397,5163,
+15187,5120,9514,15186,15188,15182,15184,4671,8744,15195,15193,5960,15192,
+15360,14903,15194,15196,15197,15371,15367,14924,15366,15365,15362,15177,15364,
+15363,15369,11781,15372,5466,15368,15370,9990,15373,15377,15374,11346,15375,
+15165,15378,15379,4116,15381,5702,6912,5428,4355,11326,15383,15382,15385,5148,
+5429,4893,15388,15387,15389,4397,8726,15390,4894,15392,15391,15393,15394,
+15395,6718,7956,6400,10319,10561,11811,6740,6447,11601,15396,15397,6719,15398,
+15399,15401,15400,10807,
+7229,6987,6691,15402,15404,7682,15403,15405,15406,15407,15408,15409,15411,
+15410,15412,4356,8745,15413,6661,4651,15414,9249,13099,5122,15415,15416,10571,
+10823,9510,15417,10053,10074,11058,15418,15420,15419,15422,15421,15424,6720,
+11024,15425,15426,5123,15427,15429,15428,7748,10264,4137,10020,9044,7200,5184,
+10021,6925,15431,4895,4183,9553,15430,6173,8754,15432,15440,15433,8480,5185,
+15441,5703,5124,15439,15437,15434,11327,8991,9528,15435,15443,15442,5634,4364,
+6426,15436,15438,10806,8531,10838,15451,15452,4398,10503,11100,15616,6914,
+7457,15447,15453,4167,5398,15444,15449,8019,9808,10054,15446,10752,15448,
+15619,15617,15450,10753,9767,5186,9220,8780,15620,15618,8504,15445,4138,11309,
+15631,15630,8021,15627,11339,9493,15621,8996,4139,6174,15624,7174,15629,15628,
+15623,15626,4679,15625,9768,11533,7507,8020,15637,15635,10284,15632,15634,
+4121,6175,11793,4636,10305,11328,4611,7706,15636,15641,7458,11279,15638,15633,
+15639,11581,9298,9505,4629,4148,15645,15648,11554,11331,15655,15649,15646,
+11571,15652,7209,15654,15659,9296,15657,15651,8727,15658,15647,15653,15660,
+3931,15650,15661,7707,7230,10500,6413,15642,15656,9241,7957,4680,6448,7459,
+15644,7201,5675,15643,15665,7244,5913,15680,15674,5203,9262,15669,15678,3854,
+4113,4376,15671,8459,15662,15664,6176,15681,15676,15668,15675,11018,15673,
+15677,5935,7460,8728,15667,11278,15670,15663,9297,15666,15672,11824,6941,
+10845,15682,9997,15694,5914,7231,15684,11534,6177,15697,3917,15695,15683,
+15689,15691,11310,15686,9229,15688,15696,15690,11046,15685,6913,15709,4681,
+15687,15692,15693,8523,8505,15701,15707,15705,9224,15874,15702,15703,15679,
+5208,10265,6942,6230,11794,15699,15873,4168,8261,9816,4896,11609,11008,9009,
+15706,15708,8209,15872,15704,15698,4898,5704,15886,15881,8023,4674,7232,15890,
+15883,8971,15880,9016,15915,15877,15876,15885,15879,15878,15884,7936,15875,
+15887,15888,4897,15893,15892,15894,15897,9250,15891,15895,5698,8536,15889,
+9754,15896,15901,15899,15902,15905,15898,6217,9735,15640,11347,15900,15904,
+8532,15903,15882,20040,15908,15912,15910,15906,15907,15911,15909,10285,15917,
+15914,15913,15916,9523,15918,8788,8524,7940,15919,15921,15920,15700,15922,
+9542,15923,4399,9299,4612,5187,6973,6449,11782,7749,4169,15925,15924,15928,
+8729,15931,15926,15930,15929,9247,3896,11604,15933,4103,15935,15934,15932,
+15927,10754,15937,15936,4170,15939,10513,15938,11028,7462,8210,7461,11610,
+15945,8024,15941,15946,4171,15944,9792,15940,15943,7463,10032,15947,6960,8025,
+15950,15942,5638,15948,11311,15951,21253,7214,15952,15953,9741,15955,15956,
+9746,9300,15958,15960,11572,15957,15959,4172,15954,12858,15961,8262,6679,
+15963,15962,7683,12600,15964,16128,15949,15965,16129,9817,16130,16131,16132,
+16133,9021,16135,16134,16136,16137,6974,10306,11083,16138,16139,8245,6915,
+16140,16141,16142,10545,10022,16143,9782,8972,16144,4422,5196,11045,11029,
+4371,11795,10801,10505,7958,16145,9506,5890,16146,6451,16148,16147,16149,
+16150,16151,5149,16152,16153,
+5891,10023,16155,7508,16154,5399,16156,16158,16157,16159,5936,16160,5448,8223,
+6236,16162,16163,16161,6988,9511,5400,16165,8715,16164,11796,9793,16168,16170,
+16167,11059,16169,16171,11555,16175,16174,8789,9740,5892,16173,16172,11280,
+11281,16176,4173,6229,6721,16177,16178,16180,7202,16182,16181,16183,4652,
+16185,16184,16187,16186,5915,11527,5419,4357,5449,4928,11591,16189,16191,
+16192,4400,16188,6680,8992,16190,16195,6989,16193,5661,10024,16194,16221,
+16200,5916,5188,16197,11356,11535,8533,16199,16201,11573,5430,10075,9769,
+16202,16204,16207,16203,16206,5961,4140,16208,7759,16205,11579,16211,21251,
+16209,16212,16198,16210,6427,16213,16214,11357,16215,16216,16196,16217,4899,
+6916,16218,16219,16220,4122,16384,10266,16385,4867,16386,16387,16388,16390,
+16391,16389,10290,16393,16392,16395,16394,16396,16397,16399,16398,6232,16401,
+16400,4900,7730,9243,16402,7959,6681,4184,16403,11312,10562,16404,9251,11282,
+6178,7708,8746,12563,8973,4423,16405,16406,16411,16409,16408,14625,4613,16407,
+3897,9993,10025,11536,16412,16410,8763,7941,9994,10252,16414,11531,5676,16415,
+16413,10037,16416,16417,3898,7509,16422,16419,9548,16418,5125,16425,16420,
+16421,16424,16423,10244,8225,8224,5150,16426,16427,16428,16430,16429,4149,
+16438,10055,16432,16434,16436,7709,16437,16435,6943,16431,16433,10273,7464,
+16440,16439,16441,6917,6414,9302,16442,9002,16444,11520,16443,8264,16449,
+16451,16452,8755,16450,16447,16445,16446,16448,16455,16453,16454,16456,16458,
+16459,16460,16461,16457,
+16463,16462,16464,11556,16467,16465,16466,4929,11101,10537,16469,16468,16470,
+16471,16475,16472,16473,16474,16476,16477,16640,16641,16642,9998,9263,16643,
+9809,10259,16644,16645,9225,4614,6179,16646,16647,16648,6664,16650,16649,
+16651,16652,10056,16653,16654,21064,16655,16656,16657,6669,16658,9781,10814,
+4141,4150,16659,16661,16660,9295,7960,15384,16662,11040,16663,4901,10038,
+16664,16665,16666,11067,11060,8989,8265,16668,7233,7465,16671,16670,16669,
+10076,4902,5896,16677,16674,7710,11025,16673,16675,16676,16672,16678,16679,
+8974,4930,8772,16680,16681,16684,7750,9507,16685,10802,16682,16683,16688,
+16687,16686,16690,16689,16691,16693,16692,10540,7221,11557,16694,9494,16695,
+16696,16700,16698,16699,16697,16701,16702,16703,16704,11030,16705,11087,16706,
+8749,9801,5450,8730,16707,5401,7983,16708,6428,16709,16710,5893,6452,16712,
+9269,6453,5165,10755,9770,9270,6203,16714,7466,11537,6180,5894,9986,16716,
+16718,5962,16717,9045,16720,4630,16715,10057,4111,6475,11825,16719,16721,
+10538,7992,16723,16724,16722,4653,16730,16729,6918,16731,16726,16732,16727,
+10039,16725,16728,16897,16896,10816,16733,3914,16899,16898,7467,16900,8226,
+16902,16901,16903,16711,16713,16905,16904,6919,11592,6961,16906,5654,5151,
+5126,6722,11283,16912,16911,8227,16908,16910,7210,7711,16909,16907,9737,7468,
+10267,6454,9303,16913,16914,16936,5431,11804,8212,16915,4401,9046,10496,16916,
+5209,16917,16919,16920,9736,16921,16922,16923,5432,4402,9508,7175,6723,16924,
+7176,4393,10274,16925,
+10058,8228,16928,16929,9800,7712,16926,8768,16927,7469,3899,5128,16930,9047,
+16931,7974,11020,10242,16932,16933,8756,11558,16935,16934,6990,16937,3919,
+16940,16938,4403,5677,16939,6181,6225,10565,16941,10803,16943,7984,4142,4377,
+3851,16942,16944,16945,7510,16946,4654,16948,5705,5189,16949,5460,16950,8027,
+9516,7999,6484,16951,8769,8266,16953,16955,16952,16954,5633,16956,5637,5190,
+11313,16958,16959,4109,16962,4693,16961,16960,16964,16957,16965,11528,16966,
+16967,13139,16969,16968,16970,16971,11540,16972,20302,7470,16973,16974,7222,
+9495,16975,8711,16976,8731,16977,5380,12318,8764,6930,4903,16978,17153,16981,
+5191,16980,17155,16979,7471,16983,16984,9226,16985,4669,7737,10307,16987,8519,
+16982,16986,16988,6490,17157,10253,9989,9304,5433,17156,17154,10004,16989,
+8765,9306,9305,6485,17175,17159,17161,17164,17165,17162,17163,17160,17158,
+17152,10542,4404,17172,17169,17174,17173,9810,11014,6682,17167,17176,17171,
+17170,17166,17168,4904,8732,8028,9985,17181,9987,8000,17178,10030,17182,10546,
+8762,17177,17179,17180,17183,6947,9509,17188,17187,17184,11797,17193,17197,
+17194,17190,17191,17196,17185,12596,17192,17186,17195,17201,4905,17198,17199,
+17200,17203,17202,10069,17204,11611,10572,17209,17206,17205,7985,17208,17210,
+17207,17214,17211,17212,17189,17213,17215,17216,10533,17217,11073,5421,5640,
+17218,10515,7751,11023,17219,11538,9811,8229,9747,7212,3871,17224,17222,17220,
+4864,7472,17225,17223,17221,17229,17228,17227,17226,17230,17231,7961,17232,
+17234,
+17233,5937,8215,17236,9307,17235,17237,10516,8267,6182,17238,11559,17240,
+17241,17242,17243,6724,17244,5678,5193,5129,17408,11090,6183,17245,17411,
+11077,9755,10258,7234,17410,6962,6184,6725,5192,10517,17409,8230,10785,6486,
+6726,9020,17414,11582,6456,17415,7713,17417,7473,6415,17416,7177,5917,8231,
+17412,17418,17413,5679,17421,17425,5706,17420,17429,6185,11340,3867,17426,
+5194,17423,17424,9308,17422,17419,4615,8003,5895,17431,17428,17430,17427,5680,
+8466,17432,8269,17445,17441,17435,17439,7001,3900,17434,17442,17446,6186,
+11061,9013,17436,17444,17433,8733,17438,3868,11049,17437,5434,10059,8268,
+11567,7246,17485,17447,8029,17443,17448,17450,9048,17453,17449,10547,4906,
+11050,3901,17452,11612,17451,4174,9547,17454,17461,17455,17462,17458,9818,
+6953,17460,17457,17463,17456,7203,10756,7211,17459,17471,17467,17470,17468,
+17472,17466,17440,7986,10026,17469,17464,8192,5681,7178,7684,8213,17475,17477,
+17478,17474,17476,17465,17473,17481,17480,10841,5642,17479,17483,17482,17486,
+17488,6683,17484,17489,17490,17491,17497,9242,17493,17492,17494,17495,17496,
+17498,17499,4907,17500,17501,17664,17665,17666,17667,17668,17669,17671,17670,
+17672,17673,17674,17677,17675,17676,6464,5682,8757,10002,7247,9772,10060,
+17678,14156,17679,17681,11332,17680,17683,17682,11314,17684,10077,17685,17688,
+17687,17686,17689,5649,8193,5152,17693,17690,17691,17694,17695,17692,4104,
+4358,17697,17698,17699,11329,7179,17701,17700,7752,17702,17703,17704,4932,
+4908,17705,17706,10812,11330,
+11315,11798,6188,17709,6963,17708,17710,6920,8496,17711,6187,11062,17712,
+17713,17714,17715,17716,6921,11084,17718,8734,17717,17720,17719,17721,7962,
+17722,17723,10520,17724,8270,17725,17726,11613,17729,17728,17727,8975,17730,
+7685,17731,17732,11799,17733,17734,17736,17735,9988,9560,11805,9992,17738,
+7474,10249,17739,17737,4909,5939,6727,10061,5897,10786,17742,17740,6189,6190,
+3912,6471,9784,3902,17747,8735,9783,8506,17749,17745,17748,17743,17746,10757,
+5940,3932,17744,17751,17752,9496,5402,17925,9756,6728,5403,7975,11813,11021,
+17750,7987,5170,17753,17755,17754,17756,8709,9757,8976,17922,17921,17757,7732,
+10308,17924,17923,6191,11826,17940,17928,17929,6991,17927,6231,17926,17930,
+8977,10497,8194,8507,17934,17935,17931,17932,17933,6192,17941,17937,10309,
+10827,10247,17936,17939,17938,10787,17942,17943,8214,17944,17946,17950,17947,
+17945,9758,17948,17949,4369,17956,17951,17952,17953,8448,17955,17954,17957,
+17958,17959,7714,4424,17960,11574,6922,7180,6729,8758,17961,17962,4112,17963,
+17964,17965,17966,17967,5404,14601,17968,8004,17969,6954,17970,12047,17971,
+10557,4923,8195,7223,10320,7181,17972,6193,17973,10027,17987,17975,8488,9812,
+5918,17974,8196,17976,9049,17978,17977,17980,17979,17981,17983,17982,4910,
+17984,17985,17986,6416,11560,17988,7686,4175,17989,17990,17991,3921,17992,
+17993,10310,6950,17995,4616,3857,17994,17997,9773,7715,4405,10758,5692,5435,
+17996,4425,4866,4176,18001,11593,8508,10275,18013,4406,18011,18009,18000,
+17998,17999,
+6978,5451,8790,9520,4144,18003,18002,18008,18004,18007,11055,18006,4407,4700,
+18010,18012,5683,18178,18187,18188,3850,18195,3920,18186,18185,18180,18179,
+18177,18176,8770,8538,18182,18181,18184,8271,5684,4128,18183,6194,8272,18201,
+18202,4408,4365,18199,18189,18197,18204,18198,18196,18005,18194,18190,4911,
+18192,18203,18193,18205,18191,9819,11336,18200,18222,18214,7770,5157,5436,
+18209,4410,7475,18212,6457,9264,18217,10573,18208,4409,5941,10248,18218,18206,
+18215,18225,18210,18211,9497,18216,18213,10759,18219,3903,18207,18221,18220,
+9802,18227,18238,4701,18241,18223,18228,11341,18237,11316,11529,8791,4682,
+10321,18243,9472,3856,18236,18232,8273,18226,18234,18239,9739,3849,18231,
+18240,10327,18235,18230,7476,7182,6923,11063,10278,18246,18255,18233,4694,
+7511,18244,18249,8274,18245,18252,8766,18253,11317,18242,4631,18248,18251,
+11019,18254,18247,18250,10760,11776,18258,18265,18257,6946,18224,10541,11009,
+18264,18263,18259,18260,4117,18262,18256,9012,18261,3933,8449,10530,18266,
+18432,10040,18269,7477,6952,18434,5405,18435,10328,18268,18229,18267,11822,
+9473,10322,18442,18448,18449,18436,9813,18446,18438,18440,18450,18439,18443,
+4177,9540,18444,18447,18437,8197,18441,6662,7716,5647,11091,11096,7249,18454,
+18452,11821,18451,11348,18453,18455,18456,18459,18457,9474,18458,10028,18445,
+7250,18460,18465,8275,18464,18433,18466,8232,18461,18463,18462,15376,15361,
+18468,18467,11349,16667,18469,18470,18471,5942,5171,18473,12348,5204,11545,
+5458,18474,18475,8781,18476,
+9561,3865,4418,18481,18482,18477,6684,18478,9761,18479,18480,18490,18484,
+18487,18483,18485,18486,6967,18488,8736,5685,4641,18491,4638,18496,18492,
+18495,10009,18493,18494,10279,10041,18497,8540,18507,18503,4426,18501,10761,
+18502,18499,18500,18505,18508,18506,18504,18498,8759,18515,11017,18513,18514,
+18509,18511,18512,18510,8005,11800,18519,18520,18688,7689,18522,18525,18517,
+18516,18689,4411,18523,18690,18524,18521,8978,18518,9799,18694,11290,18693,
+18692,18701,18695,18703,11333,18706,18697,18698,18702,18705,18704,18696,18699,
+18716,18709,18707,18708,18713,18714,4617,5153,18712,18691,18711,18715,18710,
+18717,18719,18718,18721,18720,18489,18725,18722,18723,18724,18726,5707,18728,
+18727,7183,6195,15622,18729,7216,4632,18730,4145,7478,18731,6196,18732,3904,
+10268,18733,7753,18740,18737,8782,18738,18735,5437,18734,18741,5653,8509,
+18747,18743,8468,18742,18745,18736,18746,18748,10062,18744,18749,18751,5938,
+18739,3872,18750,6458,11605,18752,18753,8276,11521,18754,11284,18755,18756,
+10563,18757,6431,11522,18762,18763,7479,18761,11334,18758,18760,7964,7773,
+18759,18764,10498,18766,18765,4683,10762,18767,18779,18769,18770,18771,18772,
+18776,18777,18775,18773,18768,18774,18778,20246,4359,18781,5438,18780,18945,
+18944,18947,18946,18948,7184,18949,18950,18951,7965,11318,18952,10499,9765,
+18953,18954,5898,5131,18955,6730,9760,18956,4655,18957,18959,11350,18958,7717,
+18960,18961,18962,4912,18963,18964,18965,18966,4656,18967,18968,18969,4433,
+7687,18970,18971,18972,5919,9050,18973,
+5686,7733,18976,9475,18975,5648,18974,8534,5132,18977,18978,7480,5708,18979,
+10763,7998,5205,11092,8233,18980,7718,8783,7481,18981,18984,18985,6429,8481,
+18983,7482,10269,18982,6731,4146,18989,5687,6733,6732,11820,18988,18987,8198,
+5164,11810,4633,7483,18986,18991,18992,18990,5943,11295,6734,9734,18995,7967,
+8737,11285,18998,5963,7966,18994,18999,5964,18996,18997,18993,8001,9512,8718,
+4412,10063,5154,8979,19002,19000,8747,7968,4913,19001,7738,11561,11807,19003,
+19014,8980,19013,19010,19018,19011,19007,9051,19006,19004,11264,6735,19008,
+19005,19012,7251,5920,8537,10788,4153,3905,9476,19016,19015,9541,19020,19009,
+19019,19021,5899,19017,6197,6964,19022,11319,19025,19028,19026,10260,19023,
+5439,19027,19029,19033,19030,19032,19031,19034,6928,19036,19035,10311,19200,
+5688,19037,19201,19202,5155,17696,7512,19203,5965,19204,19205,6685,14637,
+19206,19207,7185,19208,19209,19210,19211,19212,8714,19213,19215,19214,9477,
+19216,10764,19217,19218,19219,19220,9529,7484,19221,6218,12045,19222,19223,
+10270,19224,19232,19225,19227,19226,19228,10789,19229,19230,19231,19233,4620,
+9030,10312,6465,6198,10286,4414,10029,19236,4914,7988,19235,19240,8792,11074,
+19238,19239,5133,19241,9794,8510,10064,9244,19237,10790,4427,19243,11783,8993,
+11812,6736,19242,8464,19259,8199,9559,10287,19246,6686,6737,7485,9796,5900,
+19245,19244,10313,6944,9265,19248,19249,6199,19247,19250,19251,19253,8450,
+19252,4933,19255,19254,19256,19258,19260,19261,7989,6958,19262,4657,
+19263,8277,19264,19265,10314,5134,19266,8981,4154,19267,6992,7765,8460,19270,
+19269,19268,19276,19274,19271,19273,19272,19275,5206,19279,7990,19280,5944,
+19277,19278,11784,8982,8200,19281,19284,19282,19283,11320,9478,19287,19285,
+19286,19288,19464,19291,19292,19290,19289,9052,19456,19460,19457,19293,19458,
+19459,19466,19461,7991,19463,19465,19462,19468,7186,19467,19469,19470,19473,
+19472,19471,19475,19474,11093,19477,19476,19478,19479,19481,19480,7719,19482,
+5452,19483,19485,19486,19487,19484,19488,6965,19489,5135,5650,5901,19490,9551,
+9245,19491,19494,6931,19493,19492,5689,19495,4658,19497,6459,19496,19505,
+19499,19501,10564,19498,19500,19504,19502,5136,19503,19506,9785,11575,7187,
+19507,11265,19509,19508,19512,11296,19511,4684,19510,19515,19514,19513,9233,
+19516,19517,19518,6219,5636,19519,19520,19521,7720,19522,6924,19523,19524,
+12544,12381,19525,17487,19526,8707,7690,9759,19527,10548,9011,6237,8712,4105,
+10839,7734,5693,5440,10549,19528,19530,19529,4415,9557,19531,9814,9234,19532,
+7217,19534,11041,19549,19536,19537,9000,8511,8278,9479,19535,5172,19544,19541,
+19716,9480,8767,19538,9053,9266,19539,19543,7743,9798,9003,7969,19542,8461,
+8451,19540,3848,11777,19545,8512,7188,7721,19547,19546,3918,19548,10254,19718,
+9530,7754,8760,5463,19717,11286,4126,10550,4416,19712,19713,19714,19715,9498,
+8706,3906,19719,19720,21250,8476,19721,4178,8235,5902,11321,19722,9227,8279,
+6966,19723,19726,7236,19724,8202,8201,3907,11562,19728,10065,19730,19729,
+19727,16963,4915,19533,19732,19731,19733,11287,9536,10765,19734,6968,19735,
+19736,19737,9216,3913,6200,11801,19741,5651,19738,19739,10323,4659,11288,5406,
+9267,19742,19743,19744,9217,19746,19745,9522,19747,7189,6975,9786,8784,6993,
+7755,19748,19749,7740,19750,19751,19752,11342,7190,19754,19753,6201,6226,6687,
+19757,7237,19756,19755,8520,5966,7970,9999,7192,19758,7486,19761,19759,19760,
+19763,19762,7513,19764,19765,19766,10031,6450,6976,19767,19768,11523,7204,
+11085,11563,19769,5441,19770,9218,19773,4695,7722,19771,19772,9023,10804,5467,
+19775,19776,19774,19778,9534,4642,19782,19779,19781,19777,20014,19780,11594,
+5945,19790,9235,19785,19788,19786,19791,19792,19784,19797,4179,19783,9996,
+19787,7487,6202,10791,5443,7205,9499,8204,19795,19789,19794,11042,8983,19796,
+19793,8203,19800,19799,19798,10766,7258,19801,10558,4147,10277,8785,5207,
+19803,6204,6667,19802,7756,7757,19968,19970,7514,19969,19971,5426,10276,6977,
+11778,19805,6487,11806,19973,19972,19974,19804,9544,9268,9014,19979,8738,
+19975,19976,5644,19978,5903,19977,7488,4696,19983,6430,8280,9001,4634,19981,
+19982,8994,19980,19984,19990,19993,19992,9228,19985,19986,19989,19991,5407,
+19994,19988,19987,19998,19999,20000,19997,19996,7489,9481,19995,20004,20002,
+20003,20001,8535,20005,20006,20008,4916,20007,11097,20019,20009,20012,20010,
+20011,20013,20015,20016,20017,20020,20018,20021,20023,20022,8984,11078,20024,
+8205,20025,10531,20026,4618,4123,4918,4917,20027,20028,20029,20030,20031,4919,
+4660,6205,10005,20033,20032,20034,4155,20037,20036,20035,20038,20041,3878,
+20039,20043,20042,20045,20044,20046,9485,20047,20048,20050,20049,10315,20051,
+20052,6468,20053,20054,10792,8234,3843,8490,20055,10316,20058,20056,6206,
+20057,5921,10532,20060,20224,20061,20225,4096,7735,7259,4920,20226,9797,20228,
+4097,20227,8995,11564,9482,20059,11525,5904,11322,5464,11539,5639,8513,17920,
+20229,4619,7758,4661,20231,20232,20230,5699,6460,7490,4098,11576,20234,19725,
+20233,20237,20235,20236,20238,20239,11595,20240,20241,7976,10010,7772,4934,
+11289,4428,7191,5946,20244,20243,6738,20245,20242,6663,20249,18700,12597,7766,
+20247,11524,9552,4106,8002,6933,10518,4127,11596,11338,20250,9252,7002,20251,
+20252,7723,20253,11597,20248,20255,20257,20256,20254,20258,20259,8281,4417,
+20260,11031,20261,20262,11785,14864,20263,20264,20265,20269,20266,20267,20268,
+20270,7971,11094,7972,20271,10066,20272,21042,11051,20273,20274,20275,4662,
+20277,7736,20278,5635,20279,20283,20281,20282,4690,20280,20284,20285,3879,
+20286,20287,7491,20288,5158,20291,20290,20289,19024,10555,20292,20293,20294,
+20295,20296,20297,4921,20298,20299,9730,20301,4378,20304,20303,4099,5408,
+10534,8985,6401,6207,7238,7739,20306,20305,11297,4935,10033,9531,7771,11565,
+5690,20309,20308,10794,9483,4143,20310,20307,10288,11337,20311,20312,20314,
+8521,4666,4667,20313,4936,5905,4937,9246,11583,5947,20315,20316,20317,20480,
+20482,20481,10326,20483,20484,20485,20486,20488,20487,20489,10067,17707,7688,
+5137,20490,
+20491,12555,15386,10034,3930,3866,6739,10767,7517,20492,11070,20493,11323,
+4129,6688,20494,4429,20495,20496,20498,20499,20501,20497,20500,4922,20502,
+20503,20504,20505,20506,20508,20507,20510,20513,20509,20511,20512,20514,5409,
+6994,20515,20516,6208,20517,4637,9774,20518,20519,8761,9546,20520,9820,8491,
+4151,5453,5454,8786,20525,5455,4430,20524,20522,20523,20521,20535,20526,20527,
+20528,20529,20531,20530,7224,20532,20534,5138,20533,8282,5906,20536,8492,
+20537,9484,20538,20543,20541,20540,20542,20539,20545,20544,20547,5410,20546,
+20548,20549,20551,20550,20552,20554,20553,6235,20555,20556,4635,20557,20558,
+7760,20559,20560,20561,20562,6209,20563,20564,20565,20566,20567,10000,20569,
+10245,20570,20568,20572,20571,20573,20736,20737,20738,20739,20740,20741,20742,
+20743,20744,20745,20746,20747,20748,20749,15380,20750,17239,5139,4608,6417,
+20752,20751,11012,20754,20755,20753,20756,10817,20757,5210,11780,20758,20760,
+3869,20761,10506,20759,20762,20763,20764,20765,20766,10829,6668,6489,8206,
+20767,20770,20768,20771,5968,20769,20772,20773,20774,20778,6665,8515,20779,
+20776,20775,20777,5694,20783,20782,20781,3858,20793,20789,20790,20786,20792,
+20788,4673,11819,20791,20787,20785,20784,20795,20798,20797,20796,10280,20794,
+3922,20799,20801,4686,20780,4118,20803,20802,20800,8716,10831,11577,20804,
+20805,20806,20807,20808,8986,20809,10006,20814,20810,20811,10768,11043,9519,
+20815,20816,9501,20813,20812,4361,20824,20823,4180,20821,20820,20818,4698,
+20817,6929,4360,6210,20827,20826,20825,
+20822,20828,20829,20996,20995,20997,4108,20992,20993,6227,11032,20994,10769,
+21002,20998,21003,21000,20999,5691,21004,21005,21006,21001,20819,21007,9024,
+21011,21012,21010,21009,21015,21008,21013,21014,21017,21016,21019,21020,21021,
+11816,21018,8522,6476,21022,21023,21024,21025,21026,5907,21027,21028,6926,
+21029,21030,21031,21032,21035,21033,11803,21034,11598,21036,11578,21037,9821,
+21038,21040,21041,21039,6220,11052,10818,13654,15423,10842,4362,21043,5167,
+21044,21045,21046,6228,21047,16179,11066,8514,21048,21050,21049,21051,21052,
+21053,21054,21055,21056,21057,21058,21059,21060,21061,21062,21063,9219,5948,
+21065,8236,21066,21067,10240,21068,21069,16918,19257,20300,21070,21071,21073,
+21074,21075,11599,21072,21076,21077,21079,21078,21081,21082,21080,11541,21083,
+21084,16947,21085,9,83,79,82,84,41,42,85,59,3,4,30,527,528,529,530,531,532,
+533,534,535,536,6,7,66,64,67,8,86,544,545,546,547,548,549,550,551,552,553,554,
+555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,45,46,15,17,13,
+576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,
+595,596,597,598,599,600,601,47,34,48,16,78,
diff --git a/src/components/lib/libc/musl-1.2.0/src/locale/setlocale.c b/src/components/lib/libc/musl-1.2.0/src/locale/setlocale.c
new file mode 100644
index 0000000000..2bc7b50070
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/setlocale.c
@@ -0,0 +1,79 @@
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include "locale_impl.h"
+#include "libc.h"
+#include "lock.h"
+
+static char buf[LC_ALL*(LOCALE_NAME_MAX+1)];
+
+char *setlocale(int cat, const char *name)
+{
+	static volatile int lock[1];
+	const struct __locale_map *lm;
+
+	if ((unsigned)cat > LC_ALL) return 0;
+
+	LOCK(lock);
+
+	/* For LC_ALL, setlocale is required to return a string which
+	 * encodes the current setting for all categories. The format of
+	 * this string is unspecified, and only the following code, which
+	 * performs both the serialization and deserialization, depends
+	 * on the format, so it can easily be changed if needed. */
+	if (cat == LC_ALL) {
+		int i;
+		if (name) {
+			struct __locale_struct tmp_locale;
+			char part[LOCALE_NAME_MAX+1] = "C.UTF-8";
+			const char *p = name;
+			for (i=0; i<LC_ALL; i++) {
+				const char *z = __strchrnul(p, ';');
+				if (z-p <= LOCALE_NAME_MAX) {
+					memcpy(part, p, z-p);
+					part[z-p] = 0;
+					if (*z) p = z+1;
+				}
+				lm = __get_locale(i, part);
+				if (lm == LOC_MAP_FAILED) {
+					UNLOCK(lock);
+					return 0;
+				}
+				tmp_locale.cat[i] = lm;
+			}
+			libc.global_locale = tmp_locale;
+		}
+		char *s = buf;
+		const char *part;
+		int same = 0;
+		for (i=0; i<LC_ALL; i++) {
+			const struct __locale_map *lm =
+				libc.global_locale.cat[i];
+			if (lm == libc.global_locale.cat[0]) same++;
+			part = lm ? lm->name : "C";
+			size_t l = strlen(part);
+			memcpy(s, part, l);
+			s[l] = ';';
+			s += l+1;
+		}
+		*--s = 0;
+		UNLOCK(lock);
+		return same==LC_ALL ? (char *)part : buf;
+	}
+
+	if (name) {
+		lm = __get_locale(cat, name);
+		if (lm == LOC_MAP_FAILED) {
+			UNLOCK(lock);
+			return 0;
+		}
+		libc.global_locale.cat[cat] = lm;
+	} else {
+		lm = libc.global_locale.cat[cat];
+	}
+	char *ret = lm ? (char *)lm->name : "C";
+
+	UNLOCK(lock);
+
+	return ret;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/strcoll.c b/src/components/lib/libc/musl-1.2.0/src/locale/strcoll.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/locale/strcoll.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/strcoll.c
index 84f199ff95..dd3cbc480e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/strcoll.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/strcoll.c
@@ -1,7 +1,6 @@
 #include <string.h>
 #include <locale.h>
 #include "locale_impl.h"
-#include "libc.h"
 
 int __strcoll_l(const char *l, const char *r, locale_t loc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/strfmon.c b/src/components/lib/libc/musl-1.2.0/src/locale/strfmon.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/strfmon.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/strfmon.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/strxfrm.c b/src/components/lib/libc/musl-1.2.0/src/locale/strxfrm.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/locale/strxfrm.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/strxfrm.c
index 14b76a6327..c66c62039d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/strxfrm.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/strxfrm.c
@@ -1,7 +1,6 @@
 #include <string.h>
 #include <locale.h>
 #include "locale_impl.h"
-#include "libc.h"
 
 /* collate only by code points */
 size_t __strxfrm_l(char *restrict dest, const char *restrict src, size_t n, locale_t loc)
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/textdomain.c b/src/components/lib/libc/musl-1.2.0/src/locale/textdomain.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/locale/textdomain.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/textdomain.c
index c501501d2b..d727539799 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/textdomain.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/textdomain.c
@@ -3,8 +3,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <limits.h>
-#include "libc.h"
-#include "atomic.h"
 
 static char *current_domain;
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/uselocale.c b/src/components/lib/libc/musl-1.2.0/src/locale/uselocale.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/locale/uselocale.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/uselocale.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/wcscoll.c b/src/components/lib/libc/musl-1.2.0/src/locale/wcscoll.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/locale/wcscoll.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/wcscoll.c
index 14bb8b9f96..ad2cc69163 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/wcscoll.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/wcscoll.c
@@ -1,7 +1,6 @@
 #include <wchar.h>
 #include <locale.h>
 #include "locale_impl.h"
-#include "libc.h"
 
 /* FIXME: stub */
 int __wcscoll_l(const wchar_t *l, const wchar_t *r, locale_t locale)
diff --git a/src/components/lib/libc/musl-1.1.11/src/locale/wcsxfrm.c b/src/components/lib/libc/musl-1.2.0/src/locale/wcsxfrm.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/locale/wcsxfrm.c
rename to src/components/lib/libc/musl-1.2.0/src/locale/wcsxfrm.c
index 0a0b776dad..05e3e11581 100644
--- a/src/components/lib/libc/musl-1.1.11/src/locale/wcsxfrm.c
+++ b/src/components/lib/libc/musl-1.2.0/src/locale/wcsxfrm.c
@@ -1,7 +1,6 @@
 #include <wchar.h>
 #include <locale.h>
 #include "locale_impl.h"
-#include "libc.h"
 
 /* collate only by code points */
 size_t __wcsxfrm_l(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, locale_t loc)
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/DESIGN b/src/components/lib/libc/musl-1.2.0/src/malloc/DESIGN
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/malloc/DESIGN
rename to src/components/lib/libc/musl-1.2.0/src/malloc/DESIGN
diff --git a/src/components/lib/libc/musl-1.2.0/src/malloc/aligned_alloc.c b/src/components/lib/libc/musl-1.2.0/src/malloc/aligned_alloc.c
new file mode 100644
index 0000000000..b6143f303f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/malloc/aligned_alloc.c
@@ -0,0 +1,7 @@
+#include <stdlib.h>
+#include "malloc_impl.h"
+
+void *aligned_alloc(size_t align, size_t len)
+{
+	return __memalign(align, len);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/expand_heap.c b/src/components/lib/libc/musl-1.2.0/src/malloc/expand_heap.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/malloc/expand_heap.c
rename to src/components/lib/libc/musl-1.2.0/src/malloc/expand_heap.c
index d8c0be742b..e6a3d7a000 100644
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/expand_heap.c
+++ b/src/components/lib/libc/musl-1.2.0/src/malloc/expand_heap.c
@@ -4,6 +4,7 @@
 #include <sys/mman.h>
 #include "libc.h"
 #include "syscall.h"
+#include "malloc_impl.h"
 
 /* This function returns true if the interval [old,new]
  * intersects the 'len'-sized interval below &libc.auxv
@@ -27,8 +28,6 @@ static int traverses_stack_p(uintptr_t old, uintptr_t new)
 	return 0;
 }
 
-void *__mmap(void *, size_t, int, int, int, off_t);
-
 /* Expand the heap in-place if brk can be used, or otherwise via mmap,
  * using an exponential lower bound on growth by mmap to make
  * fragmentation asymptotically irrelevant. The size argument is both
diff --git a/src/components/lib/libc/musl-1.2.0/src/malloc/lite_malloc.c b/src/components/lib/libc/musl-1.2.0/src/malloc/lite_malloc.c
new file mode 100644
index 0000000000..050d84f648
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/malloc/lite_malloc.c
@@ -0,0 +1,59 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <limits.h>
+#include <errno.h>
+#include "lock.h"
+#include "malloc_impl.h"
+
+#define ALIGN 16
+
+static void *__simple_malloc(size_t n)
+{
+	static char *cur, *end;
+	static volatile int lock[1];
+	size_t align=1, pad;
+	void *p;
+
+	if (!n) n++;
+	while (align<n && align<ALIGN)
+		align += align;
+
+	LOCK(lock);
+
+	pad = -(uintptr_t)cur & align-1;
+
+	if (n <= SIZE_MAX/2 + ALIGN) n += pad;
+
+	if (n > end-cur) {
+		size_t m = n;
+		char *new = __expand_heap(&m);
+		if (!new) {
+			UNLOCK(lock);
+			return 0;
+		}
+		if (new != end) {
+			cur = new;
+			n -= pad;
+			pad = 0;
+		}
+		end = new + m;
+	}
+
+	p = cur + pad;
+	cur += n;
+	UNLOCK(lock);
+	return p;
+}
+
+weak_alias(__simple_malloc, malloc);
+
+static void *__simple_calloc(size_t m, size_t n)
+{
+	if (n && m > (size_t)-1/n) {
+		errno = ENOMEM;
+		return 0;
+	}
+	return __simple_malloc(n * m);
+}
+
+weak_alias(__simple_calloc, calloc);
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/malloc.c b/src/components/lib/libc/musl-1.2.0/src/malloc/malloc.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/malloc/malloc.c
rename to src/components/lib/libc/musl-1.2.0/src/malloc/malloc.c
index b90636cc67..96982596b9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/malloc.c
+++ b/src/components/lib/libc/musl-1.2.0/src/malloc/malloc.c
@@ -8,53 +8,19 @@
 #include "libc.h"
 #include "atomic.h"
 #include "pthread_impl.h"
+#include "malloc_impl.h"
 
 #if defined(__GNUC__) && defined(__PIC__)
 #define inline inline __attribute__((always_inline))
 #endif
 
-void *__mmap(void *, size_t, int, int, int, off_t);
-int __munmap(void *, size_t);
-void *__mremap(void *, size_t, size_t, int, ...);
-int __madvise(void *, size_t, int);
-
-struct chunk {
-	size_t psize, csize;
-	struct chunk *next, *prev;
-};
-
-struct bin {
-	volatile int lock[2];
-	struct chunk *head;
-	struct chunk *tail;
-};
-
 static struct {
 	volatile uint64_t binmap;
 	struct bin bins[64];
 	volatile int free_lock[2];
 } mal;
 
-
-#define SIZE_ALIGN (4*sizeof(size_t))
-#define SIZE_MASK (-SIZE_ALIGN)
-#define OVERHEAD (2*sizeof(size_t))
-#define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN)
-#define DONTCARE 16
-#define RECLAIM 163840
-
-#define CHUNK_SIZE(c) ((c)->csize & -2)
-#define CHUNK_PSIZE(c) ((c)->psize & -2)
-#define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c)))
-#define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c)))
-#define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD)
-#define CHUNK_TO_MEM(c) (void *)((char *)(c) + OVERHEAD)
-#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head))
-
-#define C_INUSE  ((size_t)1)
-
-#define IS_MMAPPED(c) !((c)->csize & (C_INUSE))
-
+int __malloc_replaced;
 
 /* Synchronization tools */
 
@@ -111,19 +77,29 @@ static int first_set(uint64_t x)
 #endif
 }
 
+static const unsigned char bin_tab[60] = {
+	            32,33,34,35,36,36,37,37,38,38,39,39,
+	40,40,40,40,41,41,41,41,42,42,42,42,43,43,43,43,
+	44,44,44,44,44,44,44,44,45,45,45,45,45,45,45,45,
+	46,46,46,46,46,46,46,46,47,47,47,47,47,47,47,47,
+};
+
 static int bin_index(size_t x)
 {
 	x = x / SIZE_ALIGN - 1;
 	if (x <= 32) return x;
+	if (x < 512) return bin_tab[x/8-4];
 	if (x > 0x1c00) return 63;
-	return ((union { float v; uint32_t r; }){(int)x}.r>>21) - 496;
+	return bin_tab[x/128-4] + 16;
 }
 
 static int bin_index_up(size_t x)
 {
 	x = x / SIZE_ALIGN - 1;
 	if (x <= 32) return x;
-	return ((union { float v; uint32_t r; }){(int)x}.r+0x1fffff>>21) - 496;
+	x--;
+	if (x < 512) return bin_tab[x/8-4] + 1;
+	return bin_tab[x/128-4] + 17;
 }
 
 #if 0
@@ -147,8 +123,6 @@ void __dump_heap(int x)
 }
 #endif
 
-void *__expand_heap(size_t *);
-
 static struct chunk *expand_heap(size_t n)
 {
 	static int heap_lock[2];
@@ -304,7 +278,7 @@ static void trim(struct chunk *self, size_t n)
 	next->psize = n1-n | C_INUSE;
 	self->csize = n | C_INUSE;
 
-	free(CHUNK_TO_MEM(split));
+	__bin_chunk(split);
 }
 
 void *malloc(size_t n)
@@ -356,15 +330,40 @@ void *malloc(size_t n)
 	return CHUNK_TO_MEM(c);
 }
 
-void *__malloc0(size_t n)
+static size_t mal0_clear(char *p, size_t pagesz, size_t n)
 {
+#ifdef __GNUC__
+	typedef uint64_t __attribute__((__may_alias__)) T;
+#else
+	typedef unsigned char T;
+#endif
+	char *pp = p + n;
+	size_t i = (uintptr_t)pp & (pagesz - 1);
+	for (;;) {
+		pp = memset(pp - i, 0, i);
+		if (pp - p < pagesz) return pp - p;
+		for (i = pagesz; i; i -= 2*sizeof(T), pp -= 2*sizeof(T))
+		        if (((T *)pp)[-1] | ((T *)pp)[-2])
+				break;
+	}
+}
+
+void *calloc(size_t m, size_t n)
+{
+	if (n && m > (size_t)-1/n) {
+		errno = ENOMEM;
+		return 0;
+	}
+	n *= m;
 	void *p = malloc(n);
-	if (p && !IS_MMAPPED(MEM_TO_CHUNK(p))) {
-		size_t *z;
-		n = (n + sizeof *z - 1)/sizeof *z;
-		for (z=p; n; n--, z++) if (*z) *z=0;
+	if (!p) return p;
+	if (!__malloc_replaced) {
+		if (IS_MMAPPED(MEM_TO_CHUNK(p)))
+			return p;
+		if (n >= PAGE_SIZE)
+			n = mal0_clear(p, PAGE_SIZE, n);
 	}
-	return p;
+	return memset(p, 0, n);
 }
 
 void *realloc(void *p, size_t n)
@@ -387,16 +386,15 @@ void *realloc(void *p, size_t n)
 		size_t newlen = n + extra;
 		/* Crash on realloc of freed chunk */
 		if (extra & 1) a_crash();
-		if (newlen < PAGE_SIZE && (new = malloc(n))) {
-			memcpy(new, p, n-OVERHEAD);
-			free(p);
-			return new;
+		if (newlen < PAGE_SIZE && (new = malloc(n-OVERHEAD))) {
+			n0 = n;
+			goto copy_free_ret;
 		}
 		newlen = (newlen + PAGE_SIZE-1) & -PAGE_SIZE;
 		if (oldlen == newlen) return p;
 		base = __mremap(base, oldlen, newlen, MREMAP_MAYMOVE);
 		if (base == (void *)-1)
-			return newlen < oldlen ? p : 0;
+			goto copy_realloc;
 		self = (void *)(base + extra);
 		self->csize = newlen - extra;
 		return CHUNK_TO_MEM(self);
@@ -429,36 +427,24 @@ void *realloc(void *p, size_t n)
 		return CHUNK_TO_MEM(self);
 	}
 
+copy_realloc:
 	/* As a last resort, allocate a new chunk and copy to it. */
 	new = malloc(n-OVERHEAD);
 	if (!new) return 0;
+copy_free_ret:
 	memcpy(new, p, n0-OVERHEAD);
 	free(CHUNK_TO_MEM(self));
 	return new;
 }
 
-void free(void *p)
+void __bin_chunk(struct chunk *self)
 {
-	struct chunk *self = MEM_TO_CHUNK(p);
-	struct chunk *next;
+	struct chunk *next = NEXT_CHUNK(self);
 	size_t final_size, new_size, size;
 	int reclaim=0;
 	int i;
 
-	if (!p) return;
-
-	if (IS_MMAPPED(self)) {
-		size_t extra = self->psize;
-		char *base = (char *)self - extra;
-		size_t len = CHUNK_SIZE(self) + extra;
-		/* Crash on double free */
-		if (extra & 1) a_crash();
-		__munmap(base, len);
-		return;
-	}
-
 	final_size = new_size = CHUNK_SIZE(self);
-	next = NEXT_CHUNK(self);
 
 	/* Crash on corrupted footer (likely from buffer overflow) */
 	if (next->psize != self->csize) a_crash();
@@ -519,3 +505,44 @@ void free(void *p)
 
 	unlock_bin(i);
 }
+
+static void unmap_chunk(struct chunk *self)
+{
+	size_t extra = self->psize;
+	char *base = (char *)self - extra;
+	size_t len = CHUNK_SIZE(self) + extra;
+	/* Crash on double free */
+	if (extra & 1) a_crash();
+	__munmap(base, len);
+}
+
+void free(void *p)
+{
+	if (!p) return;
+
+	struct chunk *self = MEM_TO_CHUNK(p);
+
+	if (IS_MMAPPED(self))
+		unmap_chunk(self);
+	else
+		__bin_chunk(self);
+}
+
+void __malloc_donate(char *start, char *end)
+{
+	size_t align_start_up = (SIZE_ALIGN-1) & (-(uintptr_t)start - OVERHEAD);
+	size_t align_end_down = (SIZE_ALIGN-1) & (uintptr_t)end;
+
+	/* Getting past this condition ensures that the padding for alignment
+	 * and header overhead will not overflow and will leave a nonzero
+	 * multiple of SIZE_ALIGN bytes between start and end. */
+	if (end - start <= OVERHEAD + align_start_up + align_end_down)
+		return;
+	start += align_start_up + OVERHEAD;
+	end   -= align_end_down;
+
+	struct chunk *c = MEM_TO_CHUNK(start), *n = MEM_TO_CHUNK(end);
+	c->psize = n->csize = C_INUSE;
+	c->csize = n->psize = C_INUSE | (end-start);
+	__bin_chunk(c);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/malloc/malloc_usable_size.c b/src/components/lib/libc/musl-1.2.0/src/malloc/malloc_usable_size.c
new file mode 100644
index 0000000000..672b518ad0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/malloc/malloc_usable_size.c
@@ -0,0 +1,9 @@
+#include <malloc.h>
+#include "malloc_impl.h"
+ 
+hidden void *(*const __realloc_dep)(void *, size_t) = realloc;
+
+size_t malloc_usable_size(void *p)
+{
+	return p ? CHUNK_SIZE(MEM_TO_CHUNK(p)) - OVERHEAD : 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/malloc/memalign.c b/src/components/lib/libc/musl-1.2.0/src/malloc/memalign.c
new file mode 100644
index 0000000000..cf9dfbda66
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/malloc/memalign.c
@@ -0,0 +1,54 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
+#include "malloc_impl.h"
+
+void *__memalign(size_t align, size_t len)
+{
+	unsigned char *mem, *new;
+
+	if ((align & -align) != align) {
+		errno = EINVAL;
+		return 0;
+	}
+
+	if (len > SIZE_MAX - align || __malloc_replaced) {
+		errno = ENOMEM;
+		return 0;
+	}
+
+	if (align <= SIZE_ALIGN)
+		return malloc(len);
+
+	if (!(mem = malloc(len + align-1)))
+		return 0;
+
+	new = (void *)((uintptr_t)mem + align-1 & -align);
+	if (new == mem) return mem;
+
+	struct chunk *c = MEM_TO_CHUNK(mem);
+	struct chunk *n = MEM_TO_CHUNK(new);
+
+	if (IS_MMAPPED(c)) {
+		/* Apply difference between aligned and original
+		 * address to the "extra" field of mmapped chunk. */
+		n->psize = c->psize + (new-mem);
+		n->csize = c->csize - (new-mem);
+		return new;
+	}
+
+	struct chunk *t = NEXT_CHUNK(c);
+
+	/* Split the allocated chunk into two chunks. The aligned part
+	 * that will be used has the size in its footer reduced by the
+	 * difference between the aligned and original addresses, and
+	 * the resulting size copied to its header. A new header and
+	 * footer are written for the split-off part to be freed. */
+	n->psize = c->csize = C_INUSE | (new-mem);
+	n->csize = t->psize -= new-mem;
+
+	__bin_chunk(c);
+	return new;
+}
+
+weak_alias(__memalign, memalign);
diff --git a/src/components/lib/libc/musl-1.1.11/src/malloc/posix_memalign.c b/src/components/lib/libc/musl-1.2.0/src/malloc/posix_memalign.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/malloc/posix_memalign.c
rename to src/components/lib/libc/musl-1.2.0/src/malloc/posix_memalign.c
index cf67db63be..2ea8bd8a43 100644
--- a/src/components/lib/libc/musl-1.1.11/src/malloc/posix_memalign.c
+++ b/src/components/lib/libc/musl-1.2.0/src/malloc/posix_memalign.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <errno.h>
-
-void *__memalign(size_t, size_t);
+#include "malloc_impl.h"
 
 int posix_memalign(void **res, size_t align, size_t len)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__cos.c b/src/components/lib/libc/musl-1.2.0/src/math/__cos.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__cos.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__cos.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__cosdf.c b/src/components/lib/libc/musl-1.2.0/src/math/__cosdf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__cosdf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__cosdf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__cosl.c b/src/components/lib/libc/musl-1.2.0/src/math/__cosl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__cosl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__cosl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__expo2.c b/src/components/lib/libc/musl-1.2.0/src/math/__expo2.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__expo2.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__expo2.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__expo2f.c b/src/components/lib/libc/musl-1.2.0/src/math/__expo2f.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__expo2f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__expo2f.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__fpclassify.c b/src/components/lib/libc/musl-1.2.0/src/math/__fpclassify.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__fpclassify.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__fpclassify.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__fpclassifyf.c b/src/components/lib/libc/musl-1.2.0/src/math/__fpclassifyf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__fpclassifyf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__fpclassifyf.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__fpclassifyl.c b/src/components/lib/libc/musl-1.2.0/src/math/__fpclassifyl.c
new file mode 100644
index 0000000000..e41781b689
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__fpclassifyl.c
@@ -0,0 +1,42 @@
+#include "libm.h"
+
+#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
+int __fpclassifyl(long double x)
+{
+	return __fpclassify(x);
+}
+#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384
+int __fpclassifyl(long double x)
+{
+	union ldshape u = {x};
+	int e = u.i.se & 0x7fff;
+	int msb = u.i.m>>63;
+	if (!e && !msb)
+		return u.i.m ? FP_SUBNORMAL : FP_ZERO;
+	if (e == 0x7fff) {
+		/* The x86 variant of 80-bit extended precision only admits
+		 * one representation of each infinity, with the mantissa msb
+		 * necessarily set. The version with it clear is invalid/nan.
+		 * The m68k variant, however, allows either, and tooling uses
+		 * the version with it clear. */
+		if (__BYTE_ORDER == __LITTLE_ENDIAN && !msb)
+			return FP_NAN;
+		return u.i.m << 1 ? FP_NAN : FP_INFINITE;
+	}
+	if (!msb)
+		return FP_NAN;
+	return FP_NORMAL;
+}
+#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384
+int __fpclassifyl(long double x)
+{
+	union ldshape u = {x};
+	int e = u.i.se & 0x7fff;
+	u.i.se = 0;
+	if (!e)
+		return u.i2.lo | u.i2.hi ? FP_SUBNORMAL : FP_ZERO;
+	if (e == 0x7fff)
+		return u.i2.lo | u.i2.hi ? FP_NAN : FP_INFINITE;
+	return FP_NORMAL;
+}
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__invtrigl.c b/src/components/lib/libc/musl-1.2.0/src/math/__invtrigl.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/math/__invtrigl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__invtrigl.c
index ef7f4e1b79..48f83aaf8c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/__invtrigl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__invtrigl.c
@@ -57,7 +57,7 @@ long double __invtrigl_R(long double z)
 {
 	long double p, q;
 	p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*(pS5+z*(pS6+z*(pS7+z*(pS8+z*pS9)))))))));
-	q = 1.0+z*(qS1+z*(qS2+z*(qS3+z*(qS4+z*(qS5+z*(pS6+z*(pS7+z*(pS8+z*pS9))))))));
+	q = 1.0+z*(qS1+z*(qS2+z*(qS3+z*(qS4+z*(qS5+z*(qS6+z*(qS7+z*(qS8+z*qS9))))))));
 	return p/q;
 }
 #endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__invtrigl.h b/src/components/lib/libc/musl-1.2.0/src/math/__invtrigl.h
new file mode 100644
index 0000000000..bee7931720
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__invtrigl.h
@@ -0,0 +1,8 @@
+#include <features.h>
+
+/* shared by acosl, asinl and atan2l */
+#define pio2_hi __pio2_hi
+#define pio2_lo __pio2_lo
+hidden extern const long double pio2_hi, pio2_lo;
+
+hidden long double __invtrigl_R(long double z);
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_divzero.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_divzero.c
new file mode 100644
index 0000000000..59d2135001
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_divzero.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+double __math_divzero(uint32_t sign)
+{
+	return fp_barrier(sign ? -1.0 : 1.0) / 0.0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_divzerof.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_divzerof.c
new file mode 100644
index 0000000000..ce046f3e32
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_divzerof.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+float __math_divzerof(uint32_t sign)
+{
+	return fp_barrierf(sign ? -1.0f : 1.0f) / 0.0f;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_invalid.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_invalid.c
new file mode 100644
index 0000000000..177404900d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_invalid.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+double __math_invalid(double x)
+{
+	return (x - x) / (x - x);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_invalidf.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_invalidf.c
new file mode 100644
index 0000000000..357d4b1211
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_invalidf.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+float __math_invalidf(float x)
+{
+	return (x - x) / (x - x);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_oflow.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_oflow.c
new file mode 100644
index 0000000000..c85dbf982a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_oflow.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+double __math_oflow(uint32_t sign)
+{
+	return __math_xflow(sign, 0x1p769);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_oflowf.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_oflowf.c
new file mode 100644
index 0000000000..fa7d06208e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_oflowf.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+float __math_oflowf(uint32_t sign)
+{
+	return __math_xflowf(sign, 0x1p97f);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_uflow.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_uflow.c
new file mode 100644
index 0000000000..b90594aee1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_uflow.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+double __math_uflow(uint32_t sign)
+{
+	return __math_xflow(sign, 0x1p-767);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_uflowf.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_uflowf.c
new file mode 100644
index 0000000000..94d50f2bf1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_uflowf.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+float __math_uflowf(uint32_t sign)
+{
+	return __math_xflowf(sign, 0x1p-95f);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_xflow.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_xflow.c
new file mode 100644
index 0000000000..744203c4c8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_xflow.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+double __math_xflow(uint32_t sign, double y)
+{
+	return eval_as_double(fp_barrier(sign ? -y : y) * y);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/__math_xflowf.c b/src/components/lib/libc/musl-1.2.0/src/math/__math_xflowf.c
new file mode 100644
index 0000000000..f2c84784f8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__math_xflowf.c
@@ -0,0 +1,6 @@
+#include "libm.h"
+
+float __math_xflowf(uint32_t sign, float y)
+{
+	return eval_as_float(fp_barrierf(sign ? -y : y) * y);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__polevll.c b/src/components/lib/libc/musl-1.2.0/src/math/__polevll.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__polevll.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__polevll.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2.c b/src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2.c
index a40db9fc05..d403f81c79 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2.c
@@ -118,7 +118,7 @@ int __rem_pio2(double x, double *y)
 	if (ix < 0x413921fb) {  /* |x| ~< 2^20*(pi/2), medium size */
 medium:
 		/* rint(x/(pi/2)), Assume round-to-nearest. */
-		fn = x*invpio2 + toint - toint;
+		fn = (double_t)x*invpio2 + toint - toint;
 		n = (int32_t)fn;
 		r = x - fn*pio2_1;
 		w = fn*pio2_1t;  /* 1st round, good to 85 bits */
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2_large.c b/src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2_large.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2_large.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2_large.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2f.c b/src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2f.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2f.c
index f516385651..4473c1c420 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2f.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2f.c
@@ -51,7 +51,7 @@ int __rem_pio2f(float x, double *y)
 	/* 25+53 bit pi is good enough for medium size */
 	if (ix < 0x4dc90fdb) {  /* |x| ~< 2^28*(pi/2), medium size */
 		/* Use a specialized rint() to get fn.  Assume round-to-nearest. */
-		fn = x*invpio2 + toint - toint;
+		fn = (double_t)x*invpio2 + toint - toint;
 		n  = (int32_t)fn;
 		*y = x - fn*pio2_1 - fn*pio2_1t;
 		return n;
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2l.c b/src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__rem_pio2l.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__rem_pio2l.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__signbit.c b/src/components/lib/libc/musl-1.2.0/src/math/__signbit.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__signbit.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__signbit.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__signbitf.c b/src/components/lib/libc/musl-1.2.0/src/math/__signbitf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__signbitf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__signbitf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__signbitl.c b/src/components/lib/libc/musl-1.2.0/src/math/__signbitl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__signbitl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__signbitl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__sin.c b/src/components/lib/libc/musl-1.2.0/src/math/__sin.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__sin.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__sin.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__sindf.c b/src/components/lib/libc/musl-1.2.0/src/math/__sindf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__sindf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__sindf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__sinl.c b/src/components/lib/libc/musl-1.2.0/src/math/__sinl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__sinl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__sinl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__tan.c b/src/components/lib/libc/musl-1.2.0/src/math/__tan.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__tan.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__tan.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__tandf.c b/src/components/lib/libc/musl-1.2.0/src/math/__tandf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__tandf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__tandf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/__tanl.c b/src/components/lib/libc/musl-1.2.0/src/math/__tanl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/__tanl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/__tanl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/ceil.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/ceil.c
new file mode 100644
index 0000000000..ac80c1dce5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/ceil.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double ceil(double x)
+{
+	__asm__ ("frintp %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/ceilf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/ceilf.c
new file mode 100644
index 0000000000..1ef1e9c839
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/ceilf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float ceilf(float x)
+{
+	__asm__ ("frintp %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fabs.c
new file mode 100644
index 0000000000..5c3ecaf44b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fabs.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double fabs(double x)
+{
+	__asm__ ("fabs %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fabsf.c
new file mode 100644
index 0000000000..7fde981793
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fabsf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float fabsf(float x)
+{
+	__asm__ ("fabs %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/floor.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/floor.c
new file mode 100644
index 0000000000..50ffdb281b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/floor.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double floor(double x)
+{
+	__asm__ ("frintm %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/floorf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/floorf.c
new file mode 100644
index 0000000000..8d007e9f84
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/floorf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float floorf(float x)
+{
+	__asm__ ("frintm %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fma.c
new file mode 100644
index 0000000000..2450ea7e19
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fma.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("fmadd %d0, %d1, %d2, %d3" : "=w"(x) : "w"(x), "w"(y), "w"(z));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmaf.c
new file mode 100644
index 0000000000..9a147213a0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmaf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("fmadd %s0, %s1, %s2, %s3" : "=w"(x) : "w"(x), "w"(y), "w"(z));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmax.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmax.c
new file mode 100644
index 0000000000..86dcb3b459
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmax.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double fmax(double x, double y)
+{
+	__asm__ ("fmaxnm %d0, %d1, %d2" : "=w"(x) : "w"(x), "w"(y));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmaxf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmaxf.c
new file mode 100644
index 0000000000..ee5eac2d73
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmaxf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float fmaxf(float x, float y)
+{
+	__asm__ ("fmaxnm %s0, %s1, %s2" : "=w"(x) : "w"(x), "w"(y));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmin.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmin.c
new file mode 100644
index 0000000000..f1e99808e0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fmin.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double fmin(double x, double y)
+{
+	__asm__ ("fminnm %d0, %d1, %d2" : "=w"(x) : "w"(x), "w"(y));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fminf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fminf.c
new file mode 100644
index 0000000000..80468f676a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/fminf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float fminf(float x, float y)
+{
+	__asm__ ("fminnm %s0, %s1, %s2" : "=w"(x) : "w"(x), "w"(y));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llrint.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llrint.c
new file mode 100644
index 0000000000..a9e07a93f1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llrint.c
@@ -0,0 +1,10 @@
+#include <math.h>
+
+long long llrint(double x)
+{
+	long long n;
+	__asm__ (
+		"frintx %d1, %d1\n"
+		"fcvtzs %x0, %d1\n" : "=r"(n), "+w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llrintf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llrintf.c
new file mode 100644
index 0000000000..12b6804f7f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llrintf.c
@@ -0,0 +1,10 @@
+#include <math.h>
+
+long long llrintf(float x)
+{
+	long long n;
+	__asm__ (
+		"frintx %s1, %s1\n"
+		"fcvtzs %x0, %s1\n" : "=r"(n), "+w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llround.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llround.c
new file mode 100644
index 0000000000..e09ddd482a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llround.c
@@ -0,0 +1,8 @@
+#include <math.h>
+
+long long llround(double x)
+{
+	long long n;
+	__asm__ ("fcvtas %x0, %d1" : "=r"(n) : "w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llroundf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llroundf.c
new file mode 100644
index 0000000000..16699598ac
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/llroundf.c
@@ -0,0 +1,8 @@
+#include <math.h>
+
+long long llroundf(float x)
+{
+	long long n;
+	__asm__ ("fcvtas %x0, %s1" : "=r"(n) : "w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lrint.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lrint.c
new file mode 100644
index 0000000000..cb7785ad1e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lrint.c
@@ -0,0 +1,10 @@
+#include <math.h>
+
+long lrint(double x)
+{
+	long n;
+	__asm__ (
+		"frintx %d1, %d1\n"
+		"fcvtzs %x0, %d1\n" : "=r"(n), "+w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lrintf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lrintf.c
new file mode 100644
index 0000000000..4d750d699d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lrintf.c
@@ -0,0 +1,10 @@
+#include <math.h>
+
+long lrintf(float x)
+{
+	long n;
+	__asm__ (
+		"frintx %s1, %s1\n"
+		"fcvtzs %x0, %s1\n" : "=r"(n), "+w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lround.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lround.c
new file mode 100644
index 0000000000..85656c78d1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lround.c
@@ -0,0 +1,8 @@
+#include <math.h>
+
+long lround(double x)
+{
+	long n;
+	__asm__ ("fcvtas %x0, %d1" : "=r"(n) : "w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lroundf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lroundf.c
new file mode 100644
index 0000000000..32e51f3cc3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/lroundf.c
@@ -0,0 +1,8 @@
+#include <math.h>
+
+long lroundf(float x)
+{
+	long n;
+	__asm__ ("fcvtas %x0, %s1" : "=r"(n) : "w"(x));
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/nearbyint.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/nearbyint.c
new file mode 100644
index 0000000000..9c3fdb4450
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/nearbyint.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double nearbyint(double x)
+{
+	__asm__ ("frinti %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/nearbyintf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/nearbyintf.c
new file mode 100644
index 0000000000..8e7f61df8c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/nearbyintf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float nearbyintf(float x)
+{
+	__asm__ ("frinti %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/rint.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/rint.c
new file mode 100644
index 0000000000..45b194b5e4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/rint.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double rint(double x)
+{
+	__asm__ ("frintx %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/rintf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/rintf.c
new file mode 100644
index 0000000000..1ae7dd2540
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/rintf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float rintf(float x)
+{
+	__asm__ ("frintx %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/round.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/round.c
new file mode 100644
index 0000000000..897a84cc2a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/round.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double round(double x)
+{
+	__asm__ ("frinta %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/roundf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/roundf.c
new file mode 100644
index 0000000000..91637eaa12
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/roundf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float roundf(float x)
+{
+	__asm__ ("frinta %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/sqrt.c
new file mode 100644
index 0000000000..fe93c3e6ad
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/sqrt.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double sqrt(double x)
+{
+	__asm__ ("fsqrt %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/sqrtf.c
new file mode 100644
index 0000000000..275c7f399c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/sqrtf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float sqrtf(float x)
+{
+	__asm__ ("fsqrt %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/trunc.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/trunc.c
new file mode 100644
index 0000000000..e592147a0c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/trunc.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double trunc(double x)
+{
+	__asm__ ("frintz %d0, %d1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/aarch64/truncf.c b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/truncf.c
new file mode 100644
index 0000000000..20ef30f128
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/aarch64/truncf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float truncf(float x)
+{
+	__asm__ ("frintz %s0, %s1" : "=w"(x) : "w"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/acos.c b/src/components/lib/libc/musl-1.2.0/src/math/acos.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/acos.c
rename to src/components/lib/libc/musl-1.2.0/src/math/acos.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/acosf.c b/src/components/lib/libc/musl-1.2.0/src/math/acosf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/acosf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/acosf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/acosh.c b/src/components/lib/libc/musl-1.2.0/src/math/acosh.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/acosh.c
rename to src/components/lib/libc/musl-1.2.0/src/math/acosh.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/acoshf.c b/src/components/lib/libc/musl-1.2.0/src/math/acoshf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/acoshf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/acoshf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/acoshl.c b/src/components/lib/libc/musl-1.2.0/src/math/acoshl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/acoshl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/acoshl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/acosl.c b/src/components/lib/libc/musl-1.2.0/src/math/acosl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/acosl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/acosl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/arm/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/arm/fabs.c
new file mode 100644
index 0000000000..f890520a5c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/arm/fabs.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __ARM_PCS_VFP
+
+double fabs(double x)
+{
+	__asm__ ("vabs.f64 %P0, %P1" : "=w"(x) : "w"(x));
+	return x;
+}
+
+#else
+
+#include "../fabs.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/arm/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/arm/fabsf.c
new file mode 100644
index 0000000000..4a217c9889
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/arm/fabsf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __ARM_PCS_VFP && !BROKEN_VFP_ASM
+
+float fabsf(float x)
+{
+	__asm__ ("vabs.f32 %0, %1" : "=t"(x) : "t"(x));
+	return x;
+}
+
+#else
+
+#include "../fabsf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/arm/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/arm/fma.c
new file mode 100644
index 0000000000..2a9b8efa77
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/arm/fma.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __ARM_FEATURE_FMA && __ARM_FP&8 && !__SOFTFP__
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("vfma.f64 %P0, %P1, %P2" : "+w"(z) : "w"(x), "w"(y));
+	return z;
+}
+
+#else
+
+#include "../fma.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/arm/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/arm/fmaf.c
new file mode 100644
index 0000000000..a1793d27f1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/arm/fmaf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __ARM_FEATURE_FMA && __ARM_FP&4 && !__SOFTFP__ && !BROKEN_VFP_ASM
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("vfma.f32 %0, %1, %2" : "+t"(z) : "t"(x), "t"(y));
+	return z;
+}
+
+#else
+
+#include "../fmaf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/arm/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/arm/sqrt.c
new file mode 100644
index 0000000000..874af9606c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/arm/sqrt.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __ARM_PCS_VFP || (__VFP_FP__ && !__SOFTFP__)
+
+double sqrt(double x)
+{
+	__asm__ ("vsqrt.f64 %P0, %P1" : "=w"(x) : "w"(x));
+	return x;
+}
+
+#else
+
+#include "../sqrt.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/arm/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/arm/sqrtf.c
new file mode 100644
index 0000000000..32693293b4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/arm/sqrtf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if (__ARM_PCS_VFP || (__VFP_FP__ && !__SOFTFP__)) && !BROKEN_VFP_ASM
+
+float sqrtf(float x)
+{
+	__asm__ ("vsqrt.f32 %0, %1" : "=t"(x) : "t"(x));
+	return x;
+}
+
+#else
+
+#include "../sqrtf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/asin.c b/src/components/lib/libc/musl-1.2.0/src/math/asin.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/asin.c
rename to src/components/lib/libc/musl-1.2.0/src/math/asin.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/asinf.c b/src/components/lib/libc/musl-1.2.0/src/math/asinf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/asinf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/asinf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/asinh.c b/src/components/lib/libc/musl-1.2.0/src/math/asinh.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/asinh.c
rename to src/components/lib/libc/musl-1.2.0/src/math/asinh.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/asinhf.c b/src/components/lib/libc/musl-1.2.0/src/math/asinhf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/asinhf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/asinhf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/asinhl.c b/src/components/lib/libc/musl-1.2.0/src/math/asinhl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/asinhl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/asinhl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/asinl.c b/src/components/lib/libc/musl-1.2.0/src/math/asinl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/asinl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/asinl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atan.c b/src/components/lib/libc/musl-1.2.0/src/math/atan.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atan.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atan.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atan2.c b/src/components/lib/libc/musl-1.2.0/src/math/atan2.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atan2.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atan2.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atan2f.c b/src/components/lib/libc/musl-1.2.0/src/math/atan2f.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atan2f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atan2f.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atan2l.c b/src/components/lib/libc/musl-1.2.0/src/math/atan2l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atan2l.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atan2l.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atanf.c b/src/components/lib/libc/musl-1.2.0/src/math/atanf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atanf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atanf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atanh.c b/src/components/lib/libc/musl-1.2.0/src/math/atanh.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atanh.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atanh.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atanhf.c b/src/components/lib/libc/musl-1.2.0/src/math/atanhf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atanhf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atanhf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atanhl.c b/src/components/lib/libc/musl-1.2.0/src/math/atanhl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/atanhl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atanhl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/atanl.c b/src/components/lib/libc/musl-1.2.0/src/math/atanl.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/math/atanl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/atanl.c
index 79a3edb805..c3b0c9268d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/atanl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/atanl.c
@@ -70,21 +70,21 @@ static long double T_odd(long double x)
 #elif LDBL_MANT_DIG == 113
 #define EXPMAN(u) ((u.i.se & 0x7fff)<<8 | u.i.top>>8)
 
-const long double atanhi[] = {
+static const long double atanhi[] = {
 	 4.63647609000806116214256231461214397e-01L,
 	 7.85398163397448309615660845819875699e-01L,
 	 9.82793723247329067985710611014666038e-01L,
 	 1.57079632679489661923132169163975140e+00L,
 };
 
-const long double atanlo[] = {
+static const long double atanlo[] = {
 	 4.89509642257333492668618435220297706e-36L,
 	 2.16795253253094525619926100651083806e-35L,
 	-2.31288434538183565909319952098066272e-35L,
 	 4.33590506506189051239852201302167613e-35L,
 };
 
-const long double aT[] = {
+static const long double aT[] = {
 	 3.33333333333333333333333333333333125e-01L,
 	-1.99999999999999999999999999999180430e-01L,
 	 1.42857142857142857142857142125269827e-01L,
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/cbrt.c b/src/components/lib/libc/musl-1.2.0/src/math/cbrt.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/cbrt.c
rename to src/components/lib/libc/musl-1.2.0/src/math/cbrt.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/cbrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/cbrtf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/cbrtf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/cbrtf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/cbrtl.c b/src/components/lib/libc/musl-1.2.0/src/math/cbrtl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/cbrtl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/cbrtl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ceil.c b/src/components/lib/libc/musl-1.2.0/src/math/ceil.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ceil.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ceil.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ceilf.c b/src/components/lib/libc/musl-1.2.0/src/math/ceilf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ceilf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ceilf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ceill.c b/src/components/lib/libc/musl-1.2.0/src/math/ceill.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ceill.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ceill.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/copysign.c b/src/components/lib/libc/musl-1.2.0/src/math/copysign.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/copysign.c
rename to src/components/lib/libc/musl-1.2.0/src/math/copysign.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/copysignf.c b/src/components/lib/libc/musl-1.2.0/src/math/copysignf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/copysignf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/copysignf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/copysignl.c b/src/components/lib/libc/musl-1.2.0/src/math/copysignl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/copysignl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/copysignl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/cos.c b/src/components/lib/libc/musl-1.2.0/src/math/cos.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/cos.c
rename to src/components/lib/libc/musl-1.2.0/src/math/cos.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/cosf.c b/src/components/lib/libc/musl-1.2.0/src/math/cosf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/cosf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/cosf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/cosh.c b/src/components/lib/libc/musl-1.2.0/src/math/cosh.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/cosh.c
rename to src/components/lib/libc/musl-1.2.0/src/math/cosh.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/coshf.c b/src/components/lib/libc/musl-1.2.0/src/math/coshf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/coshf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/coshf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/coshl.c b/src/components/lib/libc/musl-1.2.0/src/math/coshl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/coshl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/coshl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/cosl.c b/src/components/lib/libc/musl-1.2.0/src/math/cosl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/cosl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/cosl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/erf.c b/src/components/lib/libc/musl-1.2.0/src/math/erf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/erf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/erf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/erff.c b/src/components/lib/libc/musl-1.2.0/src/math/erff.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/erff.c
rename to src/components/lib/libc/musl-1.2.0/src/math/erff.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/erfl.c b/src/components/lib/libc/musl-1.2.0/src/math/erfl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/erfl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/erfl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/exp.c b/src/components/lib/libc/musl-1.2.0/src/math/exp.c
new file mode 100644
index 0000000000..b764d73cfe
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp.c
@@ -0,0 +1,134 @@
+/*
+ * Double-precision e^x function.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "exp_data.h"
+
+#define N (1 << EXP_TABLE_BITS)
+#define InvLn2N __exp_data.invln2N
+#define NegLn2hiN __exp_data.negln2hiN
+#define NegLn2loN __exp_data.negln2loN
+#define Shift __exp_data.shift
+#define T __exp_data.tab
+#define C2 __exp_data.poly[5 - EXP_POLY_ORDER]
+#define C3 __exp_data.poly[6 - EXP_POLY_ORDER]
+#define C4 __exp_data.poly[7 - EXP_POLY_ORDER]
+#define C5 __exp_data.poly[8 - EXP_POLY_ORDER]
+
+/* Handle cases that may overflow or underflow when computing the result that
+   is scale*(1+TMP) without intermediate rounding.  The bit representation of
+   scale is in SBITS, however it has a computed exponent that may have
+   overflown into the sign bit so that needs to be adjusted before using it as
+   a double.  (int32_t)KI is the k used in the argument reduction and exponent
+   adjustment of scale, positive k here means the result may overflow and
+   negative k means the result may underflow.  */
+static inline double specialcase(double_t tmp, uint64_t sbits, uint64_t ki)
+{
+	double_t scale, y;
+
+	if ((ki & 0x80000000) == 0) {
+		/* k > 0, the exponent of scale might have overflowed by <= 460.  */
+		sbits -= 1009ull << 52;
+		scale = asdouble(sbits);
+		y = 0x1p1009 * (scale + scale * tmp);
+		return eval_as_double(y);
+	}
+	/* k < 0, need special care in the subnormal range.  */
+	sbits += 1022ull << 52;
+	scale = asdouble(sbits);
+	y = scale + scale * tmp;
+	if (y < 1.0) {
+		/* Round y to the right precision before scaling it into the subnormal
+		 range to avoid double rounding that can cause 0.5+E/2 ulp error where
+		 E is the worst-case ulp error outside the subnormal range.  So this
+		 is only useful if the goal is better than 1 ulp worst-case error.  */
+		double_t hi, lo;
+		lo = scale - y + scale * tmp;
+		hi = 1.0 + y;
+		lo = 1.0 - hi + y + lo;
+		y = eval_as_double(hi + lo) - 1.0;
+		/* Avoid -0.0 with downward rounding.  */
+		if (WANT_ROUNDING && y == 0.0)
+			y = 0.0;
+		/* The underflow exception needs to be signaled explicitly.  */
+		fp_force_eval(fp_barrier(0x1p-1022) * 0x1p-1022);
+	}
+	y = 0x1p-1022 * y;
+	return eval_as_double(y);
+}
+
+/* Top 12 bits of a double (sign and exponent bits).  */
+static inline uint32_t top12(double x)
+{
+	return asuint64(x) >> 52;
+}
+
+double exp(double x)
+{
+	uint32_t abstop;
+	uint64_t ki, idx, top, sbits;
+	double_t kd, z, r, r2, scale, tail, tmp;
+
+	abstop = top12(x) & 0x7ff;
+	if (predict_false(abstop - top12(0x1p-54) >= top12(512.0) - top12(0x1p-54))) {
+		if (abstop - top12(0x1p-54) >= 0x80000000)
+			/* Avoid spurious underflow for tiny x.  */
+			/* Note: 0 is common input.  */
+			return WANT_ROUNDING ? 1.0 + x : 1.0;
+		if (abstop >= top12(1024.0)) {
+			if (asuint64(x) == asuint64(-INFINITY))
+				return 0.0;
+			if (abstop >= top12(INFINITY))
+				return 1.0 + x;
+			if (asuint64(x) >> 63)
+				return __math_uflow(0);
+			else
+				return __math_oflow(0);
+		}
+		/* Large x is special cased below.  */
+		abstop = 0;
+	}
+
+	/* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)].  */
+	/* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N].  */
+	z = InvLn2N * x;
+#if TOINT_INTRINSICS
+	kd = roundtoint(z);
+	ki = converttoint(z);
+#elif EXP_USE_TOINT_NARROW
+	/* z - kd is in [-0.5-2^-16, 0.5] in all rounding modes.  */
+	kd = eval_as_double(z + Shift);
+	ki = asuint64(kd) >> 16;
+	kd = (double_t)(int32_t)ki;
+#else
+	/* z - kd is in [-1, 1] in non-nearest rounding modes.  */
+	kd = eval_as_double(z + Shift);
+	ki = asuint64(kd);
+	kd -= Shift;
+#endif
+	r = x + kd * NegLn2hiN + kd * NegLn2loN;
+	/* 2^(k/N) ~= scale * (1 + tail).  */
+	idx = 2 * (ki % N);
+	top = ki << (52 - EXP_TABLE_BITS);
+	tail = asdouble(T[idx]);
+	/* This is only a valid scale when -1023*N < k < 1024*N.  */
+	sbits = T[idx + 1] + top;
+	/* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (tail + exp(r) - 1).  */
+	/* Evaluation is optimized assuming superscalar pipelined execution.  */
+	r2 = r * r;
+	/* Without fma the worst case error is 0.25/N ulp larger.  */
+	/* Worst case error is less than 0.5+1.11/N+(abs poly error * 2^53) ulp.  */
+	tmp = tail + r + r2 * (C2 + r * C3) + r2 * r2 * (C4 + r * C5);
+	if (predict_false(abstop == 0))
+		return specialcase(tmp, sbits, ki);
+	scale = asdouble(sbits);
+	/* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there
+	   is no spurious underflow here even without fma.  */
+	return eval_as_double(scale + scale * tmp);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/exp10.c b/src/components/lib/libc/musl-1.2.0/src/math/exp10.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/math/exp10.c
rename to src/components/lib/libc/musl-1.2.0/src/math/exp10.c
index 9f5e3c2c51..26899ebac9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/exp10.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp10.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <math.h>
 #include <stdint.h>
-#include "libc.h"
 
 double exp10(double x)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/exp10f.c b/src/components/lib/libc/musl-1.2.0/src/math/exp10f.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/math/exp10f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/exp10f.c
index 7a8d447033..d009f0a84f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/exp10f.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp10f.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <math.h>
 #include <stdint.h>
-#include "libc.h"
 
 float exp10f(float x)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/exp10l.c b/src/components/lib/libc/musl-1.2.0/src/math/exp10l.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/math/exp10l.c
rename to src/components/lib/libc/musl-1.2.0/src/math/exp10l.c
index b758ebffe1..f3da1a082c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/exp10l.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp10l.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <float.h>
 #include <math.h>
-#include "libc.h"
 #include "libm.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/exp2.c b/src/components/lib/libc/musl-1.2.0/src/math/exp2.c
new file mode 100644
index 0000000000..e0ff54bd85
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp2.c
@@ -0,0 +1,121 @@
+/*
+ * Double-precision 2^x function.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "exp_data.h"
+
+#define N (1 << EXP_TABLE_BITS)
+#define Shift __exp_data.exp2_shift
+#define T __exp_data.tab
+#define C1 __exp_data.exp2_poly[0]
+#define C2 __exp_data.exp2_poly[1]
+#define C3 __exp_data.exp2_poly[2]
+#define C4 __exp_data.exp2_poly[3]
+#define C5 __exp_data.exp2_poly[4]
+
+/* Handle cases that may overflow or underflow when computing the result that
+   is scale*(1+TMP) without intermediate rounding.  The bit representation of
+   scale is in SBITS, however it has a computed exponent that may have
+   overflown into the sign bit so that needs to be adjusted before using it as
+   a double.  (int32_t)KI is the k used in the argument reduction and exponent
+   adjustment of scale, positive k here means the result may overflow and
+   negative k means the result may underflow.  */
+static inline double specialcase(double_t tmp, uint64_t sbits, uint64_t ki)
+{
+	double_t scale, y;
+
+	if ((ki & 0x80000000) == 0) {
+		/* k > 0, the exponent of scale might have overflowed by 1.  */
+		sbits -= 1ull << 52;
+		scale = asdouble(sbits);
+		y = 2 * (scale + scale * tmp);
+		return eval_as_double(y);
+	}
+	/* k < 0, need special care in the subnormal range.  */
+	sbits += 1022ull << 52;
+	scale = asdouble(sbits);
+	y = scale + scale * tmp;
+	if (y < 1.0) {
+		/* Round y to the right precision before scaling it into the subnormal
+		   range to avoid double rounding that can cause 0.5+E/2 ulp error where
+		   E is the worst-case ulp error outside the subnormal range.  So this
+		   is only useful if the goal is better than 1 ulp worst-case error.  */
+		double_t hi, lo;
+		lo = scale - y + scale * tmp;
+		hi = 1.0 + y;
+		lo = 1.0 - hi + y + lo;
+		y = eval_as_double(hi + lo) - 1.0;
+		/* Avoid -0.0 with downward rounding.  */
+		if (WANT_ROUNDING && y == 0.0)
+			y = 0.0;
+		/* The underflow exception needs to be signaled explicitly.  */
+		fp_force_eval(fp_barrier(0x1p-1022) * 0x1p-1022);
+	}
+	y = 0x1p-1022 * y;
+	return eval_as_double(y);
+}
+
+/* Top 12 bits of a double (sign and exponent bits).  */
+static inline uint32_t top12(double x)
+{
+	return asuint64(x) >> 52;
+}
+
+double exp2(double x)
+{
+	uint32_t abstop;
+	uint64_t ki, idx, top, sbits;
+	double_t kd, r, r2, scale, tail, tmp;
+
+	abstop = top12(x) & 0x7ff;
+	if (predict_false(abstop - top12(0x1p-54) >= top12(512.0) - top12(0x1p-54))) {
+		if (abstop - top12(0x1p-54) >= 0x80000000)
+			/* Avoid spurious underflow for tiny x.  */
+			/* Note: 0 is common input.  */
+			return WANT_ROUNDING ? 1.0 + x : 1.0;
+		if (abstop >= top12(1024.0)) {
+			if (asuint64(x) == asuint64(-INFINITY))
+				return 0.0;
+			if (abstop >= top12(INFINITY))
+				return 1.0 + x;
+			if (!(asuint64(x) >> 63))
+				return __math_oflow(0);
+			else if (asuint64(x) >= asuint64(-1075.0))
+				return __math_uflow(0);
+		}
+		if (2 * asuint64(x) > 2 * asuint64(928.0))
+			/* Large x is special cased below.  */
+			abstop = 0;
+	}
+
+	/* exp2(x) = 2^(k/N) * 2^r, with 2^r in [2^(-1/2N),2^(1/2N)].  */
+	/* x = k/N + r, with int k and r in [-1/2N, 1/2N].  */
+	kd = eval_as_double(x + Shift);
+	ki = asuint64(kd); /* k.  */
+	kd -= Shift; /* k/N for int k.  */
+	r = x - kd;
+	/* 2^(k/N) ~= scale * (1 + tail).  */
+	idx = 2 * (ki % N);
+	top = ki << (52 - EXP_TABLE_BITS);
+	tail = asdouble(T[idx]);
+	/* This is only a valid scale when -1023*N < k < 1024*N.  */
+	sbits = T[idx + 1] + top;
+	/* exp2(x) = 2^(k/N) * 2^r ~= scale + scale * (tail + 2^r - 1).  */
+	/* Evaluation is optimized assuming superscalar pipelined execution.  */
+	r2 = r * r;
+	/* Without fma the worst case error is 0.5/N ulp larger.  */
+	/* Worst case error is less than 0.5+0.86/N+(abs poly error * 2^53) ulp.  */
+	tmp = tail + r * C1 + r2 * (C2 + r * C3) + r2 * r2 * (C4 + r * C5);
+	if (predict_false(abstop == 0))
+		return specialcase(tmp, sbits, ki);
+	scale = asdouble(sbits);
+	/* Note: tmp == 0 or |tmp| > 2^-65 and scale > 2^-928, so there
+	   is no spurious underflow here even without fma.  */
+	return eval_as_double(scale + scale * tmp);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/exp2f.c b/src/components/lib/libc/musl-1.2.0/src/math/exp2f.c
new file mode 100644
index 0000000000..0360482cae
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp2f.c
@@ -0,0 +1,69 @@
+/*
+ * Single-precision 2^x function.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "exp2f_data.h"
+
+/*
+EXP2F_TABLE_BITS = 5
+EXP2F_POLY_ORDER = 3
+
+ULP error: 0.502 (nearest rounding.)
+Relative error: 1.69 * 2^-34 in [-1/64, 1/64] (before rounding.)
+Wrong count: 168353 (all nearest rounding wrong results with fma.)
+Non-nearest ULP error: 1 (rounded ULP error)
+*/
+
+#define N (1 << EXP2F_TABLE_BITS)
+#define T __exp2f_data.tab
+#define C __exp2f_data.poly
+#define SHIFT __exp2f_data.shift_scaled
+
+static inline uint32_t top12(float x)
+{
+	return asuint(x) >> 20;
+}
+
+float exp2f(float x)
+{
+	uint32_t abstop;
+	uint64_t ki, t;
+	double_t kd, xd, z, r, r2, y, s;
+
+	xd = (double_t)x;
+	abstop = top12(x) & 0x7ff;
+	if (predict_false(abstop >= top12(128.0f))) {
+		/* |x| >= 128 or x is nan.  */
+		if (asuint(x) == asuint(-INFINITY))
+			return 0.0f;
+		if (abstop >= top12(INFINITY))
+			return x + x;
+		if (x > 0.0f)
+			return __math_oflowf(0);
+		if (x <= -150.0f)
+			return __math_uflowf(0);
+	}
+
+	/* x = k/N + r with r in [-1/(2N), 1/(2N)] and int k.  */
+	kd = eval_as_double(xd + SHIFT);
+	ki = asuint64(kd);
+	kd -= SHIFT; /* k/N for int k.  */
+	r = xd - kd;
+
+	/* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */
+	t = T[ki % N];
+	t += ki << (52 - EXP2F_TABLE_BITS);
+	s = asdouble(t);
+	z = C[0] * r + C[1];
+	r2 = r * r;
+	y = C[2] * r + 1;
+	y = z * r2 + y;
+	y = y * s;
+	return eval_as_float(y);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/exp2f_data.c b/src/components/lib/libc/musl-1.2.0/src/math/exp2f_data.c
new file mode 100644
index 0000000000..be324727f5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp2f_data.c
@@ -0,0 +1,35 @@
+/*
+ * Shared data between expf, exp2f and powf.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "exp2f_data.h"
+
+#define N (1 << EXP2F_TABLE_BITS)
+
+const struct exp2f_data __exp2f_data = {
+  /* tab[i] = uint(2^(i/N)) - (i << 52-BITS)
+     used for computing 2^(k/N) for an int |k| < 150 N as
+     double(tab[k%N] + (k << 52-BITS)) */
+  .tab = {
+0x3ff0000000000000, 0x3fefd9b0d3158574, 0x3fefb5586cf9890f, 0x3fef9301d0125b51,
+0x3fef72b83c7d517b, 0x3fef54873168b9aa, 0x3fef387a6e756238, 0x3fef1e9df51fdee1,
+0x3fef06fe0a31b715, 0x3feef1a7373aa9cb, 0x3feedea64c123422, 0x3feece086061892d,
+0x3feebfdad5362a27, 0x3feeb42b569d4f82, 0x3feeab07dd485429, 0x3feea47eb03a5585,
+0x3feea09e667f3bcd, 0x3fee9f75e8ec5f74, 0x3feea11473eb0187, 0x3feea589994cce13,
+0x3feeace5422aa0db, 0x3feeb737b0cdc5e5, 0x3feec49182a3f090, 0x3feed503b23e255d,
+0x3feee89f995ad3ad, 0x3feeff76f2fb5e47, 0x3fef199bdd85529c, 0x3fef3720dcef9069,
+0x3fef5818dcfba487, 0x3fef7c97337b9b5f, 0x3fefa4afa2a490da, 0x3fefd0765b6e4540,
+  },
+  .shift_scaled = 0x1.8p+52 / N,
+  .poly = {
+  0x1.c6af84b912394p-5, 0x1.ebfce50fac4f3p-3, 0x1.62e42ff0c52d6p-1,
+  },
+  .shift = 0x1.8p+52,
+  .invln2_scaled = 0x1.71547652b82fep+0 * N,
+  .poly_scaled = {
+  0x1.c6af84b912394p-5/N/N/N, 0x1.ebfce50fac4f3p-3/N/N, 0x1.62e42ff0c52d6p-1/N,
+  },
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/exp2f_data.h b/src/components/lib/libc/musl-1.2.0/src/math/exp2f_data.h
new file mode 100644
index 0000000000..fe744f15be
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp2f_data.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _EXP2F_DATA_H
+#define _EXP2F_DATA_H
+
+#include <features.h>
+#include <stdint.h>
+
+/* Shared between expf, exp2f and powf.  */
+#define EXP2F_TABLE_BITS 5
+#define EXP2F_POLY_ORDER 3
+extern hidden const struct exp2f_data {
+	uint64_t tab[1 << EXP2F_TABLE_BITS];
+	double shift_scaled;
+	double poly[EXP2F_POLY_ORDER];
+	double shift;
+	double invln2_scaled;
+	double poly_scaled[EXP2F_POLY_ORDER];
+} __exp2f_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/exp2l.c b/src/components/lib/libc/musl-1.2.0/src/math/exp2l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/exp2l.c
rename to src/components/lib/libc/musl-1.2.0/src/math/exp2l.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/exp_data.c b/src/components/lib/libc/musl-1.2.0/src/math/exp_data.c
new file mode 100644
index 0000000000..21be0146a1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp_data.c
@@ -0,0 +1,182 @@
+/*
+ * Shared data between exp, exp2 and pow.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "exp_data.h"
+
+#define N (1 << EXP_TABLE_BITS)
+
+const struct exp_data __exp_data = {
+// N/ln2
+.invln2N = 0x1.71547652b82fep0 * N,
+// -ln2/N
+.negln2hiN = -0x1.62e42fefa0000p-8,
+.negln2loN = -0x1.cf79abc9e3b3ap-47,
+// Used for rounding when !TOINT_INTRINSICS
+#if EXP_USE_TOINT_NARROW
+.shift = 0x1800000000.8p0,
+#else
+.shift = 0x1.8p52,
+#endif
+// exp polynomial coefficients.
+.poly = {
+// abs error: 1.555*2^-66
+// ulp error: 0.509 (0.511 without fma)
+// if |x| < ln2/256+eps
+// abs error if |x| < ln2/256+0x1p-15: 1.09*2^-65
+// abs error if |x| < ln2/128: 1.7145*2^-56
+0x1.ffffffffffdbdp-2,
+0x1.555555555543cp-3,
+0x1.55555cf172b91p-5,
+0x1.1111167a4d017p-7,
+},
+.exp2_shift = 0x1.8p52 / N,
+// exp2 polynomial coefficients.
+.exp2_poly = {
+// abs error: 1.2195*2^-65
+// ulp error: 0.507 (0.511 without fma)
+// if |x| < 1/256
+// abs error if |x| < 1/128: 1.9941*2^-56
+0x1.62e42fefa39efp-1,
+0x1.ebfbdff82c424p-3,
+0x1.c6b08d70cf4b5p-5,
+0x1.3b2abd24650ccp-7,
+0x1.5d7e09b4e3a84p-10,
+},
+// 2^(k/N) ~= H[k]*(1 + T[k]) for int k in [0,N)
+// tab[2*k] = asuint64(T[k])
+// tab[2*k+1] = asuint64(H[k]) - (k << 52)/N
+.tab = {
+0x0, 0x3ff0000000000000,
+0x3c9b3b4f1a88bf6e, 0x3feff63da9fb3335,
+0xbc7160139cd8dc5d, 0x3fefec9a3e778061,
+0xbc905e7a108766d1, 0x3fefe315e86e7f85,
+0x3c8cd2523567f613, 0x3fefd9b0d3158574,
+0xbc8bce8023f98efa, 0x3fefd06b29ddf6de,
+0x3c60f74e61e6c861, 0x3fefc74518759bc8,
+0x3c90a3e45b33d399, 0x3fefbe3ecac6f383,
+0x3c979aa65d837b6d, 0x3fefb5586cf9890f,
+0x3c8eb51a92fdeffc, 0x3fefac922b7247f7,
+0x3c3ebe3d702f9cd1, 0x3fefa3ec32d3d1a2,
+0xbc6a033489906e0b, 0x3fef9b66affed31b,
+0xbc9556522a2fbd0e, 0x3fef9301d0125b51,
+0xbc5080ef8c4eea55, 0x3fef8abdc06c31cc,
+0xbc91c923b9d5f416, 0x3fef829aaea92de0,
+0x3c80d3e3e95c55af, 0x3fef7a98c8a58e51,
+0xbc801b15eaa59348, 0x3fef72b83c7d517b,
+0xbc8f1ff055de323d, 0x3fef6af9388c8dea,
+0x3c8b898c3f1353bf, 0x3fef635beb6fcb75,
+0xbc96d99c7611eb26, 0x3fef5be084045cd4,
+0x3c9aecf73e3a2f60, 0x3fef54873168b9aa,
+0xbc8fe782cb86389d, 0x3fef4d5022fcd91d,
+0x3c8a6f4144a6c38d, 0x3fef463b88628cd6,
+0x3c807a05b0e4047d, 0x3fef3f49917ddc96,
+0x3c968efde3a8a894, 0x3fef387a6e756238,
+0x3c875e18f274487d, 0x3fef31ce4fb2a63f,
+0x3c80472b981fe7f2, 0x3fef2b4565e27cdd,
+0xbc96b87b3f71085e, 0x3fef24dfe1f56381,
+0x3c82f7e16d09ab31, 0x3fef1e9df51fdee1,
+0xbc3d219b1a6fbffa, 0x3fef187fd0dad990,
+0x3c8b3782720c0ab4, 0x3fef1285a6e4030b,
+0x3c6e149289cecb8f, 0x3fef0cafa93e2f56,
+0x3c834d754db0abb6, 0x3fef06fe0a31b715,
+0x3c864201e2ac744c, 0x3fef0170fc4cd831,
+0x3c8fdd395dd3f84a, 0x3feefc08b26416ff,
+0xbc86a3803b8e5b04, 0x3feef6c55f929ff1,
+0xbc924aedcc4b5068, 0x3feef1a7373aa9cb,
+0xbc9907f81b512d8e, 0x3feeecae6d05d866,
+0xbc71d1e83e9436d2, 0x3feee7db34e59ff7,
+0xbc991919b3ce1b15, 0x3feee32dc313a8e5,
+0x3c859f48a72a4c6d, 0x3feedea64c123422,
+0xbc9312607a28698a, 0x3feeda4504ac801c,
+0xbc58a78f4817895b, 0x3feed60a21f72e2a,
+0xbc7c2c9b67499a1b, 0x3feed1f5d950a897,
+0x3c4363ed60c2ac11, 0x3feece086061892d,
+0x3c9666093b0664ef, 0x3feeca41ed1d0057,
+0x3c6ecce1daa10379, 0x3feec6a2b5c13cd0,
+0x3c93ff8e3f0f1230, 0x3feec32af0d7d3de,
+0x3c7690cebb7aafb0, 0x3feebfdad5362a27,
+0x3c931dbdeb54e077, 0x3feebcb299fddd0d,
+0xbc8f94340071a38e, 0x3feeb9b2769d2ca7,
+0xbc87deccdc93a349, 0x3feeb6daa2cf6642,
+0xbc78dec6bd0f385f, 0x3feeb42b569d4f82,
+0xbc861246ec7b5cf6, 0x3feeb1a4ca5d920f,
+0x3c93350518fdd78e, 0x3feeaf4736b527da,
+0x3c7b98b72f8a9b05, 0x3feead12d497c7fd,
+0x3c9063e1e21c5409, 0x3feeab07dd485429,
+0x3c34c7855019c6ea, 0x3feea9268a5946b7,
+0x3c9432e62b64c035, 0x3feea76f15ad2148,
+0xbc8ce44a6199769f, 0x3feea5e1b976dc09,
+0xbc8c33c53bef4da8, 0x3feea47eb03a5585,
+0xbc845378892be9ae, 0x3feea34634ccc320,
+0xbc93cedd78565858, 0x3feea23882552225,
+0x3c5710aa807e1964, 0x3feea155d44ca973,
+0xbc93b3efbf5e2228, 0x3feea09e667f3bcd,
+0xbc6a12ad8734b982, 0x3feea012750bdabf,
+0xbc6367efb86da9ee, 0x3fee9fb23c651a2f,
+0xbc80dc3d54e08851, 0x3fee9f7df9519484,
+0xbc781f647e5a3ecf, 0x3fee9f75e8ec5f74,
+0xbc86ee4ac08b7db0, 0x3fee9f9a48a58174,
+0xbc8619321e55e68a, 0x3fee9feb564267c9,
+0x3c909ccb5e09d4d3, 0x3feea0694fde5d3f,
+0xbc7b32dcb94da51d, 0x3feea11473eb0187,
+0x3c94ecfd5467c06b, 0x3feea1ed0130c132,
+0x3c65ebe1abd66c55, 0x3feea2f336cf4e62,
+0xbc88a1c52fb3cf42, 0x3feea427543e1a12,
+0xbc9369b6f13b3734, 0x3feea589994cce13,
+0xbc805e843a19ff1e, 0x3feea71a4623c7ad,
+0xbc94d450d872576e, 0x3feea8d99b4492ed,
+0x3c90ad675b0e8a00, 0x3feeaac7d98a6699,
+0x3c8db72fc1f0eab4, 0x3feeace5422aa0db,
+0xbc65b6609cc5e7ff, 0x3feeaf3216b5448c,
+0x3c7bf68359f35f44, 0x3feeb1ae99157736,
+0xbc93091fa71e3d83, 0x3feeb45b0b91ffc6,
+0xbc5da9b88b6c1e29, 0x3feeb737b0cdc5e5,
+0xbc6c23f97c90b959, 0x3feeba44cbc8520f,
+0xbc92434322f4f9aa, 0x3feebd829fde4e50,
+0xbc85ca6cd7668e4b, 0x3feec0f170ca07ba,
+0x3c71affc2b91ce27, 0x3feec49182a3f090,
+0x3c6dd235e10a73bb, 0x3feec86319e32323,
+0xbc87c50422622263, 0x3feecc667b5de565,
+0x3c8b1c86e3e231d5, 0x3feed09bec4a2d33,
+0xbc91bbd1d3bcbb15, 0x3feed503b23e255d,
+0x3c90cc319cee31d2, 0x3feed99e1330b358,
+0x3c8469846e735ab3, 0x3feede6b5579fdbf,
+0xbc82dfcd978e9db4, 0x3feee36bbfd3f37a,
+0x3c8c1a7792cb3387, 0x3feee89f995ad3ad,
+0xbc907b8f4ad1d9fa, 0x3feeee07298db666,
+0xbc55c3d956dcaeba, 0x3feef3a2b84f15fb,
+0xbc90a40e3da6f640, 0x3feef9728de5593a,
+0xbc68d6f438ad9334, 0x3feeff76f2fb5e47,
+0xbc91eee26b588a35, 0x3fef05b030a1064a,
+0x3c74ffd70a5fddcd, 0x3fef0c1e904bc1d2,
+0xbc91bdfbfa9298ac, 0x3fef12c25bd71e09,
+0x3c736eae30af0cb3, 0x3fef199bdd85529c,
+0x3c8ee3325c9ffd94, 0x3fef20ab5fffd07a,
+0x3c84e08fd10959ac, 0x3fef27f12e57d14b,
+0x3c63cdaf384e1a67, 0x3fef2f6d9406e7b5,
+0x3c676b2c6c921968, 0x3fef3720dcef9069,
+0xbc808a1883ccb5d2, 0x3fef3f0b555dc3fa,
+0xbc8fad5d3ffffa6f, 0x3fef472d4a07897c,
+0xbc900dae3875a949, 0x3fef4f87080d89f2,
+0x3c74a385a63d07a7, 0x3fef5818dcfba487,
+0xbc82919e2040220f, 0x3fef60e316c98398,
+0x3c8e5a50d5c192ac, 0x3fef69e603db3285,
+0x3c843a59ac016b4b, 0x3fef7321f301b460,
+0xbc82d52107b43e1f, 0x3fef7c97337b9b5f,
+0xbc892ab93b470dc9, 0x3fef864614f5a129,
+0x3c74b604603a88d3, 0x3fef902ee78b3ff6,
+0x3c83c5ec519d7271, 0x3fef9a51fbc74c83,
+0xbc8ff7128fd391f0, 0x3fefa4afa2a490da,
+0xbc8dae98e223747d, 0x3fefaf482d8e67f1,
+0x3c8ec3bc41aa2008, 0x3fefba1bee615a27,
+0x3c842b94c3a9eb32, 0x3fefc52b376bba97,
+0x3c8a64a931d185ee, 0x3fefd0765b6e4540,
+0xbc8e37bae43be3ed, 0x3fefdbfdad9cbe14,
+0x3c77893b4d91cd9d, 0x3fefe7c1819e90d8,
+0x3c5305c14160cc89, 0x3feff3c22b8f71f1,
+},
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/exp_data.h b/src/components/lib/libc/musl-1.2.0/src/math/exp_data.h
new file mode 100644
index 0000000000..3e24bac57a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/exp_data.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _EXP_DATA_H
+#define _EXP_DATA_H
+
+#include <features.h>
+#include <stdint.h>
+
+#define EXP_TABLE_BITS 7
+#define EXP_POLY_ORDER 5
+#define EXP_USE_TOINT_NARROW 0
+#define EXP2_POLY_ORDER 5
+extern hidden const struct exp_data {
+	double invln2N;
+	double shift;
+	double negln2hiN;
+	double negln2loN;
+	double poly[4]; /* Last four coefficients.  */
+	double exp2_shift;
+	double exp2_poly[EXP2_POLY_ORDER];
+	uint64_t tab[2*(1 << EXP_TABLE_BITS)];
+} __exp_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/expf.c b/src/components/lib/libc/musl-1.2.0/src/math/expf.c
new file mode 100644
index 0000000000..f9fbf8e727
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/expf.c
@@ -0,0 +1,80 @@
+/*
+ * Single-precision e^x function.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "exp2f_data.h"
+
+/*
+EXP2F_TABLE_BITS = 5
+EXP2F_POLY_ORDER = 3
+
+ULP error: 0.502 (nearest rounding.)
+Relative error: 1.69 * 2^-34 in [-ln2/64, ln2/64] (before rounding.)
+Wrong count: 170635 (all nearest rounding wrong results with fma.)
+Non-nearest ULP error: 1 (rounded ULP error)
+*/
+
+#define N (1 << EXP2F_TABLE_BITS)
+#define InvLn2N __exp2f_data.invln2_scaled
+#define T __exp2f_data.tab
+#define C __exp2f_data.poly_scaled
+
+static inline uint32_t top12(float x)
+{
+	return asuint(x) >> 20;
+}
+
+float expf(float x)
+{
+	uint32_t abstop;
+	uint64_t ki, t;
+	double_t kd, xd, z, r, r2, y, s;
+
+	xd = (double_t)x;
+	abstop = top12(x) & 0x7ff;
+	if (predict_false(abstop >= top12(88.0f))) {
+		/* |x| >= 88 or x is nan.  */
+		if (asuint(x) == asuint(-INFINITY))
+			return 0.0f;
+		if (abstop >= top12(INFINITY))
+			return x + x;
+		if (x > 0x1.62e42ep6f) /* x > log(0x1p128) ~= 88.72 */
+			return __math_oflowf(0);
+		if (x < -0x1.9fe368p6f) /* x < log(0x1p-150) ~= -103.97 */
+			return __math_uflowf(0);
+	}
+
+	/* x*N/Ln2 = k + r with r in [-1/2, 1/2] and int k.  */
+	z = InvLn2N * xd;
+
+	/* Round and convert z to int, the result is in [-150*N, 128*N] and
+	   ideally ties-to-even rule is used, otherwise the magnitude of r
+	   can be bigger which gives larger approximation error.  */
+#if TOINT_INTRINSICS
+	kd = roundtoint(z);
+	ki = converttoint(z);
+#else
+# define SHIFT __exp2f_data.shift
+	kd = eval_as_double(z + SHIFT);
+	ki = asuint64(kd);
+	kd -= SHIFT;
+#endif
+	r = z - kd;
+
+	/* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */
+	t = T[ki % N];
+	t += ki << (52 - EXP2F_TABLE_BITS);
+	s = asdouble(t);
+	z = C[0] * r + C[1];
+	r2 = r * r;
+	y = C[2] * r + 1;
+	y = z * r2 + y;
+	y = y * s;
+	return eval_as_float(y);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/expl.c b/src/components/lib/libc/musl-1.2.0/src/math/expl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/expl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/expl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/expm1.c b/src/components/lib/libc/musl-1.2.0/src/math/expm1.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/expm1.c
rename to src/components/lib/libc/musl-1.2.0/src/math/expm1.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/expm1f.c b/src/components/lib/libc/musl-1.2.0/src/math/expm1f.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/expm1f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/expm1f.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/expm1l.c b/src/components/lib/libc/musl-1.2.0/src/math/expm1l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/expm1l.c
rename to src/components/lib/libc/musl-1.2.0/src/math/expm1l.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/fabs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fabs.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fabs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/fabsf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fabsf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fabsf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fabsl.c b/src/components/lib/libc/musl-1.2.0/src/math/fabsl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fabsl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fabsl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fdim.c b/src/components/lib/libc/musl-1.2.0/src/math/fdim.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fdim.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fdim.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fdimf.c b/src/components/lib/libc/musl-1.2.0/src/math/fdimf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fdimf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fdimf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fdiml.c b/src/components/lib/libc/musl-1.2.0/src/math/fdiml.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fdiml.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fdiml.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/finite.c b/src/components/lib/libc/musl-1.2.0/src/math/finite.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/finite.c
rename to src/components/lib/libc/musl-1.2.0/src/math/finite.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/finitef.c b/src/components/lib/libc/musl-1.2.0/src/math/finitef.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/finitef.c
rename to src/components/lib/libc/musl-1.2.0/src/math/finitef.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/floor.c b/src/components/lib/libc/musl-1.2.0/src/math/floor.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/floor.c
rename to src/components/lib/libc/musl-1.2.0/src/math/floor.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/floorf.c b/src/components/lib/libc/musl-1.2.0/src/math/floorf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/floorf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/floorf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/floorl.c b/src/components/lib/libc/musl-1.2.0/src/math/floorl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/floorl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/floorl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/fma.c
new file mode 100644
index 0000000000..0c6f90c9cf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/fma.c
@@ -0,0 +1,183 @@
+#include <stdint.h>
+#include <float.h>
+#include <math.h>
+#include "atomic.h"
+
+#define ASUINT64(x) ((union {double f; uint64_t i;}){x}).i
+#define ZEROINFNAN (0x7ff-0x3ff-52-1)
+
+struct num { uint64_t m; int e; int sign; };
+
+static struct num normalize(double x)
+{
+	uint64_t ix = ASUINT64(x);
+	int e = ix>>52;
+	int sign = e & 0x800;
+	e &= 0x7ff;
+	if (!e) {
+		ix = ASUINT64(x*0x1p63);
+		e = ix>>52 & 0x7ff;
+		e = e ? e-63 : 0x800;
+	}
+	ix &= (1ull<<52)-1;
+	ix |= 1ull<<52;
+	ix <<= 1;
+	e -= 0x3ff + 52 + 1;
+	return (struct num){ix,e,sign};
+}
+
+static void mul(uint64_t *hi, uint64_t *lo, uint64_t x, uint64_t y)
+{
+	uint64_t t1,t2,t3;
+	uint64_t xlo = (uint32_t)x, xhi = x>>32;
+	uint64_t ylo = (uint32_t)y, yhi = y>>32;
+
+	t1 = xlo*ylo;
+	t2 = xlo*yhi + xhi*ylo;
+	t3 = xhi*yhi;
+	*lo = t1 + (t2<<32);
+	*hi = t3 + (t2>>32) + (t1 > *lo);
+}
+
+double fma(double x, double y, double z)
+{
+	#pragma STDC FENV_ACCESS ON
+
+	/* normalize so top 10bits and last bit are 0 */
+	struct num nx, ny, nz;
+	nx = normalize(x);
+	ny = normalize(y);
+	nz = normalize(z);
+
+	if (nx.e >= ZEROINFNAN || ny.e >= ZEROINFNAN)
+		return x*y + z;
+	if (nz.e >= ZEROINFNAN) {
+		if (nz.e > ZEROINFNAN) /* z==0 */
+			return x*y + z;
+		return z;
+	}
+
+	/* mul: r = x*y */
+	uint64_t rhi, rlo, zhi, zlo;
+	mul(&rhi, &rlo, nx.m, ny.m);
+	/* either top 20 or 21 bits of rhi and last 2 bits of rlo are 0 */
+
+	/* align exponents */
+	int e = nx.e + ny.e;
+	int d = nz.e - e;
+	/* shift bits z<<=kz, r>>=kr, so kz+kr == d, set e = e+kr (== ez-kz) */
+	if (d > 0) {
+		if (d < 64) {
+			zlo = nz.m<<d;
+			zhi = nz.m>>64-d;
+		} else {
+			zlo = 0;
+			zhi = nz.m;
+			e = nz.e - 64;
+			d -= 64;
+			if (d == 0) {
+			} else if (d < 64) {
+				rlo = rhi<<64-d | rlo>>d | !!(rlo<<64-d);
+				rhi = rhi>>d;
+			} else {
+				rlo = 1;
+				rhi = 0;
+			}
+		}
+	} else {
+		zhi = 0;
+		d = -d;
+		if (d == 0) {
+			zlo = nz.m;
+		} else if (d < 64) {
+			zlo = nz.m>>d | !!(nz.m<<64-d);
+		} else {
+			zlo = 1;
+		}
+	}
+
+	/* add */
+	int sign = nx.sign^ny.sign;
+	int samesign = !(sign^nz.sign);
+	int nonzero = 1;
+	if (samesign) {
+		/* r += z */
+		rlo += zlo;
+		rhi += zhi + (rlo < zlo);
+	} else {
+		/* r -= z */
+		uint64_t t = rlo;
+		rlo -= zlo;
+		rhi = rhi - zhi - (t < rlo);
+		if (rhi>>63) {
+			rlo = -rlo;
+			rhi = -rhi-!!rlo;
+			sign = !sign;
+		}
+		nonzero = !!rhi;
+	}
+
+	/* set rhi to top 63bit of the result (last bit is sticky) */
+	if (nonzero) {
+		e += 64;
+		d = a_clz_64(rhi)-1;
+		/* note: d > 0 */
+		rhi = rhi<<d | rlo>>64-d | !!(rlo<<d);
+	} else if (rlo) {
+		d = a_clz_64(rlo)-1;
+		if (d < 0)
+			rhi = rlo>>1 | (rlo&1);
+		else
+			rhi = rlo<<d;
+	} else {
+		/* exact +-0 */
+		return x*y + z;
+	}
+	e -= d;
+
+	/* convert to double */
+	int64_t i = rhi; /* i is in [1<<62,(1<<63)-1] */
+	if (sign)
+		i = -i;
+	double r = i; /* |r| is in [0x1p62,0x1p63] */
+
+	if (e < -1022-62) {
+		/* result is subnormal before rounding */
+		if (e == -1022-63) {
+			double c = 0x1p63;
+			if (sign)
+				c = -c;
+			if (r == c) {
+				/* min normal after rounding, underflow depends
+				   on arch behaviour which can be imitated by
+				   a double to float conversion */
+				float fltmin = 0x0.ffffff8p-63*FLT_MIN * r;
+				return DBL_MIN/FLT_MIN * fltmin;
+			}
+			/* one bit is lost when scaled, add another top bit to
+			   only round once at conversion if it is inexact */
+			if (rhi << 53) {
+				i = rhi>>1 | (rhi&1) | 1ull<<62;
+				if (sign)
+					i = -i;
+				r = i;
+				r = 2*r - c; /* remove top bit */
+
+				/* raise underflow portably, such that it
+				   cannot be optimized away */
+				{
+					double_t tiny = DBL_MIN/FLT_MIN * r;
+					r += (double)(tiny*tiny) * (r-r);
+				}
+			}
+		} else {
+			/* only round once when scaled */
+			d = 10;
+			i = ( rhi>>d | !!(rhi<<64-d) ) << d;
+			if (sign)
+				i = -i;
+			r = i;
+		}
+	}
+	return scalbn(r, e);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/fmaf.c
new file mode 100644
index 0000000000..80f5cd8a33
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/fmaf.c
@@ -0,0 +1,93 @@
+/* origin: FreeBSD /usr/src/lib/msun/src/s_fmaf.c */
+/*-
+ * Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <fenv.h>
+#include <math.h>
+#include <stdint.h>
+
+/*
+ * Fused multiply-add: Compute x * y + z with a single rounding error.
+ *
+ * A double has more than twice as much precision than a float, so
+ * direct double-precision arithmetic suffices, except where double
+ * rounding occurs.
+ */
+float fmaf(float x, float y, float z)
+{
+	#pragma STDC FENV_ACCESS ON
+	double xy, result;
+	union {double f; uint64_t i;} u;
+	int e;
+
+	xy = (double)x * y;
+	result = xy + z;
+	u.f = result;
+	e = u.i>>52 & 0x7ff;
+	/* Common case: The double precision result is fine. */
+	if ((u.i & 0x1fffffff) != 0x10000000 || /* not a halfway case */
+		e == 0x7ff ||                   /* NaN */
+		(result - xy == z && result - z == xy) || /* exact */
+		fegetround() != FE_TONEAREST)       /* not round-to-nearest */
+	{
+		/*
+		underflow may not be raised correctly, example:
+		fmaf(0x1p-120f, 0x1p-120f, 0x1p-149f)
+		*/
+#if defined(FE_INEXACT) && defined(FE_UNDERFLOW)
+		if (e < 0x3ff-126 && e >= 0x3ff-149 && fetestexcept(FE_INEXACT)) {
+			feclearexcept(FE_INEXACT);
+			/* TODO: gcc and clang bug workaround */
+			volatile float vz = z;
+			result = xy + vz;
+			if (fetestexcept(FE_INEXACT))
+				feraiseexcept(FE_UNDERFLOW);
+			else
+				feraiseexcept(FE_INEXACT);
+		}
+#endif
+		z = result;
+		return z;
+	}
+
+	/*
+	 * If result is inexact, and exactly halfway between two float values,
+	 * we need to adjust the low-order bit in the direction of the error.
+	 */
+#ifdef FE_TOWARDZERO
+	fesetround(FE_TOWARDZERO);
+#endif
+	volatile double vxy = xy;  /* XXX work around gcc CSE bug */
+	double adjusted_result = vxy + z;
+	fesetround(FE_TONEAREST);
+	if (result == adjusted_result) {
+		u.f = adjusted_result;
+		u.i++;
+		adjusted_result = u.f;
+	}
+	z = adjusted_result;
+	return z;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmal.c b/src/components/lib/libc/musl-1.2.0/src/math/fmal.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmal.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmal.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmax.c b/src/components/lib/libc/musl-1.2.0/src/math/fmax.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmax.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmax.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmaxf.c b/src/components/lib/libc/musl-1.2.0/src/math/fmaxf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmaxf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmaxf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmaxl.c b/src/components/lib/libc/musl-1.2.0/src/math/fmaxl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmaxl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmaxl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmin.c b/src/components/lib/libc/musl-1.2.0/src/math/fmin.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmin.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmin.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fminf.c b/src/components/lib/libc/musl-1.2.0/src/math/fminf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fminf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fminf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fminl.c b/src/components/lib/libc/musl-1.2.0/src/math/fminl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fminl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fminl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmod.c b/src/components/lib/libc/musl-1.2.0/src/math/fmod.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmod.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmod.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmodf.c b/src/components/lib/libc/musl-1.2.0/src/math/fmodf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmodf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmodf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/fmodl.c b/src/components/lib/libc/musl-1.2.0/src/math/fmodl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/fmodl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/fmodl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/frexp.c b/src/components/lib/libc/musl-1.2.0/src/math/frexp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/frexp.c
rename to src/components/lib/libc/musl-1.2.0/src/math/frexp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/frexpf.c b/src/components/lib/libc/musl-1.2.0/src/math/frexpf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/frexpf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/frexpf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/frexpl.c b/src/components/lib/libc/musl-1.2.0/src/math/frexpl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/frexpl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/frexpl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/hypot.c b/src/components/lib/libc/musl-1.2.0/src/math/hypot.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/math/hypot.c
rename to src/components/lib/libc/musl-1.2.0/src/math/hypot.c
index 29ec6a476d..6071bf1e28 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/hypot.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/hypot.c
@@ -12,10 +12,10 @@ static void sq(double_t *hi, double_t *lo, double x)
 {
 	double_t xh, xl, xc;
 
-	xc = x*SPLIT;
+	xc = (double_t)x*SPLIT;
 	xh = x - xc + xc;
 	xl = x - xh;
-	*hi = x*x;
+	*hi = (double_t)x*x;
 	*lo = xh*xh - *hi + 2*xh*xl + xl*xl;
 }
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/hypotf.c b/src/components/lib/libc/musl-1.2.0/src/math/hypotf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/hypotf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/hypotf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/hypotl.c b/src/components/lib/libc/musl-1.2.0/src/math/hypotl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/hypotl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/hypotl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/__invtrigl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/__invtrigl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/__invtrigl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/__invtrigl.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/acos.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/acos.s
new file mode 100644
index 0000000000..af423a2fcd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/acos.s
@@ -0,0 +1,18 @@
+# use acos(x) = atan2(fabs(sqrt((1-x)*(1+x))), x)
+
+.global acos
+.type acos,@function
+acos:
+	fldl 4(%esp)
+	fld %st(0)
+	fld1
+	fsub %st(0),%st(1)
+	fadd %st(2)
+	fmulp
+	fsqrt
+	fabs         # fix sign of zero (matters in downward rounding mode)
+	fxch %st(1)
+	fpatan
+	fstpl 4(%esp)
+	fldl 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/acosf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/acosf.s
new file mode 100644
index 0000000000..d2cdfdbfef
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/acosf.s
@@ -0,0 +1,16 @@
+.global acosf
+.type acosf,@function
+acosf:
+	flds 4(%esp)
+	fld %st(0)
+	fld1
+	fsub %st(0),%st(1)
+	fadd %st(2)
+	fmulp
+	fsqrt
+	fabs         # fix sign of zero (matters in downward rounding mode)
+	fxch %st(1)
+	fpatan
+	fstps 4(%esp)
+	flds 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/acosl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/acosl.s
new file mode 100644
index 0000000000..599c8230cd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/acosl.s
@@ -0,0 +1,14 @@
+.global acosl
+.type acosl,@function
+acosl:
+	fldt 4(%esp)
+	fld %st(0)
+	fld1
+	fsub %st(0),%st(1)
+	fadd %st(2)
+	fmulp
+	fsqrt
+	fabs         # fix sign of zero (matters in downward rounding mode)
+	fxch %st(1)
+	fpatan
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/asin.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/asin.s
new file mode 100644
index 0000000000..2bc8356f49
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/asin.s
@@ -0,0 +1,21 @@
+.global asin
+.type asin,@function
+asin:
+	fldl 4(%esp)
+	mov 8(%esp),%eax
+	add %eax,%eax
+	cmp $0x00200000,%eax
+	jb 1f
+	fld %st(0)
+	fld1
+	fsub %st(0),%st(1)
+	fadd %st(2)
+	fmulp
+	fsqrt
+	fpatan
+	fstpl 4(%esp)
+	fldl 4(%esp)
+	ret
+		# subnormal x, return x with underflow
+1:	fsts 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/asinf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/asinf.s
new file mode 100644
index 0000000000..059097532e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/asinf.s
@@ -0,0 +1,23 @@
+.global asinf
+.type asinf,@function
+asinf:
+	flds 4(%esp)
+	mov 4(%esp),%eax
+	add %eax,%eax
+	cmp $0x01000000,%eax
+	jb 1f
+	fld %st(0)
+	fld1
+	fsub %st(0),%st(1)
+	fadd %st(2)
+	fmulp
+	fsqrt
+	fpatan
+	fstps 4(%esp)
+	flds 4(%esp)
+	ret
+		# subnormal x, return x with underflow
+1:	fld %st(0)
+	fmul %st(1)
+	fstps 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/asinl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/asinl.s
new file mode 100644
index 0000000000..e973fc85fb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/asinl.s
@@ -0,0 +1,12 @@
+.global asinl
+.type asinl,@function
+asinl:
+	fldt 4(%esp)
+	fld %st(0)
+	fld1
+	fsub %st(0),%st(1)
+	fadd %st(2)
+	fmulp
+	fsqrt
+	fpatan
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/atan.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/atan.s
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/atan.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/atan.s
index d73137b28e..2c57f6b309 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/atan.s
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/atan.s
@@ -8,10 +8,9 @@ atan:
 	jb 1f
 	fld1
 	fpatan
+	fstpl 4(%esp)
+	fldl 4(%esp)
 	ret
 		# subnormal x, return x with underflow
-1:	fnstsw %ax
-	and $16,%ax
-	jnz 2f
-	fsts 4(%esp)
-2:	ret
+1:	fsts 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/atan2.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/atan2.s
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/atan2.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/atan2.s
index a7d2979b05..8bc441b1e4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/atan2.s
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/atan2.s
@@ -4,14 +4,12 @@ atan2:
 	fldl 4(%esp)
 	fldl 12(%esp)
 	fpatan
-	fstl 4(%esp)
+	fstpl 4(%esp)
+	fldl 4(%esp)
 	mov 8(%esp),%eax
 	add %eax,%eax
 	cmp $0x00200000,%eax
 	jae 1f
 		# subnormal x, return x with underflow
-	fnstsw %ax
-	and $16,%ax
-	jnz 1f
 	fsts 4(%esp)
 1:	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/atan2f.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/atan2f.s
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/atan2f.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/atan2f.s
index 14b88ce54a..3908c86df9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/atan2f.s
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/atan2f.s
@@ -4,15 +4,13 @@ atan2f:
 	flds 4(%esp)
 	flds 8(%esp)
 	fpatan
-	fsts 4(%esp)
+	fstps 4(%esp)
+	flds 4(%esp)
 	mov 4(%esp),%eax
 	add %eax,%eax
 	cmp $0x01000000,%eax
 	jae 1f
 		# subnormal x, return x with underflow
-	fnstsw %ax
-	and $16,%ax
-	jnz 1f
 	fld %st(0)
 	fmul %st(1)
 	fstps 4(%esp)
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/atan2l.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/atan2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/atan2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/atan2l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/atanf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/atanf.s
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/atanf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/atanf.s
index 8caddefa26..c2cbe2e026 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/atanf.s
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/atanf.s
@@ -8,12 +8,11 @@ atanf:
 	jb 1f
 	fld1
 	fpatan
+	fstps 4(%esp)
+	flds 4(%esp)
 	ret
 		# subnormal x, return x with underflow
-1:	fnstsw %ax
-	and $16,%ax
-	jnz 2f
-	fld %st(0)
+1:	fld %st(0)
 	fmul %st(1)
 	fstps 4(%esp)
-2:	ret
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/atanl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/atanl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/atanl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/atanl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/ceil.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/ceil.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/ceil.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/ceil.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/ceilf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/ceilf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/ceilf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/ceilf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/ceill.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/ceill.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/ceill.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/ceill.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/exp2l.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/exp2l.s
new file mode 100644
index 0000000000..8125761d10
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/exp2l.s
@@ -0,0 +1 @@
+# see exp_ld.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/exp_ld.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/exp_ld.s
new file mode 100644
index 0000000000..99cba01fa1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/exp_ld.s
@@ -0,0 +1,93 @@
+.global expm1l
+.type expm1l,@function
+expm1l:
+	fldt 4(%esp)
+	fldl2e
+	fmulp
+	mov $0xc2820000,%eax
+	push %eax
+	flds (%esp)
+	pop %eax
+	fucomp %st(1)
+	fnstsw %ax
+	sahf
+	fld1
+	jb 1f
+		# x*log2e < -65, return -1 without underflow
+	fstp %st(1)
+	fchs
+	ret
+1:	fld %st(1)
+	fabs
+	fucom %st(1)
+	fnstsw %ax
+	fstp %st(0)
+	fstp %st(0)
+	sahf
+	ja 1f
+	f2xm1
+	ret
+1:	call 1f
+	fld1
+	fsubrp
+	ret
+
+.global exp2l
+.global __exp2l
+.hidden __exp2l
+.type exp2l,@function
+exp2l:
+__exp2l:
+	fldt 4(%esp)
+1:	sub $12,%esp
+	fld %st(0)
+	fstpt (%esp)
+	mov 8(%esp),%ax
+	and $0x7fff,%ax
+	cmp $0x3fff+13,%ax
+	jb 4f             # |x| < 8192
+	cmp $0x3fff+15,%ax
+	jae 3f            # |x| >= 32768
+	fsts (%esp)
+	cmpl $0xc67ff800,(%esp)
+	jb 2f             # x > -16382
+	movl $0x5f000000,(%esp)
+	flds (%esp)       # 0x1p63
+	fld %st(1)
+	fsub %st(1)
+	faddp
+	fucomp %st(1)
+	fnstsw
+	sahf
+	je 2f             # x - 0x1p63 + 0x1p63 == x
+	movl $1,(%esp)
+	flds (%esp)       # 0x1p-149
+	fdiv %st(1)
+	fstps (%esp)      # raise underflow
+2:	fld1
+	fld %st(1)
+	frndint
+	fxch %st(2)
+	fsub %st(2)       # st(0)=x-rint(x), st(1)=1, st(2)=rint(x)
+	f2xm1
+	faddp             # 2^(x-rint(x))
+1:	fscale
+	fstp %st(1)
+	add $12,%esp
+	ret
+3:	xor %eax,%eax
+4:	cmp $0x3fff-64,%ax
+	fld1
+	jb 1b             # |x| < 0x1p-64
+	fstpt (%esp)
+	fistl 8(%esp)
+	fildl 8(%esp)
+	fsubrp %st(1)
+	addl $0x3fff,8(%esp)
+	f2xm1
+	fld1
+	faddp             # 2^(x-rint(x))
+	fldt (%esp)       # 2^rint(x)
+	fmulp
+	add $12,%esp
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/expl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/expl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/expl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/expl.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/expm1l.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/expm1l.s
new file mode 100644
index 0000000000..8125761d10
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/expm1l.s
@@ -0,0 +1 @@
+# see exp_ld.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/fabs.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/fabs.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/fabs.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/fabs.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/fabsf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/fabsf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/fabsf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/fabsf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/fabsl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/fabsl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/fabsl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/fabsl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/floor.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/floor.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/floor.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/floor.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/floorf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/floorf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/floorf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/floorf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/floorl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/floorl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/floorl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/floorl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/fmod.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/fmod.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/fmod.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/fmod.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/fmodf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/fmodf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/fmodf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/fmodf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/fmodl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/fmodl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/fmodl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/fmodl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/hypot.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/hypot.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/hypot.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/hypot.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/hypotf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/hypotf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/hypotf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/hypotf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/ldexp.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/ldexp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/ldexp.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/ldexp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/ldexpf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/ldexpf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/ldexpf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/ldexpf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/ldexpl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/ldexpl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/ldexpl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/ldexpl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/llrint.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/llrint.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/llrint.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/llrint.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/llrintf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/llrintf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/llrintf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/llrintf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/llrintl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/llrintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/llrintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/llrintl.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/log.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log.s
new file mode 100644
index 0000000000..08c59924b4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/log.s
@@ -0,0 +1,9 @@
+.global log
+.type log,@function
+log:
+	fldln2
+	fldl 4(%esp)
+	fyl2x
+	fstpl 4(%esp)
+	fldl 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/log10.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log10.s
new file mode 100644
index 0000000000..120e91ece8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/log10.s
@@ -0,0 +1,9 @@
+.global log10
+.type log10,@function
+log10:
+	fldlg2
+	fldl 4(%esp)
+	fyl2x
+	fstpl 4(%esp)
+	fldl 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/log10f.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log10f.s
new file mode 100644
index 0000000000..b055493ad4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/log10f.s
@@ -0,0 +1,9 @@
+.global log10f
+.type log10f,@function
+log10f:
+	fldlg2
+	flds 4(%esp)
+	fyl2x
+	fstps 4(%esp)
+	flds 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log10l.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log10l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/log10l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/log10l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log1p.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log1p.s
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/log1p.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/log1p.s
index 6b6929c728..f3c95f83ad 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/log1p.s
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/log1p.s
@@ -10,15 +10,16 @@ log1p:
 	cmp $0x00100000,%eax
 	jb 2f
 	fyl2xp1
+	fstpl 4(%esp)
+	fldl 4(%esp)
 	ret
 1:	fld1
 	faddp
 	fyl2x
+	fstpl 4(%esp)
+	fldl 4(%esp)
 	ret
 		# subnormal x, return x with underflow
-2:	fnstsw %ax
-	and $16,%ax
-	jnz 1f
-	fsts 4(%esp)
+2:	fsts 4(%esp)
 	fstp %st(1)
-1:	ret
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log1pf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log1pf.s
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/log1pf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/log1pf.s
index c0bcd30f0e..9f13d95ffb 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/i386/log1pf.s
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/log1pf.s
@@ -10,16 +10,17 @@ log1pf:
 	cmp $0x00800000,%eax
 	jb 2f
 	fyl2xp1
+	fstps 4(%esp)
+	flds 4(%esp)
 	ret
 1:	fld1
 	faddp
 	fyl2x
+	fstps 4(%esp)
+	flds 4(%esp)
 	ret
 		# subnormal x, return x with underflow
-2:	fnstsw %ax
-	and $16,%ax
-	jnz 1f
-	fxch
+2:	fxch
 	fmul %st(1)
 	fstps 4(%esp)
-1:	ret
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log1pl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log1pl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/log1pl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/log1pl.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/log2.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log2.s
new file mode 100644
index 0000000000..7eff0b616c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/log2.s
@@ -0,0 +1,9 @@
+.global log2
+.type log2,@function
+log2:
+	fld1
+	fldl 4(%esp)
+	fyl2x
+	fstpl 4(%esp)
+	fldl 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/log2f.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log2f.s
new file mode 100644
index 0000000000..b32fa2f76a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/log2f.s
@@ -0,0 +1,9 @@
+.global log2f
+.type log2f,@function
+log2f:
+	fld1
+	flds 4(%esp)
+	fyl2x
+	fstps 4(%esp)
+	flds 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/log2l.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/log2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/log2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/log2l.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/i386/logf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/logf.s
new file mode 100644
index 0000000000..4d0346a445
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/i386/logf.s
@@ -0,0 +1,9 @@
+.global logf
+.type logf,@function
+logf:
+	fldln2
+	flds 4(%esp)
+	fyl2x
+	fstps 4(%esp)
+	flds 4(%esp)
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/logl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/logl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/logl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/logl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/lrint.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/lrint.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/lrint.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/lrint.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/lrintf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/lrintf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/lrintf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/lrintf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/lrintl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/lrintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/lrintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/lrintl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/remainder.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/remainder.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/remainder.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/remainder.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/remainderf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/remainderf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/remainderf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/remainderf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/remainderl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/remainderl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/remainderl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/remainderl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/remquo.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/remquo.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/remquo.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/remquo.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/remquof.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/remquof.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/remquof.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/remquof.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/remquol.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/remquol.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/remquol.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/remquol.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/rint.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/rint.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/rint.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/rint.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/rintf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/rintf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/rintf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/rintf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/rintl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/rintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/rintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/rintl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/scalbln.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/scalbln.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/scalbln.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/scalbln.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/scalblnf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/scalblnf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/scalblnf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/scalblnf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/scalblnl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/scalblnl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/scalblnl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/scalblnl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/scalbn.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/scalbn.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/scalbn.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/scalbn.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/scalbnf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/scalbnf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/scalbnf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/scalbnf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/scalbnl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/scalbnl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/scalbnl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/scalbnl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/sqrt.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/sqrt.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/sqrt.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/sqrt.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/sqrtf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/sqrtf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/sqrtf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/sqrtf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/sqrtl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/sqrtl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/sqrtl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/sqrtl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/trunc.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/trunc.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/trunc.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/trunc.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/truncf.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/truncf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/truncf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/truncf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/i386/truncl.s b/src/components/lib/libc/musl-1.2.0/src/math/i386/truncl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/i386/truncl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/i386/truncl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ilogb.c b/src/components/lib/libc/musl-1.2.0/src/math/ilogb.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ilogb.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ilogb.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ilogbf.c b/src/components/lib/libc/musl-1.2.0/src/math/ilogbf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ilogbf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ilogbf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ilogbl.c b/src/components/lib/libc/musl-1.2.0/src/math/ilogbl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ilogbl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ilogbl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/j0.c b/src/components/lib/libc/musl-1.2.0/src/math/j0.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/j0.c
rename to src/components/lib/libc/musl-1.2.0/src/math/j0.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/j0f.c b/src/components/lib/libc/musl-1.2.0/src/math/j0f.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/math/j0f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/j0f.c
index 45883dc419..fab554a311 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/j0f.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/j0f.c
@@ -208,8 +208,8 @@ static float pzerof(float x)
 	GET_FLOAT_WORD(ix, x);
 	ix &= 0x7fffffff;
 	if      (ix >= 0x41000000){p = pR8; q = pS8;}
-	else if (ix >= 0x40f71c58){p = pR5; q = pS5;}
-	else if (ix >= 0x4036db68){p = pR3; q = pS3;}
+	else if (ix >= 0x409173eb){p = pR5; q = pS5;}
+	else if (ix >= 0x4036d917){p = pR3; q = pS3;}
 	else /*ix >= 0x40000000*/ {p = pR2; q = pS2;}
 	z = 1.0f/(x*x);
 	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
@@ -304,8 +304,8 @@ static float qzerof(float x)
 	GET_FLOAT_WORD(ix, x);
 	ix &= 0x7fffffff;
 	if      (ix >= 0x41000000){p = qR8; q = qS8;}
-	else if (ix >= 0x40f71c58){p = qR5; q = qS5;}
-	else if (ix >= 0x4036db68){p = qR3; q = qS3;}
+	else if (ix >= 0x409173eb){p = qR5; q = qS5;}
+	else if (ix >= 0x4036d917){p = qR3; q = qS3;}
 	else /*ix >= 0x40000000*/ {p = qR2; q = qS2;}
 	z = 1.0f/(x*x);
 	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/j1.c b/src/components/lib/libc/musl-1.2.0/src/math/j1.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/j1.c
rename to src/components/lib/libc/musl-1.2.0/src/math/j1.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/j1f.c b/src/components/lib/libc/musl-1.2.0/src/math/j1f.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/math/j1f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/j1f.c
index 58875af9fc..3434c53dcc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/j1f.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/j1f.c
@@ -74,14 +74,13 @@ float j1f(float x)
 		return 1/(x*x);
 	if (ix >= 0x40000000)  /* |x| >= 2 */
 		return common(ix, fabsf(x), 0, sign);
-	if (ix >= 0x32000000) {  /* |x| >= 2**-27 */
+	if (ix >= 0x39000000) {  /* |x| >= 2**-13 */
 		z = x*x;
 		r = z*(r00+z*(r01+z*(r02+z*r03)));
 		s = 1+z*(s01+z*(s02+z*(s03+z*(s04+z*s05))));
 		z = 0.5f + r/s;
 	} else
-		/* raise inexact if x!=0 */
-		z = 0.5f + x;
+		z = 0.5f;
 	return z*x;
 }
 
@@ -114,7 +113,7 @@ float y1f(float x)
 		return 1/x;
 	if (ix >= 0x40000000)  /* |x| >= 2.0 */
 		return common(ix,x,1,0);
-	if (ix < 0x32000000)  /* x < 2**-27 */
+	if (ix < 0x33000000)  /* x < 2**-25 */
 		return -tpi/x;
 	z = x*x;
 	u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4])));
@@ -205,8 +204,8 @@ static float ponef(float x)
 	GET_FLOAT_WORD(ix, x);
 	ix &= 0x7fffffff;
 	if      (ix >= 0x41000000){p = pr8; q = ps8;}
-	else if (ix >= 0x40f71c58){p = pr5; q = ps5;}
-	else if (ix >= 0x4036db68){p = pr3; q = ps3;}
+	else if (ix >= 0x409173eb){p = pr5; q = ps5;}
+	else if (ix >= 0x4036d917){p = pr3; q = ps3;}
 	else /*ix >= 0x40000000*/ {p = pr2; q = ps2;}
 	z = 1.0f/(x*x);
 	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
@@ -300,9 +299,9 @@ static float qonef(float x)
 
 	GET_FLOAT_WORD(ix, x);
 	ix &= 0x7fffffff;
-	if      (ix >= 0x40200000){p = qr8; q = qs8;}
-	else if (ix >= 0x40f71c58){p = qr5; q = qs5;}
-	else if (ix >= 0x4036db68){p = qr3; q = qs3;}
+	if      (ix >= 0x41000000){p = qr8; q = qs8;}
+	else if (ix >= 0x409173eb){p = qr5; q = qs5;}
+	else if (ix >= 0x4036d917){p = qr3; q = qs3;}
 	else /*ix >= 0x40000000*/ {p = qr2; q = qs2;}
 	z = 1.0f/(x*x);
 	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/jn.c b/src/components/lib/libc/musl-1.2.0/src/math/jn.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/jn.c
rename to src/components/lib/libc/musl-1.2.0/src/math/jn.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/jnf.c b/src/components/lib/libc/musl-1.2.0/src/math/jnf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/jnf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/jnf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ldexp.c b/src/components/lib/libc/musl-1.2.0/src/math/ldexp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ldexp.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ldexp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ldexpf.c b/src/components/lib/libc/musl-1.2.0/src/math/ldexpf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ldexpf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ldexpf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/ldexpl.c b/src/components/lib/libc/musl-1.2.0/src/math/ldexpl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/ldexpl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/ldexpl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/lgamma.c b/src/components/lib/libc/musl-1.2.0/src/math/lgamma.c
new file mode 100644
index 0000000000..2fc9b478ec
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/lgamma.c
@@ -0,0 +1,7 @@
+#include <math.h>
+#include "libm.h"
+
+double lgamma(double x)
+{
+	return __lgamma_r(x, &__signgam);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lgamma_r.c b/src/components/lib/libc/musl-1.2.0/src/math/lgamma_r.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/math/lgamma_r.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lgamma_r.c
index fff565d228..f9984cd0c6 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/lgamma_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/lgamma_r.c
@@ -79,7 +79,6 @@
  */
 
 #include "libm.h"
-#include "libc.h"
 
 static const double
 pi  =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/lgammaf.c b/src/components/lib/libc/musl-1.2.0/src/math/lgammaf.c
new file mode 100644
index 0000000000..2ae051d09a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/lgammaf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+#include "libm.h"
+
+float lgammaf(float x)
+{
+	return __lgammaf_r(x, &__signgam);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lgammaf_r.c b/src/components/lib/libc/musl-1.2.0/src/math/lgammaf_r.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/math/lgammaf_r.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lgammaf_r.c
index c5b43db558..3f353f19b3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/lgammaf_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/lgammaf_r.c
@@ -14,7 +14,6 @@
  */
 
 #include "libm.h"
-#include "libc.h"
 
 static const float
 pi  =  3.1415927410e+00, /* 0x40490fdb */
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lgammal.c b/src/components/lib/libc/musl-1.2.0/src/math/lgammal.c
similarity index 99%
rename from src/components/lib/libc/musl-1.1.11/src/math/lgammal.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lgammal.c
index 2b354a7c13..abbd4fc6f3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/lgammal.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/lgammal.c
@@ -87,11 +87,8 @@
 
 #define _GNU_SOURCE
 #include "libm.h"
-#include "libc.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-double __lgamma_r(double x, int *sg);
-
 long double __lgammal_r(long double x, int *sg)
 {
 	return __lgamma_r(x, sg);
@@ -342,16 +339,12 @@ long double __lgammal_r(long double x, int *sg) {
 }
 #elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384
 // TODO: broken implementation to make things compile
-double __lgamma_r(double x, int *sg);
-
 long double __lgammal_r(long double x, int *sg)
 {
 	return __lgamma_r(x, sg);
 }
 #endif
 
-extern int __signgam;
-
 long double lgammal(long double x)
 {
 	return __lgammal_r(x, &__signgam);
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/llrint.c b/src/components/lib/libc/musl-1.2.0/src/math/llrint.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/llrint.c
rename to src/components/lib/libc/musl-1.2.0/src/math/llrint.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/llrintf.c b/src/components/lib/libc/musl-1.2.0/src/math/llrintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/llrintf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/llrintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/llrintl.c b/src/components/lib/libc/musl-1.2.0/src/math/llrintl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/llrintl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/llrintl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/llround.c b/src/components/lib/libc/musl-1.2.0/src/math/llround.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/llround.c
rename to src/components/lib/libc/musl-1.2.0/src/math/llround.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/llroundf.c b/src/components/lib/libc/musl-1.2.0/src/math/llroundf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/llroundf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/llroundf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/llroundl.c b/src/components/lib/libc/musl-1.2.0/src/math/llroundl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/llroundl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/llroundl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log.c b/src/components/lib/libc/musl-1.2.0/src/math/log.c
new file mode 100644
index 0000000000..cc52585a94
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log.c
@@ -0,0 +1,112 @@
+/*
+ * Double-precision log(x) function.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "log_data.h"
+
+#define T __log_data.tab
+#define T2 __log_data.tab2
+#define B __log_data.poly1
+#define A __log_data.poly
+#define Ln2hi __log_data.ln2hi
+#define Ln2lo __log_data.ln2lo
+#define N (1 << LOG_TABLE_BITS)
+#define OFF 0x3fe6000000000000
+
+/* Top 16 bits of a double.  */
+static inline uint32_t top16(double x)
+{
+	return asuint64(x) >> 48;
+}
+
+double log(double x)
+{
+	double_t w, z, r, r2, r3, y, invc, logc, kd, hi, lo;
+	uint64_t ix, iz, tmp;
+	uint32_t top;
+	int k, i;
+
+	ix = asuint64(x);
+	top = top16(x);
+#define LO asuint64(1.0 - 0x1p-4)
+#define HI asuint64(1.0 + 0x1.09p-4)
+	if (predict_false(ix - LO < HI - LO)) {
+		/* Handle close to 1.0 inputs separately.  */
+		/* Fix sign of zero with downward rounding when x==1.  */
+		if (WANT_ROUNDING && predict_false(ix == asuint64(1.0)))
+			return 0;
+		r = x - 1.0;
+		r2 = r * r;
+		r3 = r * r2;
+		y = r3 *
+		    (B[1] + r * B[2] + r2 * B[3] +
+		     r3 * (B[4] + r * B[5] + r2 * B[6] +
+			   r3 * (B[7] + r * B[8] + r2 * B[9] + r3 * B[10])));
+		/* Worst-case error is around 0.507 ULP.  */
+		w = r * 0x1p27;
+		double_t rhi = r + w - w;
+		double_t rlo = r - rhi;
+		w = rhi * rhi * B[0]; /* B[0] == -0.5.  */
+		hi = r + w;
+		lo = r - hi + w;
+		lo += B[0] * rlo * (rhi + r);
+		y += lo;
+		y += hi;
+		return eval_as_double(y);
+	}
+	if (predict_false(top - 0x0010 >= 0x7ff0 - 0x0010)) {
+		/* x < 0x1p-1022 or inf or nan.  */
+		if (ix * 2 == 0)
+			return __math_divzero(1);
+		if (ix == asuint64(INFINITY)) /* log(inf) == inf.  */
+			return x;
+		if ((top & 0x8000) || (top & 0x7ff0) == 0x7ff0)
+			return __math_invalid(x);
+		/* x is subnormal, normalize it.  */
+		ix = asuint64(x * 0x1p52);
+		ix -= 52ULL << 52;
+	}
+
+	/* x = 2^k z; where z is in range [OFF,2*OFF) and exact.
+	   The range is split into N subintervals.
+	   The ith subinterval contains z and c is near its center.  */
+	tmp = ix - OFF;
+	i = (tmp >> (52 - LOG_TABLE_BITS)) % N;
+	k = (int64_t)tmp >> 52; /* arithmetic shift */
+	iz = ix - (tmp & 0xfffULL << 52);
+	invc = T[i].invc;
+	logc = T[i].logc;
+	z = asdouble(iz);
+
+	/* log(x) = log1p(z/c-1) + log(c) + k*Ln2.  */
+	/* r ~= z/c - 1, |r| < 1/(2*N).  */
+#if __FP_FAST_FMA
+	/* rounding error: 0x1p-55/N.  */
+	r = __builtin_fma(z, invc, -1.0);
+#else
+	/* rounding error: 0x1p-55/N + 0x1p-66.  */
+	r = (z - T2[i].chi - T2[i].clo) * invc;
+#endif
+	kd = (double_t)k;
+
+	/* hi + lo = r + log(c) + k*Ln2.  */
+	w = kd * Ln2hi + logc;
+	hi = w + r;
+	lo = w - hi + r + kd * Ln2lo;
+
+	/* log(x) = lo + (log1p(r) - r) + hi.  */
+	r2 = r * r; /* rounding error: 0x1p-54/N^2.  */
+	/* Worst case error if |y| > 0x1p-5:
+	   0.5 + 4.13/N + abs-poly-error*2^57 ULP (+ 0.002 ULP without fma)
+	   Worst case error if |y| > 0x1p-4:
+	   0.5 + 2.06/N + abs-poly-error*2^56 ULP (+ 0.001 ULP without fma).  */
+	y = lo + r2 * A[0] +
+	    r * r2 * (A[1] + r * A[2] + r2 * (A[3] + r * A[4])) + hi;
+	return eval_as_double(y);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log10.c b/src/components/lib/libc/musl-1.2.0/src/math/log10.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/log10.c
rename to src/components/lib/libc/musl-1.2.0/src/math/log10.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log10f.c b/src/components/lib/libc/musl-1.2.0/src/math/log10f.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/log10f.c
rename to src/components/lib/libc/musl-1.2.0/src/math/log10f.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log10l.c b/src/components/lib/libc/musl-1.2.0/src/math/log10l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/log10l.c
rename to src/components/lib/libc/musl-1.2.0/src/math/log10l.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log1p.c b/src/components/lib/libc/musl-1.2.0/src/math/log1p.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/log1p.c
rename to src/components/lib/libc/musl-1.2.0/src/math/log1p.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log1pf.c b/src/components/lib/libc/musl-1.2.0/src/math/log1pf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/log1pf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/log1pf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log1pl.c b/src/components/lib/libc/musl-1.2.0/src/math/log1pl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/log1pl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/log1pl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log2.c b/src/components/lib/libc/musl-1.2.0/src/math/log2.c
new file mode 100644
index 0000000000..1276ed4e31
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log2.c
@@ -0,0 +1,122 @@
+/*
+ * Double-precision log2(x) function.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "log2_data.h"
+
+#define T __log2_data.tab
+#define T2 __log2_data.tab2
+#define B __log2_data.poly1
+#define A __log2_data.poly
+#define InvLn2hi __log2_data.invln2hi
+#define InvLn2lo __log2_data.invln2lo
+#define N (1 << LOG2_TABLE_BITS)
+#define OFF 0x3fe6000000000000
+
+/* Top 16 bits of a double.  */
+static inline uint32_t top16(double x)
+{
+	return asuint64(x) >> 48;
+}
+
+double log2(double x)
+{
+	double_t z, r, r2, r4, y, invc, logc, kd, hi, lo, t1, t2, t3, p;
+	uint64_t ix, iz, tmp;
+	uint32_t top;
+	int k, i;
+
+	ix = asuint64(x);
+	top = top16(x);
+#define LO asuint64(1.0 - 0x1.5b51p-5)
+#define HI asuint64(1.0 + 0x1.6ab2p-5)
+	if (predict_false(ix - LO < HI - LO)) {
+		/* Handle close to 1.0 inputs separately.  */
+		/* Fix sign of zero with downward rounding when x==1.  */
+		if (WANT_ROUNDING && predict_false(ix == asuint64(1.0)))
+			return 0;
+		r = x - 1.0;
+#if __FP_FAST_FMA
+		hi = r * InvLn2hi;
+		lo = r * InvLn2lo + __builtin_fma(r, InvLn2hi, -hi);
+#else
+		double_t rhi, rlo;
+		rhi = asdouble(asuint64(r) & -1ULL << 32);
+		rlo = r - rhi;
+		hi = rhi * InvLn2hi;
+		lo = rlo * InvLn2hi + r * InvLn2lo;
+#endif
+		r2 = r * r; /* rounding error: 0x1p-62.  */
+		r4 = r2 * r2;
+		/* Worst-case error is less than 0.54 ULP (0.55 ULP without fma).  */
+		p = r2 * (B[0] + r * B[1]);
+		y = hi + p;
+		lo += hi - y + p;
+		lo += r4 * (B[2] + r * B[3] + r2 * (B[4] + r * B[5]) +
+			    r4 * (B[6] + r * B[7] + r2 * (B[8] + r * B[9])));
+		y += lo;
+		return eval_as_double(y);
+	}
+	if (predict_false(top - 0x0010 >= 0x7ff0 - 0x0010)) {
+		/* x < 0x1p-1022 or inf or nan.  */
+		if (ix * 2 == 0)
+			return __math_divzero(1);
+		if (ix == asuint64(INFINITY)) /* log(inf) == inf.  */
+			return x;
+		if ((top & 0x8000) || (top & 0x7ff0) == 0x7ff0)
+			return __math_invalid(x);
+		/* x is subnormal, normalize it.  */
+		ix = asuint64(x * 0x1p52);
+		ix -= 52ULL << 52;
+	}
+
+	/* x = 2^k z; where z is in range [OFF,2*OFF) and exact.
+	   The range is split into N subintervals.
+	   The ith subinterval contains z and c is near its center.  */
+	tmp = ix - OFF;
+	i = (tmp >> (52 - LOG2_TABLE_BITS)) % N;
+	k = (int64_t)tmp >> 52; /* arithmetic shift */
+	iz = ix - (tmp & 0xfffULL << 52);
+	invc = T[i].invc;
+	logc = T[i].logc;
+	z = asdouble(iz);
+	kd = (double_t)k;
+
+	/* log2(x) = log2(z/c) + log2(c) + k.  */
+	/* r ~= z/c - 1, |r| < 1/(2*N).  */
+#if __FP_FAST_FMA
+	/* rounding error: 0x1p-55/N.  */
+	r = __builtin_fma(z, invc, -1.0);
+	t1 = r * InvLn2hi;
+	t2 = r * InvLn2lo + __builtin_fma(r, InvLn2hi, -t1);
+#else
+	double_t rhi, rlo;
+	/* rounding error: 0x1p-55/N + 0x1p-65.  */
+	r = (z - T2[i].chi - T2[i].clo) * invc;
+	rhi = asdouble(asuint64(r) & -1ULL << 32);
+	rlo = r - rhi;
+	t1 = rhi * InvLn2hi;
+	t2 = rlo * InvLn2hi + r * InvLn2lo;
+#endif
+
+	/* hi + lo = r/ln2 + log2(c) + k.  */
+	t3 = kd + logc;
+	hi = t3 + t1;
+	lo = t3 - hi + t1 + t2;
+
+	/* log2(r+1) = r/ln2 + r^2*poly(r).  */
+	/* Evaluation is optimized assuming superscalar pipelined execution.  */
+	r2 = r * r; /* rounding error: 0x1p-54/N^2.  */
+	r4 = r2 * r2;
+	/* Worst-case error if |y| > 0x1p-4: 0.547 ULP (0.550 ULP without fma).
+	   ~ 0.5 + 2/N/ln2 + abs-poly-error*0x1p56 ULP (+ 0.003 ULP without fma).  */
+	p = A[0] + r * A[1] + r2 * (A[2] + r * A[3]) + r4 * (A[4] + r * A[5]);
+	y = lo + r2 * p + hi;
+	return eval_as_double(y);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log2_data.c b/src/components/lib/libc/musl-1.2.0/src/math/log2_data.c
new file mode 100644
index 0000000000..3dd1ca5146
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log2_data.c
@@ -0,0 +1,201 @@
+/*
+ * Data for log2.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "log2_data.h"
+
+#define N (1 << LOG2_TABLE_BITS)
+
+const struct log2_data __log2_data = {
+// First coefficient: 0x1.71547652b82fe1777d0ffda0d24p0
+.invln2hi = 0x1.7154765200000p+0,
+.invln2lo = 0x1.705fc2eefa200p-33,
+.poly1 = {
+// relative error: 0x1.2fad8188p-63
+// in -0x1.5b51p-5 0x1.6ab2p-5
+-0x1.71547652b82fep-1,
+0x1.ec709dc3a03f7p-2,
+-0x1.71547652b7c3fp-2,
+0x1.2776c50f05be4p-2,
+-0x1.ec709dd768fe5p-3,
+0x1.a61761ec4e736p-3,
+-0x1.7153fbc64a79bp-3,
+0x1.484d154f01b4ap-3,
+-0x1.289e4a72c383cp-3,
+0x1.0b32f285aee66p-3,
+},
+.poly = {
+// relative error: 0x1.a72c2bf8p-58
+// abs error: 0x1.67a552c8p-66
+// in -0x1.f45p-8 0x1.f45p-8
+-0x1.71547652b8339p-1,
+0x1.ec709dc3a04bep-2,
+-0x1.7154764702ffbp-2,
+0x1.2776c50034c48p-2,
+-0x1.ec7b328ea92bcp-3,
+0x1.a6225e117f92ep-3,
+},
+/* Algorithm:
+
+	x = 2^k z
+	log2(x) = k + log2(c) + log2(z/c)
+	log2(z/c) = poly(z/c - 1)
+
+where z is in [1.6p-1; 1.6p0] which is split into N subintervals and z falls
+into the ith one, then table entries are computed as
+
+	tab[i].invc = 1/c
+	tab[i].logc = (double)log2(c)
+	tab2[i].chi = (double)c
+	tab2[i].clo = (double)(c - (double)c)
+
+where c is near the center of the subinterval and is chosen by trying +-2^29
+floating point invc candidates around 1/center and selecting one for which
+
+	1) the rounding error in 0x1.8p10 + logc is 0,
+	2) the rounding error in z - chi - clo is < 0x1p-64 and
+	3) the rounding error in (double)log2(c) is minimized (< 0x1p-68).
+
+Note: 1) ensures that k + logc can be computed without rounding error, 2)
+ensures that z/c - 1 can be computed as (z - chi - clo)*invc with close to a
+single rounding error when there is no fast fma for z*invc - 1, 3) ensures
+that logc + poly(z/c - 1) has small error, however near x == 1 when
+|log2(x)| < 0x1p-4, this is not enough so that is special cased.  */
+.tab = {
+{0x1.724286bb1acf8p+0, -0x1.1095feecdb000p-1},
+{0x1.6e1f766d2cca1p+0, -0x1.08494bd76d000p-1},
+{0x1.6a13d0e30d48ap+0, -0x1.00143aee8f800p-1},
+{0x1.661ec32d06c85p+0, -0x1.efec5360b4000p-2},
+{0x1.623fa951198f8p+0, -0x1.dfdd91ab7e000p-2},
+{0x1.5e75ba4cf026cp+0, -0x1.cffae0cc79000p-2},
+{0x1.5ac055a214fb8p+0, -0x1.c043811fda000p-2},
+{0x1.571ed0f166e1ep+0, -0x1.b0b67323ae000p-2},
+{0x1.53909590bf835p+0, -0x1.a152f5a2db000p-2},
+{0x1.5014fed61adddp+0, -0x1.9217f5af86000p-2},
+{0x1.4cab88e487bd0p+0, -0x1.8304db0719000p-2},
+{0x1.49539b4334feep+0, -0x1.74189f9a9e000p-2},
+{0x1.460cbdfafd569p+0, -0x1.6552bb5199000p-2},
+{0x1.42d664ee4b953p+0, -0x1.56b23a29b1000p-2},
+{0x1.3fb01111dd8a6p+0, -0x1.483650f5fa000p-2},
+{0x1.3c995b70c5836p+0, -0x1.39de937f6a000p-2},
+{0x1.3991c4ab6fd4ap+0, -0x1.2baa1538d6000p-2},
+{0x1.3698e0ce099b5p+0, -0x1.1d98340ca4000p-2},
+{0x1.33ae48213e7b2p+0, -0x1.0fa853a40e000p-2},
+{0x1.30d191985bdb1p+0, -0x1.01d9c32e73000p-2},
+{0x1.2e025cab271d7p+0, -0x1.e857da2fa6000p-3},
+{0x1.2b404cf13cd82p+0, -0x1.cd3c8633d8000p-3},
+{0x1.288b02c7ccb50p+0, -0x1.b26034c14a000p-3},
+{0x1.25e2263944de5p+0, -0x1.97c1c2f4fe000p-3},
+{0x1.234563d8615b1p+0, -0x1.7d6023f800000p-3},
+{0x1.20b46e33eaf38p+0, -0x1.633a71a05e000p-3},
+{0x1.1e2eefdcda3ddp+0, -0x1.494f5e9570000p-3},
+{0x1.1bb4a580b3930p+0, -0x1.2f9e424e0a000p-3},
+{0x1.19453847f2200p+0, -0x1.162595afdc000p-3},
+{0x1.16e06c0d5d73cp+0, -0x1.f9c9a75bd8000p-4},
+{0x1.1485f47b7e4c2p+0, -0x1.c7b575bf9c000p-4},
+{0x1.12358ad0085d1p+0, -0x1.960c60ff48000p-4},
+{0x1.0fef00f532227p+0, -0x1.64ce247b60000p-4},
+{0x1.0db2077d03a8fp+0, -0x1.33f78b2014000p-4},
+{0x1.0b7e6d65980d9p+0, -0x1.0387d1a42c000p-4},
+{0x1.0953efe7b408dp+0, -0x1.a6f9208b50000p-5},
+{0x1.07325cac53b83p+0, -0x1.47a954f770000p-5},
+{0x1.05197e40d1b5cp+0, -0x1.d23a8c50c0000p-6},
+{0x1.03091c1208ea2p+0, -0x1.16a2629780000p-6},
+{0x1.0101025b37e21p+0, -0x1.720f8d8e80000p-8},
+{0x1.fc07ef9caa76bp-1, 0x1.6fe53b1500000p-7},
+{0x1.f4465d3f6f184p-1, 0x1.11ccce10f8000p-5},
+{0x1.ecc079f84107fp-1, 0x1.c4dfc8c8b8000p-5},
+{0x1.e573a99975ae8p-1, 0x1.3aa321e574000p-4},
+{0x1.de5d6f0bd3de6p-1, 0x1.918a0d08b8000p-4},
+{0x1.d77b681ff38b3p-1, 0x1.e72e9da044000p-4},
+{0x1.d0cb5724de943p-1, 0x1.1dcd2507f6000p-3},
+{0x1.ca4b2dc0e7563p-1, 0x1.476ab03dea000p-3},
+{0x1.c3f8ee8d6cb51p-1, 0x1.7074377e22000p-3},
+{0x1.bdd2b4f020c4cp-1, 0x1.98ede8ba94000p-3},
+{0x1.b7d6c006015cap-1, 0x1.c0db86ad2e000p-3},
+{0x1.b20366e2e338fp-1, 0x1.e840aafcee000p-3},
+{0x1.ac57026295039p-1, 0x1.0790ab4678000p-2},
+{0x1.a6d01bc2731ddp-1, 0x1.1ac056801c000p-2},
+{0x1.a16d3bc3ff18bp-1, 0x1.2db11d4fee000p-2},
+{0x1.9c2d14967feadp-1, 0x1.406464ec58000p-2},
+{0x1.970e4f47c9902p-1, 0x1.52dbe093af000p-2},
+{0x1.920fb3982bcf2p-1, 0x1.651902050d000p-2},
+{0x1.8d30187f759f1p-1, 0x1.771d2cdeaf000p-2},
+{0x1.886e5ebb9f66dp-1, 0x1.88e9c857d9000p-2},
+{0x1.83c97b658b994p-1, 0x1.9a80155e16000p-2},
+{0x1.7f405ffc61022p-1, 0x1.abe186ed3d000p-2},
+{0x1.7ad22181415cap-1, 0x1.bd0f2aea0e000p-2},
+{0x1.767dcf99eff8cp-1, 0x1.ce0a43dbf4000p-2},
+},
+#if !__FP_FAST_FMA
+.tab2 = {
+{0x1.6200012b90a8ep-1, 0x1.904ab0644b605p-55},
+{0x1.66000045734a6p-1, 0x1.1ff9bea62f7a9p-57},
+{0x1.69fffc325f2c5p-1, 0x1.27ecfcb3c90bap-55},
+{0x1.6e00038b95a04p-1, 0x1.8ff8856739326p-55},
+{0x1.71fffe09994e3p-1, 0x1.afd40275f82b1p-55},
+{0x1.7600015590e1p-1, -0x1.2fd75b4238341p-56},
+{0x1.7a00012655bd5p-1, 0x1.808e67c242b76p-56},
+{0x1.7e0003259e9a6p-1, -0x1.208e426f622b7p-57},
+{0x1.81fffedb4b2d2p-1, -0x1.402461ea5c92fp-55},
+{0x1.860002dfafcc3p-1, 0x1.df7f4a2f29a1fp-57},
+{0x1.89ffff78c6b5p-1, -0x1.e0453094995fdp-55},
+{0x1.8e00039671566p-1, -0x1.a04f3bec77b45p-55},
+{0x1.91fffe2bf1745p-1, -0x1.7fa34400e203cp-56},
+{0x1.95fffcc5c9fd1p-1, -0x1.6ff8005a0695dp-56},
+{0x1.9a0003bba4767p-1, 0x1.0f8c4c4ec7e03p-56},
+{0x1.9dfffe7b92da5p-1, 0x1.e7fd9478c4602p-55},
+{0x1.a1fffd72efdafp-1, -0x1.a0c554dcdae7ep-57},
+{0x1.a5fffde04ff95p-1, 0x1.67da98ce9b26bp-55},
+{0x1.a9fffca5e8d2bp-1, -0x1.284c9b54c13dep-55},
+{0x1.adfffddad03eap-1, 0x1.812c8ea602e3cp-58},
+{0x1.b1ffff10d3d4dp-1, -0x1.efaddad27789cp-55},
+{0x1.b5fffce21165ap-1, 0x1.3cb1719c61237p-58},
+{0x1.b9fffd950e674p-1, 0x1.3f7d94194cep-56},
+{0x1.be000139ca8afp-1, 0x1.50ac4215d9bcp-56},
+{0x1.c20005b46df99p-1, 0x1.beea653e9c1c9p-57},
+{0x1.c600040b9f7aep-1, -0x1.c079f274a70d6p-56},
+{0x1.ca0006255fd8ap-1, -0x1.a0b4076e84c1fp-56},
+{0x1.cdfffd94c095dp-1, 0x1.8f933f99ab5d7p-55},
+{0x1.d1ffff975d6cfp-1, -0x1.82c08665fe1bep-58},
+{0x1.d5fffa2561c93p-1, -0x1.b04289bd295f3p-56},
+{0x1.d9fff9d228b0cp-1, 0x1.70251340fa236p-55},
+{0x1.de00065bc7e16p-1, -0x1.5011e16a4d80cp-56},
+{0x1.e200002f64791p-1, 0x1.9802f09ef62ep-55},
+{0x1.e600057d7a6d8p-1, -0x1.e0b75580cf7fap-56},
+{0x1.ea00027edc00cp-1, -0x1.c848309459811p-55},
+{0x1.ee0006cf5cb7cp-1, -0x1.f8027951576f4p-55},
+{0x1.f2000782b7dccp-1, -0x1.f81d97274538fp-55},
+{0x1.f6000260c450ap-1, -0x1.071002727ffdcp-59},
+{0x1.f9fffe88cd533p-1, -0x1.81bdce1fda8bp-58},
+{0x1.fdfffd50f8689p-1, 0x1.7f91acb918e6ep-55},
+{0x1.0200004292367p+0, 0x1.b7ff365324681p-54},
+{0x1.05fffe3e3d668p+0, 0x1.6fa08ddae957bp-55},
+{0x1.0a0000a85a757p+0, -0x1.7e2de80d3fb91p-58},
+{0x1.0e0001a5f3fccp+0, -0x1.1823305c5f014p-54},
+{0x1.11ffff8afbaf5p+0, -0x1.bfabb6680bac2p-55},
+{0x1.15fffe54d91adp+0, -0x1.d7f121737e7efp-54},
+{0x1.1a00011ac36e1p+0, 0x1.c000a0516f5ffp-54},
+{0x1.1e00019c84248p+0, -0x1.082fbe4da5dap-54},
+{0x1.220000ffe5e6ep+0, -0x1.8fdd04c9cfb43p-55},
+{0x1.26000269fd891p+0, 0x1.cfe2a7994d182p-55},
+{0x1.2a00029a6e6dap+0, -0x1.00273715e8bc5p-56},
+{0x1.2dfffe0293e39p+0, 0x1.b7c39dab2a6f9p-54},
+{0x1.31ffff7dcf082p+0, 0x1.df1336edc5254p-56},
+{0x1.35ffff05a8b6p+0, -0x1.e03564ccd31ebp-54},
+{0x1.3a0002e0eaeccp+0, 0x1.5f0e74bd3a477p-56},
+{0x1.3e000043bb236p+0, 0x1.c7dcb149d8833p-54},
+{0x1.4200002d187ffp+0, 0x1.e08afcf2d3d28p-56},
+{0x1.460000d387cb1p+0, 0x1.20837856599a6p-55},
+{0x1.4a00004569f89p+0, -0x1.9fa5c904fbcd2p-55},
+{0x1.4e000043543f3p+0, -0x1.81125ed175329p-56},
+{0x1.51fffcc027f0fp+0, 0x1.883d8847754dcp-54},
+{0x1.55ffffd87b36fp+0, -0x1.709e731d02807p-55},
+{0x1.59ffff21df7bap+0, 0x1.7f79f68727b02p-55},
+{0x1.5dfffebfc3481p+0, -0x1.180902e30e93ep-54},
+},
+#endif
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log2_data.h b/src/components/lib/libc/musl-1.2.0/src/math/log2_data.h
new file mode 100644
index 0000000000..276a786d14
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log2_data.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _LOG2_DATA_H
+#define _LOG2_DATA_H
+
+#include <features.h>
+
+#define LOG2_TABLE_BITS 6
+#define LOG2_POLY_ORDER 7
+#define LOG2_POLY1_ORDER 11
+extern hidden const struct log2_data {
+	double invln2hi;
+	double invln2lo;
+	double poly[LOG2_POLY_ORDER - 1];
+	double poly1[LOG2_POLY1_ORDER - 1];
+	struct {
+		double invc, logc;
+	} tab[1 << LOG2_TABLE_BITS];
+#if !__FP_FAST_FMA
+	struct {
+		double chi, clo;
+	} tab2[1 << LOG2_TABLE_BITS];
+#endif
+} __log2_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log2f.c b/src/components/lib/libc/musl-1.2.0/src/math/log2f.c
new file mode 100644
index 0000000000..c368f88f33
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log2f.c
@@ -0,0 +1,72 @@
+/*
+ * Single-precision log2 function.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "log2f_data.h"
+
+/*
+LOG2F_TABLE_BITS = 4
+LOG2F_POLY_ORDER = 4
+
+ULP error: 0.752 (nearest rounding.)
+Relative error: 1.9 * 2^-26 (before rounding.)
+*/
+
+#define N (1 << LOG2F_TABLE_BITS)
+#define T __log2f_data.tab
+#define A __log2f_data.poly
+#define OFF 0x3f330000
+
+float log2f(float x)
+{
+	double_t z, r, r2, p, y, y0, invc, logc;
+	uint32_t ix, iz, top, tmp;
+	int k, i;
+
+	ix = asuint(x);
+	/* Fix sign of zero with downward rounding when x==1.  */
+	if (WANT_ROUNDING && predict_false(ix == 0x3f800000))
+		return 0;
+	if (predict_false(ix - 0x00800000 >= 0x7f800000 - 0x00800000)) {
+		/* x < 0x1p-126 or inf or nan.  */
+		if (ix * 2 == 0)
+			return __math_divzerof(1);
+		if (ix == 0x7f800000) /* log2(inf) == inf.  */
+			return x;
+		if ((ix & 0x80000000) || ix * 2 >= 0xff000000)
+			return __math_invalidf(x);
+		/* x is subnormal, normalize it.  */
+		ix = asuint(x * 0x1p23f);
+		ix -= 23 << 23;
+	}
+
+	/* x = 2^k z; where z is in range [OFF,2*OFF] and exact.
+	   The range is split into N subintervals.
+	   The ith subinterval contains z and c is near its center.  */
+	tmp = ix - OFF;
+	i = (tmp >> (23 - LOG2F_TABLE_BITS)) % N;
+	top = tmp & 0xff800000;
+	iz = ix - top;
+	k = (int32_t)tmp >> 23; /* arithmetic shift */
+	invc = T[i].invc;
+	logc = T[i].logc;
+	z = (double_t)asfloat(iz);
+
+	/* log2(x) = log1p(z/c-1)/ln2 + log2(c) + k */
+	r = z * invc - 1;
+	y0 = logc + (double_t)k;
+
+	/* Pipelined polynomial evaluation to approximate log1p(r)/ln2.  */
+	r2 = r * r;
+	y = A[1] * r + A[2];
+	y = A[0] * r2 + y;
+	p = A[3] * r + y0;
+	y = y * r2 + p;
+	return eval_as_float(y);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log2f_data.c b/src/components/lib/libc/musl-1.2.0/src/math/log2f_data.c
new file mode 100644
index 0000000000..24e450f1ec
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log2f_data.c
@@ -0,0 +1,33 @@
+/*
+ * Data definition for log2f.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "log2f_data.h"
+
+const struct log2f_data __log2f_data = {
+  .tab = {
+  { 0x1.661ec79f8f3bep+0, -0x1.efec65b963019p-2 },
+  { 0x1.571ed4aaf883dp+0, -0x1.b0b6832d4fca4p-2 },
+  { 0x1.49539f0f010bp+0, -0x1.7418b0a1fb77bp-2 },
+  { 0x1.3c995b0b80385p+0, -0x1.39de91a6dcf7bp-2 },
+  { 0x1.30d190c8864a5p+0, -0x1.01d9bf3f2b631p-2 },
+  { 0x1.25e227b0b8eap+0, -0x1.97c1d1b3b7afp-3 },
+  { 0x1.1bb4a4a1a343fp+0, -0x1.2f9e393af3c9fp-3 },
+  { 0x1.12358f08ae5bap+0, -0x1.960cbbf788d5cp-4 },
+  { 0x1.0953f419900a7p+0, -0x1.a6f9db6475fcep-5 },
+  { 0x1p+0, 0x0p+0 },
+  { 0x1.e608cfd9a47acp-1, 0x1.338ca9f24f53dp-4 },
+  { 0x1.ca4b31f026aap-1, 0x1.476a9543891bap-3 },
+  { 0x1.b2036576afce6p-1, 0x1.e840b4ac4e4d2p-3 },
+  { 0x1.9c2d163a1aa2dp-1, 0x1.40645f0c6651cp-2 },
+  { 0x1.886e6037841edp-1, 0x1.88e9c2c1b9ff8p-2 },
+  { 0x1.767dcf5534862p-1, 0x1.ce0a44eb17bccp-2 },
+  },
+  .poly = {
+  -0x1.712b6f70a7e4dp-2, 0x1.ecabf496832ep-2, -0x1.715479ffae3dep-1,
+  0x1.715475f35c8b8p0,
+  }
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log2f_data.h b/src/components/lib/libc/musl-1.2.0/src/math/log2f_data.h
new file mode 100644
index 0000000000..4fa489560d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log2f_data.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _LOG2F_DATA_H
+#define _LOG2F_DATA_H
+
+#include <features.h>
+
+#define LOG2F_TABLE_BITS 4
+#define LOG2F_POLY_ORDER 4
+extern hidden const struct log2f_data {
+	struct {
+		double invc, logc;
+	} tab[1 << LOG2F_TABLE_BITS];
+	double poly[LOG2F_POLY_ORDER];
+} __log2f_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/log2l.c b/src/components/lib/libc/musl-1.2.0/src/math/log2l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/log2l.c
rename to src/components/lib/libc/musl-1.2.0/src/math/log2l.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log_data.c b/src/components/lib/libc/musl-1.2.0/src/math/log_data.c
new file mode 100644
index 0000000000..1a6ec712a0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log_data.c
@@ -0,0 +1,328 @@
+/*
+ * Data for log.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "log_data.h"
+
+#define N (1 << LOG_TABLE_BITS)
+
+const struct log_data __log_data = {
+.ln2hi = 0x1.62e42fefa3800p-1,
+.ln2lo = 0x1.ef35793c76730p-45,
+.poly1 = {
+// relative error: 0x1.c04d76cp-63
+// in -0x1p-4 0x1.09p-4 (|log(1+x)| > 0x1p-4 outside the interval)
+-0x1p-1,
+0x1.5555555555577p-2,
+-0x1.ffffffffffdcbp-3,
+0x1.999999995dd0cp-3,
+-0x1.55555556745a7p-3,
+0x1.24924a344de3p-3,
+-0x1.fffffa4423d65p-4,
+0x1.c7184282ad6cap-4,
+-0x1.999eb43b068ffp-4,
+0x1.78182f7afd085p-4,
+-0x1.5521375d145cdp-4,
+},
+.poly = {
+// relative error: 0x1.926199e8p-56
+// abs error: 0x1.882ff33p-65
+// in -0x1.fp-9 0x1.fp-9
+-0x1.0000000000001p-1,
+0x1.555555551305bp-2,
+-0x1.fffffffeb459p-3,
+0x1.999b324f10111p-3,
+-0x1.55575e506c89fp-3,
+},
+/* Algorithm:
+
+	x = 2^k z
+	log(x) = k ln2 + log(c) + log(z/c)
+	log(z/c) = poly(z/c - 1)
+
+where z is in [1.6p-1; 1.6p0] which is split into N subintervals and z falls
+into the ith one, then table entries are computed as
+
+	tab[i].invc = 1/c
+	tab[i].logc = (double)log(c)
+	tab2[i].chi = (double)c
+	tab2[i].clo = (double)(c - (double)c)
+
+where c is near the center of the subinterval and is chosen by trying +-2^29
+floating point invc candidates around 1/center and selecting one for which
+
+	1) the rounding error in 0x1.8p9 + logc is 0,
+	2) the rounding error in z - chi - clo is < 0x1p-66 and
+	3) the rounding error in (double)log(c) is minimized (< 0x1p-66).
+
+Note: 1) ensures that k*ln2hi + logc can be computed without rounding error,
+2) ensures that z/c - 1 can be computed as (z - chi - clo)*invc with close to
+a single rounding error when there is no fast fma for z*invc - 1, 3) ensures
+that logc + poly(z/c - 1) has small error, however near x == 1 when
+|log(x)| < 0x1p-4, this is not enough so that is special cased.  */
+.tab = {
+{0x1.734f0c3e0de9fp+0, -0x1.7cc7f79e69000p-2},
+{0x1.713786a2ce91fp+0, -0x1.76feec20d0000p-2},
+{0x1.6f26008fab5a0p+0, -0x1.713e31351e000p-2},
+{0x1.6d1a61f138c7dp+0, -0x1.6b85b38287800p-2},
+{0x1.6b1490bc5b4d1p+0, -0x1.65d5590807800p-2},
+{0x1.69147332f0cbap+0, -0x1.602d076180000p-2},
+{0x1.6719f18224223p+0, -0x1.5a8ca86909000p-2},
+{0x1.6524f99a51ed9p+0, -0x1.54f4356035000p-2},
+{0x1.63356aa8f24c4p+0, -0x1.4f637c36b4000p-2},
+{0x1.614b36b9ddc14p+0, -0x1.49da7fda85000p-2},
+{0x1.5f66452c65c4cp+0, -0x1.445923989a800p-2},
+{0x1.5d867b5912c4fp+0, -0x1.3edf439b0b800p-2},
+{0x1.5babccb5b90dep+0, -0x1.396ce448f7000p-2},
+{0x1.59d61f2d91a78p+0, -0x1.3401e17bda000p-2},
+{0x1.5805612465687p+0, -0x1.2e9e2ef468000p-2},
+{0x1.56397cee76bd3p+0, -0x1.2941b3830e000p-2},
+{0x1.54725e2a77f93p+0, -0x1.23ec58cda8800p-2},
+{0x1.52aff42064583p+0, -0x1.1e9e129279000p-2},
+{0x1.50f22dbb2bddfp+0, -0x1.1956d2b48f800p-2},
+{0x1.4f38f4734ded7p+0, -0x1.141679ab9f800p-2},
+{0x1.4d843cfde2840p+0, -0x1.0edd094ef9800p-2},
+{0x1.4bd3ec078a3c8p+0, -0x1.09aa518db1000p-2},
+{0x1.4a27fc3e0258ap+0, -0x1.047e65263b800p-2},
+{0x1.4880524d48434p+0, -0x1.feb224586f000p-3},
+{0x1.46dce1b192d0bp+0, -0x1.f474a7517b000p-3},
+{0x1.453d9d3391854p+0, -0x1.ea4443d103000p-3},
+{0x1.43a2744b4845ap+0, -0x1.e020d44e9b000p-3},
+{0x1.420b54115f8fbp+0, -0x1.d60a22977f000p-3},
+{0x1.40782da3ef4b1p+0, -0x1.cc00104959000p-3},
+{0x1.3ee8f5d57fe8fp+0, -0x1.c202956891000p-3},
+{0x1.3d5d9a00b4ce9p+0, -0x1.b81178d811000p-3},
+{0x1.3bd60c010c12bp+0, -0x1.ae2c9ccd3d000p-3},
+{0x1.3a5242b75dab8p+0, -0x1.a45402e129000p-3},
+{0x1.38d22cd9fd002p+0, -0x1.9a877681df000p-3},
+{0x1.3755bc5847a1cp+0, -0x1.90c6d69483000p-3},
+{0x1.35dce49ad36e2p+0, -0x1.87120a645c000p-3},
+{0x1.34679984dd440p+0, -0x1.7d68fb4143000p-3},
+{0x1.32f5cceffcb24p+0, -0x1.73cb83c627000p-3},
+{0x1.3187775a10d49p+0, -0x1.6a39a9b376000p-3},
+{0x1.301c8373e3990p+0, -0x1.60b3154b7a000p-3},
+{0x1.2eb4ebb95f841p+0, -0x1.5737d76243000p-3},
+{0x1.2d50a0219a9d1p+0, -0x1.4dc7b8fc23000p-3},
+{0x1.2bef9a8b7fd2ap+0, -0x1.4462c51d20000p-3},
+{0x1.2a91c7a0c1babp+0, -0x1.3b08abc830000p-3},
+{0x1.293726014b530p+0, -0x1.31b996b490000p-3},
+{0x1.27dfa5757a1f5p+0, -0x1.2875490a44000p-3},
+{0x1.268b39b1d3bbfp+0, -0x1.1f3b9f879a000p-3},
+{0x1.2539d838ff5bdp+0, -0x1.160c8252ca000p-3},
+{0x1.23eb7aac9083bp+0, -0x1.0ce7f57f72000p-3},
+{0x1.22a012ba940b6p+0, -0x1.03cdc49fea000p-3},
+{0x1.2157996cc4132p+0, -0x1.f57bdbc4b8000p-4},
+{0x1.201201dd2fc9bp+0, -0x1.e370896404000p-4},
+{0x1.1ecf4494d480bp+0, -0x1.d17983ef94000p-4},
+{0x1.1d8f5528f6569p+0, -0x1.bf9674ed8a000p-4},
+{0x1.1c52311577e7cp+0, -0x1.adc79202f6000p-4},
+{0x1.1b17c74cb26e9p+0, -0x1.9c0c3e7288000p-4},
+{0x1.19e010c2c1ab6p+0, -0x1.8a646b372c000p-4},
+{0x1.18ab07bb670bdp+0, -0x1.78d01b3ac0000p-4},
+{0x1.1778a25efbcb6p+0, -0x1.674f145380000p-4},
+{0x1.1648d354c31dap+0, -0x1.55e0e6d878000p-4},
+{0x1.151b990275fddp+0, -0x1.4485cdea1e000p-4},
+{0x1.13f0ea432d24cp+0, -0x1.333d94d6aa000p-4},
+{0x1.12c8b7210f9dap+0, -0x1.22079f8c56000p-4},
+{0x1.11a3028ecb531p+0, -0x1.10e4698622000p-4},
+{0x1.107fbda8434afp+0, -0x1.ffa6c6ad20000p-5},
+{0x1.0f5ee0f4e6bb3p+0, -0x1.dda8d4a774000p-5},
+{0x1.0e4065d2a9fcep+0, -0x1.bbcece4850000p-5},
+{0x1.0d244632ca521p+0, -0x1.9a1894012c000p-5},
+{0x1.0c0a77ce2981ap+0, -0x1.788583302c000p-5},
+{0x1.0af2f83c636d1p+0, -0x1.5715e67d68000p-5},
+{0x1.09ddb98a01339p+0, -0x1.35c8a49658000p-5},
+{0x1.08cabaf52e7dfp+0, -0x1.149e364154000p-5},
+{0x1.07b9f2f4e28fbp+0, -0x1.e72c082eb8000p-6},
+{0x1.06ab58c358f19p+0, -0x1.a55f152528000p-6},
+{0x1.059eea5ecf92cp+0, -0x1.63d62cf818000p-6},
+{0x1.04949cdd12c90p+0, -0x1.228fb8caa0000p-6},
+{0x1.038c6c6f0ada9p+0, -0x1.c317b20f90000p-7},
+{0x1.02865137932a9p+0, -0x1.419355daa0000p-7},
+{0x1.0182427ea7348p+0, -0x1.81203c2ec0000p-8},
+{0x1.008040614b195p+0, -0x1.0040979240000p-9},
+{0x1.fe01ff726fa1ap-1, 0x1.feff384900000p-9},
+{0x1.fa11cc261ea74p-1, 0x1.7dc41353d0000p-7},
+{0x1.f6310b081992ep-1, 0x1.3cea3c4c28000p-6},
+{0x1.f25f63ceeadcdp-1, 0x1.b9fc114890000p-6},
+{0x1.ee9c8039113e7p-1, 0x1.1b0d8ce110000p-5},
+{0x1.eae8078cbb1abp-1, 0x1.58a5bd001c000p-5},
+{0x1.e741aa29d0c9bp-1, 0x1.95c8340d88000p-5},
+{0x1.e3a91830a99b5p-1, 0x1.d276aef578000p-5},
+{0x1.e01e009609a56p-1, 0x1.07598e598c000p-4},
+{0x1.dca01e577bb98p-1, 0x1.253f5e30d2000p-4},
+{0x1.d92f20b7c9103p-1, 0x1.42edd8b380000p-4},
+{0x1.d5cac66fb5ccep-1, 0x1.606598757c000p-4},
+{0x1.d272caa5ede9dp-1, 0x1.7da76356a0000p-4},
+{0x1.cf26e3e6b2ccdp-1, 0x1.9ab434e1c6000p-4},
+{0x1.cbe6da2a77902p-1, 0x1.b78c7bb0d6000p-4},
+{0x1.c8b266d37086dp-1, 0x1.d431332e72000p-4},
+{0x1.c5894bd5d5804p-1, 0x1.f0a3171de6000p-4},
+{0x1.c26b533bb9f8cp-1, 0x1.067152b914000p-3},
+{0x1.bf583eeece73fp-1, 0x1.147858292b000p-3},
+{0x1.bc4fd75db96c1p-1, 0x1.2266ecdca3000p-3},
+{0x1.b951e0c864a28p-1, 0x1.303d7a6c55000p-3},
+{0x1.b65e2c5ef3e2cp-1, 0x1.3dfc33c331000p-3},
+{0x1.b374867c9888bp-1, 0x1.4ba366b7a8000p-3},
+{0x1.b094b211d304ap-1, 0x1.5933928d1f000p-3},
+{0x1.adbe885f2ef7ep-1, 0x1.66acd2418f000p-3},
+{0x1.aaf1d31603da2p-1, 0x1.740f8ec669000p-3},
+{0x1.a82e63fd358a7p-1, 0x1.815c0f51af000p-3},
+{0x1.a5740ef09738bp-1, 0x1.8e92954f68000p-3},
+{0x1.a2c2a90ab4b27p-1, 0x1.9bb3602f84000p-3},
+{0x1.a01a01393f2d1p-1, 0x1.a8bed1c2c0000p-3},
+{0x1.9d79f24db3c1bp-1, 0x1.b5b515c01d000p-3},
+{0x1.9ae2505c7b190p-1, 0x1.c2967ccbcc000p-3},
+{0x1.9852ef297ce2fp-1, 0x1.cf635d5486000p-3},
+{0x1.95cbaeea44b75p-1, 0x1.dc1bd3446c000p-3},
+{0x1.934c69de74838p-1, 0x1.e8c01b8cfe000p-3},
+{0x1.90d4f2f6752e6p-1, 0x1.f5509c0179000p-3},
+{0x1.8e6528effd79dp-1, 0x1.00e6c121fb800p-2},
+{0x1.8bfce9fcc007cp-1, 0x1.071b80e93d000p-2},
+{0x1.899c0dabec30ep-1, 0x1.0d46b9e867000p-2},
+{0x1.87427aa2317fbp-1, 0x1.13687334bd000p-2},
+{0x1.84f00acb39a08p-1, 0x1.1980d67234800p-2},
+{0x1.82a49e8653e55p-1, 0x1.1f8ffe0cc8000p-2},
+{0x1.8060195f40260p-1, 0x1.2595fd7636800p-2},
+{0x1.7e22563e0a329p-1, 0x1.2b9300914a800p-2},
+{0x1.7beb377dcb5adp-1, 0x1.3187210436000p-2},
+{0x1.79baa679725c2p-1, 0x1.377266dec1800p-2},
+{0x1.77907f2170657p-1, 0x1.3d54ffbaf3000p-2},
+{0x1.756cadbd6130cp-1, 0x1.432eee32fe000p-2},
+},
+#if !__FP_FAST_FMA
+.tab2 = {
+{0x1.61000014fb66bp-1, 0x1.e026c91425b3cp-56},
+{0x1.63000034db495p-1, 0x1.dbfea48005d41p-55},
+{0x1.650000d94d478p-1, 0x1.e7fa786d6a5b7p-55},
+{0x1.67000074e6fadp-1, 0x1.1fcea6b54254cp-57},
+{0x1.68ffffedf0faep-1, -0x1.c7e274c590efdp-56},
+{0x1.6b0000763c5bcp-1, -0x1.ac16848dcda01p-55},
+{0x1.6d0001e5cc1f6p-1, 0x1.33f1c9d499311p-55},
+{0x1.6efffeb05f63ep-1, -0x1.e80041ae22d53p-56},
+{0x1.710000e86978p-1, 0x1.bff6671097952p-56},
+{0x1.72ffffc67e912p-1, 0x1.c00e226bd8724p-55},
+{0x1.74fffdf81116ap-1, -0x1.e02916ef101d2p-57},
+{0x1.770000f679c9p-1, -0x1.7fc71cd549c74p-57},
+{0x1.78ffffa7ec835p-1, 0x1.1bec19ef50483p-55},
+{0x1.7affffe20c2e6p-1, -0x1.07e1729cc6465p-56},
+{0x1.7cfffed3fc9p-1, -0x1.08072087b8b1cp-55},
+{0x1.7efffe9261a76p-1, 0x1.dc0286d9df9aep-55},
+{0x1.81000049ca3e8p-1, 0x1.97fd251e54c33p-55},
+{0x1.8300017932c8fp-1, -0x1.afee9b630f381p-55},
+{0x1.850000633739cp-1, 0x1.9bfbf6b6535bcp-55},
+{0x1.87000204289c6p-1, -0x1.bbf65f3117b75p-55},
+{0x1.88fffebf57904p-1, -0x1.9006ea23dcb57p-55},
+{0x1.8b00022bc04dfp-1, -0x1.d00df38e04b0ap-56},
+{0x1.8cfffe50c1b8ap-1, -0x1.8007146ff9f05p-55},
+{0x1.8effffc918e43p-1, 0x1.3817bd07a7038p-55},
+{0x1.910001efa5fc7p-1, 0x1.93e9176dfb403p-55},
+{0x1.9300013467bb9p-1, 0x1.f804e4b980276p-56},
+{0x1.94fffe6ee076fp-1, -0x1.f7ef0d9ff622ep-55},
+{0x1.96fffde3c12d1p-1, -0x1.082aa962638bap-56},
+{0x1.98ffff4458a0dp-1, -0x1.7801b9164a8efp-55},
+{0x1.9afffdd982e3ep-1, -0x1.740e08a5a9337p-55},
+{0x1.9cfffed49fb66p-1, 0x1.fce08c19bep-60},
+{0x1.9f00020f19c51p-1, -0x1.a3faa27885b0ap-55},
+{0x1.a10001145b006p-1, 0x1.4ff489958da56p-56},
+{0x1.a300007bbf6fap-1, 0x1.cbeab8a2b6d18p-55},
+{0x1.a500010971d79p-1, 0x1.8fecadd78793p-55},
+{0x1.a70001df52e48p-1, -0x1.f41763dd8abdbp-55},
+{0x1.a90001c593352p-1, -0x1.ebf0284c27612p-55},
+{0x1.ab0002a4f3e4bp-1, -0x1.9fd043cff3f5fp-57},
+{0x1.acfffd7ae1ed1p-1, -0x1.23ee7129070b4p-55},
+{0x1.aefffee510478p-1, 0x1.a063ee00edea3p-57},
+{0x1.b0fffdb650d5bp-1, 0x1.a06c8381f0ab9p-58},
+{0x1.b2ffffeaaca57p-1, -0x1.9011e74233c1dp-56},
+{0x1.b4fffd995badcp-1, -0x1.9ff1068862a9fp-56},
+{0x1.b7000249e659cp-1, 0x1.aff45d0864f3ep-55},
+{0x1.b8ffff987164p-1, 0x1.cfe7796c2c3f9p-56},
+{0x1.bafffd204cb4fp-1, -0x1.3ff27eef22bc4p-57},
+{0x1.bcfffd2415c45p-1, -0x1.cffb7ee3bea21p-57},
+{0x1.beffff86309dfp-1, -0x1.14103972e0b5cp-55},
+{0x1.c0fffe1b57653p-1, 0x1.bc16494b76a19p-55},
+{0x1.c2ffff1fa57e3p-1, -0x1.4feef8d30c6edp-57},
+{0x1.c4fffdcbfe424p-1, -0x1.43f68bcec4775p-55},
+{0x1.c6fffed54b9f7p-1, 0x1.47ea3f053e0ecp-55},
+{0x1.c8fffeb998fd5p-1, 0x1.383068df992f1p-56},
+{0x1.cb0002125219ap-1, -0x1.8fd8e64180e04p-57},
+{0x1.ccfffdd94469cp-1, 0x1.e7ebe1cc7ea72p-55},
+{0x1.cefffeafdc476p-1, 0x1.ebe39ad9f88fep-55},
+{0x1.d1000169af82bp-1, 0x1.57d91a8b95a71p-56},
+{0x1.d30000d0ff71dp-1, 0x1.9c1906970c7dap-55},
+{0x1.d4fffea790fc4p-1, -0x1.80e37c558fe0cp-58},
+{0x1.d70002edc87e5p-1, -0x1.f80d64dc10f44p-56},
+{0x1.d900021dc82aap-1, -0x1.47c8f94fd5c5cp-56},
+{0x1.dafffd86b0283p-1, 0x1.c7f1dc521617ep-55},
+{0x1.dd000296c4739p-1, 0x1.8019eb2ffb153p-55},
+{0x1.defffe54490f5p-1, 0x1.e00d2c652cc89p-57},
+{0x1.e0fffcdabf694p-1, -0x1.f8340202d69d2p-56},
+{0x1.e2fffdb52c8ddp-1, 0x1.b00c1ca1b0864p-56},
+{0x1.e4ffff24216efp-1, 0x1.2ffa8b094ab51p-56},
+{0x1.e6fffe88a5e11p-1, -0x1.7f673b1efbe59p-58},
+{0x1.e9000119eff0dp-1, -0x1.4808d5e0bc801p-55},
+{0x1.eafffdfa51744p-1, 0x1.80006d54320b5p-56},
+{0x1.ed0001a127fa1p-1, -0x1.002f860565c92p-58},
+{0x1.ef00007babcc4p-1, -0x1.540445d35e611p-55},
+{0x1.f0ffff57a8d02p-1, -0x1.ffb3139ef9105p-59},
+{0x1.f30001ee58ac7p-1, 0x1.a81acf2731155p-55},
+{0x1.f4ffff5823494p-1, 0x1.a3f41d4d7c743p-55},
+{0x1.f6ffffca94c6bp-1, -0x1.202f41c987875p-57},
+{0x1.f8fffe1f9c441p-1, 0x1.77dd1f477e74bp-56},
+{0x1.fafffd2e0e37ep-1, -0x1.f01199a7ca331p-57},
+{0x1.fd0001c77e49ep-1, 0x1.181ee4bceacb1p-56},
+{0x1.feffff7e0c331p-1, -0x1.e05370170875ap-57},
+{0x1.00ffff465606ep+0, -0x1.a7ead491c0adap-55},
+{0x1.02ffff3867a58p+0, -0x1.77f69c3fcb2ep-54},
+{0x1.04ffffdfc0d17p+0, 0x1.7bffe34cb945bp-54},
+{0x1.0700003cd4d82p+0, 0x1.20083c0e456cbp-55},
+{0x1.08ffff9f2cbe8p+0, -0x1.dffdfbe37751ap-57},
+{0x1.0b000010cda65p+0, -0x1.13f7faee626ebp-54},
+{0x1.0d00001a4d338p+0, 0x1.07dfa79489ff7p-55},
+{0x1.0effffadafdfdp+0, -0x1.7040570d66bcp-56},
+{0x1.110000bbafd96p+0, 0x1.e80d4846d0b62p-55},
+{0x1.12ffffae5f45dp+0, 0x1.dbffa64fd36efp-54},
+{0x1.150000dd59ad9p+0, 0x1.a0077701250aep-54},
+{0x1.170000f21559ap+0, 0x1.dfdf9e2e3deeep-55},
+{0x1.18ffffc275426p+0, 0x1.10030dc3b7273p-54},
+{0x1.1b000123d3c59p+0, 0x1.97f7980030188p-54},
+{0x1.1cffff8299eb7p+0, -0x1.5f932ab9f8c67p-57},
+{0x1.1effff48ad4p+0, 0x1.37fbf9da75bebp-54},
+{0x1.210000c8b86a4p+0, 0x1.f806b91fd5b22p-54},
+{0x1.2300003854303p+0, 0x1.3ffc2eb9fbf33p-54},
+{0x1.24fffffbcf684p+0, 0x1.601e77e2e2e72p-56},
+{0x1.26ffff52921d9p+0, 0x1.ffcbb767f0c61p-56},
+{0x1.2900014933a3cp+0, -0x1.202ca3c02412bp-56},
+{0x1.2b00014556313p+0, -0x1.2808233f21f02p-54},
+{0x1.2cfffebfe523bp+0, -0x1.8ff7e384fdcf2p-55},
+{0x1.2f0000bb8ad96p+0, -0x1.5ff51503041c5p-55},
+{0x1.30ffffb7ae2afp+0, -0x1.10071885e289dp-55},
+{0x1.32ffffeac5f7fp+0, -0x1.1ff5d3fb7b715p-54},
+{0x1.350000ca66756p+0, 0x1.57f82228b82bdp-54},
+{0x1.3700011fbf721p+0, 0x1.000bac40dd5ccp-55},
+{0x1.38ffff9592fb9p+0, -0x1.43f9d2db2a751p-54},
+{0x1.3b00004ddd242p+0, 0x1.57f6b707638e1p-55},
+{0x1.3cffff5b2c957p+0, 0x1.a023a10bf1231p-56},
+{0x1.3efffeab0b418p+0, 0x1.87f6d66b152bp-54},
+{0x1.410001532aff4p+0, 0x1.7f8375f198524p-57},
+{0x1.4300017478b29p+0, 0x1.301e672dc5143p-55},
+{0x1.44fffe795b463p+0, 0x1.9ff69b8b2895ap-55},
+{0x1.46fffe80475ep+0, -0x1.5c0b19bc2f254p-54},
+{0x1.48fffef6fc1e7p+0, 0x1.b4009f23a2a72p-54},
+{0x1.4afffe5bea704p+0, -0x1.4ffb7bf0d7d45p-54},
+{0x1.4d000171027dep+0, -0x1.9c06471dc6a3dp-54},
+{0x1.4f0000ff03ee2p+0, 0x1.77f890b85531cp-54},
+{0x1.5100012dc4bd1p+0, 0x1.004657166a436p-57},
+{0x1.530001605277ap+0, -0x1.6bfcece233209p-54},
+{0x1.54fffecdb704cp+0, -0x1.902720505a1d7p-55},
+{0x1.56fffef5f54a9p+0, 0x1.bbfe60ec96412p-54},
+{0x1.5900017e61012p+0, 0x1.87ec581afef9p-55},
+{0x1.5b00003c93e92p+0, -0x1.f41080abf0ccp-54},
+{0x1.5d0001d4919bcp+0, -0x1.8812afb254729p-54},
+{0x1.5efffe7b87a89p+0, -0x1.47eb780ed6904p-54},
+},
+#endif
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/log_data.h b/src/components/lib/libc/musl-1.2.0/src/math/log_data.h
new file mode 100644
index 0000000000..1be22ab242
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/log_data.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _LOG_DATA_H
+#define _LOG_DATA_H
+
+#include <features.h>
+
+#define LOG_TABLE_BITS 7
+#define LOG_POLY_ORDER 6
+#define LOG_POLY1_ORDER 12
+extern hidden const struct log_data {
+	double ln2hi;
+	double ln2lo;
+	double poly[LOG_POLY_ORDER - 1]; /* First coefficient is 1.  */
+	double poly1[LOG_POLY1_ORDER - 1];
+	struct {
+		double invc, logc;
+	} tab[1 << LOG_TABLE_BITS];
+#if !__FP_FAST_FMA
+	struct {
+		double chi, clo;
+	} tab2[1 << LOG_TABLE_BITS];
+#endif
+} __log_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/logb.c b/src/components/lib/libc/musl-1.2.0/src/math/logb.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/logb.c
rename to src/components/lib/libc/musl-1.2.0/src/math/logb.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/logbf.c b/src/components/lib/libc/musl-1.2.0/src/math/logbf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/logbf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/logbf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/logbl.c b/src/components/lib/libc/musl-1.2.0/src/math/logbl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/logbl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/logbl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/logf.c b/src/components/lib/libc/musl-1.2.0/src/math/logf.c
new file mode 100644
index 0000000000..7ee5d7fe62
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/logf.c
@@ -0,0 +1,71 @@
+/*
+ * Single-precision log function.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "logf_data.h"
+
+/*
+LOGF_TABLE_BITS = 4
+LOGF_POLY_ORDER = 4
+
+ULP error: 0.818 (nearest rounding.)
+Relative error: 1.957 * 2^-26 (before rounding.)
+*/
+
+#define T __logf_data.tab
+#define A __logf_data.poly
+#define Ln2 __logf_data.ln2
+#define N (1 << LOGF_TABLE_BITS)
+#define OFF 0x3f330000
+
+float logf(float x)
+{
+	double_t z, r, r2, y, y0, invc, logc;
+	uint32_t ix, iz, tmp;
+	int k, i;
+
+	ix = asuint(x);
+	/* Fix sign of zero with downward rounding when x==1.  */
+	if (WANT_ROUNDING && predict_false(ix == 0x3f800000))
+		return 0;
+	if (predict_false(ix - 0x00800000 >= 0x7f800000 - 0x00800000)) {
+		/* x < 0x1p-126 or inf or nan.  */
+		if (ix * 2 == 0)
+			return __math_divzerof(1);
+		if (ix == 0x7f800000) /* log(inf) == inf.  */
+			return x;
+		if ((ix & 0x80000000) || ix * 2 >= 0xff000000)
+			return __math_invalidf(x);
+		/* x is subnormal, normalize it.  */
+		ix = asuint(x * 0x1p23f);
+		ix -= 23 << 23;
+	}
+
+	/* x = 2^k z; where z is in range [OFF,2*OFF] and exact.
+	   The range is split into N subintervals.
+	   The ith subinterval contains z and c is near its center.  */
+	tmp = ix - OFF;
+	i = (tmp >> (23 - LOGF_TABLE_BITS)) % N;
+	k = (int32_t)tmp >> 23; /* arithmetic shift */
+	iz = ix - (tmp & 0x1ff << 23);
+	invc = T[i].invc;
+	logc = T[i].logc;
+	z = (double_t)asfloat(iz);
+
+	/* log(x) = log1p(z/c-1) + log(c) + k*Ln2 */
+	r = z * invc - 1;
+	y0 = logc + (double_t)k * Ln2;
+
+	/* Pipelined polynomial evaluation to approximate log1p(r).  */
+	r2 = r * r;
+	y = A[1] * r + A[2];
+	y = A[0] * r2 + y;
+	y = y * r2 + (y0 + r);
+	return eval_as_float(y);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/logf_data.c b/src/components/lib/libc/musl-1.2.0/src/math/logf_data.c
new file mode 100644
index 0000000000..857221f790
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/logf_data.c
@@ -0,0 +1,33 @@
+/*
+ * Data definition for logf.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "logf_data.h"
+
+const struct logf_data __logf_data = {
+  .tab = {
+  { 0x1.661ec79f8f3bep+0, -0x1.57bf7808caadep-2 },
+  { 0x1.571ed4aaf883dp+0, -0x1.2bef0a7c06ddbp-2 },
+  { 0x1.49539f0f010bp+0, -0x1.01eae7f513a67p-2 },
+  { 0x1.3c995b0b80385p+0, -0x1.b31d8a68224e9p-3 },
+  { 0x1.30d190c8864a5p+0, -0x1.6574f0ac07758p-3 },
+  { 0x1.25e227b0b8eap+0, -0x1.1aa2bc79c81p-3 },
+  { 0x1.1bb4a4a1a343fp+0, -0x1.a4e76ce8c0e5ep-4 },
+  { 0x1.12358f08ae5bap+0, -0x1.1973c5a611cccp-4 },
+  { 0x1.0953f419900a7p+0, -0x1.252f438e10c1ep-5 },
+  { 0x1p+0, 0x0p+0 },
+  { 0x1.e608cfd9a47acp-1, 0x1.aa5aa5df25984p-5 },
+  { 0x1.ca4b31f026aap-1, 0x1.c5e53aa362eb4p-4 },
+  { 0x1.b2036576afce6p-1, 0x1.526e57720db08p-3 },
+  { 0x1.9c2d163a1aa2dp-1, 0x1.bc2860d22477p-3 },
+  { 0x1.886e6037841edp-1, 0x1.1058bc8a07ee1p-2 },
+  { 0x1.767dcf5534862p-1, 0x1.4043057b6ee09p-2 },
+  },
+  .ln2 = 0x1.62e42fefa39efp-1,
+  .poly = {
+  -0x1.00ea348b88334p-2, 0x1.5575b0be00b6ap-2, -0x1.ffffef20a4123p-2,
+  }
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/logf_data.h b/src/components/lib/libc/musl-1.2.0/src/math/logf_data.h
new file mode 100644
index 0000000000..00cff6f81d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/logf_data.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _LOGF_DATA_H
+#define _LOGF_DATA_H
+
+#include <features.h>
+
+#define LOGF_TABLE_BITS 4
+#define LOGF_POLY_ORDER 4
+extern hidden const struct logf_data {
+	struct {
+		double invc, logc;
+	} tab[1 << LOGF_TABLE_BITS];
+	double ln2;
+	double poly[LOGF_POLY_ORDER - 1]; /* First order coefficient is 1.  */
+} __logf_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/logl.c b/src/components/lib/libc/musl-1.2.0/src/math/logl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/logl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/logl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/lrint.c b/src/components/lib/libc/musl-1.2.0/src/math/lrint.c
new file mode 100644
index 0000000000..ddee7a0d9a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/lrint.c
@@ -0,0 +1,72 @@
+#include <limits.h>
+#include <fenv.h>
+#include <math.h>
+#include "libm.h"
+
+/*
+If the result cannot be represented (overflow, nan), then
+lrint raises the invalid exception.
+
+Otherwise if the input was not an integer then the inexact
+exception is raised.
+
+C99 is a bit vague about whether inexact exception is
+allowed to be raised when invalid is raised.
+(F.9 explicitly allows spurious inexact exceptions, F.9.6.5
+does not make it clear if that rule applies to lrint, but
+IEEE 754r 7.8 seems to forbid spurious inexact exception in
+the ineger conversion functions)
+
+So we try to make sure that no spurious inexact exception is
+raised in case of an overflow.
+
+If the bit size of long > precision of double, then there
+cannot be inexact rounding in case the result overflows,
+otherwise LONG_MAX and LONG_MIN can be represented exactly
+as a double.
+*/
+
+#if LONG_MAX < 1U<<53 && defined(FE_INEXACT)
+#include <float.h>
+#include <stdint.h>
+#if FLT_EVAL_METHOD==0 || FLT_EVAL_METHOD==1
+#define EPS DBL_EPSILON
+#elif FLT_EVAL_METHOD==2
+#define EPS LDBL_EPSILON
+#endif
+#ifdef __GNUC__
+/* avoid stack frame in lrint */
+__attribute__((noinline))
+#endif
+static long lrint_slow(double x)
+{
+	#pragma STDC FENV_ACCESS ON
+	int e;
+
+	e = fetestexcept(FE_INEXACT);
+	x = rint(x);
+	if (!e && (x > LONG_MAX || x < LONG_MIN))
+		feclearexcept(FE_INEXACT);
+	/* conversion */
+	return x;
+}
+
+long lrint(double x)
+{
+	uint32_t abstop = asuint64(x)>>32 & 0x7fffffff;
+	uint64_t sign = asuint64(x) & (1ULL << 63);
+
+	if (abstop < 0x41dfffff) {
+		/* |x| < 0x7ffffc00, no overflow */
+		double_t toint = asdouble(asuint64(1/EPS) | sign);
+		double_t y = x + toint - toint;
+		return (long)y;
+	}
+	return lrint_slow(x);
+}
+#else
+long lrint(double x)
+{
+	return rint(x);
+}
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lrintf.c b/src/components/lib/libc/musl-1.2.0/src/math/lrintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/lrintf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lrintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lrintl.c b/src/components/lib/libc/musl-1.2.0/src/math/lrintl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/lrintl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lrintl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lround.c b/src/components/lib/libc/musl-1.2.0/src/math/lround.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/lround.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lround.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lroundf.c b/src/components/lib/libc/musl-1.2.0/src/math/lroundf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/lroundf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lroundf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/lroundl.c b/src/components/lib/libc/musl-1.2.0/src/math/lroundl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/lroundl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/lroundl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/mips/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/mips/fabs.c
new file mode 100644
index 0000000000..0a5aa3b1d4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/mips/fabs.c
@@ -0,0 +1,16 @@
+#if !defined(__mips_soft_float) && defined(__mips_abs2008)
+
+#include <math.h>
+
+double fabs(double x)
+{
+	double r;
+	__asm__("abs.d %0,%1" : "=f"(r) : "f"(x));
+	return r;
+}
+
+#else
+
+#include "../fabs.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/mips/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/mips/fabsf.c
new file mode 100644
index 0000000000..35307be6ab
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/mips/fabsf.c
@@ -0,0 +1,16 @@
+#if !defined(__mips_soft_float) && defined(__mips_abs2008)
+
+#include <math.h>
+
+float fabsf(float x)
+{
+	float r;
+	__asm__("abs.s %0,%1" : "=f"(r) : "f"(x));
+	return r;
+}
+
+#else
+
+#include "../fabsf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/mips/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/mips/sqrt.c
new file mode 100644
index 0000000000..595c9dbc36
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/mips/sqrt.c
@@ -0,0 +1,16 @@
+#if !defined(__mips_soft_float) && __mips >= 3
+
+#include <math.h>
+
+double sqrt(double x)
+{
+	double r;
+	__asm__("sqrt.d %0,%1" : "=f"(r) : "f"(x));
+	return r;
+}
+
+#else
+
+#include "../sqrt.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/mips/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/mips/sqrtf.c
new file mode 100644
index 0000000000..84090d2d31
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/mips/sqrtf.c
@@ -0,0 +1,16 @@
+#if !defined(__mips_soft_float) && __mips >= 2
+
+#include <math.h>
+
+float sqrtf(float x)
+{
+	float r;
+	__asm__("sqrt.s %0,%1" : "=f"(r) : "f"(x));
+	return r;
+}
+
+#else
+
+#include "../sqrtf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/modf.c b/src/components/lib/libc/musl-1.2.0/src/math/modf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/modf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/modf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/modff.c b/src/components/lib/libc/musl-1.2.0/src/math/modff.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/modff.c
rename to src/components/lib/libc/musl-1.2.0/src/math/modff.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/modfl.c b/src/components/lib/libc/musl-1.2.0/src/math/modfl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/modfl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/modfl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nan.c b/src/components/lib/libc/musl-1.2.0/src/math/nan.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nan.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nan.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nanf.c b/src/components/lib/libc/musl-1.2.0/src/math/nanf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nanf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nanf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nanl.c b/src/components/lib/libc/musl-1.2.0/src/math/nanl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nanl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nanl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nearbyint.c b/src/components/lib/libc/musl-1.2.0/src/math/nearbyint.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nearbyint.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nearbyint.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nearbyintf.c b/src/components/lib/libc/musl-1.2.0/src/math/nearbyintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nearbyintf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nearbyintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nearbyintl.c b/src/components/lib/libc/musl-1.2.0/src/math/nearbyintl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nearbyintl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nearbyintl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nextafter.c b/src/components/lib/libc/musl-1.2.0/src/math/nextafter.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nextafter.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nextafter.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nextafterf.c b/src/components/lib/libc/musl-1.2.0/src/math/nextafterf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nextafterf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nextafterf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nextafterl.c b/src/components/lib/libc/musl-1.2.0/src/math/nextafterl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nextafterl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nextafterl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nexttoward.c b/src/components/lib/libc/musl-1.2.0/src/math/nexttoward.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nexttoward.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nexttoward.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nexttowardf.c b/src/components/lib/libc/musl-1.2.0/src/math/nexttowardf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nexttowardf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nexttowardf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/nexttowardl.c b/src/components/lib/libc/musl-1.2.0/src/math/nexttowardl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/nexttowardl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/nexttowardl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/pow.c b/src/components/lib/libc/musl-1.2.0/src/math/pow.c
new file mode 100644
index 0000000000..694c2ef64d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/pow.c
@@ -0,0 +1,343 @@
+/*
+ * Double-precision x^y function.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "exp_data.h"
+#include "pow_data.h"
+
+/*
+Worst-case error: 0.54 ULP (~= ulperr_exp + 1024*Ln2*relerr_log*2^53)
+relerr_log: 1.3 * 2^-68 (Relative error of log, 1.5 * 2^-68 without fma)
+ulperr_exp: 0.509 ULP (ULP error of exp, 0.511 ULP without fma)
+*/
+
+#define T __pow_log_data.tab
+#define A __pow_log_data.poly
+#define Ln2hi __pow_log_data.ln2hi
+#define Ln2lo __pow_log_data.ln2lo
+#define N (1 << POW_LOG_TABLE_BITS)
+#define OFF 0x3fe6955500000000
+
+/* Top 12 bits of a double (sign and exponent bits).  */
+static inline uint32_t top12(double x)
+{
+	return asuint64(x) >> 52;
+}
+
+/* Compute y+TAIL = log(x) where the rounded result is y and TAIL has about
+   additional 15 bits precision.  IX is the bit representation of x, but
+   normalized in the subnormal range using the sign bit for the exponent.  */
+static inline double_t log_inline(uint64_t ix, double_t *tail)
+{
+	/* double_t for better performance on targets with FLT_EVAL_METHOD==2.  */
+	double_t z, r, y, invc, logc, logctail, kd, hi, t1, t2, lo, lo1, lo2, p;
+	uint64_t iz, tmp;
+	int k, i;
+
+	/* x = 2^k z; where z is in range [OFF,2*OFF) and exact.
+	   The range is split into N subintervals.
+	   The ith subinterval contains z and c is near its center.  */
+	tmp = ix - OFF;
+	i = (tmp >> (52 - POW_LOG_TABLE_BITS)) % N;
+	k = (int64_t)tmp >> 52; /* arithmetic shift */
+	iz = ix - (tmp & 0xfffULL << 52);
+	z = asdouble(iz);
+	kd = (double_t)k;
+
+	/* log(x) = k*Ln2 + log(c) + log1p(z/c-1).  */
+	invc = T[i].invc;
+	logc = T[i].logc;
+	logctail = T[i].logctail;
+
+	/* Note: 1/c is j/N or j/N/2 where j is an integer in [N,2N) and
+     |z/c - 1| < 1/N, so r = z/c - 1 is exactly representible.  */
+#if __FP_FAST_FMA
+	r = __builtin_fma(z, invc, -1.0);
+#else
+	/* Split z such that rhi, rlo and rhi*rhi are exact and |rlo| <= |r|.  */
+	double_t zhi = asdouble((iz + (1ULL << 31)) & (-1ULL << 32));
+	double_t zlo = z - zhi;
+	double_t rhi = zhi * invc - 1.0;
+	double_t rlo = zlo * invc;
+	r = rhi + rlo;
+#endif
+
+	/* k*Ln2 + log(c) + r.  */
+	t1 = kd * Ln2hi + logc;
+	t2 = t1 + r;
+	lo1 = kd * Ln2lo + logctail;
+	lo2 = t1 - t2 + r;
+
+	/* Evaluation is optimized assuming superscalar pipelined execution.  */
+	double_t ar, ar2, ar3, lo3, lo4;
+	ar = A[0] * r; /* A[0] = -0.5.  */
+	ar2 = r * ar;
+	ar3 = r * ar2;
+	/* k*Ln2 + log(c) + r + A[0]*r*r.  */
+#if __FP_FAST_FMA
+	hi = t2 + ar2;
+	lo3 = __builtin_fma(ar, r, -ar2);
+	lo4 = t2 - hi + ar2;
+#else
+	double_t arhi = A[0] * rhi;
+	double_t arhi2 = rhi * arhi;
+	hi = t2 + arhi2;
+	lo3 = rlo * (ar + arhi);
+	lo4 = t2 - hi + arhi2;
+#endif
+	/* p = log1p(r) - r - A[0]*r*r.  */
+	p = (ar3 * (A[1] + r * A[2] +
+		    ar2 * (A[3] + r * A[4] + ar2 * (A[5] + r * A[6]))));
+	lo = lo1 + lo2 + lo3 + lo4 + p;
+	y = hi + lo;
+	*tail = hi - y + lo;
+	return y;
+}
+
+#undef N
+#undef T
+#define N (1 << EXP_TABLE_BITS)
+#define InvLn2N __exp_data.invln2N
+#define NegLn2hiN __exp_data.negln2hiN
+#define NegLn2loN __exp_data.negln2loN
+#define Shift __exp_data.shift
+#define T __exp_data.tab
+#define C2 __exp_data.poly[5 - EXP_POLY_ORDER]
+#define C3 __exp_data.poly[6 - EXP_POLY_ORDER]
+#define C4 __exp_data.poly[7 - EXP_POLY_ORDER]
+#define C5 __exp_data.poly[8 - EXP_POLY_ORDER]
+#define C6 __exp_data.poly[9 - EXP_POLY_ORDER]
+
+/* Handle cases that may overflow or underflow when computing the result that
+   is scale*(1+TMP) without intermediate rounding.  The bit representation of
+   scale is in SBITS, however it has a computed exponent that may have
+   overflown into the sign bit so that needs to be adjusted before using it as
+   a double.  (int32_t)KI is the k used in the argument reduction and exponent
+   adjustment of scale, positive k here means the result may overflow and
+   negative k means the result may underflow.  */
+static inline double specialcase(double_t tmp, uint64_t sbits, uint64_t ki)
+{
+	double_t scale, y;
+
+	if ((ki & 0x80000000) == 0) {
+		/* k > 0, the exponent of scale might have overflowed by <= 460.  */
+		sbits -= 1009ull << 52;
+		scale = asdouble(sbits);
+		y = 0x1p1009 * (scale + scale * tmp);
+		return eval_as_double(y);
+	}
+	/* k < 0, need special care in the subnormal range.  */
+	sbits += 1022ull << 52;
+	/* Note: sbits is signed scale.  */
+	scale = asdouble(sbits);
+	y = scale + scale * tmp;
+	if (fabs(y) < 1.0) {
+		/* Round y to the right precision before scaling it into the subnormal
+		   range to avoid double rounding that can cause 0.5+E/2 ulp error where
+		   E is the worst-case ulp error outside the subnormal range.  So this
+		   is only useful if the goal is better than 1 ulp worst-case error.  */
+		double_t hi, lo, one = 1.0;
+		if (y < 0.0)
+			one = -1.0;
+		lo = scale - y + scale * tmp;
+		hi = one + y;
+		lo = one - hi + y + lo;
+		y = eval_as_double(hi + lo) - one;
+		/* Fix the sign of 0.  */
+		if (y == 0.0)
+			y = asdouble(sbits & 0x8000000000000000);
+		/* The underflow exception needs to be signaled explicitly.  */
+		fp_force_eval(fp_barrier(0x1p-1022) * 0x1p-1022);
+	}
+	y = 0x1p-1022 * y;
+	return eval_as_double(y);
+}
+
+#define SIGN_BIAS (0x800 << EXP_TABLE_BITS)
+
+/* Computes sign*exp(x+xtail) where |xtail| < 2^-8/N and |xtail| <= |x|.
+   The sign_bias argument is SIGN_BIAS or 0 and sets the sign to -1 or 1.  */
+static inline double exp_inline(double_t x, double_t xtail, uint32_t sign_bias)
+{
+	uint32_t abstop;
+	uint64_t ki, idx, top, sbits;
+	/* double_t for better performance on targets with FLT_EVAL_METHOD==2.  */
+	double_t kd, z, r, r2, scale, tail, tmp;
+
+	abstop = top12(x) & 0x7ff;
+	if (predict_false(abstop - top12(0x1p-54) >=
+			  top12(512.0) - top12(0x1p-54))) {
+		if (abstop - top12(0x1p-54) >= 0x80000000) {
+			/* Avoid spurious underflow for tiny x.  */
+			/* Note: 0 is common input.  */
+			double_t one = WANT_ROUNDING ? 1.0 + x : 1.0;
+			return sign_bias ? -one : one;
+		}
+		if (abstop >= top12(1024.0)) {
+			/* Note: inf and nan are already handled.  */
+			if (asuint64(x) >> 63)
+				return __math_uflow(sign_bias);
+			else
+				return __math_oflow(sign_bias);
+		}
+		/* Large x is special cased below.  */
+		abstop = 0;
+	}
+
+	/* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)].  */
+	/* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N].  */
+	z = InvLn2N * x;
+#if TOINT_INTRINSICS
+	kd = roundtoint(z);
+	ki = converttoint(z);
+#elif EXP_USE_TOINT_NARROW
+	/* z - kd is in [-0.5-2^-16, 0.5] in all rounding modes.  */
+	kd = eval_as_double(z + Shift);
+	ki = asuint64(kd) >> 16;
+	kd = (double_t)(int32_t)ki;
+#else
+	/* z - kd is in [-1, 1] in non-nearest rounding modes.  */
+	kd = eval_as_double(z + Shift);
+	ki = asuint64(kd);
+	kd -= Shift;
+#endif
+	r = x + kd * NegLn2hiN + kd * NegLn2loN;
+	/* The code assumes 2^-200 < |xtail| < 2^-8/N.  */
+	r += xtail;
+	/* 2^(k/N) ~= scale * (1 + tail).  */
+	idx = 2 * (ki % N);
+	top = (ki + sign_bias) << (52 - EXP_TABLE_BITS);
+	tail = asdouble(T[idx]);
+	/* This is only a valid scale when -1023*N < k < 1024*N.  */
+	sbits = T[idx + 1] + top;
+	/* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (tail + exp(r) - 1).  */
+	/* Evaluation is optimized assuming superscalar pipelined execution.  */
+	r2 = r * r;
+	/* Without fma the worst case error is 0.25/N ulp larger.  */
+	/* Worst case error is less than 0.5+1.11/N+(abs poly error * 2^53) ulp.  */
+	tmp = tail + r + r2 * (C2 + r * C3) + r2 * r2 * (C4 + r * C5);
+	if (predict_false(abstop == 0))
+		return specialcase(tmp, sbits, ki);
+	scale = asdouble(sbits);
+	/* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there
+	   is no spurious underflow here even without fma.  */
+	return eval_as_double(scale + scale * tmp);
+}
+
+/* Returns 0 if not int, 1 if odd int, 2 if even int.  The argument is
+   the bit representation of a non-zero finite floating-point value.  */
+static inline int checkint(uint64_t iy)
+{
+	int e = iy >> 52 & 0x7ff;
+	if (e < 0x3ff)
+		return 0;
+	if (e > 0x3ff + 52)
+		return 2;
+	if (iy & ((1ULL << (0x3ff + 52 - e)) - 1))
+		return 0;
+	if (iy & (1ULL << (0x3ff + 52 - e)))
+		return 1;
+	return 2;
+}
+
+/* Returns 1 if input is the bit representation of 0, infinity or nan.  */
+static inline int zeroinfnan(uint64_t i)
+{
+	return 2 * i - 1 >= 2 * asuint64(INFINITY) - 1;
+}
+
+double pow(double x, double y)
+{
+	uint32_t sign_bias = 0;
+	uint64_t ix, iy;
+	uint32_t topx, topy;
+
+	ix = asuint64(x);
+	iy = asuint64(y);
+	topx = top12(x);
+	topy = top12(y);
+	if (predict_false(topx - 0x001 >= 0x7ff - 0x001 ||
+			  (topy & 0x7ff) - 0x3be >= 0x43e - 0x3be)) {
+		/* Note: if |y| > 1075 * ln2 * 2^53 ~= 0x1.749p62 then pow(x,y) = inf/0
+		   and if |y| < 2^-54 / 1075 ~= 0x1.e7b6p-65 then pow(x,y) = +-1.  */
+		/* Special cases: (x < 0x1p-126 or inf or nan) or
+		   (|y| < 0x1p-65 or |y| >= 0x1p63 or nan).  */
+		if (predict_false(zeroinfnan(iy))) {
+			if (2 * iy == 0)
+				return issignaling_inline(x) ? x + y : 1.0;
+			if (ix == asuint64(1.0))
+				return issignaling_inline(y) ? x + y : 1.0;
+			if (2 * ix > 2 * asuint64(INFINITY) ||
+			    2 * iy > 2 * asuint64(INFINITY))
+				return x + y;
+			if (2 * ix == 2 * asuint64(1.0))
+				return 1.0;
+			if ((2 * ix < 2 * asuint64(1.0)) == !(iy >> 63))
+				return 0.0; /* |x|<1 && y==inf or |x|>1 && y==-inf.  */
+			return y * y;
+		}
+		if (predict_false(zeroinfnan(ix))) {
+			double_t x2 = x * x;
+			if (ix >> 63 && checkint(iy) == 1)
+				x2 = -x2;
+			/* Without the barrier some versions of clang hoist the 1/x2 and
+			   thus division by zero exception can be signaled spuriously.  */
+			return iy >> 63 ? fp_barrier(1 / x2) : x2;
+		}
+		/* Here x and y are non-zero finite.  */
+		if (ix >> 63) {
+			/* Finite x < 0.  */
+			int yint = checkint(iy);
+			if (yint == 0)
+				return __math_invalid(x);
+			if (yint == 1)
+				sign_bias = SIGN_BIAS;
+			ix &= 0x7fffffffffffffff;
+			topx &= 0x7ff;
+		}
+		if ((topy & 0x7ff) - 0x3be >= 0x43e - 0x3be) {
+			/* Note: sign_bias == 0 here because y is not odd.  */
+			if (ix == asuint64(1.0))
+				return 1.0;
+			if ((topy & 0x7ff) < 0x3be) {
+				/* |y| < 2^-65, x^y ~= 1 + y*log(x).  */
+				if (WANT_ROUNDING)
+					return ix > asuint64(1.0) ? 1.0 + y :
+								    1.0 - y;
+				else
+					return 1.0;
+			}
+			return (ix > asuint64(1.0)) == (topy < 0x800) ?
+				       __math_oflow(0) :
+				       __math_uflow(0);
+		}
+		if (topx == 0) {
+			/* Normalize subnormal x so exponent becomes negative.  */
+			ix = asuint64(x * 0x1p52);
+			ix &= 0x7fffffffffffffff;
+			ix -= 52ULL << 52;
+		}
+	}
+
+	double_t lo;
+	double_t hi = log_inline(ix, &lo);
+	double_t ehi, elo;
+#if __FP_FAST_FMA
+	ehi = y * hi;
+	elo = y * lo + __builtin_fma(y, hi, -ehi);
+#else
+	double_t yhi = asdouble(iy & -1ULL << 27);
+	double_t ylo = y - yhi;
+	double_t lhi = asdouble(asuint64(hi) & -1ULL << 27);
+	double_t llo = hi - lhi + lo;
+	ehi = yhi * lhi;
+	elo = ylo * lhi + y * llo; /* |elo| < |ehi| * 2^-25.  */
+#endif
+	return exp_inline(ehi, elo, sign_bias);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/pow_data.c b/src/components/lib/libc/musl-1.2.0/src/math/pow_data.c
new file mode 100644
index 0000000000..81e760de19
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/pow_data.c
@@ -0,0 +1,180 @@
+/*
+ * Data for the log part of pow.
+ *
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "pow_data.h"
+
+#define N (1 << POW_LOG_TABLE_BITS)
+
+const struct pow_log_data __pow_log_data = {
+.ln2hi = 0x1.62e42fefa3800p-1,
+.ln2lo = 0x1.ef35793c76730p-45,
+.poly = {
+// relative error: 0x1.11922ap-70
+// in -0x1.6bp-8 0x1.6bp-8
+// Coefficients are scaled to match the scaling during evaluation.
+-0x1p-1,
+0x1.555555555556p-2 * -2,
+-0x1.0000000000006p-2 * -2,
+0x1.999999959554ep-3 * 4,
+-0x1.555555529a47ap-3 * 4,
+0x1.2495b9b4845e9p-3 * -8,
+-0x1.0002b8b263fc3p-3 * -8,
+},
+/* Algorithm:
+
+	x = 2^k z
+	log(x) = k ln2 + log(c) + log(z/c)
+	log(z/c) = poly(z/c - 1)
+
+where z is in [0x1.69555p-1; 0x1.69555p0] which is split into N subintervals
+and z falls into the ith one, then table entries are computed as
+
+	tab[i].invc = 1/c
+	tab[i].logc = round(0x1p43*log(c))/0x1p43
+	tab[i].logctail = (double)(log(c) - logc)
+
+where c is chosen near the center of the subinterval such that 1/c has only a
+few precision bits so z/c - 1 is exactly representible as double:
+
+	1/c = center < 1 ? round(N/center)/N : round(2*N/center)/N/2
+
+Note: |z/c - 1| < 1/N for the chosen c, |log(c) - logc - logctail| < 0x1p-97,
+the last few bits of logc are rounded away so k*ln2hi + logc has no rounding
+error and the interval for z is selected such that near x == 1, where log(x)
+is tiny, large cancellation error is avoided in logc + poly(z/c - 1).  */
+.tab = {
+#define A(a, b, c) {a, 0, b, c},
+A(0x1.6a00000000000p+0, -0x1.62c82f2b9c800p-2, 0x1.ab42428375680p-48)
+A(0x1.6800000000000p+0, -0x1.5d1bdbf580800p-2, -0x1.ca508d8e0f720p-46)
+A(0x1.6600000000000p+0, -0x1.5767717455800p-2, -0x1.362a4d5b6506dp-45)
+A(0x1.6400000000000p+0, -0x1.51aad872df800p-2, -0x1.684e49eb067d5p-49)
+A(0x1.6200000000000p+0, -0x1.4be5f95777800p-2, -0x1.41b6993293ee0p-47)
+A(0x1.6000000000000p+0, -0x1.4618bc21c6000p-2, 0x1.3d82f484c84ccp-46)
+A(0x1.5e00000000000p+0, -0x1.404308686a800p-2, 0x1.c42f3ed820b3ap-50)
+A(0x1.5c00000000000p+0, -0x1.3a64c55694800p-2, 0x1.0b1c686519460p-45)
+A(0x1.5a00000000000p+0, -0x1.347dd9a988000p-2, 0x1.5594dd4c58092p-45)
+A(0x1.5800000000000p+0, -0x1.2e8e2bae12000p-2, 0x1.67b1e99b72bd8p-45)
+A(0x1.5600000000000p+0, -0x1.2895a13de8800p-2, 0x1.5ca14b6cfb03fp-46)
+A(0x1.5600000000000p+0, -0x1.2895a13de8800p-2, 0x1.5ca14b6cfb03fp-46)
+A(0x1.5400000000000p+0, -0x1.22941fbcf7800p-2, -0x1.65a242853da76p-46)
+A(0x1.5200000000000p+0, -0x1.1c898c1699800p-2, -0x1.fafbc68e75404p-46)
+A(0x1.5000000000000p+0, -0x1.1675cababa800p-2, 0x1.f1fc63382a8f0p-46)
+A(0x1.4e00000000000p+0, -0x1.1058bf9ae4800p-2, -0x1.6a8c4fd055a66p-45)
+A(0x1.4c00000000000p+0, -0x1.0a324e2739000p-2, -0x1.c6bee7ef4030ep-47)
+A(0x1.4a00000000000p+0, -0x1.0402594b4d000p-2, -0x1.036b89ef42d7fp-48)
+A(0x1.4a00000000000p+0, -0x1.0402594b4d000p-2, -0x1.036b89ef42d7fp-48)
+A(0x1.4800000000000p+0, -0x1.fb9186d5e4000p-3, 0x1.d572aab993c87p-47)
+A(0x1.4600000000000p+0, -0x1.ef0adcbdc6000p-3, 0x1.b26b79c86af24p-45)
+A(0x1.4400000000000p+0, -0x1.e27076e2af000p-3, -0x1.72f4f543fff10p-46)
+A(0x1.4200000000000p+0, -0x1.d5c216b4fc000p-3, 0x1.1ba91bbca681bp-45)
+A(0x1.4000000000000p+0, -0x1.c8ff7c79aa000p-3, 0x1.7794f689f8434p-45)
+A(0x1.4000000000000p+0, -0x1.c8ff7c79aa000p-3, 0x1.7794f689f8434p-45)
+A(0x1.3e00000000000p+0, -0x1.bc286742d9000p-3, 0x1.94eb0318bb78fp-46)
+A(0x1.3c00000000000p+0, -0x1.af3c94e80c000p-3, 0x1.a4e633fcd9066p-52)
+A(0x1.3a00000000000p+0, -0x1.a23bc1fe2b000p-3, -0x1.58c64dc46c1eap-45)
+A(0x1.3a00000000000p+0, -0x1.a23bc1fe2b000p-3, -0x1.58c64dc46c1eap-45)
+A(0x1.3800000000000p+0, -0x1.9525a9cf45000p-3, -0x1.ad1d904c1d4e3p-45)
+A(0x1.3600000000000p+0, -0x1.87fa06520d000p-3, 0x1.bbdbf7fdbfa09p-45)
+A(0x1.3400000000000p+0, -0x1.7ab890210e000p-3, 0x1.bdb9072534a58p-45)
+A(0x1.3400000000000p+0, -0x1.7ab890210e000p-3, 0x1.bdb9072534a58p-45)
+A(0x1.3200000000000p+0, -0x1.6d60fe719d000p-3, -0x1.0e46aa3b2e266p-46)
+A(0x1.3000000000000p+0, -0x1.5ff3070a79000p-3, -0x1.e9e439f105039p-46)
+A(0x1.3000000000000p+0, -0x1.5ff3070a79000p-3, -0x1.e9e439f105039p-46)
+A(0x1.2e00000000000p+0, -0x1.526e5e3a1b000p-3, -0x1.0de8b90075b8fp-45)
+A(0x1.2c00000000000p+0, -0x1.44d2b6ccb8000p-3, 0x1.70cc16135783cp-46)
+A(0x1.2c00000000000p+0, -0x1.44d2b6ccb8000p-3, 0x1.70cc16135783cp-46)
+A(0x1.2a00000000000p+0, -0x1.371fc201e9000p-3, 0x1.178864d27543ap-48)
+A(0x1.2800000000000p+0, -0x1.29552f81ff000p-3, -0x1.48d301771c408p-45)
+A(0x1.2600000000000p+0, -0x1.1b72ad52f6000p-3, -0x1.e80a41811a396p-45)
+A(0x1.2600000000000p+0, -0x1.1b72ad52f6000p-3, -0x1.e80a41811a396p-45)
+A(0x1.2400000000000p+0, -0x1.0d77e7cd09000p-3, 0x1.a699688e85bf4p-47)
+A(0x1.2400000000000p+0, -0x1.0d77e7cd09000p-3, 0x1.a699688e85bf4p-47)
+A(0x1.2200000000000p+0, -0x1.fec9131dbe000p-4, -0x1.575545ca333f2p-45)
+A(0x1.2000000000000p+0, -0x1.e27076e2b0000p-4, 0x1.a342c2af0003cp-45)
+A(0x1.2000000000000p+0, -0x1.e27076e2b0000p-4, 0x1.a342c2af0003cp-45)
+A(0x1.1e00000000000p+0, -0x1.c5e548f5bc000p-4, -0x1.d0c57585fbe06p-46)
+A(0x1.1c00000000000p+0, -0x1.a926d3a4ae000p-4, 0x1.53935e85baac8p-45)
+A(0x1.1c00000000000p+0, -0x1.a926d3a4ae000p-4, 0x1.53935e85baac8p-45)
+A(0x1.1a00000000000p+0, -0x1.8c345d631a000p-4, 0x1.37c294d2f5668p-46)
+A(0x1.1a00000000000p+0, -0x1.8c345d631a000p-4, 0x1.37c294d2f5668p-46)
+A(0x1.1800000000000p+0, -0x1.6f0d28ae56000p-4, -0x1.69737c93373dap-45)
+A(0x1.1600000000000p+0, -0x1.51b073f062000p-4, 0x1.f025b61c65e57p-46)
+A(0x1.1600000000000p+0, -0x1.51b073f062000p-4, 0x1.f025b61c65e57p-46)
+A(0x1.1400000000000p+0, -0x1.341d7961be000p-4, 0x1.c5edaccf913dfp-45)
+A(0x1.1400000000000p+0, -0x1.341d7961be000p-4, 0x1.c5edaccf913dfp-45)
+A(0x1.1200000000000p+0, -0x1.16536eea38000p-4, 0x1.47c5e768fa309p-46)
+A(0x1.1000000000000p+0, -0x1.f0a30c0118000p-5, 0x1.d599e83368e91p-45)
+A(0x1.1000000000000p+0, -0x1.f0a30c0118000p-5, 0x1.d599e83368e91p-45)
+A(0x1.0e00000000000p+0, -0x1.b42dd71198000p-5, 0x1.c827ae5d6704cp-46)
+A(0x1.0e00000000000p+0, -0x1.b42dd71198000p-5, 0x1.c827ae5d6704cp-46)
+A(0x1.0c00000000000p+0, -0x1.77458f632c000p-5, -0x1.cfc4634f2a1eep-45)
+A(0x1.0c00000000000p+0, -0x1.77458f632c000p-5, -0x1.cfc4634f2a1eep-45)
+A(0x1.0a00000000000p+0, -0x1.39e87b9fec000p-5, 0x1.502b7f526feaap-48)
+A(0x1.0a00000000000p+0, -0x1.39e87b9fec000p-5, 0x1.502b7f526feaap-48)
+A(0x1.0800000000000p+0, -0x1.f829b0e780000p-6, -0x1.980267c7e09e4p-45)
+A(0x1.0800000000000p+0, -0x1.f829b0e780000p-6, -0x1.980267c7e09e4p-45)
+A(0x1.0600000000000p+0, -0x1.7b91b07d58000p-6, -0x1.88d5493faa639p-45)
+A(0x1.0400000000000p+0, -0x1.fc0a8b0fc0000p-7, -0x1.f1e7cf6d3a69cp-50)
+A(0x1.0400000000000p+0, -0x1.fc0a8b0fc0000p-7, -0x1.f1e7cf6d3a69cp-50)
+A(0x1.0200000000000p+0, -0x1.fe02a6b100000p-8, -0x1.9e23f0dda40e4p-46)
+A(0x1.0200000000000p+0, -0x1.fe02a6b100000p-8, -0x1.9e23f0dda40e4p-46)
+A(0x1.0000000000000p+0, 0x0.0000000000000p+0, 0x0.0000000000000p+0)
+A(0x1.0000000000000p+0, 0x0.0000000000000p+0, 0x0.0000000000000p+0)
+A(0x1.fc00000000000p-1, 0x1.0101575890000p-7, -0x1.0c76b999d2be8p-46)
+A(0x1.f800000000000p-1, 0x1.0205658938000p-6, -0x1.3dc5b06e2f7d2p-45)
+A(0x1.f400000000000p-1, 0x1.8492528c90000p-6, -0x1.aa0ba325a0c34p-45)
+A(0x1.f000000000000p-1, 0x1.0415d89e74000p-5, 0x1.111c05cf1d753p-47)
+A(0x1.ec00000000000p-1, 0x1.466aed42e0000p-5, -0x1.c167375bdfd28p-45)
+A(0x1.e800000000000p-1, 0x1.894aa149fc000p-5, -0x1.97995d05a267dp-46)
+A(0x1.e400000000000p-1, 0x1.ccb73cdddc000p-5, -0x1.a68f247d82807p-46)
+A(0x1.e200000000000p-1, 0x1.eea31c006c000p-5, -0x1.e113e4fc93b7bp-47)
+A(0x1.de00000000000p-1, 0x1.1973bd1466000p-4, -0x1.5325d560d9e9bp-45)
+A(0x1.da00000000000p-1, 0x1.3bdf5a7d1e000p-4, 0x1.cc85ea5db4ed7p-45)
+A(0x1.d600000000000p-1, 0x1.5e95a4d97a000p-4, -0x1.c69063c5d1d1ep-45)
+A(0x1.d400000000000p-1, 0x1.700d30aeac000p-4, 0x1.c1e8da99ded32p-49)
+A(0x1.d000000000000p-1, 0x1.9335e5d594000p-4, 0x1.3115c3abd47dap-45)
+A(0x1.cc00000000000p-1, 0x1.b6ac88dad6000p-4, -0x1.390802bf768e5p-46)
+A(0x1.ca00000000000p-1, 0x1.c885801bc4000p-4, 0x1.646d1c65aacd3p-45)
+A(0x1.c600000000000p-1, 0x1.ec739830a2000p-4, -0x1.dc068afe645e0p-45)
+A(0x1.c400000000000p-1, 0x1.fe89139dbe000p-4, -0x1.534d64fa10afdp-45)
+A(0x1.c000000000000p-1, 0x1.1178e8227e000p-3, 0x1.1ef78ce2d07f2p-45)
+A(0x1.be00000000000p-1, 0x1.1aa2b7e23f000p-3, 0x1.ca78e44389934p-45)
+A(0x1.ba00000000000p-1, 0x1.2d1610c868000p-3, 0x1.39d6ccb81b4a1p-47)
+A(0x1.b800000000000p-1, 0x1.365fcb0159000p-3, 0x1.62fa8234b7289p-51)
+A(0x1.b400000000000p-1, 0x1.4913d8333b000p-3, 0x1.5837954fdb678p-45)
+A(0x1.b200000000000p-1, 0x1.527e5e4a1b000p-3, 0x1.633e8e5697dc7p-45)
+A(0x1.ae00000000000p-1, 0x1.6574ebe8c1000p-3, 0x1.9cf8b2c3c2e78p-46)
+A(0x1.ac00000000000p-1, 0x1.6f0128b757000p-3, -0x1.5118de59c21e1p-45)
+A(0x1.aa00000000000p-1, 0x1.7898d85445000p-3, -0x1.c661070914305p-46)
+A(0x1.a600000000000p-1, 0x1.8beafeb390000p-3, -0x1.73d54aae92cd1p-47)
+A(0x1.a400000000000p-1, 0x1.95a5adcf70000p-3, 0x1.7f22858a0ff6fp-47)
+A(0x1.a000000000000p-1, 0x1.a93ed3c8ae000p-3, -0x1.8724350562169p-45)
+A(0x1.9e00000000000p-1, 0x1.b31d8575bd000p-3, -0x1.c358d4eace1aap-47)
+A(0x1.9c00000000000p-1, 0x1.bd087383be000p-3, -0x1.d4bc4595412b6p-45)
+A(0x1.9a00000000000p-1, 0x1.c6ffbc6f01000p-3, -0x1.1ec72c5962bd2p-48)
+A(0x1.9600000000000p-1, 0x1.db13db0d49000p-3, -0x1.aff2af715b035p-45)
+A(0x1.9400000000000p-1, 0x1.e530effe71000p-3, 0x1.212276041f430p-51)
+A(0x1.9200000000000p-1, 0x1.ef5ade4dd0000p-3, -0x1.a211565bb8e11p-51)
+A(0x1.9000000000000p-1, 0x1.f991c6cb3b000p-3, 0x1.bcbecca0cdf30p-46)
+A(0x1.8c00000000000p-1, 0x1.07138604d5800p-2, 0x1.89cdb16ed4e91p-48)
+A(0x1.8a00000000000p-1, 0x1.0c42d67616000p-2, 0x1.7188b163ceae9p-45)
+A(0x1.8800000000000p-1, 0x1.1178e8227e800p-2, -0x1.c210e63a5f01cp-45)
+A(0x1.8600000000000p-1, 0x1.16b5ccbacf800p-2, 0x1.b9acdf7a51681p-45)
+A(0x1.8400000000000p-1, 0x1.1bf99635a6800p-2, 0x1.ca6ed5147bdb7p-45)
+A(0x1.8200000000000p-1, 0x1.214456d0eb800p-2, 0x1.a87deba46baeap-47)
+A(0x1.7e00000000000p-1, 0x1.2bef07cdc9000p-2, 0x1.a9cfa4a5004f4p-45)
+A(0x1.7c00000000000p-1, 0x1.314f1e1d36000p-2, -0x1.8e27ad3213cb8p-45)
+A(0x1.7a00000000000p-1, 0x1.36b6776be1000p-2, 0x1.16ecdb0f177c8p-46)
+A(0x1.7800000000000p-1, 0x1.3c25277333000p-2, 0x1.83b54b606bd5cp-46)
+A(0x1.7600000000000p-1, 0x1.419b423d5e800p-2, 0x1.8e436ec90e09dp-47)
+A(0x1.7400000000000p-1, 0x1.4718dc271c800p-2, -0x1.f27ce0967d675p-45)
+A(0x1.7200000000000p-1, 0x1.4c9e09e173000p-2, -0x1.e20891b0ad8a4p-45)
+A(0x1.7000000000000p-1, 0x1.522ae0738a000p-2, 0x1.ebe708164c759p-45)
+A(0x1.6e00000000000p-1, 0x1.57bf753c8d000p-2, 0x1.fadedee5d40efp-46)
+A(0x1.6c00000000000p-1, 0x1.5d5bddf596000p-2, -0x1.a0b2a08a465dcp-47)
+},
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/pow_data.h b/src/components/lib/libc/musl-1.2.0/src/math/pow_data.h
new file mode 100644
index 0000000000..5d609ae80e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/pow_data.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _POW_DATA_H
+#define _POW_DATA_H
+
+#include <features.h>
+
+#define POW_LOG_TABLE_BITS 7
+#define POW_LOG_POLY_ORDER 8
+extern hidden const struct pow_log_data {
+	double ln2hi;
+	double ln2lo;
+	double poly[POW_LOG_POLY_ORDER - 1]; /* First coefficient is 1.  */
+	/* Note: the pad field is unused, but allows slightly faster indexing.  */
+	struct {
+		double invc, pad, logc, logctail;
+	} tab[1 << POW_LOG_TABLE_BITS];
+} __pow_log_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fabs.c
new file mode 100644
index 0000000000..0efc21ef83
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fabs.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(_SOFT_FLOAT) || defined(BROKEN_PPC_D_ASM)
+
+#include "../fabs.c"
+
+#else
+
+double fabs(double x)
+{
+	__asm__ ("fabs %0, %1" : "=d"(x) : "d"(x));
+	return x;
+}
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fabsf.c
new file mode 100644
index 0000000000..d88b5911c0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fabsf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _SOFT_FLOAT
+
+#include "../fabsf.c"
+
+#else
+
+float fabsf(float x)
+{
+	__asm__ ("fabs %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fma.c
new file mode 100644
index 0000000000..135c990357
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fma.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(_SOFT_FLOAT) || defined(BROKEN_PPC_D_ASM)
+
+#include "../fma.c"
+
+#else
+
+double fma(double x, double y, double z)
+{
+	__asm__("fmadd %0, %1, %2, %3" : "=d"(x) : "d"(x), "d"(y), "d"(z));
+	return x;
+}
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fmaf.c
new file mode 100644
index 0000000000..a99a2a3ba1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/fmaf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _SOFT_FLOAT
+
+#include "../fmaf.c"
+
+#else
+
+float fmaf(float x, float y, float z)
+{
+	__asm__("fmadds %0, %1, %2, %3" : "=f"(x) : "f"(x), "f"(y), "f"(z));
+	return x;
+}
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/sqrt.c
new file mode 100644
index 0000000000..8718dbd0ca
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/sqrt.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if !defined _SOFT_FLOAT && defined _ARCH_PPCSQ
+
+double sqrt(double x)
+{
+	__asm__ ("fsqrt %0, %1\n" : "=d" (x) : "d" (x));
+	return x;
+}
+
+#else
+
+#include "../sqrt.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/sqrtf.c
new file mode 100644
index 0000000000..3431b672d0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc/sqrtf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if !defined _SOFT_FLOAT && defined _ARCH_PPCSQ
+
+float sqrtf(float x)
+{
+	__asm__ ("fsqrts %0, %1\n" : "=f" (x) : "f" (x));
+	return x;
+}
+
+#else
+
+#include "../sqrtf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/ceil.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/ceil.c
new file mode 100644
index 0000000000..4b01133660
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/ceil.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+double ceil(double x)
+{
+	__asm__ ("frip %0, %1" : "=d"(x) : "d"(x));
+	return x;
+}
+
+#else
+
+#include "../ceil.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/ceilf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/ceilf.c
new file mode 100644
index 0000000000..59ba39617f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/ceilf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+float ceilf(float x)
+{
+	__asm__ ("frip %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../ceilf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fabs.c
new file mode 100644
index 0000000000..6123c7535c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fabs.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double fabs(double x)
+{
+	__asm__ ("fabs %0, %1" : "=d"(x) : "d"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fabsf.c
new file mode 100644
index 0000000000..e9e45643d2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fabsf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float fabsf(float x)
+{
+	__asm__ ("fabs %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/floor.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/floor.c
new file mode 100644
index 0000000000..4e6804449d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/floor.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+double floor(double x)
+{
+	__asm__ ("frim %0, %1" : "=d"(x) : "d"(x));
+	return x;
+}
+
+#else
+
+#include "../floor.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/floorf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/floorf.c
new file mode 100644
index 0000000000..e1031ef401
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/floorf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+float floorf(float x)
+{
+	__asm__ ("frim %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../floorf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fma.c
new file mode 100644
index 0000000000..5aebd1ac3f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fma.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("fmadd %0, %1, %2, %3" : "=d"(x) : "d"(x), "d"(y), "d"(z));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmaf.c
new file mode 100644
index 0000000000..c678fefecd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmaf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("fmadds %0, %1, %2, %3" : "=f"(x) : "f"(x), "f"(y), "f"(z));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmax.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmax.c
new file mode 100644
index 0000000000..992df7f124
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmax.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef __VSX__
+
+double fmax(double x, double y)
+{
+	__asm__ ("xsmaxdp %x0, %x1, %x2" : "=ws"(x) : "ws"(x), "ws"(y));
+	return x;
+}
+
+#else
+
+#include "../fmax.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmaxf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmaxf.c
new file mode 100644
index 0000000000..345a234a80
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmaxf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef __VSX__
+
+float fmaxf(float x, float y)
+{
+	__asm__ ("xsmaxdp %x0, %x1, %x2" : "=ww"(x) : "ww"(x), "ww"(y));
+	return x;
+}
+
+#else
+
+#include "../fmaxf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmin.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmin.c
new file mode 100644
index 0000000000..adf71bad95
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fmin.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef __VSX__
+
+double fmin(double x, double y)
+{
+	__asm__ ("xsmindp %x0, %x1, %x2" : "=ws"(x) : "ws"(x), "ws"(y));
+	return x;
+}
+
+#else
+
+#include "../fmin.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fminf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fminf.c
new file mode 100644
index 0000000000..faf0e47e99
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/fminf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef __VSX__
+
+float fminf(float x, float y)
+{
+	__asm__ ("xsmindp %x0, %x1, %x2" : "=ww"(x) : "ww"(x), "ww"(y));
+	return x;
+}
+
+#else
+
+#include "../fminf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lrint.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lrint.c
new file mode 100644
index 0000000000..4e4b2e00a9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lrint.c
@@ -0,0 +1,16 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+long lrint(double x)
+{
+	long n;
+	__asm__ ("fctid %0, %1" : "=d"(n) : "d"(x));
+	return n;
+}
+
+#else
+
+#include "../lrint.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lrintf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lrintf.c
new file mode 100644
index 0000000000..9070fc03dc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lrintf.c
@@ -0,0 +1,16 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+long lrintf(float x)
+{
+	long n;
+	__asm__ ("fctid %0, %1" : "=d"(n) : "f"(x));
+	return n;
+}
+
+#else
+
+#include "../lrintf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lround.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lround.c
new file mode 100644
index 0000000000..ee4d1143c3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lround.c
@@ -0,0 +1,18 @@
+#include <math.h>
+
+#ifdef __VSX__
+
+long lround(double x)
+{
+	long n;
+	__asm__ (
+		"xsrdpi %1, %1\n"
+		"fctid %0, %1\n" : "=d"(n), "+d"(x));
+	return n;
+}
+
+#else
+
+#include "../lround.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lroundf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lroundf.c
new file mode 100644
index 0000000000..033094ffb2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/lroundf.c
@@ -0,0 +1,18 @@
+#include <math.h>
+
+#ifdef __VSX__
+
+long lroundf(float x)
+{
+	long n;
+	__asm__ (
+		"xsrdpi %1, %1\n"
+		"fctid %0, %1\n" : "=d"(n), "+f"(x));
+	return n;
+}
+
+#else
+
+#include "../lroundf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/round.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/round.c
new file mode 100644
index 0000000000..4b9318e09f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/round.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+double round(double x)
+{
+	__asm__ ("frin %0, %1" : "=d"(x) : "d"(x));
+	return x;
+}
+
+#else
+
+#include "../round.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/roundf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/roundf.c
new file mode 100644
index 0000000000..ae93f999ab
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/roundf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+float roundf(float x)
+{
+	__asm__ ("frin %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../roundf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/sqrt.c
new file mode 100644
index 0000000000..13bb98d91c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/sqrt.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double sqrt(double x)
+{
+	__asm__ ("fsqrt %0, %1" : "=d"(x) : "d"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/sqrtf.c
new file mode 100644
index 0000000000..b6ecb106b6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/sqrtf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float sqrtf(float x)
+{
+	__asm__ ("fsqrts %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/trunc.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/trunc.c
new file mode 100644
index 0000000000..57918548b8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/trunc.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+double trunc(double x)
+{
+	__asm__ ("friz %0, %1" : "=d"(x) : "d"(x));
+	return x;
+}
+
+#else
+
+#include "../trunc.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/truncf.c b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/truncf.c
new file mode 100644
index 0000000000..94e638fb77
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powerpc64/truncf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#ifdef _ARCH_PWR5X
+
+float truncf(float x)
+{
+	__asm__ ("friz %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../truncf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powf.c b/src/components/lib/libc/musl-1.2.0/src/math/powf.c
new file mode 100644
index 0000000000..de8fab5455
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powf.c
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <math.h>
+#include <stdint.h>
+#include "libm.h"
+#include "exp2f_data.h"
+#include "powf_data.h"
+
+/*
+POWF_LOG2_POLY_ORDER = 5
+EXP2F_TABLE_BITS = 5
+
+ULP error: 0.82 (~ 0.5 + relerr*2^24)
+relerr: 1.27 * 2^-26 (Relative error ~= 128*Ln2*relerr_log2 + relerr_exp2)
+relerr_log2: 1.83 * 2^-33 (Relative error of logx.)
+relerr_exp2: 1.69 * 2^-34 (Relative error of exp2(ylogx).)
+*/
+
+#define N (1 << POWF_LOG2_TABLE_BITS)
+#define T __powf_log2_data.tab
+#define A __powf_log2_data.poly
+#define OFF 0x3f330000
+
+/* Subnormal input is normalized so ix has negative biased exponent.
+   Output is multiplied by N (POWF_SCALE) if TOINT_INTRINICS is set.  */
+static inline double_t log2_inline(uint32_t ix)
+{
+	double_t z, r, r2, r4, p, q, y, y0, invc, logc;
+	uint32_t iz, top, tmp;
+	int k, i;
+
+	/* x = 2^k z; where z is in range [OFF,2*OFF] and exact.
+	   The range is split into N subintervals.
+	   The ith subinterval contains z and c is near its center.  */
+	tmp = ix - OFF;
+	i = (tmp >> (23 - POWF_LOG2_TABLE_BITS)) % N;
+	top = tmp & 0xff800000;
+	iz = ix - top;
+	k = (int32_t)top >> (23 - POWF_SCALE_BITS); /* arithmetic shift */
+	invc = T[i].invc;
+	logc = T[i].logc;
+	z = (double_t)asfloat(iz);
+
+	/* log2(x) = log1p(z/c-1)/ln2 + log2(c) + k */
+	r = z * invc - 1;
+	y0 = logc + (double_t)k;
+
+	/* Pipelined polynomial evaluation to approximate log1p(r)/ln2.  */
+	r2 = r * r;
+	y = A[0] * r + A[1];
+	p = A[2] * r + A[3];
+	r4 = r2 * r2;
+	q = A[4] * r + y0;
+	q = p * r2 + q;
+	y = y * r4 + q;
+	return y;
+}
+
+#undef N
+#undef T
+#define N (1 << EXP2F_TABLE_BITS)
+#define T __exp2f_data.tab
+#define SIGN_BIAS (1 << (EXP2F_TABLE_BITS + 11))
+
+/* The output of log2 and thus the input of exp2 is either scaled by N
+   (in case of fast toint intrinsics) or not.  The unscaled xd must be
+   in [-1021,1023], sign_bias sets the sign of the result.  */
+static inline float exp2_inline(double_t xd, uint32_t sign_bias)
+{
+	uint64_t ki, ski, t;
+	double_t kd, z, r, r2, y, s;
+
+#if TOINT_INTRINSICS
+#define C __exp2f_data.poly_scaled
+	/* N*x = k + r with r in [-1/2, 1/2] */
+	kd = roundtoint(xd); /* k */
+	ki = converttoint(xd);
+#else
+#define C __exp2f_data.poly
+#define SHIFT __exp2f_data.shift_scaled
+	/* x = k/N + r with r in [-1/(2N), 1/(2N)] */
+	kd = eval_as_double(xd + SHIFT);
+	ki = asuint64(kd);
+	kd -= SHIFT; /* k/N */
+#endif
+	r = xd - kd;
+
+	/* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */
+	t = T[ki % N];
+	ski = ki + sign_bias;
+	t += ski << (52 - EXP2F_TABLE_BITS);
+	s = asdouble(t);
+	z = C[0] * r + C[1];
+	r2 = r * r;
+	y = C[2] * r + 1;
+	y = z * r2 + y;
+	y = y * s;
+	return eval_as_float(y);
+}
+
+/* Returns 0 if not int, 1 if odd int, 2 if even int.  The argument is
+   the bit representation of a non-zero finite floating-point value.  */
+static inline int checkint(uint32_t iy)
+{
+	int e = iy >> 23 & 0xff;
+	if (e < 0x7f)
+		return 0;
+	if (e > 0x7f + 23)
+		return 2;
+	if (iy & ((1 << (0x7f + 23 - e)) - 1))
+		return 0;
+	if (iy & (1 << (0x7f + 23 - e)))
+		return 1;
+	return 2;
+}
+
+static inline int zeroinfnan(uint32_t ix)
+{
+	return 2 * ix - 1 >= 2u * 0x7f800000 - 1;
+}
+
+float powf(float x, float y)
+{
+	uint32_t sign_bias = 0;
+	uint32_t ix, iy;
+
+	ix = asuint(x);
+	iy = asuint(y);
+	if (predict_false(ix - 0x00800000 >= 0x7f800000 - 0x00800000 ||
+			  zeroinfnan(iy))) {
+		/* Either (x < 0x1p-126 or inf or nan) or (y is 0 or inf or nan).  */
+		if (predict_false(zeroinfnan(iy))) {
+			if (2 * iy == 0)
+				return issignalingf_inline(x) ? x + y : 1.0f;
+			if (ix == 0x3f800000)
+				return issignalingf_inline(y) ? x + y : 1.0f;
+			if (2 * ix > 2u * 0x7f800000 ||
+			    2 * iy > 2u * 0x7f800000)
+				return x + y;
+			if (2 * ix == 2 * 0x3f800000)
+				return 1.0f;
+			if ((2 * ix < 2 * 0x3f800000) == !(iy & 0x80000000))
+				return 0.0f; /* |x|<1 && y==inf or |x|>1 && y==-inf.  */
+			return y * y;
+		}
+		if (predict_false(zeroinfnan(ix))) {
+			float_t x2 = x * x;
+			if (ix & 0x80000000 && checkint(iy) == 1)
+				x2 = -x2;
+			/* Without the barrier some versions of clang hoist the 1/x2 and
+			   thus division by zero exception can be signaled spuriously.  */
+			return iy & 0x80000000 ? fp_barrierf(1 / x2) : x2;
+		}
+		/* x and y are non-zero finite.  */
+		if (ix & 0x80000000) {
+			/* Finite x < 0.  */
+			int yint = checkint(iy);
+			if (yint == 0)
+				return __math_invalidf(x);
+			if (yint == 1)
+				sign_bias = SIGN_BIAS;
+			ix &= 0x7fffffff;
+		}
+		if (ix < 0x00800000) {
+			/* Normalize subnormal x so exponent becomes negative.  */
+			ix = asuint(x * 0x1p23f);
+			ix &= 0x7fffffff;
+			ix -= 23 << 23;
+		}
+	}
+	double_t logx = log2_inline(ix);
+	double_t ylogx = y * logx; /* cannot overflow, y is single prec.  */
+	if (predict_false((asuint64(ylogx) >> 47 & 0xffff) >=
+			  asuint64(126.0 * POWF_SCALE) >> 47)) {
+		/* |y*log(x)| >= 126.  */
+		if (ylogx > 0x1.fffffffd1d571p+6 * POWF_SCALE)
+			return __math_oflowf(sign_bias);
+		if (ylogx <= -150.0 * POWF_SCALE)
+			return __math_uflowf(sign_bias);
+	}
+	return exp2_inline(ylogx, sign_bias);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powf_data.c b/src/components/lib/libc/musl-1.2.0/src/math/powf_data.c
new file mode 100644
index 0000000000..13e1d9a06a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powf_data.c
@@ -0,0 +1,34 @@
+/*
+ * Data definition for powf.
+ *
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "powf_data.h"
+
+const struct powf_log2_data __powf_log2_data = {
+  .tab = {
+  { 0x1.661ec79f8f3bep+0, -0x1.efec65b963019p-2 * POWF_SCALE },
+  { 0x1.571ed4aaf883dp+0, -0x1.b0b6832d4fca4p-2 * POWF_SCALE },
+  { 0x1.49539f0f010bp+0, -0x1.7418b0a1fb77bp-2 * POWF_SCALE },
+  { 0x1.3c995b0b80385p+0, -0x1.39de91a6dcf7bp-2 * POWF_SCALE },
+  { 0x1.30d190c8864a5p+0, -0x1.01d9bf3f2b631p-2 * POWF_SCALE },
+  { 0x1.25e227b0b8eap+0, -0x1.97c1d1b3b7afp-3 * POWF_SCALE },
+  { 0x1.1bb4a4a1a343fp+0, -0x1.2f9e393af3c9fp-3 * POWF_SCALE },
+  { 0x1.12358f08ae5bap+0, -0x1.960cbbf788d5cp-4 * POWF_SCALE },
+  { 0x1.0953f419900a7p+0, -0x1.a6f9db6475fcep-5 * POWF_SCALE },
+  { 0x1p+0, 0x0p+0 * POWF_SCALE },
+  { 0x1.e608cfd9a47acp-1, 0x1.338ca9f24f53dp-4 * POWF_SCALE },
+  { 0x1.ca4b31f026aap-1, 0x1.476a9543891bap-3 * POWF_SCALE },
+  { 0x1.b2036576afce6p-1, 0x1.e840b4ac4e4d2p-3 * POWF_SCALE },
+  { 0x1.9c2d163a1aa2dp-1, 0x1.40645f0c6651cp-2 * POWF_SCALE },
+  { 0x1.886e6037841edp-1, 0x1.88e9c2c1b9ff8p-2 * POWF_SCALE },
+  { 0x1.767dcf5534862p-1, 0x1.ce0a44eb17bccp-2 * POWF_SCALE },
+  },
+  .poly = {
+  0x1.27616c9496e0bp-2 * POWF_SCALE, -0x1.71969a075c67ap-2 * POWF_SCALE,
+  0x1.ec70a6ca7baddp-2 * POWF_SCALE, -0x1.7154748bef6c8p-1 * POWF_SCALE,
+  0x1.71547652ab82bp0 * POWF_SCALE,
+  }
+};
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/powf_data.h b/src/components/lib/libc/musl-1.2.0/src/math/powf_data.h
new file mode 100644
index 0000000000..5b136e2837
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/powf_data.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017-2018, Arm Limited.
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef _POWF_DATA_H
+#define _POWF_DATA_H
+
+#include "libm.h"
+#include "exp2f_data.h"
+
+#define POWF_LOG2_TABLE_BITS 4
+#define POWF_LOG2_POLY_ORDER 5
+#if TOINT_INTRINSICS
+#define POWF_SCALE_BITS EXP2F_TABLE_BITS
+#else
+#define POWF_SCALE_BITS 0
+#endif
+#define POWF_SCALE ((double)(1 << POWF_SCALE_BITS))
+extern hidden const struct powf_log2_data {
+	struct {
+		double invc, logc;
+	} tab[1 << POWF_LOG2_TABLE_BITS];
+	double poly[POWF_LOG2_POLY_ORDER];
+} __powf_log2_data;
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/powl.c b/src/components/lib/libc/musl-1.2.0/src/math/powl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/powl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/powl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/remainder.c b/src/components/lib/libc/musl-1.2.0/src/math/remainder.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/math/remainder.c
rename to src/components/lib/libc/musl-1.2.0/src/math/remainder.c
index 6cd089c467..612155feda 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/remainder.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/remainder.c
@@ -1,5 +1,4 @@
 #include <math.h>
-#include "libc.h"
 
 double remainder(double x, double y)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/remainderf.c b/src/components/lib/libc/musl-1.2.0/src/math/remainderf.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/math/remainderf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/remainderf.c
index 420d3bfc44..bf1d7b2831 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/remainderf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/remainderf.c
@@ -1,5 +1,4 @@
 #include <math.h>
-#include "libc.h"
 
 float remainderf(float x, float y)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/remainderl.c b/src/components/lib/libc/musl-1.2.0/src/math/remainderl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/remainderl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/remainderl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/remquo.c b/src/components/lib/libc/musl-1.2.0/src/math/remquo.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/remquo.c
rename to src/components/lib/libc/musl-1.2.0/src/math/remquo.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/remquof.c b/src/components/lib/libc/musl-1.2.0/src/math/remquof.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/remquof.c
rename to src/components/lib/libc/musl-1.2.0/src/math/remquof.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/remquol.c b/src/components/lib/libc/musl-1.2.0/src/math/remquol.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/remquol.c
rename to src/components/lib/libc/musl-1.2.0/src/math/remquol.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/rint.c b/src/components/lib/libc/musl-1.2.0/src/math/rint.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/rint.c
rename to src/components/lib/libc/musl-1.2.0/src/math/rint.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/rintf.c b/src/components/lib/libc/musl-1.2.0/src/math/rintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/rintf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/rintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/rintl.c b/src/components/lib/libc/musl-1.2.0/src/math/rintl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/rintl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/rintl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/copysign.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/copysign.c
new file mode 100644
index 0000000000..c7854178f0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/copysign.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 64
+
+double copysign(double x, double y)
+{
+	__asm__ ("fsgnj.d %0, %1, %2" : "=f"(x) : "f"(x), "f"(y));
+	return x;
+}
+
+#else
+
+#include "../copysign.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/copysignf.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/copysignf.c
new file mode 100644
index 0000000000..a125611ace
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/copysignf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 32
+
+float copysignf(float x, float y)
+{
+	__asm__ ("fsgnj.s %0, %1, %2" : "=f"(x) : "f"(x), "f"(y));
+	return x;
+}
+
+#else
+
+#include "../copysignf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fabs.c
new file mode 100644
index 0000000000..5290b6f093
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fabs.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 64
+
+double fabs(double x)
+{
+	__asm__ ("fabs.d %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../fabs.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fabsf.c
new file mode 100644
index 0000000000..f5032e354d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fabsf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 32
+
+float fabsf(float x)
+{
+	__asm__ ("fabs.s %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../fabsf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fma.c
new file mode 100644
index 0000000000..99b0571301
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fma.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 64
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("fmadd.d %0, %1, %2, %3" : "=f"(x) : "f"(x), "f"(y), "f"(z));
+	return x;
+}
+
+#else
+
+#include "../fma.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmaf.c
new file mode 100644
index 0000000000..f9dc47eda9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmaf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 32
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("fmadd.s %0, %1, %2, %3" : "=f"(x) : "f"(x), "f"(y), "f"(z));
+	return x;
+}
+
+#else
+
+#include "../fmaf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmax.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmax.c
new file mode 100644
index 0000000000..023709cdfd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmax.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 64
+
+double fmax(double x, double y)
+{
+	__asm__ ("fmax.d %0, %1, %2" : "=f"(x) : "f"(x), "f"(y));
+	return x;
+}
+
+#else
+
+#include "../fmax.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmaxf.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmaxf.c
new file mode 100644
index 0000000000..863d2bd17a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmaxf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 32
+
+float fmaxf(float x, float y)
+{
+	__asm__ ("fmax.s %0, %1, %2" : "=f"(x) : "f"(x), "f"(y));
+	return x;
+}
+
+#else
+
+#include "../fmaxf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmin.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmin.c
new file mode 100644
index 0000000000..a4e3b06710
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fmin.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 64
+
+double fmin(double x, double y)
+{
+	__asm__ ("fmin.d %0, %1, %2" : "=f"(x) : "f"(x), "f"(y));
+	return x;
+}
+
+#else
+
+#include "../fmin.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fminf.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fminf.c
new file mode 100644
index 0000000000..32156e80e3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/fminf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 32
+
+float fminf(float x, float y)
+{
+	__asm__ ("fmin.s %0, %1, %2" : "=f"(x) : "f"(x), "f"(y));
+	return x;
+}
+
+#else
+
+#include "../fminf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/sqrt.c
new file mode 100644
index 0000000000..867a504c27
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/sqrt.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 64
+
+double sqrt(double x)
+{
+	__asm__ ("fsqrt.d %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../sqrt.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/riscv64/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/sqrtf.c
new file mode 100644
index 0000000000..610c2cf800
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/riscv64/sqrtf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if __riscv_flen >= 32
+
+float sqrtf(float x)
+{
+	__asm__ ("fsqrt.s %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../sqrtf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/round.c b/src/components/lib/libc/musl-1.2.0/src/math/round.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/round.c
rename to src/components/lib/libc/musl-1.2.0/src/math/round.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/roundf.c b/src/components/lib/libc/musl-1.2.0/src/math/roundf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/roundf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/roundf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/roundl.c b/src/components/lib/libc/musl-1.2.0/src/math/roundl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/roundl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/roundl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceil.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceil.c
new file mode 100644
index 0000000000..aee17df75f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceil.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double ceil(double x)
+{
+	__asm__ ("fidbra %0, 6, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../ceil.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceilf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceilf.c
new file mode 100644
index 0000000000..29ba8d4e77
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceilf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float ceilf(float x)
+{
+	__asm__ ("fiebra %0, 6, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../ceilf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceill.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceill.c
new file mode 100644
index 0000000000..b838dc13e0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/ceill.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double ceill(long double x)
+{
+	__asm__ ("fixbra %0, 6, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../ceill.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabs.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabs.c
new file mode 100644
index 0000000000..9bb51cb5ff
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabs.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double fabs(double x)
+{
+	__asm__ ("lpdbr %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../fabs.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabsf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabsf.c
new file mode 100644
index 0000000000..9fd96bc9d2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabsf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float fabsf(float x)
+{
+	__asm__ ("lpebr %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../fabsf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabsl.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabsl.c
new file mode 100644
index 0000000000..65f1005d4e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fabsl.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double fabsl(long double x)
+{
+	__asm__ ("lpxbr %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../fabsl.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/floor.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/floor.c
new file mode 100644
index 0000000000..4c0c7f1adb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/floor.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double floor(double x)
+{
+	__asm__ ("fidbra %0, 7, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../floor.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/floorf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/floorf.c
new file mode 100644
index 0000000000..ea28ec7ac5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/floorf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float floorf(float x)
+{
+	__asm__ ("fiebra %0, 7, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../floorf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/floorl.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/floorl.c
new file mode 100644
index 0000000000..8a0e16a2f8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/floorl.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double floorl(long double x)
+{
+	__asm__ ("fixbra %0, 7, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../floorl.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fma.c
new file mode 100644
index 0000000000..86da0e4958
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fma.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("madbr %0, %1, %2" : "+f"(z) : "f"(x), "f"(y));
+	return z;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fmaf.c
new file mode 100644
index 0000000000..f1aec6ade3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/fmaf.c
@@ -0,0 +1,7 @@
+#include <math.h>
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("maebr %0, %1, %2" : "+f"(z) : "f"(x), "f"(y));
+	return z;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyint.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyint.c
new file mode 100644
index 0000000000..b70da52deb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyint.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double nearbyint(double x)
+{
+	__asm__ ("fidbra %0, 0, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../nearbyint.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyintf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyintf.c
new file mode 100644
index 0000000000..704f267819
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyintf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float nearbyintf(float x)
+{
+	__asm__ ("fiebra %0, 0, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../nearbyintf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyintl.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyintl.c
new file mode 100644
index 0000000000..b4bd5523c7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/nearbyintl.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double nearbyintl(long double x)
+{
+	__asm__ ("fixbra %0, 0, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../nearbyintl.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/rint.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/rint.c
new file mode 100644
index 0000000000..b02f09eb06
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/rint.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double rint(double x)
+{
+	__asm__ ("fidbr %0, 0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../rint.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/rintf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/rintf.c
new file mode 100644
index 0000000000..c9f13130cf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/rintf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float rintf(float x)
+{
+	__asm__ ("fiebr %0, 0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../rintf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/rintl.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/rintl.c
new file mode 100644
index 0000000000..bae53185a2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/rintl.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double rintl(long double x)
+{
+	__asm__ ("fixbr %0, 0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../rintl.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/round.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/round.c
new file mode 100644
index 0000000000..71f8025118
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/round.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double round(double x)
+{
+	__asm__ ("fidbra %0, 1, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../round.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/roundf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/roundf.c
new file mode 100644
index 0000000000..46d2e10c87
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/roundf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float roundf(float x)
+{
+	__asm__ ("fiebra %0, 1, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../roundf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/roundl.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/roundl.c
new file mode 100644
index 0000000000..ce644ddd79
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/roundl.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double roundl(long double x)
+{
+	__asm__ ("fixbra %0, 1, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../roundl.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrt.c
new file mode 100644
index 0000000000..a80dc4a7d9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrt.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double sqrt(double x)
+{
+	__asm__ ("sqdbr %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../sqrt.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrtf.c
new file mode 100644
index 0000000000..52f57eb998
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrtf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float sqrtf(float x)
+{
+	__asm__ ("sqebr %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../sqrtf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrtl.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrtl.c
new file mode 100644
index 0000000000..5702d54da0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/sqrtl.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double sqrtl(long double x)
+{
+	__asm__ ("sqxbr %0, %1" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../sqrtl.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/trunc.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/trunc.c
new file mode 100644
index 0000000000..3e5d8862e6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/trunc.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+double trunc(double x)
+{
+	__asm__ ("fidbra %0, 5, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../trunc.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/truncf.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/truncf.c
new file mode 100644
index 0000000000..9097bacd0c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/truncf.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+float truncf(float x)
+{
+	__asm__ ("fiebra %0, 5, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../truncf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/s390x/truncl.c b/src/components/lib/libc/musl-1.2.0/src/math/s390x/truncl.c
new file mode 100644
index 0000000000..4eb920a519
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/s390x/truncl.c
@@ -0,0 +1,15 @@
+#include <math.h>
+
+#if defined(__HTM__) || __ARCH__ >= 9
+
+long double truncl(long double x)
+{
+	__asm__ ("fixbra %0, 5, %1, 4" : "=f"(x) : "f"(x));
+	return x;
+}
+
+#else
+
+#include "../truncl.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalb.c b/src/components/lib/libc/musl-1.2.0/src/math/scalb.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/scalb.c
rename to src/components/lib/libc/musl-1.2.0/src/math/scalb.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalbf.c b/src/components/lib/libc/musl-1.2.0/src/math/scalbf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/scalbf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/scalbf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalbln.c b/src/components/lib/libc/musl-1.2.0/src/math/scalbln.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/scalbln.c
rename to src/components/lib/libc/musl-1.2.0/src/math/scalbln.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalblnf.c b/src/components/lib/libc/musl-1.2.0/src/math/scalblnf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/scalblnf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/scalblnf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalblnl.c b/src/components/lib/libc/musl-1.2.0/src/math/scalblnl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/scalblnl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/scalblnl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/scalbn.c b/src/components/lib/libc/musl-1.2.0/src/math/scalbn.c
new file mode 100644
index 0000000000..182f561068
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/scalbn.c
@@ -0,0 +1,33 @@
+#include <math.h>
+#include <stdint.h>
+
+double scalbn(double x, int n)
+{
+	union {double f; uint64_t i;} u;
+	double_t y = x;
+
+	if (n > 1023) {
+		y *= 0x1p1023;
+		n -= 1023;
+		if (n > 1023) {
+			y *= 0x1p1023;
+			n -= 1023;
+			if (n > 1023)
+				n = 1023;
+		}
+	} else if (n < -1022) {
+		/* make sure final n < -53 to avoid double
+		   rounding in the subnormal range */
+		y *= 0x1p-1022 * 0x1p53;
+		n += 1022 - 53;
+		if (n < -1022) {
+			y *= 0x1p-1022 * 0x1p53;
+			n += 1022 - 53;
+			if (n < -1022)
+				n = -1022;
+		}
+	}
+	u.i = (uint64_t)(0x3ff+n)<<52;
+	x = y * u.f;
+	return x;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalbnf.c b/src/components/lib/libc/musl-1.2.0/src/math/scalbnf.c
similarity index 80%
rename from src/components/lib/libc/musl-1.1.11/src/math/scalbnf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/scalbnf.c
index 0b62c3c71f..a5ad208b69 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/scalbnf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/scalbnf.c
@@ -16,11 +16,11 @@ float scalbnf(float x, int n)
 				n = 127;
 		}
 	} else if (n < -126) {
-		y *= 0x1p-126f;
-		n += 126;
+		y *= 0x1p-126f * 0x1p24f;
+		n += 126 - 24;
 		if (n < -126) {
-			y *= 0x1p-126f;
-			n += 126;
+			y *= 0x1p-126f * 0x1p24f;
+			n += 126 - 24;
 			if (n < -126)
 				n = -126;
 		}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/scalbnl.c b/src/components/lib/libc/musl-1.2.0/src/math/scalbnl.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/math/scalbnl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/scalbnl.c
index 08a4c58754..db44dab064 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/scalbnl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/scalbnl.c
@@ -20,11 +20,11 @@ long double scalbnl(long double x, int n)
 				n = 16383;
 		}
 	} else if (n < -16382) {
-		x *= 0x1p-16382L;
-		n += 16382;
+		x *= 0x1p-16382L * 0x1p113L;
+		n += 16382 - 113;
 		if (n < -16382) {
-			x *= 0x1p-16382L;
-			n += 16382;
+			x *= 0x1p-16382L * 0x1p113L;
+			n += 16382 - 113;
 			if (n < -16382)
 				n = -16382;
 		}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/signgam.c b/src/components/lib/libc/musl-1.2.0/src/math/signgam.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/math/signgam.c
rename to src/components/lib/libc/musl-1.2.0/src/math/signgam.c
index cd728001ba..ee331b274e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/math/signgam.c
+++ b/src/components/lib/libc/musl-1.2.0/src/math/signgam.c
@@ -1,5 +1,5 @@
 #include <math.h>
-#include "libc.h"
+#include "libm.h"
 
 int __signgam = 0;
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/significand.c b/src/components/lib/libc/musl-1.2.0/src/math/significand.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/significand.c
rename to src/components/lib/libc/musl-1.2.0/src/math/significand.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/significandf.c b/src/components/lib/libc/musl-1.2.0/src/math/significandf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/significandf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/significandf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sin.c b/src/components/lib/libc/musl-1.2.0/src/math/sin.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sin.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sin.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sincos.c b/src/components/lib/libc/musl-1.2.0/src/math/sincos.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sincos.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sincos.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sincosf.c b/src/components/lib/libc/musl-1.2.0/src/math/sincosf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sincosf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sincosf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sincosl.c b/src/components/lib/libc/musl-1.2.0/src/math/sincosl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sincosl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sincosl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sinf.c b/src/components/lib/libc/musl-1.2.0/src/math/sinf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sinf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sinf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sinh.c b/src/components/lib/libc/musl-1.2.0/src/math/sinh.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sinh.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sinh.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sinhf.c b/src/components/lib/libc/musl-1.2.0/src/math/sinhf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sinhf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sinhf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sinhl.c b/src/components/lib/libc/musl-1.2.0/src/math/sinhl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sinhl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sinhl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sinl.c b/src/components/lib/libc/musl-1.2.0/src/math/sinl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sinl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sinl.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/sqrt.c b/src/components/lib/libc/musl-1.2.0/src/math/sqrt.c
new file mode 100644
index 0000000000..f1f6d76c78
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/sqrt.c
@@ -0,0 +1,184 @@
+/* origin: FreeBSD /usr/src/lib/msun/src/e_sqrt.c */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunSoft, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+/* sqrt(x)
+ * Return correctly rounded sqrt.
+ *           ------------------------------------------
+ *           |  Use the hardware sqrt if you have one |
+ *           ------------------------------------------
+ * Method:
+ *   Bit by bit method using integer arithmetic. (Slow, but portable)
+ *   1. Normalization
+ *      Scale x to y in [1,4) with even powers of 2:
+ *      find an integer k such that  1 <= (y=x*2^(2k)) < 4, then
+ *              sqrt(x) = 2^k * sqrt(y)
+ *   2. Bit by bit computation
+ *      Let q  = sqrt(y) truncated to i bit after binary point (q = 1),
+ *           i                                                   0
+ *                                     i+1         2
+ *          s  = 2*q , and      y  =  2   * ( y - q  ).         (1)
+ *           i      i            i                 i
+ *
+ *      To compute q    from q , one checks whether
+ *                  i+1       i
+ *
+ *                            -(i+1) 2
+ *                      (q + 2      ) <= y.                     (2)
+ *                        i
+ *                                                            -(i+1)
+ *      If (2) is false, then q   = q ; otherwise q   = q  + 2      .
+ *                             i+1   i             i+1   i
+ *
+ *      With some algebric manipulation, it is not difficult to see
+ *      that (2) is equivalent to
+ *                             -(i+1)
+ *                      s  +  2       <= y                      (3)
+ *                       i                i
+ *
+ *      The advantage of (3) is that s  and y  can be computed by
+ *                                    i      i
+ *      the following recurrence formula:
+ *          if (3) is false
+ *
+ *          s     =  s  ,       y    = y   ;                    (4)
+ *           i+1      i          i+1    i
+ *
+ *          otherwise,
+ *                         -i                     -(i+1)
+ *          s     =  s  + 2  ,  y    = y  -  s  - 2             (5)
+ *           i+1      i          i+1    i     i
+ *
+ *      One may easily use induction to prove (4) and (5).
+ *      Note. Since the left hand side of (3) contain only i+2 bits,
+ *            it does not necessary to do a full (53-bit) comparison
+ *            in (3).
+ *   3. Final rounding
+ *      After generating the 53 bits result, we compute one more bit.
+ *      Together with the remainder, we can decide whether the
+ *      result is exact, bigger than 1/2ulp, or less than 1/2ulp
+ *      (it will never equal to 1/2ulp).
+ *      The rounding mode can be detected by checking whether
+ *      huge + tiny is equal to huge, and whether huge - tiny is
+ *      equal to huge for some floating point number "huge" and "tiny".
+ *
+ * Special cases:
+ *      sqrt(+-0) = +-0         ... exact
+ *      sqrt(inf) = inf
+ *      sqrt(-ve) = NaN         ... with invalid signal
+ *      sqrt(NaN) = NaN         ... with invalid signal for signaling NaN
+ */
+
+#include "libm.h"
+
+static const double tiny = 1.0e-300;
+
+double sqrt(double x)
+{
+	double z;
+	int32_t sign = (int)0x80000000;
+	int32_t ix0,s0,q,m,t,i;
+	uint32_t r,t1,s1,ix1,q1;
+
+	EXTRACT_WORDS(ix0, ix1, x);
+
+	/* take care of Inf and NaN */
+	if ((ix0&0x7ff00000) == 0x7ff00000) {
+		return x*x + x;  /* sqrt(NaN)=NaN, sqrt(+inf)=+inf, sqrt(-inf)=sNaN */
+	}
+	/* take care of zero */
+	if (ix0 <= 0) {
+		if (((ix0&~sign)|ix1) == 0)
+			return x;  /* sqrt(+-0) = +-0 */
+		if (ix0 < 0)
+			return (x-x)/(x-x);  /* sqrt(-ve) = sNaN */
+	}
+	/* normalize x */
+	m = ix0>>20;
+	if (m == 0) {  /* subnormal x */
+		while (ix0 == 0) {
+			m -= 21;
+			ix0 |= (ix1>>11);
+			ix1 <<= 21;
+		}
+		for (i=0; (ix0&0x00100000) == 0; i++)
+			ix0<<=1;
+		m -= i - 1;
+		ix0 |= ix1>>(32-i);
+		ix1 <<= i;
+	}
+	m -= 1023;    /* unbias exponent */
+	ix0 = (ix0&0x000fffff)|0x00100000;
+	if (m & 1) {  /* odd m, double x to make it even */
+		ix0 += ix0 + ((ix1&sign)>>31);
+		ix1 += ix1;
+	}
+	m >>= 1;      /* m = [m/2] */
+
+	/* generate sqrt(x) bit by bit */
+	ix0 += ix0 + ((ix1&sign)>>31);
+	ix1 += ix1;
+	q = q1 = s0 = s1 = 0;  /* [q,q1] = sqrt(x) */
+	r = 0x00200000;        /* r = moving bit from right to left */
+
+	while (r != 0) {
+		t = s0 + r;
+		if (t <= ix0) {
+			s0   = t + r;
+			ix0 -= t;
+			q   += r;
+		}
+		ix0 += ix0 + ((ix1&sign)>>31);
+		ix1 += ix1;
+		r >>= 1;
+	}
+
+	r = sign;
+	while (r != 0) {
+		t1 = s1 + r;
+		t  = s0;
+		if (t < ix0 || (t == ix0 && t1 <= ix1)) {
+			s1 = t1 + r;
+			if ((t1&sign) == sign && (s1&sign) == 0)
+				s0++;
+			ix0 -= t;
+			if (ix1 < t1)
+				ix0--;
+			ix1 -= t1;
+			q1 += r;
+		}
+		ix0 += ix0 + ((ix1&sign)>>31);
+		ix1 += ix1;
+		r >>= 1;
+	}
+
+	/* use floating add to find out rounding direction */
+	if ((ix0|ix1) != 0) {
+		z = 1.0 - tiny; /* raise inexact flag */
+		if (z >= 1.0) {
+			z = 1.0 + tiny;
+			if (q1 == (uint32_t)0xffffffff) {
+				q1 = 0;
+				q++;
+			} else if (z > 1.0) {
+				if (q1 == (uint32_t)0xfffffffe)
+					q++;
+				q1 += 2;
+			} else
+				q1 += q1 & 1;
+		}
+	}
+	ix0 = (q>>1) + 0x3fe00000;
+	ix1 = q1>>1;
+	if (q&1)
+		ix1 |= sign;
+	INSERT_WORDS(z, ix0 + ((uint32_t)m << 20), ix1);
+	return z;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/sqrtf.c b/src/components/lib/libc/musl-1.2.0/src/math/sqrtf.c
new file mode 100644
index 0000000000..d6ace38aa6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/sqrtf.c
@@ -0,0 +1,83 @@
+/* origin: FreeBSD /usr/src/lib/msun/src/e_sqrtf.c */
+/*
+ * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
+ */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#include "libm.h"
+
+static const float tiny = 1.0e-30;
+
+float sqrtf(float x)
+{
+	float z;
+	int32_t sign = (int)0x80000000;
+	int32_t ix,s,q,m,t,i;
+	uint32_t r;
+
+	GET_FLOAT_WORD(ix, x);
+
+	/* take care of Inf and NaN */
+	if ((ix&0x7f800000) == 0x7f800000)
+		return x*x + x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf, sqrt(-inf)=sNaN */
+
+	/* take care of zero */
+	if (ix <= 0) {
+		if ((ix&~sign) == 0)
+			return x;  /* sqrt(+-0) = +-0 */
+		if (ix < 0)
+			return (x-x)/(x-x);  /* sqrt(-ve) = sNaN */
+	}
+	/* normalize x */
+	m = ix>>23;
+	if (m == 0) {  /* subnormal x */
+		for (i = 0; (ix&0x00800000) == 0; i++)
+			ix<<=1;
+		m -= i - 1;
+	}
+	m -= 127;  /* unbias exponent */
+	ix = (ix&0x007fffff)|0x00800000;
+	if (m&1)  /* odd m, double x to make it even */
+		ix += ix;
+	m >>= 1;  /* m = [m/2] */
+
+	/* generate sqrt(x) bit by bit */
+	ix += ix;
+	q = s = 0;       /* q = sqrt(x) */
+	r = 0x01000000;  /* r = moving bit from right to left */
+
+	while (r != 0) {
+		t = s + r;
+		if (t <= ix) {
+			s = t+r;
+			ix -= t;
+			q += r;
+		}
+		ix += ix;
+		r >>= 1;
+	}
+
+	/* use floating add to find out rounding direction */
+	if (ix != 0) {
+		z = 1.0f - tiny; /* raise inexact flag */
+		if (z >= 1.0f) {
+			z = 1.0f + tiny;
+			if (z > 1.0f)
+				q += 2;
+			else
+				q += q & 1;
+		}
+	}
+	ix = (q>>1) + 0x3f000000;
+	SET_FLOAT_WORD(z, ix + ((uint32_t)m << 23));
+	return z;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/sqrtl.c b/src/components/lib/libc/musl-1.2.0/src/math/sqrtl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/sqrtl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/sqrtl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tan.c b/src/components/lib/libc/musl-1.2.0/src/math/tan.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tan.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tan.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tanf.c b/src/components/lib/libc/musl-1.2.0/src/math/tanf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tanf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tanf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tanh.c b/src/components/lib/libc/musl-1.2.0/src/math/tanh.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tanh.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tanh.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tanhf.c b/src/components/lib/libc/musl-1.2.0/src/math/tanhf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tanhf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tanhf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tanhl.c b/src/components/lib/libc/musl-1.2.0/src/math/tanhl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tanhl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tanhl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tanl.c b/src/components/lib/libc/musl-1.2.0/src/math/tanl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tanl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tanl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tgamma.c b/src/components/lib/libc/musl-1.2.0/src/math/tgamma.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tgamma.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tgamma.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tgammaf.c b/src/components/lib/libc/musl-1.2.0/src/math/tgammaf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tgammaf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tgammaf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/tgammal.c b/src/components/lib/libc/musl-1.2.0/src/math/tgammal.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/tgammal.c
rename to src/components/lib/libc/musl-1.2.0/src/math/tgammal.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/trunc.c b/src/components/lib/libc/musl-1.2.0/src/math/trunc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/trunc.c
rename to src/components/lib/libc/musl-1.2.0/src/math/trunc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/truncf.c b/src/components/lib/libc/musl-1.2.0/src/math/truncf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/truncf.c
rename to src/components/lib/libc/musl-1.2.0/src/math/truncf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/truncl.c b/src/components/lib/libc/musl-1.2.0/src/math/truncl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/truncl.c
rename to src/components/lib/libc/musl-1.2.0/src/math/truncl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/__invtrigl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/__invtrigl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/__invtrigl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/__invtrigl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/acosl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/acosl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/acosl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/acosl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/asinl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/asinl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/asinl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/asinl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/atan2l.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/atan2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/atan2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/atan2l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/atanl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/atanl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/atanl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/atanl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/ceill.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/ceill.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/ceill.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/ceill.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/exp2l.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/exp2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/exp2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/exp2l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/expl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/expl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/expl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/expl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/expm1l.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/expm1l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/expm1l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/expm1l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/fabs.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/fabs.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/fabs.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/fabs.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/fabsf.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/fabsf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/fabsf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/fabsf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/fabsl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/fabsl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/fabsl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/fabsl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/floorl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/floorl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/floorl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/floorl.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/x32/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/x32/fma.c
new file mode 100644
index 0000000000..4dd53f2ac8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/x32/fma.c
@@ -0,0 +1,23 @@
+#include <math.h>
+
+#if __FMA__
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("vfmadd132sd %1, %2, %0" : "+x" (x) : "x" (y), "x" (z));
+	return x;
+}
+
+#elif __FMA4__
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("vfmaddsd %3, %2, %1, %0" : "=x" (x) : "x" (x), "x" (y), "x" (z));
+	return x;
+}
+
+#else
+
+#include "../fma.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/x32/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/x32/fmaf.c
new file mode 100644
index 0000000000..30b971ff97
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/x32/fmaf.c
@@ -0,0 +1,23 @@
+#include <math.h>
+
+#if __FMA__
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("vfmadd132ss %1, %2, %0" : "+x" (x) : "x" (y), "x" (z));
+	return x;
+}
+
+#elif __FMA4__
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("vfmaddss %3, %2, %1, %0" : "=x" (x) : "x" (x), "x" (y), "x" (z));
+	return x;
+}
+
+#else
+
+#include "../fmaf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/fmodl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/fmodl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/fmodl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/fmodl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/llrint.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/llrint.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/llrint.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/llrint.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/llrintf.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/llrintf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/llrintf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/llrintf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/llrintl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/llrintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/llrintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/llrintl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/log10l.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/log10l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/log10l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/log10l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/log1pl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/log1pl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/log1pl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/log1pl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/log2l.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/log2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/log2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/log2l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/logl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/logl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/logl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/logl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/lrint.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/lrint.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/lrint.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/lrint.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/lrintf.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/lrintf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/lrintf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/lrintf.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/x32/lrintl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/lrintl.s
new file mode 100644
index 0000000000..d4355c327c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/x32/lrintl.s
@@ -0,0 +1,7 @@
+.global lrintl
+.type lrintl,@function
+lrintl:
+	fldt 8(%esp)
+	fistpl 8(%esp)
+	movl 8(%esp),%eax
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/remainderl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/remainderl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/remainderl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/remainderl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/rintl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/rintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/rintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/rintl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/sqrt.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/sqrt.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/sqrt.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/sqrt.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/sqrtf.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/sqrtf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/sqrtf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/sqrtf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/sqrtl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/sqrtl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/sqrtl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/sqrtl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x32/truncl.s b/src/components/lib/libc/musl-1.2.0/src/math/x32/truncl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x32/truncl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x32/truncl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/__invtrigl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/__invtrigl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/__invtrigl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/__invtrigl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/acosl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/acosl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/acosl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/acosl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/asinl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/asinl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/asinl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/asinl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/atan2l.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/atan2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/atan2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/atan2l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/atanl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/atanl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/atanl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/atanl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/ceill.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/ceill.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/ceill.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/ceill.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/exp2l.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/exp2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/exp2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/exp2l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/expl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/expl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/expl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/expl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/expm1l.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/expm1l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/expm1l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/expm1l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/fabs.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fabs.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/fabs.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/fabs.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/fabsf.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fabsf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/fabsf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/fabsf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/fabsl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fabsl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/fabsl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/fabsl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/floorl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/floorl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/floorl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/floorl.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fma.c b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fma.c
new file mode 100644
index 0000000000..4dd53f2ac8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fma.c
@@ -0,0 +1,23 @@
+#include <math.h>
+
+#if __FMA__
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("vfmadd132sd %1, %2, %0" : "+x" (x) : "x" (y), "x" (z));
+	return x;
+}
+
+#elif __FMA4__
+
+double fma(double x, double y, double z)
+{
+	__asm__ ("vfmaddsd %3, %2, %1, %0" : "=x" (x) : "x" (x), "x" (y), "x" (z));
+	return x;
+}
+
+#else
+
+#include "../fma.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fmaf.c b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fmaf.c
new file mode 100644
index 0000000000..30b971ff97
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fmaf.c
@@ -0,0 +1,23 @@
+#include <math.h>
+
+#if __FMA__
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("vfmadd132ss %1, %2, %0" : "+x" (x) : "x" (y), "x" (z));
+	return x;
+}
+
+#elif __FMA4__
+
+float fmaf(float x, float y, float z)
+{
+	__asm__ ("vfmaddss %3, %2, %1, %0" : "=x" (x) : "x" (x), "x" (y), "x" (z));
+	return x;
+}
+
+#else
+
+#include "../fmaf.c"
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/fmodl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/fmodl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/fmodl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/fmodl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/llrint.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/llrint.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/llrint.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/llrint.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/llrintf.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/llrintf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/llrintf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/llrintf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/llrintl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/llrintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/llrintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/llrintl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/log10l.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/log10l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/log10l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/log10l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/log1pl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/log1pl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/log1pl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/log1pl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/log2l.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/log2l.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/log2l.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/log2l.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/logl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/logl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/logl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/logl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/lrint.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/lrint.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/lrint.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/lrint.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/lrintf.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/lrintf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/lrintf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/lrintf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/lrintl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/lrintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/lrintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/lrintl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/remainderl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/remainderl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/remainderl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/remainderl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/rintl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/rintl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/rintl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/rintl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/sqrt.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/sqrt.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/sqrt.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/sqrt.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/sqrtf.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/sqrtf.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/sqrtf.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/sqrtf.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/sqrtl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/sqrtl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/sqrtl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/sqrtl.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/math/x86_64/truncl.s b/src/components/lib/libc/musl-1.2.0/src/math/x86_64/truncl.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/math/x86_64/truncl.s
rename to src/components/lib/libc/musl-1.2.0/src/math/x86_64/truncl.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/misc/a64l.c b/src/components/lib/libc/musl-1.2.0/src/misc/a64l.c
new file mode 100644
index 0000000000..6055771040
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/a64l.c
@@ -0,0 +1,29 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+static const char digits[] =
+	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+long a64l(const char *s)
+{
+	int e;
+	uint32_t x = 0;
+	for (e=0; e<36 && *s; e+=6, s++) {
+		const char *d = strchr(digits, *s);
+		if (!d) break;
+		x |= (uint32_t)(d-digits)<<e;
+	}
+	return (int32_t)x;
+}
+
+char *l64a(long x0)
+{
+	static char s[7];
+	char *p;
+	uint32_t x = x0;
+	for (p=s; x; p++, x>>=6)
+		*p = digits[x&63];
+	*p = 0;
+	return s;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/basename.c b/src/components/lib/libc/musl-1.2.0/src/misc/basename.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/misc/basename.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/basename.c
index cc4f778c51..438377b647 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/basename.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/basename.c
@@ -1,6 +1,5 @@
 #include <string.h>
 #include <libgen.h>
-#include "libc.h"
 
 char *basename(char *s)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/dirname.c b/src/components/lib/libc/musl-1.2.0/src/misc/dirname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/dirname.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/dirname.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/ffs.c b/src/components/lib/libc/musl-1.2.0/src/misc/ffs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/ffs.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/ffs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/ffsl.c b/src/components/lib/libc/musl-1.2.0/src/misc/ffsl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/ffsl.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/ffsl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/ffsll.c b/src/components/lib/libc/musl-1.2.0/src/misc/ffsll.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/ffsll.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/ffsll.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/fmtmsg.c b/src/components/lib/libc/musl-1.2.0/src/misc/fmtmsg.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/fmtmsg.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/fmtmsg.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/forkpty.c b/src/components/lib/libc/musl-1.2.0/src/misc/forkpty.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/forkpty.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/forkpty.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/get_current_dir_name.c b/src/components/lib/libc/musl-1.2.0/src/misc/get_current_dir_name.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/get_current_dir_name.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/get_current_dir_name.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/misc/getauxval.c b/src/components/lib/libc/musl-1.2.0/src/misc/getauxval.c
new file mode 100644
index 0000000000..57f21eed9e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/getauxval.c
@@ -0,0 +1,15 @@
+#include <sys/auxv.h>
+#include <errno.h>
+#include "libc.h"
+
+unsigned long __getauxval(unsigned long item)
+{
+	size_t *auxv = libc.auxv;
+	if (item == AT_SECURE) return libc.secure;
+	for (; *auxv; auxv+=2)
+		if (*auxv==item) return auxv[1];
+	errno = ENOENT;
+	return 0;
+}
+
+weak_alias(__getauxval, getauxval);
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getdomainname.c b/src/components/lib/libc/musl-1.2.0/src/misc/getdomainname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getdomainname.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getdomainname.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/misc/getentropy.c b/src/components/lib/libc/musl-1.2.0/src/misc/getentropy.c
new file mode 100644
index 0000000000..d2f282ce87
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/getentropy.c
@@ -0,0 +1,33 @@
+#define _BSD_SOURCE
+#include <unistd.h>
+#include <sys/random.h>
+#include <pthread.h>
+#include <errno.h>
+
+int getentropy(void *buffer, size_t len)
+{
+	int cs, ret;
+	char *pos = buffer;
+
+	if (len > 256) {
+		errno = EIO;
+		return -1;
+	}
+
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+	while (len) {
+		ret = getrandom(pos, len, 0);
+		if (ret < 0) {
+			if (errno == EINTR) continue;
+			else break;
+		}
+		pos += ret;
+		len -= ret;
+		ret = 0;
+	}
+
+	pthread_setcancelstate(cs, 0);
+
+	return ret;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/misc/gethostid.c b/src/components/lib/libc/musl-1.2.0/src/misc/gethostid.c
new file mode 100644
index 0000000000..25bb35db86
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/gethostid.c
@@ -0,0 +1,6 @@
+#include <unistd.h>
+
+long gethostid()
+{
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getopt.c b/src/components/lib/libc/musl-1.2.0/src/misc/getopt.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getopt.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getopt.c
index 921798303f..c3f6699559 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/getopt.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/getopt.c
@@ -1,10 +1,11 @@
+#define _BSD_SOURCE
 #include <unistd.h>
 #include <wchar.h>
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "libc.h"
 #include "locale_impl.h"
+#include "stdio_impl.h"
 
 char *optarg;
 int optind=1, opterr=1, optopt, __optpos, __optreset=0;
@@ -16,12 +17,12 @@ void __getopt_msg(const char *a, const char *b, const char *c, size_t l)
 {
 	FILE *f = stderr;
 	b = __lctrans_cur(b);
-	flockfile(f);
-	fwrite(a, strlen(a), 1, f)
+	FLOCK(f);
+	fputs(a, f)>=0
 	&& fwrite(b, strlen(b), 1, f)
-	&& fwrite(c, l, 1, f)
+	&& fwrite(c, 1, l, f)==l
 	&& putc('\n', f);
-	funlockfile(f);
+	FUNLOCK(f);
 }
 
 int getopt(int argc, char * const argv[], const char *optstring)
@@ -60,7 +61,6 @@ int getopt(int argc, char * const argv[], const char *optstring)
 		c = 0xfffd; /* replacement char */
 	}
 	optchar = argv[optind]+optpos;
-	optopt = c;
 	optpos += k;
 
 	if (!argv[optind][optpos]) {
@@ -78,24 +78,26 @@ int getopt(int argc, char * const argv[], const char *optstring)
 		if (l>0) i+=l; else i++;
 	} while (l && d != c);
 
-	if (d != c) {
+	if (d != c || c == ':') {
+		optopt = c;
 		if (optstring[0] != ':' && opterr)
 			__getopt_msg(argv[0], ": unrecognized option: ", optchar, k);
 		return '?';
 	}
 	if (optstring[i] == ':') {
-		if (optstring[i+1] == ':') optarg = 0;
-		else if (optind >= argc) {
+		optarg = 0;
+		if (optstring[i+1] != ':' || optpos) {
+			optarg = argv[optind++] + optpos;
+			optpos = 0;
+		}
+		if (optind > argc) {
+			optopt = c;
 			if (optstring[0] == ':') return ':';
 			if (opterr) __getopt_msg(argv[0],
 				": option requires an argument: ",
 				optchar, k);
 			return '?';
 		}
-		if (optstring[i+1] != ':' || optpos) {
-			optarg = argv[optind++] + optpos;
-			optpos = 0;
-		}
 	}
 	return c;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getopt_long.c b/src/components/lib/libc/musl-1.2.0/src/misc/getopt_long.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getopt_long.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getopt_long.c
index 480c00139e..6949ab1c7e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/getopt_long.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/getopt_long.c
@@ -1,8 +1,11 @@
 #define _GNU_SOURCE
 #include <stddef.h>
+#include <stdlib.h>
+#include <limits.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <string.h>
+#include "stdio_impl.h"
 
 extern int __optpos, __optreset;
 
@@ -16,8 +19,6 @@ static void permute(char *const *argv, int dest, int src)
 	av[dest] = tmp;
 }
 
-void __getopt_msg(const char *, const char *, const char *, size_t);
-
 static int __getopt_long_core(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly);
 
 static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
@@ -53,18 +54,20 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
 {
 	optarg = 0;
 	if (longopts && argv[optind][0] == '-' &&
-		((longonly && argv[optind][1]) ||
+		((longonly && argv[optind][1] && argv[optind][1] != '-') ||
 		 (argv[optind][1] == '-' && argv[optind][2])))
 	{
 		int colon = optstring[optstring[0]=='+'||optstring[0]=='-']==':';
 		int i, cnt, match;
-		char *opt;
+		char *arg, *opt, *start = argv[optind]+1;
 		for (cnt=i=0; longopts[i].name; i++) {
 			const char *name = longopts[i].name;
-			opt = argv[optind]+1;
+			opt = start;
 			if (*opt == '-') opt++;
-			for (; *name && *name == *opt; name++, opt++);
+			while (*opt && *opt != '=' && *opt == *name)
+				name++, opt++;
 			if (*opt && *opt != '=') continue;
+			arg = opt;
 			match = i;
 			if (!*name) {
 				cnt = 1;
@@ -72,12 +75,24 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
 			}
 			cnt++;
 		}
+		if (cnt==1 && longonly && arg-start == mblen(start, MB_LEN_MAX)) {
+			int l = arg-start;
+			for (i=0; optstring[i]; i++) {
+				int j;
+				for (j=0; j<l && start[j]==optstring[i+j]; j++);
+				if (j==l) {
+					cnt++;
+					break;
+				}
+			}
+		}
 		if (cnt==1) {
 			i = match;
+			opt = arg;
 			optind++;
-			optopt = longopts[i].val;
 			if (*opt == '=') {
 				if (!longopts[i].has_arg) {
+					optopt = longopts[i].val;
 					if (colon || !opterr)
 						return '?';
 					__getopt_msg(argv[0],
@@ -89,6 +104,7 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
 				optarg = opt+1;
 			} else if (longopts[i].has_arg == required_argument) {
 				if (!(optarg = argv[optind])) {
+					optopt = longopts[i].val;
 					if (colon) return ':';
 					if (!opterr) return '?';
 					__getopt_msg(argv[0],
@@ -107,6 +123,7 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring
 			return longopts[i].val;
 		}
 		if (argv[optind][1] == '-') {
+			optopt = 0;
 			if (!colon && opterr)
 				__getopt_msg(argv[0], cnt ?
 					": option is ambiguous: " :
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getpriority.c b/src/components/lib/libc/musl-1.2.0/src/misc/getpriority.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getpriority.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getpriority.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getresgid.c b/src/components/lib/libc/musl-1.2.0/src/misc/getresgid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getresgid.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getresgid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getresuid.c b/src/components/lib/libc/musl-1.2.0/src/misc/getresuid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getresuid.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getresuid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getrlimit.c b/src/components/lib/libc/musl-1.2.0/src/misc/getrlimit.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getrlimit.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getrlimit.c
index b073677f1a..2ab2f0f4fa 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/getrlimit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/getrlimit.c
@@ -1,7 +1,6 @@
 #include <sys/resource.h>
 #include <errno.h>
 #include "syscall.h"
-#include "libc.h"
 
 #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0)
 
@@ -24,4 +23,4 @@ int getrlimit(int resource, struct rlimit *rlim)
 	return 0;
 }
 
-LFS64(getrlimit);
+weak_alias(getrlimit, getrlimit64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/misc/getrusage.c b/src/components/lib/libc/musl-1.2.0/src/misc/getrusage.c
new file mode 100644
index 0000000000..8e03e2e3db
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/getrusage.c
@@ -0,0 +1,35 @@
+#include <sys/resource.h>
+#include <string.h>
+#include <errno.h>
+#include "syscall.h"
+
+int getrusage(int who, struct rusage *ru)
+{
+	int r;
+#ifdef SYS_getrusage_time64
+	long long kru64[18];
+	r = __syscall(SYS_getrusage_time64, who, kru64);
+	if (!r) {
+		ru->ru_utime = (struct timeval)
+			{ .tv_sec = kru64[0], .tv_usec = kru64[1] };
+		ru->ru_stime = (struct timeval)
+			{ .tv_sec = kru64[2], .tv_usec = kru64[3] };
+		char *slots = (char *)&ru->ru_maxrss;
+		for (int i=0; i<14; i++)
+			*(long *)(slots + i*sizeof(long)) = kru64[4+i];
+	}
+	if (SYS_getrusage_time64 == SYS_getrusage || r != -ENOSYS)
+		return __syscall_ret(r);
+#endif
+	char *dest = (char *)&ru->ru_maxrss - 4*sizeof(long);
+	r = __syscall(SYS_getrusage, who, dest);
+	if (!r && sizeof(time_t) > sizeof(long)) {
+		long kru[4];
+		memcpy(kru, dest, 4*sizeof(long));
+		ru->ru_utime = (struct timeval)
+			{ .tv_sec = kru[0], .tv_usec = kru[1] };
+		ru->ru_stime = (struct timeval)
+			{ .tv_sec = kru[2], .tv_usec = kru[3] };
+	}
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/getsubopt.c b/src/components/lib/libc/musl-1.2.0/src/misc/getsubopt.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/getsubopt.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/getsubopt.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/initgroups.c b/src/components/lib/libc/musl-1.2.0/src/misc/initgroups.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/initgroups.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/initgroups.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/misc/ioctl.c b/src/components/lib/libc/musl-1.2.0/src/misc/ioctl.c
new file mode 100644
index 0000000000..8947751147
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/ioctl.c
@@ -0,0 +1,138 @@
+#include <sys/ioctl.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+#include <stddef.h>
+#include <string.h>
+#include "syscall.h"
+
+#define alignof(t) offsetof(struct { char c; t x; }, x)
+
+#define W 1
+#define R 2
+#define WR 3
+
+struct ioctl_compat_map {
+	int new_req, old_req;
+	unsigned char old_size, dir, force_align, noffs;
+	unsigned char offsets[8];
+};
+
+#define NINTH(a,b,c,d,e,f,g,h,i,...) i
+#define COUNT(...) NINTH(__VA_ARGS__,8,7,6,5,4,3,2,1,0)
+#define OFFS(...) COUNT(__VA_ARGS__), { __VA_ARGS__ }
+
+/* yields a type for a struct with original size n, with a misaligned
+ * timeval/timespec expanded from 32- to 64-bit. for use with ioctl
+ * number producing macros; only size of result is meaningful. */
+#define new_misaligned(n) struct { int i; time_t t; char c[(n)-4]; }
+
+static const struct ioctl_compat_map compat_map[] = {
+	{ SIOCGSTAMP, SIOCGSTAMP_OLD, 8, R, 0, OFFS(0, 4) },
+	{ SIOCGSTAMPNS, SIOCGSTAMPNS_OLD, 8, R, 0, OFFS(0, 4) },
+
+	/* SNDRV_TIMER_IOCTL_STATUS */
+	{ _IOR('T', 0x14, char[96]), _IOR('T', 0x14, 88), 88, R, 0, OFFS(0,4) },
+
+	/* SNDRV_PCM_IOCTL_STATUS[_EXT] */
+	{ _IOR('A', 0x20, char[128]), _IOR('A', 0x20, char[108]), 108, R, 1, OFFS(4,8,12,16,52,56,60,64) },
+	{ _IOWR('A', 0x24, char[128]), _IOWR('A', 0x24, char[108]), 108, WR, 1, OFFS(4,8,12,16,52,56,60,64) },
+
+	/* SNDRV_RAWMIDI_IOCTL_STATUS */
+	{ _IOWR('W', 0x20, char[48]), _IOWR('W', 0x20, char[36]), 36, WR, 1, OFFS(4,8) },
+
+	/* SNDRV_PCM_IOCTL_SYNC_PTR - with 3 subtables */
+	{ _IOWR('A', 0x23, char[136]), _IOWR('A', 0x23, char[132]), 0, WR, 1, 0 },
+	{ 0, 0, 4, WR, 1, 0 }, /* snd_pcm_sync_ptr (flags only) */
+	{ 0, 0, 32, WR, 1, OFFS(8,12,16,24,28) }, /* snd_pcm_mmap_status */
+	{ 0, 0, 8, WR, 1, OFFS(0,4) }, /* snd_pcm_mmap_control */
+
+	/* VIDIOC_QUERYBUF, VIDIOC_QBUF, VIDIOC_DQBUF, VIDIOC_PREPARE_BUF */
+	{ _IOWR('V',  9, new_misaligned(72)), _IOWR('V',  9, char[72]), 72, WR, 0, OFFS(20) },
+	{ _IOWR('V', 15, new_misaligned(72)), _IOWR('V', 15, char[72]), 72, WR, 0, OFFS(20) },
+	{ _IOWR('V', 17, new_misaligned(72)), _IOWR('V', 17, char[72]), 72, WR, 0, OFFS(20) },
+	{ _IOWR('V', 93, new_misaligned(72)), _IOWR('V', 93, char[72]), 72, WR, 0, OFFS(20) },
+
+	/* VIDIOC_DQEVENT */
+	{ _IOR('V', 89, new_misaligned(96)), _IOR('V', 89, char[96]), 96, R, 0, OFFS(76,80) },
+
+	/* VIDIOC_OMAP3ISP_STAT_REQ */
+	{ _IOWR('V', 192+6, char[32]), _IOWR('V', 192+6, char[24]), 22, WR, 0, OFFS(0,4) },
+
+	/* PPPIOCGIDLE */
+	{ _IOR('t', 63, char[16]), _IOR('t', 63, char[8]), 8, R, 0, OFFS(0,4) },
+
+	/* PPGETTIME, PPSETTIME */
+	{ _IOR('p', 0x95, char[16]), _IOR('p', 0x95, char[8]), 8, R, 0, OFFS(0,4) },
+	{ _IOW('p', 0x96, char[16]), _IOW('p', 0x96, char[8]), 8, W, 0, OFFS(0,4) },
+
+	/* LPSETTIMEOUT */
+	{ _IOW(0x6, 0xf, char[16]), 0x060f, 8, W, 0, OFFS(0,4) },
+};
+
+static void convert_ioctl_struct(const struct ioctl_compat_map *map, char *old, char *new, int dir)
+{
+	int new_offset = 0;
+	int old_offset = 0;
+	int old_size = map->old_size;
+	if (!(dir & map->dir)) return;
+	if (!map->old_size) {
+		/* offsets hard-coded for SNDRV_PCM_IOCTL_SYNC_PTR;
+		 * if another exception appears this needs changing. */
+		convert_ioctl_struct(map+1, old, new, dir);
+		convert_ioctl_struct(map+2, old+4, new+8, dir);
+		convert_ioctl_struct(map+3, old+68, new+72, dir);
+		return;
+	}
+	for (int i=0; i < map->noffs; i++) {
+		int ts_offset = map->offsets[i];
+		int len = ts_offset-old_offset;
+		if (dir==W) memcpy(old+old_offset, new+new_offset, len);
+		else memcpy(new+new_offset, old+old_offset, len);
+		new_offset += len;
+		old_offset += len;
+		long long new_ts;
+		long old_ts;
+		int align = map->force_align ? sizeof(time_t) : alignof(time_t);
+		new_offset += (align-1) & -new_offset;
+		if (dir==W) {
+			memcpy(&new_ts, new+new_offset, sizeof new_ts);
+			old_ts = new_ts;
+			memcpy(old+old_offset, &old_ts, sizeof old_ts);
+		} else {
+			memcpy(&old_ts, old+old_offset, sizeof old_ts);
+			new_ts = old_ts;
+			memcpy(new+new_offset, &new_ts, sizeof new_ts);
+		}
+		new_offset += sizeof new_ts;
+		old_offset += sizeof old_ts;
+	}
+	if (dir==W) memcpy(old+old_offset, new+new_offset, old_size-old_offset);
+	else memcpy(new+new_offset, old+old_offset, old_size-old_offset);
+}
+
+int ioctl(int fd, int req, ...)
+{
+	void *arg;
+	va_list ap;
+	va_start(ap, req);
+	arg = va_arg(ap, void *);
+	va_end(ap);
+	int r = __syscall(SYS_ioctl, fd, req, arg);
+	if (SIOCGSTAMP != SIOCGSTAMP_OLD && req && r==-ENOTTY) {
+		for (int i=0; i<sizeof compat_map/sizeof *compat_map; i++) {
+			if (compat_map[i].new_req != req) continue;
+			union {
+				long long align;
+				char buf[256];
+			} u;
+			convert_ioctl_struct(&compat_map[i], u.buf, arg, W);
+			r = __syscall(SYS_ioctl, fd, compat_map[i].old_req, u.buf);
+			if (r<0) break;
+			convert_ioctl_struct(&compat_map[i], u.buf, arg, R);
+			break;
+		}
+	}
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/issetugid.c b/src/components/lib/libc/musl-1.2.0/src/misc/issetugid.c
similarity index 80%
rename from src/components/lib/libc/musl-1.1.11/src/misc/issetugid.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/issetugid.c
index 6ffd9300dd..ddc2ca0e02 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/issetugid.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/issetugid.c
@@ -1,3 +1,4 @@
+#define _BSD_SOURCE
 #include <unistd.h>
 #include "libc.h"
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/lockf.c b/src/components/lib/libc/musl-1.2.0/src/misc/lockf.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/misc/lockf.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/lockf.c
index d8f82efd3b..16a80bec13 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/lockf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/lockf.c
@@ -1,7 +1,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "libc.h"
 
 int lockf(int fd, int op, off_t size)
 {
@@ -30,4 +29,4 @@ int lockf(int fd, int op, off_t size)
 	return -1;
 }
 
-LFS64(lockf);
+weak_alias(lockf, lockf64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/login_tty.c b/src/components/lib/libc/musl-1.2.0/src/misc/login_tty.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/login_tty.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/login_tty.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/mntent.c b/src/components/lib/libc/musl-1.2.0/src/misc/mntent.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/misc/mntent.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/mntent.c
index a16d65254d..eabb8200bf 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/mntent.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/mntent.c
@@ -3,6 +3,11 @@
 #include <mntent.h>
 #include <errno.h>
 
+static char *internal_buf;
+static size_t internal_bufsize;
+
+#define SENTINEL (char *)&internal_buf
+
 FILE *setmntent(const char *name, const char *mode)
 {
 	return fopen(name, mode);
@@ -16,13 +21,18 @@ int endmntent(FILE *f)
 
 struct mntent *getmntent_r(FILE *f, struct mntent *mnt, char *linebuf, int buflen)
 {
-	int cnt, n[8];
+	int cnt, n[8], use_internal = (linebuf == SENTINEL);
 
 	mnt->mnt_freq = 0;
 	mnt->mnt_passno = 0;
 
 	do {
-		fgets(linebuf, buflen, f);
+		if (use_internal) {
+			getline(&internal_buf, &internal_bufsize, f);
+			linebuf = internal_buf;
+		} else {
+			fgets(linebuf, buflen, f);
+		}
 		if (feof(f) || ferror(f)) return 0;
 		if (!strchr(linebuf, '\n')) {
 			fscanf(f, "%*[^\n]%*[\n]");
@@ -49,9 +59,8 @@ struct mntent *getmntent_r(FILE *f, struct mntent *mnt, char *linebuf, int bufle
 
 struct mntent *getmntent(FILE *f)
 {
-	static char linebuf[256];
 	static struct mntent mnt;
-	return getmntent_r(f, &mnt, linebuf, sizeof linebuf);
+	return getmntent_r(f, &mnt, SENTINEL, 0);
 }
 
 int addmntent(FILE *f, const struct mntent *mnt)
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/nftw.c b/src/components/lib/libc/musl-1.2.0/src/misc/nftw.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/misc/nftw.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/nftw.c
index efb2b89524..0a46410071 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/nftw.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/nftw.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <limits.h>
 #include <pthread.h>
-#include "libc.h"
 
 struct history
 {
@@ -28,7 +27,6 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
 	int type;
 	int r;
 	struct FTW lev;
-	char *name;
 
 	if ((flags & FTW_PHYS) ? lstat(path, &st) : stat(path, &st) < 0) {
 		if (!(flags & FTW_PHYS) && errno==ENOENT && !lstat(path, &st))
@@ -53,10 +51,17 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
 	new.dev = st.st_dev;
 	new.ino = st.st_ino;
 	new.level = h ? h->level+1 : 0;
-	new.base = l+1;
+	new.base = j+1;
 	
 	lev.level = new.level;
-	lev.base = h ? h->base : (name=strrchr(path, '/')) ? name-path : 0;
+	if (h) {
+		lev.base = h->base;
+	} else {
+		size_t k;
+		for (k=j; k && path[k]=='/'; k--);
+		for (; k && path[k-1]!='/'; k--);
+		lev.base = k;
+	}
 
 	if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev)))
 		return r;
@@ -120,4 +125,4 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
 	return r;
 }
 
-LFS64(nftw);
+weak_alias(nftw, nftw64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/openpty.c b/src/components/lib/libc/musl-1.2.0/src/misc/openpty.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/openpty.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/openpty.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/ptsname.c b/src/components/lib/libc/musl-1.2.0/src/misc/ptsname.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/misc/ptsname.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/ptsname.c
index a34779276f..58c151c97f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/ptsname.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/ptsname.c
@@ -1,8 +1,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-int __ptsname_r(int, char *, size_t);
-
 char *ptsname(int fd)
 {
 	static char buf[9 + sizeof(int)*3 + 1];
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/pty.c b/src/components/lib/libc/musl-1.2.0/src/misc/pty.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/misc/pty.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/pty.c
index b395d2c09e..a0577147a4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/pty.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/pty.c
@@ -3,12 +3,13 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "libc.h"
 #include "syscall.h"
 
 int posix_openpt(int flags)
 {
-	return open("/dev/ptmx", flags);
+	int r = open("/dev/ptmx", flags);
+	if (r < 0 && errno == ENOSPC) errno = EAGAIN;
+	return r;
 }
 
 int grantpt(int fd)
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/realpath.c b/src/components/lib/libc/musl-1.2.0/src/misc/realpath.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/misc/realpath.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/realpath.c
index 88c849cda3..d2708e59da 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/realpath.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/realpath.c
@@ -7,8 +7,6 @@
 #include <string.h>
 #include "syscall.h"
 
-void __procfdname(char *, unsigned);
-
 char *realpath(const char *restrict filename, char *restrict resolved)
 {
 	int fd;
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/setdomainname.c b/src/components/lib/libc/musl-1.2.0/src/misc/setdomainname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/setdomainname.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/setdomainname.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/setpriority.c b/src/components/lib/libc/musl-1.2.0/src/misc/setpriority.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/setpriority.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/setpriority.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/setrlimit.c b/src/components/lib/libc/musl-1.2.0/src/misc/setrlimit.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/misc/setrlimit.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/setrlimit.c
index 7130d719e6..7a66ab2975 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/setrlimit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/setrlimit.c
@@ -6,7 +6,7 @@
 #define MIN(a, b) ((a)<(b) ? (a) : (b))
 #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0)
 
-int __setrlimit(int resource, const struct rlimit *rlim)
+static int __setrlimit(int resource, const struct rlimit *rlim)
 {
 	unsigned long k_rlim[2];
 	struct rlimit tmp;
@@ -47,4 +47,4 @@ int setrlimit(int resource, const struct rlimit *rlim)
 	return 0;
 }
 
-LFS64(setrlimit);
+weak_alias(setrlimit, setrlimit64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/misc/syscall.c b/src/components/lib/libc/musl-1.2.0/src/misc/syscall.c
new file mode 100644
index 0000000000..6f3ef65639
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/syscall.c
@@ -0,0 +1,21 @@
+#define _BSD_SOURCE
+#include <unistd.h>
+#include "syscall.h"
+#include <stdarg.h>
+
+#undef syscall
+
+long syscall(long n, ...)
+{
+	va_list ap;
+	syscall_arg_t a,b,c,d,e,f;
+	va_start(ap, n);
+	a=va_arg(ap, syscall_arg_t);
+	b=va_arg(ap, syscall_arg_t);
+	c=va_arg(ap, syscall_arg_t);
+	d=va_arg(ap, syscall_arg_t);
+	e=va_arg(ap, syscall_arg_t);
+	f=va_arg(ap, syscall_arg_t);
+	va_end(ap);
+	return __syscall_ret(__syscall(n,a,b,c,d,e,f));
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/syslog.c b/src/components/lib/libc/musl-1.2.0/src/misc/syslog.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/misc/syslog.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/syslog.c
index 9dd1ddb588..13d4b0a6d7 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/syslog.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/syslog.c
@@ -9,9 +9,9 @@
 #include <pthread.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "libc.h"
+#include "lock.h"
 
-static volatile int lock[2];
+static volatile int lock[1];
 static char log_ident[32];
 static int log_opt;
 static int log_facility = LOG_USER;
@@ -122,7 +122,7 @@ static void _vsyslog(int priority, const char *message, va_list ap)
 	}
 }
 
-void __vsyslog(int priority, const char *message, va_list ap)
+static void __vsyslog(int priority, const char *message, va_list ap)
 {
 	int cs;
 	if (!(log_mask & LOG_MASK(priority&7)) || (priority&~0x3ff)) return;
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/uname.c b/src/components/lib/libc/musl-1.2.0/src/misc/uname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/misc/uname.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/uname.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/misc/wordexp.c b/src/components/lib/libc/musl-1.2.0/src/misc/wordexp.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/misc/wordexp.c
rename to src/components/lib/libc/musl-1.2.0/src/misc/wordexp.c
index db39b5b8a3..db83a69f37 100644
--- a/src/components/lib/libc/musl-1.1.11/src/misc/wordexp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/misc/wordexp.c
@@ -14,13 +14,7 @@
 static void reap(pid_t pid)
 {
 	int status;
-	for (;;) {
-		if (waitpid(pid, &status, 0) < 0) {
-			if (errno != EINTR) return;
-		} else {
-			if (WIFEXITED(status)) return;
-		}
-	}
+	while (waitpid(pid, &status, 0) < 0 && errno == EINTR);
 }
 
 static char *getword(FILE *f)
@@ -48,7 +42,7 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags)
 
 	if (flags & WRDE_NOCMD) for (i=0; s[i]; i++) switch (s[i]) {
 	case '\\':
-		if (!sq) i++;
+		if (!sq && !s[++i]) return WRDE_SYNTAX;
 		break;
 	case '\'':
 		if (!dq) sq^=1;
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/madvise.c b/src/components/lib/libc/musl-1.2.0/src/mman/madvise.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/mman/madvise.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/madvise.c
index f80926bec4..e0c7c0ec92 100644
--- a/src/components/lib/libc/musl-1.1.11/src/mman/madvise.c
+++ b/src/components/lib/libc/musl-1.2.0/src/mman/madvise.c
@@ -1,6 +1,5 @@
 #include <sys/mman.h>
 #include "syscall.h"
-#include "libc.h"
 
 int __madvise(void *addr, size_t len, int advice)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/mincore.c b/src/components/lib/libc/musl-1.2.0/src/mman/mincore.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mman/mincore.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/mincore.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/mman/mlock.c b/src/components/lib/libc/musl-1.2.0/src/mman/mlock.c
new file mode 100644
index 0000000000..71af582fe6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/mman/mlock.c
@@ -0,0 +1,11 @@
+#include <sys/mman.h>
+#include "syscall.h"
+
+int mlock(const void *addr, size_t len)
+{
+#ifdef SYS_mlock
+	return syscall(SYS_mlock, addr, len);
+#else
+	return syscall(SYS_mlock2, addr, len, 0);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/mlockall.c b/src/components/lib/libc/musl-1.2.0/src/mman/mlockall.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mman/mlockall.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/mlockall.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/mman/mmap.c b/src/components/lib/libc/musl-1.2.0/src/mman/mmap.c
new file mode 100644
index 0000000000..eff88d82a8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/mman/mmap.c
@@ -0,0 +1,41 @@
+#include <unistd.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <stdint.h>
+#include <limits.h>
+#include "syscall.h"
+
+static void dummy(void) { }
+weak_alias(dummy, __vm_wait);
+
+#define UNIT SYSCALL_MMAP2_UNIT
+#define OFF_MASK ((-0x2000ULL << (8*sizeof(syscall_arg_t)-1)) | (UNIT-1))
+
+void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
+{
+	long ret;
+	if (off & OFF_MASK) {
+		errno = EINVAL;
+		return MAP_FAILED;
+	}
+	if (len >= PTRDIFF_MAX) {
+		errno = ENOMEM;
+		return MAP_FAILED;
+	}
+	if (flags & MAP_FIXED) {
+		__vm_wait();
+	}
+#ifdef SYS_mmap2
+	ret = __syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT);
+#else
+	ret = __syscall(SYS_mmap, start, len, prot, flags, fd, off);
+#endif
+	/* Fixup incorrect EPERM from kernel. */
+	if (ret == -EPERM && !start && (flags&MAP_ANON) && !(flags&MAP_FIXED))
+		ret = -ENOMEM;
+	return (void *)__syscall_ret(ret);
+}
+
+weak_alias(__mmap, mmap);
+
+weak_alias(mmap, mmap64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/mprotect.c b/src/components/lib/libc/musl-1.2.0/src/mman/mprotect.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mman/mprotect.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/mprotect.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/mman/mremap.c b/src/components/lib/libc/musl-1.2.0/src/mman/mremap.c
new file mode 100644
index 0000000000..cc6991a635
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/mman/mremap.c
@@ -0,0 +1,32 @@
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include "syscall.h"
+
+static void dummy(void) { }
+weak_alias(dummy, __vm_wait);
+
+void *__mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...)
+{
+	va_list ap;
+	void *new_addr = 0;
+
+	if (new_len >= PTRDIFF_MAX) {
+		errno = ENOMEM;
+		return MAP_FAILED;
+	}
+
+	if (flags & MREMAP_FIXED) {
+		__vm_wait();
+		va_start(ap, flags);
+		new_addr = va_arg(ap, void *);
+		va_end(ap);
+	}
+
+	return (void *)syscall(SYS_mremap, old_addr, old_len, new_len, flags, new_addr);
+}
+
+weak_alias(__mremap, mremap);
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/msync.c b/src/components/lib/libc/musl-1.2.0/src/mman/msync.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mman/msync.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/msync.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/munlock.c b/src/components/lib/libc/musl-1.2.0/src/mman/munlock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mman/munlock.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/munlock.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/munlockall.c b/src/components/lib/libc/musl-1.2.0/src/mman/munlockall.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mman/munlockall.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/munlockall.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/munmap.c b/src/components/lib/libc/musl-1.2.0/src/mman/munmap.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/mman/munmap.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/munmap.c
index 3f711ee501..2bf83bbe9b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/mman/munmap.c
+++ b/src/components/lib/libc/musl-1.2.0/src/mman/munmap.c
@@ -1,6 +1,5 @@
 #include <sys/mman.h>
 #include "syscall.h"
-#include "libc.h"
 
 static void dummy(void) { }
 weak_alias(dummy, __vm_wait);
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/posix_madvise.c b/src/components/lib/libc/musl-1.2.0/src/mman/posix_madvise.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mman/posix_madvise.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/posix_madvise.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mman/shm_open.c b/src/components/lib/libc/musl-1.2.0/src/mman/shm_open.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/mman/shm_open.c
rename to src/components/lib/libc/musl-1.2.0/src/mman/shm_open.c
index d042a5a882..79784bd306 100644
--- a/src/components/lib/libc/musl-1.1.11/src/mman/shm_open.c
+++ b/src/components/lib/libc/musl-1.2.0/src/mman/shm_open.c
@@ -6,8 +6,6 @@
 #include <limits.h>
 #include <pthread.h>
 
-char *__strchrnul(const char *, int);
-
 char *__shm_mapname(const char *name, char *buf)
 {
 	char *p;
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_close.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_close.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_close.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_close.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_getattr.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_getattr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_getattr.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_getattr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_notify.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_notify.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_notify.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_notify.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_open.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_open.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_open.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_open.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_receive.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_receive.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_receive.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_receive.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_send.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_send.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_send.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_send.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_setattr.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_setattr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_setattr.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_setattr.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/mq/mq_timedreceive.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_timedreceive.c
new file mode 100644
index 0000000000..f41b6642f8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/mq/mq_timedreceive.c
@@ -0,0 +1,24 @@
+#include <mqueue.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+ssize_t mq_timedreceive(mqd_t mqd, char *restrict msg, size_t len, unsigned *restrict prio, const struct timespec *restrict at)
+{
+#ifdef SYS_mq_timedreceive_time64
+	time_t s = at ? at->tv_sec : 0;
+	long ns = at ? at->tv_nsec : 0;
+	long r = -ENOSYS;
+	if (SYS_mq_timedreceive == SYS_mq_timedreceive_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_mq_timedreceive_time64, mqd, msg, len, prio,
+			at ? ((long long []){at->tv_sec, at->tv_nsec}) : 0);
+	if (SYS_mq_timedreceive == SYS_mq_timedreceive_time64 || r != -ENOSYS)
+		return __syscall_ret(r);
+	return syscall_cp(SYS_mq_timedreceive, mqd, msg, len, prio,
+		at ? ((long[]){CLAMP(s), ns}) : 0);
+#else
+	return syscall_cp(SYS_mq_timedreceive, mqd, msg, len, prio, at);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/mq/mq_timedsend.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_timedsend.c
new file mode 100644
index 0000000000..56cfcbb833
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/mq/mq_timedsend.c
@@ -0,0 +1,24 @@
+#include <mqueue.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+int mq_timedsend(mqd_t mqd, const char *msg, size_t len, unsigned prio, const struct timespec *at)
+{
+#ifdef SYS_mq_timedsend_time64
+	time_t s = at ? at->tv_sec : 0;
+	long ns = at ? at->tv_nsec : 0;
+	long r = -ENOSYS;
+	if (SYS_mq_timedsend == SYS_mq_timedsend_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_mq_timedsend_time64, mqd, msg, len, prio,
+			at ? ((long long []){at->tv_sec, at->tv_nsec}) : 0);
+	if (SYS_mq_timedsend == SYS_mq_timedsend_time64 || r != -ENOSYS)
+		return __syscall_ret(r);
+	return syscall_cp(SYS_mq_timedsend, mqd, msg, len, prio,
+		at ? ((long[]){CLAMP(s), ns}) : 0);
+#else
+	return syscall_cp(SYS_mq_timedsend, mqd, msg, len, prio, at);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/mq/mq_unlink.c b/src/components/lib/libc/musl-1.2.0/src/mq/mq_unlink.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/mq/mq_unlink.c
rename to src/components/lib/libc/musl-1.2.0/src/mq/mq_unlink.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/btowc.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/btowc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/btowc.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/btowc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/c16rtomb.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/c16rtomb.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/c16rtomb.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/c16rtomb.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/c32rtomb.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/c32rtomb.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/c32rtomb.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/c32rtomb.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/internal.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/internal.c
similarity index 80%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/internal.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/internal.c
index bbdc4159a8..2f5aaa914a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/internal.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/internal.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include "internal.h"
 
 #define C(x) ( x<2 ? -1 : ( R(0x80,0xc0) | x ) )
@@ -15,7 +9,7 @@
              | x )
 #define F(x) ( ( x>=5 ? 0 : \
                  x==0 ? R(0x90,0xc0) : \
-                 x==4 ? R(0x80,0xa0) : \
+                 x==4 ? R(0x80,0x90) : \
                  R(0x80,0xc0) ) \
              | ( R(0x80,0xc0) >> 6 ) \
              | ( R(0x80,0xc0) >> 12 ) \
diff --git a/src/components/lib/libc/musl-1.2.0/src/multibyte/internal.h b/src/components/lib/libc/musl-1.2.0/src/multibyte/internal.h
new file mode 100644
index 0000000000..45bbc6d062
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/internal.h
@@ -0,0 +1,24 @@
+#define bittab __fsmu8
+
+#include <stdint.h>
+#include <features.h>
+
+extern hidden const uint32_t bittab[];
+
+/* Upper 6 state bits are a negative integer offset to bound-check next byte */
+/*    equivalent to: ( (b-0x80) | (b+offset) ) & ~0x3f      */
+#define OOB(c,b) (((((b)>>3)-0x10)|(((b)>>3)+((int32_t)(c)>>26))) & ~7)
+
+/* Interval [a,b). Either a must be 80 or b must be c0, lower 3 bits clear. */
+#define R(a,b) ((uint32_t)((a==0x80 ? 0x40u-b : 0u-a) << 23))
+#define FAILSTATE R(0x80,0x80)
+
+#define SA 0xc2u
+#define SB 0xf4u
+
+/* Arbitrary encoding for representing code units instead of characters. */
+#define CODEUNIT(c) (0xdfff & (signed char)(c))
+#define IS_CODEUNIT(c) ((unsigned)(c)-0xdf80 < 0x80)
+
+/* Get inline definition of MB_CUR_MAX. */
+#include "locale_impl.h"
diff --git a/src/components/lib/libc/musl-1.2.0/src/multibyte/mblen.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mblen.c
new file mode 100644
index 0000000000..a4304bf5ad
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/mblen.c
@@ -0,0 +1,6 @@
+#include <stdlib.h>
+
+int mblen(const char *s, size_t n)
+{
+	return mbtowc(0, s, n);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/multibyte/mbrlen.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbrlen.c
new file mode 100644
index 0000000000..accf4b3315
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbrlen.c
@@ -0,0 +1,7 @@
+#include <wchar.h>
+
+size_t mbrlen(const char *restrict s, size_t n, mbstate_t *restrict st)
+{
+	static unsigned internal;
+	return mbrtowc(0, s, n, st ? st : (mbstate_t *)&internal);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbrtoc16.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbrtoc16.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/mbrtoc16.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/mbrtoc16.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbrtoc32.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbrtoc32.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/mbrtoc32.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/mbrtoc32.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbrtowc.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbrtowc.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/mbrtowc.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/mbrtowc.c
index ca7da700ed..c94819e720 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbrtowc.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbrtowc.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <stdlib.h>
 #include <wchar.h>
 #include <errno.h>
diff --git a/src/components/lib/libc/musl-1.2.0/src/multibyte/mbsinit.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbsinit.c
new file mode 100644
index 0000000000..c608194a07
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbsinit.c
@@ -0,0 +1,6 @@
+#include <wchar.h>
+
+int mbsinit(const mbstate_t *st)
+{
+	return !st || !*(unsigned *)st;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbsnrtowcs.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbsnrtowcs.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/mbsnrtowcs.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/mbsnrtowcs.c
index 68b9960f37..931192e2d8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbsnrtowcs.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbsnrtowcs.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <wchar.h>
 
 size_t mbsnrtowcs(wchar_t *restrict wcs, const char **restrict src, size_t n, size_t wn, mbstate_t *restrict st)
@@ -11,6 +5,7 @@ size_t mbsnrtowcs(wchar_t *restrict wcs, const char **restrict src, size_t n, si
 	size_t l, cnt=0, n2;
 	wchar_t *ws, wbuf[256];
 	const char *s = *src;
+	const char *tmp_s;
 
 	if (!wcs) ws = wbuf, wn = sizeof wbuf / sizeof *wbuf;
 	else ws = wcs;
@@ -21,7 +16,7 @@ size_t mbsnrtowcs(wchar_t *restrict wcs, const char **restrict src, size_t n, si
 
 	while ( s && wn && ( (n2=n/4)>=wn || n2>32 ) ) {
 		if (n2>=wn) n2=wn;
-		n -= n2;
+		tmp_s = s;
 		l = mbsrtowcs(ws, &s, n2, st);
 		if (!(l+1)) {
 			cnt = l;
@@ -32,6 +27,7 @@ size_t mbsnrtowcs(wchar_t *restrict wcs, const char **restrict src, size_t n, si
 			ws += l;
 			wn -= l;
 		}
+		n = s ? n - (s - tmp_s) : 0;
 		cnt += l;
 	}
 	if (s) while (wn && n) {
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbsrtowcs.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbsrtowcs.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/mbsrtowcs.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/mbsrtowcs.c
index e23083d223..9b2f2dfbb0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbsrtowcs.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbsrtowcs.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <stdint.h>
 #include <wchar.h>
 #include <errno.h>
@@ -44,12 +38,15 @@ size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbs
 	}
 
 	if (!ws) for (;;) {
+#ifdef __GNUC__
+		typedef uint32_t __attribute__((__may_alias__)) w32;
 		if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) {
-			while (!(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) {
+			while (!(( *(w32*)s | *(w32*)s-0x01010101) & 0x80808080)) {
 				s += 4;
 				wn -= 4;
 			}
 		}
+#endif
 		if (*s-1u < 0x7f) {
 			s++;
 			wn--;
@@ -75,8 +72,10 @@ size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbs
 			*src = (const void *)s;
 			return wn0;
 		}
+#ifdef __GNUC__
+		typedef uint32_t __attribute__((__may_alias__)) w32;
 		if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) {
-			while (wn>=5 && !(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) {
+			while (wn>=5 && !(( *(w32*)s | *(w32*)s-0x01010101) & 0x80808080)) {
 				*ws++ = *s++;
 				*ws++ = *s++;
 				*ws++ = *s++;
@@ -84,6 +83,7 @@ size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbs
 				wn -= 4;
 			}
 		}
+#endif
 		if (*s-1u < 0x7f) {
 			*ws++ = *s++;
 			wn--;
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbstowcs.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbstowcs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/mbstowcs.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/mbstowcs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbtowc.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbtowc.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/mbtowc.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/mbtowc.c
index 71a950666c..c191bb038b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/mbtowc.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/mbtowc.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <stdlib.h>
 #include <wchar.h>
 #include <errno.h>
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/wcrtomb.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/wcrtomb.c
similarity index 82%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/wcrtomb.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/wcrtomb.c
index ddc37a57b5..8e34926ed8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/wcrtomb.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/wcrtomb.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <stdlib.h>
 #include <wchar.h>
 #include <errno.h>
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/wcsnrtombs.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/wcsnrtombs.c
similarity index 80%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/wcsnrtombs.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/wcsnrtombs.c
index ee4a534ab0..676932b5dc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/wcsnrtombs.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/wcsnrtombs.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <wchar.h>
 
 size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st)
@@ -11,13 +5,14 @@ size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, s
 	size_t l, cnt=0, n2;
 	char *s, buf[256];
 	const wchar_t *ws = *wcs;
+	const wchar_t *tmp_ws;
 
 	if (!dst) s = buf, n = sizeof buf;
 	else s = dst;
 
 	while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) {
 		if (n2>=n) n2=n;
-		wn -= n2;
+		tmp_ws = ws;
 		l = wcsrtombs(s, &ws, n2, 0);
 		if (!(l+1)) {
 			cnt = l;
@@ -28,6 +23,7 @@ size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, s
 			s += l;
 			n -= l;
 		}
+		wn = ws ? wn - (ws - tmp_ws) : 0;
 		cnt += l;
 	}
 	if (ws) while (n && wn) {
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/wcsrtombs.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/wcsrtombs.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/wcsrtombs.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/wcsrtombs.c
index 30be415d06..b5713aeacd 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/wcsrtombs.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/wcsrtombs.c
@@ -1,9 +1,3 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <wchar.h>
 
 size_t wcsrtombs(char *restrict s, const wchar_t **restrict ws, size_t n, mbstate_t *restrict st)
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/wcstombs.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/wcstombs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/wcstombs.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/wcstombs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/multibyte/wctob.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/wctob.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/multibyte/wctob.c
rename to src/components/lib/libc/musl-1.2.0/src/multibyte/wctob.c
index 4aeda6a132..b484a3fd01 100644
--- a/src/components/lib/libc/musl-1.1.11/src/multibyte/wctob.c
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/wctob.c
@@ -1,4 +1,5 @@
 #include <wchar.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include "internal.h"
 
diff --git a/src/components/lib/libc/musl-1.2.0/src/multibyte/wctomb.c b/src/components/lib/libc/musl-1.2.0/src/multibyte/wctomb.c
new file mode 100644
index 0000000000..bad41c5edf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/multibyte/wctomb.c
@@ -0,0 +1,8 @@
+#include <stdlib.h>
+#include <wchar.h>
+
+int wctomb(char *s, wchar_t wc)
+{
+	if (!s) return 0;
+	return wcrtomb(s, wc, 0);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/accept.c b/src/components/lib/libc/musl-1.2.0/src/network/accept.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/network/accept.c
rename to src/components/lib/libc/musl-1.2.0/src/network/accept.c
index 521e9ef984..a92406fa73 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/accept.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/accept.c
@@ -1,6 +1,5 @@
 #include <sys/socket.h>
 #include "syscall.h"
-#include "libc.h"
 
 int accept(int fd, struct sockaddr *restrict addr, socklen_t *restrict len)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/accept4.c b/src/components/lib/libc/musl-1.2.0/src/network/accept4.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/network/accept4.c
rename to src/components/lib/libc/musl-1.2.0/src/network/accept4.c
index 285d85887e..59ab1726bd 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/accept4.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/accept4.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include "syscall.h"
-#include "libc.h"
 
 int accept4(int fd, struct sockaddr *restrict addr, socklen_t *restrict len, int flg)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/bind.c b/src/components/lib/libc/musl-1.2.0/src/network/bind.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/bind.c
rename to src/components/lib/libc/musl-1.2.0/src/network/bind.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/connect.c b/src/components/lib/libc/musl-1.2.0/src/network/connect.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/network/connect.c
rename to src/components/lib/libc/musl-1.2.0/src/network/connect.c
index 57f01a1edb..289127be48 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/connect.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/connect.c
@@ -1,6 +1,5 @@
 #include <sys/socket.h>
 #include "syscall.h"
-#include "libc.h"
 
 int connect(int fd, const struct sockaddr *addr, socklen_t len)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/dn_comp.c b/src/components/lib/libc/musl-1.2.0/src/network/dn_comp.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/network/dn_comp.c
rename to src/components/lib/libc/musl-1.2.0/src/network/dn_comp.c
index a17d434dc2..f0ccd160f6 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/dn_comp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/dn_comp.c
@@ -1,6 +1,5 @@
 #include <string.h>
 #include <resolv.h>
-#include "libc.h"
 
 /* RFC 1035 message compression */
 
@@ -55,7 +54,7 @@ static int match(int *offset, const unsigned char *base, const unsigned char *dn
 	}
 }
 
-int __dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr)
+int dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr)
 {
 	int i, j, n, m=0, offset, bestlen=0, bestoff;
 	unsigned char lens[127];
@@ -106,5 +105,3 @@ int __dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dn
 	}
 	return i;
 }
-
-weak_alias(__dn_comp, dn_comp);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/dn_expand.c b/src/components/lib/libc/musl-1.2.0/src/network/dn_expand.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/network/dn_expand.c
rename to src/components/lib/libc/musl-1.2.0/src/network/dn_expand.c
index d9b3393652..eac343af5e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/dn_expand.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/dn_expand.c
@@ -1,5 +1,4 @@
 #include <resolv.h>
-#include "libc.h"
 
 int __dn_expand(const unsigned char *base, const unsigned char *end, const unsigned char *src, char *dest, int space)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/dn_skipname.c b/src/components/lib/libc/musl-1.2.0/src/network/dn_skipname.c
new file mode 100644
index 0000000000..eba65bb82a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/dn_skipname.c
@@ -0,0 +1,15 @@
+#include <resolv.h>
+
+int dn_skipname(const unsigned char *s, const unsigned char *end)
+{
+	const unsigned char *p = s;
+	while (p < end)
+		if (!*p) return p-s+1;
+		else if (*p>=192)
+			if (p+1<end) return p-s+2;
+			else break;
+		else
+			if (end-p<*p+1) break;
+			else p += *p + 1;
+	return -1;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/dns_parse.c b/src/components/lib/libc/musl-1.2.0/src/network/dns_parse.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/network/dns_parse.c
rename to src/components/lib/libc/musl-1.2.0/src/network/dns_parse.c
index 0c7a601124..e6ee19d9a6 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/dns_parse.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/dns_parse.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include "lookup.h"
 
 int __dns_parse(const unsigned char *r, int rlen, int (*callback)(void *, int, const void *, int, const void *), void *ctx)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/ent.c b/src/components/lib/libc/musl-1.2.0/src/network/ent.c
new file mode 100644
index 0000000000..c6e012306d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/ent.c
@@ -0,0 +1,22 @@
+#include <netdb.h>
+
+void sethostent(int x)
+{
+}
+
+struct hostent *gethostent()
+{
+	return 0;
+}
+
+struct netent *getnetent()
+{
+	return 0;
+}
+
+void endhostent(void)
+{
+}
+
+weak_alias(sethostent, setnetent);
+weak_alias(endhostent, endnetent);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/ether.c b/src/components/lib/libc/musl-1.2.0/src/network/ether.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/ether.c
rename to src/components/lib/libc/musl-1.2.0/src/network/ether.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/freeaddrinfo.c b/src/components/lib/libc/musl-1.2.0/src/network/freeaddrinfo.c
new file mode 100644
index 0000000000..62241c239e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/freeaddrinfo.c
@@ -0,0 +1,16 @@
+#include <stdlib.h>
+#include <stddef.h>
+#include <netdb.h>
+#include "lookup.h"
+#include "lock.h"
+
+void freeaddrinfo(struct addrinfo *p)
+{
+	size_t cnt;
+	for (cnt=1; p->ai_next; cnt++, p=p->ai_next);
+	struct aibuf *b = (void *)((char *)p - offsetof(struct aibuf, ai));
+	b -= b->slot;
+	LOCK(b->lock);
+	if (!(b->ref -= cnt)) free(b);
+	else UNLOCK(b->lock);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/gai_strerror.c b/src/components/lib/libc/musl-1.2.0/src/network/gai_strerror.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/gai_strerror.c
rename to src/components/lib/libc/musl-1.2.0/src/network/gai_strerror.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/getaddrinfo.c b/src/components/lib/libc/musl-1.2.0/src/network/getaddrinfo.c
new file mode 100644
index 0000000000..efaab30682
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/getaddrinfo.c
@@ -0,0 +1,135 @@
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <string.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <endian.h>
+#include <errno.h>
+#include "lookup.h"
+
+int getaddrinfo(const char *restrict host, const char *restrict serv, const struct addrinfo *restrict hint, struct addrinfo **restrict res)
+{
+	struct service ports[MAXSERVS];
+	struct address addrs[MAXADDRS];
+	char canon[256], *outcanon;
+	int nservs, naddrs, nais, canon_len, i, j, k;
+	int family = AF_UNSPEC, flags = 0, proto = 0, socktype = 0;
+	struct aibuf *out;
+
+	if (!host && !serv) return EAI_NONAME;
+
+	if (hint) {
+		family = hint->ai_family;
+		flags = hint->ai_flags;
+		proto = hint->ai_protocol;
+		socktype = hint->ai_socktype;
+
+		const int mask = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST |
+			AI_V4MAPPED | AI_ALL | AI_ADDRCONFIG | AI_NUMERICSERV;
+		if ((flags & mask) != flags)
+			return EAI_BADFLAGS;
+
+		switch (family) {
+		case AF_INET:
+		case AF_INET6:
+		case AF_UNSPEC:
+			break;
+		default:
+			return EAI_FAMILY;
+		}
+	}
+
+	if (flags & AI_ADDRCONFIG) {
+		/* Define the "an address is configured" condition for address
+		 * families via ability to create a socket for the family plus
+		 * routability of the loopback address for the family. */
+		static const struct sockaddr_in lo4 = {
+			.sin_family = AF_INET, .sin_port = 65535,
+			.sin_addr.s_addr = __BYTE_ORDER == __BIG_ENDIAN
+				? 0x7f000001 : 0x0100007f
+		};
+		static const struct sockaddr_in6 lo6 = {
+			.sin6_family = AF_INET6, .sin6_port = 65535,
+			.sin6_addr = IN6ADDR_LOOPBACK_INIT
+		};
+		int tf[2] = { AF_INET, AF_INET6 };
+		const void *ta[2] = { &lo4, &lo6 };
+		socklen_t tl[2] = { sizeof lo4, sizeof lo6 };
+		for (i=0; i<2; i++) {
+			if (family==tf[1-i]) continue;
+			int s = socket(tf[i], SOCK_CLOEXEC|SOCK_DGRAM,
+				IPPROTO_UDP);
+			if (s>=0) {
+				int cs;
+				pthread_setcancelstate(
+					PTHREAD_CANCEL_DISABLE, &cs);
+				int r = connect(s, ta[i], tl[i]);
+				pthread_setcancelstate(cs, 0);
+				close(s);
+				if (!r) continue;
+			}
+			switch (errno) {
+			case EADDRNOTAVAIL:
+			case EAFNOSUPPORT:
+			case EHOSTUNREACH:
+			case ENETDOWN:
+			case ENETUNREACH:
+				break;
+			default:
+				return EAI_SYSTEM;
+			}
+			if (family == tf[i]) return EAI_NONAME;
+			family = tf[1-i];
+		}
+	}
+
+	nservs = __lookup_serv(ports, serv, proto, socktype, flags);
+	if (nservs < 0) return nservs;
+
+	naddrs = __lookup_name(addrs, canon, host, family, flags);
+	if (naddrs < 0) return naddrs;
+
+	nais = nservs * naddrs;
+	canon_len = strlen(canon);
+	out = calloc(1, nais * sizeof(*out) + canon_len + 1);
+	if (!out) return EAI_MEMORY;
+
+	if (canon_len) {
+		outcanon = (void *)&out[nais];
+		memcpy(outcanon, canon, canon_len+1);
+	} else {
+		outcanon = 0;
+	}
+
+	for (k=i=0; i<naddrs; i++) for (j=0; j<nservs; j++, k++) {
+		out[k].slot = k;
+		out[k].ai = (struct addrinfo){
+			.ai_family = addrs[i].family,
+			.ai_socktype = ports[j].socktype,
+			.ai_protocol = ports[j].proto,
+			.ai_addrlen = addrs[i].family == AF_INET
+				? sizeof(struct sockaddr_in)
+				: sizeof(struct sockaddr_in6),
+			.ai_addr = (void *)&out[k].sa,
+			.ai_canonname = outcanon };
+		if (k) out[k-1].ai.ai_next = &out[k].ai;
+		switch (addrs[i].family) {
+		case AF_INET:
+			out[k].sa.sin.sin_family = AF_INET;
+			out[k].sa.sin.sin_port = htons(ports[j].port);
+			memcpy(&out[k].sa.sin.sin_addr, &addrs[i].addr, 4);
+			break;
+		case AF_INET6:
+			out[k].sa.sin6.sin6_family = AF_INET6;
+			out[k].sa.sin6.sin6_port = htons(ports[j].port);
+			out[k].sa.sin6.sin6_scope_id = addrs[i].scopeid;
+			memcpy(&out[k].sa.sin6.sin6_addr, &addrs[i].addr, 16);
+			break;			
+		}
+	}
+	out[0].ref = nais;
+	*res = &out->ai;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyaddr.c b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyaddr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/gethostbyaddr.c
rename to src/components/lib/libc/musl-1.2.0/src/network/gethostbyaddr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyaddr_r.c b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyaddr_r.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/network/gethostbyaddr_r.c
rename to src/components/lib/libc/musl-1.2.0/src/network/gethostbyaddr_r.c
index 66e0330940..0f1e61aa0c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyaddr_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyaddr_r.c
@@ -64,6 +64,7 @@ int gethostbyaddr_r(const void *a, socklen_t l, int af,
 	}
 
 	h->h_addrtype = af;
+	h->h_length = l;
 	h->h_name = h->h_aliases[0];
 	*res = h;
 	return 0;
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/gethostbyname.c b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyname.c
new file mode 100644
index 0000000000..bfedf52ad6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyname.c
@@ -0,0 +1,11 @@
+#define _GNU_SOURCE
+
+#include <sys/socket.h>
+#include <netdb.h>
+#include <string.h>
+#include <netinet/in.h>
+
+struct hostent *gethostbyname(const char *name)
+{
+	return gethostbyname2(name, AF_INET);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyname2.c b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyname2.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/gethostbyname2.c
rename to src/components/lib/libc/musl-1.2.0/src/network/gethostbyname2.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyname2_r.c b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyname2_r.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/network/gethostbyname2_r.c
rename to src/components/lib/libc/musl-1.2.0/src/network/gethostbyname2_r.c
index 81f71d2160..fc8948776d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyname2_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyname2_r.c
@@ -34,8 +34,6 @@ int gethostbyname2_r(const char *name, int af,
 	case EAI_SYSTEM:
 		*err = NO_RECOVERY;
 		return errno;
-	case 0:
-		break;
 	}
 
 	h->h_addrtype = af;
@@ -58,6 +56,13 @@ int gethostbyname2_r(const char *name, int af,
 	h->h_addr_list = (void *)buf;
 	buf += (cnt+1)*sizeof(char *);
 
+	for (i=0; i<cnt; i++) {
+		h->h_addr_list[i] = (void *)buf;
+		buf += h->h_length;
+		memcpy(h->h_addr_list[i], addrs[i].addr, h->h_length);
+	}
+	h->h_addr_list[i] = 0;
+
 	h->h_name = h->h_aliases[0] = buf;
 	strcpy(h->h_name, canon);
 	buf += strlen(h->h_name)+1;
@@ -70,13 +75,6 @@ int gethostbyname2_r(const char *name, int af,
 
 	h->h_aliases[2] = 0;
 
-	for (i=0; i<cnt; i++) {
-		h->h_addr_list[i] = (void *)buf;
-		buf += h->h_length;
-		memcpy(h->h_addr_list[i], addrs[i].addr, h->h_length);
-	}
-	h->h_addr_list[i] = 0;
-
 	*res = h;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/gethostbyname_r.c b/src/components/lib/libc/musl-1.2.0/src/network/gethostbyname_r.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/gethostbyname_r.c
rename to src/components/lib/libc/musl-1.2.0/src/network/gethostbyname_r.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getifaddrs.c b/src/components/lib/libc/musl-1.2.0/src/network/getifaddrs.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/network/getifaddrs.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getifaddrs.c
index 89a8f729d9..fed75bd8d9 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/getifaddrs.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/getifaddrs.c
@@ -162,13 +162,26 @@ static int netlink_msg_to_ifaddr(void *pctx, struct nlmsghdr *h)
 		for (rta = NLMSG_RTA(h, sizeof(*ifa)); NLMSG_RTAOK(rta, h); rta = RTA_NEXT(rta)) {
 			switch (rta->rta_type) {
 			case IFA_ADDRESS:
-				copy_addr(&ifs->ifa.ifa_addr, ifa->ifa_family, &ifs->addr, RTA_DATA(rta), RTA_DATALEN(rta), ifa->ifa_index);
+				/* If ifa_addr is already set we, received an IFA_LOCAL before
+				 * so treat this as destination address */
+				if (ifs->ifa.ifa_addr)
+					copy_addr(&ifs->ifa.ifa_dstaddr, ifa->ifa_family, &ifs->ifu, RTA_DATA(rta), RTA_DATALEN(rta), ifa->ifa_index);
+				else
+					copy_addr(&ifs->ifa.ifa_addr, ifa->ifa_family, &ifs->addr, RTA_DATA(rta), RTA_DATALEN(rta), ifa->ifa_index);
 				break;
 			case IFA_BROADCAST:
-				/* For point-to-point links this is peer, but ifa_broadaddr
-				 * and ifa_dstaddr are union, so this works for both.  */
 				copy_addr(&ifs->ifa.ifa_broadaddr, ifa->ifa_family, &ifs->ifu, RTA_DATA(rta), RTA_DATALEN(rta), ifa->ifa_index);
 				break;
+			case IFA_LOCAL:
+				/* If ifa_addr is set and we get IFA_LOCAL, assume we have
+				 * a point-to-point network. Move address to correct field. */
+				if (ifs->ifa.ifa_addr) {
+					ifs->ifu = ifs->addr;
+					ifs->ifa.ifa_dstaddr = &ifs->ifu.sa;
+					memset(&ifs->addr, 0, sizeof(ifs->addr));
+				}
+				copy_addr(&ifs->ifa.ifa_addr, ifa->ifa_family, &ifs->addr, RTA_DATA(rta), RTA_DATALEN(rta), ifa->ifa_index);
+				break;
 			case IFA_LABEL:
 				if (RTA_DATALEN(rta) < sizeof(ifs->name)) {
 					memcpy(ifs->name, RTA_DATA(rta), RTA_DATALEN(rta));
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getnameinfo.c b/src/components/lib/libc/musl-1.2.0/src/network/getnameinfo.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/network/getnameinfo.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getnameinfo.c
index 3484fc697f..f77e73ade8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/getnameinfo.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/getnameinfo.c
@@ -2,19 +2,16 @@
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <ctype.h>
+#include <resolv.h>
 #include "lookup.h"
 #include "stdio_impl.h"
 
-int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
-int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
-int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
-int __res_send(const unsigned char *, int, unsigned char *, int);
-
 #define PTR_MAX (64 + sizeof ".in-addr.arpa")
 #define RR_PTR 12
 
@@ -135,13 +132,13 @@ int getnameinfo(const struct sockaddr *restrict sa, socklen_t sl,
 	switch (af) {
 	case AF_INET:
 		a = (void *)&((struct sockaddr_in *)sa)->sin_addr;
-		if (sl != sizeof(struct sockaddr_in)) return EAI_FAMILY;
+		if (sl < sizeof(struct sockaddr_in)) return EAI_FAMILY;
 		mkptr4(ptr, a);
 		scopeid = 0;
 		break;
 	case AF_INET6:
 		a = (void *)&((struct sockaddr_in6 *)sa)->sin6_addr;
-		if (sl != sizeof(struct sockaddr_in6)) return EAI_FAMILY;
+		if (sl < sizeof(struct sockaddr_in6)) return EAI_FAMILY;
 		if (memcmp(a, "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12))
 			mkptr6(ptr, a);
 		else
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getpeername.c b/src/components/lib/libc/musl-1.2.0/src/network/getpeername.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/getpeername.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getpeername.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getservbyname.c b/src/components/lib/libc/musl-1.2.0/src/network/getservbyname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/getservbyname.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getservbyname.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getservbyname_r.c b/src/components/lib/libc/musl-1.2.0/src/network/getservbyname_r.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/network/getservbyname_r.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getservbyname_r.c
index 056c2f33bb..cad6317ab8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/getservbyname_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/getservbyname_r.c
@@ -5,6 +5,7 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 #include "lookup.h"
 
 #define ALIGN (sizeof(struct { char a; char *b; }) - sizeof(char *))
@@ -15,6 +16,13 @@ int getservbyname_r(const char *name, const char *prots,
 	struct service servs[MAXSERVS];
 	int cnt, proto, align;
 
+	*res = 0;
+
+	/* Don't treat numeric port number strings as service records. */
+	char *end = "";
+	strtoul(name, &end, 10);
+	if (!*end) return ENOENT;
+
 	/* Align buffer */
 	align = -(uintptr_t)buf & ALIGN-1;
 	if (buflen < 2*sizeof(char *)+align)
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getservbyport.c b/src/components/lib/libc/musl-1.2.0/src/network/getservbyport.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/getservbyport.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getservbyport.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getservbyport_r.c b/src/components/lib/libc/musl-1.2.0/src/network/getservbyport_r.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/network/getservbyport_r.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getservbyport_r.c
index a0a7caecf7..b7f21c6b39 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/getservbyport_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/getservbyport_r.c
@@ -5,6 +5,7 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 
 int getservbyport_r(int port, const char *prots,
 	struct servent *se, char *buf, size_t buflen, struct servent **res)
@@ -20,6 +21,7 @@ int getservbyport_r(int port, const char *prots,
 		if (r) r = getservbyport_r(port, "udp", se, buf, buflen, res);
 		return r;
 	}
+	*res = 0;
 
 	/* Align buffer */
 	i = (uintptr_t)buf & sizeof(char *)-1;
@@ -50,6 +52,9 @@ int getservbyport_r(int port, const char *prots,
 		break;
 	}
 
+	/* A numeric port string is not a service record. */
+	if (strtol(buf, 0, 10)==ntohs(port)) return ENOENT;
+
 	*res = se;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/getsockname.c b/src/components/lib/libc/musl-1.2.0/src/network/getsockname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/getsockname.c
rename to src/components/lib/libc/musl-1.2.0/src/network/getsockname.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/getsockopt.c b/src/components/lib/libc/musl-1.2.0/src/network/getsockopt.c
new file mode 100644
index 0000000000..d3640d9c91
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/getsockopt.c
@@ -0,0 +1,41 @@
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <errno.h>
+#include "syscall.h"
+
+int getsockopt(int fd, int level, int optname, void *restrict optval, socklen_t *restrict optlen)
+{
+	long tv32[2];
+	struct timeval *tv;
+
+	int r = __socketcall(getsockopt, fd, level, optname, optval, optlen, 0);
+
+	if (r==-ENOPROTOOPT) switch (level) {
+	case SOL_SOCKET:
+		switch (optname) {
+		case SO_RCVTIMEO:
+		case SO_SNDTIMEO:
+			if (SO_RCVTIMEO == SO_RCVTIMEO_OLD) break;
+			if (*optlen < sizeof *tv) return __syscall_ret(-EINVAL);
+			if (optname==SO_RCVTIMEO) optname=SO_RCVTIMEO_OLD;
+			if (optname==SO_SNDTIMEO) optname=SO_SNDTIMEO_OLD;
+			r = __socketcall(getsockopt, fd, level, optname,
+				tv32, (socklen_t[]){sizeof tv32}, 0);
+			if (r<0) break;
+			tv = optval;
+			tv->tv_sec = tv32[0];
+			tv->tv_usec = tv32[1];
+			*optlen = sizeof *tv;
+			break;
+		case SO_TIMESTAMP:
+		case SO_TIMESTAMPNS:
+			if (SO_TIMESTAMP == SO_TIMESTAMP_OLD) break;
+			if (optname==SO_TIMESTAMP) optname=SO_TIMESTAMP_OLD;
+			if (optname==SO_TIMESTAMPNS) optname=SO_TIMESTAMPNS_OLD;
+			r = __socketcall(getsockopt, fd, level,
+				optname, optval, optlen, 0);
+			break;
+		}
+	}
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/h_errno.c b/src/components/lib/libc/musl-1.2.0/src/network/h_errno.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/h_errno.c
rename to src/components/lib/libc/musl-1.2.0/src/network/h_errno.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/herror.c b/src/components/lib/libc/musl-1.2.0/src/network/herror.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/herror.c
rename to src/components/lib/libc/musl-1.2.0/src/network/herror.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/hstrerror.c b/src/components/lib/libc/musl-1.2.0/src/network/hstrerror.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/hstrerror.c
rename to src/components/lib/libc/musl-1.2.0/src/network/hstrerror.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/htonl.c b/src/components/lib/libc/musl-1.2.0/src/network/htonl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/htonl.c
rename to src/components/lib/libc/musl-1.2.0/src/network/htonl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/htons.c b/src/components/lib/libc/musl-1.2.0/src/network/htons.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/htons.c
rename to src/components/lib/libc/musl-1.2.0/src/network/htons.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/if_freenameindex.c b/src/components/lib/libc/musl-1.2.0/src/network/if_freenameindex.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/if_freenameindex.c
rename to src/components/lib/libc/musl-1.2.0/src/network/if_freenameindex.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/if_indextoname.c b/src/components/lib/libc/musl-1.2.0/src/network/if_indextoname.c
new file mode 100644
index 0000000000..3b368bf0d1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/if_indextoname.c
@@ -0,0 +1,23 @@
+#define _GNU_SOURCE
+#include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <string.h>
+#include <errno.h>
+#include "syscall.h"
+
+char *if_indextoname(unsigned index, char *name)
+{
+	struct ifreq ifr;
+	int fd, r;
+
+	if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) return 0;
+	ifr.ifr_ifindex = index;
+	r = ioctl(fd, SIOCGIFNAME, &ifr);
+	__syscall(SYS_close, fd);
+	if (r < 0) {
+		if (errno == ENODEV) errno = ENXIO;
+		return 0;
+	}
+	return strncpy(name, ifr.ifr_name, IF_NAMESIZE);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/if_nameindex.c b/src/components/lib/libc/musl-1.2.0/src/network/if_nameindex.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/if_nameindex.c
rename to src/components/lib/libc/musl-1.2.0/src/network/if_nameindex.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/if_nametoindex.c b/src/components/lib/libc/musl-1.2.0/src/network/if_nametoindex.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/network/if_nametoindex.c
rename to src/components/lib/libc/musl-1.2.0/src/network/if_nametoindex.c
index cb6ec054ef..331413c689 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/if_nametoindex.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/if_nametoindex.c
@@ -10,7 +10,7 @@ unsigned if_nametoindex(const char *name)
 	struct ifreq ifr;
 	int fd, r;
 
-	if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) return -1;
+	if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) return 0;
 	strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
 	r = ioctl(fd, SIOCGIFINDEX, &ifr);
 	__syscall(SYS_close, fd);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/in6addr_any.c b/src/components/lib/libc/musl-1.2.0/src/network/in6addr_any.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/in6addr_any.c
rename to src/components/lib/libc/musl-1.2.0/src/network/in6addr_any.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/in6addr_loopback.c b/src/components/lib/libc/musl-1.2.0/src/network/in6addr_loopback.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/in6addr_loopback.c
rename to src/components/lib/libc/musl-1.2.0/src/network/in6addr_loopback.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/inet_addr.c b/src/components/lib/libc/musl-1.2.0/src/network/inet_addr.c
similarity index 78%
rename from src/components/lib/libc/musl-1.1.11/src/network/inet_addr.c
rename to src/components/lib/libc/musl-1.2.0/src/network/inet_addr.c
index 10b21f211c..11ece3d6f8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/inet_addr.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/inet_addr.c
@@ -2,8 +2,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-int __inet_aton(const char *, struct in_addr *);
-
 in_addr_t inet_addr(const char *p)
 {
 	struct in_addr a;
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/inet_aton.c b/src/components/lib/libc/musl-1.2.0/src/network/inet_aton.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/network/inet_aton.c
rename to src/components/lib/libc/musl-1.2.0/src/network/inet_aton.c
index 0f9a45f66d..c65f7c2c03 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/inet_aton.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/inet_aton.c
@@ -2,7 +2,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include "libc.h"
+#include <stdlib.h>
 
 int __inet_aton(const char *s0, struct in_addr *dest)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/inet_legacy.c b/src/components/lib/libc/musl-1.2.0/src/network/inet_legacy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/inet_legacy.c
rename to src/components/lib/libc/musl-1.2.0/src/network/inet_legacy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/inet_ntoa.c b/src/components/lib/libc/musl-1.2.0/src/network/inet_ntoa.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/inet_ntoa.c
rename to src/components/lib/libc/musl-1.2.0/src/network/inet_ntoa.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/inet_ntop.c b/src/components/lib/libc/musl-1.2.0/src/network/inet_ntop.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/network/inet_ntop.c
rename to src/components/lib/libc/musl-1.2.0/src/network/inet_ntop.c
index 14f9f4c401..4bfef2c557 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/inet_ntop.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/inet_ntop.c
@@ -36,7 +36,7 @@ const char *inet_ntop(int af, const void *restrict a0, char *restrict s, socklen
 			j = strspn(buf+i, ":0");
 			if (j>max) best=i, max=j;
 		}
-		if (max>2) {
+		if (max>3) {
 			buf[best] = buf[best+1] = ':';
 			memmove(buf+best+2, buf+best+max, i-best-max+1);
 		}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/inet_pton.c b/src/components/lib/libc/musl-1.2.0/src/network/inet_pton.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/inet_pton.c
rename to src/components/lib/libc/musl-1.2.0/src/network/inet_pton.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/listen.c b/src/components/lib/libc/musl-1.2.0/src/network/listen.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/listen.c
rename to src/components/lib/libc/musl-1.2.0/src/network/listen.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/lookup.h b/src/components/lib/libc/musl-1.2.0/src/network/lookup.h
new file mode 100644
index 0000000000..ef66272567
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/lookup.h
@@ -0,0 +1,55 @@
+#ifndef LOOKUP_H
+#define LOOKUP_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include <features.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
+struct aibuf {
+	struct addrinfo ai;
+	union sa {
+		struct sockaddr_in sin;
+		struct sockaddr_in6 sin6;
+	} sa;
+	volatile int lock[1];
+	short slot, ref;
+};
+
+struct address {
+	int family;
+	unsigned scopeid;
+	uint8_t addr[16];
+	int sortkey;
+};
+
+struct service {
+	uint16_t port;
+	unsigned char proto, socktype;
+};
+
+#define MAXNS 3
+
+struct resolvconf {
+	struct address ns[MAXNS];
+	unsigned nns, attempts, ndots;
+	unsigned timeout;
+};
+
+/* The limit of 48 results is a non-sharp bound on the number of addresses
+ * that can fit in one 512-byte DNS packet full of v4 results and a second
+ * packet full of v6 results. Due to headers, the actual limit is lower. */
+#define MAXADDRS 48
+#define MAXSERVS 2
+
+hidden int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int proto, int socktype, int flags);
+hidden int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, int flags);
+hidden int __lookup_ipliteral(struct address buf[static 1], const char *name, int family);
+
+hidden int __get_resolv_conf(struct resolvconf *, char *, size_t);
+hidden int __res_msend_rc(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int, const struct resolvconf *);
+
+hidden int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
+
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/lookup_ipliteral.c b/src/components/lib/libc/musl-1.2.0/src/network/lookup_ipliteral.c
new file mode 100644
index 0000000000..2fddab7373
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/lookup_ipliteral.c
@@ -0,0 +1,55 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "lookup.h"
+
+int __lookup_ipliteral(struct address buf[static 1], const char *name, int family)
+{
+	struct in_addr a4;
+	struct in6_addr a6;
+	if (__inet_aton(name, &a4) > 0) {
+		if (family == AF_INET6) /* wrong family */
+			return EAI_NONAME;
+		memcpy(&buf[0].addr, &a4, sizeof a4);
+		buf[0].family = AF_INET;
+		buf[0].scopeid = 0;
+		return 1;
+	}
+
+	char tmp[64];
+	char *p = strchr(name, '%'), *z;
+	unsigned long long scopeid = 0;
+	if (p && p-name < 64) {
+		memcpy(tmp, name, p-name);
+		tmp[p-name] = 0;
+		name = tmp;
+	}
+
+	if (inet_pton(AF_INET6, name, &a6) <= 0)
+		return 0;
+	if (family == AF_INET) /* wrong family */
+		return EAI_NONAME;
+
+	memcpy(&buf[0].addr, &a6, sizeof a6);
+	buf[0].family = AF_INET6;
+	if (p) {
+		if (isdigit(*++p)) scopeid = strtoull(p, &z, 10);
+		else z = p-1;
+		if (*z) {
+			if (!IN6_IS_ADDR_LINKLOCAL(&a6) &&
+			    !IN6_IS_ADDR_MC_LINKLOCAL(&a6))
+				return EAI_NONAME;
+			scopeid = if_nametoindex(p);
+			if (!scopeid) return EAI_NONAME;
+		}
+		if (scopeid > UINT_MAX) return EAI_NONAME;
+	}
+	buf[0].scopeid = scopeid;
+	return 1;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/lookup_name.c b/src/components/lib/libc/musl-1.2.0/src/network/lookup_name.c
new file mode 100644
index 0000000000..c93263a9d5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/lookup_name.c
@@ -0,0 +1,416 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <errno.h>
+#include <resolv.h>
+#include "lookup.h"
+#include "stdio_impl.h"
+#include "syscall.h"
+
+static int is_valid_hostname(const char *host)
+{
+	const unsigned char *s;
+	if (strnlen(host, 255)-1 >= 254 || mbstowcs(0, host, 0) == -1) return 0;
+	for (s=(void *)host; *s>=0x80 || *s=='.' || *s=='-' || isalnum(*s); s++);
+	return !*s;
+}
+
+static int name_from_null(struct address buf[static 2], const char *name, int family, int flags)
+{
+	int cnt = 0;
+	if (name) return 0;
+	if (flags & AI_PASSIVE) {
+		if (family != AF_INET6)
+			buf[cnt++] = (struct address){ .family = AF_INET };
+		if (family != AF_INET)
+			buf[cnt++] = (struct address){ .family = AF_INET6 };
+	} else {
+		if (family != AF_INET6)
+			buf[cnt++] = (struct address){ .family = AF_INET, .addr = { 127,0,0,1 } };
+		if (family != AF_INET)
+			buf[cnt++] = (struct address){ .family = AF_INET6, .addr = { [15] = 1 } };
+	}
+	return cnt;
+}
+
+static int name_from_numeric(struct address buf[static 1], const char *name, int family)
+{
+	return __lookup_ipliteral(buf, name, family);
+}
+
+static int name_from_hosts(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family)
+{
+	char line[512];
+	size_t l = strlen(name);
+	int cnt = 0, badfam = 0;
+	unsigned char _buf[1032];
+	FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf);
+	if (!f) switch (errno) {
+	case ENOENT:
+	case ENOTDIR:
+	case EACCES:
+		return 0;
+	default:
+		return EAI_SYSTEM;
+	}
+	while (fgets(line, sizeof line, f) && cnt < MAXADDRS) {
+		char *p, *z;
+
+		if ((p=strchr(line, '#'))) *p++='\n', *p=0;
+		for(p=line+1; (p=strstr(p, name)) &&
+			(!isspace(p[-1]) || !isspace(p[l])); p++);
+		if (!p) continue;
+
+		/* Isolate IP address to parse */
+		for (p=line; *p && !isspace(*p); p++);
+		*p++ = 0;
+		switch (name_from_numeric(buf+cnt, line, family)) {
+		case 1:
+			cnt++;
+			break;
+		case 0:
+			continue;
+		default:
+			badfam = EAI_NONAME;
+			continue;
+		}
+
+		/* Extract first name as canonical name */
+		for (; *p && isspace(*p); p++);
+		for (z=p; *z && !isspace(*z); z++);
+		*z = 0;
+		if (is_valid_hostname(p)) memcpy(canon, p, z-p+1);
+	}
+	__fclose_ca(f);
+	return cnt ? cnt : badfam;
+}
+
+struct dpc_ctx {
+	struct address *addrs;
+	char *canon;
+	int cnt;
+};
+
+#define RR_A 1
+#define RR_CNAME 5
+#define RR_AAAA 28
+
+static int dns_parse_callback(void *c, int rr, const void *data, int len, const void *packet)
+{
+	char tmp[256];
+	struct dpc_ctx *ctx = c;
+	if (ctx->cnt >= MAXADDRS) return -1;
+	switch (rr) {
+	case RR_A:
+		if (len != 4) return -1;
+		ctx->addrs[ctx->cnt].family = AF_INET;
+		ctx->addrs[ctx->cnt].scopeid = 0;
+		memcpy(ctx->addrs[ctx->cnt++].addr, data, 4);
+		break;
+	case RR_AAAA:
+		if (len != 16) return -1;
+		ctx->addrs[ctx->cnt].family = AF_INET6;
+		ctx->addrs[ctx->cnt].scopeid = 0;
+		memcpy(ctx->addrs[ctx->cnt++].addr, data, 16);
+		break;
+	case RR_CNAME:
+		if (__dn_expand(packet, (const unsigned char *)packet + 512,
+		    data, tmp, sizeof tmp) > 0 && is_valid_hostname(tmp))
+			strcpy(ctx->canon, tmp);
+		break;
+	}
+	return 0;
+}
+
+static int name_from_dns(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, const struct resolvconf *conf)
+{
+	unsigned char qbuf[2][280], abuf[2][512];
+	const unsigned char *qp[2] = { qbuf[0], qbuf[1] };
+	unsigned char *ap[2] = { abuf[0], abuf[1] };
+	int qlens[2], alens[2];
+	int i, nq = 0;
+	struct dpc_ctx ctx = { .addrs = buf, .canon = canon };
+	static const struct { int af; int rr; } afrr[2] = {
+		{ .af = AF_INET6, .rr = RR_A },
+		{ .af = AF_INET, .rr = RR_AAAA },
+	};
+
+	for (i=0; i<2; i++) {
+		if (family != afrr[i].af) {
+			qlens[nq] = __res_mkquery(0, name, 1, afrr[i].rr,
+				0, 0, 0, qbuf[nq], sizeof *qbuf);
+			if (qlens[nq] == -1)
+				return EAI_NONAME;
+			nq++;
+		}
+	}
+
+	if (__res_msend_rc(nq, qp, qlens, ap, alens, sizeof *abuf, conf) < 0)
+		return EAI_SYSTEM;
+
+	for (i=0; i<nq; i++)
+		__dns_parse(abuf[i], alens[i], dns_parse_callback, &ctx);
+
+	if (ctx.cnt) return ctx.cnt;
+	if (alens[0] < 4 || (abuf[0][3] & 15) == 2) return EAI_AGAIN;
+	if ((abuf[0][3] & 15) == 0) return EAI_NONAME;
+	if ((abuf[0][3] & 15) == 3) return 0;
+	return EAI_FAIL;
+}
+
+static int name_from_dns_search(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family)
+{
+	char search[256];
+	struct resolvconf conf;
+	size_t l, dots;
+	char *p, *z;
+
+	if (__get_resolv_conf(&conf, search, sizeof search) < 0) return -1;
+
+	/* Count dots, suppress search when >=ndots or name ends in
+	 * a dot, which is an explicit request for global scope. */
+	for (dots=l=0; name[l]; l++) if (name[l]=='.') dots++;
+	if (dots >= conf.ndots || name[l-1]=='.') *search = 0;
+
+	/* Strip final dot for canon, fail if multiple trailing dots. */
+	if (name[l-1]=='.') l--;
+	if (!l || name[l-1]=='.') return EAI_NONAME;
+
+	/* This can never happen; the caller already checked length. */
+	if (l >= 256) return EAI_NONAME;
+
+	/* Name with search domain appended is setup in canon[]. This both
+	 * provides the desired default canonical name (if the requested
+	 * name is not a CNAME record) and serves as a buffer for passing
+	 * the full requested name to name_from_dns. */
+	memcpy(canon, name, l);
+	canon[l] = '.';
+
+	for (p=search; *p; p=z) {
+		for (; isspace(*p); p++);
+		for (z=p; *z && !isspace(*z); z++);
+		if (z==p) break;
+		if (z-p < 256 - l - 1) {
+			memcpy(canon+l+1, p, z-p);
+			canon[z-p+1+l] = 0;
+			int cnt = name_from_dns(buf, canon, canon, family, &conf);
+			if (cnt) return cnt;
+		}
+	}
+
+	canon[l] = 0;
+	return name_from_dns(buf, canon, name, family, &conf);
+}
+
+static const struct policy {
+	unsigned char addr[16];
+	unsigned char len, mask;
+	unsigned char prec, label;
+} defpolicy[] = {
+	{ "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1", 15, 0xff, 50, 0 },
+	{ "\0\0\0\0\0\0\0\0\0\0\xff\xff", 11, 0xff, 35, 4 },
+	{ "\x20\2", 1, 0xff, 30, 2 },
+	{ "\x20\1", 3, 0xff, 5, 5 },
+	{ "\xfc", 0, 0xfe, 3, 13 },
+#if 0
+	/* These are deprecated and/or returned to the address
+	 * pool, so despite the RFC, treating them as special
+	 * is probably wrong. */
+	{ "", 11, 0xff, 1, 3 },
+	{ "\xfe\xc0", 1, 0xc0, 1, 11 },
+	{ "\x3f\xfe", 1, 0xff, 1, 12 },
+#endif
+	/* Last rule must match all addresses to stop loop. */
+	{ "", 0, 0, 40, 1 },
+};
+
+static const struct policy *policyof(const struct in6_addr *a)
+{
+	int i;
+	for (i=0; ; i++) {
+		if (memcmp(a->s6_addr, defpolicy[i].addr, defpolicy[i].len))
+			continue;
+		if ((a->s6_addr[defpolicy[i].len] & defpolicy[i].mask)
+		    != defpolicy[i].addr[defpolicy[i].len])
+			continue;
+		return defpolicy+i;
+	}
+}
+
+static int labelof(const struct in6_addr *a)
+{
+	return policyof(a)->label;
+}
+
+static int scopeof(const struct in6_addr *a)
+{
+	if (IN6_IS_ADDR_MULTICAST(a)) return a->s6_addr[1] & 15;
+	if (IN6_IS_ADDR_LINKLOCAL(a)) return 2;
+	if (IN6_IS_ADDR_LOOPBACK(a)) return 2;
+	if (IN6_IS_ADDR_SITELOCAL(a)) return 5;
+	return 14;
+}
+
+static int prefixmatch(const struct in6_addr *s, const struct in6_addr *d)
+{
+	/* FIXME: The common prefix length should be limited to no greater
+	 * than the nominal length of the prefix portion of the source
+	 * address. However the definition of the source prefix length is
+	 * not clear and thus this limiting is not yet implemented. */
+	unsigned i;
+	for (i=0; i<128 && !((s->s6_addr[i/8]^d->s6_addr[i/8])&(128>>(i%8))); i++);
+	return i;
+}
+
+#define DAS_USABLE              0x40000000
+#define DAS_MATCHINGSCOPE       0x20000000
+#define DAS_MATCHINGLABEL       0x10000000
+#define DAS_PREC_SHIFT          20
+#define DAS_SCOPE_SHIFT         16
+#define DAS_PREFIX_SHIFT        8
+#define DAS_ORDER_SHIFT         0
+
+static int addrcmp(const void *_a, const void *_b)
+{
+	const struct address *a = _a, *b = _b;
+	return b->sortkey - a->sortkey;
+}
+
+int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, int flags)
+{
+	int cnt = 0, i, j;
+
+	*canon = 0;
+	if (name) {
+		/* reject empty name and check len so it fits into temp bufs */
+		size_t l = strnlen(name, 255);
+		if (l-1 >= 254)
+			return EAI_NONAME;
+		memcpy(canon, name, l+1);
+	}
+
+	/* Procedurally, a request for v6 addresses with the v4-mapped
+	 * flag set is like a request for unspecified family, followed
+	 * by filtering of the results. */
+	if (flags & AI_V4MAPPED) {
+		if (family == AF_INET6) family = AF_UNSPEC;
+		else flags -= AI_V4MAPPED;
+	}
+
+	/* Try each backend until there's at least one result. */
+	cnt = name_from_null(buf, name, family, flags);
+	if (!cnt) cnt = name_from_numeric(buf, name, family);
+	if (!cnt && !(flags & AI_NUMERICHOST)) {
+		cnt = name_from_hosts(buf, canon, name, family);
+		if (!cnt) cnt = name_from_dns_search(buf, canon, name, family);
+	}
+	if (cnt<=0) return cnt ? cnt : EAI_NONAME;
+
+	/* Filter/transform results for v4-mapped lookup, if requested. */
+	if (flags & AI_V4MAPPED) {
+		if (!(flags & AI_ALL)) {
+			/* If any v6 results exist, remove v4 results. */
+			for (i=0; i<cnt && buf[i].family != AF_INET6; i++);
+			if (i<cnt) {
+				for (j=0; i<cnt; i++) {
+					if (buf[i].family == AF_INET6)
+						buf[j++] = buf[i];
+				}
+				cnt = i = j;
+			}
+		}
+		/* Translate any remaining v4 results to v6 */
+		for (i=0; i<cnt; i++) {
+			if (buf[i].family != AF_INET) continue;
+			memcpy(buf[i].addr+12, buf[i].addr, 4);
+			memcpy(buf[i].addr, "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+			buf[i].family = AF_INET6;
+		}
+	}
+
+	/* No further processing is needed if there are fewer than 2
+	 * results or if there are only IPv4 results. */
+	if (cnt<2 || family==AF_INET) return cnt;
+	for (i=0; i<cnt; i++) if (buf[i].family != AF_INET) break;
+	if (i==cnt) return cnt;
+
+	int cs;
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+	/* The following implements a subset of RFC 3484/6724 destination
+	 * address selection by generating a single 31-bit sort key for
+	 * each address. Rules 3, 4, and 7 are omitted for having
+	 * excessive runtime and code size cost and dubious benefit.
+	 * So far the label/precedence table cannot be customized. */
+	for (i=0; i<cnt; i++) {
+		int family = buf[i].family;
+		int key = 0;
+		struct sockaddr_in6 sa6 = { 0 }, da6 = {
+			.sin6_family = AF_INET6,
+			.sin6_scope_id = buf[i].scopeid,
+			.sin6_port = 65535
+		};
+		struct sockaddr_in sa4 = { 0 }, da4 = {
+			.sin_family = AF_INET,
+			.sin_port = 65535
+		};
+		void *sa, *da;
+		socklen_t salen, dalen;
+		if (family == AF_INET6) {
+			memcpy(da6.sin6_addr.s6_addr, buf[i].addr, 16);
+			da = &da6; dalen = sizeof da6;
+			sa = &sa6; salen = sizeof sa6;
+		} else {
+			memcpy(sa6.sin6_addr.s6_addr,
+				"\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+			memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4);
+			memcpy(da6.sin6_addr.s6_addr,
+				"\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+			memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4);
+			memcpy(&da4.sin_addr, buf[i].addr, 4);
+			da = &da4; dalen = sizeof da4;
+			sa = &sa4; salen = sizeof sa4;
+		}
+		const struct policy *dpolicy = policyof(&da6.sin6_addr);
+		int dscope = scopeof(&da6.sin6_addr);
+		int dlabel = dpolicy->label;
+		int dprec = dpolicy->prec;
+		int prefixlen = 0;
+		int fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP);
+		if (fd >= 0) {
+			if (!connect(fd, da, dalen)) {
+				key |= DAS_USABLE;
+				if (!getsockname(fd, sa, &salen)) {
+					if (family == AF_INET) memcpy(
+						sa6.sin6_addr.s6_addr+12,
+						&sa4.sin_addr, 4);
+					if (dscope == scopeof(&sa6.sin6_addr))
+						key |= DAS_MATCHINGSCOPE;
+					if (dlabel == labelof(&sa6.sin6_addr))
+						key |= DAS_MATCHINGLABEL;
+					prefixlen = prefixmatch(&sa6.sin6_addr,
+						&da6.sin6_addr);
+				}
+			}
+			close(fd);
+		}
+		key |= dprec << DAS_PREC_SHIFT;
+		key |= (15-dscope) << DAS_SCOPE_SHIFT;
+		key |= prefixlen << DAS_PREFIX_SHIFT;
+		key |= (MAXADDRS-i) << DAS_ORDER_SHIFT;
+		buf[i].sortkey = key;
+	}
+	qsort(buf, cnt, sizeof *buf, addrcmp);
+
+	pthread_setcancelstate(cs, 0);
+
+	return cnt;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/lookup_serv.c b/src/components/lib/libc/musl-1.2.0/src/network/lookup_serv.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/network/lookup_serv.c
rename to src/components/lib/libc/musl-1.2.0/src/network/lookup_serv.c
index 4faa5bc7d8..ae38277851 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/lookup_serv.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/lookup_serv.c
@@ -3,7 +3,9 @@
 #include <netdb.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 #include <fcntl.h>
+#include <errno.h>
 #include "lookup.h"
 #include "stdio_impl.h"
 
@@ -63,13 +65,20 @@ int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int pro
 		return cnt;
 	}
 
-	if (flags & AI_NUMERICSERV) return EAI_SERVICE;
+	if (flags & AI_NUMERICSERV) return EAI_NONAME;
 
 	size_t l = strlen(name);
 
 	unsigned char _buf[1032];
 	FILE _f, *f = __fopen_rb_ca("/etc/services", &_f, _buf, sizeof _buf);
-	if (!f) return EAI_SERVICE;
+	if (!f) switch (errno) {
+	case ENOENT:
+	case ENOTDIR:
+	case EACCES:
+		return EAI_SERVICE;
+	default:
+		return EAI_SYSTEM;
+	}
 
 	while (fgets(line, sizeof line, f) && cnt < MAXSERVS) {
 		if ((p=strchr(line, '#'))) *p++='\n', *p=0;
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/netlink.c b/src/components/lib/libc/musl-1.2.0/src/network/netlink.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/netlink.c
rename to src/components/lib/libc/musl-1.2.0/src/network/netlink.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/netlink.h b/src/components/lib/libc/musl-1.2.0/src/network/netlink.h
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/network/netlink.h
rename to src/components/lib/libc/musl-1.2.0/src/network/netlink.h
index 20700ac5b4..38acb17892 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/netlink.h
+++ b/src/components/lib/libc/musl-1.2.0/src/network/netlink.h
@@ -91,4 +91,4 @@ struct ifaddrmsg {
 #define NLMSG_RTA(nlh,len)	((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len)))
 #define NLMSG_RTAOK(rta,nlh)	RTA_OK(rta,NLMSG_DATAEND(nlh))
 
-int __rtnetlink_enumerate(int link_af, int addr_af, int (*cb)(void *ctx, struct nlmsghdr *h), void *ctx);
+hidden int __rtnetlink_enumerate(int link_af, int addr_af, int (*cb)(void *ctx, struct nlmsghdr *h), void *ctx);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/netname.c b/src/components/lib/libc/musl-1.2.0/src/network/netname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/netname.c
rename to src/components/lib/libc/musl-1.2.0/src/network/netname.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/ns_parse.c b/src/components/lib/libc/musl-1.2.0/src/network/ns_parse.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/ns_parse.c
rename to src/components/lib/libc/musl-1.2.0/src/network/ns_parse.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/ntohl.c b/src/components/lib/libc/musl-1.2.0/src/network/ntohl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/ntohl.c
rename to src/components/lib/libc/musl-1.2.0/src/network/ntohl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/ntohs.c b/src/components/lib/libc/musl-1.2.0/src/network/ntohs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/ntohs.c
rename to src/components/lib/libc/musl-1.2.0/src/network/ntohs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/proto.c b/src/components/lib/libc/musl-1.2.0/src/network/proto.c
similarity index 82%
rename from src/components/lib/libc/musl-1.1.11/src/network/proto.c
rename to src/components/lib/libc/musl-1.2.0/src/network/proto.c
index 43aa17a42a..c4fd34efb0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/proto.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/proto.c
@@ -9,21 +9,36 @@ static const unsigned char protos[] = {
 	"\001icmp\0"
 	"\002igmp\0"
 	"\003ggp\0"
+	"\004ipencap\0"
+	"\005st\0"
 	"\006tcp\0"
+	"\010egp\0"
 	"\014pup\0"
 	"\021udp\0"
-	"\026idp\0"
+	"\024hmp\0"
+	"\026xns-idp\0"
+	"\033rdp\0"
+	"\035iso-tp4\0"
+	"\044xtp\0"
+	"\045ddp\0"
+	"\046idpr-cmtp\0"
 	"\051ipv6\0"
 	"\053ipv6-route\0"
 	"\054ipv6-frag\0"
+	"\055idrp\0"
+	"\056rsvp\0"
 	"\057gre\0"
 	"\062esp\0"
 	"\063ah\0"
+	"\071skip\0"
 	"\072ipv6-icmp\0"
 	"\073ipv6-nonxt\0"
 	"\074ipv6-opts\0"
+	"\111rspf\0"
+	"\121vmtp\0"
 	"\131ospf\0"
 	"\136ipip\0"
+	"\142encap\0"
 	"\147pim\0"
 	"\377raw"
 };
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/recv.c b/src/components/lib/libc/musl-1.2.0/src/network/recv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/recv.c
rename to src/components/lib/libc/musl-1.2.0/src/network/recv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/recvfrom.c b/src/components/lib/libc/musl-1.2.0/src/network/recvfrom.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/network/recvfrom.c
rename to src/components/lib/libc/musl-1.2.0/src/network/recvfrom.c
index 436f3447cf..61911663e0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/recvfrom.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/recvfrom.c
@@ -1,6 +1,5 @@
 #include <sys/socket.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t recvfrom(int fd, void *restrict buf, size_t len, int flags, struct sockaddr *restrict addr, socklen_t *restrict alen)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/recvmmsg.c b/src/components/lib/libc/musl-1.2.0/src/network/recvmmsg.c
new file mode 100644
index 0000000000..2978e2f64f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/recvmmsg.c
@@ -0,0 +1,39 @@
+#define _GNU_SOURCE
+#include <sys/socket.h>
+#include <limits.h>
+#include <errno.h>
+#include <time.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+hidden void __convert_scm_timestamps(struct msghdr *, socklen_t);
+
+int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags, struct timespec *timeout)
+{
+#if LONG_MAX > INT_MAX
+	struct mmsghdr *mh = msgvec;
+	unsigned int i;
+	for (i = vlen; i; i--, mh++)
+		mh->msg_hdr.__pad1 = mh->msg_hdr.__pad2 = 0;
+#endif
+#ifdef SYS_recvmmsg_time64
+	time_t s = timeout ? timeout->tv_sec : 0;
+	long ns = timeout ? timeout->tv_nsec : 0;
+	int r = __syscall_cp(SYS_recvmmsg_time64, fd, msgvec, vlen, flags,
+			timeout ? ((long long[]){s, ns}) : 0);
+	if (SYS_recvmmsg == SYS_recvmmsg_time64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	if (vlen > IOV_MAX) vlen = IOV_MAX;
+	socklen_t csize[vlen];
+	for (int i=0; i<vlen; i++) csize[i] = msgvec[i].msg_hdr.msg_controllen;
+	r = __syscall_cp(SYS_recvmmsg, fd, msgvec, vlen, flags,
+		timeout ? ((long[]){CLAMP(s), ns}) : 0);
+	for (int i=0; i<r; i++)
+		__convert_scm_timestamps(&msgvec[i].msg_hdr, csize[i]);
+	return __syscall_ret(r);
+#else
+	return syscall_cp(SYS_recvmmsg, fd, msgvec, vlen, flags, timeout);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/recvmsg.c b/src/components/lib/libc/musl-1.2.0/src/network/recvmsg.c
new file mode 100644
index 0000000000..03641625e8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/recvmsg.c
@@ -0,0 +1,68 @@
+#include <sys/socket.h>
+#include <limits.h>
+#include <time.h>
+#include <sys/time.h>
+#include <string.h>
+#include "syscall.h"
+
+hidden void __convert_scm_timestamps(struct msghdr *, socklen_t);
+
+void __convert_scm_timestamps(struct msghdr *msg, socklen_t csize)
+{
+	if (SCM_TIMESTAMP == SCM_TIMESTAMP_OLD) return;
+	if (!msg->msg_control || !msg->msg_controllen) return;
+
+	struct cmsghdr *cmsg, *last=0;
+	long tmp;
+	long long tvts[2];
+	int type = 0;
+
+	for (cmsg=CMSG_FIRSTHDR(msg); cmsg; cmsg=CMSG_NXTHDR(msg, cmsg)) {
+		if (cmsg->cmsg_level==SOL_SOCKET) switch (cmsg->cmsg_type) {
+		case SCM_TIMESTAMP_OLD:
+			if (type) break;
+			type = SCM_TIMESTAMP;
+			goto common;
+		case SCM_TIMESTAMPNS_OLD:
+			type = SCM_TIMESTAMPNS;
+		common:
+			memcpy(&tmp, CMSG_DATA(cmsg), sizeof tmp);
+			tvts[0] = tmp;
+			memcpy(&tmp, CMSG_DATA(cmsg) + sizeof tmp, sizeof tmp);
+			tvts[1] = tmp;
+			break;
+		}
+		last = cmsg;
+	}
+	if (!last || !type) return;
+	if (CMSG_SPACE(sizeof tvts) > csize-msg->msg_controllen) {
+		msg->msg_flags |= MSG_CTRUNC;
+		return;
+	}
+	msg->msg_controllen += CMSG_SPACE(sizeof tvts);
+	cmsg = CMSG_NXTHDR(msg, last);
+	cmsg->cmsg_level = SOL_SOCKET;
+	cmsg->cmsg_type = type;
+	cmsg->cmsg_len = CMSG_LEN(sizeof tvts);
+	memcpy(CMSG_DATA(cmsg), &tvts, sizeof tvts);
+}
+
+ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
+{
+	ssize_t r;
+	socklen_t orig_controllen = msg->msg_controllen;
+#if LONG_MAX > INT_MAX
+	struct msghdr h, *orig = msg;
+	if (msg) {
+		h = *msg;
+		h.__pad1 = h.__pad2 = 0;
+		msg = &h;
+	}
+#endif
+	r = socketcall_cp(recvmsg, fd, msg, flags, 0, 0, 0);
+	if (r >= 0) __convert_scm_timestamps(msg, orig_controllen);
+#if LONG_MAX > INT_MAX
+	if (orig) *orig = h;
+#endif
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/res_init.c b/src/components/lib/libc/musl-1.2.0/src/network/res_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/res_init.c
rename to src/components/lib/libc/musl-1.2.0/src/network/res_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/res_mkquery.c b/src/components/lib/libc/musl-1.2.0/src/network/res_mkquery.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/network/res_mkquery.c
rename to src/components/lib/libc/musl-1.2.0/src/network/res_mkquery.c
index ec4568acb8..6fa04a5cf8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/res_mkquery.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/res_mkquery.c
@@ -1,7 +1,6 @@
 #include <resolv.h>
 #include <string.h>
 #include <time.h>
-#include "libc.h"
 
 int __res_mkquery(int op, const char *dname, int class, int type,
 	const unsigned char *data, int datalen,
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/res_msend.c b/src/components/lib/libc/musl-1.2.0/src/network/res_msend.c
new file mode 100644
index 0000000000..3e018009eb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/res_msend.c
@@ -0,0 +1,188 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <stdint.h>
+#include <string.h>
+#include <poll.h>
+#include <time.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <errno.h>
+#include <pthread.h>
+#include "stdio_impl.h"
+#include "syscall.h"
+#include "lookup.h"
+
+static void cleanup(void *p)
+{
+	__syscall(SYS_close, (intptr_t)p);
+}
+
+static unsigned long mtime()
+{
+	struct timespec ts;
+	clock_gettime(CLOCK_REALTIME, &ts);
+	return (unsigned long)ts.tv_sec * 1000
+		+ ts.tv_nsec / 1000000;
+}
+
+int __res_msend_rc(int nqueries, const unsigned char *const *queries,
+	const int *qlens, unsigned char *const *answers, int *alens, int asize,
+	const struct resolvconf *conf)
+{
+	int fd;
+	int timeout, attempts, retry_interval, servfail_retry;
+	union {
+		struct sockaddr_in sin;
+		struct sockaddr_in6 sin6;
+	} sa = {0}, ns[MAXNS] = {{0}};
+	socklen_t sl = sizeof sa.sin;
+	int nns = 0;
+	int family = AF_INET;
+	int rlen;
+	int next;
+	int i, j;
+	int cs;
+	struct pollfd pfd;
+	unsigned long t0, t1, t2;
+
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+	timeout = 1000*conf->timeout;
+	attempts = conf->attempts;
+
+	for (nns=0; nns<conf->nns; nns++) {
+		const struct address *iplit = &conf->ns[nns];
+		if (iplit->family == AF_INET) {
+			memcpy(&ns[nns].sin.sin_addr, iplit->addr, 4);
+			ns[nns].sin.sin_port = htons(53);
+			ns[nns].sin.sin_family = AF_INET;
+		} else {
+			sl = sizeof sa.sin6;
+			memcpy(&ns[nns].sin6.sin6_addr, iplit->addr, 16);
+			ns[nns].sin6.sin6_port = htons(53);
+			ns[nns].sin6.sin6_scope_id = iplit->scopeid;
+			ns[nns].sin6.sin6_family = family = AF_INET6;
+		}
+	}
+
+	/* Get local address and open/bind a socket */
+	sa.sin.sin_family = family;
+	fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+
+	/* Handle case where system lacks IPv6 support */
+	if (fd < 0 && family == AF_INET6 && errno == EAFNOSUPPORT) {
+		fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+		family = AF_INET;
+	}
+	if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) {
+		if (fd >= 0) close(fd);
+		pthread_setcancelstate(cs, 0);
+		return -1;
+	}
+
+	/* Past this point, there are no errors. Each individual query will
+	 * yield either no reply (indicated by zero length) or an answer
+	 * packet which is up to the caller to interpret. */
+
+	pthread_cleanup_push(cleanup, (void *)(intptr_t)fd);
+	pthread_setcancelstate(cs, 0);
+
+	/* Convert any IPv4 addresses in a mixed environment to v4-mapped */
+	if (family == AF_INET6) {
+		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &(int){0}, sizeof 0);
+		for (i=0; i<nns; i++) {
+			if (ns[i].sin.sin_family != AF_INET) continue;
+			memcpy(ns[i].sin6.sin6_addr.s6_addr+12,
+				&ns[i].sin.sin_addr, 4);
+			memcpy(ns[i].sin6.sin6_addr.s6_addr,
+				"\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+			ns[i].sin6.sin6_family = AF_INET6;
+			ns[i].sin6.sin6_flowinfo = 0;
+			ns[i].sin6.sin6_scope_id = 0;
+		}
+	}
+
+	memset(alens, 0, sizeof *alens * nqueries);
+
+	pfd.fd = fd;
+	pfd.events = POLLIN;
+	retry_interval = timeout / attempts;
+	next = 0;
+	t0 = t2 = mtime();
+	t1 = t2 - retry_interval;
+
+	for (; t2-t0 < timeout; t2=mtime()) {
+		if (t2-t1 >= retry_interval) {
+			/* Query all configured namservers in parallel */
+			for (i=0; i<nqueries; i++)
+				if (!alens[i])
+					for (j=0; j<nns; j++)
+						sendto(fd, queries[i],
+							qlens[i], MSG_NOSIGNAL,
+							(void *)&ns[j], sl);
+			t1 = t2;
+			servfail_retry = 2 * nqueries;
+		}
+
+		/* Wait for a response, or until time to retry */
+		if (poll(&pfd, 1, t1+retry_interval-t2) <= 0) continue;
+
+		while ((rlen = recvfrom(fd, answers[next], asize, 0,
+		  (void *)&sa, (socklen_t[1]){sl})) >= 0) {
+
+			/* Ignore non-identifiable packets */
+			if (rlen < 4) continue;
+
+			/* Ignore replies from addresses we didn't send to */
+			for (j=0; j<nns && memcmp(ns+j, &sa, sl); j++);
+			if (j==nns) continue;
+
+			/* Find which query this answer goes with, if any */
+			for (i=next; i<nqueries && (
+				answers[next][0] != queries[i][0] ||
+				answers[next][1] != queries[i][1] ); i++);
+			if (i==nqueries) continue;
+			if (alens[i]) continue;
+
+			/* Only accept positive or negative responses;
+			 * retry immediately on server failure, and ignore
+			 * all other codes such as refusal. */
+			switch (answers[next][3] & 15) {
+			case 0:
+			case 3:
+				break;
+			case 2:
+				if (servfail_retry && servfail_retry--)
+					sendto(fd, queries[i],
+						qlens[i], MSG_NOSIGNAL,
+						(void *)&ns[j], sl);
+			default:
+				continue;
+			}
+
+			/* Store answer in the right slot, or update next
+			 * available temp slot if it's already in place. */
+			alens[i] = rlen;
+			if (i == next)
+				for (; next<nqueries && alens[next]; next++);
+			else
+				memcpy(answers[i], answers[next], rlen);
+
+			if (next == nqueries) goto out;
+		}
+	}
+out:
+	pthread_cleanup_pop(1);
+
+	return 0;
+}
+
+int __res_msend(int nqueries, const unsigned char *const *queries,
+	const int *qlens, unsigned char *const *answers, int *alens, int asize)
+{
+	struct resolvconf conf;
+	if (__get_resolv_conf(&conf, 0, 0) < 0) return -1;
+	return __res_msend_rc(nqueries, queries, qlens, answers, alens, asize, &conf);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/res_query.c b/src/components/lib/libc/musl-1.2.0/src/network/res_query.c
new file mode 100644
index 0000000000..2f4da2e2e7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/res_query.c
@@ -0,0 +1,12 @@
+#include <resolv.h>
+#include <netdb.h>
+
+int res_query(const char *name, int class, int type, unsigned char *dest, int len)
+{
+	unsigned char q[280];
+	int ql = __res_mkquery(0, name, class, type, 0, 0, 0, q, sizeof q);
+	if (ql < 0) return ql;
+	return __res_send(q, ql, dest, len);
+}
+
+weak_alias(res_query, res_search);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/res_querydomain.c b/src/components/lib/libc/musl-1.2.0/src/network/res_querydomain.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/res_querydomain.c
rename to src/components/lib/libc/musl-1.2.0/src/network/res_querydomain.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/res_send.c b/src/components/lib/libc/musl-1.2.0/src/network/res_send.c
new file mode 100644
index 0000000000..b9cea0bfd5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/res_send.c
@@ -0,0 +1,9 @@
+#include <resolv.h>
+
+int __res_send(const unsigned char *msg, int msglen, unsigned char *answer, int anslen)
+{
+	int r = __res_msend(1, &msg, &msglen, &answer, &anslen, anslen);
+	return r<0 ? r : anslen;
+}
+
+weak_alias(__res_send, res_send);
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/res_state.c b/src/components/lib/libc/musl-1.2.0/src/network/res_state.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/res_state.c
rename to src/components/lib/libc/musl-1.2.0/src/network/res_state.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/resolvconf.c b/src/components/lib/libc/musl-1.2.0/src/network/resolvconf.c
new file mode 100644
index 0000000000..ceabf08084
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/resolvconf.c
@@ -0,0 +1,94 @@
+#include "lookup.h"
+#include "stdio_impl.h"
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+
+int __get_resolv_conf(struct resolvconf *conf, char *search, size_t search_sz)
+{
+	char line[256];
+	unsigned char _buf[256];
+	FILE *f, _f;
+	int nns = 0;
+
+	conf->ndots = 1;
+	conf->timeout = 5;
+	conf->attempts = 2;
+	if (search) *search = 0;
+
+	f = __fopen_rb_ca("/etc/resolv.conf", &_f, _buf, sizeof _buf);
+	if (!f) switch (errno) {
+	case ENOENT:
+	case ENOTDIR:
+	case EACCES:
+		goto no_resolv_conf;
+	default:
+		return -1;
+	}
+
+	while (fgets(line, sizeof line, f)) {
+		char *p, *z;
+		if (!strchr(line, '\n') && !feof(f)) {
+			/* Ignore lines that get truncated rather than
+			 * potentially misinterpreting them. */
+			int c;
+			do c = getc(f);
+			while (c != '\n' && c != EOF);
+			continue;
+		}
+		if (!strncmp(line, "options", 7) && isspace(line[7])) {
+			p = strstr(line, "ndots:");
+			if (p && isdigit(p[6])) {
+				p += 6;
+				unsigned long x = strtoul(p, &z, 10);
+				if (z != p) conf->ndots = x > 15 ? 15 : x;
+			}
+			p = strstr(line, "attempts:");
+			if (p && isdigit(p[9])) {
+				p += 9;
+				unsigned long x = strtoul(p, &z, 10);
+				if (z != p) conf->attempts = x > 10 ? 10 : x;
+			}
+			p = strstr(line, "timeout:");
+			if (p && (isdigit(p[8]) || p[8]=='.')) {
+				p += 8;
+				unsigned long x = strtoul(p, &z, 10);
+				if (z != p) conf->timeout = x > 60 ? 60 : x;
+			}
+			continue;
+		}
+		if (!strncmp(line, "nameserver", 10) && isspace(line[10])) {
+			if (nns >= MAXNS) continue;
+			for (p=line+11; isspace(*p); p++);
+			for (z=p; *z && !isspace(*z); z++);
+			*z=0;
+			if (__lookup_ipliteral(conf->ns+nns, p, AF_UNSPEC) > 0)
+				nns++;
+			continue;
+		}
+
+		if (!search) continue;
+		if ((strncmp(line, "domain", 6) && strncmp(line, "search", 6))
+		    || !isspace(line[6]))
+			continue;
+		for (p=line+7; isspace(*p); p++);
+		size_t l = strlen(p);
+		/* This can never happen anyway with chosen buffer sizes. */
+		if (l >= search_sz) continue;
+		memcpy(search, p, l+1);
+	}
+
+	__fclose_ca(f);
+
+no_resolv_conf:
+	if (!nns) {
+		__lookup_ipliteral(conf->ns, "127.0.0.1", AF_UNSPEC);
+		nns = 1;
+	}
+
+	conf->nns = nns;
+
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/send.c b/src/components/lib/libc/musl-1.2.0/src/network/send.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/send.c
rename to src/components/lib/libc/musl-1.2.0/src/network/send.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/sendmmsg.c b/src/components/lib/libc/musl-1.2.0/src/network/sendmmsg.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/sendmmsg.c
rename to src/components/lib/libc/musl-1.2.0/src/network/sendmmsg.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/sendmsg.c b/src/components/lib/libc/musl-1.2.0/src/network/sendmsg.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/network/sendmsg.c
rename to src/components/lib/libc/musl-1.2.0/src/network/sendmsg.c
index 5f080007bf..80cc5f41f6 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/sendmsg.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/sendmsg.c
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <errno.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/sendto.c b/src/components/lib/libc/musl-1.2.0/src/network/sendto.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/network/sendto.c
rename to src/components/lib/libc/musl-1.2.0/src/network/sendto.c
index 899eecff57..c598797c72 100644
--- a/src/components/lib/libc/musl-1.1.11/src/network/sendto.c
+++ b/src/components/lib/libc/musl-1.2.0/src/network/sendto.c
@@ -1,6 +1,5 @@
 #include <sys/socket.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t sendto(int fd, const void *buf, size_t len, int flags, const struct sockaddr *addr, socklen_t alen)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/serv.c b/src/components/lib/libc/musl-1.2.0/src/network/serv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/serv.c
rename to src/components/lib/libc/musl-1.2.0/src/network/serv.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/network/setsockopt.c b/src/components/lib/libc/musl-1.2.0/src/network/setsockopt.c
new file mode 100644
index 0000000000..612a1947a1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/network/setsockopt.c
@@ -0,0 +1,46 @@
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+int setsockopt(int fd, int level, int optname, const void *optval, socklen_t optlen)
+{
+	const struct timeval *tv;
+	time_t s;
+	suseconds_t us;
+
+	int r = __socketcall(setsockopt, fd, level, optname, optval, optlen, 0);
+
+	if (r==-ENOPROTOOPT) switch (level) {
+	case SOL_SOCKET:
+		switch (optname) {
+		case SO_RCVTIMEO:
+		case SO_SNDTIMEO:
+			if (SO_RCVTIMEO == SO_RCVTIMEO_OLD) break;
+			if (optlen < sizeof *tv) return __syscall_ret(-EINVAL);
+			tv = optval;
+			s = tv->tv_sec;
+			us = tv->tv_usec;
+			if (!IS32BIT(s)) return __syscall_ret(-ENOTSUP);
+
+			if (optname==SO_RCVTIMEO) optname=SO_RCVTIMEO_OLD;
+			if (optname==SO_SNDTIMEO) optname=SO_SNDTIMEO_OLD;
+
+			r = __socketcall(setsockopt, fd, level, optname,
+				((long[]){s, CLAMP(us)}), 2*sizeof(long), 0);
+			break;
+		case SO_TIMESTAMP:
+		case SO_TIMESTAMPNS:
+			if (SO_TIMESTAMP == SO_TIMESTAMP_OLD) break;
+			if (optname==SO_TIMESTAMP) optname=SO_TIMESTAMP_OLD;
+			if (optname==SO_TIMESTAMPNS) optname=SO_TIMESTAMPNS_OLD;
+			r = __socketcall(setsockopt, fd, level,
+				optname, optval, optlen, 0);
+			break;
+		}
+	}
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/shutdown.c b/src/components/lib/libc/musl-1.2.0/src/network/shutdown.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/shutdown.c
rename to src/components/lib/libc/musl-1.2.0/src/network/shutdown.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/sockatmark.c b/src/components/lib/libc/musl-1.2.0/src/network/sockatmark.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/sockatmark.c
rename to src/components/lib/libc/musl-1.2.0/src/network/sockatmark.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/socket.c b/src/components/lib/libc/musl-1.2.0/src/network/socket.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/socket.c
rename to src/components/lib/libc/musl-1.2.0/src/network/socket.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/network/socketpair.c b/src/components/lib/libc/musl-1.2.0/src/network/socketpair.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/network/socketpair.c
rename to src/components/lib/libc/musl-1.2.0/src/network/socketpair.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/fgetgrent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/fgetgrent.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/fgetgrent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/fgetgrent.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/fgetpwent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/fgetpwent.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/fgetpwent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/fgetpwent.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/fgetspent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/fgetspent.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/fgetspent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/fgetspent.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getgr_a.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getgr_a.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getgr_a.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getgr_a.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getgr_r.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getgr_r.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getgr_r.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getgr_r.c
index 7246e8a42d..f3e8f603a3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/getgr_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/getgr_r.c
@@ -34,6 +34,7 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
  	free(mem);
  	free(line);
 	pthread_setcancelstate(cs, 0);
+	if (rv) errno = rv;
 	return rv;
 }
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getgrent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getgrent.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getgrent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getgrent.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getgrent_a.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getgrent_a.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getgrent_a.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getgrent_a.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getgrouplist.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getgrouplist.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getgrouplist.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getgrouplist.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getpw_a.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getpw_a.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getpw_a.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getpw_a.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getpw_r.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getpw_r.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getpw_r.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getpw_r.c
index e8cc811e4d..0c87ab05d2 100644
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/getpw_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/getpw_r.c
@@ -27,6 +27,7 @@ static int getpw_r(const char *name, uid_t uid, struct passwd *pw, char *buf, si
 	}
  	free(line);
 	pthread_setcancelstate(cs, 0);
+	if (rv) errno = rv;
 	return rv;
 }
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getpwent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getpwent.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getpwent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getpwent.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getpwent_a.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getpwent_a.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getpwent_a.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getpwent_a.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getspent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getspent.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getspent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getspent.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getspnam.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getspnam.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getspnam.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getspnam.c
index 041f896525..709b526dc5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/getspnam.c
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/getspnam.c
@@ -8,10 +8,11 @@ struct spwd *getspnam(const char *name)
 	static char *line;
 	struct spwd *res;
 	int e;
+	int orig_errno = errno;
 
 	if (!line) line = malloc(LINE_LIM);
 	if (!line) return 0;
 	e = getspnam_r(name, &sp, line, LINE_LIM, &res);
-	if (e) errno = e;
+	errno = e ? e : orig_errno;
 	return res;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/getspnam_r.c b/src/components/lib/libc/musl-1.2.0/src/passwd/getspnam_r.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/getspnam_r.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/getspnam_r.c
index 92339528ad..541e85314d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/getspnam_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/getspnam_r.c
@@ -67,19 +67,21 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
 	size_t k, l = strlen(name);
 	int skip = 0;
 	int cs;
+	int orig_errno = errno;
 
 	*res = 0;
 
 	/* Disallow potentially-malicious user names */
 	if (*name=='.' || strchr(name, '/') || !l)
-		return EINVAL;
+		return errno = EINVAL;
 
 	/* Buffer size must at least be able to hold name, plus some.. */
-	if (size < l+100) return ERANGE;
+	if (size < l+100)
+		return errno = ERANGE;
 
 	/* Protect against truncation */
 	if (snprintf(path, sizeof path, "/etc/tcb/%s/shadow", name) >= sizeof path)
-		return EINVAL;
+		return errno = EINVAL;
 
 	fd = open(path, O_RDONLY|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC);
 	if (fd >= 0) {
@@ -92,8 +94,14 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
 			return errno;
 		}
 	} else {
+		if (errno != ENOENT && errno != ENOTDIR)
+			return errno;
 		f = fopen("/etc/shadow", "rbe");
-		if (!f) return errno;
+		if (!f) {
+			if (errno != ENOENT && errno != ENOTDIR)
+				return errno;
+			return 0;
+		}
 	}
 
 	pthread_cleanup_push(cleanup, f);
@@ -112,5 +120,6 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
 		break;
 	}
 	pthread_cleanup_pop(1);
+	errno = rv ? rv : orig_errno;
 	return rv;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/lckpwdf.c b/src/components/lib/libc/musl-1.2.0/src/passwd/lckpwdf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/lckpwdf.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/lckpwdf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/nscd.h b/src/components/lib/libc/musl-1.2.0/src/passwd/nscd.h
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/nscd.h
rename to src/components/lib/libc/musl-1.2.0/src/passwd/nscd.h
index 9a53c32833..ae5aa8d5db 100644
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/nscd.h
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/nscd.h
@@ -39,6 +39,6 @@
 #define INITGRNGRPS 2
 #define INITGR_LEN 3
 
-FILE *__nscd_query(int32_t req, const char *key, int32_t *buf, size_t len, int *swap);
+hidden FILE *__nscd_query(int32_t req, const char *key, int32_t *buf, size_t len, int *swap);
 
 #endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/nscd_query.c b/src/components/lib/libc/musl-1.2.0/src/passwd/nscd_query.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/nscd_query.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/nscd_query.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/putgrent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/putgrent.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/putgrent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/putgrent.c
index a0b320fc32..2a8257dc9c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/putgrent.c
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/putgrent.c
@@ -7,7 +7,7 @@ int putgrent(const struct group *gr, FILE *f)
 	int r;
 	size_t i;
 	flockfile(f);
-	if ((r = fprintf(f, "%s:%s:%d:", gr->gr_name, gr->gr_passwd, gr->gr_gid))<0) goto done;
+	if ((r = fprintf(f, "%s:%s:%u:", gr->gr_name, gr->gr_passwd, gr->gr_gid))<0) goto done;
 	if (gr->gr_mem) for (i=0; gr->gr_mem[i]; i++)
 		if ((r = fprintf(f, "%s%s", i?",":"", gr->gr_mem[i]))<0) goto done;
 	r = fputc('\n', f);
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/putpwent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/putpwent.c
similarity index 82%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/putpwent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/putpwent.c
index 3a02e57304..312b765302 100644
--- a/src/components/lib/libc/musl-1.1.11/src/passwd/putpwent.c
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/putpwent.c
@@ -4,7 +4,7 @@
 
 int putpwent(const struct passwd *pw, FILE *f)
 {
-	return fprintf(f, "%s:%s:%d:%d:%s:%s:%s\n",
+	return fprintf(f, "%s:%s:%u:%u:%s:%s:%s\n",
 		pw->pw_name, pw->pw_passwd, pw->pw_uid, pw->pw_gid,
 		pw->pw_gecos, pw->pw_dir, pw->pw_shell)<0 ? -1 : 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/passwd/putspent.c b/src/components/lib/libc/musl-1.2.0/src/passwd/putspent.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/passwd/putspent.c
rename to src/components/lib/libc/musl-1.2.0/src/passwd/putspent.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/passwd/pwf.h b/src/components/lib/libc/musl-1.2.0/src/passwd/pwf.h
new file mode 100644
index 0000000000..95bb6e0534
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/passwd/pwf.h
@@ -0,0 +1,15 @@
+#include <pwd.h>
+#include <grp.h>
+#include <shadow.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+hidden int __getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size, struct passwd **res);
+hidden int __getpw_a(const char *name, uid_t uid, struct passwd *pw, char **buf, size_t *size, struct passwd **res);
+hidden int __getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem, struct group **res);
+hidden int __getgr_a(const char *name, gid_t gid, struct group *gr, char **buf, size_t *size, char ***mem, size_t *nmem, struct group **res);
+hidden int __parsespent(char *s, struct spwd *sp);
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/__rand48_step.c b/src/components/lib/libc/musl-1.2.0/src/prng/__rand48_step.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/prng/__rand48_step.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/__rand48_step.c
index 961d30fc91..94703d0738 100644
--- a/src/components/lib/libc/musl-1.1.11/src/prng/__rand48_step.c
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/__rand48_step.c
@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include "rand48.h"
 
 uint64_t __rand48_step(unsigned short *xi, unsigned short *lc)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/__seed48.c b/src/components/lib/libc/musl-1.2.0/src/prng/__seed48.c
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/prng/__seed48.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/__seed48.c
index 05a4539e4e..e436b4d302 100644
--- a/src/components/lib/libc/musl-1.1.11/src/prng/__seed48.c
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/__seed48.c
@@ -1 +1,3 @@
+#include "rand48.h"
+
 unsigned short __seed48[7] = { 0, 0, 0, 0xe66d, 0xdeec, 0x5, 0xb };
diff --git a/src/components/lib/libc/musl-1.2.0/src/prng/drand48.c b/src/components/lib/libc/musl-1.2.0/src/prng/drand48.c
new file mode 100644
index 0000000000..08283e240b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/drand48.c
@@ -0,0 +1,17 @@
+#include <stdlib.h>
+#include <inttypes.h>
+#include "rand48.h"
+
+double erand48(unsigned short s[3])
+{
+	union {
+		uint64_t u;
+		double f;
+	} x = { 0x3ff0000000000000ULL | __rand48_step(s, __seed48+3)<<4 };
+	return x.f - 1.0;
+}
+
+double drand48(void)
+{
+	return erand48(__seed48);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/lcong48.c b/src/components/lib/libc/musl-1.2.0/src/prng/lcong48.c
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/prng/lcong48.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/lcong48.c
index 32b27d423a..030e514844 100644
--- a/src/components/lib/libc/musl-1.1.11/src/prng/lcong48.c
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/lcong48.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-
-extern unsigned short __seed48[7];
+#include "rand48.h"
 
 void lcong48(unsigned short p[7])
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/prng/lrand48.c b/src/components/lib/libc/musl-1.2.0/src/prng/lrand48.c
new file mode 100644
index 0000000000..07e2b78440
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/lrand48.c
@@ -0,0 +1,13 @@
+#include <stdlib.h>
+#include <inttypes.h>
+#include "rand48.h"
+
+long nrand48(unsigned short s[3])
+{
+	return __rand48_step(s, __seed48+3) >> 17;
+}
+
+long lrand48(void)
+{
+	return nrand48(__seed48);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/prng/mrand48.c b/src/components/lib/libc/musl-1.2.0/src/prng/mrand48.c
new file mode 100644
index 0000000000..f4a56e61b2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/mrand48.c
@@ -0,0 +1,13 @@
+#include <stdlib.h>
+#include <inttypes.h>
+#include "rand48.h"
+
+long jrand48(unsigned short s[3])
+{
+	return (int32_t)(__rand48_step(s, __seed48+3) >> 16);
+}
+
+long mrand48(void)
+{
+	return jrand48(__seed48);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/rand.c b/src/components/lib/libc/musl-1.2.0/src/prng/rand.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/prng/rand.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/rand.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/prng/rand48.h b/src/components/lib/libc/musl-1.2.0/src/prng/rand48.h
new file mode 100644
index 0000000000..55cbec1c60
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/rand48.h
@@ -0,0 +1,5 @@
+#include <stdint.h>
+#include <features.h>
+
+hidden uint64_t __rand48_step(unsigned short *xi, unsigned short *lc);
+extern hidden unsigned short __seed48[7];
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/rand_r.c b/src/components/lib/libc/musl-1.2.0/src/prng/rand_r.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/prng/rand_r.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/rand_r.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/random.c b/src/components/lib/libc/musl-1.2.0/src/prng/random.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/prng/random.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/random.c
index 7d557d700d..633a17f690 100644
--- a/src/components/lib/libc/musl-1.1.11/src/prng/random.c
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/random.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdint.h>
-#include "libc.h"
+#include "lock.h"
 
 /*
 this code uses the same lagged fibonacci generator as the
@@ -22,7 +22,7 @@ static int n = 31;
 static int i = 3;
 static int j = 0;
 static uint32_t *x = init+1;
-static volatile int lock[2];
+static volatile int lock[1];
 
 static uint32_t lcg31(uint32_t x) {
 	return (1103515245*x + 12345) & 0x7fffffff;
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/seed48.c b/src/components/lib/libc/musl-1.2.0/src/prng/seed48.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/prng/seed48.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/seed48.c
index e0699c092a..bce7b339fe 100644
--- a/src/components/lib/libc/musl-1.1.11/src/prng/seed48.c
+++ b/src/components/lib/libc/musl-1.2.0/src/prng/seed48.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-
-extern unsigned short __seed48[7];
+#include "rand48.h"
 
 unsigned short *seed48(unsigned short *s)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/prng/srand48.c b/src/components/lib/libc/musl-1.2.0/src/prng/srand48.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/prng/srand48.c
rename to src/components/lib/libc/musl-1.2.0/src/prng/srand48.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/arm/vfork.s b/src/components/lib/libc/musl-1.2.0/src/process/arm/vfork.s
new file mode 100644
index 0000000000..d7ec41b33f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/arm/vfork.s
@@ -0,0 +1,10 @@
+.syntax unified
+.global vfork
+.type vfork,%function
+vfork:
+	mov ip, r7
+	mov r7, 190
+	svc 0
+	mov r7, ip
+	.hidden __syscall_ret
+	b __syscall_ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/execl.c b/src/components/lib/libc/musl-1.2.0/src/process/execl.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/execl.c
rename to src/components/lib/libc/musl-1.2.0/src/process/execl.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/execle.c b/src/components/lib/libc/musl-1.2.0/src/process/execle.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/execle.c
rename to src/components/lib/libc/musl-1.2.0/src/process/execle.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/execlp.c b/src/components/lib/libc/musl-1.2.0/src/process/execlp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/execlp.c
rename to src/components/lib/libc/musl-1.2.0/src/process/execlp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/execv.c b/src/components/lib/libc/musl-1.2.0/src/process/execv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/execv.c
rename to src/components/lib/libc/musl-1.2.0/src/process/execv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/execve.c b/src/components/lib/libc/musl-1.2.0/src/process/execve.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/execve.c
rename to src/components/lib/libc/musl-1.2.0/src/process/execve.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/execvp.c b/src/components/lib/libc/musl-1.2.0/src/process/execvp.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/process/execvp.c
rename to src/components/lib/libc/musl-1.2.0/src/process/execvp.c
index 3a8bbe8329..ef3b9dd598 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/execvp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/process/execvp.c
@@ -3,7 +3,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
-#include "libc.h"
 
 extern char **__environ;
 
@@ -29,8 +28,7 @@ int __execvpe(const char *file, char *const argv[], char *const envp[])
 
 	for(p=path; ; p=z) {
 		char b[l+k+1];
-		z = strchr(p, ':');
-		if (!z) z = p+strlen(p);
+		z = __strchrnul(p, ':');
 		if (z-p >= l) {
 			if (!*z++) break;
 			continue;
@@ -39,8 +37,15 @@ int __execvpe(const char *file, char *const argv[], char *const envp[])
 		b[z-p] = '/';
 		memcpy(b+(z-p)+(z>p), file, k+1);
 		execve(b, argv, envp);
-		if (errno == EACCES) seen_eacces = 1;
-		else if (errno != ENOENT) return -1;
+		switch (errno) {
+		case EACCES:
+			seen_eacces = 1;
+		case ENOENT:
+		case ENOTDIR:
+			break;
+		default:
+			return -1;
+		}
 		if (!*z++) break;
 	}
 	if (seen_eacces) errno = EACCES;
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/fdop.h b/src/components/lib/libc/musl-1.2.0/src/process/fdop.h
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/process/fdop.h
rename to src/components/lib/libc/musl-1.2.0/src/process/fdop.h
index 00b875143a..5adf144387 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/fdop.h
+++ b/src/components/lib/libc/musl-1.2.0/src/process/fdop.h
@@ -1,6 +1,8 @@
 #define FDOP_CLOSE 1
 #define FDOP_DUP2 2
 #define FDOP_OPEN 3
+#define FDOP_CHDIR 4
+#define FDOP_FCHDIR 5
 
 struct fdop {
 	struct fdop *next, *prev;
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/fexecve.c b/src/components/lib/libc/musl-1.2.0/src/process/fexecve.c
new file mode 100644
index 0000000000..554c1981b6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/fexecve.c
@@ -0,0 +1,16 @@
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include "syscall.h"
+
+int fexecve(int fd, char *const argv[], char *const envp[])
+{
+	int r = __syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH);
+	if (r != -ENOSYS) return __syscall_ret(r);
+	char buf[15 + 3*sizeof(int)];
+	__procfdname(buf, fd);
+	execve(buf, argv, envp);
+	if (errno == ENOENT) errno = EBADF;
+	return -1;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/fork.c b/src/components/lib/libc/musl-1.2.0/src/process/fork.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/process/fork.c
rename to src/components/lib/libc/musl-1.2.0/src/process/fork.c
index b96f0024f4..fb42478ae7 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/fork.c
+++ b/src/components/lib/libc/musl-1.2.0/src/process/fork.c
@@ -18,18 +18,20 @@ pid_t fork(void)
 	__fork_handler(-1);
 	__block_all_sigs(&set);
 #ifdef SYS_fork
-	ret = syscall(SYS_fork);
+	ret = __syscall(SYS_fork);
 #else
-	ret = syscall(SYS_clone, SIGCHLD, 0);
+	ret = __syscall(SYS_clone, SIGCHLD, 0);
 #endif
 	if (!ret) {
 		pthread_t self = __pthread_self();
 		self->tid = __syscall(SYS_gettid);
 		self->robust_list.off = 0;
 		self->robust_list.pending = 0;
+		self->next = self->prev = self;
+		__thread_list_lock = 0;
 		libc.threads_minus_1 = 0;
 	}
 	__restore_sigs(&set);
 	__fork_handler(!ret);
-	return ret;
+	return __syscall_ret(ret);
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/i386/vfork.s b/src/components/lib/libc/musl-1.2.0/src/process/i386/vfork.s
new file mode 100644
index 0000000000..3d0e6d6bde
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/i386/vfork.s
@@ -0,0 +1,12 @@
+.global vfork
+.type vfork,@function
+vfork:
+	pop %edx
+	mov $190,%eax
+	int $128
+	push %edx
+	push %eax
+	.hidden __syscall_ret
+	call __syscall_ret
+	pop %edx
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawn.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawn.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawn.c
index 59463558b0..2e3f04bf7f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawn.c
+++ b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn.c
@@ -8,31 +8,22 @@
 #include "syscall.h"
 #include "pthread_impl.h"
 #include "fdop.h"
-#include "libc.h"
 
 struct args {
 	int p[2];
 	sigset_t oldmask;
 	const char *path;
-	int (*exec)(const char *, char *const *, char *const *);
 	const posix_spawn_file_actions_t *fa;
 	const posix_spawnattr_t *restrict attr;
 	char *const *argv, *const *envp;
 };
 
-void __get_handler_set(sigset_t *);
-
 static int __sys_dup2(int old, int new)
 {
 #ifdef SYS_dup2
 	return __syscall(SYS_dup2, old, new);
 #else
-	if (old==new) {
-		int r = __syscall(SYS_fcntl, old, F_GETFD);
-		return r<0 ? r : old;
-	} else {
-		return __syscall(SYS_dup3, old, new, 0);
-	}
+	return __syscall(SYS_dup3, old, new, 0);
 #endif
 }
 
@@ -73,6 +64,10 @@ static int child(void *args_vp)
 		__libc_sigaction(i, &sa, 0);
 	}
 
+	if (attr->__flags & POSIX_SPAWN_SETSID)
+		if ((ret=__syscall(SYS_setsid)) < 0)
+			goto fail;
+
 	if (attr->__flags & POSIX_SPAWN_SETPGROUP)
 		if ((ret=__syscall(SYS_setpgid, 0, attr->__pgrp)))
 			goto fail;
@@ -105,8 +100,21 @@ static int child(void *args_vp)
 				__syscall(SYS_close, op->fd);
 				break;
 			case FDOP_DUP2:
-				if ((ret=__sys_dup2(op->srcfd, op->fd))<0)
+				fd = op->srcfd;
+				if (fd == p) {
+					ret = -EBADF;
 					goto fail;
+				}
+				if (fd != op->fd) {
+					if ((ret=__sys_dup2(fd, op->fd))<0)
+						goto fail;
+				} else {
+					ret = __syscall(SYS_fcntl, fd, F_GETFD);
+					ret = __syscall(SYS_fcntl, fd, F_SETFD,
+					                ret & ~FD_CLOEXEC);
+					if (ret<0)
+						goto fail;
+				}
 				break;
 			case FDOP_OPEN:
 				fd = __sys_open(op->path, op->oflag, op->mode);
@@ -117,6 +125,14 @@ static int child(void *args_vp)
 					__syscall(SYS_close, fd);
 				}
 				break;
+			case FDOP_CHDIR:
+				ret = __syscall(SYS_chdir, op->path);
+				if (ret<0) goto fail;
+				break;
+			case FDOP_FCHDIR:
+				ret = __syscall(SYS_fchdir, op->fd);
+				if (ret<0) goto fail;
+				break;
 			}
 		}
 	}
@@ -130,7 +146,10 @@ static int child(void *args_vp)
 	pthread_sigmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK)
 		? &attr->__mask : &args->oldmask, 0);
 
-	args->exec(args->path, args->argv, args->envp);
+	int (*exec)(const char *, char *const *, char *const *) =
+		attr->__fn ? (int (*)())attr->__fn : execve;
+
+	exec(args->path, args->argv, args->envp);
 	ret = -errno;
 
 fail:
@@ -141,14 +160,13 @@ static int child(void *args_vp)
 }
 
 
-int __posix_spawnx(pid_t *restrict res, const char *restrict path,
-	int (*exec)(const char *, char *const *, char *const *),
+int posix_spawn(pid_t *restrict res, const char *restrict path,
 	const posix_spawn_file_actions_t *fa,
 	const posix_spawnattr_t *restrict attr,
 	char *const argv[restrict], char *const envp[restrict])
 {
 	pid_t pid;
-	char stack[1024];
+	char stack[1024+PATH_MAX];
 	int ec=0, cs;
 	struct args args;
 
@@ -158,7 +176,6 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path,
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
 
 	args.path = path;
-	args.exec = exec;
 	args.fa = fa;
 	args.attr = attr ? attr : &(const posix_spawnattr_t){0};
 	args.argv = argv;
@@ -185,11 +202,3 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path,
 
 	return ec;
 }
-
-int posix_spawn(pid_t *restrict res, const char *restrict path,
-	const posix_spawn_file_actions_t *fa,
-	const posix_spawnattr_t *restrict attr,
-	char *const argv[restrict], char *const envp[restrict])
-{
-	return __posix_spawnx(res, path, execve, fa, attr, argv, envp);
-}
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addchdir.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addchdir.c
new file mode 100644
index 0000000000..7f2590ae4e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addchdir.c
@@ -0,0 +1,18 @@
+#include <spawn.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include "fdop.h"
+
+int posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t *restrict fa, const char *restrict path)
+{
+	struct fdop *op = malloc(sizeof *op + strlen(path) + 1);
+	if (!op) return ENOMEM;
+	op->cmd = FDOP_CHDIR;
+	op->fd = -1;
+	strcpy(op->path, path);
+	if ((op->next = fa->__actions)) op->next->prev = op;
+	op->prev = 0;
+	fa->__actions = op;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_addclose.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addclose.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_addclose.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addclose.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_adddup2.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_adddup2.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_adddup2.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_adddup2.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addfchdir.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addfchdir.c
new file mode 100644
index 0000000000..436c683d25
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addfchdir.c
@@ -0,0 +1,17 @@
+#include <spawn.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include "fdop.h"
+
+int posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *fa, int fd)
+{
+	struct fdop *op = malloc(sizeof *op);
+	if (!op) return ENOMEM;
+	op->cmd = FDOP_FCHDIR;
+	op->fd = fd;
+	if ((op->next = fa->__actions)) op->next->prev = op;
+	op->prev = 0;
+	fa->__actions = op;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_addopen.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addopen.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_addopen.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_addopen.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_destroy.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_init.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawn_file_actions_init.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawn_file_actions_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_destroy.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getflags.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getflags.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getflags.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getflags.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getpgroup.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getpgroup.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getpgroup.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getpgroup.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getsigdefault.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getsigdefault.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getsigdefault.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getsigdefault.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getsigmask.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getsigmask.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_getsigmask.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_getsigmask.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_init.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_init.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_sched.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_sched.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_sched.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_sched.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setflags.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setflags.c
new file mode 100644
index 0000000000..6878099212
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setflags.c
@@ -0,0 +1,18 @@
+#include <spawn.h>
+#include <errno.h>
+
+int posix_spawnattr_setflags(posix_spawnattr_t *attr, short flags)
+{
+	const unsigned all_flags =
+		POSIX_SPAWN_RESETIDS |
+		POSIX_SPAWN_SETPGROUP |
+		POSIX_SPAWN_SETSIGDEF |
+		POSIX_SPAWN_SETSIGMASK |
+		POSIX_SPAWN_SETSCHEDPARAM |
+		POSIX_SPAWN_SETSCHEDULER |
+		POSIX_SPAWN_USEVFORK |
+		POSIX_SPAWN_SETSID;
+	if (flags & ~all_flags) return EINVAL;
+	attr->__flags = flags;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setpgroup.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setpgroup.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setpgroup.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setpgroup.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setsigdefault.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setsigdefault.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setsigdefault.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setsigdefault.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setsigmask.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setsigmask.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/posix_spawnattr_setsigmask.c
rename to src/components/lib/libc/musl-1.2.0/src/process/posix_spawnattr_setsigmask.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnp.c b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnp.c
new file mode 100644
index 0000000000..aad6133b91
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/posix_spawnp.c
@@ -0,0 +1,13 @@
+#include <spawn.h>
+#include <unistd.h>
+
+int posix_spawnp(pid_t *restrict res, const char *restrict file,
+	const posix_spawn_file_actions_t *fa,
+	const posix_spawnattr_t *restrict attr,
+	char *const argv[restrict], char *const envp[restrict])
+{
+	posix_spawnattr_t spawnp_attr = { 0 };
+	if (attr) spawnp_attr = *attr;
+	spawnp_attr.__fn = (void *)__execvpe;	
+	return posix_spawn(res, file, fa, &spawnp_attr, argv, envp);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/s390x/vfork.s b/src/components/lib/libc/musl-1.2.0/src/process/s390x/vfork.s
new file mode 100644
index 0000000000..744f9d78d0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/s390x/vfork.s
@@ -0,0 +1,6 @@
+	.global vfork
+	.type vfork,%function
+vfork:
+	svc 190
+	.hidden __syscall_ret
+	jg  __syscall_ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/sh/vfork.s b/src/components/lib/libc/musl-1.2.0/src/process/sh/vfork.s
new file mode 100644
index 0000000000..91dbde7b93
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/sh/vfork.s
@@ -0,0 +1,20 @@
+.global vfork
+.type vfork,@function
+vfork:
+	mov #95, r3
+	add r3, r3
+
+	trapa #31
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+
+	mov r0, r4
+	mov.l 1f, r0
+2:	braf r0
+	 nop
+	.align 2
+	.hidden __syscall_ret
+1:	.long __syscall_ret@PLT-(2b+4-.)
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/system.c b/src/components/lib/libc/musl-1.2.0/src/process/system.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/process/system.c
rename to src/components/lib/libc/musl-1.2.0/src/process/system.c
index 8cbdda060d..5af59b809f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/system.c
+++ b/src/components/lib/libc/musl-1.2.0/src/process/system.c
@@ -5,7 +5,6 @@
 #include <spawn.h>
 #include <errno.h>
 #include "pthread_impl.h"
-#include "libc.h"
 
 extern char **__environ;
 
@@ -14,7 +13,7 @@ int system(const char *cmd)
 	pid_t pid;
 	sigset_t old, reset;
 	struct sigaction sa = { .sa_handler = SIG_IGN }, oldint, oldquit;
-	int status = 0x7f00, ret;
+	int status = -1, ret;
 	posix_spawnattr_t attr;
 
 	pthread_testcancel();
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/vfork.c b/src/components/lib/libc/musl-1.2.0/src/process/vfork.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/process/vfork.c
rename to src/components/lib/libc/musl-1.2.0/src/process/vfork.c
index ac954651b7..d430c13fca 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/vfork.c
+++ b/src/components/lib/libc/musl-1.2.0/src/process/vfork.c
@@ -2,9 +2,8 @@
 #include <unistd.h>
 #include <signal.h>
 #include "syscall.h"
-#include "libc.h"
 
-pid_t __vfork(void)
+pid_t vfork(void)
 {
 	/* vfork syscall cannot be made from C code */
 #ifdef SYS_fork
@@ -13,5 +12,3 @@ pid_t __vfork(void)
 	return syscall(SYS_clone, SIGCHLD, 0);
 #endif
 }
-
-weak_alias(__vfork, vfork);
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/wait.c b/src/components/lib/libc/musl-1.2.0/src/process/wait.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/process/wait.c
rename to src/components/lib/libc/musl-1.2.0/src/process/wait.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/waitid.c b/src/components/lib/libc/musl-1.2.0/src/process/waitid.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/process/waitid.c
rename to src/components/lib/libc/musl-1.2.0/src/process/waitid.c
index c67feac383..d688650d85 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/waitid.c
+++ b/src/components/lib/libc/musl-1.2.0/src/process/waitid.c
@@ -1,6 +1,5 @@
 #include <sys/wait.h>
 #include "syscall.h"
-#include "libc.h"
 
 int waitid(idtype_t type, id_t id, siginfo_t *info, int options)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/process/waitpid.c b/src/components/lib/libc/musl-1.2.0/src/process/waitpid.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/process/waitpid.c
rename to src/components/lib/libc/musl-1.2.0/src/process/waitpid.c
index f75e31ef24..1b65bf0512 100644
--- a/src/components/lib/libc/musl-1.1.11/src/process/waitpid.c
+++ b/src/components/lib/libc/musl-1.2.0/src/process/waitpid.c
@@ -1,6 +1,5 @@
 #include <sys/wait.h>
 #include "syscall.h"
-#include "libc.h"
 
 pid_t waitpid(pid_t pid, int *status, int options)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/x32/vfork.s b/src/components/lib/libc/musl-1.2.0/src/process/x32/vfork.s
new file mode 100644
index 0000000000..0f0ca3ee48
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/x32/vfork.s
@@ -0,0 +1,10 @@
+.global vfork
+.type vfork,@function
+vfork:
+	pop %rdx
+	mov $0x4000003a,%eax /* SYS_vfork */
+	syscall
+	push %rdx
+	mov %rax,%rdi
+	.hidden __syscall_ret
+	jmp __syscall_ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/process/x86_64/vfork.s b/src/components/lib/libc/musl-1.2.0/src/process/x86_64/vfork.s
new file mode 100644
index 0000000000..9114439031
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/process/x86_64/vfork.s
@@ -0,0 +1,10 @@
+.global vfork
+.type vfork,@function
+vfork:
+	pop %rdx
+	mov $58,%eax
+	syscall
+	push %rdx
+	mov %rax,%rdi
+	.hidden __syscall_ret
+	jmp __syscall_ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/regex/fnmatch.c b/src/components/lib/libc/musl-1.2.0/src/regex/fnmatch.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/regex/fnmatch.c
rename to src/components/lib/libc/musl-1.2.0/src/regex/fnmatch.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/regex/glob.c b/src/components/lib/libc/musl-1.2.0/src/regex/glob.c
new file mode 100644
index 0000000000..9de080ed9c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/regex/glob.c
@@ -0,0 +1,311 @@
+#define _BSD_SOURCE
+#include <glob.h>
+#include <fnmatch.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <pwd.h>
+
+struct match
+{
+	struct match *next;
+	char name[];
+};
+
+static int append(struct match **tail, const char *name, size_t len, int mark)
+{
+	struct match *new = malloc(sizeof(struct match) + len + 2);
+	if (!new) return -1;
+	(*tail)->next = new;
+	new->next = NULL;
+	memcpy(new->name, name, len+1);
+	if (mark && len && name[len-1]!='/') {
+		new->name[len] = '/';
+		new->name[len+1] = 0;
+	}
+	*tail = new;
+	return 0;
+}
+
+static int do_glob(char *buf, size_t pos, int type, char *pat, int flags, int (*errfunc)(const char *path, int err), struct match **tail)
+{
+	/* If GLOB_MARK is unused, we don't care about type. */
+	if (!type && !(flags & GLOB_MARK)) type = DT_REG;
+
+	/* Special-case the remaining pattern being all slashes, in
+	 * which case we can use caller-passed type if it's a dir. */
+	if (*pat && type!=DT_DIR) type = 0;
+	while (pos+1 < PATH_MAX && *pat=='/') buf[pos++] = *pat++;
+
+	/* Consume maximal [escaped-]literal prefix of pattern, copying
+	 * and un-escaping it to the running buffer as we go. */
+	ptrdiff_t i=0, j=0;
+	int in_bracket = 0, overflow = 0;
+	for (; pat[i]!='*' && pat[i]!='?' && (!in_bracket || pat[i]!=']'); i++) {
+		if (!pat[i]) {
+			if (overflow) return 0;
+			pat += i;
+			pos += j;
+			i = j = 0;
+			break;
+		} else if (pat[i] == '[') {
+			in_bracket = 1;
+		} else if (pat[i] == '\\' && !(flags & GLOB_NOESCAPE)) {
+			/* Backslashes inside a bracket are (at least by
+			 * our interpretation) non-special, so if next
+			 * char is ']' we have a complete expression. */
+			if (in_bracket && pat[i+1]==']') break;
+			/* Unpaired final backslash never matches. */
+			if (!pat[i+1]) return 0;
+			i++;
+		}
+		if (pat[i] == '/') {
+			if (overflow) return 0;
+			in_bracket = 0;
+			pat += i+1;
+			i = -1;
+			pos += j+1;
+			j = -1;
+		}
+		/* Only store a character if it fits in the buffer, but if
+		 * a potential bracket expression is open, the overflow
+		 * must be remembered and handled later only if the bracket
+		 * is unterminated (and thereby a literal), so as not to
+		 * disallow long bracket expressions with short matches. */
+		if (pos+(j+1) < PATH_MAX) {
+			buf[pos+j++] = pat[i];
+		} else if (in_bracket) {
+			overflow = 1;
+		} else {
+			return 0;
+		}
+		/* If we consume any new components, the caller-passed type
+		 * or dummy type from above is no longer valid. */
+		type = 0;
+	}
+	buf[pos] = 0;
+	if (!*pat) {
+		/* If we consumed any components above, or if GLOB_MARK is
+		 * requested and we don't yet know if the match is a dir,
+		 * we must confirm the file exists and/or determine its type.
+		 *
+		 * If marking dirs, symlink type is inconclusive; we need the
+		 * type for the symlink target, and therefore must try stat
+		 * first unless type is known not to be a symlink. Otherwise,
+		 * or if that fails, use lstat for determining existence to
+		 * avoid false negatives in the case of broken symlinks. */
+		struct stat st;
+		if ((flags & GLOB_MARK) && (!type||type==DT_LNK) && !stat(buf, &st)) {
+			if (S_ISDIR(st.st_mode)) type = DT_DIR;
+			else type = DT_REG;
+		}
+		if (!type && lstat(buf, &st)) {
+			if (errno!=ENOENT && (errfunc(buf, errno) || (flags & GLOB_ERR)))
+				return GLOB_ABORTED;
+			return 0;
+		}
+		if (append(tail, buf, pos, (flags & GLOB_MARK) && type==DT_DIR))
+			return GLOB_NOSPACE;
+		return 0;
+	}
+	char *p2 = strchr(pat, '/'), saved_sep = '/';
+	/* Check if the '/' was escaped and, if so, remove the escape char
+	 * so that it will not be unpaired when passed to fnmatch. */
+	if (p2 && !(flags & GLOB_NOESCAPE)) {
+		char *p;
+		for (p=p2; p>pat && p[-1]=='\\'; p--);
+		if ((p2-p)%2) {
+			p2--;
+			saved_sep = '\\';
+		}
+	}
+	DIR *dir = opendir(pos ? buf : ".");
+	if (!dir) {
+		if (errfunc(buf, errno) || (flags & GLOB_ERR))
+			return GLOB_ABORTED;
+		return 0;
+	}
+	int old_errno = errno;
+	struct dirent *de;
+	while (errno=0, de=readdir(dir)) {
+		/* Quickly skip non-directories when there's pattern left. */
+		if (p2 && de->d_type && de->d_type!=DT_DIR && de->d_type!=DT_LNK)
+			continue;
+
+		size_t l = strlen(de->d_name);
+		if (l >= PATH_MAX-pos) continue;
+
+		if (p2) *p2 = 0;
+
+		int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
+			| ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0);
+
+		if (fnmatch(pat, de->d_name, fnm_flags))
+			continue;
+
+		/* With GLOB_PERIOD, don't allow matching . or .. unless
+		 * fnmatch would match them with FNM_PERIOD rules in effect. */
+		if (p2 && (flags & GLOB_PERIOD) && de->d_name[0]=='.'
+		    && (!de->d_name[1] || de->d_name[1]=='.' && !de->d_name[2])
+		    && fnmatch(pat, de->d_name, fnm_flags | FNM_PERIOD))
+			continue;
+
+		memcpy(buf+pos, de->d_name, l+1);
+		if (p2) *p2 = saved_sep;
+		int r = do_glob(buf, pos+l, de->d_type, p2 ? p2 : "", flags, errfunc, tail);
+		if (r) {
+			closedir(dir);
+			return r;
+		}
+	}
+	int readerr = errno;
+	if (p2) *p2 = saved_sep;
+	closedir(dir);
+	if (readerr && (errfunc(buf, errno) || (flags & GLOB_ERR)))
+		return GLOB_ABORTED;
+	errno = old_errno;
+	return 0;
+}
+
+static int ignore_err(const char *path, int err)
+{
+	return 0;
+}
+
+static void freelist(struct match *head)
+{
+	struct match *match, *next;
+	for (match=head->next; match; match=next) {
+		next = match->next;
+		free(match);
+	}
+}
+
+static int sort(const void *a, const void *b)
+{
+	return strcmp(*(const char **)a, *(const char **)b);
+}
+
+static int expand_tilde(char **pat, char *buf, size_t *pos)
+{
+	char *p = *pat + 1;
+	size_t i = 0;
+
+	char delim, *name_end = __strchrnul(p, '/');
+	if ((delim = *name_end)) *name_end++ = 0;
+	*pat = name_end;
+
+	char *home = *p ? NULL : getenv("HOME");
+	if (!home) {
+		struct passwd pw, *res;
+		switch (*p ? getpwnam_r(p, &pw, buf, PATH_MAX, &res)
+			   : getpwuid_r(getuid(), &pw, buf, PATH_MAX, &res)) {
+		case ENOMEM:
+			return GLOB_NOSPACE;
+		case 0:
+			if (!res)
+		default:
+				return GLOB_NOMATCH;
+		}
+		home = pw.pw_dir;
+	}
+	while (i < PATH_MAX - 2 && *home)
+		buf[i++] = *home++;
+	if (*home)
+		return GLOB_NOMATCH;
+	if ((buf[i] = delim))
+		buf[++i] = 0;
+	*pos = i;
+	return 0;
+}
+
+int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, int err), glob_t *restrict g)
+{
+	struct match head = { .next = NULL }, *tail = &head;
+	size_t cnt, i;
+	size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0;
+	int error = 0;
+	char buf[PATH_MAX];
+	
+	if (!errfunc) errfunc = ignore_err;
+
+	if (!(flags & GLOB_APPEND)) {
+		g->gl_offs = offs;
+		g->gl_pathc = 0;
+		g->gl_pathv = NULL;
+	}
+
+	if (*pat) {
+		char *p = strdup(pat);
+		if (!p) return GLOB_NOSPACE;
+		buf[0] = 0;
+		size_t pos = 0;
+		char *s = p;
+		if ((flags & (GLOB_TILDE | GLOB_TILDE_CHECK)) && *p == '~')
+			error = expand_tilde(&s, buf, &pos);
+		if (!error)
+			error = do_glob(buf, pos, 0, s, flags, errfunc, &tail);
+		free(p);
+	}
+
+	if (error == GLOB_NOSPACE) {
+		freelist(&head);
+		return error;
+	}
+	
+	for (cnt=0, tail=head.next; tail; tail=tail->next, cnt++);
+	if (!cnt) {
+		if (flags & GLOB_NOCHECK) {
+			tail = &head;
+			if (append(&tail, pat, strlen(pat), 0))
+				return GLOB_NOSPACE;
+			cnt++;
+		} else
+			return GLOB_NOMATCH;
+	}
+
+	if (flags & GLOB_APPEND) {
+		char **pathv = realloc(g->gl_pathv, (offs + g->gl_pathc + cnt + 1) * sizeof(char *));
+		if (!pathv) {
+			freelist(&head);
+			return GLOB_NOSPACE;
+		}
+		g->gl_pathv = pathv;
+		offs += g->gl_pathc;
+	} else {
+		g->gl_pathv = malloc((offs + cnt + 1) * sizeof(char *));
+		if (!g->gl_pathv) {
+			freelist(&head);
+			return GLOB_NOSPACE;
+		}
+		for (i=0; i<offs; i++)
+			g->gl_pathv[i] = NULL;
+	}
+	for (i=0, tail=head.next; i<cnt; tail=tail->next, i++)
+		g->gl_pathv[offs + i] = tail->name;
+	g->gl_pathv[offs + i] = NULL;
+	g->gl_pathc += cnt;
+
+	if (!(flags & GLOB_NOSORT))
+		qsort(g->gl_pathv+offs, cnt, sizeof(char *), sort);
+	
+	return error;
+}
+
+void globfree(glob_t *g)
+{
+	size_t i;
+	for (i=0; i<g->gl_pathc; i++)
+		free(g->gl_pathv[g->gl_offs + i] - offsetof(struct match, name));
+	free(g->gl_pathv);
+	g->gl_pathc = 0;
+	g->gl_pathv = NULL;
+}
+
+weak_alias(glob, glob64);
+weak_alias(globfree, globfree64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/regex/regcomp.c b/src/components/lib/libc/musl-1.2.0/src/regex/regcomp.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/regex/regcomp.c
rename to src/components/lib/libc/musl-1.2.0/src/regex/regcomp.c
index 978dd87f33..fb24556ebe 100644
--- a/src/components/lib/libc/musl-1.1.11/src/regex/regcomp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/regex/regcomp.c
@@ -401,8 +401,8 @@ typedef struct {
 	tre_ast_node_t *n;
 	/* Position in the regexp pattern after a parse function returns. */
 	const char *s;
-	/* The first character of the regexp. */
-	const char *re;
+	/* The first character of the last subexpression parsed. */
+	const char *start;
 	/* Current submatch ID. */
 	int submatch_id;
 	/* Current position (number of literal). */
@@ -636,6 +636,20 @@ static reg_errcode_t parse_bracket(tre_parse_ctx_t *ctx, const char *s)
 		goto parse_bracket_done;
 
 	if (neg.negate) {
+		/*
+		 * With REG_NEWLINE, POSIX requires that newlines are not matched by
+		 * any form of a non-matching list.
+		 */
+		if (ctx->cflags & REG_NEWLINE) {
+			lit = tre_new_lit(&ls);
+			if (!lit) {
+				err = REG_ESPACE;
+				goto parse_bracket_done;
+			}
+			lit->code_min = '\n';
+			lit->code_max = '\n';
+			lit->position = -1;
+		}
 		/* Sort the array if we need to negate it. */
 		qsort(ls.a, ls.len, sizeof *ls.a, tre_compare_lit);
 		/* extra lit for the last negated range */
@@ -708,7 +722,7 @@ static const char *parse_dup_count(const char *s, int *n)
 	return s;
 }
 
-static reg_errcode_t parse_dup(tre_parse_ctx_t *ctx, const char *s)
+static const char *parse_dup(const char *s, int ere, int *pmin, int *pmax)
 {
 	int min, max;
 
@@ -723,19 +737,13 @@ static reg_errcode_t parse_dup(tre_parse_ctx_t *ctx, const char *s)
 		max > RE_DUP_MAX ||
 		min > RE_DUP_MAX ||
 		min < 0 ||
-		(!(ctx->cflags & REG_EXTENDED) && *s++ != '\\') ||
+		(!ere && *s++ != '\\') ||
 		*s++ != '}'
 	)
-		return REG_BADBR;
-
-	if (min == 0 && max == 0)
-		ctx->n = tre_ast_new_literal(ctx->mem, EMPTY, -1, -1);
-	else
-		ctx->n = tre_ast_new_iter(ctx->mem, ctx->n, min, max, 0);
-	if (!ctx->n)
-		return REG_ESPACE;
-	ctx->s = s;
-	return REG_OK;
+		return 0;
+	*pmin = min;
+	*pmax = max;
+	return s;
 }
 
 static int hexval(unsigned c)
@@ -834,22 +842,35 @@ static reg_errcode_t parse_atom(tre_parse_ctx_t *ctx, const char *s)
 					return REG_EBRACE;
 				s++;
 			}
-			node = tre_ast_new_literal(ctx->mem, v, v, ctx->position);
-			ctx->position++;
+			node = tre_ast_new_literal(ctx->mem, v, v, ctx->position++);
 			s--;
 			break;
+		case '{':
+		case '+':
+		case '?':
+			/* extension: treat \+, \? as repetitions in BRE */
+			/* reject repetitions after empty expression in BRE */
+			if (!ere)
+				return REG_BADRPT;
+		case '|':
+			/* extension: treat \| as alternation in BRE */
+			if (!ere) {
+				node = tre_ast_new_literal(ctx->mem, EMPTY, -1, -1);
+				s--;
+				goto end;
+			}
+			/* fallthrough */
 		default:
 			if (!ere && (unsigned)*s-'1' < 9) {
 				/* back reference */
 				int val = *s - '0';
-				node = tre_ast_new_literal(ctx->mem, BACKREF, val, ctx->position);
+				node = tre_ast_new_literal(ctx->mem, BACKREF, val, ctx->position++);
 				ctx->max_backref = MAX(val, ctx->max_backref);
 			} else {
 				/* extension: accept unknown escaped char
 				   as a literal */
 				goto parse_literal;
 			}
-			ctx->position++;
 		}
 		s++;
 		break;
@@ -869,23 +890,26 @@ static reg_errcode_t parse_atom(tre_parse_ctx_t *ctx, const char *s)
 		break;
 	case '^':
 		/* '^' has a special meaning everywhere in EREs, and at beginning of BRE. */
-		if (!ere && s != ctx->re)
+		if (!ere && s != ctx->start)
 			goto parse_literal;
 		node = tre_ast_new_literal(ctx->mem, ASSERTION, ASSERT_AT_BOL, -1);
 		s++;
 		break;
 	case '$':
-		/* '$' is special everywhere in EREs, and in the end of the string in BREs. */
-		if (!ere && s[1])
+		/* '$' is special everywhere in EREs, and at the end of a BRE subexpression. */
+		if (!ere && s[1] && (s[1]!='\\'|| (s[2]!=')' && s[2]!='|')))
 			goto parse_literal;
 		node = tre_ast_new_literal(ctx->mem, ASSERTION, ASSERT_AT_EOL, -1);
 		s++;
 		break;
 	case '*':
-	case '|':
 	case '{':
 	case '+':
 	case '?':
+		/* reject repetitions after empty expression in ERE */
+		if (ere)
+			return REG_BADRPT;
+	case '|':
 		if (!ere)
 			goto parse_literal;
 	case 0:
@@ -912,6 +936,7 @@ static reg_errcode_t parse_atom(tre_parse_ctx_t *ctx, const char *s)
 		s += len;
 		break;
 	}
+end:
 	if (!node)
 		return REG_ESPACE;
 	ctx->n = node;
@@ -933,7 +958,7 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx)
 {
 	tre_ast_node_t *nbranch=0, *nunion=0;
 	int ere = ctx->cflags & REG_EXTENDED;
-	const char *s = ctx->re;
+	const char *s = ctx->start;
 	int subid = 0;
 	int depth = 0;
 	reg_errcode_t err;
@@ -951,6 +976,7 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx)
 				s++;
 			depth++;
 			nbranch = nunion = 0;
+			ctx->start = s;
 			continue;
 		}
 		if ((!ere && *s == '\\' && s[1] == ')') ||
@@ -966,56 +992,72 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx)
 		}
 
 	parse_iter:
-		/* extension: repetitions are accepted after an empty node
-		   eg. (+), ^*, a$?, a|{2} */
-		switch (*s) {
-		case '+':
-		case '?':
-			if (!ere)
+		for (;;) {
+			int min, max;
+
+			if (*s!='\\' && *s!='*') {
+				if (!ere)
+					break;
+				if (*s!='+' && *s!='?' && *s!='{')
+					break;
+			}
+			if (*s=='\\' && ere)
 				break;
-			/* fallthrough */
-		case '*':;
-			int min=0, max=-1;
-			if (*s == '+')
-				min = 1;
-			if (*s == '?')
-				max = 1;
-			s++;
-			ctx->n = tre_ast_new_iter(ctx->mem, ctx->n, min, max, 0);
-			if (!ctx->n)
-				return REG_ESPACE;
+			/* extension: treat \+, \? as repetitions in BRE */
+			if (*s=='\\' && s[1]!='+' && s[1]!='?' && s[1]!='{')
+				break;
+			if (*s=='\\')
+				s++;
+
+			/* handle ^* at the start of a BRE. */
+			if (!ere && s==ctx->start+1 && s[-1]=='^')
+				break;
+
 			/* extension: multiple consecutive *+?{,} is unspecified,
 			   but (a+)+ has to be supported so accepting a++ makes
 			   sense, note however that the RE_DUP_MAX limit can be
 			   circumvented: (a{255}){255} uses a lot of memory.. */
-			goto parse_iter;
-		case '\\':
-			if (ere || s[1] != '{')
-				break;
-			s++;
-			goto parse_brace;
-		case '{':
-			if (!ere)
-				break;
-		parse_brace:
-			err = parse_dup(ctx, s+1);
-			if (err != REG_OK)
-				return err;
-			s = ctx->s;
-			goto parse_iter;
+			if (*s=='{') {
+				s = parse_dup(s+1, ere, &min, &max);
+				if (!s)
+					return REG_BADBR;
+			} else {
+				min=0;
+				max=-1;
+				if (*s == '+')
+					min = 1;
+				if (*s == '?')
+					max = 1;
+				s++;
+			}
+			if (max == 0)
+				ctx->n = tre_ast_new_literal(ctx->mem, EMPTY, -1, -1);
+			else
+				ctx->n = tre_ast_new_iter(ctx->mem, ctx->n, min, max, 0);
+			if (!ctx->n)
+				return REG_ESPACE;
 		}
 
 		nbranch = tre_ast_new_catenation(ctx->mem, nbranch, ctx->n);
 		if ((ere && *s == '|') ||
 		    (ere && *s == ')' && depth) ||
 		    (!ere && *s == '\\' && s[1] == ')') ||
+		    /* extension: treat \| as alternation in BRE */
+		    (!ere && *s == '\\' && s[1] == '|') ||
 		    !*s) {
 			/* extension: empty branch is unspecified (), (|a), (a|)
 			   here they are not rejected but match on empty string */
 			int c = *s;
 			nunion = tre_ast_new_union(ctx->mem, nunion, nbranch);
 			nbranch = 0;
-			if (c != '|') {
+
+			if (c == '\\' && s[1] == '|') {
+				s+=2;
+				ctx->start = s;
+			} else if (c == '|') {
+				s++;
+				ctx->start = s;
+			} else {
 				if (c == '\\') {
 					if (!depth) return REG_EPAREN;
 					s+=2;
@@ -1035,7 +1077,6 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx)
 				nunion = tre_stack_pop_voidptr(stack);
 				goto parse_iter;
 			}
-			s++;
 		}
 	}
 }
@@ -1082,6 +1123,7 @@ tre_add_tag_left(tre_mem_t mem, tre_ast_node_t *node, int tag_id)
   c->right->firstpos = NULL;
   c->right->lastpos = NULL;
   c->right->num_tags = 0;
+  c->right->num_submatches = 0;
   node->obj = c;
   node->type = CATENATION;
   return REG_OK;
@@ -1112,6 +1154,7 @@ tre_add_tag_right(tre_mem_t mem, tre_ast_node_t *node, int tag_id)
   c->left->firstpos = NULL;
   c->left->lastpos = NULL;
   c->left->num_tags = 0;
+  c->left->num_submatches = 0;
   node->obj = c;
   node->type = CATENATION;
   return REG_OK;
@@ -1584,7 +1627,8 @@ tre_add_tags(tre_mem_t mem, tre_stack_t *stack, tre_ast_node_t *tree,
 		  {
 		    status = tre_add_tag_right(mem, left, tag_left);
 		    tnfa->tag_directions[tag_left] = TRE_TAG_MAXIMIZE;
-		    status = tre_add_tag_right(mem, right, tag_right);
+		    if (status == REG_OK)
+		      status = tre_add_tag_right(mem, right, tag_right);
 		    tnfa->tag_directions[tag_right] = TRE_TAG_MAXIMIZE;
 		  }
 		num_tags += 2;
@@ -2663,7 +2707,7 @@ regcomp(regex_t *restrict preg, const char *restrict regex, int cflags)
 
   /* Allocate a stack used throughout the compilation process for various
      purposes. */
-  stack = tre_stack_new(512, 10240, 128);
+  stack = tre_stack_new(512, 1024000, 128);
   if (!stack)
     return REG_ESPACE;
   /* Allocate a fast memory allocator. */
@@ -2678,7 +2722,7 @@ regcomp(regex_t *restrict preg, const char *restrict regex, int cflags)
   memset(&parse_ctx, 0, sizeof(parse_ctx));
   parse_ctx.mem = mem;
   parse_ctx.stack = stack;
-  parse_ctx.re = regex;
+  parse_ctx.start = regex;
   parse_ctx.cflags = cflags;
   parse_ctx.max_backref = -1;
   errcode = tre_parse(&parse_ctx);
diff --git a/src/components/lib/libc/musl-1.1.11/src/regex/regerror.c b/src/components/lib/libc/musl-1.2.0/src/regex/regerror.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/regex/regerror.c
rename to src/components/lib/libc/musl-1.2.0/src/regex/regerror.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/regex/regexec.c b/src/components/lib/libc/musl-1.2.0/src/regex/regexec.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/regex/regexec.c
rename to src/components/lib/libc/musl-1.2.0/src/regex/regexec.c
index 16c5d0ac5c..253b0e1495 100644
--- a/src/components/lib/libc/musl-1.1.11/src/regex/regexec.c
+++ b/src/components/lib/libc/musl-1.2.0/src/regex/regexec.c
@@ -34,6 +34,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <limits.h>
+#include <stdint.h>
 
 #include <regex.h>
 
@@ -43,7 +44,7 @@
 
 static void
 tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags,
-		const tre_tnfa_t *tnfa, int *tags, int match_eo);
+		const tre_tnfa_t *tnfa, regoff_t *tags, regoff_t match_eo);
 
 /***********************************************************************
  from tre-match-utils.h
@@ -96,7 +97,7 @@ tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags,
 /* Returns 1 if `t1' wins `t2', 0 otherwise. */
 static int
 tre_tag_order(int num_tags, tre_tag_direction_t *tag_directions,
-	      int *t1, int *t2)
+	      regoff_t *t1, regoff_t *t2)
 {
   int i;
   for (i = 0; i < num_tags; i++)
@@ -156,25 +157,25 @@ tre_neg_char_classes_match(tre_ctype_t *classes, tre_cint_t wc, int icase)
 
 typedef struct {
   tre_tnfa_transition_t *state;
-  int *tags;
+  regoff_t *tags;
 } tre_tnfa_reach_t;
 
 typedef struct {
-  int pos;
-  int **tags;
+  regoff_t pos;
+  regoff_t **tags;
 } tre_reach_pos_t;
 
 
 static reg_errcode_t
 tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
-		      int *match_tags, int eflags,
-		      int *match_end_ofs)
+		      regoff_t *match_tags, int eflags,
+		      regoff_t *match_end_ofs)
 {
   /* State variables required by GET_NEXT_WCHAR. */
   tre_char_t prev_c = 0, next_c = 0;
   const char *str_byte = string;
-  int pos = -1;
-  int pos_add_next = 1;
+  regoff_t pos = -1;
+  regoff_t pos_add_next = 1;
 #ifdef TRE_MBSTATE
   mbstate_t mbstate;
 #endif /* TRE_MBSTATE */
@@ -190,10 +191,10 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
   int *tag_i;
   int num_tags, i;
 
-  int match_eo = -1;	   /* end offset of match (-1 if no match found yet) */
+  regoff_t match_eo = -1;	   /* end offset of match (-1 if no match found yet) */
   int new_match = 0;
-  int *tmp_tags = NULL;
-  int *tmp_iptr;
+  regoff_t *tmp_tags = NULL;
+  regoff_t *tmp_iptr;
 
 #ifdef TRE_MBSTATE
   memset(&mbstate, '\0', sizeof(mbstate));
@@ -206,25 +207,37 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
 
   /* Allocate memory for temporary data required for matching.	This needs to
      be done for every matching operation to be thread safe.  This allocates
-     everything in a single large block from the stack frame using alloca()
-     or with malloc() if alloca is unavailable. */
+     everything in a single large block with calloc(). */
   {
-    int tbytes, rbytes, pbytes, xbytes, total_bytes;
+    size_t tbytes, rbytes, pbytes, xbytes, total_bytes;
     char *tmp_buf;
+
+    /* Ensure that tbytes and xbytes*num_states cannot overflow, and that
+     * they don't contribute more than 1/8 of SIZE_MAX to total_bytes. */
+    if (num_tags > SIZE_MAX/(8 * sizeof(regoff_t) * tnfa->num_states))
+      return REG_ESPACE;
+
+    /* Likewise check rbytes. */
+    if (tnfa->num_states+1 > SIZE_MAX/(8 * sizeof(*reach_next)))
+      return REG_ESPACE;
+
+    /* Likewise check pbytes. */
+    if (tnfa->num_states > SIZE_MAX/(8 * sizeof(*reach_pos)))
+      return REG_ESPACE;
+
     /* Compute the length of the block we need. */
     tbytes = sizeof(*tmp_tags) * num_tags;
     rbytes = sizeof(*reach_next) * (tnfa->num_states + 1);
     pbytes = sizeof(*reach_pos) * tnfa->num_states;
-    xbytes = sizeof(int) * num_tags;
+    xbytes = sizeof(regoff_t) * num_tags;
     total_bytes =
       (sizeof(long) - 1) * 4 /* for alignment paddings */
       + (rbytes + xbytes * tnfa->num_states) * 2 + tbytes + pbytes;
 
     /* Allocate the memory. */
-    buf = xmalloc((unsigned)total_bytes);
+    buf = calloc(total_bytes, 1);
     if (buf == NULL)
       return REG_ESPACE;
-    memset(buf, 0, (size_t)total_bytes);
 
     /* Get the various pointers within tmp_buf (properly aligned). */
     tmp_tags = (void *)buf;
@@ -477,12 +490,12 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
 */
 
 typedef struct {
-  int pos;
+  regoff_t pos;
   const char *str_byte;
   tre_tnfa_transition_t *state;
   int state_id;
   int next_c;
-  int *tags;
+  regoff_t *tags;
 #ifdef TRE_MBSTATE
   mbstate_t mbstate;
 #endif /* TRE_MBSTATE */
@@ -578,13 +591,13 @@ typedef struct tre_backtrack_struct {
 
 static reg_errcode_t
 tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string,
-		       int *match_tags, int eflags, int *match_end_ofs)
+		       regoff_t *match_tags, int eflags, regoff_t *match_end_ofs)
 {
   /* State variables required by GET_NEXT_WCHAR. */
   tre_char_t prev_c = 0, next_c = 0;
   const char *str_byte = string;
-  int pos = 0;
-  int pos_add_next = 1;
+  regoff_t pos = 0;
+  regoff_t pos_add_next = 1;
 #ifdef TRE_MBSTATE
   mbstate_t mbstate;
 #endif /* TRE_MBSTATE */
@@ -597,15 +610,16 @@ tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string,
      started from. */
   int next_c_start;
   const char *str_byte_start;
-  int pos_start = -1;
+  regoff_t pos_start = -1;
 #ifdef TRE_MBSTATE
   mbstate_t mbstate_start;
 #endif /* TRE_MBSTATE */
 
   /* End offset of best match so far, or -1 if no match found yet. */
-  int match_eo = -1;
+  regoff_t match_eo = -1;
   /* Tag arrays. */
-  int *next_tags, *tags = NULL;
+  int *next_tags;
+  regoff_t *tags = NULL;
   /* Current TNFA state. */
   tre_tnfa_transition_t *state;
   int *states_seen = NULL;
@@ -755,8 +769,9 @@ tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string,
 	  /* This is a back reference state.  All transitions leaving from
 	     this state have the same back reference "assertion".  Instead
 	     of reading the next character, we match the back reference. */
-	  int so, eo, bt = trans_i->u.backref;
-	  int bt_len;
+	  regoff_t so, eo;
+	  int bt = trans_i->u.backref;
+	  regoff_t bt_len;
 	  int result;
 
 	  /* Get the substring we need to match against.  Remember to
@@ -913,7 +928,7 @@ tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string,
    endpoint values. */
 static void
 tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags,
-		const tre_tnfa_t *tnfa, int *tags, int match_eo)
+		const tre_tnfa_t *tnfa, regoff_t *tags, regoff_t match_eo)
 {
   tre_submatch_data_t *submatch_data;
   unsigned int i, j;
@@ -983,7 +998,7 @@ regexec(const regex_t *restrict preg, const char *restrict string,
 {
   tre_tnfa_t *tnfa = (void *)preg->TRE_REGEX_T_FIELD;
   reg_errcode_t status;
-  int *tags = NULL, eo;
+  regoff_t *tags = NULL, eo;
   if (tnfa->cflags & REG_NOSUB) nmatch = 0;
   if (tnfa->num_tags > 0 && nmatch > 0)
     {
diff --git a/src/components/lib/libc/musl-1.1.11/src/regex/tre-mem.c b/src/components/lib/libc/musl-1.2.0/src/regex/tre-mem.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/regex/tre-mem.c
rename to src/components/lib/libc/musl-1.2.0/src/regex/tre-mem.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/regex/tre.h b/src/components/lib/libc/musl-1.2.0/src/regex/tre.h
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/regex/tre.h
rename to src/components/lib/libc/musl-1.2.0/src/regex/tre.h
index 67cb9a84fb..9aae851f61 100644
--- a/src/components/lib/libc/musl-1.1.11/src/regex/tre.h
+++ b/src/components/lib/libc/musl-1.2.0/src/regex/tre.h
@@ -191,9 +191,9 @@ typedef struct tre_mem_struct {
 #define tre_mem_alloc_impl __tre_mem_alloc_impl
 #define tre_mem_destroy    __tre_mem_destroy
 
-tre_mem_t tre_mem_new_impl(int provided, void *provided_block);
-void *tre_mem_alloc_impl(tre_mem_t mem, int provided, void *provided_block,
-			 int zero, size_t size);
+hidden tre_mem_t tre_mem_new_impl(int provided, void *provided_block);
+hidden void *tre_mem_alloc_impl(tre_mem_t mem, int provided, void *provided_block,
+                                int zero, size_t size);
 
 /* Returns a new memory allocator or NULL if out of memory. */
 #define tre_mem_new()  tre_mem_new_impl(0, NULL)
@@ -222,7 +222,7 @@ void *tre_mem_alloc_impl(tre_mem_t mem, int provided, void *provided_block,
 
 
 /* Frees the memory allocator and all memory allocated with it. */
-void tre_mem_destroy(tre_mem_t mem);
+hidden void tre_mem_destroy(tre_mem_t mem);
 
 #define xmalloc malloc
 #define xcalloc calloc
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/affinity.c b/src/components/lib/libc/musl-1.2.0/src/sched/affinity.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/affinity.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/affinity.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_cpucount.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_cpucount.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/sched_cpucount.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/sched_cpucount.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_get_priority_max.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_get_priority_max.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/sched_get_priority_max.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/sched_get_priority_max.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/sched/sched_getcpu.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_getcpu.c
new file mode 100644
index 0000000000..4ec5eaf679
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/sched/sched_getcpu.c
@@ -0,0 +1,42 @@
+#define _GNU_SOURCE
+#include <errno.h>
+#include <sched.h>
+#include "syscall.h"
+#include "atomic.h"
+
+#ifdef VDSO_GETCPU_SYM
+
+static void *volatile vdso_func;
+
+typedef long (*getcpu_f)(unsigned *, unsigned *, void *);
+
+static long getcpu_init(unsigned *cpu, unsigned *node, void *unused)
+{
+	void *p = __vdsosym(VDSO_GETCPU_VER, VDSO_GETCPU_SYM);
+	getcpu_f f = (getcpu_f)p;
+	a_cas_p(&vdso_func, (void *)getcpu_init, p);
+	return f ? f(cpu, node, unused) : -ENOSYS;
+}
+
+static void *volatile vdso_func = (void *)getcpu_init;
+
+#endif
+
+int sched_getcpu(void)
+{
+	int r;
+	unsigned cpu;
+
+#ifdef VDSO_GETCPU_SYM
+	getcpu_f f = (getcpu_f)vdso_func;
+	if (f) {
+		r = f(&cpu, 0, 0);
+		if (!r) return cpu;
+		if (r != -ENOSYS) return __syscall_ret(r);
+	}
+#endif
+
+	r = __syscall(SYS_getcpu, &cpu, 0, 0);
+	if (!r) return cpu;
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_getparam.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_getparam.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/sched_getparam.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/sched_getparam.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_getscheduler.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_getscheduler.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/sched_getscheduler.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/sched_getscheduler.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/sched/sched_rr_get_interval.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_rr_get_interval.c
new file mode 100644
index 0000000000..33a3d1aeed
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/sched/sched_rr_get_interval.c
@@ -0,0 +1,21 @@
+#include <sched.h>
+#include "syscall.h"
+
+int sched_rr_get_interval(pid_t pid, struct timespec *ts)
+{
+#ifdef SYS_sched_rr_get_interval_time64
+	/* On a 32-bit arch, use the old syscall if it exists. */
+	if (SYS_sched_rr_get_interval != SYS_sched_rr_get_interval_time64) {
+		long ts32[2];
+		int r = __syscall(SYS_sched_rr_get_interval, pid, ts32);
+		if (!r) {
+			ts->tv_sec = ts32[0];
+			ts->tv_nsec = ts32[1];
+		}
+		return __syscall_ret(r);
+	}
+#endif
+	/* If reaching this point, it's a 64-bit arch or time64-only
+	 * 32-bit arch and we can get result directly into timespec. */
+	return syscall(SYS_sched_rr_get_interval, pid, ts);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_setparam.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_setparam.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/sched_setparam.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/sched_setparam.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_setscheduler.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_setscheduler.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/sched_setscheduler.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/sched_setscheduler.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/sched/sched_yield.c b/src/components/lib/libc/musl-1.2.0/src/sched/sched_yield.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/sched/sched_yield.c
rename to src/components/lib/libc/musl-1.2.0/src/sched/sched_yield.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/search/hsearch.c b/src/components/lib/libc/musl-1.2.0/src/search/hsearch.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/search/hsearch.c
rename to src/components/lib/libc/musl-1.2.0/src/search/hsearch.c
index 5c8965114b..b3ac8796e7 100644
--- a/src/components/lib/libc/musl-1.1.11/src/search/hsearch.c
+++ b/src/components/lib/libc/musl-1.2.0/src/search/hsearch.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <search.h>
-#include "libc.h"
 
 /*
 open addressing hash table with 2^n table size
@@ -24,9 +23,9 @@ struct __tab {
 
 static struct hsearch_data htab;
 
-int __hcreate_r(size_t, struct hsearch_data *);
-void __hdestroy_r(struct hsearch_data *);
-int __hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *);
+static int __hcreate_r(size_t, struct hsearch_data *);
+static void __hdestroy_r(struct hsearch_data *);
+static int __hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *);
 
 static size_t keyhash(char *k)
 {
@@ -101,7 +100,7 @@ ENTRY *hsearch(ENTRY item, ACTION action)
 	return e;
 }
 
-int __hcreate_r(size_t nel, struct hsearch_data *htab)
+static int __hcreate_r(size_t nel, struct hsearch_data *htab)
 {
 	int r;
 
@@ -117,7 +116,7 @@ int __hcreate_r(size_t nel, struct hsearch_data *htab)
 }
 weak_alias(__hcreate_r, hcreate_r);
 
-void __hdestroy_r(struct hsearch_data *htab)
+static void __hdestroy_r(struct hsearch_data *htab)
 {
 	if (htab->__tab) free(htab->__tab->entries);
 	free(htab->__tab);
@@ -125,7 +124,7 @@ void __hdestroy_r(struct hsearch_data *htab)
 }
 weak_alias(__hdestroy_r, hdestroy_r);
 
-int __hsearch_r(ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab)
+static int __hsearch_r(ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab)
 {
 	size_t hash = keyhash(item.key);
 	ENTRY *e = lookup(item.key, hash, htab);
diff --git a/src/components/lib/libc/musl-1.1.11/src/search/insque.c b/src/components/lib/libc/musl-1.2.0/src/search/insque.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/search/insque.c
rename to src/components/lib/libc/musl-1.2.0/src/search/insque.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/search/lsearch.c b/src/components/lib/libc/musl-1.2.0/src/search/lsearch.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/search/lsearch.c
rename to src/components/lib/libc/musl-1.2.0/src/search/lsearch.c
index 63f319223a..5eb5cc2bd5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/search/lsearch.c
+++ b/src/components/lib/libc/musl-1.2.0/src/search/lsearch.c
@@ -9,7 +9,7 @@ void *lsearch(const void *key, void *base, size_t *nelp, size_t width,
 	size_t i;
 
 	for (i = 0; i < n; i++)
-		if (compar(p[i], key) == 0)
+		if (compar(key, p[i]) == 0)
 			return p[i];
 	*nelp = n+1;
 	return memcpy(p[n], key, width);
@@ -23,7 +23,7 @@ void *lfind(const void *key, const void *base, size_t *nelp,
 	size_t i;
 
 	for (i = 0; i < n; i++)
-		if (compar(p[i], key) == 0)
+		if (compar(key, p[i]) == 0)
 			return p[i];
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/search/tdelete.c b/src/components/lib/libc/musl-1.2.0/src/search/tdelete.c
new file mode 100644
index 0000000000..b8bb924b4e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/search/tdelete.c
@@ -0,0 +1,49 @@
+#include <stdlib.h>
+#include <search.h>
+#include "tsearch.h"
+
+void *tdelete(const void *restrict key, void **restrict rootp,
+	int(*cmp)(const void *, const void *))
+{
+	if (!rootp)
+		return 0;
+
+	void **a[MAXH+1];
+	struct node *n = *rootp;
+	struct node *parent;
+	struct node *child;
+	int i=0;
+	/* *a[0] is an arbitrary non-null pointer that is returned when
+	   the root node is deleted.  */
+	a[i++] = rootp;
+	a[i++] = rootp;
+	for (;;) {
+		if (!n)
+			return 0;
+		int c = cmp(key, n->key);
+		if (!c)
+			break;
+		a[i++] = &n->a[c>0];
+		n = n->a[c>0];
+	}
+	parent = *a[i-2];
+	if (n->a[0]) {
+		/* free the preceding node instead of the deleted one.  */
+		struct node *deleted = n;
+		a[i++] = &n->a[0];
+		n = n->a[0];
+		while (n->a[1]) {
+			a[i++] = &n->a[1];
+			n = n->a[1];
+		}
+		deleted->key = n->key;
+		child = n->a[0];
+	} else {
+		child = n->a[1];
+	}
+	/* freed node has at most one child, move it up and rebalance.  */
+	free(n);
+	*a[--i] = child;
+	while (--i && __tsearch_balance(a[i]));
+	return parent;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/search/tdestroy.c b/src/components/lib/libc/musl-1.2.0/src/search/tdestroy.c
new file mode 100644
index 0000000000..699a901c6a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/search/tdestroy.c
@@ -0,0 +1,16 @@
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <search.h>
+#include "tsearch.h"
+
+void tdestroy(void *root, void (*freekey)(void *))
+{
+	struct node *r = root;
+
+	if (r == 0)
+		return;
+	tdestroy(r->a[0], freekey);
+	tdestroy(r->a[1], freekey);
+	if (freekey) freekey((void *)r->key);
+	free(r);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/search/tfind.c b/src/components/lib/libc/musl-1.2.0/src/search/tfind.c
new file mode 100644
index 0000000000..9e1cf98f5c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/search/tfind.c
@@ -0,0 +1,20 @@
+#include <search.h>
+#include "tsearch.h"
+
+void *tfind(const void *key, void *const *rootp,
+	int(*cmp)(const void *, const void *))
+{
+	if (!rootp)
+		return 0;
+
+	struct node *n = *rootp;
+	for (;;) {
+		if (!n)
+			break;
+		int c = cmp(key, n->key);
+		if (!c)
+			break;
+		n = n->a[c>0];
+	}
+	return n;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/search/tsearch.c b/src/components/lib/libc/musl-1.2.0/src/search/tsearch.c
new file mode 100644
index 0000000000..0de27d05e9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/search/tsearch.c
@@ -0,0 +1,92 @@
+#include <stdlib.h>
+#include <search.h>
+#include "tsearch.h"
+
+static inline int height(struct node *n) { return n ? n->h : 0; }
+
+static int rot(void **p, struct node *x, int dir /* deeper side */)
+{
+	struct node *y = x->a[dir];
+	struct node *z = y->a[!dir];
+	int hx = x->h;
+	int hz = height(z);
+	if (hz > height(y->a[dir])) {
+		/*
+		 *   x
+		 *  / \ dir          z
+		 * A   y            / \
+		 *    / \   -->    x   y
+		 *   z   D        /|   |\
+		 *  / \          A B   C D
+		 * B   C
+		 */
+		x->a[dir] = z->a[!dir];
+		y->a[!dir] = z->a[dir];
+		z->a[!dir] = x;
+		z->a[dir] = y;
+		x->h = hz;
+		y->h = hz;
+		z->h = hz+1;
+	} else {
+		/*
+		 *   x               y
+		 *  / \             / \
+		 * A   y    -->    x   D
+		 *    / \         / \
+		 *   z   D       A   z
+		 */
+		x->a[dir] = z;
+		y->a[!dir] = x;
+		x->h = hz+1;
+		y->h = hz+2;
+		z = y;
+	}
+	*p = z;
+	return z->h - hx;
+}
+
+/* balance *p, return 0 if height is unchanged.  */
+int __tsearch_balance(void **p)
+{
+	struct node *n = *p;
+	int h0 = height(n->a[0]);
+	int h1 = height(n->a[1]);
+	if (h0 - h1 + 1u < 3u) {
+		int old = n->h;
+		n->h = h0<h1 ? h1+1 : h0+1;
+		return n->h - old;
+	}
+	return rot(p, n, h0<h1);
+}
+
+void *tsearch(const void *key, void **rootp,
+	int (*cmp)(const void *, const void *))
+{
+	if (!rootp)
+		return 0;
+
+	void **a[MAXH];
+	struct node *n = *rootp;
+	struct node *r;
+	int i=0;
+	a[i++] = rootp;
+	for (;;) {
+		if (!n)
+			break;
+		int c = cmp(key, n->key);
+		if (!c)
+			return n;
+		a[i++] = &n->a[c>0];
+		n = n->a[c>0];
+	}
+	r = malloc(sizeof *r);
+	if (!r)
+		return 0;
+	r->key = key;
+	r->a[0] = r->a[1] = 0;
+	r->h = 1;
+	/* insert new node, rebalance ancestors.  */
+	*a[--i] = r;
+	while (i && __tsearch_balance(a[--i]));
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/search/tsearch.h b/src/components/lib/libc/musl-1.2.0/src/search/tsearch.h
new file mode 100644
index 0000000000..37d11d7354
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/search/tsearch.h
@@ -0,0 +1,13 @@
+#include <search.h>
+#include <features.h>
+
+/* AVL tree height < 1.44*log2(nodes+2)-0.3, MAXH is a safe upper bound.  */
+#define MAXH (sizeof(void*)*8*3/2)
+
+struct node {
+	const void *key;
+	void *a[2];
+	int h;
+};
+
+hidden int __tsearch_balance(void **);
diff --git a/src/components/lib/libc/musl-1.2.0/src/search/twalk.c b/src/components/lib/libc/musl-1.2.0/src/search/twalk.c
new file mode 100644
index 0000000000..53821cdaf3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/search/twalk.c
@@ -0,0 +1,22 @@
+#include <search.h>
+#include "tsearch.h"
+
+static void walk(const struct node *r, void (*action)(const void *, VISIT, int), int d)
+{
+	if (!r)
+		return;
+	if (r->h == 1)
+		action(r, leaf, d);
+	else {
+		action(r, preorder, d);
+		walk(r->a[0], action, d+1);
+		action(r, postorder, d);
+		walk(r->a[1], action, d+1);
+		action(r, endorder, d);
+	}
+}
+
+void twalk(const void *root, void (*action)(const void *, VISIT, int))
+{
+	walk(root, action, 0);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/select/poll.c b/src/components/lib/libc/musl-1.2.0/src/select/poll.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/select/poll.c
rename to src/components/lib/libc/musl-1.2.0/src/select/poll.c
index 9e0bcbd804..c84c8a999c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/select/poll.c
+++ b/src/components/lib/libc/musl-1.2.0/src/select/poll.c
@@ -2,7 +2,6 @@
 #include <time.h>
 #include <signal.h>
 #include "syscall.h"
-#include "libc.h"
 
 int poll(struct pollfd *fds, nfds_t n, int timeout)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/select/pselect.c b/src/components/lib/libc/musl-1.2.0/src/select/pselect.c
new file mode 100644
index 0000000000..54cfb291bb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/select/pselect.c
@@ -0,0 +1,26 @@
+#include <sys/select.h>
+#include <signal.h>
+#include <stdint.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask)
+{
+	syscall_arg_t data[2] = { (uintptr_t)mask, _NSIG/8 };
+	time_t s = ts ? ts->tv_sec : 0;
+	long ns = ts ? ts->tv_nsec : 0;
+#ifdef SYS_pselect6_time64
+	int r = -ENOSYS;
+	if (SYS_pselect6 == SYS_pselect6_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_pselect6_time64, n, rfds, wfds, efds,
+			ts ? ((long long[]){s, ns}) : 0, data);
+	if (SYS_pselect6 == SYS_pselect6_time64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	s = CLAMP(s);
+#endif
+	return syscall_cp(SYS_pselect6, n, rfds, wfds, efds,
+		ts ? ((long[]){s, ns}) : 0, data);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/select/select.c b/src/components/lib/libc/musl-1.2.0/src/select/select.c
new file mode 100644
index 0000000000..8a78688403
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/select/select.c
@@ -0,0 +1,44 @@
+#include <sys/select.h>
+#include <signal.h>
+#include <stdint.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+int select(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, struct timeval *restrict tv)
+{
+	time_t s = tv ? tv->tv_sec : 0;
+	suseconds_t us = tv ? tv->tv_usec : 0;
+	long ns;
+	const time_t max_time = (1ULL<<8*sizeof(time_t)-1)-1;
+
+	if (s<0 || us<0) return __syscall_ret(-EINVAL);
+	if (us/1000000 > max_time - s) {
+		s = max_time;
+		us = 999999;
+		ns = 999999999;
+	} else {
+		s += us/1000000;
+		us %= 1000000;
+		ns = us*1000;
+	}
+
+#ifdef SYS_pselect6_time64
+	int r = -ENOSYS;
+	if (SYS_pselect6 == SYS_pselect6_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_pselect6_time64, n, rfds, wfds, efds,
+			tv ? ((long long[]){s, ns}) : 0,
+			((syscall_arg_t[]){ 0, _NSIG/8 }));
+	if (SYS_pselect6 == SYS_pselect6_time64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+#endif
+#ifdef SYS_select
+	return syscall_cp(SYS_select, n, rfds, wfds, efds,
+		tv ? ((long[]){s, us}) : 0);
+#else
+	return syscall_cp(SYS_pselect6, n, rfds, wfds, efds,
+		tv ? ((long[]){s, ns}) : 0, ((syscall_arg_t[]){ 0, _NSIG/8 }));
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/aarch64/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/aarch64/longjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/aarch64/longjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/aarch64/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/aarch64/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/aarch64/setjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/aarch64/setjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/aarch64/setjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/arm/longjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/arm/longjmp.S
new file mode 100644
index 0000000000..8df0b8190d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/arm/longjmp.S
@@ -0,0 +1,50 @@
+.syntax unified
+.global _longjmp
+.global longjmp
+.type _longjmp,%function
+.type longjmp,%function
+_longjmp:
+longjmp:
+	mov ip,r0
+	movs r0,r1
+	moveq r0,#1
+	ldmia ip!, {v1,v2,v3,v4,v5,v6,sl,fp}
+	ldmia ip!, {r2,lr}
+	mov sp,r2
+
+	adr r1,1f
+	ldr r2,1f
+	ldr r1,[r1,r2]
+
+#if __ARM_ARCH < 8
+	tst r1,#0x260
+	beq 3f
+	// HWCAP_ARM_FPA
+	tst r1,#0x20
+	beq 2f
+	ldc p2, cr4, [ip], #48
+#endif
+2:	tst r1,#0x40
+	beq 2f
+	.fpu vfp
+	vldmia ip!, {d8-d15}
+	.fpu softvfp
+	.eabi_attribute 10, 0
+	.eabi_attribute 27, 0
+#if __ARM_ARCH < 8
+	// HWCAP_ARM_IWMMXT
+2:	tst r1,#0x200
+	beq 3f
+	ldcl p1, cr10, [ip], #8
+	ldcl p1, cr11, [ip], #8
+	ldcl p1, cr12, [ip], #8
+	ldcl p1, cr13, [ip], #8
+	ldcl p1, cr14, [ip], #8
+	ldcl p1, cr15, [ip], #8
+#endif
+2:
+3:	bx lr
+
+.hidden __hwcap
+.align 2
+1:	.word __hwcap-1b
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/arm/setjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/arm/setjmp.S
new file mode 100644
index 0000000000..45731d228e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/arm/setjmp.S
@@ -0,0 +1,52 @@
+.syntax unified
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,%function
+.type _setjmp,%function
+.type setjmp,%function
+__setjmp:
+_setjmp:
+setjmp:
+	mov ip,r0
+	stmia ip!,{v1,v2,v3,v4,v5,v6,sl,fp}
+	mov r2,sp
+	stmia ip!,{r2,lr}
+	mov r0,#0
+
+	adr r1,1f
+	ldr r2,1f
+	ldr r1,[r1,r2]
+
+#if __ARM_ARCH < 8
+	tst r1,#0x260
+	beq 3f
+	// HWCAP_ARM_FPA
+	tst r1,#0x20
+	beq 2f
+	stc p2, cr4, [ip], #48
+#endif
+2:	tst r1,#0x40
+	beq 2f
+	.fpu vfp
+	vstmia ip!, {d8-d15}
+	.fpu softvfp
+	.eabi_attribute 10, 0
+	.eabi_attribute 27, 0
+#if __ARM_ARCH < 8
+	// HWCAP_ARM_IWMMXT
+2:	tst r1,#0x200
+	beq 3f
+	stcl p1, cr10, [ip], #8
+	stcl p1, cr11, [ip], #8
+	stcl p1, cr12, [ip], #8
+	stcl p1, cr13, [ip], #8
+	stcl p1, cr14, [ip], #8
+	stcl p1, cr15, [ip], #8
+#endif
+2:
+3:	bx lr
+
+.hidden __hwcap
+.align 2
+1:	.word __hwcap-1b
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/i386/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/i386/longjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/i386/longjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/i386/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/i386/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/i386/setjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/i386/setjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/i386/setjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/longjmp.c b/src/components/lib/libc/musl-1.2.0/src/setjmp/longjmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/longjmp.c
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/longjmp.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/m68k/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/m68k/longjmp.s
new file mode 100644
index 0000000000..cdb05fb5a6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/m68k/longjmp.s
@@ -0,0 +1,14 @@
+.global _longjmp
+.global longjmp
+.type _longjmp,@function
+.type longjmp,@function
+_longjmp:
+longjmp:
+	movea.l 4(%sp),%a0
+	move.l 8(%sp),%d0
+	bne 1f
+	move.l #1,%d0
+1:	movem.l (%a0),%d2-%d7/%a2-%a7
+	fmovem.x 52(%a0),%fp2-%fp7
+	move.l 48(%a0),(%sp)
+	rts
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/m68k/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/m68k/setjmp.s
new file mode 100644
index 0000000000..15e549b0ef
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/m68k/setjmp.s
@@ -0,0 +1,18 @@
+.global ___setjmp
+.hidden ___setjmp
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	movea.l 4(%sp),%a0
+	movem.l %d2-%d7/%a2-%a7,(%a0)
+	move.l (%sp),48(%a0)
+	fmovem.x %fp2-%fp7,52(%a0)
+	clr.l %d0
+	rts
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/microblaze/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/microblaze/longjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/microblaze/longjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/microblaze/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/microblaze/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/microblaze/setjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/microblaze/setjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/microblaze/setjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/mips/longjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips/longjmp.S
new file mode 100644
index 0000000000..ecf4085538
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips/longjmp.S
@@ -0,0 +1,34 @@
+.set noreorder
+
+.global _longjmp
+.global longjmp
+.type   _longjmp,@function
+.type   longjmp,@function
+_longjmp:
+longjmp:
+	move    $2, $5
+	bne     $2, $0, 1f
+	nop
+	addu    $2, $2, 1
+1:
+#ifndef __mips_soft_float
+	l.d     $f20, 56($4)
+	l.d     $f22, 64($4)
+	l.d     $f24, 72($4)
+	l.d     $f26, 80($4)
+	l.d     $f28, 88($4)
+	l.d     $f30, 96($4)
+#endif
+	lw      $ra,  0($4)
+	lw      $sp,  4($4)
+	lw      $16,  8($4)
+	lw      $17, 12($4)
+	lw      $18, 16($4)
+	lw      $19, 20($4)
+	lw      $20, 24($4)
+	lw      $21, 28($4)
+	lw      $22, 32($4)
+	lw      $23, 36($4)
+	lw      $30, 40($4)
+	jr      $ra
+	lw      $28, 44($4)
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/mips/setjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips/setjmp.S
new file mode 100644
index 0000000000..7ae8832d51
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips/setjmp.S
@@ -0,0 +1,33 @@
+.set noreorder
+
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type   __setjmp,@function
+.type   _setjmp,@function
+.type   setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	sw      $ra,  0($4)
+	sw      $sp,  4($4)
+	sw      $16,  8($4)
+	sw      $17, 12($4)
+	sw      $18, 16($4)
+	sw      $19, 20($4)
+	sw      $20, 24($4)
+	sw      $21, 28($4)
+	sw      $22, 32($4)
+	sw      $23, 36($4)
+	sw      $30, 40($4)
+	sw      $28, 44($4)
+#ifndef __mips_soft_float
+	s.d     $f20, 56($4)
+	s.d     $f22, 64($4)
+	s.d     $f24, 72($4)
+	s.d     $f26, 80($4)
+	s.d     $f28, 88($4)
+	s.d     $f30, 96($4)
+#endif
+	jr      $ra
+	li      $2, 0
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/mips64/longjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips64/longjmp.S
new file mode 100644
index 0000000000..3db8a883c6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips64/longjmp.S
@@ -0,0 +1,37 @@
+.set	noreorder
+.global	_longjmp
+.global	longjmp
+.type	_longjmp,@function
+.type	longjmp,@function
+_longjmp:
+longjmp:
+	move	$2, $5
+
+	bne	$2, $0, 1f
+	nop
+	daddu	$2, $2, 1
+1:
+#ifndef __mips_soft_float
+	ldc1	$24, 96($4)
+	ldc1	$25, 104($4)
+	ldc1	$26, 112($4)
+	ldc1	$27, 120($4)
+	ldc1	$28, 128($4)
+	ldc1	$29, 136($4)
+	ldc1	$30, 144($4)
+	ldc1	$31, 152($4)
+#endif
+	ld	$ra, 0($4)
+	ld	$sp, 8($4)
+	ld	$gp, 16($4)
+	ld	$16, 24($4)
+	ld	$17, 32($4)
+	ld	$18, 40($4)
+	ld	$19, 48($4)
+	ld	$20, 56($4)
+	ld	$21, 64($4)
+	ld	$22, 72($4)
+	ld	$23, 80($4)
+	ld	$30, 88($4)
+	jr	$ra
+	nop
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/mips64/setjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips64/setjmp.S
new file mode 100644
index 0000000000..b9646c2abe
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/mips64/setjmp.S
@@ -0,0 +1,34 @@
+.set	noreorder
+.global	__setjmp
+.global	_setjmp
+.global	setjmp
+.type	__setjmp,@function
+.type	_setjmp,@function
+.type	setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	sd	$ra, 0($4)
+	sd	$sp, 8($4)
+	sd	$gp, 16($4)
+	sd	$16, 24($4)
+	sd	$17, 32($4)
+	sd	$18, 40($4)
+	sd	$19, 48($4)
+	sd	$20, 56($4)
+	sd	$21, 64($4)
+	sd	$22, 72($4)
+	sd	$23, 80($4)
+	sd	$30, 88($4)
+#ifndef __mips_soft_float
+	sdc1	$24, 96($4)
+	sdc1	$25, 104($4)
+	sdc1	$26, 112($4)
+	sdc1	$27, 120($4)
+	sdc1	$28, 128($4)
+	sdc1	$29, 136($4)
+	sdc1	$30, 144($4)
+	sdc1	$31, 152($4)
+#endif
+	jr	$ra
+	li	$2, 0
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/mipsn32/longjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/mipsn32/longjmp.S
new file mode 100644
index 0000000000..30c3ee0b0c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/mipsn32/longjmp.S
@@ -0,0 +1,36 @@
+.set	noreorder
+.global	_longjmp
+.global	longjmp
+.type	_longjmp,@function
+.type	longjmp,@function
+_longjmp:
+longjmp:
+	move	$2, $5
+	bne	$2, $0, 1f
+	nop
+	addu	$2, $2, 1
+1:
+#ifndef __mips_soft_float
+	ldc1	$24, 96($4)
+	ldc1	$25, 104($4)
+	ldc1	$26, 112($4)
+	ldc1	$27, 120($4)
+	ldc1	$28, 128($4)
+	ldc1	$29, 136($4)
+	ldc1	$30, 144($4)
+	ldc1	$31, 152($4)
+#endif
+	ld	$ra, 0($4)
+	ld	$sp, 8($4)
+	ld	$gp, 16($4)
+	ld	$16, 24($4)
+	ld	$17, 32($4)
+	ld	$18, 40($4)
+	ld	$19, 48($4)
+	ld	$20, 56($4)
+	ld	$21, 64($4)
+	ld	$22, 72($4)
+	ld	$23, 80($4)
+	ld	$30, 88($4)
+	jr	$ra
+	nop
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/mipsn32/setjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/mipsn32/setjmp.S
new file mode 100644
index 0000000000..b9646c2abe
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/mipsn32/setjmp.S
@@ -0,0 +1,34 @@
+.set	noreorder
+.global	__setjmp
+.global	_setjmp
+.global	setjmp
+.type	__setjmp,@function
+.type	_setjmp,@function
+.type	setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	sd	$ra, 0($4)
+	sd	$sp, 8($4)
+	sd	$gp, 16($4)
+	sd	$16, 24($4)
+	sd	$17, 32($4)
+	sd	$18, 40($4)
+	sd	$19, 48($4)
+	sd	$20, 56($4)
+	sd	$21, 64($4)
+	sd	$22, 72($4)
+	sd	$23, 80($4)
+	sd	$30, 88($4)
+#ifndef __mips_soft_float
+	sdc1	$24, 96($4)
+	sdc1	$25, 104($4)
+	sdc1	$26, 112($4)
+	sdc1	$27, 120($4)
+	sdc1	$28, 128($4)
+	sdc1	$29, 136($4)
+	sdc1	$30, 144($4)
+	sdc1	$31, 152($4)
+#endif
+	jr	$ra
+	li	$2, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/or1k/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/or1k/longjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/or1k/longjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/or1k/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/or1k/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/or1k/setjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/or1k/setjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/or1k/setjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc/longjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc/longjmp.S
new file mode 100644
index 0000000000..e598bd056e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc/longjmp.S
@@ -0,0 +1,69 @@
+	.global _longjmp
+	.global longjmp
+	.type   _longjmp,@function
+	.type   longjmp,@function
+_longjmp:
+longjmp:
+	/*
+	 * void longjmp(jmp_buf env, int val);
+	 * put val into return register and restore the env saved in setjmp
+	 * if val(r4) is 0, put 1 there.
+	 */
+	/* 0) move old return address into r0 */
+	lwz 0, 0(3)
+	/* 1) put it into link reg */
+	mtlr 0
+	/* 2 ) restore stack ptr */
+	lwz 1, 4(3)
+	/* 3) restore control reg */
+	lwz 0, 8(3)
+	mtcr 0
+	/* 4) restore r14-r31 */
+	lwz 14, 12(3)
+	lwz 15, 16(3)
+	lwz 16, 20(3)
+	lwz 17, 24(3)
+	lwz 18, 28(3)
+	lwz 19, 32(3)
+	lwz 20, 36(3)
+	lwz 21, 40(3)
+	lwz 22, 44(3)
+	lwz 23, 48(3)
+	lwz 24, 52(3)
+	lwz 25, 56(3)
+	lwz 26, 60(3)
+	lwz 27, 64(3)
+	lwz 28, 68(3)
+	lwz 29, 72(3)
+	lwz 30, 76(3)
+	lwz 31, 80(3)
+#ifndef _SOFT_FLOAT
+	lfd 14,88(3)
+	lfd 15,96(3)
+	lfd 16,104(3)
+	lfd 17,112(3)
+	lfd 18,120(3)
+	lfd 19,128(3)
+	lfd 20,136(3)
+	lfd 21,144(3)
+	lfd 22,152(3)
+	lfd 23,160(3)
+	lfd 24,168(3)
+	lfd 25,176(3)
+	lfd 26,184(3)
+	lfd 27,192(3)
+	lfd 28,200(3)
+	lfd 29,208(3)
+	lfd 30,216(3)
+	lfd 31,224(3)
+#endif
+	/* 5) put val into return reg r3 */
+	mr 3, 4
+
+	/* 6) check if return value is 0, make it 1 in that case */
+	cmpwi cr7, 4, 0
+	bne cr7, 1f
+	li 3, 1
+1:
+	blr
+
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc/setjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc/setjmp.S
new file mode 100644
index 0000000000..cd91a207f5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc/setjmp.S
@@ -0,0 +1,63 @@
+	.global ___setjmp
+	.hidden ___setjmp
+	.global __setjmp
+	.global _setjmp
+	.global setjmp
+	.type   __setjmp,@function
+	.type   _setjmp,@function
+	.type   setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	/* 0) store IP int 0, then into the jmpbuf pointed to by r3 (first arg) */
+	mflr 0
+	stw 0, 0(3)
+	/* 1) store reg1 (SP) */
+	stw 1, 4(3)
+	/* 2) store cr */
+	mfcr 0
+	stw 0, 8(3)
+	/* 3) store r14-31 */
+	stw 14, 12(3)
+	stw 15, 16(3)
+	stw 16, 20(3)
+	stw 17, 24(3)
+	stw 18, 28(3)
+	stw 19, 32(3)
+	stw 20, 36(3)
+	stw 21, 40(3)
+	stw 22, 44(3)
+	stw 23, 48(3)
+	stw 24, 52(3)
+	stw 25, 56(3)
+	stw 26, 60(3)
+	stw 27, 64(3)
+	stw 28, 68(3)
+	stw 29, 72(3)
+	stw 30, 76(3)
+	stw 31, 80(3)
+#ifndef _SOFT_FLOAT
+	stfd 14,88(3)
+	stfd 15,96(3)
+	stfd 16,104(3)
+	stfd 17,112(3)
+	stfd 18,120(3)
+	stfd 19,128(3)
+	stfd 20,136(3)
+	stfd 21,144(3)
+	stfd 22,152(3)
+	stfd 23,160(3)
+	stfd 24,168(3)
+	stfd 25,176(3)
+	stfd 26,184(3)
+	stfd 27,192(3)
+	stfd 28,200(3)
+	stfd 29,208(3)
+	stfd 30,216(3)
+	stfd 31,224(3)
+#endif
+	/* 4) set return value to 0 */
+	li 3, 0
+	/* 5) return */
+	blr
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc64/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc64/longjmp.s
new file mode 100644
index 0000000000..81d45ff60b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc64/longjmp.s
@@ -0,0 +1,81 @@
+	.global _longjmp
+	.global longjmp
+	.type   _longjmp,@function
+	.type   longjmp,@function
+_longjmp:
+longjmp:
+	# 0) move old return address into the link register
+	ld   0,  0*8(3)
+	mtlr 0
+	# 1) restore cr
+	ld   0,  1*8(3)
+	mtcr 0
+	# 2) restore SP
+	ld   1,  2*8(3)
+	# 3) restore TOC into both r2 and the caller's stack.
+	#    Which location is required depends on whether setjmp was called
+	#    locally or non-locally, but it's always safe to restore to both.
+	ld   2,  3*8(3)
+	std  2,   24(1)
+	# 4) restore r14-r31
+	ld  14,  4*8(3)
+	ld  15,  5*8(3)
+	ld  16,  6*8(3)
+	ld  17,  7*8(3)
+	ld  18,  8*8(3)
+	ld  19,  9*8(3)
+	ld  20, 10*8(3)
+	ld  21, 11*8(3)
+	ld  22, 12*8(3)
+	ld  23, 13*8(3)
+	ld  24, 14*8(3)
+	ld  25, 15*8(3)
+	ld  26, 16*8(3)
+	ld  27, 17*8(3)
+	ld  28, 18*8(3)
+	ld  29, 19*8(3)
+	ld  30, 20*8(3)
+	ld  31, 21*8(3)
+	# 5) restore floating point registers f14-f31
+	lfd 14, 22*8(3)
+	lfd 15, 23*8(3)
+	lfd 16, 24*8(3)
+	lfd 17, 25*8(3)
+	lfd 18, 26*8(3)
+	lfd 19, 27*8(3)
+	lfd 20, 28*8(3)
+	lfd 21, 29*8(3)
+	lfd 22, 30*8(3)
+	lfd 23, 31*8(3)
+	lfd 24, 32*8(3)
+	lfd 25, 33*8(3)
+	lfd 26, 34*8(3)
+	lfd 27, 35*8(3)
+	lfd 28, 36*8(3)
+	lfd 29, 37*8(3)
+	lfd 30, 38*8(3)
+	lfd 31, 39*8(3)
+
+	# 6) restore vector registers v20-v31
+	addi 3, 3, 40*8
+	lvx 20, 0, 3 ; addi 3, 3, 16
+	lvx 21, 0, 3 ; addi 3, 3, 16
+	lvx 22, 0, 3 ; addi 3, 3, 16
+	lvx 23, 0, 3 ; addi 3, 3, 16
+	lvx 24, 0, 3 ; addi 3, 3, 16
+	lvx 25, 0, 3 ; addi 3, 3, 16
+	lvx 26, 0, 3 ; addi 3, 3, 16
+	lvx 27, 0, 3 ; addi 3, 3, 16
+	lvx 28, 0, 3 ; addi 3, 3, 16
+	lvx 29, 0, 3 ; addi 3, 3, 16
+	lvx 30, 0, 3 ; addi 3, 3, 16
+	lvx 31, 0, 3
+
+	# 7) return r4 ? r4 : 1
+	mr    3,   4
+	cmpwi cr7, 4, 0
+	bne   cr7, 1f
+	li    3,   1
+1:
+	blr
+
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc64/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc64/setjmp.s
new file mode 100644
index 0000000000..37683fdaf4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/powerpc64/setjmp.s
@@ -0,0 +1,89 @@
+	.global __setjmp
+	.global _setjmp
+	.global setjmp
+	.type   __setjmp,@function
+	.type   _setjmp,@function
+	.type   setjmp,@function
+__setjmp:
+_setjmp:
+setjmp:
+	ld 5, 24(1)   # load from the TOC slot in the caller's stack frame
+	b __setjmp_toc
+
+	.localentry __setjmp,.-__setjmp
+	.localentry _setjmp,.-_setjmp
+	.localentry setjmp,.-setjmp
+	mr 5, 2
+
+	.global __setjmp_toc
+	.hidden __setjmp_toc
+	# same as normal setjmp, except TOC pointer to save is provided in r5.
+	# r4 would normally be the 2nd parameter, but we're using r5 to simplify calling from sigsetjmp.
+	# solves the problem of knowing whether to save the TOC pointer from r2 or the caller's stack frame.
+__setjmp_toc:
+	# 0) store IP into 0, then into the jmpbuf pointed to by r3 (first arg)
+	mflr  0
+	std   0,  0*8(3)
+	# 1) store cr
+	mfcr  0
+	std   0,  1*8(3)
+	# 2) store SP and TOC
+	std   1,  2*8(3)
+	std   5,  3*8(3)
+	# 3) store r14-31
+	std  14,  4*8(3)
+	std  15,  5*8(3)
+	std  16,  6*8(3)
+	std  17,  7*8(3)
+	std  18,  8*8(3)
+	std  19,  9*8(3)
+	std  20, 10*8(3)
+	std  21, 11*8(3)
+	std  22, 12*8(3)
+	std  23, 13*8(3)
+	std  24, 14*8(3)
+	std  25, 15*8(3)
+	std  26, 16*8(3)
+	std  27, 17*8(3)
+	std  28, 18*8(3)
+	std  29, 19*8(3)
+	std  30, 20*8(3)
+	std  31, 21*8(3)
+	# 4) store floating point registers f14-f31
+	stfd 14, 22*8(3)
+	stfd 15, 23*8(3)
+	stfd 16, 24*8(3)
+	stfd 17, 25*8(3)
+	stfd 18, 26*8(3)
+	stfd 19, 27*8(3)
+	stfd 20, 28*8(3)
+	stfd 21, 29*8(3)
+	stfd 22, 30*8(3)
+	stfd 23, 31*8(3)
+	stfd 24, 32*8(3)
+	stfd 25, 33*8(3)
+	stfd 26, 34*8(3)
+	stfd 27, 35*8(3)
+	stfd 28, 36*8(3)
+	stfd 29, 37*8(3)
+	stfd 30, 38*8(3)
+	stfd 31, 39*8(3)
+
+	# 5) store vector registers v20-v31
+	addi  3, 3, 40*8
+	stvx 20, 0, 3 ; addi 3, 3, 16
+	stvx 21, 0, 3 ; addi 3, 3, 16
+	stvx 22, 0, 3 ; addi 3, 3, 16
+	stvx 23, 0, 3 ; addi 3, 3, 16
+	stvx 24, 0, 3 ; addi 3, 3, 16
+	stvx 25, 0, 3 ; addi 3, 3, 16
+	stvx 26, 0, 3 ; addi 3, 3, 16
+	stvx 27, 0, 3 ; addi 3, 3, 16
+	stvx 28, 0, 3 ; addi 3, 3, 16
+	stvx 29, 0, 3 ; addi 3, 3, 16
+	stvx 30, 0, 3 ; addi 3, 3, 16
+	stvx 31, 0, 3
+
+	# 6) return 0
+	li 3, 0
+	blr
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/riscv64/longjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/riscv64/longjmp.S
new file mode 100644
index 0000000000..41e2d2102e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/riscv64/longjmp.S
@@ -0,0 +1,42 @@
+.global __longjmp
+.global _longjmp
+.global longjmp
+.type __longjmp, %function
+.type _longjmp,  %function
+.type longjmp,   %function
+__longjmp:
+_longjmp:
+longjmp:
+	ld s0,    0(a0)
+	ld s1,    8(a0)
+	ld s2,    16(a0)
+	ld s3,    24(a0)
+	ld s4,    32(a0)
+	ld s5,    40(a0)
+	ld s6,    48(a0)
+	ld s7,    56(a0)
+	ld s8,    64(a0)
+	ld s9,    72(a0)
+	ld s10,   80(a0)
+	ld s11,   88(a0)
+	ld sp,    96(a0)
+	ld ra,    104(a0)
+
+#ifndef __riscv_float_abi_soft
+	fld fs0,  112(a0)
+	fld fs1,  120(a0)
+	fld fs2,  128(a0)
+	fld fs3,  136(a0)
+	fld fs4,  144(a0)
+	fld fs5,  152(a0)
+	fld fs6,  160(a0)
+	fld fs7,  168(a0)
+	fld fs8,  176(a0)
+	fld fs9,  184(a0)
+	fld fs10, 192(a0)
+	fld fs11, 200(a0)
+#endif
+
+	seqz a0, a1
+	add a0, a0, a1
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/riscv64/setjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/riscv64/setjmp.S
new file mode 100644
index 0000000000..51249672df
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/riscv64/setjmp.S
@@ -0,0 +1,41 @@
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type __setjmp, %function
+.type _setjmp,  %function
+.type setjmp,   %function
+__setjmp:
+_setjmp:
+setjmp:
+	sd s0,    0(a0)
+	sd s1,    8(a0)
+	sd s2,    16(a0)
+	sd s3,    24(a0)
+	sd s4,    32(a0)
+	sd s5,    40(a0)
+	sd s6,    48(a0)
+	sd s7,    56(a0)
+	sd s8,    64(a0)
+	sd s9,    72(a0)
+	sd s10,   80(a0)
+	sd s11,   88(a0)
+	sd sp,    96(a0)
+	sd ra,    104(a0)
+
+#ifndef __riscv_float_abi_soft
+	fsd fs0,  112(a0)
+	fsd fs1,  120(a0)
+	fsd fs2,  128(a0)
+	fsd fs3,  136(a0)
+	fsd fs4,  144(a0)
+	fsd fs5,  152(a0)
+	fsd fs6,  160(a0)
+	fsd fs7,  168(a0)
+	fsd fs8,  176(a0)
+	fsd fs9,  184(a0)
+	fsd fs10, 192(a0)
+	fsd fs11, 200(a0)
+#endif
+
+	li a0, 0
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/s390x/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/s390x/longjmp.s
new file mode 100644
index 0000000000..b2310f8ad1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/s390x/longjmp.s
@@ -0,0 +1,23 @@
+	.global _longjmp
+	.global longjmp
+	.type   _longjmp,@function
+	.type   longjmp,@function
+_longjmp:
+longjmp:
+
+1:
+	lmg %r6, %r15, 0(%r2)
+
+	ld  %f8, 10*8(%r2)
+	ld  %f9, 11*8(%r2)
+	ld %f10, 12*8(%r2)
+	ld %f11, 13*8(%r2)
+	ld %f12, 14*8(%r2)
+	ld %f13, 15*8(%r2)
+	ld %f14, 16*8(%r2)
+	ld %f15, 17*8(%r2)
+
+	ltgr %r2, %r3
+	bnzr %r14
+	lhi  %r2, 1
+	br   %r14
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/s390x/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/s390x/setjmp.s
new file mode 100644
index 0000000000..afae1b6755
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/s390x/setjmp.s
@@ -0,0 +1,25 @@
+	.global ___setjmp
+	.hidden ___setjmp
+	.global __setjmp
+	.global _setjmp
+	.global setjmp
+	.type   __setjmp,@function
+	.type   _setjmp,@function
+	.type   setjmp,@function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+	stmg %r6, %r15, 0(%r2)
+
+	std  %f8,  10*8(%r2)
+	std  %f9,  11*8(%r2)
+	std  %f10, 12*8(%r2)
+	std  %f11, 13*8(%r2)
+	std  %f12, 14*8(%r2)
+	std  %f13, 15*8(%r2)
+	std  %f14, 16*8(%r2)
+	std  %f15, 17*8(%r2)
+
+	lghi %r2, 0
+	br   %r14
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/setjmp.c b/src/components/lib/libc/musl-1.2.0/src/setjmp/setjmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/setjmp.c
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/setjmp.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/sh/longjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/sh/longjmp.S
new file mode 100644
index 0000000000..08f668b880
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/sh/longjmp.S
@@ -0,0 +1,28 @@
+.global _longjmp
+.global longjmp
+.type   _longjmp, @function
+.type   longjmp,  @function
+_longjmp:
+longjmp:
+	mov.l  @r4+, r8
+	mov.l  @r4+, r9
+	mov.l  @r4+, r10
+	mov.l  @r4+, r11
+	mov.l  @r4+, r12
+	mov.l  @r4+, r13
+	mov.l  @r4+, r14
+	mov.l  @r4+, r15
+	lds.l  @r4+, pr
+#if __SH_FPU_ANY__ || __SH4__
+	fmov.s @r4+, fr12
+	fmov.s @r4+, fr13
+	fmov.s @r4+, fr14
+	fmov.s @r4+, fr15
+#endif
+
+	tst  r5, r5
+	movt r0
+	add  r5, r0
+
+	rts
+	 nop
diff --git a/src/components/lib/libc/musl-1.2.0/src/setjmp/sh/setjmp.S b/src/components/lib/libc/musl-1.2.0/src/setjmp/sh/setjmp.S
new file mode 100644
index 0000000000..d476e6395f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/setjmp/sh/setjmp.S
@@ -0,0 +1,32 @@
+.global ___setjmp
+.hidden ___setjmp
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type   __setjmp, @function
+.type   _setjmp,  @function
+.type   setjmp,   @function
+___setjmp:
+__setjmp:
+_setjmp:
+setjmp:
+#if __SH_FPU_ANY__ || __SH4__
+	add   #52, r4
+	fmov.s fr15, @-r4
+	fmov.s fr14, @-r4
+	fmov.s fr13, @-r4
+	fmov.s fr12, @-r4
+#else
+	add   #36, r4
+#endif
+	sts.l  pr,   @-r4
+	mov.l  r15,  @-r4
+	mov.l  r14,  @-r4
+	mov.l  r13,  @-r4
+	mov.l  r12,  @-r4
+	mov.l  r11,  @-r4
+	mov.l  r10,  @-r4
+	mov.l  r9,   @-r4
+	mov.l  r8,   @-r4
+	rts
+	 mov  #0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/x32/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/x32/longjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/x32/longjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/x32/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/x32/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/x32/setjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/x32/setjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/x32/setjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/x86_64/longjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/x86_64/longjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/x86_64/longjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/x86_64/longjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/setjmp/x86_64/setjmp.s b/src/components/lib/libc/musl-1.2.0/src/setjmp/x86_64/setjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/setjmp/x86_64/setjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/setjmp/x86_64/setjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/aarch64/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/aarch64/restore.s
new file mode 100644
index 0000000000..d4e5fcf1a3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/aarch64/restore.s
@@ -0,0 +1,10 @@
+.global __restore
+.hidden __restore
+.type __restore,%function
+__restore:
+.global __restore_rt
+.hidden __restore_rt
+.type __restore_rt,%function
+__restore_rt:
+	mov x8,#139 // SYS_rt_sigreturn
+	svc 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/aarch64/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/aarch64/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/aarch64/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/aarch64/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/arm/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/arm/restore.s
new file mode 100644
index 0000000000..fb086d9ba7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/arm/restore.s
@@ -0,0 +1,15 @@
+.syntax unified
+
+.global __restore
+.hidden __restore
+.type __restore,%function
+__restore:
+	mov r7,#119
+	swi 0x0
+
+.global __restore_rt
+.hidden __restore_rt
+.type __restore_rt,%function
+__restore_rt:
+	mov r7,#173
+	swi 0x0
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/arm/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/arm/sigsetjmp.s
new file mode 100644
index 0000000000..69ebbf4993
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/arm/sigsetjmp.s
@@ -0,0 +1,24 @@
+.syntax unified
+.global sigsetjmp
+.global __sigsetjmp
+.type sigsetjmp,%function
+.type __sigsetjmp,%function
+sigsetjmp:
+__sigsetjmp:
+	tst r1,r1
+	bne 1f
+	b setjmp
+
+1:	str lr,[r0,#256]
+	str r4,[r0,#260+8]
+	mov r4,r0
+
+	bl setjmp
+
+	mov r1,r0
+	mov r0,r4
+	ldr lr,[r0,#256]
+	ldr r4,[r0,#260+8]
+
+.hidden __sigsetjmp_tail
+	b __sigsetjmp_tail
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/block.c b/src/components/lib/libc/musl-1.2.0/src/signal/block.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/block.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/block.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/getitimer.c b/src/components/lib/libc/musl-1.2.0/src/signal/getitimer.c
new file mode 100644
index 0000000000..36d1eb9dc6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/getitimer.c
@@ -0,0 +1,18 @@
+#include <sys/time.h>
+#include "syscall.h"
+
+int getitimer(int which, struct itimerval *old)
+{
+	if (sizeof(time_t) > sizeof(long)) {
+		long old32[4];
+		int r = __syscall(SYS_getitimer, which, old32);
+		if (!r) {
+			old->it_interval.tv_sec = old32[0];
+			old->it_interval.tv_usec = old32[1];
+			old->it_value.tv_sec = old32[2];
+			old->it_value.tv_usec = old32[3];
+		}
+		return __syscall_ret(r);
+	}
+	return syscall(SYS_getitimer, which, old);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/i386/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/i386/restore.s
new file mode 100644
index 0000000000..ccc94307ae
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/i386/restore.s
@@ -0,0 +1,14 @@
+.global __restore
+.hidden __restore
+.type __restore,@function
+__restore:
+	popl %eax
+	movl $119, %eax
+	int $0x80
+
+.global __restore_rt
+.hidden __restore_rt
+.type __restore_rt,@function
+__restore_rt:
+	movl $173, %eax
+	int $0x80
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/i386/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/i386/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/i386/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/i386/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/kill.c b/src/components/lib/libc/musl-1.2.0/src/signal/kill.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/kill.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/kill.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/killpg.c b/src/components/lib/libc/musl-1.2.0/src/signal/killpg.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/killpg.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/killpg.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/m68k/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/m68k/sigsetjmp.s
new file mode 100644
index 0000000000..09bfa64680
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/m68k/sigsetjmp.s
@@ -0,0 +1,29 @@
+.global sigsetjmp
+.global __sigsetjmp
+.type sigsetjmp,@function
+.type __sigsetjmp,@function
+sigsetjmp:
+__sigsetjmp:
+	move.l 8(%sp),%d0
+	beq 1f
+
+	movea.l 4(%sp),%a1
+	move.l (%sp)+,156(%a1)
+	move.l %a2,156+4+8(%a1)
+	movea.l %a1,%a2
+
+.hidden ___setjmp
+	lea ___setjmp-.-8,%a1
+	jsr (%pc,%a1)
+
+	move.l 156(%a2),-(%sp)
+	move.l %a2,4(%sp)
+	move.l %d0,8(%sp)
+	movea.l 156+4+8(%a2),%a2
+
+.hidden __sigsetjmp_tail
+	lea __sigsetjmp_tail-.-8,%a1
+	jmp (%pc,%a1)
+
+1:	lea ___setjmp-.-8,%a1
+	jmp (%pc,%a1)
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/microblaze/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/microblaze/restore.s
new file mode 100644
index 0000000000..b3c9f57b65
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/microblaze/restore.s
@@ -0,0 +1,13 @@
+.global __restore
+.hidden __restore
+.type __restore,@function
+__restore:
+	ori     r12, r0, 119
+	brki    r14, 0x8
+
+.global __restore_rt
+.hidden __restore_rt
+.type __restore_rt,@function
+__restore_rt:
+	ori     r12, r0, 173
+	brki    r14, 0x8
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/microblaze/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/microblaze/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/microblaze/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/microblaze/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/mips/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/mips/restore.s
new file mode 100644
index 0000000000..b6dadce071
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/mips/restore.s
@@ -0,0 +1,15 @@
+.set noreorder
+
+.global __restore_rt
+.hidden __restore_rt
+.type   __restore_rt,@function
+__restore_rt:
+	li $2, 4193
+	syscall
+
+.global __restore
+.hidden __restore
+.type   __restore,@function
+__restore:
+	li $2, 4119
+	syscall
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/mips/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/mips/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/mips/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/mips/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/mips64/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/mips64/restore.s
new file mode 100644
index 0000000000..401f8e7322
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/mips64/restore.s
@@ -0,0 +1,11 @@
+.set	noreorder
+.global	__restore_rt
+.global	__restore
+.hidden __restore_rt
+.hidden __restore
+.type	__restore_rt,@function
+.type	__restore,@function
+__restore_rt:
+__restore:
+	li	$2,5211
+	syscall
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/mips64/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/mips64/sigsetjmp.s
new file mode 100644
index 0000000000..156e70bd0f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/mips64/sigsetjmp.s
@@ -0,0 +1,38 @@
+.set	noreorder
+.global	sigsetjmp
+.global	__sigsetjmp
+.type	sigsetjmp,@function
+.type	__sigsetjmp,@function
+sigsetjmp:
+__sigsetjmp:
+	lui	$3, %hi(%neg(%gp_rel(sigsetjmp)))
+	daddiu	$3, $3, %lo(%neg(%gp_rel(sigsetjmp)))
+
+	# comparing save mask with 0, if equals to 0 then
+	# sigsetjmp is equal to setjmp.
+	beq	$5, $0, 1f
+	daddu	$3, $3, $25
+	sd	$ra, 160($4)
+	sd	$16, 168($4)
+
+	# save base of got so that we can use it later
+	# once we return from 'longjmp'
+	sd	$3, 176($4)
+	ld	$25, %got_disp(setjmp)($3)
+	jalr	$25
+	move	$16, $4
+
+	move	$5, $2		# Return from 'setjmp' or 'longjmp'
+	move	$4, $16		# Restore the pointer-to-sigjmp_buf
+	ld	$ra, 160($4)	# Restore ra of sigsetjmp
+	ld	$16, 168($4)	# Restore $16 of sigsetjmp
+	ld	$3, 176($4)	# Restore base of got
+
+.hidden	__sigsetjmp_tail
+	ld	$25, %got_disp(__sigsetjmp_tail)($3)
+	jr	$25
+	nop
+1:
+	ld	$25, %got_disp(setjmp)($3)
+	jr	$25
+	nop
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/mipsn32/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/mipsn32/restore.s
new file mode 100644
index 0000000000..4cd4e1b4e4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/mipsn32/restore.s
@@ -0,0 +1,11 @@
+.set	noreorder
+.global	__restore_rt
+.global	__restore
+.hidden __restore_rt
+.hidden __restore
+.type	__restore_rt,@function
+.type	__restore,@function
+__restore_rt:
+__restore:
+	li	$2,6211
+	syscall
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/mipsn32/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/mipsn32/sigsetjmp.s
new file mode 100644
index 0000000000..c0c6961f8f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/mipsn32/sigsetjmp.s
@@ -0,0 +1,38 @@
+.set	noreorder
+.global	sigsetjmp
+.global	__sigsetjmp
+.type	sigsetjmp,@function
+.type	__sigsetjmp,@function
+sigsetjmp:
+__sigsetjmp:
+	lui	$3, %hi(%neg(%gp_rel(sigsetjmp)))
+	addiu	$3, $3, %lo(%neg(%gp_rel(sigsetjmp)))
+
+	# comparing save mask with 0, if equals to 0 then
+	# sigsetjmp is equal to setjmp.
+	beq	$5, $0, 1f
+	addu	$3, $3, $25
+	sd	$ra, 160($4)
+	sd	$16, 168($4)
+
+	# save base of got so that we can use it later
+	# once we return from 'longjmp'
+	sd	$3, 176($4)
+	lw	$25, %got_disp(setjmp)($3)
+	jalr	$25
+	move	$16, $4
+
+	move	$5, $2		# Return from 'setjmp' or 'longjmp'
+	move	$4, $16		# Restore the pointer-to-sigjmp_buf
+	ld	$ra, 160($4)	# Restore ra of sigsetjmp
+	ld	$16, 168($4)	# Restore $16 of sigsetjmp
+	ld	$3, 176($4)	# Restore base of got
+
+.hidden	__sigsetjmp_tail
+	lw	$25, %got_disp(__sigsetjmp_tail)($3)
+	jr	$25
+	nop
+1:
+	lw	$25, %got_disp(setjmp)($3)
+	jr	$25
+	nop
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/or1k/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/or1k/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/or1k/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/or1k/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/powerpc/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/powerpc/restore.s
new file mode 100644
index 0000000000..29c8afd03c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/powerpc/restore.s
@@ -0,0 +1,13 @@
+	.global __restore
+	.hidden __restore
+	.type __restore,%function
+__restore:
+	li      0, 119 #__NR_sigreturn
+	sc
+
+	.global __restore_rt
+	.hidden __restore_rt
+	.type __restore_rt,%function
+__restore_rt:
+	li      0, 172 # __NR_rt_sigreturn
+	sc
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/powerpc/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/powerpc/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/powerpc/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/powerpc/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/powerpc64/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/powerpc64/restore.s
new file mode 100644
index 0000000000..29c8afd03c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/powerpc64/restore.s
@@ -0,0 +1,13 @@
+	.global __restore
+	.hidden __restore
+	.type __restore,%function
+__restore:
+	li      0, 119 #__NR_sigreturn
+	sc
+
+	.global __restore_rt
+	.hidden __restore_rt
+	.type __restore_rt,%function
+__restore_rt:
+	li      0, 172 # __NR_rt_sigreturn
+	sc
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/powerpc64/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/powerpc64/sigsetjmp.s
new file mode 100644
index 0000000000..410c283191
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/powerpc64/sigsetjmp.s
@@ -0,0 +1,37 @@
+	.global sigsetjmp
+	.global __sigsetjmp
+	.type sigsetjmp,%function
+	.type __sigsetjmp,%function
+	.hidden __setjmp_toc
+sigsetjmp:
+__sigsetjmp:
+	addis 2, 12, .TOC.-__sigsetjmp@ha
+	addi  2,  2, .TOC.-__sigsetjmp@l
+	ld    5, 24(1)   # load from the TOC slot in the caller's stack frame
+	b     1f
+
+	.localentry sigsetjmp,.-sigsetjmp
+	.localentry __sigsetjmp,.-__sigsetjmp
+	mr    5,  2
+
+1:
+	cmpwi cr7, 4, 0
+	beq-  cr7, __setjmp_toc
+
+	mflr  6
+	std   6, 512(3)
+	std   2, 512+16(3)
+	std  16, 512+24(3)
+	mr   16, 3
+
+	bl __setjmp_toc
+
+	mr   4,  3
+	mr   3, 16
+	ld   5, 512(3)
+	mtlr 5
+	ld   2, 512+16(3)
+	ld  16, 512+24(3)
+
+.hidden __sigsetjmp_tail
+	b __sigsetjmp_tail
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/psiginfo.c b/src/components/lib/libc/musl-1.2.0/src/signal/psiginfo.c
new file mode 100644
index 0000000000..2b15982be4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/psiginfo.c
@@ -0,0 +1,6 @@
+#include <signal.h>
+
+void psiginfo(const siginfo_t *si, const char *msg)
+{
+	psignal(si->si_signo, msg);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/psignal.c b/src/components/lib/libc/musl-1.2.0/src/signal/psignal.c
new file mode 100644
index 0000000000..138dbe00fa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/psignal.c
@@ -0,0 +1,27 @@
+#include "stdio_impl.h"
+#include <string.h>
+#include <signal.h>
+#include <errno.h>
+
+void psignal(int sig, const char *msg)
+{
+	FILE *f = stderr;
+	char *s = strsignal(sig);
+
+	FLOCK(f);
+
+	/* Save stderr's orientation and encoding rule, since psignal is not
+	 * permitted to change them. Save errno and restore it if there is no
+	 * error since fprintf might change it even on success but psignal is
+	 * not permitted to do so. */
+	void *old_locale = f->locale;
+	int old_mode = f->mode;
+	int old_errno = errno;
+
+	if (fprintf(f, "%s%s%s\n", msg?msg:"", msg?": ":"", s)>=0)
+		errno = old_errno;
+	f->mode = old_mode;
+	f->locale = old_locale;
+
+	FUNLOCK(f);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/raise.c b/src/components/lib/libc/musl-1.2.0/src/signal/raise.c
new file mode 100644
index 0000000000..f0512019a1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/raise.c
@@ -0,0 +1,13 @@
+#include <signal.h>
+#include <stdint.h>
+#include "syscall.h"
+#include "pthread_impl.h"
+
+int raise(int sig)
+{
+	sigset_t set;
+	__block_app_sigs(&set);
+	int ret = syscall(SYS_tkill, __pthread_self()->tid, sig);
+	__restore_sigs(&set);
+	return ret;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/restore.c b/src/components/lib/libc/musl-1.2.0/src/signal/restore.c
new file mode 100644
index 0000000000..5ec4f5dddc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/restore.c
@@ -0,0 +1,12 @@
+#include <features.h>
+
+/* These functions will not work, but suffice for targets where the
+ * kernel sigaction structure does not actually use sa_restorer. */
+
+hidden void __restore()
+{
+}
+
+hidden void __restore_rt()
+{
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/riscv64/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/riscv64/restore.s
new file mode 100644
index 0000000000..40012c757a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/riscv64/restore.s
@@ -0,0 +1,8 @@
+.global __restore
+.type __restore, %function
+__restore:
+.global __restore_rt
+.type __restore_rt, %function
+__restore_rt:
+	li a7, 139 # SYS_rt_sigreturn
+	ecall
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/riscv64/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/riscv64/sigsetjmp.s
new file mode 100644
index 0000000000..f9bc162a0a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/riscv64/sigsetjmp.s
@@ -0,0 +1,23 @@
+.global sigsetjmp
+.global __sigsetjmp
+.type sigsetjmp, %function
+.type __sigsetjmp, %function
+sigsetjmp:
+__sigsetjmp:
+	bnez a1, 1f
+	tail setjmp
+1:
+
+	sd ra, 208(a0)
+	sd s0, 224(a0)
+	mv s0, a0
+
+	call setjmp
+
+	mv a1, a0
+	mv a0, s0
+	ld s0, 224(a0)
+	ld ra, 208(a0)
+
+.hidden __sigsetjmp_tail
+	tail __sigsetjmp_tail
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/s390x/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/s390x/restore.s
new file mode 100644
index 0000000000..88e33dbc22
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/s390x/restore.s
@@ -0,0 +1,11 @@
+	.global __restore
+	.hidden __restore
+	.type __restore,%function
+__restore:
+	svc 119 #__NR_sigreturn
+
+	.global __restore_rt
+	.hidden __restore_rt
+	.type __restore_rt,%function
+__restore_rt:
+	svc 173 # __NR_rt_sigreturn
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/s390x/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/s390x/sigsetjmp.s
new file mode 100644
index 0000000000..41b1bd9a16
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/s390x/sigsetjmp.s
@@ -0,0 +1,23 @@
+	.global sigsetjmp
+	.global __sigsetjmp
+	.type sigsetjmp,%function
+	.type __sigsetjmp,%function
+	.hidden ___setjmp
+sigsetjmp:
+__sigsetjmp:
+	ltgr  %r3, %r3
+	jz    ___setjmp
+
+	stg   %r14, 18*8(%r2)
+	stg   %r6,  20*8(%r2)
+	lgr   %r6,  %r2
+
+	brasl %r14, ___setjmp
+
+	lgr   %r3,  %r2
+	lgr   %r2,  %r6
+	lg    %r14, 18*8(%r2)
+	lg    %r6,  20*8(%r2)
+
+.hidden __sigsetjmp_tail
+	jg __sigsetjmp_tail
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/setitimer.c b/src/components/lib/libc/musl-1.2.0/src/signal/setitimer.c
new file mode 100644
index 0000000000..0dfbeb4db5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/setitimer.c
@@ -0,0 +1,26 @@
+#include <sys/time.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+
+int setitimer(int which, const struct itimerval *restrict new, struct itimerval *restrict old)
+{
+	if (sizeof(time_t) > sizeof(long)) {
+		time_t is = new->it_interval.tv_sec, vs = new->it_value.tv_sec;
+		long ius = new->it_interval.tv_usec, vus = new->it_value.tv_usec;
+		if (!IS32BIT(is) || !IS32BIT(vs))
+			return __syscall_ret(-ENOTSUP);
+		long old32[4];
+		int r = __syscall(SYS_setitimer, which,
+			((long[]){is, ius, vs, vus}), old32);
+		if (!r && old) {
+			old->it_interval.tv_sec = old32[0];
+			old->it_interval.tv_usec = old32[1];
+			old->it_value.tv_sec = old32[2];
+			old->it_value.tv_usec = old32[3];
+		}
+		return __syscall_ret(r);
+	}
+	return syscall(SYS_setitimer, which, new, old);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sh/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/sh/restore.s
new file mode 100644
index 0000000000..3a92199db6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sh/restore.s
@@ -0,0 +1,24 @@
+.global __restore
+.hidden __restore
+__restore:
+	mov   #119, r3  !__NR_sigreturn
+	trapa #31
+
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+
+.global __restore_rt
+.hidden __restore_rt
+__restore_rt:
+	mov   #100, r3  !__NR_rt_sigreturn
+	add   #73, r3
+	trapa #31
+
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sh/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/sh/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sh/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/sh/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sigaction.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigaction.c
new file mode 100644
index 0000000000..c109bea0cf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigaction.c
@@ -0,0 +1,88 @@
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+#include "syscall.h"
+#include "pthread_impl.h"
+#include "libc.h"
+#include "lock.h"
+#include "ksigaction.h"
+
+static volatile int dummy_lock[1] = { 0 };
+
+extern hidden volatile int __abort_lock[1];
+
+weak_alias(dummy_lock, __abort_lock);
+
+static int unmask_done;
+static unsigned long handler_set[_NSIG/(8*sizeof(long))];
+
+void __get_handler_set(sigset_t *set)
+{
+	memcpy(set, handler_set, sizeof handler_set);
+}
+
+volatile int __eintr_valid_flag;
+
+int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
+{
+	struct k_sigaction ksa, ksa_old;
+	unsigned long set[_NSIG/(8*sizeof(long))];
+	if (sa) {
+		if ((uintptr_t)sa->sa_handler > 1UL) {
+			a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
+				1UL<<(sig-1)%(8*sizeof(long)));
+
+			/* If pthread_create has not yet been called,
+			 * implementation-internal signals might not
+			 * yet have been unblocked. They must be
+			 * unblocked before any signal handler is
+			 * installed, so that an application cannot
+			 * receive an illegal sigset_t (with them
+			 * blocked) as part of the ucontext_t passed
+			 * to the signal handler. */
+			if (!libc.threaded && !unmask_done) {
+				__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+					SIGPT_SET, 0, _NSIG/8);
+				unmask_done = 1;
+			}
+
+			if (!(sa->sa_flags & SA_RESTART)) {
+				a_store(&__eintr_valid_flag, 1);
+			}
+		}
+		/* Changing the disposition of SIGABRT to anything but
+		 * SIG_DFL requires a lock, so that it cannot be changed
+		 * while abort is terminating the process after simply
+		 * calling raise(SIGABRT) failed to do so. */
+		if (sa->sa_handler != SIG_DFL && sig == SIGABRT) {
+			__block_all_sigs(&set);
+			LOCK(__abort_lock);
+		}
+		ksa.handler = sa->sa_handler;
+		ksa.flags = sa->sa_flags | SA_RESTORER;
+		ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
+		memcpy(&ksa.mask, &sa->sa_mask, _NSIG/8);
+	}
+	int r = __syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, _NSIG/8);
+	if (sig == SIGABRT && sa && sa->sa_handler != SIG_DFL) {
+		UNLOCK(__abort_lock);
+		__restore_sigs(&set);
+	}
+	if (old && !r) {
+		old->sa_handler = ksa_old.handler;
+		old->sa_flags = ksa_old.flags;
+		memcpy(&old->sa_mask, &ksa_old.mask, _NSIG/8);
+	}
+	return __syscall_ret(r);
+}
+
+int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
+{
+	if (sig-32U < 3 || sig-1U >= _NSIG-1) {
+		errno = EINVAL;
+		return -1;
+	}
+	return __libc_sigaction(sig, sa, old);
+}
+
+weak_alias(__sigaction, sigaction);
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigaddset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigaddset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigaddset.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigaddset.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sigaltstack.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigaltstack.c
new file mode 100644
index 0000000000..d3a6e8215f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigaltstack.c
@@ -0,0 +1,18 @@
+#include <signal.h>
+#include <errno.h>
+#include "syscall.h"
+
+int sigaltstack(const stack_t *restrict ss, stack_t *restrict old)
+{
+	if (ss) {
+		if (!(ss->ss_flags & SS_DISABLE) && ss->ss_size < MINSIGSTKSZ) {
+			errno = ENOMEM;
+			return -1;
+		}
+		if (ss->ss_flags & SS_ONSTACK) {
+			errno = EINVAL;
+			return -1;
+		}
+	}
+	return syscall(SYS_sigaltstack, ss, old);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigandset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigandset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigandset.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigandset.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigdelset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigdelset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigdelset.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigdelset.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigemptyset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigemptyset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigemptyset.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigemptyset.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigfillset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigfillset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigfillset.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigfillset.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sighold.c b/src/components/lib/libc/musl-1.2.0/src/signal/sighold.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sighold.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sighold.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigignore.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigignore.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigignore.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigignore.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/siginterrupt.c b/src/components/lib/libc/musl-1.2.0/src/signal/siginterrupt.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/siginterrupt.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/siginterrupt.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sigisemptyset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigisemptyset.c
new file mode 100644
index 0000000000..68b8662468
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigisemptyset.c
@@ -0,0 +1,10 @@
+#define _GNU_SOURCE
+#include <signal.h>
+#include <string.h>
+
+int sigisemptyset(const sigset_t *set)
+{
+	for (size_t i=0; i<_NSIG/8/sizeof *set->__bits; i++)
+		if (set->__bits[i]) return 0;
+	return 1;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigismember.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigismember.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigismember.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigismember.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/siglongjmp.c b/src/components/lib/libc/musl-1.2.0/src/signal/siglongjmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/siglongjmp.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/siglongjmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/signal.c b/src/components/lib/libc/musl-1.2.0/src/signal/signal.c
similarity index 78%
rename from src/components/lib/libc/musl-1.1.11/src/signal/signal.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/signal.c
index 29e03c8842..7a6dd17276 100644
--- a/src/components/lib/libc/musl-1.1.11/src/signal/signal.c
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/signal.c
@@ -1,8 +1,5 @@
 #include <signal.h>
 #include "syscall.h"
-#include "libc.h"
-
-int __sigaction(int, const struct sigaction *, struct sigaction *);
 
 void (*signal(int sig, void (*func)(int)))(int)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigorset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigorset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigorset.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigorset.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigpause.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigpause.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigpause.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigpause.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigpending.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigpending.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigpending.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigpending.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigprocmask.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigprocmask.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigprocmask.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigprocmask.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigqueue.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigqueue.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigqueue.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigqueue.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigrelse.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigrelse.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigrelse.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigrelse.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigrtmax.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigrtmax.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigrtmax.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigrtmax.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sigrtmin.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigrtmin.c
new file mode 100644
index 0000000000..c5a1fd92da
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigrtmin.c
@@ -0,0 +1,6 @@
+#include <signal.h>
+
+int __libc_current_sigrtmin()
+{
+	return 35;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sigset.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigset.c
new file mode 100644
index 0000000000..f3e8c4077e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigset.c
@@ -0,0 +1,27 @@
+#include <signal.h>
+
+void (*sigset(int sig, void (*handler)(int)))(int)
+{
+	struct sigaction sa, sa_old;
+	sigset_t mask, mask_old;
+
+	sigemptyset(&mask);
+	if (sigaddset(&mask, sig) < 0)
+		return SIG_ERR;
+	
+	if (handler == SIG_HOLD) {
+		if (sigaction(sig, 0, &sa_old) < 0)
+			return SIG_ERR;
+		if (sigprocmask(SIG_BLOCK, &mask, &mask_old) < 0)
+			return SIG_ERR;
+	} else {
+		sa.sa_handler = handler;
+		sa.sa_flags = 0;
+		sigemptyset(&sa.sa_mask);
+		if (sigaction(sig, &sa, &sa_old) < 0)
+			return SIG_ERR;
+		if (sigprocmask(SIG_UNBLOCK, &mask, &mask_old) < 0)
+			return SIG_ERR;
+	}
+	return sigismember(&mask_old, sig) ? SIG_HOLD : sa_old.sa_handler;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/resource.h b/src/components/lib/libc/musl-1.2.0/src/signal/sigsetjmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/arch/microblaze/bits/resource.h
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigsetjmp.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sigsetjmp_tail.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigsetjmp_tail.c
new file mode 100644
index 0000000000..f2aa28878e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigsetjmp_tail.c
@@ -0,0 +1,10 @@
+#include <setjmp.h>
+#include <signal.h>
+#include "syscall.h"
+
+hidden int __sigsetjmp_tail(sigjmp_buf jb, int ret)
+{
+	void *p = jb->__ss;
+	__syscall(SYS_rt_sigprocmask, SIG_SETMASK, ret?p:0, ret?0:p, _NSIG/8);
+	return ret;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigsuspend.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigsuspend.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigsuspend.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigsuspend.c
index 0b42725ace..36e0602c60 100644
--- a/src/components/lib/libc/musl-1.1.11/src/signal/sigsuspend.c
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigsuspend.c
@@ -1,6 +1,5 @@
 #include <signal.h>
 #include "syscall.h"
-#include "libc.h"
 
 int sigsuspend(const sigset_t *mask)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/sigtimedwait.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigtimedwait.c
new file mode 100644
index 0000000000..1287174eba
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/sigtimedwait.c
@@ -0,0 +1,32 @@
+#include <signal.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+static int do_sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const struct timespec *restrict ts)
+{
+#ifdef SYS_rt_sigtimedwait_time64
+	time_t s = ts ? ts->tv_sec : 0;
+	long ns = ts ? ts->tv_nsec : 0;
+	int r = -ENOSYS;
+	if (SYS_rt_sigtimedwait == SYS_rt_sigtimedwait_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_rt_sigtimedwait_time64, mask, si,
+			ts ? ((long long[]){s, ns}) : 0, _NSIG/8);
+	if (SYS_rt_sigtimedwait == SYS_rt_sigtimedwait_time64 || r!=-ENOSYS)
+		return r;
+	return __syscall_cp(SYS_rt_sigtimedwait, mask, si,
+		ts ? ((long[]){CLAMP(s), ns}) : 0, _NSIG/8);;
+#else
+	return __syscall_cp(SYS_rt_sigtimedwait, mask, si, ts, _NSIG/8);
+#endif
+}
+
+int sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const struct timespec *restrict timeout)
+{
+	int ret;
+	do ret = do_sigtimedwait(mask, si, timeout);
+	while (ret==-EINTR);
+	return __syscall_ret(ret);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigwait.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigwait.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigwait.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigwait.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/sigwaitinfo.c b/src/components/lib/libc/musl-1.2.0/src/signal/sigwaitinfo.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/sigwaitinfo.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/sigwaitinfo.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/getitimer.c b/src/components/lib/libc/musl-1.2.0/src/signal/x32/getitimer.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/getitimer.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/x32/getitimer.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/x32/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/x32/restore.s
new file mode 100644
index 0000000000..1117446a6c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/x32/restore.s
@@ -0,0 +1,8 @@
+	nop
+.global __restore_rt
+.hidden __restore_rt
+.type __restore_rt,@function
+__restore_rt:
+	mov $0x40000201, %rax /* SYS_rt_sigreturn */
+	syscall
+.size __restore_rt,.-__restore_rt
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/setitimer.c b/src/components/lib/libc/musl-1.2.0/src/signal/x32/setitimer.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/setitimer.c
rename to src/components/lib/libc/musl-1.2.0/src/signal/x32/setitimer.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/x32/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/x32/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/x32/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/x32/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/signal/x86_64/restore.s b/src/components/lib/libc/musl-1.2.0/src/signal/x86_64/restore.s
new file mode 100644
index 0000000000..27d6cf3103
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/signal/x86_64/restore.s
@@ -0,0 +1,8 @@
+	nop
+.global __restore_rt
+.hidden __restore_rt
+.type __restore_rt,@function
+__restore_rt:
+	mov $15, %rax
+	syscall
+.size __restore_rt,.-__restore_rt
diff --git a/src/components/lib/libc/musl-1.1.11/src/signal/x86_64/sigsetjmp.s b/src/components/lib/libc/musl-1.2.0/src/signal/x86_64/sigsetjmp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/signal/x86_64/sigsetjmp.s
rename to src/components/lib/libc/musl-1.2.0/src/signal/x86_64/sigsetjmp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/stat/__xstat.c b/src/components/lib/libc/musl-1.2.0/src/stat/__xstat.c
new file mode 100644
index 0000000000..630936a0fa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/__xstat.c
@@ -0,0 +1,40 @@
+#include <sys/stat.h>
+
+#if !_REDIR_TIME64
+
+int __fxstat(int ver, int fd, struct stat *buf)
+{
+	return fstat(fd, buf);
+}
+
+int __fxstatat(int ver, int fd, const char *path, struct stat *buf, int flag)
+{
+	return fstatat(fd, path, buf, flag);
+}
+
+int __lxstat(int ver, const char *path, struct stat *buf)
+{
+	return lstat(path, buf);
+}
+
+int __xstat(int ver, const char *path, struct stat *buf)
+{
+	return stat(path, buf);
+}
+
+weak_alias(__fxstat, __fxstat64);
+weak_alias(__fxstatat, __fxstatat64);
+weak_alias(__lxstat, __lxstat64);
+weak_alias(__xstat, __xstat64);
+
+#endif
+
+int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev)
+{
+	return mknod(path, mode, *dev);
+}
+
+int __xmknodat(int ver, int fd, const char *path, mode_t mode, dev_t *dev)
+{
+	return mknodat(fd, path, mode, *dev);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/chmod.c b/src/components/lib/libc/musl-1.2.0/src/stat/chmod.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/chmod.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/chmod.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/fchmod.c b/src/components/lib/libc/musl-1.2.0/src/stat/fchmod.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/stat/fchmod.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/fchmod.c
index 93e1b64c57..7a503eefc4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stat/fchmod.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/fchmod.c
@@ -3,8 +3,6 @@
 #include <fcntl.h>
 #include "syscall.h"
 
-void __procfdname(char *, unsigned);
-
 int fchmod(int fd, mode_t mode)
 {
 	int ret = __syscall(SYS_fchmod, fd, mode);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/fchmodat.c b/src/components/lib/libc/musl-1.2.0/src/stat/fchmodat.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/stat/fchmodat.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/fchmodat.c
index d94667aed5..4ee00b0a3e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stat/fchmodat.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/fchmodat.c
@@ -2,8 +2,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include "syscall.h"
-
-void __procfdname(char *, unsigned);
+#include "kstat.h"
 
 int fchmodat(int fd, const char *path, mode_t mode, int flag)
 {
@@ -12,7 +11,7 @@ int fchmodat(int fd, const char *path, mode_t mode, int flag)
 	if (flag != AT_SYMLINK_NOFOLLOW)
 		return __syscall_ret(-EINVAL);
 
-	struct stat st;
+	struct kstat st;
 	int ret, fd2;
 	char proc[15+3*sizeof(int)];
 
diff --git a/src/components/lib/libc/musl-1.2.0/src/stat/fstat.c b/src/components/lib/libc/musl-1.2.0/src/stat/fstat.c
new file mode 100644
index 0000000000..9bbb46decb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/fstat.c
@@ -0,0 +1,15 @@
+#define _BSD_SOURCE
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
+#include "syscall.h"
+
+int fstat(int fd, struct stat *st)
+{
+	if (fd<0) return __syscall_ret(-EBADF);
+	return fstatat(fd, "", st, AT_EMPTY_PATH);
+}
+
+#if !_REDIR_TIME64
+weak_alias(fstat, fstat64);
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/stat/fstatat.c b/src/components/lib/libc/musl-1.2.0/src/stat/fstatat.c
new file mode 100644
index 0000000000..de165b5c97
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/fstatat.c
@@ -0,0 +1,147 @@
+#define _BSD_SOURCE
+#include <sys/stat.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdint.h>
+#include <sys/sysmacros.h>
+#include "syscall.h"
+#include "kstat.h"
+
+struct statx {
+	uint32_t stx_mask;
+	uint32_t stx_blksize;
+	uint64_t stx_attributes;
+	uint32_t stx_nlink;
+	uint32_t stx_uid;
+	uint32_t stx_gid;
+	uint16_t stx_mode;
+	uint16_t pad1;
+	uint64_t stx_ino;
+	uint64_t stx_size;
+	uint64_t stx_blocks;
+	uint64_t stx_attributes_mask;
+	struct {
+		int64_t tv_sec;
+		uint32_t tv_nsec;
+		int32_t pad;
+	} stx_atime, stx_btime, stx_ctime, stx_mtime;
+	uint32_t stx_rdev_major;
+	uint32_t stx_rdev_minor;
+	uint32_t stx_dev_major;
+	uint32_t stx_dev_minor;
+	uint64_t spare[14];
+};
+
+static int fstatat_statx(int fd, const char *restrict path, struct stat *restrict st, int flag)
+{
+	struct statx stx;
+
+	int ret = __syscall(SYS_statx, fd, path, flag, 0x7ff, &stx);
+	if (ret) return ret;
+
+	*st = (struct stat){
+		.st_dev = makedev(stx.stx_dev_major, stx.stx_dev_minor),
+		.st_ino = stx.stx_ino,
+		.st_mode = stx.stx_mode,
+		.st_nlink = stx.stx_nlink,
+		.st_uid = stx.stx_uid,
+		.st_gid = stx.stx_gid,
+		.st_rdev = makedev(stx.stx_rdev_major, stx.stx_rdev_minor),
+		.st_size = stx.stx_size,
+		.st_blksize = stx.stx_blksize,
+		.st_blocks = stx.stx_blocks,
+		.st_atim.tv_sec = stx.stx_atime.tv_sec,
+		.st_atim.tv_nsec = stx.stx_atime.tv_nsec,
+		.st_mtim.tv_sec = stx.stx_mtime.tv_sec,
+		.st_mtim.tv_nsec = stx.stx_mtime.tv_nsec,
+		.st_ctim.tv_sec = stx.stx_ctime.tv_sec,
+		.st_ctim.tv_nsec = stx.stx_ctime.tv_nsec,
+#if _REDIR_TIME64
+		.__st_atim32.tv_sec = stx.stx_atime.tv_sec,
+		.__st_atim32.tv_nsec = stx.stx_atime.tv_nsec,
+		.__st_mtim32.tv_sec = stx.stx_mtime.tv_sec,
+		.__st_mtim32.tv_nsec = stx.stx_mtime.tv_nsec,
+		.__st_ctim32.tv_sec = stx.stx_ctime.tv_sec,
+		.__st_ctim32.tv_nsec = stx.stx_ctime.tv_nsec,
+#endif
+	};
+	return 0;
+}
+
+static int fstatat_kstat(int fd, const char *restrict path, struct stat *restrict st, int flag)
+{
+	int ret;
+	struct kstat kst;
+
+	if (flag==AT_EMPTY_PATH && fd>=0 && !*path) {
+		ret = __syscall(SYS_fstat, fd, &kst);
+		if (ret==-EBADF && __syscall(SYS_fcntl, fd, F_GETFD)>=0) {
+			ret = __syscall(SYS_fstatat, fd, path, &kst, flag);
+			if (ret==-EINVAL) {
+				char buf[15+3*sizeof(int)];
+				__procfdname(buf, fd);
+#ifdef SYS_stat
+				ret = __syscall(SYS_stat, buf, &kst);
+#else
+				ret = __syscall(SYS_fstatat, AT_FDCWD, buf, &kst, 0);
+#endif
+			}
+		}
+	}
+#ifdef SYS_lstat
+	else if ((fd == AT_FDCWD || *path=='/') && flag==AT_SYMLINK_NOFOLLOW)
+		ret = __syscall(SYS_lstat, path, &kst);
+#endif
+#ifdef SYS_stat
+	else if ((fd == AT_FDCWD || *path=='/') && !flag)
+		ret = __syscall(SYS_stat, path, &kst);
+#endif
+	else ret = __syscall(SYS_fstatat, fd, path, &kst, flag);
+
+	if (ret) return ret;
+
+	*st = (struct stat){
+		.st_dev = kst.st_dev,
+		.st_ino = kst.st_ino,
+		.st_mode = kst.st_mode,
+		.st_nlink = kst.st_nlink,
+		.st_uid = kst.st_uid,
+		.st_gid = kst.st_gid,
+		.st_rdev = kst.st_rdev,
+		.st_size = kst.st_size,
+		.st_blksize = kst.st_blksize,
+		.st_blocks = kst.st_blocks,
+		.st_atim.tv_sec = kst.st_atime_sec,
+		.st_atim.tv_nsec = kst.st_atime_nsec,
+		.st_mtim.tv_sec = kst.st_mtime_sec,
+		.st_mtim.tv_nsec = kst.st_mtime_nsec,
+		.st_ctim.tv_sec = kst.st_ctime_sec,
+		.st_ctim.tv_nsec = kst.st_ctime_nsec,
+#if _REDIR_TIME64
+		.__st_atim32.tv_sec = kst.st_atime_sec,
+		.__st_atim32.tv_nsec = kst.st_atime_nsec,
+		.__st_mtim32.tv_sec = kst.st_mtime_sec,
+		.__st_mtim32.tv_nsec = kst.st_mtime_nsec,
+		.__st_ctim32.tv_sec = kst.st_ctime_sec,
+		.__st_ctim32.tv_nsec = kst.st_ctime_nsec,
+#endif
+	};
+
+	return 0;
+}
+
+int fstatat(int fd, const char *restrict path, struct stat *restrict st, int flag)
+{
+	int ret;
+	if (sizeof((struct kstat){0}.st_atime_sec) < sizeof(time_t)) {
+		ret = fstatat_statx(fd, path, st, flag);
+		if (ret!=-ENOSYS) return __syscall_ret(ret);
+	}
+	ret = fstatat_kstat(fd, path, st, flag);
+	return __syscall_ret(ret);
+}
+
+#if !_REDIR_TIME64
+weak_alias(fstatat, fstatat64);
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/futimens.c b/src/components/lib/libc/musl-1.2.0/src/stat/futimens.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/futimens.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/futimens.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/futimesat.c b/src/components/lib/libc/musl-1.2.0/src/stat/futimesat.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/stat/futimesat.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/futimesat.c
index b4eea1d3c4..4bdb1c2965 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stat/futimesat.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/futimesat.c
@@ -3,7 +3,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include "syscall.h"
-#include "libc.h"
 
 int __futimesat(int dirfd, const char *pathname, const struct timeval times[2])
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/lchmod.c b/src/components/lib/libc/musl-1.2.0/src/stat/lchmod.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/lchmod.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/lchmod.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stat/lstat.c b/src/components/lib/libc/musl-1.2.0/src/stat/lstat.c
new file mode 100644
index 0000000000..6fe004dec2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/lstat.c
@@ -0,0 +1,11 @@
+#include <sys/stat.h>
+#include <fcntl.h>
+
+int lstat(const char *restrict path, struct stat *restrict buf)
+{
+	return fstatat(AT_FDCWD, path, buf, AT_SYMLINK_NOFOLLOW);
+}
+
+#if !_REDIR_TIME64
+weak_alias(lstat, lstat64);
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/mkdir.c b/src/components/lib/libc/musl-1.2.0/src/stat/mkdir.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/mkdir.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/mkdir.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/mkdirat.c b/src/components/lib/libc/musl-1.2.0/src/stat/mkdirat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/mkdirat.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/mkdirat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/mkfifo.c b/src/components/lib/libc/musl-1.2.0/src/stat/mkfifo.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/mkfifo.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/mkfifo.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/mkfifoat.c b/src/components/lib/libc/musl-1.2.0/src/stat/mkfifoat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/mkfifoat.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/mkfifoat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/mknod.c b/src/components/lib/libc/musl-1.2.0/src/stat/mknod.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/mknod.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/mknod.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/mknodat.c b/src/components/lib/libc/musl-1.2.0/src/stat/mknodat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/mknodat.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/mknodat.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stat/stat.c b/src/components/lib/libc/musl-1.2.0/src/stat/stat.c
new file mode 100644
index 0000000000..ea70efc4a0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/stat.c
@@ -0,0 +1,11 @@
+#include <sys/stat.h>
+#include <fcntl.h>
+
+int stat(const char *restrict path, struct stat *restrict buf)
+{
+	return fstatat(AT_FDCWD, path, buf, 0);
+}
+
+#if !_REDIR_TIME64
+weak_alias(stat, stat64);
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/statvfs.c b/src/components/lib/libc/musl-1.2.0/src/stat/statvfs.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/stat/statvfs.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/statvfs.c
index 30d587971b..f65d1b548d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stat/statvfs.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/statvfs.c
@@ -1,9 +1,8 @@
 #include <sys/statvfs.h>
 #include <sys/statfs.h>
 #include "syscall.h"
-#include "libc.h"
 
-int __statfs(const char *path, struct statfs *buf)
+static int __statfs(const char *path, struct statfs *buf)
 {
 	*buf = (struct statfs){0};
 #ifdef SYS_statfs64
@@ -13,7 +12,7 @@ int __statfs(const char *path, struct statfs *buf)
 #endif
 }
 
-int __fstatfs(int fd, struct statfs *buf)
+static int __fstatfs(int fd, struct statfs *buf)
 {
 	*buf = (struct statfs){0};
 #ifdef SYS_fstatfs64
@@ -58,7 +57,7 @@ int fstatvfs(int fd, struct statvfs *buf)
 	return 0;
 }
 
-LFS64(statvfs);
-LFS64(statfs);
-LFS64(fstatvfs);
-LFS64(fstatfs);
+weak_alias(statvfs, statvfs64);
+weak_alias(statfs, statfs64);
+weak_alias(fstatvfs, fstatvfs64);
+weak_alias(fstatfs, fstatfs64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stat/umask.c b/src/components/lib/libc/musl-1.2.0/src/stat/umask.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stat/umask.c
rename to src/components/lib/libc/musl-1.2.0/src/stat/umask.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stat/utimensat.c b/src/components/lib/libc/musl-1.2.0/src/stat/utimensat.c
new file mode 100644
index 0000000000..730723a9ea
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stat/utimensat.c
@@ -0,0 +1,60 @@
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define NS_SPECIAL(ns) ((ns)==UTIME_NOW || (ns)==UTIME_OMIT)
+
+int utimensat(int fd, const char *path, const struct timespec times[2], int flags)
+{
+	int r;
+	if (times && times[0].tv_nsec==UTIME_NOW && times[1].tv_nsec==UTIME_NOW)
+		times = 0;
+#ifdef SYS_utimensat_time64
+	r = -ENOSYS;
+	time_t s0=0, s1=0;
+	long ns0=0, ns1=0;
+	if (times) {
+		ns0 = times[0].tv_nsec;
+		ns1 = times[1].tv_nsec;
+		if (!NS_SPECIAL(ns0)) s0 = times[0].tv_sec;
+		if (!NS_SPECIAL(ns1)) s1 = times[1].tv_sec;
+	}
+	if (SYS_utimensat == SYS_utimensat_time64 || !IS32BIT(s0) || !IS32BIT(s1))
+		r = __syscall(SYS_utimensat_time64, fd, path, times ?
+			((long long[]){s0, ns0, s1, ns1}) : 0, flags);
+	if (SYS_utimensat == SYS_utimensat_time64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	if (!IS32BIT(s0) || !IS32BIT(s1))
+		return __syscall_ret(-ENOTSUP);
+	r = __syscall(SYS_utimensat, fd, path,
+		times ? ((long[]){s0, ns0, s1, ns1}) : 0, flags);
+#else
+	r = __syscall(SYS_utimensat, fd, path, times, flags);
+#endif
+
+#ifdef SYS_futimesat
+	if (r != -ENOSYS || flags) return __syscall_ret(r);
+	long *tv=0, tmp[4];
+	if (times) {
+		int i;
+		tv = tmp;
+		for (i=0; i<2; i++) {
+			if (times[i].tv_nsec >= 1000000000ULL) {
+				if (NS_SPECIAL(times[i].tv_nsec))
+					return __syscall_ret(-ENOSYS);
+				return __syscall_ret(-EINVAL);
+			}
+			tmp[2*i+0] = times[i].tv_sec;
+			tmp[2*i+1] = times[i].tv_nsec / 1000;
+		}
+	}
+
+	r = __syscall(SYS_futimesat, fd, path, tv);
+	if (r != -ENOSYS || fd != AT_FDCWD) return __syscall_ret(r);
+	r = __syscall(SYS_utimes, path, tv);
+#endif
+	return __syscall_ret(r);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__fclose_ca.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__fclose_ca.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__fclose_ca.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__fclose_ca.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__fdopen.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__fdopen.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__fdopen.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__fdopen.c
index 8d6ce813e4..116e78e56d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__fdopen.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__fdopen.c
@@ -4,6 +4,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include "libc.h"
 
 FILE *__fdopen(int fd, const char *mode)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__fmodeflags.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__fmodeflags.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__fmodeflags.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__fmodeflags.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__fopen_rb_ca.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__fopen_rb_ca.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__fopen_rb_ca.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__fopen_rb_ca.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/__lockfile.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__lockfile.c
new file mode 100644
index 0000000000..0f60a14990
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__lockfile.c
@@ -0,0 +1,23 @@
+#include "stdio_impl.h"
+#include "pthread_impl.h"
+
+int __lockfile(FILE *f)
+{
+	int owner = f->lock, tid = __pthread_self()->tid;
+	if ((owner & ~MAYBE_WAITERS) == tid)
+		return 0;
+	owner = a_cas(&f->lock, 0, tid);
+	if (!owner) return 1;
+	while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) {
+		if ((owner & MAYBE_WAITERS) ||
+		    a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner)
+			__futexwait(&f->lock, owner|MAYBE_WAITERS, 1);
+	}
+	return 1;
+}
+
+void __unlockfile(FILE *f)
+{
+	if (a_swap(&f->lock, 0) & MAYBE_WAITERS)
+		__wake(&f->lock, 1, 1);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/__overflow.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__overflow.c
new file mode 100644
index 0000000000..e65a594dd7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__overflow.c
@@ -0,0 +1,10 @@
+#include "stdio_impl.h"
+
+int __overflow(FILE *f, int _c)
+{
+	unsigned char c = _c;
+	if (!f->wend && __towrite(f)) return EOF;
+	if (f->wpos != f->wend && c != f->lbf) return *f->wpos++ = c;
+	if (f->write(f, &c, 1)!=1) return EOF;
+	return c;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_close.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_close.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_close.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_close.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_exit.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_exit.c
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_exit.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_exit.c
index 191b4454a4..a5e42c675f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_exit.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_exit.c
@@ -9,8 +9,8 @@ static void close_file(FILE *f)
 {
 	if (!f) return;
 	FFINALLOCK(f);
-	if (f->wpos > f->wbase) f->write(f, 0, 0);
-	if (f->rpos < f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
+	if (f->wpos != f->wbase) f->write(f, 0, 0);
+	if (f->rpos != f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
 }
 
 void __stdio_exit(void)
@@ -19,6 +19,7 @@ void __stdio_exit(void)
 	for (f=*__ofl_lock(); f; f=f->next) close_file(f);
 	close_file(__stdin_used);
 	close_file(__stdout_used);
+	close_file(__stderr_used);
 }
 
 weak_alias(__stdio_exit, __stdio_exit_needed);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_read.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_read.c
new file mode 100644
index 0000000000..ea675da34a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_read.c
@@ -0,0 +1,24 @@
+#include "stdio_impl.h"
+#include <sys/uio.h>
+
+size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
+{
+	struct iovec iov[2] = {
+		{ .iov_base = buf, .iov_len = len - !!f->buf_size },
+		{ .iov_base = f->buf, .iov_len = f->buf_size }
+	};
+	ssize_t cnt;
+
+	cnt = iov[0].iov_len ? syscall(SYS_readv, f->fd, iov, 2)
+		: syscall(SYS_read, f->fd, iov[1].iov_base, iov[1].iov_len);
+	if (cnt <= 0) {
+		f->flags |= cnt ? F_ERR : F_EOF;
+		return 0;
+	}
+	if (cnt <= iov[0].iov_len) return cnt;
+	cnt -= iov[0].iov_len;
+	f->rpos = f->buf;
+	f->rend = f->buf + cnt;
+	if (f->buf_size) buf[len-1] = *f->rpos++;
+	return len;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_seek.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_seek.c
new file mode 100644
index 0000000000..326ab9bce4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_seek.c
@@ -0,0 +1,7 @@
+#include "stdio_impl.h"
+#include <unistd.h>
+
+off_t __stdio_seek(FILE *f, off_t off, int whence)
+{
+	return __lseek(f->fd, off, whence);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_write.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_write.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__stdio_write.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__stdio_write.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__stdout_write.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__stdout_write.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__stdout_write.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__stdout_write.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__string_read.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__string_read.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__string_read.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__string_read.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/__toread.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__toread.c
new file mode 100644
index 0000000000..f142ff09c0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__toread.c
@@ -0,0 +1,19 @@
+#include <stdio_impl.h>
+
+int __toread(FILE *f)
+{
+	f->mode |= f->mode-1;
+	if (f->wpos != f->wbase) f->write(f, 0, 0);
+	f->wpos = f->wbase = f->wend = 0;
+	if (f->flags & F_NORD) {
+		f->flags |= F_ERR;
+		return EOF;
+	}
+	f->rpos = f->rend = f->buf + f->buf_size;
+	return (f->flags & F_EOF) ? EOF : 0;
+}
+
+hidden void __toread_needs_stdio_exit()
+{
+	__stdio_exit_needed();
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__towrite.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__towrite.c
similarity index 78%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__towrite.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__towrite.c
index 0a69d926dc..4c9c66ae79 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/__towrite.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/__towrite.c
@@ -3,7 +3,7 @@
 int __towrite(FILE *f)
 {
 	f->mode |= f->mode-1;
-	if (f->flags & (F_NOWR)) {
+	if (f->flags & F_NOWR) {
 		f->flags |= F_ERR;
 		return EOF;
 	}
@@ -17,9 +17,7 @@ int __towrite(FILE *f)
 	return 0;
 }
 
-void __stdio_exit_needed(void);
-
-void __towrite_needs_stdio_exit()
+hidden void __towrite_needs_stdio_exit()
 {
 	__stdio_exit_needed();
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/__uflow.c b/src/components/lib/libc/musl-1.2.0/src/stdio/__uflow.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/__uflow.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/__uflow.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/asprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/asprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/asprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/asprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/clearerr.c b/src/components/lib/libc/musl-1.2.0/src/stdio/clearerr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/clearerr.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/clearerr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/dprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/dprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/dprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/dprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ext.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ext.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/ext.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/ext.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/ext2.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ext2.c
new file mode 100644
index 0000000000..3416278013
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/ext2.c
@@ -0,0 +1,24 @@
+#include "stdio_impl.h"
+#include <stdio_ext.h>
+
+size_t __freadahead(FILE *f)
+{
+	return f->rend ? f->rend - f->rpos : 0;
+}
+
+const char *__freadptr(FILE *f, size_t *sizep)
+{
+	if (f->rpos == f->rend) return 0;
+	*sizep = f->rend - f->rpos;
+	return (const char *)f->rpos;
+}
+
+void __freadptrinc(FILE *f, size_t inc)
+{
+	f->rpos += inc;
+}
+
+void __fseterr(FILE *f)
+{
+	f->flags |= F_ERR;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fclose.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fclose.c
new file mode 100644
index 0000000000..d594532bd6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fclose.c
@@ -0,0 +1,38 @@
+#include "stdio_impl.h"
+#include <stdlib.h>
+
+static void dummy(FILE *f) { }
+weak_alias(dummy, __unlist_locked_file);
+
+int fclose(FILE *f)
+{
+	int r;
+	
+	FLOCK(f);
+	r = fflush(f);
+	r |= f->close(f);
+	FUNLOCK(f);
+
+	/* Past this point, f is closed and any further explict access
+	 * to it is undefined. However, it still exists as an entry in
+	 * the open file list and possibly in the thread's locked files
+	 * list, if it was closed while explicitly locked. Functions
+	 * which process these lists must tolerate dead FILE objects
+	 * (which necessarily have inactive buffer pointers) without
+	 * producing any side effects. */
+
+	if (f->flags & F_PERM) return r;
+
+	__unlist_locked_file(f);
+
+	FILE **head = __ofl_lock();
+	if (f->prev) f->prev->next = f->next;
+	if (f->next) f->next->prev = f->prev;
+	if (*head == f) *head = f->next;
+	__ofl_unlock();
+
+	free(f->getln_buf);
+	free(f);
+
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/feof.c b/src/components/lib/libc/musl-1.2.0/src/stdio/feof.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/feof.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/feof.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ferror.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ferror.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/ferror.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/ferror.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fflush.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fflush.c
new file mode 100644
index 0000000000..b009437641
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fflush.c
@@ -0,0 +1,47 @@
+#include "stdio_impl.h"
+
+/* stdout.c will override this if linked */
+static FILE *volatile dummy = 0;
+weak_alias(dummy, __stdout_used);
+weak_alias(dummy, __stderr_used);
+
+int fflush(FILE *f)
+{
+	if (!f) {
+		int r = 0;
+		if (__stdout_used) r |= fflush(__stdout_used);
+		if (__stderr_used) r |= fflush(__stderr_used);
+
+		for (f=*__ofl_lock(); f; f=f->next) {
+			FLOCK(f);
+			if (f->wpos != f->wbase) r |= fflush(f);
+			FUNLOCK(f);
+		}
+		__ofl_unlock();
+
+		return r;
+	}
+
+	FLOCK(f);
+
+	/* If writing, flush output */
+	if (f->wpos != f->wbase) {
+		f->write(f, 0, 0);
+		if (!f->wpos) {
+			FUNLOCK(f);
+			return EOF;
+		}
+	}
+
+	/* If reading, sync position, per POSIX */
+	if (f->rpos != f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
+
+	/* Clear read and write modes */
+	f->wpos = f->wbase = f->wend = 0;
+	f->rpos = f->rend = 0;
+
+	FUNLOCK(f);
+	return 0;
+}
+
+weak_alias(fflush, fflush_unlocked);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fgetc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetc.c
new file mode 100644
index 0000000000..2578afccd2
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetc.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+#include "getc.h"
+
+int fgetc(FILE *f)
+{
+	return do_getc(f);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetln.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetln.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fgetln.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fgetln.c
index afe12b5dfe..5748435d9f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetln.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetln.c
@@ -8,7 +8,7 @@ char *fgetln(FILE *f, size_t *plen)
 	ssize_t l;
 	FLOCK(f);
 	ungetc(getc_unlocked(f), f);
-	if ((z=memchr(f->rpos, '\n', f->rend - f->rpos))) {
+	if (f->rend && (z=memchr(f->rpos, '\n', f->rend - f->rpos))) {
 		ret = (char *)f->rpos;
 		*plen = ++z - ret;
 		f->rpos = (void *)z;
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fgetpos.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetpos.c
new file mode 100644
index 0000000000..50813d2c50
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetpos.c
@@ -0,0 +1,11 @@
+#include "stdio_impl.h"
+
+int fgetpos(FILE *restrict f, fpos_t *restrict pos)
+{
+	off_t off = __ftello(f);
+	if (off < 0) return -1;
+	*(long long *)pos = off;
+	return 0;
+}
+
+weak_alias(fgetpos, fgetpos64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fgets.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fgets.c
new file mode 100644
index 0000000000..6171f398da
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fgets.c
@@ -0,0 +1,48 @@
+#include "stdio_impl.h"
+#include <string.h>
+
+#define MIN(a,b) ((a)<(b) ? (a) : (b))
+
+char *fgets(char *restrict s, int n, FILE *restrict f)
+{
+	char *p = s;
+	unsigned char *z;
+	size_t k;
+	int c;
+
+	FLOCK(f);
+
+	if (n--<=1) {
+		f->mode |= f->mode-1;
+		FUNLOCK(f);
+		if (n) return 0;
+		*s = 0;
+		return s;
+	}
+
+	while (n) {
+		if (f->rpos != f->rend) {
+			z = memchr(f->rpos, '\n', f->rend - f->rpos);
+			k = z ? z - f->rpos + 1 : f->rend - f->rpos;
+			k = MIN(k, n);
+			memcpy(p, f->rpos, k);
+			f->rpos += k;
+			p += k;
+			n -= k;
+			if (z || !n) break;
+		}
+		if ((c = getc_unlocked(f)) < 0) {
+			if (p==s || !feof(f)) s = 0;
+			break;
+		}
+		n--;
+		if ((*p++ = c) == '\n') break;
+	}
+	if (s) *p = 0;
+
+	FUNLOCK(f);
+
+	return s;
+}
+
+weak_alias(fgets, fgets_unlocked);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetwc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetwc.c
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fgetwc.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fgetwc.c
index e455cfec40..aa10b81856 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fgetwc.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetwc.c
@@ -5,35 +5,42 @@
 
 static wint_t __fgetwc_unlocked_internal(FILE *f)
 {
-	mbstate_t st = { 0 };
 	wchar_t wc;
 	int c;
-	unsigned char b;
 	size_t l;
 
 	/* Convert character from buffer if possible */
-	if (f->rpos < f->rend) {
-		l = mbrtowc(&wc, (void *)f->rpos, f->rend - f->rpos, &st);
-		if (l+2 >= 2) {
+	if (f->rpos != f->rend) {
+		l = mbtowc(&wc, (void *)f->rpos, f->rend - f->rpos);
+		if (l+1 >= 1) {
 			f->rpos += l + !l; /* l==0 means 1 byte, null */
 			return wc;
 		}
-		if (l == -1) {
-			f->rpos++;
-			return WEOF;
-		}
-	} else l = -2;
+	}
 
 	/* Convert character byte-by-byte */
-	while (l == -2) {
+	mbstate_t st = { 0 };
+	unsigned char b;
+	int first = 1;
+	do {
 		b = c = getc_unlocked(f);
 		if (c < 0) {
-			if (!mbsinit(&st)) errno = EILSEQ;
+			if (!first) {
+				f->flags |= F_ERR;
+				errno = EILSEQ;
+			}
 			return WEOF;
 		}
 		l = mbrtowc(&wc, (void *)&b, 1, &st);
-		if (l == -1) return WEOF;
-	}
+		if (l == -1) {
+			if (!first) {
+				f->flags |= F_ERR;
+				ungetc(b, f);
+			}
+			return WEOF;
+		}
+		first = 0;
+	} while (l == -2);
 
 	return wc;
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fgetws.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetws.c
new file mode 100644
index 0000000000..b08b30491a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fgetws.c
@@ -0,0 +1,33 @@
+#include "stdio_impl.h"
+#include <wchar.h>
+#include <errno.h>
+
+wint_t __fgetwc_unlocked(FILE *);
+
+wchar_t *fgetws(wchar_t *restrict s, int n, FILE *restrict f)
+{
+	wchar_t *p = s;
+
+	if (!n--) return s;
+
+	FLOCK(f);
+
+	/* Setup a dummy errno so we can detect EILSEQ. This is
+	 * the only way to catch encoding errors in the form of a
+	 * partial character just before EOF. */
+	errno = EAGAIN;
+	for (; n; n--) {
+		wint_t c = __fgetwc_unlocked(f);
+		if (c == WEOF) break;
+		*p++ = c;
+		if (c == '\n') break;
+	}
+	*p = 0;
+	if (ferror(f) || errno==EILSEQ) p = s;
+
+	FUNLOCK(f);
+
+	return (p == s) ? NULL : s;
+}
+
+weak_alias(fgetws, fgetws_unlocked);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fileno.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fileno.c
new file mode 100644
index 0000000000..0bd0e9889e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fileno.c
@@ -0,0 +1,16 @@
+#include "stdio_impl.h"
+#include <errno.h>
+
+int fileno(FILE *f)
+{
+	FLOCK(f);
+	int fd = f->fd;
+	FUNLOCK(f);
+	if (fd < 0) {
+		errno = EBADF;
+		return -1;
+	}
+	return fd;
+}
+
+weak_alias(fileno, fileno_unlocked);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/flockfile.c b/src/components/lib/libc/musl-1.2.0/src/stdio/flockfile.c
new file mode 100644
index 0000000000..8e2206514c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/flockfile.c
@@ -0,0 +1,9 @@
+#include "stdio_impl.h"
+#include "pthread_impl.h"
+
+void flockfile(FILE *f)
+{
+	if (!ftrylockfile(f)) return;
+	__lockfile(f);
+	__register_locked_file(f, __pthread_self());
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fmemopen.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fmemopen.c
new file mode 100644
index 0000000000..5685092e36
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fmemopen.c
@@ -0,0 +1,127 @@
+#include "stdio_impl.h"
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include "libc.h"
+
+struct cookie {
+	size_t pos, len, size;
+	unsigned char *buf;
+	int mode;
+};
+
+struct mem_FILE {
+	FILE f;
+	struct cookie c;
+	unsigned char buf[UNGET+BUFSIZ], buf2[];
+};
+
+static off_t mseek(FILE *f, off_t off, int whence)
+{
+	ssize_t base;
+	struct cookie *c = f->cookie;
+	if (whence>2U) {
+fail:
+		errno = EINVAL;
+		return -1;
+	}
+	base = (size_t [3]){0, c->pos, c->len}[whence];
+	if (off < -base || off > (ssize_t)c->size-base) goto fail;
+	return c->pos = base+off;
+}
+
+static size_t mread(FILE *f, unsigned char *buf, size_t len)
+{
+	struct cookie *c = f->cookie;
+	size_t rem = c->len - c->pos;
+	if (c->pos > c->len) rem = 0;
+	if (len > rem) {
+		len = rem;
+		f->flags |= F_EOF;
+	}
+	memcpy(buf, c->buf+c->pos, len);
+	c->pos += len;
+	rem -= len;
+	if (rem > f->buf_size) rem = f->buf_size;
+	f->rpos = f->buf;
+	f->rend = f->buf + rem;
+	memcpy(f->rpos, c->buf+c->pos, rem);
+	c->pos += rem;
+	return len;
+}
+
+static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
+{
+	struct cookie *c = f->cookie;
+	size_t rem;
+	size_t len2 = f->wpos - f->wbase;
+	if (len2) {
+		f->wpos = f->wbase;
+		if (mwrite(f, f->wpos, len2) < len2) return 0;
+	}
+	if (c->mode == 'a') c->pos = c->len;
+	rem = c->size - c->pos;
+	if (len > rem) len = rem;
+	memcpy(c->buf+c->pos, buf, len);
+	c->pos += len;
+	if (c->pos > c->len) {
+		c->len = c->pos;
+		if (c->len < c->size) c->buf[c->len] = 0;
+		else if ((f->flags&F_NORD) && c->size) c->buf[c->size-1] = 0;
+	}
+	return len;
+}
+
+static int mclose(FILE *m)
+{
+	return 0;
+}
+
+FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
+{
+	struct mem_FILE *f;
+	int plus = !!strchr(mode, '+');
+	
+	if (!strchr("rwa", *mode)) {
+		errno = EINVAL;
+		return 0;
+	}
+
+	if (!buf && size > PTRDIFF_MAX) {
+		errno = ENOMEM;
+		return 0;
+	}
+
+	f = malloc(sizeof *f + (buf?0:size));
+	if (!f) return 0;
+	memset(&f->f, 0, sizeof f->f);
+	f->f.cookie = &f->c;
+	f->f.fd = -1;
+	f->f.lbf = EOF;
+	f->f.buf = f->buf + UNGET;
+	f->f.buf_size = sizeof f->buf - UNGET;
+	if (!buf) {
+		buf = f->buf2;;
+		memset(buf, 0, size);
+	}
+
+	memset(&f->c, 0, sizeof f->c);
+	f->c.buf = buf;
+	f->c.size = size;
+	f->c.mode = *mode;
+	
+	if (!plus) f->f.flags = (*mode == 'r') ? F_NOWR : F_NORD;
+	if (*mode == 'r') f->c.len = size;
+	else if (*mode == 'a') f->c.len = f->c.pos = strnlen(buf, size);
+	else if (plus) *f->c.buf = 0;
+
+	f->f.read = mread;
+	f->f.write = mwrite;
+	f->f.seek = mseek;
+	f->f.close = mclose;
+
+	if (!libc.threaded) f->f.lock = -1;
+
+	return __ofl_add(&f->f);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fopen.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fopen.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fopen.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fopen.c
index 252f08241b..e1b91e12d8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fopen.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fopen.c
@@ -30,4 +30,4 @@ FILE *fopen(const char *restrict filename, const char *restrict mode)
 	return 0;
 }
 
-LFS64(fopen);
+weak_alias(fopen, fopen64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fopencookie.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fopencookie.c
new file mode 100644
index 0000000000..da042fe8ad
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fopencookie.c
@@ -0,0 +1,135 @@
+#define _GNU_SOURCE
+#include "stdio_impl.h"
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+
+struct fcookie {
+	void *cookie;
+	cookie_io_functions_t iofuncs;
+};
+
+struct cookie_FILE {
+	FILE f;
+	struct fcookie fc;
+	unsigned char buf[UNGET+BUFSIZ];
+};
+
+static size_t cookieread(FILE *f, unsigned char *buf, size_t len)
+{
+	struct fcookie *fc = f->cookie;
+	ssize_t ret = -1;
+	size_t remain = len, readlen = 0;
+	size_t len2 = len - !!f->buf_size;
+
+	if (!fc->iofuncs.read) goto bail;
+
+	if (len2) {
+		ret = fc->iofuncs.read(fc->cookie, (char *) buf, len2);
+		if (ret <= 0) goto bail;
+
+		readlen += ret;
+		remain -= ret;
+	}
+
+	if (!f->buf_size || remain > !!f->buf_size) return readlen;
+
+	f->rpos = f->buf;
+	ret = fc->iofuncs.read(fc->cookie, (char *) f->rpos, f->buf_size);
+	if (ret <= 0) goto bail;
+	f->rend = f->rpos + ret;
+
+	buf[readlen++] = *f->rpos++;
+
+	return readlen;
+
+bail:
+	f->flags |= ret == 0 ? F_EOF : F_ERR;
+	f->rpos = f->rend = f->buf;
+	return readlen;
+}
+
+static size_t cookiewrite(FILE *f, const unsigned char *buf, size_t len)
+{
+	struct fcookie *fc = f->cookie;
+	ssize_t ret;
+	size_t len2 = f->wpos - f->wbase;
+	if (!fc->iofuncs.write) return len;
+	if (len2) {
+		f->wpos = f->wbase;
+		if (cookiewrite(f, f->wpos, len2) < len2) return 0;
+	}
+	ret = fc->iofuncs.write(fc->cookie, (const char *) buf, len);
+	if (ret < 0) {
+		f->wpos = f->wbase = f->wend = 0;
+		f->flags |= F_ERR;
+		return 0;
+	}
+	return ret;
+}
+
+static off_t cookieseek(FILE *f, off_t off, int whence)
+{
+	struct fcookie *fc = f->cookie;
+	int res;
+	if (whence > 2U) {
+		errno = EINVAL;
+		return -1;
+	}
+	if (!fc->iofuncs.seek) {
+		errno = ENOTSUP;
+		return -1;
+	}
+	res = fc->iofuncs.seek(fc->cookie, &off, whence);
+	if (res < 0)
+		return res;
+	return off;
+}
+
+static int cookieclose(FILE *f)
+{
+	struct fcookie *fc = f->cookie;
+	if (fc->iofuncs.close) return fc->iofuncs.close(fc->cookie);
+	return 0;
+}
+
+FILE *fopencookie(void *cookie, const char *mode, cookie_io_functions_t iofuncs)
+{
+	struct cookie_FILE *f;
+
+	/* Check for valid initial mode character */
+	if (!strchr("rwa", *mode)) {
+		errno = EINVAL;
+		return 0;
+	}
+
+	/* Allocate FILE+fcookie+buffer or fail */
+	if (!(f=malloc(sizeof *f))) return 0;
+
+	/* Zero-fill only the struct, not the buffer */
+	memset(&f->f, 0, sizeof f->f);
+
+	/* Impose mode restrictions */
+	if (!strchr(mode, '+')) f->f.flags = (*mode == 'r') ? F_NOWR : F_NORD;
+
+	/* Set up our fcookie */
+	f->fc.cookie = cookie;
+	f->fc.iofuncs = iofuncs;
+
+	f->f.fd = -1;
+	f->f.cookie = &f->fc;
+	f->f.buf = f->buf + UNGET;
+	f->f.buf_size = sizeof f->buf - UNGET;
+	f->f.lbf = EOF;
+
+	/* Initialize op ptrs. No problem if some are unneeded. */
+	f->f.read = cookieread;
+	f->f.write = cookiewrite;
+	f->f.seek = cookieseek;
+	f->f.close = cookieclose;
+
+	/* Add new FILE to open file list */
+	return __ofl_add(&f->f);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fprintf.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fputc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fputc.c
new file mode 100644
index 0000000000..f364ed38ba
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fputc.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+#include "putc.h"
+
+int fputc(int c, FILE *f)
+{
+	return do_putc(c, f);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fputs.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fputs.c
new file mode 100644
index 0000000000..1cf344f28c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fputs.c
@@ -0,0 +1,10 @@
+#include "stdio_impl.h"
+#include <string.h>
+
+int fputs(const char *restrict s, FILE *restrict f)
+{
+	size_t l = strlen(s);
+	return (fwrite(s, 1, l, f)==l) - 1;
+}
+
+weak_alias(fputs, fputs_unlocked);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fputwc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fputwc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fputwc.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fputwc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fputws.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fputws.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fputws.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fputws.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fread.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fread.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fread.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fread.c
index 33a65f586e..a2116da613 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fread.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fread.c
@@ -7,12 +7,13 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f)
 {
 	unsigned char *dest = destv;
 	size_t len = size*nmemb, l = len, k;
+	if (!size) nmemb = 0;
 
 	FLOCK(f);
 
 	f->mode |= f->mode-1;
 
-	if (f->rend - f->rpos > 0) {
+	if (f->rpos != f->rend) {
 		/* First exhaust the buffer. */
 		k = MIN(f->rend - f->rpos, l);
 		memcpy(dest, f->rpos, k);
@@ -24,7 +25,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f)
 	/* Read the remainder directly */
 	for (; l; l-=k, dest+=k) {
 		k = __toread(f) ? 0 : f->read(f, dest, l);
-		if (k+1<=1) {
+		if (!k) {
 			FUNLOCK(f);
 			return (len-l)/size;
 		}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/freopen.c b/src/components/lib/libc/musl-1.2.0/src/stdio/freopen.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/freopen.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/freopen.c
index 6c1b575f52..615d4b47bd 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/freopen.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/freopen.c
@@ -1,5 +1,6 @@
 #include "stdio_impl.h"
 #include <fcntl.h>
+#include <unistd.h>
 
 /* The basic idea of this implementation is to open a new FILE,
  * hack the necessary parts of the new FILE into the old one, then
@@ -9,8 +10,6 @@
  * lock, via flockfile or otherwise, when freopen is called, and in that
  * case, freopen cannot act until the lock is released. */
 
-int __dup3(int, int, int);
-
 FILE *freopen(const char *restrict filename, const char *restrict mode, FILE *restrict f)
 {
 	int fl = __fmodeflags(mode);
@@ -51,4 +50,4 @@ FILE *freopen(const char *restrict filename, const char *restrict mode, FILE *re
 	return NULL;
 }
 
-LFS64(freopen);
+weak_alias(freopen, freopen64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fscanf.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fscanf.c
index acb8a106c4..f639e118b0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fscanf.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdarg.h>
-#include "libc.h"
 
 int fscanf(FILE *restrict f, const char *restrict fmt, ...)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fseek.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fseek.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fseek.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fseek.c
index b160b74edc..439308f757 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fseek.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fseek.c
@@ -3,10 +3,10 @@
 int __fseeko_unlocked(FILE *f, off_t off, int whence)
 {
 	/* Adjust relative offset for unread data in buffer, if any. */
-	if (whence == SEEK_CUR) off -= f->rend - f->rpos;
+	if (whence == SEEK_CUR && f->rend) off -= f->rend - f->rpos;
 
 	/* Flush write buffer, and report error on failure. */
-	if (f->wpos > f->wbase) {
+	if (f->wpos != f->wbase) {
 		f->write(f, 0, 0);
 		if (!f->wpos) return -1;
 	}
@@ -40,4 +40,4 @@ int fseek(FILE *f, long off, int whence)
 
 weak_alias(__fseeko, fseeko);
 
-LFS64(fseeko);
+weak_alias(fseeko, fseeko64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/fsetpos.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fsetpos.c
new file mode 100644
index 0000000000..77ab8d8206
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fsetpos.c
@@ -0,0 +1,8 @@
+#include "stdio_impl.h"
+
+int fsetpos(FILE *f, const fpos_t *pos)
+{
+	return __fseeko(f, *(const long long *)pos, SEEK_SET);
+}
+
+weak_alias(fsetpos, fsetpos64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/ftell.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ftell.c
new file mode 100644
index 0000000000..1a2afbbce3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/ftell.c
@@ -0,0 +1,41 @@
+#include "stdio_impl.h"
+#include <limits.h>
+#include <errno.h>
+
+off_t __ftello_unlocked(FILE *f)
+{
+	off_t pos = f->seek(f, 0,
+		(f->flags & F_APP) && f->wpos != f->wbase
+		? SEEK_END : SEEK_CUR);
+	if (pos < 0) return pos;
+
+	/* Adjust for data in buffer. */
+	if (f->rend)
+		pos += f->rpos - f->rend;
+	else if (f->wbase)
+		pos += f->wpos - f->wbase;
+	return pos;
+}
+
+off_t __ftello(FILE *f)
+{
+	off_t pos;
+	FLOCK(f);
+	pos = __ftello_unlocked(f);
+	FUNLOCK(f);
+	return pos;
+}
+
+long ftell(FILE *f)
+{
+	off_t pos = __ftello(f);
+	if (pos > LONG_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	return pos;
+}
+
+weak_alias(__ftello, ftello);
+
+weak_alias(ftello, ftello64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ftrylockfile.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ftrylockfile.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/ftrylockfile.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/ftrylockfile.c
index eb13c839bf..50650585be 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/ftrylockfile.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/ftrylockfile.c
@@ -18,23 +18,29 @@ void __unlist_locked_file(FILE *f)
 	}
 }
 
+void __register_locked_file(FILE *f, pthread_t self)
+{
+	f->lockcount = 1;
+	f->prev_locked = 0;
+	f->next_locked = self->stdio_locks;
+	if (f->next_locked) f->next_locked->prev_locked = f;
+	self->stdio_locks = f;
+}
+
 int ftrylockfile(FILE *f)
 {
 	pthread_t self = __pthread_self();
 	int tid = self->tid;
-	if (f->lock == tid) {
+	int owner = f->lock;
+	if ((owner & ~MAYBE_WAITERS) == tid) {
 		if (f->lockcount == LONG_MAX)
 			return -1;
 		f->lockcount++;
 		return 0;
 	}
-	if (f->lock < 0) f->lock = 0;
-	if (f->lock || a_cas(&f->lock, 0, tid))
+	if (owner < 0) f->lock = owner = 0;
+	if (owner || a_cas(&f->lock, 0, tid))
 		return -1;
-	f->lockcount = 1;
-	f->prev_locked = 0;
-	f->next_locked = self->stdio_locks;
-	if (f->next_locked) f->next_locked->prev_locked = f;
-	self->stdio_locks = f;
+	__register_locked_file(f, self);
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/funlockfile.c b/src/components/lib/libc/musl-1.2.0/src/stdio/funlockfile.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/funlockfile.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/funlockfile.c
index 30a07ef4b3..44d8b0df5c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/funlockfile.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/funlockfile.c
@@ -1,8 +1,6 @@
 #include "stdio_impl.h"
 #include "pthread_impl.h"
 
-void __unlist_locked_file(FILE *);
-
 void funlockfile(FILE *f)
 {
 	if (f->lockcount == 1) {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fwide.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fwide.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fwide.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fwide.c
index 8410b15307..8bab634ae0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fwide.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fwide.c
@@ -1,3 +1,4 @@
+#include <wchar.h>
 #include "stdio_impl.h"
 #include "locale_impl.h"
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fwprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fwprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fwprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fwprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fwrite.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fwrite.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fwrite.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fwrite.c
index 81ec271e1b..7a567b2c55 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fwrite.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fwrite.c
@@ -13,8 +13,8 @@ size_t __fwritex(const unsigned char *restrict s, size_t l, FILE *restrict f)
 		/* Match /^(.*\n|)/ */
 		for (i=l; i && s[i-1] != '\n'; i--);
 		if (i) {
-			if (f->write(f, s, i) < i)
-				return i;
+			size_t n = f->write(f, s, i);
+			if (n < i) return n;
 			s += i;
 			l -= i;
 		}
@@ -28,6 +28,7 @@ size_t __fwritex(const unsigned char *restrict s, size_t l, FILE *restrict f)
 size_t fwrite(const void *restrict src, size_t size, size_t nmemb, FILE *restrict f)
 {
 	size_t k, l = size*nmemb;
+	if (!size) nmemb = 0;
 	FLOCK(f);
 	k = __fwritex(src, l, f);
 	FUNLOCK(f);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/fwscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/fwscanf.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/fwscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/fwscanf.c
index cb114b39f4..530bb7c7ea 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/fwscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/fwscanf.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <wchar.h>
-#include "libc.h"
 
 int fwscanf(FILE *restrict f, const wchar_t *restrict fmt, ...)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/getc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getc.c
new file mode 100644
index 0000000000..8409fc2343
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/getc.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "getc.h"
+
+int getc(FILE *f)
+{
+	return do_getc(f);
+}
+
+weak_alias(getc, _IO_getc);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/getc.h b/src/components/lib/libc/musl-1.2.0/src/stdio/getc.h
new file mode 100644
index 0000000000..e24f9905c1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/getc.h
@@ -0,0 +1,22 @@
+#include "stdio_impl.h"
+#include "pthread_impl.h"
+
+#ifdef __GNUC__
+__attribute__((__noinline__))
+#endif
+static int locking_getc(FILE *f)
+{
+	if (a_cas(&f->lock, 0, MAYBE_WAITERS-1)) __lockfile(f);
+	int c = getc_unlocked(f);
+	if (a_swap(&f->lock, 0) & MAYBE_WAITERS)
+		__wake(&f->lock, 1, 1);
+	return c;
+}
+
+static inline int do_getc(FILE *f)
+{
+	int l = f->lock;
+	if (l < 0 || l && (l & ~MAYBE_WAITERS) == __pthread_self()->tid)
+		return getc_unlocked(f);
+	return locking_getc(f);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getc_unlocked.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getc_unlocked.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/getc_unlocked.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/getc_unlocked.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/getchar.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getchar.c
new file mode 100644
index 0000000000..df395ca954
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/getchar.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+#include "getc.h"
+
+int getchar(void)
+{
+	return do_getc(stdin);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getchar_unlocked.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getchar_unlocked.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/getchar_unlocked.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/getchar_unlocked.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/getdelim.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getdelim.c
new file mode 100644
index 0000000000..d2f5b15ab1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/getdelim.c
@@ -0,0 +1,81 @@
+#include "stdio_impl.h"
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <errno.h>
+
+ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restrict f)
+{
+	char *tmp;
+	unsigned char *z;
+	size_t k;
+	size_t i=0;
+	int c;
+
+	FLOCK(f);
+
+	if (!n || !s) {
+		f->mode |= f->mode-1;
+		f->flags |= F_ERR;
+		FUNLOCK(f);
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (!*s) *n=0;
+
+	for (;;) {
+		if (f->rpos != f->rend) {
+			z = memchr(f->rpos, delim, f->rend - f->rpos);
+			k = z ? z - f->rpos + 1 : f->rend - f->rpos;
+		} else {
+			z = 0;
+			k = 0;
+		}
+		if (i+k >= *n) {
+			size_t m = i+k+2;
+			if (!z && m < SIZE_MAX/4) m += m/2;
+			tmp = realloc(*s, m);
+			if (!tmp) {
+				m = i+k+2;
+				tmp = realloc(*s, m);
+				if (!tmp) {
+					/* Copy as much as fits and ensure no
+					 * pushback remains in the FILE buf. */
+					k = *n-i;
+					memcpy(*s+i, f->rpos, k);
+					f->rpos += k;
+					f->mode |= f->mode-1;
+					f->flags |= F_ERR;
+					FUNLOCK(f);
+					errno = ENOMEM;
+					return -1;
+				}
+			}
+			*s = tmp;
+			*n = m;
+		}
+		memcpy(*s+i, f->rpos, k);
+		f->rpos += k;
+		i += k;
+		if (z) break;
+		if ((c = getc_unlocked(f)) == EOF) {
+			if (!i || !feof(f)) {
+				FUNLOCK(f);
+				return -1;
+			}
+			break;
+		}
+		/* If the byte read by getc won't fit without growing the
+		 * output buffer, push it back for next iteration. */
+		if (i+1 >= *n) *--f->rpos = c;
+		else if (((*s)[i++] = c) == delim) break;
+	}
+	(*s)[i] = 0;
+
+	FUNLOCK(f);
+
+	return i;
+}
+
+weak_alias(getdelim, __getdelim);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getline.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getline.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/getline.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/getline.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/gets.c b/src/components/lib/libc/musl-1.2.0/src/stdio/gets.c
new file mode 100644
index 0000000000..17963b93e3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/gets.c
@@ -0,0 +1,15 @@
+#include "stdio_impl.h"
+#include <limits.h>
+#include <string.h>
+
+char *gets(char *s)
+{
+	size_t i=0;
+	int c;
+	FLOCK(stdin);
+	while ((c=getc_unlocked(stdin)) != EOF && c != '\n') s[i++] = c;
+	s[i] = 0;
+	if (c != '\n' && (!feof(stdin) || !i)) s = 0;
+	FUNLOCK(stdin);
+	return s;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getw.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getw.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/getw.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/getw.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getwc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getwc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/getwc.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/getwc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/getwchar.c b/src/components/lib/libc/musl-1.2.0/src/stdio/getwchar.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/getwchar.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/getwchar.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ofl.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ofl.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/ofl.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/ofl.c
index b143999c27..f2d3215a9e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/ofl.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/ofl.c
@@ -1,8 +1,8 @@
 #include "stdio_impl.h"
-#include "libc.h"
+#include "lock.h"
 
 static FILE *ofl_head;
-static volatile int ofl_lock[2];
+static volatile int ofl_lock[1];
 
 FILE **__ofl_lock()
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ofl_add.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ofl_add.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/ofl_add.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/ofl_add.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/open_memstream.c b/src/components/lib/libc/musl-1.2.0/src/stdio/open_memstream.c
new file mode 100644
index 0000000000..600d27705b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/open_memstream.c
@@ -0,0 +1,99 @@
+#include "stdio_impl.h"
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include "libc.h"
+
+struct cookie {
+	char **bufp;
+	size_t *sizep;
+	size_t pos;
+	char *buf;
+	size_t len;
+	size_t space;
+};
+
+struct ms_FILE {
+	FILE f;
+	struct cookie c;
+	unsigned char buf[BUFSIZ];
+};
+
+static off_t ms_seek(FILE *f, off_t off, int whence)
+{
+	ssize_t base;
+	struct cookie *c = f->cookie;
+	if (whence>2U) {
+fail:
+		errno = EINVAL;
+		return -1;
+	}
+	base = (size_t [3]){0, c->pos, c->len}[whence];
+	if (off < -base || off > SSIZE_MAX-base) goto fail;
+	return c->pos = base+off;
+}
+
+static size_t ms_write(FILE *f, const unsigned char *buf, size_t len)
+{
+	struct cookie *c = f->cookie;
+	size_t len2 = f->wpos - f->wbase;
+	char *newbuf;
+	if (len2) {
+		f->wpos = f->wbase;
+		if (ms_write(f, f->wbase, len2) < len2) return 0;
+	}
+	if (len + c->pos >= c->space) {
+		len2 = 2*c->space+1 | c->pos+len+1;
+		newbuf = realloc(c->buf, len2);
+		if (!newbuf) return 0;
+		*c->bufp = c->buf = newbuf;
+		memset(c->buf + c->space, 0, len2 - c->space);
+		c->space = len2;
+	}
+	memcpy(c->buf+c->pos, buf, len);
+	c->pos += len;
+	if (c->pos >= c->len) c->len = c->pos;
+	*c->sizep = c->pos;
+	return len;
+}
+
+static int ms_close(FILE *f)
+{
+	return 0;
+}
+
+FILE *open_memstream(char **bufp, size_t *sizep)
+{
+	struct ms_FILE *f;
+	char *buf;
+
+	if (!(f=malloc(sizeof *f))) return 0;
+	if (!(buf=malloc(sizeof *buf))) {
+		free(f);
+		return 0;
+	}
+	memset(&f->f, 0, sizeof f->f);
+	memset(&f->c, 0, sizeof f->c);
+	f->f.cookie = &f->c;
+
+	f->c.bufp = bufp;
+	f->c.sizep = sizep;
+	f->c.pos = f->c.len = f->c.space = *sizep = 0;
+	f->c.buf = *bufp = buf;
+	*buf = 0;
+
+	f->f.flags = F_NORD;
+	f->f.fd = -1;
+	f->f.buf = f->buf;
+	f->f.buf_size = sizeof f->buf;
+	f->f.lbf = EOF;
+	f->f.write = ms_write;
+	f->f.seek = ms_seek;
+	f->f.close = ms_close;
+	f->f.mode = -1;
+
+	if (!libc.threaded) f->f.lock = -1;
+
+	return __ofl_add(&f->f);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/open_wmemstream.c b/src/components/lib/libc/musl-1.2.0/src/stdio/open_wmemstream.c
new file mode 100644
index 0000000000..ed1b561d9c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/open_wmemstream.c
@@ -0,0 +1,102 @@
+#include "stdio_impl.h"
+#include <wchar.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include "libc.h"
+
+struct cookie {
+	wchar_t **bufp;
+	size_t *sizep;
+	size_t pos;
+	wchar_t *buf;
+	size_t len;
+	size_t space;
+	mbstate_t mbs;
+};
+
+struct wms_FILE {
+	FILE f;
+	struct cookie c;
+	unsigned char buf[1];
+};
+
+static off_t wms_seek(FILE *f, off_t off, int whence)
+{
+	ssize_t base;
+	struct cookie *c = f->cookie;
+	if (whence>2U) {
+fail:
+		errno = EINVAL;
+		return -1;
+	}
+	base = (size_t [3]){0, c->pos, c->len}[whence];
+	if (off < -base || off > SSIZE_MAX/4-base) goto fail;
+	memset(&c->mbs, 0, sizeof c->mbs);
+	return c->pos = base+off;
+}
+
+static size_t wms_write(FILE *f, const unsigned char *buf, size_t len)
+{
+	struct cookie *c = f->cookie;
+	size_t len2;
+	wchar_t *newbuf;
+	if (len + c->pos >= c->space) {
+		len2 = 2*c->space+1 | c->pos+len+1;
+		if (len2 > SSIZE_MAX/4) return 0;
+		newbuf = realloc(c->buf, len2*4);
+		if (!newbuf) return 0;
+		*c->bufp = c->buf = newbuf;
+		memset(c->buf + c->space, 0, 4*(len2 - c->space));
+		c->space = len2;
+	}
+	
+	len2 = mbsnrtowcs(c->buf+c->pos, (void *)&buf, len, c->space-c->pos, &c->mbs);
+	if (len2 == -1) return 0;
+	c->pos += len2;
+	if (c->pos >= c->len) c->len = c->pos;
+	*c->sizep = c->pos;
+	return len;
+}
+
+static int wms_close(FILE *f)
+{
+	return 0;
+}
+
+FILE *open_wmemstream(wchar_t **bufp, size_t *sizep)
+{
+	struct wms_FILE *f;
+	wchar_t *buf;
+
+	if (!(f=malloc(sizeof *f))) return 0;
+	if (!(buf=malloc(sizeof *buf))) {
+		free(f);
+		return 0;
+	}
+	memset(&f->f, 0, sizeof f->f);
+	memset(&f->c, 0, sizeof f->c);
+	f->f.cookie = &f->c;
+
+	f->c.bufp = bufp;
+	f->c.sizep = sizep;
+	f->c.pos = f->c.len = f->c.space = *sizep = 0;
+	f->c.buf = *bufp = buf;
+	*buf = 0;
+
+	f->f.flags = F_NORD;
+	f->f.fd = -1;
+	f->f.buf = f->buf;
+	f->f.buf_size = 0;
+	f->f.lbf = EOF;
+	f->f.write = wms_write;
+	f->f.seek = wms_seek;
+	f->f.close = wms_close;
+
+	if (!libc.threaded) f->f.lock = -1;
+
+	fwide(&f->f, 1);
+
+	return __ofl_add(&f->f);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/pclose.c b/src/components/lib/libc/musl-1.2.0/src/stdio/pclose.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/pclose.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/pclose.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/perror.c b/src/components/lib/libc/musl-1.2.0/src/stdio/perror.c
new file mode 100644
index 0000000000..d0943f26a9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/perror.c
@@ -0,0 +1,30 @@
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include "stdio_impl.h"
+
+void perror(const char *msg)
+{
+	FILE *f = stderr;
+	char *errstr = strerror(errno);
+
+	FLOCK(f);
+
+	/* Save stderr's orientation and encoding rule, since perror is not
+	 * permitted to change them. */
+	void *old_locale = f->locale;
+	int old_mode = f->mode;
+	
+	if (msg && *msg) {
+		fwrite(msg, strlen(msg), 1, f);
+		fputc(':', f);
+		fputc(' ', f);
+	}
+	fwrite(errstr, strlen(errstr), 1, f);
+	fputc('\n', f);
+
+	f->mode = old_mode;
+	f->locale = old_locale;
+
+	FUNLOCK(f);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/popen.c b/src/components/lib/libc/musl-1.2.0/src/stdio/popen.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/popen.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/popen.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/printf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/printf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/printf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/printf.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/putc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/putc.c
new file mode 100644
index 0000000000..4744d97872
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/putc.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "putc.h"
+
+int putc(int c, FILE *f)
+{
+	return do_putc(c, f);
+}
+
+weak_alias(putc, _IO_putc);
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/putc.h b/src/components/lib/libc/musl-1.2.0/src/stdio/putc.h
new file mode 100644
index 0000000000..2014c4ec4a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/putc.h
@@ -0,0 +1,22 @@
+#include "stdio_impl.h"
+#include "pthread_impl.h"
+
+#ifdef __GNUC__
+__attribute__((__noinline__))
+#endif
+static int locking_putc(int c, FILE *f)
+{
+	if (a_cas(&f->lock, 0, MAYBE_WAITERS-1)) __lockfile(f);
+	c = putc_unlocked(c, f);
+	if (a_swap(&f->lock, 0) & MAYBE_WAITERS)
+		__wake(&f->lock, 1, 1);
+	return c;
+}
+
+static inline int do_putc(int c, FILE *f)
+{
+	int l = f->lock;
+	if (l < 0 || l && (l & ~MAYBE_WAITERS) == __pthread_self()->tid)
+		return putc_unlocked(c, f);
+	return locking_putc(c, f);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/putc_unlocked.c b/src/components/lib/libc/musl-1.2.0/src/stdio/putc_unlocked.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/putc_unlocked.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/putc_unlocked.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/putchar.c b/src/components/lib/libc/musl-1.2.0/src/stdio/putchar.c
new file mode 100644
index 0000000000..f044f16973
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/putchar.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+#include "putc.h"
+
+int putchar(int c)
+{
+	return do_putc(c, stdout);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/putchar_unlocked.c b/src/components/lib/libc/musl-1.2.0/src/stdio/putchar_unlocked.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/putchar_unlocked.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/putchar_unlocked.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/puts.c b/src/components/lib/libc/musl-1.2.0/src/stdio/puts.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/puts.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/puts.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/putw.c b/src/components/lib/libc/musl-1.2.0/src/stdio/putw.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/putw.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/putw.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/putwc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/putwc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/putwc.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/putwc.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/putwchar.c b/src/components/lib/libc/musl-1.2.0/src/stdio/putwchar.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/putwchar.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/putwchar.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/remove.c b/src/components/lib/libc/musl-1.2.0/src/stdio/remove.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/remove.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/remove.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/rename.c b/src/components/lib/libc/musl-1.2.0/src/stdio/rename.c
new file mode 100644
index 0000000000..f540adb6cd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/rename.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <fcntl.h>
+#include "syscall.h"
+
+int rename(const char *old, const char *new)
+{
+#if defined(SYS_rename)
+	return syscall(SYS_rename, old, new);
+#elif defined(SYS_renameat)
+	return syscall(SYS_renameat, AT_FDCWD, old, AT_FDCWD, new);
+#else
+	return syscall(SYS_renameat2, AT_FDCWD, old, AT_FDCWD, new, 0);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/rewind.c b/src/components/lib/libc/musl-1.2.0/src/stdio/rewind.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/rewind.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/rewind.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/scanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/scanf.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/scanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/scanf.c
index a740056cc9..bd77699cab 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/scanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/scanf.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdarg.h>
-#include "libc.h"
 
 int scanf(const char *restrict fmt, ...)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/setbuf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/setbuf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/setbuf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/setbuf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/setbuffer.c b/src/components/lib/libc/musl-1.2.0/src/stdio/setbuffer.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/setbuffer.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/setbuffer.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/setlinebuf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/setlinebuf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/setlinebuf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/setlinebuf.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/setvbuf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/setvbuf.c
new file mode 100644
index 0000000000..523dddc8ba
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/setvbuf.c
@@ -0,0 +1,29 @@
+#include "stdio_impl.h"
+
+/* The behavior of this function is undefined except when it is the first
+ * operation on the stream, so the presence or absence of locking is not
+ * observable in a program whose behavior is defined. Thus no locking is
+ * performed here. No allocation of buffers is performed, but a buffer
+ * provided by the caller is used as long as it is suitably sized. */
+
+int setvbuf(FILE *restrict f, char *restrict buf, int type, size_t size)
+{
+	f->lbf = EOF;
+
+	if (type == _IONBF) {
+		f->buf_size = 0;
+	} else if (type == _IOLBF || type == _IOFBF) {
+		if (buf && size >= UNGET) {
+			f->buf = (void *)(buf + UNGET);
+			f->buf_size = size - UNGET;
+		}
+		if (type == _IOLBF && f->buf_size)
+			f->lbf = '\n';
+	} else {
+		return -1;
+	}
+
+	f->flags |= F_SVB;
+
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/snprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/snprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/snprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/snprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/sprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/sprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/sprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/sprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/sscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/sscanf.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/sscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/sscanf.c
index 8a2302ff67..f2ac2f5da8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/sscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/sscanf.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdarg.h>
-#include "libc.h"
 
 int sscanf(const char *restrict s, const char *restrict fmt, ...)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/stderr.c b/src/components/lib/libc/musl-1.2.0/src/stdio/stderr.c
new file mode 100644
index 0000000000..f2bc4648d6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/stderr.c
@@ -0,0 +1,18 @@
+#include "stdio_impl.h"
+
+#undef stderr
+
+static unsigned char buf[UNGET];
+hidden FILE __stderr_FILE = {
+	.buf = buf+UNGET,
+	.buf_size = 0,
+	.fd = 2,
+	.flags = F_PERM | F_NORD,
+	.lbf = -1,
+	.write = __stdio_write,
+	.seek = __stdio_seek,
+	.close = __stdio_close,
+	.lock = -1,
+};
+FILE *const stderr = &__stderr_FILE;
+FILE *volatile __stderr_used = &__stderr_FILE;
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/stdin.c b/src/components/lib/libc/musl-1.2.0/src/stdio/stdin.c
new file mode 100644
index 0000000000..5aa5262c2a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/stdin.c
@@ -0,0 +1,17 @@
+#include "stdio_impl.h"
+
+#undef stdin
+
+static unsigned char buf[BUFSIZ+UNGET];
+hidden FILE __stdin_FILE = {
+	.buf = buf+UNGET,
+	.buf_size = sizeof buf-UNGET,
+	.fd = 0,
+	.flags = F_PERM | F_NOWR,
+	.read = __stdio_read,
+	.seek = __stdio_seek,
+	.close = __stdio_close,
+	.lock = -1,
+};
+FILE *const stdin = &__stdin_FILE;
+FILE *volatile __stdin_used = &__stdin_FILE;
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/stdout.c b/src/components/lib/libc/musl-1.2.0/src/stdio/stdout.c
new file mode 100644
index 0000000000..4985a417bd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/stdout.c
@@ -0,0 +1,18 @@
+#include "stdio_impl.h"
+
+#undef stdout
+
+static unsigned char buf[BUFSIZ+UNGET];
+hidden FILE __stdout_FILE = {
+	.buf = buf+UNGET,
+	.buf_size = sizeof buf-UNGET,
+	.fd = 1,
+	.flags = F_PERM | F_NORD,
+	.lbf = '\n',
+	.write = __stdout_write,
+	.seek = __stdio_seek,
+	.close = __stdio_close,
+	.lock = -1,
+};
+FILE *const stdout = &__stdout_FILE;
+FILE *volatile __stdout_used = &__stdout_FILE;
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/swprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/swprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/swprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/swprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/swscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/swscanf.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/swscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/swscanf.c
index d893fbacf1..03d572da1c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/swscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/swscanf.c
@@ -1,6 +1,5 @@
 #include <stdarg.h>
 #include <wchar.h>
-#include "libc.h"
 
 int swscanf(const wchar_t *restrict s, const wchar_t *restrict fmt, ...)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/tempnam.c b/src/components/lib/libc/musl-1.2.0/src/stdio/tempnam.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/tempnam.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/tempnam.c
index 5a5597527c..565df6b656 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/tempnam.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/tempnam.c
@@ -4,12 +4,12 @@
 #include <sys/stat.h>
 #include <limits.h>
 #include <string.h>
+#include <stdlib.h>
 #include "syscall.h"
+#include "kstat.h"
 
 #define MAXTRIES 100
 
-char *__randname(char *);
-
 char *tempnam(const char *dir, const char *pfx)
 {
 	char s[PATH_MAX];
@@ -38,10 +38,10 @@ char *tempnam(const char *dir, const char *pfx)
 	for (try=0; try<MAXTRIES; try++) {
 		__randname(s+l-6);
 #ifdef SYS_lstat
-		r = __syscall(SYS_lstat, s, &(struct stat){0});
+		r = __syscall(SYS_lstat, s, &(struct kstat){0});
 #else
 		r = __syscall(SYS_fstatat, AT_FDCWD, s,
-			&(struct stat){0}, AT_SYMLINK_NOFOLLOW);
+			&(struct kstat){0}, AT_SYMLINK_NOFOLLOW);
 #endif
 		if (r == -ENOENT) return strdup(s);
 	}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/tmpfile.c b/src/components/lib/libc/musl-1.2.0/src/stdio/tmpfile.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/tmpfile.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/tmpfile.c
index 525090aa06..ae493987b8 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/tmpfile.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/tmpfile.c
@@ -1,11 +1,10 @@
 #include <stdio.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #include "stdio_impl.h"
 
 #define MAXTRIES 100
 
-char *__randname(char *);
-
 FILE *tmpfile(void)
 {
 	char s[] = "/tmp/tmpfile_XXXXXX";
@@ -29,4 +28,4 @@ FILE *tmpfile(void)
 	return 0;
 }
 
-LFS64(tmpfile);
+weak_alias(tmpfile, tmpfile64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/tmpnam.c b/src/components/lib/libc/musl-1.2.0/src/stdio/tmpnam.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/tmpnam.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/tmpnam.c
index 449eb9b070..d667a83686 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/tmpnam.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/tmpnam.c
@@ -3,12 +3,12 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <stdlib.h>
 #include "syscall.h"
+#include "kstat.h"
 
 #define MAXTRIES 100
 
-char *__randname(char *);
-
 char *tmpnam(char *buf)
 {
 	static char internal[L_tmpnam];
@@ -18,10 +18,10 @@ char *tmpnam(char *buf)
 	for (try=0; try<MAXTRIES; try++) {
 		__randname(s+12);
 #ifdef SYS_lstat
-		r = __syscall(SYS_lstat, s, &(struct stat){0});
+		r = __syscall(SYS_lstat, s, &(struct kstat){0});
 #else
 		r = __syscall(SYS_fstatat, AT_FDCWD, s,
-			&(struct stat){0}, AT_SYMLINK_NOFOLLOW);
+			&(struct kstat){0}, AT_SYMLINK_NOFOLLOW);
 #endif
 		if (r == -ENOENT) return strcpy(buf ? buf : internal, s);
 	}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ungetc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ungetc.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/ungetc.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/ungetc.c
index 180673a476..bc629d4ca5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/ungetc.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/ungetc.c
@@ -16,5 +16,5 @@ int ungetc(int c, FILE *f)
 	f->flags &= ~F_EOF;
 
 	FUNLOCK(f);
-	return c;
+	return (unsigned char)c;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/ungetwc.c b/src/components/lib/libc/musl-1.2.0/src/stdio/ungetwc.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/ungetwc.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/ungetwc.c
index 80d6e203d0..9edf366f90 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/ungetwc.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/ungetwc.c
@@ -8,7 +8,7 @@
 wint_t ungetwc(wint_t c, FILE *f)
 {
 	unsigned char mbc[MB_LEN_MAX];
-	int l=1;
+	int l;
 	locale_t *ploc = &CURRENT_LOCALE, loc = *ploc;
 
 	FLOCK(f);
@@ -17,8 +17,8 @@ wint_t ungetwc(wint_t c, FILE *f)
 	*ploc = f->locale;
 
 	if (!f->rpos) __toread(f);
-	if (!f->rpos || f->rpos < f->buf - UNGET + l || c == WEOF ||
-	    (!isascii(c) && (l = wctomb((void *)mbc, c)) < 0)) {
+	if (!f->rpos || c == WEOF || (l = wcrtomb((void *)mbc, c, 0)) < 0 ||
+	    f->rpos < f->buf - UNGET + l) {
 		FUNLOCK(f);
 		*ploc = loc;
 		return WEOF;
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vasprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vasprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vasprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vasprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vdprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vdprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vdprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vdprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vfprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vfprintf.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vfprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vfprintf.c
index 2ecf76925c..9b961e7f7f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vfprintf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vfprintf.c
@@ -4,6 +4,8 @@
 #include <limits.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
 #include <wchar.h>
 #include <inttypes.h>
 #include <math.h>
@@ -26,14 +28,6 @@
 
 #define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS|GROUPED)
 
-#if UINT_MAX == ULONG_MAX
-#define LONG_IS_INT
-#endif
-
-#if SIZE_MAX != ULONG_MAX || UINTMAX_MAX != ULLONG_MAX
-#define ODD_TYPES
-#endif
-
 /* State machine to accept length modifiers + conversion specifiers.
  * Result is 0 on failure, or an argument type to pop on success. */
 
@@ -42,23 +36,9 @@ enum {
 	ZTPRE, JPRE,
 	STOP,
 	PTR, INT, UINT, ULLONG,
-#ifndef LONG_IS_INT
 	LONG, ULONG,
-#else
-#define LONG INT
-#define ULONG UINT
-#endif
 	SHORT, USHORT, CHAR, UCHAR,
-#ifdef ODD_TYPES
 	LLONG, SIZET, IMAX, UMAX, PDIFF, UIPTR,
-#else
-#define LLONG ULLONG
-#define SIZET ULONG
-#define IMAX LLONG
-#define UMAX ULLONG
-#define PDIFF LONG
-#define UIPTR ULONG
-#endif
 	DBL, LDBL,
 	NOARG,
 	MAXSTATE
@@ -128,29 +108,23 @@ union arg
 
 static void pop_arg(union arg *arg, int type, va_list *ap)
 {
-	/* Give the compiler a hint for optimizing the switch. */
-	if ((unsigned)type > MAXSTATE) return;
 	switch (type) {
 	       case PTR:	arg->p = va_arg(*ap, void *);
 	break; case INT:	arg->i = va_arg(*ap, int);
 	break; case UINT:	arg->i = va_arg(*ap, unsigned int);
-#ifndef LONG_IS_INT
 	break; case LONG:	arg->i = va_arg(*ap, long);
 	break; case ULONG:	arg->i = va_arg(*ap, unsigned long);
-#endif
 	break; case ULLONG:	arg->i = va_arg(*ap, unsigned long long);
 	break; case SHORT:	arg->i = (short)va_arg(*ap, int);
 	break; case USHORT:	arg->i = (unsigned short)va_arg(*ap, int);
 	break; case CHAR:	arg->i = (signed char)va_arg(*ap, int);
 	break; case UCHAR:	arg->i = (unsigned char)va_arg(*ap, int);
-#ifdef ODD_TYPES
 	break; case LLONG:	arg->i = va_arg(*ap, long long);
 	break; case SIZET:	arg->i = va_arg(*ap, size_t);
 	break; case IMAX:	arg->i = va_arg(*ap, intmax_t);
 	break; case UMAX:	arg->i = va_arg(*ap, uintmax_t);
 	break; case PDIFF:	arg->i = va_arg(*ap, ptrdiff_t);
 	break; case UIPTR:	arg->i = (uintptr_t)va_arg(*ap, void *);
-#endif
 	break; case DBL:	arg->f = va_arg(*ap, double);
 	break; case LDBL:	arg->f = va_arg(*ap, long double);
 	}
@@ -247,6 +221,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
 		else re=LDBL_MANT_DIG/4-1-p;
 
 		if (re) {
+			round *= 1<<(LDBL_MANT_DIG%4);
 			while (re--) round*=16;
 			if (*prefix=='-') {
 				y=-y;
@@ -272,6 +247,8 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
 			if (s-buf==1 && (y||p>0||(fl&ALT_FORM))) *s++='.';
 		} while (y);
 
+		if (p > INT_MAX-2-(ebuf-estr)-pl)
+			return -1;
 		if (p && s-buf-2 < p)
 			l = (p+2) + (ebuf-estr);
 		else
@@ -312,7 +289,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
 	}
 	while (e2<0) {
 		uint32_t carry=0, *b;
-		int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3+8)/9;
+		int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3U+8)/9;
 		for (d=a; d<z; d++) {
 			uint32_t rm = *d & (1<<sh)-1;
 			*d = (*d>>sh) + carry;
@@ -343,7 +320,8 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
 		if (x || d+1!=z) {
 			long double round = 2/LDBL_EPSILON;
 			long double small;
-			if (*d/i & 1) round += 2;
+			if ((*d/i & 1) || (i==1000000000 && d>a && (d[-1]&1)))
+				round += 2;
 			if (x<i/2) small=0x0.8p0;
 			else if (x==i/2 && d+1==z) small=0x1.0p0;
 			else small=0x1.8p0;
@@ -383,17 +361,22 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
 				p = MIN(p,MAX(0,9*(z-r-1)+e-j));
 		}
 	}
+	if (p > INT_MAX-1-(p || (fl&ALT_FORM)))
+		return -1;
 	l = 1 + p + (p || (fl&ALT_FORM));
 	if ((t|32)=='f') {
+		if (e > INT_MAX-l) return -1;
 		if (e>0) l+=e;
 	} else {
 		estr=fmt_u(e<0 ? -e : e, ebuf);
 		while(ebuf-estr<2) *--estr='0';
 		*--estr = (e<0 ? '-' : '+');
 		*--estr = t;
+		if (ebuf-estr > INT_MAX-l) return -1;
 		l += ebuf-estr;
 	}
 
+	if (l > INT_MAX-pl) return -1;
 	pad(f, ' ', w, pl+l, fl);
 	out(f, prefix, pl);
 	pad(f, '0', w, pl+l, fl^ZERO_PAD);
@@ -437,8 +420,10 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
 
 static int getint(char **s) {
 	int i;
-	for (i=0; isdigit(**s); (*s)++)
-		i = 10*i + (**s-'0');
+	for (i=0; isdigit(**s); (*s)++) {
+		if (i > INT_MAX/10U || **s-'0' > INT_MAX-10*i) i = -1;
+		else i = 10*i + (**s-'0');
+	}
 	return i;
 }
 
@@ -446,12 +431,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 {
 	char *a, *z, *s=(char *)fmt;
 	unsigned l10n=0, fl;
-	int w, p;
+	int w, p, xp;
 	union arg arg;
 	int argpos;
 	unsigned st, ps;
 	int cnt=0, l=0;
-	int i;
+	size_t i;
 	char buf[sizeof(uintmax_t)*3+3+LDBL_MANT_DIG/4];
 	const char *prefix;
 	int t, pl;
@@ -459,18 +444,19 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 	char mb[4];
 
 	for (;;) {
+		/* This error is only specified for snprintf, but since it's
+		 * unspecified for other forms, do the same. Stop immediately
+		 * on overflow; otherwise %n could produce wrong results. */
+		if (l > INT_MAX - cnt) goto overflow;
+
 		/* Update output count, end loop when fmt is exhausted */
-		if (cnt >= 0) {
-			if (l > INT_MAX - cnt) {
-				errno = EOVERFLOW;
-				cnt = -1;
-			} else cnt += l;
-		}
+		cnt += l;
 		if (!*s) break;
 
 		/* Handle literal text and %% format specifiers */
 		for (a=s; *s && *s!='%'; s++);
 		for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2);
+		if (z-a > INT_MAX-cnt) goto overflow;
 		l = z-a;
 		if (f) out(f, a, l);
 		if (l) continue;
@@ -498,9 +484,9 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 			} else if (!l10n) {
 				w = f ? va_arg(*ap, int) : 0;
 				s++;
-			} else return -1;
+			} else goto inval;
 			if (w<0) fl|=LEFT_ADJ, w=-w;
-		} else if ((w=getint(&s))<0) return -1;
+		} else if ((w=getint(&s))<0) goto overflow;
 
 		/* Read precision */
 		if (*s=='.' && s[1]=='*') {
@@ -511,24 +497,29 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 			} else if (!l10n) {
 				p = f ? va_arg(*ap, int) : 0;
 				s+=2;
-			} else return -1;
+			} else goto inval;
+			xp = (p>=0);
 		} else if (*s=='.') {
 			s++;
 			p = getint(&s);
-		} else p = -1;
+			xp = 1;
+		} else {
+			p = -1;
+			xp = 0;
+		}
 
 		/* Format specifier state machine */
 		st=0;
 		do {
-			if (OOB(*s)) return -1;
+			if (OOB(*s)) goto inval;
 			ps=st;
 			st=states[st]S(*s++);
 		} while (st-1<STOP);
-		if (!st) return -1;
+		if (!st) goto inval;
 
 		/* Check validity of argument type (nl/normal) */
 		if (st==NOARG) {
-			if (argpos>=0) return -1;
+			if (argpos>=0) goto inval;
 		} else {
 			if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos];
 			else if (f) pop_arg(&arg, st, ap);
@@ -584,7 +575,8 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 		case 'u':
 			a = fmt_u(arg.i, z);
 			}
-			if (p>=0) fl &= ~ZERO_PAD;
+			if (xp && p<0) goto overflow;
+			if (xp) fl &= ~ZERO_PAD;
 			if (!arg.i && !p) {
 				a=z;
 				break;
@@ -599,9 +591,9 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 			if (1) a = strerror(errno); else
 		case 's':
 			a = arg.p ? arg.p : "(null)";
-			z = memchr(a, 0, p);
-			if (!z) z=a+p;
-			else p=z-a;
+			z = a + strnlen(a, p<0 ? INT_MAX : p);
+			if (p<0 && *z) goto overflow;
+			p = z-a;
 			fl &= ~ZERO_PAD;
 			break;
 		case 'C':
@@ -611,8 +603,9 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 			p = -1;
 		case 'S':
 			ws = arg.p;
-			for (i=l=0; i<0U+p && *ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l);
+			for (i=l=0; i<p && *ws && (l=wctomb(mb, *ws++))>=0 && l<=p-i; i+=l);
 			if (l<0) return -1;
+			if (i > INT_MAX) goto overflow;
 			p = i;
 			pad(f, ' ', w, p, fl);
 			ws = arg.p;
@@ -623,12 +616,16 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 			continue;
 		case 'e': case 'f': case 'g': case 'a':
 		case 'E': case 'F': case 'G': case 'A':
+			if (xp && p<0) goto overflow;
 			l = fmt_fp(f, arg.f, w, p, fl, t);
+			if (l<0) goto overflow;
 			continue;
 		}
 
 		if (p < z-a) p = z-a;
+		if (p > INT_MAX-pl) goto overflow;
 		if (w < pl+p) w = pl+p;
+		if (w > INT_MAX-cnt) goto overflow;
 
 		pad(f, ' ', w, pl+p, fl);
 		out(f, prefix, pl);
@@ -646,8 +643,15 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 	for (i=1; i<=NL_ARGMAX && nl_type[i]; i++)
 		pop_arg(nl_arg+i, nl_type[i], ap);
 	for (; i<=NL_ARGMAX && !nl_type[i]; i++);
-	if (i<=NL_ARGMAX) return -1;
+	if (i<=NL_ARGMAX) goto inval;
 	return 1;
+
+inval:
+	errno = EINVAL;
+	return -1;
+overflow:
+	errno = EOVERFLOW;
+	return -1;
 }
 
 int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap)
@@ -671,11 +675,12 @@ int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap)
 	if (f->mode < 1) f->flags &= ~F_ERR;
 	if (!f->buf_size) {
 		saved_buf = f->buf;
-		f->wpos = f->wbase = f->buf = internal_buf;
+		f->buf = internal_buf;
 		f->buf_size = sizeof internal_buf;
-		f->wend = internal_buf + sizeof internal_buf;
+		f->wpos = f->wbase = f->wend = 0;
 	}
-	ret = printf_core(f, fmt, &ap2, nl_arg, nl_type);
+	if (!f->wend && __towrite(f)) ret = -1;
+	else ret = printf_core(f, fmt, &ap2, nl_arg, nl_type);
 	if (saved_buf) {
 		f->write(f, 0, 0);
 		if (!f->wpos) ret = -1;
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vfscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vfscanf.c
similarity index 98%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vfscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vfscanf.c
index d4d2454b08..9e030fc444 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vfscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vfscanf.c
@@ -89,15 +89,19 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap)
 			continue;
 		}
 		if (*p != '%' || p[1] == '%') {
-			p += *p=='%';
 			shlim(f, 0);
-			c = shgetc(f);
+			if (*p == '%') {
+				p++;
+				while (isspace((c=shgetc(f))));
+			} else {
+				c = shgetc(f);
+			}
 			if (c!=*p) {
 				shunget(f);
 				if (c<0) goto input_fail;
 				goto match_fail;
 			}
-			pos++;
+			pos += shcnt(f);
 			continue;
 		}
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vfwprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vfwprintf.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vfwprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vfwprintf.c
index f06d5aedb2..85b036c3df 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vfwprintf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vfwprintf.c
@@ -4,6 +4,8 @@
 #include <limits.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
 #include <wchar.h>
 #include <inttypes.h>
 
@@ -19,14 +21,6 @@
 
 #define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS|GROUPED)
 
-#if UINT_MAX == ULONG_MAX
-#define LONG_IS_INT
-#endif
-
-#if SIZE_MAX != ULONG_MAX || UINTMAX_MAX != ULLONG_MAX
-#define ODD_TYPES
-#endif
-
 /* State machine to accept length modifiers + conversion specifiers.
  * Result is 0 on failure, or an argument type to pop on success. */
 
@@ -35,23 +29,9 @@ enum {
 	ZTPRE, JPRE,
 	STOP,
 	PTR, INT, UINT, ULLONG,
-#ifndef LONG_IS_INT
 	LONG, ULONG,
-#else
-#define LONG INT
-#define ULONG UINT
-#endif
 	SHORT, USHORT, CHAR, UCHAR,
-#ifdef ODD_TYPES
 	LLONG, SIZET, IMAX, UMAX, PDIFF, UIPTR,
-#else
-#define LLONG ULLONG
-#define SIZET ULONG
-#define IMAX LLONG
-#define UMAX ULLONG
-#define PDIFF LONG
-#define UIPTR ULONG
-#endif
 	DBL, LDBL,
 	NOARG,
 	MAXSTATE
@@ -73,6 +53,8 @@ static const unsigned char states[]['z'-'A'+1] = {
 	}, { /* 1: l-prefixed */
 		S('d') = LONG, S('i') = LONG,
 		S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG,
+		S('e') = DBL, S('f') = DBL, S('g') = DBL, S('a') = DBL,
+		S('E') = DBL, S('F') = DBL, S('G') = DBL, S('A') = DBL,
 		S('c') = INT, S('s') = PTR, S('n') = PTR,
 		S('l') = LLPRE,
 	}, { /* 2: ll-prefixed */
@@ -119,29 +101,23 @@ union arg
 
 static void pop_arg(union arg *arg, int type, va_list *ap)
 {
-	/* Give the compiler a hint for optimizing the switch. */
-	if ((unsigned)type > MAXSTATE) return;
 	switch (type) {
 	       case PTR:	arg->p = va_arg(*ap, void *);
 	break; case INT:	arg->i = va_arg(*ap, int);
 	break; case UINT:	arg->i = va_arg(*ap, unsigned int);
-#ifndef LONG_IS_INT
 	break; case LONG:	arg->i = va_arg(*ap, long);
 	break; case ULONG:	arg->i = va_arg(*ap, unsigned long);
-#endif
 	break; case ULLONG:	arg->i = va_arg(*ap, unsigned long long);
 	break; case SHORT:	arg->i = (short)va_arg(*ap, int);
 	break; case USHORT:	arg->i = (unsigned short)va_arg(*ap, int);
 	break; case CHAR:	arg->i = (signed char)va_arg(*ap, int);
 	break; case UCHAR:	arg->i = (unsigned char)va_arg(*ap, int);
-#ifdef ODD_TYPES
 	break; case LLONG:	arg->i = va_arg(*ap, long long);
 	break; case SIZET:	arg->i = va_arg(*ap, size_t);
 	break; case IMAX:	arg->i = va_arg(*ap, intmax_t);
 	break; case UMAX:	arg->i = va_arg(*ap, uintmax_t);
 	break; case PDIFF:	arg->i = va_arg(*ap, ptrdiff_t);
 	break; case UIPTR:	arg->i = (uintptr_t)va_arg(*ap, void *);
-#endif
 	break; case DBL:	arg->f = va_arg(*ap, double);
 	break; case LDBL:	arg->f = va_arg(*ap, long double);
 	}
@@ -154,8 +130,10 @@ static void out(FILE *f, const wchar_t *s, size_t l)
 
 static int getint(wchar_t **s) {
 	int i;
-	for (i=0; iswdigit(**s); (*s)++)
-		i = 10*i + (**s-'0');
+	for (i=0; iswdigit(**s); (*s)++) {
+		if (i > INT_MAX/10U || **s-'0' > INT_MAX-10*i) i = -1;
+		else i = 10*i + (**s-'0');
+	}
 	return i;
 }
 
@@ -168,8 +146,8 @@ static const char sizeprefix['y'-'a'] = {
 static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_arg, int *nl_type)
 {
 	wchar_t *a, *z, *s=(wchar_t *)fmt;
-	unsigned l10n=0, litpct, fl;
-	int w, p;
+	unsigned l10n=0, fl;
+	int w, p, xp;
 	union arg arg;
 	int argpos;
 	unsigned st, ps;
@@ -181,20 +159,19 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 	wchar_t wc;
 
 	for (;;) {
+		/* This error is only specified for snprintf, but since it's
+		 * unspecified for other forms, do the same. Stop immediately
+		 * on overflow; otherwise %n could produce wrong results. */
+		if (l > INT_MAX - cnt) goto overflow;
+
 		/* Update output count, end loop when fmt is exhausted */
-		if (cnt >= 0) {
-			if (l > INT_MAX - cnt) {
-				if (!ferror(f)) errno = EOVERFLOW;
-				cnt = -1;
-			} else cnt += l;
-		}
+		cnt += l;
 		if (!*s) break;
 
 		/* Handle literal text and %% format specifiers */
 		for (a=s; *s && *s!='%'; s++);
-		litpct = wcsspn(s, L"%")/2; /* Optimize %%%% runs */
-		z = s+litpct;
-		s += 2*litpct;
+		for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2);
+		if (z-a > INT_MAX-cnt) goto overflow;
 		l = z-a;
 		if (f) out(f, a, l);
 		if (l) continue;
@@ -222,9 +199,9 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 			} else if (!l10n) {
 				w = f ? va_arg(*ap, int) : 0;
 				s++;
-			} else return -1;
+			} else goto inval;
 			if (w<0) fl|=LEFT_ADJ, w=-w;
-		} else if ((w=getint(&s))<0) return -1;
+		} else if ((w=getint(&s))<0) goto overflow;
 
 		/* Read precision */
 		if (*s=='.' && s[1]=='*') {
@@ -235,24 +212,29 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 			} else if (!l10n) {
 				p = f ? va_arg(*ap, int) : 0;
 				s+=2;
-			} else return -1;
+			} else goto inval;
+			xp = (p>=0);
 		} else if (*s=='.') {
 			s++;
 			p = getint(&s);
-		} else p = -1;
+			xp = 1;
+		} else {
+			p = -1;
+			xp = 0;
+		}
 
 		/* Format specifier state machine */
 		st=0;
 		do {
-			if (OOB(*s)) return -1;
+			if (OOB(*s)) goto inval;
 			ps=st;
 			st=states[st]S(*s++);
 		} while (st-1<STOP);
-		if (!st) return -1;
+		if (!st) goto inval;
 
 		/* Check validity of argument type (nl/normal) */
 		if (st==NOARG) {
-			if (argpos>=0) return -1;
+			if (argpos>=0) goto inval;
 		} else {
 			if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos];
 			else if (f) pop_arg(&arg, st, ap);
@@ -276,8 +258,11 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 			}
 			continue;
 		case 'c':
+			if (w<1) w=1;
+			if (w>1 && !(fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, "");
 			fputwc(btowc(arg.i), f);
-			l = 1;
+			if (w>1 && (fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, "");
+			l = w;
 			continue;
 		case 'C':
 			fputwc(arg.i, f);
@@ -285,12 +270,13 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 			continue;
 		case 'S':
 			a = arg.p;
-			z = wmemchr(a, 0, p);
-			if (z) p=z-a;
+			z = a + wcsnlen(a, p<0 ? INT_MAX : p);
+			if (p<0 && *z) goto overflow;
+			p = z-a;
 			if (w<p) w=p;
-			if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+			if (!(fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
 			out(f, a, p);
-			if ((fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+			if ((fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
 			l=w;
 			continue;
 		case 'm':
@@ -298,23 +284,24 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 		case 's':
 			if (!arg.p) arg.p = "(null)";
 			bs = arg.p;
-			if (p<0) p = INT_MAX;
-			for (i=l=0; l<p && (i=mbtowc(&wc, bs, MB_LEN_MAX))>0; bs+=i, l++);
+			for (i=l=0; l<(p<0?INT_MAX:p) && (i=mbtowc(&wc, bs, MB_LEN_MAX))>0; bs+=i, l++);
 			if (i<0) return -1;
+			if (p<0 && *bs) goto overflow;
 			p=l;
 			if (w<p) w=p;
-			if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+			if (!(fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
 			bs = arg.p;
 			while (l--) {
 				i=mbtowc(&wc, bs, MB_LEN_MAX);
 				bs+=i;
 				fputwc(wc, f);
 			}
-			if ((fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+			if ((fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
 			l=w;
 			continue;
 		}
 
+		if (xp && p<0) goto overflow;
 		snprintf(charfmt, sizeof charfmt, "%%%s%s%s%s%s*.*%c%c",
 			"#"+!(fl & ALT_FORM),
 			"+"+!(fl & MARK_POS),
@@ -341,6 +328,13 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 	for (; i<=NL_ARGMAX && !nl_type[i]; i++);
 	if (i<=NL_ARGMAX) return -1;
 	return 1;
+
+inval:
+	errno = EINVAL;
+	return -1;
+overflow:
+	errno = EOVERFLOW;
+	return -1;
 }
 
 int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vfwscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vfwscanf.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vfwscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vfwscanf.c
index 223aad4f35..82f4860441 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vfwscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vfwscanf.c
@@ -11,7 +11,6 @@
 #include "shgetc.h"
 #include "intscan.h"
 #include "floatscan.h"
-#include "libc.h"
 
 #define SIZE_hh -2
 #define SIZE_h  -1
@@ -77,7 +76,7 @@ static int in_set(const wchar_t *set, int c)
 #if 1
 #undef getwc
 #define getwc(f) \
-	((f)->rpos < (f)->rend && *(f)->rpos < 128 ? *(f)->rpos++ : (getwc)(f))
+	((f)->rpos != (f)->rend && *(f)->rpos < 128 ? *(f)->rpos++ : (getwc)(f))
 
 #undef ungetwc
 #define ungetwc(c,f) \
@@ -117,8 +116,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
 			continue;
 		}
 		if (*p != '%' || p[1] == '%') {
-			p += *p=='%';
-			c = getwc(f);
+			if (*p == '%') {
+				p++;
+				while (iswspace((c=getwc(f)))) pos++;
+			} else {
+				c = getwc(f);
+			}
 			if (c!=*p) {
 				ungetwc(c, f);
 				if (c<0) goto input_fail;
@@ -214,11 +217,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
 				set = L"";
 			} else if (t == 's') {
 				invert = 1;
-				set = (const wchar_t[]){
+				static const wchar_t spaces[] = {
 					' ', '\t', '\n', '\r', 11, 12,  0x0085,
 					0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005,
 					0x2006, 0x2008, 0x2009, 0x200a,
 					0x2028, 0x2029, 0x205f, 0x3000, 0 };
+				set = spaces;
 			} else {
 				if (*++p == '^') p++, invert = 1;
 				else invert = 0;
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vscanf.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vscanf.c
index 43892f01b3..9d46ab09d5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vscanf.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdarg.h>
-#include "libc.h"
 
 int vscanf(const char *restrict fmt, va_list ap)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/vsnprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vsnprintf.c
new file mode 100644
index 0000000000..b3510a6340
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vsnprintf.c
@@ -0,0 +1,55 @@
+#include "stdio_impl.h"
+#include <limits.h>
+#include <string.h>
+#include <errno.h>
+#include <stdint.h>
+
+struct cookie {
+	char *s;
+	size_t n;
+};
+
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+static size_t sn_write(FILE *f, const unsigned char *s, size_t l)
+{
+	struct cookie *c = f->cookie;
+	size_t k = MIN(c->n, f->wpos - f->wbase);
+	if (k) {
+		memcpy(c->s, f->wbase, k);
+		c->s += k;
+		c->n -= k;
+	}
+	k = MIN(c->n, l);
+	if (k) {
+		memcpy(c->s, s, k);
+		c->s += k;
+		c->n -= k;
+	}
+	*c->s = 0;
+	f->wpos = f->wbase = f->buf;
+	/* pretend to succeed, even if we discarded extra data */
+	return l;
+}
+
+int vsnprintf(char *restrict s, size_t n, const char *restrict fmt, va_list ap)
+{
+	unsigned char buf[1];
+	char dummy[1];
+	struct cookie c = { .s = n ? s : dummy, .n = n ? n-1 : 0 };
+	FILE f = {
+		.lbf = EOF,
+		.write = sn_write,
+		.lock = -1,
+		.buf = buf,
+		.cookie = &c,
+	};
+
+	if (n > INT_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+
+	*c.s = 0;
+	return vfprintf(&f, fmt, ap);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vsprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vsprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vsprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vsprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vsscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vsscanf.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vsscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vsscanf.c
index 929ffa3b0f..985002256e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vsscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vsscanf.c
@@ -1,5 +1,4 @@
 #include "stdio_impl.h"
-#include "libc.h"
 
 static size_t do_read(FILE *f, unsigned char *buf, size_t len)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdio/vswprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vswprintf.c
new file mode 100644
index 0000000000..7f98c5c969
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vswprintf.c
@@ -0,0 +1,60 @@
+#include "stdio_impl.h"
+#include <limits.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <wchar.h>
+
+struct cookie {
+	wchar_t *ws;
+	size_t l;
+};
+
+static size_t sw_write(FILE *f, const unsigned char *s, size_t l)
+{
+	size_t l0 = l;
+	int i = 0;
+	struct cookie *c = f->cookie;
+	if (s!=f->wbase && sw_write(f, f->wbase, f->wpos-f->wbase)==-1)
+		return -1;
+	while (c->l && l && (i=mbtowc(c->ws, (void *)s, l))>=0) {
+		s+=i;
+		l-=i;
+		c->l--;
+		c->ws++;
+	}
+	*c->ws = 0;
+	if (i < 0) {
+		f->wpos = f->wbase = f->wend = 0;
+		f->flags |= F_ERR;
+		return i;
+	}
+	f->wend = f->buf + f->buf_size;
+	f->wpos = f->wbase = f->buf;
+	return l0;
+}
+
+int vswprintf(wchar_t *restrict s, size_t n, const wchar_t *restrict fmt, va_list ap)
+{
+	int r;
+	unsigned char buf[256];
+	struct cookie c = { s, n-1 };
+	FILE f = {
+		.lbf = EOF,
+		.write = sw_write,
+		.lock = -1,
+		.buf = buf,
+		.buf_size = sizeof buf,
+		.cookie = &c,
+	};
+
+	if (!n) {
+		return -1;
+	} else if (n > INT_MAX) {
+		errno = EOVERFLOW;
+		return -1;
+	}
+	r = vfwprintf(&f, fmt, ap);
+	sw_write(&f, 0, 0);
+	return r>=n ? -1 : r;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vswscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vswscanf.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vswscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vswscanf.c
index 411dd39c9a..00b614bc2f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vswscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vswscanf.c
@@ -1,5 +1,4 @@
 #include "stdio_impl.h"
-#include "libc.h"
 #include <wchar.h>
 
 static size_t wstring_read(FILE *f, unsigned char *buf, size_t len)
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vwprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vwprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vwprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vwprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/vwscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/vwscanf.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/vwscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/vwscanf.c
index 63c9cce10b..5a3931e191 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/vwscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/vwscanf.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <wchar.h>
-#include "libc.h"
 
 int vwscanf(const wchar_t *restrict fmt, va_list ap)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/wprintf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/wprintf.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/wprintf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/wprintf.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdio/wscanf.c b/src/components/lib/libc/musl-1.2.0/src/stdio/wscanf.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/stdio/wscanf.c
rename to src/components/lib/libc/musl-1.2.0/src/stdio/wscanf.c
index 8041225234..4dfec25dcf 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdio/wscanf.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdio/wscanf.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <wchar.h>
-#include "libc.h"
 
 int wscanf(const wchar_t *restrict fmt, ...)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdlib/abs.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/abs.c
new file mode 100644
index 0000000000..e721fdc2b1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdlib/abs.c
@@ -0,0 +1,6 @@
+#include <stdlib.h>
+
+int abs(int a)
+{
+	return a>0 ? a : -a;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/atof.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/atof.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/atof.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/atof.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/atoi.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/atoi.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/atoi.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/atoi.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/atol.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/atol.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/atol.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/atol.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/atoll.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/atoll.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/atoll.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/atoll.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdlib/bsearch.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/bsearch.c
new file mode 100644
index 0000000000..fe050ea30a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdlib/bsearch.c
@@ -0,0 +1,20 @@
+#include <stdlib.h>
+
+void *bsearch(const void *key, const void *base, size_t nel, size_t width, int (*cmp)(const void *, const void *))
+{
+	void *try;
+	int sign;
+	while (nel > 0) {
+		try = (char *)base + width*(nel/2);
+		sign = cmp(key, try);
+		if (sign < 0) {
+			nel /= 2;
+		} else if (sign > 0) {
+			base = (char *)try + width;
+			nel -= nel/2+1;
+		} else {
+			return try;
+		}
+	}
+	return NULL;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/div.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/div.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/div.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/div.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/ecvt.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/ecvt.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/ecvt.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/ecvt.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/fcvt.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/fcvt.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/fcvt.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/fcvt.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/gcvt.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/gcvt.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/gcvt.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/gcvt.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/imaxabs.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/imaxabs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/imaxabs.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/imaxabs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/imaxdiv.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/imaxdiv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/imaxdiv.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/imaxdiv.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdlib/labs.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/labs.c
new file mode 100644
index 0000000000..83ddb1475c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdlib/labs.c
@@ -0,0 +1,6 @@
+#include <stdlib.h>
+
+long labs(long a)
+{
+	return a>0 ? a : -a;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/ldiv.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/ldiv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/ldiv.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/ldiv.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/stdlib/llabs.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/llabs.c
new file mode 100644
index 0000000000..9dfaf5cf76
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/stdlib/llabs.c
@@ -0,0 +1,6 @@
+#include <stdlib.h>
+
+long long llabs(long long a)
+{
+	return a>0 ? a : -a;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/lldiv.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/lldiv.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/lldiv.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/lldiv.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/qsort.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/qsort.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/qsort.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/qsort.c
index 434d935072..da58fd3177 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdlib/qsort.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdlib/qsort.c
@@ -21,6 +21,9 @@
 
 /* Minor changes by Rich Felker for integration in musl, 2011-04-27. */
 
+/* Smoothsort, an adaptive variant of Heapsort.  Memory usage: O(1).
+   Run time: Worst case O(n log n), close to O(n) in the mostly-sorted case. */
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/strtod.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/strtod.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/strtod.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/strtod.c
index 461dcf858e..a5d0118a2d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdlib/strtod.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdlib/strtod.c
@@ -2,14 +2,11 @@
 #include "shgetc.h"
 #include "floatscan.h"
 #include "stdio_impl.h"
-#include "libc.h"
 
 static long double strtox(const char *s, char **p, int prec)
 {
-	FILE f = {
-		.buf = (void *)s, .rpos = (void *)s,
-		.rend = (void *)-1, .lock = -1
-	};
+	FILE f;
+	sh_fromstring(&f, s);
 	shlim(&f, 0);
 	long double y = __floatscan(&f, prec, 1);
 	off_t cnt = shcnt(&f);
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/strtol.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/strtol.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/strtol.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/strtol.c
index 730bf2d7bd..bfefea69d1 100644
--- a/src/components/lib/libc/musl-1.1.11/src/stdlib/strtol.c
+++ b/src/components/lib/libc/musl-1.2.0/src/stdlib/strtol.c
@@ -4,19 +4,11 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <ctype.h>
-#include "libc.h"
 
 static unsigned long long strtox(const char *s, char **p, int base, unsigned long long lim)
 {
-	/* FIXME: use a helper function or macro to setup the FILE */
 	FILE f;
-	f.flags = 0;
-	f.buf = f.rpos = (void *)s;
-	if ((size_t)s > (size_t)-1/2)
-		f.rend = (void *)-1;
-	else
-		f.rend = (unsigned char *)s+(size_t)-1/2;
-	f.lock = -1;
+	sh_fromstring(&f, s);
 	shlim(&f, 0);
 	unsigned long long y = __intscan(&f, base, 1, lim);
 	if (p) {
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/wcstod.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/wcstod.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/wcstod.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/wcstod.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/stdlib/wcstol.c b/src/components/lib/libc/musl-1.2.0/src/stdlib/wcstol.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/stdlib/wcstol.c
rename to src/components/lib/libc/musl-1.2.0/src/stdlib/wcstol.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/arm/__aeabi_memcpy.s b/src/components/lib/libc/musl-1.2.0/src/string/arm/__aeabi_memcpy.s
new file mode 100644
index 0000000000..3a527e41b8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/arm/__aeabi_memcpy.s
@@ -0,0 +1,45 @@
+.syntax unified
+
+.global __aeabi_memcpy8
+.global __aeabi_memcpy4
+.global __aeabi_memcpy
+.global __aeabi_memmove8
+.global __aeabi_memmove4
+.global __aeabi_memmove
+
+.type __aeabi_memcpy8,%function
+.type __aeabi_memcpy4,%function
+.type __aeabi_memcpy,%function
+.type __aeabi_memmove8,%function
+.type __aeabi_memmove4,%function
+.type __aeabi_memmove,%function
+
+__aeabi_memmove8:
+__aeabi_memmove4:
+__aeabi_memmove:
+	cmp   r0, r1
+	bls   3f
+	cmp   r2, #0
+	beq   2f
+	adds  r0, r0, r2
+	adds  r2, r1, r2
+1:	subs  r2, r2, #1
+	ldrb  r3, [r2]
+	subs  r0, r0, #1
+	strb  r3, [r0]
+	cmp   r1, r2
+	bne   1b
+2:	bx    lr
+__aeabi_memcpy8:
+__aeabi_memcpy4:
+__aeabi_memcpy:
+3:	cmp   r2, #0
+	beq   2f
+	adds  r2, r1, r2
+1:	ldrb  r3, [r1]
+	adds  r1, r1, #1
+	strb  r3, [r0]
+	adds  r0, r0, #1
+	cmp   r1, r2
+	bne   1b
+2:	bx    lr
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/arm/__aeabi_memset.s b/src/components/lib/libc/musl-1.2.0/src/string/arm/__aeabi_memset.s
new file mode 100644
index 0000000000..f9f605838b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/arm/__aeabi_memset.s
@@ -0,0 +1,31 @@
+.syntax unified
+
+.global __aeabi_memclr8
+.global __aeabi_memclr4
+.global __aeabi_memclr
+.global __aeabi_memset8
+.global __aeabi_memset4
+.global __aeabi_memset
+
+.type __aeabi_memclr8,%function
+.type __aeabi_memclr4,%function
+.type __aeabi_memclr,%function
+.type __aeabi_memset8,%function
+.type __aeabi_memset4,%function
+.type __aeabi_memset,%function
+
+__aeabi_memclr8:
+__aeabi_memclr4:
+__aeabi_memclr:
+	movs  r2, #0
+__aeabi_memset8:
+__aeabi_memset4:
+__aeabi_memset:
+	cmp   r1, #0
+	beq   2f
+	adds  r1, r0, r1
+1:	strb  r2, [r0]
+	adds  r0, r0, #1
+	cmp   r1, r0
+	bne   1b
+2:	bx    lr
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/arm/memcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/arm/memcpy.c
new file mode 100644
index 0000000000..041614f4ba
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/arm/memcpy.c
@@ -0,0 +1,3 @@
+#if __ARMEB__
+#include "../memcpy.c"
+#endif
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/arm/memcpy_le.S b/src/components/lib/libc/musl-1.2.0/src/string/arm/memcpy_le.S
new file mode 100644
index 0000000000..7b35d305ec
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/arm/memcpy_le.S
@@ -0,0 +1,386 @@
+#if !__ARMEB__
+
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+/*
+ * Optimized memcpy() for ARM.
+ *
+ * note that memcpy() always returns the destination pointer,
+ * so we have to preserve R0.
+  */
+
+/*
+ * This file has been modified from the original for use in musl libc.
+ * The main changes are: addition of .type memcpy,%function to make the
+ * code safely callable from thumb mode, adjusting the return
+ * instructions to be compatible with pre-thumb ARM cpus, removal of
+ * prefetch code that is not compatible with older cpus and support for
+ * building as thumb 2.
+ */
+
+.syntax unified
+
+.global memcpy
+.type memcpy,%function
+memcpy:
+	/* The stack must always be 64-bits aligned to be compliant with the
+	 * ARM ABI. Since we have to save R0, we might as well save R4
+	 * which we can use for better pipelining of the reads below
+	 */
+	.fnstart
+	.save       {r0, r4, lr}
+	stmfd       sp!, {r0, r4, lr}
+	/* Making room for r5-r11 which will be spilled later */
+	.pad        #28
+	sub         sp, sp, #28
+
+	/* it simplifies things to take care of len<4 early */
+	cmp     r2, #4
+	blo     copy_last_3_and_return
+
+	/* compute the offset to align the source
+	 * offset = (4-(src&3))&3 = -src & 3
+	 */
+	rsb     r3, r1, #0
+	ands    r3, r3, #3
+	beq     src_aligned
+
+	/* align source to 32 bits. We need to insert 2 instructions between
+	 * a ldr[b|h] and str[b|h] because byte and half-word instructions
+	 * stall 2 cycles.
+	 */
+	movs    r12, r3, lsl #31
+	sub     r2, r2, r3              /* we know that r3 <= r2 because r2 >= 4 */
+	ldrbmi r3, [r1], #1
+	ldrbcs r4, [r1], #1
+	ldrbcs r12,[r1], #1
+	strbmi r3, [r0], #1
+	strbcs r4, [r0], #1
+	strbcs r12,[r0], #1
+
+src_aligned:
+
+	/* see if src and dst are aligned together (congruent) */
+	eor     r12, r0, r1
+	tst     r12, #3
+	bne     non_congruent
+
+	/* Use post-incriment mode for stm to spill r5-r11 to reserved stack
+	 * frame. Don't update sp.
+	 */
+	stmea   sp, {r5-r11}
+
+	/* align the destination to a cache-line */
+	rsb     r3, r0, #0
+	ands    r3, r3, #0x1C
+	beq     congruent_aligned32
+	cmp     r3, r2
+	andhi   r3, r2, #0x1C
+
+	/* conditionnaly copies 0 to 7 words (length in r3) */
+	movs    r12, r3, lsl #28
+	ldmcs   r1!, {r4, r5, r6, r7}           /* 16 bytes */
+	ldmmi   r1!, {r8, r9}                   /*  8 bytes */
+	stmcs   r0!, {r4, r5, r6, r7}
+	stmmi   r0!, {r8, r9}
+	tst     r3, #0x4
+	ldrne   r10,[r1], #4                    /*  4 bytes */
+	strne   r10,[r0], #4
+	sub     r2, r2, r3
+
+congruent_aligned32:
+	/*
+	 * here source is aligned to 32 bytes.
+	 */
+
+cached_aligned32:
+	subs    r2, r2, #32
+	blo     less_than_32_left
+
+	/*
+	 * We preload a cache-line up to 64 bytes ahead. On the 926, this will
+	 * stall only until the requested world is fetched, but the linefill
+	 * continues in the the background.
+	 * While the linefill is going, we write our previous cache-line
+	 * into the write-buffer (which should have some free space).
+	 * When the linefill is done, the writebuffer will
+	 * start dumping its content into memory
+	 *
+	 * While all this is going, we then load a full cache line into
+	 * 8 registers, this cache line should be in the cache by now
+	 * (or partly in the cache).
+	 *
+	 * This code should work well regardless of the source/dest alignment.
+	 *
+	 */
+
+	/* Align the preload register to a cache-line because the cpu does
+	 * "critical word first" (the first word requested is loaded first).
+	 */
+	@ bic           r12, r1, #0x1F
+	@ add           r12, r12, #64
+
+1:      ldmia   r1!, { r4-r11 }
+	subs    r2, r2, #32
+
+	/* 
+	 * NOTE: if r12 is more than 64 ahead of r1, the following ldrhi
+	 * for ARM9 preload will not be safely guarded by the preceding subs.
+	 * When it is safely guarded the only possibility to have SIGSEGV here
+	 * is because the caller overstates the length.
+	 */
+	@ ldrhi         r3, [r12], #32      /* cheap ARM9 preload */
+	stmia   r0!, { r4-r11 }
+	bhs     1b
+
+	add     r2, r2, #32
+
+less_than_32_left:
+	/*
+	 * less than 32 bytes left at this point (length in r2)
+	 */
+
+	/* skip all this if there is nothing to do, which should
+	 * be a common case (if not executed the code below takes
+	 * about 16 cycles)
+	 */
+	tst     r2, #0x1F
+	beq     1f
+
+	/* conditionnaly copies 0 to 31 bytes */
+	movs    r12, r2, lsl #28
+	ldmcs   r1!, {r4, r5, r6, r7}           /* 16 bytes */
+	ldmmi   r1!, {r8, r9}                   /*  8 bytes */
+	stmcs   r0!, {r4, r5, r6, r7}
+	stmmi   r0!, {r8, r9}
+	movs    r12, r2, lsl #30
+	ldrcs   r3, [r1], #4                    /*  4 bytes */
+	ldrhmi r4, [r1], #2                     /*  2 bytes */
+	strcs   r3, [r0], #4
+	strhmi r4, [r0], #2
+	tst     r2, #0x1
+	ldrbne r3, [r1]                         /*  last byte  */
+	strbne r3, [r0]
+
+	/* we're done! restore everything and return */
+1:      ldmfd   sp!, {r5-r11}
+	ldmfd   sp!, {r0, r4, lr}
+	bx      lr
+
+	/********************************************************************/
+
+non_congruent:
+	/*
+	 * here source is aligned to 4 bytes
+	 * but destination is not.
+	 *
+	 * in the code below r2 is the number of bytes read
+	 * (the number of bytes written is always smaller, because we have
+	 * partial words in the shift queue)
+	 */
+	cmp     r2, #4
+	blo     copy_last_3_and_return
+
+	/* Use post-incriment mode for stm to spill r5-r11 to reserved stack
+	 * frame. Don't update sp.
+	 */
+	stmea   sp, {r5-r11}
+
+	/* compute shifts needed to align src to dest */
+	rsb     r5, r0, #0
+	and     r5, r5, #3                      /* r5 = # bytes in partial words */
+	mov     r12, r5, lsl #3         /* r12 = right */
+	rsb     lr, r12, #32            /* lr = left  */
+
+	/* read the first word */
+	ldr     r3, [r1], #4
+	sub     r2, r2, #4
+
+	/* write a partial word (0 to 3 bytes), such that destination
+	 * becomes aligned to 32 bits (r5 = nb of words to copy for alignment)
+	 */
+	movs    r5, r5, lsl #31
+	strbmi r3, [r0], #1
+	movmi   r3, r3, lsr #8
+	strbcs r3, [r0], #1
+	movcs   r3, r3, lsr #8
+	strbcs r3, [r0], #1
+	movcs   r3, r3, lsr #8
+
+	cmp     r2, #4
+	blo     partial_word_tail
+
+	/* Align destination to 32 bytes (cache line boundary) */
+1:      tst     r0, #0x1c
+	beq     2f
+	ldr     r5, [r1], #4
+	sub     r2, r2, #4
+	mov     r4, r5,                 lsl lr
+	orr     r4, r4, r3
+	mov     r3, r5,                 lsr r12
+	str     r4, [r0], #4
+	cmp     r2, #4
+	bhs     1b
+	blo     partial_word_tail
+
+	/* copy 32 bytes at a time */
+2:      subs    r2, r2, #32
+	blo     less_than_thirtytwo
+
+	/* Use immediate mode for the shifts, because there is an extra cycle
+	 * for register shifts, which could account for up to 50% of
+	 * performance hit.
+	 */
+
+	cmp     r12, #24
+	beq     loop24
+	cmp     r12, #8
+	beq     loop8
+
+loop16:
+	ldr     r12, [r1], #4
+1:      mov     r4, r12
+	ldmia   r1!, {   r5,r6,r7,  r8,r9,r10,r11}
+	subs    r2, r2, #32
+	ldrhs   r12, [r1], #4
+	orr     r3, r3, r4, lsl #16
+	mov     r4, r4, lsr #16
+	orr     r4, r4, r5, lsl #16
+	mov     r5, r5, lsr #16
+	orr     r5, r5, r6, lsl #16
+	mov     r6, r6, lsr #16
+	orr     r6, r6, r7, lsl #16
+	mov     r7, r7, lsr #16
+	orr     r7, r7, r8, lsl #16
+	mov     r8, r8, lsr #16
+	orr     r8, r8, r9, lsl #16
+	mov     r9, r9, lsr #16
+	orr     r9, r9, r10, lsl #16
+	mov     r10, r10,               lsr #16
+	orr     r10, r10, r11, lsl #16
+	stmia   r0!, {r3,r4,r5,r6, r7,r8,r9,r10}
+	mov     r3, r11, lsr #16
+	bhs     1b
+	b       less_than_thirtytwo
+
+loop8:
+	ldr     r12, [r1], #4
+1:      mov     r4, r12
+	ldmia   r1!, {   r5,r6,r7,  r8,r9,r10,r11}
+	subs    r2, r2, #32
+	ldrhs   r12, [r1], #4
+	orr     r3, r3, r4, lsl #24
+	mov     r4, r4, lsr #8
+	orr     r4, r4, r5, lsl #24
+	mov     r5, r5, lsr #8
+	orr     r5, r5, r6, lsl #24
+	mov     r6, r6,  lsr #8
+	orr     r6, r6, r7, lsl #24
+	mov     r7, r7,  lsr #8
+	orr     r7, r7, r8,             lsl #24
+	mov     r8, r8,  lsr #8
+	orr     r8, r8, r9,             lsl #24
+	mov     r9, r9,  lsr #8
+	orr     r9, r9, r10,    lsl #24
+	mov     r10, r10, lsr #8
+	orr     r10, r10, r11,  lsl #24
+	stmia   r0!, {r3,r4,r5,r6, r7,r8,r9,r10}
+	mov     r3, r11, lsr #8
+	bhs     1b
+	b       less_than_thirtytwo
+
+loop24:
+	ldr     r12, [r1], #4
+1:      mov     r4, r12
+	ldmia   r1!, {   r5,r6,r7,  r8,r9,r10,r11}
+	subs    r2, r2, #32
+	ldrhs   r12, [r1], #4
+	orr     r3, r3, r4, lsl #8
+	mov     r4, r4, lsr #24
+	orr     r4, r4, r5, lsl #8
+	mov     r5, r5, lsr #24
+	orr     r5, r5, r6, lsl #8
+	mov     r6, r6, lsr #24
+	orr     r6, r6, r7, lsl #8
+	mov     r7, r7, lsr #24
+	orr     r7, r7, r8, lsl #8
+	mov     r8, r8, lsr #24
+	orr     r8, r8, r9, lsl #8
+	mov     r9, r9, lsr #24
+	orr     r9, r9, r10, lsl #8
+	mov     r10, r10, lsr #24
+	orr     r10, r10, r11, lsl #8
+	stmia   r0!, {r3,r4,r5,r6, r7,r8,r9,r10}
+	mov     r3, r11, lsr #24
+	bhs     1b
+
+less_than_thirtytwo:
+	/* copy the last 0 to 31 bytes of the source */
+	rsb     r12, lr, #32            /* we corrupted r12, recompute it  */
+	add     r2, r2, #32
+	cmp     r2, #4
+	blo     partial_word_tail
+
+1:      ldr     r5, [r1], #4
+	sub     r2, r2, #4
+	mov     r4, r5,                 lsl lr
+	orr     r4, r4, r3
+	mov     r3,     r5,                     lsr r12
+	str     r4, [r0], #4
+	cmp     r2, #4
+	bhs     1b
+
+partial_word_tail:
+	/* we have a partial word in the input buffer */
+	movs    r5, lr, lsl #(31-3)
+	strbmi r3, [r0], #1
+	movmi   r3, r3, lsr #8
+	strbcs r3, [r0], #1
+	movcs   r3, r3, lsr #8
+	strbcs r3, [r0], #1
+
+	/* Refill spilled registers from the stack. Don't update sp. */
+	ldmfd   sp, {r5-r11}
+
+copy_last_3_and_return:
+	movs    r2, r2, lsl #31 /* copy remaining 0, 1, 2 or 3 bytes */
+	ldrbmi r2, [r1], #1
+	ldrbcs r3, [r1], #1
+	ldrbcs r12,[r1]
+	strbmi r2, [r0], #1
+	strbcs r3, [r0], #1
+	strbcs r12,[r0]
+
+	/* we're done! restore sp and spilled registers and return */
+	add     sp,  sp, #28
+	ldmfd   sp!, {r0, r4, lr}
+	bx      lr
+
+#endif
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/bcmp.c b/src/components/lib/libc/musl-1.2.0/src/string/bcmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/bcmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/bcmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/bcopy.c b/src/components/lib/libc/musl-1.2.0/src/string/bcopy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/bcopy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/bcopy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/bzero.c b/src/components/lib/libc/musl-1.2.0/src/string/bzero.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/bzero.c
rename to src/components/lib/libc/musl-1.2.0/src/string/bzero.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/explicit_bzero.c b/src/components/lib/libc/musl-1.2.0/src/string/explicit_bzero.c
new file mode 100644
index 0000000000..f2e12f2375
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/explicit_bzero.c
@@ -0,0 +1,8 @@
+#define _BSD_SOURCE
+#include <string.h>
+
+void explicit_bzero(void *d, size_t n)
+{
+	d = memset(d, 0, n);
+	__asm__ __volatile__ ("" : : "r"(d) : "memory");
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/i386/memcpy.s b/src/components/lib/libc/musl-1.2.0/src/string/i386/memcpy.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/i386/memcpy.s
rename to src/components/lib/libc/musl-1.2.0/src/string/i386/memcpy.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/i386/memmove.s b/src/components/lib/libc/musl-1.2.0/src/string/i386/memmove.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/i386/memmove.s
rename to src/components/lib/libc/musl-1.2.0/src/string/i386/memmove.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/i386/memset.s b/src/components/lib/libc/musl-1.2.0/src/string/i386/memset.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/i386/memset.s
rename to src/components/lib/libc/musl-1.2.0/src/string/i386/memset.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/index.c b/src/components/lib/libc/musl-1.2.0/src/string/index.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/index.c
rename to src/components/lib/libc/musl-1.2.0/src/string/index.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memccpy.c b/src/components/lib/libc/musl-1.2.0/src/string/memccpy.c
similarity index 83%
rename from src/components/lib/libc/musl-1.1.11/src/string/memccpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memccpy.c
index 7c233d5e90..00c18e2b5b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/memccpy.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/memccpy.c
@@ -11,21 +11,24 @@ void *memccpy(void *restrict dest, const void *restrict src, int c, size_t n)
 {
 	unsigned char *d = dest;
 	const unsigned char *s = src;
-	size_t *wd, k;
-	const size_t *ws;
 
 	c = (unsigned char)c;
+#ifdef __GNUC__
+	typedef size_t __attribute__((__may_alias__)) word;
+	word *wd;
+	const word *ws;
 	if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
 		for (; ((uintptr_t)s & ALIGN) && n && (*d=*s)!=c; n--, s++, d++);
 		if ((uintptr_t)s & ALIGN) goto tail;
-		k = ONES * c;
+		size_t k = ONES * c;
 		wd=(void *)d; ws=(const void *)s;
 		for (; n>=sizeof(size_t) && !HASZERO(*ws^k);
 		       n-=sizeof(size_t), ws++, wd++) *wd = *ws;
 		d=(void *)wd; s=(const void *)ws;
 	}
+#endif
 	for (; n && (*d=*s)!=c; n--, s++, d++);
 tail:
-	if (*s==c) return d+1;
+	if (n && *s==c) return d+1;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memchr.c b/src/components/lib/libc/musl-1.2.0/src/string/memchr.c
similarity index 78%
rename from src/components/lib/libc/musl-1.1.11/src/string/memchr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memchr.c
index 4daff7bbc4..65f0d789b2 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/memchr.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/memchr.c
@@ -12,12 +12,16 @@ void *memchr(const void *src, int c, size_t n)
 {
 	const unsigned char *s = src;
 	c = (unsigned char)c;
+#ifdef __GNUC__
 	for (; ((uintptr_t)s & ALIGN) && n && *s != c; s++, n--);
 	if (n && *s != c) {
-		const size_t *w;
+		typedef size_t __attribute__((__may_alias__)) word;
+		const word *w;
 		size_t k = ONES * c;
 		for (w = (const void *)s; n>=SS && !HASZERO(*w^k); w++, n-=SS);
-		for (s = (const void *)w; n && *s != c; s++, n--);
+		s = (const void *)w;
 	}
+#endif
+	for (; n && *s != c; s++, n--);
 	return n ? (void *)s : 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memcmp.c b/src/components/lib/libc/musl-1.2.0/src/string/memcmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/memcmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memcmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/memcpy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/memcpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memcpy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memmem.c b/src/components/lib/libc/musl-1.2.0/src/string/memmem.c
similarity index 90%
rename from src/components/lib/libc/musl-1.1.11/src/string/memmem.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memmem.c
index d7e1221940..58a21fcd6e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/memmem.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/memmem.c
@@ -5,27 +5,27 @@
 static char *twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
 {
 	uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1];
-	for (h++, k--; k; k--, hw = hw<<8 | *++h)
-		if (hw == nw) return (char *)h-1;
-	return 0;
+	for (h+=2, k-=2; k; k--, hw = hw<<8 | *h++)
+		if (hw == nw) return (char *)h-2;
+	return hw == nw ? (char *)h-2 : 0;
 }
 
 static char *threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
 {
 	uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8;
 	uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8;
-	for (h+=2, k-=2; k; k--, hw = (hw|*++h)<<8)
-		if (hw == nw) return (char *)h-2;
-	return 0;
+	for (h+=3, k-=3; k; k--, hw = (hw|*h++)<<8)
+		if (hw == nw) return (char *)h-3;
+	return hw == nw ? (char *)h-3 : 0;
 }
 
 static char *fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
 {
 	uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3];
 	uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3];
-	for (h+=3, k-=3; k; k--, hw = hw<<8 | *++h)
-		if (hw == nw) return (char *)h-3;
-	return 0;
+	for (h+=4, k-=4; k; k--, hw = hw<<8 | *h++)
+		if (hw == nw) return (char *)h-4;
+	return hw == nw ? (char *)h-4 : 0;
 }
 
 #define MAX(a,b) ((a)>(b)?(a):(b))
@@ -100,7 +100,7 @@ static char *twoway_memmem(const unsigned char *h, const unsigned char *z, const
 		if (BITOP(byteset, h[l-1], &)) {
 			k = l-shift[h[l-1]];
 			if (k) {
-				if (mem0 && mem && k < p) k = l-p;
+				if (k < mem) k = mem;
 				h += k;
 				mem = 0;
 				continue;
@@ -140,6 +140,7 @@ void *memmem(const void *h0, size_t k, const void *n0, size_t l)
 	h = memchr(h0, *n, k);
 	if (!h || l==1) return (void *)h;
 	k -= h - (const unsigned char *)h0;
+	if (k<l) return 0;
 	if (l==2) return twobyte_memmem(h, k, n);
 	if (l==3) return threebyte_memmem(h, k, n);
 	if (l==4) return fourbyte_memmem(h, k, n);
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memmove.c b/src/components/lib/libc/musl-1.2.0/src/string/memmove.c
similarity index 78%
rename from src/components/lib/libc/musl-1.1.11/src/string/memmove.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memmove.c
index 27f670e1a3..5dc9cdb924 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/memmove.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/memmove.c
@@ -1,8 +1,10 @@
 #include <string.h>
 #include <stdint.h>
 
-#define WT size_t
+#ifdef __GNUC__
+typedef __attribute__((__may_alias__)) size_t WT;
 #define WS (sizeof(WT))
+#endif
 
 void *memmove(void *dest, const void *src, size_t n)
 {
@@ -10,9 +12,10 @@ void *memmove(void *dest, const void *src, size_t n)
 	const char *s = src;
 
 	if (d==s) return d;
-	if (s+n <= d || d+n <= s) return memcpy(d, s, n);
+	if ((uintptr_t)s-(uintptr_t)d-n <= -2*n) return memcpy(d, s, n);
 
 	if (d<s) {
+#ifdef __GNUC__
 		if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
 			while ((uintptr_t)d % WS) {
 				if (!n--) return dest;
@@ -20,8 +23,10 @@ void *memmove(void *dest, const void *src, size_t n)
 			}
 			for (; n>=WS; n-=WS, d+=WS, s+=WS) *(WT *)d = *(WT *)s;
 		}
+#endif
 		for (; n; n--) *d++ = *s++;
 	} else {
+#ifdef __GNUC__
 		if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
 			while ((uintptr_t)(d+n) % WS) {
 				if (!n--) return dest;
@@ -29,6 +34,7 @@ void *memmove(void *dest, const void *src, size_t n)
 			}
 			while (n>=WS) n-=WS, *(WT *)(d+n) = *(WT *)(s+n);
 		}
+#endif
 		while (n) n--, d[n] = s[n];
 	}
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/mempcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/mempcpy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/mempcpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/mempcpy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memrchr.c b/src/components/lib/libc/musl-1.2.0/src/string/memrchr.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/string/memrchr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memrchr.c
index a78e9d6caf..e51748b805 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/memrchr.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/memrchr.c
@@ -1,5 +1,4 @@
 #include <string.h>
-#include "libc.h"
 
 void *__memrchr(const void *m, int c, size_t n)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/memset.c b/src/components/lib/libc/musl-1.2.0/src/string/memset.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/string/memset.c
rename to src/components/lib/libc/musl-1.2.0/src/string/memset.c
index f438b073ae..5613a1486e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/memset.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/memset.c
@@ -11,12 +11,16 @@ void *memset(void *dest, int c, size_t n)
 	 * offsets are well-defined and in the dest region. */
 
 	if (!n) return dest;
-	s[0] = s[n-1] = c;
+	s[0] = c;
+	s[n-1] = c;
 	if (n <= 2) return dest;
-	s[1] = s[n-2] = c;
-	s[2] = s[n-3] = c;
+	s[1] = c;
+	s[2] = c;
+	s[n-2] = c;
+	s[n-3] = c;
 	if (n <= 6) return dest;
-	s[3] = s[n-4] = c;
+	s[3] = c;
+	s[n-4] = c;
 	if (n <= 8) return dest;
 
 	/* Advance pointer to align it at a 4-byte boundary,
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/rindex.c b/src/components/lib/libc/musl-1.2.0/src/string/rindex.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/rindex.c
rename to src/components/lib/libc/musl-1.2.0/src/string/rindex.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/stpcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/stpcpy.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/string/stpcpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/stpcpy.c
index 06623c4491..4db46a9e50 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/stpcpy.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/stpcpy.c
@@ -1,7 +1,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <limits.h>
-#include "libc.h"
 
 #define ALIGN (sizeof(size_t))
 #define ONES ((size_t)-1/UCHAR_MAX)
@@ -10,9 +9,10 @@
 
 char *__stpcpy(char *restrict d, const char *restrict s)
 {
-	size_t *wd;
-	const size_t *ws;
-
+#ifdef __GNUC__
+	typedef size_t __attribute__((__may_alias__)) word;
+	word *wd;
+	const word *ws;
 	if ((uintptr_t)s % ALIGN == (uintptr_t)d % ALIGN) {
 		for (; (uintptr_t)s % ALIGN; s++, d++)
 			if (!(*d=*s)) return d;
@@ -20,6 +20,7 @@ char *__stpcpy(char *restrict d, const char *restrict s)
 		for (; !HASZERO(*ws); *wd++ = *ws++);
 		d=(void *)wd; s=(const void *)ws;
 	}
+#endif
 	for (; (*d=*s); s++, d++);
 
 	return d;
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/stpncpy.c b/src/components/lib/libc/musl-1.2.0/src/string/stpncpy.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/string/stpncpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/stpncpy.c
index 1f57a4ddbd..f57fa6b71b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/stpncpy.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/stpncpy.c
@@ -1,7 +1,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <limits.h>
-#include "libc.h"
 
 #define ALIGN (sizeof(size_t)-1)
 #define ONES ((size_t)-1/UCHAR_MAX)
@@ -10,9 +9,10 @@
 
 char *__stpncpy(char *restrict d, const char *restrict s, size_t n)
 {
-	size_t *wd;
-	const size_t *ws;
-
+#ifdef __GNUC__
+	typedef size_t __attribute__((__may_alias__)) word;
+	word *wd;
+	const word *ws;
 	if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
 		for (; ((uintptr_t)s & ALIGN) && n && (*d=*s); n--, s++, d++);
 		if (!n || !*s) goto tail;
@@ -21,6 +21,7 @@ char *__stpncpy(char *restrict d, const char *restrict s, size_t n)
 		       n-=sizeof(size_t), ws++, wd++) *wd = *ws;
 		d=(void *)wd; s=(const void *)ws;
 	}
+#endif
 	for (; n && (*d=*s); n--, s++, d++);
 tail:
 	memset(d, 0, n);
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strcasecmp.c b/src/components/lib/libc/musl-1.2.0/src/string/strcasecmp.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/string/strcasecmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strcasecmp.c
index 3cd5f2d024..002c6aa15b 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/strcasecmp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strcasecmp.c
@@ -1,6 +1,5 @@
 #include <strings.h>
 #include <ctype.h>
-#include "libc.h"
 
 int strcasecmp(const char *_l, const char *_r)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strcasestr.c b/src/components/lib/libc/musl-1.2.0/src/string/strcasestr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strcasestr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strcasestr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strcat.c b/src/components/lib/libc/musl-1.2.0/src/string/strcat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strcat.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strcat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strchr.c b/src/components/lib/libc/musl-1.2.0/src/string/strchr.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/string/strchr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strchr.c
index bfae8f9f84..3cbc828beb 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/strchr.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strchr.c
@@ -1,7 +1,5 @@
 #include <string.h>
 
-char *__strchrnul(const char *, int);
-
 char *strchr(const char *s, int c)
 {
 	char *r = __strchrnul(s, c);
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/strchrnul.c b/src/components/lib/libc/musl-1.2.0/src/string/strchrnul.c
new file mode 100644
index 0000000000..39e2635b30
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strchrnul.c
@@ -0,0 +1,28 @@
+#include <string.h>
+#include <stdint.h>
+#include <limits.h>
+
+#define ALIGN (sizeof(size_t))
+#define ONES ((size_t)-1/UCHAR_MAX)
+#define HIGHS (ONES * (UCHAR_MAX/2+1))
+#define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
+
+char *__strchrnul(const char *s, int c)
+{
+	c = (unsigned char)c;
+	if (!c) return (char *)s + strlen(s);
+
+#ifdef __GNUC__
+	typedef size_t __attribute__((__may_alias__)) word;
+	const word *w;
+	for (; (uintptr_t)s % ALIGN; s++)
+		if (!*s || *(unsigned char *)s == c) return (char *)s;
+	size_t k = ONES * c;
+	for (w = (void *)s; !HASZERO(*w) && !HASZERO(*w^k); w++);
+	s = (void *)w;
+#endif
+	for (; *s && *(unsigned char *)s != c; s++);
+	return (char *)s;
+}
+
+weak_alias(__strchrnul, strchrnul);
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strcmp.c b/src/components/lib/libc/musl-1.2.0/src/string/strcmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strcmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strcmp.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/strcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/strcpy.c
new file mode 100644
index 0000000000..6668a12956
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strcpy.c
@@ -0,0 +1,7 @@
+#include <string.h>
+
+char *strcpy(char *restrict dest, const char *restrict src)
+{
+	__stpcpy(dest, src);
+	return dest;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strcspn.c b/src/components/lib/libc/musl-1.2.0/src/string/strcspn.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/string/strcspn.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strcspn.c
index cfdba114ca..a0c617bd7c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/strcspn.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strcspn.c
@@ -3,8 +3,6 @@
 #define BITOP(a,b,op) \
  ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))
 
-char *__strchrnul(const char *, int);
-
 size_t strcspn(const char *s, const char *c)
 {
 	const char *a = s;
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/strdup.c b/src/components/lib/libc/musl-1.2.0/src/string/strdup.c
new file mode 100644
index 0000000000..d4c274494f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strdup.c
@@ -0,0 +1,10 @@
+#include <stdlib.h>
+#include <string.h>
+
+char *strdup(const char *s)
+{
+	size_t l = strlen(s);
+	char *d = malloc(l+1);
+	if (!d) return NULL;
+	return memcpy(d, s, l+1);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strerror_r.c b/src/components/lib/libc/musl-1.2.0/src/string/strerror_r.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/string/strerror_r.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strerror_r.c
index da26b4fe98..1dc88bb160 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/strerror_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strerror_r.c
@@ -1,6 +1,5 @@
 #include <string.h>
 #include <errno.h>
-#include "libc.h"
 
 int strerror_r(int err, char *buf, size_t buflen)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strlcat.c b/src/components/lib/libc/musl-1.2.0/src/string/strlcat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strlcat.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strlcat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strlcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/strlcpy.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/string/strlcpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strlcpy.c
index 193d724130..ffa0b0b014 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/strlcpy.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strlcpy.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <limits.h>
-#include "libc.h"
 
 #define ALIGN (sizeof(size_t)-1)
 #define ONES ((size_t)-1/UCHAR_MAX)
@@ -13,9 +12,11 @@ size_t strlcpy(char *d, const char *s, size_t n)
 {
 	char *d0 = d;
 	size_t *wd;
-	const size_t *ws;
 
 	if (!n--) goto finish;
+#ifdef __GNUC__
+	typedef size_t __attribute__((__may_alias__)) word;
+	const word *ws;
 	if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
 		for (; ((uintptr_t)s & ALIGN) && n && (*d=*s); n--, s++, d++);
 		if (n && *s) {
@@ -25,6 +26,7 @@ size_t strlcpy(char *d, const char *s, size_t n)
 			d=(void *)wd; s=(const void *)ws;
 		}
 	}
+#endif
 	for (; n && (*d=*s); n--, s++, d++);
 	*d = 0;
 finish:
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/strlen.c b/src/components/lib/libc/musl-1.2.0/src/string/strlen.c
new file mode 100644
index 0000000000..309990f029
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strlen.c
@@ -0,0 +1,22 @@
+#include <string.h>
+#include <stdint.h>
+#include <limits.h>
+
+#define ALIGN (sizeof(size_t))
+#define ONES ((size_t)-1/UCHAR_MAX)
+#define HIGHS (ONES * (UCHAR_MAX/2+1))
+#define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
+
+size_t strlen(const char *s)
+{
+	const char *a = s;
+#ifdef __GNUC__
+	typedef size_t __attribute__((__may_alias__)) word;
+	const word *w;
+	for (; (uintptr_t)s % ALIGN; s++) if (!*s) return s-a;
+	for (w = (const void *)s; !HASZERO(*w); w++);
+	s = (const void *)w;
+#endif
+	for (; *s; s++);
+	return s-a;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strncasecmp.c b/src/components/lib/libc/musl-1.2.0/src/string/strncasecmp.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/string/strncasecmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strncasecmp.c
index 3af5300878..e0ef93c20d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/strncasecmp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strncasecmp.c
@@ -1,6 +1,5 @@
 #include <strings.h>
 #include <ctype.h>
-#include "libc.h"
 
 int strncasecmp(const char *_l, const char *_r, size_t n)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strncat.c b/src/components/lib/libc/musl-1.2.0/src/string/strncat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strncat.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strncat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strncmp.c b/src/components/lib/libc/musl-1.2.0/src/string/strncmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strncmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strncmp.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/strncpy.c b/src/components/lib/libc/musl-1.2.0/src/string/strncpy.c
new file mode 100644
index 0000000000..545892e6ec
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strncpy.c
@@ -0,0 +1,7 @@
+#include <string.h>
+
+char *strncpy(char *restrict d, const char *restrict s, size_t n)
+{
+	__stpncpy(d, s, n);
+	return d;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strndup.c b/src/components/lib/libc/musl-1.2.0/src/string/strndup.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strndup.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strndup.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strnlen.c b/src/components/lib/libc/musl-1.2.0/src/string/strnlen.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strnlen.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strnlen.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strpbrk.c b/src/components/lib/libc/musl-1.2.0/src/string/strpbrk.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strpbrk.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strpbrk.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/strrchr.c b/src/components/lib/libc/musl-1.2.0/src/string/strrchr.c
new file mode 100644
index 0000000000..98ad1b0454
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strrchr.c
@@ -0,0 +1,6 @@
+#include <string.h>
+
+char *strrchr(const char *s, int c)
+{
+	return __memrchr(s, c, strlen(s) + 1);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strsep.c b/src/components/lib/libc/musl-1.2.0/src/string/strsep.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strsep.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strsep.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strsignal.c b/src/components/lib/libc/musl-1.2.0/src/string/strsignal.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strsignal.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strsignal.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strspn.c b/src/components/lib/libc/musl-1.2.0/src/string/strspn.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strspn.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strspn.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strstr.c b/src/components/lib/libc/musl-1.2.0/src/string/strstr.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/string/strstr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strstr.c
index cd0691275b..55ba1c7b45 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/strstr.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/strstr.c
@@ -108,9 +108,8 @@ static char *twoway_strstr(const unsigned char *h, const unsigned char *n)
 		/* Check last byte first; advance by shift on mismatch */
 		if (BITOP(byteset, h[l-1], &)) {
 			k = l-shift[h[l-1]];
-			//printf("adv by %zu (on %c) at [%s] (%zu;l=%zu)\n", k, h[l-1], h, shift[h[l-1]], l);
 			if (k) {
-				if (mem0 && mem && k < p) k = l-p;
+				if (k < mem) k = mem;
 				h += k;
 				mem = 0;
 				continue;
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strtok.c b/src/components/lib/libc/musl-1.2.0/src/string/strtok.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strtok.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strtok.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strtok_r.c b/src/components/lib/libc/musl-1.2.0/src/string/strtok_r.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strtok_r.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strtok_r.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/strverscmp.c b/src/components/lib/libc/musl-1.2.0/src/string/strverscmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/strverscmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/strverscmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/swab.c b/src/components/lib/libc/musl-1.2.0/src/string/swab.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/swab.c
rename to src/components/lib/libc/musl-1.2.0/src/string/swab.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcpcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/wcpcpy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcpcpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcpcpy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcpncpy.c b/src/components/lib/libc/musl-1.2.0/src/string/wcpncpy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcpncpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcpncpy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcscasecmp.c b/src/components/lib/libc/musl-1.2.0/src/string/wcscasecmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcscasecmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcscasecmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcscasecmp_l.c b/src/components/lib/libc/musl-1.2.0/src/string/wcscasecmp_l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcscasecmp_l.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcscasecmp_l.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcscat.c b/src/components/lib/libc/musl-1.2.0/src/string/wcscat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcscat.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcscat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcschr.c b/src/components/lib/libc/musl-1.2.0/src/string/wcschr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcschr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcschr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcscmp.c b/src/components/lib/libc/musl-1.2.0/src/string/wcscmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcscmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcscmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcscpy.c b/src/components/lib/libc/musl-1.2.0/src/string/wcscpy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcscpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcscpy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcscspn.c b/src/components/lib/libc/musl-1.2.0/src/string/wcscspn.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcscspn.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcscspn.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsdup.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsdup.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsdup.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsdup.c
index dd49c1b629..f398e8091c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/string/wcsdup.c
+++ b/src/components/lib/libc/musl-1.2.0/src/string/wcsdup.c
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #include <wchar.h>
-#include "libc.h"
 
 wchar_t *wcsdup(const wchar_t *s)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcslen.c b/src/components/lib/libc/musl-1.2.0/src/string/wcslen.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcslen.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcslen.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsncasecmp.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsncasecmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsncasecmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsncasecmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsncasecmp_l.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsncasecmp_l.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsncasecmp_l.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsncasecmp_l.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsncat.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsncat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsncat.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsncat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsncmp.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsncmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsncmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsncmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsncpy.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsncpy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsncpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsncpy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsnlen.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsnlen.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsnlen.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsnlen.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcspbrk.c b/src/components/lib/libc/musl-1.2.0/src/string/wcspbrk.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcspbrk.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcspbrk.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsrchr.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsrchr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsrchr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsrchr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsspn.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsspn.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsspn.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsspn.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcsstr.c b/src/components/lib/libc/musl-1.2.0/src/string/wcsstr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcsstr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcsstr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcstok.c b/src/components/lib/libc/musl-1.2.0/src/string/wcstok.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcstok.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcstok.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wcswcs.c b/src/components/lib/libc/musl-1.2.0/src/string/wcswcs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wcswcs.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wcswcs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wmemchr.c b/src/components/lib/libc/musl-1.2.0/src/string/wmemchr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wmemchr.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wmemchr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wmemcmp.c b/src/components/lib/libc/musl-1.2.0/src/string/wmemcmp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wmemcmp.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wmemcmp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wmemcpy.c b/src/components/lib/libc/musl-1.2.0/src/string/wmemcpy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wmemcpy.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wmemcpy.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/string/wmemmove.c b/src/components/lib/libc/musl-1.2.0/src/string/wmemmove.c
new file mode 100644
index 0000000000..964c903299
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/string/wmemmove.c
@@ -0,0 +1,13 @@
+#include <wchar.h>
+#include <stdint.h>
+
+wchar_t *wmemmove(wchar_t *d, const wchar_t *s, size_t n)
+{
+	wchar_t *d0 = d;
+	if (d == s) return d;
+	if ((uintptr_t)d-(uintptr_t)s < n * sizeof *d)
+		while (n--) d[n] = s[n];
+	else
+		while (n--) *d++ = *s++;
+	return d0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/wmemset.c b/src/components/lib/libc/musl-1.2.0/src/string/wmemset.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/wmemset.c
rename to src/components/lib/libc/musl-1.2.0/src/string/wmemset.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/x86_64/memcpy.s b/src/components/lib/libc/musl-1.2.0/src/string/x86_64/memcpy.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/x86_64/memcpy.s
rename to src/components/lib/libc/musl-1.2.0/src/string/x86_64/memcpy.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/x86_64/memmove.s b/src/components/lib/libc/musl-1.2.0/src/string/x86_64/memmove.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/x86_64/memmove.s
rename to src/components/lib/libc/musl-1.2.0/src/string/x86_64/memmove.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/string/x86_64/memset.s b/src/components/lib/libc/musl-1.2.0/src/string/x86_64/memset.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/string/x86_64/memset.s
rename to src/components/lib/libc/musl-1.2.0/src/string/x86_64/memset.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/temp/__randname.c b/src/components/lib/libc/musl-1.2.0/src/temp/__randname.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/temp/__randname.c
rename to src/components/lib/libc/musl-1.2.0/src/temp/__randname.c
index 464b83d5f9..2bce37a0c4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/temp/__randname.c
+++ b/src/components/lib/libc/musl-1.2.0/src/temp/__randname.c
@@ -1,8 +1,6 @@
 #include <time.h>
 #include <stdint.h>
 
-int __clock_gettime(clockid_t, struct timespec *);
-
 /* This assumes that a check for the
    template size has already been made */
 char *__randname(char *template)
diff --git a/src/components/lib/libc/musl-1.1.11/src/temp/mkdtemp.c b/src/components/lib/libc/musl-1.2.0/src/temp/mkdtemp.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/temp/mkdtemp.c
rename to src/components/lib/libc/musl-1.2.0/src/temp/mkdtemp.c
index 6c2c16ef2e..5708257bfe 100644
--- a/src/components/lib/libc/musl-1.1.11/src/temp/mkdtemp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/temp/mkdtemp.c
@@ -3,8 +3,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-char *__randname(char *);
-
 char *mkdtemp(char *template)
 {
 	size_t l = strlen(template);
diff --git a/src/components/lib/libc/musl-1.2.0/src/temp/mkostemp.c b/src/components/lib/libc/musl-1.2.0/src/temp/mkostemp.c
new file mode 100644
index 0000000000..d8dcb8052d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/temp/mkostemp.c
@@ -0,0 +1,9 @@
+#define _BSD_SOURCE
+#include <stdlib.h>
+
+int mkostemp(char *template, int flags)
+{
+	return __mkostemps(template, 0, flags);
+}
+
+weak_alias(mkostemp, mkostemp64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/temp/mkostemps.c b/src/components/lib/libc/musl-1.2.0/src/temp/mkostemps.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/temp/mkostemps.c
rename to src/components/lib/libc/musl-1.2.0/src/temp/mkostemps.c
index 512b5f188a..ef24eeae2c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/temp/mkostemps.c
+++ b/src/components/lib/libc/musl-1.2.0/src/temp/mkostemps.c
@@ -1,11 +1,9 @@
 #define _BSD_SOURCE
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include "libc.h"
-
-char *__randname(char *);
 
 int __mkostemps(char *template, int len, int flags)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/temp/mkstemp.c b/src/components/lib/libc/musl-1.2.0/src/temp/mkstemp.c
new file mode 100644
index 0000000000..166b8afe49
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/temp/mkstemp.c
@@ -0,0 +1,8 @@
+#include <stdlib.h>
+
+int mkstemp(char *template)
+{
+	return __mkostemps(template, 0, 0);
+}
+
+weak_alias(mkstemp, mkstemp64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/temp/mkstemps.c b/src/components/lib/libc/musl-1.2.0/src/temp/mkstemps.c
new file mode 100644
index 0000000000..6b7531b5e9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/temp/mkstemps.c
@@ -0,0 +1,9 @@
+#define _BSD_SOURCE
+#include <stdlib.h>
+
+int mkstemps(char *template, int len)
+{
+	return __mkostemps(template, len, 0);
+}
+
+weak_alias(mkstemps, mkstemps64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/temp/mktemp.c b/src/components/lib/libc/musl-1.2.0/src/temp/mktemp.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/temp/mktemp.c
rename to src/components/lib/libc/musl-1.2.0/src/temp/mktemp.c
index 4ab0df2069..7b3d2648b2 100644
--- a/src/components/lib/libc/musl-1.1.11/src/temp/mktemp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/temp/mktemp.c
@@ -4,8 +4,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-char *__randname(char *);
-
 char *mktemp(char *template)
 {
 	size_t l = strlen(template);
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/cfgetospeed.c b/src/components/lib/libc/musl-1.2.0/src/termios/cfgetospeed.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/termios/cfgetospeed.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/cfgetospeed.c
index 0ebc198c1c..55fa6f55c0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/termios/cfgetospeed.c
+++ b/src/components/lib/libc/musl-1.2.0/src/termios/cfgetospeed.c
@@ -1,3 +1,4 @@
+#define _BSD_SOURCE
 #include <termios.h>
 #include <sys/ioctl.h>
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/cfmakeraw.c b/src/components/lib/libc/musl-1.2.0/src/termios/cfmakeraw.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/termios/cfmakeraw.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/cfmakeraw.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/cfsetospeed.c b/src/components/lib/libc/musl-1.2.0/src/termios/cfsetospeed.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/termios/cfsetospeed.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/cfsetospeed.c
index 80c790f1fd..c9cbdd9d9d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/termios/cfsetospeed.c
+++ b/src/components/lib/libc/musl-1.2.0/src/termios/cfsetospeed.c
@@ -1,7 +1,7 @@
+#define _BSD_SOURCE
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include "libc.h"
 
 int cfsetospeed(struct termios *tio, speed_t speed)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/tcdrain.c b/src/components/lib/libc/musl-1.2.0/src/termios/tcdrain.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/termios/tcdrain.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/tcdrain.c
index 6e43afb756..c0e542b3e5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/termios/tcdrain.c
+++ b/src/components/lib/libc/musl-1.2.0/src/termios/tcdrain.c
@@ -1,6 +1,5 @@
 #include <termios.h>
 #include <sys/ioctl.h>
-#include "libc.h"
 #include "syscall.h"
 
 int tcdrain(int fd)
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/tcflow.c b/src/components/lib/libc/musl-1.2.0/src/termios/tcflow.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/termios/tcflow.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/tcflow.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/tcflush.c b/src/components/lib/libc/musl-1.2.0/src/termios/tcflush.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/termios/tcflush.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/tcflush.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/tcgetattr.c b/src/components/lib/libc/musl-1.2.0/src/termios/tcgetattr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/termios/tcgetattr.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/tcgetattr.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/tcgetsid.c b/src/components/lib/libc/musl-1.2.0/src/termios/tcgetsid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/termios/tcgetsid.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/tcgetsid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/tcsendbreak.c b/src/components/lib/libc/musl-1.2.0/src/termios/tcsendbreak.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/termios/tcsendbreak.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/tcsendbreak.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/termios/tcsetattr.c b/src/components/lib/libc/musl-1.2.0/src/termios/tcsetattr.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/termios/tcsetattr.c
rename to src/components/lib/libc/musl-1.2.0/src/termios/tcsetattr.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/__lock.c b/src/components/lib/libc/musl-1.2.0/src/thread/__lock.c
new file mode 100644
index 0000000000..45557c8885
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/__lock.c
@@ -0,0 +1,60 @@
+#include "pthread_impl.h"
+
+/* This lock primitive combines a flag (in the sign bit) and a
+ * congestion count (= threads inside the critical section, CS) in a
+ * single int that is accessed through atomic operations. The states
+ * of the int for value x are:
+ *
+ * x == 0: unlocked and no thread inside the critical section
+ *
+ * x < 0: locked with a congestion of x-INT_MIN, including the thread
+ * that holds the lock
+ *
+ * x > 0: unlocked with a congestion of x
+ *
+ * or in an equivalent formulation x is the congestion count or'ed
+ * with INT_MIN as a lock flag.
+ */
+
+void __lock(volatile int *l)
+{
+	if (!libc.threads_minus_1) return;
+	/* fast path: INT_MIN for the lock, +1 for the congestion */
+	int current = a_cas(l, 0, INT_MIN + 1);
+	if (!current) return;
+	/* A first spin loop, for medium congestion. */
+	for (unsigned i = 0; i < 10; ++i) {
+		if (current < 0) current -= INT_MIN + 1;
+		// assertion: current >= 0
+		int val = a_cas(l, current, INT_MIN + (current + 1));
+		if (val == current) return;
+		current = val;
+	}
+	// Spinning failed, so mark ourselves as being inside the CS.
+	current = a_fetch_add(l, 1) + 1;
+	/* The main lock acquisition loop for heavy congestion. The only
+	 * change to the value performed inside that loop is a successful
+	 * lock via the CAS that acquires the lock. */
+	for (;;) {
+		/* We can only go into wait, if we know that somebody holds the
+		 * lock and will eventually wake us up, again. */
+		if (current < 0) {
+			__futexwait(l, current, 1);
+			current -= INT_MIN + 1;
+		}
+		/* assertion: current > 0, the count includes us already. */
+		int val = a_cas(l, current, INT_MIN + current);
+		if (val == current) return;
+		current = val;
+	}
+}
+
+void __unlock(volatile int *l)
+{
+	/* Check l[0] to see if we are multi-threaded. */
+	if (l[0] < 0) {
+		if (a_fetch_add(l, -(INT_MIN + 1)) != (INT_MIN + 1)) {
+			__wake(l, 1, 1);
+		}
+	}
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__set_thread_area.c b/src/components/lib/libc/musl-1.2.0/src/thread/__set_thread_area.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/__set_thread_area.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/__set_thread_area.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__syscall_cp.c b/src/components/lib/libc/musl-1.2.0/src/thread/__syscall_cp.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/thread/__syscall_cp.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/__syscall_cp.c
index 65e0a787fc..280938f419 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/__syscall_cp.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/__syscall_cp.c
@@ -2,13 +2,10 @@
 #include "syscall.h"
 
 #ifdef SHARED
-__attribute__((__visibility__("hidden")))
+hidden
 #endif
 long __syscall_cp_c();
 
-__attribute__((weak, regparm(1)))
-long __cos_syscall(int syscall_num, long a, long b, long c, long d, long e, long f, long g);
-
 static long sccp(syscall_arg_t nr,
                  syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
                  syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/__timedwait.c b/src/components/lib/libc/musl-1.2.0/src/thread/__timedwait.c
new file mode 100644
index 0000000000..666093be98
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/__timedwait.c
@@ -0,0 +1,71 @@
+#include <pthread.h>
+#include <time.h>
+#include <errno.h>
+#include "futex.h"
+#include "syscall.h"
+#include "pthread_impl.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+static int __futex4_cp(volatile void *addr, int op, int val, const struct timespec *to)
+{
+	int r;
+#ifdef SYS_futex_time64
+	time_t s = to ? to->tv_sec : 0;
+	long ns = to ? to->tv_nsec : 0;
+	r = -ENOSYS;
+	if (SYS_futex == SYS_futex_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_futex_time64, addr, op, val,
+			to ? ((long long[]){s, ns}) : 0);
+	if (SYS_futex == SYS_futex_time64 || r!=-ENOSYS) return r;
+	to = to ? (void *)(long[]){CLAMP(s), ns} : 0;
+#endif
+	r = __syscall_cp(SYS_futex, addr, op, val, to);
+	if (r != -ENOSYS) return r;
+	return __syscall_cp(SYS_futex, addr, op & ~FUTEX_PRIVATE, val, to);
+}
+
+static volatile int dummy = 0;
+weak_alias(dummy, __eintr_valid_flag);
+
+int __timedwait_cp(volatile int *addr, int val,
+	clockid_t clk, const struct timespec *at, int priv)
+{
+	int r;
+	struct timespec to, *top=0;
+
+	if (priv) priv = FUTEX_PRIVATE;
+
+	if (at) {
+		if (at->tv_nsec >= 1000000000UL) return EINVAL;
+		if (__clock_gettime(clk, &to)) return EINVAL;
+		to.tv_sec = at->tv_sec - to.tv_sec;
+		if ((to.tv_nsec = at->tv_nsec - to.tv_nsec) < 0) {
+			to.tv_sec--;
+			to.tv_nsec += 1000000000;
+		}
+		if (to.tv_sec < 0) return ETIMEDOUT;
+		top = &to;
+	}
+
+	r = -__futex4_cp(addr, FUTEX_WAIT|priv, val, top);
+	if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0;
+	/* Mitigate bug in old kernels wrongly reporting EINTR for non-
+	 * interrupting (SA_RESTART) signal handlers. This is only practical
+	 * when NO interrupting signal handlers have been installed, and
+	 * works by sigaction tracking whether that's the case. */
+	if (r == EINTR && !__eintr_valid_flag) r = 0;
+
+	return r;
+}
+
+int __timedwait(volatile int *addr, int val,
+	clockid_t clk, const struct timespec *at, int priv)
+{
+	int cs, r;
+	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	r = __timedwait_cp(addr, val, clk, at, priv);
+	__pthread_setcancelstate(cs, 0);
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/__tls_get_addr.c b/src/components/lib/libc/musl-1.2.0/src/thread/__tls_get_addr.c
new file mode 100644
index 0000000000..19524fe076
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/__tls_get_addr.c
@@ -0,0 +1,7 @@
+#include "pthread_impl.h"
+
+void *__tls_get_addr(tls_mod_off_t *v)
+{
+	pthread_t self = __pthread_self();
+	return (void *)(self->dtv[v[0]] + v[1]);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/__unmapself.c b/src/components/lib/libc/musl-1.2.0/src/thread/__unmapself.c
new file mode 100644
index 0000000000..31d94e67ed
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/__unmapself.c
@@ -0,0 +1,24 @@
+#include "pthread_impl.h"
+#include "atomic.h"
+#include "syscall.h"
+/* cheat and reuse CRTJMP macro from dynlink code */
+#include "dynlink.h"
+
+static void *unmap_base;
+static size_t unmap_size;
+static char shared_stack[256];
+
+static void do_unmap()
+{
+	__syscall(SYS_munmap, unmap_base, unmap_size);
+	__syscall(SYS_exit);
+}
+
+void __unmapself(void *base, size_t size)
+{
+	char *stack = shared_stack + sizeof shared_stack;
+	stack -= (uintptr_t)stack % 16;
+	unmap_base = base;
+	unmap_size = size;
+	CRTJMP(do_unmap, stack);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/__wait.c b/src/components/lib/libc/musl-1.2.0/src/thread/__wait.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/__wait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/__wait.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/__set_thread_area.s
new file mode 100644
index 0000000000..fd0df34b04
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/__set_thread_area.s
@@ -0,0 +1,7 @@
+.global __set_thread_area
+.hidden __set_thread_area
+.type   __set_thread_area,@function
+__set_thread_area:
+	msr tpidr_el0,x0
+	mov w0,#0
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/aarch64/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/aarch64/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/aarch64/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/clone.s
new file mode 100644
index 0000000000..e3c83395ca
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/clone.s
@@ -0,0 +1,30 @@
+// __clone(func, stack, flags, arg, ptid, tls, ctid)
+//         x0,   x1,    w2,    x3,  x4,   x5,  x6
+
+// syscall(SYS_clone, flags, stack, ptid, tls, ctid)
+//         x8,        x0,    x1,    x2,   x3,  x4
+
+.global __clone
+.hidden __clone
+.type   __clone,%function
+__clone:
+	// align stack and save func,arg
+	and x1,x1,#-16
+	stp x0,x3,[x1,#-16]!
+
+	// syscall
+	uxtw x0,w2
+	mov x2,x4
+	mov x3,x5
+	mov x4,x6
+	mov x8,#220 // SYS_clone
+	svc #0
+
+	cbz x0,1f
+	// parent
+	ret
+	// child
+1:	ldp x1,x0,[sp],#16
+	blr x1
+	mov x8,#93 // SYS_exit
+	svc #0
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/syscall_cp.s
new file mode 100644
index 0000000000..41db68af95
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/aarch64/syscall_cp.s
@@ -0,0 +1,32 @@
+// __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z)
+//                  x0             x1  x2 x3 x4 x5 x6 x7
+
+// syscall(nr, u, v, w, x, y, z)
+//         x8  x0 x1 x2 x3 x4 x5
+
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type __syscall_cp_asm,%function
+__syscall_cp_asm:
+__cp_begin:
+	ldr w0,[x0]
+	cbnz w0,__cp_cancel
+	mov x8,x1
+	mov x0,x2
+	mov x1,x3
+	mov x2,x4
+	mov x3,x5
+	mov x4,x6
+	mov x5,x7
+	svc 0
+__cp_end:
+	ret
+__cp_cancel:
+	b __cancel
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/arm/__aeabi_read_tp.s b/src/components/lib/libc/musl-1.2.0/src/thread/arm/__aeabi_read_tp.s
new file mode 100644
index 0000000000..2585620c44
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/arm/__aeabi_read_tp.s
@@ -0,0 +1,10 @@
+.syntax unified
+.global __aeabi_read_tp
+.type __aeabi_read_tp,%function
+__aeabi_read_tp:
+	ldr r0,1f
+	add r0,r0,pc
+	ldr r0,[r0]
+2:	bx r0
+	.align 2
+1:	.word __a_gettp_ptr - 2b
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/arm/__set_thread_area.c b/src/components/lib/libc/musl-1.2.0/src/thread/arm/__set_thread_area.c
new file mode 100644
index 0000000000..09de65aab0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/arm/__set_thread_area.c
@@ -0,0 +1,52 @@
+#include <stdint.h>
+#include <elf.h>
+#include "pthread_impl.h"
+#include "libc.h"
+
+#define HWCAP_TLS (1 << 15)
+
+extern hidden const unsigned char
+	__a_barrier_oldkuser[], __a_barrier_v6[], __a_barrier_v7[],
+	__a_cas_v6[], __a_cas_v7[],
+	__a_gettp_cp15[];
+
+#define __a_barrier_kuser 0xffff0fa0
+#define __a_barrier_oldkuser (uintptr_t)__a_barrier_oldkuser
+#define __a_barrier_v6 (uintptr_t)__a_barrier_v6
+#define __a_barrier_v7 (uintptr_t)__a_barrier_v7
+
+#define __a_cas_kuser 0xffff0fc0
+#define __a_cas_v6 (uintptr_t)__a_cas_v6
+#define __a_cas_v7 (uintptr_t)__a_cas_v7
+
+#define __a_gettp_kuser 0xffff0fe0
+#define __a_gettp_cp15 (uintptr_t)__a_gettp_cp15
+
+extern hidden uintptr_t __a_barrier_ptr, __a_cas_ptr, __a_gettp_ptr;
+
+int __set_thread_area(void *p)
+{
+#if !__ARM_ARCH_7A__ && !__ARM_ARCH_7R__ && __ARM_ARCH < 7
+	if (__hwcap & HWCAP_TLS) {
+		size_t *aux;
+		__a_cas_ptr = __a_cas_v7;
+		__a_barrier_ptr = __a_barrier_v7;
+		for (aux=libc.auxv; *aux; aux+=2) {
+			if (*aux != AT_PLATFORM) continue;
+			const char *s = (void *)aux[1];
+			if (s[0]!='v' || s[1]!='6' || s[2]-'0'<10u) break;
+			__a_cas_ptr = __a_cas_v6;
+			__a_barrier_ptr = __a_barrier_v6;
+			break;
+		}
+	} else {
+		int ver = *(int *)0xffff0ffc;
+		__a_gettp_ptr = __a_gettp_kuser;
+		__a_cas_ptr = __a_cas_kuser;
+		__a_barrier_ptr = __a_barrier_kuser;
+		if (ver < 2) a_crash();
+		if (ver < 3) __a_barrier_ptr = __a_barrier_oldkuser;
+	}
+#endif
+	return __syscall(0xf0005, p);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/arm/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/arm/__unmapself.s
new file mode 100644
index 0000000000..29c2d07b16
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/arm/__unmapself.s
@@ -0,0 +1,9 @@
+.syntax unified
+.text
+.global __unmapself
+.type   __unmapself,%function
+__unmapself:
+	mov r7,#91
+	svc 0
+	mov r7,#1
+	svc 0
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/arm/atomics.s b/src/components/lib/libc/musl-1.2.0/src/thread/arm/atomics.s
new file mode 100644
index 0000000000..da50508d8d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/arm/atomics.s
@@ -0,0 +1,106 @@
+.syntax unified
+.text
+
+.global __a_barrier_dummy
+.hidden __a_barrier_dummy
+.type __a_barrier_dummy,%function
+__a_barrier_dummy:
+	bx lr
+
+.global __a_barrier_oldkuser
+.hidden __a_barrier_oldkuser
+.type __a_barrier_oldkuser,%function
+__a_barrier_oldkuser:
+	push {r0,r1,r2,r3,ip,lr}
+	mov r1,r0
+	mov r2,sp
+	ldr ip,=0xffff0fc0
+	bl 1f
+	pop {r0,r1,r2,r3,ip,lr}
+	bx lr
+1:	bx ip
+
+.global __a_barrier_v6
+.hidden __a_barrier_v6
+.type __a_barrier_v6,%function
+__a_barrier_v6:
+	.arch armv6t2
+	mcr p15,0,r0,c7,c10,5
+	bx lr
+
+.global __a_barrier_v7
+.hidden __a_barrier_v7
+.type __a_barrier_v7,%function
+__a_barrier_v7:
+	.arch armv7-a
+	dmb ish
+	bx lr
+
+.global __a_cas_dummy
+.hidden __a_cas_dummy
+.type __a_cas_dummy,%function
+__a_cas_dummy:
+	mov r3,r0
+	ldr r0,[r2]
+	subs r0,r3,r0
+	streq r1,[r2]
+	bx lr
+
+.global __a_cas_v6
+.hidden __a_cas_v6
+.type __a_cas_v6,%function
+__a_cas_v6:
+	.arch armv6t2
+	mov r3,r0
+	mcr p15,0,r0,c7,c10,5
+1:	ldrex r0,[r2]
+	subs r0,r3,r0
+	strexeq r0,r1,[r2]
+	teqeq r0,#1
+	beq 1b
+	mcr p15,0,r0,c7,c10,5
+	bx lr
+
+.global __a_cas_v7
+.hidden __a_cas_v7
+.type __a_cas_v7,%function
+__a_cas_v7:
+	.arch armv7-a
+	mov r3,r0
+	dmb ish
+1:	ldrex r0,[r2]
+	subs r0,r3,r0
+	strexeq r0,r1,[r2]
+	teqeq r0,#1
+	beq 1b
+	dmb ish
+	bx lr
+
+.global __a_gettp_cp15
+.hidden __a_gettp_cp15
+.type __a_gettp_cp15,%function
+__a_gettp_cp15:
+	mrc p15,0,r0,c13,c0,3
+	bx lr
+
+/* Tag this file with minimum ISA level so as not to affect linking. */
+.object_arch armv4t
+.eabi_attribute 6,2
+
+.data
+.align 2
+
+.global __a_barrier_ptr
+.hidden __a_barrier_ptr
+__a_barrier_ptr:
+	.word __a_barrier_dummy
+
+.global __a_cas_ptr
+.hidden __a_cas_ptr
+__a_cas_ptr:
+	.word __a_cas_dummy
+
+.global __a_gettp_ptr
+.hidden __a_gettp_ptr
+__a_gettp_ptr:
+	.word __a_gettp_cp15
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/arm/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/arm/clone.s
new file mode 100644
index 0000000000..bb0965dafe
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/arm/clone.s
@@ -0,0 +1,28 @@
+.syntax unified
+.text
+.global __clone
+.hidden __clone
+.type   __clone,%function
+__clone:
+	stmfd sp!,{r4,r5,r6,r7}
+	mov r7,#120
+	mov r6,r3
+	mov r5,r0
+	mov r0,r2
+	and r1,r1,#-16
+	ldr r2,[sp,#16]
+	ldr r3,[sp,#20]
+	ldr r4,[sp,#24]
+	svc 0
+	tst r0,r0
+	beq 1f
+	ldmfd sp!,{r4,r5,r6,r7}
+	bx lr
+
+1:	mov r0,r6
+	bl 3f
+2:	mov r7,#1
+	svc 0
+	b 2b
+
+3:	bx r5
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/arm/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/arm/syscall_cp.s
new file mode 100644
index 0000000000..e607dd426a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/arm/syscall_cp.s
@@ -0,0 +1,29 @@
+.syntax unified
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type __syscall_cp_asm,%function
+__syscall_cp_asm:
+	mov ip,sp
+	stmfd sp!,{r4,r5,r6,r7}
+__cp_begin:
+	ldr r0,[r0]
+	cmp r0,#0
+	bne __cp_cancel
+	mov r7,r1
+	mov r0,r2
+	mov r1,r3
+	ldmfd ip,{r2,r3,r4,r5,r6}
+	svc 0
+__cp_end:
+	ldmfd sp!,{r4,r5,r6,r7}
+	bx lr
+__cp_cancel:
+	ldmfd sp!,{r4,r5,r6,r7}
+	b __cancel
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/call_once.c b/src/components/lib/libc/musl-1.2.0/src/thread/call_once.c
new file mode 100644
index 0000000000..5ed30183df
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/call_once.c
@@ -0,0 +1,7 @@
+#include <threads.h>
+#include <pthread.h>
+
+void call_once(once_flag *flag, void (*func)(void))
+{
+	__pthread_once(flag, func);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/clone.c b/src/components/lib/libc/musl-1.2.0/src/thread/clone.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/clone.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/clone.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/cnd_broadcast.c b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_broadcast.c
new file mode 100644
index 0000000000..e76b5a81bd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_broadcast.c
@@ -0,0 +1,9 @@
+#include <threads.h>
+#include <pthread.h>
+
+int cnd_broadcast(cnd_t *c)
+{
+	/* This internal function never fails, and always returns zero,
+	 * which matches the value thrd_success is defined with. */
+	return __private_cond_signal((pthread_cond_t *)c, -1);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/cnd_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/cnd_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/cnd_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/cnd_init.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/cnd_signal.c b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_signal.c
new file mode 100644
index 0000000000..02cdc6c60a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_signal.c
@@ -0,0 +1,9 @@
+#include <threads.h>
+#include <pthread.h>
+
+int cnd_signal(cnd_t *c)
+{
+	/* This internal function never fails, and always returns zero,
+	 * which matches the value thrd_success is defined with. */
+	return __private_cond_signal((pthread_cond_t *)c, 1);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/cnd_timedwait.c b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_timedwait.c
new file mode 100644
index 0000000000..2802af522a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_timedwait.c
@@ -0,0 +1,14 @@
+#include <threads.h>
+#include <pthread.h>
+#include <errno.h>
+
+int cnd_timedwait(cnd_t *restrict c, mtx_t *restrict m, const struct timespec *restrict ts)
+{
+	int ret = __pthread_cond_timedwait((pthread_cond_t *)c, (pthread_mutex_t *)m, ts);
+	switch (ret) {
+	/* May also return EINVAL or EPERM. */
+	default:        return thrd_error;
+	case 0:         return thrd_success;
+	case ETIMEDOUT: return thrd_timedout;
+	}
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/cnd_wait.c b/src/components/lib/libc/musl-1.2.0/src/thread/cnd_wait.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/cnd_wait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/cnd_wait.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/default_attr.c b/src/components/lib/libc/musl-1.2.0/src/thread/default_attr.c
new file mode 100644
index 0000000000..dce9640964
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/default_attr.c
@@ -0,0 +1,4 @@
+#include "pthread_impl.h"
+
+unsigned __default_stacksize = DEFAULT_STACK_SIZE;
+unsigned __default_guardsize = DEFAULT_GUARD_SIZE;
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/i386/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/i386/__set_thread_area.s
new file mode 100644
index 0000000000..c2c21dd5d6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/i386/__set_thread_area.s
@@ -0,0 +1,46 @@
+.text
+.global __set_thread_area
+.hidden __set_thread_area
+.type   __set_thread_area,@function
+__set_thread_area:
+	push %ebx
+	push $0x51
+	push $0xfffff
+	push 16(%esp)
+	call 1f
+1:	addl $4f-1b,(%esp)
+	pop %ecx
+	mov (%ecx),%edx
+	push %edx
+	mov %esp,%ebx
+	xor %eax,%eax
+	mov $243,%al
+	int $128
+	testl %eax,%eax
+	jnz 2f
+	movl (%esp),%edx
+	movl %edx,(%ecx)
+	leal 3(,%edx,8),%edx
+3:	movw %dx,%gs
+1:
+	addl $16,%esp
+	popl %ebx
+	ret
+2:
+	mov %ebx,%ecx
+	xor %ebx,%ebx
+	xor %edx,%edx
+	mov %ebx,(%esp)
+	mov $1,%bl
+	mov $16,%dl
+	mov $123,%al
+	int $128
+	testl %eax,%eax
+	jnz 1b
+	mov $7,%dl
+	inc %al
+	jmp 3b
+
+.data
+	.align 4
+4:	.long -1
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/i386/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/i386/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/i386/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/i386/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/i386/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/i386/syscall_cp.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/i386/syscall_cp.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/i386/syscall_cp.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/i386/tls.s b/src/components/lib/libc/musl-1.2.0/src/thread/i386/tls.s
new file mode 100644
index 0000000000..6e4c4cb928
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/i386/tls.s
@@ -0,0 +1,9 @@
+.text
+.global ___tls_get_addr
+.type ___tls_get_addr,@function
+___tls_get_addr:
+	mov %gs:4,%edx
+	mov (%eax),%ecx
+	mov 4(%eax),%eax
+	add (%edx,%ecx,4),%eax
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/lock_ptc.c b/src/components/lib/libc/musl-1.2.0/src/thread/lock_ptc.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/lock_ptc.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/lock_ptc.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/m68k/__m68k_read_tp.s b/src/components/lib/libc/musl-1.2.0/src/thread/m68k/__m68k_read_tp.s
new file mode 100644
index 0000000000..86886da8a5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/m68k/__m68k_read_tp.s
@@ -0,0 +1,8 @@
+.text
+.global __m68k_read_tp
+.type   __m68k_read_tp,@function
+__m68k_read_tp:
+	move.l #333,%d0
+	trap #0
+	move.l %d0,%a0
+	rts
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/m68k/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/m68k/clone.s
new file mode 100644
index 0000000000..f6dfa06f49
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/m68k/clone.s
@@ -0,0 +1,25 @@
+.text
+.global __clone
+.hidden __clone
+.type   __clone,@function
+__clone:
+	movem.l %d2-%d5,-(%sp)
+	move.l #120,%d0
+	move.l 28(%sp),%d1
+	move.l 24(%sp),%d2
+	and.l #-16,%d2
+	move.l 36(%sp),%d3
+	move.l 44(%sp),%d4
+	move.l 40(%sp),%d5
+	move.l 20(%sp),%a0
+	move.l 32(%sp),%a1
+	trap #0
+	tst.l %d0
+	beq 1f
+	movem.l (%sp)+,%d2-%d5
+	rts
+1:	move.l %a1,-(%sp)
+	jsr (%a0)
+	move.l #1,%d0
+	trap #0
+	clr.b 0
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/m68k/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/m68k/syscall_cp.s
new file mode 100644
index 0000000000..5628a896e5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/m68k/syscall_cp.s
@@ -0,0 +1,26 @@
+.text
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm,@function
+__syscall_cp_asm:
+	movem.l %d2-%d5,-(%sp)
+	movea.l 20(%sp),%a0
+__cp_begin:
+	move.l (%a0),%d0
+	bne __cp_cancel
+	movem.l 24(%sp),%d0-%d5/%a0
+	trap #0
+__cp_end:
+	movem.l (%sp)+,%d2-%d5
+	rts
+__cp_cancel:
+	movem.l (%sp)+,%d2-%d5
+	move.l __cancel-.-8,%a1
+	jmp (%pc,%a1)
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/__set_thread_area.s
new file mode 100644
index 0000000000..9a226a9157
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/__set_thread_area.s
@@ -0,0 +1,7 @@
+.global __set_thread_area
+.hidden __set_thread_area
+.type   __set_thread_area,@function
+__set_thread_area:
+	ori      r21, r5, 0
+	rtsd     r15, 8
+	ori      r3, r0, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/microblaze/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/microblaze/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/microblaze/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/clone.s
new file mode 100644
index 0000000000..b68cc5fc22
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/clone.s
@@ -0,0 +1,30 @@
+.global __clone
+.hidden __clone
+.type   __clone,@function
+
+# r5, r6, r7, r8, r9, r10, stack
+# fn, st, fl, ar, pt, tl, ct
+# fl, st, __, pt, ct, tl
+
+__clone:
+	andi    r6, r6, -16
+	addi    r6, r6, -16
+	swi     r5, r6, 0
+	swi     r8, r6, 4
+
+	ori     r5, r7, 0
+	ori     r8, r9, 0
+	lwi     r9, r1, 28
+	ori     r12, r0, 120
+
+	brki    r14, 8
+	beqi	r3, 1f
+	rtsd    r15, 8
+	nop
+
+1:	lwi     r3, r1, 0
+	lwi     r5, r1, 4
+	brald   r15, r3
+	nop
+	ori     r12, r0, 1
+	brki    r14, 8
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/syscall_cp.s
new file mode 100644
index 0000000000..b0df61c571
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/microblaze/syscall_cp.s
@@ -0,0 +1,27 @@
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm,@function
+__syscall_cp_asm:
+__cp_begin:
+	lwi     r5, r5, 0
+	bnei    r5, __cp_cancel
+	addi    r12, r6, 0
+	add     r5, r7, r0
+	add     r6, r8, r0
+	add     r7, r9, r0
+	add     r8, r10, r0
+	lwi     r9, r1, 28
+	lwi     r10, r1, 32
+	brki    r14, 0x8
+__cp_end:
+	rtsd    r15, 8
+	nop
+__cp_cancel:
+	bri     __cancel
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mips/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/mips/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/mips/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/mips/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mips/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/mips/clone.s
new file mode 100644
index 0000000000..0446338568
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mips/clone.s
@@ -0,0 +1,36 @@
+.set noreorder
+.global __clone
+.hidden __clone
+.type   __clone,@function
+__clone:
+	# Save function pointer and argument pointer on new thread stack
+	and $5, $5, -8
+	subu $5, $5, 16
+	sw $4, 0($5)
+	sw $7, 4($5)
+	# Shuffle (fn,sp,fl,arg,ptid,tls,ctid) to (fl,sp,ptid,tls,ctid)
+	move $4, $6
+	lw $6, 16($sp)
+	lw $7, 20($sp)
+	lw $9, 24($sp)
+	subu $sp, $sp, 16
+	sw $9, 16($sp)
+	li $2, 4120
+	syscall
+	beq $7, $0, 1f
+	nop
+	addu $sp, $sp, 16
+	jr $ra
+	subu $2, $0, $2
+1:	beq $2, $0, 1f
+	nop
+	addu $sp, $sp, 16
+	jr $ra
+	nop
+1:	lw $25, 0($sp)
+	lw $4, 4($sp)
+	jalr $25
+	nop
+	move $4, $2
+	li $2, 4001
+	syscall
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mips/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/mips/syscall_cp.s
new file mode 100644
index 0000000000..d284626450
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mips/syscall_cp.s
@@ -0,0 +1,53 @@
+.set    noreorder
+
+.global __cp_begin
+.hidden __cp_begin
+.type   __cp_begin,@function
+.global __cp_end
+.hidden __cp_end
+.type   __cp_end,@function
+.global __cp_cancel
+.hidden __cp_cancel
+.type   __cp_cancel,@function
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm,@function
+__syscall_cp_asm:
+	subu    $sp, $sp, 32
+__cp_begin:
+	lw      $4, 0($4)
+	bne     $4, $0, __cp_cancel
+	move    $2, $5
+	move    $4, $6
+	move    $5, $7
+	lw      $6, 48($sp)
+	lw      $7, 52($sp)
+	lw      $8, 56($sp)
+	lw      $9, 60($sp)
+	lw      $10,64($sp)
+	sw      $8, 16($sp)
+	sw      $9, 20($sp)
+	sw      $10,24($sp)
+	sw      $2, 28($sp)
+	lw      $2, 28($sp)
+	syscall
+__cp_end:
+	beq     $7, $0, 1f
+	addu    $sp, $sp, 32
+	subu    $2, $0, $2
+1:	jr      $ra
+	nop
+
+__cp_cancel:
+	move    $2, $ra
+	bal     1f
+	addu    $sp, $sp, 32
+	.gpword .
+	.gpword __cancel
+1:	lw      $3, ($ra)
+	subu    $3, $ra, $3
+	lw      $25, 4($ra)
+	addu    $25, $25, $3
+	jr      $25
+	move    $ra, $2
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mips64/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/mips64/__unmapself.s
new file mode 100644
index 0000000000..f6795cda28
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mips64/__unmapself.s
@@ -0,0 +1,9 @@
+.set	noreorder
+.global	__unmapself
+.type	__unmapself, @function
+__unmapself:
+	li	$2, 5011
+	syscall
+	li	$4, 0
+	li	$2, 5058
+	syscall
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mips64/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/mips64/clone.s
new file mode 100644
index 0000000000..2d86899a1d
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mips64/clone.s
@@ -0,0 +1,34 @@
+.set	noreorder
+.global	__clone
+.hidden __clone
+.type	__clone,@function
+__clone:
+	# Save function pointer and argument pointer on new thread stack
+	and	$5, $5, -16	# aligning stack to double word
+	dsubu	$5, $5, 16
+	sd	$4, 0($5)	# save function pointer
+	sd	$7, 8($5)	# save argument pointer
+
+	# Shuffle (fn,sp,fl,arg,ptid,tls,ctid) to (fl,sp,ptid,tls,ctid)
+	# sys_clone(u64 flags, u64 ustack_base, u64 parent_tidptr, u64 child_tidptr, u64 tls)
+	move	$4, $6
+	move	$6, $8
+	move	$7, $9
+	move	$8, $10
+	li	$2, 5055
+	syscall
+	beq	$7, $0, 1f
+	nop
+	jr	$ra
+	dsubu	$2, $0, $2
+1:	beq	$2, $0, 1f
+	nop
+	jr	$ra
+	nop
+1:	ld	$25, 0($sp)	# function pointer
+	ld	$4, 8($sp)	# argument pointer
+	jalr	$25		# call the user's function
+	nop
+	move 	$4, $2
+	li	$2, 5058
+	syscall
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mips64/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/mips64/syscall_cp.s
new file mode 100644
index 0000000000..0d4ede7635
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mips64/syscall_cp.s
@@ -0,0 +1,52 @@
+.set	noreorder
+.global	__cp_begin
+.hidden	__cp_begin
+.type	__cp_begin,@function
+.global	__cp_end
+.hidden	__cp_end
+.type	__cp_end,@function
+.global	__cp_cancel
+.hidden	__cp_cancel
+.type	__cp_cancel,@function
+.global	__cp_cancel_data
+.hidden	__cp_cancel_data
+.type	__cp_cancel_data,@function
+.hidden	__cancel
+.global	__syscall_cp_asm
+.hidden	__syscall_cp_asm
+.type	__syscall_cp_asm,@function
+__syscall_cp_asm:
+__cp_begin:
+	lw	$4, 0($4)
+	bne	$4, $0, __cp_cancel
+	move	$2, $5
+	move	$4, $6
+	move	$5, $7
+	move	$6, $8
+	move	$7, $9
+	move	$8, $10
+	move	$9, $11
+	ld	$10, 0($sp)
+	syscall
+__cp_end:
+	beq	$7, $0, 1f
+	nop
+	dsubu	$2, $0, $2
+1:	jr	$ra
+	nop
+
+	# if cancellation flag is 1 then call __cancel
+__cp_cancel:
+	move	$2, $ra
+.align 8
+	bal	1f
+	nop
+__cp_cancel_data:
+	.gpdword __cp_cancel_data
+	.gpdword __cancel
+1:	ld	$3, ($ra)
+	dsubu	$3, $ra, $3
+	ld	$25, 8($ra)
+	daddu	$25, $25, $3
+	jr	$25
+	move	$ra, $2
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/__unmapself.s
new file mode 100644
index 0000000000..4b032e5e58
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/__unmapself.s
@@ -0,0 +1,9 @@
+.set	noreorder
+.global	__unmapself
+.type	__unmapself,@function
+__unmapself:
+	li	$2, 6011
+	syscall
+	li	$4, 0
+	li	$2, 6058
+	syscall
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/clone.s
new file mode 100644
index 0000000000..4d3c8c7a25
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/clone.s
@@ -0,0 +1,34 @@
+.set	noreorder
+.global	__clone
+.hidden __clone
+.type	__clone,@function
+__clone:
+	# Save function pointer and argument pointer on new thread stack
+	and	$5, $5, -16	# aligning stack to double word
+	subu	$5, $5, 16
+	sw	$4, 0($5)	# save function pointer
+	sw	$7, 4($5)	# save argument pointer
+
+	# Shuffle (fn,sp,fl,arg,ptid,tls,ctid) to (fl,sp,ptid,tls,ctid)
+	# sys_clone(u64 flags, u64 ustack_base, u64 parent_tidptr, u64 child_tidptr, u64 tls)
+	move	$4, $6
+	move	$6, $8
+	move	$7, $9
+	move	$8, $10
+	li	$2, 6055
+	syscall
+	beq	$7, $0, 1f
+	nop
+	jr	$ra
+	subu	$2, $0, $2
+1:	beq	$2, $0, 1f
+	nop
+	jr	$ra
+	nop
+1:	lw	$25, 0($sp)	# function pointer
+	lw	$4, 4($sp)	# argument pointer
+	jalr	$25		# call the user's function
+	nop
+	move 	$4, $2
+	li	$2, 6058
+	syscall
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/syscall_cp.s
new file mode 100644
index 0000000000..e85615bcb3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mipsn32/syscall_cp.s
@@ -0,0 +1,51 @@
+.set	noreorder
+.global	__cp_begin
+.hidden	__cp_begin
+.type	__cp_begin,@function
+.global	__cp_end
+.hidden	__cp_end
+.type	__cp_end,@function
+.global	__cp_cancel
+.hidden	__cp_cancel
+.type	__cp_cancel,@function
+.global	__cp_cancel_data
+.hidden	__cp_cancel_data
+.type	__cp_cancel_data,@function
+.hidden	__cancel
+.global	__syscall_cp_asm
+.hidden	__syscall_cp_asm
+.type	__syscall_cp_asm,@function
+__syscall_cp_asm:
+__cp_begin:
+	lw	$4, 0($4)
+	bne	$4, $0, __cp_cancel
+	move	$2, $5
+	move	$4, $6
+	move	$5, $7
+	move	$6, $8
+	move	$7, $9
+	move	$8, $10
+	move	$9, $11
+	lw	$10, 0($sp)
+	syscall
+__cp_end:
+	beq	$7, $0, 1f
+	nop
+	subu	$2, $0, $2
+1:	jr	$ra
+	nop
+
+	# if cancellation flag is 1 then call __cancel
+__cp_cancel:
+	move	$2, $ra
+	bal	1f
+	nop
+__cp_cancel_data:
+	.gpword __cp_cancel_data
+	.gpword __cancel
+1:	lw	$3, 0($ra)
+	subu	$3, $ra, $3
+	lw	$25, 4($ra)
+	addu	$25, $25, $3
+	jr	$25
+	move	$ra, $2
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/mtx_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/mtx_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/mtx_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/mtx_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_lock.c b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_lock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/mtx_lock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/mtx_lock.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/mtx_timedlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_timedlock.c
new file mode 100644
index 0000000000..d22c8cf448
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_timedlock.c
@@ -0,0 +1,13 @@
+#include <threads.h>
+#include <pthread.h>
+#include <errno.h>
+
+int mtx_timedlock(mtx_t *restrict m, const struct timespec *restrict ts)
+{
+	int ret = __pthread_mutex_timedlock((pthread_mutex_t *)m, ts);
+	switch (ret) {
+	default:        return thrd_error;
+	case 0:         return thrd_success;
+	case ETIMEDOUT: return thrd_timedout;
+	}
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_trylock.c b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_trylock.c
similarity index 80%
rename from src/components/lib/libc/musl-1.1.11/src/thread/mtx_trylock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/mtx_trylock.c
index 61e7694edc..40a8b8c297 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_trylock.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_trylock.c
@@ -1,14 +1,12 @@
 #include "pthread_impl.h"
 #include <threads.h>
 
-int __pthread_mutex_trylock(mtx_t *);
-
 int mtx_trylock(mtx_t *m)
 {
 	if (m->_m_type == PTHREAD_MUTEX_NORMAL)
 		return (a_cas(&m->_m_lock, 0, EBUSY) & EBUSY) ? thrd_busy : thrd_success;
 
-	int ret = __pthread_mutex_trylock(m);
+	int ret = __pthread_mutex_trylock((pthread_mutex_t *)m);
 	switch (ret) {
 	default:    return thrd_error;
 	case 0:     return thrd_success;
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_unlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_unlock.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/thread/mtx_unlock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/mtx_unlock.c
index 5033ace7f3..2e5c8cf6bf 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/mtx_unlock.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/mtx_unlock.c
@@ -1,11 +1,10 @@
 #include <threads.h>
-
-int __pthread_mutex_unlock(mtx_t *);
+#include <pthread.h>
 
 int mtx_unlock(mtx_t *mtx)
 {
 	/* The only cases where pthread_mutex_unlock can return an
 	 * error are undefined behavior for C11 mtx_unlock, so we can
 	 * assume it does not return an error and simply tail call. */
-	return __pthread_mutex_unlock(mtx);
+	return __pthread_mutex_unlock((pthread_mutex_t *)mtx);
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/or1k/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/or1k/__set_thread_area.s
new file mode 100644
index 0000000000..b9ffb9303b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/or1k/__set_thread_area.s
@@ -0,0 +1,7 @@
+.global __set_thread_area
+.hidden __set_thread_area
+.type   __set_thread_area,@function
+__set_thread_area:
+	l.ori	r10, r3, 0
+	l.jr	r9
+	 l.ori	r11, r0, 0
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/or1k/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/or1k/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/or1k/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/or1k/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/or1k/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/or1k/clone.s
new file mode 100644
index 0000000000..2473ac2040
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/or1k/clone.s
@@ -0,0 +1,31 @@
+/* int clone(fn, stack, flags, arg, ptid, tls, ctid)
+ *           r3  r4     r5     r6   sp+0  sp+4 sp+8
+ * sys_clone(flags, stack, ptid, ctid, tls)
+ */
+.global __clone
+.hidden __clone
+.type   __clone,@function
+__clone:
+	l.addi	r4, r4, -8
+	l.sw	0(r4), r3
+	l.sw	4(r4), r6
+	/* (fn, st, fl, ar, pt, tl, ct) => (fl, st, pt, ct, tl) */
+	l.ori	r3, r5, 0
+	l.lwz	r5, 0(r1)
+	l.lwz	r6, 8(r1)
+	l.lwz	r7, 4(r1)
+	l.ori	r11, r0, 220 /* __NR_clone */
+	l.sys	1
+
+	l.sfeqi	r11, 0
+	l.bf	1f
+	 l.nop
+	l.jr	r9
+	 l.nop
+
+1:	l.lwz	r11, 0(r1)
+	l.jalr	r11
+	 l.lwz	r3, 4(r1)
+
+	l.ori	r11, r0, 93 /* __NR_exit */
+	l.sys	1
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/or1k/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/or1k/syscall_cp.s
new file mode 100644
index 0000000000..7951166ed9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/or1k/syscall_cp.s
@@ -0,0 +1,29 @@
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm,@function
+__syscall_cp_asm:
+__cp_begin:
+	l.lwz	r3, 0(r3)
+	l.sfeqi	r3, 0
+	l.bnf	__cp_cancel
+	 l.ori	r11, r4, 0
+	l.ori	r3, r5, 0
+	l.ori	r4, r6, 0
+	l.ori	r5, r7, 0
+	l.ori	r6, r8, 0
+	l.lwz	r7, 0(r1)
+	l.lwz	r8, 4(r1)
+	l.sys	1
+__cp_end:
+	l.jr	r9
+	 l.nop
+__cp_cancel:
+	l.j	__cancel
+	 l.nop
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/__set_thread_area.s
new file mode 100644
index 0000000000..86c498fa38
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/__set_thread_area.s
@@ -0,0 +1,12 @@
+.text
+.global __set_thread_area
+.hidden __set_thread_area
+.type   __set_thread_area, %function
+__set_thread_area:
+	# mov pointer in reg3 into r2
+	mr 2, 3
+	# put 0 into return reg
+	li 3, 0
+	# return
+	blr
+
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/powerpc/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/powerpc/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/powerpc/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/clone.s
new file mode 100644
index 0000000000..da13f446c0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/clone.s
@@ -0,0 +1,73 @@
+.text
+.global __clone
+.hidden __clone
+.type __clone, %function
+__clone:
+# int clone(fn, stack, flags, arg, ptid, tls, ctid)
+#            a  b       c     d     e    f    g
+#            3  4       5     6     7    8    9
+# pseudo C code:
+# tid = syscall(SYS_clone,c,b,e,f,g);
+# if (!tid) syscall(SYS_exit, a(d));
+# return tid;
+
+# SYS_clone = 120
+# SYS_exit = 1
+
+# store non-volatile regs r30, r31 on stack in order to put our
+# start func and its arg there
+stwu 30, -16(1)
+stw 31, 4(1)
+
+# save r3 (func) into r30, and r6(arg) into r31
+mr 30, 3
+mr 31, 6
+
+# create initial stack frame for new thread
+clrrwi 4, 4, 4
+li 0, 0
+stwu 0, -16(4)
+
+#move c into first arg
+mr 3, 5
+#mr 4, 4
+mr 5, 7
+mr 6, 8
+mr 7, 9
+
+# move syscall number into r0    
+li 0, 120
+
+sc
+
+# check for syscall error
+bns+ 1f # jump to label 1 if no summary overflow.
+#else
+neg 3, 3 #negate the result (errno)
+1:
+# compare sc result with 0
+cmpwi cr7, 3, 0
+
+# if not 0, jump to end
+bne cr7, 2f
+
+#else: we're the child
+#call funcptr: move arg (d) into r3
+mr 3, 31
+#move r30 (funcptr) into CTR reg
+mtctr 30
+# call CTR reg
+bctrl
+# mov SYS_exit into r0 (the exit param is already in r3)
+li 0, 1
+sc
+
+2:
+
+# restore stack
+lwz 30, 0(1)
+lwz 31, 4(1)
+addi 1, 1, 16
+
+blr
+
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/syscall_cp.s
new file mode 100644
index 0000000000..77f8938dc8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc/syscall_cp.s
@@ -0,0 +1,59 @@
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+
+#r0: volatile. may be modified during linkage.
+#r1: stack frame: 16 byte alignment.
+#r2: tls/thread pointer on pp32
+#r3,r4: return values, first args
+#r5-r10: args
+#r11-r12: volatile. may be modified during linkage
+#r13: "small data area" pointer
+#r14 - r30: local vars
+#r31: local or environment pointer
+
+#r1, r14-31: belong to the caller, must be saved and restored
+#r0, r3-r12, ctr, xer: volatile, not preserved
+#r0,r11,r12: may be altered by cross-module call, 
+#"a func cannot depend on that these regs have the values placed by the caller"
+
+#the fields CR2,CR2,CR4 of the cond reg must be preserved
+#LR (link reg) shall contain the funcs return address
+	.text
+	.type   __syscall_cp_asm,%function
+__syscall_cp_asm:
+	# at enter: r3 = pointer to self->cancel, r4: syscall no, r5: first arg, r6: 2nd, r7: 3rd, r8: 4th, r9: 5th, r10: 6th
+__cp_begin:
+	# r3 holds first argument, its a pointer to self->cancel. 
+	# we must compare the dereferenced value with 0 and jump to __cancel if its not
+	
+	lwz 0, 0(3) #deref pointer into r0
+	
+	cmpwi cr7, 0, 0 #compare r0 with 0, store result in cr7. 
+	beq+ cr7, 1f #jump to label 1 if r0 was 0
+	
+	b __cp_cancel #else call cancel
+1:
+	#ok, the cancel flag was not set
+	# syscall: number goes to r0, the rest 3-8
+	mr      0, 4                  # put the system call number into r0
+	mr      3, 5                  # Shift the arguments: arg1
+	mr      4, 6                  # arg2
+	mr      5, 7                  # arg3
+	mr      6, 8                  # arg4
+	mr      7, 9                  # arg5
+	mr      8, 10                  # arg6
+	sc
+__cp_end:
+	bnslr+ # return if no summary overflow. 
+	#else negate result.
+	neg 3, 3
+	blr
+__cp_cancel:
+	b __cancel
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/__set_thread_area.s
new file mode 100644
index 0000000000..bb9c55d6d3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/__set_thread_area.s
@@ -0,0 +1,9 @@
+.text
+.global __set_thread_area
+.hidden __set_thread_area
+.type   __set_thread_area, %function
+__set_thread_area:
+	mr 13, 3
+	li  3, 0
+	blr
+
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/__unmapself.s
new file mode 100644
index 0000000000..c9360b47a6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/__unmapself.s
@@ -0,0 +1,9 @@
+	.text
+	.global __unmapself
+	.type   __unmapself,%function
+__unmapself:
+	li      0, 91 # __NR_munmap
+	sc
+	li      0, 1 #__NR_exit
+	sc
+	blr
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/clone.s
new file mode 100644
index 0000000000..41cb6787a7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/clone.s
@@ -0,0 +1,48 @@
+.text
+.global __clone
+.hidden __clone
+.type __clone, %function
+__clone:
+	# int clone(fn, stack, flags, arg, ptid, tls, ctid)
+	#            a  b       c     d     e    f    g
+	#            3  4       5     6     7    8    9
+	# pseudo C code:
+	# tid = syscall(SYS_clone,c,b,e,f,g);
+	# if (!tid) syscall(SYS_exit, a(d));
+	# return tid;
+
+	# create initial stack frame for new thread
+	clrrdi 4, 4, 4
+	li     0, 0
+	stdu   0,-32(4)
+
+	# save fn and arg to child stack
+	std    3,  8(4)
+	std    6, 16(4)
+
+	# shuffle args into correct registers and call SYS_clone
+	mr    3, 5
+	#mr   4, 4
+	mr    5, 7
+	mr    6, 8
+	mr    7, 9
+	li    0, 120  # SYS_clone = 120
+	sc
+
+	# if error, negate return (errno)
+	bns+  1f
+	neg   3, 3
+
+1:	# if we're the parent, return
+	cmpwi cr7, 3, 0
+	bnelr cr7
+
+	# we're the child. call fn(arg)
+	ld     3, 16(1)
+	ld    12,  8(1)
+	mtctr 12
+	bctrl
+
+	# call SYS_exit. exit code is already in r3 from fn return value
+	li    0, 1    # SYS_exit = 1
+	sc
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/syscall_cp.s
new file mode 100644
index 0000000000..ef50ed0073
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/powerpc64/syscall_cp.s
@@ -0,0 +1,44 @@
+	.global __cp_begin
+	.hidden __cp_begin
+	.global __cp_end
+	.hidden __cp_end
+	.global __cp_cancel
+	.hidden __cp_cancel
+	.hidden __cancel
+	.global __syscall_cp_asm
+	.hidden __syscall_cp_asm
+	.text
+	.type   __syscall_cp_asm,%function
+__syscall_cp_asm:
+	# at enter: r3 = pointer to self->cancel, r4: syscall no, r5: first arg, r6: 2nd, r7: 3rd, r8: 4th, r9: 5th, r10: 6th
+__cp_begin:
+	# if (self->cancel) goto __cp_cancel
+	lwz   0, 0(3)
+	cmpwi cr7, 0, 0
+	bne-  cr7, __cp_cancel
+
+	# make syscall
+	mr    0,  4
+	mr    3,  5
+	mr    4,  6
+	mr    5,  7
+	mr    6,  8
+	mr    7,  9
+	mr    8, 10
+	sc
+
+__cp_end:
+	# return error ? -r3 : r3
+	bnslr+
+	neg 3, 3
+	blr
+
+__cp_cancel:
+	mflr 0
+	bl 1f
+	.long .TOC.-.
+1:	mflr 3
+	lwa 2, 0(3)
+	add 2, 2, 3
+	mtlr 0
+	b __cancel
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_atfork.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_atfork.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_atfork.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_atfork.c
index a40d7f6328..7649740165 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_atfork.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_atfork.c
@@ -1,5 +1,6 @@
 #include <pthread.h>
 #include "libc.h"
+#include "lock.h"
 
 static struct atfork_funcs {
 	void (*prepare)(void);
@@ -8,7 +9,7 @@ static struct atfork_funcs {
 	struct atfork_funcs *prev, *next;
 } *funcs;
 
-static volatile int lock[2];
+static volatile int lock[1];
 
 void __fork_handler(int who)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_get.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_get.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_get.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_get.c
index 3d296bf3a5..4aa5afdb28 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_get.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_get.c
@@ -7,7 +7,7 @@ int pthread_attr_getdetachstate(const pthread_attr_t *a, int *state)
 }
 int pthread_attr_getguardsize(const pthread_attr_t *restrict a, size_t *restrict size)
 {
-	*size = a->_a_guardsize + DEFAULT_GUARD_SIZE;
+	*size = a->_a_guardsize;
 	return 0;
 }
 
@@ -39,14 +39,14 @@ int pthread_attr_getstack(const pthread_attr_t *restrict a, void **restrict addr
 {
 	if (!a->_a_stackaddr)
 		return EINVAL;
-	*size = a->_a_stacksize + DEFAULT_STACK_SIZE;
+	*size = a->_a_stacksize;
 	*addr = (void *)(a->_a_stackaddr - *size);
 	return 0;
 }
 
 int pthread_attr_getstacksize(const pthread_attr_t *restrict a, size_t *restrict size)
 {
-	*size = a->_a_stacksize + DEFAULT_STACK_SIZE;
+	*size = a->_a_stacksize;
 	return 0;
 }
 
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_init.c
new file mode 100644
index 0000000000..463a8d2075
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_init.c
@@ -0,0 +1,11 @@
+#include "pthread_impl.h"
+
+int pthread_attr_init(pthread_attr_t *a)
+{
+	*a = (pthread_attr_t){0};
+	__acquire_ptc();
+	a->_a_stacksize = __default_stacksize;
+	a->_a_guardsize = __default_guardsize;
+	__release_ptc();
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setdetachstate.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setdetachstate.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setdetachstate.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setdetachstate.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setguardsize.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setguardsize.c
similarity index 75%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setguardsize.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setguardsize.c
index 9f21d24702..1c5c60acbc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setguardsize.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setguardsize.c
@@ -3,6 +3,6 @@
 int pthread_attr_setguardsize(pthread_attr_t *a, size_t size)
 {
 	if (size > SIZE_MAX/8) return EINVAL;
-	a->_a_guardsize = size - DEFAULT_GUARD_SIZE;
+	a->_a_guardsize = size;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setinheritsched.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setinheritsched.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setinheritsched.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setinheritsched.c
index c91d8f83cc..ca264be7c4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setinheritsched.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setinheritsched.c
@@ -1,4 +1,5 @@
 #include "pthread_impl.h"
+#include "syscall.h"
 
 int pthread_attr_setinheritsched(pthread_attr_t *a, int inherit)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setschedparam.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setschedparam.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setschedparam.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setschedparam.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setschedpolicy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setschedpolicy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setschedpolicy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setschedpolicy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setscope.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setscope.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setscope.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setscope.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setstack.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setstack.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setstack.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setstack.c
index 61707a3189..1eddcbd6eb 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setstack.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setstack.c
@@ -4,6 +4,6 @@ int pthread_attr_setstack(pthread_attr_t *a, void *addr, size_t size)
 {
 	if (size-PTHREAD_STACK_MIN > SIZE_MAX/4) return EINVAL;
 	a->_a_stackaddr = (size_t)addr + size;
-	a->_a_stacksize = size - DEFAULT_STACK_SIZE;
+	a->_a_stacksize = size;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setstacksize.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setstacksize.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setstacksize.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setstacksize.c
index 09d3fda72e..9c6a8806ee 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_attr_setstacksize.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_attr_setstacksize.c
@@ -4,6 +4,6 @@ int pthread_attr_setstacksize(pthread_attr_t *a, size_t size)
 {
 	if (size-PTHREAD_STACK_MIN > SIZE_MAX/4) return EINVAL;
 	a->_a_stackaddr = 0;
-	a->_a_stacksize = size - DEFAULT_STACK_SIZE;
+	a->_a_stacksize = size;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrier_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrier_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrier_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrier_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrier_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrier_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrier_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrier_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrier_wait.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrier_wait.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrier_wait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrier_wait.c
index 06b83db926..cc2a8bbf58 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrier_wait.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrier_wait.c
@@ -84,7 +84,7 @@ int pthread_barrier_wait(pthread_barrier_t *b)
 			a_spin();
 		a_inc(&inst->finished);
 		while (inst->finished == 1)
-			__syscall(SYS_futex,&inst->finished,FUTEX_WAIT|128,1,0) != -ENOSYS
+			__syscall(SYS_futex,&inst->finished,FUTEX_WAIT|FUTEX_PRIVATE,1,0) != -ENOSYS
 			|| __syscall(SYS_futex,&inst->finished,FUTEX_WAIT,1,0);
 		return PTHREAD_BARRIER_SERIAL_THREAD;
 	}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrierattr_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrierattr_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrierattr_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrierattr_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrierattr_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrierattr_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrierattr_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrierattr_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrierattr_setpshared.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrierattr_setpshared.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrierattr_setpshared.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrierattr_setpshared.c
index b391461e16..c2d2929dcf 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_barrierattr_setpshared.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_barrierattr_setpshared.c
@@ -2,6 +2,7 @@
 
 int pthread_barrierattr_setpshared(pthread_barrierattr_t *a, int pshared)
 {
+	if (pshared > 1U) return EINVAL;
 	a->__attr = pshared ? INT_MIN : 0;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cancel.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cancel.c
new file mode 100644
index 0000000000..2f9d5e975f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cancel.c
@@ -0,0 +1,101 @@
+#define _GNU_SOURCE
+#include <string.h>
+#include "pthread_impl.h"
+#include "syscall.h"
+
+hidden long __cancel(), __syscall_cp_asm(), __syscall_cp_c();
+
+long __cancel()
+{
+	pthread_t self = __pthread_self();
+	if (self->canceldisable == PTHREAD_CANCEL_ENABLE || self->cancelasync)
+		pthread_exit(PTHREAD_CANCELED);
+	self->canceldisable = PTHREAD_CANCEL_DISABLE;
+	return -ECANCELED;
+}
+
+long __syscall_cp_asm(volatile void *, syscall_arg_t,
+                      syscall_arg_t, syscall_arg_t, syscall_arg_t,
+                      syscall_arg_t, syscall_arg_t, syscall_arg_t);
+
+long __syscall_cp_c(syscall_arg_t nr,
+                    syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
+                    syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
+{
+	pthread_t self;
+	long r;
+	int st;
+
+	if ((st=(self=__pthread_self())->canceldisable)
+	    && (st==PTHREAD_CANCEL_DISABLE || nr==SYS_close))
+		return __syscall(nr, u, v, w, x, y, z);
+
+	r = __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z);
+	if (r==-EINTR && nr!=SYS_close && self->cancel &&
+	    self->canceldisable != PTHREAD_CANCEL_DISABLE)
+		r = __cancel();
+	return r;
+}
+
+static void _sigaddset(sigset_t *set, int sig)
+{
+	unsigned s = sig-1;
+	set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1);
+}
+
+extern hidden const char __cp_begin[1], __cp_end[1], __cp_cancel[1];
+
+static void cancel_handler(int sig, siginfo_t *si, void *ctx)
+{
+	pthread_t self = __pthread_self();
+	ucontext_t *uc = ctx;
+	uintptr_t pc = uc->uc_mcontext.MC_PC;
+
+	a_barrier();
+	if (!self->cancel || self->canceldisable == PTHREAD_CANCEL_DISABLE) return;
+
+	_sigaddset(&uc->uc_sigmask, SIGCANCEL);
+
+	if (self->cancelasync || pc >= (uintptr_t)__cp_begin && pc < (uintptr_t)__cp_end) {
+		uc->uc_mcontext.MC_PC = (uintptr_t)__cp_cancel;
+#ifdef CANCEL_GOT
+		uc->uc_mcontext.MC_GOT = CANCEL_GOT;
+#endif
+		return;
+	}
+
+	__syscall(SYS_tkill, self->tid, SIGCANCEL);
+}
+
+void __testcancel()
+{
+	pthread_t self = __pthread_self();
+	if (self->cancel && !self->canceldisable)
+		__cancel();
+}
+
+static void init_cancellation()
+{
+	struct sigaction sa = {
+		.sa_flags = SA_SIGINFO | SA_RESTART,
+		.sa_sigaction = cancel_handler
+	};
+	memset(&sa.sa_mask, -1, _NSIG/8);
+	__libc_sigaction(SIGCANCEL, &sa, 0);
+}
+
+int pthread_cancel(pthread_t t)
+{
+	static int init;
+	if (!init) {
+		init_cancellation();
+		init = 1;
+	}
+	a_store(&t->cancel, 1);
+	if (t == pthread_self()) {
+		if (t->canceldisable == PTHREAD_CANCEL_ENABLE && t->cancelasync)
+			pthread_exit(PTHREAD_CANCELED);
+		return 0;
+	}
+	return pthread_kill(t, SIGCANCEL);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cleanup_push.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cleanup_push.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_cleanup_push.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_cleanup_push.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_broadcast.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_broadcast.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_broadcast.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_broadcast.c
index 69f840fb4f..6bfab78f96 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_broadcast.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_broadcast.c
@@ -1,7 +1,5 @@
 #include "pthread_impl.h"
 
-int __private_cond_signal(pthread_cond_t *, int);
-
 int pthread_cond_broadcast(pthread_cond_t *c)
 {
 	if (!c->_c_shared) return __private_cond_signal(c, -1);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_signal.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_signal.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_signal.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_signal.c
index 119c00abcd..575ad54bc0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_signal.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_signal.c
@@ -1,7 +1,5 @@
 #include "pthread_impl.h"
 
-int __private_cond_signal(pthread_cond_t *, int);
-
 int pthread_cond_signal(pthread_cond_t *c)
 {
 	if (!c->_c_shared) return __private_cond_signal(c, 1);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_timedwait.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_timedwait.c
similarity index 95%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_timedwait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_timedwait.c
index 3526ecfb6d..d15012406d 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_timedwait.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_timedwait.c
@@ -1,10 +1,5 @@
 #include "pthread_impl.h"
 
-void __pthread_testcancel(void);
-int __pthread_mutex_lock(pthread_mutex_t *);
-int __pthread_mutex_unlock(pthread_mutex_t *);
-int __pthread_setcancelstate(int, int *);
-
 /*
  * struct waiter
  *
@@ -54,7 +49,7 @@ static inline void unlock_requeue(volatile int *l, volatile int *r, int w)
 {
 	a_store(l, 0);
 	if (w) __wake(l, 1, 1);
-	else __syscall(SYS_futex, l, FUTEX_REQUEUE|128, 0, 1, r) != -ENOSYS
+	else __syscall(SYS_futex, l, FUTEX_REQUEUE|FUTEX_PRIVATE, 0, 1, r) != -ENOSYS
 		|| __syscall(SYS_futex, l, FUTEX_REQUEUE, 0, 1, r);
 }
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_wait.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_wait.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_cond_wait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_cond_wait.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_setclock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_setclock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_setclock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_setclock.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_setpshared.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_setpshared.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_condattr_setpshared.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_condattr_setpshared.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_create.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_create.c
new file mode 100644
index 0000000000..5f49109259
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_create.c
@@ -0,0 +1,382 @@
+#define _GNU_SOURCE
+#include "pthread_impl.h"
+#include "stdio_impl.h"
+#include "libc.h"
+#include "lock.h"
+#include <sys/mman.h>
+#include <string.h>
+#include <stddef.h>
+
+static void dummy_0()
+{
+}
+weak_alias(dummy_0, __acquire_ptc);
+weak_alias(dummy_0, __release_ptc);
+weak_alias(dummy_0, __pthread_tsd_run_dtors);
+weak_alias(dummy_0, __do_orphaned_stdio_locks);
+weak_alias(dummy_0, __dl_thread_cleanup);
+weak_alias(dummy_0, __membarrier_init);
+
+static int tl_lock_count;
+static int tl_lock_waiters;
+
+void __tl_lock(void)
+{
+	int tid = __pthread_self()->tid;
+	int val = __thread_list_lock;
+	if (val == tid) {
+		tl_lock_count++;
+		return;
+	}
+	while ((val = a_cas(&__thread_list_lock, 0, tid)))
+		__wait(&__thread_list_lock, &tl_lock_waiters, val, 0);
+}
+
+void __tl_unlock(void)
+{
+	if (tl_lock_count) {
+		tl_lock_count--;
+		return;
+	}
+	a_store(&__thread_list_lock, 0);
+	if (tl_lock_waiters) __wake(&__thread_list_lock, 1, 0);
+}
+
+void __tl_sync(pthread_t td)
+{
+	a_barrier();
+	int val = __thread_list_lock;
+	if (!val) return;
+	__wait(&__thread_list_lock, &tl_lock_waiters, val, 0);
+	if (tl_lock_waiters) __wake(&__thread_list_lock, 1, 0);
+}
+
+_Noreturn void __pthread_exit(void *result)
+{
+	pthread_t self = __pthread_self();
+	sigset_t set;
+
+	self->canceldisable = 1;
+	self->cancelasync = 0;
+	self->result = result;
+
+	while (self->cancelbuf) {
+		void (*f)(void *) = self->cancelbuf->__f;
+		void *x = self->cancelbuf->__x;
+		self->cancelbuf = self->cancelbuf->__next;
+		f(x);
+	}
+
+	__pthread_tsd_run_dtors();
+
+	/* Access to target the exiting thread with syscalls that use
+	 * its kernel tid is controlled by killlock. For detached threads,
+	 * any use past this point would have undefined behavior, but for
+	 * joinable threads it's a valid usage that must be handled. */
+	LOCK(self->killlock);
+
+	/* The thread list lock must be AS-safe, and thus requires
+	 * application signals to be blocked before it can be taken. */
+	__block_app_sigs(&set);
+	__tl_lock();
+
+	/* If this is the only thread in the list, don't proceed with
+	 * termination of the thread, but restore the previous lock and
+	 * signal state to prepare for exit to call atexit handlers. */
+	if (self->next == self) {
+		__tl_unlock();
+		__restore_sigs(&set);
+		UNLOCK(self->killlock);
+		exit(0);
+	}
+
+	/* At this point we are committed to thread termination. Unlink
+	 * the thread from the list. This change will not be visible
+	 * until the lock is released, which only happens after SYS_exit
+	 * has been called, via the exit futex address pointing at the lock. */
+	libc.threads_minus_1--;
+	self->next->prev = self->prev;
+	self->prev->next = self->next;
+	self->prev = self->next = self;
+
+	/* Process robust list in userspace to handle non-pshared mutexes
+	 * and the detached thread case where the robust list head will
+	 * be invalid when the kernel would process it. */
+	__vm_lock();
+	volatile void *volatile *rp;
+	while ((rp=self->robust_list.head) && rp != &self->robust_list.head) {
+		pthread_mutex_t *m = (void *)((char *)rp
+			- offsetof(pthread_mutex_t, _m_next));
+		int waiters = m->_m_waiters;
+		int priv = (m->_m_type & 128) ^ 128;
+		self->robust_list.pending = rp;
+		self->robust_list.head = *rp;
+		int cont = a_swap(&m->_m_lock, 0x40000000);
+		self->robust_list.pending = 0;
+		if (cont < 0 || waiters)
+			__wake(&m->_m_lock, 1, priv);
+	}
+	__vm_unlock();
+
+	__do_orphaned_stdio_locks();
+	__dl_thread_cleanup();
+
+	/* This atomic potentially competes with a concurrent pthread_detach
+	 * call; the loser is responsible for freeing thread resources. */
+	int state = a_cas(&self->detach_state, DT_JOINABLE, DT_EXITING);
+
+	if (state==DT_DETACHED && self->map_base) {
+		/* Detached threads must block even implementation-internal
+		 * signals, since they will not have a stack in their last
+		 * moments of existence. */
+		__block_all_sigs(&set);
+
+		/* Robust list will no longer be valid, and was already
+		 * processed above, so unregister it with the kernel. */
+		if (self->robust_list.off)
+			__syscall(SYS_set_robust_list, 0, 3*sizeof(long));
+
+		/* Since __unmapself bypasses the normal munmap code path,
+		 * explicitly wait for vmlock holders first. */
+		__vm_wait();
+
+		/* The following call unmaps the thread's stack mapping
+		 * and then exits without touching the stack. */
+		__unmapself(self->map_base, self->map_size);
+	}
+
+	/* Wake any joiner. */
+	__wake(&self->detach_state, 1, 1);
+
+	/* After the kernel thread exits, its tid may be reused. Clear it
+	 * to prevent inadvertent use and inform functions that would use
+	 * it that it's no longer available. */
+	self->tid = 0;
+	UNLOCK(self->killlock);
+
+	for (;;) __syscall(SYS_exit, 0);
+}
+
+void __do_cleanup_push(struct __ptcb *cb)
+{
+	struct pthread *self = __pthread_self();
+	cb->__next = self->cancelbuf;
+	self->cancelbuf = cb;
+}
+
+void __do_cleanup_pop(struct __ptcb *cb)
+{
+	__pthread_self()->cancelbuf = cb->__next;
+}
+
+struct start_args {
+	void *(*start_func)(void *);
+	void *start_arg;
+	volatile int control;
+	unsigned long sig_mask[_NSIG/8/sizeof(long)];
+};
+
+static int start(void *p)
+{
+	struct start_args *args = p;
+	int state = args->control;
+	if (state) {
+		if (a_cas(&args->control, 1, 2)==1)
+			__wait(&args->control, 0, 2, 1);
+		if (args->control) {
+			__syscall(SYS_set_tid_address, &args->control);
+			for (;;) __syscall(SYS_exit, 0);
+		}
+	}
+	__syscall(SYS_rt_sigprocmask, SIG_SETMASK, &args->sig_mask, 0, _NSIG/8);
+	__pthread_exit(args->start_func(args->start_arg));
+	return 0;
+}
+
+static int start_c11(void *p)
+{
+	struct start_args *args = p;
+	int (*start)(void*) = (int(*)(void*)) args->start_func;
+	__pthread_exit((void *)(uintptr_t)start(args->start_arg));
+	return 0;
+}
+
+#define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
+
+/* pthread_key_create.c overrides this */
+static volatile size_t dummy = 0;
+weak_alias(dummy, __pthread_tsd_size);
+static void *dummy_tsd[1] = { 0 };
+weak_alias(dummy_tsd, __pthread_tsd_main);
+
+static FILE *volatile dummy_file = 0;
+weak_alias(dummy_file, __stdin_used);
+weak_alias(dummy_file, __stdout_used);
+weak_alias(dummy_file, __stderr_used);
+
+static void init_file_lock(FILE *f)
+{
+	if (f && f->lock<0) f->lock = 0;
+}
+
+int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp, void *(*entry)(void *), void *restrict arg)
+{
+	int ret, c11 = (attrp == __ATTRP_C11_THREAD);
+	size_t size, guard;
+	struct pthread *self, *new;
+	unsigned char *map = 0, *stack = 0, *tsd = 0, *stack_limit;
+	unsigned flags = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND
+		| CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS
+		| CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED;
+	pthread_attr_t attr = { 0 };
+	sigset_t set;
+
+	if (!libc.can_do_threads) return ENOSYS;
+	self = __pthread_self();
+	if (!libc.threaded) {
+		for (FILE *f=*__ofl_lock(); f; f=f->next)
+			init_file_lock(f);
+		__ofl_unlock();
+		init_file_lock(__stdin_used);
+		init_file_lock(__stdout_used);
+		init_file_lock(__stderr_used);
+		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, _NSIG/8);
+		self->tsd = (void **)__pthread_tsd_main;
+		__membarrier_init();
+		libc.threaded = 1;
+	}
+	if (attrp && !c11) attr = *attrp;
+
+	__acquire_ptc();
+	if (!attrp || c11) {
+		attr._a_stacksize = __default_stacksize;
+		attr._a_guardsize = __default_guardsize;
+	}
+
+	if (attr._a_stackaddr) {
+		size_t need = libc.tls_size + __pthread_tsd_size;
+		size = attr._a_stacksize;
+		stack = (void *)(attr._a_stackaddr & -16);
+		stack_limit = (void *)(attr._a_stackaddr - size);
+		/* Use application-provided stack for TLS only when
+		 * it does not take more than ~12% or 2k of the
+		 * application's stack space. */
+		if (need < size/8 && need < 2048) {
+			tsd = stack - __pthread_tsd_size;
+			stack = tsd - libc.tls_size;
+			memset(stack, 0, need);
+		} else {
+			size = ROUND(need);
+		}
+		guard = 0;
+	} else {
+		guard = ROUND(attr._a_guardsize);
+		size = guard + ROUND(attr._a_stacksize
+			+ libc.tls_size +  __pthread_tsd_size);
+	}
+
+	if (!tsd) {
+		if (guard) {
+			map = __mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANON, -1, 0);
+			if (map == MAP_FAILED) goto fail;
+			if (__mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)
+			    && errno != ENOSYS) {
+				__munmap(map, size);
+				goto fail;
+			}
+		} else {
+			map = __mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
+			if (map == MAP_FAILED) goto fail;
+		}
+		tsd = map + size - __pthread_tsd_size;
+		if (!stack) {
+			stack = tsd - libc.tls_size;
+			stack_limit = map + guard;
+		}
+	}
+
+	new = __copy_tls(tsd - libc.tls_size);
+	new->map_base = map;
+	new->map_size = size;
+	new->stack = stack;
+	new->stack_size = stack - stack_limit;
+	new->guard_size = guard;
+	new->self = new;
+	new->tsd = (void *)tsd;
+	new->locale = &libc.global_locale;
+	if (attr._a_detach) {
+		new->detach_state = DT_DETACHED;
+	} else {
+		new->detach_state = DT_JOINABLE;
+	}
+	new->robust_list.head = &new->robust_list.head;
+	new->CANARY = self->CANARY;
+	new->sysinfo = self->sysinfo;
+
+	/* Setup argument structure for the new thread on its stack.
+	 * It's safe to access from the caller only until the thread
+	 * list is unlocked. */
+	stack -= (uintptr_t)stack % sizeof(uintptr_t);
+	stack -= sizeof(struct start_args);
+	struct start_args *args = (void *)stack;
+	args->start_func = entry;
+	args->start_arg = arg;
+	args->control = attr._a_sched ? 1 : 0;
+
+	/* Application signals (but not the synccall signal) must be
+	 * blocked before the thread list lock can be taken, to ensure
+	 * that the lock is AS-safe. */
+	__block_app_sigs(&set);
+
+	/* Ensure SIGCANCEL is unblocked in new thread. This requires
+	 * working with a copy of the set so we can restore the
+	 * original mask in the calling thread. */
+	memcpy(&args->sig_mask, &set, sizeof args->sig_mask);
+	args->sig_mask[(SIGCANCEL-1)/8/sizeof(long)] &=
+		~(1UL<<((SIGCANCEL-1)%(8*sizeof(long))));
+
+	__tl_lock();
+	libc.threads_minus_1++;
+	ret = __clone((c11 ? start_c11 : start), stack, flags, args, &new->tid, TP_ADJ(new), &__thread_list_lock);
+
+	/* All clone failures translate to EAGAIN. If explicit scheduling
+	 * was requested, attempt it before unlocking the thread list so
+	 * that the failed thread is never exposed and so that we can
+	 * clean up all transient resource usage before returning. */
+	if (ret < 0) {
+		ret = -EAGAIN;
+	} else if (attr._a_sched) {
+		ret = __syscall(SYS_sched_setscheduler,
+			new->tid, attr._a_policy, &attr._a_prio);
+		if (a_swap(&args->control, ret ? 3 : 0)==2)
+			__wake(&args->control, 1, 1);
+		if (ret)
+			__wait(&args->control, 0, 3, 0);
+	}
+
+	if (ret >= 0) {
+		new->next = self->next;
+		new->prev = self;
+		new->next->prev = new;
+		new->prev->next = new;
+	} else {
+		libc.threads_minus_1--;
+	}
+	__tl_unlock();
+	__restore_sigs(&set);
+	__release_ptc();
+
+	if (ret < 0) {
+		if (map) __munmap(map, size);
+		return -ret;
+	}
+
+	*res = new;
+	return 0;
+fail:
+	__release_ptc();
+	return EAGAIN;
+}
+
+weak_alias(__pthread_exit, pthread_exit);
+weak_alias(__pthread_create, pthread_create);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_detach.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_detach.c
new file mode 100644
index 0000000000..77772af2c6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_detach.c
@@ -0,0 +1,14 @@
+#include "pthread_impl.h"
+#include <threads.h>
+
+static int __pthread_detach(pthread_t t)
+{
+	/* If the cas fails, detach state is either already-detached
+	 * or exiting/exited, and pthread_join will trap or cleanup. */
+	if (a_cas(&t->detach_state, DT_JOINABLE, DT_DETACHED) != DT_JOINABLE)
+		return __pthread_join(t, 0);
+	return 0;
+}
+
+weak_alias(__pthread_detach, pthread_detach);
+weak_alias(__pthread_detach, thrd_detach);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_equal.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_equal.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_equal.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_equal.c
index 7c31482af3..dbb7365587 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_equal.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_equal.c
@@ -1,6 +1,5 @@
 #include <pthread.h>
 #include <threads.h>
-#include "libc.h"
 
 static int __pthread_equal(pthread_t a, pthread_t b)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_getattr_np.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_getattr_np.c
similarity index 77%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_getattr_np.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_getattr_np.c
index 10ea512733..2881831f8c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_getattr_np.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_getattr_np.c
@@ -6,10 +6,11 @@
 int pthread_getattr_np(pthread_t t, pthread_attr_t *a)
 {
 	*a = (pthread_attr_t){0};
-	a->_a_detach = !!t->detached;
+	a->_a_detach = t->detach_state>=DT_DETACHED;
+	a->_a_guardsize = t->guard_size;
 	if (t->stack) {
 		a->_a_stackaddr = (uintptr_t)t->stack;
-		a->_a_stacksize = t->stack_size - DEFAULT_STACK_SIZE;
+		a->_a_stacksize = t->stack_size;
 	} else {
 		char *p = (void *)libc.auxv;
 		size_t l = PAGE_SIZE;
@@ -17,7 +18,7 @@ int pthread_getattr_np(pthread_t t, pthread_attr_t *a)
 		a->_a_stackaddr = (uintptr_t)p;
 		while (mremap(p-l-PAGE_SIZE, PAGE_SIZE, 2*PAGE_SIZE, 0)==MAP_FAILED && errno==ENOMEM)
 			l += PAGE_SIZE;
-		a->_a_stacksize = l - DEFAULT_STACK_SIZE;
+		a->_a_stacksize = l;
 	}
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_getconcurrency.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_getconcurrency.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_getconcurrency.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_getconcurrency.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_getcpuclockid.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_getcpuclockid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_getcpuclockid.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_getcpuclockid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_getschedparam.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_getschedparam.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_getschedparam.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_getschedparam.c
index 3053c1865e..1cba073d0c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_getschedparam.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_getschedparam.c
@@ -1,10 +1,11 @@
 #include "pthread_impl.h"
+#include "lock.h"
 
 int pthread_getschedparam(pthread_t t, int *restrict policy, struct sched_param *restrict param)
 {
 	int r;
-	__lock(t->killlock);
-	if (t->dead) {
+	LOCK(t->killlock);
+	if (!t->tid) {
 		r = ESRCH;
 	} else {
 		r = -__syscall(SYS_sched_getparam, t->tid, param);
@@ -12,6 +13,6 @@ int pthread_getschedparam(pthread_t t, int *restrict policy, struct sched_param
 			*policy = __syscall(SYS_sched_getscheduler, t->tid);
 		}
 	}
-	__unlock(t->killlock);
+	UNLOCK(t->killlock);
 	return r;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_getspecific.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_getspecific.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_getspecific.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_getspecific.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_join.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_join.c
new file mode 100644
index 0000000000..17dae85d70
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_join.c
@@ -0,0 +1,40 @@
+#define _GNU_SOURCE
+#include "pthread_impl.h"
+#include <sys/mman.h>
+
+static void dummy1(pthread_t t)
+{
+}
+weak_alias(dummy1, __tl_sync);
+
+static int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
+{
+	int state, cs, r = 0;
+	__pthread_testcancel();
+	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
+	while ((state = t->detach_state) && r != ETIMEDOUT && r != EINVAL) {
+		if (state >= DT_DETACHED) a_crash();
+		r = __timedwait_cp(&t->detach_state, state, CLOCK_REALTIME, at, 1);
+	}
+	__pthread_setcancelstate(cs, 0);
+	if (r == ETIMEDOUT || r == EINVAL) return r;
+	__tl_sync(t);
+	if (res) *res = t->result;
+	if (t->map_base) __munmap(t->map_base, t->map_size);
+	return 0;
+}
+
+int __pthread_join(pthread_t t, void **res)
+{
+	return __pthread_timedjoin_np(t, res, 0);
+}
+
+static int __pthread_tryjoin_np(pthread_t t, void **res)
+{
+	return t->detach_state==DT_JOINABLE ? EBUSY : __pthread_join(t, res);
+}
+
+weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np);
+weak_alias(__pthread_timedjoin_np, pthread_timedjoin_np);
+weak_alias(__pthread_join, pthread_join);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_key_create.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_key_create.c
new file mode 100644
index 0000000000..d112094122
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_key_create.c
@@ -0,0 +1,91 @@
+#include "pthread_impl.h"
+
+volatile size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
+void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
+
+static void (*keys[PTHREAD_KEYS_MAX])(void *);
+
+static pthread_rwlock_t key_lock = PTHREAD_RWLOCK_INITIALIZER;
+
+static pthread_key_t next_key;
+
+static void nodtor(void *dummy)
+{
+}
+
+static void dummy_0(void)
+{
+}
+
+weak_alias(dummy_0, __tl_lock);
+weak_alias(dummy_0, __tl_unlock);
+
+int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
+{
+	pthread_t self = __pthread_self();
+
+	/* This can only happen in the main thread before
+	 * pthread_create has been called. */
+	if (!self->tsd) self->tsd = __pthread_tsd_main;
+
+	/* Purely a sentinel value since null means slot is free. */
+	if (!dtor) dtor = nodtor;
+
+	__pthread_rwlock_wrlock(&key_lock);
+	pthread_key_t j = next_key;
+	do {
+		if (!keys[j]) {
+			keys[next_key = *k = j] = dtor;
+			__pthread_rwlock_unlock(&key_lock);
+			return 0;
+		}
+	} while ((j=(j+1)%PTHREAD_KEYS_MAX) != next_key);
+
+	__pthread_rwlock_unlock(&key_lock);
+	return EAGAIN;
+}
+
+int __pthread_key_delete(pthread_key_t k)
+{
+	sigset_t set;
+	pthread_t self = __pthread_self(), td=self;
+
+	__block_app_sigs(&set);
+	__pthread_rwlock_wrlock(&key_lock);
+
+	__tl_lock();
+	do td->tsd[k] = 0;
+	while ((td=td->next)!=self);
+	__tl_unlock();
+
+	keys[k] = 0;
+
+	__pthread_rwlock_unlock(&key_lock);
+	__restore_sigs(&set);
+
+	return 0;
+}
+
+void __pthread_tsd_run_dtors()
+{
+	pthread_t self = __pthread_self();
+	int i, j;
+	for (j=0; self->tsd_used && j<PTHREAD_DESTRUCTOR_ITERATIONS; j++) {
+		__pthread_rwlock_rdlock(&key_lock);
+		self->tsd_used = 0;
+		for (i=0; i<PTHREAD_KEYS_MAX; i++) {
+			void *val = self->tsd[i];
+			void (*dtor)(void *) = keys[i];
+			self->tsd[i] = 0;
+			if (val && dtor && dtor != nodtor) {
+				__pthread_rwlock_unlock(&key_lock);
+				dtor(val);
+				__pthread_rwlock_rdlock(&key_lock);
+			}
+		}
+		__pthread_rwlock_unlock(&key_lock);
+	}
+}
+
+weak_alias(__pthread_key_create, pthread_key_create);
+weak_alias(__pthread_key_delete, pthread_key_delete);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_kill.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_kill.c
new file mode 100644
index 0000000000..3d9395cb7e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_kill.c
@@ -0,0 +1,12 @@
+#include "pthread_impl.h"
+#include "lock.h"
+
+int pthread_kill(pthread_t t, int sig)
+{
+	int r;
+	LOCK(t->killlock);
+	r = t->tid ? -__syscall(SYS_tkill, t->tid, sig)
+		: (sig+0U >= _NSIG ? EINVAL : 0);
+	UNLOCK(t->killlock);
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_consistent.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_consistent.c
new file mode 100644
index 0000000000..27c74e5b6a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_consistent.c
@@ -0,0 +1,14 @@
+#include "pthread_impl.h"
+#include "atomic.h"
+
+int pthread_mutex_consistent(pthread_mutex_t *m)
+{
+	int old = m->_m_lock;
+	int own = old & 0x3fffffff;
+	if (!(m->_m_type & 4) || !own || !(old & 0x40000000))
+		return EINVAL;
+	if (own != __pthread_self()->tid)
+		return EPERM;
+	a_and(&m->_m_lock, ~0x40000000);
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_getprioceiling.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_getprioceiling.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_getprioceiling.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_getprioceiling.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_init.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_lock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_lock.c
new file mode 100644
index 0000000000..638d4b8697
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_lock.c
@@ -0,0 +1,12 @@
+#include "pthread_impl.h"
+
+int __pthread_mutex_lock(pthread_mutex_t *m)
+{
+	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
+	    && !a_cas(&m->_m_lock, 0, EBUSY))
+		return 0;
+
+	return __pthread_mutex_timedlock(m, 0);
+}
+
+weak_alias(__pthread_mutex_lock, pthread_mutex_lock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_setprioceiling.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_setprioceiling.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutex_setprioceiling.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_setprioceiling.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_timedlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_timedlock.c
new file mode 100644
index 0000000000..9279fc5430
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_timedlock.c
@@ -0,0 +1,92 @@
+#include "pthread_impl.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+static int __futex4(volatile void *addr, int op, int val, const struct timespec *to)
+{
+#ifdef SYS_futex_time64
+	time_t s = to ? to->tv_sec : 0;
+	long ns = to ? to->tv_nsec : 0;
+	int r = -ENOSYS;
+	if (SYS_futex == SYS_futex_time64 || !IS32BIT(s))
+		r = __syscall(SYS_futex_time64, addr, op, val,
+			to ? ((long long[]){s, ns}) : 0);
+	if (SYS_futex == SYS_futex_time64 || r!=-ENOSYS) return r;
+	to = to ? (void *)(long[]){CLAMP(s), ns} : 0;
+#endif
+	return __syscall(SYS_futex, addr, op, val, to);
+}
+
+static int pthread_mutex_timedlock_pi(pthread_mutex_t *restrict m, const struct timespec *restrict at)
+{
+	int type = m->_m_type;
+	int priv = (type & 128) ^ 128;
+	pthread_t self = __pthread_self();
+	int e;
+
+	if (!priv) self->robust_list.pending = &m->_m_next;
+
+	do e = -__futex4(&m->_m_lock, FUTEX_LOCK_PI|priv, 0, at);
+	while (e==EINTR);
+	if (e) self->robust_list.pending = 0;
+
+	switch (e) {
+	case 0:
+		/* Catch spurious success for non-robust mutexes. */
+		if (!(type&4) && ((m->_m_lock & 0x40000000) || m->_m_waiters)) {
+			a_store(&m->_m_waiters, -1);
+			__syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv);
+			self->robust_list.pending = 0;
+			break;
+		}
+		/* Signal to trylock that we already have the lock. */
+		m->_m_count = -1;
+		return __pthread_mutex_trylock(m);
+	case ETIMEDOUT:
+		return e;
+	case EDEADLK:
+		if ((type&3) == PTHREAD_MUTEX_ERRORCHECK) return e;
+	}
+	do e = __timedwait(&(int){0}, 0, CLOCK_REALTIME, at, 1);
+	while (e != ETIMEDOUT);
+	return e;
+}
+
+int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at)
+{
+	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
+	    && !a_cas(&m->_m_lock, 0, EBUSY))
+		return 0;
+
+	int type = m->_m_type;
+	int r, t, priv = (type & 128) ^ 128;
+
+	r = __pthread_mutex_trylock(m);
+	if (r != EBUSY) return r;
+
+	if (type&8) return pthread_mutex_timedlock_pi(m, at);
+	
+	int spins = 100;
+	while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
+
+	while ((r=__pthread_mutex_trylock(m)) == EBUSY) {
+		r = m->_m_lock;
+		int own = r & 0x3fffffff;
+		if (!own && (!r || (type&4)))
+			continue;
+		if ((type&3) == PTHREAD_MUTEX_ERRORCHECK
+		    && own == __pthread_self()->tid)
+			return EDEADLK;
+
+		a_inc(&m->_m_waiters);
+		t = r | 0x80000000;
+		a_cas(&m->_m_lock, r, t);
+		r = __timedwait(&m->_m_lock, t, CLOCK_REALTIME, at, priv);
+		a_dec(&m->_m_waiters);
+		if (r && r != EINTR) break;
+	}
+	return r;
+}
+
+weak_alias(__pthread_mutex_timedlock, pthread_mutex_timedlock);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_trylock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_trylock.c
new file mode 100644
index 0000000000..a24e7c58ac
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_trylock.c
@@ -0,0 +1,74 @@
+#include "pthread_impl.h"
+
+int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
+{
+	int old, own;
+	int type = m->_m_type;
+	pthread_t self = __pthread_self();
+	int tid = self->tid;
+
+	old = m->_m_lock;
+	own = old & 0x3fffffff;
+	if (own == tid) {
+		if ((type&8) && m->_m_count<0) {
+			old &= 0x40000000;
+			m->_m_count = 0;
+			goto success;
+		}
+		if ((type&3) == PTHREAD_MUTEX_RECURSIVE) {
+			if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN;
+			m->_m_count++;
+			return 0;
+		}
+	}
+	if (own == 0x3fffffff) return ENOTRECOVERABLE;
+	if (own || (old && !(type & 4))) return EBUSY;
+
+	if (type & 128) {
+		if (!self->robust_list.off) {
+			self->robust_list.off = (char*)&m->_m_lock-(char *)&m->_m_next;
+			__syscall(SYS_set_robust_list, &self->robust_list, 3*sizeof(long));
+		}
+		if (m->_m_waiters) tid |= 0x80000000;
+		self->robust_list.pending = &m->_m_next;
+	}
+	tid |= old & 0x40000000;
+
+	if (a_cas(&m->_m_lock, old, tid) != old) {
+		self->robust_list.pending = 0;
+		if ((type&12)==12 && m->_m_waiters) return ENOTRECOVERABLE;
+		return EBUSY;
+	}
+
+success:
+	if ((type&8) && m->_m_waiters) {
+		int priv = (type & 128) ^ 128;
+		__syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv);
+		self->robust_list.pending = 0;
+		return (type&4) ? ENOTRECOVERABLE : EBUSY;
+	}
+
+	volatile void *next = self->robust_list.head;
+	m->_m_next = next;
+	m->_m_prev = &self->robust_list.head;
+	if (next != &self->robust_list.head) *(volatile void *volatile *)
+		((char *)next - sizeof(void *)) = &m->_m_next;
+	self->robust_list.head = &m->_m_next;
+	self->robust_list.pending = 0;
+
+	if (old) {
+		m->_m_count = 0;
+		return EOWNERDEAD;
+	}
+
+	return 0;
+}
+
+int __pthread_mutex_trylock(pthread_mutex_t *m)
+{
+	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL)
+		return a_cas(&m->_m_lock, 0, EBUSY) & EBUSY;
+	return __pthread_mutex_trylock_owner(m);
+}
+
+weak_alias(__pthread_mutex_trylock, pthread_mutex_trylock);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_unlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_unlock.c
new file mode 100644
index 0000000000..b66423e6c3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutex_unlock.c
@@ -0,0 +1,52 @@
+#include "pthread_impl.h"
+
+int __pthread_mutex_unlock(pthread_mutex_t *m)
+{
+	pthread_t self;
+	int waiters = m->_m_waiters;
+	int cont;
+	int type = m->_m_type & 15;
+	int priv = (m->_m_type & 128) ^ 128;
+	int new = 0;
+	int old;
+
+	if (type != PTHREAD_MUTEX_NORMAL) {
+		self = __pthread_self();
+		old = m->_m_lock;
+		int own = old & 0x3fffffff;
+		if (own != self->tid)
+			return EPERM;
+		if ((type&3) == PTHREAD_MUTEX_RECURSIVE && m->_m_count)
+			return m->_m_count--, 0;
+		if ((type&4) && (old&0x40000000))
+			new = 0x7fffffff;
+		if (!priv) {
+			self->robust_list.pending = &m->_m_next;
+			__vm_lock();
+		}
+		volatile void *prev = m->_m_prev;
+		volatile void *next = m->_m_next;
+		*(volatile void *volatile *)prev = next;
+		if (next != &self->robust_list.head) *(volatile void *volatile *)
+			((char *)next - sizeof(void *)) = prev;
+	}
+	if (type&8) {
+		if (old<0 || a_cas(&m->_m_lock, old, new)!=old) {
+			if (new) a_store(&m->_m_waiters, -1);
+			__syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv);
+		}
+		cont = 0;
+		waiters = 0;
+	} else {
+		cont = a_swap(&m->_m_lock, new);
+	}
+	if (type != PTHREAD_MUTEX_NORMAL && !priv) {
+		self->robust_list.pending = 0;
+		__vm_unlock();
+	}
+	if (waiters || cont<0)
+		__wake(&m->_m_lock, 1, priv);
+	return 0;
+}
+
+weak_alias(__pthread_mutex_unlock, pthread_mutex_unlock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_init.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setprotocol.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setprotocol.c
new file mode 100644
index 0000000000..511cc32d8f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setprotocol.c
@@ -0,0 +1,29 @@
+#include "pthread_impl.h"
+#include "syscall.h"
+
+static pthread_once_t check_pi_once;
+static int check_pi_result;
+
+static void check_pi()
+{
+	volatile int lk = 0;
+	check_pi_result = -__syscall(SYS_futex, &lk, FUTEX_LOCK_PI, 0, 0);
+}
+
+int pthread_mutexattr_setprotocol(pthread_mutexattr_t *a, int protocol)
+{
+	switch (protocol) {
+	case PTHREAD_PRIO_NONE:
+		a->__attr &= ~8;
+		return 0;
+	case PTHREAD_PRIO_INHERIT:
+		pthread_once(&check_pi_once, check_pi);
+		if (check_pi_result) return check_pi_result;
+		a->__attr |= 8;
+		return 0;
+	case PTHREAD_PRIO_PROTECT:
+		return ENOTSUP;
+	default:
+		return EINVAL;
+	}
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setpshared.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setpshared.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_setpshared.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setpshared.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setrobust.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setrobust.c
new file mode 100644
index 0000000000..04db92a626
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_setrobust.c
@@ -0,0 +1,25 @@
+#include "pthread_impl.h"
+#include "syscall.h"
+
+static pthread_once_t check_robust_once;
+static int check_robust_result;
+
+static void check_robust()
+{
+	void *p;
+	size_t l;
+	check_robust_result = -__syscall(SYS_get_robust_list, 0, &p, &l);
+}
+
+int pthread_mutexattr_setrobust(pthread_mutexattr_t *a, int robust)
+{
+	if (robust > 1U) return EINVAL;
+	if (robust) {
+		pthread_once(&check_robust_once, check_robust);
+		if (check_robust_result) return check_robust_result;
+		a->__attr |= 4;
+		return 0;
+	}
+	a->__attr &= ~4;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_settype.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_settype.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_mutexattr_settype.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_mutexattr_settype.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_once.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_once.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_once.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_once.c
index a8f8aeb17a..8e8d40ae83 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_once.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_once.c
@@ -8,7 +8,7 @@ static void undo(void *control)
 		__wake(control, -1, 1);
 }
 
-int __pthread_once_full(pthread_once_t *control, void (*init)(void))
+hidden int __pthread_once_full(pthread_once_t *control, void (*init)(void))
 {
 	/* Try to enter initializing state. Four possibilities:
 	 *  0 - we're the first or the other cancelled; run init
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_init.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_rdlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_rdlock.c
new file mode 100644
index 0000000000..8546c07d2e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_rdlock.c
@@ -0,0 +1,8 @@
+#include "pthread_impl.h"
+
+int __pthread_rwlock_rdlock(pthread_rwlock_t *rw)
+{
+	return __pthread_rwlock_timedrdlock(rw, 0);
+}
+
+weak_alias(__pthread_rwlock_rdlock, pthread_rwlock_rdlock);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_timedrdlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_timedrdlock.c
new file mode 100644
index 0000000000..8cdd8ecf17
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_timedrdlock.c
@@ -0,0 +1,25 @@
+#include "pthread_impl.h"
+
+int __pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
+{
+	int r, t;
+
+	r = pthread_rwlock_tryrdlock(rw);
+	if (r != EBUSY) return r;
+	
+	int spins = 100;
+	while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
+
+	while ((r=__pthread_rwlock_tryrdlock(rw))==EBUSY) {
+		if (!(r=rw->_rw_lock) || (r&0x7fffffff)!=0x7fffffff) continue;
+		t = r | 0x80000000;
+		a_inc(&rw->_rw_waiters);
+		a_cas(&rw->_rw_lock, r, t);
+		r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, rw->_rw_shared^128);
+		a_dec(&rw->_rw_waiters);
+		if (r && r != EINTR) return r;
+	}
+	return r;
+}
+
+weak_alias(__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_timedwrlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_timedwrlock.c
new file mode 100644
index 0000000000..d77706e6bc
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_timedwrlock.c
@@ -0,0 +1,25 @@
+#include "pthread_impl.h"
+
+int __pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
+{
+	int r, t;
+	
+	r = pthread_rwlock_trywrlock(rw);
+	if (r != EBUSY) return r;
+	
+	int spins = 100;
+	while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
+
+	while ((r=__pthread_rwlock_trywrlock(rw))==EBUSY) {
+		if (!(r=rw->_rw_lock)) continue;
+		t = r | 0x80000000;
+		a_inc(&rw->_rw_waiters);
+		a_cas(&rw->_rw_lock, r, t);
+		r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, rw->_rw_shared^128);
+		a_dec(&rw->_rw_waiters);
+		if (r && r != EINTR) return r;
+	}
+	return r;
+}
+
+weak_alias(__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_tryrdlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_tryrdlock.c
new file mode 100644
index 0000000000..c13bc9cc19
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_tryrdlock.c
@@ -0,0 +1,15 @@
+#include "pthread_impl.h"
+
+int __pthread_rwlock_tryrdlock(pthread_rwlock_t *rw)
+{
+	int val, cnt;
+	do {
+		val = rw->_rw_lock;
+		cnt = val & 0x7fffffff;
+		if (cnt == 0x7fffffff) return EBUSY;
+		if (cnt == 0x7ffffffe) return EAGAIN;
+	} while (a_cas(&rw->_rw_lock, val, val+1) != val);
+	return 0;
+}
+
+weak_alias(__pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_trywrlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_trywrlock.c
new file mode 100644
index 0000000000..64d9d3121a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_trywrlock.c
@@ -0,0 +1,9 @@
+#include "pthread_impl.h"
+
+int __pthread_rwlock_trywrlock(pthread_rwlock_t *rw)
+{
+	if (a_cas(&rw->_rw_lock, 0, 0x7fffffff)) return EBUSY;
+	return 0;
+}
+
+weak_alias(__pthread_rwlock_trywrlock, pthread_rwlock_trywrlock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_unlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_unlock.c
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_unlock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_unlock.c
index 7b5eec84d8..9ae27ad2b3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlock_unlock.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_unlock.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_unlock(pthread_rwlock_t *rw)
+int __pthread_rwlock_unlock(pthread_rwlock_t *rw)
 {
 	int val, cnt, waiters, new, priv = rw->_rw_shared^128;
 
@@ -16,3 +16,5 @@ int pthread_rwlock_unlock(pthread_rwlock_t *rw)
 
 	return 0;
 }
+
+weak_alias(__pthread_rwlock_unlock, pthread_rwlock_unlock);
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_wrlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_wrlock.c
new file mode 100644
index 0000000000..46a3b3a5b0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlock_wrlock.c
@@ -0,0 +1,8 @@
+#include "pthread_impl.h"
+
+int __pthread_rwlock_wrlock(pthread_rwlock_t *rw)
+{
+	return __pthread_rwlock_timedwrlock(rw, 0);
+}
+
+weak_alias(__pthread_rwlock_wrlock, pthread_rwlock_wrlock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlockattr_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlockattr_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlockattr_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlockattr_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlockattr_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlockattr_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlockattr_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlockattr_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlockattr_setpshared.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlockattr_setpshared.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_rwlockattr_setpshared.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_rwlockattr_setpshared.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_self.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_self.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_self.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_self.c
index 241a6202d2..bd3bf95bb7 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_self.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_self.c
@@ -1,6 +1,5 @@
 #include "pthread_impl.h"
 #include <threads.h>
-#include "libc.h"
 
 static pthread_t __pthread_self_internal()
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setattr_default_np.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setattr_default_np.c
new file mode 100644
index 0000000000..58486220e0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setattr_default_np.c
@@ -0,0 +1,37 @@
+#define _GNU_SOURCE
+#include "pthread_impl.h"
+#include <string.h>
+
+#define MIN(a,b) ((a)<(b) ? (a) : (b))
+#define MAX(a,b) ((a)>(b) ? (a) : (b))
+
+int pthread_setattr_default_np(const pthread_attr_t *attrp)
+{
+	/* Reject anything in the attr object other than stack/guard size. */
+	pthread_attr_t tmp = *attrp, zero = { 0 };
+	tmp._a_stacksize = 0;
+	tmp._a_guardsize = 0;
+	if (memcmp(&tmp, &zero, sizeof tmp))
+		return EINVAL;
+
+	unsigned stack = MIN(attrp->_a_stacksize, DEFAULT_STACK_MAX);
+	unsigned guard = MIN(attrp->_a_guardsize, DEFAULT_GUARD_MAX);
+
+	__inhibit_ptc();
+	__default_stacksize = MAX(__default_stacksize, stack);
+	__default_guardsize = MAX(__default_guardsize, guard);
+	__release_ptc();
+
+	return 0;
+}
+
+int pthread_getattr_default_np(pthread_attr_t *attrp)
+{
+	__acquire_ptc();
+	*attrp = (pthread_attr_t) {
+		._a_stacksize = __default_stacksize,
+		._a_guardsize = __default_guardsize,
+	};
+	__release_ptc();
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setcancelstate.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setcancelstate.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_setcancelstate.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_setcancelstate.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setcanceltype.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setcanceltype.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_setcanceltype.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_setcanceltype.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setconcurrency.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setconcurrency.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_setconcurrency.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_setconcurrency.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setname_np.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setname_np.c
new file mode 100644
index 0000000000..82d35e17ed
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setname_np.c
@@ -0,0 +1,26 @@
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/prctl.h>
+
+#include "pthread_impl.h"
+
+int pthread_setname_np(pthread_t thread, const char *name)
+{
+	int fd, cs, status = 0;
+	char f[sizeof "/proc/self/task//comm" + 3*sizeof(int)];
+	size_t len;
+
+	if ((len = strnlen(name, 16)) > 15) return ERANGE;
+
+	if (thread == pthread_self())
+		return prctl(PR_SET_NAME, (unsigned long)name, 0UL, 0UL, 0UL) ? errno : 0;
+
+	snprintf(f, sizeof f, "/proc/self/task/%d/comm", thread->tid);
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	if ((fd = open(f, O_WRONLY)) < 0 || write(fd, name, len) < 0) status = errno;
+	if (fd >= 0) close(fd);
+	pthread_setcancelstate(cs, 0);
+	return status;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setschedparam.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setschedparam.c
new file mode 100644
index 0000000000..038d13d8ac
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setschedparam.c
@@ -0,0 +1,11 @@
+#include "pthread_impl.h"
+#include "lock.h"
+
+int pthread_setschedparam(pthread_t t, int policy, const struct sched_param *param)
+{
+	int r;
+	LOCK(t->killlock);
+	r = !t->tid ? ESRCH : -__syscall(SYS_sched_setscheduler, t->tid, policy, param);
+	UNLOCK(t->killlock);
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setschedprio.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setschedprio.c
new file mode 100644
index 0000000000..5bf4a0197e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setschedprio.c
@@ -0,0 +1,11 @@
+#include "pthread_impl.h"
+#include "lock.h"
+
+int pthread_setschedprio(pthread_t t, int prio)
+{
+	int r;
+	LOCK(t->killlock);
+	r = !t->tid ? ESRCH : -__syscall(SYS_sched_setparam, t->tid, &prio);
+	UNLOCK(t->killlock);
+	return r;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_setspecific.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_setspecific.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_setspecific.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_setspecific.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_sigmask.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_sigmask.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_sigmask.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_sigmask.c
index 88c333f6b6..f188782a32 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_sigmask.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_sigmask.c
@@ -5,7 +5,7 @@
 int pthread_sigmask(int how, const sigset_t *restrict set, sigset_t *restrict old)
 {
 	int ret;
-	if ((unsigned)how - SIG_BLOCK > 2U) return EINVAL;
+	if (set && (unsigned)how - SIG_BLOCK > 2U) return EINVAL;
 	ret = -__syscall(SYS_rt_sigprocmask, how, set, old, _NSIG/8);
 	if (!ret && old) {
 		if (sizeof old->__bits[0] == 8) {
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_lock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_lock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_lock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_lock.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_trylock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_trylock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_trylock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_trylock.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_unlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_unlock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_spin_unlock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_spin_unlock.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_testcancel.c b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_testcancel.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/thread/pthread_testcancel.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/pthread_testcancel.c
index ee48e6d8af..d772449d94 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/pthread_testcancel.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/pthread_testcancel.c
@@ -1,5 +1,4 @@
 #include "pthread_impl.h"
-#include "libc.h"
 
 static void dummy()
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/__set_thread_area.s
new file mode 100644
index 0000000000..828154d297
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/__set_thread_area.s
@@ -0,0 +1,6 @@
+.global __set_thread_area
+.type   __set_thread_area, %function
+__set_thread_area:
+	mv tp, a0
+	li a0, 0
+	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/__unmapself.s
new file mode 100644
index 0000000000..2849119c39
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/__unmapself.s
@@ -0,0 +1,7 @@
+.global __unmapself
+.type __unmapself, %function
+__unmapself:
+	li a7, 215 # SYS_munmap
+	ecall
+	li a7, 93  # SYS_exit
+	ecall
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/clone.s
new file mode 100644
index 0000000000..db908248cd
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/clone.s
@@ -0,0 +1,34 @@
+# __clone(func, stack, flags, arg, ptid, tls, ctid)
+#           a0,    a1,    a2,  a3,   a4,  a5,   a6
+
+# syscall(SYS_clone, flags, stack, ptid, tls, ctid)
+#                a7     a0,    a1,   a2,  a3,   a4
+
+.global __clone
+.type  __clone, %function
+__clone:
+	# Save func and arg to stack
+	addi a1, a1, -16
+	sd a0, 0(a1)
+	sd a3, 8(a1)
+
+	# Call SYS_clone
+	mv a0, a2
+	mv a2, a4
+	mv a3, a5
+	mv a4, a6
+	li a7, 220 # SYS_clone
+	ecall
+
+	beqz a0, 1f
+	# Parent
+	ret
+
+	# Child
+1:      ld a1, 0(sp)
+	ld a0, 8(sp)
+	jalr a1
+
+	# Exit
+	li a7, 93 # SYS_exit
+	ecall
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/syscall_cp.s
new file mode 100644
index 0000000000..eeef6391bf
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/riscv64/syscall_cp.s
@@ -0,0 +1,29 @@
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type __syscall_cp_asm, %function
+__syscall_cp_asm:
+__cp_begin:
+	lw t0, 0(a0)
+	bnez t0, __cp_cancel
+
+	mv t0, a1
+	mv a0, a2
+	mv a1, a3
+	mv a2, a4
+	mv a3, a5
+	mv a4, a6
+	mv a5, a7
+	ld a6, 0(sp)
+	mv a7, t0
+	ecall
+__cp_end:
+	ret
+__cp_cancel:
+	tail __cancel
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__set_thread_area.s
new file mode 100644
index 0000000000..00a11e2544
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__set_thread_area.s
@@ -0,0 +1,10 @@
+.text
+.global __set_thread_area
+.hidden __set_thread_area
+.type   __set_thread_area, %function
+__set_thread_area:
+	sar  %a1, %r2
+	srlg %r2, %r2, 32
+	sar  %a0, %r2
+	lghi %r2, 0
+	br   %r14
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__tls_get_offset.s b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__tls_get_offset.s
new file mode 100644
index 0000000000..8ee92de8ea
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__tls_get_offset.s
@@ -0,0 +1,17 @@
+	.global __tls_get_offset
+	.type __tls_get_offset,%function
+__tls_get_offset:
+	stmg  %r14, %r15, 112(%r15)
+	aghi  %r15, -160
+
+	la    %r2, 0(%r2, %r12)
+	brasl %r14, __tls_get_addr
+
+	ear   %r1, %a0
+	sllg  %r1, %r1, 32
+	ear   %r1, %a1
+
+	sgr   %r2, %r1
+
+	lmg   %r14, %r15, 272(%r15)
+	br    %r14
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__unmapself.s
new file mode 100644
index 0000000000..48b312cd30
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/__unmapself.s
@@ -0,0 +1,6 @@
+.text
+.global __unmapself
+.type   __unmapself, @function
+__unmapself:
+	svc 91 # SYS_munmap
+	svc 1  # SYS_exit
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/s390x/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/clone.s
new file mode 100644
index 0000000000..577748eab3
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/clone.s
@@ -0,0 +1,48 @@
+.text
+.global __clone
+.hidden __clone
+.type __clone, %function
+__clone:
+	# int clone(
+	#    fn,      a = r2
+	#    stack,   b = r3
+	#    flags,   c = r4
+	#    arg,     d = r5
+	#    ptid,    e = r6
+	#    tls,     f = *(r15+160)
+	#    ctid)    g = *(r15+168)
+	#
+	# pseudo C code:
+	# tid = syscall(SYS_clone,b,c,e,g,f);
+	# if (!tid) syscall(SYS_exit, a(d));
+	# return tid;
+
+	# create initial stack frame for new thread
+	nill %r3, 0xfff8
+	aghi %r3, -160
+	lghi %r0, 0
+	stg  %r0, 0(%r3)
+
+	# save fn and arg to child stack
+	stg  %r2,  8(%r3)
+	stg  %r5, 16(%r3)
+
+	# shuffle args into correct registers and call SYS_clone
+	lgr  %r2, %r3
+	lgr  %r3, %r4
+	lgr  %r4, %r6
+	lg   %r5, 168(%r15)
+	lg   %r6, 160(%r15)
+	svc  120
+
+	# if error or if we're the parent, return
+	ltgr %r2, %r2
+	bnzr %r14
+
+	# we're the child. call fn(arg)
+	lg   %r1,  8(%r15)
+	lg   %r2, 16(%r15)
+	basr %r14, %r1
+
+	# call SYS_exit. exit code is already in r2 from fn return value
+	svc  1
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/s390x/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/syscall_cp.s
new file mode 100644
index 0000000000..c1da40de88
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/s390x/syscall_cp.s
@@ -0,0 +1,32 @@
+	.global __cp_begin
+	.hidden __cp_begin
+	.global __cp_end
+	.hidden __cp_end
+	.global __cp_cancel
+	.hidden __cp_cancel
+	.hidden __cancel
+	.global __syscall_cp_asm
+	.hidden __syscall_cp_asm
+	.text
+	.type   __syscall_cp_asm,%function
+__syscall_cp_asm:
+__cp_begin:
+	icm %r2, 15, 0(%r2)
+	jne __cp_cancel
+
+	stg %r7, 56(%r15)
+	lgr %r1, %r3
+	lgr %r2, %r4
+	lgr %r3, %r5
+	lgr %r4, %r6
+	lg  %r5, 160(%r15)
+	lg  %r6, 168(%r15)
+	lg  %r7, 176(%r15)
+	svc 0
+
+__cp_end:
+	lg  %r7, 56(%r15)
+	br  %r14
+
+__cp_cancel:
+	jg  __cancel
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_destroy.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_destroy.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_destroy.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_destroy.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_getvalue.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_getvalue.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_getvalue.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_getvalue.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_init.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_init.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_init.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_init.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_open.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_open.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_open.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_open.c
index fda0acd35c..de8555c5a6 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/sem_open.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sem_open.c
@@ -11,16 +11,14 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "libc.h"
-
-char *__shm_mapname(const char *, char *);
+#include "lock.h"
 
 static struct {
 	ino_t ino;
 	sem_t *sem;
 	int refcnt;
 } *semtab;
-static volatile int lock[2];
+static volatile int lock[1];
 
 #define FLAGS (O_RDWR|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK)
 
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_post.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_post.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_post.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_post.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_timedwait.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_timedwait.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_timedwait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_timedwait.c
index 8132eb1bf7..58d3ebfefc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/sem_timedwait.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sem_timedwait.c
@@ -22,7 +22,7 @@ int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at)
 		pthread_cleanup_push(cleanup, (void *)(sem->__val+1));
 		r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, sem->__val[2]);
 		pthread_cleanup_pop(1);
-		if (r && r != EINTR) {
+		if (r) {
 			errno = r;
 			return -1;
 		}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_trywait.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_trywait.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_trywait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_trywait.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_unlink.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_unlink.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_unlink.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_unlink.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/sem_wait.c b/src/components/lib/libc/musl-1.2.0/src/thread/sem_wait.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/sem_wait.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/sem_wait.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/sh/__set_thread_area.c b/src/components/lib/libc/musl-1.2.0/src/thread/sh/__set_thread_area.c
new file mode 100644
index 0000000000..34264bddd9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sh/__set_thread_area.c
@@ -0,0 +1,37 @@
+#include "pthread_impl.h"
+#include "libc.h"
+#include <elf.h>
+
+/* Also perform sh-specific init */
+
+#define CPU_HAS_LLSC 0x0040
+#define CPU_HAS_CAS_L 0x0400
+
+extern hidden const char __sh_cas_gusa[], __sh_cas_llsc[], __sh_cas_imask[], __sh_cas_cas_l[];
+
+hidden const void *__sh_cas_ptr;
+
+hidden unsigned __sh_nommu;
+
+int __set_thread_area(void *p)
+{
+	size_t *aux;
+	__asm__ __volatile__ ( "ldc %0, gbr" : : "r"(p) : "memory" );
+#ifndef __SH4A__
+	__sh_cas_ptr = __sh_cas_gusa;
+#if !defined(__SH3__) && !defined(__SH4__)
+	for (aux=libc.auxv; *aux; aux+=2) {
+		if (*aux != AT_PLATFORM) continue;
+		const char *s = (void *)aux[1];
+		if (s[0]!='s' || s[1]!='h' || s[2]!='2' || s[3]-'0'<10u) break;
+		__sh_cas_ptr = __sh_cas_imask;
+		__sh_nommu = 1;
+	}
+#endif
+	if (__hwcap & CPU_HAS_CAS_L)
+		__sh_cas_ptr = __sh_cas_cas_l;
+	else if (__hwcap & CPU_HAS_LLSC)
+		__sh_cas_ptr = __sh_cas_llsc;
+#endif
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/sh/__unmapself.c b/src/components/lib/libc/musl-1.2.0/src/thread/sh/__unmapself.c
new file mode 100644
index 0000000000..35fb3c92d0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sh/__unmapself.c
@@ -0,0 +1,24 @@
+#include "pthread_impl.h"
+
+hidden void __unmapself_sh_mmu(void *, size_t);
+hidden void __unmapself_sh_nommu(void *, size_t);
+
+#if !defined(__SH3__) && !defined(__SH4__)
+#define __unmapself __unmapself_sh_nommu
+#include "dynlink.h"
+#undef CRTJMP
+#define CRTJMP(pc,sp) __asm__ __volatile__( \
+	"mov.l @%0+,r0 ; mov.l @%0,r12 ; jmp @r0 ; mov %1,r15" \
+	: : "r"(pc), "r"(sp) : "r0", "memory" )
+#include "../__unmapself.c"
+#undef __unmapself
+extern hidden unsigned __sh_nommu;
+#else
+#define __sh_nommu 0
+#endif
+
+void __unmapself(void *base, size_t size)
+{
+	if (__sh_nommu) __unmapself_sh_nommu(base, size);
+	else __unmapself_sh_mmu(base, size);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/sh/__unmapself_mmu.s b/src/components/lib/libc/musl-1.2.0/src/thread/sh/__unmapself_mmu.s
new file mode 100644
index 0000000000..688087b80f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sh/__unmapself_mmu.s
@@ -0,0 +1,23 @@
+.text
+.global __unmapself_sh_mmu
+.hidden __unmapself_sh_mmu
+.type   __unmapself_sh_mmu, @function
+__unmapself_sh_mmu:
+	mov   #91, r3  ! SYS_munmap
+	trapa #31
+
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+
+	mov   #1, r3   ! SYS_exit
+	mov   #0, r4
+	trapa #31
+
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
+	or    r0, r0
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/sh/atomics.s b/src/components/lib/libc/musl-1.2.0/src/thread/sh/atomics.s
new file mode 100644
index 0000000000..9d9fcb6eda
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sh/atomics.s
@@ -0,0 +1,65 @@
+/* Contract for all versions is same as cas.l r2,r3,@r0
+ * pr and r1 are also clobbered (by jsr & r1 as temp).
+ * r0,r2,r4-r15 must be preserved.
+ * r3 contains result (==r2 iff cas succeeded). */
+
+	.align 2
+.global __sh_cas_gusa
+.hidden __sh_cas_gusa
+__sh_cas_gusa:
+	mov.l r5,@-r15
+	mov.l r4,@-r15
+	mov r0,r4
+	mova 1f,r0
+	mov r15,r1
+	mov #(0f-1f),r15
+0:	mov.l @r4,r5
+	cmp/eq r5,r2
+	bf 1f
+	mov.l r3,@r4
+1:	mov r1,r15
+	mov r5,r3
+	mov r4,r0
+	mov.l @r15+,r4
+	rts
+	 mov.l @r15+,r5
+
+.global __sh_cas_llsc
+.hidden __sh_cas_llsc
+__sh_cas_llsc:
+	mov r0,r1
+	.word 0x00ab /* synco */
+0:	.word 0x0163 /* movli.l @r1,r0 */
+	cmp/eq r0,r2
+	bf 1f
+	mov r3,r0
+	.word 0x0173 /* movco.l r0,@r1 */
+	bf 0b
+	mov r2,r0
+1:	.word 0x00ab /* synco */
+	mov r0,r3
+	rts
+	 mov r1,r0
+
+.global __sh_cas_imask
+.hidden __sh_cas_imask
+__sh_cas_imask:
+	mov r0,r1
+	stc sr,r0
+	mov.l r0,@-r15
+	or #0xf0,r0
+	ldc r0,sr
+	mov.l @r1,r0
+	cmp/eq r0,r2
+	bf 1f
+	mov.l r3,@r1
+1:	ldc.l @r15+,sr
+	mov r0,r3
+	rts
+	 mov r1,r0
+
+.global __sh_cas_cas_l
+.hidden __sh_cas_cas_l
+__sh_cas_cas_l:
+	rts
+	 .word 0x2323 /* cas.l r2,r3,@r0 */
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/sh/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/sh/clone.s
new file mode 100644
index 0000000000..9cfd8623c5
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sh/clone.s
@@ -0,0 +1,54 @@
+.text
+.global __clone
+.hidden __clone
+.type   __clone, @function
+__clone:
+! incoming: fn stack flags arg ptid tls      ctid
+!           r4 r5    r6    r7  @r15 @(4,r15) @(8,r15)
+
+	mov   #-16, r0
+	and   r0, r5
+
+	mov   r4, r1         ! r1 = fn
+	mov   r7, r2         ! r2 = arg
+
+	mov   #120,     r3   ! r3 = __NR_clone
+	mov   r6,       r4   ! r4 = flags
+	!mov  r5,       r5   ! r5 = stack
+	mov.l @r15,     r6   ! r6 = ptid
+	mov.l @(8,r15), r7   ! r7 = ctid
+	mov.l @(4,r15), r0   ! r0 = tls
+	trapa #31
+
+	or r0, r0
+	or r0, r0
+	or r0, r0
+	or r0, r0
+	or r0, r0
+
+	cmp/eq #0, r0
+	bt     1f
+
+	! we are the parent, return
+	rts
+	 nop
+
+1:	! we are the child, call fn(arg)
+	mov.l  1f, r0
+	mov    r1, r5
+	bsrf   r0
+	 mov    r2, r4
+
+2:	mov   #1, r3   ! __NR_exit
+	mov   r0, r4
+	trapa #31
+
+	or   r0, r0
+	or   r0, r0
+	or   r0, r0
+	or   r0, r0
+	or   r0, r0
+
+.align 2
+.hidden __shcall
+1:	.long __shcall@PCREL+(.-2b)
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/sh/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/sh/syscall_cp.s
new file mode 100644
index 0000000000..bb848ef3b6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/sh/syscall_cp.s
@@ -0,0 +1,45 @@
+.text
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm, @function
+__syscall_cp_asm:
+
+__cp_begin:
+	mov.l @r4, r4
+	tst   r4, r4
+	bf    __cp_cancel
+	mov   r5, r3
+	mov   r6, r4
+	mov   r7, r5
+	mov.l @r15, r6
+	mov.l @(4,r15), r7
+	mov.l @(8,r15), r0
+	mov.l @(12,r15), r1
+	trapa #31
+
+__cp_end:
+	! work around hardware bug
+	or   r0, r0
+	or   r0, r0
+	or   r0, r0
+	or   r0, r0
+	or   r0, r0
+
+	rts
+	 nop
+
+__cp_cancel:
+	mov.l 2f, r0
+	braf  r0
+	 nop
+1:
+
+.align 2
+2:	.long __cancel@PCREL-(1b-.)
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/synccall.c b/src/components/lib/libc/musl-1.2.0/src/thread/synccall.c
new file mode 100644
index 0000000000..648a6ad458
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/synccall.c
@@ -0,0 +1,119 @@
+#include "pthread_impl.h"
+#include <semaphore.h>
+#include <string.h>
+
+static void dummy_0(void)
+{
+}
+
+weak_alias(dummy_0, __tl_lock);
+weak_alias(dummy_0, __tl_unlock);
+
+static int target_tid;
+static void (*callback)(void *), *context;
+static sem_t target_sem, caller_sem;
+
+static void dummy(void *p)
+{
+}
+
+static void handler(int sig)
+{
+	if (__pthread_self()->tid != target_tid) return;
+
+	int old_errno = errno;
+
+	/* Inform caller we have received signal and wait for
+	 * the caller to let us make the callback. */
+	sem_post(&caller_sem);
+	sem_wait(&target_sem);
+
+	callback(context);
+
+	/* Inform caller we've complered the callback and wait
+	 * for the caller to release us to return. */
+	sem_post(&caller_sem);
+	sem_wait(&target_sem);
+
+	/* Inform caller we are returning and state is destroyable. */
+	sem_post(&caller_sem);
+
+	errno = old_errno;
+}
+
+void __synccall(void (*func)(void *), void *ctx)
+{
+	sigset_t oldmask;
+	int cs, i, r;
+	struct sigaction sa = { .sa_flags = SA_RESTART, .sa_handler = handler };
+	pthread_t self = __pthread_self(), td;
+	int count = 0;
+
+	/* Blocking signals in two steps, first only app-level signals
+	 * before taking the lock, then all signals after taking the lock,
+	 * is necessary to achieve AS-safety. Blocking them all first would
+	 * deadlock if multiple threads called __synccall. Waiting to block
+	 * any until after the lock would allow re-entry in the same thread
+	 * with the lock already held. */
+	__block_app_sigs(&oldmask);
+	__tl_lock();
+	__block_all_sigs(0);
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+	sem_init(&target_sem, 0, 0);
+	sem_init(&caller_sem, 0, 0);
+
+	if (!libc.threads_minus_1) goto single_threaded;
+
+	callback = func;
+	context = ctx;
+
+	/* Block even implementation-internal signals, so that nothing
+	 * interrupts the SIGSYNCCALL handlers. The main possible source
+	 * of trouble is asynchronous cancellation. */
+	memset(&sa.sa_mask, -1, sizeof sa.sa_mask);
+	__libc_sigaction(SIGSYNCCALL, &sa, 0);
+
+
+	for (td=self->next; td!=self; td=td->next) {
+		target_tid = td->tid;
+		while ((r = -__syscall(SYS_tkill, td->tid, SIGSYNCCALL)) == EAGAIN);
+		if (r) {
+			/* If we failed to signal any thread, nop out the
+			 * callback to abort the synccall and just release
+			 * any threads already caught. */
+			callback = func = dummy;
+			break;
+		}
+		sem_wait(&caller_sem);
+		count++;
+	}
+	target_tid = 0;
+
+	/* Serialize execution of callback in caught threads, or just
+	 * release them all if synccall is being aborted. */
+	for (i=0; i<count; i++) {
+		sem_post(&target_sem);
+		sem_wait(&caller_sem);
+	}
+
+	sa.sa_handler = SIG_IGN;
+	__libc_sigaction(SIGSYNCCALL, &sa, 0);
+
+single_threaded:
+	func(ctx);
+
+	/* Only release the caught threads once all threads, including the
+	 * caller, have returned from the callback function. */
+	for (i=0; i<count; i++)
+		sem_post(&target_sem);
+	for (i=0; i<count; i++)
+		sem_wait(&caller_sem);
+
+	sem_destroy(&caller_sem);
+	sem_destroy(&target_sem);
+
+	pthread_setcancelstate(cs, 0);
+	__tl_unlock();
+	__restore_sigs(&oldmask);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/syscall_cp.c b/src/components/lib/libc/musl-1.2.0/src/thread/syscall_cp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/syscall_cp.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/syscall_cp.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/thrd_create.c b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_create.c
new file mode 100644
index 0000000000..76a683dbf8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_create.c
@@ -0,0 +1,12 @@
+#include "pthread_impl.h"
+#include <threads.h>
+
+int thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
+{
+	int ret = __pthread_create(thr, __ATTRP_C11_THREAD, (void *(*)(void *))func, arg);
+	switch (ret) {
+	case 0:      return thrd_success;
+	case EAGAIN: return thrd_nomem;
+	default:     return thrd_error;
+	}
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/thrd_exit.c b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_exit.c
new file mode 100644
index 0000000000..9b291ae3db
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_exit.c
@@ -0,0 +1,8 @@
+#include <threads.h>
+#include <pthread.h>
+#include <stdint.h>
+
+_Noreturn void thrd_exit(int result)
+{
+	__pthread_exit((void*)(intptr_t)result);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_join.c b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_join.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/thread/thrd_join.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/thrd_join.c
index ac6678939f..0d5fd302d1 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_join.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_join.c
@@ -1,7 +1,6 @@
 #include <stdint.h>
 #include <threads.h>
-
-int __pthread_join(thrd_t, void**);
+#include <pthread.h>
 
 int thrd_join(thrd_t t, int *res)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_sleep.c b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_sleep.c
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/thread/thrd_sleep.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/thrd_sleep.c
index e8dfe400cb..97de53455e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_sleep.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_sleep.c
@@ -1,10 +1,11 @@
 #include <threads.h>
+#include <time.h>
 #include <errno.h>
 #include "syscall.h"
 
 int thrd_sleep(const struct timespec *req, struct timespec *rem)
 {
-	int ret = __syscall(SYS_nanosleep, req, rem);
+	int ret = -__clock_nanosleep(CLOCK_REALTIME, 0, req, rem);
 	switch (ret) {
 	case 0:      return 0;
 	case -EINTR: return -1; /* value specified by C11 */
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/thrd_yield.c b/src/components/lib/libc/musl-1.2.0/src/thread/thrd_yield.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/thrd_yield.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/thrd_yield.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/tls.c b/src/components/lib/libc/musl-1.2.0/src/thread/tls.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/tls.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/tls.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/tss_create.c b/src/components/lib/libc/musl-1.2.0/src/thread/tss_create.c
similarity index 85%
rename from src/components/lib/libc/musl-1.1.11/src/thread/tss_create.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/tss_create.c
index 251d22b9ab..6d6ef96b4c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/thread/tss_create.c
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/tss_create.c
@@ -1,6 +1,5 @@
 #include <threads.h>
-
-int __pthread_key_create(tss_t *, void (*)(void *));
+#include <pthread.h>
 
 int tss_create(tss_t *tss, tss_dtor_t dtor)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/tss_delete.c b/src/components/lib/libc/musl-1.2.0/src/thread/tss_delete.c
new file mode 100644
index 0000000000..6f51b07eb9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/tss_delete.c
@@ -0,0 +1,7 @@
+#include <threads.h>
+#include <pthread.h>
+
+void tss_delete(tss_t key)
+{
+	__pthread_key_delete(key);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/tss_set.c b/src/components/lib/libc/musl-1.2.0/src/thread/tss_set.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/tss_set.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/tss_set.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/vmlock.c b/src/components/lib/libc/musl-1.2.0/src/thread/vmlock.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/vmlock.c
rename to src/components/lib/libc/musl-1.2.0/src/thread/vmlock.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/x32/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/x32/__set_thread_area.s
new file mode 100644
index 0000000000..c0fee87e6a
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/x32/__set_thread_area.s
@@ -0,0 +1,11 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.text
+.global __set_thread_area
+.hidden __set_thread_area
+.type __set_thread_area,@function
+__set_thread_area:
+	mov %edi,%esi           /* shift for syscall */
+	movl $0x1002,%edi       /* SET_FS register */
+	movl $0x4000009e,%eax          /* set fs segment to */
+	syscall                 /* arch_prctl(SET_FS, arg)*/
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x32/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/x32/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/x32/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/x32/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/x32/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/x32/clone.s
new file mode 100644
index 0000000000..b870880f93
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/x32/clone.s
@@ -0,0 +1,26 @@
+.text
+.global __clone
+.hidden __clone
+.type   __clone,@function
+__clone:
+	movl $0x40000038,%eax /* SYS_clone */
+	mov %rdi,%r11
+	mov %rdx,%rdi
+	mov %r8,%rdx
+	mov %r9,%r8
+	mov 8(%rsp),%r10
+	mov %r11,%r9
+	and $-16,%rsi
+	sub $8,%rsi
+	mov %rcx,(%rsi)
+	syscall
+	test %eax,%eax
+	jnz 1f
+	xor %ebp,%ebp
+	pop %rdi
+	call *%r9
+	mov %eax,%edi
+	movl $0x4000003c,%eax /* SYS_exit */
+	syscall
+	hlt
+1:	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/x32/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/x32/syscall_cp.s
new file mode 100644
index 0000000000..4f101716d4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/x32/syscall_cp.s
@@ -0,0 +1,31 @@
+.text
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm,@function
+__syscall_cp_asm:
+
+__cp_begin:
+	mov (%rdi),%eax
+	test %eax,%eax
+	jnz __cp_cancel
+	mov %rdi,%r11
+	mov %rsi,%rax
+	mov %rdx,%rdi
+	mov %rcx,%rsi
+	mov %r8,%rdx
+	mov %r9,%r10
+	mov 8(%rsp),%r8
+	mov 16(%rsp),%r9
+	mov %r11,8(%rsp)
+	syscall
+__cp_end:
+	ret
+__cp_cancel:
+	jmp __cancel
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/__set_thread_area.s b/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/__set_thread_area.s
new file mode 100644
index 0000000000..7347ff4dc1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/__set_thread_area.s
@@ -0,0 +1,11 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.text
+.global __set_thread_area
+.hidden __set_thread_area
+.type __set_thread_area,@function
+__set_thread_area:
+	mov %rdi,%rsi           /* shift for syscall */
+	movl $0x1002,%edi       /* SET_FS register */
+	movl $158,%eax          /* set fs segment to */
+	syscall                 /* arch_prctl(SET_FS, arg)*/
+	ret
diff --git a/src/components/lib/libc/musl-1.1.11/src/thread/x86_64/__unmapself.s b/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/__unmapself.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/thread/x86_64/__unmapself.s
rename to src/components/lib/libc/musl-1.2.0/src/thread/x86_64/__unmapself.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/clone.s b/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/clone.s
new file mode 100644
index 0000000000..6e47bc0a37
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/clone.s
@@ -0,0 +1,28 @@
+.text
+.global __clone
+.hidden __clone
+.type   __clone,@function
+__clone:
+	xor %eax,%eax
+	mov $56,%al
+	mov %rdi,%r11
+	mov %rdx,%rdi
+	mov %r8,%rdx
+	mov %r9,%r8
+	mov 8(%rsp),%r10
+	mov %r11,%r9
+	and $-16,%rsi
+	sub $8,%rsi
+	mov %rcx,(%rsi)
+	syscall
+	test %eax,%eax
+	jnz 1f
+	xor %ebp,%ebp
+	pop %rdi
+	call *%r9
+	mov %eax,%edi
+	xor %eax,%eax
+	mov $60,%al
+	syscall
+	hlt
+1:	ret
diff --git a/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/syscall_cp.s b/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/syscall_cp.s
new file mode 100644
index 0000000000..4f101716d4
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/thread/x86_64/syscall_cp.s
@@ -0,0 +1,31 @@
+.text
+.global __cp_begin
+.hidden __cp_begin
+.global __cp_end
+.hidden __cp_end
+.global __cp_cancel
+.hidden __cp_cancel
+.hidden __cancel
+.global __syscall_cp_asm
+.hidden __syscall_cp_asm
+.type   __syscall_cp_asm,@function
+__syscall_cp_asm:
+
+__cp_begin:
+	mov (%rdi),%eax
+	test %eax,%eax
+	jnz __cp_cancel
+	mov %rdi,%r11
+	mov %rsi,%rax
+	mov %rdx,%rdi
+	mov %rcx,%rsi
+	mov %r8,%rdx
+	mov %r9,%r10
+	mov 8(%rsp),%r8
+	mov 16(%rsp),%r9
+	mov %r11,8(%rsp)
+	syscall
+__cp_end:
+	ret
+__cp_cancel:
+	jmp __cancel
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/__map_file.c b/src/components/lib/libc/musl-1.2.0/src/time/__map_file.c
new file mode 100644
index 0000000000..d3cefa8284
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/__map_file.c
@@ -0,0 +1,19 @@
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include "syscall.h"
+#include "kstat.h"
+
+const char unsigned *__map_file(const char *pathname, size_t *size)
+{
+	struct kstat st;
+	const unsigned char *map = MAP_FAILED;
+	int fd = sys_open(pathname, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
+	if (fd < 0) return 0;
+	if (!syscall(SYS_fstat, fd, &st)) {
+		map = __mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+		*size = st.st_size;
+	}
+	__syscall(SYS_close, fd);
+	return map == MAP_FAILED ? 0 : map;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/__month_to_secs.c b/src/components/lib/libc/musl-1.2.0/src/time/__month_to_secs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/__month_to_secs.c
rename to src/components/lib/libc/musl-1.2.0/src/time/__month_to_secs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/__secs_to_tm.c b/src/components/lib/libc/musl-1.2.0/src/time/__secs_to_tm.c
similarity index 91%
rename from src/components/lib/libc/musl-1.1.11/src/time/__secs_to_tm.c
rename to src/components/lib/libc/musl-1.2.0/src/time/__secs_to_tm.c
index f3c1cf923e..093d9021ae 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/__secs_to_tm.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/__secs_to_tm.c
@@ -10,10 +10,10 @@
 
 int __secs_to_tm(long long t, struct tm *tm)
 {
-	long long days, secs;
+	long long days, secs, years;
 	int remdays, remsecs, remyears;
 	int qc_cycles, c_cycles, q_cycles;
-	int years, months;
+	int months;
 	int wday, yday, leap;
 	static const char days_in_month[] = {31,30,31,30,31,31,30,31,30,31,31,29};
 
@@ -55,20 +55,21 @@ int __secs_to_tm(long long t, struct tm *tm)
 	yday = remdays + 31 + 28 + leap;
 	if (yday >= 365+leap) yday -= 365+leap;
 
-	years = remyears + 4*q_cycles + 100*c_cycles + 400*qc_cycles;
+	years = remyears + 4*q_cycles + 100*c_cycles + 400LL*qc_cycles;
 
 	for (months=0; days_in_month[months] <= remdays; months++)
 		remdays -= days_in_month[months];
 
+	if (months >= 10) {
+		months -= 12;
+		years++;
+	}
+
 	if (years+100 > INT_MAX || years+100 < INT_MIN)
 		return -1;
 
 	tm->tm_year = years + 100;
 	tm->tm_mon = months + 2;
-	if (tm->tm_mon >= 12) {
-		tm->tm_mon -=12;
-		tm->tm_year++;
-	}
 	tm->tm_mday = remdays + 1;
 	tm->tm_wday = wday;
 	tm->tm_yday = yday;
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/__tm_to_secs.c b/src/components/lib/libc/musl-1.2.0/src/time/__tm_to_secs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/__tm_to_secs.c
rename to src/components/lib/libc/musl-1.2.0/src/time/__tm_to_secs.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/__tz.c b/src/components/lib/libc/musl-1.2.0/src/time/__tz.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/time/__tz.c
rename to src/components/lib/libc/musl-1.2.0/src/time/__tz.c
index 8b84b9bd12..185642e882 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/__tz.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/__tz.c
@@ -3,7 +3,9 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mman.h>
 #include "libc.h"
+#include "lock.h"
 
 long  __timezone = 0;
 int   __daylight = 0;
@@ -15,7 +17,7 @@ weak_alias(__tzname, tzname);
 
 static char std_name[TZNAME_MAX+1];
 static char dst_name[TZNAME_MAX+1];
-const char __gmt[] = "GMT";
+const char __utc[] = "UTC";
 
 static int dst_off;
 static int r0[5], r1[5];
@@ -27,7 +29,7 @@ static char old_tz_buf[32];
 static char *old_tz = old_tz_buf;
 static size_t old_tz_size = sizeof old_tz_buf;
 
-static volatile int lock[2];
+static volatile int lock[1];
 
 static int getint(const char **p)
 {
@@ -84,7 +86,7 @@ static void getname(char *d, const char **p)
 	int i;
 	if (**p == '<') {
 		++*p;
-		for (i=0; **p!='>' && i<TZNAME_MAX; i++)
+		for (i=0; (*p)[i]!='>' && i<TZNAME_MAX; i++)
 			d[i] = (*p)[i];
 		++*p;
 	} else {
@@ -113,8 +115,6 @@ static size_t zi_dotprod(const unsigned char *z, const unsigned char *v, size_t
 	return y;
 }
 
-int __munmap(void *, size_t);
-
 static void do_tzset()
 {
 	char buf[NAME_MAX+25], *pathname=buf+24;
@@ -126,17 +126,19 @@ static void do_tzset()
 
 	s = getenv("TZ");
 	if (!s) s = "/etc/localtime";
-	if (!*s) s = __gmt;
+	if (!*s) s = __utc;
 
 	if (old_tz && !strcmp(s, old_tz)) return;
 
+	for (i=0; i<5; i++) r0[i] = r1[i] = 0;
+
 	if (zi) __munmap((void *)zi, map_size);
 
 	/* Cache the old value of TZ to check if it has changed. Avoid
 	 * free so as not to pull it into static programs. Growth
 	 * strategy makes it so free would have minimal benefit anyway. */
 	i = strlen(s);
-	if (i > PATH_MAX+1) s = __gmt, i = 3;
+	if (i > PATH_MAX+1) s = __utc, i = 3;
 	if (i >= old_tz_size) {
 		old_tz_size *= 2;
 		if (i >= old_tz_size) old_tz_size = i+1;
@@ -165,12 +167,12 @@ static void do_tzset()
 				}
 			}
 		}
-		if (!map) s = __gmt;
+		if (!map) s = __utc;
 	}
 	if (map && (map_size < 44 || memcmp(map, "TZif", 4))) {
 		__munmap((void *)map, map_size);
 		map = 0;
-		s = __gmt;
+		s = __utc;
 	}
 
 	zi = map;
@@ -194,7 +196,6 @@ static void do_tzset()
 			const unsigned char *p;
 			__tzname[0] = __tzname[1] = 0;
 			__daylight = __timezone = dst_off = 0;
-			for (i=0; i<5; i++) r0[i] = r1[i] = 0;
 			for (p=types; p<abbrevs; p+=6) {
 				if (!p[4] && !__tzname[0]) {
 					__tzname[0] = (char *)abbrevs + p[5];
@@ -207,7 +208,7 @@ static void do_tzset()
 				}
 			}
 			if (!__tzname[0]) __tzname[0] = __tzname[1];
-			if (!__tzname[0]) __tzname[0] = (char *)__gmt;
+			if (!__tzname[0]) __tzname[0] = (char *)__utc;
 			if (!__daylight) {
 				__tzname[1] = __tzname[0];
 				dst_off = __timezone;
@@ -216,7 +217,7 @@ static void do_tzset()
 		}
 	}
 
-	if (!s) s = __gmt;
+	if (!s) s = __utc;
 	getname(std_name, &s);
 	__tzname[0] = std_name;
 	__timezone = getoff(&s);
@@ -230,7 +231,7 @@ static void do_tzset()
 			dst_off = __timezone - 3600;
 	} else {
 		__daylight = 0;
-		dst_off = 0;
+		dst_off = __timezone;
 	}
 
 	if (*s == ',') s++, getrule(&s, r0);
@@ -373,18 +374,14 @@ void __secs_to_zone(long long t, int local, int *isdst, long *offset, long *oppo
 	long long t0 = rule_to_secs(r0, y);
 	long long t1 = rule_to_secs(r1, y);
 
+	if (!local) {
+		t0 += __timezone;
+		t1 += dst_off;
+	}
 	if (t0 < t1) {
-		if (!local) {
-			t0 += __timezone;
-			t1 += dst_off;
-		}
 		if (t >= t0 && t < t1) goto dst;
 		goto std;
 	} else {
-		if (!local) {
-			t1 += __timezone;
-			t0 += dst_off;
-		}
 		if (t >= t1 && t < t0) goto std;
 		goto dst;
 	}
@@ -403,7 +400,7 @@ void __secs_to_zone(long long t, int local, int *isdst, long *offset, long *oppo
 	UNLOCK(lock);
 }
 
-void __tzset()
+static void __tzset()
 {
 	LOCK(lock);
 	do_tzset();
@@ -417,7 +414,7 @@ const char *__tm_to_tzname(const struct tm *tm)
 	const void *p = tm->__tm_zone;
 	LOCK(lock);
 	do_tzset();
-	if (p != __gmt && p != __tzname[0] && p != __tzname[1] &&
+	if (p != __utc && p != __tzname[0] && p != __tzname[1] &&
 	    (!zi || (uintptr_t)p-(uintptr_t)abbrevs >= abbrevs_end - abbrevs))
 		p = "";
 	UNLOCK(lock);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/__year_to_secs.c b/src/components/lib/libc/musl-1.2.0/src/time/__year_to_secs.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/__year_to_secs.c
rename to src/components/lib/libc/musl-1.2.0/src/time/__year_to_secs.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/asctime.c b/src/components/lib/libc/musl-1.2.0/src/time/asctime.c
new file mode 100644
index 0000000000..1febe54409
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/asctime.c
@@ -0,0 +1,7 @@
+#include <time.h>
+
+char *asctime(const struct tm *tm)
+{
+	static char buf[26];
+	return __asctime_r(tm, buf);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/asctime_r.c b/src/components/lib/libc/musl-1.2.0/src/time/asctime_r.c
new file mode 100644
index 0000000000..26809ca267
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/asctime_r.c
@@ -0,0 +1,28 @@
+#include <time.h>
+#include <stdio.h>
+#include <langinfo.h>
+#include "locale_impl.h"
+#include "atomic.h"
+
+char *__asctime_r(const struct tm *restrict tm, char *restrict buf)
+{
+	if (snprintf(buf, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
+		__nl_langinfo_l(ABDAY_1+tm->tm_wday, C_LOCALE),
+		__nl_langinfo_l(ABMON_1+tm->tm_mon, C_LOCALE),
+		tm->tm_mday, tm->tm_hour,
+		tm->tm_min, tm->tm_sec,
+		1900 + tm->tm_year) >= 26)
+	{
+		/* ISO C requires us to use the above format string,
+		 * even if it will not fit in the buffer. Thus asctime_r
+		 * is _supposed_ to crash if the fields in tm are too large.
+		 * We follow this behavior and crash "gracefully" to warn
+		 * application developers that they may not be so lucky
+		 * on other implementations (e.g. stack smashing..).
+		 */
+		a_crash();
+	}
+	return buf;
+}
+
+weak_alias(__asctime_r, asctime_r);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/clock.c b/src/components/lib/libc/musl-1.2.0/src/time/clock.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/time/clock.c
rename to src/components/lib/libc/musl-1.2.0/src/time/clock.c
index c348e39836..6724012b92 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/clock.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/clock.c
@@ -1,8 +1,6 @@
 #include <time.h>
 #include <limits.h>
 
-int __clock_gettime(clockid_t, struct timespec *);
-
 clock_t clock()
 {
 	struct timespec ts;
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/clock_getcpuclockid.c b/src/components/lib/libc/musl-1.2.0/src/time/clock_getcpuclockid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/clock_getcpuclockid.c
rename to src/components/lib/libc/musl-1.2.0/src/time/clock_getcpuclockid.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/clock_getres.c b/src/components/lib/libc/musl-1.2.0/src/time/clock_getres.c
new file mode 100644
index 0000000000..81c6703761
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/clock_getres.c
@@ -0,0 +1,21 @@
+#include <time.h>
+#include "syscall.h"
+
+int clock_getres(clockid_t clk, struct timespec *ts)
+{
+#ifdef SYS_clock_getres_time64
+	/* On a 32-bit arch, use the old syscall if it exists. */
+	if (SYS_clock_getres != SYS_clock_getres_time64) {
+		long ts32[2];
+		int r = __syscall(SYS_clock_getres, clk, ts32);
+		if (!r && ts) {
+			ts->tv_sec = ts32[0];
+			ts->tv_nsec = ts32[1];
+		}
+		return __syscall_ret(r);
+	}
+#endif
+	/* If reaching this point, it's a 64-bit arch or time64-only
+	 * 32-bit arch and we can get result directly into timespec. */
+	return syscall(SYS_clock_getres, clk, ts);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/clock_gettime.c b/src/components/lib/libc/musl-1.2.0/src/time/clock_gettime.c
new file mode 100644
index 0000000000..3e1d0975b1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/clock_gettime.c
@@ -0,0 +1,107 @@
+#include <time.h>
+#include <errno.h>
+#include <stdint.h>
+#include "syscall.h"
+#include "atomic.h"
+
+#ifdef VDSO_CGT_SYM
+
+static void *volatile vdso_func;
+
+#ifdef VDSO_CGT32_SYM
+static void *volatile vdso_func_32;
+static int cgt_time32_wrap(clockid_t clk, struct timespec *ts)
+{
+	long ts32[2];
+	int (*f)(clockid_t, long[2]) =
+		(int (*)(clockid_t, long[2]))vdso_func_32;
+	int r = f(clk, ts32);
+	if (!r) {
+		/* Fallback to syscalls if time32 overflowed. Maybe
+		 * we lucked out and somehow migrated to a kernel with
+		 * time64 syscalls available. */
+		if (ts32[0] < 0) {
+			a_cas_p(&vdso_func, (void *)cgt_time32_wrap, 0);
+			return -ENOSYS;
+		}
+		ts->tv_sec = ts32[0];
+		ts->tv_nsec = ts32[1];
+	}
+	return r;
+}
+#endif
+
+static int cgt_init(clockid_t clk, struct timespec *ts)
+{
+	void *p = __vdsosym(VDSO_CGT_VER, VDSO_CGT_SYM);
+#ifdef VDSO_CGT32_SYM
+	if (!p) {
+		void *q = __vdsosym(VDSO_CGT32_VER, VDSO_CGT32_SYM);
+		if (q) {
+			a_cas_p(&vdso_func_32, 0, q);
+			p = cgt_time32_wrap;
+		}
+	}
+#endif
+	int (*f)(clockid_t, struct timespec *) =
+		(int (*)(clockid_t, struct timespec *))p;
+	a_cas_p(&vdso_func, (void *)cgt_init, p);
+	return f ? f(clk, ts) : -ENOSYS;
+}
+
+static void *volatile vdso_func = (void *)cgt_init;
+
+#endif
+
+int __clock_gettime(clockid_t clk, struct timespec *ts)
+{
+	int r;
+
+#ifdef VDSO_CGT_SYM
+	int (*f)(clockid_t, struct timespec *) =
+		(int (*)(clockid_t, struct timespec *))vdso_func;
+	if (f) {
+		r = f(clk, ts);
+		if (!r) return r;
+		if (r == -EINVAL) return __syscall_ret(r);
+		/* Fall through on errors other than EINVAL. Some buggy
+		 * vdso implementations return ENOSYS for clocks they
+		 * can't handle, rather than making the syscall. This
+		 * also handles the case where cgt_init fails to find
+		 * a vdso function to use. */
+	}
+#endif
+
+#ifdef SYS_clock_gettime64
+	r = -ENOSYS;
+	if (sizeof(time_t) > 4)
+		r = __syscall(SYS_clock_gettime64, clk, ts);
+	if (SYS_clock_gettime == SYS_clock_gettime64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	long ts32[2];
+	r = __syscall(SYS_clock_gettime, clk, ts32);
+	if (r==-ENOSYS && clk==CLOCK_REALTIME) {
+		r = __syscall(SYS_gettimeofday, ts32, 0);
+		ts32[1] *= 1000;
+	}
+	if (!r) {
+		ts->tv_sec = ts32[0];
+		ts->tv_nsec = ts32[1];
+		return r;
+	}
+	return __syscall_ret(r);
+#else
+	r = __syscall(SYS_clock_gettime, clk, ts);
+	if (r == -ENOSYS) {
+		if (clk == CLOCK_REALTIME) {
+			__syscall(SYS_gettimeofday, ts, 0);
+			ts->tv_nsec = (int)ts->tv_nsec * 1000;
+			return 0;
+		}
+		r = -EINVAL;
+	}
+	return __syscall_ret(r);
+#endif
+}
+
+weak_alias(__clock_gettime, clock_gettime);
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/clock_nanosleep.c b/src/components/lib/libc/musl-1.2.0/src/time/clock_nanosleep.c
new file mode 100644
index 0000000000..e195499cc0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/clock_nanosleep.c
@@ -0,0 +1,38 @@
+#include <time.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+int __clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct timespec *rem)
+{
+	if (clk == CLOCK_THREAD_CPUTIME_ID) return EINVAL;
+#ifdef SYS_clock_nanosleep_time64
+	time_t s = req->tv_sec;
+	long ns = req->tv_nsec;
+	int r = -ENOSYS;
+	if (SYS_clock_nanosleep == SYS_clock_nanosleep_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_clock_nanosleep_time64, clk, flags,
+			((long long[]){s, ns}), rem);
+	if (SYS_clock_nanosleep == SYS_clock_nanosleep_time64 || r!=-ENOSYS)
+		return -r;
+	long long extra = s - CLAMP(s);
+	long ts32[2] = { CLAMP(s), ns };
+	if (clk == CLOCK_REALTIME && !flags)
+		r = __syscall_cp(SYS_nanosleep, &ts32, &ts32);
+	else
+		r = __syscall_cp(SYS_clock_nanosleep, clk, flags, &ts32, &ts32);
+	if (r==-EINTR && rem && !(flags & TIMER_ABSTIME)) {
+		rem->tv_sec = ts32[0] + extra;
+		rem->tv_nsec = ts32[1];
+	}
+	return -r;
+#else
+	if (clk == CLOCK_REALTIME && !flags)
+		return -__syscall_cp(SYS_nanosleep, req, rem);
+	return -__syscall_cp(SYS_clock_nanosleep, clk, flags, req, rem);
+#endif
+}
+
+weak_alias(__clock_nanosleep, clock_nanosleep);
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/clock_settime.c b/src/components/lib/libc/musl-1.2.0/src/time/clock_settime.c
new file mode 100644
index 0000000000..1004ed1528
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/clock_settime.c
@@ -0,0 +1,24 @@
+#include <time.h>
+#include <errno.h>
+#include "syscall.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+
+int clock_settime(clockid_t clk, const struct timespec *ts)
+{
+#ifdef SYS_clock_settime64
+	time_t s = ts->tv_sec;
+	long ns = ts->tv_nsec;
+	int r = -ENOSYS;
+	if (SYS_clock_settime == SYS_clock_settime64 || !IS32BIT(s))
+		r = __syscall(SYS_clock_settime64, clk,
+			((long long[]){s, ns}));
+	if (SYS_clock_settime == SYS_clock_settime64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	if (!IS32BIT(s))
+		return __syscall_ret(-ENOTSUP);
+	return syscall(SYS_clock_settime, clk, ((long[]){s, ns}));
+#else
+	return syscall(SYS_clock_settime, clk, ts);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/ctime.c b/src/components/lib/libc/musl-1.2.0/src/time/ctime.c
new file mode 100644
index 0000000000..3602931512
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/ctime.c
@@ -0,0 +1,8 @@
+#include <time.h>
+
+char *ctime(const time_t *t)
+{
+	struct tm *tm = localtime(t);
+	if (!tm) return 0;
+	return asctime(tm);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/ctime_r.c b/src/components/lib/libc/musl-1.2.0/src/time/ctime_r.c
new file mode 100644
index 0000000000..3e24aa681b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/ctime_r.c
@@ -0,0 +1,7 @@
+#include <time.h>
+
+char *ctime_r(const time_t *t, char *buf)
+{
+	struct tm tm, *tm_p = localtime_r(t, &tm);
+	return tm_p ? asctime_r(tm_p, buf) : 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/difftime.c b/src/components/lib/libc/musl-1.2.0/src/time/difftime.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/difftime.c
rename to src/components/lib/libc/musl-1.2.0/src/time/difftime.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/ftime.c b/src/components/lib/libc/musl-1.2.0/src/time/ftime.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/ftime.c
rename to src/components/lib/libc/musl-1.2.0/src/time/ftime.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/getdate.c b/src/components/lib/libc/musl-1.2.0/src/time/getdate.c
similarity index 92%
rename from src/components/lib/libc/musl-1.1.11/src/time/getdate.c
rename to src/components/lib/libc/musl-1.2.0/src/time/getdate.c
index 89f2169912..420cd8e412 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/getdate.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/getdate.c
@@ -37,7 +37,8 @@ struct tm *getdate(const char *s)
 		}
 	}
 
-	getdate_err = 7;
+	if (ferror(f)) getdate_err = 5;
+	else getdate_err = 7;
 out:
 	if (f) fclose(f);
 	pthread_setcancelstate(cs, 0);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/gettimeofday.c b/src/components/lib/libc/musl-1.2.0/src/time/gettimeofday.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/gettimeofday.c
rename to src/components/lib/libc/musl-1.2.0/src/time/gettimeofday.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/gmtime.c b/src/components/lib/libc/musl-1.2.0/src/time/gmtime.c
new file mode 100644
index 0000000000..6320b6377e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/gmtime.c
@@ -0,0 +1,8 @@
+#include "time_impl.h"
+#include <errno.h>
+
+struct tm *gmtime(const time_t *t)
+{
+	static struct tm tm;
+	return __gmtime_r(t, &tm);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/gmtime_r.c b/src/components/lib/libc/musl-1.2.0/src/time/gmtime_r.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/time/gmtime_r.c
rename to src/components/lib/libc/musl-1.2.0/src/time/gmtime_r.c
index 8cbdadcb5d..22aec2c2e2 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/gmtime_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/gmtime_r.c
@@ -1,8 +1,5 @@
 #include "time_impl.h"
 #include <errno.h>
-#include "libc.h"
-
-extern const char __gmt[];
 
 struct tm *__gmtime_r(const time_t *restrict t, struct tm *restrict tm)
 {
@@ -12,7 +9,7 @@ struct tm *__gmtime_r(const time_t *restrict t, struct tm *restrict tm)
 	}
 	tm->tm_isdst = 0;
 	tm->__tm_gmtoff = 0;
-	tm->__tm_zone = __gmt;
+	tm->__tm_zone = __utc;
 	return tm;
 }
 
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/localtime.c b/src/components/lib/libc/musl-1.2.0/src/time/localtime.c
new file mode 100644
index 0000000000..5210423230
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/localtime.c
@@ -0,0 +1,7 @@
+#include "time_impl.h"
+
+struct tm *localtime(const time_t *t)
+{
+	static struct tm tm;
+	return __localtime_r(t, &tm);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/localtime_r.c b/src/components/lib/libc/musl-1.2.0/src/time/localtime_r.c
similarity index 96%
rename from src/components/lib/libc/musl-1.1.11/src/time/localtime_r.c
rename to src/components/lib/libc/musl-1.2.0/src/time/localtime_r.c
index 2e62c29fb2..1a15b314d0 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/localtime_r.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/localtime_r.c
@@ -1,6 +1,6 @@
 #include "time_impl.h"
 #include <errno.h>
-#include "libc.h"
+#include <limits.h>
 
 struct tm *__localtime_r(const time_t *restrict t, struct tm *restrict tm)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/mktime.c b/src/components/lib/libc/musl-1.2.0/src/time/mktime.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/mktime.c
rename to src/components/lib/libc/musl-1.2.0/src/time/mktime.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/nanosleep.c b/src/components/lib/libc/musl-1.2.0/src/time/nanosleep.c
new file mode 100644
index 0000000000..bc9f7895fa
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/nanosleep.c
@@ -0,0 +1,7 @@
+#include <time.h>
+#include "syscall.h"
+
+int nanosleep(const struct timespec *req, struct timespec *rem)
+{
+	return __syscall_ret(-__clock_nanosleep(CLOCK_REALTIME, 0, req, rem));
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/strftime.c b/src/components/lib/libc/musl-1.2.0/src/time/strftime.c
new file mode 100644
index 0000000000..cc53d5369c
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/strftime.c
@@ -0,0 +1,281 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <langinfo.h>
+#include <locale.h>
+#include <time.h>
+#include <limits.h>
+#include "locale_impl.h"
+#include "time_impl.h"
+
+static int is_leap(int y)
+{
+	/* Avoid overflow */
+	if (y>INT_MAX-1900) y -= 2000;
+	y += 1900;
+	return !(y%4) && ((y%100) || !(y%400));
+}
+
+static int week_num(const struct tm *tm)
+{
+	int val = (tm->tm_yday + 7U - (tm->tm_wday+6U)%7) / 7;
+	/* If 1 Jan is just 1-3 days past Monday,
+	 * the previous week is also in this year. */
+	if ((tm->tm_wday + 371U - tm->tm_yday - 2) % 7 <= 2)
+		val++;
+	if (!val) {
+		val = 52;
+		/* If 31 December of prev year a Thursday,
+		 * or Friday of a leap year, then the
+		 * prev year has 53 weeks. */
+		int dec31 = (tm->tm_wday + 7U - tm->tm_yday - 1) % 7;
+		if (dec31 == 4 || (dec31 == 5 && is_leap(tm->tm_year%400-1)))
+			val++;
+	} else if (val == 53) {
+		/* If 1 January is not a Thursday, and not
+		 * a Wednesday of a leap year, then this
+		 * year has only 52 weeks. */
+		int jan1 = (tm->tm_wday + 371U - tm->tm_yday) % 7;
+		if (jan1 != 4 && (jan1 != 3 || !is_leap(tm->tm_year)))
+			val = 1;
+	}
+	return val;
+}
+
+const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc, int pad)
+{
+	nl_item item;
+	long long val;
+	const char *fmt = "-";
+	int width = 2, def_pad = '0';
+
+	switch (f) {
+	case 'a':
+		if (tm->tm_wday > 6U) goto string;
+		item = ABDAY_1 + tm->tm_wday;
+		goto nl_strcat;
+	case 'A':
+		if (tm->tm_wday > 6U) goto string;
+		item = DAY_1 + tm->tm_wday;
+		goto nl_strcat;
+	case 'h':
+	case 'b':
+		if (tm->tm_mon > 11U) goto string;
+		item = ABMON_1 + tm->tm_mon;
+		goto nl_strcat;
+	case 'B':
+		if (tm->tm_mon > 11U) goto string;
+		item = MON_1 + tm->tm_mon;
+		goto nl_strcat;
+	case 'c':
+		item = D_T_FMT;
+		goto nl_strftime;
+	case 'C':
+		val = (1900LL+tm->tm_year) / 100;
+		goto number;
+	case 'e':
+		def_pad = '_';
+	case 'd':
+		val = tm->tm_mday;
+		goto number;
+	case 'D':
+		fmt = "%m/%d/%y";
+		goto recu_strftime;
+	case 'F':
+		fmt = "%Y-%m-%d";
+		goto recu_strftime;
+	case 'g':
+	case 'G':
+		val = tm->tm_year + 1900LL;
+		if (tm->tm_yday < 3 && week_num(tm) != 1) val--;
+		else if (tm->tm_yday > 360 && week_num(tm) == 1) val++;
+		if (f=='g') val %= 100;
+		else width = 4;
+		goto number;
+	case 'H':
+		val = tm->tm_hour;
+		goto number;
+	case 'I':
+		val = tm->tm_hour;
+		if (!val) val = 12;
+		else if (val > 12) val -= 12;
+		goto number;
+	case 'j':
+		val = tm->tm_yday+1;
+		width = 3;
+		goto number;
+	case 'm':
+		val = tm->tm_mon+1;
+		goto number;
+	case 'M':
+		val = tm->tm_min;
+		goto number;
+	case 'n':
+		*l = 1;
+		return "\n";
+	case 'p':
+		item = tm->tm_hour >= 12 ? PM_STR : AM_STR;
+		goto nl_strcat;
+	case 'r':
+		item = T_FMT_AMPM;
+		goto nl_strftime;
+	case 'R':
+		fmt = "%H:%M";
+		goto recu_strftime;
+	case 's':
+		val = __tm_to_secs(tm) - tm->__tm_gmtoff;
+		width = 1;
+		goto number;
+	case 'S':
+		val = tm->tm_sec;
+		goto number;
+	case 't':
+		*l = 1;
+		return "\t";
+	case 'T':
+		fmt = "%H:%M:%S";
+		goto recu_strftime;
+	case 'u':
+		val = tm->tm_wday ? tm->tm_wday : 7;
+		width = 1;
+		goto number;
+	case 'U':
+		val = (tm->tm_yday + 7U - tm->tm_wday) / 7;
+		goto number;
+	case 'W':
+		val = (tm->tm_yday + 7U - (tm->tm_wday+6U)%7) / 7;
+		goto number;
+	case 'V':
+		val = week_num(tm);
+		goto number;
+	case 'w':
+		val = tm->tm_wday;
+		width = 1;
+		goto number;
+	case 'x':
+		item = D_FMT;
+		goto nl_strftime;
+	case 'X':
+		item = T_FMT;
+		goto nl_strftime;
+	case 'y':
+		val = (tm->tm_year + 1900LL) % 100;
+		if (val < 0) val = -val;
+		goto number;
+	case 'Y':
+		val = tm->tm_year + 1900LL;
+		if (val >= 10000) {
+			*l = snprintf(*s, sizeof *s, "+%lld", val);
+			return *s;
+		}
+		width = 4;
+		goto number;
+	case 'z':
+		if (tm->tm_isdst < 0) {
+			*l = 0;
+			return "";
+		}
+		*l = snprintf(*s, sizeof *s, "%+.4ld",
+			tm->__tm_gmtoff/3600*100 + tm->__tm_gmtoff%3600/60);
+		return *s;
+	case 'Z':
+		if (tm->tm_isdst < 0) {
+			*l = 0;
+			return "";
+		}
+		fmt = __tm_to_tzname(tm);
+		goto string;
+	case '%':
+		*l = 1;
+		return "%";
+	default:
+		return 0;
+	}
+number:
+	switch (pad ? pad : def_pad) {
+	case '-': *l = snprintf(*s, sizeof *s, "%lld", val); break;
+	case '_': *l = snprintf(*s, sizeof *s, "%*lld", width, val); break;
+	case '0':
+	default:  *l = snprintf(*s, sizeof *s, "%0*lld", width, val); break;
+	}
+	return *s;
+nl_strcat:
+	fmt = __nl_langinfo_l(item, loc);
+string:
+	*l = strlen(fmt);
+	return fmt;
+nl_strftime:
+	fmt = __nl_langinfo_l(item, loc);
+recu_strftime:
+	*l = __strftime_l(*s, sizeof *s, fmt, tm, loc);
+	if (!*l) return 0;
+	return *s;
+}
+
+size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm, locale_t loc)
+{
+	size_t l, k;
+	char buf[100];
+	char *p;
+	const char *t;
+	int pad, plus;
+	unsigned long width;
+	for (l=0; l<n; f++) {
+		if (!*f) {
+			s[l] = 0;
+			return l;
+		}
+		if (*f != '%') {
+			s[l++] = *f;
+			continue;
+		}
+		f++;
+		pad = 0;
+		if (*f == '-' || *f == '_' || *f == '0') pad = *f++;
+		if ((plus = (*f == '+'))) f++;
+		width = strtoul(f, &p, 10);
+		if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') {
+			if (!width && p!=f) width = 1;
+		} else {
+			width = 0;
+		}
+		f = p;
+		if (*f == 'E' || *f == 'O') f++;
+		t = __strftime_fmt_1(&buf, &k, *f, tm, loc, pad);
+		if (!t) break;
+		if (width) {
+			/* Trim off any sign and leading zeros, then
+			 * count remaining digits to determine behavior
+			 * for the + flag. */
+			if (*t=='+' || *t=='-') t++, k--;
+			for (; *t=='0' && t[1]-'0'<10U; t++, k--);
+			if (width < k) width = k;
+			size_t d;
+			for (d=0; t[d]-'0'<10U; d++);
+			if (tm->tm_year < -1900) {
+				s[l++] = '-';
+				width--;
+			} else if (plus && d+(width-k) >= (*p=='C'?3:5)) {
+				s[l++] = '+';
+				width--;
+			}
+			for (; width > k && l < n; width--)
+				s[l++] = '0';
+		}
+		if (k > n-l) k = n-l;
+		memcpy(s+l, t, k);
+		l += k;
+	}
+	if (n) {
+		if (l==n) l=n-1;
+		s[l] = 0;
+	}
+	return 0;
+}
+
+size_t strftime(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm)
+{
+	return __strftime_l(s, n, f, tm, CURRENT_LOCALE);
+}
+
+weak_alias(__strftime_l, strftime_l);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/strptime.c b/src/components/lib/libc/musl-1.2.0/src/time/strptime.c
similarity index 94%
rename from src/components/lib/libc/musl-1.1.11/src/time/strptime.c
rename to src/components/lib/libc/musl-1.2.0/src/time/strptime.c
index f41f55f24c..c54a0d8c4c 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/strptime.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/strptime.c
@@ -11,7 +11,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
 	int i, w, neg, adj, min, range, *dest, dummy;
 	const char *ex;
 	size_t len;
-	int want_century = 0, century = 0;
+	int want_century = 0, century = 0, relyear = 0;
 	while (*f) {
 		if (*f != '%') {
 			if (isspace(*f)) for (; *s && isspace(*s); s++);
@@ -22,8 +22,13 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
 		}
 		f++;
 		if (*f == '+') f++;
-		if (isdigit(*f)) w=strtoul(f, (void *)&f, 10);
-		else w=-1;
+		if (isdigit(*f)) {
+			char *new_f;
+			w=strtoul(f, &new_f, 10);
+			f = new_f;
+		} else {
+			w=-1;
+		}
 		adj=0;
 		switch (*f++) {
 		case 'a': case 'A':
@@ -68,6 +73,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
 			dest = &tm->tm_yday;
 			min = 1;
 			range = 366;
+			adj = 1;
 			goto numeric_range;
 		case 'm':
 			dest = &tm->tm_mon;
@@ -88,6 +94,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
 			len = strlen(ex);
 			if (!strncasecmp(s, ex, len)) {
 				tm->tm_hour %= 12;
+				s += len;
 				break;
 			}
 			ex = nl_langinfo(PM_STR);
@@ -95,6 +102,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
 			if (!strncasecmp(s, ex, len)) {
 				tm->tm_hour %= 12;
 				tm->tm_hour += 12;
+				s += len;
 				break;
 			}
 			return 0;
@@ -136,7 +144,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
 			if (!s) return 0;
 			break;
 		case 'y':
-			dest = &tm->tm_year;
+			dest = &relyear;
 			w = 2;
 			want_century |= 1;
 			goto numeric_digits;
@@ -190,6 +198,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
 		}
 	}
 	if (want_century) {
+		tm->tm_year = relyear;
 		if (want_century & 2) tm->tm_year += century * 100 - 1900;
 		else if (tm->tm_year <= 68) tm->tm_year += 100;
 	}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/time.c b/src/components/lib/libc/musl-1.2.0/src/time/time.c
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/src/time/time.c
rename to src/components/lib/libc/musl-1.2.0/src/time/time.c
index 4b95e7527d..ad0480f9ea 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/time.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/time.c
@@ -1,8 +1,6 @@
 #include <time.h>
 #include "syscall.h"
 
-int __clock_gettime(clockid_t, struct timespec *);
-
 time_t time(time_t *t)
 {
 	struct timespec ts;
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/time_impl.h b/src/components/lib/libc/musl-1.2.0/src/time/time_impl.h
new file mode 100644
index 0000000000..f26d80053f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/time_impl.h
@@ -0,0 +1,11 @@
+#include <time.h>
+
+hidden int __days_in_month(int, int);
+hidden int __month_to_secs(int, int);
+hidden long long __year_to_secs(long long, int *);
+hidden long long __tm_to_secs(const struct tm *);
+hidden const char *__tm_to_tzname(const struct tm *);
+hidden int __secs_to_tm(long long, struct tm *);
+hidden void __secs_to_zone(long long, int, int *, long *, long *, const char **);
+hidden const char *__strftime_fmt_1(char (*)[100], size_t *, int, const struct tm *, locale_t, int);
+extern hidden const char __utc[];
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/timegm.c b/src/components/lib/libc/musl-1.2.0/src/time/timegm.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/time/timegm.c
rename to src/components/lib/libc/musl-1.2.0/src/time/timegm.c
index b5dae8b648..4e5907d7f5 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/timegm.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/timegm.c
@@ -2,8 +2,6 @@
 #include "time_impl.h"
 #include <errno.h>
 
-extern const char __gmt[];
-
 time_t timegm(struct tm *tm)
 {
 	struct tm new;
@@ -15,6 +13,6 @@ time_t timegm(struct tm *tm)
 	*tm = new;
 	tm->tm_isdst = 0;
 	tm->__tm_gmtoff = 0;
-	tm->__tm_zone = __gmt;
+	tm->__tm_zone = __utc;
 	return t;
 }
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/timer_create.c b/src/components/lib/libc/musl-1.2.0/src/time/timer_create.c
new file mode 100644
index 0000000000..455d49fc50
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/timer_create.c
@@ -0,0 +1,133 @@
+#include <time.h>
+#include <setjmp.h>
+#include <limits.h>
+#include "pthread_impl.h"
+
+struct ksigevent {
+	union sigval sigev_value;
+	int sigev_signo;
+	int sigev_notify;
+	int sigev_tid;
+};
+
+struct start_args {
+	pthread_barrier_t b;
+	struct sigevent *sev;
+};
+
+static void dummy_0()
+{
+}
+weak_alias(dummy_0, __pthread_tsd_run_dtors);
+
+static void cleanup_fromsig(void *p)
+{
+	pthread_t self = __pthread_self();
+	__pthread_tsd_run_dtors();
+	self->cancel = 0;
+	self->cancelbuf = 0;
+	self->canceldisable = 0;
+	self->cancelasync = 0;
+	__reset_tls();
+	longjmp(p, 1);
+}
+
+static void timer_handler(int sig, siginfo_t *si, void *ctx)
+{
+}
+
+static void install_handler()
+{
+	struct sigaction sa = {
+		.sa_sigaction = timer_handler,
+		.sa_flags = SA_SIGINFO | SA_RESTART
+	};
+	__libc_sigaction(SIGTIMER, &sa, 0);
+}
+
+static void *start(void *arg)
+{
+	pthread_t self = __pthread_self();
+	struct start_args *args = arg;
+	jmp_buf jb;
+
+	void (*notify)(union sigval) = args->sev->sigev_notify_function;
+	union sigval val = args->sev->sigev_value;
+
+	pthread_barrier_wait(&args->b);
+	for (;;) {
+		siginfo_t si;
+		while (sigwaitinfo(SIGTIMER_SET, &si) < 0);
+		if (si.si_code == SI_TIMER && !setjmp(jb)) {
+			pthread_cleanup_push(cleanup_fromsig, jb);
+			notify(val);
+			pthread_cleanup_pop(1);
+		}
+		if (self->timer_id < 0) break;
+	}
+	__syscall(SYS_timer_delete, self->timer_id & INT_MAX);
+	return 0;
+}
+
+int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict res)
+{
+	static pthread_once_t once = PTHREAD_ONCE_INIT;
+	pthread_t td;
+	pthread_attr_t attr;
+	int r;
+	struct start_args args;
+	struct ksigevent ksev, *ksevp=0;
+	int timerid;
+	sigset_t set;
+
+	switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
+	case SIGEV_NONE:
+	case SIGEV_SIGNAL:
+		if (evp) {
+			ksev.sigev_value = evp->sigev_value;
+			ksev.sigev_signo = evp->sigev_signo;
+			ksev.sigev_notify = evp->sigev_notify;
+			ksev.sigev_tid = 0;
+			ksevp = &ksev;
+		}
+		if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
+			return -1;
+		*res = (void *)(intptr_t)timerid;
+		break;
+	case SIGEV_THREAD:
+		pthread_once(&once, install_handler);
+		if (evp->sigev_notify_attributes)
+			attr = *evp->sigev_notify_attributes;
+		else
+			pthread_attr_init(&attr);
+		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+		pthread_barrier_init(&args.b, 0, 2);
+		args.sev = evp;
+
+		__block_app_sigs(&set);
+		__syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGTIMER_SET, 0, _NSIG/8);
+		r = pthread_create(&td, &attr, start, &args);
+		__restore_sigs(&set);
+		if (r) {
+			errno = r;
+			return -1;
+		}
+
+		ksev.sigev_value.sival_ptr = 0;
+		ksev.sigev_signo = SIGTIMER;
+		ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */
+		ksev.sigev_tid = td->tid;
+		if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
+			timerid = -1;
+		td->timer_id = timerid;
+		pthread_barrier_wait(&args.b);
+		if (timerid < 0) return -1;
+		*res = (void *)(INTPTR_MIN | (uintptr_t)td>>1);
+		break;
+	default:
+		errno = EINVAL;
+		return -1;
+	}
+
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/timer_delete.c b/src/components/lib/libc/musl-1.2.0/src/time/timer_delete.c
similarity index 86%
rename from src/components/lib/libc/musl-1.1.11/src/time/timer_delete.c
rename to src/components/lib/libc/musl-1.2.0/src/time/timer_delete.c
index 7c97eeb1a1..b0bfac0968 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/timer_delete.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/timer_delete.c
@@ -7,7 +7,7 @@ int timer_delete(timer_t t)
 	if ((intptr_t)t < 0) {
 		pthread_t td = (void *)((uintptr_t)t << 1);
 		a_store(&td->timer_id, td->timer_id | INT_MIN);
-		__wake(&td->timer_id, 1, 1);
+		__syscall(SYS_tkill, td->tid, SIGTIMER);
 		return 0;
 	}
 	return __syscall(SYS_timer_delete, t);
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/timer_getoverrun.c b/src/components/lib/libc/musl-1.2.0/src/time/timer_getoverrun.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/timer_getoverrun.c
rename to src/components/lib/libc/musl-1.2.0/src/time/timer_getoverrun.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/timer_gettime.c b/src/components/lib/libc/musl-1.2.0/src/time/timer_gettime.c
new file mode 100644
index 0000000000..21c9d32c3f
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/timer_gettime.c
@@ -0,0 +1,28 @@
+#include <time.h>
+#include <limits.h>
+#include "pthread_impl.h"
+
+int timer_gettime(timer_t t, struct itimerspec *val)
+{
+	if ((intptr_t)t < 0) {
+		pthread_t td = (void *)((uintptr_t)t << 1);
+		t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
+	}
+#ifdef SYS_timer_gettime64
+	int r = -ENOSYS;
+	if (sizeof(time_t) > 4)
+		r = __syscall(SYS_timer_gettime64, t, val);
+	if (SYS_timer_gettime == SYS_timer_gettime64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	long val32[4];
+	r = __syscall(SYS_timer_gettime, t, val32);
+	if (!r) {
+		val->it_interval.tv_sec = val32[0];
+		val->it_interval.tv_nsec = val32[1];
+		val->it_value.tv_sec = val32[2];
+		val->it_value.tv_nsec = val32[3];
+	}
+	return __syscall_ret(r);
+#endif
+	return syscall(SYS_timer_gettime, t, val);
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/time/timer_settime.c b/src/components/lib/libc/musl-1.2.0/src/time/timer_settime.c
new file mode 100644
index 0000000000..373f00ced7
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/time/timer_settime.c
@@ -0,0 +1,37 @@
+#include <time.h>
+#include <limits.h>
+#include "pthread_impl.h"
+
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+
+int timer_settime(timer_t t, int flags, const struct itimerspec *restrict val, struct itimerspec *restrict old)
+{
+	if ((intptr_t)t < 0) {
+		pthread_t td = (void *)((uintptr_t)t << 1);
+		t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
+	}
+#ifdef SYS_timer_settime64
+	time_t is = val->it_interval.tv_sec, vs = val->it_value.tv_sec;
+	long ins = val->it_interval.tv_nsec, vns = val->it_value.tv_nsec;
+	int r = -ENOSYS;
+	if (SYS_timer_settime == SYS_timer_settime64
+	    || !IS32BIT(is) || !IS32BIT(vs) || (sizeof(time_t)>4 && old))
+		r = __syscall(SYS_timer_settime64, t, flags,
+			((long long[]){is, ins, vs, vns}), old);
+	if (SYS_timer_settime == SYS_timer_settime64 || r!=-ENOSYS)
+		return __syscall_ret(r);
+	if (!IS32BIT(is) || !IS32BIT(vs))
+		return __syscall_ret(-ENOTSUP);
+	long old32[4];
+	r = __syscall(SYS_timer_settime, t, flags,
+		((long[]){is, ins, vs, vns}), old32);
+	if (!r && old) {
+		old->it_interval.tv_sec = old32[0];
+		old->it_interval.tv_nsec = old32[1];
+		old->it_value.tv_sec = old32[2];
+		old->it_value.tv_nsec = old32[3];
+	}
+	return __syscall_ret(r);
+#endif
+	return syscall(SYS_timer_settime, t, flags, val, old);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/times.c b/src/components/lib/libc/musl-1.2.0/src/time/times.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/times.c
rename to src/components/lib/libc/musl-1.2.0/src/time/times.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/timespec_get.c b/src/components/lib/libc/musl-1.2.0/src/time/timespec_get.c
similarity index 84%
rename from src/components/lib/libc/musl-1.1.11/src/time/timespec_get.c
rename to src/components/lib/libc/musl-1.2.0/src/time/timespec_get.c
index 03c5a77b7b..40ea9c1c32 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/timespec_get.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/timespec_get.c
@@ -1,7 +1,5 @@
 #include <time.h>
 
-int __clock_gettime(clockid_t, struct timespec *);
-
 /* There is no other implemented value than TIME_UTC; all other values
  * are considered erroneous. */
 int timespec_get(struct timespec * ts, int base)
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/utime.c b/src/components/lib/libc/musl-1.2.0/src/time/utime.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/time/utime.c
rename to src/components/lib/libc/musl-1.2.0/src/time/utime.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/time/wcsftime.c b/src/components/lib/libc/musl-1.2.0/src/time/wcsftime.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/time/wcsftime.c
rename to src/components/lib/libc/musl-1.2.0/src/time/wcsftime.c
index 638e64f6b4..8e1437b33f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/time/wcsftime.c
+++ b/src/components/lib/libc/musl-1.2.0/src/time/wcsftime.c
@@ -2,9 +2,7 @@
 #include <time.h>
 #include <locale.h>
 #include "locale_impl.h"
-#include "libc.h"
-
-const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc);
+#include "time_impl.h"
 
 size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, const struct tm *restrict tm, locale_t loc)
 {
@@ -14,7 +12,7 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
 	wchar_t *p;
 	const char *t_mb;
 	const wchar_t *t;
-	int plus;
+	int pad, plus;
 	unsigned long width;
 	for (l=0; l<n; f++) {
 		if (!*f) {
@@ -26,6 +24,8 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
 			continue;
 		}
 		f++;
+		pad = 0;
+		if (*f == '-' || *f == '_' || *f == '0') pad = *f++;
 		if ((plus = (*f == '+'))) f++;
 		width = wcstoul(f, &p, 10);
 		if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') {
@@ -35,7 +35,7 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
 		}
 		f = p;
 		if (*f == 'E' || *f == 'O') f++;
-		t_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc);
+		t_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc, pad);
 		if (!t_mb) break;
 		k = mbstowcs(wbuf, t_mb, sizeof wbuf / sizeof *wbuf);
 		if (k == (size_t)-1) return 0;
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/_exit.c b/src/components/lib/libc/musl-1.2.0/src/unistd/_exit.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/_exit.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/_exit.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/access.c b/src/components/lib/libc/musl-1.2.0/src/unistd/access.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/access.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/access.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/acct.c b/src/components/lib/libc/musl-1.2.0/src/unistd/acct.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/acct.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/acct.c
index f6f25a8a62..308ffc3821 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/acct.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/acct.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <unistd.h>
 #include "syscall.h"
-#include "libc.h"
 
 int acct(const char *filename)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/alarm.c b/src/components/lib/libc/musl-1.2.0/src/unistd/alarm.c
new file mode 100644
index 0000000000..a5e0c822a0
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/alarm.c
@@ -0,0 +1,10 @@
+#include <unistd.h>
+#include <sys/time.h>
+#include "syscall.h"
+
+unsigned alarm(unsigned seconds)
+{
+	struct itimerval it = { .it_value.tv_sec = seconds }, old = { 0 };
+	setitimer(ITIMER_REAL, &it, &old);
+	return old.it_value.tv_sec + !!old.it_value.tv_usec;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/chdir.c b/src/components/lib/libc/musl-1.2.0/src/unistd/chdir.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/chdir.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/chdir.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/chown.c b/src/components/lib/libc/musl-1.2.0/src/unistd/chown.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/chown.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/chown.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/close.c b/src/components/lib/libc/musl-1.2.0/src/unistd/close.c
similarity index 93%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/close.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/close.c
index fa3c6cab7e..5b38e01946 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/close.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/close.c
@@ -1,7 +1,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include "syscall.h"
-#include "libc.h"
 
 static int dummy(int fd)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/ctermid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/ctermid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/ctermid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/ctermid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/dup.c b/src/components/lib/libc/musl-1.2.0/src/unistd/dup.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/dup.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/dup.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/dup2.c b/src/components/lib/libc/musl-1.2.0/src/unistd/dup2.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/dup2.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/dup2.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/dup3.c b/src/components/lib/libc/musl-1.2.0/src/unistd/dup3.c
similarity index 97%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/dup3.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/dup3.c
index 0eb6caf59e..f919f79125 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/dup3.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/dup3.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include "syscall.h"
-#include "libc.h"
 
 int __dup3(int old, int new, int flags)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/faccessat.c b/src/components/lib/libc/musl-1.2.0/src/unistd/faccessat.c
new file mode 100644
index 0000000000..c2314cf703
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/faccessat.c
@@ -0,0 +1,56 @@
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/wait.h>
+#include "syscall.h"
+#include "pthread_impl.h"
+
+struct ctx {
+	int fd;
+	const char *filename;
+	int amode;
+	int p;
+};
+
+static int checker(void *p)
+{
+	struct ctx *c = p;
+	int ret;
+	if (__syscall(SYS_setregid, __syscall(SYS_getegid), -1)
+	    || __syscall(SYS_setreuid, __syscall(SYS_geteuid), -1))
+		__syscall(SYS_exit, 1);
+	ret = __syscall(SYS_faccessat, c->fd, c->filename, c->amode, 0);
+	__syscall(SYS_write, c->p, &ret, sizeof ret);
+	return 0;
+}
+
+int faccessat(int fd, const char *filename, int amode, int flag)
+{
+	if (!flag || (flag==AT_EACCESS && getuid()==geteuid() && getgid()==getegid()))
+		return syscall(SYS_faccessat, fd, filename, amode, flag);
+
+	if (flag != AT_EACCESS)
+		return __syscall_ret(-EINVAL);
+
+	char stack[1024];
+	sigset_t set;
+	pid_t pid;
+	int status;
+	int ret, p[2];
+
+	if (pipe2(p, O_CLOEXEC)) return __syscall_ret(-EBUSY);
+	struct ctx c = { .fd = fd, .filename = filename, .amode = amode, .p = p[1] };
+
+	__block_all_sigs(&set);
+	
+	pid = __clone(checker, stack+sizeof stack, 0, &c, 0, 0, 0);
+	__syscall(SYS_close, p[1]);
+
+	if (pid<0 || __syscall(SYS_read, p[0], &ret, sizeof ret) != sizeof(ret))
+		ret = -EBUSY;
+	__syscall(SYS_close, p[0]);
+	__syscall(SYS_wait4, pid, &status, __WCLONE, 0);
+
+	__restore_sigs(&set);
+
+	return __syscall_ret(ret);
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/fchdir.c b/src/components/lib/libc/musl-1.2.0/src/unistd/fchdir.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/fchdir.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/fchdir.c
index 72c3915eee..dee45ba68e 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/fchdir.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/fchdir.c
@@ -3,8 +3,6 @@
 #include <fcntl.h>
 #include "syscall.h"
 
-void __procfdname(char *, unsigned);
-
 int fchdir(int fd)
 {
 	int ret = __syscall(SYS_fchdir, fd);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/fchown.c b/src/components/lib/libc/musl-1.2.0/src/unistd/fchown.c
similarity index 80%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/fchown.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/fchown.c
index 03459849e5..737b3672fc 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/fchown.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/fchown.c
@@ -3,8 +3,6 @@
 #include <fcntl.h>
 #include "syscall.h"
 
-void __procfdname(char *, unsigned);
-
 int fchown(int fd, uid_t uid, gid_t gid)
 {
 	int ret = __syscall(SYS_fchown, fd, uid, gid);
@@ -16,7 +14,7 @@ int fchown(int fd, uid_t uid, gid_t gid)
 #ifdef SYS_chown
 	return syscall(SYS_chown, buf, uid, gid);
 #else
-	return syscall(SYS_fchownat, AT_FDCWD, buf, uid, gid);
+	return syscall(SYS_fchownat, AT_FDCWD, buf, uid, gid, 0);
 #endif
 
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/fchownat.c b/src/components/lib/libc/musl-1.2.0/src/unistd/fchownat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/fchownat.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/fchownat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/fdatasync.c b/src/components/lib/libc/musl-1.2.0/src/unistd/fdatasync.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/fdatasync.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/fdatasync.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/fsync.c b/src/components/lib/libc/musl-1.2.0/src/unistd/fsync.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/fsync.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/fsync.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/ftruncate.c b/src/components/lib/libc/musl-1.2.0/src/unistd/ftruncate.c
similarity index 79%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/ftruncate.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/ftruncate.c
index 467135f009..b41be0fa6f 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/ftruncate.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/ftruncate.c
@@ -1,10 +1,9 @@
 #include <unistd.h>
 #include "syscall.h"
-#include "libc.h"
 
 int ftruncate(int fd, off_t length)
 {
 	return syscall(SYS_ftruncate, fd, __SYSCALL_LL_O(length));
 }
 
-LFS64(ftruncate);
+weak_alias(ftruncate, ftruncate64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/getcwd.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getcwd.c
new file mode 100644
index 0000000000..f407ffe07e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/getcwd.c
@@ -0,0 +1,25 @@
+#include <unistd.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include "syscall.h"
+
+char *getcwd(char *buf, size_t size)
+{
+	char tmp[buf ? 1 : PATH_MAX];
+	if (!buf) {
+		buf = tmp;
+		size = sizeof tmp;
+	} else if (!size) {
+		errno = EINVAL;
+		return 0;
+	}
+	long ret = syscall(SYS_getcwd, buf, size);
+	if (ret < 0)
+		return 0;
+	if (ret == 0 || buf[0] != '/') {
+		errno = ENOENT;
+		return 0;
+	}
+	return buf == tmp ? strdup(buf) : buf;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getegid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getegid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getegid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getegid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/geteuid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/geteuid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/geteuid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/geteuid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getgid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getgid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getgid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getgid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getgroups.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getgroups.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getgroups.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getgroups.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/gethostname.c b/src/components/lib/libc/musl-1.2.0/src/unistd/gethostname.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/gethostname.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/gethostname.c
index f984b7dd2f..633ef571a4 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/gethostname.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/gethostname.c
@@ -8,6 +8,6 @@ int gethostname(char *name, size_t len)
 	if (uname(&uts)) return -1;
 	if (len > sizeof uts.nodename) len = sizeof uts.nodename;
 	for (i=0; i<len && (name[i] = uts.nodename[i]); i++);
-	if (i==len) name[i-1] = 0;
+	if (i && i==len) name[i-1] = 0;
 	return 0;
 }
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getlogin.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getlogin.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getlogin.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getlogin.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getlogin_r.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getlogin_r.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getlogin_r.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getlogin_r.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getpgid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getpgid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getpgid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getpgid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getpgrp.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getpgrp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getpgrp.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getpgrp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getpid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getpid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getpid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getpid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getppid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getppid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getppid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getppid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getsid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getsid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getsid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getsid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/getuid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/getuid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/getuid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/getuid.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/isatty.c b/src/components/lib/libc/musl-1.2.0/src/unistd/isatty.c
new file mode 100644
index 0000000000..75a9c186a9
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/isatty.c
@@ -0,0 +1,13 @@
+#include <unistd.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include "syscall.h"
+
+int isatty(int fd)
+{
+	struct winsize wsz;
+	unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
+	if (r == 0) return 1;
+	if (errno != EBADF) errno = ENOTTY;
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/lchown.c b/src/components/lib/libc/musl-1.2.0/src/unistd/lchown.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/lchown.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/lchown.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/link.c b/src/components/lib/libc/musl-1.2.0/src/unistd/link.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/link.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/link.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/linkat.c b/src/components/lib/libc/musl-1.2.0/src/unistd/linkat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/linkat.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/linkat.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/lseek.c b/src/components/lib/libc/musl-1.2.0/src/unistd/lseek.c
new file mode 100644
index 0000000000..b4984f3e9e
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/lseek.c
@@ -0,0 +1,15 @@
+#include <unistd.h>
+#include "syscall.h"
+
+off_t __lseek(int fd, off_t offset, int whence)
+{
+#ifdef SYS__llseek
+	off_t result;
+	return syscall(SYS__llseek, fd, offset>>32, offset, &result, whence) ? -1 : result;
+#else
+	return syscall(SYS_lseek, fd, offset, whence);
+#endif
+}
+
+weak_alias(__lseek, lseek);
+weak_alias(__lseek, lseek64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/mips/pipe.s b/src/components/lib/libc/musl-1.2.0/src/unistd/mips/pipe.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/mips/pipe.s
rename to src/components/lib/libc/musl-1.2.0/src/unistd/mips/pipe.s
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/mips64/pipe.s b/src/components/lib/libc/musl-1.2.0/src/unistd/mips64/pipe.s
new file mode 100644
index 0000000000..f8a27dccfb
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/mips64/pipe.s
@@ -0,0 +1,19 @@
+.set	noreorder
+.global	pipe
+.type	pipe,@function
+pipe:
+	lui	$3, %hi(%neg(%gp_rel(pipe)))
+	daddiu	$3, $3, %lo(%neg(%gp_rel(pipe)))
+	daddu	$3, $3, $25
+	li	$2, 5021
+	syscall
+	beq	$7, $0, 1f
+	nop
+	ld	$25, %got_disp(__syscall_ret)($3)
+	jr	$25
+	dsubu	$4, $0, $2
+1:	sw	$2, 0($4)
+	sw	$3, 4($4)
+	move	$2, $0
+	jr	$ra
+	nop
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/mipsn32/lseek.c b/src/components/lib/libc/musl-1.2.0/src/unistd/mipsn32/lseek.c
new file mode 100644
index 0000000000..60e74a51f8
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/mipsn32/lseek.c
@@ -0,0 +1,20 @@
+#include <unistd.h>
+#include "syscall.h"
+
+off_t __lseek(int fd, off_t offset, int whence)
+{
+	register long long r4 __asm__("$4") = fd;
+	register long long r5 __asm__("$5") = offset;
+	register long long r6 __asm__("$6") = whence;
+	register long long r7 __asm__("$7");
+	register long long r2 __asm__("$2") = SYS_lseek;
+	__asm__ __volatile__ (
+		"syscall"
+		: "+&r"(r2), "=r"(r7)
+		: "r"(r4), "r"(r5), "r"(r6)
+		: SYSCALL_CLOBBERLIST);
+	return r7 ? __syscall_ret(-r2) : r2;
+}
+
+weak_alias(__lseek, lseek);
+weak_alias(__lseek, lseek64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/mipsn32/pipe.s b/src/components/lib/libc/musl-1.2.0/src/unistd/mipsn32/pipe.s
new file mode 100644
index 0000000000..80f882e2b1
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/mipsn32/pipe.s
@@ -0,0 +1,19 @@
+.set	noreorder
+.global	pipe
+.type	pipe,@function
+pipe:
+	lui	$3, %hi(%neg(%gp_rel(pipe)))
+	addiu	$3, $3, %lo(%neg(%gp_rel(pipe)))
+	addu	$3, $3, $25
+	li	$2, 6021
+	syscall
+	beq	$7, $0, 1f
+	nop
+	lw	$25, %got_disp(__syscall_ret)($3)
+	jr	$25
+	subu	$4, $0, $2
+1:	sw	$2, 0($4)
+	sw	$3, 4($4)
+	move	$2, $0
+	jr	$ra
+	nop
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/nice.c b/src/components/lib/libc/musl-1.2.0/src/unistd/nice.c
new file mode 100644
index 0000000000..6c25c8c326
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/nice.c
@@ -0,0 +1,16 @@
+#include <unistd.h>
+#include <sys/resource.h>
+#include <limits.h>
+#include "syscall.h"
+
+int nice(int inc)
+{
+	int prio = inc;
+	// Only query old priority if it can affect the result.
+	// This also avoids issues with integer overflow.
+	if (inc > -2*NZERO && inc < 2*NZERO)
+		prio += getpriority(PRIO_PROCESS, 0);
+	if (prio > NZERO-1) prio = NZERO-1;
+	if (prio < -NZERO) prio = -NZERO;
+	return setpriority(PRIO_PROCESS, 0, prio) ? -1 : prio;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/pause.c b/src/components/lib/libc/musl-1.2.0/src/unistd/pause.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/pause.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/pause.c
index 56eb171e0a..90bbf4ca8a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/pause.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/pause.c
@@ -1,7 +1,5 @@
 #include <unistd.h>
-#include <signal.h>
 #include "syscall.h"
-#include "libc.h"
 
 int pause(void)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/pipe.c b/src/components/lib/libc/musl-1.2.0/src/unistd/pipe.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/pipe.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/pipe.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/pipe2.c b/src/components/lib/libc/musl-1.2.0/src/unistd/pipe2.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/pipe2.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/pipe2.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/posix_close.c b/src/components/lib/libc/musl-1.2.0/src/unistd/posix_close.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/posix_close.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/posix_close.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/pread.c b/src/components/lib/libc/musl-1.2.0/src/unistd/pread.c
new file mode 100644
index 0000000000..5681b045d6
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/pread.c
@@ -0,0 +1,9 @@
+#include <unistd.h>
+#include "syscall.h"
+
+ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
+{
+	return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_PRW(ofs));
+}
+
+weak_alias(pread, pread64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/preadv.c b/src/components/lib/libc/musl-1.2.0/src/unistd/preadv.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/preadv.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/preadv.c
index 46d9ece7bb..8376d60f2a 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/preadv.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/preadv.c
@@ -2,7 +2,6 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t preadv(int fd, const struct iovec *iov, int count, off_t ofs)
 {
@@ -10,4 +9,4 @@ ssize_t preadv(int fd, const struct iovec *iov, int count, off_t ofs)
 		(long)(ofs), (long)(ofs>>32));
 }
 
-LFS64(preadv);
+weak_alias(preadv, preadv64);
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/pwrite.c b/src/components/lib/libc/musl-1.2.0/src/unistd/pwrite.c
new file mode 100644
index 0000000000..ca37657622
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/pwrite.c
@@ -0,0 +1,9 @@
+#include <unistd.h>
+#include "syscall.h"
+
+ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs)
+{
+	return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_PRW(ofs));
+}
+
+weak_alias(pwrite, pwrite64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/pwritev.c b/src/components/lib/libc/musl-1.2.0/src/unistd/pwritev.c
similarity index 87%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/pwritev.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/pwritev.c
index aec5d3235a..f5a612c486 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/pwritev.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/pwritev.c
@@ -2,7 +2,6 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t pwritev(int fd, const struct iovec *iov, int count, off_t ofs)
 {
@@ -10,4 +9,4 @@ ssize_t pwritev(int fd, const struct iovec *iov, int count, off_t ofs)
 		(long)(ofs), (long)(ofs>>32));
 }
 
-LFS64(pwritev);
+weak_alias(pwritev, pwritev64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/read.c b/src/components/lib/libc/musl-1.2.0/src/unistd/read.c
similarity index 88%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/read.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/read.c
index eb882fcc1b..f3589c05c3 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/read.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/read.c
@@ -1,6 +1,5 @@
 #include <unistd.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t read(int fd, void *buf, size_t count)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/readlink.c b/src/components/lib/libc/musl-1.2.0/src/unistd/readlink.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/readlink.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/readlink.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/readlinkat.c b/src/components/lib/libc/musl-1.2.0/src/unistd/readlinkat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/readlinkat.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/readlinkat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/readv.c b/src/components/lib/libc/musl-1.2.0/src/unistd/readv.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/readv.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/readv.c
index e45cb484f0..91e6de8167 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/readv.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/readv.c
@@ -1,6 +1,5 @@
 #include <sys/uio.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t readv(int fd, const struct iovec *iov, int count)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/renameat.c b/src/components/lib/libc/musl-1.2.0/src/unistd/renameat.c
new file mode 100644
index 0000000000..c3b40a258b
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/renameat.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include "syscall.h"
+
+int renameat(int oldfd, const char *old, int newfd, const char *new)
+{
+#ifdef SYS_renameat
+	return syscall(SYS_renameat, oldfd, old, newfd, new);
+#else
+	return syscall(SYS_renameat2, oldfd, old, newfd, new, 0);
+#endif
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/rmdir.c b/src/components/lib/libc/musl-1.2.0/src/unistd/rmdir.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/rmdir.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/rmdir.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setegid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setegid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setegid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setegid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/seteuid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/seteuid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/seteuid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/seteuid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setgid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setgid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setgid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setgid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setpgid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setpgid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setpgid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setpgid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setpgrp.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setpgrp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setpgrp.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setpgrp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setregid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setregid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setregid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setregid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setresgid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setresgid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setresgid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setresgid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setresuid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setresuid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setresuid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setresuid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setreuid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setreuid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setreuid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setreuid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setsid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setsid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setsid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setsid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setuid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setuid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setuid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setuid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/setxid.c b/src/components/lib/libc/musl-1.2.0/src/unistd/setxid.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/setxid.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/setxid.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/sh/pipe.s b/src/components/lib/libc/musl-1.2.0/src/unistd/sh/pipe.s
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/sh/pipe.s
rename to src/components/lib/libc/musl-1.2.0/src/unistd/sh/pipe.s
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/sleep.c b/src/components/lib/libc/musl-1.2.0/src/unistd/sleep.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/sleep.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/sleep.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/symlink.c b/src/components/lib/libc/musl-1.2.0/src/unistd/symlink.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/symlink.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/symlink.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/symlinkat.c b/src/components/lib/libc/musl-1.2.0/src/unistd/symlinkat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/symlinkat.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/symlinkat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/sync.c b/src/components/lib/libc/musl-1.2.0/src/unistd/sync.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/sync.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/sync.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/tcgetpgrp.c b/src/components/lib/libc/musl-1.2.0/src/unistd/tcgetpgrp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/tcgetpgrp.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/tcgetpgrp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/tcsetpgrp.c b/src/components/lib/libc/musl-1.2.0/src/unistd/tcsetpgrp.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/tcsetpgrp.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/tcsetpgrp.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/truncate.c b/src/components/lib/libc/musl-1.2.0/src/unistd/truncate.c
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/truncate.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/truncate.c
index 8e65655cd2..9729680076 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/truncate.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/truncate.c
@@ -1,10 +1,9 @@
 #include <unistd.h>
 #include "syscall.h"
-#include "libc.h"
 
 int truncate(const char *path, off_t length)
 {
 	return syscall(SYS_truncate, path, __SYSCALL_LL_O(length));
 }
 
-LFS64(truncate);
+weak_alias(truncate, truncate64);
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/ttyname.c b/src/components/lib/libc/musl-1.2.0/src/unistd/ttyname.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/ttyname.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/ttyname.c
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/ttyname_r.c b/src/components/lib/libc/musl-1.2.0/src/unistd/ttyname_r.c
new file mode 100644
index 0000000000..82acb75e19
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/ttyname_r.c
@@ -0,0 +1,28 @@
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include "syscall.h"
+
+int ttyname_r(int fd, char *name, size_t size)
+{
+	struct stat st1, st2;
+	char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2];
+	ssize_t l;
+
+	if (!isatty(fd)) return errno;
+
+	__procfdname(procname, fd);
+	l = readlink(procname, name, size);
+
+	if (l < 0) return errno;
+	else if (l == size) return ERANGE;
+
+	name[l] = 0;
+
+	if (stat(name, &st1) || fstat(fd, &st2))
+		return errno;
+	if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)
+		return ENODEV;
+
+	return 0;
+}
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/ualarm.c b/src/components/lib/libc/musl-1.2.0/src/unistd/ualarm.c
new file mode 100644
index 0000000000..2985855c72
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/ualarm.c
@@ -0,0 +1,13 @@
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <sys/time.h>
+
+unsigned ualarm(unsigned value, unsigned interval)
+{
+	struct itimerval it = {
+		.it_interval.tv_usec = interval,
+		.it_value.tv_usec = value
+	}, it_old;
+	setitimer(ITIMER_REAL, &it, &it_old);
+	return it_old.it_value.tv_sec*1000000 + it_old.it_value.tv_usec;
+}
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/unlink.c b/src/components/lib/libc/musl-1.2.0/src/unistd/unlink.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/unlink.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/unlink.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/unlinkat.c b/src/components/lib/libc/musl-1.2.0/src/unistd/unlinkat.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/unlinkat.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/unlinkat.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/usleep.c b/src/components/lib/libc/musl-1.2.0/src/unistd/usleep.c
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/usleep.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/usleep.c
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/write.c b/src/components/lib/libc/musl-1.2.0/src/unistd/write.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/write.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/write.c
index e2f7e1f219..8fd5bc5c26 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/write.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/write.c
@@ -1,6 +1,5 @@
 #include <unistd.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t write(int fd, const void *buf, size_t count)
 {
diff --git a/src/components/lib/libc/musl-1.1.11/src/unistd/writev.c b/src/components/lib/libc/musl-1.2.0/src/unistd/writev.c
similarity index 89%
rename from src/components/lib/libc/musl-1.1.11/src/unistd/writev.c
rename to src/components/lib/libc/musl-1.2.0/src/unistd/writev.c
index ef300ddf81..5a46c951af 100644
--- a/src/components/lib/libc/musl-1.1.11/src/unistd/writev.c
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/writev.c
@@ -1,6 +1,5 @@
 #include <sys/uio.h>
 #include "syscall.h"
-#include "libc.h"
 
 ssize_t writev(int fd, const struct iovec *iov, int count)
 {
diff --git a/src/components/lib/libc/musl-1.2.0/src/unistd/x32/lseek.c b/src/components/lib/libc/musl-1.2.0/src/unistd/x32/lseek.c
new file mode 100644
index 0000000000..3263642953
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/src/unistd/x32/lseek.c
@@ -0,0 +1,15 @@
+#include <unistd.h>
+#include "syscall.h"
+
+off_t __lseek(int fd, off_t offset, int whence)
+{
+	off_t ret;
+	__asm__ __volatile__ ("syscall"
+		: "=a"(ret)
+		: "a"(SYS_lseek), "D"(fd), "S"(offset), "d"(whence)
+		: "rcx", "r11", "memory");
+	return ret < 0 ? __syscall_ret(ret) : ret;
+}
+
+weak_alias(__lseek, lseek);
+weak_alias(__lseek, lseek64);
diff --git a/src/components/lib/libc/musl-1.2.0/tools/add-cfi.common.awk b/src/components/lib/libc/musl-1.2.0/tools/add-cfi.common.awk
new file mode 100644
index 0000000000..04482d4384
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/tools/add-cfi.common.awk
@@ -0,0 +1,26 @@
+function hex2int(str,   i) {
+  str = tolower(str)
+
+  for (i = 1; i <= 16; i++) {
+    char = substr("0123456789abcdef", i, 1)
+    lookup[char] = i-1
+  }
+
+  result = 0
+  for (i = 1; i <= length(str); i++) {
+    result = result * 16
+    char   = substr(str, i, 1)
+    result = result + lookup[char]
+  }
+  return result
+}
+
+function parse_const(str) {
+  sign = sub(/^-/, "", str)
+  hex  = sub(/^0x/, "", str)
+  if (hex)
+    n = hex2int(str)
+  else
+    n = str+0
+  return sign ? -n : n
+}
diff --git a/src/components/lib/libc/musl-1.1.11/tools/add-cfi.i386.awk b/src/components/lib/libc/musl-1.2.0/tools/add-cfi.i386.awk
similarity index 81%
rename from src/components/lib/libc/musl-1.1.11/tools/add-cfi.i386.awk
rename to src/components/lib/libc/musl-1.2.0/tools/add-cfi.i386.awk
index 4a4a3b6319..d05037de18 100644
--- a/src/components/lib/libc/musl-1.1.11/tools/add-cfi.i386.awk
+++ b/src/components/lib/libc/musl-1.2.0/tools/add-cfi.i386.awk
@@ -22,52 +22,34 @@ BEGIN {
   called = ""
 }
 
-function hex2int(str,   i) {
-  str = tolower(str)
-
-  for (i = 1; i <= 16; i++) {
-    char = substr("0123456789abcdef", i, 1)
-    lookup[char] = i-1
-  }
-
-  result = 0
-  for (i = 1; i <= length(str); i++) {
-    result = result * 16
-    char   = substr(str, i, 1)
-    result = result + lookup[char]
-  }
-  return result
-}
-
-function parse_const(str) {
-  sign = sub(/^-/, "", str)
-  hex  = sub(/^0x/, "", str)
-  if (hex)
-    n = hex2int(str)
-  else
-    n = str+0
-  return sign ? -n : n
-}
-
 function get_const1() {
   # for instructions with 2 operands, get 1st operand (assuming it is constant)
   match($0, /-?(0x[0-9a-fA-F]+|[0-9]+),/)
   return parse_const(substr($0, RSTART, RLENGTH-1))
 }
+
+function canonicalize_reg(register) {
+  if (match(register, /^e/))
+    return register
+  else if (match(register, /[hl]$/)) # AH, AL, BH, BL, etc
+    return "e" substr(register, 1, 1) "x"
+  else # AX, BX, CX, etc
+    return "e" register
+}
 function get_reg() {
   # only use if you already know there is 1 and only 1 register
-  match($0, /%e(ax|bx|cx|dx|si|di|bp)/)
-  return substr($0, RSTART+1, 3)
+  match($0, /%e?([abcd][hlx]|si|di|bp)/)
+  return canonicalize_reg(substr($0, RSTART+1, RLENGTH-1))
 }
 function get_reg1() {
   # for instructions with 2 operands, get 1st operand (assuming it is register)
-  match($0, /%e(ax|bx|cx|dx|si|di|bp),/)
-  return substr($0, RSTART+1, 3)
+  match($0, /%e?([abcd][hlx]|si|di|bp),/)
+  return canonicalize_reg(substr($0, RSTART+1, RLENGTH-2))
 }
 function get_reg2() {
   # for instructions with 2 operands, get 2nd operand (assuming it is register)
-  match($0, /,%e(ax|bx|cx|dx|si|di|bp)/)
-  return substr($0, RSTART+RLENGTH-3, 3)
+  match($0, /,%e?([abcd][hlx]|si|di|bp)/)
+  return canonicalize_reg(substr($0, RSTART+2, RLENGTH-2))
 }
 
 function adjust_sp_offset(delta) {
@@ -99,7 +81,7 @@ function adjust_sp_offset(delta) {
     in_function = 0
   }
 }
-/^\.type [a-zA-Z0-9_]+,\@function/ {
+/^\.type [a-zA-Z0-9_]+,@function/ {
   functions[substr($2, 1, length($2)-10)] = 1
 }
 # not interested in assembler directives beyond this, just pass them through
@@ -211,14 +193,14 @@ function trashed(register) {
 }
 # this does NOT exhaustively check for all possible instructions which could
 # overwrite a register value inherited from the caller (just the common ones)
-/mov.*,%e(ax|bx|cx|dx|si|di|bp)/  { trashed(get_reg2()) }
-/(add|addl|sub|subl|and|or|xor|lea|sal|sar|shl|shr) %e(ax|bx|cx|dx|si|di|bp),/ {
-  trashed(get_reg1())
-}
-/i?mul [^,]*$/                    { trashed("eax"); trashed("edx") }
-/i?mul %e(ax|bx|cx|dx|si|di|bp),/ { trashed(get_reg1()) }
-/i?div/                           { trashed("eax"); trashed("edx") }
-/(dec|inc|not|neg|pop) %e(ax|bx|cx|dx|si|di|bp)/  { trashed(get_reg()) }
+/mov.*,%e?([abcd][hlx]|si|di|bp)$/  { trashed(get_reg2()) }
+/(add|addl|sub|subl|and|or|xor|lea|sal|sar|shl|shr).*,%e?([abcd][hlx]|si|di|bp)$/ {
+  trashed(get_reg2())
+}
+/^i?mul [^,]*$/                      { trashed("eax"); trashed("edx") }
+/^i?mul.*,%e?([abcd][hlx]|si|di|bp)$/ { trashed(get_reg2()) }
+/^i?div/                             { trashed("eax"); trashed("edx") }
+/(dec|inc|not|neg|pop) %e?([abcd][hlx]|si|di|bp)/  { trashed(get_reg()) }
 /cpuid/ { trashed("eax"); trashed("ebx"); trashed("ecx"); trashed("edx") }
 
 END {
diff --git a/src/components/lib/libc/musl-1.2.0/tools/add-cfi.x86_64.awk b/src/components/lib/libc/musl-1.2.0/tools/add-cfi.x86_64.awk
new file mode 100644
index 0000000000..7e1513d643
--- /dev/null
+++ b/src/components/lib/libc/musl-1.2.0/tools/add-cfi.x86_64.awk
@@ -0,0 +1,196 @@
+# Insert GAS CFI directives ("control frame information") into x86-64 asm input
+
+BEGIN {
+  # don't put CFI data in the .eh_frame ELF section (which we don't keep)
+  print ".cfi_sections .debug_frame"
+
+  # only emit CFI directives inside a function
+  in_function = 0
+
+  # emit .loc directives with line numbers from original source
+  printf ".file 1 \"%s\"\n", ARGV[1]
+  line_number = 0
+
+  # used to detect "call label; label:" trick
+  called = ""
+}
+
+function get_const1() {
+  # for instructions with 2 operands, get 1st operand (assuming it is constant)
+  match($0, /-?(0x[0-9a-fA-F]+|[0-9]+),/)
+  return parse_const(substr($0, RSTART, RLENGTH-1))
+}
+
+function canonicalize_reg(register) {
+  if (match(register, /^r/))
+    return register
+  else if (match(register, /^e/))
+    return "r" substr(register, 2, length(register)-1)
+  else if (match(register, /[hl]$/)) # AH, AL, BH, BL, etc
+    return "r" substr(register, 1, 1) "x"
+  else # AX, BX, CX, etc
+    return "r" register
+}
+function get_reg() {
+  # only use if you already know there is 1 and only 1 register
+  match($0, /%[er]?([abcd][xlh]|si|di|bp|8|9|10|11|12|13|14|15)/)
+  return canonicalize_reg(substr($0, RSTART+1, RLENGTH-1))
+}
+function get_reg1() {
+  # for instructions with 2 operands, get 1st operand (assuming it is register)
+  match($0, /%[er]?([abcd][xlh]|si|di|bp|8|9|10|11|12|13|14|15),/)
+  return canonicalize_reg(substr($0, RSTART+1, RLENGTH-2))
+}
+function get_reg2() {
+  # for instructions with 2 operands, get 2nd operand (assuming it is register)
+  match($0, /,%[er]?([abcd][xlh]|si|di|bp|8|9|10|11|12|13|14|15)/)
+  return canonicalize_reg(substr($0, RSTART+2, RLENGTH-2))
+}
+
+function adjust_sp_offset(delta) {
+  if (in_function)
+    printf ".cfi_adjust_cfa_offset %d\n", delta
+}
+
+{
+  line_number = line_number + 1
+
+  # clean the input up before doing anything else
+  # delete comments
+  gsub(/(#|\/\/).*/, "")
+
+  # canonicalize whitespace
+  gsub(/[ \t]+/, " ") # mawk doesn't understand \s
+  gsub(/ *, */, ",")
+  gsub(/ *: */, ": ")
+  gsub(/ $/, "")
+  gsub(/^ /, "")
+}
+
+# check for assembler directives which we care about
+/^\.(section|data|text)/ {
+  # a .cfi_startproc/.cfi_endproc pair should be within the same section
+  # otherwise, clang will choke when generating ELF output
+  if (in_function) {
+    print ".cfi_endproc"
+    in_function = 0
+  }
+}
+/^\.type [a-zA-Z0-9_]+,@function/ {
+  functions[substr($2, 1, length($2)-10)] = 1
+}
+# not interested in assembler directives beyond this, just pass them through
+/^\./ {
+  print
+  next
+}
+
+/^[a-zA-Z0-9_]+:/ {
+  label = substr($1, 1, length($1)-1) # drop trailing :
+
+  if (called == label) {
+    # note adjustment of stack pointer from "call label; label:"
+    adjust_sp_offset(8)
+  }
+
+  if (functions[label]) {
+    if (in_function)
+      print ".cfi_endproc"
+
+    in_function = 1
+    print ".cfi_startproc"
+
+    for (register in saved)
+      delete saved[register]
+    for (register in dirty)
+      delete dirty[register]
+  }
+
+  # an instruction may follow on the same line, so continue processing
+}
+
+/^$/ { next }
+
+{
+  called = ""
+  printf ".loc 1 %d\n", line_number
+  print
+}
+
+# KEEPING UP WITH THE STACK POINTER
+# %rsp should only be adjusted by pushing/popping or adding/subtracting constants
+#
+/pushl?/ {
+  adjust_sp_offset(8)
+}
+/popl?/ {
+  adjust_sp_offset(-8)
+}
+/addl? \$-?(0x[0-9a-fA-F]+|[0-9]+),%rsp/ { adjust_sp_offset(-get_const1()) }
+/subl? \$-?(0x[0-9a-fA-F]+|[0-9]+),%rsp/ { adjust_sp_offset(get_const1()) }
+
+/call/ {
+  if (match($0, /call [0-9]+f/)) # "forward" label
+    called = substr($0, RSTART+5, RLENGTH-6)
+  else if (match($0, /call [0-9a-zA-Z_]+/))
+    called = substr($0, RSTART+5, RLENGTH-5)
+}
+
+# TRACKING REGISTER VALUES FROM THE PREVIOUS STACK FRAME
+#
+/pushl? %r(ax|bx|cx|dx|si|di|bp|8|9|10|11|12|13|14|15)/ { # don't match "push (%reg)"
+  # if a register is being pushed, and its value has not changed since the
+  #   beginning of this function, the pushed value can be used when printing
+  #   local variables at the next level up the stack
+  # emit '.cfi_rel_offset' for that
+
+  if (in_function) {
+    register = get_reg()
+    if (!saved[register] && !dirty[register]) {
+      printf ".cfi_rel_offset %s,0\n", register
+      saved[register] = 1
+    }
+  }
+}
+
+/movl? %r(ax|bx|cx|dx|si|di|bp|8|9|10|11|12|13|14|15),-?(0x[0-9a-fA-F]+|[0-9]+)?\(%rsp\)/ {
+  if (in_function) {
+    register = get_reg()
+    if (match($0, /-?(0x[0-9a-fA-F]+|[0-9]+)\(%rsp\)/)) {
+      offset = parse_const(substr($0, RSTART, RLENGTH-6))
+    } else {
+      offset = 0
+    }
+    if (!saved[register] && !dirty[register]) {
+      printf ".cfi_rel_offset %s,%d\n", register, offset
+      saved[register] = 1
+    }
+  }
+}
+
+# IF REGISTER VALUES ARE UNCEREMONIOUSLY TRASHED
+# ...then we want to know about it.
+#
+function trashed(register) {
+  if (in_function && !saved[register] && !dirty[register]) {
+    printf ".cfi_undefined %s\n", register
+  }
+  dirty[register] = 1
+}
+# this does NOT exhaustively check for all possible instructions which could
+# overwrite a register value inherited from the caller (just the common ones)
+/mov.*,%[er]?([abcd][xlh]|si|di|bp|8|9|10|11|12|13|14|15)$/ { trashed(get_reg2()) }
+/(add|addl|sub|subl|and|or|xor|lea|sal|sar|shl|shr).*,%[er]?([abcd][xlh]|si|di|bp|8|9|10|11|12|13|14|15)$/ {
+  trashed(get_reg2())
+}
+/^i?mul [^,]*$/ { trashed("rax"); trashed("rdx") }
+/^i?mul.*,%[er]?([abcd][xlh]|si|di|bp|8|9|10|11|12|13|14|15)$/ { trashed(get_reg2()) }
+/^i?div/ { trashed("rax"); trashed("rdx") }
+
+/(dec|inc|not|neg|pop) %[er]?([abcd][xlh]|si|di|bp|8|9|10|11|12|13|14|15)/  { trashed(get_reg()) }
+/cpuid/ { trashed("rax"); trashed("rbx"); trashed("rcx"); trashed("rdx") }
+
+END {
+  if (in_function)
+    print ".cfi_endproc"
+}
diff --git a/src/components/lib/libc/musl-1.1.11/tools/install.sh b/src/components/lib/libc/musl-1.2.0/tools/install.sh
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/tools/install.sh
rename to src/components/lib/libc/musl-1.2.0/tools/install.sh
diff --git a/src/components/lib/libc/musl-1.1.11/tools/ld.musl-clang.in b/src/components/lib/libc/musl-1.2.0/tools/ld.musl-clang.in
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/tools/ld.musl-clang.in
rename to src/components/lib/libc/musl-1.2.0/tools/ld.musl-clang.in
diff --git a/src/components/lib/libc/musl-1.1.11/tools/mkalltypes.sed b/src/components/lib/libc/musl-1.2.0/tools/mkalltypes.sed
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/tools/mkalltypes.sed
rename to src/components/lib/libc/musl-1.2.0/tools/mkalltypes.sed
diff --git a/src/components/lib/libc/musl-1.1.11/tools/musl-clang.in b/src/components/lib/libc/musl-1.2.0/tools/musl-clang.in
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/tools/musl-clang.in
rename to src/components/lib/libc/musl-1.2.0/tools/musl-clang.in
diff --git a/src/components/lib/libc/musl-1.1.11/tools/musl-gcc.specs.sh b/src/components/lib/libc/musl-1.2.0/tools/musl-gcc.specs.sh
similarity index 76%
rename from src/components/lib/libc/musl-1.1.11/tools/musl-gcc.specs.sh
rename to src/components/lib/libc/musl-1.2.0/tools/musl-gcc.specs.sh
index 294e24f755..3049257446 100644
--- a/src/components/lib/libc/musl-1.1.11/tools/musl-gcc.specs.sh
+++ b/src/components/lib/libc/musl-1.2.0/tools/musl-gcc.specs.sh
@@ -17,10 +17,10 @@ cat <<EOF
 libgcc.a%s %:if-exists(libgcc_eh.a%s)
 
 *startfile:
-%{!shared: $libdir/%{pie:S}crt1.o} $libdir/crti.o %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}
+%{!shared: $libdir/Scrt1.o} $libdir/crti.o crtbeginS.o%s
 
 *endfile:
-%{shared|pie:crtendS.o%s;:crtend.o%s} $libdir/crtn.o
+crtendS.o%s $libdir/crtn.o
 
 *link:
 -dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} %{rdynamic:-export-dynamic}
diff --git a/src/components/lib/libc/musl-1.1.11/tools/version.sh b/src/components/lib/libc/musl-1.2.0/tools/version.sh
similarity index 100%
rename from src/components/lib/libc/musl-1.1.11/tools/version.sh
rename to src/components/lib/libc/musl-1.2.0/tools/version.sh
diff --git a/src/components/lib/libcxx/Makefile b/src/components/lib/libcxx/Makefile
index 41af07beb4..979aa1eeb2 100644
--- a/src/components/lib/libcxx/Makefile
+++ b/src/components/lib/libcxx/Makefile
@@ -61,7 +61,7 @@ LIBRARY_DEPENDENCIES = component
 # init: clean all
 # distclean: clean
 
-.PHONY: all clean distclean init
+.PHONY: all clean distclean init i386_init x86_64_init
 
 all:
 clean:
@@ -77,4 +77,20 @@ distclean: clean
 	@make -C ./libstdc++-v3-4.8 clean
 	rm -f *.o *.a
 
-init: libsupc++.a libstdc++.a
+i386_init:
+	$(info Building libcxx for i386...)
+	make LIBCXX_ARCH=-m32 -C ./libstdc++-v3-4.8/libsupc++
+	make LIBCXX_ARCH=-m32 -C ./libstdc++-v3-4.8
+
+x86_64_init:
+	$(info Building libcxx for x86_64...)
+	make LIBCXX_ARCH=-m64 -C ./libstdc++-v3-4.8/libsupc++
+	make LIBCXX_ARCH=-m64 -C ./libstdc++-v3-4.8
+
+armv7a_init:
+	$(info Building libcxx for armv7-a...)
+	$(info This is not supported currently, abort...)
+	# make CXX=arm-none-eabi-g++  -C ./libstdc++-v3-4.8/libsupc++
+	# make CXX=arm-none-eabi-g++  -C ./libstdc++-v3-4.8
+
+init: $(PLATFORM)_init
diff --git a/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile b/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile
index b7e87bee2a..1bb8c2468e 100644
--- a/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile
+++ b/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile
@@ -1,6 +1,6 @@
 BUILDDIR := ../build/libstdc++
 INCLUDE := -I../include
-MUSLFLAG := -isystem ../../libc/musl-1.1.11/include
+MUSLFLAG := -isystem ../../libc/musl-1.2.0/include
 include Makefile.inc
 
 EXCEPTION :=
@@ -15,6 +15,8 @@ c++98/streambuf.o c++98/streambuf-inst.o c++98/tree.o
 OBJ_CC += c++11/fstream-inst.o c++11/functexcept.o c++11/string-inst.o
 #OBJ_CC += $(EXCEPTION)
 
+CXXFLAGS += $(LIBCXX_ARCH)
+
 vpath %.cc ./src
 vpath %.cc ./config/io
 vpath %.cc ./config/locale/generic
diff --git a/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile.inc b/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile.inc
index ebeca1a43e..3bedb700c8 100644
--- a/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile.inc
+++ b/src/components/lib/libcxx/libstdc++-v3-4.8/Makefile.inc
@@ -1,4 +1,4 @@
 CXX := g++
 AR := ar
 MV := mv
-CXXFLAGS := -Wall -nostdinc -nostdlib -fno-stack-protector -fno-exceptions -std=gnu++11 -O3 $(INCLUDE) $(MUSLFLAG) -D MINIMAL_LIBCXX -m32
+CXXFLAGS := -Wall -Wno-deprecated -Wno-deprecated-declarations -nostdinc -nostdlib -fno-stack-protector -fno-exceptions -std=gnu++11 -O3 $(INCLUDE) $(MUSLFLAG) -D MINIMAL_LIBCXX
diff --git a/src/components/lib/libcxx/libstdc++-v3-4.8/libsupc++/Makefile b/src/components/lib/libcxx/libstdc++-v3-4.8/libsupc++/Makefile
index 39dd852f3d..1e5ddd203e 100644
--- a/src/components/lib/libcxx/libstdc++-v3-4.8/libsupc++/Makefile
+++ b/src/components/lib/libcxx/libstdc++-v3-4.8/libsupc++/Makefile
@@ -1,6 +1,6 @@
 BUILDDIR := ../../build/libsupc++
 INCLUDE := -I../../include
-MUSLFLAG := -isystem ../../../libc/musl-1.1.11/include
+MUSLFLAG := -isystem ../../../libc/musl-1.2.0/include
 include ../Makefile.inc
 
 EXCEPTION := eh_alloc.o eh_arm.o eh_aux_runtime.o eh_call.o eh_catch.o eh_exception.o eh_throw.o \
@@ -13,6 +13,8 @@ OBJ_CC_GCC48 := array_type_info.o atexit_arm.o bad_alloc.o bad_cast.o bad_typeid
 dyncast.o enum_type_info.o function_type_info.o fundamental_type_info.o pbase_type_info.o \
 pmem_type_info.o pointer_type_info.o si_class_type_info.o vmi_class_type_info.o guard_error.o hash_bytes.o
 
+CXXFLAGS += $(LIBCXX_ARCH)
+
 .PHONY: all clean
 
 all: libsupc++.a
diff --git a/src/components/lib/lwip/Makefile b/src/components/lib/lwip/Makefile
new file mode 100644
index 0000000000..ad2ed3b35a
--- /dev/null
+++ b/src/components/lib/lwip/Makefile
@@ -0,0 +1,69 @@
+LWIP_DIR		= lwip/src
+LWIP_INC_DIR		= $(LWIP_DIR)/include
+
+LWIP_ADAPTER_DIR	= cos_adapter/
+
+LIBRARY_OUTPUT = lwip
+
+OBJECT_OUTPUT =
+
+INCLUDE_PATHS = . cos_adapter lwip/src/include
+
+INTERFACE_DEPENDENCIES =
+
+LIBRARY_DEPENDENCIES = component
+
+# this is to stop non supported build target
+# this will override $(OBJS) so that compiler will not compile target files under unsupported cases
+ifneq ($(PLATFORM),x86_64)
+override OBJS =
+endif
+
+# CFILES+=$(wildcard adapter/*.c)
+# SFILES+=$(wildcard adapter/*.S)
+
+# LWIP_CORE_FILES, LWIP_CORE_IPV4_FILES: The minimum set of files needed for lwIP.
+LWIP_CORE_FILES=$(LWIP_DIR)/core/mem.c $(LWIP_DIR)/core/memp.c $(LWIP_DIR)/core/netif.c \
+	$(LWIP_DIR)/core/pbuf.c $(LWIP_DIR)/core/raw.c \
+	$(LWIP_DIR)/core/stats.c $(LWIP_DIR)/core/sys.c \
+	$(LWIP_DIR)/core/tcp.c $(LWIP_DIR)/core/tcp_in.c \
+	$(LWIP_DIR)/core/tcp_out.c $(LWIP_DIR)/core/udp.c \
+	$(LWIP_DIR)/core/init.c $(LWIP_DIR)/core/inet_chksum.c \
+	$(LWIP_DIR)/core/def.c $(LWIP_DIR)/core/timeouts.c \
+	$(LWIP_DIR)/core/ip.c \
+	$(LWIP_DIR)/api/err.c
+
+LWIP_CORE_IPV4_FILES=$(LWIP_DIR)/core/ipv4/icmp.c $(LWIP_DIR)/core/ipv4/ip4.c \
+	$(LWIP_DIR)/core/ipv4/ip4_addr.c $(LWIP_DIR)/core/ipv4/ip4_frag.c
+COS_LWIP_ADAPTER_FILES=$(LWIP_ADAPTER_DIR)/sys_arch.c
+
+LWIP_FILES=$(LWIP_CORE_FILES) $(LWIP_CORE_IPV4_FILES) $(COS_LWIP_ADAPTER_FILES)
+LWIP_FILESW=$(wildcard $(LWIP_FILES))
+
+CFILES+=$(LWIP_FILESW)
+
+include Makefile.lib
+CINC+=$(foreach I, $(INCLUDE_PATHS), -I$(I))
+
+.PHONY: all   clean distclean init build 
+
+build:
+ifneq ($(PLATFORM),x86_64)
+	@echo "Platform: $(PLATFORM) is not supported in LWIP"
+endif
+
+armv7a_init:
+
+i386_init:
+
+x86_64_init: 
+
+platform_init:
+	make $(PLATFORM)_init
+
+init: platform_init
+
+distclean:
+	$(info lwip distclean)
+	rm $(OBJS) $(CFILES:%.c=%.d)
+clean:
diff --git a/src/components/lib/lwip/cos_adapter/arch/cc.h b/src/components/lib/lwip/cos_adapter/arch/cc.h
new file mode 100644
index 0000000000..5bedb7f559
--- /dev/null
+++ b/src/components/lib/lwip/cos_adapter/arch/cc.h
@@ -0,0 +1,34 @@
+#ifndef __ARCH_CC_H__
+#define __ARCH_CC_H__
+
+#define LWIP_NO_STDINT_H 1
+
+#ifndef COS_BASE_TYPES
+#define COS_BASE_TYPES
+typedef unsigned char      u8_t;
+typedef unsigned short int u16_t;
+typedef unsigned int       u32_t;
+typedef unsigned long long u64_t;
+typedef signed char        s8_t;
+typedef signed short int   s16_t;
+typedef signed int         s32_t;
+typedef signed long long   s64_t;
+#endif
+
+typedef unsigned long int mem_ptr_t;
+
+/* Define platform endianness */
+#ifndef BYTE_ORDER
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif /* BYTE_ORDER */
+
+/* Compiler hints for packing structures */
+// #define PACK_STRUCT_FIELD(x) x __attribute__((packed))
+#define PACK_STRUCT_STRUCT __attribute__((packed))
+#define PACK_STRUCT_BEGIN
+#define PACK_STRUCT_END
+
+#include <llprint.h>
+#define LWIP_PLATFORM_DIAG(x) do { printc x; } while (0);
+#define LWIP_PLATFORM_ASSERT(x) do { printc(x); } while (0);
+#endif /* __ARCH_CC_H__ */
diff --git a/src/components/lib/lwip/cos_adapter/arch/perf.h b/src/components/lib/lwip/cos_adapter/arch/perf.h
new file mode 100644
index 0000000000..1d8deddb2f
--- /dev/null
+++ b/src/components/lib/lwip/cos_adapter/arch/perf.h
@@ -0,0 +1,4 @@
+#ifndef __ARCH_PERF_H__
+#define __ARCH_PERF_H__
+
+#endif /* __ARCH_PERF_H__ */
diff --git a/src/components/lib/lwip/cos_adapter/arch/sys_arch.h b/src/components/lib/lwip/cos_adapter/arch/sys_arch.h
new file mode 100644
index 0000000000..e3f4208763
--- /dev/null
+++ b/src/components/lib/lwip/cos_adapter/arch/sys_arch.h
@@ -0,0 +1,21 @@
+#ifndef __ARCH_SYS_ARCH_H__
+#define __ARCH_SYS_ARCH_H__
+
+//#include <errno.h>
+
+/* #define SYS_MBOX_NULL NULL */
+/* #define SYS_SEM_NULL  NULL */
+
+// typedef unsigned int sys_prot_t;
+
+/* struct sys_sem; */
+/* typedef struct sys_sem * sys_sem_t; */
+
+/* struct sys_mbox; */
+/* typedef struct sys_mbox *sys_mbox_t; */
+
+/* struct sys_thread; */
+/* typedef struct sys_thread * sys_thread_t; */
+
+#endif /* __ARCH_SYS_ARCH_H__ */
+
diff --git a/src/components/lib/lwip/cos_adapter/lwipopts.h b/src/components/lib/lwip/cos_adapter/lwipopts.h
new file mode 100644
index 0000000000..71397877eb
--- /dev/null
+++ b/src/components/lib/lwip/cos_adapter/lwipopts.h
@@ -0,0 +1,104 @@
+#ifndef LWIPOPTS_H
+#define LWIPOPTS_H
+
+#define MEM_LIBC_MALLOC 1
+#define MEM_USE_POOLS 0
+
+#define NO_SYS 1
+#define MEM_ALIGNMENT 4
+#define MEM_SIZE 0 //64000
+/* #define MEMP_OVERFLOW_CHECK 1 */
+/* #define MEMP_SANITY_CHECK 1 */
+/* #define MEMP_NUM_PBUF (4096*4) */
+#define MEMP_NUM_UDP_PCB 512
+
+#define MEMP_NUM_TCP_PCB 512 	/* need a fair amount of these due to timed wait on close  */
+#define MEMP_NUM_TCP_PCB_LISTEN 128
+#define LWIP_ARP 0
+#define IP_REASSEMBLY 0
+#define IP_FRAG 0
+
+#define SYS_LIGHTWEIGHT_PROT           0
+//#define LWIP_WND_SCALE                  1
+
+/* TCP */
+#define LWIP_TCP                1
+#define TCP_TTL                 255
+
+/* Controls if TCP should queue segments that arrive out of
+   order. Define to 0 if your device is low on memory. */
+#define TCP_QUEUE_OOSEQ         1
+
+/* TCP sender buffer space (pbufs). This must be at least = 2 *
+   TCP_SND_BUF/TCP_MSS for things to work. */
+#define TCP_SND_QUEUELEN       4096 //(64 * TCP_SND_BUF/TCP_MSS)
+
+#define MEMP_NUM_TCP_SEG 2*4096 //(TCP_SND_QUEUELEN*16)
+
+/* TCP receive window. */
+#define TCP_WND                 4096
+
+/* Maximum number of retransmissions of data segments. */
+#define TCP_MAXRTX              12
+
+/* Maximum number of retransmissions of SYN segments. */
+#define TCP_SYNMAXRTX           4
+
+#define TCP_LISTEN_BACKLOG      1
+
+#undef LWIP_EVENT_API
+#define LWIP_CALLBACK_API 1
+
+#define PPP_SUPPORT      0      /* Set > 0 for PPP */
+
+#define ARP_QUEUEING 0
+#define LWIP_SOCKET 0
+#define LWIP_NETCONN 0
+#define LWIP_ICMP   1
+
+#define LWIP_DEBUG  1
+
+
+ #define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_ALL
+// #define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_WARNING
+//#define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_SERIOUS
+//#define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_SEVERE
+
+//#define LWIP_DBG_TYPES_ON               LWIP_DBG_ON
+#define LWIP_DBG_TYPES_ON               (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH)
+
+#define ETHARP_DEBUG                    LWIP_DBG_ON
+#define NETIF_DEBUG                     LWIP_DBG_ON
+#define PBUF_DEBUG                      LWIP_DBG_ON
+#define API_LIB_DEBUG                   LWIP_DBG_ON
+#define API_MSG_DEBUG                   LWIP_DBG_ON
+#define SOCKETS_DEBUG                   LWIP_DBG_ON
+#define ICMP_DEBUG                      LWIP_DBG_ON
+#define IGMP_DEBUG                      LWIP_DBG_ON
+#define INET_DEBUG                      LWIP_DBG_ON
+#define IP_DEBUG                        LWIP_DBG_ON
+#define IP_REASS_DEBUG                  LWIP_DBG_ON
+#define RAW_DEBUG                       LWIP_DBG_ON
+#define MEM_DEBUG                       LWIP_DBG_ON
+#define MEMP_DEBUG                      LWIP_DBG_ON
+#define SYS_DEBUG                       LWIP_DBG_ON
+#define TCP_DEBUG                       LWIP_DBG_ON
+#define TCP_INPUT_DEBUG                 LWIP_DBG_ON
+#define TCP_FR_DEBUG                    LWIP_DBG_ON
+#define TCP_RTO_DEBUG                   LWIP_DBG_ON
+#define TCP_CWND_DEBUG                  LWIP_DBG_ON
+#define TCP_WND_DEBUG                   LWIP_DBG_ON
+#define TCP_OUTPUT_DEBUG                LWIP_DBG_ON
+#define TCP_RST_DEBUG                   LWIP_DBG_ON
+#define TCP_QLEN_DEBUG                  LWIP_DBG_ON
+#define UDP_DEBUG                       LWIP_DBG_ON
+#define TCPIP_DEBUG                     LWIP_DBG_ON
+#define PPP_DEBUG                       LWIP_DBG_ON
+#define SLIP_DEBUG                      LWIP_DBG_ON
+#define DHCP_DEBUG                      LWIP_DBG_ON
+#define AUTOIP_DEBUG                    LWIP_DBG_ON
+#define SNMP_MSG_DEBUG                  LWIP_DBG_ON
+#define SNMP_MIB_DEBUG                  LWIP_DBG_ON
+#define DNS_DEBUG                       LWIP_DBG_ON 
+
+#endif	/* LWIPOPTS_H */
diff --git a/src/components/lib/lwip/cos_adapter/sys_arch.c b/src/components/lib/lwip/cos_adapter/sys_arch.c
new file mode 100644
index 0000000000..e72f6ed528
--- /dev/null
+++ b/src/components/lib/lwip/cos_adapter/sys_arch.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2017 Simon Goldschmidt
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Simon Goldschmidt
+ *
+ */
+
+
+#include <lwip/opt.h>
+#include <lwip/arch.h>
+#include <lwip/stats.h>
+#include <lwip/debug.h>
+#include <lwip/sys.h>
+
+#include <string.h>
+
+u32_t lwip_sys_now;
+
+u32_t
+sys_jiffies(void)
+{
+  return lwip_sys_now;
+}
+
+u32_t
+sys_now(void)
+{
+  return lwip_sys_now;
+}
+
+void
+sys_init(void)
+{
+}
+
diff --git a/src/components/lib/lwip/lwip b/src/components/lib/lwip/lwip
new file mode 160000
index 0000000000..f249e3f0be
--- /dev/null
+++ b/src/components/lib/lwip/lwip
@@ -0,0 +1 @@
+Subproject commit f249e3f0be90e525a9904e9e5aa448e84b0d02cb
diff --git a/src/components/lib/pci/Makefile b/src/components/lib/pci/Makefile
index 4ba7db39ad..f2c2aed143 100644
--- a/src/components/lib/pci/Makefile
+++ b/src/components/lib/pci/Makefile
@@ -40,8 +40,13 @@ LIBRARY_DEPENDENCIES = component
 # libraries written for composite. Get rid of this if you require a
 # custom Makefile (e.g. if you use an existing
 # (non-composite-specific) library. An example of this is `kernel`.
+ifneq ($(PLATFORM), armv7a)
 include Makefile.lib
+endif
 
+all:
+clean:
+init:
 ## Type 2, external library: If you need to specialize the Makefile
 ## for an external library, you can add the external code as a
 ## subdirectory, and drive its compilation, and integration with the
diff --git a/src/components/lib/pci/io.h b/src/components/lib/pci/io.h
index 60c8044347..4fc89da5e3 100644
--- a/src/components/lib/pci/io.h
+++ b/src/components/lib/pci/io.h
@@ -1,32 +1,7 @@
 #ifndef IO_H
 #define IO_H
-
 #include <cos_types.h>
 
-/**
- * Write byte to specific port
- */
-static inline void
-outb(u16_t port, u8_t value)
-{
-    __asm__ __volatile__("outb %1, %0" : : "dN" (port), "a" (value));
-}
-
-/**
- * Read byte from port
- */
-static inline u8_t
-inb(u16_t port)
-{
-    u8_t ret;
-
-    __asm__ __volatile__("inb %1, %0"
-        : "=a" (ret)
-        : "dN" (port));
-        
-    return ret;
-}
-
 static inline void
 outl(u16_t port, u32_t value)
 {
diff --git a/src/components/lib/pci/pci.c b/src/components/lib/pci/pci.c
index fe3ffedc83..773095ca68 100644
--- a/src/components/lib/pci/pci.c
+++ b/src/components/lib/pci/pci.c
@@ -37,19 +37,20 @@ pci_scan(struct pci_dev *devices, int sz)
 			for (f = 0 ; f < PCI_FUNC_MAX ; f++) {
 				reg = pci_config_read(i, j, f, 0x0);
 				if (reg == PCI_BITMASK_32) continue;
-				for (k = 0 ; k < PCI_DATA_NUM ; k++) devices[dev_num].data[k] = pci_config_read(i, j, f, k << 2);
+				for (k = 0 ; k < PCI_DATA_NUM ; k++) {
+					devices[dev_num].data[k] = pci_config_read(i, j, f, k << 2);
+				}
 				
-				devices[dev_num] = (struct pci_dev) {
-					.bus       = (u32_t)i,
-					.dev       = (u32_t)j,
-					.func      = (u32_t)f,
-					.vendor    = (u16_t)PCI_VENDOR_ID(devices[dev_num].data[0]),
-					.device    = (u16_t)PCI_DEVICE_ID(devices[dev_num].data[0]),
-					.classcode = (u8_t)PCI_CLASS_ID(devices[dev_num].data[2]),
-					.subclass  = (u8_t)PCI_SUBCLASS_ID(devices[dev_num].data[2]),
-					.progIF    = (u8_t)PCI_PROG_IF(devices[dev_num].data[2]),
-					.header    = (u8_t)PCI_HEADER(devices[dev_num].data[3]),
-				};
+				devices[dev_num].bus       = (u32_t)i;
+				devices[dev_num].dev       = (u32_t)j;
+				devices[dev_num].func      = (u32_t)f;
+				devices[dev_num].vendor    = (u16_t)PCI_VENDOR_ID(devices[dev_num].data[0]);
+				devices[dev_num].device    = (u16_t)PCI_DEVICE_ID(devices[dev_num].data[0]);
+				devices[dev_num].classcode = (u8_t)PCI_CLASS_ID(devices[dev_num].data[2]);
+				devices[dev_num].subclass  = (u8_t)PCI_SUBCLASS_ID(devices[dev_num].data[2]);
+				devices[dev_num].progIF    = (u8_t)PCI_PROG_IF(devices[dev_num].data[2]);
+				devices[dev_num].header    = (u8_t)PCI_HEADER(devices[dev_num].data[3]);
+
 				for (k = 0 ; k < PCI_BAR_NUM ; k++) {
 					devices[dev_num].bar[k].raw = devices[dev_num].data[4+k];
 					/* the least signficant 8 bits hold data about the region type, locatable and prefetchable, so they are masked out */
diff --git a/src/components/lib/pci/pci.h b/src/components/lib/pci/pci.h
index 56ffa8a8ba..7f06b3ffb7 100644
--- a/src/components/lib/pci/pci.h
+++ b/src/components/lib/pci/pci.h
@@ -2,7 +2,7 @@
 #define PCI_H
 
 #define PCI_BUS_MAX        255
-#define PCI_DEVICE_MAX     32
+#define PCI_DEVICE_MAX     256
 #define PCI_FUNC_MAX       7
 #define PCI_DEVICE_NUM     128
 #define PCI_CONFIG_ADDRESS 0xCF8
@@ -92,4 +92,6 @@ int pci_dev_get(struct pci_dev *devices, int sz, struct pci_dev *dev, u16_t dev_
  */
 int pci_dev_count(void);
 
+u32_t pci_config_read(u32_t bus, u32_t dev, u32_t func, u32_t reg);
+void pci_config_write(u32_t bus, u32_t dev, u32_t func, u32_t reg, u32_t v);
 #endif /* PCI_H */
\ No newline at end of file
diff --git a/src/components/lib/posix/Makefile b/src/components/lib/posix/Makefile
index a9f2c943a4..455b0f5514 100644
--- a/src/components/lib/posix/Makefile
+++ b/src/components/lib/posix/Makefile
@@ -18,10 +18,10 @@ OBJECT_OUTPUT = posix
 INCLUDE_PATHS = .
 # The interfaces this component is dependent on for compilation (this
 # is a list of directory names in interface/)
-INTERFACE_DEPENDENCIES =
+INTERFACE_DEPENDENCIES = 
 # The library dependencies this component is reliant on for
 # compilation/linking (this is a list of directory names in lib/)
-LIBRARY_DEPENDENCIES = component kernel sl
+LIBRARY_DEPENDENCIES = component
 # Note: Both the interface and library dependencies should be
 # *minimal*. That is to say that removing a dependency should cause
 # the build to fail. The build system does not validate this
diff --git a/src/components/lib/posix/posix.c b/src/components/lib/posix/posix.c
index 73166a7524..c503ab1726 100644
--- a/src/components/lib/posix/posix.c
+++ b/src/components/lib/posix/posix.c
@@ -1,520 +1,49 @@
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <syscall.h>
-#include <time.h>
-
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-
 #include <cos_component.h>
-#include <cos_defkernel_api.h>
 #include <llprint.h>
-#include <sl.h>
-#include <sl_lock.h>
-#include <sl_thd.h>
-
-volatile int* null_ptr = NULL;
-#define ABORT() do {int i = *null_ptr;} while(0)
+#include "posix.h"
 
-#define SYSCALLS_NUM 378
-
-typedef long (*cos_syscall_t)(long a, long b, long c, long d, long e, long f);
 cos_syscall_t cos_syscalls[SYSCALLS_NUM];
 
-static void
-libc_syscall_override(cos_syscall_t fn, int syscall_num)
-{
-	printc("Overriding syscall %d\n", syscall_num);
-	cos_syscalls[syscall_num] = fn;
-}
-
-struct sl_lock stdout_lock = SL_LOCK_STATIC_INIT();
-
-ssize_t
-write_bytes_to_stdout(const char *buf, size_t count)
-{
-	size_t i;
-	for(i = 0; i < count; i++) printc("%c", buf[i]);
-	return count;
-}
-
-ssize_t
-cos_write(int fd, const void *buf, size_t count)
-{
-	/* You shouldn't write to stdin anyway, so don't bother special casing it */
-	if (fd == 1 || fd == 2) {
-		sl_lock_take(&stdout_lock);
-		write_bytes_to_stdout((const char *) buf, count);
-		sl_lock_release(&stdout_lock);
-		return count;
-	} else {
-		printc("fd: %d not supported!\n", fd);
-		assert(0);
-	}
-}
-
-ssize_t
-cos_writev(int fd, const struct iovec *iov, int iovcnt)
-{
-	if (fd == 1 || fd == 2) {
-		sl_lock_take(&stdout_lock);
-		int i;
-		ssize_t ret = 0;
-		for(i=0; i<iovcnt; i++) {
-			ret += write_bytes_to_stdout((const void *)iov[i].iov_base, iov[i].iov_len);
-		}
-		sl_lock_release(&stdout_lock);
-		return ret;
-	} else {
-		printc("fd: %d not supported!\n", fd);
-		assert(0);
-	}
-}
-
 long
-cos_ioctl(int fd, int request, void *data)
-{
-	/* musl libc does some ioctls to stdout, so just allow these to silently go through */
-	if (fd == 1 || fd == 2) return 0;
-
-	printc("ioctl on fd(%d) not implemented\n", fd);
-	assert(0);
-	return 0;
-}
-
-ssize_t
-cos_brk(void *addr)
-{
-	printc("brk not implemented\n");
-	/* Unsure if the below comment is accurate. We return 0, so doesn't brk "succeed"? */
-	/* musl libc tries to use brk to expand heap in malloc. But if brk fails, it
-	   turns to mmap. So this fake brk always fails, force musl libc to use mmap */
-	return 0;
-}
-
-void *
-cos_mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
-{
-	void *ret=0;
-
-	if (addr != NULL) {
-		printc("parameter void *addr is not supported!\n");
-		errno = ENOTSUP;
-		return MAP_FAILED;
-	}
-	if (fd != -1) {
-		printc("file mapping is not supported!\n");
-		errno = ENOTSUP;
-		return MAP_FAILED;
-	}
-
-	addr = (void *)cos_page_bump_allocn(&cos_defcompinfo_curr_get()->ci, length);
-	if (!addr){
-		ret = (void *) -1;
-	} else {
-		ret = addr;
-	}
-
-	if (ret == (void *)-1) {  /* return value comes from man page */
-		printc("mmap() failed!\n");
-		/* This is a best guess about what went wrong */
-		errno = ENOMEM;
-	}
-	return ret;
-}
-
-int
-cos_munmap(void *start, size_t length)
-{
-	printc("munmap not implemented\n");
-	errno = ENOSYS;
-	return -1;
-}
-
-int
-cos_madvise(void *start, size_t length, int advice)
-{
-	/* We don't do anything with the advice from madvise, but that isn't really a problem */
-	return 0;
-}
-
-void *
-cos_mremap(void *old_address, size_t old_size, size_t new_size, int flags)
-{
-	printc("mremap not implemented\n");
-	errno = ENOSYS;
-	return (void*) -1;
-}
-
-int
-cos_rt_sigprocmask(int how, void* set, void* oldset, size_t sigsetsize)
-{
-	/* Musl uses this at thread create time */
-	printc("rt_sigprocmask not implemented\n");
-	errno = ENOSYS;
-	return -1;
-}
-
-int
-cos_mprotect(void *addr, size_t len, int prot)
-{
-	/* Musl uses this at thread create time */
-	printc("mprotect not implemented\n");
-	return 0;
-}
-
-/* Thread related functions */
-pid_t
-cos_gettid(void)
+cos_syscall_handler(int syscall_num, long a, long b, long c, long d, long e, long f)
 {
-	return (pid_t) sl_thdid();
-}
+	assert(syscall_num <= SYSCALLS_NUM);
 
-int
-cos_tkill(int tid, int sig)
-{
-	if (sig == SIGABRT || sig == SIGKILL) {
-		printc("Abort requested, complying...\n");
-		ABORT();
-	} else if (sig == SIGFPE) {
-		printc("Floating point error, aborting...\n");
-		ABORT();
-	} else if (sig == SIGILL) {
-		printc("Illegal instruction, aborting...\n");
-		ABORT();
-	} else if (sig == SIGINT) {
-		printc("Terminal interrupt, aborting?\n");
-		ABORT();
-	} else {
-		printc("Unknown signal %d\n", sig);
+	if (!cos_syscalls[syscall_num]){
+		printc("ERROR: Component %ld calling unimplemented system call %d\n", cos_spd_id(), syscall_num);
 		assert(0);
-	}
-
-	assert(0);
-	return 0;
-}
-
-static inline microsec_t
-time_to_microsec(const struct timespec *t)
-{
-	time_t seconds          = t->tv_sec;
-	long nano_seconds       = t->tv_nsec;
-	microsec_t microseconds = seconds * 1000000 + nano_seconds / 1000;
-
-	return microseconds;
-}
-
-long
-cos_nanosleep(const struct timespec *req, struct timespec *rem)
-{
-	time_t remaining_seconds;
-	long remaining_nano_seconds;
-	microsec_t remaining_microseconds;
-	cycles_t wakeup_deadline, wakeup_time;
-	int completed_successfully;
-
-	if (!req) {
-		errno = EFAULT;
-		return -1;
-	}
-
-	wakeup_deadline        = sl_now() + sl_usec2cyc(time_to_microsec(req));
-	completed_successfully = sl_thd_block_timeout(0, wakeup_deadline);
-	wakeup_time   = sl_now();
-
-	if (completed_successfully || wakeup_time > wakeup_deadline) {
 		return 0;
 	} else {
-		errno = EINTR;
-		if (rem) {
-			remaining_microseconds = sl_cyc2usec(wakeup_deadline - wakeup_time);
-			remaining_seconds      = remaining_microseconds / 1000000;
-			remaining_nano_seconds = (remaining_microseconds - remaining_seconds * 1000000) * 1000;
-			*rem = (struct timespec) {
-				.tv_sec = remaining_seconds,
-				.tv_nsec = remaining_nano_seconds
-			};
-		}
-		return -1;
-	}
-}
-
-
-long
-cos_set_tid_address(int *tidptr)
-{
-	/* Just do nothing for now and hope that works */
-	return 0;
-}
-
-/* struct user_desc {
- *     int  		  entry_number; // Ignore
- *     unsigned int  base_addr; // Pass to cos thread mod
- *     unsigned int  limit; // Ignore
- *     unsigned int  seg_32bit:1;
- *     unsigned int  contents:2;
- *     unsigned int  read_exec_only:1;
- *     unsigned int  limit_in_pages:1;
- *     unsigned int  seg_not_present:1;
- *     unsigned int  useable:1;
- * };
- */
-
-void* backing_data[SL_MAX_NUM_THDS];
-
-static void
-setup_thread_area(struct sl_thd *thread, void* data)
-{
-	struct cos_compinfo *ci = cos_compinfo_get(cos_defcompinfo_curr_get());
-	thdid_t thdid = sl_thd_thdid(thread);
-
-	backing_data[thdid] = data;
-
-	cos_thd_mod(ci, sl_thd_thdcap(thread), &backing_data[thdid]);
-}
-
-int
-cos_set_thread_area(void* data)
-{
-	setup_thread_area(sl_thd_curr(), data);
-	return 0;
-}
-
-int
-cos_clone(int (*func)(void *), void *stack, int flags, void *arg, pid_t *ptid, void *tls, pid_t *ctid)
-{
-	if (!func) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	struct sl_thd * thd = sl_thd_alloc((cos_thd_fn_t) func, arg);
-	if (tls) {
-		setup_thread_area(thd, tls);
-	}
-	return sl_thd_thdid(thd);
-}
-
-#define FUTEX_WAIT		0
-#define FUTEX_WAKE		1
-#define FUTEX_FD		2
-#define FUTEX_REQUEUE		3
-#define FUTEX_CMP_REQUEUE	4
-#define FUTEX_WAKE_OP		5
-#define FUTEX_LOCK_PI		6
-#define FUTEX_UNLOCK_PI		7
-#define FUTEX_TRYLOCK_PI	8
-#define FUTEX_WAIT_BITSET	9
-
-#define FUTEX_PRIVATE 128
-
-#define FUTEX_CLOCK_REALTIME 256
-
-struct futex_data
-{
-	int *uaddr;
-	struct ps_list_head waiters;
-};
-
-struct futex_waiter
-{
-	thdid_t thdid;
-	struct ps_list list;
-};
-
-#define FUTEX_COUNT 20
-struct futex_data futexes[FUTEX_COUNT];
-
-struct futex_data *
-lookup_futex(int *uaddr)
-{
-	int last_free = -1;
-	int i;
-
-	for (i = 0; i < FUTEX_COUNT; i++) {
-		if (futexes[i].uaddr == uaddr) {
-			return &futexes[i];
-		} else if (futexes[i].uaddr == 0) {
-			last_free = i;
-		}
-	}
-	if (last_free >= 0) {
-		futexes[last_free] = (struct futex_data) {
-			.uaddr = uaddr
-		};
-		ps_list_head_init(&futexes[last_free].waiters);
-		return &futexes[last_free];
-	}
-	printc("Out of futex ids!");
-	assert(0);
-}
-
-/* TODO: Cleanup empty futexes */
-
-struct sl_lock futex_lock = SL_LOCK_STATIC_INIT();
-
-/*
- * precondition: futex_lock is taken
- */
-int
-cos_futex_wait(struct futex_data *futex, int *uaddr, int val, const struct timespec *timeout)
-{
-	cycles_t   deadline;
-	microsec_t wait_time;
-	struct futex_waiter waiter = (struct futex_waiter) {
-		.thdid = sl_thdid()
-	};
-
-	if (*uaddr != val) return EAGAIN;
-
-	ps_list_init_d(&waiter);
-	ps_list_head_append_d(&futex->waiters, &waiter);
-
-	if (timeout != NULL) {
-		wait_time = time_to_microsec(timeout);
-		deadline = sl_now() + sl_usec2cyc(wait_time);
-	}
-
-	do {
-		/* No race here, we'll enter the awoken state if things go wrong */
-		sl_lock_release(&futex_lock);
-		if (timeout == NULL) {
-			sl_thd_block(0);
-		} else {
-			sl_thd_block_timeout(0, deadline);
-		}
-		sl_lock_take(&futex_lock);
-	/* We continue while the waiter is in the list, and the deadline has not elapsed */
-	} while(!ps_list_singleton_d(&waiter) && (timeout == NULL || sl_now() < deadline));
-
-	/* If our waiter is still in the list (meaning we quit because the deadline elapsed),
-	 * then we remove it from the list. */
-	if (!ps_list_singleton_d(&waiter)) {
-		ps_list_rem_d(&waiter);
-	}
-	/* We exit the function with futex_lock taken */
-	return 0;
-}
-
-int cos_futex_wake(struct futex_data *futex, int wakeup_count)
-{
-	struct futex_waiter *waiter, *tmp;
-	int awoken = 0;
-
-	ps_list_foreach_del_d(&futex->waiters, waiter, tmp) {
-		if (awoken >= wakeup_count) {
-			return awoken;
-		}
-		ps_list_rem_d(waiter);
-		sl_thd_wakeup(waiter->thdid);
-		awoken += 1;
+		return cos_syscalls[syscall_num](a, b, c, d, e, f);
 	}
-	return awoken;
 }
 
-int
-cos_futex(int *uaddr, int op, int val,
-          const struct timespec *timeout, /* or: uint32_t val2 */
-		  int *uaddr2, int val3)
+void
+libc_syscall_override(cos_syscall_t fn, int syscall_num)
 {
-	int result = 0;
-	struct futex_data *futex;
-
-	sl_lock_take(&futex_lock);
-
-	/* TODO: Consider whether these options have sensible composite interpretations */
-	op &= ~FUTEX_PRIVATE;
-	assert(!(op & FUTEX_CLOCK_REALTIME));
-
-	futex = lookup_futex(uaddr);
-	switch (op) {
-		case FUTEX_WAIT:
-			result = cos_futex_wait(futex, uaddr, val, timeout);
-			if (result != 0) {
-				errno = result;
-				result = -1;
-			}
-			break;
-		case FUTEX_WAKE:
-			result = cos_futex_wake(futex, val);
-			break;
-		default:
-			printc("Unsupported futex operation");
-			assert(0);
-	}
-
-	sl_lock_release(&futex_lock);
-
-	return result;
+	printc("Overriding syscall %d\n", syscall_num);
+	cos_syscalls[syscall_num] = fn;
 }
 
-
 void
 pre_syscall_default_setup()
 {
-	printc("pre_syscall_default_setup\n");
-
-	struct cos_defcompinfo *defci = cos_defcompinfo_curr_get();
-	struct cos_compinfo    *ci    = cos_compinfo_get(defci);
-
-	cos_defcompinfo_init();
-	cos_meminfo_init(&(ci->mi), BOOT_MEM_KM_BASE, COS_MEM_KERN_PA_SZ, BOOT_CAPTBL_SELF_UNTYPED_PT);
-	sl_init(SL_MIN_PERIOD_US);
-}
+	int i;
 
-void
-syscall_emulation_setup(void)
-{
-	printc("syscall_emulation_setup\n");
+	printc("default posix initializating...\n");
 
-	int i;
 	for (i = 0; i < SYSCALLS_NUM; i++) {
 		cos_syscalls[i] = 0;
 	}
-
-	libc_syscall_override((cos_syscall_t)cos_write, __NR_write);
-	libc_syscall_override((cos_syscall_t)cos_writev, __NR_writev);
-	libc_syscall_override((cos_syscall_t)cos_ioctl, __NR_ioctl);
-	libc_syscall_override((cos_syscall_t)cos_brk, __NR_brk);
-	libc_syscall_override((cos_syscall_t)cos_mmap, __NR_mmap);
-	libc_syscall_override((cos_syscall_t)cos_mmap, __NR_mmap2);
-	libc_syscall_override((cos_syscall_t)cos_munmap, __NR_munmap);
-	libc_syscall_override((cos_syscall_t)cos_madvise, __NR_madvise);
-	libc_syscall_override((cos_syscall_t)cos_mremap, __NR_mremap);
-
-	libc_syscall_override((cos_syscall_t)cos_nanosleep, __NR_nanosleep);
-
-	libc_syscall_override((cos_syscall_t)cos_rt_sigprocmask, __NR_rt_sigprocmask);
-	libc_syscall_override((cos_syscall_t)cos_mprotect, __NR_mprotect);
-
-	libc_syscall_override((cos_syscall_t)cos_gettid, __NR_gettid);
-	libc_syscall_override((cos_syscall_t)cos_tkill, __NR_tkill);
-	libc_syscall_override((cos_syscall_t)cos_set_thread_area, __NR_set_thread_area);
-	libc_syscall_override((cos_syscall_t)cos_set_tid_address, __NR_set_tid_address);
-	libc_syscall_override((cos_syscall_t)cos_clone, __NR_clone);
-	libc_syscall_override((cos_syscall_t)cos_futex, __NR_futex);
 }
 
-long
-cos_syscall_handler(int syscall_num, long a, long b, long c, long d, long e, long f)
+/* override musl-libc's init_tls() */
+void __init_tls(size_t *auxv)
 {
-	assert(syscall_num <= SYSCALLS_NUM);
-	/* printc("Making syscall %d\n", syscall_num); */
-	if (!cos_syscalls[syscall_num]){
-		printc("WARNING: Component %ld calling unimplemented system call %d\n", cos_spd_id(), syscall_num);
-		assert(0);
-		return 0;
-	} else {
-		return cos_syscalls[syscall_num](a, b, c, d, e, f);
-	}
 }
 
 void
 libc_initialization_handler()
 {
-	printc("libc_init\n");
 	libc_init();
 }
diff --git a/src/components/lib/posix/posix.h b/src/components/lib/posix/posix.h
new file mode 100644
index 0000000000..81024a8715
--- /dev/null
+++ b/src/components/lib/posix/posix.h
@@ -0,0 +1,5 @@
+#define SYSCALLS_NUM 500
+
+typedef long (*cos_syscall_t)(long a, long b, long c, long d, long e, long f);
+
+void libc_syscall_override(cos_syscall_t fn, int syscall_num);
diff --git a/src/components/lib/posix_cap/Makefile b/src/components/lib/posix_cap/Makefile
new file mode 100644
index 0000000000..63be3c12b0
--- /dev/null
+++ b/src/components/lib/posix_cap/Makefile
@@ -0,0 +1,63 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lposix) into dependents. This list should be
+# "posix" for output files such as libposix.a.
+LIBRARY_OUTPUT =
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# posix) which will generate posix.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT = posix_cap
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = memmgr sched
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component kernel posix
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+# There are two different *types* of Makefiles for libraries.
+# 1. Those that are Composite-specific, and simply need an easy way to
+#    compile and itegrate their code.
+# 2. Those that aim to integrate external libraries into
+#    Composite. These focus on "driving" the build process of the
+#    external library, then pulling out the resulting files and
+#    directories. These need to be flexible as all libraries are
+#    different.
+
+# Type 1, Composite library: This is the default Makefile for
+# libraries written for composite. Get rid of this if you require a
+# custom Makefile (e.g. if you use an existing
+# (non-composite-specific) library. An example of this is `kernel`.
+include Makefile.lib
+
+## Type 2, external library: If you need to specialize the Makefile
+## for an external library, you can add the external code as a
+## subdirectory, and drive its compilation, and integration with the
+## system using a specialized Makefile. The Makefile must generate
+## lib$(LIBRARY_OUTPUT).a and $(OBJECT_OUTPUT).lib.o, and have all of
+## the necessary include paths in $(INCLUDE_PATHS).
+##
+## To access the Composite Makefile definitions, use the following. An
+## example of a Makefile written in this way is in `ps/`.
+#
+# include Makefile.src Makefile.comp Makefile.dependencies
+# .PHONY: all clean init distclean
+## Fill these out with your implementation
+# all:
+# clean:
+#
+## Default rules:
+# init: clean all
+# distclean: clean
diff --git a/src/components/lib/posix_cap/posix_cap.c b/src/components/lib/posix_cap/posix_cap.c
new file mode 100644
index 0000000000..fc925c22b8
--- /dev/null
+++ b/src/components/lib/posix_cap/posix_cap.c
@@ -0,0 +1,158 @@
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syscall.h>
+#include <time.h>
+
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+
+#include <cos_component.h>
+#include <cos_defkernel_api.h>
+#include <llprint.h>
+#include <posix.h>
+#include <ps_list.h>
+#include <memmgr.h>
+
+static struct ps_lock stdout_lock;
+
+ssize_t
+write_bytes_to_stdout(const char *buf, size_t count)
+{
+	size_t i;
+	for(i = 0; i < count; i++) printc("%c", buf[i]);
+	return count;
+}
+
+ssize_t
+cos_write(int fd, const void *buf, size_t count)
+{
+	/* You shouldn't write to stdin anyway, so don't bother special casing it */
+	if (fd == 1 || fd == 2) {
+		ps_lock_take(&stdout_lock);
+		write_bytes_to_stdout((const char *) buf, count);
+		ps_lock_release(&stdout_lock);
+		return count;
+	} else {
+		printc("fd: %d not supported!\n", fd);
+		assert(0);
+	}
+}
+
+ssize_t
+cos_writev(int fd, const struct iovec *iov, int iovcnt)
+{
+	if (fd == 1 || fd == 2) {
+		ps_lock_take(&stdout_lock);
+		int i;
+		ssize_t ret = 0;
+		for(i=0; i<iovcnt; i++) {
+			ret += write_bytes_to_stdout((const void *)iov[i].iov_base, iov[i].iov_len);
+		}
+		ps_lock_release(&stdout_lock);
+		return ret;
+	} else {
+		printc("fd: %d not supported!\n", fd);
+		assert(0);
+	}
+}
+
+long
+cos_ioctl(int fd, int request, void *data)
+{
+	/* musl libc does some ioctls to stdout, so just allow these to silently go through */
+	if (fd == 1 || fd == 2) return 0;
+
+	printc("ioctl on fd(%d) not implemented\n", fd);
+	assert(0);
+	return 0;
+}
+
+ssize_t
+cos_brk(void *addr)
+{
+	printc("brk not implemented\n");
+	/* Unsure if the below comment is accurate. We return 0, so doesn't brk "succeed"? */
+	/* musl libc tries to use brk to expand heap in malloc. But if brk fails, it
+	   turns to mmap. So this fake brk always fails, force musl libc to use mmap */
+	return 0;
+}
+
+void *
+cos_mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+{
+	void *ret=0;
+
+	if (addr != NULL) {
+		printc("parameter void *addr is not supported!\n");
+		errno = ENOTSUP;
+		return MAP_FAILED;
+	}
+	if (fd != -1) {
+		printc("file mapping is not supported!\n");
+		errno = ENOTSUP;
+		return MAP_FAILED;
+	}
+
+	addr = (void *)memmgr_heap_page_allocn((length / PAGE_SIZE));
+	if (!addr){
+		ret = (void *) -1;
+	} else {
+		ret = addr;
+	}
+
+	if (ret == (void *)-1) {  /* return value comes from man page */
+		printc("mmap() failed!\n");
+		/* This is a best guess about what went wrong */
+		errno = ENOMEM;
+	}
+	return ret;
+}
+
+int
+cos_munmap(void *start, size_t length)
+{
+	printc("munmap not implemented\n");
+	errno = ENOSYS;
+	return -1;
+}
+
+int
+cos_madvise(void *start, size_t length, int advice)
+{
+	/* We don't do anything with the advice from madvise, but that isn't really a problem */
+	return 0;
+}
+
+void *
+cos_mremap(void *old_address, size_t old_size, size_t new_size, int flags)
+{
+	printc("mremap not implemented\n");
+	errno = ENOSYS;
+	return (void*) -1;
+}
+
+int
+cos_mprotect(void *addr, size_t len, int prot)
+{
+	/* Musl uses this at thread create time */
+	printc("mprotect not implemented\n");
+	return 0;
+}
+
+void
+libc_posixcap_initialization_handler()
+{
+	ps_lock_init(&stdout_lock);
+	libc_syscall_override((cos_syscall_t)(void*)cos_write, __NR_write);
+	libc_syscall_override((cos_syscall_t)(void*)cos_writev, __NR_writev);
+	libc_syscall_override((cos_syscall_t)(void*)cos_ioctl, __NR_ioctl);
+	libc_syscall_override((cos_syscall_t)(void*)cos_brk, __NR_brk);
+	libc_syscall_override((cos_syscall_t)(void*)cos_munmap, __NR_munmap);
+	libc_syscall_override((cos_syscall_t)(void*)cos_madvise, __NR_madvise);
+	libc_syscall_override((cos_syscall_t)(void*)cos_mremap, __NR_mremap);
+	libc_syscall_override((cos_syscall_t)(void*)cos_mprotect, __NR_mprotect);
+	libc_syscall_override((cos_syscall_t)(void*)cos_mmap, __NR_mmap);
+}
diff --git a/src/components/lib/posix_legacy/Makefile b/src/components/lib/posix_legacy/Makefile
new file mode 100644
index 0000000000..be9ac97217
--- /dev/null
+++ b/src/components/lib/posix_legacy/Makefile
@@ -0,0 +1,63 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lposix) into dependents. This list should be
+# "posix" for output files such as libposix.a.
+LIBRARY_OUTPUT =
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# posix) which will generate posix.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT = posix_legacy
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = memmgr sched
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component kernel posix
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+# There are two different *types* of Makefiles for libraries.
+# 1. Those that are Composite-specific, and simply need an easy way to
+#    compile and itegrate their code.
+# 2. Those that aim to integrate external libraries into
+#    Composite. These focus on "driving" the build process of the
+#    external library, then pulling out the resulting files and
+#    directories. These need to be flexible as all libraries are
+#    different.
+
+# Type 1, Composite library: This is the default Makefile for
+# libraries written for composite. Get rid of this if you require a
+# custom Makefile (e.g. if you use an existing
+# (non-composite-specific) library. An example of this is `kernel`.
+include Makefile.lib
+
+## Type 2, external library: If you need to specialize the Makefile
+## for an external library, you can add the external code as a
+## subdirectory, and drive its compilation, and integration with the
+## system using a specialized Makefile. The Makefile must generate
+## lib$(LIBRARY_OUTPUT).a and $(OBJECT_OUTPUT).lib.o, and have all of
+## the necessary include paths in $(INCLUDE_PATHS).
+##
+## To access the Composite Makefile definitions, use the following. An
+## example of a Makefile written in this way is in `ps/`.
+#
+# include Makefile.src Makefile.comp Makefile.dependencies
+# .PHONY: all clean init distclean
+## Fill these out with your implementation
+# all:
+# clean:
+#
+## Default rules:
+# init: clean all
+# distclean: clean
diff --git a/src/components/lib/posix_legacy/posix_legacy.c b/src/components/lib/posix_legacy/posix_legacy.c
new file mode 100644
index 0000000000..de9f1811dd
--- /dev/null
+++ b/src/components/lib/posix_legacy/posix_legacy.c
@@ -0,0 +1,521 @@
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syscall.h>
+#include <time.h>
+
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+
+#include <cos_component.h>
+#include <cos_defkernel_api.h>
+#include <llprint.h>
+#include <sl.h>
+#include <sl_lock.h>
+#include <sl_thd.h>
+
+volatile int* null_ptr = NULL;
+#define ABORT() do {int i = *null_ptr;} while(0)
+
+#define SYSCALLS_NUM 500
+
+typedef long (*cos_syscall_t)(long a, long b, long c, long d, long e, long f);
+cos_syscall_t cos_syscalls[SYSCALLS_NUM];
+
+static void
+libc_syscall_override(cos_syscall_t fn, int syscall_num)
+{
+	printc("Overriding syscall %d\n", syscall_num);
+	cos_syscalls[syscall_num] = fn;
+}
+
+struct sl_lock stdout_lock = SL_LOCK_STATIC_INIT();
+
+ssize_t
+write_bytes_to_stdout(const char *buf, size_t count)
+{
+	size_t i;
+	for(i = 0; i < count; i++) printc("%c", buf[i]);
+	return count;
+}
+
+ssize_t
+cos_write(int fd, const void *buf, size_t count)
+{
+	/* You shouldn't write to stdin anyway, so don't bother special casing it */
+	if (fd == 1 || fd == 2) {
+		sl_lock_take(&stdout_lock);
+		write_bytes_to_stdout((const char *) buf, count);
+		sl_lock_release(&stdout_lock);
+		return count;
+	} else {
+		printc("fd: %d not supported!\n", fd);
+		assert(0);
+	}
+}
+
+ssize_t
+cos_writev(int fd, const struct iovec *iov, int iovcnt)
+{
+	if (fd == 1 || fd == 2) {
+		sl_lock_take(&stdout_lock);
+		int i;
+		ssize_t ret = 0;
+		for(i=0; i<iovcnt; i++) {
+			ret += write_bytes_to_stdout((const void *)iov[i].iov_base, iov[i].iov_len);
+		}
+		sl_lock_release(&stdout_lock);
+		return ret;
+	} else {
+		printc("fd: %d not supported!\n", fd);
+		assert(0);
+	}
+}
+
+long
+cos_ioctl(int fd, int request, void *data)
+{
+	/* musl libc does some ioctls to stdout, so just allow these to silently go through */
+	if (fd == 1 || fd == 2) return 0;
+
+	printc("ioctl on fd(%d) not implemented\n", fd);
+	assert(0);
+	return 0;
+}
+
+ssize_t
+cos_brk(void *addr)
+{
+	printc("brk not implemented\n");
+	/* Unsure if the below comment is accurate. We return 0, so doesn't brk "succeed"? */
+	/* musl libc tries to use brk to expand heap in malloc. But if brk fails, it
+	   turns to mmap. So this fake brk always fails, force musl libc to use mmap */
+	return 0;
+}
+
+void *
+cos_mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+{
+	void *ret=0;
+
+	if (addr != NULL) {
+		printc("parameter void *addr is not supported!\n");
+		errno = ENOTSUP;
+		return MAP_FAILED;
+	}
+	if (fd != -1) {
+		printc("file mapping is not supported!\n");
+		errno = ENOTSUP;
+		return MAP_FAILED;
+	}
+
+	addr = (void *)cos_page_bump_allocn(&cos_defcompinfo_curr_get()->ci, length);
+	if (!addr){
+		ret = (void *) -1;
+	} else {
+		ret = addr;
+	}
+
+	if (ret == (void *)-1) {  /* return value comes from man page */
+		printc("mmap() failed!\n");
+		/* This is a best guess about what went wrong */
+		errno = ENOMEM;
+	}
+	return ret;
+}
+
+int
+cos_munmap(void *start, size_t length)
+{
+	printc("munmap not implemented\n");
+	errno = ENOSYS;
+	return -1;
+}
+
+int
+cos_madvise(void *start, size_t length, int advice)
+{
+	/* We don't do anything with the advice from madvise, but that isn't really a problem */
+	return 0;
+}
+
+void *
+cos_mremap(void *old_address, size_t old_size, size_t new_size, int flags)
+{
+	printc("mremap not implemented\n");
+	errno = ENOSYS;
+	return (void*) -1;
+}
+
+int
+cos_rt_sigprocmask(int how, void* set, void* oldset, size_t sigsetsize)
+{
+	/* Musl uses this at thread create time */
+	printc("rt_sigprocmask not implemented\n");
+	errno = ENOSYS;
+	return -1;
+}
+
+int
+cos_mprotect(void *addr, size_t len, int prot)
+{
+	/* Musl uses this at thread create time */
+	printc("mprotect not implemented\n");
+	return 0;
+}
+
+/* Thread related functions */
+pid_t
+cos_gettid(void)
+{
+	return (pid_t) sl_thdid();
+}
+
+int
+cos_tkill(int tid, int sig)
+{
+	if (sig == SIGABRT || sig == SIGKILL) {
+		printc("Abort requested, complying...\n");
+		ABORT();
+	} else if (sig == SIGFPE) {
+		printc("Floating point error, aborting...\n");
+		ABORT();
+	} else if (sig == SIGILL) {
+		printc("Illegal instruction, aborting...\n");
+		ABORT();
+	} else if (sig == SIGINT) {
+		printc("Terminal interrupt, aborting?\n");
+		ABORT();
+	} else {
+		printc("Unknown signal %d\n", sig);
+		assert(0);
+	}
+
+	assert(0);
+	return 0;
+}
+
+static inline microsec_t
+time_to_microsec(const struct timespec *t)
+{
+	time_t seconds          = t->tv_sec;
+	long nano_seconds       = t->tv_nsec;
+	microsec_t microseconds = seconds * 1000000 + nano_seconds / 1000;
+
+	return microseconds;
+}
+
+long
+cos_nanosleep(const struct timespec *req, struct timespec *rem)
+{
+	time_t remaining_seconds;
+	long remaining_nano_seconds;
+	microsec_t remaining_microseconds;
+	cycles_t wakeup_deadline, wakeup_time;
+	int completed_successfully;
+
+	if (!req) {
+		errno = EFAULT;
+		return -1;
+	}
+
+	wakeup_deadline        = sl_now() + sl_usec2cyc(time_to_microsec(req));
+	completed_successfully = sl_thd_block_timeout(0, wakeup_deadline);
+	wakeup_time   = sl_now();
+
+	if (completed_successfully || wakeup_time > wakeup_deadline) {
+		return 0;
+	} else {
+		errno = EINTR;
+		if (rem) {
+			remaining_microseconds = sl_cyc2usec(wakeup_deadline - wakeup_time);
+			remaining_seconds      = remaining_microseconds / 1000000;
+			remaining_nano_seconds = (remaining_microseconds - remaining_seconds * 1000000) * 1000;
+			*rem = (struct timespec) {
+				.tv_sec = remaining_seconds,
+				.tv_nsec = remaining_nano_seconds
+			};
+		}
+		return -1;
+	}
+}
+
+
+long
+cos_set_tid_address(int *tidptr)
+{
+	/* Just do nothing for now and hope that works */
+	return 0;
+}
+
+/* struct user_desc {
+ *     int  		  entry_number; // Ignore
+ *     unsigned int  base_addr; // Pass to cos thread mod
+ *     unsigned int  limit; // Ignore
+ *     unsigned int  seg_32bit:1;
+ *     unsigned int  contents:2;
+ *     unsigned int  read_exec_only:1;
+ *     unsigned int  limit_in_pages:1;
+ *     unsigned int  seg_not_present:1;
+ *     unsigned int  useable:1;
+ * };
+ */
+
+void* backing_data[SL_MAX_NUM_THDS];
+
+static void
+setup_thread_area(struct sl_thd *thread, void* data)
+{
+	struct cos_compinfo *ci = cos_compinfo_get(cos_defcompinfo_curr_get());
+	thdid_t thdid = sl_thd_thdid(thread);
+
+	backing_data[thdid] = data;
+
+	cos_thd_mod(ci, sl_thd_thdcap(thread), &backing_data[thdid]);
+}
+
+int
+cos_set_thread_area(void* data)
+{
+	setup_thread_area(sl_thd_curr(), data);
+	return 0;
+}
+
+int
+cos_clone(int (*func)(void *), void *stack, int flags, void *arg, pid_t *ptid, void *tls, pid_t *ctid)
+{
+	if (!func) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	struct sl_thd * thd = sl_thd_alloc((cos_thd_fn_t)func, arg);
+	if (tls) {
+		setup_thread_area(thd, tls);
+	}
+	return sl_thd_thdid(thd);
+}
+
+#define FUTEX_WAIT		0
+#define FUTEX_WAKE		1
+#define FUTEX_FD		2
+#define FUTEX_REQUEUE		3
+#define FUTEX_CMP_REQUEUE	4
+#define FUTEX_WAKE_OP		5
+#define FUTEX_LOCK_PI		6
+#define FUTEX_UNLOCK_PI		7
+#define FUTEX_TRYLOCK_PI	8
+#define FUTEX_WAIT_BITSET	9
+
+#define FUTEX_PRIVATE 128
+
+#define FUTEX_CLOCK_REALTIME 256
+
+struct futex_data
+{
+	int *uaddr;
+	struct ps_list_head waiters;
+};
+
+struct futex_waiter
+{
+	thdid_t thdid;
+	struct ps_list list;
+};
+
+#define FUTEX_COUNT 20
+struct futex_data futexes[FUTEX_COUNT];
+
+struct futex_data *
+lookup_futex(int *uaddr)
+{
+	int last_free = -1;
+	int i;
+
+	for (i = 0; i < FUTEX_COUNT; i++) {
+		if (futexes[i].uaddr == uaddr) {
+			return &futexes[i];
+		} else if (futexes[i].uaddr == 0) {
+			last_free = i;
+		}
+	}
+	if (last_free >= 0) {
+		futexes[last_free] = (struct futex_data) {
+			.uaddr = uaddr
+		};
+		ps_list_head_init(&futexes[last_free].waiters);
+		return &futexes[last_free];
+	}
+	printc("Out of futex ids!");
+	assert(0);
+}
+
+/* TODO: Cleanup empty futexes */
+
+struct sl_lock futex_lock = SL_LOCK_STATIC_INIT();
+
+/*
+ * precondition: futex_lock is taken
+ */
+int
+cos_futex_wait(struct futex_data *futex, int *uaddr, int val, const struct timespec *timeout)
+{
+	cycles_t   deadline = 0;
+	microsec_t wait_time;
+	struct futex_waiter waiter = (struct futex_waiter) {
+		.thdid = sl_thdid()
+	};
+
+	if (*uaddr != val) return EAGAIN;
+
+	ps_list_init_d(&waiter);
+	ps_list_head_append_d(&futex->waiters, &waiter);
+
+	if (timeout != NULL) {
+		wait_time = time_to_microsec(timeout);
+		deadline = sl_now() + sl_usec2cyc(wait_time);
+	}
+
+	do {
+		/* No race here, we'll enter the awoken state if things go wrong */
+		sl_lock_release(&futex_lock);
+		if (timeout == NULL) {
+			sl_thd_block(0);
+		} else {
+			sl_thd_block_timeout(0, deadline);
+		}
+		sl_lock_take(&futex_lock);
+	/* We continue while the waiter is in the list, and the deadline has not elapsed */
+	} while(!ps_list_singleton_d(&waiter) && (timeout == NULL || sl_now() < deadline));
+
+	/* If our waiter is still in the list (meaning we quit because the deadline elapsed),
+	 * then we remove it from the list. */
+	if (!ps_list_singleton_d(&waiter)) {
+		ps_list_rem_d(&waiter);
+	}
+	/* We exit the function with futex_lock taken */
+	return 0;
+}
+
+int cos_futex_wake(struct futex_data *futex, int wakeup_count)
+{
+	struct futex_waiter *waiter, *tmp;
+	int awoken = 0;
+
+	ps_list_foreach_del_d(&futex->waiters, waiter, tmp) {
+		if (awoken >= wakeup_count) {
+			return awoken;
+		}
+		ps_list_rem_d(waiter);
+		sl_thd_wakeup(waiter->thdid);
+		awoken += 1;
+	}
+	return awoken;
+}
+
+int
+cos_futex(int *uaddr, int op, int val,
+          const struct timespec *timeout, /* or: uint32_t val2 */
+		  int *uaddr2, int val3)
+{
+	int result = 0;
+	struct futex_data *futex;
+
+	sl_lock_take(&futex_lock);
+
+	/* TODO: Consider whether these options have sensible composite interpretations */
+	op &= ~FUTEX_PRIVATE;
+	assert(!(op & FUTEX_CLOCK_REALTIME));
+
+	futex = lookup_futex(uaddr);
+	switch (op) {
+		case FUTEX_WAIT:
+			result = cos_futex_wait(futex, uaddr, val, timeout);
+			if (result != 0) {
+				errno = result;
+				result = -1;
+			}
+			break;
+		case FUTEX_WAKE:
+			result = cos_futex_wake(futex, val);
+			break;
+		default:
+			printc("Unsupported futex operation");
+			assert(0);
+	}
+
+	sl_lock_release(&futex_lock);
+
+	return result;
+}
+
+
+void
+pre_syscall_default_setup()
+{
+	printc("pre_syscall_default_setup\n");
+
+	struct cos_defcompinfo *defci = cos_defcompinfo_curr_get();
+	struct cos_compinfo    *ci    = cos_compinfo_get(defci);
+
+	cos_defcompinfo_init();
+	cos_meminfo_init(&(ci->mi), BOOT_MEM_KM_BASE, COS_MEM_KERN_PA_SZ, BOOT_CAPTBL_SELF_UNTYPED_PT);
+	sl_init(SL_MIN_PERIOD_US);
+}
+
+void
+syscall_emulation_setup(void)
+{
+	printc("syscall_emulation_setup\n");
+
+	int i;
+	for (i = 0; i < SYSCALLS_NUM; i++) {
+		cos_syscalls[i] = 0;
+	}
+
+	libc_syscall_override((cos_syscall_t)(void*)cos_write, __NR_write);
+	libc_syscall_override((cos_syscall_t)(void*)cos_writev, __NR_writev);
+	libc_syscall_override((cos_syscall_t)(void*)cos_ioctl, __NR_ioctl);
+	libc_syscall_override((cos_syscall_t)(void*)cos_brk, __NR_brk);
+	libc_syscall_override((cos_syscall_t)(void*)cos_munmap, __NR_munmap);
+	libc_syscall_override((cos_syscall_t)(void*)cos_madvise, __NR_madvise);
+	libc_syscall_override((cos_syscall_t)(void*)cos_mremap, __NR_mremap);
+
+	libc_syscall_override((cos_syscall_t)(void*)cos_nanosleep, __NR_nanosleep);
+
+	libc_syscall_override((cos_syscall_t)(void*)cos_rt_sigprocmask, __NR_rt_sigprocmask);
+	libc_syscall_override((cos_syscall_t)(void*)cos_mprotect, __NR_mprotect);
+
+	libc_syscall_override((cos_syscall_t)(void*)cos_gettid, __NR_gettid);
+	libc_syscall_override((cos_syscall_t)cos_tkill, __NR_tkill);
+#if defined(__x86__)
+	libc_syscall_override((cos_syscall_t)(void*)cos_mmap, __NR_mmap);
+	libc_syscall_override((cos_syscall_t)(void*)cos_set_thread_area, __NR_set_thread_area);
+#endif
+	libc_syscall_override((cos_syscall_t)(void*)cos_set_tid_address, __NR_set_tid_address);
+	libc_syscall_override((cos_syscall_t)(void*)cos_clone, __NR_clone);
+	libc_syscall_override((cos_syscall_t)(void*)cos_futex, __NR_futex);
+}
+
+long
+cos_syscall_handler(int syscall_num, long a, long b, long c, long d, long e, long f)
+{
+	assert(syscall_num <= SYSCALLS_NUM);
+	/* printc("Making syscall %d\n", syscall_num); */
+	if (!cos_syscalls[syscall_num]){
+		printc("WARNING: Component %ld calling unimplemented system call %d\n", cos_spd_id(), syscall_num);
+		assert(0);
+		return 0;
+	} else {
+		return cos_syscalls[syscall_num](a, b, c, d, e, f);
+	}
+}
+
+void
+libc_initialization_handler()
+{
+	printc("libc_init\n");
+	libc_init();
+}
diff --git a/src/components/lib/posix_sched/Makefile b/src/components/lib/posix_sched/Makefile
new file mode 100644
index 0000000000..849fc0df88
--- /dev/null
+++ b/src/components/lib/posix_sched/Makefile
@@ -0,0 +1,63 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lposix) into dependents. This list should be
+# "posix" for output files such as libposix.a.
+LIBRARY_OUTPUT =
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# posix) which will generate posix.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT = posix_sched
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = memmgr sched
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component kernel posix
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+# There are two different *types* of Makefiles for libraries.
+# 1. Those that are Composite-specific, and simply need an easy way to
+#    compile and itegrate their code.
+# 2. Those that aim to integrate external libraries into
+#    Composite. These focus on "driving" the build process of the
+#    external library, then pulling out the resulting files and
+#    directories. These need to be flexible as all libraries are
+#    different.
+
+# Type 1, Composite library: This is the default Makefile for
+# libraries written for composite. Get rid of this if you require a
+# custom Makefile (e.g. if you use an existing
+# (non-composite-specific) library. An example of this is `kernel`.
+include Makefile.lib
+
+## Type 2, external library: If you need to specialize the Makefile
+## for an external library, you can add the external code as a
+## subdirectory, and drive its compilation, and integration with the
+## system using a specialized Makefile. The Makefile must generate
+## lib$(LIBRARY_OUTPUT).a and $(OBJECT_OUTPUT).lib.o, and have all of
+## the necessary include paths in $(INCLUDE_PATHS).
+##
+## To access the Composite Makefile definitions, use the following. An
+## example of a Makefile written in this way is in `ps/`.
+#
+# include Makefile.src Makefile.comp Makefile.dependencies
+# .PHONY: all clean init distclean
+## Fill these out with your implementation
+# all:
+# clean:
+#
+## Default rules:
+# init: clean all
+# distclean: clean
diff --git a/src/components/lib/posix_sched/posix_sched.c b/src/components/lib/posix_sched/posix_sched.c
new file mode 100644
index 0000000000..5c0bf79302
--- /dev/null
+++ b/src/components/lib/posix_sched/posix_sched.c
@@ -0,0 +1,231 @@
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syscall.h>
+#include <time.h>
+
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+
+#include <cos_component.h>
+#include <cos_defkernel_api.h>
+#include <llprint.h>
+#include <posix.h>
+#include <ps_list.h>
+#include <sched.h>
+
+static volatile int* null_ptr = NULL;
+#define ABORT() do {int i = *null_ptr;} while(0)
+
+int
+cos_rt_sigprocmask(int how, void* set, void* oldset, size_t sigsetsize)
+{
+	/* Musl uses this at thread create time */
+	printc("rt_sigprocmask not implemented\n");
+	errno = ENOSYS;
+	return -1;
+}
+
+/* Thread related functions */
+pid_t
+cos_gettid(void)
+{
+	return (pid_t) cos_thdid();
+}
+
+int
+cos_tkill(int tid, int sig)
+{
+	if (sig == SIGABRT || sig == SIGKILL) {
+		printc("Abort requested, complying...\n");
+		ABORT();
+	} else if (sig == SIGFPE) {
+		printc("Floating point error, aborting...\n");
+		ABORT();
+	} else if (sig == SIGILL) {
+		printc("Illegal instruction, aborting...\n");
+		ABORT();
+	} else if (sig == SIGINT) {
+		printc("Terminal interrupt, aborting?\n");
+		ABORT();
+	} else {
+		printc("Unknown signal %d\n", sig);
+		assert(0);
+	}
+
+	assert(0);
+	return 0;
+}
+
+static inline microsec_t
+time_to_microsec(const struct timespec *t)
+{
+	time_t seconds          = t->tv_sec;
+	long nano_seconds       = t->tv_nsec;
+	microsec_t microseconds = seconds * 1000000 + nano_seconds / 1000;
+
+	return microseconds;
+}
+
+long
+cos_nanosleep(const struct timespec *req, struct timespec *rem)
+{
+	time_t remaining_seconds;
+	long remaining_nano_seconds;
+	microsec_t remaining_microseconds;
+	cycles_t wakeup_deadline, wakeup_time;
+	int completed_successfully;
+
+	if (!req) {
+		errno = EFAULT;
+		return -1;
+	}
+
+	/* FIXME: call scheduler component to finish this sleep */
+	return 0;
+}
+
+
+long
+cos_set_tid_address(int *tidptr)
+{
+	/* Just do nothing for now and hope that works */
+	return 0;
+}
+
+/* struct user_desc {
+ *     int  		  entry_number; // Ignore
+ *     unsigned int  base_addr; // Pass to cos thread mod
+ *     unsigned int  limit; // Ignore
+ *     unsigned int  seg_32bit:1;
+ *     unsigned int  contents:2;
+ *     unsigned int  read_exec_only:1;
+ *     unsigned int  limit_in_pages:1;
+ *     unsigned int  seg_not_present:1;
+ *     unsigned int  useable:1;
+ * };
+ */
+
+void* backing_data[MAX_NUM_THREADS];
+
+static void
+setup_thread_area(void *thread, void* data)
+{
+	return ;
+}
+
+int
+cos_set_thread_area(void* data)
+{
+	setup_thread_area(NULL, data);
+	return 0;
+}
+
+int
+cos_clone(int (*func)(void *), void *stack, int flags, void *arg, pid_t *ptid, void *tls, pid_t *ctid)
+{
+	if (!func) {
+		errno = EINVAL;
+		return -1;
+	}
+	/* FIXME: call scheduler component to finish this */
+	//struct sl_thd * thd = sl_thd_alloc((cos_thd_fn_t)(void*)func, arg);
+	if (tls) {
+		setup_thread_area(NULL, tls);
+	}
+	return 0;
+}
+
+#define FUTEX_WAIT		0
+#define FUTEX_WAKE		1
+#define FUTEX_FD		2
+#define FUTEX_REQUEUE		3
+#define FUTEX_CMP_REQUEUE	4
+#define FUTEX_WAKE_OP		5
+#define FUTEX_LOCK_PI		6
+#define FUTEX_UNLOCK_PI		7
+#define FUTEX_TRYLOCK_PI	8
+#define FUTEX_WAIT_BITSET	9
+
+#define FUTEX_PRIVATE 128
+
+#define FUTEX_CLOCK_REALTIME 256
+
+struct futex_data
+{
+	int *uaddr;
+	struct ps_list_head waiters;
+};
+
+struct futex_waiter
+{
+	thdid_t thdid;
+	struct ps_list list;
+};
+
+#define FUTEX_COUNT 20
+struct futex_data futexes[FUTEX_COUNT];
+
+struct futex_data *
+lookup_futex(int *uaddr)
+{
+	int last_free = -1;
+	int i;
+
+	for (i = 0; i < FUTEX_COUNT; i++) {
+		if (futexes[i].uaddr == uaddr) {
+			return &futexes[i];
+		} else if (futexes[i].uaddr == 0) {
+			last_free = i;
+		}
+	}
+	if (last_free >= 0) {
+		futexes[last_free] = (struct futex_data) {
+			.uaddr = uaddr
+		};
+		ps_list_head_init(&futexes[last_free].waiters);
+		return &futexes[last_free];
+	}
+	printc("Out of futex ids!");
+	assert(0);
+}
+
+/* TODO: Cleanup empty futexes */
+static struct ps_lock futex_lock;
+
+int
+cos_futex(int *uaddr, int op, int val,
+          const struct timespec *timeout, /* or: uint32_t val2 */
+		  int *uaddr2, int val3)
+{
+	printc("futex not implemented\n");
+	errno = ENOSYS;
+	return -1;
+}
+
+/* TODO: init tls when creating components */
+char tls_space[8192] = {0};
+void tls_init()
+{
+	vaddr_t* tls_addr	= (vaddr_t *)&tls_space;
+	*tls_addr 		= (vaddr_t)&tls_space;
+
+	sched_set_tls((void*)tls_addr);
+}
+
+void
+libc_posixsched_initialization_handler()
+{
+	ps_lock_init(&futex_lock);
+	libc_syscall_override((cos_syscall_t)(void*)cos_nanosleep, __NR_nanosleep);
+	libc_syscall_override((cos_syscall_t)(void*)cos_rt_sigprocmask, __NR_rt_sigprocmask);
+	libc_syscall_override((cos_syscall_t)(void*)cos_gettid, __NR_gettid);
+	libc_syscall_override((cos_syscall_t)(void*)cos_tkill, __NR_tkill);
+	libc_syscall_override((cos_syscall_t)(void*)cos_set_thread_area, __NR_set_thread_area);
+	libc_syscall_override((cos_syscall_t)(void*)cos_set_tid_address, __NR_set_tid_address);
+	libc_syscall_override((cos_syscall_t)(void*)cos_clone, __NR_clone);
+	libc_syscall_override((cos_syscall_t)(void*)cos_futex, __NR_futex);
+	tls_init();
+}
diff --git a/src/components/lib/ps/Makefile b/src/components/lib/ps/Makefile
index 30adc03e90..2c5e3aefac 100644
--- a/src/components/lib/ps/Makefile
+++ b/src/components/lib/ps/Makefile
@@ -54,29 +54,39 @@ LIBRARY_DEPENDENCIES = component
 
 include Makefile.src Makefile.comp Makefile.dependencies
 
-.PHONY: all clean init distclean config clean_lib
+.PHONY: all clean init distclean config clean_lib armv7a_config i386_config
 CINC_ENV = $(CINC) $(DEPENDENCY_INCPATH)
-CFLAGS   = $(CINC_ENV)
+
+CFLAGS   = $(CINC_ENV) -Wno-address-of-packed-member
 export CINC_ENV
 export CFLAGS
-# Note that these are used during the ps compilation processes
 
 all: config
 	$(info Building ps library...)
-	make -s -C ps all
-	@cp ps/libps.a .
+	make -C ps all
+	cp ps/libps.a .
 
 clean_lib:
 	@rm -f libps.a
 	make -C ps clean
 
 # need to make sure the ps_plat.h is always available
-clean: clean_lib config
+clean: config clean_lib
+
+armv7a_config:
+	$(info Configuring the ps library)
+	@cd ps; ./configure cos armv7a general; cd ..
 
-config:
+i386_config:
 	$(info Configuring the ps library)
 	@cd ps; ./configure cos x86 general; cd ..
-	make -s -C ps config
 
-init: clean config
+x86_64_config:
+	$(info Configuring the ps library)
+	cd ps; ./configure cos x86_64 general; cd ..
+
+config: $(PLATFORM)_config
+	make -C ps config
+
+init: clean all
 distclean: clean
diff --git a/src/components/lib/ps/ps b/src/components/lib/ps/ps
index 71a9f77d02..5ac8fe3c87 160000
--- a/src/components/lib/ps/ps
+++ b/src/components/lib/ps/ps
@@ -1 +1 @@
-Subproject commit 71a9f77d02eb338906e1ca94377a49174457214f
+Subproject commit 5ac8fe3c8728266786dbbd2d86b639293a92c713
diff --git a/src/components/lib/shm_bm/Makefile b/src/components/lib/shm_bm/Makefile
new file mode 100644
index 0000000000..d99c814a79
--- /dev/null
+++ b/src/components/lib/shm_bm/Makefile
@@ -0,0 +1,63 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lshm_bm) into dependents. This list should be
+# "shm_bm" for output files such as libshm_bm.a.
+LIBRARY_OUTPUT = shm_bm
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# shm_bm) which will generate shm_bm.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT =
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = memmgr
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+# There are two different *types* of Makefiles for libraries.
+# 1. Those that are Composite-specific, and simply need an easy way to
+#    compile and itegrate their code.
+# 2. Those that aim to integrate external libraries into
+#    Composite. These focus on "driving" the build process of the
+#    external library, then pulling out the resulting files and
+#    directories. These need to be flexible as all libraries are
+#    different.
+
+# Type 1, Composite library: This is the default Makefile for
+# libraries written for composite. Get rid of this if you require a
+# custom Makefile (e.g. if you use an existing
+# (non-composite-specific) library. An example of this is `kernel`.
+include Makefile.lib
+
+## Type 2, external library: If you need to specialize the Makefile
+## for an external library, you can add the external code as a
+## subdirectory, and drive its compilation, and integration with the
+## system using a specialized Makefile. The Makefile must generate
+## lib$(LIBRARY_OUTPUT).a and $(OBJECT_OUTPUT).lib.o, and have all of
+## the necessary include paths in $(INCLUDE_PATHS).
+##
+## To access the Composite Makefile definitions, use the following. An
+## example of a Makefile written in this way is in `ps/`.
+#
+# include Makefile.src Makefile.comp Makefile.dependencies
+# .PHONY: all clean init distclean
+## Fill these out with your implementation
+# all:
+# clean:
+#
+## Default rules:
+# init: clean all
+# distclean: clean
diff --git a/src/components/lib/shm_bm/doc.md b/src/components/lib/shm_bm/doc.md
new file mode 100644
index 0000000000..530c7e78b7
--- /dev/null
+++ b/src/components/lib/shm_bm/doc.md
@@ -0,0 +1,219 @@
+## shm_bm
+
+### Description
+
+This library provides a slab-like memory allocator interface to allocate fixed-size blocks of memory from a region of memory shared between a number of components. This allows the passing of user-defined objects that do not fit into syncronous invocation calls between a client and server with minimal additional overhead.
+
+### Usage and Assumptions
+
+Most of the code for this library is generated at compile-time by the preprocessor for performance. The compiler can make significant optimizations to the allocation, freeing, and address space translation routines by knowing the size of the memory available and the size of individual allocations. As such, the code in `shm_bm.h` provides little documentation because all of the user-facing code is preprocessor generated.
+
+This section provides general usecase documentation. For full interface documentation, skip to the end of this document.
+
+The interface for a particular user-defined object must be created at compile-time. The following code creates an interface that can allocate the `testobj` struct. This declaration must be in a header file that is shared by all the components that wish to use the generated interface.
+
+```c
+/* test_interface.h */ 
+
+#include <shm_bm.h>
+
+struct testobj {
+    int  id;
+    char name[12];
+}
+
+SHM_BM_INTERFACE_CREATE(testobj, sizeof (struct obj_test), 2048);
+```
+
+The `SHM_BM_INTERFACE_CREATE` takes 3 parameters: the name of the interface, the size of the object that is being allocated, and the maximum number of objects that can be allocated at once (the size of the shared memory region). All functions in the interface end with the name of the interface:
+
+```c				
+shm_bm_size_testobj();
+shm_bm_create_testobj(void *mem, size_t memsz);
+shm_bm_alloc_testobj(shm_bm_t shm, shm_objid_t *objid);
+shm_bm_take_testobj(shm_bm_t shm, shm_objid_t objid);
+shm_bm_borrow_testobj(shm_bm_t shm, shm_objid_t objid);
+shm_bm_transfer_testobj(shm_bm_t shm, shm_objid_t objid);
+shm_bm_free_testobj(void *ptr);
+```
+
+These functions are created by the preprocessor. The following typedefs are used by all instances of the interface:
+
+- `shm_bm_t`: An opaque reference for a component to the shared memory region it creates. The client gets a unique `shm_bm_t` for every shared memory region it creates. 
+
+- `shm_bm_objid_t`: An identifer for an object in the shared memory region. When a component allocates an object from a shared memory region, it gets a `shm_objid_t` that can be used another component to reference that object.
+
+This library offloads the allocation of shared memory to other libraries and instead is responsible for managing allocated memory and facilitaing its use in IPC. As such, the user must allocate memory using another interface provided by the operating system. This example allocates shared memory using the `capmgr`. The library requires that 1) the allocated memory used by the library is aligned on a power-of-2 boundry specified by `SHM_BM_ALIGN` included in `shm_bm.h` (see below for the reason for this condition) and 2) The allocated memory is big enough for the library to manage. The interface provides a function to get the amount of memory required by the interface:
+
+```c
+/* component1.c */
+
+void    *mem
+size_t   memsz;
+cbuf_t   id;
+
+memsz = round_up_to_page(shm_bm_size_testobj());
+id = memmgr_shared_page_allocn_aligned(memsz/PAGE_SIZE, SHM_BM_ALIGN, (vaddr_t *)&mem);
+```
+
+The library can now manage this memory created by the operating system. A component can now use this shared memory region using the `testobj` interface using the following:
+
+```c
+/* component1.c */
+
+shm_bm_t shm;
+
+shm = shm_bm_create_testobj(mem, shmsz);
+if (!shm) {
+    printc("FAILURE: could not create shm from allocated memory\n");
+    return;
+}
+shm_bm_init_testobj(shm);
+```
+
+Note that `shm_bm_create_{name}` returns 0 if the library can not manage the memory. This occurs if the two conditions above for the allocated memory are not satified. `shm_bm_init_{name}` will zero-out the memory and initialize the object-tracking data structures that are internal to the library. Only one component who will use this memory should make this call, and it should only be done at initialization as it will deallocate and overwrite any objects that have been allocated from the memory and may be in use by other components.
+
+Other components can use this shared memory by making the same calls. Note that only the first component makes a call to `shm_bm_init_{name}.` Again, this example uses the functionality provided by the `capmgr` component to share memory between components, but this is not required.
+
+```c
+/* component2.c */
+
+unsigned long npages;
+void         *mem;
+shm_bm_t      shm;
+
+/* using id sent from component1 */
+npages = memmgr_shared_page_map_aligned(id, SHM_BM_ALIGN, (vaddr_t *)&mem);
+shm = shm_bm_create_testobj(mem, npages * PAGE_SIZE);
+```
+
+Both components using the shared memory can now use it to allocate objects and send them between eachother. A component can allocate a `testobj` from the shared memory region using the following:
+
+```c
+/* component1.c */
+
+shm_bm_objid_t  objid;
+struct testobj *obj;
+
+obj = shm_bm_alloc_testobj(shm, &objid);
+```
+
+Another component using the shared memory can use the object that this component allocated using both the and `objid`. The allocating component can send this id to the component using synchronous invocation, and the other component can get a pointer to it using the following:
+
+```c
+/* component2.c */
+
+struct testobj *obj;
+
+/* using the objid sent from the client */
+obj = shm_bm_take_testobj(shm, objid);
+
+```
+
+All objects allocted from the shared memory region have a reference count. `shm_bm_take_{name}` and `shm_bm_alloc_{name}` increment the reference count for the object they are allocating/taking a reference to. This means that all components that make these calls must free the object in order for the memory to be reclaimed. The following code frees an object in a shared memory region:
+
+```c
+shm_bm_free_testobj(obj);
+```
+
+Note that the free interface does not require knowledge of which shared memory region it came from; this is by design. All shared memory regions created by `shm_bm_create_{name}` are aligned in the components' virtual address space on a power-of-2 alignment. This alignment is specified in `shm_bm.h` by `SHM_BM_ALIGN`. As such, `shm_bm_free_{name}` can get a pointer to the header of the shared memory region by masking out the bits of the address less significant than the alignment. `shm_bm_free_{name}` decrements the reference count of the object, and afterwards if the reference count is zero, it marks the object as free for reallocation.
+
+There are instances where a component might want to avoid the overhead of updating the reference count and having to free an object that it is borrowing from another component. The following call will allow the server to skip this overhead, with the assumption that it is only borrowing the object for the lifetime of the syncronous call from the other component and the other component is still responsible for freeing:
+
+```c
+/* test_server.c */
+
+struct testobj *obj;
+
+/* using the reqtok and objid sent from the client */
+obj = (struct testobj *) shm_bm_borrow_testobj(reqtok, objid);
+
+```
+
+Similarily, if a component would like to completely transfer ownership of an object from itself to the another component, with the assumption that the former component will no longer use the object and the latter component will now be responsible for freeing, the component that wants to take ownership of the object can make the following call:
+
+```c
+/* test_server.c */
+
+struct testobj *obj;
+
+/* using the reqtok and objid sent from the client */
+obj = (struct testobj *) shm_bm_transfer_testobj(reqtok, objid);
+
+```
+
+### Interface Documentation
+
+```c
+SHM_BM_INTERFACE_CREATE(name, objsz, nobj)	
+```
+Preprocessor macro that creates a shm_bm interface for {name}. Must be called in a header file shared by the server and clients that will use the interface
+- (param) `name`: the name of the interface
+- (param) `objsz`: the size of objects allocated from the shared memory
+- (param) `nobj`: the maximum number of objects that can be allocated at once from the shared memory
+
+
+```c
+size_t shm_bm_size_{name}(void);
+```
+Computes the memory size required for the {name} interface. 
+- (returns) the size of memory required for the interface in bytes.
+
+
+```c
+shm_bm_t shm_bm_create_{name}(void *mem, size_t memsz);
+```
+Creates a `shm_bm_t` that allows the interface to manage the shared memory pointed to by `mem`. Returns 0 if the interface is unable to manage the inputted memory.
+- (param) `mem`: a pointer to the shared memory to manage.
+- (param) `memsz`: the size (in bytes) of the inputted memory.
+- (returns) a `shm_bm_t` value that the component can use to allocate from the shared memory
+
+
+```c
+void shm_bm_init_{name}(shm_bm_t shm);
+```
+Initializes the shared memory to be used to allocate objects. This includes zeroing out the data memory and initialzing the internal object-tracking data structures (bitmap and refcnts).
+- (param) `shm`: the shared memory region to initialize
+
+
+```c
+void *shm_bm_alloc_{name}(shm_bm_t shm, shm_bm_objid_t *objid);
+```
+Allocates an object from the shared memory region referenced by `shm`. 
+- (param) `shm`: the shared memory region to allocate from.
+- (returns) a pointer to the allocated object, `NULL` if no more objects to allocate
+- (returns) a `shm_bm_objid_t` value that identifies the allocated object
+
+
+```c
+void *shm_bm_take_{name}(shm_bm_t shm, shm_objid_t objid);
+```
+Gets a pointer to the object identified by `objid` in the shared memory region. The server must free the object before the pointer goes out of scope.
+- (param) `shm`:  the shared memory region the object was allocate d from
+- (param) `objid`: identifier for the object in the shared memory region to access
+- (returns) a pointer to the object in the component's VAS. Returns NULL if the the object identified by `objid` has not been allocated or if `objid` is invalid.
+
+
+```c
+void *shm_bm_borrow_{name}(shm_reqtok_t reqtok, shm_objid_t objid);
+```
+Same as `shm_bm_take_{name}` but does not increment the reference count of the object, meaning the calling component does not need to free the pointer. Used if the lifetime of the component's access to the object is limited and the component wants to avoid the overhead of having to free the pointer.
+- (param) `shm`:  the shared memory region the object was allocate d from
+- (param) `objid`: identifier for the object in the shared memory region to access
+- (returns) a pointer to the object in the component's VAS. Returns NULL if the the object identified by `objid` has not been allocated or if `objid` is invalid.
+
+
+```c
+void *shm_bm_srv_transfer_{name}(shm_reqtok_t reqtok, shm_objid_t objid);
+```
+Same as `shm_bm_take_{name}` but does not increment the reference count of the object, meaning the calling component is now the owner of the object. The assumes the component that send the `objid` reliquishes its access to the object and that the calling component is responsible for freeing the pointer.
+- (param) `shm`:  the shared memory region the object was allocate d from
+- (param) `objid`: identifier for the object in the shared memory region to access
+- (returns) a pointer to the object in the component's VAS. Returns NULL if the the object identified by `objid` has not been allocated or if `objid` is invalid.
+
+
+```c
+void shm_bm_free_{name}(void *ptr);
+```
+Decrements the reference count of the object referenced by `ptr`. If there are no more reference to the object, the memory is marked for reallocation.
+- (param) `ptr`: A pointer to the object to free.
\ No newline at end of file
diff --git a/src/components/lib/shm_bm/shm_bm.h b/src/components/lib/shm_bm/shm_bm.h
new file mode 100644
index 0000000000..17f2613bea
--- /dev/null
+++ b/src/components/lib/shm_bm/shm_bm.h
@@ -0,0 +1,226 @@
+#ifndef SHM_BM_H
+#define SHM_BM_H
+
+#include <cos_types.h>
+#include <memmgr.h>
+#include <limits.h>
+#include <consts.h>
+#include <string.h>
+
+/**
+ * This library provides a slab-like memory allocator interface to allocate fixed-size
+ * blocks of memory from a region of memory shared between a server component and a 
+ * number of client components.
+ * 
+ * Reference ./doc.md for interface documentation. Most of this interface is generated
+ * at compile-time for using the preprocessor. This is required for the performance of
+ * this library by giving more information to the compiler that allows it to significantly
+ * optimize most operations, particularily allocating, freeing, and translating between
+ * address spaces, by knowing at compile time the size of allocations and the size of the 
+ * shared memory region.
+ */
+
+#define SHM_BM_BITMAP_BLOCK (sizeof (word_t) * CHAR_BIT)
+#define SHM_BM_ALIGN (1 << 22)
+#define SHM_BM_BITS_TO_WORDS(bits) (round_up_to_pow2(bits, SHM_BM_BITMAP_BLOCK) / SHM_BM_BITMAP_BLOCK)
+
+typedef void *        shm_bm_t;
+typedef unsigned int  shm_bm_objid_t;
+
+#define SHM_BM_REFC(shm, nobj) ((unsigned char *)((unsigned char *)shm + SHM_BM_BITS_TO_WORDS(nobj) * sizeof (word_t)))
+#define SHM_BM_DATA(shm, nobj) ((unsigned char *)(SHM_BM_REFC(shm, nobj) + (unsigned int)nobj))
+
+static inline void
+__shm_bm_set_contig(word_t *bm, int offset)
+{
+	int i, n, ind;
+
+	ind = offset / SHM_BM_BITMAP_BLOCK;
+	offset %= SHM_BM_BITMAP_BLOCK;
+
+	for (i = 0; i < ind; i++) {
+		bm[i] = ~0x0ul;
+	}
+
+	n = SHM_BM_BITMAP_BLOCK - offset;
+	bm[ind] = ~((1ul << n) - 1); // set most sig n bits of bm[ind]
+}
+
+/* Find the first nonzero word in the inputted bitmap */
+static inline int
+__shm_bm_next_free_word(word_t *bm, unsigned long nwords)
+{
+	/* the index of the word in the bitmap where the first set bit is found */
+	int idx;
+
+	for (idx = 0; idx < (int) nwords; idx++) {
+		if (*bm != 0) return idx;
+		bm++;
+	}
+
+	/* all bits set to zero */
+	return -1;
+}
+
+static inline size_t
+__shm_bm_size(size_t objsz, unsigned int nobj)
+{
+	size_t bitmap_sz, refcnt_sz, data_sz;
+
+	bitmap_sz = SHM_BM_BITS_TO_WORDS(nobj) * sizeof(word_t);
+	refcnt_sz = nobj;
+	data_sz   = nobj * objsz;
+
+	return bitmap_sz + refcnt_sz + data_sz;
+}
+
+static inline shm_bm_t 
+__shm_bm_create(void *mem, size_t memsz, size_t objsz, unsigned int nobj)
+{
+	if ((word_t)mem % SHM_BM_ALIGN != 0) return 0;
+	if (memsz < __shm_bm_size(objsz, nobj)) return 0;
+	return (shm_bm_t)mem;
+}
+
+static inline void
+__shm_bm_init(shm_bm_t shm, size_t objsz, unsigned int nobj)
+{
+	memset(shm, 0, __shm_bm_size(objsz, nobj));
+	/* set nobj bits to free in the bitmap */
+	__shm_bm_set_contig((word_t *)shm, nobj);
+}
+
+static inline void * 
+__shm_bm_alloc(shm_bm_t shm, shm_bm_objid_t *objid, size_t objsz, unsigned int nobj)
+{
+	int     freebit, idx , offset, lz;
+	word_t  word; 
+	word_t *bm;
+
+	/* 
+	 * Find a free space; could be preempted. Find the next word in
+	 * the bitmap with a free bit and get its index in the bitmap, and 
+	 * the offset of the free bit in that word. Then try to atomically 
+	 * xchg the bitmap with the freebit set to 0
+	 */
+	bm = (word_t *)shm;
+	do {
+		idx = __shm_bm_next_free_word(bm, SHM_BM_BITS_TO_WORDS(nobj));
+		if (unlikely(idx == -1)) return NULL;
+		word   = bm[idx];
+		lz     = __builtin_clzl(word); 
+		offset = SHM_BM_BITMAP_BLOCK - lz - 1;
+	} while (!cos_cas(bm + idx, word, word & ~(1ul << offset)));
+
+	freebit = lz + (idx * SHM_BM_BITMAP_BLOCK);
+
+	cos_faab(SHM_BM_REFC(shm, nobj) + freebit, 1);
+
+	*objid = (shm_bm_objid_t)freebit;
+	return SHM_BM_DATA(shm, nobj) + (freebit * objsz);
+}
+
+static inline void *   
+__shm_bm_take(shm_bm_t shm, shm_bm_objid_t objid, size_t objsz, unsigned int nobj)
+{
+	if (unlikely(objid >= nobj)) return NULL;
+
+	/* obj has not been allocated */
+	if (unlikely(*(SHM_BM_REFC(shm, nobj) + objid) == 0)) return NULL;
+
+	cos_faab(SHM_BM_REFC(shm, nobj) + objid, 1);
+
+	return SHM_BM_DATA(shm, nobj) + (objid * objsz);
+}
+
+static inline void *   
+__shm_bm_take_norefcnt(shm_bm_t shm, shm_bm_objid_t objid, size_t objsz, unsigned int nobj)
+{
+	if (unlikely(objid >= nobj)) return NULL;
+
+	/* obj has not been allocated */
+	if (unlikely(*(SHM_BM_REFC(shm, nobj) + objid) == 0)) return NULL;
+
+	return SHM_BM_DATA(shm, nobj) + (objid * objsz);
+}
+
+static void
+__shm_bm_ptr_free(void *ptr, size_t objsz, unsigned int nobj)
+{
+	void        *shm;
+	unsigned int obj_idx, bm_idx, bm_offset;
+	word_t      *bm;
+
+	/* Mask out bits less significant than the alignment to get pointer to head of shm */
+	shm = (void *)((word_t)ptr & ~(SHM_BM_ALIGN - 1));
+	obj_idx = ((unsigned char *)ptr - SHM_BM_DATA(shm, nobj)) / objsz;
+	if (obj_idx >= nobj) return;
+	
+	if (cos_faab(SHM_BM_REFC(shm, nobj) + obj_idx, -1) > 1) { 
+		return;
+	}
+	/* droping the last reference, must set obj to free in bitmap */
+	bm         = (word_t *)shm;
+	bm_idx     = obj_idx / SHM_BM_BITMAP_BLOCK;
+	bm_offset  = SHM_BM_BITMAP_BLOCK - obj_idx % SHM_BM_BITMAP_BLOCK - 1;
+	bm[bm_idx] = bm[bm_idx] | (1ul << bm_offset);
+}
+
+
+#define __SHM_BM_DEFINE_FCNS(name)                                                          \
+    static inline size_t   shm_bm_size_##name(void);                                        \
+    static inline shm_bm_t shm_bm_create_##name(void *mem, size_t memsz);                   \
+    static inline void     shm_bm_init_##name(shm_bm_t shm);                                \
+    static inline void *   shm_bm_alloc_##name(shm_bm_t shm, shm_bm_objid_t *objid);        \
+    static inline void *   shm_bm_take_##name(shm_bm_t shm, shm_bm_objid_t objid);          \
+    static inline void *   shm_bm_borrow_##name(shm_bm_t shm, shm_bm_objid_t objid);        \
+    static inline void *   shm_bm_transfer_##name(shm_bm_t shm, shm_bm_objid_t objid);      \
+    static inline void     shm_bm_free_##name(void *ptr);                                                                                         
+
+#define __SHM_BM_CREATE_FCNS(name, objsz, nobjs)                                            \
+    static inline size_t                                                                    \
+    shm_bm_size_##name(void)                                                                \
+    {                                                                                       \
+        return __shm_bm_size(objsz, nobjs);                                                 \
+    }                                                                                       \
+    static inline shm_bm_t                                                                  \
+    shm_bm_create_##name(void *mem, size_t memsz)                                           \
+    {                                                                                       \
+        return __shm_bm_create(mem, memsz, objsz, nobjs);                                   \
+    }                                                                                       \
+    static inline void                                                                      \
+    shm_bm_init_##name(shm_bm_t shm)                                                        \
+    {                                                                                       \
+        __shm_bm_init(shm, objsz, nobjs);                                                   \
+    }                                                                                       \
+    static inline void *                                                                    \
+    shm_bm_alloc_##name(shm_bm_t shm, shm_bm_objid_t *objid)                                \
+    {                                                                                       \
+        return __shm_bm_alloc(shm, objid, objsz, nobjs);                                    \
+    }                                                                                       \
+    static inline void *                                                                    \
+    shm_bm_take_##name(shm_bm_t shm, shm_bm_objid_t objid)                                  \
+    {                                                                                       \
+        return __shm_bm_take(shm, objid, objsz, nobjs);                                     \
+    }                                                                                       \
+    static inline void *                                                                    \
+    shm_bm_borrow_##name(shm_bm_t shm, shm_bm_objid_t objid)                                \
+    {                                                                                       \
+        return __shm_bm_take_norefcnt(shm, objid, objsz, nobjs);                            \
+    }                                                                                       \
+    static inline void *                                                                    \
+    shm_bm_transfer_##name(shm_bm_t shm, shm_bm_objid_t objid)                              \
+    {                                                                                       \
+        return __shm_bm_take_norefcnt(shm, objid, objsz, nobjs);                            \
+    }                                                                                       \
+    static inline void                                                                      \
+    shm_bm_free_##name(void *ptr)                                                           \
+    {                                                                                       \
+        __shm_bm_ptr_free(ptr, objsz, nobjs);                                               \
+    }
+
+#define SHM_BM_INTERFACE_CREATE(name, objsz, nobjs)                                         \
+    __SHM_BM_DEFINE_FCNS(name)                                                              \
+    __SHM_BM_CREATE_FCNS(name, objsz, nobjs) 
+
+#endif
\ No newline at end of file
diff --git a/src/components/lib/sl/cos_time.h b/src/components/lib/sl/cos_time.h
index 6959c240ef..15ed393e1f 100644
--- a/src/components/lib/sl/cos_time.h
+++ b/src/components/lib/sl/cos_time.h
@@ -38,7 +38,10 @@ time_usec2cyc(microsec_t usec)
 static inline cycles_t
 time_now(void)
 {
-	return ps_tsc();
+	cycles_t now;
+	rdtscll(now);
+
+	return now;
 }
 
 static inline microsec_t
diff --git a/src/components/lib/sl/res_spec.h b/src/components/lib/sl/res_spec.h
index a521032536..d750b5bb68 100644
--- a/src/components/lib/sl/res_spec.h
+++ b/src/components/lib/sl/res_spec.h
@@ -37,9 +37,11 @@ typedef enum {
 	SCHEDP_WEIGHT,      /* proportion compared to other */
 	SCHEDP_IDLE,        /* idle thread: internal use only */
 	SCHEDP_INIT,        /* initialization threads: internal use only */
+	SCHEDP_INIT_PROTO,  /* HP scheduler threads performing the initialization protocol */
 	SCHEDP_IPI_HANDLER, /* IPI handler thread: internal use only */
 	SCHEDP_TIMER,       /* timer thread: internal use only */
 	SCHEDP_CORE_ID,     /* create the thread on the target core */
+	SCHEDP_EXEC,	    /* time to execute the thread! */
 	SCHEDP_MAX          /* maximum value */
 } sched_param_type_t;
 
diff --git a/src/components/lib/sl/sl.h b/src/components/lib/sl/sl.h
index 6244d8f2d4..9108a9467d 100644
--- a/src/components/lib/sl/sl.h
+++ b/src/components/lib/sl/sl.h
@@ -38,6 +38,7 @@
 #include <sl_thd.h>
 #include <sl_consts.h>
 #include <sl_xcpu.h>
+#include <cos_time.h>
 #include <heap.h>
 
 /* Critical section (cs) API to protect scheduler data-structures */
@@ -306,7 +307,7 @@ sl_usec2cyc(microsec_t usec)
 static inline cycles_t
 sl_now(void)
 {
-	return ps_tsc();
+	return time_now();
 }
 
 static inline microsec_t
diff --git a/src/components/lib/sl/sl_blkpt.c b/src/components/lib/sl/sl_blkpt.c
index 8a747171e7..51354e328f 100644
--- a/src/components/lib/sl/sl_blkpt.c
+++ b/src/components/lib/sl/sl_blkpt.c
@@ -67,7 +67,6 @@ sl_blkpt_free(sched_blkpt_id_t id)
 int
 sl_blkpt_trigger(sched_blkpt_id_t blkpt, sched_blkpt_epoch_t epoch, int single)
 {
-	thdid_t tid;
 	struct sl_thd *t;
 	struct blkpt_mem *m;
 	int ret = 0;
@@ -81,10 +80,7 @@ sl_blkpt_trigger(sched_blkpt_id_t blkpt, sched_blkpt_epoch_t epoch, int single)
 	if (!blkpt_epoch_is_higher(m->epoch, epoch)) ERR_THROW(0, unlock);
 
 	m->epoch = epoch;
-	while ((tid = stacklist_dequeue(&m->blocked)) != 0) {
-		t = sl_thd_lkup(tid);
-		assert(t);
-
+	while ((t = stacklist_dequeue(&m->blocked)) != 0) {
 		sl_thd_wakeup_no_cs(t); /* ignore retval: process next thread */
 	}
 	/* most likely we switch to a woken thread here */
@@ -114,9 +110,8 @@ sl_blkpt_block(sched_blkpt_id_t blkpt, sched_blkpt_epoch_t epoch, thdid_t depend
 	if (blkpt_epoch_is_higher(m->epoch, epoch)) ERR_THROW(0, unlock);
 
 	/* Block! */
-	stacklist_add(&m->blocked, &sl);
-
 	t = sl_thd_curr();
+	stacklist_add(&m->blocked, &sl, t);
 	if (sl_thd_block_no_cs(t, SL_THD_BLOCKED, 0)) ERR_THROW(-1, unlock);
 
 	sl_cs_exit_schedule();
diff --git a/src/components/lib/sl/sl_sched.c b/src/components/lib/sl/sl_sched.c
index fe297c1be9..acc522c716 100644
--- a/src/components/lib/sl/sl_sched.c
+++ b/src/components/lib/sl/sl_sched.c
@@ -13,6 +13,7 @@
 #include <cos_debug.h>
 #include <cos_kernel_api.h>
 #include <bitmap.h>
+#include <capmgr.h>
 
 struct sl_global sl_global_data;
 struct sl_global_cpu sl_global_cpu_data[NUM_CPU] CACHE_ALIGNED;
@@ -435,6 +436,15 @@ sl_thd_wakeup(thdid_t tid)
 	return;
 }
 
+void sched_set_tls(void* tls_addr)
+{
+	struct sl_thd *t = sl_thd_curr();
+
+	thdcap_t thdcap = sl_thd_thdcap(t);
+
+	capmgr_set_tls(thdcap, tls_addr);
+}
+
 void
 sl_thd_yield_cs_exit(thdid_t tid)
 {
@@ -507,6 +517,7 @@ sl_thd_param_set(struct sl_thd *t, sched_param_t sp)
 
 	sched_param_get(sp, &type, &value);
 
+	sl_cs_enter();
 	switch (type) {
 	case SCHEDP_WINDOW:
 	{
@@ -523,6 +534,7 @@ sl_thd_param_set(struct sl_thd *t, sched_param_t sp)
 	}
 
 	sl_mod_thd_param_set(sl_mod_thd_policy_get(t), type, value);
+	sl_cs_exit();
 }
 
 void
@@ -560,7 +572,7 @@ void
 sl_init_cpubmp(microsec_t period, u32_t *cpubmp)
 {
 	int i;
-	static volatile int first    = 1, init_done = 0;
+	static volatile long long int first    = 1, init_done = 0;
 	struct cos_defcompinfo *dci  = cos_defcompinfo_curr_get();
 	struct cos_compinfo    *ci   = cos_compinfo_get(dci);
 	struct sl_global_cpu   *g    = sl__globals_cpu();
@@ -572,7 +584,7 @@ sl_init_cpubmp(microsec_t period, u32_t *cpubmp)
 		ps_faa((unsigned long *)&init_done, 1);
 	} else {
 		/* wait until global ring buffers are initialized correctly! */
-		while (!ps_load((unsigned long *)&init_done)) ;
+		while (!ps_load(&init_done)) ;
 		/* make sure this scheduler is active on this cpu/core */
 		assert(sl_cpu_active());
 	}
diff --git a/src/components/lib/sl/sl_xcpu.c b/src/components/lib/sl/sl_xcpu.c
index 2cd5b4978a..fc96853005 100644
--- a/src/components/lib/sl/sl_xcpu.c
+++ b/src/components/lib/sl/sl_xcpu.c
@@ -10,6 +10,7 @@
 #include <sl_xcpu.h>
 #include <sl.h>
 #include <bitmap.h>
+#include <errno.h>
 
 #define SL_REQ_THD_ALLOC(req, fn, data) do {							\
 						req.type = SL_XCPU_THD_ALLOC;			\
diff --git a/src/components/lib/sl_capmgr/sl_capmgr.c b/src/components/lib/sl_capmgr/sl_capmgr.c
index 011cb58113..4332c922f9 100644
--- a/src/components/lib/sl_capmgr/sl_capmgr.c
+++ b/src/components/lib/sl_capmgr/sl_capmgr.c
@@ -10,8 +10,8 @@
 #include <sl_mod_policy.h>
 #include <cos_debug.h>
 #include <cos_kernel_api.h>
-#include "../../interface/capmgr/capmgr.h"
-#include "../../interface/capmgr/memmgr.h"
+#include <capmgr.h>
+#include <memmgr.h>
 #include <bitmap.h>
 #include <sl_child.h>
 
diff --git a/src/components/lib/slm/Makefile b/src/components/lib/slm/Makefile
new file mode 100644
index 0000000000..bf4a5c9b14
--- /dev/null
+++ b/src/components/lib/slm/Makefile
@@ -0,0 +1,63 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -lslmin) into dependents. This list should be
+# "slmin" for output files such as libslmin.a.
+LIBRARY_OUTPUT = slmin
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# slmin) which will generate slmin.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT =
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES =
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component util
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+# There are two different *types* of Makefiles for libraries.
+# 1. Those that are Composite-specific, and simply need an easy way to
+#    compile and itegrate their code.
+# 2. Those that aim to integrate external libraries into
+#    Composite. These focus on "driving" the build process of the
+#    external library, then pulling out the resulting files and
+#    directories. These need to be flexible as all libraries are
+#    different.
+
+# Type 1, Composite library: This is the default Makefile for
+# libraries written for composite. Get rid of this if you require a
+# custom Makefile (e.g. if you use an existing
+# (non-composite-specific) library. An example of this is `kernel`.
+include Makefile.lib
+
+## Type 2, external library: If you need to specialize the Makefile
+## for an external library, you can add the external code as a
+## subdirectory, and drive its compilation, and integration with the
+## system using a specialized Makefile. The Makefile must generate
+## lib$(LIBRARY_OUTPUT).a and $(OBJECT_OUTPUT).lib.o, and have all of
+## the necessary include paths in $(INCLUDE_PATHS).
+##
+## To access the Composite Makefile definitions, use the following. An
+## example of a Makefile written in this way is in `ps/`.
+#
+# include Makefile.src Makefile.comp Makefile.dependencies
+# .PHONY: all clean init distclean
+## Fill these out with your implementation
+# all:
+# clean:
+#
+## Default rules:
+# init: clean all
+# distclean: clean
diff --git a/src/components/lib/slm/doc.md b/src/components/lib/slm/doc.md
new file mode 100644
index 0000000000..0838edd31d
--- /dev/null
+++ b/src/components/lib/slm/doc.md
@@ -0,0 +1,26 @@
+## Minimal/Modular Scheduling Library (`slm`)
+
+`slm` is a set of modules that can be composed into a scheduler.
+Unlike our previous version of a scheduling library (`sl`), this focuses on simplifying the logic, removing edge-cases (and functionality), and efficiency.
+Efficiency in the scheduling library is of increased importance with `slite` (scheduling light) that avoids system calls on dispatches to blocked threads, thus removing all kernel overhead, and emphasizing library overhead.
+
+### Description
+
+`slm` modularizes scheduling logic into
+
+- timeout and wakeup logic,
+- scheduling policy,
+- inter-core coordination mechanisms,
+- the blockpoint API for efficient client synchronization, and
+- core thread state and synchronization logic.
+
+Later, this can include
+
+- a separate thread per-child scheduler to manage hierarchical scheduling.
+
+The core API that this library exports is in `slm.h`, and the APIs of the different modules (only relevant if you're implementing your own) is in `slm_api.h`.
+
+### Usage and Assumptions
+
+An example of `slm`'s use is in `implementation/tests/slm/`.
+This library currently assumes that it is the root scheduler of the system (with an infinite `tcap`).
diff --git a/src/components/lib/slm/fprr.c b/src/components/lib/slm/fprr.c
new file mode 100644
index 0000000000..abe4915e8b
--- /dev/null
+++ b/src/components/lib/slm/fprr.c
@@ -0,0 +1,142 @@
+#include <slm.h>
+#include <fprr.h>
+#include <slm_api.h>
+#include <cos_types.h>
+#include <cos_component.h>
+
+#define SLM_FPRR_NPRIOS         32
+#define SLM_FPRR_PRIO_HIGHEST   TCAP_PRIO_MAX
+#define SLM_FPRR_PRIO_LOWEST    (SLM_FPRR_NPRIOS - 1)
+
+#define SLM_FPRR_PERIOD_US_MIN  10000
+
+struct ps_list_head threads[NUM_CPU][SLM_FPRR_NPRIOS] CACHE_ALIGNED;
+
+/* No RR based on execution, yet */
+void
+slm_sched_fprr_execution(struct slm_thd *t, cycles_t cycles)
+{ return; }
+
+struct slm_thd *
+slm_sched_fprr_schedule(void)
+{
+	int i;
+	struct slm_sched_thd *t;
+	struct ps_list_head *prios = threads[cos_cpuid()];
+
+	for (i = 0 ; i < SLM_FPRR_NPRIOS ; i++) {
+		if (ps_list_head_empty(&prios[i])) continue;
+		t = ps_list_head_first_d(&prios[i], struct slm_sched_thd);
+
+		/*
+		 * We want to move the selected thread to the back of the list.
+		 * Otherwise fprr won't be truly round robin
+		 */
+		ps_list_rem_d(t);
+		ps_list_head_append_d(&prios[i], t);
+
+//		printc("Schedule -> %ld\n", slm_thd_from_sched(t)->tid);
+		return slm_thd_from_sched(t);
+	}
+//	printc("Schedule -> idle\n");
+
+	return NULL;
+}
+
+int
+slm_sched_fprr_block(struct slm_thd *t)
+{
+	struct slm_sched_thd *p = slm_thd_sched_policy(t);
+
+	ps_list_rem_d(p);
+
+	return 0;
+}
+
+int
+slm_sched_fprr_wakeup(struct slm_thd *t)
+{
+	struct slm_sched_thd *p = slm_thd_sched_policy(t);
+
+	assert(ps_list_singleton_d(p));
+
+	ps_list_head_append_d(&threads[cos_cpuid()][t->priority - 1], p);
+
+	return 0;
+}
+
+void
+slm_sched_fprr_yield(struct slm_thd *t, struct slm_thd *yield_to)
+{
+	struct slm_sched_thd *p = slm_thd_sched_policy(t);
+
+	ps_list_rem_d(p);
+	ps_list_head_append_d(&threads[cos_cpuid()][t->priority - 1], p);
+}
+
+int
+slm_sched_fprr_thd_init(struct slm_thd *t)
+{
+	t->priority = SLM_FPRR_PRIO_LOWEST;
+	ps_list_init_d(slm_thd_sched_policy(t));
+
+	return 0;
+}
+
+void
+slm_sched_fprr_thd_deinit(struct slm_thd *t)
+{
+	ps_list_rem_d(slm_thd_sched_policy(t));
+}
+
+static void
+update_queue(struct slm_thd *t, tcap_prio_t prio)
+{
+	struct slm_sched_thd *p = slm_thd_sched_policy(t);
+
+	t->priority = prio;
+	ps_list_rem_d(p); /* if we're already on a list, and we're updating priority */
+	ps_list_head_append_d(&threads[cos_cpuid()][prio], p);
+
+	return;
+}
+
+int
+slm_sched_fprr_thd_update(struct slm_thd *t, sched_param_type_t type, unsigned int v)
+{
+	switch (type) {
+	case SCHEDP_INIT_PROTO:
+	{
+		update_queue(t, 0);
+
+		return 0;
+	}
+	case SCHEDP_INIT:
+	{
+		update_queue(t, SLM_FPRR_PRIO_LOWEST);
+
+		return 0;
+	}
+	case SCHEDP_PRIO:
+	{
+		assert(v >= SLM_FPRR_PRIO_HIGHEST && v <= SLM_FPRR_PRIO_LOWEST);
+		update_queue(t, v);
+
+		return 0;
+	}
+	/* Only support priority, for now */
+	default:
+		return -1;
+	}
+}
+
+void
+slm_sched_fprr_init(void)
+{
+	int i;
+
+	memset(threads[cos_cpuid()], 0, sizeof(struct ps_list_head) * SLM_FPRR_NPRIOS);
+	for (i = 0 ; i < SLM_FPRR_NPRIOS ; i++) {
+		ps_list_head_init(&threads[cos_cpuid()][i]);
+	}
+}
diff --git a/src/components/lib/slm/fprr.h b/src/components/lib/slm/fprr.h
new file mode 100644
index 0000000000..e13851d5ee
--- /dev/null
+++ b/src/components/lib/slm/fprr.h
@@ -0,0 +1,14 @@
+#ifndef FPRR_H
+#define FPRR_H
+
+#include <ps_list.h>
+
+struct slm_sched_thd {
+	struct ps_list list;
+};
+
+#include <slm.h>
+
+SLM_MODULES_POLICY_PROTOTYPES(fprr)
+
+#endif	/* FPRR_H */
diff --git a/src/components/lib/slm/quantum.c b/src/components/lib/slm/quantum.c
new file mode 100644
index 0000000000..0dba006ae3
--- /dev/null
+++ b/src/components/lib/slm/quantum.c
@@ -0,0 +1,169 @@
+#include <cos_types.h>
+#include <cos_component.h>
+#include <slm.h>
+#include <quantum.h>
+#include <slm_api.h>
+#include <heap.h>
+
+/***
+ * Quantum-based time management. Wooo. Periodic timer FTW.
+ */
+
+struct timer_global {
+	struct heap  h;
+	void        *data[MAX_NUM_THREADS];
+	cycles_t     period;
+	cycles_t     current_timeout;
+} CACHE_ALIGNED;
+
+static struct timer_global __timer_globals[NUM_CPU];
+
+static inline struct timer_global *
+timer_global(void) {
+	return &__timer_globals[cos_coreid()];
+}
+
+/* wakeup any blocked threads! */
+static void
+quantum_wakeup_expired(cycles_t now)
+{
+	struct timer_global *g = timer_global();
+
+	while (heap_size(&g->h) > 0) {
+		struct slm_thd *tp, *th;
+		struct slm_timer_thd *tt;
+
+		tp = heap_peek(&g->h);
+		assert(tp);
+		tt = slm_thd_timer_policy(tp);
+		assert(tt);
+
+		/* FIXME: logic for wraparound in current tsc */
+		if (likely(tt->abs_wakeup > now)) break;
+
+		th = heap_highest(&g->h);
+		assert(th == tp);
+
+		tt->timeout_idx = -1;
+		tt->abs_wakeup  = now;
+		slm_thd_wakeup(tp, 1);
+	}
+}
+
+/* The timer expired */
+void
+slm_timer_quantum_expire(cycles_t now)
+{
+	struct timer_global *g = timer_global();
+	cycles_t             offset;
+	cycles_t             next_timeout;
+
+	/*
+	 * Note that we might miss specific quantum if we are in a
+	 * virtualized environment. Thus we might be multiple periods
+	 * into the future.
+	 */
+	assert(now >= g->current_timeout);
+
+	offset = (now - g->current_timeout) % g->period;
+ 	assert(g->period > offset);
+	next_timeout = now + (g->period - offset);
+	assert(next_timeout > now);
+
+	slm_timeout_set(next_timeout);
+	g->current_timeout = next_timeout;
+
+	quantum_wakeup_expired(now);
+}
+
+/*
+ * Timeout and wakeup functionality
+ *
+ * TODO: Replace the in-place heap with a rb-tree to avoid external, static allocation.
+ */
+
+int
+slm_timer_quantum_add(struct slm_thd *t, cycles_t absolute_timeout)
+{
+	struct slm_timer_thd *tt = slm_thd_timer_policy(t);
+	struct timer_global *g = timer_global();
+
+	assert(tt && tt->timeout_idx == -1);
+	assert(heap_size(&g->h) < MAX_NUM_THREADS);
+
+	if (!cycles_greater_than(absolute_timeout, slm_now())) return 0;
+
+	tt->abs_wakeup = absolute_timeout;
+	heap_add(&g->h, t);
+
+	return 0;
+}
+
+int
+slm_timer_quantum_cancel(struct slm_thd *t)
+{
+	struct slm_timer_thd *tt = slm_thd_timer_policy(t);
+	struct timer_global *g   = timer_global();
+
+	assert(heap_size(&g->h));
+	assert(tt->timeout_idx > 0);
+
+	heap_remove(&g->h, tt->timeout_idx);
+	tt->timeout_idx = -1;
+
+	return 0;
+}
+
+int
+slm_timer_quantum_thd_init(struct slm_thd *t)
+{
+	struct slm_timer_thd *tt = slm_thd_timer_policy(t);
+
+	*tt = (struct slm_timer_thd){
+		.timeout_idx = -1,
+		.abs_wakeup  = 0
+	};
+
+	return 0;
+}
+
+void
+slm_timer_quantum_thd_deinit(struct slm_thd *t)
+{
+	return;
+}
+
+static int
+__slm_timeout_compare_min(void *a, void *b)
+{
+	/* FIXME: logic for wraparound in either timeout_cycs */
+	return slm_thd_timer_policy((struct slm_thd *)a)->abs_wakeup <= slm_thd_timer_policy((struct slm_thd *)b)->abs_wakeup;
+}
+
+static void
+__slm_timeout_update_idx(void *e, int pos)
+{ slm_thd_timer_policy((struct slm_thd *)e)->timeout_idx = pos; }
+
+static void
+slm_policy_timer_init(microsec_t period)
+{
+	struct timer_global *g = timer_global();
+	cycles_t next_timeout;
+
+	memset(g, 0, sizeof(struct timer_global));
+	g->period = slm_usec2cyc(period);
+	heap_init(&g->h, MAX_NUM_THREADS, __slm_timeout_compare_min, __slm_timeout_update_idx);
+
+	next_timeout = slm_now() + g->period;
+	g->current_timeout = next_timeout;
+	slm_timeout_set(next_timeout);
+}
+
+int
+slm_timer_quantum_init(void)
+{
+	/* 10ms */
+	slm_policy_timer_init(10000);
+
+	return 0;
+}
diff --git a/src/components/lib/slm/quantum.h b/src/components/lib/slm/quantum.h
new file mode 100644
index 0000000000..4736b966dc
--- /dev/null
+++ b/src/components/lib/slm/quantum.h
@@ -0,0 +1,13 @@
+#ifndef QUANTUM_H
+#define QUANTUM_H
+
+#include <slm.h>
+
+SLM_MODULES_TIMER_PROTOTYPES(quantum)
+
+struct slm_timer_thd {
+	int      timeout_idx;	/* where are we in the heap? */
+	cycles_t abs_wakeup;
+};
+
+#endif	/* QUANTUM_H */
diff --git a/src/components/lib/slm/res_spec.h b/src/components/lib/slm/res_spec.h
new file mode 100644
index 0000000000..cf9002ea7e
--- /dev/null
+++ b/src/components/lib/slm/res_spec.h
@@ -0,0 +1,76 @@
+#ifndef RES_SPEC_H
+#define RES_SPEC_H
+
+#include <cos_types.h>
+
+typedef int res_t;
+typedef enum { RESRES_SOFT, RESRES_FIRM, RESRES_HARD } res_hardness_t;
+typedef enum { RESRES_MEM, RESRES_CPU, RESRES_IO } res_type_t;
+typedef struct {
+	/* allocation, and window of that allocation */
+	s16_t a, w;
+} __attribute__((packed)) res_spec_t;
+#define NULL_RSPEC ((res_spec_t){.a = 0, .w = 0})
+
+static inline res_spec_t
+resres_spec(s16_t alloc)
+{
+	return (res_spec_t){.a = alloc, .w = 0};
+}
+
+static inline res_spec_t
+resres_spec_w(s16_t alloc, s16_t window)
+{
+	return (res_spec_t){.a = alloc, .w = window};
+}
+
+typedef enum {
+	SCHEDP_NOOP = 0,
+	SCHEDP_PRIO,  /* fixed priority */
+	SCHEDP_RPRIO, /* priority relatively higher than current thread */
+	/* priority relatively lower (not numerically) than current thread */
+	SCHEDP_RLPRIO,
+	SCHEDP_DEADLINE,    /* if != window */
+	SCHEDP_BUDGET,      /* exec time */
+	SCHEDP_WINDOW,      /* period */
+	SCHEDP_PROPORTION,  /* percent required */
+	SCHEDP_WEIGHT,      /* proportion compared to other */
+	SCHEDP_IDLE,        /* idle thread: internal use only */
+	SCHEDP_INIT_PROTO,  /* HP scheduler threads performing the initialization protocol */
+	SCHEDP_INIT,        /* initialization threads: internal use only */
+	SCHEDP_IPI_HANDLER, /* IPI handler thread: internal use only */
+	SCHEDP_TIMER,       /* timer thread: internal use only */
+	SCHEDP_CORE_ID,     /* create the thread on the target core */
+	SCHEDP_EXEC,	    /* time to execute the thread! */
+	SCHEDP_MAX          /* maximum value */
+} sched_param_type_t;
+
+#define SCHED_PARAM_TYPE_BITS 6
+#define SCHED_PARAM_TYPE_MASK ((1 << SCHED_PARAM_TYPE_BITS) - 1)
+
+typedef u32_t sched_param_t;
+
+/* for static configuration */
+#define SCHED_PARAM_CONS(type, value) ((sched_param_t)(type | (value << SCHED_PARAM_TYPE_BITS)))
+
+/* use _cons instead! */
+static inline sched_param_t
+sched_param_pack(sched_param_type_t type, unsigned int value)
+{
+	return SCHED_PARAM_CONS(type, value);
+}
+
+static inline sched_param_t
+sched_param_cons(sched_param_type_t type, unsigned int value)
+{
+	return sched_param_pack(type, value);
+}
+
+static inline void
+sched_param_get(sched_param_t sp, sched_param_type_t *type, unsigned int *value)
+{
+	if (type)  *type  = (sched_param_type_t)(sp &  SCHED_PARAM_TYPE_MASK);
+	if (value) *value = (unsigned int)      (sp >> SCHED_PARAM_TYPE_BITS);
+}
+
+#endif /* RES_SPEC_H */
diff --git a/src/components/lib/slm/slm.c b/src/components/lib/slm/slm.c
new file mode 100644
index 0000000000..851d662e1e
--- /dev/null
+++ b/src/components/lib/slm/slm.c
@@ -0,0 +1,553 @@
+#include <slm.h>
+#include <slm_api.h>
+#include <ps_list.h>
+
+struct slm_global __slm_global[NUM_CPU];
+
+struct slm_thd *
+slm_thd_special(void)
+{
+	thdid_t me = cos_thdid();
+	struct slm_global *g = slm_global();
+
+	if (me == g->sched_thd.tid)     return &g->sched_thd;
+	else if (me == g->idle_thd.tid) return &g->idle_thd;
+	else                            return NULL;
+}
+
+static int
+slm_thd_init_internal(struct slm_thd *t, thdcap_t thd, thdid_t tid)
+{
+	struct cos_defcompinfo *defci     = cos_defcompinfo_curr_get();
+	struct cos_aep_info    *sched_aep = cos_sched_aep_get(defci);
+	int ret;
+
+	memset(t, 0, sizeof(struct slm_thd));
+	*t = (struct slm_thd) {
+		.tc = sched_aep->tc,
+		.thd = thd,
+		.tid = tid,
+		.state = SLM_THD_RUNNABLE,
+		.priority = TCAP_PRIO_MIN,
+		.properties = 0
+	};
+	ps_list_init(t, thd_list);
+	ps_list_init(t, graveyard_list);
+
+	return 0;
+}
+
+static int
+slm_thd_deinit_internal(struct slm_thd *t)
+{
+	ps_list_head_append(&slm_global()->graveyard_head, t, graveyard_list);
+
+	return 0;
+}
+
+int
+slm_thd_init(struct slm_thd *t, thdcap_t thd, thdid_t tid)
+{
+	int ret;
+
+	if ((ret = slm_thd_init_internal(t, thd, tid))) return ret;
+	if ((ret = slm_timer_thd_init(t))) return ret;
+	if ((ret = slm_sched_thd_init(t))) return ret;
+
+	return 0;
+}
+
+void
+slm_thd_deinit(struct slm_thd *t)
+{
+	slm_sched_thd_deinit(t);
+	slm_timer_thd_deinit(t);
+	t->state = SLM_THD_DYING;
+}
+
+/*
+ * If there is contention of the critical section, this is called.
+ * This is pulled out of the inlined fastpath.
+ *
+ * - @cs - critical section
+ * - @cached - the cached value of the cs
+ * - @curr - current thread
+ * - @owner - the thread that owns the cs
+ * - @contended - {0, 1} previously contended or not
+ * - @tok - scheduler synchronization token for cos_defswitch
+ *
+ * @ret:
+ *     (Caller of this function should retry for a non-zero return value.)
+ *     1 for cas failure or after successful thread switch to thread that owns the lock.
+ *     -ve from cos_defswitch failure, allowing caller for ex: the scheduler thread to
+ *     check if it was -EBUSY to first recieve pending notifications before retrying lock.
+ */
+int
+slm_cs_enter_contention(struct slm_cs *cs, slm_cs_cached_t cached, struct slm_thd *curr, struct slm_thd *owner, int contended, sched_tok_t tok)
+{
+	struct slm_global *g = slm_global();
+	int ret;
+
+	/* Set contention if it isn't yet set */
+	if (!contended) {
+		if (__slm_cs_cas(cs, cached, owner, 1)) return 1;
+	}
+
+	/* Switch to the owner of the critical section, with inheritance using our tcap/priority */
+	ret = cos_defswitch(owner->thd, curr->priority, owner == &g->sched_thd ? TCAP_TIME_NIL : g->timeout_next, tok);
+	if (ret) return ret;
+	/* if we have an outdated token, then we want to use the same repeat loop, so return to that */
+
+	return 1;
+}
+
+/*
+ * If another thread contended the critical section we're giving up,
+ * this is the slowpath.
+ *
+ * - @cs - the critical section
+ * - @curr - the current thread (releasing the cs)
+ * - @cached - cached copy the critical section value
+ * - @tok: scheduler synchronization token
+ *
+ * @ret: returns 1 if we need a retry, 0 otherwise
+ */
+int
+slm_cs_exit_contention(struct slm_cs *cs, struct slm_thd *curr, slm_cs_cached_t cached, sched_tok_t tok)
+{
+	struct slm_thd *s = &slm_global()->sched_thd;
+	int ret;
+
+	if (__slm_cs_cas(cs, cached, NULL, 0)) return 1;
+	/*
+	 * We simplify here by simply switching to the scheduler
+	 * thread to let it resolve the situation. Use our priority
+	 * for its execution to avoid inversion.
+	 */
+	ret = cos_defswitch(s->thd, curr->priority, TCAP_TIME_NIL, tok);
+	assert(ret != -EINVAL);
+
+	return 0;
+}
+
+/***
+ * Thread blocking and waking.
+ */
+
+/**
+ * `slm_thd_wakeup_blked` assumes that `t` is in the `BLOCKED` state,
+ * and wakes it up, telling the policy to insert it into the
+ * runqueues.
+ *
+ * - @t - The thread to wakeup
+ * - @return - `1` if it's already `RUNNABLE`.
+ *             `0` if it was woken up in this call
+ */
+static inline int
+slm_thd_wakeup_blked(struct slm_thd *t)
+{
+	assert(t);
+	assert(slm_thd_normal(t));
+
+	assert(t->state == SLM_THD_BLOCKED);
+	t->state = SLM_THD_RUNNABLE;
+	slm_sched_wakeup(t);
+	t->properties &= ~SLM_THD_PROPERTY_SUSPENDED;
+
+	return 0;
+}
+
+/*
+ * - @t must be the current thread.
+ * - @return: 1 if it's already WOKEN.
+ *	    0 if it successfully blocked in this call.
+ */
+int
+slm_thd_block(struct slm_thd *t)
+{
+	assert(t);
+	assert(slm_thd_normal(t));
+
+	if (unlikely(t->state == SLM_THD_WOKEN)) {
+		assert(!(t->properties & SLM_THD_PROPERTY_SUSPENDED));
+		t->state = SLM_THD_RUNNABLE;
+
+		return 1;
+	}
+	assert(t->state == SLM_THD_RUNNABLE);
+
+	/*
+	 * reset SLM_THD_PROPERTY_SUSPENDED if the scheduler thinks
+	 * "curr" was suspended on cos_rcv previously
+	 */
+	if (t->properties & SLM_THD_PROPERTY_SUSPENDED) {
+		t->properties &= ~SLM_THD_PROPERTY_SUSPENDED;
+		if (t->state == SLM_THD_BLOCKED) {
+			slm_thd_wakeup_blked(t);
+		}
+	}
+
+	assert(t->state == SLM_THD_RUNNABLE);
+	t->state = SLM_THD_BLOCKED;
+	slm_sched_block(t);
+
+	return 0;
+}
+
+void
+slm_thd_block_cs(struct slm_thd *current)
+{
+	slm_cs_enter(current, SLM_CS_NONE);
+	if (slm_thd_block(current)) {
+		slm_cs_exit(current, SLM_CS_NONE);
+	} else {
+		slm_cs_exit_reschedule(current, SLM_CS_NONE);
+	}
+
+	return;
+}
+
+/*
+ * This API is only used by the scheduling thread to block an AEP thread.
+ * AEP thread scheduling events could be redundant.
+ *
+ * @return: 0 if it successfully blocked in this call.
+ */
+static inline int
+slm_thd_sched_block(struct slm_thd *t)
+{
+	assert(t);
+	assert(slm_state_is_runnable(t->state) || t->state == SLM_THD_BLOCKED);
+	assert(slm_thd_normal(t));
+
+	/*
+	 * It is oddly possible that the thread is already blocked. It
+	 * was previously blocked, yet woke due to an asynchronous
+	 * activation. This code can execute *before* the scheduler
+	 * thread sees the notification that it had been woken.
+	 */
+	if (likely(slm_state_is_runnable(t->state))) {
+		slm_sched_block(t);
+	}
+	t->state       = SLM_THD_BLOCKED;
+	t->properties |= SLM_THD_PROPERTY_SUSPENDED;
+
+	return 0;
+}
+
+
+/*
+ * This API is only used by the scheduling thread to wakeup an AEP thread.
+ * AEP thread scheduling events could be redundant.
+ *
+ * @return: 1 if it's already WOKEN or RUNNABLE.
+ *	    0 if it successfully blocked in this call.
+ */
+int
+slm_thd_sched_wakeup(struct slm_thd *t)
+{
+	assert(t);
+
+	/* not blocked on cos_rcv, so don't mess with user-level thread states */
+	if (unlikely(!(t->properties & SLM_THD_PROPERTY_SUSPENDED))) return 1;
+	t->properties &= ~SLM_THD_PROPERTY_SUSPENDED;
+	/*
+	 * If a thread was preempted and scheduler updated it to
+	 * RUNNABLE status and if that AEP was activated again
+	 * (perhaps by tcap preemption logic) and expired it's budget,
+	 * it could result in the scheduler having a redundant WAKEUP
+	 * event.
+	 *
+	 * Thread could be in WOKEN state: Perhaps the thread was
+	 * blocked waiting for a lock and was woken up by another
+	 * thread and and then scheduler sees some redundant wakeup
+	 * event through "asnd" or "tcap budget expiry".
+	 */
+	if (unlikely(slm_state_is_runnable(t->state))) {
+		t->state = SLM_THD_RUNNABLE;
+
+		return 1;
+	}
+
+	assert(t->state == SLM_THD_BLOCKED);
+	t->state = SLM_THD_RUNNABLE;
+	slm_sched_wakeup(t);
+
+	return 0;
+}
+
+/**
+ * - @redundant - can we have redundant wakeups? Likely this only
+ *   makes sense for redundant periodic wakeups.
+ */
+int
+slm_thd_wakeup(struct slm_thd *t, int redundant)
+{
+	assert(t);
+
+	if (unlikely(t->state == SLM_THD_RUNNABLE || (redundant && t->state == SLM_THD_WOKEN))) {
+		/*
+		 * We have an odd case. We have a thread that is
+		 * runnable (and running!), but is being asked to wake
+		 * up. How can this happen? There can be a race
+		 * between a thread blocking itself, and another
+		 * thread waking it up. If the thread is preempted
+		 * before it blocks itself, it can be runnable, but
+		 * the other thread can get activated and tries to
+		 * wake it.
+		 *
+		 * t->state == SLM_THD_WOKEN? multiple wakeups?
+		 */
+		t->state = SLM_THD_WOKEN;
+
+		return 1;
+	}
+	assert(t->state == SLM_THD_BLOCKED);
+
+	return slm_thd_wakeup_blked(t);
+}
+
+void
+slm_thd_wakeup_cs(struct slm_thd *curr, struct slm_thd *t)
+{
+	assert(t);
+
+	slm_cs_enter(curr, SLM_CS_NONE);
+	/* Only reschedule if we wake up a thread */
+	if (slm_thd_wakeup(t, 0)) {
+		slm_cs_exit(curr, SLM_CS_NONE);
+	} else {
+		slm_cs_exit_reschedule(curr, SLM_CS_NONE);
+	}
+
+	return;
+}
+
+void
+slm_thd_event_reset(struct slm_thd *t)
+{
+	memset(&t->event_info, 0, sizeof(struct event_info));
+}
+
+static inline void
+slm_thd_event_enqueue(struct slm_thd *t, int blocked, cycles_t cycles, tcap_time_t timeout)
+{
+	struct slm_global *g = slm_global();
+
+	if (ps_list_singleton(t, thd_list)) ps_list_head_append(&g->event_head, t, thd_list);
+
+	t->event_info.blocked = blocked;
+	t->event_info.cycles += cycles;
+	t->event_info.timeout = timeout;
+}
+
+static inline void
+slm_thd_event_dequeue(struct slm_thd *t, int *blocked, cycles_t *cycles, tcap_time_t *timeout)
+{
+	ps_list_rem(t, thd_list);
+
+	*blocked = t->event_info.blocked;
+	*cycles  = t->event_info.cycles;
+	*timeout = t->event_info.timeout;
+	slm_thd_event_reset(t);
+}
+
+/*
+ * `slm_cs_enter_sched` enter into scheduler cs from the scheduler
+ * thread context, and if we cannot take the critical section because
+ * there are pending scheduler events (for this thread to get from the
+ * kernel), then return as such.
+ *
+ * - @ret: returns -EBUSY if sched thread has events to process and
+ *     cannot switch threads, 0 otherwise.
+ */
+static inline int
+slm_cs_enter_sched(void)
+{
+	int ret;
+
+	while ((ret = slm_cs_enter(&slm_global()->sched_thd, SLM_CS_NOSPIN))) {
+		/* We don't want to retry if we have pending events to handle */
+		if (ret == -EBUSY) break;
+	}
+
+	return ret;
+}
+
+static void
+slm_sched_loop_intern(int non_block)
+{
+	struct slm_global *g = slm_global();
+	rcv_flags_t      rfl = (non_block ? RCV_NON_BLOCKING : 0) | RCV_ALL_PENDING;
+	struct slm_thd   *us = &g->sched_thd;
+	struct slm_thd *t = NULL, *tn = NULL;
+
+	/* Only the scheduler thread should call this function. */
+	assert(cos_thdid() == us->tid);
+
+	while (1) {
+		int pending;
+
+		do {
+			thdid_t        tid;
+			int            blocked, rcvd;
+			cycles_t       cycles;
+			tcap_time_t    thd_timeout;
+
+			/*
+			 * Here we retrieve the kernel scheduler
+			 * events. These include threads being asnded
+			 * (thus activating), rcving (thus
+			 * suspending), and generally executing (thus
+			 * consuming cycles of computation). This is a
+			 * rcv, so it may suspend the calling thread
+			 * if `non_block` is `0`.
+			 *
+			 * Important that this is *not* in the CS due
+			 * to the potential blocking.
+			 */
+			pending = cos_sched_rcv(us->rcv, rfl, g->timeout_next, &rcvd, &tid, &blocked, &cycles, &thd_timeout);
+			if (!tid) goto pending_events;
+
+			/*
+			 * FIXME: kernel should pass an untyped
+			 * pointer back here that we can use instead
+			 * of the tid. This is the only place where
+			 * slm requires the thread id -> thread
+			 * mapping ;-(
+			 */
+			t = slm_thd_lookup(tid);
+			assert(t);
+			/* don't report the idle thread or a freed thread */
+			if (unlikely(t == &g->idle_thd || slm_state_is_dead(t->state))) goto pending_events;
+
+			/*
+			 * Failure to take the CS because 1. another
+			 * thread is holding it and 2. switching to
+			 * that thread cannot succeed because
+			 * scheduler has pending events which will
+			 * prevent the switch to the CS holder. This
+			 * can cause the event just received to be
+			 * dropped. Thus, to avoid dropping events,
+			 * add the events to the scheduler event list
+			 * and processing all the pending events after
+			 * the scheduler can successfully take the
+			 * lock.
+			 *
+			 * TODO: Better would be to update the kernel
+			 * to enable a flag that ignores pending
+			 * events on a dispatch request. This would
+			 * allow the scheduler thread to switch to the
+			 * CS holder, and switch back when the CS
+			 * holder releases the CS (thus allowing the
+			 * events to be processed at that point.
+			 */
+			slm_thd_event_enqueue(t, blocked, cycles, thd_timeout);
+
+pending_events:
+			/* No events? make a scheduling decision */
+			if (ps_list_head_empty(&g->event_head)) break;
+
+			/*
+			 * Receiving scheduler notifications is not in critical section mainly for
+			 * 1. scheduler thread can often be blocked in rcv, which can add to
+			 *    interrupt execution or even AEP thread execution overheads.
+			 * 2. scheduler events are not acting on the slm_thd or the policy structures, so
+			 *    having finer grained locks around the code that modifies slm_thd states is better.
+			 *
+			 * Thus we process the events now, with the CS taken.
+			 */
+			if (slm_cs_enter(us, SLM_CS_SCHEDEVT)) continue;
+
+			ps_list_foreach_del(&g->event_head, t, tn, thd_list) {
+				/* remove the event from the list and get event info */
+				slm_thd_event_dequeue(t, &blocked, &cycles, &thd_timeout);
+
+				/* outdated event for a freed thread */
+				if (unlikely(slm_state_is_dead(t->state))) continue;
+
+				/* Notify the policy that some execution has happened. */
+				slm_sched_execution(t, cycles);
+
+				if (blocked) {
+					assert(cycles);
+					slm_thd_sched_block(t);
+				} else {
+					slm_thd_sched_wakeup(t);
+				}
+			}
+
+			slm_cs_exit(us, SLM_CS_NONE);
+		} while (pending > 0);
+
+		if (slm_cs_enter_sched()) continue;
+		/* If switch returns an inconsistency, we retry anyway */
+		if (slm_cs_exit_reschedule(us, SLM_CS_CHECK_TIMEOUT)) assert(0);
+	}
+}
+
+void
+slm_sched_loop(void)
+{
+	slm_sched_loop_intern(0);
+}
+
+void
+slm_sched_loop_nonblock(void)
+{
+	slm_sched_loop_intern(1);
+}
+
+void
+slm_idle(void *d)
+{
+	while (1) ;
+
+	BUG();
+}
+
+void
+slm_init(thdcap_t thd, thdid_t tid)
+{
+	struct slm_global *g = slm_global();
+	struct slm_thd *s    = &g->sched_thd;
+	struct slm_thd *i    = &g->idle_thd;
+	struct cos_defcompinfo *defci;
+	struct cos_aep_info    *sched_aep;
+
+	defci = cos_defcompinfo_curr_get();
+	sched_aep = cos_sched_aep_get(defci);
+
+	*s = (struct slm_thd) {
+		.properties = SLM_THD_PROPERTY_SPECIAL,
+		.state = SLM_THD_RUNNABLE,
+		.tc  = sched_aep->tc,
+		.thd = sched_aep->thd,
+		.tid = sched_aep->tid,
+		.rcv = sched_aep->rcv,
+		.priority = TCAP_PRIO_MAX
+	};
+	ps_list_init(s, thd_list);
+	assert(s->tid == cos_thdid());
+
+	*i = (struct slm_thd) {
+		.properties = SLM_THD_PROPERTY_SPECIAL,
+		.state = SLM_THD_RUNNABLE,
+		.tc = sched_aep->tc,
+		.thd = thd,
+		.tid = tid,
+		.rcv = 0,
+		.priority = TCAP_PRIO_MIN
+	};
+	ps_list_init(i, thd_list);
+	ps_list_init(i, graveyard_list);
+
+	ps_list_head_init(&g->event_head);
+	ps_list_head_init(&g->graveyard_head);
+
+	g->cyc_per_usec = cos_hw_cycles_per_usec(BOOT_CAPTBL_SELF_INITHW_BASE);
+	g->lock.owner_contention = 0;
+
+	slm_sched_init();
+	slm_timer_init();
+}
diff --git a/src/components/lib/slm/slm.h b/src/components/lib/slm/slm.h
new file mode 100644
index 0000000000..558f270296
--- /dev/null
+++ b/src/components/lib/slm/slm.h
@@ -0,0 +1,353 @@
+#ifndef SLM_H
+#define SLM_H
+
+#include <cos_component.h>
+#include <cos_defkernel_api.h>
+#include <ps.h>
+
+/*
+ * Simple state machine for each thread
+ */
+typedef enum {
+	SLM_THD_FREE = 0,
+	SLM_THD_BLOCKED,
+	SLM_THD_WOKEN, /* if a race causes a wakeup before the thread's inevitable block */
+	SLM_THD_RUNNABLE,
+	SLM_THD_DYING,
+} slm_thd_state_t;
+
+typedef enum {
+	SLM_THD_PROPERTY_OWN_TCAP  = 1,      /* Thread owns a tcap */
+	SLM_THD_PROPERTY_SEND      = (1<<1), /* use asnd to dispatch to this thread */
+	SLM_THD_PROPERTY_SUSPENDED = (1<<2), /* suspended on a rcv capability? See note below. */
+	SLM_THD_PROPERTY_SPECIAL   = (1<<3), /* is this either the scheduler or idle thread? */
+} slm_thd_property_t;
+
+struct event_info {
+	int         blocked; /* 1 - blocked. 0 - awake */
+	cycles_t    cycles;  /* how many cycles the thread executed */
+	tcap_time_t timeout;
+};
+
+struct slm_thd {
+	/*
+	 * rcv_suspended: Tracks the kernel state of the AEP threads for whether they're
+	 *                suspended on cos_rcv or not.
+	 *		  rcv_suspended is used only for threads that are AEPs (call cos_rcv).
+	 *
+	 * Activations of these AEP threads cannot be fully controlled by the
+	 * scheduler and depends on the global quality of the TCap associated with this
+	 * AEP at any point an `asnd` happens to this AEP.
+	 *
+	 * Therefore, this is really not a thread state that the scheduler controls.
+	 * if a thread has rcv_suspended set, it doesn't mean that it isn't running.
+	 * But if the thread uses any of `sl` block/yield, this should first be reset and
+	 * the thread must be put back to run-queue before doing anything!!
+	 *
+	 * Another important detail is, when the scheduler receives a "unblocked" event, it
+	 * resets this. If rcv_suspended == 0, then the scheduler does not modify the thread states!
+	 * This is because, a thread could have run without the scheduler's knowledge through the
+	 * tcap mechanism and may have eventually tried to block/acquire a lock/futex
+	 * which would then block the thread at user-level. A kernel scheduling event
+	 * should not cause it to change to RUNNABLE state and enter a critical section when
+	 * it isn't it's turn!
+	 *
+	 * This is the strongest motivation towards not combining user-level and kernel-level
+	 * thread states.
+	 *
+	 * To sum up:
+	 * if rcv_suspended: A thread could "still" be calling block/yield and therefore be
+	 *                   in a RUNNABLE/BLOCKED/BLOCKED_TIMEOUT states. It could also be
+	 *                   woken up at the user-level if there is another high-prio thread
+	 *                   and that gets to run before scheduler is activated up on this
+	 *                   thread calls block/yield and it then wakes this thread up.
+	 * if !rcv_suspended: A thread could be in any state and also be in cos_rcv.
+	 *
+	 * The only thing this captures is, "unblocking" a thread from cos_rcv or "blocking" it
+	 * on cos_rcv from a scheduler's context. BLOCKing a thread when the scheduler processes
+	 * a "blocked" kernel event, clears any prior thread states and sets it to be BLOCKED/BLOCKED_TIMEOUT.
+	 */
+	slm_thd_property_t properties;
+	slm_thd_state_t    state;
+
+	/*
+	 * All of the capabilities and kernel-relevant information for
+	 * the thread.
+	 */
+	tcap_t      tc;
+	thdcap_t    thd;
+	thdid_t     tid;
+	arcvcap_t   rcv;
+	asndcap_t   asnd;
+	tcap_prio_t priority;
+
+	/* Execution information retrieved by the scheduler thread */
+	struct event_info event_info;
+	struct ps_list    thd_list;       /* list of events for the scheduler */
+	struct ps_list    graveyard_list; /* list of threads that have terminated that require deallocation */
+};
+
+typedef enum {
+	SLM_CS_NONE     = 0,
+	SLM_CS_NOSPIN   = 1, /* return if we race with another thread */
+	SLM_CS_SWITCHTO = 2, /* we should try and switch to the `switchto` argument */
+	SLM_CS_SCHEDEVT = 4, /* return if there are pending scheduler notifications */
+	SLM_CS_CHECK_TIMEOUT = 8, /* should we check for pending timeouts on exit? */
+} slm_cs_flags_t;
+
+static inline cycles_t
+slm_now(void)
+{
+	return ps_tsc();
+}
+
+#include <slm_private.h>
+
+/***
+ * The initialization procedure for the slm must include:
+ *
+ * ```c
+ * void
+ * cos_init() {
+ *         t = thd_alloc(slm_idle, ...); // bypass the slm in allocation
+ *         slm_init(t->thdcap, t->thdid);
+ *         ...
+ * }
+ *
+ * int
+ * main(void) {
+ *         ...
+ *         slm_sched_loop(); // start processing the scheduler, never return
+ * }
+ * ```
+ */
+
+/* This is the idle function, and should be the function executed by the thread */
+void slm_idle(void *);
+/**
+ * This function *must* be called as part of the scheduler
+ * initialization, usually as part of `cos_init`. This assumes that
+ * the calling thread will become the main scheduling thread, and that
+ * it was created with the `defkernel` APIs.
+ *
+ * - @thd - a thread capability to the *idle thread* that is executing
+ *     the `slm_idle` function
+ * - @tid - the thread id of the idle thread
+ */
+void slm_init(thdcap_t thd, thdid_t tid);
+/*
+ * The initialization thread must execute this (post `slm_init`), and
+ * this thread will become the scheduler notification thread that
+ * polls the rcv end-point for other thread's activations and
+ * suspensions.
+ */
+void slm_sched_loop(void);
+void slm_sched_loop_nonblock(void);
+/*
+ * Return if the initialization is done *and* the scheduler thread on
+ * this core has executed the scheduler loop. All threads should not
+ * be activated in the policy (thus runnable) until this has been
+ * done.
+ */
+int slm_init_done(void);
+/* After a thread has been initialized, activate it! Calls `slm_thd_sched_update`. */
+int slm_thd_commit_updates(struct slm_thd *t);
+
+int  slm_thd_init(struct slm_thd *t, thdcap_t thd, thdid_t tid);
+void slm_thd_deinit(struct slm_thd *t);
+
+/* forward declarations, not part of the public API. */
+int slm_cs_enter_contention(struct slm_cs *cs, slm_cs_cached_t cached, struct slm_thd *curr, struct slm_thd *owner, int contended, sched_tok_t tok);
+int slm_cs_exit_contention(struct slm_cs *cs, struct slm_thd *curr, slm_cs_cached_t cached, sched_tok_t tok);
+
+/**
+ * Try to enter into the critical section. There are few ways that
+ * this can play out.
+ *
+ * 1. The lock is not owned by anyone, so we can take it! Use an
+ *     atomic instruction to update the value.
+ *
+ * 2. The lock is owned by another thread. We will try and switch
+ *     directly to that thread. This is subtly powerful: it enables us
+ *     to implement priority inheritance *regardless which scheduling
+ *     policy is used*.
+ *
+ * 3. We don't see someone owning the lock, *but* we race on updating
+ *     the lock to us as the owner, and the other thread wins. Instead
+ *     of trying to do option 2 here we return an error so that the
+ *     surrounding context can manage the "retries".
+ *
+ * - @current - The currently active thread that is calling this
+ *     function! Note that the liveness is awkward here. How do we
+ *     know if the thread's structure is live at this point? Simple:
+ *     we're currently executing the thread, so we simply need to
+ *     ensure that the `slm_thd` for a thread is live as long as the
+ *     thread is live...something that is fairly natural.
+
+ * - @ret - `0` if we have the critical section, `1` if there was a
+ *     race on setting the lock, and we lost, `-N` for errors on the
+ *     kernel call to switch threads, including `-EAGAIN` if there was
+ *     a race on the scheduler token, and `-EBUSY` if we are a
+ *     scheduling thread, and there are pending scheduler events.
+ */
+static inline int
+slm_cs_enter(struct slm_thd *current, slm_cs_flags_t flags)
+{
+	struct slm_cs  *cs;
+	slm_cs_cached_t cached;
+	sched_tok_t     tok;
+	struct slm_thd  *owner;
+	int             contended;
+
+	assert(current);
+	cs = &(slm_global()->lock);
+
+	while (1) {
+		tok    = cos_sched_sync();
+		cached = __slm_cs_data(cs, &owner, &contended);
+
+		if (unlikely(owner)) {
+			int ret;
+
+			ret = slm_cs_enter_contention(cs, cached, current, owner, contended, tok);
+			/* does the caller want to be notified of pending scheduler events? */
+			if (flags & SLM_CS_SCHEDEVT && ret == -EBUSY) return ret;
+			assert(ret != -EBUSY); /* no scheduler thread should not see these events */
+
+			if (flags & SLM_CS_NOSPIN) return ret;
+
+			continue;
+		}
+
+		/* success! common case */
+		if (likely(!__slm_cs_cas(cs, cached, current, 0))) return 0;
+		if (flags & SLM_CS_NOSPIN) return 1;
+	}
+}
+
+/*
+ * Release the scheduler critical section, switch to the scheduler
+ * thread if there is pending contention.
+ *
+ * Assume: the owner of the critical section is the same thread that
+ * calls `slm_cs_exit`.
+ */
+static inline void
+slm_cs_exit(struct slm_thd *switchto, slm_cs_flags_t flags)
+{
+	int ret = 1;
+	struct slm_cs *cs = &(slm_global()->lock);
+
+	while (ret != 0) {
+		int             contention;
+		sched_tok_t     tok;
+		slm_cs_cached_t cached;
+		struct slm_thd *current;
+
+		tok    = cos_sched_sync();
+		cached = __slm_cs_data(cs, &current, &contention);
+		/* Another thread attempted to enter the critical section */
+		if (unlikely(contention)) {
+			if (!slm_cs_exit_contention(cs, current, cached, tok)) return;
+
+			continue; /* we couldn't update the CS variable, try again */
+		}
+
+		/* The common case: release lock, no-one waiting for it */
+		ret = __slm_cs_cas(cs, cached, NULL, 0);
+		if (flags & SLM_CS_NOSPIN) return;
+		if (flags & SLM_CS_SCHEDEVT && ret == -EBUSY) return;
+	}
+
+	return;
+}
+
+static inline int slm_cs_exit_reschedule(struct slm_thd *curr, slm_cs_flags_t flags);
+
+/**
+ * `slm_switch_to` attempts to perform scheduler bypass and switch
+ * directly to the specified thread. This is pretty unsafe, in
+ * general. There is no critical section, and it bypasses all
+ * scheduling decisions. As we bypass scheduling decisions, we must
+ * decide with which priority we want to execute: the current
+ * thread's, or the next's. Thus, the `inherit_prio` value selects if
+ * the switched-to thread inherits this thread's priority.
+ *
+ * This function is mainly useful in defining scheduling fast-paths
+ * for communication between different threads. Though Composite IPC
+ * is very fast, IPC between threads has the overhead of component
+ * invocation, scheduling, and dispatch. Slite gets rid of the latter,
+ * and this effectively gets rid of the scheduling overhead.
+ *
+ * *Synchronization*: `tok` is passed as an argument enabling some
+ * limited synchronization as the surrounding context can access
+ * data-structures after taken the token, and the thread switch will
+ * be prevented if context switches happened in the mean-time.
+ *
+ * - `curr` - the current thread, only used when inheriting priority
+ * - `to` - thread to switch to
+ * - `tok` - the scheduler token, passed from the caller
+ * - `inherit_prio` - should `to` inherit `curr`'s priority?
+ */
+static inline int
+slm_switch_to(struct slm_thd *curr, struct slm_thd *to, sched_tok_t tok, int inherit_prio)
+{
+	if (unlikely(!slm_state_is_runnable(to->state))) return 1;
+
+	return slm_thd_activate(curr, to, tok, inherit_prio);
+}
+
+int slm_thd_block(struct slm_thd *t);
+int slm_thd_wakeup(struct slm_thd *t, int redundant);
+
+/***
+ * The `slm` time API. Unfortunately, three times are used in the
+ * system:
+ *
+ * 1. cycles which are the finest-granularity, and are accessed with
+ *    the least overhead (using direct instructions).
+ * 2. microseconds (usec), which are an intuitive time unit with which
+ *    users specify time. Relatively expensive to convert to and from
+ *    (requiring general multiplication and division.
+ * 3. tcap "ticks" which are some multiple of a cycle which are quick
+ *    to convert to and from.
+ *
+ * `slm` simply tries to hide tcap times, and interfaces with timer
+ * policy using only cycles. The conversion functions to and from
+ * microseconds are provided here for that policy to use, should it
+ * need it.
+ */
+
+static inline microsec_t
+slm_cyc2usec(cycles_t cyc)
+{
+	return cyc / slm_global()->cyc_per_usec;
+}
+
+static inline cycles_t
+slm_usec2cyc(microsec_t usec)
+{
+	return usec * slm_global()->cyc_per_usec;
+}
+
+/***
+ * Simple timeout API to enable the timer module to set and remove
+ * timeouts. Must be used with the scheduler's critical section taken.
+ */
+static inline void
+slm_timeout_set(cycles_t timeout)
+{
+	struct slm_global *g = slm_global();
+
+	g->timeout_next = tcap_cyc2time(timeout);
+	g->timer_next   = timeout;
+	g->timer_set    = 1;
+}
+
+static inline void
+slm_timeout_clear(void)
+{
+	slm_global()->timer_set = 0;
+}
+
+#endif	/* SLM_H */
diff --git a/src/components/lib/slm/slm_api.h b/src/components/lib/slm/slm_api.h
new file mode 100644
index 0000000000..093f49e08b
--- /dev/null
+++ b/src/components/lib/slm/slm_api.h
@@ -0,0 +1,248 @@
+#ifndef SLM_API_H
+#define SLM_API_H
+
+#include <slm.h>
+
+/***
+ * This file encodes the main means of communication that bind the
+ * different modules of `slm` together. The core modules are:
+ *
+ * 1. *slm* - the scheduler "core" logic that provides critical
+ *     sections, and coordinates thread state transitions, and
+ *     interacts with the nuances of the kernel's API.
+ * 2. *timer policy* - which is the timer policy and drives the timeout APIs
+ *     of `slm`, and tracks all timeouts, and their association with
+ *     threads.
+ * 3. *scheduler policy* - which drives the scheduling decisions of
+ *     the system by defining the scheduler policy.
+ * 4. *slm adapter* - the highest-level API that allocates and tracks
+ *     threads, and coordinates the coordination between the previous
+ *     three modules. This API bridges the higher level (e.g. `sched`)
+ *     API to the slm.
+ */
+
+/* These should be defined in their own policy files. */
+struct slm_timer_thd;
+struct slm_sched_thd;
+struct slm_resources_thd;
+
+/***
+ * The adapter layer coordinating API must define the following. These
+ * functions are used by the various modules to get access to their
+ * own structures that should be stored along with the `slm_thd`
+ * structure.
+ */
+struct slm_timer_thd *slm_thd_timer_policy(struct slm_thd *t);
+struct slm_sched_thd *slm_thd_sched_policy(struct slm_thd *t);
+struct slm_thd *slm_thd_from_timer(struct slm_timer_thd *t);
+struct slm_thd *slm_thd_from_sched(struct slm_sched_thd *t);
+struct slm_thd *slm_thd_lookup(thdid_t id);
+
+/***
+ * This is the timer API. Timer policy must define all of these
+ * functions that are used by the `slm` to expire timeouts (via
+ * `slm_timer_expire`), and for the adapter to create and cancel
+ * timers.
+ */
+
+/**
+ * This function is triggered by the `slm` core when a timeout
+ * expires. This function (and others) will likely want to use the
+ * `slm_timeout_set` (and `slm_timeout_clear`) function to set the
+ * timer as this value is what will eventually result in this function
+ * being called.
+ *
+ * - @now - the current cycle count, passed here to avoid the costs of
+ *          retrieving it from hardware registers (e.g. 30 cycles on
+ *          x86)
+ */
+void slm_timer_expire(cycles_t now);
+
+/**
+ * The API that the scheduler uses to interact with slm. Initialize
+ * and remove threads, add specific thread timeouts, remove them,
+ * etc... `cancel` cancels an active timeout for this thread.
+ */
+int slm_timer_thd_init(struct slm_thd *t);
+void slm_timer_thd_deinit(struct slm_thd *t);
+
+int slm_timer_add(struct slm_thd *t, cycles_t absolute_cyc);
+int slm_timer_cancel(struct slm_thd *t);
+
+int slm_timer_init(void);
+
+/***
+ * The API that the scheduling policy must implement.
+ *
+ * Module specifications:
+ *
+ * - The thread allocation and indexing interfaces that allocate the
+ *   thread representation in memory (thus it should be paired with
+ *   the policy if the policy needs additional fields), and converts
+ *   between thread ids, and that memory representation.
+ * - Scheduling policy hooks to implement the policy, and implements
+ *   the thread state machine going through initialization, setting up
+ *   parameters (modification), execution, blocking, and waking to
+ *   execute again, and removal from the system.
+ * - The low-level resource allocation APIs that are either backed by
+ *   an in-component mechanism (e.g. crt), or via invocation of other
+ *   components that have the privileges to do so.
+ *
+ * These do not need to be implemented by the same body of code, but
+ * do need to be compiled into the binary in some manner.
+ */
+
+#include <res_spec.h>
+
+/**
+ * Initialize the general scheduler toolkit.
+ */
+void slm_sched_init(void);
+/**
+ * Initialize a new thread (but don't yet add to scheduler queues).
+ */
+int slm_sched_thd_init(struct slm_thd *t);
+/**
+ * Prepare for thread deletion.
+ */
+void slm_sched_thd_deinit(struct slm_thd *t);
+/**
+ * Take a list of scheduler parameters, and apply them to a thread.
+ * Update the thread in the scheduler data-structures corresponding to
+ * these parameters.
+ */
+int slm_sched_thd_update(struct slm_thd *t, sched_param_type_t param, unsigned int v);
+
+/**
+ * Block the *current* thread, denoted by `t`.
+ */
+int slm_sched_block(struct slm_thd *t);
+/**
+ * Add the thread, `t`, for consideration for execution.
+ */
+int slm_sched_wakeup(struct slm_thd *t);
+
+/**
+ * Return the next thread (e.g. highest priority thread) that should
+ * execute. Can return `NULL` if no thread is runnable.
+ */
+struct slm_thd *slm_sched_schedule(void);
+/**
+ * Called to notify the scheduler that some amount of execution for
+ * thread t has elapsed.
+ */
+void slm_sched_execution(struct slm_thd *t, cycles_t cycles);
+
+/***
+ * Resource APIs.
+ */
+
+typedef void (*thd_fn_t)(void *);
+
+
+/*
+ * Macros to create the uniform functions that are used to coordinate
+ * between slm modules (scheduling policy, timer policy, and
+ * resource/memory management).
+ *
+ * ```c
+ * #include <slm_compose.h>
+ * #include <quantum.h>
+ * #include <fprr.h>
+ * #include <static_slab.h>
+ * SLM_MODULES_COMPOSE_FNS(quantum, fprr, static_sched);
+ * ```
+ *
+ * `static_slab.h` has to include `SLM_MODULES_COMPOSE_DATA();` after
+ * `struct slm_resources_thd` has been defined, but before the
+ * implementation requires `struct slm_thd_container`.
+ *
+ * This code creates the scheduler logic that uses a quantum-based
+ * timer with fixed-priority, round-robin scheduling, and static
+ * memory layout and resources.
+ *
+ * The thread structure created as a side-effect of this is a
+ * container including
+ *
+ * - core slm thread
+ * - scheduling policy data
+ * - timer policy data
+ * - resources allocated from the kernel via `crt`
+ *
+ * TODO: remove the requirement to have the resource policy module as
+ * part of all of this by enabling the kernel to return a pointer on
+ * event notification, rather than a thread id. The event retrieval is
+ * the only place that slm requires this mapping.
+ */
+
+#define SLM_MODULES_COMPOSE_FNS(timepol, schedpol, respol)		\
+	void slm_timer_expire(cycles_t now)				\
+	{ slm_timer_##timepol##_expire(now); }				\
+	int slm_timer_thd_init(struct slm_thd *t)			\
+	{ return slm_timer_##timepol##_thd_init(t); }			\
+	void slm_timer_thd_deinit(struct slm_thd *t)			\
+	{ slm_timer_##timepol##_thd_deinit(t); }			\
+	int slm_timer_add(struct slm_thd *t, cycles_t when)		\
+	{ return slm_timer_##timepol##_add(t, when); }			\
+	int slm_timer_cancel(struct slm_thd *t)				\
+	{ return slm_timer_##timepol##_cancel(t); }			\
+	int slm_timer_init(void)					\
+	{ return slm_timer_##timepol##_init(); }			\
+									\
+	void slm_sched_init(void)					\
+	{ slm_sched_##schedpol##_init(); }				\
+	int slm_sched_thd_init(struct slm_thd *t)			\
+	{ return slm_sched_##schedpol##_thd_init(t); }			\
+	void slm_sched_thd_deinit(struct slm_thd *t)			\
+	{ slm_sched_##schedpol##_thd_deinit(t); }			\
+	int slm_sched_thd_update(struct slm_thd *t, sched_param_type_t p, unsigned int v) \
+	{ return slm_sched_##schedpol##_thd_update(t, p, v); }		\
+	int slm_sched_block(struct slm_thd *t)				\
+	{ return slm_sched_##schedpol##_block(t); }			\
+	int slm_sched_wakeup(struct slm_thd *t)				\
+	{ return slm_sched_##schedpol##_wakeup(t); }			\
+	struct slm_thd *slm_sched_schedule(void)			\
+	{ return slm_sched_##schedpol##_schedule(); }			\
+	void slm_sched_execution(struct slm_thd *t, cycles_t c)		\
+	{ slm_sched_##schedpol##_execution(t, c); }			\
+									\
+	struct slm_thd *slm_thd_lookup(thdid_t id)			\
+	{ return slm_thd_##respol##_lookup(id); }
+
+#define SLM_MODULES_POLICY_PROTOTYPES(schedpol)				\
+	void slm_sched_##schedpol##_execution(struct slm_thd *t, cycles_t cycles); \
+	struct slm_thd *slm_sched_##schedpol##_schedule(void);		\
+	int slm_sched_##schedpol##_block(struct slm_thd *t);		\
+	int slm_sched_##schedpol##_wakeup(struct slm_thd *t);		\
+	void slm_sched_##schedpol##_yield(struct slm_thd *t, struct slm_thd *yield_to);	\
+	int slm_sched_##schedpol##_thd_init(struct slm_thd *t);		\
+	void slm_sched_##schedpol##_thd_deinit(struct slm_thd *t);	\
+	int slm_sched_##schedpol##_thd_update(struct slm_thd *t, sched_param_type_t type, unsigned int v); \
+	void slm_sched_##schedpol##_init(void);
+
+#define SLM_MODULES_TIMER_PROTOTYPES(timerpol)				\
+	void slm_timer_##timerpol##_expire(cycles_t now);		\
+	int slm_timer_##timerpol##_add(struct slm_thd *t, cycles_t absolute_timeout); \
+	int slm_timer_##timerpol##_cancel(struct slm_thd *t);		\
+	int slm_timer_##timerpol##_thd_init(struct slm_thd *t);		\
+	void slm_timer_##timerpol##_thd_deinit(struct slm_thd *t);	\
+	int slm_timer_##timerpol##_init(void);
+
+#define SLM_MODULES_COMPOSE_DATA()					\
+	struct slm_thd_container {					\
+		struct slm_thd           thd;				\
+		struct slm_sched_thd     sched;				\
+		struct slm_timer_thd     timer;				\
+		struct slm_resources_thd resources;			\
+	};								\
+									\
+	struct slm_timer_thd *slm_thd_timer_policy(struct slm_thd *t)	\
+	{ return &ps_container(t, struct slm_thd_container, thd)->timer; } \
+	struct slm_sched_thd *slm_thd_sched_policy(struct slm_thd *t)	\
+	{ return &ps_container(t, struct slm_thd_container, thd)->sched; } \
+	struct slm_thd *slm_thd_from_timer(struct slm_timer_thd *t)	\
+	{ return &ps_container(t, struct slm_thd_container, timer)->thd; } \
+	struct slm_thd *slm_thd_from_sched(struct slm_sched_thd *t)	\
+	{ return &ps_container(t, struct slm_thd_container, sched)->thd; }
+
+#endif	/* SLM_API_H */
diff --git a/src/components/lib/slm/slm_blkpt.c b/src/components/lib/slm/slm_blkpt.c
new file mode 100644
index 0000000000..cfd27ca234
--- /dev/null
+++ b/src/components/lib/slm/slm_blkpt.c
@@ -0,0 +1,129 @@
+#include <slm.h>
+#include <slm_blkpt.h>
+#include <stacklist.h>
+
+#define NBLKPTS 64
+struct blkpt_mem {
+	sched_blkpt_id_t      id;
+	sched_blkpt_epoch_t   epoch;
+	struct stacklist_head blocked;
+};
+static struct blkpt_mem __blkpts[NBLKPTS];
+static int __blkpt_offset = 1;
+
+#define BLKPT_EPOCH_BLKED_BITS ((sizeof(sched_blkpt_epoch_t) * 8)
+#define BLKPT_EPOCH_DIFF       (BLKPT_EPOCH_BLKED_BITS - 2)/2)
+
+/*
+ * Is cmp > e? This is more complicated than it seems it should be
+ * only because of wrap-around. We have to consider the case that we
+ * have, and that we haven't wrapped around.
+ */
+static int
+blkpt_epoch_is_higher(sched_blkpt_epoch_t e, sched_blkpt_epoch_t cmp)
+{
+	return (e > cmp && (e - cmp) > BLKPT_EPOCH_DIFF) || (e < cmp && (cmp - e) < BLKPT_EPOCH_DIFF);
+}
+
+static struct blkpt_mem *
+blkpt_get(sched_blkpt_id_t id)
+{
+	if (id - 1 == NBLKPTS) return NULL;
+
+	return &__blkpts[id-1];
+}
+
+sched_blkpt_id_t
+slm_blkpt_alloc(struct slm_thd *current)
+{
+	sched_blkpt_id_t id;
+	struct blkpt_mem *m;
+	sched_blkpt_id_t ret = SCHED_BLKPT_NULL;
+
+	slm_cs_enter(current, SLM_CS_NONE);
+
+	id = (sched_blkpt_id_t)__blkpt_offset;
+	m  = blkpt_get(id);
+	if (!m) ERR_THROW(SCHED_BLKPT_NULL, unlock);
+
+	m->id    = id;
+	ret      = id;
+	m->epoch = 0;
+	stacklist_init(&m->blocked);
+	__blkpt_offset++;
+unlock:
+	slm_cs_exit(NULL, SLM_CS_NONE);
+
+	return ret;
+}
+
+int
+slm_blkpt_free(sched_blkpt_id_t id)
+{
+	/* alloc only for now */
+	return 0;
+}
+
+int
+slm_blkpt_trigger(sched_blkpt_id_t blkpt, struct slm_thd *current, sched_blkpt_epoch_t epoch, int single)
+{
+	thdid_t tid;
+	struct blkpt_mem *m;
+	int ret = 0;
+	struct stacklist *sl;
+	struct slm_thd *t;
+
+	slm_cs_enter(current, SLM_CS_NONE);
+
+	m = blkpt_get(blkpt);
+	if (!m) ERR_THROW(-1, unlock);
+
+	/* is the new epoch more recent than the existing? */
+	if (!blkpt_epoch_is_higher(m->epoch, epoch)) ERR_THROW(0, unlock);
+
+	m->epoch = epoch;
+	while ((sl = stacklist_dequeue(&m->blocked)) != NULL) {
+		t = sl->data;
+		slm_thd_wakeup(t, 0); /* ignore retval: process next thread */
+
+		if (single) break;
+	}
+	/* most likely we switch to a woken thread here */
+	slm_cs_exit_reschedule(current, SLM_CS_NONE);
+
+	return 0;
+unlock:
+	slm_cs_exit(NULL, SLM_CS_NONE);
+
+	return ret;
+}
+
+int
+slm_blkpt_block(sched_blkpt_id_t blkpt, struct slm_thd *current, sched_blkpt_epoch_t epoch, thdid_t dependency)
+{
+	struct blkpt_mem *m;
+	struct stacklist sl; 	/* The stack-based structure we'll use to track ourself */
+	int ret = 0;
+
+	slm_cs_enter(current, SLM_CS_NONE);
+
+	m = blkpt_get(blkpt);
+	if (!m) ERR_THROW(-1, unlock);
+
+	/* Outdated event? don't block! */
+	if (blkpt_epoch_is_higher(m->epoch, epoch)) ERR_THROW(0, unlock);
+
+	/* Block! */
+	stacklist_add(&m->blocked, &sl, current);
+
+	if (slm_thd_block(current)) ERR_THROW(-1, unlock);
+
+	slm_cs_exit_reschedule(current, SLM_CS_NONE);
+	assert(stacklist_is_removed(&sl));
+
+	return 0;
+unlock:
+	slm_cs_exit(NULL, SLM_CS_NONE);
+
+	return ret;
+}
diff --git a/src/components/lib/slm/slm_blkpt.h b/src/components/lib/slm/slm_blkpt.h
new file mode 100644
index 0000000000..01a5b96aac
--- /dev/null
+++ b/src/components/lib/slm/slm_blkpt.h
@@ -0,0 +1,15 @@
+#ifndef SLM_BLKPT_H
+#define SLM_BLKPT_H
+
+#include <slm.h>
+
+typedef u32_t sched_blkpt_id_t;
+#define SCHED_BLKPT_NULL 0
+typedef word_t sched_blkpt_epoch_t;
+
+sched_blkpt_id_t slm_blkpt_alloc(struct slm_thd *current);
+int slm_blkpt_free(sched_blkpt_id_t id);
+int slm_blkpt_trigger(sched_blkpt_id_t blkpt, struct slm_thd *current, sched_blkpt_epoch_t epoch, int single);
+int slm_blkpt_block(sched_blkpt_id_t blkpt, struct slm_thd *current, sched_blkpt_epoch_t epoch, thdid_t dependency);
+
+#endif	/* SLM_BLKPT_H */
diff --git a/src/components/lib/slm/slm_container.h b/src/components/lib/slm/slm_container.h
new file mode 100644
index 0000000000..43c0b74ea8
--- /dev/null
+++ b/src/components/lib/slm/slm_container.h
@@ -0,0 +1,43 @@
+#ifndef SLM_CONTAINER_H
+#define SLM_CONTAINER_H
+
+/**
+ * This file is only to be included *after* you include the
+ * definitions of the all three types of blocks. This simply enables
+ * indexing and conversion between the different aspects of the
+ * thread. In short, this file is *not* self-contained, thus in no way
+ * useful on its own.
+ */
+
+struct slm_thd_container {
+	struct slm_thd thd;
+	struct slm_sched_thd sched;
+	struct slm_timer_thd timer;
+	struct crt_thd resources;
+};
+
+struct slm_timer_thd *
+slm_thd_timer_policy(struct slm_thd *t)
+{
+	return ps_container(t, struct slm_thd_container, thd)->timer;
+}
+
+struct slm_sched_thd *
+slm_thd_sched_policy(struct slm_thd *t)
+{
+	return ps_container(t, struct slm_thd_container, thd)->sched;
+}
+
+struct slm_thd *
+slm_thd_from_timer(struct slm_timer_thd *t)
+{
+	return ps_container(t, struct slm_thd_container, timer)->thd;
+}
+
+struct slm_thd *
+slm_thd_from_sched(struct slm_sched_thd *t)
+{
+	return ps_container(t, struct slm_thd_container, sched)->thd;
+}
+
+#endif
diff --git a/src/components/lib/slm/slm_mod_sched.h b/src/components/lib/slm/slm_mod_sched.h
new file mode 100644
index 0000000000..c0c70e891a
--- /dev/null
+++ b/src/components/lib/slm/slm_mod_sched.h
@@ -0,0 +1,40 @@
+#ifndef SLM_POLICY_H
+#define SLM_POLICY_H
+
+/***
+ * Module specifications:
+ *
+ * - The thread allocation and indexing interfaces that allocate the
+ *   thread representation in memory (thus it should be paired with
+ *   the policy if the policy needs additional fields), and converts
+ *   between thread ids, and that memory representation.
+ * - Scheduling policy hooks to implement the policy, and implements
+ *   the thread state machine going through initialization, setting up
+ *   parameters (modification), execution, blocking, and waking to
+ *   execute again, and removal from the system.
+ * - The low-level resource allocation APIs that are either backed by
+ *   an in-component mechanism (e.g. crt), or via invocation of other
+ *   components that have the privileges to do so.
+ *
+ * These do not need to be implemented by the same body of code, but
+ * do need to be compiled into the binary in some manner.
+ */
+
+/* Thread allocation and indexing API */
+
+struct slm_thd *slm_policy_thd_alloc(void);
+int slm_policy_thd_dealloc(struct slm_thd *);
+struct slm_thd *slm_policy_thd_lookup(thdid_t id);
+
+/* Scheduling policy APIs */
+
+#include <res_spec.h>
+
+int slm_policy_block(struct slm_thd *t);
+int slm_policy_wakeup(struct slm_thd *t);
+struct slm_thd *slm_policy_schedule(void);
+
+int slm_policy_thd_add(struct slm_thd *t);
+int slm_policy_thd_modify(struct slm_thd *t, sched_param_t param);
+
+#endif	/* SLM_POLICY_H */
diff --git a/src/components/lib/slm/slm_policy_timer.h b/src/components/lib/slm/slm_policy_timer.h
new file mode 100644
index 0000000000..07576ecd5e
--- /dev/null
+++ b/src/components/lib/slm/slm_policy_timer.h
@@ -0,0 +1,5 @@
+#ifndef SLM_POLICY_TIMER_H
+#define SLM_POLICY_TIMER_H
+
+
+#endif /* SLM_POLICY_TIMER_H */
diff --git a/src/components/lib/slm/slm_private.h b/src/components/lib/slm/slm_private.h
new file mode 100644
index 0000000000..0062e0e747
--- /dev/null
+++ b/src/components/lib/slm/slm_private.h
@@ -0,0 +1,205 @@
+#ifndef SLM_PRIVATE_H
+#define SLM_PRIVATE_H
+
+#include <cos_component.h>
+#include <ps.h>
+#include <slm_api.h>
+
+typedef unsigned long slm_cs_cached_t;
+/* Critical section (cs) API to protect scheduler data-structures */
+struct slm_cs {
+	unsigned long owner_contention;
+};
+
+static inline int
+slm_state_is_runnable(slm_thd_state_t s)
+{ return s == SLM_THD_RUNNABLE || s == SLM_THD_WOKEN; }
+
+static inline int
+slm_state_is_dead(slm_thd_state_t s)
+{ return s == SLM_THD_FREE || s == SLM_THD_DYING; }
+
+/**
+ * Get the metadata about the critical section (CS). This includes the
+ * owner thread (or `NULL`), and if the CS has been contended by another
+ * thread.
+ *
+ * - @cs - the critical section
+ * - @thd - the *returned* owner thread or `NULL`
+ * - @contention - {`0`, `1`} depending on if there is contention
+ * - @ret - a *cached* version of the critical section metadata to be passed into `__slm_cs_cas`.
+ */
+static inline slm_cs_cached_t
+__slm_cs_data(struct slm_cs *cs, struct slm_thd **thd, int *contention)
+{
+	unsigned long oc = ps_load(&cs->owner_contention);
+	/* least significant bit signifies contention */
+	*thd        = (struct slm_thd *)(oc & (~0UL << 1));
+	*contention = oc & 1;
+
+	return oc;
+}
+
+/**
+ * Update the critical section atomically using compare-and-swap.
+ * `cached` was returned from `__slm_cs_data`.
+ *
+ * - @cs - the critical section
+ * - @cached - the previous value of the critical section
+ * - @thd - thread owning the critical section or NULL
+ * - @contention - must be in {`0`, `1`} -- denotes if we want the
+ *                 contention bit to be set.
+ * - @ret - `0` on success to update the cs, `1` on failure
+ */
+static inline int
+__slm_cs_cas(struct slm_cs *cs, slm_cs_cached_t cached, struct slm_thd *thd, int contention)
+{
+	return !ps_cas(&cs->owner_contention, (unsigned long)cached, ((unsigned long)thd | !!contention));
+}
+
+struct slm_global {
+	struct slm_cs lock;
+
+	struct slm_thd sched_thd;
+	struct slm_thd idle_thd;
+
+	int         cyc_per_usec;
+	int         timer_set; 	  /* is the timer set? */
+	cycles_t    timer_next;	  /* ...what is it set to? */
+	tcap_time_t timeout_next; /* ...and what is the tcap representation? */
+
+	struct ps_list_head event_head;     /* all pending events for sched end-point */
+	struct ps_list_head graveyard_head; /* all deinitialized threads */
+} CACHE_ALIGNED;
+
+/*
+ * Simply retrieve this core's global data-structures.
+ */
+static inline struct slm_global *
+slm_global(void)
+{
+	extern struct slm_global __slm_global[NUM_CPU];
+
+	return &__slm_global[cos_coreid()];
+}
+
+/*
+ * Return if the given thread is normal, i.e. not the idle thread nor
+ * the scheduler thread.
+ */
+static inline int
+slm_thd_normal(struct slm_thd *t)
+{
+	struct slm_global *g = slm_global();
+
+	return t != &g->idle_thd && t != &g->sched_thd;
+}
+
+/*
+ * If the current thread is the scheduler or idle thread, return that
+ * slm_thd. That thread should generally never be used
+ */
+struct slm_thd *slm_thd_special(void);
+
+static inline int
+slm_thd_activate(struct slm_thd *curr, struct slm_thd *t, sched_tok_t tok, int inherit_prio)
+{
+	struct cos_defcompinfo *dci = cos_defcompinfo_curr_get();
+	struct cos_compinfo    *ci  = &dci->ci;
+	struct slm_global      *g   = slm_global();
+	tcap_prio_t             prio;
+	tcap_time_t             timeout;
+	int                     ret = 0;
+
+	timeout = g->timeout_next;
+	prio = inherit_prio ? curr->priority : t->priority;
+
+	if (unlikely(t->properties & (SLM_THD_PROPERTY_SEND | SLM_THD_PROPERTY_OWN_TCAP | SLM_THD_PROPERTY_SPECIAL))) {
+		if (t == &g->sched_thd) {
+			timeout = TCAP_TIME_NIL;
+			prio    = curr->priority;
+		}
+		if (t->properties & SLM_THD_PROPERTY_SEND) {
+			return cos_sched_asnd(t->asnd, g->timeout_next, g->sched_thd.rcv, tok);
+		} else if (t->properties & SLM_THD_PROPERTY_OWN_TCAP) {
+			return cos_switch(t->thd, t->tc, prio, timeout, g->sched_thd.rcv, tok);
+		}
+	}
+
+	ret = cos_defswitch(t->thd, prio, timeout, tok);
+
+	if (unlikely(ret == -EPERM && !slm_thd_normal(t))) {
+		/*
+		 * Attempting to activate scheduler thread or idle
+		 * thread failed for no budget in it's tcap. Force
+		 * switch to the scheduler with current tcap.
+		 */
+		ret = cos_switch(g->sched_thd.thd, 0, curr->priority, TCAP_TIME_NIL, g->sched_thd.rcv, tok);
+	}
+
+	return ret;
+}
+
+static inline void slm_cs_exit(struct slm_thd *switchto, slm_cs_flags_t flags);
+
+/*
+ * Do a few things: 1. call schedule to find the next thread to run,
+ * 2. release the critical section (note this will cause visual
+ * asymmetries in your code if you call slm_cs_enter before this
+ * function), and 3. switch to the given thread. It hides some races,
+ * and details that would make this difficult to write repetitively.
+ *
+ * Preconditions: if synchronization is required with code before
+ * calling this, you must call slm_cs_enter before-hand (this is likely
+ * a typical case).
+ *
+ * Return: the return value from cos_switch.  The caller must handle
+ * this value correctly.
+ *
+ * A common use-case is:
+ *
+ * slm_cs_enter(...);
+ * scheduling_stuff()
+ * slm_cs_exit_reschedule(...);
+ *
+ * ...which correctly handles any race-conditions on thread selection and
+ * dispatch.
+ */
+static inline int
+slm_cs_exit_reschedule(struct slm_thd *curr, slm_cs_flags_t flags)
+{
+	struct cos_compinfo    *ci  = &cos_defcompinfo_curr_get()->ci;
+	struct slm_global      *g   = slm_global();
+	struct slm_thd         *t;
+	sched_tok_t             tok;
+	int                     ret;
+
+	tok  = cos_sched_sync();
+	if (flags & SLM_CS_CHECK_TIMEOUT && g->timer_set) {
+		cycles_t now;
+		s64_t    diff;
+
+		now  = slm_now();
+		diff = (s64_t)(g->timer_next - now);
+		/* Do we need to recompute the timer? */
+		if (diff <= 0) {
+			g->timer_set = 0;
+			/* The timer policy will likely reset the timer */
+			slm_timer_expire(now);
+		}
+	}
+
+	t = slm_sched_schedule();
+	if (unlikely(!t)) t = &g->idle_thd;
+
+	assert(slm_state_is_runnable(t->state));
+	slm_cs_exit(NULL, flags);
+
+	ret = slm_thd_activate(curr, t, tok, 0);
+	/* Assuming only the single tcap with infinite budget...should not get EPERM */
+	assert(ret != -EPERM);
+
+	return ret;
+}
+
+#endif	/* SLM_PRIVATE_H */
diff --git a/src/components/lib/slm/slm_timer.h b/src/components/lib/slm/slm_timer.h
new file mode 100644
index 0000000000..8e10236a47
--- /dev/null
+++ b/src/components/lib/slm/slm_timer.h
@@ -0,0 +1,8 @@
+#ifndef SLM_TIMER_H
+#define SLM_TIMER_H
+
+struct slm_timer_thd {
+
+};
+
+#endif	/* SLM_TIMER_H */
diff --git a/src/components/lib/stubs/arch/arm/cos_asm_stubs.h b/src/components/lib/stubs/arch/arm/cos_asm_stubs.h
new file mode 100644
index 0000000000..37e96e8f7e
--- /dev/null
+++ b/src/components/lib/stubs/arch/arm/cos_asm_stubs.h
@@ -0,0 +1,148 @@
+#ifndef COS_ASM_STUB_ARM_H
+#define COS_ASM_STUB_ARM_H
+
+/* clang-format off */
+#ifdef COS_SERVER_STUBS
+#include "../../../kernel/include/asm_ipc_defs.h"
+//#include <consts.h>
+#include <cos_asm_simple_stacks.h>
+
+/*
+ * This is the default, simple stub that is a slightly faster path.
+ * Calls the server's function directly, instead of indirecting
+ * through a C stub.  Passes 4 arguments in registers, and returns a
+ * single value.
+ *
+ * The register layout is paired with that in ipc.S in the kernel,
+ * %ecx holding the token.  We zero out the %ebp so that if we do a
+ * stack trace later, we know that when the %ebp is 0, we are at the
+ * end of the stack.
+ */
+#define cos_asm_stub(name)			\
+.type  name, %function;				\
+.weak name;					\
+.globl __cosrt_s_##name;			\
+.type  __cosrt_s_##name, %function ;		\
+.align 16 ;					\
+__cosrt_s_##name:				\
+	COS_ASM_GET_STACK_INVTOKEN		\
+	mov fp, sp;				\
+	mov r0, r2;				\
+	mov r1, r3;				\
+	mov r2, r4;				\
+	mov r3, r5;				\
+	ldr r6, =name;				\
+	blx r6;					\
+						\
+	ldr r1, =RET_CAP;			\
+	COS_ASM_RET_STACK			\
+						\
+	svc #0x00;				\
+	.ltorg;
+
+/*
+ * This stub enables three return values (%ecx, %esi, %edi), AND
+ * requires that you provide separate stub functions that are
+ * indirectly activated and are written in C (in c_stub.c and s_stub.c
+ * using cos_stubs.h) to choose the calling convention you'd like.
+ */
+#define cos_asm_stub_indirect(name)		\
+.globl __cosrt_s_##name;			\
+.type  __cosrt_s_##name, %function ;		\
+.align 16 ;					\
+__cosrt_s_##name:				\
+	COS_ASM_GET_STACK_INVTOKEN              \
+	mov fp, sp;				\
+	mov r6, #0;				\
+	push {r6};				\
+	mov r6, sp;				\
+	mov r7, #0;				\
+	push {r7};				\
+	mov r7, sp;				\
+	mov r0, r2;				\
+	mov r1, r3;				\
+	mov r2, r4;				\
+	mov r3, r5;				\
+	push {r6-r7};				\
+	ldr r8, =__cosrt_s_cstub_##name;	\
+	blx r8;					\
+	ldr r2, [sp, #12];			\
+	ldr r3, [sp, #8];			\
+						\
+	ldr r1, =RET_CAP;			\
+	COS_ASM_RET_STACK			\
+						\
+	svc #0x00;				\
+	.ltorg;
+
+#endif
+
+#ifdef COS_UCAP_STUBS
+/*
+ * This file contains the client-side assembly stubs for a synchronous
+ * invocation (sinv).  It should be included in the assembly files
+ * that constitute the stubs in the src/component/interface/.../stubs/
+ * directories.  This part of the synchronous invocation path is very
+ * much like the Procedure Linkage Table (PLT) and indirects through a
+ * trampoline stub that parses a data-structure that locates the
+ * actual stub.
+ *
+ * This code creates
+ *
+ * 1. the user-level capability (ucap) structure that contains the
+ *    address of the stub to invoke when one of the server's interface
+ *    functions is invoked, and
+ *
+ * 2. the trampoline that actually implements the function's symbol,
+ *    and redirects the call to the stub, passing a reference to the
+ *    ucap to it.  That ucap contains the capability that should be
+ *    used for the kernel sinv.
+ */
+
+//#define __ASM__
+#include "../../../kernel/include/asm_ipc_defs.h"
+//#include <consts.h>
+
+/*
+ * Note that all ucaps are allocated into a separate section so that
+ * they are contiguous.  That section is then collapsed with .data
+ * during the build process (via comp.ld).
+ *
+ * The __cosrt_extern_* aliases are to support components to call a
+ * server function in an interface that it also exports.
+ */
+#define cos_asm_stub(name)			\
+.text;						\
+.weak name;					\
+.globl __cosrt_extern_##name;			\
+.type  name, %function;				\
+.type  __cosrt_extern_##name, %function;	\
+.align 8;					\
+name:						\
+__cosrt_extern_##name:				\
+	push {r0, r1, r2, r3, lr};		\
+	ldr r0, =__cosrt_ucap_##name;		\
+	ldr ip, =cos_inv_cap_set;		\
+	blx ip;					\
+	mov ip, r0;				\
+	pop {r0, r1, r2, r3, lr};		\
+	bx ip;					\
+	.ltorg					\
+						\
+.section .ucap, "a", %progbits;			\
+.globl __cosrt_ucap_##name;			\
+__cosrt_ucap_##name:				\
+        .rep UCAP_SZ;				\
+        .long 0;				\
+        .endr;					\
+.text /* start out in the text segment, and always return there */
+
+#define cos_asm_stub_indirect cos_asm_stub
+
+#endif
+
+.text
+
+/* clang-format on */
+
+#endif	/* COS_ASM_STUB_ARM_H */
diff --git a/src/components/lib/stubs/arch/x86/cos_asm_stubs.h b/src/components/lib/stubs/arch/x86/cos_asm_stubs.h
new file mode 100644
index 0000000000..7abcb7373e
--- /dev/null
+++ b/src/components/lib/stubs/arch/x86/cos_asm_stubs.h
@@ -0,0 +1,135 @@
+#ifndef COS_ASM_STUB_X86_H
+#define COS_ASM_STUB_X86_H
+
+/* clang-format off */
+#ifdef COS_SERVER_STUBS
+#include "../../../kernel/include/asm_ipc_defs.h"
+//#include <consts.h>
+#include <cos_asm_simple_stacks.h>
+
+/*
+ * This is the default, simple stub that is a slightly faster path.
+ * Calls the server's function directly, instead of indirecting
+ * through a C stub.  Passes 4 arguments in registers, and returns a
+ * single value.
+ *
+ * The register layout is paired with that in ipc.S in the kernel,
+ * %ecx holding the token.  We zero out the %ebp so that if we do a
+ * stack trace later, we know that when the %ebp is 0, we are at the
+ * end of the stack.
+ */
+#define cos_asm_stub(name)			\
+.globl __cosrt_s_##name;			\
+.type  __cosrt_s_##name, @function ;		\
+.align 16 ;					\
+__cosrt_s_##name:				\
+	COS_ASM_GET_STACK_INVTOKEN		\
+	pushl %ebp;				\
+	xor %ebp, %ebp;				\
+	pushl %edi;				\
+	pushl %esi;				\
+	pushl %ebx;				\
+	call name ;				\
+ 	/* addl $16, %esp; */			\
+	movl %eax, %ecx;			\
+	movl $RET_CAP, %eax;			\
+	COS_ASM_RET_STACK			\
+						\
+	sysenter;
+
+/*
+ * This stub enables three return values (%ecx, %esi, %edi), AND
+ * requires that you provide separate stub functions that are
+ * indirectly activated and are written in C (in c_stub.c and s_stub.c
+ * using cos_stubs.h) to choose the calling convention you'd like.
+ */
+#define cos_asm_stub_indirect(name)		\
+.globl __cosrt_s_##name;			\
+.type  __cosrt_s_##name, @function ;		\
+.align 16 ;					\
+__cosrt_s_##name:				\
+        COS_ASM_GET_STACK_INVTOKEN              \
+	pushl $0;				\
+	movl  %esp, %ecx;			\
+	pushl $0;				\
+	pushl %esp;				\
+	pushl %ecx;				\
+	pushl %ebp;				\
+	xor %ebp, %ebp;				\
+	pushl %edi;				\
+	pushl %esi;				\
+	pushl %ebx;				\
+	call __cosrt_s_cstub_##name ;		\
+	addl $24, %esp;				\
+	popl %edi;				\
+	popl %esi;				\
+						\
+	movl %eax, %ecx;			\
+	movl $RET_CAP, %eax;			\
+	COS_ASM_RET_STACK			\
+						\
+	sysenter;
+#endif
+
+#ifdef COS_UCAP_STUBS
+/*
+ * This file contains the client-side assembly stubs for a synchronous
+ * invocation (sinv).  It should be included in the assembly files
+ * that constitute the stubs in the src/component/interface/.../stubs/
+ * directories.  This part of the synchronous invocation path is very
+ * much like the Procedure Linkage Table (PLT) and indirects through a
+ * trampoline stub that parses a data-structure that locates the
+ * actual stub.
+ *
+ * This code creates
+ *
+ * 1. the user-level capability (ucap) structure that contains the
+ *    address of the stub to invoke when one of the server's interface
+ *    functions is invoked, and
+ *
+ * 2. the trampoline that actually implements the function's symbol,
+ *    and redirects the call to the stub, passing a reference to the
+ *    ucap to it.  That ucap contains the capability that should be
+ *    used for the kernel sinv.
+ */
+
+//#define __ASM__
+#include <consts.h>
+
+/*
+ * Note that all ucaps are allocated into a separate section so that
+ * they are contiguous.  That section is then collapsed with .data
+ * during the build process (via comp.ld).
+ *
+ * The __cosrt_extern_* aliases are to support components to call a
+ * server function in an interface that it also exports.
+ */
+
+#define cos_asm_stub(name)		       \
+.text;                                         \
+.weak name;                                    \
+.globl __cosrt_extern_##name;                  \
+.type  name, @function;			       \
+.type  __cosrt_extern_##name, @function;       \
+.align 8 ;                                     \
+name:                                          \
+__cosrt_extern_##name:			       \
+        movl $__cosrt_ucap_##name, %eax ;      \
+        jmp *INVFN(%eax) ;		       \
+					       \
+.section .ucap, "a", @progbits ;               \
+.globl __cosrt_ucap_##name ;                   \
+__cosrt_ucap_##name:                           \
+        .rep UCAP_SZ ;                         \
+        .long 0 ;                              \
+        .endr ;				       \
+.text /* start out in the text segment, and always return there */
+
+#define cos_asm_stub_indirect(name) cos_asm_stub(name)
+#endif
+
+.text
+
+/* clang-format on */
+
+#endif	/* COS_ASM_STUB_X86_H */
diff --git a/src/components/lib/stubs/arch/x86_64/cos_asm_stubs.h b/src/components/lib/stubs/arch/x86_64/cos_asm_stubs.h
new file mode 100644
index 0000000000..a61936787d
--- /dev/null
+++ b/src/components/lib/stubs/arch/x86_64/cos_asm_stubs.h
@@ -0,0 +1,134 @@
+#ifndef COS_ASM_STUB_X86_64_H
+#define COS_ASM_STUB_X86_64_H
+
+/* clang-format off */
+#ifdef COS_SERVER_STUBS
+#include "../../../kernel/include/asm_ipc_defs.h"
+//#include <consts.h>
+#include <cos_asm_simple_stacks.h>
+
+/*
+ * This is the default, simple stub that is a slightly faster path.
+ * Calls the server's function directly, instead of indirecting
+ * through a C stub.  Passes 4 arguments in registers, and returns a
+ * single value.
+ *
+ * The register layout is paired with that in ipc.S in the kernel,
+ * %ecx holding the token.  We zero out the %ebp so that if we do a
+ * stack trace later, we know that when the %ebp is 0, we are at the
+ * end of the stack.
+ */
+#define cos_asm_stub(name)					\
+.globl __cosrt_s_##name;					\
+.type  __cosrt_s_##name, @function ;				\
+.align 16 ;							\
+__cosrt_s_##name:						\
+	COS_ASM_GET_STACK_INVTOKEN				\
+	mov %r12, %rcx;						\
+	xor %rbp, %rbp;						\
+	mov %rdi, %rax;						\
+	mov %rbx, %rdi;						\
+	mov %rax, %rdx;						\
+	/* ABI mandate a 16-byte alignment stack pointer*/	\
+	and $~0xf, %rsp;					\
+	call name ;						\
+ 	/* addl $16, %esp; */					\
+	mov %rax, %r8;						\
+	mov $RET_CAP, %rax;					\
+	COS_ASM_RET_STACK					\
+	syscall;
+
+/*
+ * This stub enables three return values (%ecx, %esi, %edi), AND
+ * requires that you provide separate stub functions that are
+ * indirectly activated and are written in C (in c_stub.c and s_stub.c
+ * using cos_stubs.h) to choose the calling convention you'd like.
+ */
+#define cos_asm_stub_indirect(name)		\
+.globl __cosrt_s_##name;			\
+.type  __cosrt_s_##name, @function ;		\
+.align 16 ;					\
+__cosrt_s_##name:				\
+	COS_ASM_GET_STACK_INVTOKEN		\
+	/* 16-byte alignment of rsp*/		\
+	and $~0xf, %rsp;			\
+	push $0;				\
+	mov %rsp, %r8;				\
+	push $0;				\
+	mov %rsp, %r9;				\
+	mov %r12, %rcx;				\
+	xor %rbp, %rbp;				\
+	mov %rdi, %r12;				\
+	mov %rbx, %rdi;				\
+	mov %r12, %rdx;				\
+	call __cosrt_s_cstub_##name ;		\
+	pop %rdi;				\
+	pop %rsi;				\
+	mov %rax, %r8;				\
+	mov $RET_CAP, %rax;			\
+	COS_ASM_RET_STACK			\
+	syscall;
+#endif
+
+#ifdef COS_UCAP_STUBS
+/*
+ * This file contains the client-side assembly stubs for a synchronous
+ * invocation (sinv).  It should be included in the assembly files
+ * that constitute the stubs in the src/component/interface/.../stubs/
+ * directories.  This part of the synchronous invocation path is very
+ * much like the Procedure Linkage Table (PLT) and indirects through a
+ * trampoline stub that parses a data-structure that locates the
+ * actual stub.
+ *
+ * This code creates
+ *
+ * 1. the user-level capability (ucap) structure that contains the
+ *    address of the stub to invoke when one of the server's interface
+ *    functions is invoked, and
+ *
+ * 2. the trampoline that actually implements the function's symbol,
+ *    and redirects the call to the stub, passing a reference to the
+ *    ucap to it.  That ucap contains the capability that should be
+ *    used for the kernel sinv.
+ */
+
+//#define __ASM__
+#include <consts.h>
+
+/*
+ * Note that all ucaps are allocated into a separate section so that
+ * they are contiguous.  That section is then collapsed with .data
+ * during the build process (via comp.ld).
+ *
+ * The __cosrt_extern_* aliases are to support components to call a
+ * server function in an interface that it also exports.
+ */
+
+#define cos_asm_stub(name)			\
+.text;						\
+.weak name;					\
+.globl __cosrt_extern_##name;			\
+.type  name, @function;				\
+.type  __cosrt_extern_##name, @function;	\
+.align 8 ;					\
+name:						\
+__cosrt_extern_##name:				\
+	movabs $__cosrt_ucap_##name, %rax ;	\
+	jmp *INVFN(%rax) ;			\
+						\
+.section .ucap, "a", @progbits ;		\
+.globl __cosrt_ucap_##name ;			\
+__cosrt_ucap_##name:				\
+	.rep UCAP_SZ ;				\
+	.quad 0 ;				\
+	.endr ;					\
+.text /* start out in the text segment, and always return there */
+
+#define cos_asm_stub_indirect(name) cos_asm_stub(name)
+#endif
+
+.text
+
+/* clang-format on */
+
+#endif	/* COS_ASM_STUB_X86_H */
diff --git a/src/components/lib/stubs/cos_asm_stubs.h b/src/components/lib/stubs/cos_asm_stubs.h
index 3f74140094..20695b0572 100644
--- a/src/components/lib/stubs/cos_asm_stubs.h
+++ b/src/components/lib/stubs/cos_asm_stubs.h
@@ -1,135 +1,14 @@
 #ifndef COS_ASM_STUB_H
 #define COS_ASM_STUB_H
 
-/* clang-format off */
-#ifdef COS_SERVER_STUBS
-#include "../../../kernel/include/asm_ipc_defs.h"
-//#include <consts.h>
-#include <cos_asm_simple_stacks.h>
-
-/*
- * This is the default, simple stub that is a slightly faster path.
- * Calls the server's function directly, instead of indirecting
- * through a C stub.  Passes 4 arguments in registers, and returns a
- * single value.
- *
- * The register layout is paired with that in ipc.S in the kernel,
- * %ecx holding the token.  We zero out the %ebp so that if we do a
- * stack trace later, we know that when the %ebp is 0, we are at the
- * end of the stack.
- */
-#define cos_asm_stub(name)			\
-.globl __cosrt_s_##name;			\
-.type  __cosrt_s_##name, @function ;		\
-.align 16 ;					\
-__cosrt_s_##name:				\
-	COS_ASM_GET_STACK_INVTOKEN		\
-	pushl %ebp;				\
-	xor %ebp, %ebp;				\
-	pushl %edi;				\
-	pushl %esi;				\
-	pushl %ebx;				\
-	call name ;				\
- 	/* addl $16, %esp; */			\
-	movl %eax, %ecx;			\
-	movl $RET_CAP, %eax;			\
-	COS_ASM_RET_STACK			\
-						\
-	sysenter;
-
-/*
- * This stub enables three return values (%ecx, %esi, %edi), AND
- * requires that you provide separate stub functions that are
- * indirectly activated and are written in C (in c_stub.c and s_stub.c
- * using cos_stubs.h) to choose the calling convention you'd like.
- */
-#define cos_asm_stub_indirect(name)		\
-.globl __cosrt_s_##name;			\
-.type  __cosrt_s_##name, @function ;		\
-.align 16 ;					\
-__cosrt_s_##name:				\
-        COS_ASM_GET_STACK_INVTOKEN              \
-	pushl $0;				\
-	movl  %esp, %ecx;			\
-	pushl $0;				\
-	pushl %esp;				\
-	pushl %ecx;				\
-	pushl %ebp;				\
-	xor %ebp, %ebp;				\
-	pushl %edi;				\
-	pushl %esi;				\
-	pushl %ebx;				\
-	call __cosrt_s_cstub_##name ;		\
-	addl $24, %esp;				\
-	popl %edi;				\
-	popl %esi;				\
-						\
-	movl %eax, %ecx;			\
-	movl $RET_CAP, %eax;			\
-	COS_ASM_RET_STACK			\
-						\
-	sysenter;
-#endif
-
-#ifdef COS_UCAP_STUBS
-/*
- * This file contains the client-side assembly stubs for a synchronous
- * invocation (sinv).  It should be included in the assembly files
- * that constitute the stubs in the src/component/interface/.../stubs/
- * directories.  This part of the synchronous invocation path is very
- * much like the Procedure Linkage Table (PLT) and indirects through a
- * trampoline stub that parses a data-structure that locates the
- * actual stub.
- *
- * This code creates
- *
- * 1. the user-level capability (ucap) structure that contains the
- *    address of the stub to invoke when one of the server's interface
- *    functions is invoked, and
- *
- * 2. the trampoline that actually implements the function's symbol,
- *    and redirects the call to the stub, passing a reference to the
- *    ucap to it.  That ucap contains the capability that should be
- *    used for the kernel sinv.
- */
-
-#define __ASM__
-#include <consts.h>
-
-/*
- * Note that all ucaps are allocated into a separate section so that
- * they are contiguous.  That section is then collapsed with .data
- * during the build process (via comp.ld).
- *
- * The __cosrt_extern_* aliases are to support components to call a
- * server function in an interface that it also exports.
- */
-
-#define cos_asm_stub(name)		       \
-.text;                                         \
-.weak name;                                    \
-.globl __cosrt_extern_##name;                  \
-.type  name, @function;			       \
-.type  __cosrt_extern_##name, @function;       \
-.align 8 ;                                     \
-name:                                          \
-__cosrt_extern_##name:			       \
-        movl $__cosrt_ucap_##name, %eax ;      \
-        jmp *INVFN(%eax) ;		       \
-					       \
-.section .ucap, "a", @progbits ;               \
-.globl __cosrt_ucap_##name ;                   \
-__cosrt_ucap_##name:                           \
-        .rep UCAP_SZ ;                         \
-        .long 0 ;                              \
-        .endr ;				       \
-.text /* start out in the text segment, and always return there */
-
-#define cos_asm_stub_indirect(name) cos_asm_stub(name)
+#if defined(__x86__)
+#include "arch/x86/cos_asm_stubs.h"
+#elif defined(__x86_64__)
+#include "arch/x86_64/cos_asm_stubs.h"
+#elif defined(__arm__)
+#include "arch/arm/cos_asm_stubs.h"
+#else
+#error "Undefined architecture!"
 #endif
 
-.text
-
-/* clang-format on */
-
 #endif	/* COS_ASM_STUB_H */
diff --git a/src/components/lib/stubs/cos_stubs.h b/src/components/lib/stubs/cos_stubs.h
index 58707c8c0f..a730c6a9f3 100644
--- a/src/components/lib/stubs/cos_stubs.h
+++ b/src/components/lib/stubs/cos_stubs.h
@@ -15,13 +15,14 @@
 #include <cos_kernel_api.h>
 #include <cos_types.h>
 
+#include <c_stub.h>
+
 /*
  * Macros for defining C stubs for the client and server. These
  * functions are called through the PLT-like level of indirection on
  * interface functions that ensure the the invocation information
  * (struct usr_inv_cap) which includes the capability id.
  */
-#define COS_CLIENT_STUB(_type, _client_fn) __attribute__((regparm(1))) _type __cosrt_c_##_client_fn
 
 /*
  * Note that this provides the complete prototype as it is fixed for
@@ -29,7 +30,7 @@
  */
 #define COS_SERVER_STUB(_type, _server_fn)				\
 _type									\
-__cosrt_s_cstub_##_server_fn##(word_t p0, word_t p1, word_t p2, word_t p3, word_t *r1, word_t *r2)
+__cosrt_s_cstub_##_server_fn(word_t p0, word_t p1, word_t p2, word_t p3, word_t *r1, word_t *r2)
 
 #define COS_SERVER_3RET_STUB(_type, _server_fn)			\
 _type								\
diff --git a/src/components/lib/tmr/Makefile b/src/components/lib/tmr/Makefile
new file mode 100644
index 0000000000..43c9731fb1
--- /dev/null
+++ b/src/components/lib/tmr/Makefile
@@ -0,0 +1,63 @@
+# Required variables used to drive the compilation process. It is OK
+# for many of these to be empty.
+#
+# The library names associated with .a files output that are linked
+# (via, for example, -ltmr) into dependents. This list should be
+# "tmr" for output files such as libtmr.a.
+LIBRARY_OUTPUT = tmr
+# The .o files that are mandatorily linked into dependents. This is
+# rarely used, and only when normal .a linking rules will avoid
+# linking some necessary objects. This list is of names (for example,
+# tmr) which will generate tmr.lib.o. Do NOT include the list of .o
+# files here. Please note that using this list is *very rare* and
+# should only be used when the .a support above is not appropriate.
+OBJECT_OUTPUT =
+# The path within this directory that holds the .h files for
+# dependents to compile with (./ by default). Will be fed into the -I
+# compiler arguments.
+INCLUDE_PATHS = .
+# The interfaces this component is dependent on for compilation (this
+# is a list of directory names in interface/)
+INTERFACE_DEPENDENCIES = tmrmgr evt
+# The library dependencies this component is reliant on for
+# compilation/linking (this is a list of directory names in lib/)
+LIBRARY_DEPENDENCIES = component
+# Note: Both the interface and library dependencies should be
+# *minimal*. That is to say that removing a dependency should cause
+# the build to fail. The build system does not validate this
+# minimality; that's on you!
+
+# There are two different *types* of Makefiles for libraries.
+# 1. Those that are Composite-specific, and simply need an easy way to
+#    compile and itegrate their code.
+# 2. Those that aim to integrate external libraries into
+#    Composite. These focus on "driving" the build process of the
+#    external library, then pulling out the resulting files and
+#    directories. These need to be flexible as all libraries are
+#    different.
+
+# Type 1, Composite library: This is the default Makefile for
+# libraries written for composite. Get rid of this if you require a
+# custom Makefile (e.g. if you use an existing
+# (non-composite-specific) library. An example of this is `kernel`.
+include Makefile.lib
+
+## Type 2, external library: If you need to specialize the Makefile
+## for an external library, you can add the external code as a
+## subdirectory, and drive its compilation, and integration with the
+## system using a specialized Makefile. The Makefile must generate
+## lib$(LIBRARY_OUTPUT).a and $(OBJECT_OUTPUT).lib.o, and have all of
+## the necessary include paths in $(INCLUDE_PATHS).
+##
+## To access the Composite Makefile definitions, use the following. An
+## example of a Makefile written in this way is in `ps/`.
+#
+# include Makefile.src Makefile.comp Makefile.dependencies
+# .PHONY: all clean init distclean
+## Fill these out with your implementation
+# all:
+# clean:
+#
+## Default rules:
+# init: clean all
+# distclean: clean
diff --git a/src/components/lib/tmr/doc.md b/src/components/lib/tmr/doc.md
new file mode 100644
index 0000000000..7fae3c8ac7
--- /dev/null
+++ b/src/components/lib/tmr/doc.md
@@ -0,0 +1,7 @@
+## tmr
+
+The timer library, call to make timers. This is how timers are intended to be used; Do not directly call tmrmgr interfaces.
+
+### Description
+
+### Usage and Assumptions
diff --git a/src/components/lib/tmr/tmr.h b/src/components/lib/tmr/tmr.h
new file mode 100644
index 0000000000..4ab7e3c7c1
--- /dev/null
+++ b/src/components/lib/tmr/tmr.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2020, Runyu Pan, GWU, panrunyu@gwu.edu.
+ *
+ * This uses a two clause BSD License.
+ */
+
+#ifndef TMR_H
+#define TMR_H
+
+/***
+ * Timer implementation. This assumes both one-shot and periodic timers.
+ */
+
+#include <evt.h>
+#include <tmrmgr.h>
+
+#include <errno.h>
+#define TMR_TRY_AGAIN		EAGAIN
+/* cannot allocate due to a lack of memory */
+#define TMR_ERR_NOMEM		ENOMEM
+/* passed an invalid argument */
+#define TMR_ERR_INVAL_ARG	EINVAL
+
+/*
+ * This is the timer data-structure. We assume that timers are always used by one process,
+ * and they are never shared. We don't do reference counting on this at all. Also, timers
+ * are always free-running; thus it does not have any blkpts. All of these blocking features
+ * rely on the event manager.
+ */
+struct tmr {
+	tmr_id_t id;
+	evt_res_id_t evt_id;
+	unsigned int usecs;
+	tmr_flags_t flags;
+};
+
+/**
+ * `tmr_init` initializes a timer data-structure, and creates a new
+ * timer with `time` cycles. The 'type' can be  each of maximum size `item_sz`.
+ *
+ * - @usecs - The time value. Unit is microseconds.
+ * - @tmr_flags_t flags  - Requested timer type, periodic or one-shot.
+ * - @return  - `0` on success, `-errval` where `errval` is one of the above `CHAN_ERR_*` values.
+ */
+static inline int
+tmr_init(struct tmr *t, unsigned int usecs, tmr_flags_t flags)
+{
+	tmr_id_t id;
+	int ret;
+	
+	if ((flags != TMR_ONESHOT) && (flags != TMR_PERIODIC)) return -TMR_ERR_INVAL_ARG;
+	id = tmrmgr_create(usecs, flags);
+	if (id == 0) return -TMR_ERR_NOMEM;
+	
+	t->id = id;
+	t->usecs = usecs;
+	t->flags = flags;
+	t->evt_id = 0;
+	
+	return 0;
+}
+
+/**
+ * 'tmr_teardown' always directly destroys a timer regardless of its usage.
+ * Currently unimplemented - teardown 
+ */
+static inline int
+tmr_teardown(struct tmr *t)
+{
+	return -TMR_ERR_INVAL_ARG;
+}
+
+/**
+ * 'tmr_start' starts an initialized timer.
+ */
+static inline int
+tmr_start(struct tmr *t)
+{
+	int ret;
+	
+	ret = tmrmgr_start(t->id);
+	
+	if (ret == -1) return -TMR_ERR_INVAL_ARG;
+	else if(ret == -2) return TMR_TRY_AGAIN;
+	
+	return 0;
+}
+
+/**
+ * 'tmr_stop' stops an started timer.
+ */
+static inline int
+tmr_stop(struct tmr *t)
+{
+	int ret;
+
+	ret = tmrmgr_stop(t->id);
+	
+	if (ret == -1) return -TMR_ERR_INVAL_ARG;
+	else if(ret == -2) return TMR_TRY_AGAIN;
+	
+	return 0;
+}
+
+/**
+ * Add the event resource id into the timer so that when the timer
+ * fires, it will trigger the event of the waiting thread. `disassociate`
+ * removes the previous association.
+ *
+ * - @t      - timer to add to the event set
+ * - @eid    - the event resource id to be triggered
+ * - @return -
+ *
+ *     - `0` on success
+ *     - `-n` for error with `n` being an errno value
+ */
+static inline int 
+tmr_evt_associate(struct tmr *t, evt_res_id_t eid)
+{
+	int ret;
+
+	if (t->evt_id != 0) return -1;
+	t->evt_id = eid;
+
+	ret = tmrmgr_evt_set(t->id, t->evt_id);
+
+	return ret;
+}
+
+static inline evt_res_id_t
+tmr_evt_associated(struct tmr *t)
+{
+	if (t->evt_id == 0) {
+		t->evt_id = tmrmgr_evt_get(t->id);
+	}
+
+	return t->evt_id;
+}
+
+static inline int
+tmr_evt_disassociate(struct tmr *t)
+{
+	evt_res_id_t eid = 0;
+
+	if (t->evt_id == 0) return -1;
+	tmrmgr_evt_set(t->id, 0);
+	t->evt_id = 0;
+
+	return 0;
+}
+
+#endif /* TMR_H */
diff --git a/src/components/lib/ubench/perfdata.h b/src/components/lib/ubench/perfdata.h
index 31a29fb735..73936a84d5 100644
--- a/src/components/lib/ubench/perfdata.h
+++ b/src/components/lib/ubench/perfdata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019, Phani Gadepalli and Sebastian Foubert
+ * Copyright 2019, Phani Gadepalli, Sebastian Foubert and Runyu Pan
  *
  * This uses a two clause BSD License.
  */
@@ -9,13 +9,14 @@
 
 #include <cos_debug.h>
 #include <llprint.h>
+#include <errno.h>
 
 #ifndef PERF_VAL_MAX_SZ
 #define PERF_VAL_MAX_SZ    10000
 #endif
 
 #define PERF_VAL_MIN_SZ    10
-#define PERF_DATA_NAME     32
+#define PERF_DATA_NAME     64
 #define PERF_PTILE_SZ      3
 
 #define PERF_DATA_DEBUG
@@ -30,7 +31,7 @@ struct perfdata {
 	char      name[PERF_DATA_NAME];
 	cycles_t *values;
 	int       sz;
-	int	      array_size;
+	int	  array_size;
 	cycles_t  min, max, avg, total;
 	cycles_t  sd, var;
 	cycles_t  ptiles[PERF_PTILE_SZ]; /* 90, 95, 99 */
@@ -232,4 +233,19 @@ perfdata_print(struct perfdata *pd)
 		pd->name, pd->sz, pd->sd, pd->avg, pd->ptiles[PTILE_99], pd->max);
 }
 
+static void
+perfdata_all(struct perfdata *pd)
+{
+	int i;
+
+	perfdata_print(pd);
+	
+	printc(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n");
+	
+	printc("#Latency\n");
+	for (i = 0 ; i < pd->sz ; i++) printc("V: %llu\n", pd->values[i]);
+	
+	printc("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n\n");
+}
+
 #endif /* PERFDATA_H */
diff --git a/src/components/lib/util/stacklist.h b/src/components/lib/util/stacklist.h
index 8651a408a7..4c757b7b9e 100644
--- a/src/components/lib/util/stacklist.h
+++ b/src/components/lib/util/stacklist.h
@@ -12,8 +12,8 @@
 #include <ps.h>
 
 struct stacklist {
-	thdid_t thdid;
 	struct stacklist *next;
+	void *data;
 };
 
 struct stacklist_head {
@@ -42,10 +42,10 @@ stacklist_rem(struct stacklist *l)
 
 /* Add a thread that is going to block */
 static inline void
-stacklist_add(struct stacklist_head *h, struct stacklist *l)
+stacklist_add(struct stacklist_head *h, struct stacklist *l, void *data)
 {
-	l->thdid = cos_thdid();
-	l->next  = NULL;
+	l->next = NULL;
+	l->data = data;
 	assert(h);
 
 	while (1) {
@@ -57,12 +57,12 @@ stacklist_add(struct stacklist_head *h, struct stacklist *l)
 }
 
 /* Get a thread to wake up, and remove its record! */
-static inline thdid_t
+static inline struct stacklist *
 stacklist_dequeue(struct stacklist_head *h)
 {
 	struct stacklist *sl;
 
-	if (!h->head) return 0;
+	if (!h->head) return NULL;
 
 	/*
 	 * Only a single thread should trigger an event, and dequeue
@@ -77,7 +77,7 @@ stacklist_dequeue(struct stacklist_head *h)
 	}
 	sl->next = NULL;
 
-	return sl->thdid;
+	return sl;
 }
 
 /*
diff --git a/src/composer/src/address_assignment.rs b/src/composer/src/address_assignment.rs
new file mode 100644
index 0000000000..88a247ea0b
--- /dev/null
+++ b/src/composer/src/address_assignment.rs
@@ -0,0 +1,81 @@
+use passes::{AddressAssignmentPass, BuildState, ComponentId, SystemState, Transition};
+use std::collections::HashMap;
+
+pub struct AddressAssignmentx86_64 {
+    baseaddrs: HashMap<ComponentId, u64>,
+}
+
+impl AddressAssignmentPass for AddressAssignmentx86_64 {
+    fn component_baseaddr(&self, id: &ComponentId) -> u64 {
+        // unwrap as we already sanitized/validated the ids.
+        *self.baseaddrs.get(&id).unwrap()
+    }
+}
+
+impl Transition for AddressAssignmentx86_64 {
+    fn transition(s: &SystemState, _b: &mut dyn BuildState) -> Result<Box<Self>, String> {
+        let ases = s.get_named();
+        // This is the offset into each address space name that each
+        // component starts at (unless manually overridden). This is a
+        // 4MB offset, mainly just a known value significantly larger
+        // than NULL = 0.
+        let addr_offset = 0x400000;
+        // We're assuming 64 bit systems here, and x86-64
+        // specifically. This is the size of the address range in each
+        // second level nodes of the page-table.
+        //
+        // TODO: make this math architecture-specific by adding a
+        // per-architecture configuration file.
+        //
+        // 2^9 = # of entries per page-table node
+        // (2^9)^3 = # 3 levels of page-tables
+        let addrspc_name_sz = u64::pow(u64::pow(2, 9), 3) * u64::pow(2, 12);
+        // 2^48 is the size of the virtual address space on x86-64, so
+        // a sanity check:
+        assert_eq!(addrspc_name_sz, u64::pow(2, 48) / u64::pow(2, 9));
+        let mut baseaddrs = HashMap::new();
+	// Track the last assigned address to a VAS, so that parent
+	// relationships know where to start child addresses.
+	let mut lastaddr = HashMap::new();
+
+        for (_, a) in ases.addrspc_components_shared() {
+            let mut offset = addr_offset;
+	    if let Some(ref p) = a.parent {
+		// Lets start our address space name where our parent
+		// left off. Unwrap is OK as we've already validated
+		// the name.
+		offset = *lastaddr.get(p).unwrap();
+	    }
+            for c in &a.components {
+                let id = s.get_named().rmap().get(&c).unwrap();
+                baseaddrs.insert(*id, offset);
+                offset += addrspc_name_sz;
+            }
+	    lastaddr.insert(&a.name, offset); // record the next name *past* the parent's
+        }
+
+        // All components within their own exclusive address space:
+        // use the default base address, or the one that is explicitly
+        // chosen within the composition script
+        for c in ases.addrspc_components_exclusive() {
+            let id = s.get_named().rmap().get(&c).unwrap();
+            let comp = s.get_spec().component_named(&c);
+            let preproc_addr = comp.base_vaddr.trim_start_matches("0x");
+            let addr_wrapped = u64::from_str_radix(preproc_addr, 16);
+            let mut addr = addr_offset;
+
+            if let Ok(a) = addr_wrapped {
+                addr = a;
+            } else {
+                println!(
+                    r#"Warning (do not ignore): Cannot parse the base address, {}, for component "{}" as hexdecimal. Using default."#,
+                    comp.base_vaddr, c
+                );
+            }
+
+            baseaddrs.insert(*id, addr);
+        }
+
+        Ok(Box::new(AddressAssignmentx86_64 { baseaddrs }))
+    }
+}
diff --git a/src/composer/src/build.rs b/src/composer/src/build.rs
index 969d3f7838..9d3833da07 100644
--- a/src/composer/src/build.rs
+++ b/src/composer/src/build.rs
@@ -1,10 +1,9 @@
-
 use initargs::ArgsKV;
-use passes::{component, deps, exports, BuildState, ComponentId, SystemState};
+use passes::{component, deps, exports, AddrSpcName, BuildState, ComponentId, SystemState};
+use std::env;
 use std::fs::File;
 use syshelpers::{dir_exists, emit_file, exec_pipeline, reset_dir};
 use tar::Builder;
-use std::env;
 
 // Interact with the composite build system to "seal" the components.
 // This requires linking them with all dependencies, and with libc,
@@ -115,7 +114,6 @@ fn constructor_serialize_args(
     b: &dyn BuildState,
 ) -> Result<String, String> {
     let mut sinvs = Vec::new();
-    let mut ids = Vec::new();
 
     for s in s.get_invs_id(id).invocations().iter() {
         let mut sinv = Vec::new();
@@ -146,6 +144,7 @@ fn constructor_serialize_args(
         sinvs.push(ArgsKV::new_arr(String::from("_"), sinv));
     }
 
+    let mut ids = Vec::new();
     s.get_named().ids().iter().for_each(|(id, _cname)| {
         let info_addr = s.get_objs_id(&id).comp_symbs().comp_info;
         let cinfo = ArgsKV::new_arr(
@@ -158,9 +157,75 @@ fn constructor_serialize_args(
         ids.push(cinfo)
     });
 
+    let ids_copy: Vec<ArgsKV> = ids.into_iter().rev().collect();
+
+    // Find the id of the address space with a specific name
+    fn addrspc_parent_id(s: &SystemState, asname: &AddrSpcName) -> String {
+        s.get_named()
+            .addrspc_components_shared()
+            .iter()
+            .find_map(|(id2, a)| {
+                if &a.name == asname {
+                    Some(id2.to_string())
+                } else {
+                    None
+                }
+            })
+            .unwrap()
+    }
+
+    let ases = s
+        .get_named()
+        .addrspc_components_shared()
+        .iter()
+        .map(|(id, a)| {
+            ArgsKV::new_arr(id.to_string(), {
+                let mut v = vec![
+                    ArgsKV::new_key("name".to_string(), a.name.clone()),
+                    ArgsKV::new_arr(
+                        "components".to_string(),
+                        a.components
+                            .iter()
+                            .map(|c| {
+                                ArgsKV::new_key(
+                                    "_".to_string(),
+                                    s.get_named().rmap().get(c).unwrap().to_string(),
+                                )
+                            })
+                            .collect(),
+                    ),
+                ];
+                if let Some(ref p) = a.parent {
+                    v.push(ArgsKV::new_key(
+                        "parent".to_string(),
+                        addrspc_parent_id(&s, &p),
+                    ));
+                }
+                v
+            })
+        })
+        .rev()
+        .collect();
+    let excl_ases = s
+        .get_named()
+        .addrspc_components_exclusive()
+        .iter()
+        .map(|c| {
+            ArgsKV::new_key(
+                "_".to_string(),
+                s.get_named().rmap().get(c).unwrap().to_string(),
+            )
+        })
+        .collect();
+
     let mut topkv = Vec::new();
     topkv.push(ArgsKV::new_arr(String::from("sinvs"), sinvs));
-    topkv.push(ArgsKV::new_arr(String::from("components"), ids));
+    topkv.push(ArgsKV::new_arr(String::from("components"), ids_copy));
+    topkv.push(ArgsKV::new_arr(String::from("addrspc_shared"), ases));
+    topkv.push(ArgsKV::new_arr(
+        String::from("addrspc_exclusive"),
+        excl_ases,
+    ));
     s.get_param_id(&id)
         .param_list()
         .iter()
@@ -218,10 +283,14 @@ fn comp_gen_make_cmd(
     }
     let decomp: Vec<&str> = c.source.split(".").collect();
     assert!(decomp.len() == 2);
-    let name = format!("{}.{}", &c.name.scope_name, &c.name.var_name);
+    // unwrap as we've already validated the name.
+    let compid = s.get_named().rmap().get(&c.name).unwrap();
+    let baseaddr = s.get_address_assignments().component_baseaddr(compid);
 
-    let cmd = format!(r#"make -C src COMP_INTERFACES="{}" COMP_IFDEPS="{}" COMP_LIBDEPS="" COMP_INTERFACE={} COMP_NAME={} COMP_VARNAME={} COMP_OUTPUT={} COMP_BASEADDR={} {} component"#,
-                      if_exp, if_deps, &decomp[0], &decomp[1], &name, output_name, &c.base_vaddr, &optional_cmds);
+    let cmd = format!(
+        r#"make -C src COMP_INTERFACES="{}" COMP_IFDEPS="{}" COMP_LIBDEPS="" COMP_INTERFACE={} COMP_NAME={} COMP_VARNAME={} COMP_OUTPUT={} COMP_BASEADDR={:#X} {} component"#,
+        if_exp, if_deps, &decomp[0], &decomp[1], &c.name, output_name, baseaddr, &optional_cmds
+    );
 
     cmd
 }
@@ -288,10 +357,7 @@ impl BuildState for DefaultBuilder {
 
     fn comp_obj_file(&self, c: &ComponentId, s: &SystemState) -> String {
         let comp = component(&s, &c);
-        format!(
-            "{}.{}.{}",
-            &comp.source, &comp.name.scope_name, &comp.name.var_name
-        )
+        format!("{}.{}", &comp.source, &comp.name)
     }
 
     fn comp_obj_path(&self, c: &ComponentId, s: &SystemState) -> Result<String, String> {
@@ -308,8 +374,8 @@ impl BuildState for DefaultBuilder {
 
         let name = state.get_named().ids().get(id).unwrap();
         println!(
-            "Compiling component {}.{} with the following command line:\n\t{}",
-            name.scope_name, name.var_name, cmd
+            "Compiling component {} with the following command line:\n\t{}",
+            name, cmd
         );
 
         let (out, err) = exec_pipeline(vec![cmd.clone()]);
diff --git a/src/composer/src/cossystem.rs b/src/composer/src/cossystem.rs
index 5478ee2e44..2153754ac2 100644
--- a/src/composer/src/cossystem.rs
+++ b/src/composer/src/cossystem.rs
@@ -1,11 +1,11 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use syshelpers::dump_file;
 use toml;
 
 use initargs::ArgsKV;
 use passes::{
-    BuildState, Component, ComponentName, Dependency, Export, Library, SpecificationPass,
-    SystemState, Transition,
+    AddrSpace, AddrSpaces, AddrSpcName, BuildState, Component, ComponentName, Dependency, Export,
+    Library, SpecificationPass, SystemState, Transition,
 };
 
 #[derive(Debug, Deserialize)]
@@ -17,8 +17,8 @@ pub struct Dep {
 
 #[derive(Debug, Deserialize)]
 pub struct Parameters {
-    pub name: String,
-    pub value: String,
+    pub key: String,
+    pub value: Option<String>,	// optional as we might provide simple keys without values.
     pub at: Option<String>,
 }
 
@@ -45,11 +45,18 @@ pub struct SysInfo {
     description: String, // comment
 }
 
+#[derive(Debug, Deserialize)]
+pub struct TomlAddrSpace {
+    name: String,
+    components: Vec<String>, // names of components in the vas
+    parent: Option<String>,  // which vas contains this one
+}
+
 #[derive(Debug, Deserialize)]
 pub struct TomlSpecification {
     system: SysInfo,
     components: Vec<TomlComponent>,
-    //aggregates: Vec<TomlComponent>  For components of components
+    address_spaces: Option<Vec<TomlAddrSpace>>, //aggregates: Vec<TomlComponent>  For components of components
 }
 
 impl Dep {
@@ -144,6 +151,122 @@ impl TomlSpecification {
             fail = true;
         }
 
+        // Check that 1. each address space includes components that
+        // have been included in the components list, 2. that each
+        // component is included maximum once in an address space, 3.
+        // that each address spaces has a non-empty name, 4. that each
+        // address space has a unique name, 5. that each parent of an
+        // address space is a valid address space, and 6. that there
+        // are no cycles with the parent relation.
+        let mut addrspc_names = Vec::new();
+        if self.ases().is_some() {
+            for addrspc in self.ases().as_ref().unwrap().iter() {
+                let mut referenced_components = Vec::new();
+
+                // 1. Each address space component is a listed component?
+                for as_c in &addrspc.components {
+                    if !self
+                        .comps()
+                        .iter()
+                        .fold(false, |found, c| found | (c.name == *as_c))
+                    {
+                        err_accum.push_str(&format!("Error: Address space \"{}\" includes component \"{}\" that is not found in the list of components.\n", addrspc.name, as_c));
+                        fail = true;
+                    }
+
+                    // 2. Test that the components are only referenced
+                    // a single time in address spaces.
+                    if referenced_components.contains(&as_c) {
+                        err_accum.push_str(&format!("Error: Address space \"{}\" includes component {} that is already found in another address space.\n", addrspc.name, as_c));
+                        fail = true;
+                    } else {
+                        referenced_components.push(as_c);
+                    }
+                }
+
+                // 3. ensure that address spaces have non-empty names.
+                if addrspc.name.len() == 0 {
+                    err_accum.push_str(&format!(
+                        "Error: Address space has empty name. Must provide a non-empty name.\n"
+                    ));
+                    fail = true;
+                    continue;
+                }
+
+                // 4. Make sure that address spaces have unique names.
+                if addrspc_names.contains(&addrspc.name) {
+                    err_accum.push_str(&format!("Error: Address space \"{}\" name is used by multiple address spaces; address spaces must have unique names.\n", addrspc.name));
+                    fail = true;
+                } else {
+                    addrspc_names.push(addrspc.name.clone());
+                }
+            }
+
+            let as_and_parents = self
+                .ases()
+                .as_ref()
+                .unwrap_or(&Vec::new())
+                .iter()
+                .map(|a| (a.name.clone(), a.parent.clone()))
+                .collect::<Vec<(String, Option<String>)>>();
+            // 5. Check that the parent's, when provided, reference
+            // named address spaces.
+            for (addrspc, parent) in &as_and_parents {
+                if let Some(p) = parent {
+                    if !addrspc_names.contains(&p) {
+                        err_accum.push_str(&format!("Error: Address space \"{}\" has parent \"{}\" where that name is not found among the names of address spaces.\n", addrspc, p));
+                        fail = true;
+                    }
+                }
+            }
+
+            // 6. Last, we'll move address spaces to a list of the
+            // parents (initialized with all address spaces without
+            // any parents) from the initial list of address spaces.
+            // We move over an AS only when its parent is in the list
+            // of parents. If we cannot move over all components, then
+            // there is a cycle.
+            let mut parents_len = 0;
+            let (mut parents, mut as_and_parents) = as_and_parents.iter().fold(
+                (Vec::new(), Vec::new()),
+                |(mut p, mut a), (asname, pname)| {
+                    if pname.is_some() {
+                        a.push((asname.to_string(), pname.clone()));
+                    } else {
+                        p.push(asname.to_string());
+                    }
+                    (p, a)
+                },
+            );
+            // Iterate while we have more ASes to process, or until
+            // there are no changes to the sets.
+            while as_and_parents.len() > 0 && parents.len() != parents_len {
+                parents_len = parents.len();
+                let tmp = as_and_parents.iter().fold(
+                    (parents, Vec::new()),
+                    |(mut p, mut a), (asname, pname)| {
+                        let mut moved = false;
+                        if let Some(parentname) = pname {
+                            if p.contains(parentname) {
+                                p.push(asname.to_string());
+                                moved = true;
+                            }
+                        }
+                        if !moved {
+                            a.push((asname.to_string(), pname.clone()));
+                        }
+                        (p, a)
+                    },
+                );
+                parents = tmp.0;
+                as_and_parents = tmp.1;
+            }
+            for (as_spc, p) in &as_and_parents {
+                err_accum.push_str(&format!("Error: Address spaces \"{}\" and \"{}\" are involved in a cycle of parent dependencies. Cycles are not allowed.\n", as_spc, p.as_ref().unwrap()));
+                fail = true;
+            }
+        }
+
         // Validate that all dependencies resolve to a defined
         // component, and that that dependency exports the depended on
         // interface.
@@ -231,6 +354,10 @@ impl TomlSpecification {
         &self.components
     }
 
+    pub fn ases(&self) -> &Option<Vec<TomlAddrSpace>> {
+        &self.address_spaces
+    }
+
     pub fn comps_mut(&mut self) -> &mut Vec<TomlComponent> {
         &mut self.components
     }
@@ -250,7 +377,7 @@ impl TomlSpecification {
         let mut cossys = cossys_pre.unwrap();
         if let Err(s) = cossys.validate() {
             let mut e = String::from("Error in system specification:\n");
-            e.push_str(&format!("{:?}", s));
+            e.push_str(&format!("{}", s));
             return Err(e);
         }
 
@@ -264,6 +391,52 @@ pub struct SystemSpec {
     deps: HashMap<ComponentName, Vec<Dependency>>,
     libs: HashMap<ComponentName, Vec<Library>>,
     exports: HashMap<ComponentName, Vec<Export>>,
+    address_spaces: HashMap<AddrSpcName, AddrSpace>,
+}
+
+// Helper functions to compute components in an address space, and
+// those in all address spaces that descend from it. They assume the
+// SystemSpec data-structures so that we can avoid redundantly
+// computing the set of children address spaces (as that is part of
+// creating SystemSpec::address_spaces.
+fn addrspc_parent_closure<'a>(
+    children: HashSet<&'a AddrSpcName>,
+    all: &'a AddrSpaces,
+) -> HashSet<&'a AddrSpcName> {
+    let mut cs = children.clone();
+    for (_, a) in all.iter() {
+        if children.contains(&a.name) {
+            let children_set: HashSet<&'a AddrSpcName> = a.children.iter().collect();
+            cs = cs
+                .union(&addrspc_parent_closure(children_set, all))
+                .map(|c| *c)
+                .collect();
+        }
+    }
+    cs
+}
+
+// return value is the components in `addrspc`, and the set of
+// components in address spaces that are descendants
+fn addrspc_components<'a>(
+    parent_name: &'a AddrSpcName,
+    all: &'a AddrSpaces,
+) -> (Vec<&'a ComponentName>, Vec<&'a ComponentName>) {
+    // unwrap as we already validated the names
+    let parent = all.get(parent_name).unwrap();
+    let parent_comps = parent.components.iter().collect();
+
+    let descendent_as = addrspc_parent_closure(parent.children.iter().collect(), all);
+    let descendent_comps = descendent_as
+        .iter()
+        .fold(HashSet::new(), |agg, a| {
+            let comps_as_set = all.get(*a).unwrap().components.iter().collect();
+            agg.union(&comps_as_set).map(|c| *c).collect()
+        })
+        .into_iter()
+        .collect();
+
+    (parent_comps, descendent_comps)
 }
 
 impl Transition for SystemSpec {
@@ -346,7 +519,7 @@ impl Transition for SystemSpec {
                     .as_ref()
                     .unwrap_or(&Vec::new())
                     .iter()
-                    .map(|p| ArgsKV::new_key(p.name.clone(), p.value.clone()))
+                    .map(|p| ArgsKV::new_key(p.key.clone(), p.value.as_ref().unwrap_or(&String::from("")).clone()))
                     .collect(),
                 fsimg: c.initfs.clone(),
             };
@@ -355,13 +528,76 @@ impl Transition for SystemSpec {
             exports.insert(ComponentName::new(&c.name, &String::from("global")), es);
         }
 
-        Ok(Box::new(SystemSpec {
+        // Create the address spaces structure
+        let mut address_spaces = HashMap::new();
+        if let Some(ref ases) = spec.ases() {
+            for addrspc in ases {
+                let name = addrspc.name.clone();
+                let parent = addrspc.parent.clone();
+                let components = addrspc
+                    .components
+                    .iter()
+                    .map(|c| ComponentName::new(&c, &String::from("global")))
+                    .collect();
+                let children = ases
+                    .iter()
+                    .filter_map(|a| match a.parent {
+                        Some(ref p) if name == *p => Some(a.name.clone()),
+                        _ => None,
+                    })
+                    .collect();
+
+                address_spaces.insert(
+                    addrspc.name.clone() as AddrSpcName,
+                    AddrSpace {
+                        name,
+                        components,
+                        parent,
+                        children,
+                    },
+                );
+            }
+        }
+
+        let spec = Box::new(SystemSpec {
             ids,
             components,
             deps,
             libs,
             exports,
-        }))
+            address_spaces,
+        });
+
+        // Check that the address spaces are formed such that there
+        // are no dependencies from components in parent (generally,
+        // ancestor) address spaces to components in child address
+        // spaces. This should be done in `validate`, but it requires
+        // the children to be solved.
+        let ases = spec.address_spaces();
+        let mut errs = String::new();
+        for (_, a) in ases {
+            let (parent_comps, child_comps) = addrspc_components(&a.name, &ases);
+
+            // Iterate through parent components, and ensure that they
+            // do not depend on descendent address space components.
+            for pc in &parent_comps {
+                let backward_dep = spec
+                    .deps_named(pc)
+                    .iter()
+                    .find(|&d| child_comps.contains(&&d.server));
+                if backward_dep.is_some() {
+                    let bd = backward_dep.unwrap();
+                    errs.push_str(&format!(
+			"Error: Dependency exists in address space \"{}\" from component \"{}\" to \"{}\" which is in a descendant address space; dependencies can only go from descendants to ancestors.",
+			a.name, pc, bd.server));
+                }
+            }
+        }
+        if errs.len() != 0 {
+            return Err(errs);
+        }
+
+        Ok(spec)
     }
 }
 
@@ -385,4 +621,8 @@ impl SpecificationPass for SystemSpec {
     fn exports_named(&self, id: &ComponentName) -> &Vec<Export> {
         &self.exports.get(id).unwrap()
     }
+
+    fn address_spaces(&self) -> &HashMap<AddrSpcName, AddrSpace> {
+        &self.address_spaces
+    }
 }
diff --git a/src/composer/src/initargs.rs b/src/composer/src/initargs.rs
index 0c04639b95..a9d8ef526d 100644
--- a/src/composer/src/initargs.rs
+++ b/src/composer/src/initargs.rs
@@ -32,14 +32,14 @@ impl VarNamespace {
 impl ArgsKV {
     pub fn new_key(key: String, val: String) -> ArgsKV {
         ArgsKV {
-            key: key,
+            key,
             val: ArgsValType::Str(val),
         }
     }
 
     pub fn new_arr(key: String, val: Vec<ArgsKV>) -> ArgsKV {
         ArgsKV {
-            key: key,
+            key,
             val: ArgsValType::Arr(val),
         }
     }
@@ -62,9 +62,14 @@ impl ArgsKV {
             } => {
                 // base case
                 let kv_name = ns.fresh_name();
-                (format!(r#"static struct kv_entry {} = {{ key: "{}", vtype: VTYPE_STR, val: {{ str: "{}" }} }};
-"#, kv_name, k, s),
-                 vec![format!("&{}", kv_name)])
+                (
+                    format!(
+                        r#"static struct kv_entry {} = {{ key: "{}", vtype: VTYPE_STR, val: {{ str: "{}" }} }};
+"#,
+                        kv_name, k, s
+                    ),
+                    vec![format!("&{}", kv_name)],
+                )
             }
             ArgsKV {
                 key: k,
@@ -84,11 +89,21 @@ impl ArgsKV {
 
                         (format!("{}{}", t, t1), exprs)
                     });
-                (format!(r#"{}static struct kv_entry *{}[] = {{{}}};
+                (
+                    format!(
+                        r#"{}static struct kv_entry *{}[] = {{{}}};
 static struct kv_entry {} = {{ key: "{}", vtype: VTYPE_ARR, val: {{ arr: {{ sz: {}, kvs: {} }} }} }};
 "#,
-                         strs.0, arr_name, strs.1.join(", "), arr_val_name, k, kvs.len(), arr_name),
-                 vec![format!("&{}", arr_val_name)])
+                        strs.0,
+                        arr_name,
+                        strs.1.join(", "),
+                        arr_val_name,
+                        k,
+                        kvs.len(),
+                        arr_name
+                    ),
+                    vec![format!("&{}", arr_val_name)],
+                )
             }
         }
     }
@@ -168,10 +183,9 @@ impl TransitionIter for Parameters {
     ) -> Result<Box<Self>, String> {
         let argpath = b.comp_file_path(&id, &"initargs.c".to_string(), s)?;
         let mut args = Vec::new();
-        component(s, id)
-            .params
-            .iter()
-            .for_each(|a| args.push(a.clone()));
+
+        let param_args = component(s, id).params.clone();
+        args.push(ArgsKV::new_arr(String::from("param"), param_args));
         let resargs = s.get_restbl().args(&id);
         resargs.iter().for_each(|a| args.push(a.clone()));
         args.push(ArgsKV::new_key(String::from("compid"), id.to_string()));
diff --git a/src/composer/src/main.rs b/src/composer/src/main.rs
index 299c2c7155..bfb27751d3 100644
--- a/src/composer/src/main.rs
+++ b/src/composer/src/main.rs
@@ -17,6 +17,7 @@ mod symbols;
 mod syshelpers;
 mod tot_order;
 mod properties;
+mod address_assignment;
 
 use build::DefaultBuilder;
 use compobject::{Constructor, ElfObject};
@@ -28,6 +29,7 @@ use resources::ResAssignPass;
 use properties::CompProperties;
 use std::env;
 use tot_order::CompTotOrd;
+use address_assignment::AddressAssignmentx86_64;
 
 pub fn exec() -> Result<(), String> {
     let mut args = env::args();
@@ -49,6 +51,7 @@ pub fn exec() -> Result<(), String> {
 
     sys.add_parsed(SystemSpec::transition(&sys, &mut build)?);
     sys.add_named(CompTotOrd::transition(&sys, &mut build)?);
+    sys.add_address_assign(AddressAssignmentx86_64::transition(&sys, &mut build)?);
     sys.add_properties(CompProperties::transition(&sys, &mut build)?);
     sys.add_restbls(ResAssignPass::transition(&sys, &mut build)?);
 
diff --git a/src/composer/src/passes.rs b/src/composer/src/passes.rs
index 005b8ce017..352c96a7cf 100644
--- a/src/composer/src/passes.rs
+++ b/src/composer/src/passes.rs
@@ -14,12 +14,14 @@
 use std::collections::{BTreeMap, HashMap};
 
 use initargs::ArgsKV;
+use std::fmt;
 
 pub struct SystemState {
     spec: String,
 
     parse: Option<Box<dyn SpecificationPass>>,
     named: Option<Box<dyn OrderedSpecPass>>,
+    address_assignment: Option<Box<dyn AddressAssignmentPass>>,
     properties: Option<Box<dyn PropertiesPass>>,
     restbls: Option<Box<dyn ResPass>>,
     param: HashMap<ComponentId, Box<dyn InitParamPass>>,
@@ -34,6 +36,7 @@ impl SystemState {
             spec,
             parse: None,
             named: None,
+	    address_assignment: None,
             properties: None,
             restbls: None,
             param: HashMap::new(),
@@ -51,6 +54,10 @@ impl SystemState {
         self.named = Some(n);
     }
 
+    pub fn add_address_assign(&mut self, a: Box<dyn AddressAssignmentPass>) {
+        self.address_assignment = Some(a);
+    }
+
     pub fn add_properties(&mut self, n: Box<dyn PropertiesPass>) {
         self.properties = Some(n);
     }
@@ -87,6 +94,10 @@ impl SystemState {
         &**(self.named.as_ref().unwrap())
     }
 
+    pub fn get_address_assignments(&self) -> &dyn AddressAssignmentPass {
+        &**(self.address_assignment.as_ref().unwrap())
+    }
+
     pub fn get_properties(&self) -> &dyn PropertiesPass {
         &**(self.properties.as_ref().unwrap())
     }
@@ -164,6 +175,7 @@ pub type Interface = String;
 pub type Variant = String;
 pub type Library = String;
 pub type VAddr = u64;
+pub type AddrSpcName = String;
 
 // unique identifier for a component
 #[derive(Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
@@ -181,6 +193,12 @@ impl ComponentName {
     }
 }
 
+impl fmt::Display for ComponentName {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+	write!(f, "{}.{}", self.scope_name, self.var_name)
+    }
+}
+
 pub type ComponentId = u32;
 
 // This structure carries throughout the entire process.
@@ -192,7 +210,7 @@ pub struct Component {
     pub scheduler: ComponentName,   // our scheduler (that creates or initial thread)
 
     pub source: String,      // Where is the component source located?
-    pub base_vaddr: String, // The lowest virtual address for the component -- could be hex, so not a VAddr
+    pub base_vaddr: String,  // The lowest virtual address for the component -- could be hex, so not a VAddr
     pub params: Vec<ArgsKV>, // initialization parameters
     pub fsimg: Option<String>,
 }
@@ -208,6 +226,16 @@ pub struct Dependency {
     pub variant: Variant,
 }
 
+#[derive(Clone, Debug)]
+pub struct AddrSpace {
+    pub name: AddrSpcName,
+    pub components: Vec<ComponentName>,
+    pub parent: Option<AddrSpcName>,
+    pub children: Vec<AddrSpcName>
+}
+
+pub type AddrSpaces = HashMap<AddrSpcName, AddrSpace>;
+
 #[derive(Clone, Debug)]
 pub struct Export {
     pub interface: Interface,
@@ -220,15 +248,19 @@ pub trait SpecificationPass {
     fn deps_named(&self, id: &ComponentName) -> &Vec<Dependency>;
     fn exports_named(&self, id: &ComponentName) -> &Vec<Export>;
     fn libs_named(&self, id: &ComponentName) -> &Vec<Library>;
+    fn address_spaces(&self) -> &AddrSpaces;
 }
 
-// Integer namspacing pass. Convert the component variable names to
+// Integer namespacing pass. Convert the component variable names to
 // component ids, and create a total order for the components based on
 // their stated dependencies (lower ids are more trusted (more
 // depended on).
 pub trait OrderedSpecPass {
     fn ids(&self) -> &BTreeMap<ComponentId, ComponentName>;
     fn rmap(&self) -> &BTreeMap<ComponentName, ComponentId>;
+    // An ordering of address spaces, and of components without a shared address space.
+    fn addrspc_components_shared(&self) -> &BTreeMap<usize, AddrSpace>;
+    fn addrspc_components_exclusive(&self) -> &Vec<ComponentName>;
 }
 
 // Helper access functions
@@ -286,6 +318,11 @@ pub trait PropertiesPass {
     fn service_dependency(&self, id: &ComponentId, t: ServiceType) -> Option<ComponentId>;
 }
 
+// Each component must be compiled starting
+pub trait AddressAssignmentPass {
+    fn component_baseaddr(&self, id: &ComponentId) -> u64;
+}
+
 // Compute the resource table, and resource allocations for each
 // component.
 pub trait ResPass {
diff --git a/src/composer/src/resources.rs b/src/composer/src/resources.rs
index 42b7ea5d43..cabf7be0a2 100644
--- a/src/composer/src/resources.rs
+++ b/src/composer/src/resources.rs
@@ -15,10 +15,12 @@ enum CapRes {
     Comp(ComponentId),
 }
 
+const BOOT_CAPTBL_FREE: u32 = 52;
+
 // The equivalent of the C __captbl_cap2sz(c)
 fn cap_sz(cap: &CapRes) -> u32 {
     match cap {
-        CapRes::CapTbl(_) | CapRes::PgTbl(_) => 2,
+        CapRes::CapTbl(_) | CapRes::PgTbl(_) => 4,
         CapRes::Comp(_) => 4,
     }
 }
@@ -45,7 +47,7 @@ impl CaptblState {
     fn new() -> CaptblState {
         CaptblState {
             captbl: BTreeMap::new(),
-            frontier: 44, // BOOT_CAPTBL_FREE...FIXME: automatically generate this
+            frontier: BOOT_CAPTBL_FREE, // BOOT_CAPTBL_FREE...FIXME: currently use shell script automatically generate this, is there a more elegant way?
             prev_sz: 4,
         }
     }
diff --git a/src/composer/src/tot_order.rs b/src/composer/src/tot_order.rs
index b394660cd1..c9a81a5b07 100644
--- a/src/composer/src/tot_order.rs
+++ b/src/composer/src/tot_order.rs
@@ -1,9 +1,14 @@
-use passes::{BuildState, ComponentId, ComponentName, OrderedSpecPass, SystemState, Transition};
-use std::collections::BTreeMap;
+use passes::{
+    AddrSpace, AddrSpaces, BuildState, ComponentId, ComponentName, OrderedSpecPass, SystemState,
+    Transition,
+};
+use std::collections::{BTreeMap, HashSet};
 
 pub struct CompTotOrd {
     ids: BTreeMap<ComponentId, ComponentName>,
     rmap: BTreeMap<ComponentName, ComponentId>,
+    addrspc_comps: BTreeMap<usize, AddrSpace>,
+    addrspc_exclusive: Vec<ComponentName>,
 }
 
 impl OrderedSpecPass for CompTotOrd {
@@ -14,6 +19,30 @@ impl OrderedSpecPass for CompTotOrd {
     fn rmap(&self) -> &BTreeMap<ComponentName, ComponentId> {
         &self.rmap
     }
+
+    fn addrspc_components_shared(&self) -> &BTreeMap<usize, AddrSpace> {
+        &self.addrspc_comps
+    }
+
+    fn addrspc_components_exclusive(&self) -> &Vec<ComponentName> {
+        &self.addrspc_exclusive
+    }
+}
+
+fn addrspc_dfs_via_children(
+    offset: &mut usize,
+    agg: &mut BTreeMap<usize, AddrSpace>,
+    curr: &AddrSpace,
+    addrspaces: &AddrSpaces,
+) {
+    agg.insert(*offset, curr.clone());
+    *offset = *offset + 1;
+    for child_name in &curr.children {
+        // Unwrap should be OK as we've already validated the
+        // component names.
+        let child = addrspaces.get(child_name).unwrap();
+        addrspc_dfs_via_children(offset, agg, child, addrspaces);
+    }
 }
 
 impl Transition for CompTotOrd {
@@ -23,7 +52,7 @@ impl Transition for CompTotOrd {
         // Find a total order of components based on the dependency
         // relation...
         let mut tot_ord = Vec::new();
-        // which components are still remaining without an placement
+        // which components are still remaining without a placement
         // in the total order?
         let mut remaining: BTreeMap<ComponentName, Vec<ComponentName>> = BTreeMap::new();
         for n in spec.names().iter() {
@@ -70,9 +99,35 @@ impl Transition for CompTotOrd {
             id = id + 1;
         }
 
+        // Order the address spaces so that they (and their
+        // components) can be created parent address spaces first.
+        let mut addrspc_comps = BTreeMap::new();
+        let mut offset = 0;
+        let mut comps_track_exclusive: HashSet<ComponentName> = comps.values().cloned().collect();
+        for (_, a) in spec.address_spaces() {
+            // a "root" of the AS hierarchy, recurs from there to do a DFS
+            if a.parent.is_none() {
+                addrspc_dfs_via_children(
+                    &mut offset,
+                    &mut addrspc_comps,
+                    &a,
+                    &spec.address_spaces(),
+                );
+            }
+            // Remove components that are explicitly in address
+            // spaces, so that we can track the *rest* that are in an
+            // exclusive AS.
+            for c in &a.components {
+                comps_track_exclusive.remove(&c);
+            }
+        }
+        let addrspc_exclusive = comps_track_exclusive.into_iter().collect();
+
         Ok(Box::new(CompTotOrd {
             ids: comps,
-            rmap: rmap,
+            rmap,
+            addrspc_comps,
+            addrspc_exclusive,
         }))
     }
 }
diff --git a/src/kernel/capinv.c b/src/kernel/capinv.c
index a7c00feef0..48977cc933 100644
--- a/src/kernel/capinv.c
+++ b/src/kernel/capinv.c
@@ -15,6 +15,7 @@
 #include "include/tcap.h"
 #include "include/chal/defs.h"
 #include "include/hw.h"
+#include "include/chal/chal_proto.h"
 
 #define COS_DEFAULT_RET_CAP 0
 
@@ -44,7 +45,7 @@ printfn(struct pt_regs *regs)
 	int   len;
 	char  kern_buf[MAX_LEN];
 
-	str = (char *)__userregs_get1(regs);
+	str = (char *)(word_t)__userregs_get1(regs);
 	len = __userregs_get2(regs);
 
 	if (len < 1) goto done;
@@ -82,7 +83,7 @@ printfn(struct pt_regs *regs)
 	return 0;
 }
 
-static void
+void
 kmem_unalloc(unsigned long *pte)
 {
 	/*
@@ -93,9 +94,9 @@ kmem_unalloc(unsigned long *pte)
 	 */
 	unsigned long old = *pte;
 
-	assert(old & PGTBL_COSKMEM);
-	retypetbl_deref((void *)(old & PGTBL_FRAME_MASK));
-	*pte = old & ~PGTBL_COSKMEM;
+	assert(chal_pgtbl_flag_exist(old, PGTBL_COSKMEM));
+	retypetbl_deref((void *)(old & PGTBL_FRAME_MASK), PAGE_ORDER);
+	*pte = chal_pgtbl_flag_clr(*pte, PGTBL_COSKMEM);
 }
 
 /*
@@ -107,7 +108,7 @@ kmem_deact_pre(struct cap_header *ch, struct captbl *ct, capid_t pgtbl_cap, capi
                unsigned long **p_pte, unsigned long *v)
 {
 	struct cap_pgtbl *cap_pt;
-	u32_t             flags, old_v, pa;
+	word_t            flags, old_v, pa;
 	u64_t             curr;
 	int               ret;
 
@@ -123,8 +124,8 @@ kmem_deact_pre(struct cap_header *ch, struct captbl *ct, capid_t pgtbl_cap, capi
 	old_v = *v = **p_pte;
 
 	pa = old_v & PGTBL_FRAME_MASK;
-	if (!(old_v & PGTBL_COSKMEM)) cos_throw(err, -EINVAL);
-	assert(!(old_v & PGTBL_QUIESCENCE));
+	 if (!chal_pgtbl_flag_exist(old_v, PGTBL_COSKMEM)) cos_throw(err, -EINVAL);
+	 assert(!chal_pgtbl_flag_exist(old_v, PGTBL_QUIESCENCE)); 
 
 	/* Scan the page to make sure there's nothing left. */
 	if (ch->type == CAP_CAPTBL) {
@@ -152,7 +153,7 @@ kmem_deact_pre(struct cap_header *ch, struct captbl *ct, capid_t pgtbl_cap, capi
 		}
 
 		/* set the scan flag to avoid concurrent scanning. */
-		if (cos_cas((unsigned long *)&deact_cap->refcnt_flags, l, l | CAP_MEM_SCAN_FLAG) != CAS_SUCCESS)
+		if (cos_cas_32((u32_t*)&deact_cap->refcnt_flags, l, l | CAP_MEM_SCAN_FLAG) != CAS_SUCCESS)
 			return -ECASFAIL;
 
 		/*
@@ -167,58 +168,14 @@ kmem_deact_pre(struct cap_header *ch, struct captbl *ct, capid_t pgtbl_cap, capi
 
 		if (ret) {
 			/* unset scan and frozen bits. */
-			cos_cas((unsigned long *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG,
+			cos_cas_32((u32_t *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG,
 			        l & ~(CAP_MEM_FROZEN_FLAG | CAP_MEM_SCAN_FLAG));
 			cos_throw(err, ret);
 		}
-		cos_cas((unsigned long *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG, l);
+		cos_cas_32((u32_t *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG, l);
 	} else if (ch->type == CAP_PGTBL) {
-		struct cap_pgtbl *deact_cap = (struct cap_pgtbl *)ch;
-		void *            page      = deact_cap->pgtbl;
-		u32_t             l         = deact_cap->refcnt_flags;
-
-		if (chal_pa2va((paddr_t)pa) != page) cos_throw(err, -EINVAL);
-
-		/* Require freeze memory and wait for quiescence
-		 * first! */
-		if (!(l & CAP_MEM_FROZEN_FLAG)) {
-			cos_throw(err, -EQUIESCENCE);
-		}
-
-		/* Quiescence check! */
-		if (deact_cap->lvl == 0) {
-			/* top level has tlb quiescence period. */
-			if (!tlb_quiescence_check(deact_cap->frozen_ts)) return -EQUIESCENCE;
-		} else {
-			/* other levels have kernel quiescence
-			 * period. (but the mapping scan will ensure
-			 * tlb quiescence implicitly). */
-			rdtscll(curr);
-			if (!QUIESCENCE_CHECK(curr, deact_cap->frozen_ts, KERN_QUIESCENCE_CYCLES)) return -EQUIESCENCE;
-		}
-
-		/* set the scan flag to avoid concurrent scanning. */
-		if (cos_cas((unsigned long *)&deact_cap->refcnt_flags, l, l | CAP_MEM_SCAN_FLAG) != CAS_SUCCESS)
-			return -ECASFAIL;
-
-		if (deact_cap->lvl == 0) {
-			/* PGD: only scan user mapping. */
-			ret = kmem_page_scan(page, PAGE_SIZE - KERNEL_PGD_REGION_SIZE);
-		} else if (deact_cap->lvl == PGTBL_DEPTH - 1) {
-			/* Leaf level, scan mapping. */
-			ret = pgtbl_mapping_scan(deact_cap);
-		} else {
-			/* don't have this with 2-level pgtbl. */
-			ret = kmem_page_scan(page, PAGE_SIZE);
-		}
-
-		if (ret) {
-			/* unset scan and frozen bits. */
-			cos_cas((unsigned long *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG,
-			        l & ~(CAP_MEM_FROZEN_FLAG | CAP_MEM_SCAN_FLAG));
-			cos_throw(err, ret);
-		}
-		cos_cas((unsigned long *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG, l);
+		ret = chal_pgtbl_deact_pre(ch, pa);
+		if (ret) cos_throw(err, ret);
 	} else {
 		/* currently only captbl and pgtbl pages need to be
 		 * scanned before deactivation. */
@@ -240,13 +197,13 @@ int
 kmem_deact_post(unsigned long *pte, unsigned long old_v)
 {
 	int   ret;
-	u32_t new_v;
-
+	word_t new_v;
 	/* Unset coskmem bit. Release the kmem frame. */
-	new_v = old_v & (~PGTBL_COSKMEM);
+	new_v = chal_pgtbl_flag_clr(old_v, PGTBL_COSKMEM);
+
 	if (cos_cas(pte, old_v, new_v) != CAS_SUCCESS) cos_throw(err, -ECASFAIL);
 
-	ret = retypetbl_deref((void *)(old_v & PGTBL_FRAME_MASK));
+	ret = retypetbl_kern_deref((void *)(old_v & PGTBL_FRAME_MASK), PAGE_ORDER);
 	if (ret) {
 		/* FIXME: handle this case? */
 		cos_cas(pte, new_v, old_v);
@@ -264,9 +221,11 @@ kmem_deact_post(unsigned long *pte, unsigned long old_v)
  * Copy a capability from a location in one captbl/pgtbl to a location
  * in the other.  Fundamental operation used to delegate capabilities.
  * TODO: should limit the types of capabilities this works on.
+ * The order is the power of 2 of the size of the (sub)page delegated.
+ *
  */
 static inline int
-cap_cpy(struct captbl *t, capid_t cap_to, capid_t capin_to, capid_t cap_from, capid_t capin_from)
+cap_cpy(struct captbl *t, capid_t cap_to, capid_t capin_to, capid_t cap_from, capid_t capin_from, word_t flags)
 {
 	struct cap_header *ctto, *ctfrom;
 	int                sz, ret;
@@ -305,7 +264,7 @@ cap_cpy(struct captbl *t, capid_t cap_to, capid_t capin_to, capid_t cap_from, ca
 			if (l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
 			if ((l & CAP_REFCNT_MAX) == CAP_REFCNT_MAX) return -EOVERFLOW;
 
-			cos_cas((unsigned long *)&(parent->refcnt_flags), old_v, l + 1);
+			cos_cas_32((u32_t *)&(parent->refcnt_flags), old_v, l + 1);
 
 			child->refcnt_flags = 1;
 			child->parent       = parent;
@@ -317,28 +276,14 @@ cap_cpy(struct captbl *t, capid_t cap_to, capid_t capin_to, capid_t cap_from, ca
 			if (l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
 			if ((l & CAP_REFCNT_MAX) == CAP_REFCNT_MAX) return -EOVERFLOW;
 
-			cos_cas((unsigned long *)&(parent->refcnt_flags), old_v, l + 1);
+			cos_cas_32((u32_t *)&(parent->refcnt_flags), old_v, l + 1);
 
 			child->refcnt_flags = 1;
 			child->parent       = parent;
 		}
 		__cap_capactivate_post(ctto, type);
 	} else if (cap_type == CAP_PGTBL) {
-		unsigned long *f, old_v;
-		u32_t          flags;
-
-		ctto = captbl_lkup(t, cap_to);
-		if (unlikely(!ctto)) return -ENOENT;
-		if (unlikely(ctto->type != cap_type)) return -EINVAL;
-		if (unlikely(((struct cap_pgtbl *)ctto)->refcnt_flags & CAP_MEM_FROZEN_FLAG)) return -EINVAL;
-		f = pgtbl_lkup_pte(((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, &flags);
-		if (!f) return -ENOENT;
-		old_v = *f;
-
-		/* Cannot copy frame, or kernel entry. */
-		if ((old_v & PGTBL_COSFRAME) || !(old_v & PGTBL_USER)) return -EPERM;
-		/* TODO: validate the type is appropriate given the value of *flags */
-		ret = pgtbl_mapping_add(((struct cap_pgtbl *)ctto)->pgtbl, capin_to, old_v & PGTBL_FRAME_MASK, flags);
+		ret = chal_pgtbl_cpy(t, cap_to, capin_to, (struct cap_pgtbl*)ctfrom, capin_from, cap_type, flags);
 	} else {
 		ret = -EINVAL;
 	}
@@ -363,23 +308,32 @@ cap_move(struct captbl *t, capid_t cap_to, capid_t capin_to, capid_t cap_from, c
 		return -EPERM;
 	} else if (cap_type == CAP_PGTBL) {
 		unsigned long *f, old_v, *moveto, old_v_to;
-		u32_t          flags;
+		word_t         flags;
 
 		ctto = captbl_lkup(t, cap_to);
 		if (unlikely(!ctto)) return -ENOENT;
 		if (unlikely(ctto->type != cap_type)) return -EINVAL;
 		if (unlikely(((struct cap_pgtbl *)ctto)->refcnt_flags & CAP_MEM_FROZEN_FLAG)) return -EINVAL;
+	#if defined(__x86_64__)
+		f = pgtbl_lkup_lvl(((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, &flags, 0, PGTBL_DEPTH);
+	#else
 		f = pgtbl_lkup_pte(((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, &flags);
+	#endif
 		if (!f) return -ENOENT;
 		old_v = *f;
 
+	#if defined(__x86_64__)
+		moveto = pgtbl_lkup_lvl(((struct cap_pgtbl *)ctto)->pgtbl, capin_to, &flags, 0, PGTBL_DEPTH);
+	#else
 		moveto = pgtbl_lkup_pte(((struct cap_pgtbl *)ctto)->pgtbl, capin_to, &flags);
+	#endif
 		if (!moveto) return -ENOENT;
 		old_v_to = *moveto;
 
 		cos_mem_fence();
-		if ((old_v & PGTBL_COSFRAME) == 0) return -EPERM;
-		if (old_v_to & (PGTBL_COSFRAME | PGTBL_PRESENT)) return -EPERM;
+		if (!chal_pgtbl_flag_exist(old_v, PGTBL_COSFRAME)) return -EPERM;
+		if (chal_pgtbl_flag_exist(old_v_to, PGTBL_COSFRAME | PGTBL_PRESENT)) return -EPERM;
+
 		ret = pgtbl_quie_check(old_v_to);
 		if (ret) return ret;
 
@@ -436,7 +390,7 @@ cap_thd_switch(struct pt_regs *regs, struct thread *curr, struct thread *next, s
 	}
 
 	thd_current_update(next, curr, cos_info);
-	if (likely(ci->pgtbl != next_ci->pgtbl)) pgtbl_update(next_ci->pgtbl);
+	if (likely(ci->pgtblinfo.pgtbl != next_ci->pgtblinfo.pgtbl)) pgtbl_update(&next_ci->pgtblinfo);
 
 	/* Not sure of the trade-off here: Branch cost vs. segment register update */
 	if (next->tls != curr->tls) chal_tls_update(next->tls);
@@ -608,6 +562,12 @@ cap_thd_op(struct cap_thd *thd_cap, struct thread *thd, struct pt_regs *regs, st
            struct cos_cpu_local_info *cos_info)
 {
 	struct thread *next        = thd_cap->t;
+#if defined(__WORD_SIZE_64__)
+	capid_t        arcv        = __userregs_get3(regs);
+	capid_t        tc          = __userregs_getop(regs);
+	tcap_prio_t    prio        = __userregs_get2(regs);
+	sched_tok_t    usr_counter = __userregs_get1(regs);
+#else
 	capid_t        arcv        = (__userregs_get1(regs) << 16) >> 16;
 	capid_t        tc          = __userregs_get1(regs) >> 16;
 	u32_t          prio_higher = __userregs_get3(regs);
@@ -615,6 +575,7 @@ cap_thd_op(struct cap_thd *thd_cap, struct thread *thd, struct pt_regs *regs, st
 	tcap_prio_t    prio        = (tcap_prio_t)(prio_higher >> 16) << 32 | (tcap_prio_t)prio_lower;
 	sched_tok_t    usr_counter = (((sched_tok_t)__userregs_get3(regs) << 16) >> 16)
 	                          | ((sched_tok_t)__userregs_getop(regs) << 16); /* op holds MSB of counter */
+#endif
 	tcap_time_t  timeout = (tcap_time_t)__userregs_get4(regs);
 	struct tcap *tcap    = tcap_current(cos_info);
 	int          ret;
@@ -1162,39 +1123,8 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			capid_t pgtbl_cap = __userregs_get2(regs);
 			vaddr_t kmem_cap  = __userregs_get3(regs);
 			capid_t pgtbl_lvl = __userregs_get4(regs);
-
-			pgtbl_t        new_pt, curr_pt;
-			vaddr_t        kmem_addr = 0;
-			unsigned long *pte       = NULL;
-
-			ret = cap_kmem_activate(ct, pgtbl_cap, kmem_cap, (unsigned long *)&kmem_addr, &pte);
-			if (unlikely(ret)) cos_throw(err, ret);
-			assert(kmem_addr && pte);
-
-			if (pgtbl_lvl == 0) {
-				/* PGD */
-				struct cap_pgtbl *cap_pt = (struct cap_pgtbl *)captbl_lkup(ct, pgtbl_cap);
-				if (!CAP_TYPECHK(cap_pt, CAP_PGTBL)) {
-					ret = -EINVAL;
-					break;
-				}
-
-				curr_pt = cap_pt->pgtbl;
-				assert(curr_pt);
-
-				new_pt = pgtbl_create((void *)kmem_addr, curr_pt);
-				ret    = pgtbl_activate(ct, cap, pt_entry, new_pt, 0);
-			} else if (pgtbl_lvl == 1) {
-				/* PTE */
-				pgtbl_init_pte((void *)kmem_addr);
-				ret = pgtbl_activate(ct, cap, pt_entry, (pgtbl_t)kmem_addr, 1);
-			} else {
-				/* Not supported yet. */
-				printk("cos: warning - PGTBL level greater than 2 not supported yet. \n");
-				ret = -1;
-			}
-
-			if (ret) kmem_unalloc(pte);
+			/* FIXME: change lvl to order */
+			ret = chal_pgtbl_pgtblactivate(ct, cap, pt_entry, pgtbl_cap, kmem_cap, pgtbl_lvl);
 
 			break;
 		}
@@ -1260,7 +1190,8 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			vaddr_t tlsaddr = __userregs_get2(regs);
 
 			assert(op_cap->captbl);
-			if (thd_tls_set(op_cap->captbl, thd_cap, tlsaddr, thd)) cos_throw(err, -EINVAL);
+			ret = thd_tls_set(op_cap->captbl, thd_cap, tlsaddr, thd);
+			if (ret) cos_throw(err, -EINVAL);
 			break;
 		}
 		case CAPTBL_OP_THDDEACTIVATE_ROOT: {
@@ -1283,7 +1214,7 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			livenessid_t lid        = __userregs_get3(regs);
 			vaddr_t      entry_addr = __userregs_get4(regs);
 
-			ret = comp_activate(ct, cap, capin, captbl_cap, pgtbl_cap, lid, entry_addr, NULL);
+			ret = comp_activate(ct, cap, capin, captbl_cap, pgtbl_cap, lid, entry_addr);
 			break;
 		}
 		case CAPTBL_OP_COMPDEACTIVATE: {
@@ -1320,7 +1251,7 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			capid_t rcv_captbl = __userregs_get2(regs);
 			capid_t rcv_cap    = __userregs_get3(regs);
 
-			ret = asnd_activate(ct, cap, capin, rcv_captbl, rcv_cap, 0, 0);
+			ret = asnd_activate(ct, cap, capin, rcv_captbl, rcv_cap);
 			break;
 		}
 		case CAPTBL_OP_ASNDDEACTIVATE: {
@@ -1350,7 +1281,7 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			capid_t dest_captbl = __userregs_get2(regs);
 			capid_t dest_cap    = __userregs_get3(regs);
 
-			ret = cap_cpy(ct, dest_captbl, dest_cap, from_captbl, from_cap);
+			ret = cap_cpy(ct, dest_captbl, dest_cap, from_captbl, from_cap, 0);
 			break;
 		}
 		case CAPTBL_OP_CONS: {
@@ -1407,9 +1338,9 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			vaddr_t source_addr = __userregs_get1(regs);
 			capid_t dest_pt     = __userregs_get2(regs);
 			vaddr_t dest_addr   = __userregs_get3(regs);
+			word_t  flags       = __userregs_get4(regs);
 
-			ret = cap_cpy(ct, dest_pt, dest_addr, source_pt, source_addr);
-
+			ret = cap_cpy(ct, dest_pt, dest_addr, source_pt, source_addr, flags);
 			break;
 		}
 		case CAPTBL_OP_MEMMOVE: {
@@ -1442,13 +1373,13 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			break;
 		}
 		case CAPTBL_OP_MEMACTIVATE: {
-			/* This takes cosframe as input and constructs
-			 * mapping in pgtbl. */
+			/* This takes cosframe as input and constructs mapping in pgtbl. */
 			capid_t frame_cap = __userregs_get1(regs);
 			capid_t dest_pt   = __userregs_get2(regs);
 			vaddr_t vaddr     = __userregs_get3(regs);
+			vaddr_t order     = __userregs_get4(regs);
 
-			ret = cap_memactivate(ct, (struct cap_pgtbl *)ch, frame_cap, dest_pt, vaddr);
+			ret = cap_memactivate(ct, (struct cap_pgtbl *)ch, frame_cap, dest_pt, vaddr, order);
 
 			break;
 		}
@@ -1465,48 +1396,47 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 		case CAPTBL_OP_MEM_RETYPE2USER: {
 			vaddr_t frame_addr = __userregs_get1(regs);
 			paddr_t frame;
+			vaddr_t order;
 
-			ret = pgtbl_get_cosframe(((struct cap_pgtbl *)ch)->pgtbl, frame_addr, &frame);
+			ret = pgtbl_get_cosframe(((struct cap_pgtbl *)ch)->pgtbl, frame_addr, &frame, &order);
 			if (ret) cos_throw(err, ret);
 
-			ret = retypetbl_retype2user((void *)frame);
+			if (__userregs_get2(regs) != 0) order = __userregs_get2(regs);
+			ret = retypetbl_retype2user((void *)frame, order);
 
 			break;
 		}
 		case CAPTBL_OP_MEM_RETYPE2KERN: {
 			vaddr_t frame_addr = __userregs_get1(regs);
 			paddr_t frame;
+			vaddr_t order;
+
+			ret = pgtbl_get_cosframe(((struct cap_pgtbl *)ch)->pgtbl, frame_addr, &frame, &order);
 
-			ret = pgtbl_get_cosframe(((struct cap_pgtbl *)ch)->pgtbl, frame_addr, &frame);
 			if (ret) cos_throw(err, ret);
 
-			ret = retypetbl_retype2kern((void *)frame);
+			if (__userregs_get2(regs) != 0) order = __userregs_get2(regs);
+			ret = retypetbl_retype2kern((void *)frame, order);
 
 			break;
 		}
 		case CAPTBL_OP_MEM_RETYPE2FRAME: {
 			vaddr_t frame_addr = __userregs_get1(regs);
 			paddr_t frame;
+			vaddr_t order;
 
-			ret = pgtbl_get_cosframe(((struct cap_pgtbl *)ch)->pgtbl, frame_addr, &frame);
+			ret = pgtbl_get_cosframe(((struct cap_pgtbl *)ch)->pgtbl, frame_addr, &frame, &order);
 			if (ret) cos_throw(err, ret);
 
-			ret = retypetbl_retype2frame((void *)frame);
+			if (__userregs_get2(regs) != 0) order = __userregs_get2(regs);
+			ret = retypetbl_retype2frame((void *)frame, order);
 
 			break;
 		}
 		case CAPTBL_OP_INTROSPECT: {
 			vaddr_t        addr = __userregs_get1(regs);
-			unsigned long *pte;
-			u32_t          flags;
-
-			pte = pgtbl_lkup_pte(((struct cap_pgtbl *)ch)->pgtbl, addr, &flags);
-
-			if (pte)
-				ret = *pte;
-			else
-				ret = 0;
 
+			ret = chal_pgtbl_introspect(ch, addr);
 			break;
 		}
 		/* case CAPTBL_OP_MAPPING_MOD: */
@@ -1667,7 +1597,7 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			paddr_t           pa    = __userregs_get3(regs);
 			struct cap_pgtbl *ptc;
 			unsigned long *   pte;
-			u32_t             flags;
+			word_t            flags;
 
 			/*
 			 * FIXME: This is broken.  It should only be
@@ -1682,7 +1612,7 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			pte = pgtbl_lkup_pte(ptc->pgtbl, va, &flags);
 			if (!pte) cos_throw(err, -EINVAL);
 			if (*pte & PGTBL_FRAME_MASK) cos_throw(err, -ENOENT);
-			*pte = (PGTBL_FRAME_MASK & pa) | PGTBL_USER_DEF;
+			*pte = chal_pgtbl_flag_add(chal_pgtbl_frame(pa), PGTBL_USER_DEF);
 
 			ret = 0;
 			break;
@@ -1700,6 +1630,29 @@ static int __attribute__((noinline)) composite_syscall_slowpath(struct pt_regs *
 			ret = 0;
 			break;
 		}
+		case CAPTBL_OP_HW_TLB_LOCKDOWN: {
+			unsigned long entryid = __userregs_get1(regs);
+			unsigned long vaddr = __userregs_get2(regs);
+			unsigned long paddr = __userregs_get3(regs);
+			ret = chal_tlb_lockdown(entryid, vaddr, paddr);
+			break;
+		}
+		case CAPTBL_OP_HW_L1FLUSH: {
+			ret = chal_l1flush();
+			break;
+		}
+		case CAPTBL_OP_HW_TLBFLUSH: {
+			ret = chal_tlbflush(0);
+			break;
+		}
+		case CAPTBL_OP_HW_TLBSTALL: {
+			ret = chal_tlbstall();
+			break;
+		}
+		case CAPTBL_OP_HW_TLBSTALL_RECOUNT: {
+			ret = chal_tlbstall_recount(0);
+			break;
+		}
 		default:
 			goto err;
 		}
diff --git a/src/kernel/captbl.c b/src/kernel/captbl.c
index 0e89d182d5..18a6881972 100644
--- a/src/kernel/captbl.c
+++ b/src/kernel/captbl.c
@@ -16,6 +16,7 @@ captbl_activate_boot(struct captbl *t, unsigned long cap)
 
 	ctc = (struct cap_captbl *)captbl_add(t, cap, CAP_CAPTBL, &ret);
 	if (!ctc) return ret;
+
 	ctc->captbl       = t; /* reference ourself! */
 	ctc->lvl          = 0;
 	ctc->h.type       = CAP_CAPTBL;
@@ -88,7 +89,7 @@ captbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned lon
 	ret = cap_capdeactivate(dest_ct_cap, capin, CAP_CAPTBL, lid);
 	if (ret) cos_throw(err, ret);
 
-	if (cos_cas((unsigned long *)&deact_cap->refcnt_flags, l, CAP_MEM_FROZEN_FLAG) != CAS_SUCCESS)
+	if (cos_cas_32((u32_t *)&deact_cap->refcnt_flags, l, CAP_MEM_FROZEN_FLAG) != CAS_SUCCESS)
 		cos_throw(err, -ECASFAIL);
 
 	/* deactivation success. We should either release the
@@ -124,7 +125,7 @@ captbl_cons(struct cap_captbl *target_ct, struct cap_captbl *cons_cap, capid_t c
 	if ((l & CAP_REFCNT_MAX) == CAP_REFCNT_MAX) cos_throw(err, -EOVERFLOW);
 
 	/* increment refcnt */
-	if (cos_cas((unsigned long *)&(cons_cap->refcnt_flags), l, l + 1) != CAS_SUCCESS) cos_throw(err, -ECASFAIL);
+	if (cos_cas_32((u32_t *)&(cons_cap->refcnt_flags), l, l + 1) != CAS_SUCCESS) cos_throw(err, -ECASFAIL);
 
 	/*
 	 * FIXME: we are expanding the entire page to
@@ -153,6 +154,41 @@ captbl_cons(struct cap_captbl *target_ct, struct cap_captbl *cons_cap, capid_t c
 	return ret;
 }
 
+
+int
+captbl_decons(struct cap_header *head, struct cap_header *sub, capid_t pruneid, unsigned long lvl)
+{
+	unsigned long *    intern, old_v;
+	u32_t l;
+	struct cap_captbl *ct = (struct cap_captbl *)head;
+
+	if (lvl <= ct->lvl) return -EINVAL;
+	intern = captbl_lkup_lvl(ct->captbl, pruneid, ct->lvl, lvl);
+	if (!intern) return -ENOENT;
+	old_v = *intern;
+
+	if (old_v == 0) return -ENOENT; /* return an error here? */
+	/* commit; note that 0 is "no entry" in both pgtbl and captbl */
+	if (cos_cas(intern, old_v, 0) != CAS_SUCCESS) return -ECASFAIL;
+
+	/* FIXME: we are removing two half pages for captbl. */
+	intern = captbl_lkup_lvl(ct->captbl, pruneid + (PAGE_SIZE / 2 / CAPTBL_LEAFSZ), ct->lvl, lvl);
+	if (!intern) return -ENOENT;
+
+	old_v = *intern;
+	if (old_v == 0) return -ENOENT; /* return an error here? */
+	/* commit; note that 0 is "no entry" in both pgtbl and captbl */
+	if (cos_cas(intern, old_v, 0) != CAS_SUCCESS) return -ECASFAIL;
+
+	/* decrement the refcnt */
+	ct = (struct cap_captbl *)sub;
+	l = ct->refcnt_flags;
+	if (l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
+	cos_faa((int *)&(ct->refcnt_flags), -1);
+
+	return 0;
+}
+
 static int
 captbl_leaflvl_scan(struct captbl *ct)
 {
@@ -173,7 +209,7 @@ captbl_leaflvl_scan(struct captbl *ct)
 
 		rdtscll(curr_ts);
 		header_i = h;
-		n_ent    = CACHELINE_SIZE / ent_size;
+		n_ent    = CACHELINE_SIZE >> (l.size + CAP_SZ_OFF) ;
 
 		for (j = 0; j < n_ent; j++) {
 			assert((void *)header_i < ((void *)h + CACHELINE_SIZE));
diff --git a/src/kernel/include/assert.h b/src/kernel/include/assert.h
index 2f235c4977..c312b94043 100644
--- a/src/kernel/include/assert.h
+++ b/src/kernel/include/assert.h
@@ -15,10 +15,15 @@
 #ifdef assert
 #error "Assert in kernel already mysteriously defined."
 #endif
+
+#if ( COS_ASSERTIONS_ACTIVE != 0 )
 #define assert(x)                                                                                           \
 	do {                                                                                                \
 		if (unlikely(0 == (x)))                                                                     \
 			die("Assertion '%s' failed at %s:%d in fn %s\n", #x, __FILE__, __LINE__, __func__); \
 	} while (0)
+#else
+#define assert(x)
+#endif
 
 #endif /* ASSERT_H */
diff --git a/src/kernel/include/cap_ops.h b/src/kernel/include/cap_ops.h
index 2664ccdeb0..cc6ca1ea27 100644
--- a/src/kernel/include/cap_ops.h
+++ b/src/kernel/include/cap_ops.h
@@ -4,6 +4,7 @@
 #include "captbl.h"
 #include "pgtbl.h"
 #include "liveness_tbl.h"
+#include "chal/chal_proto.h"
 
 /*
  * Capability-table, capability operations for activation and
@@ -101,7 +102,6 @@ cap_cons(struct captbl *t, capid_t capto, capid_t capsub, capid_t expandid)
 	 * identical layout to cap_pgtbl.
 	 */
 	struct cap_captbl *ct, *ctsub;
-	unsigned long *    intern;
 	u32_t              depth;
 	cap_t              cap_type;
 	int                ret = 0;
@@ -122,34 +122,7 @@ cap_cons(struct captbl *t, capid_t capto, capid_t capsub, capid_t expandid)
 	if (cap_type == CAP_CAPTBL) {
 		ret = captbl_cons(ct, ctsub, expandid);
 	} else {
-		/* FIXME: we need to ensure TLB quiescence for pgtbl cons/decons! */
-		u32_t flags = 0, old_pte, new_pte, old_v, refcnt_flags;
-
-		intern = pgtbl_lkup_lvl(((struct cap_pgtbl *)ct)->pgtbl, expandid, &flags, ct->lvl, depth);
-		if (!intern) return -ENOENT;
-		old_pte = *intern;
-		if (pgtbl_ispresent(old_pte)) return -EPERM;
-
-		old_v = refcnt_flags = ((struct cap_pgtbl *)ctsub)->refcnt_flags;
-		if (refcnt_flags & CAP_MEM_FROZEN_FLAG) return -EINVAL;
-		if ((refcnt_flags & CAP_REFCNT_MAX) == CAP_REFCNT_MAX) return -EOVERFLOW;
-
-		refcnt_flags++;
-		ret = cos_cas((unsigned long *)&(((struct cap_pgtbl *)ctsub)->refcnt_flags), old_v, refcnt_flags);
-		if (ret != CAS_SUCCESS) return -ECASFAIL;
-
-		new_pte = (u32_t)chal_va2pa(
-		            (void *)((unsigned long)(((struct cap_pgtbl *)ctsub)->pgtbl) & PGTBL_FRAME_MASK))
-		          | PGTBL_INTERN_DEF;
-
-		ret = cos_cas(intern, old_pte, new_pte);
-		if (ret != CAS_SUCCESS) {
-			/* decrement to restore the refcnt on failure. */
-			cos_faa((int *)&(((struct cap_pgtbl *)ctsub)->refcnt_flags), -1);
-			return -ECASFAIL;
-		} else {
-			ret = 0;
-		}
+		ret = chal_pgtbl_cons(ct, ctsub, expandid, depth);
 	}
 
 	return ret;
@@ -174,57 +147,12 @@ cap_decons(struct captbl *t, capid_t cap, capid_t capsub, capid_t pruneid, unsig
 	if (unlikely(head->type != sub->type)) return -EPERM;
 
 	if (head->type == CAP_CAPTBL) {
-		struct cap_captbl *ct = (struct cap_captbl *)head;
-
-		if (lvl <= ct->lvl) return -EINVAL;
-		intern = captbl_lkup_lvl(ct->captbl, pruneid, ct->lvl, lvl);
+		return captbl_decons(head, sub, pruneid, lvl);
 	} else if (head->type == CAP_PGTBL) {
-		struct cap_pgtbl *pt = (struct cap_pgtbl *)head;
-		u32_t             flags;
-		if (lvl <= pt->lvl) return -EINVAL;
-		intern = pgtbl_lkup_lvl(pt->pgtbl, pruneid, &flags, pt->lvl, lvl);
-	} else {
-		return -EINVAL;
-	}
+		return chal_pgtbl_decons(head, sub, pruneid, lvl);
+	} 
 
-	if (!intern) return -ENOENT;
-	old_v = *intern;
-
-	if (old_v == 0) return 0; /* return an error here? */
-	/* commit; note that 0 is "no entry" in both pgtbl and captbl */
-	if (cos_cas(intern, old_v, 0) != CAS_SUCCESS) return -ECASFAIL;
-
-	if (head->type == CAP_CAPTBL) {
-		/* FIXME: we are removing two half pages for captbl. */
-		struct cap_captbl *ct = (struct cap_captbl *)head;
-
-		intern = captbl_lkup_lvl(ct->captbl, pruneid + (PAGE_SIZE / 2 / CAPTBL_LEAFSZ), ct->lvl, lvl);
-		if (!intern) return -ENOENT;
-
-		old_v = *intern;
-		if (old_v == 0) return 0; /* return an error here? */
-		/* commit; note that 0 is "no entry" in both pgtbl and captbl */
-		if (cos_cas(intern, old_v, 0) != CAS_SUCCESS) return -ECASFAIL;
-	}
-
-	/* decrement the refcnt */
-	if (head->type == CAP_CAPTBL) {
-		struct cap_captbl *ct = (struct cap_captbl *)sub;
-		u32_t              old_v, l;
-
-		old_v = l = ct->refcnt_flags;
-		if (l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
-		cos_faa((int *)&(ct->refcnt_flags), -1);
-	} else {
-		struct cap_pgtbl *pt = (struct cap_pgtbl *)sub;
-		u32_t             old_v, l;
-
-		old_v = l = pt->refcnt_flags;
-		if (l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
-		cos_faa((int *)&(pt->refcnt_flags), -1);
-	}
-
-	return 0;
+	return -EINVAL;
 }
 
 static int
@@ -246,7 +174,7 @@ cap_kmem_freeze(struct captbl *t, capid_t target_cap)
 		if ((l & CAP_REFCNT_MAX) > 1 || l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
 
 		rdtscll(ct->frozen_ts);
-		ret = cos_cas((unsigned long *)&ct->refcnt_flags, l, l | CAP_MEM_FROZEN_FLAG);
+		ret = cos_cas_32((u32_t *)&ct->refcnt_flags, l, l | CAP_MEM_FROZEN_FLAG);
 		if (ret != CAS_SUCCESS) return -ECASFAIL;
 	} else if (ch->type == CAP_PGTBL) {
 		struct cap_pgtbl *pt = (struct cap_pgtbl *)ch;
@@ -254,7 +182,7 @@ cap_kmem_freeze(struct captbl *t, capid_t target_cap)
 		if ((l & CAP_REFCNT_MAX) > 1 || l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
 
 		rdtscll(pt->frozen_ts);
-		ret = cos_cas((unsigned long *)&pt->refcnt_flags, l, l | CAP_MEM_FROZEN_FLAG);
+		ret = cos_cas_32((u32_t *)&pt->refcnt_flags, l, l | CAP_MEM_FROZEN_FLAG);
 		if (ret != CAS_SUCCESS) return -ECASFAIL;
 	} else {
 		return -EINVAL;
diff --git a/src/kernel/include/captbl.h b/src/kernel/include/captbl.h
index 102fe147d3..8ca57029af 100644
--- a/src/kernel/include/captbl.h
+++ b/src/kernel/include/captbl.h
@@ -24,7 +24,11 @@
 
 #define CAPTBL_DEPTH 2
 #define CAPTBL_INTERNSZ (sizeof(int *))
-#define CAPTBL_INTERN_ORD 9 /* log(PAGE_SIZE/(2*(CAPTBL_DEPTH-1)*CAPTBL_INTERNSZ)) */
+#if defined(__WORD_SIZE_64__)
+	#define CAPTBL_INTERN_ORD 8 /* log(PAGE_SIZE/(2*(CAPTBL_DEPTH-1)*CAPTBL_INTERNSZ)) */
+#else
+	#define CAPTBL_INTERN_ORD 9
+#endif
 #define CAPTBL_LEAFSZ (sizeof(struct cap_min))
 #define CAPTBL_LEAF_ORD 7 /* log(PAGE_SIZE/(2*CAPTBL_LEAFSZ)) */
 
@@ -71,7 +75,7 @@ struct cap_header {
 	cap_flags_t flags : CAP_HEAD_FLAGS_SZ;
 	cap_t       type : CAP_HEAD_TYPE_SZ;
 
-	u8_t post[0];
+	u8_t post[];
 } __attribute__((packed));
 
 struct cap_min {
@@ -246,13 +250,22 @@ captbl_lkup(struct captbl *t, capid_t cap)
 }
 
 static inline int
-__captbl_store(unsigned long *addr, unsigned long new, unsigned long old)
+__captbl_store_32(u32_t *addr, u32_t new, u32_t old)
 {
-	if (!cos_cas(addr, old, new)) return -1;
+	if (!cos_cas_32(addr, old, new)) { return -1; }
 
 	return 0;
 }
-#define CTSTORE(a, n, o) __captbl_store((unsigned long *)a, *(unsigned long *)n, *(unsigned long *)o)
+
+#define CTSTORE(a, n, o) \
+	({                            \
+		int tmp_ret = 0;     \
+		u32_t *tmp_n = n;   \
+		u32_t *tmp_o = o;   \
+		tmp_ret = __captbl_store_32((u32_t *)a, *tmp_n, *tmp_o); \
+		tmp_ret; \
+	})
+
 #define cos_throw(label, errno) \
 	{                       \
 		ret = (errno);  \
@@ -305,7 +318,7 @@ captbl_add(struct captbl *t, capid_t cap, cap_t type, int *retval)
 
 		rdtscll(curr_ts);
 		header_i = h;
-		n_ent    = CACHELINE_SIZE / ent_size;
+		n_ent    = CACHELINE_SIZE >> (l.size + CAP_SZ_OFF);
 		for (i = 0; i < n_ent; i++) {
 			assert((void *)header_i < ((void *)h + CACHELINE_SIZE));
 
@@ -343,7 +356,7 @@ captbl_add(struct captbl *t, capid_t cap, cap_t type, int *retval)
 		l.type        = type;
 		l.liveness_id = 0;
 	}
-	if (CTSTORE(h, &l, &o)) cos_throw(err, -EEXIST); /* commit */
+	if (CTSTORE(h, (u32_t *)&l,(u32_t *)&o)) cos_throw(err, -EEXIST); /* commit */
 
 	/* FIXME: same as above */
 	if (p != h) {
@@ -407,7 +420,7 @@ captbl_del(struct captbl *t, capid_t cap, cap_t type, livenessid_t lid)
 		l.type = CAP_QUIESCENCE;
 	}
 
-	if (CTSTORE(h, &l, &o)) cos_throw(err, -EEXIST); /* commit */
+	if (CTSTORE(h, (u32_t *)&l, (u32_t *)&o)) cos_throw(err, -EEXIST); /* commit */
 err:
 	return ret;
 }
@@ -453,7 +466,7 @@ captbl_prune(struct captbl *t, capid_t cap, u32_t depth, int *retval)
 	if (unlikely(!intern)) cos_throw(err, -EPERM);
 	p   = *intern;
 	new = (unsigned long)CT_DEFINITVAL;
-	if (CTSTORE(intern, &new, &p)) cos_throw(err, -EEXIST); /* commit */
+	if (CTSTORE(intern, (u32_t*)&new, (u32_t *)&p)) cos_throw(err, -EEXIST); /* commit */
 done:
 	*retval = ret;
 	return (void *)p;
@@ -489,6 +502,7 @@ int captbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned
 int captbl_activate_boot(struct captbl *t, unsigned long cap);
 
 int captbl_cons(struct cap_captbl *target_ct, struct cap_captbl *cons_cap, capid_t cons_addr);
+int captbl_decons(struct cap_header *head, struct cap_header *sub, capid_t pruneid, unsigned long lvl);
 int captbl_kmem_scan(struct cap_captbl *cap);
 
 static void
@@ -499,4 +513,4 @@ cap_init(void)
 	assert(CAPTBL_EXPAND_SZ == 1 << CAPTBL_LEAF_ORD);
 }
 
-#endif /* CAPTBL_H */
+#endif /* CAPTBL_H */
\ No newline at end of file
diff --git a/src/kernel/include/chal b/src/kernel/include/chal
deleted file mode 120000
index 75d7531bcd..0000000000
--- a/src/kernel/include/chal
+++ /dev/null
@@ -1 +0,0 @@
-../../platform/i386/chal/
\ No newline at end of file
diff --git a/src/kernel/include/chal.h b/src/kernel/include/chal.h
index 2caa7dd0ca..70a6d261c0 100644
--- a/src/kernel/include/chal.h
+++ b/src/kernel/include/chal.h
@@ -60,8 +60,6 @@ void chal_cycles_per_period(u64_t cycles);
  * Address translation functions *
  *********************************/
 
-paddr_t        chal_va2pa(void *va);
-void *         chal_pa2va(paddr_t pa);
 extern paddr_t chal_kernel_mem_pa;
 
 /************************************
@@ -102,7 +100,7 @@ void chal_init(void);
 /* int cos_syscall_buff_mgmt(void); */
 /* void cos_syscall_upcall(void); */
 
-#include "../../platform/include/chal_plat.h"
+#include "../chal/chal_plat.h"
 
 extern void printk(const char *fmt, ...);
 void        chal_khalt(void);
diff --git a/src/kernel/include/component.h b/src/kernel/include/component.h
index c837cf22fa..ef335bc944 100644
--- a/src/kernel/include/component.h
+++ b/src/kernel/include/component.h
@@ -13,11 +13,11 @@
 #include "pgtbl.h"
 #include "cap_ops.h"
 
+/* 24B */
 struct comp_info {
-	struct liveness_data        liveness;
-	pgtbl_t                     pgtbl;
-	struct captbl *             captbl;
-	struct cos_sched_data_area *comp_nfo;
+	struct liveness_data liveness;
+	struct pgtbl_info    pgtblinfo;
+	struct captbl *      captbl;
 } __attribute__((packed));
 
 struct cap_comp {
@@ -30,7 +30,7 @@ struct cap_comp {
 
 static int
 comp_activate(struct captbl *t, capid_t cap, capid_t capin, capid_t captbl_cap, capid_t pgtbl_cap, livenessid_t lid,
-              vaddr_t entry_addr, struct cos_sched_data_area *sa)
+              vaddr_t entry_addr)
 {
 	struct cap_comp *  compc;
 	struct cap_pgtbl * ptc;
@@ -45,11 +45,11 @@ comp_activate(struct captbl *t, capid_t cap, capid_t capin, capid_t captbl_cap,
 
 	v = ptc->refcnt_flags;
 	if (v & CAP_MEM_FROZEN_FLAG) return -EINVAL;
-	if (cos_cas((unsigned long *)&ptc->refcnt_flags, v, v + 1) != CAS_SUCCESS) return -ECASFAIL;
+	if (cos_cas_32((u32_t *)&ptc->refcnt_flags, v, v + 1) != CAS_SUCCESS) return -ECASFAIL;
 
 	v = ctc->refcnt_flags;
 	if (v & CAP_MEM_FROZEN_FLAG) cos_throw(undo_ptc, -EINVAL);
-	if (cos_cas((unsigned long *)&ctc->refcnt_flags, v, v + 1) != CAS_SUCCESS) {
+	if (cos_cas_32((u32_t *)&ctc->refcnt_flags, v, v + 1) != CAS_SUCCESS) {
 		/* undo before return */
 		cos_throw(undo_ptc, -ECASFAIL);
 	}
@@ -57,12 +57,12 @@ comp_activate(struct captbl *t, capid_t cap, capid_t capin, capid_t captbl_cap,
 	compc = (struct cap_comp *)__cap_capactivate_pre(t, cap, capin, CAP_COMP, &ret);
 	if (!compc) cos_throw(undo_ctc, ret);
 
-	compc->entry_addr    = entry_addr;
-	compc->info.pgtbl    = ptc->pgtbl;
-	compc->info.captbl   = ctc->captbl;
-	compc->info.comp_nfo = sa;
-	compc->pgd           = ptc;
-	compc->ct_top        = ctc;
+	compc->entry_addr           = entry_addr;
+	compc->info.pgtblinfo.pgtbl = ptc->pgtbl;
+	compc->info.pgtblinfo.asid  = chal_asid_alloc();
+	compc->info.captbl          = ctc->captbl;
+	compc->pgd                  = ptc;
+	compc->ct_top               = ctc;
 	ltbl_get(lid, &compc->info.liveness);
 	__cap_capactivate_post(&compc->h, CAP_COMP);
 
diff --git a/src/kernel/include/hw.h b/src/kernel/include/hw.h
index fafc1ef7e1..d722d615ce 100644
--- a/src/kernel/include/hw.h
+++ b/src/kernel/include/hw.h
@@ -17,7 +17,7 @@
 #define HW_IRQ_EXTERNAL_MIN 32
 #define HW_IRQ_EXTERNAL_MAX 63
 
-struct cap_asnd hw_asnd_caps[HW_IRQ_TOTAL];
+extern struct cap_asnd hw_asnd_caps[HW_IRQ_TOTAL];
 
 struct cap_hw {
 	struct cap_header h;
@@ -65,7 +65,7 @@ hw_attach_rcvcap(struct cap_hw *hwc, hwid_t hwid, struct cap_arcv *rcvc, capid_t
 	if (!(hwc->hw_bitmap & (1 << (hwid - HW_IRQ_EXTERNAL_MIN)))) return -EINVAL;
 	if (hw_asnd_caps[hwid].h.type == CAP_ASND) return -EEXIST;
 
-	return asnd_construct(&hw_asnd_caps[hwid], rcvc, rcv_cap, 0, 0);
+	return asnd_construct(&hw_asnd_caps[hwid], rcvc, rcv_cap);
 }
 
 static int
diff --git a/src/kernel/include/inv.h b/src/kernel/include/inv.h
index 089c784b54..4a02255b8a 100644
--- a/src/kernel/include/inv.h
+++ b/src/kernel/include/inv.h
@@ -33,11 +33,6 @@ struct cap_asnd {
 	cpuid_t           cpuid, arcv_cpuid;
 	u32_t             arcv_capid, arcv_epoch; /* identify receiver */
 	struct comp_info  comp_info;
-
-	/* deferrable server to rate-limit IPIs */
-	u32_t budget, period, replenish_amnt;
-	/* Following not used for now. */
-	/* u64_t replenish_time; 	   /\* time of last replenishment *\/ */
 } __attribute__((packed));
 
 struct cap_arcv {
@@ -98,7 +93,7 @@ sret_deactivate(struct cap_captbl *t, capid_t capin, livenessid_t lid)
 }
 
 static int
-asnd_construct(struct cap_asnd *asndc, struct cap_arcv *arcvc, capid_t rcv_cap, u32_t budget, u32_t period)
+asnd_construct(struct cap_asnd *asndc, struct cap_arcv *arcvc, capid_t rcv_cap)
 {
 	/* FIXME: Add synchronization with __xx_pre and __xx_post */
 
@@ -110,17 +105,12 @@ asnd_construct(struct cap_asnd *asndc, struct cap_arcv *arcvc, capid_t rcv_cap,
 	/* ...and initialize our own data */
 	asndc->cpuid          = get_cpuid();
 	asndc->arcv_capid     = rcv_cap;
-	asndc->period         = period;
-	asndc->budget         = budget;
-	asndc->replenish_amnt = budget;
-	/* FIXME:  add rdtscll(asndc->replenish_time); */
 
 	return 0;
 }
 
 static int
-asnd_activate(struct captbl *t, capid_t cap, capid_t capin, capid_t rcv_captbl, capid_t rcv_cap, u32_t budget,
-              u32_t period)
+asnd_activate(struct captbl *t, capid_t cap, capid_t capin, capid_t rcv_captbl, capid_t rcv_cap)
 {
 	struct cap_captbl *rcv_ct;
 	struct cap_asnd *  asndc;
@@ -136,7 +126,7 @@ asnd_activate(struct captbl *t, capid_t cap, capid_t capin, capid_t rcv_captbl,
 	asndc = (struct cap_asnd *)__cap_capactivate_pre(t, cap, capin, CAP_ASND, &ret);
 	if (!asndc) return ret;
 
-	ret = asnd_construct(asndc, arcvc, rcv_cap, budget, period);
+	ret = asnd_construct(asndc, arcvc, rcv_cap);
 	__cap_capactivate_post(&asndc->h, CAP_ASND);
 
 	return ret;
@@ -311,12 +301,12 @@ sinv_call(struct thread *thd, struct cap_sinv *sinvc, struct pt_regs *regs, stru
 		return;
 	}
 
-	pgtbl_update(sinvc->comp_info.pgtbl);
+	pgtbl_update(&sinvc->comp_info.pgtblinfo);
 
 	/* TODO: test this before pgtbl update...pre- vs. post-serialization */
 	__userregs_sinvupdate(regs);
-	__userregs_set(regs, thd->tid | (get_cpuid() << 16), sinvc->token,
-	               sinvc->entry_addr);
+	__userregs_setinv(regs, thd->tid | (get_cpuid() << 16), sinvc->token,
+			  sinvc->entry_addr);
 
 	return;
 }
@@ -340,7 +330,7 @@ sret_ret(struct thread *thd, struct pt_regs *regs, struct cos_cpu_local_info *co
 		return;
 	}
 
-	pgtbl_update(ci->pgtbl);
+	pgtbl_update(&ci->pgtblinfo);
 	/* Set return sp and ip and function return value in eax */
 	__userregs_set(regs, __userregs_getinvret(regs), sp, ip);
 }
diff --git a/src/kernel/include/pgtbl.h b/src/kernel/include/pgtbl.h
index 7ef95512d8..7709ba0299 100644
--- a/src/kernel/include/pgtbl.h
+++ b/src/kernel/include/pgtbl.h
@@ -10,16 +10,18 @@
 
 #include "shared/cos_errno.h"
 #include "ertrie.h"
-#include "shared/util.h"
+#include "chal/shared/util.h"
 #include "captbl.h"
 #include "retype_tbl.h"
 #include "liveness_tbl.h"
 #include "chal/defs.h"
+#include "chal/chal_proto.h"
 
 #ifndef LINUX_TEST
 #include "chal.h"
 #endif
 
+/* Generic page table flags */
 typedef enum {
 	PGTBL_PRESENT  = 1,
 	PGTBL_WRITABLE = 1 << 1,
@@ -35,18 +37,10 @@ typedef enum {
 	PGTBL_COSKMEM    = 1 << 10, /* page activated as kernel object */
 	PGTBL_QUIESCENCE = 1 << 11,
 	/* Flag bits done. */
-
 	PGTBL_USER_DEF   = PGTBL_PRESENT | PGTBL_USER | PGTBL_ACCESSED | PGTBL_MODIFIED | PGTBL_WRITABLE,
 	PGTBL_INTERN_DEF = PGTBL_USER_DEF,
 } pgtbl_flags_t;
 
-#define PGTBL_PAGEIDX_SHIFT (12)
-#define PGTBL_FRAME_BITS (32 - PGTBL_PAGEIDX_SHIFT)
-#define PGTBL_FLAG_MASK ((1 << PGTBL_PAGEIDX_SHIFT) - 1)
-#define PGTBL_FRAME_MASK (~PGTBL_FLAG_MASK)
-#define PGTBL_DEPTH 2
-#define PGTBL_ORD 10
-
 struct tlb_quiescence {
 	/* Updated by timer. */
 	u64_t last_periodic_flush;
@@ -56,527 +50,36 @@ struct tlb_quiescence {
 	u8_t __padding[CACHE_LINE - 2 * sizeof(u64_t)];
 } __attribute__((aligned(CACHE_LINE), packed));
 
-/*
- * Use the passed in page, but make sure that we only use the passed
- * in page once.
- */
-static inline void *
-__pgtbl_a(void *d, int sz, int leaf)
-{
-	void **i = d, *p;
-
-	(void)leaf;
-	assert(sz == PAGE_SIZE);
-	if (unlikely(!*i)) return NULL;
-	p  = *i;
-	*i = NULL;
-	return p;
-}
-static struct ert_intern *
-__pgtbl_get(struct ert_intern *a, void *accum, int isleaf)
-{
-	(void)isleaf;
-	/* don't use | here as we only want the pte flags */
-	*(u32_t *)accum = (((u32_t)a->next) & PGTBL_FLAG_MASK);
-	return chal_pa2va((paddr_t)((((u32_t)a->next) & PGTBL_FRAME_MASK)));
-}
-static int
-__pgtbl_isnull(struct ert_intern *a, void *accum, int isleaf)
-{
-	(void)isleaf;
-	(void)accum;
-	return !(((u32_t)(a->next)) & (PGTBL_PRESENT | PGTBL_COSFRAME));
-}
-static void
-__pgtbl_init(struct ert_intern *a, int isleaf)
-{
-	(void)isleaf;
-	//	if (isleaf) return;
-	a->next = NULL;
-}
-
-/* We only need to do mapping_add at boot time to add all physical
- * memory to the pgtbl of llboot. After that, we only need to do copy
- * from llboot pgtbl to other pgtbls. Thus, when adding to pgtbl, we
- * use physical addresses; when doing copy, we don't need to worry
- * about PA. */
-
-/* v should include the desired flags */
-static inline int
-__pgtbl_setleaf(struct ert_intern *a, void *v)
-{
-	u32_t new, old;
-
-	old = (u32_t)(a->next);
-	new = (u32_t)(v);
-
-	if (!cos_cas((unsigned long *)a, old, new)) return -ECASFAIL;
-
-	return 0;
-}
-
-/* This takes an input parameter as the old value of the mapping. Only
- * update when the existing value matches. */
-static inline int
-__pgtbl_update_leaf(struct ert_intern *a, void *v, u32_t old)
-{
-	u32_t new;
-
-	new = (u32_t)(v);
-	if (!cos_cas((unsigned long *)a, old, new)) return -ECASFAIL;
-
-	return 0;
-}
-
-/* Note:  We're just using pre-defined default flags for internal (pgd) entries */
-static int
-__pgtbl_set(struct ert_intern *a, void *v, void *accum, int isleaf)
-{
-	u32_t old, new;
-	(void)accum;
-	assert(!isleaf);
-
-	old = (u32_t)a->next;
-	new = (u32_t)chal_va2pa((void *)((u32_t)v & PGTBL_FRAME_MASK)) | PGTBL_INTERN_DEF;
-
-	if (!cos_cas((unsigned long *)&a->next, old, new)) return -ECASFAIL;
-
-	return 0;
-}
-
-static inline void *
-__pgtbl_getleaf(struct ert_intern *a, void *accum)
-{
-	if (unlikely(!a)) return NULL;
-	return __pgtbl_get(a, accum, 1);
-}
-
-ERT_CREATE(__pgtbl, pgtbl, PGTBL_DEPTH, PGTBL_ORD, sizeof(int *), PGTBL_ORD, sizeof(int *), NULL, __pgtbl_init,
-           __pgtbl_get, __pgtbl_isnull, __pgtbl_set, __pgtbl_a, __pgtbl_setleaf, __pgtbl_getleaf, ert_defresolve);
-
-/* make it an opaque type...not to be touched */
-typedef struct pgtbl *pgtbl_t;
-
-/* identical to the capability structure */
-struct cap_pgtbl {
-	struct cap_header h;
-	u32_t             refcnt_flags; /* includes refcnt and flags */
-	pgtbl_t           pgtbl;
-	u32_t             lvl;       /* what level are the pgtbl nodes at? */
-	struct cap_pgtbl *parent;    /* if !null, points to parent cap */
-	u64_t             frozen_ts; /* timestamp when frozen is set. */
-} __attribute__((packed));
-
-static pgtbl_t
-pgtbl_alloc(void *page)
-{
-	return (pgtbl_t)((unsigned long)__pgtbl_alloc(&page) & PGTBL_FRAME_MASK);
-}
-
-static void
-pgtbl_init_pte(void *pte)
-{
-	int            i;
-	unsigned long *vals = pte;
-
-	for (i = 0; i < (1 << PGTBL_ORD); i++) vals[i] = 0;
-}
-
-static int
-pgtbl_intern_expand(pgtbl_t pt, u32_t addr, void *pte, u32_t flags)
-{
-	unsigned long accum = (unsigned long)flags;
-	int           ret;
-
-	/* NOTE: flags currently ignored. */
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & (u32_t)pte) == 0);
-	assert((PGTBL_FRAME_MASK & flags) == 0);
-
-	if (!pte) return -EINVAL;
-	ret = __pgtbl_expandn(pt, (unsigned long)(addr >> PGTBL_PAGEIDX_SHIFT), PGTBL_DEPTH, &accum, &pte, NULL);
-	if (!ret && pte) return -EEXIST; /* no need to expand */
-	assert(!(ret && !pte));          /* error and used memory??? */
-
-	return ret;
-}
-
-/*
- * FIXME: If these need to return a physical address, we should do a
- * va2pa before returning
- */
-static void *
-pgtbl_intern_prune(pgtbl_t pt, u32_t addr)
-{
-	unsigned long accum = 0, *pgd;
-	void *        page;
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & (u32_t)addr) == 0);
-
-	pgd = __pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), (u32_t)addr >> PGTBL_PAGEIDX_SHIFT, 1, &accum);
-	if (!pgd) return NULL;
-	page  = __pgtbl_get((struct ert_intern *)pgd, &accum, 0);
-	accum = 0;
-
-	if (__pgtbl_set((struct ert_intern *)pgd, NULL, &accum, 0)) return NULL;
-
-	return page;
-}
-
-/* FIXME:  these pgd functions should be replaced with lookup_lvl functions (see below) */
-static void *
-pgtbl_get_pgd(pgtbl_t pt, u32_t addr)
-{
-	unsigned long accum = 0;
-
-	assert(pt);
-	return __pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), (u32_t)addr >> PGTBL_PAGEIDX_SHIFT, 1, &accum);
-}
-
-static int
-pgtbl_check_pgd_absent(pgtbl_t pt, u32_t addr)
-{
-	return __pgtbl_isnull(pgtbl_get_pgd(pt, (u32_t)addr), 0, 0);
-}
-
 extern struct tlb_quiescence tlb_quiescence[NUM_CPU] CACHE_ALIGNED;
 
-int tlb_quiescence_check(u64_t timestamp);
-
-
-static inline int
-pgtbl_quie_check(u32_t orig_v)
-{
-	livenessid_t lid;
-	u64_t        ts;
-
-	if (orig_v & PGTBL_QUIESCENCE) {
-		lid = orig_v >> PGTBL_PAGEIDX_SHIFT;
-		/* An unmap happened at this vaddr before. We need to
-		 * make sure that all cores have done tlb flush before
-		 * creating new mapping. */
-		assert(lid < LTBL_ENTS);
-
-		if (ltbl_get_timestamp(lid, &ts)) return -EFAULT;
-		if (!tlb_quiescence_check(ts)) {
-			printk("kern tsc %llu, lid %d, last flush %llu\n", ts, lid,
-			       tlb_quiescence[get_cpuid()].last_periodic_flush);
-			return -EQUIESCENCE;
-		}
-	}
-
-	return 0;
-}
-
-/*
- * this works on both kmem and regular user memory: the retypetbl_ref
- * works on both.
- */
-static int
-pgtbl_mapping_add(pgtbl_t pt, u32_t addr, u32_t page, u32_t flags)
-{
-	int                ret = 0;
-	struct ert_intern *pte;
-	u32_t              orig_v, accum = 0;
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & page) == 0);
-	assert((PGTBL_FRAME_MASK & flags) == 0);
-
-	/* get the pte */
-	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
-	                                          PGTBL_DEPTH, &accum);
-	if (!pte) return -ENOENT;
-	orig_v = (u32_t)(pte->next);
-
-	if (orig_v & PGTBL_PRESENT) return -EEXIST;
-	if (orig_v & PGTBL_COSFRAME) return -EPERM;
-
-	/* Quiescence check */
-	ret = pgtbl_quie_check(orig_v);
-	if (ret) return ret;
-
-	/* ref cnt on the frame. */
-	ret = retypetbl_ref((void *)page);
-	if (ret) return ret;
-
-	ret = __pgtbl_update_leaf(pte, (void *)(page | flags), orig_v);
-	/* restore the refcnt if necessary */
-	if (ret) retypetbl_deref((void *)page);
-
-	return ret;
-}
-
-/*
- * FIXME: a hack used to get more kmem available in Linux booting
- * environment. Only used when booting up in Linux (hijack.c). This
- * just adds the Linux allocated kmem into pgtbl w/o checking
- * quiescence or refcnt.
- */
-static int
-kmem_add_hack(pgtbl_t pt, u32_t addr, u32_t page, u32_t flags)
-{
-	int                ret;
-	struct ert_intern *pte;
-	u32_t              orig_v, accum = 0;
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & page) == 0);
-	assert((PGTBL_FRAME_MASK & flags) == 0);
-
-	/* get the pte */
-	pte    = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
-                                                  PGTBL_DEPTH, &accum);
-	orig_v = (u32_t)(pte->next);
-
-	if (orig_v & PGTBL_PRESENT) return -EEXIST;
-	if (orig_v & PGTBL_COSFRAME) return -EPERM;
-
-	ret = __pgtbl_update_leaf(pte, (void *)(page | flags), orig_v);
-
-	return ret;
-}
-
-/* This function is only used by the booting code to add cos frames to
- * the pgtbl. It ignores the retype tbl (as we are adding untyped
- * frames). */
-static int
-pgtbl_cosframe_add(pgtbl_t pt, u32_t addr, u32_t page, u32_t flags)
-{
-	struct ert_intern *pte;
-	u32_t              orig_v, accum = 0;
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & page) == 0);
-	assert((PGTBL_FRAME_MASK & flags) == 0);
-
-	/* get the pte */
-	pte    = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
-                                                  PGTBL_DEPTH, &accum);
-	orig_v = (u32_t)(pte->next);
-	assert(orig_v == 0);
-
-	return __pgtbl_update_leaf(pte, (void *)(page | flags), 0);
-}
-
-/* This function updates flags of an existing mapping. */
-static int
-pgtbl_mapping_mod(pgtbl_t pt, u32_t addr, u32_t flags, u32_t *prevflags)
-{
-	/* Not used for now. TODO: add retypetbl_ref / _deref */
-
-	struct ert_intern *pte;
-	u32_t              orig_v, accum = 0;
-
-	assert(pt && prevflags);
-	assert((PGTBL_FLAG_MASK & addr) == 0);
-	assert((PGTBL_FRAME_MASK & flags) == 0);
-
-	/* get the pte */
-	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
-	                                          PGTBL_DEPTH, &accum);
-	if (__pgtbl_isnull(pte, 0, 0)) return -ENOENT;
-
-	orig_v = (u32_t)(pte->next);
-	/*
-	 * accum contains flags from pgd as well, so don't use it to
-	 * get prevflags.
-	 */
-	*prevflags = orig_v & PGTBL_FLAG_MASK;
-
-	/* and update the flags. */
-	return __pgtbl_update_leaf(pte, (void *)((orig_v & PGTBL_FRAME_MASK) | ((u32_t)flags & PGTBL_FLAG_MASK)),
-	                           orig_v);
-}
-
-/* When we remove a mapping, we need to link the vas to a liv_id,
- * which tracks quiescence for us. */
-static int
-pgtbl_mapping_del(pgtbl_t pt, u32_t addr, u32_t liv_id)
-{
-	int                ret;
-	struct ert_intern *pte;
-	unsigned long      orig_v, accum = 0;
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & addr) == 0);
-
-	/* In pgtbl, we have only 20bits for liv id. */
-	if (unlikely(liv_id >= (1 << (32 - PGTBL_PAGEIDX_SHIFT)))) return -EINVAL;
-
-	/* Liveness tracking of the unmapping VAS. */
-	ret = ltbl_timestamp_update(liv_id);
-	if (unlikely(ret)) goto done;
-
-	/* get the pte */
-	pte    = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
-                                                  PGTBL_DEPTH, &accum);
-	orig_v = (u32_t)(pte->next);
-	if (!(orig_v & PGTBL_PRESENT)) return -EEXIST;
-	if (orig_v & PGTBL_COSFRAME) return -EPERM;
-
-
-	ret = __pgtbl_update_leaf(pte, (void *)((liv_id << PGTBL_PAGEIDX_SHIFT) | PGTBL_QUIESCENCE), orig_v);
-	if (ret) cos_throw(done, ret);
-
-	/* decrement ref cnt on the frame. */
-	ret = retypetbl_deref((void *)(orig_v & PGTBL_FRAME_MASK));
-	if (ret) cos_throw(done, ret);
-
-done:
-	return ret;
-}
-
-/* NOTE: This just removes the mapping. NO liveness tracking! TLB
- * flush should be taken care of separately (and carefully). */
-static int
-pgtbl_mapping_del_direct(pgtbl_t pt, u32_t addr)
-{
-	unsigned long accum = 0, *pte = NULL;
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & addr) == 0);
-
-	return __pgtbl_expandn(pt, addr >> PGTBL_PAGEIDX_SHIFT, PGTBL_DEPTH + 1, &accum, &pte, NULL);
-}
-
-static void *
-pgtbl_lkup_lvl(pgtbl_t pt, u32_t addr, u32_t *flags, u32_t start_lvl, u32_t end_lvl)
-{
-	return __pgtbl_lkupani((pgtbl_t)((unsigned long)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT, start_lvl,
-	                       end_lvl, flags);
-}
-
-static int
-pgtbl_ispresent(u32_t flags)
-{
-	return flags & (PGTBL_PRESENT | PGTBL_COSFRAME);
-}
-
-static unsigned long *
-pgtbl_lkup(pgtbl_t pt, u32_t addr, u32_t *flags)
-{
-	void *ret;
-
-	ret = __pgtbl_lkupan((pgtbl_t)((unsigned long)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT, PGTBL_DEPTH + 1,
-	                     flags);
-	if (!pgtbl_ispresent(*flags)) return NULL;
-	return ret;
-}
-
-/* Return the pointer of the pte.  */
-static unsigned long *
-pgtbl_lkup_pte(pgtbl_t pt, u32_t addr, u32_t *flags)
-{
-	return __pgtbl_lkupan((pgtbl_t)((unsigned long)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT, PGTBL_DEPTH,
-	                      flags);
-}
-
-/* FIXME: remove this function.  Why do we need a paddr lookup??? */
-static paddr_t
-pgtbl_lookup(pgtbl_t pt, u32_t addr, u32_t *flags)
-{
-	unsigned long *ret = pgtbl_lkup(pt, addr, flags);
-	if (!ret) return (paddr_t)NULL;
-	return (paddr_t)chal_va2pa(ret);
-}
-
-static int
-pgtbl_get_cosframe(pgtbl_t pt, vaddr_t frame_addr, paddr_t *cosframe)
-{
-	u32_t          flags;
-	unsigned long *pte;
-	paddr_t        v;
-
-	pte = pgtbl_lkup_pte(pt, frame_addr, &flags);
-	if (!pte) return -EINVAL;
-
-	v = *pte;
-	if (!(v & PGTBL_COSFRAME)) return -EINVAL;
-
-	*cosframe = v & PGTBL_FRAME_MASK;
-
-	return 0;
-}
-
-extern unsigned long __cr3_contents;
-
-// this helps debugging.
-// #define UPDATE_LINUX_MM_STRUCT
-
-/* If Composite is running at the highest priority, then we don't need
- * to touch the mm_struct. Also, don't set this when we want return to
- * Linux on idle.*/
-#ifndef LINUX_HIGHEST_PRIORITY
-#undef UPDATE_LINUX_MM_STRUCT
-#define UPDATE_LINUX_MM_STRUCT
-#endif
-#ifdef LINUX_ON_IDLE
-#undef UPDATE_LINUX_MM_STRUCT
-#define UPDATE_LINUX_MM_STRUCT
-#endif
+int            tlb_quiescence_check(u64_t timestamp);
+int            pgtbl_cosframe_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order);
+int            pgtbl_mapping_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order);
+int            pgtbl_mapping_mod(pgtbl_t pt, u32_t addr, u32_t flags, u32_t *prevflags);
+int            pgtbl_mapping_del(pgtbl_t pt, vaddr_t addr, u32_t liv_id);
+int            pgtbl_mapping_del_direct(pgtbl_t pt, u32_t addr);
+void          *pgtbl_lkup_lvl(pgtbl_t pt, vaddr_t addr, word_t *flags, u32_t start_lvl, u32_t end_lvl);
+int            pgtbl_ispresent(word_t flags);
+unsigned long *pgtbl_lkup(pgtbl_t pt, vaddr_t addr, word_t *flags);
+unsigned long *pgtbl_lkup_pte(pgtbl_t pt, vaddr_t addr, word_t *flags);
+unsigned long *pgtbl_lkup_pgd(pgtbl_t pt, vaddr_t addr, word_t *flags);
+int            pgtbl_get_cosframe(pgtbl_t pt, vaddr_t frame_addr, paddr_t *cosframe, vaddr_t *order);
+vaddr_t        pgtbl_translate(pgtbl_t pt, vaddr_t addr, word_t *flags);
+pgtbl_t        pgtbl_create(void *page, void *curr_pgtbl);
+int            pgtbl_activate(struct captbl *t, unsigned long cap, unsigned long capin, pgtbl_t pgtbl, u32_t lvl);
+int            pgtbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned long capin, livenessid_t lid,
+                                capid_t pgtbl_cap, capid_t cosframe_addr, const int root);
+int            pgtbl_mapping_scan(struct cap_pgtbl *pt);
+int            pgtbl_quie_check(word_t orig_v);
+void           pgtbl_init_pte(void *pte);
 
 static inline void
-pgtbl_update(pgtbl_t pt)
-{
-	asm volatile("mov %0, %%cr3" : : "r"(pt));
-}
-
-/* vaddr -> kaddr */
-static vaddr_t
-pgtbl_translate(pgtbl_t pt, u32_t addr, u32_t *flags)
+pgtbl_update(struct pgtbl_info *ptinfo)
 {
-	return (vaddr_t)pgtbl_lkup(pt, addr, flags);
+	chal_pgtbl_update(ptinfo);
 }
 
-/* FIXME: this should be using cos_config.h defines */
-#define KERNEL_PGD_REGION_OFFSET (PAGE_SIZE - PAGE_SIZE / 4)
-#define KERNEL_PGD_REGION_SIZE (PAGE_SIZE / 4)
-
-static pgtbl_t
-pgtbl_create(void *page, void *curr_pgtbl)
-{
-	pgtbl_t ret = pgtbl_alloc(page);
-	/* Copying the kernel part of the pgd. */
-	memcpy(page + KERNEL_PGD_REGION_OFFSET, (void *)chal_pa2va((paddr_t)curr_pgtbl) + KERNEL_PGD_REGION_OFFSET,
-	       KERNEL_PGD_REGION_SIZE);
-
-	return ret;
-}
-int pgtbl_activate(struct captbl *t, unsigned long cap, unsigned long capin, pgtbl_t pgtbl, u32_t lvl);
-int pgtbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned long capin, livenessid_t lid,
-                     capid_t pgtbl_cap, capid_t cosframe_addr, const int root);
-
-static int
-pgtbl_mapping_scan(struct cap_pgtbl *pt)
-{
-	unsigned int i, pte, *page;
-	livenessid_t lid;
-	u64_t        past_ts;
-
-	/* This scans the leaf level of the pgtbl and verifies
-	 * quiescence. */
-	if (pt->lvl != PGTBL_DEPTH - 1) return -EINVAL;
-
-	page = (unsigned int *)(pt->pgtbl);
-	assert(page);
-
-	for (i = 0; i < PAGE_SIZE / sizeof(int *); i++) {
-		pte = *(page + i);
-		if (pte & PGTBL_PRESENT || pte & PGTBL_COSFRAME) return -EINVAL;
-
-		if (pte & PGTBL_QUIESCENCE) {
-			lid = pte >> PGTBL_PAGEIDX_SHIFT;
-
-			if (ltbl_get_timestamp(lid, &past_ts)) return -EFAULT;
-			if (!tlb_quiescence_check(past_ts)) return -EQUIESCENCE;
-		}
-	}
-
-	return 0;
-}
+extern unsigned long __cr3_contents;
 
 static void
 pgtbl_init(void)
@@ -586,7 +89,54 @@ pgtbl_init(void)
 	return;
 }
 
-int cap_memactivate(struct captbl *ct, struct cap_pgtbl *pt, capid_t frame_cap, capid_t dest_pt, vaddr_t vaddr);
-int pgtbl_kmem_act(pgtbl_t pt, u32_t addr, unsigned long *kern_addr, unsigned long **pte);
+extern void kmem_unalloc(unsigned long *pte);
+int cap_memactivate(struct captbl *ct, struct cap_pgtbl *pt, capid_t frame_cap, capid_t dest_pt, vaddr_t vaddr, vaddr_t order);
+int pgtbl_kmem_act(pgtbl_t pt, vaddr_t addr, unsigned long *kern_addr, unsigned long **pte);
+
+/* Chal related function prototypes */
+/* Do flag transformations */
+unsigned long  chal_pgtbl_flag_add(unsigned long input, pgtbl_flags_t flags);
+unsigned long  chal_pgtbl_flag_clr(unsigned long input, pgtbl_flags_t flags);
+unsigned long  chal_pgtbl_flag_exist(unsigned long input, pgtbl_flags_t flags);
+unsigned long  chal_pgtbl_flag_all(unsigned long input, pgtbl_flags_t flags);
+unsigned long  chal_pgtbl_frame(unsigned long input);
+unsigned long  chal_pgtbl_flag(unsigned long input);
+
+int            chal_pgtbl_kmem_act(pgtbl_t pt, vaddr_t addr, unsigned long *kern_addr, unsigned long **pte_ret);
+int            chal_tlb_quiescence_check(u64_t timestamp);
+int            chal_cap_memactivate(struct captbl *ct, struct cap_pgtbl *pt, capid_t frame_cap, capid_t dest_pt, vaddr_t vaddr, vaddr_t order);
+int            chal_pgtbl_activate(struct captbl *t, unsigned long cap, unsigned long capin, pgtbl_t pgtbl, u32_t lvl);
+int            chal_pgtbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned long capin,
+                                     livenessid_t lid, capid_t pgtbl_cap, capid_t cosframe_addr, const int root);
+
+int            chal_pgtbl_mapping_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order);
+int            chal_pgtbl_cosframe_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order);
+/* This function updates flags of an existing mapping. */
+int            chal_pgtbl_mapping_mod(pgtbl_t pt, vaddr_t addr, u32_t flags, u32_t *prevflags);
+int            chal_pgtbl_mapping_del(pgtbl_t pt, vaddr_t addr, u32_t liv_id);
+int            chal_pgtbl_mapping_del_direct(pgtbl_t pt, u32_t addr);
+int            chal_pgtbl_mapping_scan(struct cap_pgtbl *pt);
+void          *chal_pgtbl_lkup_lvl(pgtbl_t pt, vaddr_t addr, word_t *flags, u32_t start_lvl, u32_t end_lvl);
+int            chal_pgtbl_ispresent(word_t flags);
+unsigned long *chal_pgtbl_lkup(pgtbl_t pt, vaddr_t addr, word_t *flags);
+unsigned long *chal_pgtbl_lkup_pte(pgtbl_t pt, vaddr_t addr, word_t *flags);
+unsigned long *chal_pgtbl_lkup_pgd(pgtbl_t pt, vaddr_t addr, word_t *flags);
+int            chal_pgtbl_get_cosframe(pgtbl_t pt, vaddr_t frame_addr, paddr_t *cosframe, vaddr_t *order);
+pgtbl_t        chal_pgtbl_create(void *page, void *curr_pgtbl);
+int            chal_pgtbl_quie_check(u32_t orig_v);
+void           chal_pgtbl_init_pte(void *pte);
+
+/* Creation of the table object - not to be confused with activation of cap */
+int            chal_pgtbl_pgtblactivate(struct captbl *ct, capid_t cap, capid_t pt_entry, capid_t pgtbl_cap, vaddr_t kmem_cap, capid_t pgtbl_lvl);
+/* Deactivate */
+int            chal_pgtbl_deact_pre(struct cap_header *ch, u32_t pa);
+/* Page mapping */
+int            chal_pgtbl_cpy(struct captbl *t, capid_t cap_to, capid_t capin_to, struct cap_pgtbl *ctfrom, capid_t capin_from, cap_t cap_type, vaddr_t order);
+/* Cons & decons functions */
+int            chal_pgtbl_cons(struct cap_captbl *ct, struct cap_captbl *ctsub, capid_t expandid, unsigned long depth);
+int            chal_pgtbl_decons(struct cap_header *head, struct cap_header *sub, capid_t pruneid, unsigned long lvl);
+/* Introspection */
+int            chal_pgtbl_introspect(struct cap_header *ch, vaddr_t addr);
 
 #endif /* PGTBL_H */
+
diff --git a/src/kernel/include/retype_tbl.h b/src/kernel/include/retype_tbl.h
index 18bb738c9b..fabccd2126 100644
--- a/src/kernel/include/retype_tbl.h
+++ b/src/kernel/include/retype_tbl.h
@@ -10,8 +10,8 @@
 #define RETYPE_TBL_H
 
 #include "shared/cos_types.h"
-#include "shared/cos_config.h"
-#include "shared/util.h"
+#include "chal/shared/cos_config.h"
+#include "chal/shared/util.h"
 #include "chal/cpuid.h"
 #include "chal.h"
 
@@ -22,29 +22,56 @@ typedef enum {
 	RETYPETBL_RETYPING = 3, /* ongoing retyping operation */
 } mem_type_t;
 
-#define RETYPE_ENT_TYPE_SZ 4
+#define RETYPE_ENT_TYPE_SZ COS_PGTBL_NUM_ORDER
 #define RETYPE_ENT_REFCNT_SZ (sizeof(u32_t) * 8 - RETYPE_ENT_TYPE_SZ)
+#define RETYPE_ENT_GLB_REFCNT_SZ (RETYPE_ENT_REFCNT_SZ / 2)
 #define RETYPE_REFCNT_MAX ((1 << RETYPE_ENT_REFCNT_SZ) - 1)
+#define RETYPE_REFCNT_GLB_MAX ((1 << RETYPE_ENT_GLB_REFCNT_SZ) - 1)
 
-/* This maintains the information of a collection of physical pages
- * (on one core). */
+/* 
+ * This maintains the information of a collection of physical pages
+ * (of one core).
+ */
 struct retype_entry {
 	union refcnt_atom {
 		struct {
-			mem_type_t type : RETYPE_ENT_TYPE_SZ;
-			/* The ref_cnt is the # of mappings in user space for user
-			 * memory. For kernel memory, it's the # of pages that have
-			 * been activated as kernel objects. */
+			/* 
+			 * The ref_cnt is the # of mappings in user space for user
+			 * memory, or # of mappings in kernel space for kernel memory.
+			 */
 			int ref_cnt : RETYPE_ENT_REFCNT_SZ;
+			mem_type_t type : RETYPE_ENT_TYPE_SZ;
 		} __attribute__((packed));
 		u32_t v;
 	} refcnt_atom;
 	u32_t __pad; /* let's make the size power of 2. */
-	/* the timestamp of when the last unmapped happened. Used to
-	 * track TLB quiescence when retype */
+	/* 
+	 * The timestamp of when the last unmapped happened. Used to
+	 * track TLB quiescence when retype.
+	 */
 	u64_t last_unmap;
 } __attribute__((packed));
 
+/*
+ * This maintains the information of a collection of physical pages
+ * (globally).
+ */
+struct retype_entry_glb {
+	union refcnt_atom_glb {
+		struct {
+			/* How many smaller subpages are typed as kernel? */
+			int kernel_cnt : RETYPE_ENT_GLB_REFCNT_SZ;
+			/* How many smaller subpages are typed as user-level? */
+			int user_cnt : RETYPE_ENT_GLB_REFCNT_SZ;
+			mem_type_t type : RETYPE_ENT_TYPE_SZ;
+		} __attribute__((packed));
+		u32_t v;
+	} refcnt_atom;
+	/* FIXME: Move this to core-local */
+	/* How many kernel pages are used as kernel objects in this memory set? */
+	u32_t kernel_ref;
+} __attribute__((packed));
+
 /* When getting kernel memory through Linux, the retype table is
  * partitioned into two parts for kmem and user memory. */
 /* # of mem_sets in total. +1 to be safe. */
@@ -52,13 +79,16 @@ struct retype_entry {
 #define N_KERN_MEM_SETS (COS_KERNEL_MEMORY / RETYPE_MEM_NPAGES + 1)
 
 #define N_MEM_SETS (N_USER_MEM_SETS + N_KERN_MEM_SETS)
-#define N_MEM_SETS_SZ (sizeof(struct retype_entry) * N_MEM_SETS)
+
+/* FIXME:move these macros to architecture-specific parts */
+#define N_RETYPE_SLOTS (N_MEM_SETS + N_MEM_SETS / 1024 + 1)
+#define N_RETYPE_SLOTS_SZ (sizeof(struct retype_entry) * N_RETYPE_SLOTS)
 
 /* per-cpu retype_info. Each core update this locally when doing
  * mapping/unmapping. */
 struct retype_info {
-	struct retype_entry mem_set[N_MEM_SETS];
-	char                __pad[(N_MEM_SETS_SZ % CACHE_LINE == 0) ? 0 : (N_MEM_SETS_SZ % CACHE_LINE)];
+	struct retype_entry mem_set[N_RETYPE_SLOTS];
+	char                __pad[(N_RETYPE_SLOTS_SZ % CACHE_LINE == 0) ? 0 : (N_RETYPE_SLOTS_SZ % CACHE_LINE)];
 } CACHE_ALIGNED;
 
 extern struct retype_info retype_tbl[NUM_CPU];
@@ -66,30 +96,40 @@ extern struct retype_info retype_tbl[NUM_CPU];
 /* global retype_info. We should only touch this when doing
  * retyping. NOT when doing mapping / unmapping. */
 struct retype_info_glb {
-	u32_t type;
-	char  __pad[CACHE_LINE - sizeof(u32_t)];
+	struct retype_entry_glb info;
+	char  __pad[CACHE_LINE - sizeof(struct retype_entry_glb)];
 } CACHE_ALIGNED;
 
-extern struct retype_info_glb glb_retype_tbl[N_MEM_SETS];
+extern struct retype_info_glb glb_retype_tbl[N_RETYPE_SLOTS];
 
 #define COS_KMEM_BOUND (chal_kernel_mem_pa + PAGE_SIZE * COS_KERNEL_MEMORY)
 
 /* physical address boundary check */
 #define PA_BOUNDARY_CHECK()                                                                            \
 	do {                                                                                           \
-		if (unlikely(!(((u32_t)pa >= COS_MEM_START) && ((u32_t)pa < COS_MEM_BOUND))            \
-		             && !(((u32_t)pa >= chal_kernel_mem_pa) && ((u32_t)pa < COS_KMEM_BOUND)))) \
+		if (unlikely(!(((paddr_t)pa >= COS_MEM_START) && ((paddr_t)pa < COS_MEM_BOUND))            \
+			     && !(((paddr_t)pa >= chal_kernel_mem_pa) && ((paddr_t)pa < COS_KMEM_BOUND)))) \
 			return -EINVAL;                                                                \
 	} while (0)
 
 /* get the index of the memory set. */
 #define GET_MEM_IDX(pa)                                                                 \
-	(((u32_t)pa >= COS_MEM_START) ? (((u32_t)(pa)-COS_MEM_START) / RETYPE_MEM_SIZE) \
-	                              : (((u32_t)(pa)-chal_kernel_mem_pa) / RETYPE_MEM_SIZE + N_USER_MEM_SETS))
+	(((paddr_t)pa >= COS_MEM_START) ? (((paddr_t)(pa) - COS_MEM_START) / RETYPE_MEM_SIZE) \
+	                              : (((paddr_t)(pa) - chal_kernel_mem_pa) / RETYPE_MEM_SIZE + N_USER_MEM_SETS))
+/* The minimum/maximum page order - currently 4kB/1MB pages. This is fine because we don't support large pages on ARM */
+#define MIN_PAGE_ORDER               12
+#if defined(__arm__)
+#define MAX_PAGE_ORDER               20
+#else
+#define MAX_PAGE_ORDER               22
+#endif
+#define NUM_PAGE_SIZES               2
 /* get the memory set struct of the current cpu */
-#define GET_RETYPE_ENTRY(idx) ((&(retype_tbl[get_cpuid()].mem_set[idx])))
+#define GET_RETYPE_POS(idx,order)    (((idx) >> ((order) - MIN_PAGE_ORDER)) + pos2base[order2pos[order]])
+#define GET_RETYPE_ENTRY(idx, order) ((&(retype_tbl[get_cpuid()].mem_set[GET_RETYPE_POS(idx,order)])))
+#define GET_RETYPE_CPU_ENTRY(cpu, idx, order) ((&(retype_tbl[cpu].mem_set[GET_RETYPE_POS(idx,order)])))
 /* get the global memory set struct (used for retyping only). */
-#define GET_GLB_RETYPE_ENTRY(idx) ((&(glb_retype_tbl[idx])))
+#define GET_GLB_RETYPE_ENTRY(idx, order) ((&(glb_retype_tbl[GET_RETYPE_POS(idx,order)].info)))
 
 #define cos_throw(label, errno) \
 	{                       \
@@ -100,16 +140,17 @@ extern struct retype_info_glb glb_retype_tbl[N_MEM_SETS];
 static inline int
 retypetbl_cas(u32_t *a, u32_t old, u32_t new)
 {
-	return cos_cas((unsigned long *)a, old, new);
+	return cos_cas_32((u32_t *)a, old, new);
 }
 
-int retypetbl_retype2user(void *pa);
-int retypetbl_retype2kern(void *pa);
-int retypetbl_retype2frame(void *pa);
+int retypetbl_retype2user(void *pa, u32_t order);
+int retypetbl_retype2kern(void *pa, u32_t order);
+int retypetbl_retype2frame(void *pa, u32_t order);
 
 void retype_tbl_init(void);
-int  retypetbl_ref(void *pa);
-int  retypetbl_kern_ref(void *pa);
-int  retypetbl_deref(void *pa);
+int  retypetbl_ref(void *pa, u32_t order);
+int  retypetbl_deref(void *pa, u32_t order);
+int  retypetbl_kern_ref(void *pa, u32_t order);
+int  retypetbl_kern_deref(void *pa, u32_t order);
 
 #endif /* RETYPE_TBL_H */
diff --git a/src/kernel/include/shared/consts.h b/src/kernel/include/shared/consts.h
index 35864c13fc..b191278949 100644
--- a/src/kernel/include/shared/consts.h
+++ b/src/kernel/include/shared/consts.h
@@ -14,35 +14,14 @@
 #define CONSTS_H
 
 #include "cos_errno.h"
-#include "cos_config.h"
 
 #ifndef __ASM__
-#ifdef __KERNEL__
-#include <linux/thread_info.h> /* for PAGE_SIZE */
-#else
-struct pt_regs {
-	long bx;
-	long cx;
-	long dx;
-	long si;
-	long di;
-	long bp;
-	long ax;
-	long ds;
-	long es;
-	long fs;
-	long gs;
-	long orig_ax;
-	long ip;
-	long cs;
-	long flags;
-	long sp;
-	long ss;
-};
-// struct pt_regs { int dummy[16]; };
-#endif
+#include "../chal/shared/chal_consts.h"
 #endif
+#define MAX_PA_LIMIT     (1ULL << 32)
 #define PAGE_ORDER 12
+#define SUPER_PAGE_ORDER 22
+#define MAX_PA_LIMIT     (1ULL << 32)
 #ifndef __KERNEL__
 #ifndef PAGE_SIZE
 #define PAGE_SIZE (1 << PAGE_ORDER)
@@ -52,14 +31,24 @@ struct pt_regs {
 #define MAX_SERVICE_DEPTH 31
 #define MAX_NUM_THREADS (64 * NUM_CPU)
 
-/* Stacks are 2 * page_size (expressed in words) */
-#define MAX_STACK_SZ_BYTE_ORDER 12
+/*
+ * Stacks are 4 * page_size (expressed in words) 
+ * Thus, usually this would be 4 * 4k = 16k bytes
+ */
+#define MAX_STACK_SZ_BYTE_ORDER 14
 /* Stack size in bytes */
 #define COS_STACK_SZ (1 << MAX_STACK_SZ_BYTE_ORDER)
 /* Stack size in words */
 #define MAX_STACK_SZ (COS_STACK_SZ / 4)
 
-#define ALL_STACK_SZ (MAX_NUM_THREADS * MAX_STACK_SZ)
+#define ALL_STACK_SZ ((MAX_NUM_THREADS + 1) * MAX_STACK_SZ)
+/* 
+ * 4096B / 4 * (64+1) : to flatten the math because of the below error
+ * cos_asm_upcall_simple_stacks.S:28: Error: bad or irreducible absolute expression
+ * Use a 66506 * 4 all stack size simply because the statck size is changed to 4 * 4k,
+ * and applications like DPDK would require a larger stack size
+ */
+#define ALL_STACK_SZ_FLAT (66560*4)
 #define MAX_SPD_VAS_LOCATIONS 8
 
 /* a kludge:  should not use a tmp stack on a stack miss */
@@ -75,13 +64,6 @@ struct pt_regs {
 #define MAX_STATIC_CAP 256
 #define MAX_NUM_ACAP 256
 
-#define PAGE_MASK (~(PAGE_SIZE - 1))
-#define PGD_SHIFT 22
-#define PGD_RANGE (1 << PGD_SHIFT)
-#define PGD_SIZE PGD_RANGE
-#define PGD_MASK (~(PGD_RANGE - 1))
-#define PGD_PER_PTBL 1024
-
 /* For this family of macros, do NOT pass zero as the pow2 */
 #define round_to_pow2(x, pow2) (((unsigned long)(x)) & (~((pow2)-1)))
 #define round_up_to_pow2(x, pow2) (round_to_pow2(((unsigned long)x) + (pow2)-1, (pow2)))
@@ -91,6 +73,21 @@ struct pt_regs {
 #define round_to_pgd_page(x) round_to_pow2(x, PGD_SIZE)
 #define round_up_to_pgd_page(x) round_up_to_pow2(x, PGD_SIZE)
 
+#define round_to_pgt0_page(x) round_to_pow2(x, PGD_SIZE)
+#define round_up_to_pgt0_page(x) round_up_to_pow2(x, PGD_SIZE)
+
+#if defined(__x86_64__)
+#define round_to_pgt1_page(x) round_to_pow2(x, PGT1_SIZE)
+#define round_up_to_pgt1_page(x) round_up_to_pow2(x, PGT1_SIZE)
+#define round_to_pgt2_page(x) round_to_pow2(x, PGT2_SIZE)
+#define round_up_to_pgt2_page(x) round_up_to_pow2(x, PGT2_SIZE)
+#else
+#define round_to_pgt1_page(x) 0
+#define round_up_to_pgt1_page(x) 0
+#define round_to_pgt2_page(x) 0
+#define round_up_to_pgt2_page(x) 0
+#endif
+
 #define CACHE_LINE (64)
 #define CACHE_ALIGNED __attribute__((aligned(CACHE_LINE)))
 #define HALF_CACHE_ALIGNED __attribute__((aligned(CACHE_LINE / 2)))
@@ -139,5 +136,9 @@ struct pt_regs {
 #define CPUID_OFFSET 1
 #define THDID_OFFSET 2
 #define INVTOKEN_OFFSET 3
+#define INVCAP_OFFSET 4
 
-#endif
+/* FIXME: Info on superpage mappings - this should be passed from kernel to userlevel! */
+#define TEST_SUPERPAGE_FRAME    0x10400000
+
+#endif
\ No newline at end of file
diff --git a/src/kernel/include/shared/cos_config.h b/src/kernel/include/shared/cos_config.h
deleted file mode 100644
index a80dc56884..0000000000
--- a/src/kernel/include/shared/cos_config.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef COS_CONFIG_H
-#define COS_CONFIG_H
-
-/***
- * Memory information.  Included are four sections:
- * - physical memory information (PA)
- * - virtual memory addresses (VA)
- * - resource table addresses to index memory resources (RTA)
- * - the maximum number of pages of the different types of memory.
- *   See BOOT_* in cos_types.h for this information
- *
- * These exist separately for kernel-accessible memory that can be
- * typed as either kernel or user virtual memory, and
- * kernel-inaccessible memory that can only be used as user virtual
- * memory.
- */
-
-#include "cpu_ghz.h"
-
-#define NUM_CPU 1
-#define NUM_CPU_BMP_BYTES ((NUM_CPU + 7) / 8)
-#define NUM_CPU_BMP_WORDS ((NUM_CPU_BMP_BYTES + 3) / 4)
-
-/*
- * 1 MB, note that this is not the PA of kernel-usable memory, instead
- * it is the PA of the kernel.  If you change this, update the kernel
- * linker script (.ld) as well.
- */
-#define COS_MEM_KERN_PA (0x00100000)
-#define COS_MEM_KERN_PA_ORDER (29)
-#define COS_MEM_KERN_PA_SZ ((1 << COS_MEM_KERN_PA_ORDER) - (1<<26)) /* FIXME: Need a way to get physical memory size from kernel. Cannot use a hardcoded value, actual memory could be much lower! */
-
-#define COS_MEM_COMP_START_VA ((1 << 30) + (1 << 22)) /* 1GB + 4MB (a relic) */
-#define COS_MEM_KERN_START_VA (0xc0000000) // COS_MEM_KERN_PA     /* currently, we don't do kernel relocation */
-
-#define COS_HW_MMIO_MAX_SZ (1 << 27) /* Assuming a MAX of 128MB for MMIO. */
-#define COS_PHYMEM_MAX_SZ ((1 << 30) - (1 << 22) - COS_HW_MMIO_MAX_SZ) /* 1GB - 4MB - MMIO sz */
-
-#define COS_PHYMEM_END_PA ((1 << 30) - COS_HW_MMIO_MAX_SZ) /* Maximum usable physical memory */
-
-#define BOOT_COMP_MAX_SZ (1 << 24) /* 16 MB for the booter component */
-
-#define CPU_TIMER_FREQ 100 // set in your linux .config
-
-#define RUNTIME 3 // seconds
-
-/* The kernel quiescence period = WCET in Kernel + WCET of a CAS. */
-#define KERN_QUIESCENCE_PERIOD_US 500
-#define KERN_QUIESCENCE_CYCLES (KERN_QUIESCENCE_PERIOD_US * 4000)
-#define TLB_QUIESCENCE_CYCLES (4000 * 1000 * (1000 / CPU_TIMER_FREQ))
-
-// After how many seconds should schedulers print out their information?
-#define SCHED_PRINTOUT_PERIOD 100000
-#define COMPONENT_ASSERTIONS 1 // activate assertions in components?
-
-//#define FPU_ENABLED
-#define FPU_SUPPORT_FXSR 1 /* >0 : CPU supports FXSR. */
-
-/* the CPU that does initialization for Composite */
-#define INIT_CORE 0
-#define NUM_CPU_COS (NUM_CPU > 1 ? NUM_CPU - 1 : 1)
-
-/* Composite user memory uses physical memory above this. */
-#define COS_MEM_START COS_MEM_KERN_PA
-
-/* NUM_CPU_SOCKETS defined in cpu_ghz.h. The information is used for
- * intelligent IPI distribution. */
-#define NUM_CORE_PER_SOCKET (NUM_CPU / NUM_CPU_SOCKETS)
-
-// cos kernel settings
-#define COS_PRINT_MEASUREMENTS 1
-#define COS_PRINT_SCHED_EVENTS 1
-#define COS_ASSERTIONS_ACTIVE 1
-
-/*** Console and output options ***/
-/*
- * Notes: If you are using composite as high priority and no idle to
- * linux, then the shell output will not appear until the Composite
- * system has exited.  Thus, you will want to make the memory size
- * large enough to buffer _all_ output.  Note that currently
- * COS_PRINT_MEM_SZ should not exceed around (1024*1024*3).
- *
- * If you have COS_PRINT_SHELL, you _will not see output_ unless you
- * run
- * $~/transfer/print
- * after
- * # make
- * but before the runscript.
- */
-/* print out to the shell? */
-#define COS_PRINT_SHELL 1
-/* how much should we buffer before sending an event to the shell? */
-#define COS_PRINT_BUF_SZ 128
-/* how large should the shared memory region be that will buffer print data? */
-#define COS_PRINT_MEM_SZ (4096)
-
-/* print out to dmesg? */
-/* #define COS_PRINT_DMESG 1 */
-
-/**
- * Configuration to enable/disable functionality in Kernel.
- */
-#define ENABLE_VGA
-#define ENABLE_SERIAL
-
-#endif /* COS_CONFIG_H */
diff --git a/src/kernel/include/shared/cos_io.h b/src/kernel/include/shared/cos_io.h
deleted file mode 120000
index d741c9aed3..0000000000
--- a/src/kernel/include/shared/cos_io.h
+++ /dev/null
@@ -1 +0,0 @@
-../chal/io.h
\ No newline at end of file
diff --git a/src/kernel/include/shared/cos_types.h b/src/kernel/include/shared/cos_types.h
index 18f8917c44..cd2f8f05cd 100644
--- a/src/kernel/include/shared/cos_types.h
+++ b/src/kernel/include/shared/cos_types.h
@@ -15,21 +15,36 @@
 #define TYPES_H
 
 #include "./consts.h"
-#include "./cos_config.h"
-#include "./chal_config.h"
+#include "../chal/shared/cos_config.h"
+#include "../chal/chal_config.h"
 
 #ifndef LLONG_MAX
 #define LLONG_MAX 9223372036854775807LL
 #endif
 
-typedef unsigned long word_t;
-typedef u64_t         cycles_t;
-typedef u64_t         microsec_t;
-typedef unsigned long tcap_res_t;
-typedef unsigned long tcap_time_t;
-typedef u64_t         tcap_prio_t;
-typedef u64_t         tcap_uid_t;
-typedef u32_t         sched_tok_t;
+typedef unsigned long      word_t;
+typedef unsigned long long dword_t;
+typedef u64_t              cycles_t;
+typedef u64_t              microsec_t;
+typedef unsigned long      tcap_res_t;
+typedef unsigned long      tcap_time_t;
+typedef u64_t              tcap_prio_t;
+typedef u64_t              tcap_uid_t;
+typedef u32_t              sched_tok_t;
+typedef u32_t              asid_t;
+
+/*
+ * This is more complicated than a direct comparison due to
+ * wraparound. We assume that no cycle value will be referenced that
+ * is more than 2^63 away from another, thus producing the following
+ * logic. Practically, this often simply means that timeouts cannot be
+ * more than 2^63 into the future.
+ */
+static inline int
+cycles_greater_than(cycles_t g, cycles_t l)
+{
+	return (s64_t)(g - l) > 0;
+}
 
 /*
  * The assumption in the following is that cycles_t are higher
@@ -37,7 +52,12 @@ typedef u32_t         sched_tok_t;
  *
  *  sizeof(cycles_t) >= sizeof(tcap_time_t)
  */
-#define TCAP_TIME_QUANTUM_ORD 12
+#if defined(__x86_64__)
+	#define TCAP_TIME_QUANTUM_ORD 0
+#else 
+
+	#define TCAP_TIME_QUANTUM_ORD 12
+#endif
 #define TCAP_TIME_MAX_ORD (TCAP_TIME_QUANTUM_ORD + (sizeof(tcap_time_t) * 8))
 #define TCAP_TIME_MAX_BITS(c) (((u64_t)c >> TCAP_TIME_MAX_ORD) << TCAP_TIME_MAX_ORD)
 #define TCAP_TIME_NIL 0
@@ -45,7 +65,12 @@ typedef u32_t         sched_tok_t;
 static inline cycles_t
 tcap_time2cyc(tcap_time_t c, cycles_t curr)
 {
+#if defined(__x86_64__)
+	(void)curr;
+	return c;
+#else
 	return (((cycles_t)c) << TCAP_TIME_QUANTUM_ORD) | TCAP_TIME_MAX_BITS(curr);
+#endif
 }
 static inline tcap_time_t
 tcap_cyc2time(cycles_t c)
@@ -126,6 +151,11 @@ typedef enum {
 	CAPTBL_OP_HW_CYC_USEC,
 	CAPTBL_OP_HW_CYC_THRESH,
 	CAPTBL_OP_HW_SHUTDOWN,
+	CAPTBL_OP_HW_TLB_LOCKDOWN,
+	CAPTBL_OP_HW_L1FLUSH,
+	CAPTBL_OP_HW_TLBFLUSH,
+	CAPTBL_OP_HW_TLBSTALL,
+	CAPTBL_OP_HW_TLBSTALL_RECOUNT
 } syscall_op_t;
 
 typedef enum {
@@ -199,14 +229,14 @@ __captbl_cap2sz(cap_t c)
 	case CAP_THD:
 	case CAP_TCAP:
 		return CAP_SZ_16B;
-	case CAP_CAPTBL:
-	case CAP_PGTBL:
 	case CAP_HW: /* TODO: 256bits = 32B * 8b */
 		return CAP_SZ_32B;
 	case CAP_SINV:
 	case CAP_COMP:
 	case CAP_ASND:
 	case CAP_ARCV:
+	case CAP_CAPTBL:
+	case CAP_PGTBL:
 		return CAP_SZ_64B;
 	default:
 		return CAP_SZ_ERR;
@@ -245,16 +275,16 @@ enum
 	BOOT_CAPTBL_SRET            = 0,
 	BOOT_CAPTBL_PRINT_HACK      = 2, /* This slot is not used for any capability and SRET is 16B (1slot).. */
 	BOOT_CAPTBL_SELF_CT         = 4,
-	BOOT_CAPTBL_SELF_PT         = 6,
-	BOOT_CAPTBL_SELF_COMP       = 8,
-	BOOT_CAPTBL_BOOTVM_PTE      = 12,
-	BOOT_CAPTBL_SELF_UNTYPED_PT = 14,
-	BOOT_CAPTBL_PHYSM_PTE       = 16,
-	BOOT_CAPTBL_KM_PTE          = 18,
-
-	BOOT_CAPTBL_SINV_CAP           = 20,
-	BOOT_CAPTBL_SELF_INITHW_BASE   = 24,
-	BOOT_CAPTBL_SELF_INITTHD_BASE  = 28,
+	BOOT_CAPTBL_SELF_PT         = 8,
+	BOOT_CAPTBL_SELF_COMP       = 12,
+	BOOT_CAPTBL_BOOTVM_PTE      = 16,
+	BOOT_CAPTBL_SELF_UNTYPED_PT = 20,
+	BOOT_CAPTBL_PHYSM_PTE       = 24,
+	BOOT_CAPTBL_KM_PTE          = 28,
+
+	BOOT_CAPTBL_SINV_CAP           = 32,
+	BOOT_CAPTBL_SELF_INITHW_BASE   = 36,
+	BOOT_CAPTBL_SELF_INITTHD_BASE  = 40,
 	/*
 	 * NOTE: kernel doesn't support sharing a cache-line across cores,
 	 *       so optimize to place INIT THD/TCAP on same cache line and bump by 64B for next CPU
@@ -268,7 +298,7 @@ enum
 };
 
 #define BOOT_CAPTBL_SELF_INITTHD_BASE_CPU(cpuid) (BOOT_CAPTBL_SELF_INITTHD_BASE + cpuid * CAP16B_IDSZ)
-#define BOOT_CAPTBL_SELF_INITTCAP_BASE_CPU(cpuid) (BOOT_CAPTBL_SELF_INITTCAP_BASE + cpuid + CAP16B_IDSZ)
+#define BOOT_CAPTBL_SELF_INITTCAP_BASE_CPU(cpuid) (BOOT_CAPTBL_SELF_INITTCAP_BASE + cpuid * CAP16B_IDSZ)
 #define BOOT_CAPTBL_SELF_INITRCV_BASE_CPU(cpuid) (BOOT_CAPTBL_SELF_INITRCV_BASE + cpuid * CAP64B_IDSZ)
 
 #define BOOT_CAPTBL_SELF_INITTHD_CPU_BASE (BOOT_CAPTBL_SELF_INITTHD_BASE_CPU(cos_cpuid()))
@@ -282,11 +312,8 @@ enum
  */
 #define BOOT_CAPTBL_NPAGES ((BOOT_CAPTBL_FREE + CAPTBL_EXPAND_SZ + CAPTBL_EXPAND_SZ * 2 - 1) / (CAPTBL_EXPAND_SZ * 2))
 
-enum
-{
-	BOOT_MEM_VM_BASE = (COS_MEM_COMP_START_VA + (1 << 22)), /* @ 1G + 8M */
-	BOOT_MEM_KM_BASE = PGD_SIZE, /* kernel & user memory @ 4M, pgd aligned start address */
-};
+#define BOOT_MEM_VM_BASE (COS_MEM_COMP_START_VA + (1 << 22)) /* @ 1G + 8M */
+#define BOOT_MEM_KM_BASE PGD_SIZE /* kernel & user memory @ 4M, pgd aligned start address */
 
 enum
 {
@@ -336,8 +363,6 @@ enum
 #define PERCPU_GET(name) (&(name[GET_CURR_CPU].name))
 #define PERCPU_GET_TARGET(name, target) (&(name[target].name))
 
-#define COS_SYSCALL __attribute__((regparm(0)))
-
 #ifndef NULL
 #define NULL ((void *)0)
 #endif
@@ -501,4 +526,4 @@ typedef unsigned short int cos_channelkey_t; /* 0 == PRIVATE KEY. >= 1 GLOBAL KE
  */
 #define PRINT_CAP_TEMP (BOOT_CAPTBL_PRINT_HACK)
 
-#endif /* TYPES_H */
+#endif /* TYPES_H */
\ No newline at end of file
diff --git a/src/kernel/include/shared/elf_loader.h b/src/kernel/include/shared/elf_loader.h
index 966acc83f1..c5064ceed2 100644
--- a/src/kernel/include/shared/elf_loader.h
+++ b/src/kernel/include/shared/elf_loader.h
@@ -13,6 +13,13 @@
 
 #include <cos_types.h>
 
+
+enum ELF_HDR_TYPE {
+	ELF_HDR_ERR 	= -1,
+	ELF_HDR_32	= 32,
+	ELF_HDR_64	= 64,
+};
+
 /* ELF File Header */
 struct elf_hdr {
 	unsigned char e_ident[16];       /* Magic number and other info */
@@ -64,35 +71,26 @@ elf_chk_format(struct elf_hdr *hdr)
 {
 	unsigned char *s = hdr->e_ident;
 
-	/* Format:  "0x7fELF1" where the 1 is for 32 bit */
-	if (s[0] != 0x7f || s[1] != 'E' || s[2] != 'L' || s[3] != 'F' || s[4] != 1) return -1;
-	return 0;
-}
+	if (s[0] == 0x7f && s[1] == 'E' && s[2] == 'L' && s[3] == 'F' && s[4] == 1) return ELF_HDR_32;
+	if (s[0] == 0x7f && s[1] == 'E' && s[2] == 'L' && s[3] == 'F' && s[4] == 2) return ELF_HDR_64;
 
-/*
- * Returns the address of the entry function, or 0 on error.
- */
-static inline vaddr_t
-elf_entry_addr(struct elf_hdr *hdr)
-{
-	if (elf_chk_format(hdr)) return 0;
-
-	return (vaddr_t)hdr->e_entry;
+	return ELF_HDR_ERR;
 }
 
+
 /*
  * Get the nmem-th contiguous memory region in the binary.  Return -1
  * if the elf object isn't shaped correctly, 1 if there aren't `nmem`
  * regions, and 0 if `mem` is properly populated.
  */
 static inline int
-elf_contig_mem(struct elf_hdr *hdr, unsigned int nmem, struct elf_contig_mem *mem)
+elf32_contig_mem(struct elf_hdr *hdr, unsigned int nmem, struct elf_contig_mem *mem)
 {
 	struct elf32_proghdr *proghdr, *memsect = NULL;
 	u32_t off;
 	unsigned int i, cntmem;
 
-	if (elf_chk_format(hdr) ||
+	if (elf_chk_format(hdr) != ELF_HDR_32 ||
 	    hdr->e_phentsize != sizeof(struct elf32_proghdr)) return -1;
 
 	proghdr = (struct elf32_proghdr *)((char *)hdr + hdr->e_phoff);
@@ -118,6 +116,106 @@ elf_contig_mem(struct elf_hdr *hdr, unsigned int nmem, struct elf_contig_mem *me
 	return 0;
 }
 
+/*
+ * This is the elf_64 related code
+ */
+struct elf64_hdr{
+        unsigned char   e_ident[16]; 
+        u16_t           e_type;
+        u16_t           e_machine;
+        u32_t           e_version;
+        u64_t           e_entry;
+        u64_t           e_phoff;
+        u64_t           e_shoff;
+        u32_t           e_flags;
+        u16_t           e_ehsize;
+        u16_t           e_phentsize;
+        u16_t           e_phnum;
+        u16_t           e_shentsize;
+        u16_t           e_shnum;
+        u16_t           e_shstrndx;
+};
+
+
+struct elf64_proghdr {
+        u32_t    p_type;
+        u32_t    p_flags;
+        u64_t    p_offset;
+        u64_t    p_vaddr;
+        u64_t    p_paddr;
+        u64_t    p_filesz;
+        u64_t    p_memsz;
+        u64_t    p_align;
+};
+
+
+static inline int
+elf64_contig_mem(struct elf64_hdr *hdr, unsigned int nmem, struct elf_contig_mem *mem)
+{
+	struct elf64_proghdr *proghdr, *memsect = NULL;
+	u32_t off;
+	unsigned int i, cntmem;
+
+	if (elf_chk_format((struct elf_hdr *)hdr) != ELF_HDR_64 ||
+	    hdr->e_phentsize != sizeof(struct elf64_proghdr)) return -1;
+
+	proghdr = (struct elf64_proghdr *)((char *)hdr + hdr->e_phoff);
+
+	for (i = 0, cntmem = 0; i < hdr->e_phnum && cntmem <= nmem; i++) {
+		if (proghdr[i].p_type != ELF_PH_LOAD) continue;
+		if (cntmem == nmem) {
+			memsect = &proghdr[i];
+			break;
+		}
+		cntmem++;
+	}
+	if (memsect == NULL) return 1;
+
+	*mem = (struct elf_contig_mem){
+		.vstart = memsect->p_vaddr,
+		.mem    = (char *)hdr + memsect->p_offset,
+		.objsz  = memsect->p_filesz,
+		.sz     = memsect->p_memsz,
+		.access = memsect->p_flags
+	};
+
+	return 0;
+}
+
+/*
+ * Returns the address of the entry function, or 0 on error.
+ */
+static inline vaddr_t
+elf_entry_addr(struct elf_hdr *hdr)
+{
+	int ret = elf_chk_format(hdr);
+	if (ret == ELF_HDR_32) {
+		return (vaddr_t)hdr->e_entry;
+	} else if (ret == ELF_HDR_64) {
+		return (vaddr_t)(((struct elf64_hdr* )hdr)->e_entry);
+	}
+
+	return 0;
+}
+
+/*
+ * Get the nmem-th contiguous memory region in the binary.  Return -1
+ * if the elf object isn't shaped correctly, 1 if there aren't `nmem`
+ * regions, and 0 if `mem` is properly populated.
+ */
+static inline int
+elf_contig_mem(struct elf_hdr *hdr, unsigned int nmem, struct elf_contig_mem *mem)
+{
+	int ret = elf_chk_format(hdr);
+	if (ret == ELF_HDR_32) {
+		return elf32_contig_mem(hdr, nmem, mem);
+	} else if (ret == ELF_HDR_64) {
+		return elf64_contig_mem((struct elf64_hdr *)hdr, nmem, mem);
+	}
+
+	return -1;
+}
+
 /*
  * This function ASSUMES that the elf object has only two sections,
  * one for RO data, and one for RW. It assumes the RO section appears
@@ -161,5 +259,4 @@ elf_load_info(struct elf_hdr *hdr, vaddr_t *ro_addr, size_t *ro_sz, char **ro_sr
 	return 0;
 }
 
-
 #endif	/* SIMPLE_ELF_H */
diff --git a/src/kernel/include/shared/util.h b/src/kernel/include/shared/util.h
deleted file mode 100644
index 16cea9ee27..0000000000
--- a/src/kernel/include/shared/util.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef UTIL_H
-#define UTIL_H
-
-#define CAS_SUCCESS 1
-/*
- * Return values:
- * 0 on failure due to contention (*target != old)
- * 1 otherwise (*target == old -> *target = updated)
- */
-static inline int
-cos_cas(unsigned long *target, unsigned long old, unsigned long updated)
-{
-	char z;
-	__asm__ __volatile__("lock cmpxchgl %2, %0; setz %1"
-	                     : "+m"(*target), "=a"(z)
-	                     : "q"(updated), "a"(old)
-	                     : "memory", "cc");
-	return (int)z;
-}
-
-/* Fetch-and-add implementation on x86. It returns the original value
- * before xaddl. */
-static inline int
-cos_faa(int *var, int value)
-{
-	__asm__ __volatile__("lock xaddl %%eax, %2;"
-	                     : "=a"(value)           // Output
-	                     : "a"(value), "m"(*var) // Input
-	                     : "memory");
-	return value;
-}
-
-/* x86 cpuid instruction barrier. */
-static inline void
-cos_inst_bar(void)
-{
-	int eax, edx, code = 0;
-	(void)eax;
-	(void)edx;
-	(void)code;
-
-	__asm__ __volatile__("cpuid" : "=a"(eax), "=d"(edx) : "a"(code) : "ecx", "ebx");
-
-	return;
-}
-
-#ifndef rdtscll
-#define rdtscll(val) __asm__ __volatile__("rdtsc" : "=A"(val))
-#endif
-
-#endif
diff --git a/src/kernel/include/tcap.h b/src/kernel/include/tcap.h
index 7ae3dec9a5..2dbc3dcbb3 100644
--- a/src/kernel/include/tcap.h
+++ b/src/kernel/include/tcap.h
@@ -251,7 +251,12 @@ tcap_timer_update(struct cos_cpu_local_info *cos_info, struct tcap *next, tcap_t
 	}
 
 	/* timeout based on the tcap budget... */
-	timer       = now + left;
+	if (TCAP_RES_IS_INF(left)) {
+		timer = left;
+	} else {
+		timer = now + left;
+	}
+
 	timeout_cyc = tcap_time2cyc(timeout, now);
 	/* ...or explicit timeout within the bounds of the budget */
 	if (timeout != TCAP_TIME_NIL && timeout_cyc < timer) {
diff --git a/src/kernel/include/thd.h b/src/kernel/include/thd.h
index 8c10d536cc..fd0ec066b3 100644
--- a/src/kernel/include/thd.h
+++ b/src/kernel/include/thd.h
@@ -90,20 +90,9 @@ struct cap_thd {
 } __attribute__((packed));
 
 static void
-thd_upcall_setup(struct thread *thd, u32_t entry_addr, int option, int arg1, int arg2, int arg3)
+thd_upcall_setup(struct thread *thd, vaddr_t entry_addr, int option, int arg1, int arg2, int arg3)
 {
-	struct pt_regs *r = &thd->regs;
-
-	r->cx = option;
-
-	r->bx = arg1;
-	r->di = arg2;
-	r->si = arg3;
-
-	r->ip = r->dx = entry_addr;
-	r->ax         = thd->tid | (get_cpuid() << 16); // thd id + cpu id
-
-	return;
+	regs_upcall_setup(&thd->regs, entry_addr, option, thd->tid | (get_cpuid() << 16), arg1, arg2, arg3);
 }
 
 /*
@@ -493,7 +482,7 @@ thd_current_pgtbl(struct thread *thd)
 	/* don't use the cached invstk_top here. We need the stack
 	 * pointer of the specified thread. */
 	curr_entry = &thd->invstk[thd->invstk_top];
-	return curr_entry->comp_info.pgtbl;
+	return curr_entry->comp_info.pgtblinfo.pgtbl;
 }
 
 static inline int
diff --git a/src/kernel/pgtbl.c b/src/kernel/pgtbl.c
index 2d1489a91c..3849da5fe1 100644
--- a/src/kernel/pgtbl.c
+++ b/src/kernel/pgtbl.c
@@ -4,184 +4,135 @@
 #include "include/cap_ops.h"
 #include "include/liveness_tbl.h"
 #include "include/retype_tbl.h"
+#include "chal/chal_proto.h"
 
 int
-pgtbl_kmem_act(pgtbl_t pt, u32_t addr, unsigned long *kern_addr, unsigned long **pte_ret)
+pgtbl_kmem_act(pgtbl_t pt, vaddr_t addr, unsigned long *kern_addr, unsigned long **pte_ret)
 {
-	struct ert_intern *pte;
-	u32_t              orig_v, new_v, accum = 0;
-
-	assert(pt);
-	assert((PGTBL_FLAG_MASK & addr) == 0);
+	return chal_pgtbl_kmem_act(pt, addr, kern_addr, pte_ret);
+}
 
-	/* get the pte */
-	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
-	                                          PGTBL_DEPTH, &accum);
-	if (unlikely(!pte)) return -ENOENT;
-	if (unlikely(__pgtbl_isnull(pte, 0, 0))) return -ENOENT;
+int
+tlb_quiescence_check(u64_t timestamp)
+{
+	return chal_tlb_quiescence_check(timestamp);
+}
 
-	orig_v = (u32_t)(pte->next);
-	if (unlikely(!(orig_v & PGTBL_COSFRAME))) return -EINVAL; /* can't activate non-frames */
-	if (unlikely(orig_v & PGTBL_COSKMEM)) return -EEXIST;     /* can't re-activate kmem frames */
-	assert(!(orig_v & PGTBL_QUIESCENCE));
+int
+cap_memactivate(struct captbl *ct, struct cap_pgtbl *pt, capid_t frame_cap, capid_t dest_pt, vaddr_t vaddr, vaddr_t order)
+{
+	return chal_cap_memactivate(ct, pt, frame_cap, dest_pt, vaddr, order);
+}
 
-	*kern_addr = (unsigned long)chal_pa2va((paddr_t)(orig_v & PGTBL_FRAME_MASK));
-	new_v      = orig_v | PGTBL_COSKMEM;
+int
+pgtbl_activate(struct captbl *t, unsigned long cap, unsigned long capin, pgtbl_t pgtbl, u32_t lvl)
+{
+	return chal_pgtbl_activate(t, cap, capin, pgtbl, lvl);
+}
 
-	/* pa2va (value in *kern_addr) will return NULL if the page is
-	 * not kernel accessible */
-	if (unlikely(!*kern_addr)) return -EINVAL; /* cannot retype a non-kernel accessible page */
-	if (unlikely(retypetbl_kern_ref((void *)(new_v & PGTBL_FRAME_MASK)))) return -EFAULT;
+int
+pgtbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned long capin,
+                 livenessid_t lid, capid_t pgtbl_cap, capid_t cosframe_addr, const int root)
+{
+	return chal_pgtbl_deactivate(t, dest_ct_cap, capin, lid, pgtbl_cap, cosframe_addr, root);
+}
 
-	/* We keep the cos_frame entry, but mark it as COSKMEM so that
-	 * we won't use it for other kernel objects. */
-	if (unlikely(cos_cas((unsigned long *)pte, orig_v, new_v) != CAS_SUCCESS)) {
-		/* restore the ref cnt. */
-		retypetbl_deref((void *)(orig_v & PGTBL_FRAME_MASK));
-		return -ECASFAIL;
-	}
-	/* Return the pte ptr, so that we can release the page if the
-	 * kobj activation failed later. */
-	*pte_ret = (unsigned long *)pte;
+int
+pgtbl_mapping_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order)
+{
+	return chal_pgtbl_mapping_add(pt, addr, page, flags, order);
+}
 
-	return 0;
+int
+pgtbl_cosframe_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order)
+{
+	return chal_pgtbl_cosframe_add(pt, addr, page, flags, order);
 }
 
-/* Return 1 if quiescent past since input timestamp. 0 if not. */
 int
-tlb_quiescence_check(u64_t timestamp)
+pgtbl_mapping_mod(pgtbl_t pt, u32_t addr, u32_t flags, u32_t *prevflags)
 {
-	int i, quiescent = 1;
-
-	/* Did timer interrupt (which does tlb flush
-	 * periodically) happen after unmap? The periodic
-	 * flush happens on all cpus, thus only need to check
-	 * the time stamp of the current core for that case
-	 * (assuming consistent time stamp counters). */
-	if (timestamp > tlb_quiescence[get_cpuid()].last_periodic_flush) {
-		/* If no periodic flush done yet, did the
-		 * mandatory flush happen on all cores? */
-		for (i = 0; i < NUM_CPU_COS; i++) {
-			if (timestamp > tlb_quiescence[i].last_mandatory_flush) {
-				/* no go */
-				quiescent = 0;
-				break;
-			}
-		}
-	}
-	if (quiescent == 0) {
-		printk("from cpu %d, t %llu: cpu %d last mandatory flush: %llu\n", get_cpuid(), timestamp, i,
-		       tlb_quiescence[i].last_mandatory_flush);
-		for (i = 0; i < NUM_CPU_COS; i++) {
-			printk("cpu %d: flush %llu\n", i, tlb_quiescence[i].last_mandatory_flush);
-		}
-	}
-
-	return quiescent;
+	return chal_pgtbl_mapping_mod(pt, addr, flags, prevflags);
 }
 
 int
-cap_memactivate(struct captbl *ct, struct cap_pgtbl *pt, capid_t frame_cap, capid_t dest_pt, vaddr_t vaddr)
+pgtbl_mapping_del(pgtbl_t pt, vaddr_t addr, u32_t liv_id)
 {
-	unsigned long *    pte, cosframe, orig_v;
-	struct cap_header *dest_pt_h;
-	u32_t              flags;
-	int                ret;
+	return chal_pgtbl_mapping_del(pt, addr, liv_id);
+}
 
-	if (unlikely(pt->lvl || (pt->refcnt_flags & CAP_MEM_FROZEN_FLAG))) return -EINVAL;
+/* 
+ * NOTE: This just removes the mapping. NO liveness tracking! TLB
+ * flush should be taken care of separately (and carefully).
+ */
+int
+pgtbl_mapping_del_direct(pgtbl_t pt, u32_t addr)
+{
+	return chal_pgtbl_mapping_del_direct(pt, addr);
+}
 
-	dest_pt_h = captbl_lkup(ct, dest_pt);
-	if (dest_pt_h->type != CAP_PGTBL) return -EINVAL;
-	if (((struct cap_pgtbl *)dest_pt_h)->lvl) return -EINVAL;
+int
+pgtbl_mapping_scan(struct cap_pgtbl *pt)
+{
+	return chal_pgtbl_mapping_scan(pt);
+}
 
-	pte = pgtbl_lkup_pte(pt->pgtbl, frame_cap, &flags);
-	if (!pte) return -EINVAL;
-	orig_v = *pte;
+void *
+pgtbl_lkup_lvl(pgtbl_t pt, vaddr_t addr, word_t *flags, u32_t start_lvl, u32_t end_lvl)
+{
+	return chal_pgtbl_lkup_lvl(pt, addr, flags, start_lvl, end_lvl);
+}
 
-	if (!(orig_v & PGTBL_COSFRAME) || (orig_v & PGTBL_COSKMEM)) return -EPERM;
+int
+pgtbl_ispresent(word_t flags)
+{
+	return chal_pgtbl_ispresent(flags);
+}
 
-	assert(!(orig_v & PGTBL_QUIESCENCE));
-	cosframe = orig_v & PGTBL_FRAME_MASK;
+unsigned long *
+pgtbl_lkup(pgtbl_t pt, vaddr_t addr, word_t *flags)
+{
+	return chal_pgtbl_lkup(pt, addr, flags);
+}
 
-	ret = pgtbl_mapping_add(((struct cap_pgtbl *)dest_pt_h)->pgtbl, vaddr, cosframe, PGTBL_USER_DEF);
+unsigned long *
+pgtbl_lkup_pte(pgtbl_t pt, vaddr_t addr, word_t *flags)
+{
+	return chal_pgtbl_lkup_pte(pt, addr, flags);
+}
 
-	return ret;
+unsigned long *
+pgtbl_lkup_pgd(pgtbl_t pt, vaddr_t addr, word_t *flags)
+{
+	return chal_pgtbl_lkup_pgd(pt, addr, flags);
 }
 
 int
-pgtbl_activate(struct captbl *t, unsigned long cap, unsigned long capin, pgtbl_t pgtbl, u32_t lvl)
+pgtbl_get_cosframe(pgtbl_t pt, vaddr_t frame_addr, paddr_t *cosframe, vaddr_t *order)
 {
-	struct cap_pgtbl *pt;
-	int               ret;
-
-	pt = (struct cap_pgtbl *)__cap_capactivate_pre(t, cap, capin, CAP_PGTBL, &ret);
-	if (unlikely(!pt)) return ret;
-	pt->pgtbl = pgtbl;
+	return chal_pgtbl_get_cosframe(pt, frame_addr, cosframe, order);
+}
 
-	pt->refcnt_flags = 1;
-	pt->parent       = NULL; /* new cap has no parent. only copied cap has. */
-	pt->lvl          = lvl;
-	__cap_capactivate_post(&pt->h, CAP_PGTBL);
+vaddr_t
+pgtbl_translate(pgtbl_t pt, word_t addr, word_t *flags)
+{
+	return (vaddr_t)pgtbl_lkup(pt, addr, flags);
+}
 
-	return 0;
+pgtbl_t
+pgtbl_create(void *page, void *curr_pgtbl)
+{
+	return chal_pgtbl_create(page, curr_pgtbl);
 }
 
 int
-pgtbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned long capin, livenessid_t lid,
-                 capid_t pgtbl_cap, capid_t cosframe_addr, const int root)
-{
-	struct cap_header *deact_header;
-	struct cap_pgtbl * deact_cap, *parent;
-
-	unsigned long l, old_v = 0, *pte = NULL;
-	int           ret;
-
-	deact_header = captbl_lkup(dest_ct_cap->captbl, capin);
-	if (!deact_header || deact_header->type != CAP_PGTBL) cos_throw(err, -EINVAL);
-	deact_cap = (struct cap_pgtbl *)deact_header;
-	parent    = deact_cap->parent;
-
-	l = deact_cap->refcnt_flags;
-	assert(l & CAP_REFCNT_MAX);
-
-	if ((l & CAP_REFCNT_MAX) != 1) {
-		/* We need to deact children first! */
-		cos_throw(err, -EINVAL);
-	}
-
-	if (parent == NULL) {
-		if (!root) cos_throw(err, -EINVAL);
-		/* Last reference to the captbl page. Require pgtbl
-		 * and cos_frame cap to release the kmem page. */
-		ret = kmem_deact_pre(deact_header, t, pgtbl_cap, cosframe_addr, &pte, &old_v);
-		if (ret) cos_throw(err, ret);
-	} else {
-		/* more reference exists. */
-		if (root) cos_throw(err, -EINVAL);
-		assert(!pgtbl_cap && !cosframe_addr);
-	}
-
-	if (cos_cas((unsigned long *)&deact_cap->refcnt_flags, l, CAP_MEM_FROZEN_FLAG) != CAS_SUCCESS)
-		cos_throw(err, -ECASFAIL);
-
-	/* deactivation success. We should either release the
-	 * page, or decrement parent cnt. */
-	if (parent == NULL) {
-		/* move the kmem to COSFRAME */
-		ret = kmem_deact_post(pte, old_v);
-		if (ret) {
-			cos_faa((int *)&deact_cap->refcnt_flags, 1);
-			cos_throw(err, ret);
-		}
-	} else {
-		cos_faa((int *)&parent->refcnt_flags, -1);
-	}
-
-	/* FIXME: this should be before the kmem_deact_post */
-	ret = cap_capdeactivate(dest_ct_cap, capin, CAP_PGTBL, lid);
-	if (ret) cos_throw(err, ret);
-
-	return 0;
-err:
-	return ret;
+pgtbl_quie_check(word_t orig_v)
+{
+	return chal_pgtbl_quie_check(orig_v);
+}
+
+void
+pgtbl_init_pte(void *pte)
+{
+	return chal_pgtbl_init_pte(pte);
 }
diff --git a/src/kernel/retype_tbl.c b/src/kernel/retype_tbl.c
index 69a962a7ae..8c6167b1ee 100644
--- a/src/kernel/retype_tbl.c
+++ b/src/kernel/retype_tbl.c
@@ -8,84 +8,191 @@
 
 #include "include/retype_tbl.h"
 #include "include/chal.h"
+#include "include/chal/defs.h"
 #include "include/shared/cos_types.h"
 #include "include/shared/cos_errno.h"
 #include "cc.h"
 #include <assert.h>
 
+/* The retype table walking structure - track our path through the pages of different granularity */
+struct page_record {
+	int inc_cnt;
+	struct retype_entry *p;
+	struct retype_entry_glb *p_glb;
+};
+
+/* The CPU-local data structures */
 struct retype_info     retype_tbl[NUM_CPU] CACHE_ALIGNED;
-struct retype_info_glb glb_retype_tbl[N_MEM_SETS] CACHE_ALIGNED;
+struct retype_info_glb glb_retype_tbl[N_RETYPE_SLOTS] CACHE_ALIGNED;
 
-/* called to increment or decrement the refcnt. */
-static inline int
-mod_ref_cnt(void *pa, const int op, const int type_check)
+/* The start positions of the tables - also architecture-specific */
+const int pos2base[] = {0, N_MEM_SETS};
+
+/* Currently this is x86 specific. Convert size orders to position */
+const int order2pos[] = {COS_PGTBL_ORDER2POS};
+
+/* Convert position to size orders */
+const int pos2order[] = {COS_PGTBL_ORDERS};
+
+#define POS(order)       (order2pos[order])
+#define BASE(order)      (pos2base[POS(order)])
+#define ORDER(pos)       (pos2order[pos])
+#define SUPER(order)     (pos2order[SUPER_POS(order)])
+#define SMALL(order)     (pos2order[SMALL_POS(order)])
+
+/* This only does reference for kernel typed memory */
+int
+retypetbl_kern_ref(void *pa, u32_t order)
 {
-	u32_t                idx, old_v;
-	struct retype_entry *retype_entry;
-	union refcnt_atom    local_u;
+	struct retype_entry_glb* p_glb;
+	int ret;
+	unsigned long idx;
 
+	assert(pa); /* cannot be NULL: kernel image takes that space */
 	PA_BOUNDARY_CHECK();
 
 	idx = GET_MEM_IDX(pa);
 	assert(idx < N_MEM_SETS);
+	p_glb = GET_GLB_RETYPE_ENTRY(idx, order);
+	/* Is this kernel memory? */
+	if (p_glb->refcnt_atom.type != RETYPETBL_KERN) return -EINVAL;
+	/* Atomic with FAA - necessary because of cluster counting */
+	cos_faa((int*)&(p_glb->kernel_ref), 1);
 
-	retype_entry = GET_RETYPE_ENTRY(idx);
-	old_v = local_u.v = retype_entry->refcnt_atom.v;
-	/* only allow to ref user or kernel typed memory set */
-	if (unlikely((local_u.type != RETYPETBL_USER) && (local_u.type != RETYPETBL_KERN))) return -EPERM;
+	return 0;
+}
 
-	/* Do type check if type passed in. */
-	if (type_check >= 0 && type_check != local_u.type) return -EPERM;
-	if (local_u.ref_cnt == RETYPE_REFCNT_MAX) return -EOVERFLOW;
-	if (op) {
-		local_u.ref_cnt = local_u.ref_cnt + 1;
-	} else {
-		local_u.ref_cnt = local_u.ref_cnt - 1;
-		rdtscll(retype_entry->last_unmap);
-		cos_mem_fence();
-		//		cos_inst_bar();
-	}
-	cos_mem_fence();
+int
+retypetbl_kern_deref(void *pa, u32_t order)
+{
+	struct retype_entry_glb* p_glb;
+	int ret;
+	unsigned long idx;
 
-	if (retypetbl_cas(&(retype_entry->refcnt_atom.v), old_v, local_u.v) != CAS_SUCCESS) return -ECASFAIL;
+	assert(pa); /* cannot be NULL: kernel image takes that space */
+	PA_BOUNDARY_CHECK();
+
+	idx = GET_MEM_IDX(pa);
+	assert(idx < N_MEM_SETS);
+
+	p_glb = GET_GLB_RETYPE_ENTRY(idx, order);
+	/* Is this kernel memory? */
+	if (p_glb->refcnt_atom.type != RETYPETBL_KERN) return -EINVAL;
+	/* Atomic with FAA - necessary because of cluster counting */
+	cos_faa((int*)&(p_glb->kernel_ref), -1);
 
 	return 0;
 }
 
-/* This only does reference for kernel typed memory. */
+/* This will only track the number of user counts */
 int
-retypetbl_kern_ref(void *pa)
+retypetbl_ref(void *pa, u32_t order)
 {
-	return mod_ref_cnt(pa, 1, RETYPETBL_KERN);
+	int old_v;
+	unsigned long idx;
+	struct retype_entry *retype_entry;
+	union refcnt_atom local_u;
+	int found = 0;
+
+	assert(pa); /* cannot be NULL: kernel image takes that space */
+	PA_BOUNDARY_CHECK();
+
+	idx = GET_MEM_IDX(pa);
+	assert(idx < N_MEM_SETS);
+
+	retype_entry = GET_RETYPE_ENTRY(idx, ORDER(0));
+	old_v = local_u.v = retype_entry->refcnt_atom.v;
+	if (local_u.ref_cnt == RETYPE_REFCNT_MAX) return -EOVERFLOW;
+	/* Increase or decrease the core-local count with CAS */
+	local_u.ref_cnt = local_u.ref_cnt + 1;
+	cos_mem_fence();
+	if (retypetbl_cas(&(retype_entry->refcnt_atom.v), old_v, local_u.v) != CAS_SUCCESS) return -ECASFAIL;
+
+	return 0;
 }
 
 int
-retypetbl_ref(void *pa)
+retypetbl_deref(void *pa, u32_t order)
 {
-	return mod_ref_cnt(pa, 1, -1);
+	struct page_record walk[NUM_PAGE_SIZES];
+	int found = 0;
+	int i, ret;
+	unsigned long idx;
+
+	assert(pa); /* cannot be NULL: kernel image takes that space */
+	PA_BOUNDARY_CHECK();
+
+	idx = GET_MEM_IDX(pa);
+	assert(idx < N_MEM_SETS);
+
+	memset(walk, 0, sizeof(struct page_record) * NUM_PAGE_SIZES);
+
+	/* See if it is kernel or user */
+	for (i = POS(MAX_PAGE_ORDER); i >= POS(order); i--) {
+		walk[i].p = GET_RETYPE_ENTRY(idx, ORDER(i));
+		if (walk[i].p->refcnt_atom.type == RETYPETBL_KERN) cos_throw(err, -EPERM);
+		if (walk[i].p->refcnt_atom.type == RETYPETBL_USER) found = 1;
+		walk[i].p->refcnt_atom.v--;
+		walk[i].inc_cnt = 1;
+	}
+	if (!found) cos_throw(err, -EPERM);
+
+	rdtscll(walk[POS(order)].p->last_unmap);
+	cos_mem_fence();
+	
+	return 0;
+err:
+	/* Prepare to unwind and quit */
+	for ( ; i <= POS(MAX_PAGE_ORDER); i++) {
+		if (walk[i].inc_cnt != 0) walk[i].p->refcnt_atom.v++;
+	}
+	return ret;
 }
 
-int
-retypetbl_deref(void *pa)
+static inline int
+atomic_type_swap(void* ptr, int old_type, int new_type, int clear)
 {
-	return mod_ref_cnt(pa, 0, -1);
+	struct retype_entry temp, old_temp;
+
+	old_temp.refcnt_atom.v = ((struct retype_entry*)(ptr))->refcnt_atom.v;
+	if (clear != 0) {
+		temp.refcnt_atom.v = 0;
+	} else {
+		temp.refcnt_atom.v = old_temp.refcnt_atom.v;
+	}
+	if (old_type != -1) old_temp.refcnt_atom.type = old_type;
+	temp.refcnt_atom.type = new_type;
+
+	return retypetbl_cas((u32_t*)ptr, old_temp.refcnt_atom.v, temp.refcnt_atom.v);
 }
 
 static inline int
-mod_mem_type(void *pa, const mem_type_t type)
+mod_mem_type(void *pa, u32_t order, const mem_type_t type)
 {
-	int                     i, ret;
+	struct page_record      walk[NUM_PAGE_SIZES];
+	int                     i, ret, val;
 	u32_t                   idx, old_type;
-	struct retype_info_glb *glb_retype_info;
+	struct retype_entry_glb temp;
+	struct retype_entry_glb old_temp;
+	struct retype_entry_glb *glb_retype_info;
 
 	assert(pa); /* cannot be NULL: kernel image takes that space */
+	assert(order == 12); /* only need/have to use 4kb page */
+	memset(walk, 0, sizeof(walk));
+	memset(&old_temp, 0, sizeof(old_temp));
+	memset(&temp, 0, sizeof(temp));
+	glb_retype_info = 0;
 	PA_BOUNDARY_CHECK();
 
 	idx = GET_MEM_IDX(pa);
 	assert(idx < N_MEM_SETS);
 
-	glb_retype_info = GET_GLB_RETYPE_ENTRY(idx);
-	old_type        = glb_retype_info->type;
+	/* Kernel memory needs to be kernel accessible: pa2va returns null if it's not */
+	if (type == RETYPETBL_KERN && chal_pa2va((paddr_t)pa) == NULL) return -EINVAL;
+
+	/* Get the global slot */
+	walk[POS(MAX_PAGE_ORDER)].p_glb = GET_GLB_RETYPE_ENTRY(idx, MAX_PAGE_ORDER);
+	old_type = walk[POS(MAX_PAGE_ORDER)].p_glb->refcnt_atom.type;
 
 	/* only can retype untyped mem sets. */
 	if (unlikely(old_type != RETYPETBL_UNTYPED)) {
@@ -95,52 +202,88 @@ mod_mem_type(void *pa, const mem_type_t type)
 			return -EPERM;
 	}
 
-	/* Kernel memory needs to be kernel accessible: pa2va returns
-	 * null if it's not. */
-	if (type == RETYPETBL_KERN && chal_pa2va((paddr_t)pa) == NULL) return -EINVAL;
+	/* Repetitively add the record of a page set to a type, into the level one above it */ 
+	for (i = POS(MAX_PAGE_ORDER) - 1; i >= POS(order); i--) {
+		walk[i].p_glb = GET_GLB_RETYPE_ENTRY(idx, ORDER(i));
+		walk[i].inc_cnt = 0;
+		/* Do we need to update the next highest page size count? */ 
+		if (walk[i].p_glb->refcnt_atom.type == RETYPETBL_UNTYPED || 
+			(((type == RETYPETBL_USER) && (walk[i].p_glb->refcnt_atom.user_cnt == 0)) ||
+			((type == RETYPETBL_KERN) && (walk[i].p_glb->refcnt_atom.kernel_cnt == 0)))) {
+			old_temp.refcnt_atom.v = walk[i + 1].p_glb->refcnt_atom.v; 
+			if (old_temp.refcnt_atom.type != RETYPETBL_UNTYPED) cos_throw(err, -EPERM); 
+			temp.refcnt_atom.v = old_temp.refcnt_atom.v;
+			if (type == RETYPETBL_USER) temp.refcnt_atom.user_cnt++; else temp.refcnt_atom.kernel_cnt++;
+			/*
+			 * Use CAS to update the word here in case there is a retype/retype race.
+			 * If another retype retypes the parent, then the type check in this CAS
+			 * will fail. This CAS makes sure that the parent will not be retyped into
+			 * something else.
+			 */
+			if (retypetbl_cas((u32_t*)(walk[i + 1].p_glb), old_temp.refcnt_atom.v, temp.refcnt_atom.v) != CAS_SUCCESS) cos_throw(err, -ECASFAIL);
+			/* This is a simple assignment, because this is the function's local variable */
+			walk[i + 1].inc_cnt = 1;
+		}
+		if (walk[i].p_glb->refcnt_atom.type != RETYPETBL_UNTYPED) cos_throw(err, -ECASFAIL);
+	}
+
+	/* typed as the other type? - if there is a retype/retype race */
+	if (((temp.refcnt_atom.type == RETYPETBL_KERN) && (type == RETYPETBL_USER)) ||
+		((temp.refcnt_atom.type == RETYPETBL_USER) && (type == RETYPETBL_KERN))) cos_throw(err, -ECASFAIL);
 
-	ret = retypetbl_cas(&(glb_retype_info->type), RETYPETBL_UNTYPED, RETYPETBL_RETYPING);
-	if (ret != CAS_SUCCESS) return -ECASFAIL;
+	/* atomic update with CAS */
+	ret = atomic_type_swap(walk[POS(order)].p_glb, RETYPETBL_UNTYPED, RETYPETBL_RETYPING, 1);
+	if (ret != CAS_SUCCESS) cos_throw(err, -ECASFAIL);
 	cos_mem_fence();
 
-	/* Set the retyping flag successfully. Now nobody else can
+	/* 
+	 * Set the retyping flag successfully. Now nobody else can
 	 * change this memory set. Update the per-core retype entries
-	 * next. */
-	for (i = 0; i < NUM_CPU; i++) {
-		retype_tbl[i].mem_set[idx].refcnt_atom.type = type;
-	}
+	 * next.
+	 */
+	for (i = 0; i < NUM_CPU; i++) GET_RETYPE_CPU_ENTRY(i, idx, order)->refcnt_atom.type = type;
 	cos_mem_fence();
 
 	/* Now commit the change to the global entry. */
-	ret = retypetbl_cas(&(glb_retype_info->type), RETYPETBL_RETYPING, type);
+	ret = atomic_type_swap(walk[POS(order)].p_glb, RETYPETBL_RETYPING, type, 1);
 	assert(ret == CAS_SUCCESS);
 
 	return 0;
+err:
+	/* Prepare to unwind and quit */
+	if (type == RETYPETBL_USER) val = 1 << RETYPE_ENT_GLB_REFCNT_SZ; else val = 1;
+	for ( ;i <= POS(MAX_PAGE_ORDER); i++) {
+		if (walk[i].inc_cnt != 0) cos_faa((int*)walk[i].p_glb, -val);
+	}
+
+	return ret;
 }
 
 int
-retypetbl_retype2user(void *pa)
+retypetbl_retype2user(void *pa, u32_t order)
 {
-	return mod_mem_type(pa, RETYPETBL_USER);
+	return mod_mem_type(pa, order, RETYPETBL_USER);
 }
 
 int
-retypetbl_retype2kern(void *pa)
+retypetbl_retype2kern(void *pa, u32_t order)
 {
-	return mod_mem_type(pa, RETYPETBL_KERN);
+	return mod_mem_type(pa, order, RETYPETBL_KERN);
 }
 
 /* implemented in pgtbl.c */
 int tlb_quiescence_check(u64_t unmap_time);
 
+/* Retype something back to frame */
 int
-retypetbl_retype2frame(void *pa)
+retypetbl_retype2frame(void *pa, u32_t order)
 {
-	struct retype_info_glb *glb_retype_info;
+	struct retype_entry_glb *glb_retype_info;
+	struct retype_entry     *retype_info;
 	union refcnt_atom       local_u;
 	u32_t                   old_v, idx;
 	u64_t                   last_unmap;
-	int                     cpu, ret, ref_sum;
+	int                     i, j, cpu, ret, sum;
 	mem_type_t              old_type;
 
 	PA_BOUNDARY_CHECK();
@@ -148,74 +291,71 @@ retypetbl_retype2frame(void *pa)
 	idx = GET_MEM_IDX(pa);
 	assert(idx < N_MEM_SETS);
 
-	glb_retype_info = GET_GLB_RETYPE_ENTRY(idx);
-	old_type        = glb_retype_info->type;
-	/* only can retype untyped mem sets. */
+	/* Exact page granularity */
+	glb_retype_info = GET_GLB_RETYPE_ENTRY(idx, order);
+	old_type        = glb_retype_info->refcnt_atom.type;
+	/* Only can untype typed mem sets */
 	if (unlikely(old_type != RETYPETBL_USER && old_type != RETYPETBL_KERN)) return -EPERM;
 
-	/* lock down the memory set we are going to retype. */
-	ret = retypetbl_cas(&(glb_retype_info->type), old_type, RETYPETBL_RETYPING);
+	/* lock down the memory set we are going to untype */
+	ret = atomic_type_swap(glb_retype_info, -1, RETYPETBL_RETYPING, 0);
 	if (ret != CAS_SUCCESS) return ret;
 
-	last_unmap = 0;
-	for (ref_sum = 0, cpu = 0; cpu < NUM_CPU; cpu++) {
-		/* Keep in mind that, ref_cnt on each core could be
-		 * negative. */
-		old_v = local_u.v = retype_tbl[cpu].mem_set[idx].refcnt_atom.v;
-		assert(local_u.type == old_type || local_u.type == RETYPETBL_RETYPING);
-
-		local_u.type = RETYPETBL_RETYPING;
-		ret          = retypetbl_cas(&(retype_tbl[cpu].mem_set[idx].refcnt_atom.v), old_v, local_u.v);
-		if (ret != CAS_SUCCESS) cos_throw(restore_all, -ECASFAIL);
+	for (i = 0; i < NUM_CPU; i++) {
+		retype_info = GET_RETYPE_CPU_ENTRY(i, idx, order);
+		/* See if we can successfully lock it */
+		if (atomic_type_swap(retype_info, -1, RETYPETBL_RETYPING, 0) != CAS_SUCCESS) cos_throw(err, -EINVAL);
+	}
 
-		ref_sum += local_u.ref_cnt;
+	/* Now all of them are frozen. add up the counts to see this still mapped somewhere */
+	last_unmap = 0;
+	sum = 0;
+	for (cpu = 0; cpu < NUM_CPU; cpu++) {
+		sum += GET_RETYPE_CPU_ENTRY(cpu, idx, order)->refcnt_atom.ref_cnt;
 		/* for tlb quiescence check */
-		if (last_unmap < retype_tbl[cpu].mem_set[idx].last_unmap)
-			last_unmap = retype_tbl[cpu].mem_set[idx].last_unmap;
+		if (last_unmap < GET_RETYPE_CPU_ENTRY(cpu, idx, order)->last_unmap) {
+			last_unmap = GET_RETYPE_CPU_ENTRY(cpu, idx, order)->last_unmap;
+		}
 	}
-	/* only can retype when there's no more mapping */
-	if (ref_sum != 0) cos_throw(restore_all, -EINVAL);
 
-	/* before retype any type of memory back to untyped, we need
+	/* Only can retype when there's no more mapping */
+	if (sum != 0) cos_throw(err, -EINVAL);
+
+	/* 
+	 * Before retype any type of memory back to untyped, we need
 	 * to make sure TLB quiescence has been achieved after the
-	 * last unmapping of any pages in this memory set. */
-	if (!tlb_quiescence_check(last_unmap)) cos_throw(restore_all, -EQUIESCENCE);
+	 * last unmapping of any pages in this memory set
+	 */
+	if (!tlb_quiescence_check(last_unmap)) cos_throw(err, -EQUIESCENCE);
 	cos_mem_fence();
 
-	/**************************/
-	/**** Legit to retype! ****/
-	/**************************/
-	/* we already locked all entries. feel free to change here. */
-	for (cpu = 0; cpu < NUM_CPU; cpu++) {
-		retype_tbl[cpu].mem_set[idx].refcnt_atom.ref_cnt = 0;
-		retype_tbl[cpu].mem_set[idx].refcnt_atom.type    = RETYPETBL_UNTYPED;
+	/* Repetitively add the record of a page set to a type, into the level one above it */
+	if (old_type == RETYPETBL_USER) sum = (1 << RETYPE_ENT_GLB_REFCNT_SZ); else sum = 1;
+	for (j = POS(MAX_PAGE_ORDER); j > POS(order); j--) {
+		glb_retype_info = GET_GLB_RETYPE_ENTRY(idx, ORDER(j));
+		/* The following is atomic with FAA */
+		cos_faa((int*)glb_retype_info, -sum);
 	}
-	cos_mem_fence();
 
-	/* and commit to the global entry. */
-	ret = retypetbl_cas(&(glb_retype_info->type), RETYPETBL_RETYPING, RETYPETBL_UNTYPED);
-	assert(ret == CAS_SUCCESS);
+	/* Update all the per-cpu variables one by one */
+	for (cpu = 0; cpu < NUM_CPU; cpu++) {
+		retype_info = GET_RETYPE_CPU_ENTRY(cpu, idx, order);
+		retype_info->refcnt_atom.v = 0;
+	}
+	assert(atomic_type_swap(glb_retype_info, RETYPETBL_RETYPING, RETYPETBL_UNTYPED, 0) == CAS_SUCCESS);
 
 	return 0;
-restore_all:
-	/* Something went wrong: CAS, TLB quiescence or ref_sum
-	 * non-zero. Clean-up here.*/
-
+err:
 	/* restore per-core retype entries. (is this necessary?) */
 	/* cpu is the one we tried to modify but fail. So we need to
 	 * restore [0, cpu-1]. */
-	for (cpu--; cpu >= 0; cpu--) {
-		old_v = local_u.v = retype_tbl[cpu].mem_set[idx].refcnt_atom.v;
-		local_u.type      = old_type;
-		retypetbl_cas(&(retype_tbl[cpu].mem_set[idx].refcnt_atom.v), old_v, local_u.v);
-	}
-	/* and global entry. */
-	{
-		/* Restore the global entry to old type before return:
-		 * only us can change it. */
-		int ret_local = retypetbl_cas(&(glb_retype_info->type), RETYPETBL_RETYPING, old_type);
-		assert(ret_local == CAS_SUCCESS);
+	for (i--; i >= 0; i--) {
+		retype_info = GET_RETYPE_CPU_ENTRY(i, idx, order);
+		atomic_type_swap(retype_info, -1, old_type, 0);
 	}
+	/* Restore the global entry to old type before return:
+	 * only us can change it. */
+	assert(atomic_type_swap(glb_retype_info, RETYPETBL_RETYPING, old_type, 0) == CAS_SUCCESS);
 
 	return ret;
 }
@@ -223,30 +363,33 @@ retypetbl_retype2frame(void *pa)
 void
 retype_tbl_init(void)
 {
-	int i, j;
+	unsigned long i, j;
 
 	/* Alignment & size checks! */
 	assert(sizeof(struct retype_info) % CACHE_LINE == 0);
 	assert(sizeof(struct retype_info_glb) % CACHE_LINE == 0);
 	assert(sizeof(retype_tbl) % CACHE_LINE == 0);
 	assert(sizeof(glb_retype_tbl) % CACHE_LINE == 0);
-	assert((int)retype_tbl % CACHE_LINE == 0);
-	assert((int)glb_retype_tbl % CACHE_LINE == 0);
+	assert((unsigned long)retype_tbl % CACHE_LINE == 0);
+	assert((unsigned long)glb_retype_tbl % CACHE_LINE == 0);
 
 	assert(sizeof(union refcnt_atom) == sizeof(u32_t));
 	assert(RETYPE_ENT_TYPE_SZ + RETYPE_ENT_REFCNT_SZ == 32);
 	assert(CACHE_LINE % sizeof(struct retype_entry) == 0);
 
 	for (i = 0; i < NUM_CPU; i++) {
-		for (j = 0; j < N_MEM_SETS; j++) {
+		for (j = 0; j < N_RETYPE_SLOTS; j++) {
 			retype_tbl[i].mem_set[j].refcnt_atom.type    = RETYPETBL_UNTYPED;
 			retype_tbl[i].mem_set[j].refcnt_atom.ref_cnt = 0;
 			retype_tbl[i].mem_set[j].last_unmap          = 0;
 		}
 	}
 
-	for (i = 0; i < N_MEM_SETS; i++) {
-		glb_retype_tbl[i].type = RETYPETBL_UNTYPED;
+	for (i = 0; i < N_RETYPE_SLOTS; i++) {
+		glb_retype_tbl[i].info.refcnt_atom.type = RETYPETBL_UNTYPED;
+		glb_retype_tbl[i].info.refcnt_atom.user_cnt = 0;
+		glb_retype_tbl[i].info.refcnt_atom.kernel_cnt = 0;
+		glb_retype_tbl[i].info.kernel_ref = 0;
 	}
 
 	cos_mem_fence();
diff --git a/src/platform/archived/linker/Makefile b/src/platform/archived/linker/Makefile
index 98394046d6..79675d1103 100644
--- a/src/platform/archived/linker/Makefile
+++ b/src/platform/archived/linker/Makefile
@@ -2,7 +2,7 @@ include Makefile.src
 
 CC=gcc
 LD=ld
-CFLAGS=-D__x86__ -D_GNU_SOURCE -lpthread -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-format -ggdb3 -I$(SHAREDINC)
+CFLAGS=-D__x86__ -D_GNU_SOURCE -lpthread -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-format -Wno-address-of-packed-member -ggdb3 -I$(SHAREDINC)
 LDFLAGS=-melf_i386
 PRODUCTS=cos_linker gen_client_stub
 
diff --git a/src/platform/archived/linux/link_load/Makefile b/src/platform/archived/linux/link_load/Makefile
index 0d11607856..f27f7c3cdb 100644
--- a/src/platform/archived/linux/link_load/Makefile
+++ b/src/platform/archived/linux/link_load/Makefile
@@ -1,6 +1,6 @@
 include Makefile.src
 
-CFLAGS=-D__x86__ -D_GNU_SOURCE -lpthread -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -ggdb3 -I$(KINC) 
+CFLAGS=-D__x86__ -D_GNU_SOURCE -lpthread -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-address-of-packed-member -ggdb3 -I$(KINC) 
 PRODUCTS=cos_loader gen_client_stub
 
 default: $(PRODUCTS)
diff --git a/src/platform/armv7a/Makefile b/src/platform/armv7a/Makefile
new file mode 100644
index 0000000000..7e9ef0777b
--- /dev/null
+++ b/src/platform/armv7a/Makefile
@@ -0,0 +1,126 @@
+include Makefile.src
+
+CC := $(CROSS_COMPILE)gcc
+LD := $(CROSS_COMPILE)ld
+AS := $(CROSS_COMPILE)as
+OBJCP := $(CROSS_COMPILE)objcopy
+
+INCPATH := ../../kernel/include
+INCS    := -I$(INCPATH) -I$(INCPATH)/shared/ -I$(INCPATH)/chal/
+CFLAGS  := -march=armv7-a -DZYNQ_ZC702 -g3 -O3 -ffreestanding -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -nostdinc -nostdlib -fno-pic $(INCS)
+LDFLAGS := -marmelf -nostdlib -nostartfiles -nostdinc -nodefaultlibs
+
+KERNEL := kernel.img
+IMAGE  := cos.img
+IMGBIN := cos.bin
+
+WARNINGS += -Wall
+WARNINGS += -Wcast-align
+WARNINGS += -Wformat=2
+WARNINGS += -Winit-self
+#WARNINGS += -Wmissing-declarations
+#WARNINGS += -Wmissing-prototypes
+WARNINGS += -Wnested-externs
+WARNINGS += -Wno-system-headers
+WARNINGS += -Wold-style-definition
+WARNINGS += -Wredundant-decls
+WARNINGS += -Wsign-compare
+WARNINGS += -Wstrict-prototypes
+WARNINGS += -Wundef
+WARNINGS += -Wvolatile-register-var
+WARNINGS += -Wwrite-strings
+
+CFLAGS += $(WARNINGS)
+
+OBJS += kernel.o
+OBJS += vm.o
+OBJS += printk.o
+OBJS += string.o
+OBJS += user.o
+OBJS += serial.o
+OBJS += chal.o
+OBJS += boot_comp.o
+OBJS += timer.o
+OBJS += l2cache.o
+OBJS += tlb.o
+OBJS += chal_pgtbl.o
+OBJS += irq.o
+OBJS += vtxprintf.o
+#OBJS += div.o
+OBJS += __aeabi_idiv.o
+OBJS += udivmoddi4.o
+
+ASM_OBJS += __aeabi_uidiv.o
+ASM_OBJS += __aeabi_uidivmod.o
+ASM_OBJS += __aeabi_uldivmod.o
+
+COS_OBJ += pgtbl.o
+COS_OBJ += retype_tbl.o
+COS_OBJ += liveness_tbl.o
+COS_OBJ += tcap.o
+COS_OBJ += capinv.o
+COS_OBJ += captbl.o
+
+DEPS :=$(patsubst %.o, %.d, $(OBJS))
+
+OBJS += $(COS_OBJ) $(ASM_OBJS)
+
+.PHONY: $(CONSTRUCTOR_COMP)
+
+all: $(KERNEL)
+
+$(KERNEL): linker.ld $(OBJS) start.o $(CONSTRUCTOR_COMP)
+	$(if $(CONSTRUCTOR_COMP), $(info |     [LD]   Linking in the constructor component $@))
+	$(if $(CONSTRUCTOR_COMP), @cp $(CONSTRUCTOR_COMP) constructor; $(LD) -r -b binary constructor -o constructor.o; $(OBJCP) --rename-section .data=.initial_component constructor.o; rm constructor)
+	$(if $(KERNEL_OUTPUT), $(info |     [LD]   Linking $@))
+	$(if $(KERNEL_OUTPUT), $(LD) $(LDFLAGS) -T linker.ld start.o $(OBJS) $(if $(CONSTRUCTOR_COMP), constructor.o) -o $@)
+	$(if $(KERNEL_OUTPUT), $(info |     [OBJCP]   Converting $@ to binary))
+	$(if $(KERNEL_OUTPUT), $(OBJCP) -O binary $@ $@.bin)
+	$(if $(KERNEL_OUTPUT), $(info |     [CP]   Copying $@ into $(KERNEL_OUTPUT)))
+	$(if $(KERNEL_OUTPUT), @cp $@ $(KERNEL_OUTPUT))
+	$(if $(KERNEL_OUTPUT), @cp $@.bin $(KERNEL_OUTPUT).bin)
+
+%.d: %.c
+	@set +e; rm -f $@; \
+	$(CC) -M $(CFLAGS) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
+	rm -f $@.$$$$
+
+pgtbl.o: ../../kernel/pgtbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+tcap.o: ../../kernel/tcap.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+retype_tbl.o: ../../kernel/retype_tbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+liveness_tbl.o: ../../kernel/liveness_tbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+capinv.o: ../../kernel/capinv.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+captbl.o: ../../kernel/captbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+%.o: %.S
+	$(info |     [AS]   Assembling $@)
+	@$(AS) -c $< -o $@
+
+%.o: %.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+clean:
+	@rm -f *.d *.o $(KERNEL)
+
+-include $(DEPS)
diff --git a/src/platform/armv7a/__aeabi_idiv.c b/src/platform/armv7a/__aeabi_idiv.c
new file mode 100644
index 0000000000..d725f89823
--- /dev/null
+++ b/src/platform/armv7a/__aeabi_idiv.c
@@ -0,0 +1,30 @@
+/*
+CODE from: https://github.com/vanvught/rpidmx512/tree/master/lib-arm/src/aeabi
+	This routine performs a 32-bit divide of two signed integers.
+	Returns the result of the division, or 0 if there was an error (such as divide by 0).
+ */
+
+extern unsigned int __aeabi_uidiv(unsigned int num, unsigned int den);
+
+signed int __aeabi_idiv(signed int num, signed int den) {
+	signed int minus = 0;
+	signed int v;
+
+	if (num < 0) {
+		num = -num;
+		minus = 1;
+	}
+
+	if (den < 0) {
+		den = -den;
+		minus ^= 1;
+	}
+
+	v = (signed int)__aeabi_uidiv((unsigned int) num, (unsigned int) den);
+
+	if (minus != 0) {
+		return -v;
+	}
+
+	return v;
+}
diff --git a/src/platform/armv7a/__aeabi_uidiv.S b/src/platform/armv7a/__aeabi_uidiv.S
new file mode 100644
index 0000000000..f47c9aa2a4
--- /dev/null
+++ b/src/platform/armv7a/__aeabi_uidiv.S
@@ -0,0 +1,27 @@
+/*
+CODE from: https://github.com/vanvught/rpidmx512/tree/master/lib-arm/src/aeabi
+	This routine performs a 32-bit divide of two unsigned integers.
+ 	Returns the result of the division, or 0 if there was an error (such as divide by 0).
+
+ 	unsigned int __aeabi_uidiv(unsigned int num, unsigned int den)
+ */
+
+	.globl	__aeabi_uidiv
+	.align	4
+
+__aeabi_uidiv:
+	clz  r3, r0             	/* r3 ← CLZ(r0) Count leading zeroes of num */
+    clz  r2, r1             	/* r2 ← CLZ(r1) Count leading zeroes of den */
+    rsb	r3, r3, r2				/* r3 ← r2 - r3 */
+    mov r2, #0              	/* r2 ← 0 */
+    cmp	r3, #0
+  	blt .Lquit
+    .Lloop:
+      cmp r0, r1, lsl r3      	/* Compute r0 - (r1 << r3) and update cpsr */
+      adc r2, r2, r2          	/* r2 ← r2 + r2 + C. Note that if r0 >= (r1 << r3) then C=1, C=0 otherwise */
+      subcs r0, r0, r1, lsl r3	/* r0 ← r0 - (r1 << r3) if C = 1 (this is, only if r0 >= (r1 << r3) ) */
+      subs r3, r3, #1         	/* r3 ← r3 - 1 */
+      bpl .Lloop				/* if r3 >= 0 (N=0) then branch to .Lloop */
+.Lquit:
+    mov r0, r2
+    bx lr
diff --git a/src/platform/armv7a/__aeabi_uidivmod.S b/src/platform/armv7a/__aeabi_uidivmod.S
new file mode 100644
index 0000000000..7d7868d1e8
--- /dev/null
+++ b/src/platform/armv7a/__aeabi_uidivmod.S
@@ -0,0 +1,20 @@
+/* CODE from: https://github.com/vanvught/rpidmx512/tree/master/lib-arm/src/aeabi */
+/*
+	struct { unsigned quot, unsigned rem} __aeabi_uidivmod(unsigned numerator, unsigned denominator) {
+		unsigned rem, quot;
+		quot = __aeabi_uidiv(numerator, denominator);
+		rem = numerator - (quot * denominator)
+		return {quot, rem};
+	}
+*/
+
+	.globl	__aeabi_uidivmod
+	.align	4
+
+__aeabi_uidivmod:
+	stmfd	sp!, {r0, r1, ip, lr}	/* r0 ← numerator , r1 ← denominator */
+	bl	__aeabi_uidiv
+	ldmfd	sp!, {r1, r2, ip, lr}	/* r0 ← quot , r1 ← numerator , r2 ← denominator */
+	mul	r3, r0, r2
+	sub	r1, r1, r3					/* r1 ← rem */
+	mov	pc, lr
diff --git a/src/platform/armv7a/__aeabi_uldivmod.S b/src/platform/armv7a/__aeabi_uldivmod.S
new file mode 100644
index 0000000000..c7cc0bf1da
--- /dev/null
+++ b/src/platform/armv7a/__aeabi_uldivmod.S
@@ -0,0 +1,21 @@
+/* CODE from: https://github.com/vanvught/rpidmx512/tree/master/lib-arm/src/aeabi */
+/*
+	struct { uint64_t quot, uint64_t rem} __aeabi_uldivmod(uint64_t numerator, uint64_t denominator) {
+		uint64_t rem, quot;
+		quot = udivmoddi4(numerator, denominator, &rem);
+		return {quot, rem};
+	}
+*/
+	.globl	__aeabi_uldivmod
+	.align	4
+
+__aeabi_uldivmod:
+        push	{r11, lr}
+        sub	sp, sp, #16
+        add	r12, sp, #8
+        str	r12, [sp]
+        bl	udivmoddi4
+        ldr	r2, [sp, #8]
+        ldr	r3, [sp, #12]
+        add	sp, sp, #16
+        pop	{r11, pc}
diff --git a/src/platform/armv7a/board_specifics.h b/src/platform/armv7a/board_specifics.h
new file mode 100644
index 0000000000..69346dcc41
--- /dev/null
+++ b/src/platform/armv7a/board_specifics.h
@@ -0,0 +1,17 @@
+#ifndef BOARD_SPECIFICS_H
+#define BOARD_SPECIFICS_H
+
+#if defined(ZYNQ_ZC702)
+#define CAV7_UART_CONTROL (*((volatile unsigned long *)(0xE0001000)))
+#define CAV7_UART_MODE (*((volatile unsigned long *)(0xE0001004)))
+#define CAV7_UART_BRGEN (*((volatile unsigned long *)(0xE0001018)))
+#define CAV7_UART_STATUS (*((volatile unsigned long *)(0xE000102C)))
+#define CAV7_UART_FIFO (*((volatile unsigned long *)(0xE0001030)))
+#define CAV7_UART_BRDIV (*((volatile unsigned long *)(0xE0001034)))
+#define CAV7_UART_STATUS_TXE (1U << 3)
+
+#define KERN_MEM_END   0xBFFF0000
+
+#endif
+
+#endif /* BOARD_SPECIFICS_H */
diff --git a/src/platform/armv7a/boot_comp.c b/src/platform/armv7a/boot_comp.c
new file mode 100644
index 0000000000..4ee917eb68
--- /dev/null
+++ b/src/platform/armv7a/boot_comp.c
@@ -0,0 +1,352 @@
+#include "assert.h"
+#include "kernel.h"
+#include "boot_comp.h"
+#include "chal_cpu.h"
+#include "chal/chal_proto.h"
+#include "chal_pgtbl.h"
+#include "mem_layout.h"
+#include "string.h"
+#include <pgtbl.h>
+#include <thd.h>
+#include <component.h>
+#include <inv.h>
+#include <hw.h>
+#include <shared/elf_loader.h>
+
+extern u8_t *boot_comp_pgd;
+
+struct cap_asnd hw_asnd_caps[HW_IRQ_TOTAL];
+void *thd_mem[NUM_CPU], *tcap_mem[NUM_CPU];
+struct captbl *glb_boot_ct;
+
+/* FIXME:  loops to create threads/tcaps/rcv caps per core. */
+static void
+kern_boot_thd(struct captbl *ct, void *thd_mem, void *tcap_mem, const cpuid_t cpu_id)
+{
+	struct cos_cpu_local_info *cos_info = cos_cpu_local_info();
+	struct thread *            t        = thd_mem;
+	struct tcap *              tc       = tcap_mem;
+	tcap_res_t                 expended;
+	int                        ret;
+	struct cap_comp *          cap_comp;
+
+	assert(cpu_id >= 0);
+	assert(cos_info->cpuid == (u32_t)cpu_id);
+	assert(sizeof(struct cos_cpu_local_info) == STK_INFO_SZ);
+	memset(cos_info, 0, sizeof(struct cos_cpu_local_info));
+	cos_info->cpuid          = cpu_id;
+	cos_info->invstk_top     = 0;
+	cos_info->overflow_check = 0xDEADBEEF;
+	ret = thd_activate(ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_INITTHD_BASE_CPU(cpu_id), thd_mem, BOOT_CAPTBL_SELF_COMP, 0);
+	assert(!ret);
+
+	tcap_active_init(cos_info);
+	ret = tcap_activate(ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_INITTCAP_BASE_CPU(cpu_id), tcap_mem);
+	assert(!ret);
+
+	tc->budget.cycles = TCAP_RES_INF; /* Chronos's got all the time in the world */
+	tc->perm_prio     = 0;
+	tcap_setprio(tc, 0);                              /* Chronos gets preempted by no one! */
+	list_enqueue(&cos_info->tcaps, &tc->active_list); /* Chronos on the TCap active list */
+	cos_info->tcap_uid  = 1;
+	cos_info->cycles    = tsc();
+	cos_info->curr_tcap = tc;
+	thd_next_thdinfo_update(cos_info, 0, 0, 0, 0);
+
+	thd_current_update(t, t, cos_info);
+	thd_scheduler_set(t, t);
+
+	ret = arcv_activate(ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_INITRCV_BASE_CPU(cpu_id), BOOT_CAPTBL_SELF_COMP,
+	                    BOOT_CAPTBL_SELF_INITTHD_BASE_CPU(cpu_id), BOOT_CAPTBL_SELF_INITTCAP_BASE_CPU(cpu_id), 0, 1);
+	assert(!ret);
+
+	/* switching to boot component's PGD using component capability */
+	cap_comp = (struct cap_comp *)captbl_lkup(ct, BOOT_CAPTBL_SELF_COMP);
+	if (!cap_comp || !CAP_TYPECHK(cap_comp, CAP_COMP)) assert(0);
+	assert(cap_comp->info.pgtblinfo.pgtbl);
+	pgtbl_update(&cap_comp->info.pgtblinfo);
+
+	printk("\tCreating initial threads, tcaps, and rcv end-points in boot-component.\n");
+}
+
+static vaddr_t
+mem_bootc_entry(void)
+{
+	return elf_entry_addr((struct elf_hdr *)mem_bootc_start());
+}
+
+static int
+boot_nptes(unsigned int sz)
+{
+	return round_up_to_pow2(sz, PGD_RANGE) / PGD_RANGE;
+}
+
+static void
+boot_pgtbl_expand(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *label,
+		  unsigned long user_vaddr, unsigned int range)
+{
+	int               ret;
+	u8_t *            ptes;
+	unsigned int      nptes = 0, nsmalls = 0, i;
+	struct cap_pgtbl *pte_cap, *pgd_cap;
+
+	/* No superpage support is implemented for Cortex-A */
+	nsmalls = range / PAGE_SIZE;
+	/* each PTE should contain 256 entries? */
+	nptes   = nsmalls / 256 + 1;
+	ptes    = mem_boot_alloc(nptes);
+	assert(ptes);
+
+	printk("\tCreating %d %s PTEs from [%x,%x) to [%x,%x).\n", nptes, label,
+	       ptes, ptes + nptes * PAGE_SIZE, user_vaddr, user_vaddr + range);
+
+	/*
+	 * Note the use of NULL here.  We aren't actually adding a PTE
+	 * currently.  This is a hack and only used on boot-up.  We'll
+	 * reuse this capability entry to create _multiple_ ptes.  We
+	 * won't create captbl entries for each of them, so they
+	 * cannot be aliased/removed later.  The only adverse
+	 * side-effect I can think of from this is that we cannot
+	 * reclaim all of the boot-time memory, but that is so far
+	 * into the future, I don't think we care.
+	 */
+	if (pgtbl_activate(ct, BOOT_CAPTBL_SELF_CT, ptecap, NULL, 1)) assert(0);
+	pte_cap = (struct cap_pgtbl *)captbl_lkup(ct, ptecap);
+	assert(pte_cap);
+
+	/* Hook in the PTEs */
+	for (i = 0; i < nptes; i++) {
+		u8_t *  p  = ptes + i * PAGE_SIZE;
+		paddr_t pf = chal_va2pa(p);
+
+		pgtbl_init_pte(p);
+		pte_cap->pgtbl = (pgtbl_t)p;
+
+		/* hook the pte into the boot component's page tables */
+		ret = cap_cons(ct, pgdcap, ptecap, (capid_t)(user_vaddr + i * PGD_RANGE));
+		assert(!ret);
+	}
+
+	return;
+}
+
+int
+boot_pgtbl_mappings_add(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *label, void *kern_vaddr,
+                        unsigned long user_vaddr, unsigned int range, int uvm)
+{
+	int               ret;
+	u8_t *            ptes;
+	unsigned int      nsmalls = 0, i;
+	struct cap_pgtbl *pte_cap, *pgd_cap;
+	pgtbl_t           pgtbl;
+
+	pgd_cap = (struct cap_pgtbl *)captbl_lkup(ct, pgdcap);
+	if (!pgd_cap || !CAP_TYPECHK(pgd_cap, CAP_PGTBL)) assert(0);
+	pgtbl = (pgtbl_t)pgd_cap->pgtbl;
+
+	nsmalls = range / PAGE_SIZE;
+	printk("\tMapping in %s ([0x%x, 0x%x)) (@ [0x%x, 0x%x))\n", label, kern_vaddr, kern_vaddr + range, user_vaddr, user_vaddr + range);
+	/* Map in the actual memory. */
+	for (i = 0; i < nsmalls; i++) {
+		u8_t *  p     = kern_vaddr + i * PAGE_SIZE;
+		paddr_t pf    = chal_va2pa(p);
+		u32_t   mapat = (u32_t)user_vaddr + i * PAGE_SIZE, flags = 0;
+
+		if (uvm && pgtbl_mapping_add(pgtbl, mapat, pf, CAV7_4K_USER_DEF, PAGE_ORDER)) assert(0);
+		if (!uvm && pgtbl_cosframe_add(pgtbl, mapat, pf, CAV7_PGTBL_COSFRAME, PAGE_ORDER)) assert(0);
+		assert((void *)p == pgtbl_lkup(pgtbl, user_vaddr + i * PAGE_SIZE, &flags));
+	}
+
+	return 0;
+}
+
+static int
+boot_map(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *label, void *kern_vaddr,
+	 unsigned long user_vaddr, unsigned int range, int user)
+{
+	return boot_pgtbl_mappings_add(ct, pgdcap, ptecap, label, kern_vaddr, user_vaddr, range, user);
+}
+
+static void
+boot_elf_dump_hex(vaddr_t addr, unsigned int range)
+{
+	for (int i = 0; i < range; i += 32) {
+		printk("%x: ", addr + i);
+		for (int j = 0; j < 32; j++) {
+			printk("%x ", *(char *)(addr + i + j));
+		}
+		printk("\n");
+	}
+}
+
+static int
+boot_elf_process(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *label, void *kern_vaddr,
+		 unsigned int range)
+{
+	struct elf_contig_mem s[3] = {};
+	unsigned long  bss_sz;	   /* derived from the section information for .data */
+	unsigned int   bss_pages;
+	unsigned int   bss_offset; /* offset into the last page that includes .data information */
+	unsigned char *bss;	   /* memory array for the last bit of .data and .bss */
+
+	/* RO + Code */
+	if (elf_contig_mem((struct elf_hdr *)kern_vaddr, 0, &s[0])) assert(0);
+	assert(s[0].objsz == s[0].sz && s[0].access == ELF_PH_CODE);
+
+	/* Data + BSS */
+	if (elf_contig_mem((struct elf_hdr *)kern_vaddr, 1, &s[1])) assert(0);
+	assert(s[1].access == ELF_PH_RW);
+	/* the data should immediately follow code */
+	assert(round_up_to_page(s[0].vstart + s[0].sz) == s[1].vstart);
+	/* should be page aligned so that we can map it directly */
+	assert(round_to_page(s[0].mem) == (unsigned int)s[0].mem);
+
+	/* allocate bss memory, including the last sub-page of .data (assumes .data is page-aligned) */
+	assert(s[1].vstart % PAGE_SIZE == 0);
+	bss_pages  = (round_up_to_page(s[1].sz) - round_to_page(s[1].objsz))/PAGE_SIZE;
+	bss_sz     = (round_up_to_page(s[1].sz) - s[1].objsz);
+	bss_offset = s[1].objsz % PAGE_SIZE; //round_up_to_page(s[1].sz) - round_to_page(s[1].objsz);
+	bss = mem_boot_user_alloc(bss_pages);
+	assert(bss);
+
+	memcpy(bss, s[1].mem + round_to_page(s[1].objsz), bss_offset);
+	memset(bss + bss_offset, 0, bss_sz);
+
+	/* Assume there are no more sections */
+	if (elf_contig_mem((struct elf_hdr *)kern_vaddr, 2, &s[2]) != 1) assert(0);
+
+
+	printk("\tBooter elf information: %lx, %lx, %lx, %lx\n", kern_vaddr, range, s[0].vstart, round_up_to_page(s[0].sz) + s[1].sz);
+	/* We have the elf information, time to do the virtual memory operations... */
+	boot_pgtbl_expand(ct, pgdcap, ptecap, label, s[0].vstart, round_up_to_page(s[0].sz) + s[1].sz);
+
+	/* Map in the sections separately */
+	if (boot_map(ct, pgdcap, ptecap, label, s[0].mem, s[0].vstart, round_up_to_page(s[0].objsz), 1)) return -1;
+	//boot_elf_dump_hex(s[0].mem, s[0].objsz);
+	if (boot_map(ct, pgdcap, ptecap, label, s[1].mem, s[1].vstart, round_to_page(s[1].objsz), 1)) return -1;
+	printk("\tBSS information: %lx %lx %lx\n", bss, s[1].vstart + round_to_page(s[1].objsz), bss_sz);
+	if (boot_map(ct, pgdcap, ptecap, label, bss, s[1].vstart + round_to_page(s[1].objsz), bss_sz, 1)) return -1;
+
+	printk("\tBooter elf object: RO - [%x, %x), RW - [%x, %x)\n",
+	       s[0].vstart, s[0].vstart + s[0].objsz, s[1].vstart, s[1].vstart + s[1].sz);
+
+	return 0;
+}
+
+void
+kern_boot_comp(const cpuid_t cpu_id)
+{
+	int            ret = 0, nkmemptes;
+	unsigned int   i;
+	u8_t *         boot_comp_captbl;
+	pgtbl_t        pgtbl     = (pgtbl_t)&boot_comp_pgd, boot_vm_pgd;
+	u32_t          hw_bitmap = ~0;
+
+	assert(cpu_id >= 0);
+	if (NUM_CPU > 1 && cpu_id > 0) {
+		assert(glb_boot_ct);
+		chal_cpu_pgtbl_activate(pgtbl);
+		kern_boot_thd(glb_boot_ct, thd_mem[cpu_id], tcap_mem[cpu_id], cpu_id);
+		return;
+	}
+
+	printk("Setting up the booter component.\n");
+
+	boot_comp_captbl = mem_boot_alloc(BOOT_CAPTBL_NPAGES);
+	assert(boot_comp_captbl);
+	glb_boot_ct = captbl_create(boot_comp_captbl);
+	assert(glb_boot_ct);
+
+	/* expand the captbl to use multiple pages. */
+	for (i = PAGE_SIZE; i < BOOT_CAPTBL_NPAGES * PAGE_SIZE; i += PAGE_SIZE) {
+		captbl_init(boot_comp_captbl + i, 1);
+		ret = captbl_expand(glb_boot_ct, (i - PAGE_SIZE / 2) / CAPTBL_LEAFSZ, captbl_maxdepth(), boot_comp_captbl + i);
+		assert(!ret);
+		captbl_init(boot_comp_captbl + PAGE_SIZE + PAGE_SIZE / 2, 1);
+		ret = captbl_expand(glb_boot_ct, i / CAPTBL_LEAFSZ, captbl_maxdepth(), boot_comp_captbl + i + PAGE_SIZE / 2);
+		assert(!ret);
+	}
+
+	for (i = 0; i < NUM_CPU; i++) {
+		thd_mem[i]  = mem_boot_alloc(1);
+		assert(thd_mem[i]);
+		tcap_mem[i] = mem_boot_alloc(1);
+		assert(tcap_mem[i]);
+		assert(thd_mem[i] && tcap_mem[i]);
+	}
+
+	if (captbl_activate_boot(glb_boot_ct, BOOT_CAPTBL_SELF_CT)) assert(0);
+	if (sret_activate(glb_boot_ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SRET)) assert(0);
+
+	hw_asndcap_init();
+	if (hw_activate(glb_boot_ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_INITHW_BASE, hw_bitmap)) assert(0);
+
+	/*
+	 * separate pgd for boot component virtual memory
+	 */
+	boot_vm_pgd = (pgtbl_t)mem_boot_alloc(1);
+	assert(boot_vm_pgd);
+	/* There's no need to copy any kernel entry into this - because we know that kernel uses TTBR1 */
+	if (pgtbl_activate(glb_boot_ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_PT, (pgtbl_t)boot_vm_pgd, 0)) assert(0);
+
+	/* Map in the virtual memory */
+	ret = boot_elf_process(glb_boot_ct, BOOT_CAPTBL_SELF_PT, BOOT_CAPTBL_BOOTVM_PTE, "booter VM",
+			       mem_bootc_start(), mem_bootc_end() - mem_bootc_start());
+	assert(ret == 0);
+
+	/*
+	 * Map in the untyped memory.  This is more complicated as we
+	 * need to use the untyped memory itself for the PTEs.
+	 *
+	 * Chicken and egg problem here: We want to know how many PTEs
+	 * to allocate based on how much untyped memory there is.
+	 * Once the PTEs are allocated, we might require fewer address
+	 * range, thus less PTEs.  This _must_ be the last allocation.
+	 * The bump pointer modifies this allocation.
+	 *
+	 * Need to account for the pages that will be allocated as
+	 * PTEs
+	 */
+	if (pgtbl_activate(glb_boot_ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_UNTYPED_PT, pgtbl, 0)) assert(0);
+
+	nkmemptes = boot_nptes(mem_utmem_end() - mem_boot_end());
+	boot_pgtbl_expand(glb_boot_ct, BOOT_CAPTBL_SELF_UNTYPED_PT, BOOT_CAPTBL_KM_PTE, "untyped memory",
+			  BOOT_MEM_KM_BASE, mem_utmem_end() - mem_boot_nalloc_end(nkmemptes));
+	ret = boot_pgtbl_mappings_add(glb_boot_ct, BOOT_CAPTBL_SELF_UNTYPED_PT, BOOT_CAPTBL_KM_PTE, "untyped memory",
+                                      mem_boot_nalloc_end(nkmemptes), BOOT_MEM_KM_BASE,
+                                      mem_utmem_end() - mem_boot_nalloc_end(nkmemptes), 0);
+	assert(ret == 0);
+
+	printk("\tCapability table and page-table created.\n");
+
+	/* Shut off further bump allocations */
+	glb_memlayout.allocs_avail = 0;
+
+	if (comp_activate(glb_boot_ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_COMP, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_PT, 0,
+	                  mem_bootc_entry()))
+		assert(0);
+	printk("\tCreated boot component structure from page-table and capability-table.\n");
+
+	kern_boot_thd(glb_boot_ct, thd_mem[cpu_id], tcap_mem[cpu_id], cpu_id);
+
+	printk("\tBoot component initialization complete.\n");
+}
+
+void
+kern_boot_upcall(void)
+{
+	void *entry = (void *)mem_bootc_entry();
+	u32_t flags = 0;
+	void *p;
+
+	assert(get_cpuid() >= 0);
+	/* only print complete msg for BSP */
+	if (get_cpuid() == 0) {
+		printk("Upcall into boot component at ip 0x%x for cpu: %d with tid: %d\n", entry, get_cpuid(), thd_current(cos_cpu_local_info())->tid);
+		printk("------------------[ Kernel boot complete ]------------------\n");
+	}
+
+	chal_user_upcall(entry, thd_current(cos_cpu_local_info())->tid, get_cpuid());
+	printk("Should never get here!\n");
+	assert(0); /* should never get here! */
+}
diff --git a/src/platform/armv7a/boot_comp.h b/src/platform/armv7a/boot_comp.h
new file mode 100644
index 0000000000..693dfcce23
--- /dev/null
+++ b/src/platform/armv7a/boot_comp.h
@@ -0,0 +1,2 @@
+void kern_boot_comp(cpuid_t cpu_id);
+void kern_boot_upcall(void);
diff --git a/src/platform/armv7a/cav7_consts.h b/src/platform/armv7a/cav7_consts.h
new file mode 100644
index 0000000000..7a25ae8bc3
--- /dev/null
+++ b/src/platform/armv7a/cav7_consts.h
@@ -0,0 +1,192 @@
+#ifndef CAV7_CONSTS_H
+#define CAV7_CONSTS_H
+
+#include "kernel.h"
+#include "chal_cpu.h"
+#include "shared/cpu_ghz.h"
+
+/* Base of registers */
+/* What is the interrupt priority grouping? */
+#define CAV7_GIC_GROUPING CAV7_GIC_GROUPING_P7S1
+/* GIC distributor base address */
+#define CAV7_GICD_BASE 0xF8F01000
+/* GIC CPU interface base address */
+#define CAV7_GICC_BASE 0xF8F00100
+/* Private timer and watchdog block base */
+#define CAV7_PTWD_BASE 0xF8F00600
+/* Global timer base */
+#define CAV7_GTMR_BASE 0xF8F00200
+
+/* Macro definitions for timers and interrupt controllers */
+#define CAV7_SFR(base, offset) (*((volatile unsigned long *)((unsigned long)((base) + (offset)))))
+
+/* Timer definitions */
+/* Private timer load register */
+#define CAV7_PTWD_PTLR CAV7_SFR(CAV7_PTWD_BASE, 0x0000)
+/* Private timer counter register */
+#define CAV7_PTWD_PTCNTR CAV7_SFR(CAV7_PTWD_BASE, 0x0004)
+/* Private timer control register */
+#define CAV7_PTWD_PTCTLR CAV7_SFR(CAV7_PTWD_BASE, 0x0008)
+#define CAV7_PTWD_PTCTLR_PRESC(x) ((x) << 8U)
+#define CAV7_PTWD_PTCTLR_IRQEN (1U << 2U)
+#define CAV7_PTWD_PTCTLR_AUTOREL (1U << 1U)
+#define CAV7_PTWD_PTCTLR_TIMEN (1U << 0U)
+/* Private timer interrupt status register */
+#define CAV7_PTWD_PTISR CAV7_SFR(CAV7_PTWD_BASE, 0x000C)
+
+/* Watchdog load register */
+#define CAV7_PTWD_WDLR CAV7_SFR(CAV7_PTWD_BASE, 0x0020)
+/* Watchdog counter register */
+#define CAV7_PTWD_WDCNTR CAV7_SFR(CAV7_PTWD_BASE, 0x0024)
+/* Watchdog control register */
+#define CAV7_PTWD_WDCTLR CAV7_SFR(CAV7_PTWD_BASE, 0x0028)
+/* Watchdog interrupt status register */
+#define CAV7_PTWD_WDISR CAV7_SFR(CAV7_PTWD_BASE, 0x002C)
+/* Watchdog reset status register */
+#define CAV7_PTWD_WDRSR CAV7_SFR(CAV7_PTWD_BASE, 0x0030)
+/* Watchdog disable register */
+#define CAV7_PTWD_WDDR CAV7_SFR(CAV7_PTWD_BASE, 0x0034)
+
+/* GIC definitions - This is only present in MPCore platform. Most Cortex-A9s,
+ * all Cortex-A7s and Cortex-A5s are on the multicore platform */
+/* Distributor control register */
+#define CAV7_GICD_CTLR CAV7_SFR(CAV7_GICD_BASE, 0x0000)
+#define CAV7_GICD_CTLR_GRP1EN (1U << 1U)
+#define CAV7_GICD_CTLR_GRP0EN (1U << 0U)
+/* Interrupt controller type register */
+#define CAV7_GICD_TYPER CAV7_SFR(CAV7_GICD_BASE, 0x0004)
+/* Distributor implementer identification register */
+#define CAV7_GICD_IIDR CAV7_SFR(CAV7_GICD_BASE, 0x0008)
+/* Interrupt group registers */
+#define CAV7_GICD_IGROUPR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0080 + (x)*4) /* 0-31 */
+/* Interrupt enabling registers */
+#define CAV7_GICD_ISENABLER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0100 + (x)*4) /* 0-31 */
+/* Interrupt disabling registers */
+#define CAV7_GICD_ICENABLER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0180 + (x)*4) /* 0-31 */
+/* Interrupt set-pending registers */
+#define CAV7_GICD_ISPENDR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0200 + (x)*4) /* 0-31 */
+/* Interrupt clear-pending registers */
+#define CAV7_GICD_ICPENDR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0280 + (x)*4) /* 0-31 */
+/* Interrupt set-active registers */
+#define CAV7_GICD_ISACTIVER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0300 + (x)*4) /* 0-31 */
+/* Interrupt clear-active registers */
+#define CAV7_GICD_ICACTIVER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0380 + (x)*4) /* 0-31 */
+/* Interrupt priority registers */
+#define CAV7_GICD_IPRIORITYR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0400 + (x)*4) /* 0-254 */
+/* Interrupt processor targets registers */
+#define CAV7_GICD_ITARGETSR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0800 + (x)*4) /* 0-7 */
+/* Interrupt configuration registers */
+#define CAV7_GICD_ICFGR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0C00 + (x)*4) /* 0-63 */
+/* Non-secure access control registers */
+#define CAV7_GICD_NSACR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0E00 + (x)*4) /* 0-63 */
+/* Software generated interrupt register */
+#define CAV7_GICD_SGIR CAV7_SFR(CAV7_GICD_BASE, 0x0F00)
+/* SGI clear-pending registers */
+#define CAV7_GICD_CPENDSGIR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0F10 + (x)*4) /* 0-3 */
+/* SGI set-pending registers */
+#define CAV7_GICD_SPENDSGIR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0F20 + (x)*4) /* 0-3 */
+
+/* CPU interface control register */
+#define CAV7_GICC_CTLR CAV7_SFR(CAV7_GICC_BASE, 0x0000)
+/* Interrupt priority mask register */
+#define CAV7_GICC_PMR CAV7_SFR(CAV7_GICC_BASE, 0x0004)
+/* Binary pointer register */
+#define CAV7_GICC_BPR CAV7_SFR(CAV7_GICC_BASE, 0x0004)
+/* Interrupt acknowledge register */
+#define CAV7_GICC_IAR CAV7_SFR(CAV7_GICC_BASE, 0x000C)
+/* End of interrupt register */
+#define CAV7_GICC_EOIR CAV7_SFR(CAV7_GICC_BASE, 0x0010)
+/* Running priority register */
+#define CAV7_GICC_RPR CAV7_SFR(CAV7_GICC_BASE, 0x0014)
+/* Highest priority pending interrupt register */
+#define CAV7_GICC_HPPIR CAV7_SFR(CAV7_GICC_BASE, 0x0018)
+/* Aliased binary point register */
+#define CAV7_GICC_ABPR CAV7_SFR(CAV7_GICC_BASE, 0x001C)
+/* Aliased interrupt acknowledge register */
+#define CAV7_GICC_AIAR CAV7_SFR(CAV7_GICC_BASE, 0x0020)
+/* Aliased end of interrupt register */
+#define CAV7_GICC_AEOIR CAV7_SFR(CAV7_GICC_BASE, 0x0024)
+/* Aliased highest priority pending interrupt register */
+#define CAV7_GICC_AHPPIR CAV7_SFR(CAV7_GICC_BASE, 0x0028)
+/* Active priorities registers */
+#define CAV7_GICC_APR(x) CAV7_SFR(CAV7_GICC_BASE, 0x00D0 + (x)*4) /* 0-3 */
+/* Non-secure active priorities registers */
+#define CAV7_GICC_NSAPR(x) CAV7_SFR(CAV7_GICC_BASE, 0x00E0 + (x)*4) /* 0-3 */
+/* CPU interface identification register */
+#define CAV7_GICC_IIDR CAV7_SFR(CAV7_GICC_BASE, 0x00FC)
+/* Deactivate interrupt register */
+#define CAV7_GICC_DIR CAV7_SFR(CAV7_GICC_BASE, 0x1000)
+
+/* Control register */
+#define CAV7_GICC_CBPR (1U << 4U)
+#define CAV7_GICC_FIQEN (1U << 3U)
+#define CAV7_GICC_ACKCTL (1U << 2U)
+#define CAV7_GICC_ENABLEGRP1 (1U << 1U)
+#define CAV7_GICC_ENABLEGRP0 (1U << 0U)
+
+/* Priority grouping */
+#define CAV7_GIC_GROUPING_P7S1 (0U)
+#define CAV7_GIC_GROUPING_P6S2 (1U)
+#define CAV7_GIC_GROUPING_P5S3 (2U)
+#define CAV7_GIC_GROUPING_P4S4 (3U)
+#define CAV7_GIC_GROUPING_P3S5 (4U)
+#define CAV7_GIC_GROUPING_P2S6 (5U)
+#define CAV7_GIC_GROUPING_P1S7 (6U)
+#define CAV7_GIC_GROUPING_P0S8 (7U)
+
+/* Global timer registers */
+#define CAV7_GTMR_GTCNTRL CAV7_SFR(CAV7_GTMR_BASE, 0x0000)
+#define CAV7_GTMR_GTCNTRH CAV7_SFR(CAV7_GTMR_BASE, 0x0004)
+#define CAV7_GTMR_GTCTLR CAV7_SFR(CAV7_GTMR_BASE, 0x0008)
+
+#define CAV7_L2C_BASE 0xF8F02000
+/* Cache ID register */
+#define CAV7_L2C_CACHE_ID CAV7_SFR(CAV7_L2C_BASE, 0x0000)
+/* Cache type register */
+#define CAV7_L2C_CACHE_TYPE CAV7_SFR(CAV7_L2C_BASE, 0x0004)
+/* Control register */
+#define CAV7_L2C_CONTROL CAV7_SFR(CAV7_L2C_BASE, 0x0100)
+/* Auxiliary control register */
+#define CAV7_L2C_AUX_CONTROL CAV7_SFR(CAV7_L2C_BASE, 0x0104)
+/* Tag and data RAM latency control registers */
+#define CAV7_L2C_TAG_RAM_CTRL CAV7_SFR(CAV7_L2C_BASE, 0x0108)
+#define CAV7_L2C_DATA_RAM_CTRL CAV7_SFR(CAV7_L2C_BASE, 0x010C)
+/* Event counter control register */
+#define CAV7_L2C_EV_CNTR_CTRL CAV7_SFR(CAV7_L2C_BASE, 0x0200)
+/* Event counter configuration registers */
+#define CAV7_L2C_EV_CNTR1_CFG CAV7_SFR(CAV7_L2C_BASE, 0x0204)
+#define CAV7_L2C_EV_CNTR0_CFG CAV7_SFR(CAV7_L2C_BASE, 0x0208)
+/* Event counter value registers */
+#define CAV7_L2C_EV_CNTR1 CAV7_SFR(CAV7_L2C_BASE, 0x020C)
+#define CAV7_L2C_EV_CNTR0 CAV7_SFR(CAV7_L2C_BASE, 0x0210)
+/* Interrupt registers */
+#define CAV7_L2C_INT_MASK CAV7_SFR(CAV7_L2C_BASE, 0x0214)
+#define CAV7_L2C_INT_MASK_STATUS CAV7_SFR(CAV7_L2C_BASE, 0x0218)
+#define CAV7_L2C_INT_RAW_STATUS CAV7_SFR(CAV7_L2C_BASE, 0x021C)
+#define CAV7_L2C_INT_CLEAR CAV7_SFR(CAV7_L2C_BASE, 0x0220)
+/* Cache maintenance operations */
+#define CAV7_L2C_CACHE_SYNC CAV7_SFR(CAV7_L2C_BASE, 0x0730)
+#define CAV7_L2C_INV_PA CAV7_SFR(CAV7_L2C_BASE, 0x0770)
+#define CAV7_L2C_INV_WAY CAV7_SFR(CAV7_L2C_BASE, 0x077C)
+#define CAV7_L2C_CLEAN_PA CAV7_SFR(CAV7_L2C_BASE, 0x07B0)
+#define CAV7_L2C_CLEAN_INDEX CAV7_SFR(CAV7_L2C_BASE, 0x07B8)
+#define CAV7_L2C_CLEAN_WAY CAV7_SFR(CAV7_L2C_BASE, 0x07BC)
+#define CAV7_L2C_CLEAN_INV_PA CAV7_SFR(CAV7_L2C_BASE, 0x07F0)
+#define CAV7_L2C_CLEAN_INV_INDEX CAV7_SFR(CAV7_L2C_BASE, 0x07F8)
+#define CAV7_L2C_CLEAN_INV_WAY CAV7_SFR(CAV7_L2C_BASE, 0x07FC)
+/* Cache lockdown */
+#define CAV7_L2C_D_LOCKDOWN(X) CAV7_SFR(CAV7_L2C_BASE, 0x0900 + (X)*8) /* 0-7 */
+#define CAV7_L2C_I_LOCKDOWN(X) CAV7_SFR(CAV7_L2C_BASE, 0x0904 + (X)*8) /* 0-7 */
+#define CAV7_L2C_D_LOCK_LINE_EN CAV7_SFR(CAV7_L2C_BASE, 0x0950)
+#define CAV7_L2C_I_UNLOCK_WAY CAV7_SFR(CAV7_L2C_BASE, 0x0954)
+/* Address filtering */
+#define CAV7_L2C_I_ADDR_FLTR_START CAV7_SFR(CAV7_L2C_BASE, 0x0C00)
+#define CAV7_L2C_I_ADDR_FLTR_END CAV7_SFR(CAV7_L2C_BASE, 0x0C04)
+/* Debug register */
+#define CAV7_L2C_DEBUG_CTRL CAV7_SFR(CAV7_L2C_BASE, 0x0F40)
+/* Prefetch control register */
+#define CAV7_L2C_PREFETCH_CTRL CAV7_SFR(CAV7_L2C_BASE, 0x0F60)
+/* Power control register */
+#define CAV7_L2C_POWER_CTRL CAV7_SFR(CAV7_L2C_BASE, 0x0F80)
+
+#endif /* CAV7_CONSTS_H */
diff --git a/src/platform/armv7a/chal.c b/src/platform/armv7a/chal.c
new file mode 100644
index 0000000000..d5a2cd7643
--- /dev/null
+++ b/src/platform/armv7a/chal.c
@@ -0,0 +1,93 @@
+#include <chal.h>
+#include <shared/cos_types.h>
+#include "kernel.h"
+#include "mem_layout.h"
+#include "chal_cpu.h"
+#include "irq.h"
+
+u32_t        free_thd_id = 1;
+asid_t       free_asid   = 1; /* reserve 0 for synchronization if necessary! */
+char         timer_detector[PAGE_SIZE] PAGE_ALIGNED;
+extern void *cos_kmem, *cos_kmem_base;
+u32_t        chal_msr_mhz = 0;
+
+paddr_t chal_kernel_mem_pa;
+
+void *
+chal_alloc_kern_mem(int order)
+{
+	return mem_kmem_start();
+}
+
+void
+chal_free_kern_mem(void *mem, int order)
+{
+}
+
+int
+chal_attempt_arcv(struct cap_arcv *arcv)
+{
+	return 0;
+}
+
+void
+chal_send_ipi(int cpuid)
+{
+}
+
+void
+chal_khalt(void)
+{
+	khalt();
+}
+
+void
+chal_init(void)
+{
+	/* Initialize timers, etc */
+	__cos_cav7_int_init();
+	timer_init();
+	l2cache_init();
+	/* Initialize the vector table */
+	printk("CAV7-Vector table: 0x%x\r\n", (unsigned long)&__cos_cav7_vector_table);
+	__cos_cav7_vbar_set((unsigned long)&__cos_cav7_vector_table);
+
+	printk("CAV7-Init: complete\r\n");
+}
+
+void
+chal_tls_update(vaddr_t tlsaddr)
+{
+}
+
+int
+chal_cyc_usec(void)
+{
+	return CYC_PER_USEC;
+}
+
+void
+_exit(int code)
+{
+	/* dead loop */
+	while (1)
+		;
+}
+
+int
+_kill(int pid, int sig)
+{
+	return -1;
+}
+
+int
+_getpid(void)
+{
+	return -1;
+}
+
+char *
+_sbrk(int incr)
+{
+	return (char *)(0);
+}
diff --git a/src/platform/armv7a/chal/call_convention.h b/src/platform/armv7a/chal/call_convention.h
new file mode 100644
index 0000000000..9be9f31c44
--- /dev/null
+++ b/src/platform/armv7a/chal/call_convention.h
@@ -0,0 +1,187 @@
+#ifndef CALL_CONVENTION_H
+#define CALL_CONVENTION_H
+
+#include "../../../kernel/include/asm_ipc_defs.h"
+
+/*
+ * Calling convention registers here..
+ *
+ * input:
+ *	r1 = operation & capability for system call.
+ *      r2, r3, r4, r5 = arguments.
+ *
+ * return:
+ *	r0 = return value
+ *      r2, r3, r4 = multiple return value for sinv ret.
+ *
+ *      r0 = contains thdid + cpuid for thd upcall & sinv.
+ *      r1 = option for thd upcall, token for sinv
+ */
+
+
+/*
+ * Functions to maintain calling conventions on invocation and return
+ * (i.e. to make sure the registers are appropriately set up).
+ */
+static inline void
+__userregs_setret(struct pt_regs *regs, unsigned long ret)
+{
+	regs->r0 = ret;
+}
+
+static inline unsigned long
+__userregs_getsp(struct pt_regs *regs)
+{
+	return regs->r13_sp;
+}
+
+static inline unsigned long
+__userregs_getip(struct pt_regs *regs)
+{
+	return regs->r15_pc;
+}
+
+static inline capid_t
+__userregs_getcap(struct pt_regs *regs)
+{
+	return (regs->r1 >> COS_CAPABILITY_OFFSET) - 1;
+}
+
+static inline u32_t
+__userregs_getop(struct pt_regs *regs)
+{
+	return regs->r1 & ((1 << COS_CAPABILITY_OFFSET) - 1);
+}
+
+static inline unsigned long
+__userregs_getinvret(struct pt_regs *regs)
+{
+	return regs->r0;
+} 
+
+static inline void
+__userregs_setinv(struct pt_regs *regs, unsigned long id, unsigned long tok, unsigned long ip)
+{
+	regs->r0 = id;
+	regs->r1 = tok;
+	regs->r15_pc = ip;
+}
+
+static inline void
+__userregs_set(struct pt_regs *regs, unsigned long ret, unsigned long sp, unsigned long ip)
+{
+	regs->r0 = ret;
+	regs->r13_sp = sp;
+	regs->r15_pc = ip;
+}
+
+static inline void
+__userregs_setretvals(struct pt_regs *regs, unsigned long ret, unsigned long ret1, unsigned long ret2, unsigned long ret3)
+{
+	regs->r0 = ret;
+	regs->r2 = ret1;
+	regs->r3 = ret2;
+	regs->r4 = ret3;
+}
+
+static inline void
+__userregs_sinvupdate(struct pt_regs *regs)
+{
+	/* IPC calling side has 4 args (in order): r1 r2 r3 r4 */
+	/* IPC server side receives 4 args: r1, r2, r3, r4 */
+	/* No movement needed */
+	/* regs->r1 = regs->r1; */
+	/* regs->r2 = regs->r2; */
+	/* regs->r3 = regs->r3; */
+	/* regs->r4 = regs->r5; */
+}
+
+static inline int
+__userregs_get1(struct pt_regs *regs)
+{
+	return regs->r2;
+}
+
+static inline int
+__userregs_get2(struct pt_regs *regs)
+{
+	return regs->r3;
+}
+
+static inline int
+__userregs_get3(struct pt_regs *regs)
+{
+	return regs->r4;
+}
+
+static inline int
+__userregs_get4(struct pt_regs *regs)
+{
+	return regs->r5;
+}
+
+static inline void
+copy_gp_regs(struct pt_regs *from, struct pt_regs *to)
+{
+#define COPY_REG(reg) to->reg = from->reg
+	COPY_REG(r0);
+	COPY_REG(r1);
+	COPY_REG(r2);
+	COPY_REG(r3);
+	COPY_REG(r4);
+	COPY_REG(r5);
+	COPY_REG(r6);
+	COPY_REG(r7);
+	COPY_REG(r8);
+	COPY_REG(r9);
+	COPY_REG(r10);
+	COPY_REG(r11);
+	COPY_REG(r12);
+	COPY_REG(r13_sp);
+	COPY_REG(r14_lr);
+	COPY_REG(r15_pc);
+	COPY_REG(cpsr);
+#undef COPY_REG
+}
+
+static inline void
+copy_all_regs(struct pt_regs *from, struct pt_regs *to)
+{
+#define COPY_REG(reg) to->reg = from->reg
+	COPY_REG(r0);
+	COPY_REG(r1);
+	COPY_REG(r2);
+	COPY_REG(r3);
+	COPY_REG(r4);
+	COPY_REG(r5);
+	COPY_REG(r6);
+	COPY_REG(r7);
+	COPY_REG(r8);
+	COPY_REG(r9);
+	COPY_REG(r10);
+	COPY_REG(r11);
+	COPY_REG(r12);
+	COPY_REG(r13_sp);
+	COPY_REG(r14_lr);
+	COPY_REG(r15_pc);
+	COPY_REG(cpsr);
+#undef COPY_REG
+}
+
+static inline void
+regs_upcall_setup(struct pt_regs *regs, u32_t entry_addr, int option, int id, int arg1, int arg2, int arg3)
+{
+	regs->r0 = id;
+
+	regs->cpsr = CPSR_USER_LEVEL; 
+	regs->r1 = option;
+	regs->r2 = arg1;
+	regs->r3 = arg2;
+	regs->r4 = arg3;
+
+	regs->r15_pc = entry_addr;
+
+	return;
+}
+
+#endif /* CALL_CONVENTION_H */
diff --git a/src/platform/armv7a/chal/chal_config.h b/src/platform/armv7a/chal/chal_config.h
new file mode 100644
index 0000000000..bad0608176
--- /dev/null
+++ b/src/platform/armv7a/chal/chal_config.h
@@ -0,0 +1,93 @@
+#ifndef CHAL_CONFIG_H
+#define CHAL_CONFIG_H
+
+#ifndef COS_BASE_TYPES
+#define COS_BASE_TYPES
+typedef unsigned char      u8_t;
+typedef unsigned short int u16_t;
+typedef unsigned int       u32_t;
+typedef unsigned long long u64_t;
+typedef signed char        s8_t;
+typedef signed short int   s16_t;
+typedef signed int         s32_t;
+typedef signed long long   s64_t;
+#endif
+
+typedef enum {
+	HW_PERIODIC = 32, /* periodic timer interrupt */
+	HW_KEYBOARD,      /* keyboard interrupt */
+	HW_ID3,
+	HW_ID4,
+	HW_SERIAL, /* serial interrupt */
+	HW_ID6,
+	HW_ID7,
+	HW_ID8,
+	HW_ONESHOT, /* onetime timer interrupt */
+	HW_ID10,
+	HW_ID11,
+	HW_ID12,
+	HW_ID13,
+	HW_ID14,
+	HW_ID15,
+	HW_ID16,
+	HW_ID17,
+	HW_ID18,
+	HW_ID19,
+	HW_ID20,
+	HW_ID21,
+	HW_ID22,
+	HW_ID23,
+	HW_ID24,
+	HW_ID25,
+	HW_ID26,
+	HW_ID27,
+	HW_ID28,
+	HW_ID29,
+	HW_ID30,
+	HW_ID31,
+	HW_LAPIC_SPURIOUS,
+	HW_LAPIC_TIMER = 255, /* Local APIC TSC-DEADLINE mode - Timer interrupts */
+} hwid_t;
+
+typedef struct {
+	volatile unsigned int counter;
+} atomic_t;
+
+#define LOCK_PREFIX_HERE                  \
+	".pushsection .smp_locks,\"a\"\n" \
+	".balign 4\n"                     \
+	".long 671f - .\n" /* offset */   \
+	".popsection\n"                   \
+	"671:"
+
+#define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; "
+
+static inline void
+atomic_inc(atomic_t *v)
+{
+	__asm__ __volatile__(LOCK_PREFIX "incl %0" : "+m"(v->counter));
+}
+
+static inline void
+atomic_dec(atomic_t *v)
+{
+	__asm__ __volatile__(LOCK_PREFIX "decl %0" : "+m"(v->counter));
+}
+
+static inline void
+cos_mem_fence(void)
+{
+	__asm__ __volatile__("dmb" ::: "memory");
+}
+
+/* 256 entries. can be increased if necessary */
+#define COS_THD_INIT_REGION_SIZE (1 << 8)
+// Static entries are after the dynamic allocated entries
+#define COS_STATIC_THD_ENTRY(i) ((i + COS_THD_INIT_REGION_SIZE + 1))
+
+#define KERNEL_PGD_REGION_OFFSET (PAGE_SIZE - PAGE_SIZE / 4)
+#define KERNEL_PGD_REGION_SIZE (PAGE_SIZE / 4)
+
+#define COS_SYSCALL
+
+#endif /* CHAL_CONFIG_H */
diff --git a/src/platform/armv7a/chal/chal_plat.h b/src/platform/armv7a/chal/chal_plat.h
new file mode 100644
index 0000000000..28b5f7ce88
--- /dev/null
+++ b/src/platform/armv7a/chal/chal_plat.h
@@ -0,0 +1,45 @@
+#ifndef CHAL_PLAT_H
+#define CHAL_PLAT_H
+
+/* This flushes all levels of cache of the current logical CPU. */
+static inline void
+chal_flush_cache(void)
+{
+	asm volatile("wbinvd" : : : "memory");
+}
+
+static inline void
+chal_flush_tlb_global(void)
+{
+}
+static inline void
+chal_remote_tlb_flush(int target_cpu)
+{
+}
+/* This won't flush global TLB (pinned with PGE) entries. */
+static inline void
+chal_flush_tlb(void)
+{
+}
+
+static inline void *
+chal_pa2va(paddr_t address)
+{
+        return (void *)(address + COS_MEM_KERN_START_VA);
+}
+
+static inline paddr_t
+chal_va2pa(void *address)
+{
+        return (paddr_t)(address - COS_MEM_KERN_START_VA);
+}
+
+
+int chal_tlb_lockdown(unsigned long entryid, unsigned long vaddr, unsigned long paddr);
+int chal_tlbflush(int a);
+int chal_tlbstall(void);
+int chal_tlbstall_recount(int a);
+
+int chal_l1flush(void);
+
+#endif /* CHAL_PLAT_H */
diff --git a/src/platform/armv7a/chal/chal_proto.h b/src/platform/armv7a/chal/chal_proto.h
new file mode 100644
index 0000000000..9ec1eb83e9
--- /dev/null
+++ b/src/platform/armv7a/chal/chal_proto.h
@@ -0,0 +1,96 @@
+/* Architecture-specific prototypes that go into the kernel */
+#ifndef CHAL_PROTO_H
+#define CHAL_PROTO_H
+
+/* Page table platform-dependent definitions - for ARM, some of the x86 page flags are not useful */
+#define PGTBL_PGTIDX_SHIFT (20)
+#define PGTBL_PAGEIDX_SHIFT (12)
+#define PGTBL_FRAME_BITS (32 - PGTBL_PAGEIDX_SHIFT)
+#define PGTBL_FLAG_MASK ((1 << PGTBL_PAGEIDX_SHIFT) - 1)
+#define PGTBL_FRAME_MASK (~PGTBL_FLAG_MASK)
+#define PGTBL_DEPTH 2
+#define PGTBL_ENTRY_ORDER 8
+#define PGTBL_ENTRY (1 << PGTBL_ENTRY_ORDER)
+#define SUPER_PAGE_FLAG_MASK  (0x3FFFFF)
+#define SUPER_PAGE_PTE_MASK   (0x3FF000)
+
+/* FIXME:find a better way to do this */
+#define EXTRACT_SUB_PAGE(super) ((super) & SUPER_PAGE_PTE_MASK)
+
+struct pgtbl
+{
+	u32_t 		pgtbl[1024];
+};
+
+/* Page table related prototypes & structs */
+/* make it an opaque type...not to be touched */
+typedef struct pgtbl *pgtbl_t;
+
+struct pgtbl_info {
+	asid_t  asid;
+	pgtbl_t pgtbl;
+} __attribute__((packed));
+
+/* identical to the capability structure */
+struct cap_pgtbl {
+	struct cap_header h;
+	u32_t             refcnt_flags; /* includes refcnt and flags */
+	pgtbl_t           pgtbl;
+	u32_t             lvl;       /* what level are the pgtbl nodes at? */
+	struct cap_pgtbl *parent;    /* if !null, points to parent cap */
+	u64_t             frozen_ts; /* timestamp when frozen is set. */
+} __attribute__((packed));
+
+static inline void
+chal_pgtbl_update(struct pgtbl_info *ptinfo)
+{
+	/*
+	 * https://github.com/gwsystems/composite/commit/6c41838513f6b5188a5b0353ff3c1f6c19c6fff5
+	 * In this commit, I debugged different variants for asid context switch code 
+	 * but wasn't successful with any of those. 
+	 * Not sure what I did wrong.. Now this woks
+	 */
+	paddr_t ttbr0 = chal_va2pa(ptinfo->pgtbl) | 0x4a;
+
+	/* asm volatile("mcr p15, 0, r0, c8, c7, 0"); was using TLBIALL */
+	
+	/* Scheme 1 - cycle through an unused ASID - slower 
+	asm volatile("mcr p15, 0, %0, c13, c0, 1" :: "r" (0));
+	asm volatile("isb");
+	asm volatile("mcr p15, 0, %0, c2, c0, 0" :: "r" (ttbr0));
+	asm volatile("isb");
+	asm volatile("mcr p15, 0, %0, c13, c0, 1" :: "r" (ptinfo->asid));
+	 */
+	extern unsigned char __cos_cav7_kern_pgtbl;
+	extern unsigned char __va_offset__;
+
+/* #define TTBR1_CONTENT 	((&__cos_cav7_kern_pgtbl - &__va_offset__) | 0x4a) */
+#define TTBR1_CONTENT  (0x0015004a)
+
+	/* Scheme 2 - cycle through global page table - faster - with separated inline asms, which GCC is not good at.
+	asm volatile("dsb");
+	asm volatile("mcr p15, 0, %0, c2, c0, 0" :: "r" (TTBR1_CONTENT));
+	asm volatile("isb");
+	asm volatile("mcr p15, 0, %0, c13, c0, 1" :: "r" (ptinfo->asid));
+	asm volatile("mcr p15, 0, %0, c2, c0, 0" :: "r" (ttbr0));
+	asm volatile("isb");  */
+	
+	/* Scheme 2 - cycle through global page table - faster - whole blocks. */
+	__asm__ __volatile__("dsb \n\t"
+	                     "mcr p15, 0, %0, c2, c0, 0 \n\t"
+	                     "isb \n\t"
+	                     "mcr p15, 0, %1, c13, c0, 1  \n\t"
+	                     "mcr p15, 0, %2, c2, c0, 0 \n\t"
+	                     "isb \n\t"
+	                     :: "r"(TTBR1_CONTENT), "r"(ptinfo->asid), "r"(ttbr0));
+}
+
+extern asid_t free_asid;
+static inline asid_t
+chal_asid_alloc(void)
+{
+	if (unlikely(free_asid >= MAX_NUM_ASID)) assert(0);
+	return cos_faa((int *)&free_asid, 1);
+}
+
+#endif /* CHAL_PROTO_H */
diff --git a/src/platform/armv7a/chal/cpuid.h b/src/platform/armv7a/chal/cpuid.h
new file mode 100644
index 0000000000..a5f5173496
--- /dev/null
+++ b/src/platform/armv7a/chal/cpuid.h
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2012 by Qi Wang, interwq@gwu.edu; Gabriel Parmer,
+ * gparmer@gwu.edu
+
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+
+#ifndef CPUID_H
+#define CPUID_H
+
+#include "../../../kernel/include/shared/consts.h"
+#include "../../../kernel/include/shared/cos_types.h"
+#include "../../../kernel/include/asm_ipc_defs.h"
+#include "../../../kernel/include/list.h"
+#include "../chal_asm_inc.h"
+#include "shared/util.h"
+
+static inline cycles_t
+tsc(void)
+{
+	unsigned long long ret;
+
+	rdtscll(ret);
+
+	return ret;
+}
+
+/*
+ * This is the data structure embedded in the cos_cpu_local_info (next_ti) that
+ * contains information for the thread that was either preempted or woken up
+ * and is eligible to be scheduled instead of the current thread's scheduler
+ * upon RCV syscall. This is mainly to reduce the number of context switches
+ * to schedule the thread that is deemed eligible by the scheduler.
+ */
+struct next_thdinfo {
+	void *      thd;
+	void *      tc;
+	tcap_prio_t prio;
+	tcap_res_t  budget;
+};
+
+struct cos_cpu_local_info {
+	/*
+	 * orig_sysenter_esp SHOULD be the first variable here. The
+	 * sysenter interposition path gets tss from it.
+	 */
+	unsigned long *orig_sysenter_esp; /* Points to the end of the tss struct in Linux. */
+	/***********************************************/
+	/* info saved in kernel stack for fast access. */
+	unsigned long cpuid;
+	void *        curr_thd;
+	void *        curr_tcap;
+	struct list   tcaps;
+	tcap_uid_t    tcap_uid;
+	tcap_prio_t   tcap_prio;
+	cycles_t      cycles;
+	cycles_t      next_timer;
+	/*
+	 * cache the stk_top index to save a cacheline access on
+	 * inv/ret. Could use a struct here if need to cache multiple
+	 * things. (e.g. captbl, etc)
+	 */
+	int           invstk_top;
+	unsigned long epoch;
+	/***********************************************/
+	/*
+	 * Since this struct resides at the lowest address of the
+	 * kernel stack page (along with thread_info struct of
+	 * Linux), we store 0xDEADBEEF to detect overflow.
+	 */
+	unsigned long overflow_check;
+	/* next - preempted/awoken thread information */
+	struct next_thdinfo next_ti;
+};
+
+static inline struct cos_cpu_local_info *
+cos_cpu_local_info(void)
+{
+	int local;
+
+	return (struct cos_cpu_local_info *)(round_up_to_page((unsigned long)&local) - STK_INFO_OFF);
+}
+
+static inline int
+get_cpuid(void)
+{
+#if NUM_CPU == 1
+	return 0;
+#endif
+
+	return cos_cpu_local_info()->cpuid;
+}
+
+#endif /* CPUID_H */
diff --git a/src/platform/armv7a/chal/defs.h b/src/platform/armv7a/chal/defs.h
new file mode 100644
index 0000000000..3929d2451c
--- /dev/null
+++ b/src/platform/armv7a/chal/defs.h
@@ -0,0 +1,27 @@
+#ifndef DEFS_H
+#define DEFS_H
+
+typedef unsigned long int size_t;
+
+static inline void *
+memcpy(void *dst, const void *src, size_t count)
+{
+	const u8_t *s = (const u8_t *)src;
+	u8_t *      d = (u8_t *)dst;
+
+	for (; count != 0; count--) *d++ = *s++;
+
+	return dst;
+}
+
+static inline void *
+memset(void *dst, int c, size_t count)
+{
+	char *p = (char *)dst;
+
+	for (; count != 0; count--) *p++ = c;
+
+	return dst;
+}
+
+#endif /* DEFS_H */
diff --git a/src/platform/armv7a/chal/io.h b/src/platform/armv7a/chal/io.h
new file mode 100644
index 0000000000..1ad4fe93d4
--- /dev/null
+++ b/src/platform/armv7a/chal/io.h
@@ -0,0 +1,4 @@
+#ifndef IO_H
+#define IO_H
+
+#endif /* IO_H */
diff --git a/src/platform/armv7a/chal/shared/chal_consts.h b/src/platform/armv7a/chal/shared/chal_consts.h
new file mode 100644
index 0000000000..e0f8410b67
--- /dev/null
+++ b/src/platform/armv7a/chal/shared/chal_consts.h
@@ -0,0 +1,57 @@
+#ifndef CHAL_CONSTS_H
+#define CHAL_CONSTS_H
+
+struct pt_regs {
+        unsigned long cpsr;
+        unsigned long r0;
+        unsigned long r1;
+        unsigned long r2;
+        unsigned long r3;
+        unsigned long r4;
+        unsigned long r5;
+        unsigned long r6;
+        unsigned long r7;
+        unsigned long r8;
+        unsigned long r9;
+        unsigned long r10;
+        unsigned long r11;
+        unsigned long r12;
+        unsigned long r13_sp;
+        unsigned long r14_lr;
+        unsigned long r15_pc;
+};
+
+#define PAGE_MASK (~(PAGE_SIZE - 1))
+#define PGD_SHIFT 20
+#define PGD_RANGE (1 << PGD_SHIFT)
+#define PGD_SIZE PGD_RANGE
+#define PGD_MASK (~(PGD_RANGE - 1))
+#define PGD_PER_PTBL 1024
+
+#define PGT1_SHIFT 0
+#define PGT1_RANGE (1UL << PGT1_SHIFT)
+#define PGT1_SIZE PGT1_RANGE
+#define PGT1_MASK (~(PGT1_RANGE - 1))
+#define PGT1_PER_PTBL 0
+
+#define PGT2_SHIFT 0
+#define PGT2_RANGE (1UL << PGT2_SHIFT)
+#define PGT2_SIZE PGT2_RANGE
+#define PGT2_MASK (~(PGT2_RANGE - 1))
+#define PGT2_PER_PTBL 0
+
+#define PGT3_SHIFT 0
+#define PGT3_RANGE (1UL << PGT3_SHIFT)
+#define PGT3_SIZE PGT3_RANGE
+#define PGT3_MASK (~(PGT3_RANGE - 1))
+#define PGT3_PER_PTBL 0
+
+#define CPSR_USER_LEVEL 0x600f0010
+
+#define MAX_ASID_BITS 8
+#define MAX_NUM_ASID (1<<MAX_ASID_BITS)
+#define ASID_MASK (MAX_NUM_ASID - 1)
+
+#define TTBCR_PD0 (1<<3) /* Bit 4 */
+
+#endif /* CHAL_CONSTS_H */
diff --git a/src/platform/armv7a/chal/shared/cos_config.h b/src/platform/armv7a/chal/shared/cos_config.h
new file mode 100644
index 0000000000..5b28dd917b
--- /dev/null
+++ b/src/platform/armv7a/chal/shared/cos_config.h
@@ -0,0 +1,143 @@
+#ifndef COS_CONFIG_H
+#define COS_CONFIG_H
+
+/***
+ * Memory information.  Included are four sections:
+ * - physical memory information (PA)
+ * - virtual memory addresses (VA)
+ * - resource table addresses to index memory resources (RTA)
+ * - the maximum number of pages of the different types of memory.
+ *   See BOOT_* in cos_types.h for this information
+ *
+ * These exist separately for kernel-accessible memory that can be
+ * typed as either kernel or user virtual memory, and
+ * kernel-inaccessible memory that can only be used as user virtual
+ * memory.
+ */
+
+#include "cpu_ghz.h"
+
+#define NUM_CPU 1
+#define NUM_CPU_BMP_BYTES ((NUM_CPU + 7) / 8)
+#define NUM_CPU_BMP_WORDS ((NUM_CPU_BMP_BYTES + 3) / 4)
+
+/* 
+ * FIXME: The macro to set a portion of memory of the booter to super pages - 
+ * should be dynamically passed from kernel to userlevel!
+ */
+#define NUM_SUPERPAGES           139 
+#define MAX_USABLE_MEMORY        1700
+/* FIXME: This is a hack - was 0xD800000, now expanded to 1200MB */
+#define EXTRA_MEMORY             ((MAX_USABLE_MEMORY - 512) << 20)
+#define EXTRA_SUPERPAGES         ((MAX_USABLE_MEMORY - 808) / 4)
+#define TOTAL_SUPERPAGES         (NUM_SUPERPAGES + EXTRA_SUPERPAGES - 1)
+/*
+ * 1 MB, note that this is not the PA of kernel-usable memory, instead
+ * it is the PA of the kernel.  If you change this, update the kernel
+ * linker script (.ld) as well. - For Cortex-A this starts at 0x0.
+ */
+#define COS_MEM_KERN_PA (0x00000000)
+#define COS_MEM_KERN_PA_ORDER (30)
+//#define COS_MEM_KERN_PA_SZ ((1 << COS_MEM_KERN_PA_ORDER))
+#define COS_MEM_KERN_PA_SZ (0x20000000)
+
+#define COS_MEM_COMP_START_VA ((1 << 30) + (1 << 22)) /* 1GB + 4MB (a relic) */
+#define COS_MEM_KERN_START_VA (0x80000000) // COS_MEM_KERN_PA     /* currently, we don't do kernel relocation */
+
+#define COS_HW_MMIO_MAX_SZ (1 << 27) /* Assuming a MAX of 128MB for MMIO. */
+#define COS_PHYMEM_MAX_SZ ((1 << 30) - (1 << 22) - COS_HW_MMIO_MAX_SZ) /* 1GB - 4MB - MMIO sz */
+
+#define COS_PHYMEM_END_PA ((1 << 30) - COS_HW_MMIO_MAX_SZ) /* Maximum usable physical memory */
+
+#define BOOT_COMP_MAX_SZ (1 << 24) /* 16 MB for the booter component */
+
+/*
+ * The half of the first page of init captbl is devoted to root node. So, the
+ * first page of captbl can contain 128 caps, and every extra page can hold 256
+ * caps.
+ */
+#define BOOT_CAPTBL_NPAGES ((BOOT_CAPTBL_FREE + CAPTBL_EXPAND_SZ + CAPTBL_EXPAND_SZ * 2 - 1) / (CAPTBL_EXPAND_SZ * 2))
+
+
+#define NUM_CPU 1
+
+#define CPU_TIMER_FREQ 100 // set in your linux .config
+
+#define RUNTIME 3 // seconds
+
+/* The kernel quiescence period = WCET in Kernel + WCET of a CAS. */
+#define KERN_QUIESCENCE_PERIOD_US 500
+#define KERN_QUIESCENCE_CYCLES (KERN_QUIESCENCE_PERIOD_US * 4000)
+#define TLB_QUIESCENCE_CYCLES (4000 * 1000 * (1000 / CPU_TIMER_FREQ))
+
+// After how many seconds should schedulers print out their information?
+#define SCHED_PRINTOUT_PERIOD 100000
+#define COMPONENT_ASSERTIONS 1 // activate assertions in components?
+
+//#define FPU_ENABLED
+#define FPU_SUPPORT_FXSR 1 /* >0 : CPU supports FXSR. */
+
+/* the CPU that does initialization for Composite */
+#define INIT_CORE 0
+#define NUM_CPU_COS (NUM_CPU > 1 ? NUM_CPU - 1 : 1)
+
+/* Composite user memory uses physical memory above this. */
+#define COS_MEM_START COS_MEM_KERN_PA
+
+/* NUM_CPU_SOCKETS defined in cpu_ghz.h. The information is used for
+ * intelligent IPI distribution. */
+#define NUM_CORE_PER_SOCKET (NUM_CPU / NUM_CPU_SOCKETS)
+
+// cos kernel settings
+#define COS_PRINT_MEASUREMENTS 1
+#define COS_PRINT_SCHED_EVENTS 1
+#define COS_ASSERTIONS_ACTIVE 1
+
+/*** Console and output options ***/
+/*
+ * Notes: If you are using composite as high priority and no idle to
+ * linux, then the shell output will not appear until the Composite
+ * system has exited.  Thus, you will want to make the memory size
+ * large enough to buffer _all_ output.  Note that currently
+ * COS_PRINT_MEM_SZ should not exceed around (1024*1024*3).
+ *
+ * If you have COS_PRINT_SHELL, you _will not see output_ unless you
+ * run
+ * $~/transfer/print
+ * after
+ * # make
+ * but before the runscript.
+ */
+/* print out to the shell? */
+#define COS_PRINT_SHELL 1
+/* how much should we buffer before sending an event to the shell? */
+#define COS_PRINT_BUF_SZ 128
+/* how large should the shared memory region be that will buffer print data? */
+#define COS_PRINT_MEM_SZ (4096)
+
+/* print out to dmesg? */
+/* #define COS_PRINT_DMESG 1 */
+
+/**
+ * Configuration to enable/disable functionality in Kernel.
+ */
+#define ENABLE_VGA
+#define ENABLE_SERIAL
+
+#define COS_PGTBL_DEPTH 2
+#define COS_PGTBL_ORDER_PTE 12
+#define COS_PGTBL_ORDER_PGD 20
+
+/* Page sizes */
+#define COS_PGTBL_NUM_ORDER      2
+#define COS_PGTBL_ORDERS         COS_PGTBL_ORDER_PTE, COS_PGTBL_ORDER_PGD
+#define COS_PGTBL_ORDER2POS /* 0/1B    1/2B    2/4B    3/8B   4/16B   5/32B   6/64B  7/128B  8/256B  9/512B */ \
+				-1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+		  	    /* 10/1K   11/2K   12/4K   13/8K  14/16K  15/32K  16/64K 17/128K 18/256K 19/512K */ \
+		  		-1,     -1,      0,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+		  	    /* 20/1M   21/2M   22/4M   23/8M  24/16M  25/32M  26/64M 27/128M 28/256M 29/512M */ \
+		  		 1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+  		  	    /* 30/1G   31/2G */ \
+		  		-1,     -1 \
+
+#endif /* COS_CONFIG_H */
diff --git a/src/platform/armv7a/chal/shared/util.h b/src/platform/armv7a/chal/shared/util.h
new file mode 100644
index 0000000000..734da638ff
--- /dev/null
+++ b/src/platform/armv7a/chal/shared/util.h
@@ -0,0 +1,141 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+#define CAS_SUCCESS 1
+
+#define CAV7_SFR(base, offset) (*((volatile unsigned long *)((unsigned long)((base) + (offset)))))
+
+/* Basic assembly for Cortex-A */
+static inline unsigned long
+cos_ldrexw(volatile unsigned long *addr)
+{
+	unsigned long result;
+	__asm__ __volatile__ ("ldrex %0, %1" : "=r" (result) : "Q" (*addr) );
+	return(result);
+}
+
+static inline unsigned long
+cos_strexw(unsigned long value, volatile unsigned long *addr)
+{
+	unsigned long result;
+	__asm__ __volatile__ ("strex %0, %2, %1" : "=&r" (result), "=Q" (*addr) : "r" (value) );
+	return(result);
+}
+
+
+static inline void
+cos_clrex(void)
+{
+	__asm__ __volatile__ ("clrex" ::: "memory");
+}
+
+/*
+ * Return values:
+ * 0 on failure due to contention (*target != old)
+ * 1 otherwise (*target == old -> *target = updated)
+ */
+static inline int 
+cos_cas(unsigned long *target, unsigned long old, unsigned long updated)
+{
+	unsigned long oldval, res;
+
+	do {
+		oldval=cos_ldrexw(target);
+
+		if(oldval==old) /* 0=succeeded, 1=failed */
+			res=cos_strexw(updated, target);
+		else {
+			cos_clrex();
+			return 0;
+		}
+	}
+	while(res);
+
+	return 1;
+}
+
+/*
+ * Return values:
+ * 0 on failure due to contention (*target != old)
+ * 1 otherwise (*target == old -> *target = updated)
+ */
+static inline int 
+cos_cas_32(unsigned long *target, unsigned long old, unsigned long updated)
+{
+	unsigned long oldval, res;
+
+	do {
+		oldval=cos_ldrexw(target);
+
+		if(oldval==old) /* 0=succeeded, 1=failed */
+			res=cos_strexw(updated, target);
+		else {
+			cos_clrex();
+			return 0;
+		}
+	}
+	while(res);
+
+	return 1;
+}
+
+/*
+ * Fetch-and-add implementation on Cortex-A. Returns the original value.
+ */
+static inline int 
+cos_faa(int *var, int value)
+{
+	unsigned int res;
+	int oldval;
+
+	do {
+		oldval=(int)cos_ldrexw((volatile unsigned long*)var);
+		res=cos_strexw((unsigned long)(oldval+value), (volatile unsigned long*)var);
+	}
+	while(res);
+
+	return oldval;
+}
+
+/* Cortex-A isb instruction barrier. */
+static inline void
+cos_inst_bar(void)
+{
+	__asm__ __volatile__("isb":::);
+}
+
+#ifndef rdtscll
+static inline unsigned long long __rdtscll(void)
+{
+	/* Global timer base */
+	#define CAV7_GTMR_BASE           0xF8F00200
+	/* Global timer registers */
+	#define CAV7_GTMR_GTCNTRL            CAV7_SFR(CAV7_GTMR_BASE,0x0000)
+	#define CAV7_GTMR_GTCNTRH            CAV7_SFR(CAV7_GTMR_BASE,0x0004)
+	#define CAV7_GTMR_GTCTLR             CAV7_SFR(CAV7_GTMR_BASE,0x0008)
+
+	unsigned long tsc_h_first;
+	unsigned long tsc_h_second;
+	unsigned long tsc_l;
+	unsigned long long tsc;
+
+	do {
+		tsc_h_first = CAV7_GTMR_GTCNTRH;
+		tsc_l = CAV7_GTMR_GTCNTRL;
+		tsc_h_second = CAV7_GTMR_GTCNTRH;
+	}
+	while (tsc_h_first != tsc_h_second);
+
+	tsc = tsc_h_first;
+	tsc <<= 32;
+	tsc += tsc_l;
+
+	return tsc<<1;
+}
+#define rdtscll(val) do {			\
+			val=__rdtscll();	\
+		     } while(0)
+
+#endif
+
+#endif
diff --git a/src/platform/armv7a/chal_asm_inc.h b/src/platform/armv7a/chal_asm_inc.h
new file mode 100644
index 0000000000..0ea13bae56
--- /dev/null
+++ b/src/platform/armv7a/chal_asm_inc.h
@@ -0,0 +1,16 @@
+/* Segment selectors for the GDT */
+#define SEL_RPL_USR 0x3
+
+#define SEL_NULL 0x00
+#define SEL_KCSEG 0x08                 /* Kernel code selector. */
+#define SEL_KDSEG 0x10                 /* Kernel data selector. */
+#define SEL_UCSEG (0x18 | SEL_RPL_USR) /* User code selector. */
+#define SEL_UDSEG (0x20 | SEL_RPL_USR) /* User data selector. */
+#define SEL_TSS 0x28                   /* Task-state segment. */
+#define SEL_UGSEG (0x30 | SEL_RPL_USR) /* User TLS selector. */
+#define SEL_CNT 7                      /* Number of segments. */
+
+#define STK_INFO_SZ 104                /* sizeof(struct cos_cpu_local_info) */
+#define STK_INFO_OFF (STK_INFO_SZ + 4) /* sizeof(struct cos_cpu_local_info) + sizeof(long) */
+
+#define SMP_BOOT_PATCH_ADDR 0x70000
diff --git a/src/platform/armv7a/chal_cpu.h b/src/platform/armv7a/chal_cpu.h
new file mode 100644
index 0000000000..ecfa93d486
--- /dev/null
+++ b/src/platform/armv7a/chal_cpu.h
@@ -0,0 +1,58 @@
+#ifndef CHAL_CPU_H
+#define CHAL_CPU_H
+
+#include <pgtbl.h>
+#include <thd.h>
+
+
+static void
+chal_cpu_pgtbl_activate(pgtbl_t pgtbl)
+{
+	paddr_t ttbr0 = chal_va2pa(pgtbl) | 0x4a;
+
+	asm volatile("mcr p15, 0, %0, c2, c0, 0" :: "r" (ttbr0));
+	asm volatile("mcr p15, 0, %0, c8, c7, 0" :: "r" (0)); /* TLBIALL */
+}
+
+extern void sysenter_entry(void);
+
+static void
+chal_cpu_init(void)
+{
+}
+
+static inline vaddr_t
+chal_cpu_fault_vaddr(struct pt_regs *r)
+{
+	return 0;
+}
+
+/* FIXME: I doubt these flags are really the same as the PGTBL_* macros */
+static inline u32_t
+chal_cpu_fault_errcode(struct pt_regs *r)
+{
+	return r->r0;
+}
+
+static inline u32_t
+chal_cpu_fault_ip(struct pt_regs *r)
+{
+	return r->r15_pc;
+}
+
+extern void __cos_enter_user_mode(void *ip, u32_t id);
+
+static inline void
+chal_user_upcall(void *ip, u16_t tid, u16_t cpuid)
+{
+	/* Now we need to go into the user-level. Need to load something to
+	 * there for execution. We can use mbooter to have a try.
+	 * Now the timers are not hooked. After all it can be considered to be
+	 * incorrect because the RDTSC issue and timer reprogramming.
+	 * We must use the global timer instead. */
+	__cos_enter_user_mode(ip, (((unsigned long)cpuid) << 16) | tid);
+}
+
+void chal_timer_thd_init(struct thread *t);
+
+#endif /* CHAL_CPU_H */
diff --git a/src/platform/armv7a/chal_pgtbl.c b/src/platform/armv7a/chal_pgtbl.c
new file mode 100644
index 0000000000..ca3c6b0e3d
--- /dev/null
+++ b/src/platform/armv7a/chal_pgtbl.c
@@ -0,0 +1,934 @@
+/**
+ * Copyright 2018 by Runyu Pan, panrunyu@gwu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ * For ARM Cortex-A v7, the page table can span 4 pages. This is a
+ * problem, and we are forced to use TTBR1 to reduce the page table
+ * size to fit in a single page. Thus, the user VA is restricted to
+ * 0x00000000 - 0x3FFFFFFF, and the kernel VA is restricted to
+ * 0xC0000000 - 0xFFFFFFFF. It might be possible to lift these
+ * restrictions in the future after we allow a kernel object to be
+ * larger than a single page.
+ */
+#include "shared/cos_types.h"
+#include "captbl.h"
+#include "pgtbl.h"
+#include "cap_ops.h"
+#include "liveness_tbl.h"
+#include "retype_tbl.h"
+#include "chal/chal_proto.h"
+#include "chal_pgtbl.h"
+
+/* The memory information to fill in as the initial page table - This
+ * is only used during the booting phase. We will map everything
+ * as an identical mapping to the kernel space and the user space.
+ * TTBR0 and TTBR1 will point to the same page table at this point.
+ * We will always set the access flag because that can cause an access
+ * fault. This is very bad; we are letting this go.
+ * 0x00000000 -> 0x00000000 0x400 pages, user-level
+ * 0x00000000 -> 0x80000000 0x800 pages, kernel */
+#define CAV7_MEM_ENTRIES (5 * 4U + 1U) * 4U
+#define CAV7_MEM_CONTENTS                                                                                             \
+	/* Number of entries */                                                                                       \
+	CAV7_MEM_ENTRIES, /* Start_PA    Start_VA    Num             Attributes   0xc02      */                       \
+	  0x00000000, 0x00000000, 0x400, CAV7_1M_USER_DEF /* User memory - 1008 MB DDR2 SDRAM identically mapped */,  \
+	  0x40000000, 0x40000000, 0x400, CAV7_1M_USER_SEQ /* Kernel devices - 512MB device space */, 0x00000000,      \
+	  0x80000000, 0x400, CAV7_1M_KERN_DEF /* Kernel memory - 1023MB DDR2 SDRAM */, 0x40100000, 0xC0100000, 0x1FF, \
+	  CAV7_1M_USER_SEQ /* Kernel devices - 512MB device space */, 0xE0000000, 0xE0000000, 0x200,                  \
+	  CAV7_1M_USER_SEQ /* Kernel devices - 512MB Cortex device space */
+
+unsigned long cos_cav7_mem_info[CAV7_MEM_ENTRIES] = {CAV7_MEM_CONTENTS};
+
+//0x00000000, 0xC0000000, 0x1,   CAV7_1M_KERN_DEF /* Kernel memory - 192kB OCSRAM */,
+/* Convert the flags from composite standard to ARM standard */
+unsigned long
+chal_pgtbl_flag_cos2nat_1M(unsigned long input)
+{
+	unsigned long output = CAV7_1M_ACCESS | CAV7_1M_SHAREABLE | CAV7_1M_USER;
+
+	if ((input & PGTBL_PRESENT) != 0) output |= CAV7_1M_PAGE_PRESENT;
+	if ((input & PGTBL_WRITABLE) == 0) output |= CAV7_1M_READONLY;
+	if ((input & PGTBL_WT) == 0) output |= CAV7_1M_BUFFERABLE;
+	if ((input & PGTBL_NOCACHE) == 0) output |= CAV7_1M_CACHEABLE;
+	if ((input & PGTBL_GLOBAL) == 0) output |= CAV7_1M_NOTGLOBAL;
+
+	/* Convert composite specific bits */
+	if ((input & PGTBL_COSFRAME) != 0) output |= CAV7_PGTBL_COSFRAME;
+	if ((input & PGTBL_COSKMEM) != 0) output |= CAV7_PGTBL_COSKMEM;
+	if ((input & PGTBL_QUIESCENCE) != 0) output |= CAV7_PGTBL_QUIESCENCE;
+
+	return output;
+}
+
+/* Convert the flags from composite standard to ARM standard */
+unsigned long
+chal_pgtbl_flag_cos2nat_4K(unsigned long input)
+{
+	unsigned long output = CAV7_4K_ACCESS | CAV7_4K_SHAREABLE | CAV7_4K_USER;
+
+	if ((input & PGTBL_PRESENT) != 0) output |= CAV7_4K_PAGE_PRESENT;
+	if ((input & PGTBL_WRITABLE) == 0) output |= CAV7_4K_READONLY;
+	if ((input & PGTBL_WT) == 0) output |= CAV7_4K_BUFFERABLE;
+	if ((input & PGTBL_NOCACHE) == 0) output |= CAV7_4K_CACHEABLE;
+	if ((input & PGTBL_GLOBAL) == 0) output |= CAV7_4K_NOTGLOBAL;
+
+	/* Convert composite specific bits */
+	if ((input & PGTBL_COSFRAME) != 0) output |= CAV7_PGTBL_COSFRAME;
+	if ((input & PGTBL_COSKMEM) != 0) output |= CAV7_PGTBL_COSKMEM;
+	if ((input & PGTBL_QUIESCENCE) != 0) output |= CAV7_PGTBL_QUIESCENCE;
+
+	return output;
+}
+
+unsigned long
+chal_pgtbl_flag_nat2cos_1M(unsigned long input)
+{
+	unsigned long output = PGTBL_SUPER | PGTBL_USER;
+
+	if ((input & CAV7_1M_PAGE_PRESENT) != 0) output |= PGTBL_PRESENT;
+	if ((input & CAV7_1M_READONLY) == 0) output |= PGTBL_WRITABLE;
+	if ((input & CAV7_1M_BUFFERABLE) == 0) output |= PGTBL_WT;
+	if ((input & CAV7_1M_CACHEABLE) == 0) output |= PGTBL_NOCACHE;
+	if ((input & CAV7_1M_NOTGLOBAL) == 0) output |= PGTBL_GLOBAL;
+
+	/* Convert composite specific bits */
+	if ((input & CAV7_1M_PAGE_PRESENT) == 0) {
+		/* When not present, this serves as cosframe */
+		if ((input & CAV7_PGTBL_COSFRAME) != 0) output |= PGTBL_COSFRAME;
+	}
+	if ((input & CAV7_PGTBL_COSKMEM) != 0) output |= PGTBL_COSKMEM;
+	if ((input & CAV7_PGTBL_QUIESCENCE) != 0) output |= PGTBL_QUIESCENCE;
+
+	return output;
+}
+
+unsigned long
+chal_pgtbl_flag_nat2cos_4K(unsigned long input)
+{
+	unsigned long output = PGTBL_USER;
+
+	if ((input & CAV7_4K_PAGE_PRESENT) != 0) output |= PGTBL_PRESENT;
+	if ((input & CAV7_4K_READONLY) == 0) output |= PGTBL_WRITABLE;
+	if ((input & CAV7_4K_BUFFERABLE) == 0) output |= PGTBL_WT;
+	if ((input & CAV7_4K_CACHEABLE) == 0) output |= PGTBL_NOCACHE;
+	if ((input & CAV7_4K_NOTGLOBAL) == 0) output |= PGTBL_GLOBAL;
+
+	/* Convert composite specific bits */
+	if ((input & CAV7_4K_PAGE_PRESENT) == 0) {
+		/* When not present, this serves as cosframe */
+		if ((input & CAV7_PGTBL_COSFRAME) != 0) output |= PGTBL_COSFRAME;
+	}
+	if ((input & CAV7_PGTBL_COSKMEM) != 0) output |= PGTBL_COSKMEM;
+	if ((input & CAV7_PGTBL_QUIESCENCE) != 0) output |= PGTBL_QUIESCENCE;
+
+	return output;
+}
+
+/*
+ * These functions do flag operations - no superpage support is included because
+ * the pages are indistinguishable from each other by only looking at the entry itself
+ */
+unsigned long
+chal_pgtbl_flag_add(unsigned long input, pgtbl_flags_t flags)
+{
+	unsigned long output;
+
+	output = chal_pgtbl_flag_nat2cos_4K(input) | flags;
+	return chal_pgtbl_flag_cos2nat_4K(output) | CAV7_4K_PAGE_ADDR(input);
+}
+
+unsigned long
+chal_pgtbl_flag_clr(unsigned long input, pgtbl_flags_t flags)
+{
+	unsigned long output;
+
+	output = chal_pgtbl_flag_nat2cos_4K(input) & (~flags);
+	return chal_pgtbl_flag_cos2nat_4K(output) | CAV7_4K_PAGE_ADDR(input);
+}
+
+unsigned long
+chal_pgtbl_flag_exist(unsigned long input, pgtbl_flags_t flags)
+{
+	return chal_pgtbl_flag_nat2cos_4K(input) & (flags);
+}
+
+unsigned long
+chal_pgtbl_flag_all(unsigned long input, pgtbl_flags_t flags)
+{
+	return chal_pgtbl_flag_exist(input, flags) == flags;
+}
+
+unsigned long
+chal_pgtbl_frame(unsigned long input)
+{
+	return CAV7_4K_PAGE_ADDR(input);
+}
+
+unsigned long
+chal_pgtbl_flag(unsigned long input)
+{
+	return CAV7_4K_PAGE_FLAGS(input);
+}
+
+/* Perform page table walks in the ARM architecture */
+unsigned long *
+__chal_pgtbl_lkup(pgtbl_t pt, unsigned long addr)
+{
+	unsigned long *next;
+
+	if (addr >= 0x40000000) return 0;
+
+	next = (unsigned long *)(((unsigned long *)pt)[addr >> PGTBL_PGTIDX_SHIFT]);
+
+	if ((((unsigned long)next) & CAV7_1M_PGDIR_PRESENT) == 0) return 0;
+
+	next = (unsigned long *)chal_pa2va(CAV7_1M_PGTBL_ADDR((unsigned long)next));
+	return &(next[(addr >> PGTBL_PAGEIDX_SHIFT) & 0xFF]);
+}
+
+int
+chal_pgtbl_kmem_act(pgtbl_t pt, vaddr_t addr, unsigned long *kern_addr, unsigned long **pte_ret)
+{
+	struct ert_intern *pte;
+	u32_t              orig_v, new_v, accum = 0;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+
+	/* Get the pte */
+	pte = (struct ert_intern *)__chal_pgtbl_lkup(pt, addr);
+	if (unlikely(!pte)) return -ENOENT;
+	if (unlikely(__pgtbl_isnull(pte, 0, 0))) return -ENOENT;
+
+	orig_v = (u32_t)(pte->next);
+	if (unlikely(!(orig_v & CAV7_PGTBL_COSFRAME))) return -EINVAL; /* can't activate non-frames */
+	if (unlikely(orig_v & CAV7_PGTBL_COSKMEM)) return -EEXIST;     /* can't re-activate kmem frames */
+	assert(!(orig_v & CAV7_PGTBL_QUIESCENCE));
+
+	*kern_addr = (unsigned long)chal_pa2va((paddr_t)(orig_v & PGTBL_FRAME_MASK));
+	new_v      = orig_v | CAV7_PGTBL_COSKMEM;
+
+	/* pa2va (value in *kern_addr) will return NULL if the page is not kernel accessible */
+	if (unlikely(!*kern_addr)) return -EINVAL; /* cannot retype a non-kernel accessible page */
+	/* Now we can only activate 4k pages */
+	if (unlikely(retypetbl_kern_ref((void *)(new_v & PGTBL_FRAME_MASK), PAGE_ORDER))) return -EFAULT;
+
+	/*
+	 * We keep the cos_frame entry, but mark it as COSKMEM so that
+	 * we won't use it for other kernel objects.
+	 */
+	if (unlikely(cos_cas((unsigned long *)pte, orig_v, new_v) != CAS_SUCCESS)) {
+		/* restore the ref cnt. */
+		retypetbl_kern_deref((void *)(orig_v & PGTBL_FRAME_MASK), PAGE_ORDER);
+		return -ECASFAIL;
+	}
+	/*
+	 * Return the pte ptr, so that we can release the page if the
+	 * kobj activation failed later.
+	 */
+	*pte_ret = (unsigned long *)pte;
+
+	return 0;
+}
+
+int
+chal_tlb_quiescence_check(u64_t timestamp)
+{
+	int i, quiescent = 1;
+
+	/*
+	 * Did timer interrupt (which does tlb flush
+	 * periodically) happen after unmap? The periodic
+	 * flush happens on all cpus, thus only need to check
+	 * the time stamp of the current core for that case
+	 * (assuming consistent time stamp counters).
+	 */
+	if (timestamp > tlb_quiescence[get_cpuid()].last_periodic_flush) {
+		/*
+		 * If no periodic flush done yet, did the
+		 * mandatory flush happen on all cores?
+		 */
+		for (i = 0; i < NUM_CPU_COS; i++) {
+			if (timestamp > tlb_quiescence[i].last_mandatory_flush) {
+				/* no go */
+				quiescent = 0;
+				break;
+			}
+		}
+	}
+	if (quiescent == 0) {
+		printk("from cpu %d, t %llu: cpu %d last mandatory flush: %llu\n", get_cpuid(), timestamp, i,
+		       tlb_quiescence[i].last_mandatory_flush);
+		for (i = 0; i < NUM_CPU_COS; i++) {
+			printk("cpu %d: flush %llu\n", i, tlb_quiescence[i].last_mandatory_flush);
+		}
+	}
+
+	return quiescent;
+}
+
+int
+chal_cap_memactivate(struct captbl *ct, struct cap_pgtbl *pt, capid_t frame_cap, capid_t dest_pt, vaddr_t vaddr,
+                     vaddr_t order)
+{
+	unsigned long *    pte, cosframe, orig_v;
+	struct cap_header *dest_pt_h;
+	u32_t              flags;
+	int                ret;
+
+	if (unlikely(pt->lvl || (pt->refcnt_flags & CAP_MEM_FROZEN_FLAG))) return -EINVAL;
+	dest_pt_h = captbl_lkup(ct, dest_pt);
+	if (dest_pt_h->type != CAP_PGTBL) return -EINVAL;
+	if (((struct cap_pgtbl *)dest_pt_h)->lvl) return -EINVAL;
+
+	/* What is the order needed for this? */
+	if (order != PGTBL_PAGEIDX_SHIFT) return -EINVAL;
+
+	/* Only 4k pages are allowed for activation */
+	pte = __chal_pgtbl_lkup((pgtbl_t)pt->pgtbl, frame_cap);
+	if (!pte) return -EINVAL;
+	orig_v = *pte;
+
+	if (!(orig_v & CAV7_PGTBL_COSFRAME) || (orig_v & CAV7_PGTBL_COSKMEM)) return -EPERM;
+	assert(!(orig_v & CAV7_PGTBL_QUIESCENCE));
+	cosframe = orig_v & PGTBL_FRAME_MASK;
+	flags    = CAV7_4K_USER_DEF;
+
+	/* printk("cosframe %x dest pt %x vaddr %x flags %x\n", cosframe, ((struct cap_pgtbl *)dest_pt_h)->pgtbl, vaddr,
+	 * flags); */
+	ret = pgtbl_mapping_add(((struct cap_pgtbl *)dest_pt_h)->pgtbl, vaddr, cosframe, flags, order);
+	return ret;
+}
+
+int
+chal_pgtbl_activate(struct captbl *t, unsigned long cap, unsigned long capin, pgtbl_t pgtbl, u32_t lvl)
+{
+	struct cap_pgtbl *pt;
+	int               ret;
+
+	pt = (struct cap_pgtbl *)__cap_capactivate_pre(t, cap, capin, CAP_PGTBL, &ret);
+	if (unlikely(!pt)) return ret;
+	pt->pgtbl = pgtbl;
+
+	pt->refcnt_flags = 1;
+	pt->parent       = NULL; /* new cap has no parent. only copied cap has. */
+	pt->lvl          = lvl;
+	__cap_capactivate_post(&pt->h, CAP_PGTBL);
+
+	return 0;
+}
+
+int
+chal_pgtbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned long capin, livenessid_t lid,
+                      capid_t pgtbl_cap, capid_t cosframe_addr, const int root)
+{
+	struct cap_header *deact_header;
+	struct cap_pgtbl * deact_cap, *parent;
+
+	unsigned long l, old_v = 0, *pte = NULL;
+	int           ret;
+
+	deact_header = captbl_lkup(dest_ct_cap->captbl, capin);
+	if (!deact_header || deact_header->type != CAP_PGTBL) cos_throw(err, -EINVAL);
+	deact_cap = (struct cap_pgtbl *)deact_header;
+	parent    = deact_cap->parent;
+
+	l = deact_cap->refcnt_flags;
+	assert(l & CAP_REFCNT_MAX);
+
+	if ((l & CAP_REFCNT_MAX) != 1) {
+		/* We need to deact children first! */
+		cos_throw(err, -EINVAL);
+	}
+
+	if (parent == NULL) {
+		if (!root) cos_throw(err, -EINVAL);
+		/*
+		 * Last reference to the captbl page. Require pgtbl
+		 * and cos_frame cap to release the kmem page.
+		 */
+		ret = kmem_deact_pre(deact_header, t, pgtbl_cap, cosframe_addr, &pte, &old_v);
+		if (ret) cos_throw(err, ret);
+	} else {
+		/* more reference exists. */
+		if (root) cos_throw(err, -EINVAL);
+		assert(!pgtbl_cap && !cosframe_addr);
+	}
+
+	if (cos_cas((unsigned long *)&deact_cap->refcnt_flags, l, CAP_MEM_FROZEN_FLAG) != CAS_SUCCESS)
+		cos_throw(err, -ECASFAIL);
+
+	/*
+	 * deactivation success. We should either release the
+	 * page, or decrement parent cnt.
+	 */
+	if (parent == NULL) {
+		/* move the kmem to COSFRAME */
+		ret = kmem_deact_post(pte, old_v);
+		if (ret) {
+			cos_faa((int *)&deact_cap->refcnt_flags, 1);
+			cos_throw(err, ret);
+		}
+	} else {
+		cos_faa((int *)&parent->refcnt_flags, -1);
+	}
+
+	/* FIXME: this should be before the kmem_deact_post */
+	ret = cap_capdeactivate(dest_ct_cap, capin, CAP_PGTBL, lid);
+	if (ret) cos_throw(err, ret);
+
+	return 0;
+err:
+	return ret;
+}
+
+int
+chal_pgtbl_mapping_add(pgtbl_t pt, vaddr_t addr, paddr_t page, u32_t flags, u32_t order)
+{
+	int                ret = 0;
+	struct ert_intern *pte;
+	u32_t              orig_v, accum = 0;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & page) == 0);
+	assert((PGTBL_FRAME_MASK & flags) == 0);
+
+	/* Only 4k pages are allowed for activation */
+	if (order != PGTBL_PAGEIDX_SHIFT) return -EINVAL;
+
+	/* look this page up */
+	pte = (struct ert_intern *)__chal_pgtbl_lkup((pgtbl_t)pt->pgtbl, addr);
+
+	if (!pte) return -ENOENT;
+	orig_v = (u32_t)(pte->next);
+	if (orig_v & CAV7_4K_PAGE_PRESENT) return -EEXIST;
+	if (orig_v & CAV7_PGTBL_COSFRAME) return -EPERM;
+
+	/* Quiescence check */
+	ret = pgtbl_quie_check(orig_v);
+	if (ret) return ret;
+
+	/* ref cnt on the frame - always user frame. */
+	ret = retypetbl_ref((void *)page, order);
+	if (ret) return ret;
+
+	ret = __pgtbl_update_leaf(pte, (void *)(page | flags), orig_v);
+	/* restore the refcnt if necessary */
+	if (ret) retypetbl_deref((void *)page, order);
+
+	return ret;
+}
+
+int
+chal_pgtbl_cosframe_add(pgtbl_t pt, vaddr_t addr, paddr_t page, u32_t flags, u32_t order)
+{
+	struct ert_intern *pte;
+	u32_t              orig_v, accum = 0;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & page) == 0);
+	assert((PGTBL_FRAME_MASK & flags) == 0);
+
+	/*
+	 * Only 4k pages are allowed for adding currently. We will revive superpage
+	 * support if we have time.
+	 */
+	if (order != PGTBL_PAGEIDX_SHIFT) return -EINVAL;
+
+	pte = (struct ert_intern *)__chal_pgtbl_lkup((pgtbl_t)pt->pgtbl, addr);
+
+	if (!pte) return -ENOENT;
+	orig_v = (u32_t)(pte->next);
+	assert(orig_v == 0);
+
+	return __pgtbl_update_leaf(pte, (void *)(page | flags), 0);
+}
+
+/* This function updates flags of an existing mapping. */
+int
+chal_pgtbl_mapping_mod(pgtbl_t pt, vaddr_t addr, u32_t flags, u32_t *prevflags)
+{
+	/* Not used for now. TODO: add retypetbl_ref / _deref */
+
+	struct ert_intern *pte;
+	u32_t              orig_v, accum = 0;
+
+	assert(pt && prevflags);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+	assert((PGTBL_FRAME_MASK & flags) == 0);
+
+	/* get the pte */
+	pte = (struct ert_intern *)__chal_pgtbl_lkup(pt, addr);
+	if (__pgtbl_isnull(pte, 0, 0)) return -ENOENT;
+
+	orig_v = (u32_t)(pte->next);
+	/**
+	 * accum contains flags from pgd as well, so don't use it to
+	 * get prevflags.
+	 */
+	*prevflags = orig_v & PGTBL_FLAG_MASK;
+
+	/* and update the flags. */
+	return __pgtbl_update_leaf(pte, (void *)((orig_v & PGTBL_FRAME_MASK) | ((u32_t)flags & PGTBL_FLAG_MASK)),
+	                           orig_v);
+}
+
+/**
+ * When we remove a mapping, we need to link the vas to a liv_id,
+ * which tracks quiescence for us.
+ */
+int
+chal_pgtbl_mapping_del(pgtbl_t pt, vaddr_t addr, u32_t liv_id)
+{
+	int                ret;
+	struct ert_intern *pte;
+	unsigned long      orig_v, accum = 0;
+	vaddr_t            order;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+
+	/* In pgtbl, we have only 20bits for liv id. */
+	if (unlikely(liv_id >= (1 << (32 - PGTBL_PAGEIDX_SHIFT)))) return -EINVAL;
+
+	/* Liveness tracking of the unmapping VAS. */
+	ret = ltbl_timestamp_update(liv_id);
+	if (unlikely(ret)) goto done;
+
+	/* Get the PGD to see if we are deleting a superpage */
+	pte    = (struct ert_intern *)__chal_pgtbl_lkup(pt, addr);
+	orig_v = (u32_t)(pte->next);
+	if (!(orig_v & CAV7_4K_PAGE_PRESENT)) return -EEXIST;
+	if (orig_v & CAV7_PGTBL_COSFRAME) return -EPERM;
+
+	order = PAGE_ORDER;
+	ret   = __pgtbl_update_leaf(pte, (void *)((liv_id << PGTBL_PAGEIDX_SHIFT) | CAV7_PGTBL_QUIESCENCE), orig_v);
+	if (ret) cos_throw(done, ret);
+
+	/* decrement ref cnt on the frame. */
+	ret = retypetbl_deref((void *)(orig_v & PGTBL_FRAME_MASK), order);
+	if (ret) cos_throw(done, ret);
+
+done:
+	return ret;
+}
+
+/**
+ * NOTE: This just removes the mapping. NO liveness tracking! TLB
+ * flush should be taken care of separately (and carefully).
+ */
+int
+chal_pgtbl_mapping_del_direct(pgtbl_t pt, u32_t addr)
+{
+	unsigned long accum = 0, *pte = NULL;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+	pte  = __chal_pgtbl_lkup(pt, addr);
+	*pte = 0;
+	return 0;
+}
+
+int
+chal_pgtbl_mapping_scan(struct cap_pgtbl *pt)
+{
+	unsigned int i, pte, *page;
+	livenessid_t lid;
+	u64_t        past_ts;
+
+	/**
+	 * This scans the leaf level of the pgtbl and verifies
+	 * quiescence.
+	 */
+	if (pt->lvl != PGTBL_DEPTH - 1) return -EINVAL;
+
+	page = (unsigned int *)(pt->pgtbl);
+	assert(page);
+
+	for (i = 0; i < PAGE_SIZE / sizeof(int *); i++) {
+		pte = *(page + i);
+		if (pte & CAV7_4K_PAGE_PRESENT || pte & CAV7_PGTBL_COSFRAME) return -EINVAL;
+
+		if (pte & CAV7_PGTBL_QUIESCENCE) {
+			lid = pte >> PGTBL_PAGEIDX_SHIFT;
+
+			if (ltbl_get_timestamp(lid, &past_ts)) return -EFAULT;
+			if (!tlb_quiescence_check(past_ts)) return -EQUIESCENCE;
+		}
+	}
+
+	return 0;
+}
+
+/* Perform lookup to a certain level */
+void *
+chal_pgtbl_lkup_lvl(pgtbl_t pt, vaddr_t addr, u32_t *flags, u32_t start_lvl, u32_t end_lvl)
+{
+	/* We return level 1 in all cases */
+	unsigned long *next;
+
+	if (addr >= 0x40000000) return 0;
+
+	next = &(((unsigned long *)pt)[addr >> PGTBL_PGTIDX_SHIFT]);
+	/*
+	        if ((((unsigned long)next) & CAV7_1M_PGDIR_PRESENT) == 0)
+	                return 0;
+	*/
+	return next;
+}
+
+int
+chal_pgtbl_ispresent(u32_t flags)
+{
+	return flags & (CAV7_4K_PAGE_PRESENT | CAV7_PGTBL_COSFRAME);
+}
+
+unsigned long *
+chal_pgtbl_lkup(pgtbl_t pt, u32_t addr, u32_t *flags)
+{
+	unsigned long *pte;
+	/* We return level 2 only in all lookups */
+	pte    = __chal_pgtbl_lkup(pt, addr);
+	*flags = chal_pgtbl_flag_nat2cos_4K(*pte);
+	if (!pgtbl_ispresent(*flags)) return NULL;
+
+	return (unsigned long *)chal_pa2va(CAV7_4K_PAGE_ADDR(*pte));
+}
+
+unsigned long *
+chal_pgtbl_lkup_pte(pgtbl_t pt, u32_t addr, u32_t *flags)
+{
+	unsigned long *pte;
+
+	/* We return level 2 only in all lookups */
+	pte    = __chal_pgtbl_lkup(pt, addr);
+	*flags = chal_pgtbl_flag_nat2cos_4K(*pte);
+	if (!pgtbl_ispresent(*flags)) return NULL;
+
+	return pte;
+}
+
+unsigned long *
+chal_pgtbl_lkup_pgd(pgtbl_t pt, u32_t addr, u32_t *flags)
+{
+	/* We return level 1 in all cases */
+	unsigned long *next;
+
+	if (addr >= 0x40000000) return 0;
+
+	next   = &(((unsigned long *)pt)[addr >> PGTBL_PGTIDX_SHIFT]);
+	*flags = ((unsigned long)pt) & (0xFFFFFFFF << PGTBL_PGTIDX_SHIFT);
+
+	return next;
+}
+
+int
+chal_pgtbl_get_cosframe(pgtbl_t pt, vaddr_t frame_addr, paddr_t *cosframe, vaddr_t *order)
+{
+	u32_t          flags;
+	unsigned long *pte;
+	paddr_t        v;
+
+	/* What is the order of this cosframe? */
+	pte = pgtbl_lkup_pte(pt, frame_addr, &flags);
+	if (!pte) return -EINVAL;
+
+	v      = *pte;
+	*order = PAGE_ORDER;
+
+	if (!(v & CAV7_PGTBL_COSFRAME)) return -EINVAL;
+
+	*cosframe = v & PGTBL_FRAME_MASK;
+
+	return 0;
+}
+
+pgtbl_t
+chal_pgtbl_create(void *page, void *curr_pgtbl)
+{
+	pgtbl_t ret = (pgtbl_t)(page);
+
+	memset(page, 0, PAGE_SIZE);
+	/* I think the below comment (copied from boot_comp.c) applies here as well? NO? */
+	/* There's no need to copy any kernel entry into this - because we know that kernel uses TTBR1 */
+
+	return ret;
+}
+
+int
+chal_pgtbl_quie_check(u32_t orig_v)
+{
+	livenessid_t lid;
+	u64_t        ts;
+
+	if (orig_v & CAV7_PGTBL_QUIESCENCE) {
+		lid = orig_v >> PGTBL_PAGEIDX_SHIFT;
+		/*
+		 * An unmap happened at this vaddr before. We need to
+		 * make sure that all cores have done tlb flush before
+		 * creating new mapping.
+		 */
+		assert(lid < LTBL_ENTS);
+
+		if (ltbl_get_timestamp(lid, &ts)) return -EFAULT;
+		if (!tlb_quiescence_check(ts)) {
+			printk("kern tsc %llu, lid %d, last flush %llu\n", ts, lid,
+			       tlb_quiescence[get_cpuid()].last_periodic_flush);
+			return -EQUIESCENCE;
+		}
+	}
+
+	return 0;
+}
+
+void
+chal_pgtbl_init_pte(void *pte)
+{
+	int            i;
+	unsigned long *vals = pte;
+	for (i = 0; i < (1 << 8 /* (PGTBL_ENTRY_ORDER) */); i++) vals[i] = 0;
+}
+
+extern const int order2pos[];
+#define POS(order) (order2pos[order])
+#define LVL(order) (1 - POS(order))
+int
+chal_pgtbl_pgtblactivate(struct captbl *ct, capid_t cap, capid_t pt_entry, capid_t pgtbl_cap, vaddr_t kmem_cap,
+                         capid_t pgtbl_order)
+{
+	pgtbl_t        new_pt, curr_pt;
+	vaddr_t        kmem_addr = 0;
+	unsigned long *pte       = NULL;
+	int            ret;
+	unsigned long  pgtbl_lvl = 3;
+
+	ret = cap_kmem_activate(ct, pgtbl_cap, kmem_cap, (unsigned long *)&kmem_addr, &pte);
+	if (unlikely(ret)) return ret;
+	assert(kmem_addr && pte);
+
+	/* Convert order to level here */
+	pgtbl_lvl = pgtbl_order;
+
+	if (pgtbl_lvl == 0) {
+		/* PGD */
+		struct cap_pgtbl *cap_pt = (struct cap_pgtbl *)captbl_lkup(ct, pgtbl_cap);
+		if (!CAP_TYPECHK(cap_pt, CAP_PGTBL)) return -EINVAL;
+
+		curr_pt = cap_pt->pgtbl;
+		assert(curr_pt);
+
+		new_pt = pgtbl_create((void *)kmem_addr, curr_pt);
+		ret    = pgtbl_activate(ct, cap, pt_entry, new_pt, 0);
+	} else if (pgtbl_lvl == 1) {
+		/* PTE */
+		pgtbl_init_pte((void *)kmem_addr);
+		ret = pgtbl_activate(ct, cap, pt_entry, (pgtbl_t)kmem_addr, 1);
+	} else {
+		/* Not supported yet. */
+		printk("cos: warning - PGTBL level greater than 2 not supported yet. \n");
+		ret = -1;
+	}
+
+	if (ret) kmem_unalloc(pte);
+	return ret;
+}
+
+int
+chal_pgtbl_cpy(struct captbl *t, capid_t cap_to, capid_t capin_to, struct cap_pgtbl *ctfrom, capid_t capin_from,
+               cap_t cap_type, vaddr_t order)
+{
+	struct cap_header *ctto;
+	unsigned long *    f, old_v;
+	u32_t              flags;
+
+	ctto = captbl_lkup(t, cap_to);
+	if (unlikely(!ctto)) return -ENOENT;
+	if (unlikely(ctto->type != cap_type)) return -EINVAL;
+	if (unlikely(((struct cap_pgtbl *)ctto)->refcnt_flags & CAP_MEM_FROZEN_FLAG)) return -EINVAL;
+
+	/*
+	 * See what kind of delegation we are doing. There are 4 kinds of delegations:
+	 * 1. Superpage -> Smallpage [order = 12]
+	 * 2. Superpage -> Superpage [order = 22]
+	 * 3. Smallpage -> Smallpage [order = 12]
+	 * 4. Smallpage -> Superpage [prohibited]
+	 */
+	/* How big is the current page? */
+	// printk("pgtbl %x capin_from %x order %d\n",((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, order);
+	//	f = pgtbl_lkup_pgd(((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, &flags);
+	//	if (!f) return -ENOENT;
+	//	old_v = *f;
+	//
+	//	if (chal_pgtbl_flag_exist(old_v, PGTBL_SUPER)) {
+	//		flags = chal_pgtbl_flag(old_v);
+	//		if (order != SUPER_PAGE_ORDER) {
+	//			/* We need to pick a subpage */
+	//			old_v += EXTRACT_SUB_PAGE(capin_from);
+	//			flags &= (~PGTBL_SUPER);
+	//		} else {
+	//			/* If we do superpage to superpage delegation, both addresses must be aligned to 4MB
+	// boundary */ 			if ((EXTRACT_SUB_PAGE(capin_from) != 0) || (EXTRACT_SUB_PAGE(capin_to) != 0))
+	// return -EINVAL;
+	//		}
+	//	} else {
+	if (order != PAGE_ORDER) return -EINVAL;
+	f     = pgtbl_lkup_pte(((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, &flags);
+	flags = chal_pgtbl_flag_cos2nat_4K(flags);
+	if (!f) return -ENOENT;
+	old_v = *f;
+	//	}
+
+	//	printk("%d old_v %x\n",__LINE__, old_v);
+	/* Cannot copy frame, or kernel entry. */
+	if (chal_pgtbl_flag_exist(old_v, PGTBL_COSFRAME) || !chal_pgtbl_flag_exist(old_v, PGTBL_USER)) return -EPERM;
+	//	printk("%d\n",__LINE__);
+	return pgtbl_mapping_add(((struct cap_pgtbl *)ctto)->pgtbl, capin_to, old_v & PGTBL_FRAME_MASK, flags, order);
+}
+
+/* FIXME: we need to ensure TLB quiescence for pgtbl cons/decons!
+ * ct - main table capability
+ * ctsub - sub table capability
+ * expandid - address to place the subtable
+ * depth - the depth level of the subtable
+ */
+int
+chal_pgtbl_cons(struct cap_captbl *ct, struct cap_captbl *ctsub, capid_t expandid, unsigned long depth)
+{
+	u32_t          flags = 0, old_pte, new_pte, old_v, refcnt_flags;
+	unsigned long *intern;
+	int            ret = 0;
+
+	intern = pgtbl_lkup_lvl(((struct cap_pgtbl *)ct)->pgtbl, expandid, &flags, ct->lvl, depth);
+
+	if (!intern) return -ENOENT;
+	old_pte = *intern;
+
+	if (pgtbl_ispresent(old_pte)) return -EPERM;
+
+	old_v = refcnt_flags = ((struct cap_pgtbl *)ctsub)->refcnt_flags;
+	if (refcnt_flags & CAP_MEM_FROZEN_FLAG) return -EINVAL;
+	if ((refcnt_flags & CAP_REFCNT_MAX) == CAP_REFCNT_MAX) return -EOVERFLOW;
+
+	refcnt_flags++;
+	ret = cos_cas((unsigned long *)&(((struct cap_pgtbl *)ctsub)->refcnt_flags), old_v, refcnt_flags);
+	if (ret != CAS_SUCCESS) return -ECASFAIL;
+
+	new_pte = (u32_t)chal_va2pa((void *)((unsigned long)(((struct cap_pgtbl *)ctsub)->pgtbl) & PGTBL_FRAME_MASK))
+	          | CAV7_1M_INTERN_DEF;
+
+	/* printk("expandid %x, depth %x, new_pte %x\n", expandid, depth, new_pte); */
+
+	ret = cos_cas(intern, old_pte, new_pte);
+	if (ret != CAS_SUCCESS) {
+		/* decrement to restore the refcnt on failure. */
+		cos_faa((int *)&(((struct cap_pgtbl *)ctsub)->refcnt_flags), -1);
+		return -ECASFAIL;
+	} else {
+		ret = 0;
+	}
+
+	return ret;
+}
+
+int
+chal_pgtbl_decons(struct cap_header *head, struct cap_header *sub, capid_t pruneid, unsigned long lvl)
+{
+	unsigned long *intern, old_v;
+
+	struct cap_pgtbl *pt = (struct cap_pgtbl *)head;
+	u32_t             flags;
+	if (lvl <= pt->lvl) return -EINVAL;
+	intern = pgtbl_lkup_lvl(pt->pgtbl, pruneid, &flags, pt->lvl, lvl);
+
+	if (!intern) return -ENOENT;
+	old_v = *intern;
+
+	/* Is this really a pte or we are trying to decons on superpages - prohibited? */
+	if (old_v & CAV7_1M_PAGE_PRESENT) return -EINVAL;
+	if (old_v == 0) return 0; /* FIXME: old comment - return an error here? */
+	/* commit; note that 0 is "no entry" in both pgtbl and captbl */
+	if (cos_cas(intern, old_v, 0) != CAS_SUCCESS) return -ECASFAIL;
+
+	/* decrement the refcnt */
+	pt = (struct cap_pgtbl *)sub;
+	u32_t l;
+	l = pt->refcnt_flags;
+	if (l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
+	cos_faa((int *)&(pt->refcnt_flags), -1);
+
+	return 0;
+}
+
+int
+chal_pgtbl_introspect(struct cap_header *ch, vaddr_t addr)
+{
+	unsigned long *pte;
+	u32_t          flags;
+	int            ret = 0;
+	/* Is this a pte or a pgd? */
+	pte = pgtbl_lkup_pgd(((struct cap_pgtbl *)ch)->pgtbl, addr, &flags);
+	if (pte) {
+		if (chal_pgtbl_flag_exist(*pte, PGTBL_SUPER)) {
+			ret = *pte;
+		} else {
+			pte = pgtbl_lkup_pte(((struct cap_pgtbl *)ch)->pgtbl, addr, &flags);
+			if (pte) ret = *pte;
+		}
+	}
+
+	return ret;
+}
+
+int
+chal_pgtbl_deact_pre(struct cap_header *ch, u32_t pa)
+{
+	struct cap_pgtbl *deact_cap = (struct cap_pgtbl *)ch;
+	void *            page      = deact_cap->pgtbl;
+	u32_t             l         = deact_cap->refcnt_flags;
+	u64_t             curr;
+	int               ret;
+
+	if (chal_pa2va((paddr_t)pa) != page) return -EINVAL;
+
+	/* Require freeze memory and wait for quiescence
+	 * first! */
+	if (!(l & CAP_MEM_FROZEN_FLAG)) return -EQUIESCENCE;
+
+	/* Quiescence check! */
+	if (deact_cap->lvl == 0) {
+		/* top level has tlb quiescence period. */
+		if (!tlb_quiescence_check(deact_cap->frozen_ts)) return -EQUIESCENCE;
+	} else {
+		/* other levels have kernel quiescence
+		 * period. (but the mapping scan will ensure
+		 * tlb quiescence implicitly). */
+		rdtscll(curr);
+		if (!QUIESCENCE_CHECK(curr, deact_cap->frozen_ts, KERN_QUIESCENCE_CYCLES)) return -EQUIESCENCE;
+	}
+
+	/* set the scan flag to avoid concurrent scanning. */
+	if (cos_cas((unsigned long *)&deact_cap->refcnt_flags, l, l | CAP_MEM_SCAN_FLAG) != CAS_SUCCESS)
+		return -ECASFAIL;
+
+	if (deact_cap->lvl == 0) {
+		/* PGD: only scan user mapping. */
+		ret = kmem_page_scan(page, PAGE_SIZE - KERNEL_PGD_REGION_SIZE);
+	} else if (deact_cap->lvl == PGTBL_DEPTH - 1) {
+		/* Leaf level, scan mapping. */
+		ret = pgtbl_mapping_scan(deact_cap);
+	} else {
+		/* don't have this with 2-level pgtbl. */
+		ret = kmem_page_scan(page, PAGE_SIZE);
+	}
+
+	if (ret) {
+		/* unset scan and frozen bits. */
+		cos_cas((unsigned long *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG,
+		        l & ~(CAP_MEM_FROZEN_FLAG | CAP_MEM_SCAN_FLAG));
+		return ret;
+	}
+	cos_cas((unsigned long *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG, l);
+
+	return 0;
+}
diff --git a/src/platform/armv7a/chal_pgtbl.h b/src/platform/armv7a/chal_pgtbl.h
new file mode 100644
index 0000000000..e218c97b32
--- /dev/null
+++ b/src/platform/armv7a/chal_pgtbl.h
@@ -0,0 +1,151 @@
+#ifndef CHAL_PGTBL_H
+#define CHAL_PGTBL_H
+
+/* These code below are for x86 specifically, only used in x86 chal */
+typedef enum
+{
+	CAV7_1M_PGDIR_PRESENT   = 0x01U,
+	CAV7_1M_PGDIR_NOTSECURE = (1U << 3U),
+	CAV7_1M_PAGE_PRESENT    = (0x02U),
+	CAV7_1M_BUFFERABLE      = (1U << 2U),
+	CAV7_1M_CACHEABLE       = (1U << 3U),
+	CAV7_1M_EXECUTENEVER    = (1U << 4U),
+	CAV7_1M_ACCESS          = (1U << 10U),
+	CAV7_1M_USER            = (1U << 11U),
+	CAV7_1M_READONLY        = (1U << 15U),
+	CAV7_1M_SHAREABLE       = (1U << 16U),
+	CAV7_1M_NOTGLOBAL       = (1U << 17U),
+	CAV7_1M_NOTSECURE       = (1U << 19U),
+
+	CAV7_4K_EXECUTENEVER = (1U << 0U),
+	CAV7_4K_PAGE_PRESENT = (1U << 1U),
+	CAV7_4K_BUFFERABLE   = (1U << 2U),
+	CAV7_4K_CACHEABLE    = (1U << 3U),
+	CAV7_4K_ACCESS       = (1U << 4U),
+	CAV7_4K_USER         = (1U << 5U),
+	CAV7_4K_READONLY     = (1U << 9U),
+	CAV7_4K_SHAREABLE    = (1U << 10U),
+	CAV7_4K_NOTGLOBAL    = (1U << 11U),
+
+	/* Composite defined bits next - the cosframe will be there if the present is empty */
+	CAV7_PGTBL_COSFRAME = 1U << 11U,
+	/* We enabled TEX remap, thus these two bits are freed */
+	CAV7_PGTBL_COSKMEM    = 1U << 8U, /* page activated as kernel object */
+	CAV7_PGTBL_QUIESCENCE = 1U << 7U,
+	/* Flag bits done. */
+	CAV7_4K_USER_COMMON = CAV7_4K_PAGE_PRESENT | CAV7_4K_USER | CAV7_4K_SHAREABLE | CAV7_4K_NOTGLOBAL
+	                      | CAV7_4K_ACCESS,
+	CAV7_4K_USER_DEF = CAV7_4K_USER_COMMON | CAV7_4K_BUFFERABLE | CAV7_4K_CACHEABLE,
+
+	CAV7_1M_USER_COMMON = CAV7_1M_PAGE_PRESENT | CAV7_1M_USER | CAV7_1M_SHAREABLE | CAV7_1M_NOTGLOBAL
+	                      | CAV7_1M_ACCESS,
+	CAV7_1M_USER_DEF = CAV7_1M_USER_COMMON | CAV7_1M_BUFFERABLE | CAV7_1M_CACHEABLE,
+	CAV7_1M_USER_SEQ = CAV7_1M_USER_COMMON,
+
+	CAV7_1M_KERN_COMMON = CAV7_1M_PAGE_PRESENT | CAV7_1M_SHAREABLE | CAV7_1M_NOTGLOBAL | CAV7_1M_ACCESS,
+	CAV7_1M_KERN_DEF    = CAV7_1M_KERN_COMMON | CAV7_1M_BUFFERABLE | CAV7_1M_CACHEABLE,
+	CAV7_1M_KERN_SEQ    = CAV7_1M_KERN_COMMON,
+
+	CAV7_1M_INTERN_DEF = CAV7_1M_PGDIR_PRESENT,
+} pgtbl_flags_cav7_t;
+
+/* MMU definitions operation flags, assuming the following changes:
+ * TTBCR=2 : TTBR0 use 1GB,
+ * SCTLR.AFE=1 : AP[2:1] is the permission flags, AP[0] is now the access flag.
+ * DACR=0x55555555 : All pages/tables are client and access permissions always checked. 0xFFFFFFFF not checked,
+ * SCTLR.TRE=1 : TEX remap engaged, CACHEABLE and BUFFERABLE works as currently defined.
+ *               {MSB TEX[0], C, B LSB} will index PRRR and NMRR.
+ * PRRR=0b 00 00 00 00 00 00 10 10 00 00 00 00 10 10 01 00=0x000A00A4
+ *         OUTER_SHARE PTBL_DECIDE xx xx xx xx CB C- -B --
+ *      In PRRR configuration, shareability is decided by the page table. This
+ *      facilitates cache-incoherent user-level systems. Also, if the memory
+ *      is shareable, then it is both inner and outer shareable.
+ * NMRR=0b 00 00 00 00 01 10 11 00 00 00 00 00  01 10 11 00=0x006C006C
+ *         xx xx xx xx CB C- -B -- xx xx xx xx  CB C- -B --
+ * -- : Non-cacheable non-bufferable - strongly ordered, caching not allowed at all
+ * -B : Non-cacheable bufferable - device, write-back without write-allocate (since
+ *      reads will still have to load words from memory)
+ * C- : Cacheable non-bufferable - normal, write-through without write allocate
+ * CB : Cachaable bufferable - normal memory, write-back, write-allocate */
+
+#define CAV7_4G_PGTBL_ADDR(X) ((X)&0xFFFFF000U)
+#define CAV7_1M_PGTBL_ADDR(X) ((X)&0xFFFFFC00U)
+#define CAV7_1M_PAGE_ADDR(X) ((X)&0xFFF00000U)
+#define CAV7_4K_PAGE_ADDR(X) ((X)&0xFFFFF000U)
+#define CAV7_4K_PAGE_FLAGS(X) ((X)&0x00000FFFU)
+
+#define CAV7_PGFLG_1M_COS2NAT(X) (CAV7_Pgflg_1M_COS2NAT[X])
+#define CAV7_PGFLG_1M_PREPROC(X)                                                                             \
+	((((X)&CAV7_1M_READONLY) >> 12) | (((X)&CAV7_1M_EXECUTENEVER) >> 2) | (((X)&CAV7_1M_CACHEABLE) >> 2) \
+	 | (((X)&CAV7_1M_BUFFERABLE) >> 2))
+#define CAV7_PGFLG_1M_NAT2COS(X) (CAV7_Pgflg_1M_NAT2COS[CAV7_PGFLG_1M_PREPROC(X)])
+
+#define CAV7_PGFLG_4K_RME2NAT(X) (CAV7_Pgflg_4K_RME2NAT[X])
+#define CAV7_PGFLG_4K_PREPROC(X)                                                                          \
+	((((X)&CAV7_4K_READONLY) >> 6) | (((X)&CAV7_4K_CACHEABLE) >> 1) | (((X)&CAV7_4K_BUFFERABLE) >> 1) \
+	 | (((X)&CAV7_4K_EXECUTENEVER) >> 0))
+#define CAV7_PGFLG_4K_NAT2RME(X) (CAV7_Pgflg_4K_NAT2RME[CAV7_4K_PREPROC(X)])
+
+/**
+ * We only need to do mapping_add at boot time to add all physical
+ * memory to the pgtbl of llboot. After that, we only need to do copy
+ * from llboot pgtbl to other pgtbls. Thus, when adding to pgtbl, we
+ * use physical addresses; when doing copy, we don't need to worry
+ * about PA.
+ */
+
+/* v should include the desired flags */
+static inline int
+__pgtbl_setleaf(struct ert_intern *a, void *v)
+{
+	u32_t new, old;
+	old = (u32_t)(a->next);
+	new = (u32_t)(v);
+
+	if (!cos_cas((unsigned long *)a, old, new)) return -ECASFAIL;
+
+	return 0;
+}
+
+/**
+ * This takes an input parameter as the old value of the mapping. Only
+ * update when the existing value matches.
+ */
+static inline int
+__pgtbl_update_leaf(struct ert_intern *a, void *v, u32_t old)
+{
+	u32_t new;
+
+	new = (u32_t)(v);
+	if (!cos_cas((unsigned long *)a, old, new)) return -ECASFAIL;
+	/* printk("old %x, new %x, addr %x\n", old, new, a); */
+	return 0;
+}
+
+static int
+__pgtbl_isnull(struct ert_intern *a, void *accum, int isleaf)
+{
+	(void)isleaf;
+	(void)accum;
+	return !(((u32_t)(a->next)) & (CAV7_1M_PAGE_PRESENT | CAV7_PGTBL_COSFRAME));
+}
+
+static int
+__pgtbl_resolve(struct ert_intern *a, void *accum, int leaf, u32_t order, u32_t sz)
+{
+	(void)a;
+	(void)leaf;
+	(void)order;
+	(void)sz;
+	*(u32_t *)accum = (((u32_t)a->next) & PGTBL_FLAG_MASK);
+	return 1;
+}
+
+static void
+__pgtbl_init(struct ert_intern *a, int isleaf)
+{
+	(void)isleaf;
+	a->next = NULL;
+}
+
+#endif /* CHAL_PGTBL_H */
diff --git a/src/platform/armv7a/div.c b/src/platform/armv7a/div.c
new file mode 100644
index 0000000000..8436435a35
--- /dev/null
+++ b/src/platform/armv7a/div.c
@@ -0,0 +1,61 @@
+typedef unsigned int su_int;
+typedef signed int   si_int;
+#define CHAR_BIT 8
+
+si_int
+__divsi3(si_int a, si_int b)
+{
+	const int bits_in_word_m1 = (int)(sizeof(si_int) * CHAR_BIT) - 1;
+	si_int    s_a             = a >> bits_in_word_m1; // s_a = a < 0 ? -1 : 0
+	si_int    s_b             = b >> bits_in_word_m1; // s_b = b < 0 ? -1 : 0
+	a                         = (a ^ s_a) - s_a;      // negate if s_a == -1
+	b                         = (b ^ s_b) - s_b;      // negate if s_b == -1
+	s_a ^= s_b;                                       // sign of quotient
+	//
+	// On CPUs without unsigned hardware division support,
+	//  this calls __udivsi3 (notice the cast to su_int).
+	// On CPUs with unsigned hardware division support,
+	//  this uses the unsigned division instruction.
+	//
+	return ((su_int)a / (su_int)b ^ s_a) - s_a; // negate if s_a == -1
+}
+
+su_int
+__udivsi3(su_int n, su_int d)
+{
+	const unsigned n_uword_bits = sizeof(su_int) * CHAR_BIT;
+	su_int         q;
+	su_int         r;
+	unsigned       sr;
+	// special cases
+	if (d == 0) return 0; // ?!
+	if (n == 0) return 0;
+	sr = __builtin_clz(d) - __builtin_clz(n);
+	// 0 <= sr <= n_uword_bits - 1 or sr large
+	if (sr > n_uword_bits - 1) // d > r
+		return 0;
+	if (sr == n_uword_bits - 1) // d == 1
+		return n;
+	++sr;
+	// 1 <= sr <= n_uword_bits - 1
+	// Not a special case
+	q            = n << (n_uword_bits - sr);
+	r            = n >> sr;
+	su_int carry = 0;
+	for (; sr > 0; --sr) {
+		// r:q = ((r:q)  << 1) | carry
+		r = (r << 1) | (q >> (n_uword_bits - 1));
+		q = (q << 1) | carry;
+		// carry = 0;
+		// if (r.all >= d.all)
+		// {
+		//      r.all -= d.all;
+		//      carry = 1;
+		// }
+		const si_int s = (si_int)(d - r - 1) >> (n_uword_bits - 1);
+		carry          = s & 1;
+		r -= d & s;
+	}
+	q = (q << 1) | carry;
+	return q;
+}
diff --git a/src/platform/armv7a/irq.c b/src/platform/armv7a/irq.c
new file mode 100644
index 0000000000..98abdf3fab
--- /dev/null
+++ b/src/platform/armv7a/irq.c
@@ -0,0 +1,237 @@
+#include <chal.h>
+#include <shared/cos_types.h>
+#include "kernel.h"
+#include "mem_layout.h"
+#include "chal_cpu.h"
+#include "irq.h"
+
+/* Base of registers */
+/* What is the interrupt priority grouping? */
+#define CAV7_GIC_GROUPING CAV7_GIC_GROUPING_P7S1
+/* GIC distributor base address */
+#define CAV7_GICD_BASE 0xF8F01000
+/* GIC CPU interface base address */
+#define CAV7_GICC_BASE 0xF8F00100
+/* Private timer and watchdog block base */
+#define CAV7_PTWD_BASE 0xF8F00600
+
+/* Macro definitions for timers and interrupt controllers */
+/* GIC definitions - This is only present in MPCore platform. Most Cortex-A9s,
+ * all Cortex-A7s and Cortex-A5s are on the multicore platform */
+/* Distributor control register */
+#define CAV7_GICD_CTLR CAV7_SFR(CAV7_GICD_BASE, 0x0000)
+#define CAV7_GICD_CTLR_GRP1EN (1U << 1U)
+#define CAV7_GICD_CTLR_GRP0EN (1U << 0U)
+/* Interrupt controller type register */
+#define CAV7_GICD_TYPER CAV7_SFR(CAV7_GICD_BASE, 0x0004)
+/* Distributor implementer identification register */
+#define CAV7_GICD_IIDR CAV7_SFR(CAV7_GICD_BASE, 0x0008)
+/* Interrupt group registers */
+#define CAV7_GICD_IGROUPR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0080 + (x)*4) /* 0-31 */
+/* Interrupt enabling registers */
+#define CAV7_GICD_ISENABLER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0100 + (x)*4) /* 0-31 */
+/* Interrupt disabling registers */
+#define CAV7_GICD_ICENABLER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0180 + (x)*4) /* 0-31 */
+/* Interrupt set-pending registers */
+#define CAV7_GICD_ISPENDR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0200 + (x)*4) /* 0-31 */
+/* Interrupt clear-pending registers */
+#define CAV7_GICD_ICPENDR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0280 + (x)*4) /* 0-31 */
+/* Interrupt set-active registers */
+#define CAV7_GICD_ISACTIVER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0300 + (x)*4) /* 0-31 */
+/* Interrupt clear-active registers */
+#define CAV7_GICD_ICACTIVER(x) CAV7_SFR(CAV7_GICD_BASE, 0x0380 + (x)*4) /* 0-31 */
+/* Interrupt priority registers */
+#define CAV7_GICD_IPRIORITYR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0400 + (x)*4) /* 0-254 */
+/* Interrupt processor targets registers */
+#define CAV7_GICD_ITARGETSR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0800 + (x)*4) /* 0-7 */
+/* Interrupt configuration registers */
+#define CAV7_GICD_ICFGR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0C00 + (x)*4) /* 0-63 */
+/* Non-secure access control registers */
+#define CAV7_GICD_NSACR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0E00 + (x)*4) /* 0-63 */
+/* Software generated interrupt register */
+#define CAV7_GICD_SGIR CAV7_SFR(CAV7_GICD_BASE, 0x0F00)
+/* SGI clear-pending registers */
+#define CAV7_GICD_CPENDSGIR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0F10 + (x)*4) /* 0-3 */
+/* SGI set-pending registers */
+#define CAV7_GICD_SPENDSGIR(x) CAV7_SFR(CAV7_GICD_BASE, 0x0F20 + (x)*4) /* 0-3 */
+
+/* CPU interface control register */
+#define CAV7_GICC_CTLR CAV7_SFR(CAV7_GICC_BASE, 0x0000)
+/* Interrupt priority mask register */
+#define CAV7_GICC_PMR CAV7_SFR(CAV7_GICC_BASE, 0x0004)
+/* Binary pointer register */
+#define CAV7_GICC_BPR CAV7_SFR(CAV7_GICC_BASE, 0x0004)
+/* Interrupt acknowledge register */
+#define CAV7_GICC_IAR CAV7_SFR(CAV7_GICC_BASE, 0x000C)
+/* End of interrupt register */
+#define CAV7_GICC_EOIR CAV7_SFR(CAV7_GICC_BASE, 0x0010)
+/* Running priority register */
+#define CAV7_GICC_RPR CAV7_SFR(CAV7_GICC_BASE, 0x0014)
+/* Highest priority pending interrupt register */
+#define CAV7_GICC_HPPIR CAV7_SFR(CAV7_GICC_BASE, 0x0018)
+/* Aliased binary point register */
+#define CAV7_GICC_ABPR CAV7_SFR(CAV7_GICC_BASE, 0x001C)
+/* Aliased interrupt acknowledge register */
+#define CAV7_GICC_AIAR CAV7_SFR(CAV7_GICC_BASE, 0x0020)
+/* Aliased end of interrupt register */
+#define CAV7_GICC_AEOIR CAV7_SFR(CAV7_GICC_BASE, 0x0024)
+/* Aliased highest priority pending interrupt register */
+#define CAV7_GICC_AHPPIR CAV7_SFR(CAV7_GICC_BASE, 0x0028)
+/* Active priorities registers */
+#define CAV7_GICC_APR(x) CAV7_SFR(CAV7_GICC_BASE, 0x00D0 + (x)*4) /* 0-3 */
+/* Non-secure active priorities registers */
+#define CAV7_GICC_NSAPR(x) CAV7_SFR(CAV7_GICC_BASE, 0x00E0 + (x)*4) /* 0-3 */
+/* CPU interface identification register */
+#define CAV7_GICC_IIDR CAV7_SFR(CAV7_GICC_BASE, 0x00FC)
+/* Deactivate interrupt register */
+#define CAV7_GICC_DIR CAV7_SFR(CAV7_GICC_BASE, 0x1000)
+
+/* Control register */
+#define CAV7_GICC_CBPR (1U << 4U)
+#define CAV7_GICC_FIQEN (1U << 3U)
+#define CAV7_GICC_ACKCTL (1U << 2U)
+#define CAV7_GICC_ENABLEGRP1 (1U << 1U)
+#define CAV7_GICC_ENABLEGRP0 (1U << 0U)
+
+/* Priority grouping */
+#define CAV7_GIC_GROUPING_P7S1 (0U)
+#define CAV7_GIC_GROUPING_P6S2 (1U)
+#define CAV7_GIC_GROUPING_P5S3 (2U)
+#define CAV7_GIC_GROUPING_P4S4 (3U)
+#define CAV7_GIC_GROUPING_P3S5 (4U)
+#define CAV7_GIC_GROUPING_P2S6 (5U)
+#define CAV7_GIC_GROUPING_P1S7 (6U)
+#define CAV7_GIC_GROUPING_P0S8 (7U)
+
+void
+__cos_cav7_int_local_init(void)
+{
+	/* Priority grouping */
+	CAV7_GICC_BPR = CAV7_GIC_GROUPING;
+
+	/* Enable all interrupts to this interface - FIQ is bypassed, and all
+	 * interrupts go through the IRQ. The FIQ feature is only available on
+	 * the standalone FIQ interrupt line */
+	CAV7_GICC_CTLR = CAV7_GICC_ENABLEGRP0;
+
+	/* No interrupts are masked - This must be set at last because enabling
+	 * will trash the contents of this register if previously set. To maintain
+	 * compatibility across all possible implementations, no priority level
+	 * lower than 0xF0 will be considered valid */
+	CAV7_GICC_PMR = 0xF0U;
+}
+
+void
+__cos_cav7_timer_init(void)
+{
+	/* Do nothing - we will initialize the timer in another function */
+}
+
+void
+__cos_cav7_int_init(void)
+{
+	unsigned long temp;
+	unsigned long lines;
+
+	/* Who implemented the GIC, what variant, how many interrupts? */
+	temp = CAV7_GICD_IIDR;
+	printk("CAV7-GIC - ProductID: %d, Variant: %d, Revision: %d, Implementer: 0x%x\r\n", temp >> 24,
+	       (temp >> 20) & 0xF, (temp >> 12) & 0xF, temp & 0xFFF);
+
+	/* How many locked SPIs, security extension enabled or not, number of
+	 * actual CPUs and interrupt lines */
+	temp  = CAV7_GICD_TYPER;
+	lines = ((temp & 0x1F) + 1) * 32;
+	printk("CAV7-GIC - SPI number: %d, Security extension: %d, CPU number: %d, Interrupt line number: %d\r\n",
+	       temp >> 16, (temp >> 10) & 0x1, ((temp >> 5) & 0x7) + 1, lines);
+
+	/* Initialize all vectors to group 0, and disable all */
+	for (temp = 0; temp < lines / 32; temp++) {
+		CAV7_GICD_ICPENDR(temp)   = 0xFFFFFFFFU;
+		CAV7_GICD_IGROUPR(temp)   = 0x00000000U;
+		CAV7_GICD_ICENABLER(temp) = 0xFFFFFFFFU;
+	}
+
+	/* Set the priority of all such interrupts to the lowest level */
+	for (temp = 0; temp < lines / 4; temp++) CAV7_GICD_IPRIORITYR(temp) = 0xA0A0A0A0U;
+
+	/* All interrupts target CPU0 */
+	for (temp = 8; temp < lines / 4; temp++) CAV7_GICD_ITARGETSR(temp) = 0x01010101U;
+
+	/* All interrupts are edge triggered, and use 1-N model */
+	for (temp = 0; temp < lines / 16; temp++) CAV7_GICD_ICFGR(temp) = 0x55555555U;
+
+	/* Enable the interrupt controller */
+	CAV7_GICD_CTLR = CAV7_GICD_CTLR_GRP1EN | CAV7_GICD_CTLR_GRP0EN;
+
+	/* Initialize the core-local interrupt controller */
+	__cos_cav7_int_local_init();
+}
+
+/* Private timer and watchdog block base */
+#define CAV7_PTWD_BASE 0xF8F00600
+
+/* Macro definitions for timers and interrupt controllers */
+#define CAV7_SFR(base, offset) (*((volatile unsigned long *)((unsigned long)((base) + (offset)))))
+
+/* Timer definitions */
+/* Private timer load register */
+#define CAV7_PTWD_PTLR CAV7_SFR(CAV7_PTWD_BASE, 0x0000)
+/* Private timer counter register */
+#define CAV7_PTWD_PTCNTR CAV7_SFR(CAV7_PTWD_BASE, 0x0004)
+/* Private timer control register */
+#define CAV7_PTWD_PTCTLR CAV7_SFR(CAV7_PTWD_BASE, 0x0008)
+#define CAV7_PTWD_PTCTLR_PRESC(x) ((x) << 8U)
+#define CAV7_PTWD_PTCTLR_IRQEN (1U << 2U)
+#define CAV7_PTWD_PTCTLR_AUTOREL (1U << 1U)
+#define CAV7_PTWD_PTCTLR_TIMEN (1U << 0U)
+/* Private timer interrupt status register */
+#define CAV7_PTWD_PTISR CAV7_SFR(CAV7_PTWD_BASE, 0x000C)
+
+/* Watchdog load register */
+#define CAV7_PTWD_WDLR CAV7_SFR(CAV7_PTWD_BASE, 0x0020)
+/* Watchdog counter register */
+#define CAV7_PTWD_WDCNTR CAV7_SFR(CAV7_PTWD_BASE, 0x0024)
+/* Watchdog control register */
+#define CAV7_PTWD_WDCTLR CAV7_SFR(CAV7_PTWD_BASE, 0x0028)
+/* Watchdog interrupt status register */
+#define CAV7_PTWD_WDISR CAV7_SFR(CAV7_PTWD_BASE, 0x002C)
+/* Watchdog reset status register */
+#define CAV7_PTWD_WDRSR CAV7_SFR(CAV7_PTWD_BASE, 0x0030)
+/* Watchdog disable register */
+#define CAV7_PTWD_WDDR CAV7_SFR(CAV7_PTWD_BASE, 0x0034)
+
+extern int timer_process(struct pt_regs *regs);
+
+void
+__cos_cav7_irq_handler(struct pt_regs *regs)
+{
+	unsigned long int_id;
+	unsigned long cpuid;
+
+	/* What interrupt is this? */
+	int_id = CAV7_GICC_IAR;
+	cpuid  = int_id >> 10;
+	int_id &= 0x3FFU;
+
+	/* Is this a spurious interrupt? (Can't be 1022 because GICv1 don't have group1) */
+	assert(int_id != 1022);
+	/* Spurious interrupt does not need this at all */
+	if (int_id == 1023) return;
+	/* Only the booting processor will receive timer interrupts */
+	/* Is is an timer interrupt? (we know that it is at 29) */
+	if (int_id == 29) {
+		/* Clear the interrupt flag */
+		CAV7_PTWD_PTISR = 0;
+		/* printk("tptsc\n"); */
+		timer_process(regs);
+		/* Send interrupt to all other processors to notify them about this */
+		/* EOI the interrupt */
+		CAV7_GICC_EOIR = int_id;
+		return;
+	}
+
+	/* Is this an casual interrupt? */
+	assert(cpuid == 0);
+	/* Not handled. lol */
+}
diff --git a/src/platform/armv7a/irq.h b/src/platform/armv7a/irq.h
new file mode 100644
index 0000000000..94db2c3b14
--- /dev/null
+++ b/src/platform/armv7a/irq.h
@@ -0,0 +1,3 @@
+extern void          __cos_cav7_int_init(void);
+extern void          __cos_cav7_timer_init(void);
+extern unsigned long __cos_cav7_vector_table;
diff --git a/src/platform/armv7a/kernel.c b/src/platform/armv7a/kernel.c
new file mode 100644
index 0000000000..46c65396b3
--- /dev/null
+++ b/src/platform/armv7a/kernel.c
@@ -0,0 +1,123 @@
+#include "assert.h"
+#include "kernel.h"
+#include "multiboot.h"
+#include "string.h"
+#include "boot_comp.h"
+#include "mem_layout.h"
+#include "chal_cpu.h"
+#include "board_specifics.h"
+
+#include <captbl.h>
+#include <retype_tbl.h>
+#include <component.h>
+#include <thd.h>
+
+#define ADDR_STR_LEN 8
+#define CMDLINE_MAX_LEN 32
+#define CMDLINE_REQ_LEN (ADDR_STR_LEN * 2 + 1)
+
+struct mem_layout glb_memlayout;
+volatile int      cores_ready[NUM_CPU];
+
+static int
+xdtoi(char c)
+{
+	if ('0' <= c && c <= '9') return c - '0';
+	if ('a' <= c && c <= 'f') return c - 'a' + 10;
+	if ('A' <= c && c <= 'F') return c - 'A' + 10;
+	return 0;
+}
+
+static u32_t
+hextol(const char *s)
+{
+	int i, r = 0;
+
+	for (i = 0; i < 8; i++) { r = (r * 0x10) + xdtoi(s[i]); }
+
+	return r;
+}
+
+extern u8_t end, end_all; /* from the linker script */
+extern u8_t _binary_constructor_start, _binary_constructor_end;
+
+#define MEM_KB_ONLY(x) (((x) & ((1 << 20) - 1)) >> 10)
+#define MEM_MB_ONLY(x) ((x) >> 20)
+
+void
+kern_memory_setup(struct multiboot *mb, u32_t mboot_magic)
+{
+	/* Empty: no mboot information used here */
+}
+
+void
+kmain(struct multiboot *mboot, u32_t mboot_magic, u32_t esp)
+{
+	serial_init();
+
+	printk("serial initialization complete\r\n");
+
+	kern_paging_map_init(0);
+
+	chal_init();
+	cap_init();
+	ltbl_init();
+	retype_tbl_init();
+	comp_init();
+	thd_init();
+
+	/* We know the memory layout and will initialize it here - kernel : 256MB */
+	glb_memlayout.kern_end = &end_all;
+	/* Booter : 64MB, these are kernel addresses that will never be used in fact */
+	glb_memlayout.mod_start = &_binary_constructor_start;
+	glb_memlayout.mod_end   = &_binary_constructor_end;
+	printk("[%08x, %08x)\n", &_binary_constructor_start, &_binary_constructor_end);
+	/* Booter entry */
+	glb_memlayout.bootc_entry = 0; /* use elf library for this later! */
+	/* Booter virtual address */
+	glb_memlayout.bootc_vaddr    = 0;
+	glb_memlayout.kern_boot_heap = mem_boot_start(); /* this breaks if bss segment is after the initial component! */
+	glb_memlayout.kmem_end       = KERN_MEM_END;
+	printk("[%08x, %08x)\n", glb_memlayout.kern_boot_heap, glb_memlayout.kmem_end);
+	glb_memlayout.allocs_avail   = 1;
+
+	chal_kernel_mem_pa = chal_va2pa(mem_kmem_start());
+
+	paging_init();
+
+	kern_boot_comp(INIT_CORE);
+	kern_boot_upcall();
+
+	/* should not get here... */
+	khalt();
+}
+
+void
+smp_kmain(void)
+{
+	volatile cpuid_t           cpu_id   = get_cpuid();
+	struct cos_cpu_local_info *cos_info = cos_cpu_local_info();
+
+	printk("Initializing CPU %d\n", cpu_id);
+
+	chal_cpu_init();
+	kern_boot_comp(cpu_id);
+
+	printk("New CPU %d Booted\n", cpu_id);
+	cores_ready[cpu_id] = 1;
+	/* waiting for all cored booted */
+	while (cores_ready[INIT_CORE] == 0)
+		;
+
+	kern_boot_upcall();
+
+	while (1)
+		;
+}
+
+void
+khalt(void)
+{
+	while (1)
+		;
+}
diff --git a/src/platform/armv7a/kernel.h b/src/platform/armv7a/kernel.h
new file mode 100644
index 0000000000..41cce350f5
--- /dev/null
+++ b/src/platform/armv7a/kernel.h
@@ -0,0 +1,59 @@
+#ifndef KERNEL_H
+#define KERNEL_H
+
+#include <shared/cos_config.h>
+#include <shared/cos_types.h>
+#include <chal/shared/util.h>
+#include "chal.h"
+#include "multiboot.h"
+
+#include "chal_asm_inc.h"
+#include <thd.h>
+#include <hw.h>
+
+#ifdef ENABLE_SERIAL
+void serial_init(void);
+#endif
+
+#define PRINTK(format, ...) printk("%d: " format, get_cpuid(), ## __VA_ARGS__)
+
+/* These numbers map directly to actual timers in the HPET */
+typedef enum
+{
+	TIMER_PERIODIC = 0,
+	TIMER_ONESHOT  = 1,
+} timer_type_t;
+
+#define CYC_PER_USEC 767 /* Set to 767 MHz */
+
+#define TIMER_DEFAULT_US_INTERARRIVAL 1000 /* US = microseconds */
+
+void  timer_set(timer_type_t timer_type, u64_t cycles);
+void  timer_init(void);
+u64_t timer_find_hpet(void *timer);
+void  timer_set_hpet_page(u32_t page);
+void  timer_thd_init(struct thread *t);
+
+void  tss_init(const cpuid_t cpu_id);
+void  idt_init(const cpuid_t cpu_id);
+void  gdt_init(const cpuid_t cpu_id);
+void  user_init(void);
+void  paging_init(void);
+void *acpi_find_rsdt(void);
+void *acpi_find_timer(void);
+void  acpi_set_rsdt_page(u32_t);
+void  kern_paging_map_init(void *pa);
+
+void serial_send(char out);
+
+void smp_init(volatile int *cores_ready);
+
+void tls_update(u32_t addr);
+
+// void printk(const char *fmt, ...);
+int printk_register_handler(void (*handler)(const char *));
+void print_pt_regs(struct pt_regs *r);
+
+void khalt(void);
+
+#endif /* KERNEL_H */
diff --git a/src/platform/armv7a/l2cache.c b/src/platform/armv7a/l2cache.c
new file mode 100644
index 0000000000..a15c420802
--- /dev/null
+++ b/src/platform/armv7a/l2cache.c
@@ -0,0 +1,152 @@
+#include "cav7_consts.h"
+
+void
+Xil_L1DCacheFlush(void)
+{
+	register unsigned long CsidReg, C7Reg, CtrlReg;
+	unsigned long          CacheSize, LineSize, NumWays;
+	unsigned long          Way;
+	unsigned long          WayIndex, Set, SetIndex, NumSet;
+	unsigned long          currmask;
+
+	/* Select cache level 0 and D cache in CSSR */
+	__cos_cav7_id_csselr_set(0);
+
+	CsidReg = __cos_cav7_id_ccsidr_get();
+
+	/* Determine Cache Size */
+
+	/* disable the Data cache */
+	//      CtrlReg = __cos_cav7_sctlr_get();
+	//      CtrlReg &= ~(1<<2);
+	//      __cos_cav7_sctlr_set(CtrlReg);
+	//      printk("sctlr is %x\n",__cos_cav7_sctlr_get());
+
+	CacheSize = (CsidReg >> 13U) & 0x1FFU;
+	CacheSize += 1U;
+	CacheSize *= 128U; /* to get number of bytes */
+
+	/* Number of Ways */
+	NumWays = (CsidReg & 0x3ffU) >> 3U;
+	NumWays += 1U;
+
+	/* Get the cacheline size, way size, index size from csidr */
+	LineSize = (CsidReg & 0x07U) + 4U;
+
+	NumSet = CacheSize / 4;
+	//NumSet = CacheSize / NumWays;
+	NumSet /= (0x00000001U << LineSize);
+
+	Way = 0U;
+	Set = 0U;
+
+	/* Invalidate all the cachelines */
+	for (WayIndex = 0U; WayIndex < NumWays; WayIndex++) {
+		for (SetIndex = 0U; SetIndex < NumSet; SetIndex++) {
+			C7Reg = Way | Set;
+			/* Flush by Set/Way */
+			__cos_cav7_dccisw_set(C7Reg);
+			Set += (0x00000001U << LineSize);
+		}
+		Set = 0U;
+		Way += 0x40000000U;
+	}
+
+	/* disable the Data cache
+	   CtrlReg = __cos_cav7_sctlr_get();
+	   CtrlReg &= ~(1<<2);
+	   __cos_cav7_sctlr_set(CtrlReg); */
+}
+
+int
+chal_l1flush(void)
+{
+	Xil_L1DCacheFlush();
+
+	return 0;
+}
+
+#define ENABLE_PREFETCH
+
+void
+l2cache_init(void)
+{
+	/* 0x410000C8, revision r3p2 */
+	printk("L2 cache ID 0x%x\n", CAV7_L2C_CACHE_ID);
+	printk("L2 control reg is 0x%x\n", CAV7_L2C_CONTROL);
+	printk("L2 aux control reg is 0x%x\n", CAV7_L2C_AUX_CONTROL);
+	printk("L2 prefetch control reg is 0x%x\n", CAV7_L2C_PREFETCH_CTRL);
+	printk("L2 power control reg is 0x%x\n", CAV7_L2C_POWER_CTRL);
+	
+	Xil_L1DCacheFlush();
+
+	/* Just enable the prefetcher in general settings, but keep them disabled at the specific controls, only
+	 * instruction pf enabled */
+#ifndef ENABLE_PREFETCH
+	CAV7_L2C_AUX_CONTROL &= 0x2fbfffff;
+	CAV7_L2C_AUX_CONTROL |= 0x00400000;
+#endif
+	/* Invalidate all of them and wait */
+	CAV7_L2C_INV_WAY = 0xFFFF;
+	while ((CAV7_L2C_INV_WAY & 0xFFFF) != 0)
+		;
+	/* Clear all interrupts */
+	CAV7_L2C_INT_CLEAR = 0xFFFFFFFF;
+	/* Enable L2 cache */
+	CAV7_L2C_CONTROL = 0x01;
+
+	printk("L2 cache ID 0x%x\n", CAV7_L2C_CACHE_ID);
+	printk("L2 control reg is 0x%x\n", CAV7_L2C_CONTROL);
+	printk("L2 aux control reg is 0x%x\n", CAV7_L2C_AUX_CONTROL);
+	printk("L2 prefetch control reg is 0x%x\n", CAV7_L2C_PREFETCH_CTRL);
+	printk("L2 power control reg is 0x%x\n", CAV7_L2C_POWER_CTRL);
+
+	/* Program the ACTLR to turn off the L1 prefetching as well */
+#ifndef ENABLE_PREFETCH
+	printk("ACTLR reg is 0x%x\n", __cos_cav7_actlr_get());
+	unsigned long actlr = __cos_cav7_actlr_get();
+	__cos_cav7_actlr_set(actlr & 0xFFFFFFF9);
+#endif
+	printk("ACTLR reg is 0x%x\n", __cos_cav7_actlr_get());
+
+	/* We initialize the PMU to count main TLB stall */
+	unsigned long pmcr = __cos_cav7_pmcr_get();
+	printk("PMCR reg is 0x%x\n", pmcr); /* IMP = 0x41 IDCODE = 0x09 N = 00110b = 0x6, divider on, all counters
+					       enabled - leave unchanged */
+	/* Enable the first counter */
+	unsigned long pmcntenset = __cos_cav7_pmcntenset_get();
+	printk("PMCNTENSET reg is 0x%x\n", pmcntenset);
+	__cos_cav7_pmcntenset_set(pmcntenset | 0x01);
+	printk("PMCNTENSET reg is 0x%x\n", __cos_cav7_pmcntenset_get());
+	/* Select the first counter */
+	__cos_cav7_pmselr_set(0x00);
+	printk("PMSELR reg is 0x%x\n", __cos_cav7_pmselr_get());
+	/* Set the event type to main TLB stall 0x62
+	 * - or 0x83 data main TLB miss stall
+	 * - or 0x85 data micro TLB stall, we can measure main TLB lockdown */
+	__cos_cav7_pmxevtyper_set(0x83);
+	printk("PMXEVRTPER reg is 0x%x\n", __cos_cav7_pmxevtyper_get());
+	/* Clear the counter value to zero */
+	__cos_cav7_pmxevcntr_set(0x00);
+	printk("PMXEVRTPER reg is 0x%x\n", __cos_cav7_pmxevcntr_get());
+	/* Debug features? */
+	printk("ID_DFR0 reg is 0x%x\n", __cos_cav7_id_dfr0_get());
+
+	//      PMCNTENSET[0] = 1;
+	//      PMSELR select counter 0.
+	//      PMXEVTTYPER event type select Main TLB stall cycles.
+	//      PMXEVCNTR clear to zero.
+	//          .global             __cos_cav7_pmcr_set
+	//          .global             __cos_cav7_pmcntenset_set
+	//          .global             __cos_cav7_pmcntenclr_set
+	//          .global             __cos_cav7_pmovsr_set
+	//          .global             __cos_cav7_pmswinc_set
+	//          .global             __cos_cav7_pmselr_set
+	//          .global             __cos_cav7_pmccntr_set
+	//          .global             __cos_cav7_pmxevtyper_set
+	//          .global             __cos_cav7_pmxevcntr_set
+	//          .global             __cos_cav7_pmuserenr_set
+	//          .global             __cos_cav7_pmintenset_set
+	//          .global             __cos_cav7_pmintenclr_set
+}
+
diff --git a/src/platform/armv7a/linker.ld b/src/platform/armv7a/linker.ld
new file mode 100755
index 0000000000..d14f34ce3d
--- /dev/null
+++ b/src/platform/armv7a/linker.ld
@@ -0,0 +1,53 @@
+OUTPUT_FORMAT("elf32-littlearm")
+OUTPUT_ARCH(arm)
+ENTRY(_start)
+
+PROVIDE(__va_offset__ = 0x80000000);
+phys = 0x00100000;
+SECTIONS
+{
+  . = 0x80100000;
+
+  .text : AT(phys) {
+    code = .;
+    *start.o(.text) /* .rela.text .stub .text.* .gnu.linkonce.t.*) */
+    *(.text) /* .rela.text .stub .text.* .gnu.linkonce.t.*) */
+    *(.rodata) /*.rodata.* .gnu.linkonce.r.*) */
+    . = ALIGN(4096);
+    *(__ipc_entry)
+    . = ALIGN(4096);
+  }
+
+  .data : AT(phys + (data - code)) {
+    data = .;
+    *(.data .data.*)
+    . = ALIGN(4096);
+  }
+
+  end = .;
+  . = ALIGN(4096);
+
+  .initial_component : AT(phys + (initial_component - code)) {
+     initial_component = .;
+     *(.initial_component)
+     . = ALIGN(4096);
+  }
+
+  .bss : AT(phys + (bss - code)) {
+    bss = .;  
+    __bss_start__ = .;
+    *(.bss)
+    __bss_end__ = .;
+    . = ALIGN(4096);
+  }
+
+  end_all = .;
+  ASSERT(. < 0x90000000, "Kernel size exceeded the limit, may need to adjust memory configurations")
+
+
+  /DISCARD/ : {
+     *(.comment)
+     *(.eh_frame)
+     *(.note.gnu.build-id)
+  }
+}
diff --git a/src/platform/armv7a/mem_layout.h b/src/platform/armv7a/mem_layout.h
new file mode 100644
index 0000000000..e93cf8ec76
--- /dev/null
+++ b/src/platform/armv7a/mem_layout.h
@@ -0,0 +1,108 @@
+#ifndef MEM_LAYOUT_H
+#define MEM_LAYOUT_H
+
+#include <shared/cos_types.h>
+#include <shared/consts.h>
+#include <chal/shared/cos_config.h>
+#include <retype_tbl.h>
+
+#include "multiboot.h"
+
+/*
+ * Virtual memory layout of the system.  Physical addresses can be
+ * obtained with chal_va2pa.  See kernel.c for a set of assertions
+ * that ensure the proper alignment of all memory sections.
+ *
+ * mem_X_{end,start}, where X is:
+ * - kern  (K): the actual kernel image
+ * - bootc (B): the memory for the booter component
+ * - boot  (A): memory that is dynamically allocated at boot time (kernel bump allocator)
+ * - kmem:      all kernel memory at boot-up time represented in the retype table
+ * - utmem (U): memory that is untyped, and used by the components
+ *
+ * The memory image (physical memory):
+ *
+ * |-------|KKKKKKKK|WWWWW|BBBBBBBB|AA|UUUUUUUUUUUUUUUUUUU|
+ *
+ * |      ||                                              |
+ * +---+--++---------------------+------------------------+
+ *     |                         |
+ * 1MB: x86 reserved            kmem
+ *
+ * For now, GRUB wastes a fair amount of memory between the kernel
+ * image and the module, notated as W.
+ */
+
+struct mem_layout {
+	u8_t *kern_end, *mod_start, *mod_end, *bootc_entry, *bootc_vaddr, *kern_boot_heap, *kmem_end;
+	int   allocs_avail;
+};
+extern struct mem_layout glb_memlayout;
+extern unsigned long __initial_component_start__, __initial_component_end__;
+
+static inline u8_t *
+mem_kern_start(void)
+{
+	return (void *)(COS_MEM_KERN_START_VA + COS_MEM_KERN_PA);
+}
+static inline u8_t *
+mem_kern_end(void)
+{
+	return glb_memlayout.kern_end;
+}
+static inline u8_t *
+mem_bootc_start(void)
+{
+	return glb_memlayout.mod_start;
+}
+static inline u8_t *
+mem_bootc_end(void)
+{
+	return glb_memlayout.mod_end;
+}
+static inline u8_t *
+mem_bootc_vaddr(void)
+{
+	return glb_memlayout.bootc_vaddr;
+}
+static inline u8_t *
+mem_boot_start(void)
+{
+	return (u8_t *)round_up_to_pow2(mem_kern_end(), RETYPE_MEM_NPAGES * PAGE_SIZE);
+}
+static inline u8_t *
+mem_boot_end(void)
+{
+	return (u8_t *)round_up_to_pow2(glb_memlayout.kern_boot_heap, RETYPE_MEM_NPAGES * PAGE_SIZE);
+}
+/* what will the end be _after_ n allocations? */
+static inline u8_t *
+mem_boot_nalloc_end(int n)
+{
+	return (u8_t *)round_up_to_pow2(glb_memlayout.kern_boot_heap + n * PAGE_SIZE, RETYPE_MEM_NPAGES * PAGE_SIZE);
+}
+static inline u8_t *
+mem_kmem_start(void)
+{
+	return mem_bootc_start();
+}
+static inline u8_t *
+mem_kmem_end(void)
+{
+	return glb_memlayout.kmem_end;
+}
+/* not that this is only valid _after_ all boot-time kernel allocations are made */
+static inline u8_t *
+mem_utmem_start(void)
+{
+	return mem_boot_end();
+}
+static inline u8_t *
+mem_utmem_end(void)
+{
+	return mem_kmem_end();
+}
+u8_t *mem_boot_alloc(int npages); /* boot-time, bump-ptr heap */
+u8_t *mem_boot_user_alloc(int npages); /* boot-time, bump-ptr for user-allocations */
+
+#endif /* MEM_LAYOUT_H */
diff --git a/src/platform/i386/multiboot.h b/src/platform/armv7a/multiboot.h
similarity index 100%
rename from src/platform/i386/multiboot.h
rename to src/platform/armv7a/multiboot.h
diff --git a/src/platform/armv7a/printk.c b/src/platform/armv7a/printk.c
new file mode 100644
index 0000000000..a08a0346f1
--- /dev/null
+++ b/src/platform/armv7a/printk.c
@@ -0,0 +1,100 @@
+#include "string.h"
+#include "kernel.h"
+
+#define PRINTK_BUFFER 1024
+#define MAX_HANDLERS 5
+
+static void (*printk_handlers[MAX_HANDLERS])(const char *);
+static unsigned num_handlers = 0;
+
+int
+printk_register_handler(void (*handler)(const char *))
+{
+	if (handler == NULL || num_handlers > (sizeof(printk_handlers) / sizeof(printk_handlers[0]))) return -1;
+	printk_handlers[num_handlers++] = handler;
+	return 0;
+}
+
+void
+printk(const char *fmt, ...)
+{
+	char         buffer[PRINTK_BUFFER];
+	va_list      args;
+	unsigned int l, i;
+
+	va_start(args, fmt);
+	l = vsprintf(buffer, fmt, args);
+	va_end(args);
+
+	for (i = 0; i < num_handlers; i++) { printk_handlers[i](buffer); }
+}
+
+void
+print_pt_regs(struct pt_regs* regs)
+{
+	PRINTK("Register hexdump (0x%p):\n", regs);
+	PRINTK("Argument-> R0: 0x%x, R1: 0x%x, R2: 0x%x, R3: 0x%x\n",
+	       regs->r0, regs->r1, regs->r2, regs->r3);
+	PRINTK("Variable-> R4: 0x%x, R5: 0x%x, R6: 0x%x, R7: 0x%x\n",
+	       regs->r4, regs->r5, regs->r6, regs->r7);
+	PRINTK("           R8: 0x%x, R9: 0x%x, R10: 0x%x, R11: 0x%x\n",
+	       regs->r8, regs->r9, regs->r10, regs->r11);
+	PRINTK("Special->  R12 (IP): 0x%x, R13 (SP): 0x%x, R14 (LR): 0x%x, R15 (PC): 0x%x\n",
+	       regs->r12, regs->r13_sp, regs->r14_lr, regs->r15_pc);
+	PRINTK("(CPSR: 0x%x)\n", regs->cpsr);
+}
+
+void
+dbgprint(void)
+{
+	PRINTK("Debug print string active\n");
+}
+
+void
+undefined_dbgprint(struct pt_regs *regs)
+{
+	PRINTK("Undefined handler!!\n");
+	print_pt_regs(regs);
+}
+
+void
+prefetch_abort_dbgprint(struct pt_regs *regs)
+{
+	PRINTK("Prefetch Abort handler!!\n");
+	print_pt_regs(regs);
+	PRINTK("ID_MMFR0: 0x%lx\n", __cos_cav7_id_mmfr0_get());
+	PRINTK("ID_MMFR1: 0x%lx\n", __cos_cav7_id_mmfr1_get());
+	PRINTK("SCTLR: 0x%lx\n", __cos_cav7_sctlr_get());
+	PRINTK("TTBCR: 0x%lx\n", __cos_cav7_ttbcr_get());
+	PRINTK("TTBR0: 0x%lx, TTBR1: 0x%lx\n", __cos_cav7_ttbr0_get(), __cos_cav7_ttbr1_get());
+	PRINTK("IFSR: 0x%lx, IFAR: 0x%lx\n", __cos_cav7_ifsr_get(), __cos_cav7_ifar_get());
+	PRINTK("DFSR: 0x%lx, DFAR: 0x%lx\n", __cos_cav7_dfsr_get(), __cos_cav7_dfar_get());
+	PRINTK("ADFSR: 0x%lx\n", __cos_cav7_adfsr_get());
+}
+
+void
+data_abort_dbgprint(struct pt_regs *regs)
+{
+	PRINTK("Data Abort handler!!\n");
+	print_pt_regs(regs);
+	PRINTK("ID_MMFR0: 0x%lx\n", __cos_cav7_id_mmfr0_get());
+	PRINTK("ID_MMFR1: 0x%lx\n", __cos_cav7_id_mmfr1_get());
+	PRINTK("SCTLR: 0x%lx\n", __cos_cav7_sctlr_get());
+	PRINTK("TTBCR: 0x%lx\n", __cos_cav7_ttbcr_get());
+	PRINTK("TTBR0: 0x%lx, TTBR1: 0x%lx\n", __cos_cav7_ttbr0_get(), __cos_cav7_ttbr1_get());
+	PRINTK("IFSR: 0x%lx, IFAR: 0x%lx\n", __cos_cav7_ifsr_get(), __cos_cav7_ifar_get());
+	PRINTK("DFSR: 0x%lx, DFAR: 0x%lx\n", __cos_cav7_dfsr_get(), __cos_cav7_dfar_get());
+	PRINTK("ADFSR: 0x%lx\n", __cos_cav7_adfsr_get());
+}
+
+void
+fiq_dbgprint(void)
+{
+	PRINTK("FIQ handler!!\n");
+}
+
+void
+dbgval(unsigned long val)
+{
+	PRINTK("Debug value 0x%x\n", val);
+}
diff --git a/src/platform/armv7a/serial.c b/src/platform/armv7a/serial.c
new file mode 100644
index 0000000000..fb5e3c116a
--- /dev/null
+++ b/src/platform/armv7a/serial.c
@@ -0,0 +1,45 @@
+#define ENABLE_SERIAL
+
+#include "string.h"
+#include "kernel.h"
+#include "board_specifics.h"
+
+void serial_puts(const char *s);
+
+static inline char
+serial_recv(void)
+{
+}
+
+void
+serial_send(char out)
+{
+	if (out == '\n') {
+		while ((CAV7_UART_STATUS & CAV7_UART_STATUS_TXE) == 0)
+			;
+		CAV7_UART_FIFO = '\r';
+	}
+
+	while ((CAV7_UART_STATUS & CAV7_UART_STATUS_TXE) == 0)
+		;
+	CAV7_UART_FIFO = (out);
+}
+
+void
+serial_puts(const char *s)
+{
+	for (; *s != '\0'; s++) serial_send(*s);
+}
+
+int
+serial_handler(struct pt_regs *r)
+{
+	return 0;
+}
+
+void
+serial_init(void)
+{
+	printk_register_handler(serial_puts);
+	serial_puts("Serial usable.\r\n");
+}
diff --git a/src/platform/armv7a/start.S b/src/platform/armv7a/start.S
new file mode 100755
index 0000000000..0c34cd07dc
--- /dev/null
+++ b/src/platform/armv7a/start.S
@@ -0,0 +1,1509 @@
+/* the assembly part for cortex-a7 */
+    .section            .text
+    .code               32
+    .align              16
+
+.macro cp15_get_init crn op1 crm op2
+    mrc                 p15,\op1,r0,\crn,\crm,\op2
+    isb
+.endm
+
+.macro cp15_get crn op1 crm op2
+    mrc                 p15,\op1,r0,\crn,\crm,\op2
+    isb
+    bx                  lr
+.endm
+
+.macro cp15_get_double crm op
+    mrrc                p15,\op,r2,r3,\crm
+    isb
+    str                 r2,[r0]
+    str                 r3,[r1]
+    bx                  lr
+.endm
+
+.macro cp15_set_init crn op1 crm op2
+    mcr                 p15,\op1,r0,\crn,\crm,\op2
+    isb
+.endm
+
+.macro cp15_set crn op1 crm op2
+    mcr                 p15,\op1,r0,\crn,\crm,\op2
+    isb
+    bx                  lr
+.endm
+
+.macro cp15_set_double crm op
+    mcrr                p15,\op,r0,r0,\crm
+    isb
+    bx                  lr
+.endm
+
+    /* disable all interrupts */
+    .global             __cos_disable_int
+    /* enable all interrupts */
+    .global             __cos_enable_int
+    /* read acquire/write release for cortex-a (armv7) */
+    .global             __cos_cav7_read_acquire
+    .global             __cos_cav7_write_release
+    /* get the msb in a word */
+    .global             __cos_cav7_msb_get
+    /* kernel main function wrapper */
+    .global             _cos_kmain
+    /* entering of the user mode */
+    .global             __cos_enter_user_mode
+
+    /* cav7 specific stuff */
+    /* halt processor to wait for interrupt */
+    .global             __cos_cav7_halt
+    /* load page table */
+    .global             __cos_cav7_pgtbl_set
+    /* get register values */
+    .global             __cos_cav7_cpsr_get
+    .global             __cos_cav7_spsr_get
+    /* c0 */
+    .global             __cos_cav7_midr_get
+    .global             __cos_cav7_ctr_get
+    .global             __cos_cav7_tcmtr_get
+    .global             __cos_cav7_tlbtr_get
+    .global             __cos_cav7_mpidr_get
+    .global             __cos_cav7_revidr_get
+    .global             __cos_cav7_id_pfr0_get
+    .global             __cos_cav7_id_pfr1_get
+    .global             __cos_cav7_id_dfr0_get
+    .global             __cos_cav7_id_afr0_get
+    .global             __cos_cav7_id_mmfr0_get
+    .global             __cos_cav7_id_mmfr1_get
+    .global             __cos_cav7_id_mmfr2_get
+    .global             __cos_cav7_id_mmfr3_get
+    .global             __cos_cav7_id_isar0_get
+    .global             __cos_cav7_id_isar1_get
+    .global             __cos_cav7_id_isar2_get
+    .global             __cos_cav7_id_isar3_get
+    .global             __cos_cav7_id_isar4_get
+    .global             __cos_cav7_id_isar5_get
+    .global             __cos_cav7_id_ccsidr_get
+    .global             __cos_cav7_id_clidr_get
+    .global             __cos_cav7_id_aidr_get
+    .global             __cos_cav7_id_csselr_get
+    .global             __cos_cav7_id_vpidr_get
+    .global             __cos_cav7_id_vmpidr_get
+    /* c1 */
+    .global             __cos_cav7_sctlr_get
+    .global             __cos_cav7_actlr_get
+    .global             __cos_cav7_cpacr_get
+    .global             __cos_cav7_scr_get
+    .global             __cos_cav7_sder_get
+    .global             __cos_cav7_nsacr_get
+    .global             __cos_cav7_hsctlr_get
+    .global             __cos_cav7_hactlr_get
+    .global             __cos_cav7_hcr_get
+    .global             __cos_cav7_hdcr_get
+    .global             __cos_cav7_hcptr_get
+    .global             __cos_cav7_hstr_get
+    .global             __cos_cav7_hacr_get
+    /* c2 */
+    .global             __cos_cav7_ttbr0_get
+    .global             __cos_cav7_ttbr1_get
+    .global             __cos_cav7_ttbcr_get
+    .global             __cos_cav7_htcr_get
+    .global             __cos_cav7_vtcr_get
+    .global             __cos_cav7_dacr_get
+    /* c5 */
+    .global             __cos_cav7_dfsr_get
+    .global             __cos_cav7_ifsr_get
+    .global             __cos_cav7_adfsr_get
+    .global             __cos_cav7_aifsr_get
+    .global             __cos_cav7_hadfsr_get
+    .global             __cos_cav7_haifsr_get
+    .global             __cos_cav7_hsr_get
+    .global             __cos_cav7_dfar_get
+    .global             __cos_cav7_ifar_get
+    .global             __cos_cav7_hdfar_get
+    .global             __cos_cav7_hifar_get
+    .global             __cos_cav7_hpfar_get
+    .global             __cos_cav7_par_get
+    /* c9 */
+    .global             __cos_cav7_pmcr_get
+    .global             __cos_cav7_pmcntenset_get
+    .global             __cos_cav7_pmcntenclr_get
+    .global             __cos_cav7_pmovsr_get
+    .global             __cos_cav7_pmselr_get
+    .global             __cos_cav7_pmccntr_get
+    .global             __cos_cav7_pmxevtyper_get
+    .global             __cos_cav7_pmxevcntr_get
+    .global             __cos_cav7_pmuserenr_get
+    .global             __cos_cav7_pmintenset_get
+    .global             __cos_cav7_pmintenclr_get
+    /* c10 */
+    .global             __cos_cav7_tlblr_get
+    .global             __cos_cav7_prrr_get
+    .global             __cos_cav7_nmrr_get
+    .global             __cos_cav7_amair0_get
+    .global             __cos_cav7_amair1_get
+    .global             __cos_cav7_hmair0_get
+    .global             __cos_cav7_hmair1_get
+    .global             __cos_cav7_hamair0_get
+    .global             __cos_cav7_hamair1_get
+    /* c12 */
+    .global             __cos_cav7_vbar_get
+    .global             __cos_cav7_mvbar_get
+    .global             __cos_cav7_isr_get
+    .global             __cos_cav7_hvbar_get
+    /* c13 */
+    .global             __cos_cav7_fcseidr_get
+    .global             __cos_cav7_contextidr_get
+    .global             __cos_cav7_tpidrurw_get
+    .global             __cos_cav7_tpidruro_get
+    .global             __cos_cav7_tpidrurw_get
+    .global             __cos_cav7_htpidr_get
+    /* c14 */
+    .global             __cos_cav7_cntfrq_get
+    .global             __cos_cav7_cntkctl_get
+    .global             __cos_cav7_cntp_tval_get
+    .global             __cos_cav7_cntp_ctl_get
+    .global             __cos_cav7_cntv_tval_get
+    .global             __cos_cav7_cntv_ctl_get
+    .global             __cos_cav7_cnthctl_get
+    .global             __cos_cav7_cnthp_tval_get
+    .global             __cos_cav7_cnthp_ctl_get
+    /* c15 */
+    .global 		__cos_cav7_sel_lkdn_read_set
+    .global 		__cos_cav7_sel_lkdn_write_set
+    .global 		__cos_cav7_main_tlb_va_set
+    .global 		__cos_cav7_main_tlb_pa_set
+    .global 		__cos_cav7_main_tlb_attrib_set
+    /* double words */
+    .global             __cos_cav7_cntpct_dw_get
+    .global             __cos_cav7_cntvct_dw_get
+    .global             __cos_cav7_cntp_cval_dw_get
+    .global             __cos_cav7_cntv_cval_dw_get
+    .global             __cos_cav7_cntvoff_dw_get
+    .global             __cos_cav7_cnthp_cval_dw_get
+
+    /* set register values */
+    .global             __cos_cav7_cpsr_set
+    .global             __cos_cav7_spsr_set
+    /* c0 */
+    .global             __cos_cav7_id_csselr_set
+    .global             __cos_cav7_id_vpidr_set
+    .global             __cos_cav7_id_vmpidr_set
+    /* c1 */
+    .global             __cos_cav7_sctlr_set
+    .global             __cos_cav7_actlr_set
+    .global             __cos_cav7_cpacr_set
+    .global             __cos_cav7_scr_set
+    .global             __cos_cav7_sder_set
+    .global             __cos_cav7_nsacr_set
+    .global             __cos_cav7_hsctlr_set
+    .global             __cos_cav7_hactlr_set
+    .global             __cos_cav7_hcr_set
+    .global             __cos_cav7_hdcr_set
+    .global             __cos_cav7_hcptr_set
+    .global             __cos_cav7_hstr_set
+    .global             __cos_cav7_hacr_set
+    /* c2,c3 */
+    .global             __cos_cav7_ttbr0_set
+    .global             __cos_cav7_ttbr1_set
+    .global             __cos_cav7_ttbcr_set
+    .global             __cos_cav7_htcr_set
+    .global             __cos_cav7_vtcr_set
+    .global             __cos_cav7_dacr_set
+    /* c5 */
+    .global             __cos_cav7_dfsr_set
+    .global             __cos_cav7_ifsr_set
+    .global             __cos_cav7_adfsr_set
+    .global             __cos_cav7_aifsr_set
+    .global             __cos_cav7_hadfsr_set
+    .global             __cos_cav7_haifsr_set
+    .global             __cos_cav7_hsr_set
+    .global             __cos_cav7_dfar_set
+    .global             __cos_cav7_ifar_set
+    .global             __cos_cav7_hdfar_set
+    .global             __cos_cav7_hifar_set
+    .global             __cos_cav7_hpfar_set
+    /* c7 */
+    .global             __cos_cav7_icialluis_set
+    .global             __cos_cav7_bpiallis_set
+    .global             __cos_cav7_par_set
+    .global             __cos_cav7_iciallu_set
+    .global             __cos_cav7_icimvau_set
+    .global             __cos_cav7_cp15isb_set
+    .global             __cos_cav7_bpiall_set
+    .global             __cos_cav7_bpimva_set
+    .global             __cos_cav7_dcimvac_set
+    .global             __cos_cav7_dcisw_set
+    .global             __cos_cav7_ats1cpr_set
+    .global             __cos_cav7_ats1cpw_set
+    .global             __cos_cav7_ats1cur_set
+    .global             __cos_cav7_ats1cuw_set
+    .global             __cos_cav7_ats12nsopr_set
+    .global             __cos_cav7_ats12nsopw_set
+    .global             __cos_cav7_ats12nsour_set
+    .global             __cos_cav7_ats12nsouw_set
+    .global             __cos_cav7_dccmvac_set
+    .global             __cos_cav7_dccsw_set
+    .global             __cos_cav7_cp15dsb_set
+    .global             __cos_cav7_cp15dmb_set
+    .global             __cos_cav7_dccmvau_set
+    .global             __cos_cav7_dccimvac_set
+    .global             __cos_cav7_dccisw_set
+    .global             __cos_cav7_ats1hr_set
+    .global             __cos_cav7_ats1hw_set
+    /* c8 */
+    .global             __cos_cav7_tlbiallis_set
+    .global             __cos_cav7_tlbimvais_set
+    .global             __cos_cav7_tlbiasidis_set
+    .global             __cos_cav7_tlbimvaais_set
+    .global             __cos_cav7_itlbiall_set
+    .global             __cos_cav7_itlbimva_set
+    .global             __cos_cav7_itlbiasid_set
+    .global             __cos_cav7_dtlbiall_set
+    .global             __cos_cav7_dtlbimva_set
+    .global             __cos_cav7_dtlbiasid_set
+    .global             __cos_cav7_tlbiall_set
+    .global             __cos_cav7_tlbimva_set
+    .global             __cos_cav7_tlbiasid_set
+    .global             __cos_cav7_tlbimvaa_set
+    .global             __cos_cav7_tlbiallhis_set
+    .global             __cos_cav7_tlbimvahis_set
+    .global             __cos_cav7_tlbiallnsnhis_set
+    .global             __cos_cav7_tlbiallh_set
+    .global             __cos_cav7_tlbimvah_set
+    .global             __cos_cav7_tlbiallnsnh_set
+    /* c9 */
+    .global             __cos_cav7_pmcr_set
+    .global             __cos_cav7_pmcntenset_set
+    .global             __cos_cav7_pmcntenclr_set
+    .global             __cos_cav7_pmovsr_set
+    .global             __cos_cav7_pmswinc_set
+    .global             __cos_cav7_pmselr_set
+    .global             __cos_cav7_pmccntr_set
+    .global             __cos_cav7_pmxevtyper_set
+    .global             __cos_cav7_pmxevcntr_set
+    .global             __cos_cav7_pmuserenr_set
+    .global             __cos_cav7_pmintenset_set
+    .global             __cos_cav7_pmintenclr_set
+    /* c10 */
+    .global             __cos_cav7_tlblr_set
+    .global             __cos_cav7_prrr_set
+    .global             __cos_cav7_nmrr_set
+    .global             __cos_cav7_amair0_set
+    .global             __cos_cav7_amair1_set
+    .global             __cos_cav7_hmair0_set
+    .global             __cos_cav7_hmair1_set
+    .global             __cos_cav7_hamair0_set
+    .global             __cos_cav7_hamair1_set
+    /* c12 */
+    .global             __cos_cav7_vbar_set
+    .global             __cos_cav7_mvbar_set
+    .global             __cos_cav7_hvbar_set
+    /* c13 */
+    .global             __cos_cav7_contextidr_set
+    .global             __cos_cav7_tpidrurw_set
+    .global             __cos_cav7_tpidruro_set
+    .global             __cos_cav7_tpidrprw_set
+    .global             __cos_cav7_htpidr_set
+    /* c14 */
+    .global             __cos_cav7_cntfrq_set
+    .global             __cos_cav7_cntkctl_set
+    .global             __cos_cav7_cntp_tval_set
+    .global             __cos_cav7_cntp_ctl_set
+    .global             __cos_cav7_cntv_tval_set
+    .global             __cos_cav7_cntv_ctl_set
+    .global             __cos_cav7_cnthctl_set
+    .global             __cos_cav7_cnthp_tval_set
+    .global             __cos_cav7_cnthp_ctl_set
+    /* double words */
+    .global             __cos_cav7_cntp_cval_dw_set
+    .global             __cos_cav7_cntv_cval_dw_set
+    .global             __cos_cav7_cntvoff_dw_set
+    .global             __cos_cav7_cnthp_cval_dw_set
+
+    /* booting specific stuff */
+    .global             __cos_cav7_stack_start
+    /* initial page table */
+    .global             __cos_cav7_kern_pgtbl
+    /* vector table */
+    .global             __cos_cav7_vector_table
+    /* fault handlers and user handlers are exported on their spot */
+
+    /* the kernel entry of cos. this will be defined in c language. */
+    .global             cos_kmain
+    /* the fault handlerd of cos. these will be defined in c language. */
+    .global             __cos_cav7_irq_handler
+    /* the generic interrupt handler of cos. this will be defined in c language. */
+    .global             __cos_cav7_generic_handler
+    /* the system call handler of cos. this will be defined in c language. */
+    .global             cos_syscall_handler
+    /* the system tick handler of cos. this will be defined in c language. */
+    .global             _cos_tick_handler
+    /* the entry of smp after they have finished their initialization */
+    .global             __cos_smp_low_level_init
+    /* all other processor's timer interrupt handler */
+    .global             __cos_cav7_smp_tick
+    /* memory layout information - this is the actual page table mapping */
+    .global             cos_cav7_mem_info
+
+/* das u-boot header is appended by the u-boot through fit image generation.
+ * we do not temper with this here, as it is unnecessary. for the .data section,
+ * we are perfectly fine because it is in ram do not even need relocation, and
+ * it is of course included in the resulting binary from elf. (actually cos
+ * kernel code does not make use of the .data section anyway). as a result,
+ * we just need to clean up the. bss section. the linux kernel, when booting,
+ * always hacks the cpu to svc mode, perhaps to allow usage of many different
+ * bootloaders; however, we know that u-boot have already set the cpu to svc
+ * mode, which can spare us the ugly self-modifying code. */
+    .global             __bss_start__
+    .global             __bss_end__
+    .global             __va_offset__
+    .global             main
+_start:
+    .global             _start
+    ldr                 r0,=__bss_start__
+    ldr                 r1,=__bss_end__
+    ldr                 r2,=__va_offset__
+    sub                 r0,r0,r2
+    sub                 r1,r1,r2
+    ldr                 r2,=0x00
+clear_bss:
+    cmp                 r0,r1
+    beq                 clear_done
+    str                 r2,[r0]
+    add                 r0,#0x04
+    b                   clear_bss
+clear_done:
+
+    /* Clean up the memory for the components */
+    /*
+    ldr                 r0,=0x10000000
+    ldr                 r1,=0x30000000
+    ldr                 r2,=0x00
+clear_comp:
+    cmp                 r0,r1
+    beq                 clear_comp_done
+    str                 r2,[r0]
+    add                 r0,#0x04
+    b                   clear_comp
+clear_comp_done: */
+
+    /* set stacks for all modes except for usr */
+    ldr                 r4,=__cos_cav7_stack_start
+    add                 r4,r4,#65536
+    sub                 r4,r4,#2048
+    /* irq mode */
+    ldr                 r0,=0x600f00d2
+    msr                 cpsr,r0
+    mov                 sp,r4
+    /* abt mode */
+    ldr                 r0,=0x600f00d7
+    msr                 cpsr,r0
+    mov                 sp,r4
+    /* fiq mode */
+    ldr                 r0,=0x600f00d1
+    msr                 cpsr,r0
+    mov                 sp,r4
+    /* und mode */
+    ldr                 r0,=0x600f00db
+    msr                 cpsr,r0
+    mov                 sp,r4
+    /* sys mode */
+    ldr                 r0,=0x600f00db
+    msr                 cpsr,r0
+    mov                 sp,r4
+    /* svc mode */
+    ldr                 r0,=0x600f00d3
+    msr                 cpsr,r0
+    mov                 sp,r4
+
+    /* turn off the mmu and all cache if it is already enabled. there's no need
+     * to turn cache off because we are not modifying the instruction stream at
+     * all; the tlb walker will start walking from l1d if it is enabled.
+     * original page table setup .... c0e. */
+    cp15_get_init       crn=c1 op1=0 crm=c0 op2=0
+    ldr                 r1,=~((1<<2)|(1<<0))
+    and                 r0,r0,r1
+    cp15_set_init       crn=c1 op1=0 crm=c0 op2=0 /* sctlr.afe,tre,i,c,m */
+    isb
+    /* flush tlb */
+    ldr                 r0,=0x00
+    cp15_set_init       crn=c8 op1=0 crm=c7 op2=0 /* tlbiall */
+    isb
+
+    /* set up the initial page table
+     * r0: read base address
+     * r1: write base address
+     * r2: end read address
+     * r3: pa address to map from
+     * r4: va address to map into
+     * r5: number of pages
+     * r6: property mask
+     * r7: page counter
+     * r8: write index register
+     * r9: write content register */
+    ldr                 r0,=cos_cav7_mem_info
+    ldr                 r1,=__cos_cav7_kern_pgtbl
+    ldr                 r2,=__va_offset__
+    /* calculate the actual address */
+    sub                 r0,r0,r2
+    sub                 r1,r1,r2
+    /* calculate the configuration end address */
+    ldr                 r3,[r0]
+    add                 r2,r0,r3
+    add                 r0,r0,#0x04
+
+    /* load configurations and generate page table layout one by one */
+load_config:
+    ldmia               r0!,{r3-r6}
+    mov                 r7,#0x00
+    lsr                 r8,r4,#18
+    add                 r8,r1,r8
+    orr                 r9,r3,r6
+
+fill_pgtbl:
+    str                 r9,[r8]
+    add                 r8,r8,#4
+    add                 r7,r7,#1
+    add                 r9,r9,#0x100000
+    cmp                 r7,r5
+    bne                 fill_pgtbl
+
+    cmp                 r0,r2
+    bne                 load_config
+
+    dmb			sy
+
+    /* set the registers */
+    ldr                 r0,=0x02
+    cp15_set_init       crn=c2 op1=0 crm=c0 op2=2 /* ttbcr, ttbr1 only use 1gb */
+    isb
+
+    ldr                 r0,=0x55555555//0xFFFFFFFF
+    cp15_set_init       crn=c3 op1=0 crm=c0 op2=0 /* dacr */
+    isb
+
+    ldr                 r0,=0x000a00a4
+    cp15_set_init       crn=c10 op1=0 crm=c2 op2=0 /* prrr */
+    isb
+
+    ldr                 r0,=0x006c006c
+    cp15_set_init       crn=c10 op1=0 crm=c2 op2=1 /* nmrr */
+    isb
+
+    /* contextidr undefined on reset, set here! */
+    ldr                 r0, =0x00
+    cp15_set_init       crn=c13 op1=0 crm=c0 op2=1
+    isb
+
+    /* set base address */
+    ldr                 r0,=__cos_cav7_kern_pgtbl
+    ldr                 r1,=__va_offset__
+    sub                 r0,r0,r1
+    orr                 r0,r0,#0x4a /* 0x09 */
+
+    cp15_set_init       crn=c2 op1=0 crm=c0 op2=0 /* ttbr0 */
+    cp15_set_init       crn=c2 op1=0 crm=c0 op2=1 /* ttbr1 */
+    /* load the main function address to r3 first to prepare for a long jump */
+    ldr                 r3,=kmain
+    isb
+    
+    /* flush BTAC and L1I */
+    ldr		 r0, =0x00
+    cp15_set_init       crn=c7 op1=0 crm=c5 op2=6
+    cp15_set_init       crn=c7 op1=0 crm=c5 op2=0
+
+    /* turn on paging and cache */
+    cp15_get_init       crn=c1 op1=0 crm=c0 op2=0
+    isb
+    ldr                 r1,=~((1<<29)|(1<<28)|(1<<12)|(1<<11)|(1<<2)|(1<<0))
+    and                 r0,r0,r1
+    ldr                 r1,=(1<<29)|(1<<28)|(1<<12)|(1<<11)|(1<<2)|(1<<0) //(1<<12)|(1<<2)|(1<<0)
+    orr                 r0,r0,r1
+    cp15_set_init       crn=c1 op1=0 crm=c0 op2=0 /* sctlr.afe,tre,i,c,m */
+    isb
+
+    /* flush tlb again */
+    ldr                 r0,=0x00
+    cp15_set_init       crn=c8 op1=0 crm=c7 op2=0 /* tlbiall */
+    isb
+
+    /* branch to main function */
+    bx                  r3
+    .ltorg
+
+    /*
+    ldr                 r0,=0x00
+    ldr                 r1,=0x11
+    ldr                 r2,=0x22
+    ldr 		r12,=0x00
+    stmia               r12!,{r0-r11}
+
+    cp15_set_init            crn=c7 op1=0 crm=c14 op2=1
+    isb
+
+    ldr                 r0,=0x41210000
+    ldr                 r1,=0x55555555
+    str                 r1,[r0]
+    b                   .*/
+
+/* das u-boot will set up us an initial page table with all identical mappings.
+ * there's no need to do anything special here. also, we will not initialize
+ * the serial port for similar reasons. but, we do need to set up initial stacks
+ * for the cpus. because we know that there can be no more than 4 cpus in an armv7
+ * chip, we can statically allocate them here. each core is associated with 64kb
+ * stack, which should be more than sufficient. */
+    .align              8
+__cos_cav7_stack_start:
+    .space              4*65536
+__cos_cav7_stack_end:
+    .space              4096
+/* the kernel page table - the initialization sequence is totally controlled
+ * by the configuration file, because there's no generic way to detect memory on
+ * these devices. */
+    .align              16
+__cos_cav7_kern_pgtbl:
+    .space              65536
+
+/* vectors *******************************************************************/
+    .align              8
+__cos_cav7_vector_table:
+    b                   reset_handler
+    b                   undefined_handler
+    b                   svc_handler
+    b                   prefetch_abort_handler
+    b                   data_abort_handler
+    b                   unused_handler
+    b                   irq_handler
+    b                   fiq_handler
+
+/* cpsr & spsr */
+__cos_cav7_cpsr_get:
+    mrs                 r0,cpsr
+    bx                  lr
+__cos_cav7_spsr_get:
+    mrs                 r0,spsr
+    bx                  lr
+
+/* main id register */
+__cos_cav7_midr_get:
+    cp15_get            crn=c0 op1=0 crm=c0 op2=0
+/* cache type register */
+__cos_cav7_ctr_get:
+    cp15_get            crn=c0 op1=0 crm=c0 op2=1
+/* tcm type register */
+__cos_cav7_tcmtr_get:
+    cp15_get            crn=c0 op1=0 crm=c0 op2=2
+/* tlb type register */
+__cos_cav7_tlbtr_get:
+    cp15_get            crn=c0 op1=0 crm=c0 op2=3
+/* multiprocessor affinity register */
+__cos_cav7_mpidr_get:
+    cp15_get            crn=c0 op1=0 crm=c0 op2=5
+/* revision id register */
+__cos_cav7_revidr_get:
+    cp15_get            crn=c0 op1=0 crm=c0 op2=6
+/* processor feature register 0 */
+__cos_cav7_id_pfr0_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=0
+/* processor feature register 1 */
+__cos_cav7_id_pfr1_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=1
+/* debug feature register 0 */
+__cos_cav7_id_dfr0_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=2
+/* auxiliary feature register 0 */
+__cos_cav7_id_afr0_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=3
+/* memory model feature register 0 */
+__cos_cav7_id_mmfr0_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=4
+/* memory model feature register 1 */
+__cos_cav7_id_mmfr1_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=5
+/* memory model feature register 2 */
+__cos_cav7_id_mmfr2_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=6
+/* memory model feature register 3 */
+__cos_cav7_id_mmfr3_get:
+    cp15_get            crn=c0 op1=0 crm=c1 op2=7
+/* isa feature register 0 */
+__cos_cav7_id_isar0_get:
+    cp15_get            crn=c0 op1=0 crm=c2 op2=0
+/* isa feature register 1 */
+__cos_cav7_id_isar1_get:
+    cp15_get            crn=c0 op1=0 crm=c2 op2=1
+/* isa feature register 2 */
+__cos_cav7_id_isar2_get:
+    cp15_get            crn=c0 op1=0 crm=c2 op2=2
+/* isa feature register 3 */
+__cos_cav7_id_isar3_get:
+    cp15_get            crn=c0 op1=0 crm=c2 op2=3
+/* isa feature register 4 */
+__cos_cav7_id_isar4_get:
+    cp15_get            crn=c0 op1=0 crm=c2 op2=4
+/* isa feature register 5 */
+__cos_cav7_id_isar5_get:
+    cp15_get            crn=c0 op1=0 crm=c2 op2=5
+/* cache size id registers */
+__cos_cav7_id_ccsidr_get:
+    cp15_get            crn=c0 op1=1 crm=c0 op2=0
+/* cache level id register */
+__cos_cav7_id_clidr_get:
+    cp15_get            crn=c0 op1=1 crm=c0 op2=1
+/* auxiliary id register */
+__cos_cav7_id_aidr_get:
+    cp15_get            crn=c0 op1=1 crm=c0 op2=7
+/* cache size selection register */
+__cos_cav7_id_csselr_get:
+    cp15_get            crn=c0 op1=2 crm=c0 op2=0
+/* virtualization processor id register  */
+__cos_cav7_id_vpidr_get:
+    cp15_get            crn=c0 op1=4 crm=c0 op2=0
+/* virtualization multiprocessor id register */
+__cos_cav7_id_vmpidr_get:
+    cp15_get            crn=c0 op1=4 crm=c0 op2=5
+
+/* system control register */
+__cos_cav7_sctlr_get:
+    cp15_get            crn=c1 op1=0 crm=c0 op2=0
+/* auxiliary control register */
+__cos_cav7_actlr_get:
+    cp15_get            crn=c1 op1=0 crm=c0 op2=1
+/* coprocessor auxiliary control register */
+__cos_cav7_cpacr_get:
+    cp15_get            crn=c1 op1=0 crm=c0 op2=2
+/* secure configuration register */
+__cos_cav7_scr_get:
+    cp15_get            crn=c1 op1=0 crm=c1 op2=0
+/* secure debug enable register */
+__cos_cav7_sder_get:
+    cp15_get            crn=c1 op1=0 crm=c1 op2=1
+/* non-secure access control register */
+__cos_cav7_nsacr_get:
+    cp15_get            crn=c1 op1=0 crm=c1 op2=2
+/* hyp system control register */
+__cos_cav7_hsctlr_get:
+    cp15_get            crn=c1 op1=4 crm=c0 op2=0
+/* hyp auxiliary control register */
+__cos_cav7_hactlr_get:
+    cp15_get            crn=c1 op1=4 crm=c0 op2=1
+/* hyp configuration register */
+__cos_cav7_hcr_get:
+    cp15_get            crn=c1 op1=4 crm=c1 op2=0
+/* hyp debug configuration register */
+__cos_cav7_hdcr_get:
+    cp15_get            crn=c1 op1=4 crm=c1 op2=1
+/* hyp coprocessor trap register */
+__cos_cav7_hcptr_get:
+    cp15_get            crn=c1 op1=4 crm=c1 op2=2
+/* hyp system trap register */
+__cos_cav7_hstr_get:
+    cp15_get            crn=c1 op1=4 crm=c1 op2=3
+/* hyp auxiliary configuration register */
+__cos_cav7_hacr_get:
+    cp15_get            crn=c1 op1=4 crm=c1 op2=7
+
+/* translation table base register 0 - 32bit. we do not support pae of any kind */
+__cos_cav7_ttbr0_get:
+    cp15_get            crn=c2 op1=0 crm=c0 op2=0
+/* translation table base register 1 - 32bit. we do not support pae of any kind */
+__cos_cav7_ttbr1_get:
+    cp15_get            crn=c2 op1=0 crm=c0 op2=1
+/* translation table base control register */
+__cos_cav7_ttbcr_get:
+    cp15_get            crn=c2 op1=0 crm=c0 op2=2
+/* hyp translation control register */
+__cos_cav7_htcr_get:
+    cp15_get            crn=c2 op1=4 crm=c0 op2=2
+/* virtualization translation control register */
+__cos_cav7_vtcr_get:
+    cp15_get            crn=c2 op1=4 crm=c1 op2=2
+/* domain access control register */
+__cos_cav7_dacr_get:
+    cp15_get            crn=c3 op1=0 crm=c0 op2=0
+
+/* data fault status register */
+__cos_cav7_dfsr_get:
+    cp15_get            crn=c5 op1=0 crm=c0 op2=0
+/* instruction fault status register */
+__cos_cav7_ifsr_get:
+    cp15_get            crn=c5 op1=0 crm=c0 op2=1
+/* auxiliary data fault status register */
+__cos_cav7_adfsr_get:
+    cp15_get            crn=c5 op1=0 crm=c1 op2=0
+/* auxiliary instruction fault status register */
+__cos_cav7_aifsr_get:
+    cp15_get            crn=c5 op1=0 crm=c1 op2=1
+/* hyp auxiliary data fault status register */
+__cos_cav7_hadfsr_get:
+    cp15_get            crn=c5 op1=4 crm=c1 op2=0
+/* hyp auxiliary instruction fault status register */
+__cos_cav7_haifsr_get:
+    cp15_get            crn=c5 op1=4 crm=c1 op2=1
+/* hyp syndrome register */
+__cos_cav7_hsr_get:
+    cp15_get            crn=c5 op1=4 crm=c2 op2=0
+/* data fault address register */
+__cos_cav7_dfar_get:
+    cp15_get            crn=c6 op1=0 crm=c0 op2=0
+/* instruction fault address register */
+__cos_cav7_ifar_get:
+    cp15_get            crn=c6 op1=0 crm=c0 op2=2
+/* hyp data fault address register */
+__cos_cav7_hdfar_get:
+    cp15_get            crn=c6 op1=4 crm=c0 op2=0
+/* hyp instruction fault address register */
+__cos_cav7_hifar_get:
+    cp15_get            crn=c6 op1=4 crm=c0 op2=2
+/* hyp ipa fault address register */
+__cos_cav7_hpfar_get:
+    cp15_get            crn=c6 op1=4 crm=c0 op2=4
+
+/* physical address register */
+__cos_cav7_par_get:
+    cp15_get            crn=c7 op1=0 crm=c4 op2=0
+
+/* performance monitors control register */
+__cos_cav7_pmcr_get:
+    cp15_get            crn=c9 op1=0 crm=c12 op2=0
+/* performance monitors count enable set register */
+__cos_cav7_pmcntenset_get:
+    cp15_get            crn=c9 op1=0 crm=c12 op2=1
+/* performance monitors count enable clear register */
+__cos_cav7_pmcntenclr_get:
+    cp15_get            crn=c9 op1=0 crm=c12 op2=2
+/* performance monitors overflow flag status register */
+__cos_cav7_pmovsr_get:
+    cp15_get            crn=c9 op1=0 crm=c12 op2=3
+/* performance monitors event counter selection register */
+__cos_cav7_pmselr_get:
+    cp15_get            crn=c9 op1=0 crm=c12 op2=5
+/* performance monitors cycle count register */
+__cos_cav7_pmccntr_get:
+    cp15_get            crn=c9 op1=0 crm=c13 op2=0
+/* performance monitors event type select register */
+__cos_cav7_pmxevtyper_get:
+    cp15_get            crn=c9 op1=0 crm=c13 op2=1
+/* performance monitors event count register */
+__cos_cav7_pmxevcntr_get:
+    cp15_get            crn=c9 op1=0 crm=c13 op2=2
+/* performance monitors user enable register */
+__cos_cav7_pmuserenr_get:
+    cp15_get            crn=c9 op1=0 crm=c14 op2=0
+/* performance monitors interrupt enable set register */
+__cos_cav7_pmintenset_get:
+    cp15_get            crn=c9 op1=0 crm=c14 op2=1
+/* performance monitors interrupt enable clear register */
+__cos_cav7_pmintenclr_get:
+    cp15_get            crn=c9 op1=0 crm=c14 op2=2
+
+/* tlb lockdown register - cortex-a9 */
+__cos_cav7_tlblr_get:
+    cp15_get            crn=c10 op1=0 crm=c0 op2=0
+/* primary region remap register */
+__cos_cav7_prrr_get:
+    cp15_get            crn=c10 op1=0 crm=c2 op2=0
+/* normal memory remap register */
+__cos_cav7_nmrr_get:
+    cp15_get            crn=c10 op1=0 crm=c2 op2=1
+/* auxiliary memory attribute indirection register 0 */
+__cos_cav7_amair0_get:
+    cp15_get            crn=c10 op1=0 crm=c3 op2=0
+/* auxiliary memory attribute indirection register 1 */
+__cos_cav7_amair1_get:
+    cp15_get            crn=c10 op1=0 crm=c3 op2=1
+/* hyp memory attribute indirection register 0 */
+__cos_cav7_hmair0_get:
+    cp15_get            crn=c10 op1=4 crm=c2 op2=0
+/* hyp memory attribute indirection register 1 */
+__cos_cav7_hmair1_get:
+    cp15_get            crn=c10 op1=4 crm=c2 op2=1
+/* hyp auxiliary memory attribute indirection register 0 */
+__cos_cav7_hamair0_get:
+    cp15_get            crn=c10 op1=4 crm=c3 op2=0
+/* hyp auxiliary memory attribute indirection register 1 */
+__cos_cav7_hamair1_get:
+    cp15_get            crn=c10 op1=4 crm=c3 op2=1
+
+/* vector base address register */
+__cos_cav7_vbar_get:
+    cp15_get            crn=c12 op1=0 crm=c0 op2=0
+/* vector base address register */
+__cos_cav7_mvbar_get:
+    cp15_get            crn=c12 op1=0 crm=c0 op2=1
+/* interrupt status register */
+__cos_cav7_isr_get:
+    cp15_get            crn=c12 op1=0 crm=c1 op2=0
+/* hyp vector base address register */
+__cos_cav7_hvbar_get:
+    cp15_get            crn=c12 op1=4 crm=c0 op2=0
+
+/* fcse pid register */
+__cos_cav7_fcseidr_get:
+    cp15_get            crn=c13 op1=0 crm=c0 op2=0
+/* context id register */
+__cos_cav7_contextidr_get:
+    cp15_get            crn=c13 op1=0 crm=c0 op2=1
+/* user read/write software thread register */
+__cos_cav7_tpidrurw_get:
+    cp15_get            crn=c13 op1=0 crm=c0 op2=2
+/* user read-only software thread register */
+__cos_cav7_tpidruro_get:
+    cp15_get            crn=c13 op1=0 crm=c0 op2=3
+/* pl1-only software thread register */
+__cos_cav7_tpidrprw_get:
+    cp15_get            crn=c13 op1=0 crm=c0 op2=4
+/* hyp read/write software thread register */
+__cos_cav7_htpidr_get:
+    cp15_get            crn=c13 op1=4 crm=c0 op2=2
+
+/* counter frequency register */
+__cos_cav7_cntfrq_get:
+    cp15_get            crn=c14 op1=0 crm=c0 op2=0
+/* timer pl1 control register */
+__cos_cav7_cntkctl_get:
+    cp15_get            crn=c14 op1=0 crm=c1 op2=0
+/* pl1 physical timer value register */
+__cos_cav7_cntp_tval_get:
+    cp15_get            crn=c14 op1=0 crm=c2 op2=0
+/* pl1 physical timer control register */
+__cos_cav7_cntp_ctl_get:
+    cp15_get            crn=c14 op1=0 crm=c2 op2=1
+/* virtual timer value register */
+__cos_cav7_cntv_tval_get:
+    cp15_get            crn=c14 op1=0 crm=c3 op2=0
+/* virtual timer control register */
+__cos_cav7_cntv_ctl_get:
+    cp15_get            crn=c14 op1=0 crm=c3 op2=1
+/* timer pl2 control register */
+__cos_cav7_cnthctl_get:
+    cp15_get            crn=c14 op1=4 crm=c1 op2=0
+/* pl2 physical timer value register */
+__cos_cav7_cnthp_tval_get:
+    cp15_get            crn=c14 op1=4 crm=c2 op2=0
+/* pl2 physical timer control register */
+__cos_cav7_cnthp_ctl_get:
+    cp15_get            crn=c14 op1=4 crm=c2 op2=1
+
+/* Cortex-A9 main TLB VA register */
+__cos_cav7_main_tlb_va_get:
+    cp15_get            crn=c15 op1=5 crm=c5 op2=2
+/* Cortex-A9 main TLB PA register */
+__cos_cav7_main_tlb_pa_get:
+    cp15_get            crn=c15 op1=5 crm=c6 op2=2
+/* Cortex-A9 main TLB attribute register */
+__cos_cav7_main_tlb_attrib_get:
+    cp15_get            crn=c15 op1=5 crm=c7 op2=2
+
+/* physical count register */
+__cos_cav7_cntpct_dw_get:
+    cp15_get_double     crm=c14 op=0
+/* virtual count register */
+__cos_cav7_cntvct_dw_get:
+    cp15_get_double     crm=c14 op=1
+/* pl1 physical timer compare value register */
+__cos_cav7_cntp_cval_dw_get:
+    cp15_get_double     crm=c14 op=2
+/* virtual timer compare value register */
+__cos_cav7_cntv_cval_dw_get:
+    cp15_get_double     crm=c14 op=3
+/* virtual offset register */
+__cos_cav7_cntvoff_dw_get:
+    cp15_get_double     crm=c14 op=4
+/* l2 physical timer compare value register */
+__cos_cav7_cnthp_cval_dw_get:
+    cp15_get_double     crm=c14 op=6
+
+/* cpsr & spsr */
+__cos_cav7_cpsr_set:
+    msr                 cpsr,r0
+    bx                  lr
+__cos_cav7_spsr_set:
+    msr                 spsr,r0
+    bx                  lr
+
+/* cache size selection register */
+__cos_cav7_id_csselr_set:
+    cp15_set            crn=c0 op1=2 crm=c0 op2=0
+/* virtualization processor id register  */
+__cos_cav7_id_vpidr_set:
+    cp15_set            crn=c0 op1=4 crm=c0 op2=0
+/* virtualization multiprocessor id register */
+__cos_cav7_id_vmpidr_set:
+    cp15_set            crn=c0 op1=4 crm=c0 op2=5
+
+/* system control register */
+__cos_cav7_sctlr_set:
+    cp15_set            crn=c1 op1=0 crm=c0 op2=0
+/* auxiliary control register */
+__cos_cav7_actlr_set:
+    cp15_set            crn=c1 op1=0 crm=c0 op2=1
+/* coprocessor auxiliary control register */
+__cos_cav7_cpacr_set:
+    cp15_set            crn=c1 op1=0 crm=c0 op2=2
+/* secure configuration register */
+__cos_cav7_scr_set:
+    cp15_set            crn=c1 op1=0 crm=c1 op2=0
+/* secure debug enable register */
+__cos_cav7_sder_set:
+    cp15_set            crn=c1 op1=0 crm=c1 op2=1
+/* non-secure access control register */
+__cos_cav7_nsacr_set:
+    cp15_set            crn=c1 op1=0 crm=c1 op2=2
+/* hyp system control register */
+__cos_cav7_hsctlr_set:
+    cp15_set            crn=c1 op1=4 crm=c0 op2=0
+/* hyp auxiliary control register */
+__cos_cav7_hactlr_set:
+    cp15_set            crn=c1 op1=4 crm=c0 op2=1
+/* hyp configuration register */
+__cos_cav7_hcr_set:
+    cp15_set            crn=c1 op1=4 crm=c1 op2=0
+/* hyp debug configuration register */
+__cos_cav7_hdcr_set:
+    cp15_set            crn=c1 op1=4 crm=c1 op2=1
+/* hyp coprocessor trap register */
+__cos_cav7_hcptr_set:
+    cp15_set            crn=c1 op1=4 crm=c1 op2=2
+/* hyp system trap register */
+__cos_cav7_hstr_set:
+    cp15_set            crn=c1 op1=4 crm=c1 op2=3
+/* hyp auxiliary configuration register */
+__cos_cav7_hacr_set:
+    cp15_set            crn=c1 op1=4 crm=c1 op2=7
+
+/* translation table base register 0 - 32bit. we do not support pae of any kind.
+ * this operation also sets the page table of this architecture */
+__cos_cav7_ttbr0_set:
+__cos_cav7_pgtbl_set:
+    cp15_set            crn=c2 op1=0 crm=c0 op2=0
+/* translation table base register 1 - 32bit. we do not support pae of any kind */
+__cos_cav7_ttbr1_set:
+    cp15_set            crn=c2 op1=0 crm=c0 op2=1
+/* translation table base control register */
+__cos_cav7_ttbcr_set:
+    cp15_set            crn=c2 op1=0 crm=c0 op2=2
+/* hyp translation control register */
+__cos_cav7_htcr_set:
+    cp15_set            crn=c2 op1=4 crm=c0 op2=2
+/* virtualization translation control register */
+__cos_cav7_vtcr_set:
+    cp15_set            crn=c2 op1=4 crm=c1 op2=2
+/* domain access control register */
+__cos_cav7_dacr_set:
+    cp15_set            crn=c3 op1=0 crm=c0 op2=0
+
+/* data fault status register */
+__cos_cav7_dfsr_set:
+    cp15_set            crn=c5 op1=0 crm=c0 op2=0
+/* instruction fault status register */
+__cos_cav7_ifsr_set:
+    cp15_set            crn=c5 op1=0 crm=c0 op2=1
+/* auxiliary data fault status register */
+__cos_cav7_adfsr_set:
+    cp15_set            crn=c5 op1=0 crm=c1 op2=0
+/* auxiliary instruction fault status register */
+__cos_cav7_aifsr_set:
+    cp15_set            crn=c5 op1=0 crm=c1 op2=1
+/* hyp auxiliary data fault status register */
+__cos_cav7_hadfsr_set:
+    cp15_set            crn=c5 op1=4 crm=c1 op2=0
+/* hyp auxiliary instruction fault status register */
+__cos_cav7_haifsr_set:
+    cp15_set            crn=c5 op1=4 crm=c1 op2=1
+/* hyp syndrome register */
+__cos_cav7_hsr_set:
+    cp15_set            crn=c5 op1=4 crm=c2 op2=0
+/* data fault address register */
+__cos_cav7_dfar_set:
+    cp15_set            crn=c6 op1=0 crm=c0 op2=0
+/* instruction fault address register */
+__cos_cav7_ifar_set:
+    cp15_set            crn=c6 op1=0 crm=c0 op2=2
+/* hyp data fault address register */
+__cos_cav7_hdfar_set:
+    cp15_set            crn=c6 op1=4 crm=c0 op2=0
+/* hyp instruction fault address register */
+__cos_cav7_hifar_set:
+    cp15_set            crn=c6 op1=4 crm=c0 op2=2
+/* hyp ipa fault address register */
+__cos_cav7_hpfar_set:
+    cp15_set            crn=c6 op1=4 crm=c0 op2=4
+
+/* instruction cache invalidate all to pou inner shareable */
+__cos_cav7_icialluis_set:
+    cp15_set            crn=c7 op1=0 crm=c1 op2=0
+/* branch predictor invalidate all inner shareable */
+__cos_cav7_bpiallis_set:
+    cp15_set            crn=c7 op1=0 crm=c1 op2=6
+/* physical address register */
+__cos_cav7_par_set:
+    cp15_set            crn=c7 op1=0 crm=c4 op2=6
+/* instruction cache invalidate all to pou */
+__cos_cav7_iciallu_set:
+    cp15_set            crn=c7 op1=0 crm=c5 op2=0
+/* invalidate instruction cache by mva to pou */
+__cos_cav7_icimvau_set:
+    cp15_set            crn=c7 op1=0 crm=c5 op2=1
+/* isb register - deprecated */
+__cos_cav7_cp15isb_set:
+    cp15_set            crn=c7 op1=0 crm=c5 op2=4
+/* invalidate entire branch predictor array */
+__cos_cav7_bpiall_set:
+    cp15_set            crn=c7 op1=0 crm=c5 op2=6
+/* invalidate mva from branch predictors */
+__cos_cav7_bpimva_set:
+    cp15_set            crn=c7 op1=0 crm=c5 op2=7
+/* invalidate data cache by mva to poc */
+__cos_cav7_dcimvac_set:
+    cp15_set            crn=c7 op1=0 crm=c6 op2=1
+/* invalidate data cache line by set/way */
+__cos_cav7_dcisw_set:
+    cp15_set            crn=c7 op1=0 crm=c6 op2=2
+/* priviledged read va to pa translation */
+__cos_cav7_ats1cpr_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=0
+/* priviledged write va to pa translation */
+__cos_cav7_ats1cpw_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=1
+/* user read va to pa translation */
+__cos_cav7_ats1cur_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=2
+/* user write va to pa translation */
+__cos_cav7_ats1cuw_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=3
+/* priviledged read va to pa translation, other security state */
+__cos_cav7_ats12nsopr_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=4
+/* priviledged write va to pa translation, other security state */
+__cos_cav7_ats12nsopw_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=5
+/* user read va to pa translation, other security state */
+__cos_cav7_ats12nsour_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=6
+/* user write va to pa translation, other security state */
+__cos_cav7_ats12nsouw_set:
+    cp15_set            crn=c7 op1=0 crm=c8 op2=7
+/* clean data cache line by mva to poc */
+__cos_cav7_dccmvac_set:
+    cp15_set            crn=c7 op1=0 crm=c10 op2=1
+/* clean data cache line by set/way */
+__cos_cav7_dccsw_set:
+    cp15_set            crn=c7 op1=0 crm=c10 op2=2
+/* dsb register - deprecated */
+__cos_cav7_cp15dsb_set:
+    cp15_set            crn=c7 op1=0 crm=c10 op2=4
+/* dmb register - deprecated */
+__cos_cav7_cp15dmb_set:
+    cp15_set            crn=c7 op1=0 crm=c10 op2=5
+/* clean data cache line by mva to pou */
+__cos_cav7_dccmvau_set:
+    cp15_set            crn=c7 op1=0 crm=c11 op2=1
+/* clean and invalidate data cache line by mva to poc */
+__cos_cav7_dccimvac_set:
+    cp15_set            crn=c7 op1=0 crm=c14 op2=1
+/* clean and invalidate data cache line by set/way */
+__cos_cav7_dccisw_set:
+    cp15_set            crn=c7 op1=0 crm=c14 op2=2
+/* hyp mode read translation */
+__cos_cav7_ats1hr_set:
+    cp15_set            crn=c7 op1=4 crm=c8 op2=0
+/* hyp mode write translation */
+__cos_cav7_ats1hw_set:
+    cp15_set            crn=c7 op1=4 crm=c8 op2=1
+
+/* invalidate entire tlb is */
+__cos_cav7_tlbiallis_set:
+    cp15_set            crn=c8 op1=0 crm=c3 op2=0
+/* invalidate unified tlb entry by mva and asid is */
+__cos_cav7_tlbimvais_set:
+    cp15_set            crn=c8 op1=0 crm=c3 op2=1
+/* invalidate unified tlb by asid match is */
+__cos_cav7_tlbiasidis_set:
+    cp15_set            crn=c8 op1=0 crm=c3 op2=2
+/* invalidate unified tlb entry by mva all asid is */
+__cos_cav7_tlbimvaais_set:
+    cp15_set            crn=c8 op1=0 crm=c3 op2=3
+/* invalidate instruction tlb */
+__cos_cav7_itlbiall_set:
+    cp15_set            crn=c8 op1=0 crm=c5 op2=0
+/* invalidate instruction tlb entry by mva and asid */
+__cos_cav7_itlbimva_set:
+    cp15_set            crn=c8 op1=0 crm=c5 op2=1
+/* invalidate instruction tlb by asid match */
+__cos_cav7_itlbiasid_set:
+    cp15_set            crn=c8 op1=0 crm=c5 op2=2
+/* invalidate data tlb */
+__cos_cav7_dtlbiall_set:
+    cp15_set            crn=c8 op1=0 crm=c6 op2=0
+/* invalidate data tlb entry by mva and asid */
+__cos_cav7_dtlbimva_set:
+    cp15_set            crn=c8 op1=0 crm=c6 op2=1
+/* invalidate data tlb by asid match */
+__cos_cav7_dtlbiasid_set:
+    cp15_set            crn=c8 op1=0 crm=c6 op2=2
+/* invalidate unified tlb */
+__cos_cav7_tlbiall_set:
+    cp15_set            crn=c8 op1=0 crm=c7 op2=0
+/* invalidate unified tlb entry by mva and asid */
+__cos_cav7_tlbimva_set:
+    cp15_set            crn=c8 op1=0 crm=c7 op2=1
+/* invalidate unified tlb by asid match */
+__cos_cav7_tlbiasid_set:
+    cp15_set            crn=c8 op1=0 crm=c7 op2=2
+/* invalidate unified tlb entries by mva all asid */
+__cos_cav7_tlbimvaa_set:
+    cp15_set            crn=c8 op1=0 crm=c7 op2=3
+/* invalidate entire hyp unified tlb is */
+__cos_cav7_tlbiallhis_set:
+    cp15_set            crn=c8 op1=4 crm=c3 op2=0
+/* invalidate hyp unified tlb entry by mva is */
+__cos_cav7_tlbimvahis_set:
+    cp15_set            crn=c8 op1=4 crm=c3 op2=1
+/* invalidate entire non-secure non-hyp unified tlb is */
+__cos_cav7_tlbiallnsnhis_set:
+    cp15_set            crn=c8 op1=4 crm=c3 op2=4
+/* invalidate entire hyp unified tlb */
+__cos_cav7_tlbiallh_set:
+    cp15_set            crn=c8 op1=4 crm=c7 op2=0
+/* invalidate hyp unified tlb entry by mva */
+__cos_cav7_tlbimvah_set:
+    cp15_set            crn=c8 op1=4 crm=c7 op2=1
+/* invalidate entire non-secure non-hyp unified tlb */
+__cos_cav7_tlbiallnsnh_set:
+    cp15_set            crn=c8 op1=4 crm=c7 op2=4
+
+/* performance monitors control register */
+__cos_cav7_pmcr_set:
+    cp15_set            crn=c9 op1=0 crm=c12 op2=0
+/* performance monitors count enable set register */
+__cos_cav7_pmcntenset_set:
+    cp15_set            crn=c9 op1=0 crm=c12 op2=1
+/* performance monitors count enable clear register */
+__cos_cav7_pmcntenclr_set:
+    cp15_set            crn=c9 op1=0 crm=c12 op2=2
+/* performance monitors overflow flag status register */
+__cos_cav7_pmovsr_set:
+    cp15_set            crn=c9 op1=0 crm=c12 op2=3
+/* performance monitors software increment register */
+__cos_cav7_pmswinc_set:
+    cp15_set            crn=c9 op1=0 crm=c12 op2=4
+/* performance monitors event counter selection register */
+__cos_cav7_pmselr_set:
+    cp15_set            crn=c9 op1=0 crm=c12 op2=5
+/* performance monitors cycle count register */
+__cos_cav7_pmccntr_set:
+    cp15_set            crn=c9 op1=0 crm=c13 op2=0
+/* performance monitors event type select register */
+__cos_cav7_pmxevtyper_set:
+    cp15_set            crn=c9 op1=0 crm=c13 op2=1
+/* performance monitors event count register */
+__cos_cav7_pmxevcntr_set:
+    cp15_set            crn=c9 op1=0 crm=c13 op2=2
+/* performance monitors user enable register */
+__cos_cav7_pmuserenr_set:
+    cp15_set            crn=c9 op1=0 crm=c14 op2=0
+/* performance monitors interrupt enable set register */
+__cos_cav7_pmintenset_set:
+    cp15_set            crn=c9 op1=0 crm=c14 op2=1
+/* performance monitors interrupt enable clear register */
+__cos_cav7_pmintenclr_set:
+    cp15_set            crn=c9 op1=0 crm=c14 op2=2
+
+/* tlb lockdown register - cortex-a9 */
+__cos_cav7_tlblr_set:
+    cp15_set            crn=c10 op1=0 crm=c0 op2=0
+/* primary region remap register */
+__cos_cav7_prrr_set:
+    cp15_set            crn=c10 op1=0 crm=c2 op2=0
+/* normal memory remap register */
+__cos_cav7_nmrr_set:
+    cp15_set            crn=c10 op1=0 crm=c2 op2=1
+/* auxiliary memory attribute indirection register 0 */
+__cos_cav7_amair0_set:
+    cp15_set            crn=c10 op1=0 crm=c3 op2=0
+/* auxiliary memory attribute indirection register 1 */
+__cos_cav7_amair1_set:
+    cp15_set            crn=c10 op1=0 crm=c3 op2=1
+/* hyp memory attribute indirection register 0 */
+__cos_cav7_hmair0_set:
+    cp15_set            crn=c10 op1=4 crm=c2 op2=0
+/* hyp memory attribute indirection register 1 */
+__cos_cav7_hmair1_set:
+    cp15_set            crn=c10 op1=4 crm=c2 op2=1
+/* hyp auxiliary memory attribute indirection register 0 */
+__cos_cav7_hamair0_set:
+    cp15_set            crn=c10 op1=4 crm=c3 op2=0
+/* hyp auxiliary memory attribute indirection register 1 */
+__cos_cav7_hamair1_set:
+    cp15_set            crn=c10 op1=4 crm=c3 op2=1
+
+/* vector base address register */
+__cos_cav7_vbar_set:
+    cp15_set            crn=c12 op1=0 crm=c0 op2=0
+/* vector base address register */
+__cos_cav7_mvbar_set:
+    cp15_set            crn=c12 op1=0 crm=c0 op2=1
+/* hyp vector base address register */
+__cos_cav7_hvbar_set:
+    cp15_set            crn=c12 op1=4 crm=c0 op2=0
+
+/* context id register */
+__cos_cav7_contextidr_set:
+    cp15_set            crn=c13 op1=0 crm=c0 op2=1
+/* user read/write software thread register */
+__cos_cav7_tpidrurw_set:
+    cp15_set            crn=c13 op1=0 crm=c0 op2=2
+/* user read-only software thread register */
+__cos_cav7_tpidruro_set:
+    cp15_set            crn=c13 op1=0 crm=c0 op2=3
+/* pl1-only software thread register */
+__cos_cav7_tpidrprw_set:
+    cp15_set            crn=c13 op1=0 crm=c0 op2=4
+/* hyp read/write software thread register */
+__cos_cav7_htpidr_set:
+    cp15_set            crn=c13 op1=4 crm=c0 op2=2
+
+/* counter frequency register */
+__cos_cav7_cntfrq_set:
+    cp15_set            crn=c14 op1=0 crm=c0 op2=0
+/* timer pl1 control register */
+__cos_cav7_cntkctl_set:
+    cp15_set            crn=c14 op1=0 crm=c1 op2=0
+/* pl1 physical timer value register */
+__cos_cav7_cntp_tval_set:
+    cp15_set            crn=c14 op1=0 crm=c2 op2=0
+/* pl1 physical timer control register */
+__cos_cav7_cntp_ctl_set:
+    cp15_set            crn=c14 op1=0 crm=c2 op2=1
+/* virtual timer value register */
+__cos_cav7_cntv_tval_set:
+    cp15_set            crn=c14 op1=0 crm=c3 op2=0
+/* virtual timer control register */
+__cos_cav7_cntv_ctl_set:
+    cp15_set            crn=c14 op1=0 crm=c3 op2=1
+/* timer pl2 control register */
+__cos_cav7_cnthctl_set:
+    cp15_set            crn=c14 op1=4 crm=c1 op2=0
+/* pl2 physical timer value register */
+__cos_cav7_cnthp_tval_set:
+    cp15_set            crn=c14 op1=4 crm=c2 op2=0
+/* pl2 physical timer control register */
+__cos_cav7_cnthp_ctl_set:
+    cp15_set            crn=c14 op1=4 crm=c2 op2=1
+
+
+/* Cortex-A9 select lockdown tlb entry for read */
+__cos_cav7_sel_lkdn_read_set:
+    cp15_set            crn=c15 op1=5 crm=c4 op2=2
+/* Cortex-A9 select lockdown tlb entry for write */
+__cos_cav7_sel_lkdn_write_set:
+    cp15_set            crn=c15 op1=5 crm=c4 op2=4
+/* Cortex-A9 main TLB VA register */
+__cos_cav7_main_tlb_va_set:
+    cp15_set            crn=c15 op1=5 crm=c5 op2=2
+/* Cortex-A9 main TLB PA register */
+__cos_cav7_main_tlb_pa_set:
+    cp15_set            crn=c15 op1=5 crm=c6 op2=2
+/* Cortex-A9 main TLB attribute register */
+__cos_cav7_main_tlb_attrib_set:
+    cp15_set            crn=c15 op1=5 crm=c7 op2=2
+
+/* pl1 physical timer compare value register */
+__cos_cav7_cntp_cval_dw_set:
+    cp15_set_double     crm=c14 op=2
+/* virtual timer compare value register */
+__cos_cav7_cntv_cval_dw_set:
+    cp15_set_double     crm=c14 op=3
+/* virtual offset register */
+__cos_cav7_cntvoff_dw_set:
+    cp15_set_double     crm=c14 op=4
+/* l2 physical timer compare value register */
+__cos_cav7_cnthp_cval_dw_set:
+    cp15_set_double     crm=c14 op=6
+
+__cos_cav7_comp_swap:
+    dmb                 sy
+    ldrex               r3,[r0]
+    cmp                 r3,r1
+    bne                 __cos_cav7_comp_swap_fail
+    strex               r3,r2,[r0]
+    cmp                 r3,#0x00
+    bne                 __cos_cav7_comp_swap
+    mov                 r0,#0x01
+    dmb                 sy
+    bx                  lr
+__cos_cav7_comp_swap_fail:
+    clrex
+    mov                 r0,#0x00
+    bx                  lr
+
+__cos_cav7_fetch_add:
+    ldrex               r2,[r0]
+    add                 r3,r2,r1
+    strex               r12,r3,[r0]
+    cmp                 r12,#0x00
+    bne                 __cos_cav7_fetch_add
+    mov                 r0,r2
+    bx                  lr
+
+__cos_cav7_fetch_and:
+    ldrex               r2,[r0]
+    and                 r3,r2,r1
+    strex               r12,r3,[r0]
+    cmp                 r12,#0x00
+    bne                 __cos_cav7_fetch_add
+    mov                 r0,r2
+    bx                  lr
+
+__cos_cav7_read_acquire:
+    ldr                 r0,[r0]
+    dmb
+    bx                  lr
+
+__cos_cav7_write_release:
+    dmb
+    str                 r1,[r0]
+    bx                  lr
+
+__cos_disable_int:
+    cpsid               i
+    bx                  lr
+
+__cos_enable_int:
+    cpsie               i
+    bx                  lr
+
+__cos_cav7_halt:
+    /* wait for interrupt */
+    wfi
+    bx                  lr
+
+__cos_cav7_msb_get:
+    clz                 r1,r0
+    mov                 r0,#31
+    sub                 r0,r1
+    bx                  lr
+
+/* Now let's go into user mode...
+ * R0 = User-level PC, R1 = TID+CPUID. r2-r4 are args.
+ * The user-level code is responsible for setting up the user-level SP.
+ * CPSR = 0x600F0010.
+ */
+__cos_enter_user_mode:
+    push                {r0}
+    mov                 r0,r1
+    /* prepare the spsr for user-level */
+    ldr                 r2,=0x600F0010
+    msr                 spsr_cxsf,r2
+    mov			r12,sp
+    mov			r2,#0
+    mov			r3,#0
+    mov			r4,#0
+    ldmia               r12!,{pc}^
+
+reset_handler:
+unused_handler:
+    b                   .
+
+/* save all general-purpose registers */
+.macro save_gp_regs
+    /* save user-mode pc */
+    push                {lr}
+    /* save user-mode sp and lr */
+    stmdb               sp,{sp,lr}^
+    sub                 sp,sp,#0x08
+    /* save user-mode general-purpose registers */
+    push                {r0-r12}
+    /* save user-mode psr */
+    mrs                 r0,spsr
+    push                {r0}
+    mov                 r0,sp
+.endm
+
+/* restore all general-purpose registers */
+.macro restore_gp_regs
+    /* restore user-mode psr */
+    pop                 {r0}
+    msr                 spsr_cxsf,r0
+    /* restore user-mode general purpose registers */
+    pop                 {r0-r12}
+    /* restore user-mode sp and lr */
+    ldmia               sp,{sp,lr}^
+    add                 sp,sp,#0x08
+    /* restore user-mode pc */
+    ldmia               sp!,{pc}^
+.endm
+
+undefined_handler:
+    save_gp_regs
+    bl                  undefined_dbgprint
+    b			.
+    restore_gp_regs
+
+prefetch_abort_handler:
+    sub			lr,lr,#0x04
+    save_gp_regs
+    bl                  prefetch_abort_dbgprint
+    b                   .
+    restore_gp_regs
+
+data_abort_handler:
+    sub			lr,lr,#0x08
+    save_gp_regs
+    bl                  data_abort_dbgprint
+    b			.
+    restore_gp_regs
+
+/* This is the faster, more intelligent way */
+svc_handler:
+    /* save user-mode pc */
+    push                {lr}
+    /* save user-mode sp and lr */
+    stmdb               sp,{sp,lr}^
+    sub                 sp,sp,#36
+    /* save user-mode critical registers, r0-r5 */
+    push                {r0-r5}
+    /* save user-mode psr */
+    mrs                 r0,spsr
+    push                {r0}
+    mov                 r0,sp
+    bl                  composite_syscall_handler
+    /* Unlikely to be taken, will restore everything */
+    cmp                 r0,#0
+    bne                 svc_switch_thd
+    /* restore user-mode psr */
+    pop                 {r0}
+    msr                 spsr_cxsf,r0
+    /* restore user-mode general purpose registers, r0-r4 */
+    pop                 {r0-r4}
+    add		 sp,sp,#32
+    /* restore user-mode sp and lr */
+    ldmia               sp,{sp,lr}^
+    add                 sp,sp,#8
+    /* restore user-mode pc */
+    ldmia               sp!,{pc}^
+    /* slow path */
+svc_switch_thd:
+    restore_gp_regs
+
+/* This is the original, stupid one that saves and restores everything.
+svc_handler:
+    save_gp_regs
+    bl                  composite_syscall_handler
+    restore_gp_regs
+*/
+
+irq_handler:
+    sub			lr,lr,#0x04
+    save_gp_regs
+    bl                  __cos_cav7_irq_handler
+    restore_gp_regs
+
+fiq_handler:
+    sub			lr,lr,#0x04
+    save_gp_regs
+    bl                  fiq_dbgprint
+    b                   .
+    restore_gp_regs
+    .ltorg
diff --git a/src/platform/armv7a/string.c b/src/platform/armv7a/string.c
new file mode 100644
index 0000000000..580473ca52
--- /dev/null
+++ b/src/platform/armv7a/string.c
@@ -0,0 +1,45 @@
+#include "string.h"
+#include "vtxprintf.h"
+
+static char *str_buf;
+
+size_t
+strnlen(const char *str, size_t max)
+{
+	size_t ret;
+
+	for (ret = 0; *str != '\0' && ret < max; str++) ret++;
+
+	return ret;
+}
+
+static void
+str_tx_byte(unsigned char byte)
+{
+	*str_buf = byte;
+	str_buf++;
+}
+
+int
+vsprintf(char *buf, const char *fmt, va_list args)
+{
+	int i;
+
+	str_buf  = buf;
+	i        = vtxprintf(str_tx_byte, fmt, args);
+	*str_buf = '\0';
+
+	return i;
+}
+
+int
+strncmp(const char *s1, const char *s2, size_t n)
+{
+	size_t i;
+
+	for (i = 0; i < n; i++) {
+		if (s1[i] < s2[i]) return -1;
+		if (s1[i] > s2[i]) return 1;
+	}
+	return 0;
+}
diff --git a/src/platform/armv7a/string.h b/src/platform/armv7a/string.h
new file mode 100644
index 0000000000..d6852ed196
--- /dev/null
+++ b/src/platform/armv7a/string.h
@@ -0,0 +1,14 @@
+#ifndef STRING_H
+#define STRING_H
+
+#include "vtxprintf.h"
+#include "shared/cos_types.h"
+#include "chal/defs.h"
+
+typedef unsigned long int size_t;
+
+size_t strnlen(const char *str, size_t max);
+int    vsprintf(char *buf, const char *fmt, va_list args);
+int    strncmp(const char *s1, const char *s2, size_t n);
+
+#endif /* STRING_H */
diff --git a/src/platform/armv7a/timer.c b/src/platform/armv7a/timer.c
new file mode 100644
index 0000000000..548c1ea859
--- /dev/null
+++ b/src/platform/armv7a/timer.c
@@ -0,0 +1,65 @@
+#include "cav7_consts.h"
+
+
+#define CHAL_CYC_THRESH (CYC_PER_USEC * 100)
+void
+chal_timer_set(cycles_t cycles)
+{
+	cycles_t now;
+	rdtscll(now);
+	if (now < cycles) {
+		cycles -= now;
+	} else {
+		/* in the past? set to fire one tick from now! */
+		cycles  = CHAL_CYC_THRESH;
+	}
+	chal_timer_disable();
+	/* Writing this will also write the counter register as well */
+	CAV7_PTWD_PTLR = cycles / 2;
+	/* CAV7_PTWD_PTCNTR = cycles/2; */
+	/* Clear the interrupt flag - write 1! */
+	CAV7_PTWD_PTISR = 1;
+	/* Ack all timer interrupts */
+	CAV7_GICC_EOIR = 29;
+	/* Enable the interrupt */
+	CAV7_GICD_ISENABLER(0) = 1 << 29;
+	/* Start the timer */
+	CAV7_PTWD_PTCTLR = CAV7_PTWD_PTCTLR_PRESC(0) | CAV7_PTWD_PTCTLR_IRQEN | CAV7_PTWD_PTCTLR_TIMEN;
+}
+
+void
+chal_timer_disable(void)
+{
+	/* Disable the interrupt */
+	CAV7_GICD_ICENABLER(0) = 1 << 29;
+	CAV7_PTWD_PTCTLR       = 0;
+	/* Clear the interrupt flag - write 1! */
+	CAV7_PTWD_PTISR = 1;
+}
+
+unsigned int
+chal_cyc_thresh(void)
+{
+	return CHAL_CYC_THRESH;
+}
+
+void
+pmc_ready(void)
+{
+	/* enable user-mode access to the performance counter*/
+	asm ("MCR p15, 0, %0, C9, C14, 0\n\t" :: "r"(1)); 
+
+	/* disable counter overflow interrupts (just in case)*/
+	asm ("MCR p15, 0, %0, C9, C14, 2\n\t" :: "r"(0x8000000f));
+}
+
+void
+timer_init(void)
+{
+	/* We are initializing the global timer here */
+	CAV7_GTMR_GTCNTRL = 0;
+	CAV7_GTMR_GTCNTRH = 0;
+	CAV7_GTMR_GTCTLR  = 1;
+	printk("global timer init\n");
+	pmc_ready();
+}
diff --git a/src/platform/armv7a/tlb.c b/src/platform/armv7a/tlb.c
new file mode 100644
index 0000000000..b5e84b8852
--- /dev/null
+++ b/src/platform/armv7a/tlb.c
@@ -0,0 +1,59 @@
+#include "cav7_consts.h"
+
+int
+chal_tlb_lockdown(unsigned long entryid, unsigned long vaddr, unsigned long paddr)
+{
+	/* entryid: 0-3 means lock a 4kB page,
+	 * 4-7 means lock a 64kB page,
+	 * 8-11 means lock a 1MB page,
+	 * 12-15 means lock a 16MB page */
+	assert(entryid < 16);
+	__cos_cav7_sel_lkdn_write_set(entryid % 4);
+	if (entryid < 4) {
+		/* Cortex-A9 main TLB VA register */
+		__cos_cav7_main_tlb_va_set(vaddr);
+		/* Cortex-A9 main TLB attribute register */
+		__cos_cav7_main_tlb_attrib_set(0x07);
+		/* Cortex-A9 main TLB PA register */
+		__cos_cav7_main_tlb_pa_set(paddr | (1 << 6) | (3 << 1) | 1);
+	} else if (entryid < 8) {
+		__cos_cav7_main_tlb_va_set(vaddr);
+		__cos_cav7_main_tlb_attrib_set(0x07);
+		__cos_cav7_main_tlb_pa_set(paddr | (2 << 6) | (3 << 1) | 1);
+	} else if (entryid < 12) {
+		__cos_cav7_main_tlb_va_set(vaddr);
+		__cos_cav7_main_tlb_attrib_set(0x07);
+		__cos_cav7_main_tlb_pa_set(paddr | (3 << 6) | (3 << 1) | 1);
+	} else {
+		__cos_cav7_main_tlb_va_set(vaddr);
+		__cos_cav7_main_tlb_attrib_set(0x07);
+		__cos_cav7_main_tlb_pa_set(paddr | (0 << 6) | (3 << 1) | 1);
+	}
+
+	__cos_cav7_ats1cpr_set(vaddr);
+	assert((__cos_cav7_par_get() & 0xFFFFF000) == paddr);
+
+	return 0;
+}
+
+int
+chal_tlbflush(int a)
+{
+	__cos_cav7_tlbiall_set(a);
+
+	return 0;
+}
+
+int
+chal_tlbstall(void)
+{
+	return __cos_cav7_pmxevcntr_get();
+}
+
+int
+chal_tlbstall_recount(int a)
+{
+	__cos_cav7_pmxevcntr_set(0);
+
+	return 0;
+}
diff --git a/src/platform/armv7a/udivmoddi4.c b/src/platform/armv7a/udivmoddi4.c
new file mode 100644
index 0000000000..fae22b6d3f
--- /dev/null
+++ b/src/platform/armv7a/udivmoddi4.c
@@ -0,0 +1,33 @@
+/* CODE from https://github.com/vanvught/rpidmx512/tree/master/lib-arm/src/aeabi */
+#include "kernel.h" 
+
+unsigned long long udivmoddi4(unsigned long long num, unsigned long long den, unsigned long long *rem_p) {
+	unsigned long long quot = 0, qbit = 1;
+	unsigned int shift = 0;
+
+	if (den == 0) {
+		return 0;
+	}
+
+	shift = (unsigned int)__builtin_clzll(den);
+
+	den <<= shift;
+	qbit <<= shift;
+
+	while (qbit != (unsigned long) 0) {
+		if (den <= num) {
+			num -= den;
+			quot += qbit;
+		}
+
+		den >>= 1;
+		qbit >>= 1;
+	}
+
+	if (rem_p != NULL) {
+		*rem_p = num;
+	}
+
+	return quot;
+}
+
diff --git a/src/platform/armv7a/user.c b/src/platform/armv7a/user.c
new file mode 100644
index 0000000000..c5ca4f5e14
--- /dev/null
+++ b/src/platform/armv7a/user.c
@@ -0,0 +1,2 @@
+#include "kernel.h"
+#include "mem_layout.h"
diff --git a/src/platform/armv7a/vm.c b/src/platform/armv7a/vm.c
new file mode 100644
index 0000000000..f456d96b73
--- /dev/null
+++ b/src/platform/armv7a/vm.c
@@ -0,0 +1,122 @@
+#include <cc.h>
+#include <pgtbl.h>
+#include <thd.h>
+
+#include "kernel.h"
+#include "string.h"
+#include "chal_cpu.h"
+#include "mem_layout.h"
+#include "chal_pgtbl.h"
+
+struct tlb_quiescence tlb_quiescence[NUM_CPU] CACHE_ALIGNED;
+struct liveness_entry __liveness_tbl[LTBL_ENTS] CACHE_ALIGNED;
+
+#define KERN_INIT_PGD_IDX (COS_MEM_KERN_START_VA >> PGD_SHIFT)
+
+/* We are not using this, and we will not support AP */
+u32_t boot_comp_pgd[PAGE_SIZE / sizeof(u32_t)] PAGE_ALIGNED = {0};
+
+void
+kern_retype_initial(void)
+{
+	u8_t *k;
+
+	assert((int)mem_bootc_start() % RETYPE_MEM_NPAGES == 0);
+	assert((int)mem_bootc_end() % RETYPE_MEM_NPAGES == 0);
+	printk("PA-VA: 0x%x\r\n", COS_MEM_KERN_START_VA);
+	for (k = mem_bootc_start(); k < mem_bootc_end(); k += PAGE_SIZE * RETYPE_MEM_NPAGES) {
+		if (retypetbl_retype2user((void *)chal_va2pa(k), PAGE_ORDER)) assert(0);
+	}
+}
+
+u8_t *
+mem_boot_user_alloc(int npages) /* boot-time, bump-ptr heap */
+{
+	u8_t *        r = glb_memlayout.kern_boot_heap;
+	unsigned long i;
+
+	assert(glb_memlayout.allocs_avail);
+
+	glb_memlayout.kern_boot_heap += npages * (PAGE_SIZE / sizeof(u8_t));
+	assert(glb_memlayout.kern_boot_heap <= mem_kmem_end());
+	for (i = (unsigned long)r; i < (unsigned long)glb_memlayout.kern_boot_heap; i += PAGE_SIZE) {
+		if ((unsigned long)i % RETYPE_MEM_NPAGES == 0) {
+			if (retypetbl_retype2user((void *)chal_va2pa((void *)i), PAGE_ORDER)) {}
+		}
+	}
+
+	memset((void *)r, 0, npages * (PAGE_SIZE / sizeof(u8_t)));
+
+	return r;
+}
+
+u8_t *
+mem_boot_alloc(int npages) /* boot-time, bump-ptr heap */
+{
+	u8_t *        r = glb_memlayout.kern_boot_heap;
+	unsigned long i;
+
+	assert(glb_memlayout.allocs_avail);
+
+	glb_memlayout.kern_boot_heap += npages * (PAGE_SIZE / sizeof(u8_t));
+	assert(glb_memlayout.kern_boot_heap <= mem_kmem_end());
+	for (i = (unsigned long)r; i < (unsigned long)glb_memlayout.kern_boot_heap; i += PAGE_SIZE) {
+		if ((unsigned long)i % RETYPE_MEM_NPAGES == 0) {
+			if (retypetbl_retype2kern((void *)chal_va2pa((void *)i), PAGE_ORDER)) {}
+		}
+	}
+
+	memset((void *)r, 0, npages * (PAGE_SIZE / sizeof(u8_t)));
+
+	return r;
+}
+
+int
+kern_setup_image(void)
+{
+	chal_cpu_init();
+
+	kern_retype_initial();
+
+	return 0;
+}
+
+#define SCLR_UNLOCK_REG (*((volatile unsigned long *)0xF8000008))
+#define SCLR_LOCK_REG (*((volatile unsigned long *)0xF8000004))
+#define OCM_MAP_REG (*((volatile unsigned long *)0xF8000910))
+#define OCM_RESET_REG (*((volatile unsigned long *)0xF8000238))
+#define SCU_FILTER_START (*((volatile unsigned long *)0xF8F00040))
+void
+kern_paging_map_init(void *pa)
+{
+	/* We will initialize these mappings ourselves in assembly - we are already done */
+	/* is the OCM ready, or not at all? are we accessing SRAM or worse? */
+	/* Unlock the SCLR */
+	SCLR_UNLOCK_REG = 0xDF0D;
+
+	/* Map OCM to higher address - might have been an issue here */
+	OCM_MAP_REG = 0x10;
+	/* OCM reset */
+	OCM_RESET_REG = 0x01;
+	printk("OCM reg: %x\n", OCM_MAP_REG);
+	OCM_RESET_REG = 0x00;
+
+	/* Relock the SCLR */
+	SCLR_LOCK_REG = 0x767B;
+
+	/* Die if we fail miserably */
+	assert(*((volatile unsigned long *)0xF8000910) == 0x10);
+
+	/* Change the filtering control so that we now go to the SRAM */
+	SCU_FILTER_START = 0x00100000;
+}
+
+
+void
+paging_init(void)
+{
+	int ret;
+
+	printk("Initializing virtual memory\n");
+	if ((ret = kern_setup_image())) { die("Could not set up kernel image, errno %d.\n", ret); }
+}
diff --git a/src/platform/armv7a/vtxprintf.c b/src/platform/armv7a/vtxprintf.c
new file mode 100644
index 0000000000..b9a6582467
--- /dev/null
+++ b/src/platform/armv7a/vtxprintf.c
@@ -0,0 +1,294 @@
+/*  vtxprintf.c, from
+ *    linux/lib/vsprintf.c
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+
+#include "string.h"
+#include "vtxprintf.h"
+
+/*
+ * do_div() is NOT a C function. It wants to return
+ * two values (the quotient and the remainder), but
+ * since that doesn't work very well in C, what it
+ * does is:
+ *
+ * - modifies the 64-bit dividend _in_place_
+ * - returns the 32-bit remainder
+ *
+ * This ends up being the most efficient "calling
+ * convention" on x86.
+ */
+
+
+#define do_div(n, base)                       \
+	({                                    \
+		unsigned int __base = (base);          \
+		unsigned int __rem;                    \
+		__rem = ((unsigned long)(n)) % __base; \
+		(n)   = ((unsigned long)(n)) / __base; \
+		__rem;                        \
+	})
+
+
+/* haha, don't need ctype.c */
+#define isdigit(c) ((c) >= '0' && (c) <= '9')
+#define is_digit isdigit
+#define isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
+
+static int
+skip_atoi(const char **s)
+{
+	int i = 0;
+
+	while (is_digit(**s)) i = i * 10 + *((*s)++) - '0';
+	return i;
+}
+
+#define ZEROPAD 1  /* pad with zero */
+#define SIGN 2     /* unsigned/signed long */
+#define PLUS 4     /* show plus */
+#define SPACE 8    /* space if plus */
+#define LEFT 16    /* left justified */
+#define SPECIAL 32 /* 0x */
+#define LARGE 64   /* use 'ABCDEF' instead of 'abcdef' */
+
+static int
+number(void (*tx_byte)(unsigned char byte), unsigned long num, int base, int size, int precision, int type)
+{
+	char        c, sign, tmp[66];
+	const char *digits = "0123456789abcdefghijklmnopqrstuvwxyz";
+	int         i;
+	int         count = 0;
+
+	if (type & LARGE) digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	if (type & LEFT) type &= ~ZEROPAD;
+	if (base < 2 || base > 36) return 0;
+	c    = (type & ZEROPAD) ? '0' : ' ';
+	sign = 0;
+	if (type & SIGN) {
+		if ((signed long long)num < 0) {
+			sign = '-';
+			num  = -num;
+			size--;
+		} else if (type & PLUS) {
+			sign = '+';
+			size--;
+		} else if (type & SPACE) {
+			sign = ' ';
+			size--;
+		}
+	}
+	if (type & SPECIAL) {
+		if (base == 16)
+			size -= 2;
+		else if (base == 8)
+			size--;
+	}
+	i = 0;
+	if (num == 0)
+		tmp[i++] = '0';
+	else
+		while (num != 0) tmp[i++] = digits[do_div(num, base)];
+	if (i > precision) precision = i;
+	size -= precision;
+	if (!(type & (ZEROPAD + LEFT)))
+		while (size-- > 0) tx_byte(' '), count++;
+	if (sign) tx_byte(sign), count++;
+	if (type & SPECIAL) {
+		if (base == 8)
+			tx_byte('0'), count++;
+		else if (base == 16) {
+			tx_byte('0'), count++;
+			tx_byte(digits[33]), count++;
+		}
+	}
+	if (!(type & LEFT))
+		while (size-- > 0) tx_byte(c), count++;
+	while (i < precision--) tx_byte('0'), count++;
+	while (i-- > 0) tx_byte(tmp[i]), count++;
+	while (size-- > 0) tx_byte(' '), count++;
+	return count;
+}
+
+
+int
+vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args)
+{
+	int                len;
+	unsigned long long num;
+	int                i, base;
+	const char *       s;
+
+	int flags; /* flags to number() */
+
+	int field_width; /* width of output field */
+	int precision;   /* min. # of digits for integers; max
+	                    number of chars for from string */
+	int qualifier;   /* 'h', 'l', or 'L' for integer fields */
+
+	int count;
+
+#if defined(__SMM__) && CONFIG_SMM_TSEG
+	/* Fix pointer in TSEG */
+	tx_byte = console_tx_byte;
+#endif
+
+	for (count = 0; *fmt; ++fmt) {
+		if (*fmt != '%') {
+			tx_byte(*fmt), count++;
+			continue;
+		}
+
+		/* process flags */
+		flags = 0;
+	repeat:
+		++fmt; /* this also skips first '%' */
+		switch (*fmt) {
+		case '-':
+			flags |= LEFT;
+			goto repeat;
+		case '+':
+			flags |= PLUS;
+			goto repeat;
+		case ' ':
+			flags |= SPACE;
+			goto repeat;
+		case '#':
+			flags |= SPECIAL;
+			goto repeat;
+		case '0':
+			flags |= ZEROPAD;
+			goto repeat;
+		}
+
+		/* get field width */
+		field_width = -1;
+		if (is_digit(*fmt))
+			field_width = skip_atoi(&fmt);
+		else if (*fmt == '*') {
+			++fmt;
+			/* it's the next argument */
+			field_width = va_arg(args, int);
+			if (field_width < 0) {
+				field_width = -field_width;
+				flags |= LEFT;
+			}
+		}
+
+		/* get the precision */
+		precision = -1;
+		if (*fmt == '.') {
+			++fmt;
+			if (is_digit(*fmt))
+				precision = skip_atoi(&fmt);
+			else if (*fmt == '*') {
+				++fmt;
+				/* it's the next argument */
+				precision = va_arg(args, int);
+			}
+			if (precision < 0) precision = 0;
+		}
+
+		/* get the conversion qualifier */
+		qualifier = -1;
+		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') {
+			qualifier = *fmt;
+			++fmt;
+			if (*fmt == 'l') {
+				qualifier = 'L';
+				++fmt;
+			}
+		}
+
+		/* default base */
+		base = 10;
+
+		switch (*fmt) {
+		case 'c':
+			if (!(flags & LEFT))
+				while (--field_width > 0) tx_byte(' '), count++;
+			tx_byte((unsigned char)va_arg(args, int)), count++;
+			while (--field_width > 0) tx_byte(' '), count++;
+			continue;
+
+		case 's':
+			s = va_arg(args, char *);
+			if (!s) s = "<NULL>";
+
+			len = strnlen(s, precision);
+
+			if (!(flags & LEFT))
+				while (len < field_width--) tx_byte(' '), count++;
+			for (i = 0; i < len; ++i) tx_byte(*s++), count++;
+			while (len < field_width--) tx_byte(' '), count++;
+			continue;
+
+		case 'p':
+			if (field_width == -1) {
+				field_width = 2 * sizeof(void *);
+				flags |= ZEROPAD;
+			}
+			count += number(tx_byte, (unsigned long)va_arg(args, void *), 16, field_width, precision,
+			                flags);
+			continue;
+
+
+		case 'n':
+			if (qualifier == 'L') {
+				long long *ip = va_arg(args, long long *);
+				*ip           = count;
+			} else if (qualifier == 'l') {
+				long *ip = va_arg(args, long *);
+				*ip      = count;
+			} else {
+				int *ip = va_arg(args, int *);
+				*ip     = count;
+			}
+			continue;
+
+		case '%':
+			tx_byte('%'), count++;
+			continue;
+
+		/* integer number formats - set up the flags and "break" */
+		case 'o':
+			base = 8;
+			break;
+
+		case 'X':
+			flags |= LARGE;
+		case 'x':
+			base = 16;
+			break;
+
+		case 'd':
+		case 'i':
+			flags |= SIGN;
+		case 'u':
+			break;
+
+		default:
+			tx_byte('%'), count++;
+			if (*fmt)
+				tx_byte(*fmt), count++;
+			else
+				--fmt;
+			continue;
+		}
+		if (qualifier == 'L') {
+			num = va_arg(args, unsigned long long);
+		} else if (qualifier == 'l') {
+			num = va_arg(args, unsigned long);
+		} else if (qualifier == 'h') {
+			num = (unsigned short)va_arg(args, int);
+			if (flags & SIGN) num = (short)num;
+		} else if (flags & SIGN) {
+			num = va_arg(args, int);
+		} else {
+			num = va_arg(args, unsigned int);
+		}
+		count += number(tx_byte, num, base, field_width, precision, flags);
+	}
+	return count;
+}
diff --git a/src/platform/armv7a/vtxprintf.h b/src/platform/armv7a/vtxprintf.h
new file mode 100644
index 0000000000..09dd1e8bb4
--- /dev/null
+++ b/src/platform/armv7a/vtxprintf.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2009 coresystems GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef VTXPRINTF_H
+#define VTXPRINTF_H
+
+/* With GCC we use -nostdinc -ffreestanding to keep out system includes.
+ * Unfortunately this also gets us rid of the _compiler_ includes, like
+ * stdarg.h. To work around the issue, we define varargs directly here.
+ * On LLVM we can still just include stdarg.h.
+ */
+#ifdef __GNUC__
+#define va_start(v, l) __builtin_va_start(v, l)
+#define va_end(v) __builtin_va_end(v)
+#define va_arg(v, l) __builtin_va_arg(v, l)
+typedef __builtin_va_list va_list;
+#else
+#include <stdarg.h>
+#endif
+
+int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args);
+
+#endif /* VTXPRINTF_H */
diff --git a/src/platform/i386/.gdbinit b/src/platform/i386/.gdbinit
deleted file mode 100644
index 06f0f40f20..0000000000
--- a/src/platform/i386/.gdbinit
+++ /dev/null
@@ -1,2 +0,0 @@
-file kernel.img
-target remote localhost:1234
diff --git a/src/platform/i386/Makefile b/src/platform/i386/Makefile
index 8ea2e57796..bc87425582 100644
--- a/src/platform/i386/Makefile
+++ b/src/platform/i386/Makefile
@@ -1,12 +1,14 @@
 include Makefile.src
+include Makefile.arch
 
 CC := gcc -m32 -march=i686
-LD := ld -m elf_i386
+LD := ld -m elf_i386 --nmagic
 AS := as --32 -g
 
 INCPATH := ../../kernel/include
-INCS    := -I$(INCPATH) -I$(INCPATH)/shared/
-CFLAGS  := -g3 -O3 -fcommon -fno-stack-protector -ffreestanding -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -nostdinc -nostdlib -fno-pic -mno-red-zone $(INCS)
+INCS    := -I$(INCPATH) -I$(INCPATH)/shared/ -I$(INCPATH)/chal/
+# This variable gets rid of the all the warnings on Ubuntu 20, but we should look into each...
+CFLAGS  := $(ARCH_CFLAGS) -g3 -O3 -fno-stack-protector -ffreestanding -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -nostdinc -nostdlib -fno-pic -mno-red-zone $(INCS)
 LDFLAGS := -nostdlib -fno-builtin -nostartfiles -nostdinc -nodefaultlibs
 
 KERNEL := kernel.img
@@ -27,6 +29,7 @@ WARNINGS += -Wstrict-prototypes
 WARNINGS += -Wundef
 WARNINGS += -Wvolatile-register-var
 WARNINGS += -Wwrite-strings
+WARNINGS += -Wno-address-of-packed-member
 
 CFLAGS += $(WARNINGS)
 
@@ -48,6 +51,7 @@ OBJS += miniacpi.o
 OBJS += vga.o
 OBJS += exception.o
 OBJS += lapic.o
+OBJS += chal_pgtbl.o
 
 COS_OBJ += pgtbl.o
 COS_OBJ += retype_tbl.o
@@ -60,9 +64,11 @@ DEPS :=$(patsubst %.o, %.d, $(OBJS))
 
 OBJS += $(COS_OBJ)
 
+.PHONY: $(CONSTRUCTOR_COMP)
+
 all: $(KERNEL)
 
-$(KERNEL): linker.ld $(DEPS) $(OBJS) loader.o
+$(KERNEL): linker.ld $(OBJS) loader.o $(CONSTRUCTOR_COMP)
 	$(if $(CONSTRUCTOR_COMP), $(info |     [LD]   Linking in the constructor component $@))
 	$(if $(CONSTRUCTOR_COMP), @cp $(CONSTRUCTOR_COMP) constructor; $(LD) -r -b binary constructor -o constructor.o; objcopy --rename-section .data=.initial_component constructor.o; rm constructor)
 	$(if $(KERNEL_OUTPUT), $(info |     [LD]   Linking $@))
@@ -76,7 +82,12 @@ loader.o: loader.S entry.S
 	@$(CC) -c -I$(INCPATH) loader.S
 
 %.d: %.c
-	@$(CC) -M -MT $(patsubst %.d, %.o, $@) $(CFLAGS) $(LDFLAGS) $< -o $@
+	@set +e; rm -f $@; \
+	$(CC) -M $(CFLAGS) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
+	rm -f $@.$$$$
 
 pgtbl.o: ../../kernel/pgtbl.c
 	$(info |     [CC]   Compiling $@)
@@ -109,3 +120,5 @@ captbl.o: ../../kernel/captbl.c
 
 clean:
 	@rm -f *.d *.o $(KERNEL)
+
+-include $(DEPS)
diff --git a/src/platform/i386/boot_comp.c b/src/platform/i386/boot_comp.c
index 386cbe69a5..7ce078de74 100644
--- a/src/platform/i386/boot_comp.c
+++ b/src/platform/i386/boot_comp.c
@@ -2,6 +2,8 @@
 #include "kernel.h"
 #include "boot_comp.h"
 #include "chal_cpu.h"
+#include "chal/chal_proto.h"
+#include "chal_pgtbl.h"
 #include "mem_layout.h"
 #include "string.h"
 #include <pgtbl.h>
@@ -10,6 +12,7 @@
 #include <inv.h>
 #include <hw.h>
 #include <shared/elf_loader.h>
+#include <shared/cos_config.h>
 
 extern u8_t *boot_comp_pgd;
 
@@ -25,8 +28,7 @@ kern_boot_thd(struct captbl *ct, void *thd_mem, void *tcap_mem, const cpuid_t cp
 	struct tcap *              tc       = tcap_mem;
 	tcap_res_t                 expended;
 	int                        ret;
-	struct cap_pgtbl *         cap_pt;
-	pgtbl_t                    pgtbl;
+	struct cap_comp *          cap_comp;
 
 	assert(cpu_id >= 0);
 	assert(cos_info->cpuid == (u32_t)cpu_id);
@@ -58,15 +60,12 @@ kern_boot_thd(struct captbl *ct, void *thd_mem, void *tcap_mem, const cpuid_t cp
 	                    BOOT_CAPTBL_SELF_INITTHD_BASE_CPU(cpu_id), BOOT_CAPTBL_SELF_INITTCAP_BASE_CPU(cpu_id), 0, 1);
 	assert(!ret);
 
-	/*
-	 * boot component's mapped into SELF_PT,
-	 * switching to boot component's pgd
-	 */
-	cap_pt = (struct cap_pgtbl *)captbl_lkup(ct, BOOT_CAPTBL_SELF_PT);
-	if (!cap_pt || !CAP_TYPECHK(cap_pt, CAP_PGTBL)) assert(0);
-	pgtbl = cap_pt->pgtbl;
-	assert(pgtbl);
-	pgtbl_update(pgtbl);
+	/* switching to boot component's PGD using component capability */
+	cap_comp = (struct cap_comp *)captbl_lkup(ct, BOOT_CAPTBL_SELF_COMP);
+	if (!cap_comp || !CAP_TYPECHK(cap_comp, CAP_COMP)) assert(0);
+	assert(cap_comp->info.pgtblinfo.pgtbl);
+	pgtbl_update(&cap_comp->info.pgtblinfo);
+
 
 	printk("\tCreating initial threads, tcaps, and rcv end-points in boot-component.\n");
 }
@@ -78,54 +77,75 @@ mem_bootc_entry(void)
 }
 
 static int
-boot_nptes(unsigned int sz)
+boot_nptes(unsigned long vaddr_start, unsigned long sz, int lvl)
 {
-	return round_up_to_pow2(sz, PGD_RANGE) / PGD_RANGE;
+	/* 
+	 * Need the start address for edge cases
+	 * 4 lvl page tables, each lvl is: 0, 1, 2, 3
+	 * the 0, 1, 2 lvl page tables' order is 9, the 
+	 * last one order is 12, which is a page order
+	 * will return the number of lvl-th page tables needed.
+	 * the idea here is that page tables needed depends on
+	 * how many entries we have on higher lvl page table(s),
+	 * we calculate the entries one by one
+	 */	
+	assert(lvl > 0);
+	assert(sz > 0);
+	assert(vaddr_start <= COS_MEM_USER_MAX_VA);
+
+	unsigned long end_addr = (vaddr_start + sz - 1) >> PAGE_ORDER;
+	vaddr_start = vaddr_start >> PAGE_ORDER;
+
+	return ((end_addr >> ((PGTBL_DEPTH - lvl) * PGTBL_ENTRY_ORDER)) - 
+			(vaddr_start >> ((PGTBL_DEPTH - lvl) * PGTBL_ENTRY_ORDER)) 
+			+ 1);
 }
 
 static void
 boot_pgtbl_expand(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *label,
-		  unsigned long user_vaddr, unsigned int range)
+		  unsigned long user_vaddr, unsigned long range)
 {
 	int               ret;
 	u8_t *            ptes;
-	unsigned int      nptes = 0, i;
+	unsigned int      nptes = 0, lvl, i;
 	struct cap_pgtbl *pte_cap, *pgd_cap;
 
-	nptes = boot_nptes(range);
-	ptes  = mem_boot_alloc(nptes);
-	assert(ptes);
-
-	printk("\tCreating %d %s PTEs from [%x,%x) to [%x,%x).\n", nptes, label,
-	       ptes, ptes + nptes * PAGE_SIZE, user_vaddr, user_vaddr + range);
-
-	/*
-	 * Note the use of NULL here.  We aren't actually adding a PTE
-	 * currently.  This is a hack and only used on boot-up.  We'll
-	 * reuse this capability entry to create _multiple_ ptes.  We
-	 * won't create captbl entries for each of them, so they
-	 * cannot be aliased/removed later.  The only adverse
-	 * side-effect I can think of from this is that we cannot
-	 * reclaim all of the boot-time memory, but that is so far
-	 * into the future, I don't think we care.
-	 */
 	if (pgtbl_activate(ct, BOOT_CAPTBL_SELF_CT, ptecap, NULL, 1)) assert(0);
-	pte_cap = (struct cap_pgtbl *)captbl_lkup(ct, ptecap);
-	assert(pte_cap);
+	for (lvl = 1; lvl < PGTBL_DEPTH; lvl++) {
+		nptes = boot_nptes(user_vaddr, range, lvl);
+		ptes  = mem_boot_alloc(nptes);
+		assert(ptes);
 
-	/* Hook in the PTEs */
-	for (i = 0; i < nptes; i++) {
-		u8_t *  p  = ptes + i * PAGE_SIZE;
-		paddr_t pf = chal_va2pa(p);
-
-		pgtbl_init_pte(p);
-		pte_cap->pgtbl = (pgtbl_t)p;
+		printk("\tCreating %d %d-lvl %s pages from [%p,%p) for v_addr [%p,%p).\n", nptes, lvl ,label,
+	       ptes, ptes + nptes * PAGE_SIZE, user_vaddr, user_vaddr + range);
 
-		/* hook the pte into the boot component's page tables */
-		ret = cap_cons(ct, pgdcap, ptecap, (capid_t)(user_vaddr + i * PGD_RANGE));
-		assert(!ret);
+		/*
+		* Note the use of NULL here.  We aren't actually adding a PTE
+		* currently.  This is a hack and only used on boot-up.  We'll
+		* reuse this capability entry to create _multiple_ ptes.  We
+		* won't create captbl entries for each of them, so they
+		* cannot be aliased/removed later.  The only adverse
+		* side-effect I can think of from this is that we cannot
+		* reclaim all of the boot-time memory, but that is so far
+		* into the future, I don't think we care.
+		*/
+		pte_cap = (struct cap_pgtbl *)captbl_lkup(ct, ptecap);
+		assert(pte_cap);
+		/* Hook in the PTEs */
+		for (i = 0; i < nptes; i++) {
+			u8_t *  p  = ptes + i * PAGE_SIZE;
+			paddr_t pf = chal_va2pa(p);
+
+			pgtbl_init_pte(p);
+			pte_cap->pgtbl = (pgtbl_t)p;
+			pte_cap->lvl = lvl;
+			/* hook the pte into the boot component's page tables */
+			ret = cap_cons(ct, pgdcap, ptecap, 
+					(capid_t)(user_vaddr + i * (1 << (PAGE_ORDER + (PGTBL_DEPTH - lvl) * PGTBL_ENTRY_ORDER))));
+			assert(!ret);
+		}
 	}
-
+	
 	return;
 }
 
@@ -135,7 +155,7 @@ boot_pgtbl_mappings_add(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const
 {
 	int               ret;
 	u8_t *            ptes;
-	unsigned int      nptes = 0, i;
+	unsigned long int      nptes = 0, i;
 	struct cap_pgtbl *pte_cap, *pgd_cap;
 	pgtbl_t           pgtbl;
 
@@ -143,16 +163,18 @@ boot_pgtbl_mappings_add(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const
 	if (!pgd_cap || !CAP_TYPECHK(pgd_cap, CAP_PGTBL)) assert(0);
 	pgtbl = (pgtbl_t)pgd_cap->pgtbl;
 
-	printk("\tMapping in %s (@ [0x%x, 0x%x))\n", label, user_vaddr, user_vaddr + range);
+	printk("\tMapping in %s (@ [0x%p, 0x%p))\n", label, user_vaddr, user_vaddr + range);
 	/* Map in the actual memory. */
 	for (i = 0; i < round_up_to_page(range) / PAGE_SIZE; i++) {
 		u8_t *  p     = kern_vaddr + i * PAGE_SIZE;
 		paddr_t pf    = chal_va2pa(p);
-		u32_t   mapat = (u32_t)user_vaddr + i * PAGE_SIZE, flags = 0;
+		unsigned long   mapat = (unsigned long)user_vaddr + i * PAGE_SIZE;
+		word_t flags = 0;
 
-		if (uvm && pgtbl_mapping_add(pgtbl, mapat, pf, PGTBL_USER_DEF)) assert(0);
-		if (!uvm && pgtbl_cosframe_add(pgtbl, mapat, pf, PGTBL_COSFRAME)) assert(0);
-		assert((void *)p == pgtbl_lkup(pgtbl, user_vaddr + i * PAGE_SIZE, &flags));
+		if (uvm && pgtbl_mapping_add(pgtbl, mapat, pf, X86_PGTBL_USER_DEF, PAGE_ORDER)) assert(0);
+		if (!uvm && pgtbl_cosframe_add(pgtbl, mapat, pf, X86_PGTBL_COSFRAME, PAGE_ORDER)) assert(0);
+		assert(pf == (*(unsigned long*)chal_pgtbl_lkup_lvl((pgtbl_t)(pgtbl), mapat, &flags, 0, PGTBL_DEPTH) & 
+				PGTBL_ENTRY_ADDR_MASK));
 	}
 
 	return 0;
@@ -176,16 +198,16 @@ boot_elf_process(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *
 	unsigned char *bss;	   /* memory array for the last bit of .data and .bss */
 
 	/* RO + Code */
-	if (elf_contig_mem((struct elf_hdr *)kern_vaddr, 0, &s[0])) assert(0);
+	if (elf_contig_mem(kern_vaddr, 0, &s[0])) assert(0);
 	assert(s[0].objsz == s[0].sz && s[0].access == ELF_PH_CODE);
 
 	/* Data + BSS */
-	if (elf_contig_mem((struct elf_hdr *)kern_vaddr, 1, &s[1])) assert(0);
+	if (elf_contig_mem(kern_vaddr, 1, &s[1])) assert(0);
 	assert(s[1].access == ELF_PH_RW);
 	/* the data should immediately follow code */
 	assert(round_up_to_page(s[0].vstart + s[0].sz) == s[1].vstart);
 	/* should be page aligned so that we can map it directly */
-	assert(round_to_page(s[0].mem) == (unsigned int)s[0].mem);
+	assert(round_to_page(s[0].mem) == (unsigned long)s[0].mem);
 
 	/* allocate bss memory, including the last sub-page of .data (assumes .data is page-aligned) */
 	assert(s[1].vstart % PAGE_SIZE == 0);
@@ -199,8 +221,7 @@ boot_elf_process(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *
 	memset(bss + bss_offset, 0, bss_sz);
 
 	/* Assume there are no more sections */
-	if (elf_contig_mem((struct elf_hdr *)kern_vaddr, 2, &s[2]) != 1) assert(0);
-
+	if (elf_contig_mem(kern_vaddr, 2, &s[2]) != 1) assert(0);
 
 	/* We have the elf information, time to do the virtual memory operations... */
 	boot_pgtbl_expand(ct, pgdcap, ptecap, label, s[0].vstart, round_up_to_page(s[0].sz) + s[1].sz);
@@ -219,7 +240,7 @@ boot_elf_process(struct captbl *ct, capid_t pgdcap, capid_t ptecap, const char *
 void
 kern_boot_comp(const cpuid_t cpu_id)
 {
-	int            ret = 0, nkmemptes;
+	int            ret = 0, nkmemptes = 0;
 	unsigned int   i;
 	u8_t *         boot_comp_captbl;
 	pgtbl_t        pgtbl     = (pgtbl_t)chal_va2pa(&boot_comp_pgd), boot_vm_pgd;
@@ -228,7 +249,7 @@ kern_boot_comp(const cpuid_t cpu_id)
 	assert(cpu_id >= 0);
 	if (NUM_CPU > 1 && cpu_id > 0) {
 		assert(glb_boot_ct);
-		pgtbl_update(pgtbl);
+		chal_cpu_pgtbl_activate(pgtbl);
 		kern_boot_thd(glb_boot_ct, thd_mem[cpu_id], tcap_mem[cpu_id], cpu_id);
 		return;
 	}
@@ -293,12 +314,13 @@ kern_boot_comp(const cpuid_t cpu_id)
 	 */
 	if (pgtbl_activate(glb_boot_ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_UNTYPED_PT, pgtbl, 0)) assert(0);
 
-	nkmemptes = boot_nptes(mem_utmem_end() - mem_boot_end());
 	boot_pgtbl_expand(glb_boot_ct, BOOT_CAPTBL_SELF_UNTYPED_PT, BOOT_CAPTBL_KM_PTE, "untyped memory",
-			  BOOT_MEM_KM_BASE, mem_utmem_end() - mem_boot_nalloc_end(nkmemptes));
+			  BOOT_MEM_KM_BASE, mem_utmem_end() - mem_boot_end());
+
 	ret = boot_pgtbl_mappings_add(glb_boot_ct, BOOT_CAPTBL_SELF_UNTYPED_PT, BOOT_CAPTBL_KM_PTE, "untyped memory",
-                                      mem_boot_nalloc_end(nkmemptes), BOOT_MEM_KM_BASE,
-                                      mem_utmem_end() - mem_boot_nalloc_end(nkmemptes), 0);
+                                      mem_utmem_start(), BOOT_MEM_KM_BASE,
+                                      mem_utmem_end() - mem_utmem_start(), 0);
+
 	assert(ret == 0);
 
 	printk("\tCapability table and page-table created.\n");
@@ -307,7 +329,7 @@ kern_boot_comp(const cpuid_t cpu_id)
 	glb_memlayout.allocs_avail = 0;
 
 	if (comp_activate(glb_boot_ct, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_COMP, BOOT_CAPTBL_SELF_CT, BOOT_CAPTBL_SELF_PT, 0,
-	                  mem_bootc_entry(), NULL))
+	                  mem_bootc_entry()))
 		assert(0);
 	printk("\tCreated boot component structure from page-table and capability-table.\n");
 
@@ -319,14 +341,14 @@ kern_boot_comp(const cpuid_t cpu_id)
 void
 kern_boot_upcall(void)
 {
-	void *entry = (void *)mem_bootc_entry();
-	u32_t flags = 0;
+	void  *entry = (void *)mem_bootc_entry();
+	word_t flags = 0;
 	void *p;
 
 	assert(get_cpuid() >= 0);
 	/* only print complete msg for BSP */
-	if (get_cpuid() == 0) {
-		printk("Upcall into boot component at ip 0x%x for cpu: %d with tid: %d\n", entry, get_cpuid(), thd_current(cos_cpu_local_info())->tid);
+	if (get_cpuid() == INIT_CORE) {
+		printk("Upcall into boot component at ip 0x%p for cpu: %d with tid: %d\n", entry, get_cpuid(), thd_current(cos_cpu_local_info())->tid);
 		printk("------------------[ Kernel boot complete ]------------------\n");
 	}
 
diff --git a/src/platform/i386/chal.c b/src/platform/i386/chal.c
index 141bfadb00..854ee7369a 100644
--- a/src/platform/i386/chal.c
+++ b/src/platform/i386/chal.c
@@ -11,18 +11,6 @@ u32_t        chal_msr_mhz = 0;
 
 paddr_t chal_kernel_mem_pa;
 
-void *
-chal_pa2va(paddr_t address)
-{
-	return (void *)(address + COS_MEM_KERN_START_VA);
-}
-
-paddr_t
-chal_va2pa(void *address)
-{
-	return (paddr_t)(address - COS_MEM_KERN_START_VA);
-}
-
 void *
 chal_alloc_kern_mem(int order)
 {
@@ -54,6 +42,40 @@ chal_khalt(void)
 	khalt();
 }
 
+int
+chal_tlb_lockdown(unsigned long entryid, unsigned long vaddr, unsigned long paddr)
+{
+	return 0;
+}
+
+int
+chal_l1flush(void)
+{
+	/* TODO */
+	return 0;
+}
+
+int
+chal_tlbflush(int a)
+{
+	/* TODO */
+	return 0;
+}
+
+int
+chal_tlbstall(void)
+{
+	/* TODO */
+	return 0;
+}
+
+int
+chal_tlbstall_recount(int a)
+{
+	/* TODO */
+	return 0;
+}
+
 void
 chal_init(void)
 {
@@ -100,6 +122,8 @@ chal_init(void)
 	if (d & (1 << 8)) printk("invariant_tsc ");
 	printk("]\n");
 
+	chal_cpuid(0x16, &a, &b, &c, &d);
+	/* FIXME: on x86_64, need to do cpuid twice to get frequency, don't know why */
 	chal_cpuid(0x16, &a, &b, &c, &d);
 	a = (a << 16) >> 16;
 	if (a) {
@@ -107,6 +131,7 @@ chal_init(void)
 		printk("\tCPUID max  frequency: %d (* 1Mhz)\n", (b << 16) >> 16);
 	}
 
+	/* FIXME: on x86_64, cannot get platform info on qemu */
 	readmsr(MSR_PLATFORM_INFO, &a, &b);
 	a = (a >> 8) & ((1<<7)-1);
 	if (a) {
diff --git a/src/platform/i386/chal/call_convention.h b/src/platform/i386/chal/call_convention.h
index a956f2870a..d6b785a847 100644
--- a/src/platform/i386/chal/call_convention.h
+++ b/src/platform/i386/chal/call_convention.h
@@ -12,38 +12,66 @@ __userregs_setret(struct pt_regs *regs, unsigned long ret)
 {
 	regs->ax = ret;
 }
+
 static inline unsigned long
 __userregs_getsp(struct pt_regs *regs)
 {
 	return regs->bp;
 }
+
 static inline unsigned long
 __userregs_getip(struct pt_regs *regs)
 {
+#if defined(__x86_64__)
+	return regs->r8;
+#elif defined(__i386__)
 	return regs->cx;
+#endif
 }
+
 static inline capid_t
 __userregs_getcap(struct pt_regs *regs)
 {
 	return (regs->ax >> COS_CAPABILITY_OFFSET) - 1;
 }
+
 static inline u32_t
 __userregs_getop(struct pt_regs *regs)
 {
 	return regs->ax & ((1 << COS_CAPABILITY_OFFSET) - 1);
 }
+
 static inline unsigned long
 __userregs_getinvret(struct pt_regs *regs)
 {
+#if defined(__x86_64__)
+	/* r8 holds the return value on invocation return path. */
+	return regs->r8;
+#elif defined(__i386__)
+	/* cx holds the return value on invocation return path. */
 	return regs->cx;
-} /* cx holds the return value on invocation return path. */
+#endif
+} 
+
 static inline void
 __userregs_set(struct pt_regs *regs, unsigned long ret, unsigned long sp, unsigned long ip)
 {
+#if defined(__x86_64__)
+	regs->ax = ret;
+	regs->ip = regs->cx = ip;
+	regs->sp = regs->bp = sp;
+
+#elif defined(__i386__)
 	regs->ax = ret;
 	regs->sp = regs->cx = sp;
 	regs->ip = regs->dx = ip;
+#endif
 }
+
+static inline void
+__userregs_setinv(struct pt_regs *regs, unsigned long id, unsigned long tok, unsigned long ip)
+{ __userregs_set(regs, id, tok, ip); }
+
 static inline void
 __userregs_setretvals(struct pt_regs *regs, unsigned long ret, unsigned long ret1, unsigned long ret2, unsigned long ret3)
 {
@@ -52,9 +80,13 @@ __userregs_setretvals(struct pt_regs *regs, unsigned long ret, unsigned long ret
 	regs->di = ret2;
 	regs->bx = ret3;
 }
+
 static inline void
 __userregs_sinvupdate(struct pt_regs *regs)
 {
+#if defined(__x86_64__)
+	regs->r12 = regs->dx;
+#elif defined(__i386__)
 	/* IPC calling side has 4 args (in order): bx, si, di, dx */
 	/* IPC server side receives 4 args: bx, si, di, bp */
 	/* So we need to pass the 4th argument. */
@@ -63,23 +95,28 @@ __userregs_sinvupdate(struct pt_regs *regs)
 	/* regs->si = regs->si; */
 	/* regs->di = regs->di; */
 	regs->bp = regs->dx;
+#endif
 }
-static inline int
+
+static inline word_t 
 __userregs_get1(struct pt_regs *regs)
 {
 	return regs->bx;
 }
-static inline int
+
+static inline word_t 
 __userregs_get2(struct pt_regs *regs)
 {
 	return regs->si;
 }
-static inline int
+
+static inline word_t 
 __userregs_get3(struct pt_regs *regs)
 {
 	return regs->di;
 }
-static inline int
+
+static inline word_t 
 __userregs_get4(struct pt_regs *regs)
 {
 	return regs->dx;
@@ -89,20 +126,40 @@ static inline void
 copy_gp_regs(struct pt_regs *from, struct pt_regs *to)
 {
 #define COPY_REG(reg) to->reg = from->reg
-	COPY_REG(ax);
+#if defined(__x86_64__)
+	COPY_REG(r15);
+	COPY_REG(r14);
+	COPY_REG(r13);
+	COPY_REG(r12);
+	COPY_REG(r11);
+	COPY_REG(r10);
+	COPY_REG(r9);
+	COPY_REG(r8);
+#endif
 	COPY_REG(bx);
 	COPY_REG(cx);
 	COPY_REG(dx);
 	COPY_REG(si);
 	COPY_REG(di);
 	COPY_REG(bp);
+	COPY_REG(ax);
 #undef COPY_REG
 }
 
 static inline void
 copy_all_regs(struct pt_regs *from, struct pt_regs *to)
 {
-#define COPY_REG(reg) to->reg = from->reg
+#define COPY_REG(reg) to->reg = from->reg	
+#if defined(__x86_64__)
+	COPY_REG(r15);
+	COPY_REG(r14);
+	COPY_REG(r13);
+	COPY_REG(r12);
+	COPY_REG(r11);
+	COPY_REG(r10);
+	COPY_REG(r9);
+	COPY_REG(r8);
+#endif
 	COPY_REG(bx);
 	COPY_REG(cx);
 	COPY_REG(dx);
@@ -123,4 +180,31 @@ copy_all_regs(struct pt_regs *from, struct pt_regs *to)
 #undef COPY_REG
 }
 
+static inline void
+regs_upcall_setup(struct pt_regs *r, unsigned long entry_addr, int option, int id, int arg1, int arg2, int arg3)
+{
+#if defined(__x86_64__)
+	/* $0x3200 : enable interrupt, and iopl is set to 3, the same as user's CPL */
+	r->r11	= 0x3200;
+	r->r12	= option;
+
+	r->bx	= arg1;
+	r->di	= arg2;
+	r->si	= arg3;
+
+	r->ip	= r->cx	= entry_addr;
+	r->ax	= id;
+#elif defined(__i386__)
+	r->cx = option;
+
+	r->bx = arg1;
+	r->di = arg2;
+	r->si = arg3;
+
+	r->ip = r->dx = entry_addr;
+	r->ax         = id; // thd id + cpu id
+#endif
+	return;
+}
+
 #endif /* CALL_CONVENTION_H */
diff --git a/src/platform/i386/chal/chal_config.h b/src/platform/i386/chal/chal_config.h
index 2624ad9fab..c199bb84ff 100644
--- a/src/platform/i386/chal/chal_config.h
+++ b/src/platform/i386/chal/chal_config.h
@@ -86,4 +86,13 @@ cos_mem_fence(void)
 // Static entries are after the dynamic allocated entries
 #define COS_STATIC_THD_ENTRY(i) ((i + COS_THD_INIT_REGION_SIZE + 1))
 
+#define COS_SYSCALL __attribute__((regparm(0)))
+#if defined(__x86_64__)
+#define KERNEL_PGD_REGION_OFFSET (PAGE_SIZE - PAGE_SIZE / 2)
+#define KERNEL_PGD_REGION_SIZE (PAGE_SIZE / 2)
+#elif defined(__i386__)
+#define KERNEL_PGD_REGION_OFFSET (PAGE_SIZE - PAGE_SIZE / 4)
+#define KERNEL_PGD_REGION_SIZE (PAGE_SIZE / 4)
+#endif
+
 #endif /* CHAL_CONFIG_H */
diff --git a/src/platform/i386/chal/chal_plat.h b/src/platform/i386/chal/chal_plat.h
new file mode 100644
index 0000000000..68f2a4152c
--- /dev/null
+++ b/src/platform/i386/chal/chal_plat.h
@@ -0,0 +1,43 @@
+#ifndef CHAL_PLAT_H
+#define CHAL_PLAT_H
+
+int chal_tlb_lockdown(unsigned long entryid, unsigned long vaddr, unsigned long paddr);
+int chal_l1flush(void);
+int chal_tlbstall(void);
+int chal_tlbstall_recount(int a);
+int chal_tlbflush(int a);
+
+/* This flushes all levels of cache of the current logical CPU. */
+static inline void
+chal_flush_cache(void)
+{
+	asm volatile("wbinvd" : : : "memory");
+}
+
+static inline void
+chal_flush_tlb_global(void)
+{
+}
+static inline void
+chal_remote_tlb_flush(int target_cpu)
+{
+}
+/* This won't flush global TLB (pinned with PGE) entries. */
+static inline void
+chal_flush_tlb(void)
+{
+}
+
+static inline void *
+chal_pa2va(paddr_t address)
+{
+	return (void *)(address + COS_MEM_KERN_START_VA);
+}
+
+static inline paddr_t
+chal_va2pa(void *address)
+{
+	return (paddr_t)((unsigned long)address - COS_MEM_KERN_START_VA);
+}
+
+#endif /* CHAL_PLAT_H */
diff --git a/src/platform/i386/chal/chal_proto.h b/src/platform/i386/chal/chal_proto.h
new file mode 100644
index 0000000000..8429b3de9d
--- /dev/null
+++ b/src/platform/i386/chal/chal_proto.h
@@ -0,0 +1,61 @@
+/* Architecture-specific prototypes that go into the kernel */
+#ifndef CHAL_PROTO_H
+#define CHAL_PROTO_H
+
+/* Page table platform-dependent definitions */
+#define PGTBL_PAGEIDX_SHIFT (12)
+#define PGTBL_FRAME_BITS (32 - PGTBL_PAGEIDX_SHIFT)
+
+#if defined(__x86_64__)
+#define PGTBL_ENTRY_ADDR_MASK 0xfffffffffffff000
+#define PGTBL_DEPTH 4
+#define PGTBL_ENTRY_ORDER 9
+#define PGTBL_FLAG_MASK 0xf800000000000fff
+#define PGTBL_FRAME_MASK (~PGTBL_FLAG_MASK)
+#elif defined(__i386__)
+#define PGTBL_ENTRY_ADDR_MASK 0xfffff000
+#define PGTBL_DEPTH 2
+#define PGTBL_ENTRY_ORDER 10
+#define PGTBL_FLAG_MASK ((1 << PGTBL_PAGEIDX_SHIFT) - 1)
+#define PGTBL_FRAME_MASK (~PGTBL_FLAG_MASK)
+#endif
+
+#define PGTBL_ENTRY (1 << PGTBL_ENTRY_ORDER)
+#define SUPER_PAGE_FLAG_MASK  (0x3FFFFF)
+#define SUPER_PAGE_PTE_MASK   (0x3FF000)
+
+/* FIXME:find a better way to do this */
+#define EXTRACT_SUB_PAGE(super) ((super) & SUPER_PAGE_PTE_MASK)
+
+/* Page table related prototypes & structs */
+/* make it an opaque type...not to be touched */
+typedef struct pgtbl *pgtbl_t;
+
+struct pgtbl_info {
+	asid_t  asid; /* Unused */
+	pgtbl_t pgtbl;
+} __attribute__((packed));
+
+/* identical to the capability structure */
+struct cap_pgtbl {
+	struct cap_header h;
+	u32_t             refcnt_flags; /* includes refcnt and flags */
+	pgtbl_t           pgtbl;
+	u32_t             lvl;       /* what level are the pgtbl nodes at? */
+	struct cap_pgtbl *parent;    /* if !null, points to parent cap */
+	u64_t             frozen_ts; /* timestamp when frozen is set. */
+} __attribute__((packed));
+
+/* Update the page table */
+static inline void
+chal_pgtbl_update(struct pgtbl_info *pt)
+{
+	asm volatile("mov %0, %%cr3" : : "r"(pt->pgtbl));
+}
+
+static inline asid_t
+chal_asid_alloc(void)
+{ return 0; }
+
+#endif /* CHAL_PROTO_H */
+
diff --git a/src/platform/i386/chal/cpuid.h b/src/platform/i386/chal/cpuid.h
index c2d622f782..000ca87779 100644
--- a/src/platform/i386/chal/cpuid.h
+++ b/src/platform/i386/chal/cpuid.h
@@ -19,8 +19,13 @@ static inline cycles_t
 tsc(void)
 {
 	unsigned long long ret;
-
-	__asm__ __volatile__("rdtsc" : "=A"(ret));
+	
+	#if defined(__x86_64__)
+		__asm__ __volatile__("rdtsc; shl $32, %%rdx; or %%rdx, %0" : "=a"(ret)::"rdx");
+	#elif defined(__i386__)
+		__asm__ __volatile__("rdtsc" : "=A"(ret));
+	#endif
+	
 
 	return ret;
 }
@@ -84,11 +89,11 @@ cos_cpu_local_info(void)
 static inline int
 get_cpuid(void)
 {
-	if (NUM_CPU > 1) {
-		return cos_cpu_local_info()->cpuid;
-	}
-
+#if NUM_CPU == 1
 	return 0;
+#endif
+
+	return cos_cpu_local_info()->cpuid;
 }
 
 #endif /* CPUID_H */
diff --git a/src/platform/i386/chal/defs.h b/src/platform/i386/chal/defs.h
index b379154dec..3929d2451c 100644
--- a/src/platform/i386/chal/defs.h
+++ b/src/platform/i386/chal/defs.h
@@ -3,7 +3,25 @@
 
 typedef unsigned long int size_t;
 
-void *memset(void *dst, int c, size_t count);
-void *memcpy(void *dst, const void *src, size_t count);
+static inline void *
+memcpy(void *dst, const void *src, size_t count)
+{
+	const u8_t *s = (const u8_t *)src;
+	u8_t *      d = (u8_t *)dst;
+
+	for (; count != 0; count--) *d++ = *s++;
+
+	return dst;
+}
+
+static inline void *
+memset(void *dst, int c, size_t count)
+{
+	char *p = (char *)dst;
+
+	for (; count != 0; count--) *p++ = c;
+
+	return dst;
+}
 
 #endif /* DEFS_H */
diff --git a/src/platform/i386/chal/io.h b/src/platform/i386/chal/io.h
deleted file mode 100644
index 36848ddc20..0000000000
--- a/src/platform/i386/chal/io.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef IO_H
-#define IO_H
-
-/**
- * Write byte to specific port
- */
-static inline void
-outb(u16_t port, u8_t value)
-{
-	__asm__ __volatile__("outb %1, %0" : : "dN"(port), "a"(value));
-}
-
-/**
- * Read byte from port
- */
-static inline u8_t
-inb(u16_t port)
-{
-	u8_t ret;
-
-	__asm__ __volatile__("inb %1, %0" : "=a"(ret) : "dN"(port));
-
-	return ret;
-}
-
-#endif /* IO_H */
diff --git a/src/platform/i386/chal/shared/chal_consts.h b/src/platform/i386/chal/shared/chal_consts.h
new file mode 100644
index 0000000000..96f02fdf80
--- /dev/null
+++ b/src/platform/i386/chal/shared/chal_consts.h
@@ -0,0 +1,49 @@
+#ifndef CHAL_CONSTS_H
+#define CHAL_CONSTS_H
+
+struct pt_regs {
+        long bx;
+        long cx;
+        long dx;
+        long si;
+        long di;
+        long bp;
+        long ax;
+        long ds;
+        long es;
+        long fs;
+        long gs;
+        long orig_ax;
+        long ip;
+        long cs;
+        long flags;
+        long sp;
+        long ss;
+};
+
+#define PAGE_MASK (~(PAGE_SIZE - 1))
+#define PGD_SHIFT 22
+#define PGD_RANGE (1 << PGD_SHIFT)
+#define PGD_SIZE PGD_RANGE
+#define PGD_MASK (~(PGD_RANGE - 1))
+#define PGD_PER_PTBL 1024
+
+#define PGT1_SHIFT 30
+#define PGT1_RANGE (1UL << PGT1_SHIFT)
+#define PGT1_SIZE PGT1_RANGE
+#define PGT1_MASK (~(PGT1_RANGE - 1))
+#define PGT1_PER_PTBL 512
+
+#define PGT2_SHIFT 21
+#define PGT2_RANGE (1UL << PGT2_SHIFT)
+#define PGT2_SIZE PGT2_RANGE
+#define PGT2_MASK (~(PGT2_RANGE - 1))
+#define PGT2_PER_PTBL 512
+
+#define PGT3_SHIFT 12
+#define PGT3_RANGE (1UL << PGT3_SHIFT)
+#define PGT3_SIZE PGT3_RANGE
+#define PGT3_MASK (~(PGT3_RANGE - 1))
+#define PGT3_PER_PTBL 512
+
+#endif /* CHAL_CONSTS_H */
diff --git a/src/platform/i386/chal/shared/cos_config.h b/src/platform/i386/chal/shared/cos_config.h
new file mode 100644
index 0000000000..d5f522b4b8
--- /dev/null
+++ b/src/platform/i386/chal/shared/cos_config.h
@@ -0,0 +1,197 @@
+#ifndef COS_CONFIG_H
+#define COS_CONFIG_H
+
+/***
+ * Memory information.  Included are four sections:
+ * - physical memory information (PA)
+ * - virtual memory addresses (VA)
+ * - resource table addresses to index memory resources (RTA)
+ * - the maximum number of pages of the different types of memory.
+ *   See BOOT_* in cos_types.h for this information
+ *
+ * These exist separately for kernel-accessible memory that can be
+ * typed as either kernel or user virtual memory, and
+ * kernel-inaccessible memory that can only be used as user virtual
+ * memory.
+ */
+
+#include "cpu_ghz.h"
+
+#define NUM_CPU 1
+#define NUM_CPU_BMP_BYTES ((NUM_CPU + 7) / 8)
+#define NUM_CPU_BMP_WORDS ((NUM_CPU_BMP_BYTES + 3) / 4)
+/* 
+ * FIXME: The macro to set a portion of memory of the booter to super pages - 
+ * should be dynamically passed from kernel to userlevel!
+ */
+#define NUM_SUPERPAGES           139 
+#define MAX_USABLE_MEMORY        1700
+/* FIXME: This is a hack - was 0xD800000, now expanded to 1200MB */
+#define EXTRA_MEMORY             ((MAX_USABLE_MEMORY - 512) << 20)
+#define EXTRA_SUPERPAGES         ((MAX_USABLE_MEMORY - 808) / 4)
+#define TOTAL_SUPERPAGES         (NUM_SUPERPAGES + EXTRA_SUPERPAGES - 1)
+
+/*
+ * 1 MB, note that this is not the PA of kernel-usable memory, instead
+ * it is the PA of the kernel.  If you change this, update the kernel
+ * linker script (.ld) as well.
+ */
+#define COS_MEM_KERN_PA (0x00100000)
+#if defined(__x86_64__)
+#define COS_MEM_KERN_PA_ORDER (33)
+#else
+#define COS_MEM_KERN_PA_ORDER (29)
+#endif
+#define COS_MEM_KERN_PA_SZ ((1UL << COS_MEM_KERN_PA_ORDER) - (1UL << 26)) /* FIXME: Need a way to get physical memory size from kernel. Cannot use a hardcoded value, actual memory could be much lower! */
+
+#define COS_MEM_COMP_START_VA ((1 << 30) + (1 << 22)) /* 1GB + 4MB (a relic) */
+
+#if defined(__x86_64__)
+#define COS_MEM_KERN_HIGH_ADDR_VA_PGD_MASK 0x0000ff8000000000
+#define COS_MEM_KERN_START_VA (0xffff800000000000) // COS_MEM_KERN_PA     /* currently, we don't do kernel relocation */
+#define COS_MEM_USER_MAX_VA 0x00007fffffffffff
+#else 
+#define COS_MEM_USER_MAX_VA (0xc0000000 - 1)
+#define COS_MEM_KERN_START_VA (0xc0000000) // COS_MEM_KERN_PA     /* currently, we don't do kernel relocation */
+#endif
+
+#define COS_HW_MMIO_MAX_SZ (1UL << 27) /* Assuming a MAX of 128MB for MMIO. */
+#if defined(__x86_64__)
+#define COS_PHYMEM_MAX_SZ ((1UL << 35) - (1UL << 22) - COS_HW_MMIO_MAX_SZ) /* 1GB - 4MB - MMIO sz */
+#define COS_PHYMEM_END_PA ((1UL << 35) - COS_HW_MMIO_MAX_SZ) /* Maximum usable physical memory */
+#else
+#define COS_PHYMEM_MAX_SZ ((1UL << 30) - (1UL << 22) - COS_HW_MMIO_MAX_SZ) /* 1GB - 4MB - MMIO sz */
+#define COS_PHYMEM_END_PA ((1UL << 30) - COS_HW_MMIO_MAX_SZ) /* Maximum usable physical memory */
+#endif
+
+
+#define BOOT_COMP_MAX_SZ (1 << 24) /* 16 MB for the booter component */
+
+#define CPU_TIMER_FREQ 100 // set in your linux .config
+
+#define RUNTIME 3 // seconds
+
+/* The kernel quiescence period = WCET in Kernel + WCET of a CAS. */
+#define KERN_QUIESCENCE_PERIOD_US 500
+#define KERN_QUIESCENCE_CYCLES (KERN_QUIESCENCE_PERIOD_US * 4000)
+#define TLB_QUIESCENCE_CYCLES (4000 * 1000 * (1000 / CPU_TIMER_FREQ))
+
+// After how many seconds should schedulers print out their information?
+#define SCHED_PRINTOUT_PERIOD 100000
+#define COMPONENT_ASSERTIONS 1 // activate assertions in components?
+
+//#define FPU_ENABLED
+#define FPU_SUPPORT_FXSR 1 /* >0 : CPU supports FXSR. */
+
+/* the CPU that does initialization for Composite */
+#define INIT_CORE 0
+#define NUM_CPU_COS (NUM_CPU > 1 ? NUM_CPU - 1 : 1)
+
+/* Composite user memory uses physical memory above this. */
+#define COS_MEM_START COS_MEM_KERN_PA
+
+/* NUM_CPU_SOCKETS defined in cpu_ghz.h. The information is used for
+ * intelligent IPI distribution. */
+#define NUM_CORE_PER_SOCKET (NUM_CPU / NUM_CPU_SOCKETS)
+
+// cos kernel settings
+#define COS_PRINT_MEASUREMENTS 1
+#define COS_PRINT_SCHED_EVENTS 1
+#define COS_ASSERTIONS_ACTIVE 1
+
+/*** Console and output options ***/
+/*
+ * Notes: If you are using composite as high priority and no idle to
+ * linux, then the shell output will not appear until the Composite
+ * system has exited.  Thus, you will want to make the memory size
+ * large enough to buffer _all_ output.  Note that currently
+ * COS_PRINT_MEM_SZ should not exceed around (1024*1024*3).
+ *
+ * If you have COS_PRINT_SHELL, you _will not see output_ unless you
+ * run
+ * $~/transfer/print
+ * after
+ * # make
+ * but before the runscript.
+ */
+/* print out to the shell? */
+#define COS_PRINT_SHELL 1
+/* how much should we buffer before sending an event to the shell? */
+#define COS_PRINT_BUF_SZ 128
+/* how large should the shared memory region be that will buffer print data? */
+#define COS_PRINT_MEM_SZ (4096)
+
+/* print out to dmesg? */
+/* #define COS_PRINT_DMESG 1 */
+
+/**
+ * Configuration to enable/disable functionality in Kernel.
+ */
+#define ENABLE_VGA
+#define ENABLE_SERIAL
+
+#if defined(__x86_64__)
+/* root page tbale is 0, then second level page table is 1, etc.*/
+#define COS_PGTBL_DEPTH 4
+#define COS_PGTBL_ORDER_PTE_3 12
+#define COS_PGTBL_ORDER_PTE_2 21
+#define COS_PGTBL_ORDER_PTE_1 30
+#define COS_PGTBL_ORDER_PTE_0 39
+
+/* Page sizes */
+#define COS_PGTBL_NUM_ORDER      2
+#define COS_PGTBL_ORDERS_64         COS_PGTBL_ORDER_PTE_3, COS_PGTBL_ORDER_PTE_2, COS_PGTBL_ORDER_PTE_1, COS_PGTBL_ORDER_PTE_0
+#define COS_PGTBL_ORDER2POS_64 /* 0/1B    1/2B    2/4B    3/8B   4/16B   5/32B   6/64B  7/128B  8/256B  9/512B */ \
+                               -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 10/1K   11/2K   12/4K   13/8K  14/16K  15/32K  16/64K 17/128K 18/256K 19/512K */ \
+                               -1,     -1,      4,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 20/1M   21/2M   22/4M   23/8M  24/16M  25/32M  26/64M 27/128M 28/256M 29/512M */ \
+                               -1,     3,     1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 30/1G   31/2G  32/4G   33/8G   34/16G   35/32G   36/64G   37/128G   38/256G   39/512G */ \
+                                2,     -1,     -1,      -1,     -1,      -1,      -1,      -1,       -1,      1       \
+
+/* FIXME: we need to remove this x86_32 pgtbl definitions, now we keep it here simply because retype memory logic heavily rely on it */
+#define COS_PGTBL_ORDER_PTE 12
+#define COS_PGTBL_ORDER_PGD 22
+
+#define COS_PGTBL_ORDERS         COS_PGTBL_ORDER_PTE, COS_PGTBL_ORDER_PGD
+#define COS_PGTBL_ORDER2POS /* 0/1B    1/2B    2/4B    3/8B   4/16B   5/32B   6/64B  7/128B  8/256B  9/512B */ \
+                               -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 10/1K   11/2K   12/4K   13/8K  14/16K  15/32K  16/64K 17/128K 18/256K 19/512K */ \
+                               -1,     -1,      0,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 20/1M   21/2M   22/4M   23/8M  24/16M  25/32M  26/64M 27/128M 28/256M 29/512M */ \
+                               -1,     -1,     1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 30/1G   31/2G */ \
+                               -1,     -1 \
+
+/* PTE user pagetable modifiable flags */
+#define COS_PAGE_READABLE (0)
+#define COS_PAGE_WRITABLE (1ul << 1)
+#define COS_PAGE_PKEY0    (1ul << 59)
+#define COS_PAGE_PKEY1    (1ul << 60)
+#define COS_PAGE_PKEY2    (1ul << 61)
+#define COS_PAGE_PKEY3    (1ul << 62)
+#define COS_PAGE_XDISABLE (1ul << 63)
+
+#elif defined(__i386__)
+#define COS_PGTBL_DEPTH 2
+#define COS_PGTBL_ORDER_PTE 12
+#define COS_PGTBL_ORDER_PGD 22
+
+/* Page sizes */
+#define COS_PGTBL_NUM_ORDER      2
+#define COS_PGTBL_ORDERS         COS_PGTBL_ORDER_PTE, COS_PGTBL_ORDER_PGD
+#define COS_PGTBL_ORDER2POS /* 0/1B    1/2B    2/4B    3/8B   4/16B   5/32B   6/64B  7/128B  8/256B  9/512B */ \
+                               -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 10/1K   11/2K   12/4K   13/8K  14/16K  15/32K  16/64K 17/128K 18/256K 19/512K */ \
+                               -1,     -1,      0,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 20/1M   21/2M   22/4M   23/8M  24/16M  25/32M  26/64M 27/128M 28/256M 29/512M */ \
+                               -1,     -1,     1,     -1,     -1,     -1,     -1,     -1,     -1,     -1, \
+                            /* 30/1G   31/2G */ \
+                               -1,     -1 \
+/* PTE user modifiable flags */
+#define COS_PAGE_READABLE (0)
+#define COS_PAGE_WRITABLE (1ul << 1)
+
+#endif
+#endif /* COS_CONFIG_H */
diff --git a/src/platform/i386/chal/shared/cos_io.h b/src/platform/i386/chal/shared/cos_io.h
new file mode 100644
index 0000000000..9f9883113e
--- /dev/null
+++ b/src/platform/i386/chal/shared/cos_io.h
@@ -0,0 +1,26 @@
+#ifndef COS_IO_H
+#define COS_IO_H
+
+/**
+ * Write byte to specific port
+ */
+static inline void
+outb(u16_t port, u8_t value)
+{
+	__asm__ __volatile__("outb %1, %0" : : "dN"(port), "a"(value));
+}
+
+/**
+ * Read byte from port
+ */
+static inline u8_t
+inb(u16_t port)
+{
+	u8_t ret;
+
+	__asm__ __volatile__("inb %1, %0" : "=a"(ret) : "dN"(port));
+
+	return ret;
+}
+
+#endif /* COS_IO_H */
diff --git a/src/platform/i386/chal/shared/util.h b/src/platform/i386/chal/shared/util.h
new file mode 100644
index 0000000000..4b8466e454
--- /dev/null
+++ b/src/platform/i386/chal/shared/util.h
@@ -0,0 +1,86 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+#define CAS_SUCCESS 1
+/*
+ * Return values:
+ * 0 on failure due to contention (*target != old)
+ * 1 otherwise (*target == old -> *target = updated)
+ */
+static inline int
+cos_cas_32(u32_t *target, u32_t old, u32_t updated)
+{
+	char z;
+	__asm__ __volatile__("lock cmpxchgl %2, %0; setz %1"
+	                     : "+m"(*target), "=a"(z)
+	                     : "q"(updated), "a"(old)
+	                     : "memory", "cc");
+	return (int)z;
+}
+
+static inline int
+cos_cas(unsigned long *target, unsigned long old, unsigned long updated)
+{
+	char z;
+	#if defined(__x86_64__)
+	__asm__ __volatile__("lock cmpxchgq %2, %0; setz %1"
+	                     : "+m"(*target), "=a"(z)
+	                     : "q"(updated), "a"(old)
+	                     : "memory", "cc");
+	#elif defined(__i386__)
+	__asm__ __volatile__("lock cmpxchgl %2, %0; setz %1"
+	                     : "+m"(*target), "=a"(z)
+	                     : "q"(updated), "a"(old)
+	                     : "memory", "cc");
+	#endif 
+
+	return (int)z;
+}
+
+/* Fetch-and-add implementation on x86. It returns the original value
+ * before xaddl. */
+static inline int
+cos_faa(int *var, int value)
+{
+	__asm__ __volatile__("lock xaddl %%eax, %2;"
+	                     : "=a"(value)           // Output
+	                     : "a"(value), "m"(*var) // Input
+	                     : "memory");
+	return value;
+}
+
+/* Byte sized fetch-and-add implementation on x86. It returns the 
+original value before xaddl. */
+static inline char
+cos_faab(unsigned char *var, char value)
+{
+	__asm__ __volatile__("lock xaddb %%al, %2;"
+	                     : "=a"(value)           // Output
+	                     : "a"(value), "m"(*var) // Input
+	                     : "memory");
+	return value;
+}
+
+/* x86 cpuid instruction barrier. */
+static inline void
+cos_inst_bar(void)
+{
+	int eax, edx, code = 0;
+	(void)eax;
+	(void)edx;
+	(void)code;
+
+	__asm__ __volatile__("cpuid" : "=a"(eax), "=d"(edx) : "a"(code) : "ecx", "ebx");
+
+	return;
+}
+
+#ifndef rdtscll
+	#if defined(__x86_64__)
+		#define rdtscll(val) __asm__ __volatile__("rdtsc; shl $32, %%rdx; or %%rdx, %0" : "=a"(val)::"rdx")
+	#elif defined(__i386__)
+		#define rdtscll(val) __asm__ __volatile__("rdtsc" : "=A"(val))
+	#endif
+#endif
+
+#endif
diff --git a/src/platform/i386/chal_cpu.h b/src/platform/i386/chal_cpu.h
index ecd5ecf1f5..abbf7470b3 100644
--- a/src/platform/i386/chal_cpu.h
+++ b/src/platform/i386/chal_cpu.h
@@ -7,13 +7,15 @@
 #include "tss.h"
 
 typedef enum {
-	CR4_TSD    = 1 << 2,  /* time stamp (rdtsc) access at user-level disabled */
-	CR4_PSE    = 1 << 4,  /* page size extensions (superpages) */
-	CR4_PGE    = 1 << 7,  /* page global bit enabled */
-	CR4_PCE    = 1 << 8,  /* user-level access to performance counters enabled (rdpmc) */
-	CR4_OSFXSR = 1 << 9,  /* floating point enabled */
-	CR4_SMEP   = 1 << 20, /* Supervisor Mode Execution Protection Enable */
-	CR4_SMAP   = 1 << 21  /* Supervisor Mode Access Protection Enable */
+	CR4_TSD      = 1 << 2,  /* time stamp (rdtsc) access at user-level disabled */
+	CR4_PSE      = 1 << 4,  /* page size extensions (superpages) */
+	CR4_PGE      = 1 << 7,  /* page global bit enabled */
+	CR4_PCE      = 1 << 8,  /* user-level access to performance counters enabled (rdpmc) */
+	CR4_OSFXSR   = 1 << 9,  /* floating point enabled */
+	CR4_FSGSBASE = 1 << 16, /* user level fs/gs access permission bit */
+	CR4_OSXSAVE  = 1 << 18, /* XSAVE and Processor Extended States Enable */
+	CR4_SMEP     = 1 << 20, /* Supervisor Mode Execution Protection Enable */
+	CR4_SMAP     = 1 << 21  /* Supervisor Mode Access Protection Enable */
 } cr4_flags_t;
 
 enum
@@ -23,42 +25,56 @@ enum
 	CR0_PRMOD = 1 << 0   /* in protected-mode (vs real-mode) */
 };
 
-static inline u32_t
+static inline unsigned long
 chal_cpu_cr4_get(void)
 {
-	u32_t config;
+	unsigned long config;
+#if defined(__x86_64__)
+	asm("movq %%cr4, %0" : "=r"(config));
+#elif defined(__i386__)
 	asm("movl %%cr4, %0" : "=r"(config));
+#endif
+
 	return config;
 }
 
 static inline void
 chal_cpu_cr4_set(cr4_flags_t flags)
 {
-	u32_t config = chal_cpu_cr4_get();
-	config |= (u32_t)flags;
+	unsigned long config = chal_cpu_cr4_get();
+	config |= (unsigned long)flags;
+#if defined(__x86_64__)
+	asm("movq %0, %%cr4" : : "r"(config));
+#elif defined(__i386__)
 	asm("movl %0, %%cr4" : : "r"(config));
+#endif
 }
 
 static inline void
 chal_cpu_eflags_init(void)
 {
-	u32_t val;
+	unsigned long val;
 
+#if defined(__x86_64__)
+	asm volatile("pushfq ; popq %0" : "=r"(val));
+	val |= 3 << 12; /* iopl */
+	asm volatile("pushq %0 ; popfq" : : "r"(val));
+#elif defined(__i386__)
 	asm volatile("pushf ; popl %0" : "=r"(val));
 	val |= 3 << 12; /* iopl */
 	asm volatile("pushl %0 ; popf" : : "r"(val));
+#endif
+
 }
 
-static void
+static inline void
 chal_cpu_pgtbl_activate(pgtbl_t pgtbl)
 {
-	//	unsigned long cr0;
-
-	pgtbl_update(pgtbl);
-	/* asm volatile("mov %%cr0, %0" : "=r"(cr0)); */
-	/* cr0 |= CR0_PG; */
-	/* printk("cr0 = %x\n", cr0); */
-	/* asm volatile("mov %0, %%cr0" : : "r"(cr0)); */
+#if defined(__x86_64__)
+	asm volatile("movq %0, %%cr3" : : "r"(pgtbl));
+#elif defined(__i386__)
+	asm volatile("mov %0, %%cr3" : : "r"(pgtbl));
+#endif
 }
 
 #define IA32_SYSENTER_CS  0x174
@@ -68,6 +84,17 @@ chal_cpu_pgtbl_activate(pgtbl_t pgtbl)
 #define MSR_APIC_BASE     0x1b
 #define MSR_TSC_AUX       0xc0000103
 
+#if defined(__x86_64__)
+#define MSR_IA32_EFER		0xC0000080
+#define MSR_STAR 		0xC0000081 
+#define MSR_LSTAR 		0xC0000082
+#define MSR_SFMASK 		0xC0000084
+
+#define MSR_FSBASE		0xC0000100
+#define MSR_USER_GSBASE 	0xC0000101
+#define MSR_KERNEL_GSBASE 	0xC0000102
+#endif
+
 extern void sysenter_entry(void);
 
 static inline void
@@ -88,16 +115,45 @@ chal_cpuid(int code, u32_t *a, u32_t *b, u32_t *c, u32_t *d)
 	asm volatile("cpuid" : "=a"(*a), "=b"(*b), "=c"(*c), "=d"(*d) : "a"(code));
 }
 
+static inline void
+chal_avx_enable(void)
+{
+	__asm__ __volatile__(
+		"xor %%rcx, %%rcx\n\t" \
+		"xgetbv\n\t" \
+		"or $7, %%eax\n\t" \
+		"xsetbv\n\t" \
+		:::"rax","rdx","rcx");
+}
+
 static void
 chal_cpu_init(void)
 {
-	u32_t cr4 = chal_cpu_cr4_get();
+	unsigned long cr4 = chal_cpu_cr4_get();
 	cpuid_t cpu_id = get_cpuid();
 
+#if defined(__x86_64__)
+	u32_t low = 0, high = 0;
+
+	chal_cpu_cr4_set(cr4 | CR4_PSE | CR4_PGE | CR4_OSXSAVE);
+	chal_avx_enable();
+
+	readmsr(MSR_IA32_EFER, &low, &high);
+	writemsr(MSR_IA32_EFER,low | 0x1, high);
+
+	writemsr(MSR_STAR, 0, SEL_KCSEG | ((SEL_UCSEG - 16) << 16));
+	writemsr(MSR_LSTAR, (u32_t)((u64_t)sysenter_entry), (u32_t)((u64_t)sysenter_entry >> 32));
+	writemsr(MSR_SFMASK, 512, 0);
+	writemsr(MSR_USER_GSBASE, 0, 0);
+	writemsr(MSR_KERNEL_GSBASE, (u32_t)((u64_t)(&kernel_stack_info[cpu_id])), (u32_t)((u64_t)(&kernel_stack_info[cpu_id]) >> 32));
+
+#elif defined(__i386__)
 	chal_cpu_cr4_set(cr4 | CR4_PSE | CR4_PGE);
 	writemsr(IA32_SYSENTER_CS, SEL_KCSEG, 0);
 	writemsr(IA32_SYSENTER_ESP, (u32_t)tss[cpu_id].esp0, 0);
 	writemsr(IA32_SYSENTER_EIP, (u32_t)sysenter_entry, 0);
+#endif
+	
 	chal_cpu_eflags_init();
 }
 
@@ -105,18 +161,23 @@ static inline vaddr_t
 chal_cpu_fault_vaddr(struct pt_regs *r)
 {
 	vaddr_t fault_addr;
+#if defined(__x86_64__)
+	asm volatile("movq %%cr2, %0" : "=r"(fault_addr));
+#elif defined(__i386__)
 	asm volatile("mov %%cr2, %0" : "=r"(fault_addr));
+#endif
+
 	return fault_addr;
 }
 
 /* FIXME: I doubt these flags are really the same as the PGTBL_* macros */
-static inline u32_t
+static inline unsigned long
 chal_cpu_fault_errcode(struct pt_regs *r)
 {
 	return r->orig_ax;
 }
 
-static inline u32_t
+static inline unsigned long
 chal_cpu_fault_ip(struct pt_regs *r)
 {
 	return r->ip;
@@ -125,10 +186,16 @@ chal_cpu_fault_ip(struct pt_regs *r)
 static inline void
 chal_user_upcall(void *ip, u16_t tid, u16_t cpuid)
 {
+#if defined(__x86_64__)
+	/* rcx = user-level ip, r12 = option, rbx = arg, rax = tid + cpuid  */
+	/* $0x3200 : enable interrupt, and iopl is set to 3, the same as user's CPL */
+	__asm__("movq $0x3200, %%r11 ; mov %%rdx, %%ds ; movq %3, %%r12 ; sysretq" : : "c"(ip), "a"(tid | (cpuid << 16)), "d"(SEL_UDSEG), "i"(0), "b"(0));
+#elif defined(__i386__)
 	/* edx = user-level ip, ecx = option, ebx = arg, eax = tid + cpuid */
 	__asm__("sti ; sysexit" : : "c"(0), "d"(ip), "b"(0), "a"(tid | (cpuid << 16)));
+#endif
 }
 
 void chal_timer_thd_init(struct thread *t);
 
-#endif /* CHAL_CPU_H */
+#endif /* CHAL_CPU_H */
\ No newline at end of file
diff --git a/src/platform/i386/chal_pgtbl.c b/src/platform/i386/chal_pgtbl.c
new file mode 100644
index 0000000000..1cc43c1f99
--- /dev/null
+++ b/src/platform/i386/chal_pgtbl.c
@@ -0,0 +1,868 @@
+/**
+ * Copyright 2018 by Runyu Pan, panrunyu@gwu.edu
+ *
+ * Redistribution of this file is permitted under the GNU General
+ * Public License v2.
+ */
+#include "shared/cos_types.h"
+#include "captbl.h"
+#include "pgtbl.h"
+#include "cap_ops.h"
+#include "liveness_tbl.h"
+#include "retype_tbl.h"
+#include "chal/chal_proto.h"
+#include "chal_pgtbl.h"
+
+/* These functions do flag operations */
+unsigned long
+chal_pgtbl_flag_add(unsigned long input, pgtbl_flags_t flags)
+{
+	return input | flags;
+}
+
+unsigned long
+chal_pgtbl_flag_clr(unsigned long input, pgtbl_flags_t flags)
+{
+	return input & (~flags);
+}
+
+unsigned long
+chal_pgtbl_flag_exist(unsigned long input, pgtbl_flags_t flags)
+{
+	return input & flags;
+}
+
+unsigned long
+chal_pgtbl_flag_all(unsigned long input, pgtbl_flags_t flags)
+{
+	return chal_pgtbl_flag_exist(input, flags) == flags;
+}
+
+unsigned long 
+chal_pgtbl_frame(unsigned long input)
+{
+	return PGTBL_FRAME_MASK & input;
+}
+
+unsigned long 
+chal_pgtbl_flag(unsigned long input)
+{
+	return PGTBL_FLAG_MASK & input;
+}
+
+unsigned long
+chal_pgtbl_flag_update(unsigned long orig, pgtbl_flags_x86_t new)
+{
+	unsigned long updated;
+	/* 
+	 * This is kind of hacky but we only want the user to be able  
+	 * to change a subset of the original flags when we delegate 
+	 * a pte to another component. Obviously user-level components
+	 * should not change certain bits in the pagetable, but we also
+	 * don't want a component to have upgraded rights to a page that
+	 * they are delegated (e.i. making a RO page RW).
+	 */
+
+	/* first, user-level components can't change most flags*/
+	updated = new | (orig & ~X86_PGTBL_USER_MODIFIABLE);
+
+	/* second, they should not be able to upgrade a page's rights */
+	if (orig & X86_PGTBL_WRITABLE) {
+		updated |= new & PGTBL_WRITABLE;
+	}
+#if defined(__x86_64__)
+	if (!(orig & X86_PGTBL_XDISABLE)) {
+		updated |= new & X86_PGTBL_XDISABLE;
+	}
+#endif
+	return updated; 
+}
+
+int
+chal_pgtbl_kmem_act(pgtbl_t pt, vaddr_t addr, unsigned long *kern_addr, unsigned long **pte_ret)
+{
+	struct ert_intern *pte;
+	unsigned long              orig_v, new_v, accum = 0;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+
+#if defined(__x86_64__)
+	word_t flags;
+	pte = pgtbl_lkup_lvl(pt, addr, &flags, 0, 1);
+#elif defined(__i386__)	
+	/* Is this place really a pte? If there is a super page, reject the operation now */
+	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
+	                                          1, &accum);
+#endif
+	if (unlikely(!pte)) return -ENOENT;
+	orig_v = (unsigned long)(pte->next);
+	if (orig_v & X86_PGTBL_SUPER) return -EINVAL;
+
+	/* Get the pte */
+#if defined(__x86_64__)
+	pte = pgtbl_lkup_lvl(pt, addr, &flags, 0, PGTBL_DEPTH);
+#elif defined(__i386__)	
+	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
+	                                          PGTBL_DEPTH, &accum);
+#endif
+	if (unlikely(!pte)) return -ENOENT;
+	if (unlikely(__pgtbl_isnull(pte, 0, 0))) return -ENOENT;
+
+	orig_v = (unsigned long)(pte->next);
+	if (unlikely(!(orig_v & X86_PGTBL_COSFRAME))) return -EINVAL; /* can't activate non-frames */
+	if (unlikely(orig_v & X86_PGTBL_COSKMEM)) return -EEXIST;     /* can't re-activate kmem frames */
+	assert(!(orig_v & X86_PGTBL_QUIESCENCE));
+
+	*kern_addr = (unsigned long)chal_pa2va((paddr_t)(orig_v & PGTBL_FRAME_MASK));
+	new_v      = orig_v | X86_PGTBL_COSKMEM;
+
+	/* pa2va (value in *kern_addr) will return NULL if the page is not kernel accessible */
+	if (unlikely(!*kern_addr)) return -EINVAL; /* cannot retype a non-kernel accessible page */
+	/* Now we can only activate 4k pages */
+	if (unlikely(retypetbl_kern_ref((void *)(new_v & PGTBL_FRAME_MASK), PAGE_ORDER))) return -EFAULT;
+
+	/*
+	 * We keep the cos_frame entry, but mark it as COSKMEM so that
+	 * we won't use it for other kernel objects.
+	 */
+	if (unlikely(cos_cas((unsigned long *)pte, orig_v, new_v) != CAS_SUCCESS)) {
+		/* restore the ref cnt. */
+		retypetbl_kern_deref((void *)(orig_v & PGTBL_FRAME_MASK), PAGE_ORDER);
+		return -ECASFAIL;
+	}
+	/*
+	 * Return the pte ptr, so that we can release the page if the
+	 * kobj activation failed later.
+	 */
+	*pte_ret = (unsigned long *)pte;
+
+	return 0;
+}
+
+int
+chal_tlb_quiescence_check(u64_t timestamp)
+{
+	int i, quiescent = 1;
+
+	/*
+	 * Did timer interrupt (which does tlb flush
+	 * periodically) happen after unmap? The periodic
+	 * flush happens on all cpus, thus only need to check
+	 * the time stamp of the current core for that case
+	 * (assuming consistent time stamp counters).
+	 */
+	if (timestamp > tlb_quiescence[get_cpuid()].last_periodic_flush) {
+		/*
+		 * If no periodic flush done yet, did the
+		 * mandatory flush happen on all cores?
+		 */
+		for (i = 0; i < NUM_CPU_COS; i++) {
+			if (timestamp > tlb_quiescence[i].last_mandatory_flush) {
+				/* no go */
+				quiescent = 0;
+				break;
+			}
+		}
+	}
+	if (quiescent == 0) {
+		printk("from cpu %d, t %llu: cpu %d last mandatory flush: %llu\n", get_cpuid(), timestamp, i,
+		       tlb_quiescence[i].last_mandatory_flush);
+		for (i = 0; i < NUM_CPU_COS; i++) {
+			printk("cpu %d: flush %llu\n", i, tlb_quiescence[i].last_mandatory_flush);
+		}
+	}
+
+	return quiescent;
+}
+
+int
+chal_cap_memactivate(struct captbl *ct, struct cap_pgtbl *pt, capid_t frame_cap, capid_t dest_pt, vaddr_t vaddr, vaddr_t order)
+{
+	unsigned long *    pte, cosframe, orig_v;
+	struct cap_header *dest_pt_h;
+	word_t             flags;
+	int                ret;
+
+	if (unlikely(pt->lvl || (pt->refcnt_flags & CAP_MEM_FROZEN_FLAG))) return -EINVAL;
+
+	dest_pt_h = captbl_lkup(ct, dest_pt);
+	if (dest_pt_h->type != CAP_PGTBL) return -EINVAL;
+	if (((struct cap_pgtbl *)dest_pt_h)->lvl) return -EINVAL;
+
+	/* What is the order needed for this? */
+	/* We will probably activate a part of a superpage */
+#if defined(__x86_64__)
+	pte = pgtbl_lkup_lvl(pt->pgtbl, frame_cap, &flags, 0, 1);
+#elif defined(__i386__)	
+	pte = pgtbl_lkup_pgd(pt->pgtbl, frame_cap, &flags);
+#endif
+	if (!pte) return -EINVAL;
+	orig_v = *pte;
+
+	/* We don't allow activating non-frames or kernel entry */
+	if (orig_v & X86_PGTBL_SUPER) {
+		if (order != SUPER_PAGE_ORDER) {
+			/* We need to pick a subpage */
+			orig_v += EXTRACT_SUB_PAGE(frame_cap);
+		}
+	} else {
+		if (order != PAGE_ORDER) return -EPERM;
+	#if defined(__x86_64__)
+		pte = pgtbl_lkup_lvl(pt->pgtbl, frame_cap, &flags, 0, PGTBL_DEPTH);
+	#elif defined(__i386__)	
+		pte = pgtbl_lkup_pte(pt->pgtbl, frame_cap, &flags);
+	#endif
+		if (!pte) return -EINVAL;
+		orig_v = *pte;
+	}
+
+	if (!(orig_v & X86_PGTBL_COSFRAME) || (orig_v & X86_PGTBL_COSKMEM)) return -EPERM;
+
+	assert(!(orig_v & X86_PGTBL_QUIESCENCE));
+	cosframe = orig_v & PGTBL_FRAME_MASK;
+	flags = X86_PGTBL_USER_DEF;
+	ret = pgtbl_mapping_add(((struct cap_pgtbl *)dest_pt_h)->pgtbl, vaddr, cosframe, flags, order);
+
+	return ret;
+}
+
+int
+chal_pgtbl_activate(struct captbl *t, unsigned long cap, unsigned long capin, pgtbl_t pgtbl, u32_t lvl)
+{
+	struct cap_pgtbl *pt;
+	int               ret;
+
+	pt = (struct cap_pgtbl *)__cap_capactivate_pre(t, cap, capin, CAP_PGTBL, &ret);
+	if (unlikely(!pt)) return ret;
+	pt->pgtbl = pgtbl;
+
+	pt->refcnt_flags = 1;
+	pt->parent       = NULL; /* new cap has no parent. only copied cap has. */
+	pt->lvl          = lvl;
+	__cap_capactivate_post(&pt->h, CAP_PGTBL);
+
+	return 0;
+}
+
+int
+chal_pgtbl_deactivate(struct captbl *t, struct cap_captbl *dest_ct_cap, unsigned long capin,
+                      livenessid_t lid, capid_t pgtbl_cap, capid_t cosframe_addr, const int root)
+{
+	struct cap_header *deact_header;
+	struct cap_pgtbl * deact_cap, *parent;
+
+	unsigned long l, old_v = 0, *pte = NULL;
+	int           ret;
+
+	deact_header = captbl_lkup(dest_ct_cap->captbl, capin);
+	if (!deact_header || deact_header->type != CAP_PGTBL) cos_throw(err, -EINVAL);
+	deact_cap = (struct cap_pgtbl *)deact_header;
+	parent    = deact_cap->parent;
+
+	l = deact_cap->refcnt_flags;
+	assert(l & CAP_REFCNT_MAX);
+
+	if ((l & CAP_REFCNT_MAX) != 1) {
+		/* We need to deact children first! */
+		cos_throw(err, -EINVAL);
+	}
+
+	if (parent == NULL) {
+		if (!root) cos_throw(err, -EINVAL);
+		/*
+		 * Last reference to the captbl page. Require pgtbl
+		 * and cos_frame cap to release the kmem page.
+		 */
+		ret = kmem_deact_pre(deact_header, t, pgtbl_cap, cosframe_addr, &pte, &old_v);
+		if (ret) cos_throw(err, ret);
+	} else {
+		/* more reference exists. */
+		if (root) cos_throw(err, -EINVAL);
+		assert(!pgtbl_cap && !cosframe_addr);
+	}
+
+	if (cos_cas_32((u32_t *)&deact_cap->refcnt_flags, l, CAP_MEM_FROZEN_FLAG) != CAS_SUCCESS) cos_throw(err, -ECASFAIL);
+
+	/*
+	 * deactivation success. We should either release the
+	 * page, or decrement parent cnt.
+	 */
+	if (parent == NULL) {
+		/* move the kmem to COSFRAME */
+		ret = kmem_deact_post(pte, old_v);
+		if (ret) {
+			cos_faa((int *)&deact_cap->refcnt_flags, 1);
+			cos_throw(err, ret);
+		}
+	} else {
+		cos_faa((int *)&parent->refcnt_flags, -1);
+	}
+
+	/* FIXME: this should be before the kmem_deact_post */
+	ret = cap_capdeactivate(dest_ct_cap, capin, CAP_PGTBL, lid);
+	if (ret) cos_throw(err, ret);
+
+	return 0;
+err:
+	return ret;
+}
+
+void *
+chal_pgtbl_lkup_lvl(pgtbl_t pt, vaddr_t addr, word_t *flags, u32_t start_lvl, u32_t end_lvl)
+{
+#if defined(__x86_64__)
+	u32_t i;
+	unsigned long *intern = chal_pa2va((unsigned long)pt & PGTBL_ENTRY_ADDR_MASK);
+	unsigned long *page   = chal_pa2va((unsigned long)pt & PGTBL_ENTRY_ADDR_MASK);
+
+	assert(addr <= COS_MEM_USER_MAX_VA || addr >= COS_MEM_KERN_START_VA);
+	assert(start_lvl == 0);
+
+	for (i = start_lvl; i < end_lvl; i++) {
+		/* high 16 bits doesn't involve indexing, so we mask them */
+		addr = addr & (0xffffffffffff >> (PGTBL_ENTRY_ORDER * i));
+		intern = page + (addr >> (PAGE_ORDER + PGTBL_ENTRY_ORDER * (PGTBL_DEPTH - 1 - i))); 
+		page = chal_pa2va((*intern) & PGTBL_ENTRY_ADDR_MASK);
+	}
+
+	*flags = (*intern) & PGTBL_FLAG_MASK;
+	return intern;
+#elif defined(__i386__)
+	return __pgtbl_lkupani((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT, start_lvl,
+							end_lvl, flags);
+#endif
+}
+
+int
+chal_pgtbl_mapping_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order)
+{
+	int                ret = 0;
+	struct ert_intern *pte = 0;
+	unsigned long      orig_v;
+	u32_t              accum = 0;
+	/* this temp_flag should not be used */
+	word_t             temp_flag = 0;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & page) == 0);
+	assert((PGTBL_FRAME_MASK & flags) == 0);
+	/* 
+	 * FIXME:the current ertrie implementation cannot stop upon detection of superpage.
+	 * We have to do this manually, get the PGD first, to make sure that we will not
+	 * dereference the super page as a second-level pointer. Performance bummer.
+	 */
+	assert(order == PAGE_ORDER);
+
+#if defined(__x86_64__)
+	pte = (struct ert_intern *)chal_pgtbl_lkup_lvl((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr, &temp_flag, 0, PGTBL_DEPTH);
+#elif defined(__i386__)
+	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
+						PGTBL_DEPTH, &accum);
+#endif
+
+	if (!pte) return -ENOENT;
+	orig_v = (unsigned long)(pte->next);
+	if (orig_v & X86_PGTBL_PRESENT) return -EEXIST;
+	if (orig_v & X86_PGTBL_COSFRAME) return -EPERM;
+
+	/* Quiescence check */
+	ret = pgtbl_quie_check(orig_v);
+	if (ret) return ret;
+
+	/* ref cnt on the frame - always user frame. */
+	ret = retypetbl_ref((void *)page, order);
+	if (ret) return ret;
+
+	ret = __pgtbl_update_leaf(pte, (void *)(page | flags), orig_v);
+	/* restore the refcnt if necessary */
+	if (ret) retypetbl_deref((void *)page, order);
+
+	return ret;
+}
+
+int
+chal_pgtbl_cosframe_add(pgtbl_t pt, vaddr_t addr, paddr_t page, word_t flags, u32_t order)
+{
+	struct ert_intern *pte;
+	unsigned long      orig_v = 0;
+	u32_t              accum = 0;
+	word_t             temp_flags = 0;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & page) == 0);
+	assert((PGTBL_FRAME_MASK & flags) == 0);
+
+	/* 
+	 * FIXME:the current ertrie implementation cannot stop upon detection of superpage.
+	 * We have to do this manually, get the PGD first, to make sure that we will not
+	 * dereference the super page as a second-level pointer. Performance bummer.
+	 */
+#if defined(__x86_64__)
+	pte = (struct ert_intern *)chal_pgtbl_lkup_lvl((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr, &temp_flags, 0, PGTBL_DEPTH);
+#elif defined(__i386__)
+	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((u32_t)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
+						PGTBL_DEPTH, &accum);
+#endif
+
+	if (!pte) return -ENOENT;
+	orig_v = (unsigned long)(pte->next);
+	assert(orig_v == 0);
+
+	return __pgtbl_update_leaf(pte, (void *)(page | flags), 0);
+}
+
+/* This function updates flags of an existing mapping. */
+int
+chal_pgtbl_mapping_mod(pgtbl_t pt, vaddr_t addr, u32_t flags, u32_t *prevflags)
+{
+	/* Not used for now. TODO: add retypetbl_ref / _deref */
+
+	struct ert_intern *pte;
+	u32_t              orig_v, accum = 0;
+
+	assert(pt && prevflags);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+	assert((PGTBL_FRAME_MASK & flags) == 0);
+
+	/* get the pte */
+	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
+	                                          PGTBL_DEPTH, &accum);
+	if (__pgtbl_isnull(pte, 0, 0)) return -ENOENT;
+
+	orig_v = (unsigned long)(pte->next);
+	/**
+	 * accum contains flags from pgd as well, so don't use it to
+	 * get prevflags.
+	 */
+	*prevflags = orig_v & PGTBL_FLAG_MASK;
+
+	/* and update the flags. */
+	return __pgtbl_update_leaf(pte, (void *)(unsigned long)((orig_v & PGTBL_FRAME_MASK) | ((u32_t)flags & PGTBL_FLAG_MASK)),
+	                           orig_v);
+}
+
+/**
+ * When we remove a mapping, we need to link the vas to a liv_id,
+ * which tracks quiescence for us.
+ */
+int
+chal_pgtbl_mapping_del(pgtbl_t pt, vaddr_t addr, u32_t liv_id)
+{
+	int                ret;
+	struct ert_intern *pte;
+	unsigned long      orig_v, accum = 0;
+	vaddr_t            order;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+
+	/* In pgtbl, we have only 20bits for liv id. */
+	if (unlikely(liv_id >= (1 << (32 - PGTBL_PAGEIDX_SHIFT)))) return -EINVAL;
+
+	/* Liveness tracking of the unmapping VAS. */
+	ret = ltbl_timestamp_update(liv_id);
+	if (unlikely(ret)) goto done;
+
+	/* Get the PGD to see if we are deleting a superpage */
+	pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
+                                                  1, &accum);
+	orig_v = (unsigned long)(pte->next);
+	if (!(orig_v & X86_PGTBL_PRESENT)) return -EEXIST;
+	if (orig_v & X86_PGTBL_COSFRAME) return -EPERM;
+	if (!(orig_v & X86_PGTBL_SUPER)) {
+		/* There is a pgd here. We are going to delete ptes in it */
+		pte = (struct ert_intern *)__pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT,
+		                                          PGTBL_DEPTH, &accum);
+		orig_v = (unsigned long)(pte->next);
+		if (!(orig_v & X86_PGTBL_PRESENT)) return -EEXIST;
+		if (orig_v & X86_PGTBL_COSFRAME) return -EPERM;
+		order = PAGE_ORDER;
+	} else order = SUPER_PAGE_ORDER;
+
+	ret = __pgtbl_update_leaf(pte, (void *)(unsigned long)((liv_id << PGTBL_PAGEIDX_SHIFT) | X86_PGTBL_QUIESCENCE), orig_v);
+	if (ret) cos_throw(done, ret);
+
+	/* decrement ref cnt on the frame. */
+	ret = retypetbl_deref((void *)(orig_v & PGTBL_FRAME_MASK), order);
+	if (ret) cos_throw(done, ret);
+
+done:
+	return ret;
+}
+
+/**
+ * NOTE: This just removes the mapping. NO liveness tracking! TLB
+ * flush should be taken care of separately (and carefully).
+ */
+int
+chal_pgtbl_mapping_del_direct(pgtbl_t pt, u32_t addr)
+{
+	unsigned long accum = 0, *pte = NULL;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & addr) == 0);
+
+	return __pgtbl_expandn(pt, addr >> PGTBL_PAGEIDX_SHIFT, PGTBL_DEPTH + 1, &accum, &pte, NULL);
+}
+
+int
+chal_pgtbl_mapping_scan(struct cap_pgtbl *pt)
+{
+	unsigned int i, pte, *page;
+	livenessid_t lid;
+	u64_t        past_ts;
+
+	/**
+         * This scans the leaf level of the pgtbl and verifies
+	 * quiescence.
+         */
+	if (pt->lvl != PGTBL_DEPTH - 1) return -EINVAL;
+
+	page = (unsigned int *)(pt->pgtbl);
+	assert(page);
+
+	for (i = 0; i < PAGE_SIZE / sizeof(int *); i++) {
+		pte = *(page + i);
+		if (pte & X86_PGTBL_PRESENT || pte & X86_PGTBL_COSFRAME) return -EINVAL;
+
+		if (pte & X86_PGTBL_QUIESCENCE) {
+			lid = pte >> PGTBL_PAGEIDX_SHIFT;
+
+			if (ltbl_get_timestamp(lid, &past_ts)) return -EFAULT;
+			if (!tlb_quiescence_check(past_ts)) return -EQUIESCENCE;
+		}
+	}
+
+	return 0;
+}
+
+
+int
+chal_pgtbl_ispresent(word_t flags)
+{
+	return flags & (X86_PGTBL_PRESENT | X86_PGTBL_COSFRAME);
+}
+
+unsigned long *
+chal_pgtbl_lkup(pgtbl_t pt, vaddr_t addr, word_t *flags)
+{
+	void *ret;
+
+	ret = __pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT, PGTBL_DEPTH + 1,
+	                     flags);
+	if (!pgtbl_ispresent(*flags)) return NULL;
+	return ret;
+}
+
+unsigned long *
+chal_pgtbl_lkup_pte(pgtbl_t pt, vaddr_t addr, word_t *flags)
+{
+	return __pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT, PGTBL_DEPTH,
+	                      flags);
+}
+
+unsigned long *
+chal_pgtbl_lkup_pgd(pgtbl_t pt, vaddr_t addr, word_t *flags)
+{
+	return __pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), addr >> PGTBL_PAGEIDX_SHIFT, 1,
+			      flags);
+}
+
+int
+chal_pgtbl_get_cosframe(pgtbl_t pt, vaddr_t frame_addr, paddr_t *cosframe, vaddr_t *order)
+{
+	word_t         flags;
+	unsigned long *pte;
+	paddr_t        v;
+#if defined(__x86_64__)
+	pte = pgtbl_lkup_lvl(pt, frame_addr, &flags, 0, PGTBL_DEPTH);
+	if (!pte) return -EINVAL;
+	v = *pte;
+	*order = PAGE_ORDER;
+#elif defined(__i386__)
+	/* What is the order of this cosframe? */
+	pte = pgtbl_lkup_pgd(pt, frame_addr, &flags);
+	if (!pte) return -EINVAL;
+	v = *pte;
+	if (chal_pgtbl_flag_exist(v, X86_PGTBL_SUPER)) {
+		*order = SUPER_PAGE_ORDER;
+	} else {
+		pte = pgtbl_lkup_pte(pt, frame_addr, &flags);
+		if (!pte) return -EINVAL;
+		v = *pte;
+		*order = PAGE_ORDER;
+	}
+	
+#endif
+	if (!(v & X86_PGTBL_COSFRAME)) return -EINVAL;
+
+	*cosframe = v & PGTBL_FRAME_MASK;
+
+	return 0;
+}
+
+pgtbl_t
+chal_pgtbl_create(void *page, void *curr_pgtbl)
+{
+	pgtbl_t ret = pgtbl_alloc(page);
+
+	/* Copying the kernel part of the pgd. */
+	memcpy(page + KERNEL_PGD_REGION_OFFSET, (void *)chal_pa2va((paddr_t)curr_pgtbl) + KERNEL_PGD_REGION_OFFSET,
+	       KERNEL_PGD_REGION_SIZE);
+
+	return ret;
+}
+
+int
+chal_pgtbl_quie_check(u32_t orig_v)
+{
+	livenessid_t lid;
+	u64_t        ts;
+
+	if (orig_v & X86_PGTBL_QUIESCENCE) {
+		lid = orig_v >> PGTBL_PAGEIDX_SHIFT;
+		/*
+		 * An unmap happened at this vaddr before. We need to
+		 * make sure that all cores have done tlb flush before
+		 * creating new mapping.
+		 */
+		assert(lid < LTBL_ENTS);
+
+		if (ltbl_get_timestamp(lid, &ts)) return -EFAULT;
+		if (!tlb_quiescence_check(ts)) {
+			printk("kern tsc %llu, lid %d, last flush %llu\n", ts, lid,
+			       tlb_quiescence[get_cpuid()].last_periodic_flush);
+			return -EQUIESCENCE;
+		}
+	}
+
+	return 0;
+}
+
+void
+chal_pgtbl_init_pte(void *pte)
+{
+	int            i;
+	unsigned long *vals = pte;
+
+	for (i = 0; i < (1 << PGTBL_ENTRY_ORDER); i++) vals[i] = 0;
+}
+
+int
+chal_pgtbl_pgtblactivate(struct captbl *ct, capid_t cap, capid_t pt_entry, capid_t pgtbl_cap, vaddr_t kmem_cap, capid_t pgtbl_lvl)
+{
+	pgtbl_t        new_pt, curr_pt;
+	vaddr_t        kmem_addr = 0;
+	unsigned long *pte       = NULL;
+	int            ret;
+
+	ret = cap_kmem_activate(ct, pgtbl_cap, kmem_cap, (unsigned long *)&kmem_addr, &pte);
+	if (unlikely(ret)) return ret;
+	assert(kmem_addr && pte);
+ 
+	if (pgtbl_lvl == 0) {
+		/* PGD */
+		struct cap_pgtbl *cap_pt = (struct cap_pgtbl *)captbl_lkup(ct, pgtbl_cap);
+		if (!CAP_TYPECHK(cap_pt, CAP_PGTBL)) return -EINVAL;
+
+		curr_pt = cap_pt->pgtbl;
+		assert(curr_pt);
+
+		new_pt = pgtbl_create((void *)kmem_addr, curr_pt);
+		ret    = pgtbl_activate(ct, cap, pt_entry, new_pt, 0);
+	} else if (pgtbl_lvl < 0 || pgtbl_lvl > 3 ) {
+		/* Not supported yet. */
+		printk("cos: warning - PGTBL level greater than 4 not supported yet. \n");
+		ret = -1;
+	} else {
+		pgtbl_init_pte((void *)kmem_addr);
+		ret = pgtbl_activate(ct, cap, pt_entry, (pgtbl_t)kmem_addr, pgtbl_lvl);
+	}
+
+	if (ret) kmem_unalloc(pte);
+	return ret;
+}
+
+int
+chal_pgtbl_cpy(struct captbl *t, capid_t cap_to, capid_t capin_to, struct cap_pgtbl *ctfrom, capid_t capin_from, cap_t cap_type, word_t flags_in)
+{
+	struct cap_header	*ctto;
+	unsigned long		*f, old_v;
+	word_t			     flags;
+
+	ctto = captbl_lkup(t, cap_to);
+	if (unlikely(!ctto)) return -ENOENT;
+	if (unlikely(ctto->type != cap_type)) return -EINVAL;
+	if (unlikely(((struct cap_pgtbl *)ctto)->refcnt_flags & CAP_MEM_FROZEN_FLAG)) return -EINVAL;
+
+#if defined(__x86_64__)
+	f = pgtbl_lkup_lvl(((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, &flags, 0, PGTBL_DEPTH);
+#elif defined(__i386__)	
+	f = pgtbl_lkup_pte(((struct cap_pgtbl *)ctfrom)->pgtbl, capin_from, &flags);
+#endif
+	if (!f) return -ENOENT;
+	old_v = *f;
+
+	/* Cannot copy frame, or kernel entry. */
+	if (chal_pgtbl_flag_exist(old_v, PGTBL_COSFRAME) || !chal_pgtbl_flag_exist(old_v, PGTBL_USER)) return -EPERM;
+
+	/* sanitize the input flags */
+	flags = chal_pgtbl_flag_update(flags, flags_in);
+
+	return pgtbl_mapping_add(((struct cap_pgtbl *)ctto)->pgtbl, capin_to, old_v & PGTBL_FRAME_MASK, flags, PAGE_ORDER);
+}
+
+/* 
+ * FIXME: we need to ensure TLB quiescence for pgtbl cons/decons!
+ * ct - main table capability
+ * ctsub - sub table capability
+ * expandid - address to place the subtable
+ * depth - the depth level of the subtable
+ */
+int
+chal_pgtbl_cons(struct cap_captbl *ct, struct cap_captbl *ctsub, capid_t expandid, unsigned long depth)
+{
+	word_t flags = 0; 
+	u32_t  refcnt_flags, old_v;
+	unsigned long old_pte, new_pte;
+	unsigned long *    intern;
+	int                ret = 0;
+
+	intern = pgtbl_lkup_lvl(((struct cap_pgtbl *)ct)->pgtbl, expandid, &flags, ct->lvl, depth);
+	if (!intern) return -ENOENT;
+	old_pte = *intern;
+	if (pgtbl_ispresent(old_pte)) return -EPERM;
+	old_v = refcnt_flags = ((struct cap_pgtbl *)ctsub)->refcnt_flags;
+	if (refcnt_flags & CAP_MEM_FROZEN_FLAG) return -EINVAL;
+	if ((refcnt_flags & CAP_REFCNT_MAX) == CAP_REFCNT_MAX) return -EOVERFLOW;
+
+	refcnt_flags++;
+	ret = cos_cas_32((u32_t *)&(((struct cap_pgtbl *)ctsub)->refcnt_flags), old_v, refcnt_flags);
+	if (ret != CAS_SUCCESS) return -ECASFAIL;
+
+	new_pte = (u32_t)chal_va2pa(
+	          (void *)((unsigned long)(((struct cap_pgtbl *)ctsub)->pgtbl) & PGTBL_FRAME_MASK))
+	          | X86_PGTBL_INTERN_DEF;
+
+	ret = cos_cas(intern, old_pte, new_pte);
+	if (ret != CAS_SUCCESS) {
+		/* decrement to restore the refcnt on failure. */
+		cos_faa((int *)&(((struct cap_pgtbl *)ctsub)->refcnt_flags), -1);
+		return -ECASFAIL;
+	} else {
+		ret = 0;
+	}
+
+	return ret;
+}
+
+int 
+chal_pgtbl_decons(struct cap_header *head, struct cap_header *sub, capid_t pruneid, unsigned long lvl)
+{
+	unsigned long *    intern, old_v;
+
+	struct cap_pgtbl *pt = (struct cap_pgtbl *)head;
+	word_t            flags;
+	if (lvl <= pt->lvl) return -EINVAL;
+	intern = pgtbl_lkup_lvl(pt->pgtbl, pruneid, &flags, pt->lvl, lvl);
+
+	if (!intern) return -ENOENT;
+	old_v = *intern;
+
+	/* Is this really a pte or we are trying to decons on superpages - prohibited? */
+	if (old_v & X86_PGTBL_SUPER) return -EINVAL;
+	if (old_v == 0) return 0; /* FIXME: old comment - return an error here? */
+	/* commit; note that 0 is "no entry" in both pgtbl and captbl */
+	if (cos_cas(intern, old_v, 0) != CAS_SUCCESS) return -ECASFAIL;
+
+	/* decrement the refcnt */
+	pt = (struct cap_pgtbl *)sub;
+	u32_t l;
+	l = pt->refcnt_flags;
+	if (l & CAP_MEM_FROZEN_FLAG) return -EINVAL;
+	cos_faa((int *)&(pt->refcnt_flags), -1);
+
+	return 0;
+}
+
+int
+chal_pgtbl_introspect(struct cap_header *ch, vaddr_t addr)
+{
+	unsigned long *pte;
+	word_t         flags;
+	int            ret = 0;
+#if defined(__x86_64__)
+	unsigned long		*f, old_v;
+
+	f = pgtbl_lkup_lvl(((struct cap_pgtbl *)ch)->pgtbl, addr, &flags, 0, PGTBL_DEPTH);
+	old_v = *f;
+	return old_v;
+#endif
+	/* Is this a pte or a pgd? */
+	pte = pgtbl_lkup_pgd(((struct cap_pgtbl *)ch)->pgtbl, addr, &flags);
+	if (pte) {
+		if (chal_pgtbl_flag_exist(*pte, PGTBL_SUPER)) {
+			ret = *pte;
+		} else {
+			pte = pgtbl_lkup_pte(((struct cap_pgtbl *)ch)->pgtbl, addr, &flags);
+			if (pte) ret = *pte;
+		}
+	}
+
+	return ret;
+}
+
+int 
+chal_pgtbl_deact_pre(struct cap_header *ch, u32_t pa)
+{
+	struct cap_pgtbl *deact_cap = (struct cap_pgtbl *)ch;
+	void *            page      = deact_cap->pgtbl;
+	u32_t             l         = deact_cap->refcnt_flags;
+	u64_t             curr;
+	int               ret;
+
+	if (chal_pa2va((paddr_t)pa) != page) return -EINVAL;
+
+	/* Require freeze memory and wait for quiescence
+	 * first! */
+	if (!(l & CAP_MEM_FROZEN_FLAG)) return -EQUIESCENCE;
+
+	/* Quiescence check! */
+	if (deact_cap->lvl == 0) {
+		/* top level has tlb quiescence period. */
+		if (!tlb_quiescence_check(deact_cap->frozen_ts)) return -EQUIESCENCE;
+	} else {
+		/* other levels have kernel quiescence
+		 * period. (but the mapping scan will ensure
+		 * tlb quiescence implicitly). */
+		rdtscll(curr);
+		if (!QUIESCENCE_CHECK(curr, deact_cap->frozen_ts, KERN_QUIESCENCE_CYCLES)) return -EQUIESCENCE;
+	}
+
+	/* set the scan flag to avoid concurrent scanning. */
+	if (cos_cas_32((u32_t *)&deact_cap->refcnt_flags, l, l | CAP_MEM_SCAN_FLAG) != CAS_SUCCESS)
+		return -ECASFAIL;
+
+	if (deact_cap->lvl == 0) {
+		/* PGD: only scan user mapping. */
+		ret = kmem_page_scan(page, PAGE_SIZE - KERNEL_PGD_REGION_SIZE);
+	} else if (deact_cap->lvl == PGTBL_DEPTH - 1) {
+		/* Leaf level, scan mapping. */
+		ret = pgtbl_mapping_scan(deact_cap);
+	} else {
+		/* don't have this with 2-level pgtbl. */
+		ret = kmem_page_scan(page, PAGE_SIZE);
+	}
+
+	if (ret) {
+		/* unset scan and frozen bits. */
+		cos_cas_32((u32_t *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG,
+		        l & ~(CAP_MEM_FROZEN_FLAG | CAP_MEM_SCAN_FLAG));
+		return ret;
+	}
+	cos_cas((unsigned long *)&deact_cap->refcnt_flags, l | CAP_MEM_SCAN_FLAG, l);
+
+	return 0;
+}
+
diff --git a/src/platform/i386/chal_pgtbl.h b/src/platform/i386/chal_pgtbl.h
new file mode 100644
index 0000000000..4dd50e9efd
--- /dev/null
+++ b/src/platform/i386/chal_pgtbl.h
@@ -0,0 +1,216 @@
+#ifndef CHAL_PGTBL_H
+#define CHAL_PGTBL_H
+
+/* These code below are for x86 specifically, only used in x86 chal */
+typedef enum {
+	X86_PGTBL_PRESENT    = 1,
+	X86_PGTBL_WRITABLE   = 1 << 1,
+	X86_PGTBL_USER       = 1 << 2,
+	X86_PGTBL_WT         = 1 << 3, /* write-through caching */
+	X86_PGTBL_NOCACHE    = 1 << 4, /* caching disabled */
+	X86_PGTBL_ACCESSED   = 1 << 5,
+	X86_PGTBL_MODIFIED   = 1 << 6,
+	X86_PGTBL_SUPER      = 1 << 7, /* super-page (4MB on x86-32) */
+	X86_PGTBL_GLOBAL     = 1 << 8,
+	/* Composite defined bits next*/
+	X86_PGTBL_COSFRAME   = 1 << 9,
+	X86_PGTBL_COSKMEM    = 1 << 10, /* page activated as kernel object */
+	X86_PGTBL_QUIESCENCE = 1 << 11,
+#if defined(__x86_64__)
+	X86_PGTBL_PKEY0      = 1ul << 59, /* MPK key bits */
+	X86_PGTBL_PKEY1      = 1ul << 60, 
+	X86_PGTBL_PKEY2      = 1ul << 61, 
+	X86_PGTBL_PKEY3      = 1ul << 62, 
+
+	X86_PGTBL_XDISABLE   = 1ul << 63,
+#endif
+	/* Flag bits done. */
+
+	X86_PGTBL_USER_DEF   = X86_PGTBL_PRESENT | X86_PGTBL_USER | X86_PGTBL_ACCESSED | X86_PGTBL_MODIFIED | X86_PGTBL_WRITABLE,
+	X86_PGTBL_INTERN_DEF = X86_PGTBL_USER_DEF,
+#if defined(__x86_64__)
+	X86_PGTBL_USER_MODIFIABLE = X86_PGTBL_WRITABLE | X86_PGTBL_PKEY0 | X86_PGTBL_PKEY1 | X86_PGTBL_PKEY2 | X86_PGTBL_PKEY3 | X86_PGTBL_XDISABLE,
+#elif defined(__i386__)	
+	X86_PGTBL_USER_MODIFIABLE = X86_PGTBL_WRITABLE,
+#endif
+} pgtbl_flags_x86_t;
+
+/**
+ * Use the passed in page, but make sure that we only use the passed
+ * in page once.
+ */
+static inline void *
+__pgtbl_a(void *d, int sz, int leaf)
+{
+	void **i = d, *p;
+
+	(void)leaf;
+	assert(sz == PAGE_SIZE);
+	if (unlikely(!*i)) return NULL;
+	p  = *i;
+	*i = NULL;
+	return p;
+}
+static struct ert_intern *
+__pgtbl_get(struct ert_intern *a, void *accum, int isleaf)
+{
+	(void)isleaf;
+	/* don't use | here as we only want the pte flags */
+	*(u32_t *)accum = (((u32_t)(unsigned long)a->next) & PGTBL_FLAG_MASK);
+	return chal_pa2va((paddr_t)((((unsigned long)a->next) & PGTBL_FRAME_MASK)));
+}
+static int
+__pgtbl_isnull(struct ert_intern *a, void *accum, int isleaf)
+{
+	(void)isleaf;
+	(void)accum;
+	return !(((u32_t)(unsigned long)(a->next)) & (X86_PGTBL_PRESENT | X86_PGTBL_COSFRAME));
+}
+static int
+__pgtbl_resolve(struct ert_intern *a, void *accum, int leaf, u32_t order, u32_t sz)
+{
+	(void)a;
+	(void)leaf;
+	(void)order;
+	(void)sz;
+	*(u32_t *)accum = (((u32_t)(unsigned long)a->next) & PGTBL_FLAG_MASK);
+	return 1;
+}
+static void
+__pgtbl_init(struct ert_intern *a, int isleaf)
+{
+	(void)isleaf;
+	a->next = NULL;
+}
+
+/**
+ * We only need to do mapping_add at boot time to add all physical
+ * memory to the pgtbl of llboot. After that, we only need to do copy
+ * from llboot pgtbl to other pgtbls. Thus, when adding to pgtbl, we
+ * use physical addresses; when doing copy, we don't need to worry
+ * about PA.
+ */
+
+/* v should include the desired flags */
+static inline int
+__pgtbl_setleaf(struct ert_intern *a, void *v)
+{
+	unsigned long new, old;
+	old = (unsigned long)(a->next);
+	new = (unsigned long)(v);
+
+	if (!cos_cas((unsigned long *)a, old, new)) return -ECASFAIL;
+
+	return 0;
+}
+
+/**
+ * This takes an input parameter as the old value of the mapping. Only
+ * update when the existing value matches.
+ */
+static inline int
+__pgtbl_update_leaf(struct ert_intern *a, void *v, unsigned long old)
+{
+	unsigned long new;
+
+	new = (unsigned long)(v);
+	if (!cos_cas((unsigned long *)a, old, new)) return -ECASFAIL;
+
+	return 0;
+}
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+/* Note:  We're just using pre-defined default flags for internal (pgd) entries */
+static int
+__pgtbl_set(struct ert_intern *a, void *v, void *accum, int isleaf)
+{
+	unsigned long old, new;
+	(void)accum;
+	assert(!isleaf);
+
+	old = (unsigned long)a->next;
+	new = (unsigned long)chal_va2pa((void *)((unsigned long)v & PGTBL_FRAME_MASK)) | X86_PGTBL_INTERN_DEF;
+
+	if (!cos_cas((unsigned long *)&a->next, old, new)) return -ECASFAIL;
+
+	return 0;
+}
+#pragma GCC diagnostic pop
+
+static inline void *
+__pgtbl_getleaf(struct ert_intern *a, void *accum)
+{
+	if (unlikely(!a)) return NULL;
+	return __pgtbl_get(a, accum, 1);
+}
+
+ERT_CREATE(__pgtbl, pgtbl, PGTBL_DEPTH, PGTBL_ENTRY_ORDER, sizeof(int *), PGTBL_ENTRY_ORDER, sizeof(int *), NULL, __pgtbl_init,
+           __pgtbl_get, __pgtbl_isnull, __pgtbl_set, __pgtbl_a, __pgtbl_setleaf, __pgtbl_getleaf, __pgtbl_resolve);
+
+static pgtbl_t
+pgtbl_alloc(void *page)
+{
+	return (pgtbl_t)((unsigned long)__pgtbl_alloc(&page) & PGTBL_FRAME_MASK);
+}
+
+static int
+pgtbl_intern_expand(pgtbl_t pt, unsigned long addr, void *pte, unsigned long flags)
+{
+	unsigned long accum = flags;
+	int           ret;
+
+	/* NOTE: flags currently ignored. */
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & (unsigned long)pte) == 0);
+	assert((PGTBL_FRAME_MASK & flags) == 0);
+
+	if (!pte) return -EINVAL;
+	ret = __pgtbl_expandn(pt, (unsigned long)(addr >> PGTBL_PAGEIDX_SHIFT), PGTBL_DEPTH, &accum, &pte, NULL);
+	if (!ret && pte) return -EEXIST; /* no need to expand */
+	assert(!(ret && !pte));          /* error and used memory??? */
+
+	return ret;
+}
+
+/**
+ * FIXME: If these need to return a physical address, we should do a
+ * va2pa before returning
+ */
+static void *
+pgtbl_intern_prune(pgtbl_t pt, unsigned long addr)
+{
+	unsigned long accum = 0, *pgd;
+	void *        page;
+
+	assert(pt);
+	assert((PGTBL_FLAG_MASK & (unsigned long)addr) == 0);
+
+	pgd = __pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), (unsigned long)addr >> PGTBL_PAGEIDX_SHIFT, 1, &accum);
+	if (!pgd) return NULL;
+	page  = __pgtbl_get((struct ert_intern *)pgd, &accum, 0);
+	accum = 0;
+
+	if (__pgtbl_set((struct ert_intern *)pgd, NULL, &accum, 0)) return NULL;
+
+	return page;
+}
+
+/* FIXME:  these pgd functions should be replaced with lookup_lvl functions (see below). Consider deleting this because we have lkup now */
+static void *
+pgtbl_get_pgd(pgtbl_t pt, unsigned long addr)
+{
+	unsigned long accum = 0;
+
+	assert(pt);
+	return __pgtbl_lkupan((pgtbl_t)((unsigned long)pt | X86_PGTBL_PRESENT), (unsigned long)addr >> PGTBL_PAGEIDX_SHIFT, 1, &accum);
+}
+
+static int
+pgtbl_check_pgd_absent(pgtbl_t pt, u32_t addr)
+{
+	return __pgtbl_isnull(pgtbl_get_pgd(pt, (u32_t)addr), 0, 0);
+}
+#endif /* CHAL_PGTBL_H */
+
diff --git a/src/platform/i386/console.c b/src/platform/i386/console.c
index 7003a5b15b..a507a7033c 100644
--- a/src/platform/i386/console.c
+++ b/src/platform/i386/console.c
@@ -1,6 +1,6 @@
 #define ENABLE_CONSOLE
 
-#include "io.h"
+#include "chal/shared/cos_io.h"
 #include "string.h"
 #include "isr.h"
 #include "kernel.h"
diff --git a/src/platform/i386/exception.c b/src/platform/i386/exception.c
index 5b6694c01a..24f5649dfd 100644
--- a/src/platform/i386/exception.c
+++ b/src/platform/i386/exception.c
@@ -6,25 +6,10 @@
 #include "isr.h"
 #include "chal_cpu.h"
 
-#define PRINTK(format, ...) printk("(CPU%ld:) " format, get_cpuid(), ## __VA_ARGS__)
-
-void
-print_regs_state(struct pt_regs *regs)
-{
-	PRINTK("registers:\n");
-	PRINTK("General registers-> EAX: %x, EBX: %x, ECX: %x, EDX: %x\n", regs->ax, regs->bx, regs->cx, regs->dx);
-	PRINTK("Segment registers-> CS: %x, DS: %x, ES: %x, FS: %x, GS: %x, SS: %x\n", regs->cs, regs->ds, regs->es,
-	       regs->fs, regs->gs, regs->ss);
-	PRINTK("Index registers-> ESI: %x, EDI: %x, EIP: %x, ESP: %x, EBP: %x\n", regs->si, regs->di, regs->ip,
-	       regs->sp, regs->bp);
-	PRINTK("Indicator-> EFLAGS: %x\n", regs->flags);
-	PRINTK("(Exception Error Code-> ORIG_AX: %x)\n", regs->orig_ax);
-}
-
 int
 div_by_zero_err_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Divide by Zero Error\n\n");
 
 	return 1;
@@ -33,7 +18,7 @@ div_by_zero_err_fault_handler(struct pt_regs *regs)
 int
 debug_trap_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("TRAP: Debug\n");
 
 	return 1;
@@ -42,7 +27,7 @@ debug_trap_handler(struct pt_regs *regs)
 int
 breakpoint_trap_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("TRAP: Breakpoint\n");
 
 	return 1;
@@ -51,7 +36,7 @@ breakpoint_trap_handler(struct pt_regs *regs)
 int
 overflow_trap_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("TRAP: Overflow\n");
 
 	return 1;
@@ -60,7 +45,7 @@ overflow_trap_handler(struct pt_regs *regs)
 int
 bound_range_exceed_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Bound Range Exceeded\n");
 
 	return 1;
@@ -69,7 +54,7 @@ bound_range_exceed_fault_handler(struct pt_regs *regs)
 int
 invalid_opcode_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Invalid opcode\n");
 
 	return 1;
@@ -78,7 +63,7 @@ invalid_opcode_fault_handler(struct pt_regs *regs)
 int
 device_not_avail_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Device Not Available\n");
 
 	return 1;
@@ -87,7 +72,7 @@ device_not_avail_fault_handler(struct pt_regs *regs)
 int
 double_fault_abort_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("ABORT: Double Fault\n");
 
 	return 1;
@@ -96,7 +81,7 @@ double_fault_abort_handler(struct pt_regs *regs)
 int
 invalid_tss_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Invalid TSS\n");
 
 	return 1;
@@ -105,7 +90,7 @@ invalid_tss_fault_handler(struct pt_regs *regs)
 int
 seg_not_present_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Segment Not Present\n");
 
 	return 1;
@@ -114,7 +99,7 @@ seg_not_present_fault_handler(struct pt_regs *regs)
 int
 stack_seg_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Stack Segment Fault\n");
 
 	return 1;
@@ -123,7 +108,7 @@ stack_seg_fault_handler(struct pt_regs *regs)
 int
 gen_protect_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: General Protection Fault\n");
 
 	return 1;
@@ -132,19 +117,19 @@ gen_protect_fault_handler(struct pt_regs *regs)
 int
 page_fault_handler(struct pt_regs *regs)
 {
-	u32_t                      fault_addr, errcode = 0, eip = 0;
+	unsigned long                      fault_addr = 0, errcode = 0, ip = 0;
 	struct cos_cpu_local_info *ci    = cos_cpu_local_info();
 	thdid_t                    thdid = thd_current(ci)->tid;
 
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	fault_addr = chal_cpu_fault_vaddr(regs);
 	errcode    = chal_cpu_fault_errcode(regs);
-	eip        = chal_cpu_fault_ip(regs);
+	ip        = chal_cpu_fault_ip(regs);
 
-	die("FAULT: Page Fault in thd %d (%s %s %s %s %s) @ 0x%x, ip 0x%x\n", thdid,
+	die("FAULT: Page Fault in thd %d (%s %s %s %s %s) @ 0x%p, ip 0x%p\n", thdid,
 	    errcode & PGTBL_PRESENT ? "present" : "not-present",
 	    errcode & PGTBL_WRITABLE ? "write-fault" : "read-fault", errcode & PGTBL_USER ? "user-mode" : "system",
-	    errcode & PGTBL_WT ? "reserved" : "", errcode & PGTBL_NOCACHE ? "instruction-fetch" : "", fault_addr, eip);
+	    errcode & PGTBL_WT ? "reserved" : "", errcode & PGTBL_NOCACHE ? "instruction-fetch" : "", fault_addr, ip);
 
 	return 1;
 }
@@ -152,7 +137,7 @@ page_fault_handler(struct pt_regs *regs)
 int
 x87_float_pt_except_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: x87 Floating-point Exception\n");
 
 	return 1;
@@ -161,7 +146,7 @@ x87_float_pt_except_fault_handler(struct pt_regs *regs)
 int
 align_check_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Alignment Check\n");
 
 	return 1;
@@ -170,7 +155,7 @@ align_check_fault_handler(struct pt_regs *regs)
 int
 machine_check_abort_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("ABORT: Machine Check\n");
 
 	return 1;
@@ -179,7 +164,7 @@ machine_check_abort_handler(struct pt_regs *regs)
 int
 smid_float_pt_except_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: SMID Floating-point Exception\n");
 
 	return 1;
@@ -188,7 +173,7 @@ smid_float_pt_except_fault_handler(struct pt_regs *regs)
 int
 virtualization_except_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Virtualization Exception\n");
 
 	return 1;
@@ -197,7 +182,7 @@ virtualization_except_fault_handler(struct pt_regs *regs)
 int
 security_except_fault_handler(struct pt_regs *regs)
 {
-	print_regs_state(regs);
+	print_pt_regs(regs);
 	die("FAULT: Security Exception\n");
 
 	return 1;
diff --git a/src/platform/i386/geniso.sh b/src/platform/i386/geniso.sh
deleted file mode 100755
index 3ffd85b6d6..0000000000
--- a/src/platform/i386/geniso.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-if [ $# != 1 ]; then
-  echo "Usage: $0 <run-script.sh>"
-  exit 1
-fi
-
-if ! [ -r $1 ]; then
-  echo "Can't open run-script"
-  exit 1
-fi
-
-COS_KERNEL=kernel.img
-COS_MODULES=$(sh $1 | awk '/^Writing image/ { print $3; }' | tr '\n' ' ')
-COS_ISO=composite.iso
-ISO_DIR=bootable/
-BOOT_DIR=$ISO_DIR/boot/
-GRUB_DIR=$BOOT_DIR/grub/
-GRUB_CFG=$GRUB_DIR/grub.cfg
-
-if ! [ -f $COS_KERNEL ]; then
-  echo "Can't find kernel image"
-  exit 1
-fi
-
-if [ -d $ISO_DIR ]; then
-  rm -rf $ISO_DIR
-fi
-
-mkdir -p $GRUB_DIR
-cp $COS_KERNEL $BOOT_DIR
-
-printf 'set timeout=0\n\n' >> $GRUB_CFG
-printf 'menuentry composite {\n' >>$GRUB_CFG
-printf '\tmultiboot /boot/%s\n' $COS_KERNEL >>$GRUB_CFG
-for MODULE in "$COS_MODULES"
-do 
-  cp $MODULE $BOOT_DIR
-  printf '\tmodule /boot/%s /boot/%s\n' $MODULE $MODULE >>$GRUB_CFG
-done
-printf '\tboot\n' >>$GRUB_CFG
-printf '}\n' >>$GRUB_CFG
-
-grub-mkrescue -o $COS_ISO $ISO_DIR
-rm -rf $ISO_DIR
-
diff --git a/src/platform/i386/hpet.c b/src/platform/i386/hpet.c
index 50bd42f150..4e7ad21f17 100644
--- a/src/platform/i386/hpet.c
+++ b/src/platform/i386/hpet.c
@@ -55,6 +55,8 @@
 
 #define HPET_INT_ENABLE(n) (*hpet_interrupt = (0x1 << n)) /* Clears the INT n for level-triggered mode. */
 
+struct cap_asnd hw_asnd_caps[HW_IRQ_TOTAL];
+
 static volatile u32_t *hpet_capabilities;
 static volatile u64_t *hpet_config;
 static volatile u64_t *hpet_interrupt;
diff --git a/src/platform/i386/idt.c b/src/platform/i386/idt.c
index 0d79f8c675..10b70026d8 100644
--- a/src/platform/i386/idt.c
+++ b/src/platform/i386/idt.c
@@ -1,7 +1,7 @@
 #include "kernel.h"
 #include "string.h"
 #include "isr.h"
-#include "chal/io.h"
+#include "chal/shared/cos_io.h"
 
 /* Information taken from: http://wiki.osdev.org/PIC */
 /* FIXME:  Remove magic numbers and replace with this */
@@ -34,28 +34,36 @@ struct idt_entry {
 	u8_t  zero;    // Must always be zero
 	u8_t  flags;   // flags
 	u16_t base_hi; // Upper 16 bits of addres to jump too
+	#if defined(__x86_64__)
+	u64_t base_hi_64; //x64
+	#endif
 } __attribute__((packed));
 
 struct idt_ptr {
 	u16_t limit;
-	u32_t base; // Addres of first element
+	unsigned long base; // Addres of first element
 } __attribute__((packed));
 
 // Always must be 256
 #define NUM_IDT_ENTRIES 256
 
-extern void idt_flush(u32_t);
-
 struct idt_entry idt_entries[NUM_IDT_ENTRIES];
 struct idt_ptr   idt_ptr;
 
+static void 
+idt_flush(struct idt_ptr * idt_ptr_addr){
+	__asm__ __volatile__("lidt %0" : :"m"(*idt_ptr_addr)); 
+}
+
 static void
-idt_set_gate(u8_t num, u32_t base, u16_t sel, u8_t flags)
+idt_set_gate(u8_t num, unsigned long base, u16_t sel, u8_t flags)
 {
 	int cpu_id = get_cpuid();
 	idt_entries[num].base_lo = base & 0xFFFF;
 	idt_entries[num].base_hi = (base >> 16) & 0xFFFF;
-
+#if defined(__x86_64__)
+	idt_entries[num].base_hi_64 = (base >> 32) & 0x00000000ffffffff;
+#endif
 	idt_entries[num].sel  = sel;
 	idt_entries[num].zero = 0;
 
@@ -96,7 +104,7 @@ void
 idt_init(const cpuid_t cpu_id)
 {
 	idt_ptr.limit = (sizeof(struct idt_entry) * NUM_IDT_ENTRIES) - 1;
-	idt_ptr.base  = (u32_t)&(idt_entries);
+	idt_ptr.base  = (unsigned long)&(idt_entries);
 	memset(&(idt_entries), 0, sizeof(struct idt_entry) * NUM_IDT_ENTRIES);
 
 	outb(0x20, 0x11);
@@ -110,69 +118,61 @@ idt_init(const cpuid_t cpu_id)
 	outb(0x21, 0x0);
 	outb(0xA1, 0x0);
 
-	idt_set_gate(IRQ_DIV_BY_ZERO_ERR_FAULT, (u32_t)div_by_zero_err_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_DEBUG_TRAP, (u32_t)debug_trap_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_BREAKPOINT_TRAP, (u32_t)breakpoint_trap_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_OVERFLOW_TRAP, (u32_t)overflow_trap_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_BOUND_RANGE_EXCEED_FAULT, (u32_t)bound_range_exceed_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_INVALID_OPCODE_FAULT, (u32_t)invalid_opcode_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_DEVICE_NOT_AVAIL_FAULT, (u32_t)device_not_avail_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_DOUBLE_FAULT_ABORT, (u32_t)double_fault_abort_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_INVALID_TSS_FAULT, (u32_t)invalid_tss_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_SEG_NOT_PRESENT_FAULT, (u32_t)seg_not_present_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_STACK_SEG_FAULT, (u32_t)stack_seg_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_GEN_PROTECT_FAULT, (u32_t)gen_protect_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_PAGE_FAULT, (u32_t)page_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_X87_FLOAT_PT_EXCEPT_FAULT, (u32_t)x87_float_pt_except_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_ALIGN_CHECK_FAULT, (u32_t)align_check_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_MACHINE_CHECK_ABORT, (u32_t)machine_check_abort_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_SMID_FLOAT_PT_EXCEPT_FAULT, (u32_t)smid_float_pt_except_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_VIRTUALIZATION_EXCEPT_FAULT, (u32_t)virtualization_except_fault_irq, 0x08, 0x8E);
-	idt_set_gate(IRQ_SECURITY_EXCEPT_FAULT, (u32_t)security_except_fault_irq, 0x08, 0x8E);
-
-	idt_set_gate(HW_PERIODIC, (u32_t)periodic_irq, 0x08, 0x8E);
-	idt_set_gate(HW_KEYBOARD, (u32_t)keyboard_irq, 0x08, 0x8E);
-	idt_set_gate(HW_ID3, (u32_t)handler_hw_34, 0x08, 0x8E);
-	idt_set_gate(HW_ID4, (u32_t)handler_hw_35, 0x08, 0x8E);
-	idt_set_gate(HW_SERIAL, (u32_t)serial_irq, 0x08, 0x8E);
-	idt_set_gate(HW_ID6, (u32_t)handler_hw_37, 0x08, 0x8E);
-	idt_set_gate(HW_ID7, (u32_t)handler_hw_38, 0x08, 0x8E);
-	idt_set_gate(HW_ID8, (u32_t)handler_hw_39, 0x08, 0x8E);
-	idt_set_gate(HW_ONESHOT, (u32_t)oneshot_irq, 0x08, 0x8E);
-	idt_set_gate(HW_ID10, (u32_t)handler_hw_41, 0x08, 0x8E);
-	idt_set_gate(HW_ID11, (u32_t)handler_hw_42, 0x08, 0x8E);
-	idt_set_gate(HW_ID12, (u32_t)handler_hw_43, 0x08, 0x8E);
-	idt_set_gate(HW_ID13, (u32_t)handler_hw_44, 0x08, 0x8E);
-	idt_set_gate(HW_ID14, (u32_t)handler_hw_45, 0x08, 0x8E);
-	idt_set_gate(HW_ID15, (u32_t)handler_hw_46, 0x08, 0x8E);
-	idt_set_gate(HW_ID16, (u32_t)handler_hw_47, 0x08, 0x8E);
-	idt_set_gate(HW_ID17, (u32_t)handler_hw_48, 0x08, 0x8E);
-	idt_set_gate(HW_ID18, (u32_t)handler_hw_49, 0x08, 0x8E);
-	idt_set_gate(HW_ID19, (u32_t)handler_hw_50, 0x08, 0x8E);
-	idt_set_gate(HW_ID20, (u32_t)handler_hw_51, 0x08, 0x8E);
-	idt_set_gate(HW_ID21, (u32_t)handler_hw_52, 0x08, 0x8E);
-	idt_set_gate(HW_ID22, (u32_t)handler_hw_53, 0x08, 0x8E);
-	idt_set_gate(HW_ID23, (u32_t)handler_hw_54, 0x08, 0x8E);
-	idt_set_gate(HW_ID24, (u32_t)handler_hw_55, 0x08, 0x8E);
-	idt_set_gate(HW_ID25, (u32_t)handler_hw_56, 0x08, 0x8E);
-	idt_set_gate(HW_ID26, (u32_t)handler_hw_57, 0x08, 0x8E);
-	idt_set_gate(HW_ID27, (u32_t)handler_hw_58, 0x08, 0x8E);
-	idt_set_gate(HW_ID28, (u32_t)handler_hw_59, 0x08, 0x8E);
-	idt_set_gate(HW_ID29, (u32_t)handler_hw_60, 0x08, 0x8E);
-	idt_set_gate(HW_ID30, (u32_t)handler_hw_61, 0x08, 0x8E);
-	idt_set_gate(HW_ID31, (u32_t)handler_hw_62, 0x08, 0x8E);
-	idt_set_gate(HW_LAPIC_SPURIOUS, (u32_t)lapic_spurious_irq, 0x08, 0x8E);
-	idt_set_gate(HW_LAPIC_IPI_ASND, (u32_t)lapic_ipi_asnd_irq, 0x08, 0x8E);
-	idt_set_gate(HW_LAPIC_TIMER, (u32_t)lapic_timer_irq, 0x08, 0x8E);
-
-	struct {
-		unsigned short length;
-		unsigned long  base;
-	} __attribute__((__packed__)) idtr;
-
-	idtr.length = idt_ptr.limit;
-	idtr.base   = (unsigned long)(&(idt_entries));
+	idt_set_gate(IRQ_DIV_BY_ZERO_ERR_FAULT, (unsigned long)div_by_zero_err_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_DEBUG_TRAP, (unsigned long)debug_trap_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_BREAKPOINT_TRAP, (unsigned long)breakpoint_trap_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_OVERFLOW_TRAP, (unsigned long)overflow_trap_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_BOUND_RANGE_EXCEED_FAULT, (unsigned long)bound_range_exceed_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_INVALID_OPCODE_FAULT, (unsigned long)invalid_opcode_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_DEVICE_NOT_AVAIL_FAULT, (unsigned long)device_not_avail_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_DOUBLE_FAULT_ABORT, (unsigned long)double_fault_abort_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_INVALID_TSS_FAULT, (unsigned long)invalid_tss_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_SEG_NOT_PRESENT_FAULT, (unsigned long)seg_not_present_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_STACK_SEG_FAULT, (unsigned long)stack_seg_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_GEN_PROTECT_FAULT, (unsigned long)gen_protect_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_PAGE_FAULT, (unsigned long)page_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_X87_FLOAT_PT_EXCEPT_FAULT, (unsigned long)x87_float_pt_except_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_ALIGN_CHECK_FAULT, (unsigned long)align_check_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_MACHINE_CHECK_ABORT, (unsigned long)machine_check_abort_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_SMID_FLOAT_PT_EXCEPT_FAULT, (unsigned long)smid_float_pt_except_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_VIRTUALIZATION_EXCEPT_FAULT, (unsigned long)virtualization_except_fault_irq, 0x08, 0x8E);
+	idt_set_gate(IRQ_SECURITY_EXCEPT_FAULT, (unsigned long)security_except_fault_irq, 0x08, 0x8E);
+
+	idt_set_gate(HW_PERIODIC, (unsigned long)periodic_irq, 0x08, 0x8E);
+	idt_set_gate(HW_KEYBOARD, (unsigned long)keyboard_irq, 0x08, 0x8E);
+	idt_set_gate(HW_ID3, (unsigned long)handler_hw_34, 0x08, 0x8E);
+	idt_set_gate(HW_ID4, (unsigned long)handler_hw_35, 0x08, 0x8E);
+	idt_set_gate(HW_SERIAL, (unsigned long)serial_irq, 0x08, 0x8E);
+	idt_set_gate(HW_ID6, (unsigned long)handler_hw_37, 0x08, 0x8E);
+	idt_set_gate(HW_ID7, (unsigned long)handler_hw_38, 0x08, 0x8E);
+	idt_set_gate(HW_ID8, (unsigned long)handler_hw_39, 0x08, 0x8E);
+	idt_set_gate(HW_ONESHOT, (unsigned long)oneshot_irq, 0x08, 0x8E);
+	idt_set_gate(HW_ID10, (unsigned long)handler_hw_41, 0x08, 0x8E);
+	idt_set_gate(HW_ID11, (unsigned long)handler_hw_42, 0x08, 0x8E);
+	idt_set_gate(HW_ID12, (unsigned long)handler_hw_43, 0x08, 0x8E);
+	idt_set_gate(HW_ID13, (unsigned long)handler_hw_44, 0x08, 0x8E);
+	idt_set_gate(HW_ID14, (unsigned long)handler_hw_45, 0x08, 0x8E);
+	idt_set_gate(HW_ID15, (unsigned long)handler_hw_46, 0x08, 0x8E);
+	idt_set_gate(HW_ID16, (unsigned long)handler_hw_47, 0x08, 0x8E);
+	idt_set_gate(HW_ID17, (unsigned long)handler_hw_48, 0x08, 0x8E);
+	idt_set_gate(HW_ID18, (unsigned long)handler_hw_49, 0x08, 0x8E);
+	idt_set_gate(HW_ID19, (unsigned long)handler_hw_50, 0x08, 0x8E);
+	idt_set_gate(HW_ID20, (unsigned long)handler_hw_51, 0x08, 0x8E);
+	idt_set_gate(HW_ID21, (unsigned long)handler_hw_52, 0x08, 0x8E);
+	idt_set_gate(HW_ID22, (unsigned long)handler_hw_53, 0x08, 0x8E);
+	idt_set_gate(HW_ID23, (unsigned long)handler_hw_54, 0x08, 0x8E);
+	idt_set_gate(HW_ID24, (unsigned long)handler_hw_55, 0x08, 0x8E);
+	idt_set_gate(HW_ID25, (unsigned long)handler_hw_56, 0x08, 0x8E);
+	idt_set_gate(HW_ID26, (unsigned long)handler_hw_57, 0x08, 0x8E);
+	idt_set_gate(HW_ID27, (unsigned long)handler_hw_58, 0x08, 0x8E);
+	idt_set_gate(HW_ID28, (unsigned long)handler_hw_59, 0x08, 0x8E);
+	idt_set_gate(HW_ID29, (unsigned long)handler_hw_60, 0x08, 0x8E);
+	idt_set_gate(HW_ID30, (unsigned long)handler_hw_61, 0x08, 0x8E);
+	idt_set_gate(HW_ID31, (unsigned long)handler_hw_62, 0x08, 0x8E);
+	idt_set_gate(HW_LAPIC_SPURIOUS, (unsigned long)lapic_spurious_irq, 0x08, 0x8E);
+	idt_set_gate(HW_LAPIC_IPI_ASND, (unsigned long)lapic_ipi_asnd_irq, 0x08, 0x8E);
+	idt_set_gate(HW_LAPIC_TIMER, (unsigned long)lapic_timer_irq, 0x08, 0x8E);
 
 	/* asm volatile("lidt (%0)" : : "p"(&idtr)); */
-	idt_flush((u32_t)&idtr);
+	idt_flush((struct idt_ptr *)&idt_ptr);
 }
diff --git a/src/platform/i386/isr.h b/src/platform/i386/isr.h
index 052c0596a8..d3c653500a 100644
--- a/src/platform/i386/isr.h
+++ b/src/platform/i386/isr.h
@@ -2,7 +2,7 @@
 #define ISR_H
 
 #include "shared/cos_types.h"
-#include "chal/io.h"
+#include "chal/shared/cos_io.h"
 #include "chal_asm_inc.h"
 #include <inv.h>
 
diff --git a/src/platform/i386/kernel.c b/src/platform/i386/kernel.c
index 904dace99e..c8e2b4496a 100644
--- a/src/platform/i386/kernel.c
+++ b/src/platform/i386/kernel.c
@@ -1,6 +1,6 @@
 #include "assert.h"
 #include "kernel.h"
-#include "multiboot.h"
+#include "multiboot2.h"
 #include "string.h"
 #include "boot_comp.h"
 #include "mem_layout.h"
@@ -10,6 +10,7 @@
 #include <retype_tbl.h>
 #include <component.h>
 #include <thd.h>
+#include <chal_plat.h>
 
 #define ADDR_STR_LEN 8
 
@@ -33,53 +34,91 @@ extern u8_t end; /* from the linker script */
 
 extern u8_t _binary_constructor_start, _binary_constructor_end;
 
+static void
+multiboot_mem_parse(struct multiboot_tag *tag)
+{
+	unsigned int i = 0;
+	multiboot_memory_map_t *mmap;
+	u8_t *                  mod_end;
+	u8_t *                  mem_addr;
+	unsigned long long      mem_len, sz;
+
+	for (mmap = ((struct multiboot_tag_mmap *) tag)->entries;
+		(multiboot_uint8_t *) mmap < (multiboot_uint8_t *) tag + tag->size;
+		mmap = (multiboot_memory_map_t *) ((unsigned long) mmap +
+		 ((struct multiboot_tag_mmap *) tag)->entry_size)) {
+
+		mod_end  = glb_memlayout.mod_end;
+		mem_addr = chal_pa2va((paddr_t)mmap->addr);
+		mem_len  = (mmap->len > COS_PHYMEM_MAX_SZ ? COS_PHYMEM_MAX_SZ : mmap->len); /* maximum allowed */
+		printk("\t- %d (%s): [%08llx, %08llx) sz = %ldMB + %ldKB\n", i, 
+			mmap->type == 1 ? "Available" : "Reserved ",
+			mmap->addr, mmap->addr + mmap->len, 
+			MEM_MB_ONLY((unsigned long long)mmap->len), MEM_KB_ONLY((unsigned long long)mmap->len));
+
+		if (mmap->addr > COS_PHYMEM_END_PA || mmap->addr + mem_len > COS_PHYMEM_END_PA) {
+			i++;
+			continue;
+		}
+		/* is this the memory region we'll use for component memory? */
+		if (mmap->type == 1 && mod_end >= mem_addr && mod_end < (mem_addr + mem_len)) {
+			sz = (mem_addr + mem_len) - mod_end;
+			glb_memlayout.kmem_end = mem_addr + mem_len;
+			printk("\t  memory usable at boot time: %lx (%ld MB + %ld KB)\n", sz, 
+				MEM_MB_ONLY(sz), MEM_KB_ONLY(sz));
+		}
+		i++;
+	}
+}
+
+static void 
+multiboot_tag_parse(unsigned long mboot_addr)
+{
+	struct multiboot_tag *tag;
+	multiboot_memory_map_t *mmap;
+
+	for (tag = (struct multiboot_tag *) (mboot_addr + 8); 
+		tag->type != MULTIBOOT_TAG_TYPE_END;
+		tag = (struct multiboot_tag *) ((multiboot_uint8_t *) tag + ((tag->size + 7) & ~7))) {
+		if (tag->type == MULTIBOOT_TAG_TYPE_MMAP) multiboot_mem_parse(tag);
+	}
+}
+
 void
-kern_memory_setup(struct multiboot *mb, u32_t mboot_magic)
+kern_memory_setup(unsigned long mboot_addr, unsigned long mboot_magic)
 {
-	struct multiboot_mem_list *mems;
-	unsigned int               i, wastage = 0;
+	unsigned int wastage = 0;
+	u32_t size;
 
 	glb_memlayout.allocs_avail = 1;
 
-	if (mboot_magic != MULTIBOOT_EAX_MAGIC) {
-		die("Not started from a multiboot loader!\n");
+	if (mboot_magic != MULTIBOOT2_BOOTLOADER_MAGIC) {
+		die("multiboot magic not correct\n");
 	}
-	if ((mb->flags & MULTIBOOT_FLAGS_REQUIRED) != MULTIBOOT_FLAGS_REQUIRED) {
-		die("Multiboot flags include %x but are missing one of %x\n", mb->flags, MULTIBOOT_FLAGS_REQUIRED);
+
+	if (mboot_addr & 7) {
+		die("mboot unligned mbi\n");
 	}
 
-	mems = (struct multiboot_mem_list *)mb->mmap_addr;
 	glb_memlayout.kern_end = &end;
-	assert((unsigned int)&end % RETYPE_MEM_NPAGES * PAGE_SIZE == 0);
+	assert((unsigned long)&end % RETYPE_MEM_NPAGES * PAGE_SIZE == 0);
 
 	printk("Initial component found:\n");
 	/* These values have to be higher-half addresses */
 	glb_memlayout.mod_start = &_binary_constructor_start;
 	glb_memlayout.mod_end   = &_binary_constructor_end;
 	glb_memlayout.kern_boot_heap = mem_boot_start();
-	printk("\t- [%08x, %08x)\n", &_binary_constructor_start, &_binary_constructor_end);
-
-	printk("Memory regions:\n");
-	for (i = 0; i < mb->mmap_length / sizeof(struct multiboot_mem_list); i++) {
-		struct multiboot_mem_list *mem      = &mems[i];
-		u8_t *                     mod_end  = glb_memlayout.mod_end;
-		u8_t *                     mem_addr = chal_pa2va((paddr_t)mem->addr);
-		unsigned long              mem_len  = (mem->len > COS_PHYMEM_MAX_SZ ? COS_PHYMEM_MAX_SZ : mem->len); /* maximum allowed */
-
-		printk("\t- %d (%s): [%08llx, %08llx) sz = %ldMB + %ldKB\n", i, mem->type == 1 ? "Available" : "Reserved ", mem->addr,
-		       mem->addr + mem->len, MEM_MB_ONLY((u32_t)mem->len), MEM_KB_ONLY((u32_t)mem->len));
+	printk("kenrel mem layout:\n");
+	printk("\t- [%p, %p, %p)\n", glb_memlayout.mod_start, glb_memlayout.mod_end, glb_memlayout.kern_boot_heap);
 
-		if (mem->addr > COS_PHYMEM_END_PA || mem->addr + mem_len > COS_PHYMEM_END_PA) continue;
+	size = *(u32_t *)mboot_addr;
+	if (size <= 0) {
+		die("not found tag!\n");
+	}
 
-		/* is this the memory region we'll use for component memory? */
-		if (mem->type == 1 && mod_end >= mem_addr && mod_end < (mem_addr + mem_len)) {
-			unsigned long sz = (mem_addr + mem_len) - mod_end;
+	printk("Memory regions:\n");
+	multiboot_tag_parse(mboot_addr);
 
-			glb_memlayout.kmem_end = mem_addr + mem_len;
-			printk("\t  memory usable at boot time: %lx (%ld MB + %ld KB)\n", sz, MEM_MB_ONLY(sz),
-			       MEM_KB_ONLY(sz));
-		}
-	}
 	/* FIXME: check memory layout vs. the multiboot memory regions... */
 
 	/* Validate the memory layout. */
@@ -100,7 +139,7 @@ kern_memory_setup(struct multiboot *mb, u32_t mboot_magic)
 }
 
 void
-kmain(struct multiboot *mboot, u32_t mboot_magic, u32_t esp)
+kmain(unsigned long mboot_addr, unsigned long mboot_magic)
 {
 #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
 	unsigned long max;
@@ -120,10 +159,10 @@ kmain(struct multiboot *mboot, u32_t mboot_magic, u32_t esp)
 #endif
 	boot_state_transition(INIT_BOOTED, INIT_CPU);
 
-	max = MAX((unsigned long)mboot->mods_addr,
-	          MAX((unsigned long)mboot->mmap_addr, (unsigned long)(chal_va2pa(&end))));
-	kern_paging_map_init((void *)(max + PGD_SIZE));
-	kern_memory_setup(mboot, mboot_magic);
+	max = MAX((unsigned long)chal_va2pa((void*)mboot_addr), (unsigned long)(chal_va2pa(&end)));
+
+	kern_paging_map_init((void *)(max));
+	kern_memory_setup(mboot_addr, mboot_magic);
 	boot_state_transition(INIT_CPU, INIT_MEM_MAP);
 
 	chal_init();
@@ -187,6 +226,13 @@ khalt(void)
 	static int method = 0;
 
 	if (method == 0) printk("Shutting down...\n");
+
+	/* Since we cannot shutdown the system currently, use halt here to save cpu time */
+	while (1)
+	{
+		asm volatile("hlt");
+	}
+	
 	/*
 	 * Use the case statement as we shutdown in the fault handler,
 	 * thus faults on shutdown require that we bypass faulty
diff --git a/src/platform/i386/kernel.h b/src/platform/i386/kernel.h
index d5bcd7f48e..40a9824fcd 100644
--- a/src/platform/i386/kernel.h
+++ b/src/platform/i386/kernel.h
@@ -5,7 +5,7 @@
 #include <shared/cos_types.h>
 #include <shared/util.h>
 #include "chal.h"
-#include "multiboot.h"
+#include "multiboot2.h"
 
 #include "chal_asm_inc.h"
 #include <thd.h>
@@ -27,6 +27,8 @@ void vga_puts(const char *str);
 void serial_init(void);
 #endif
 
+#define PRINTK(format, ...) printk("%d: " format, get_cpuid(), ## __VA_ARGS__)
+
 typedef enum {
 	INIT_BOOTED,   /* initial boot */
 	INIT_CPU,      /* bare minimum CPU initialization (tss, gdt, idt, etc...) */
@@ -94,6 +96,7 @@ void tls_update(u32_t addr);
 
 // void printk(const char *fmt, ...);
 int printk_register_handler(void (*handler)(const char *));
+void print_pt_regs(struct pt_regs *r);
 
 void khalt(void);
 
diff --git a/src/platform/i386/lapic.c b/src/platform/i386/lapic.c
index 6350b306e2..279b5626f9 100644
--- a/src/platform/i386/lapic.c
+++ b/src/platform/i386/lapic.c
@@ -525,7 +525,7 @@ smp_boot_all_ap(volatile int *cores_ready)
 		printk("\nBooting AP %d with apic_id %d\n", i, apicids[i]);
 		/* Application Processor (AP) startup sequence: */
 		/* ...make sure that we pass this core's stack */
-		*stackpatch = &stack + ((PAGE_SIZE * i) + (PAGE_SIZE - STK_INFO_OFF));
+		*stackpatch = (char *)((unsigned long)&stack + ((PAGE_SIZE * i) + (PAGE_SIZE - STK_INFO_OFF)));
 		/* ...initialize the coreid of the new processor */
 		cli         = (struct cos_cpu_local_info *)*stackpatch;
 		cli->cpuid  = i; /* the rest is initialized during the bootup process */
diff --git a/src/platform/i386/linker.ld b/src/platform/i386/linker.ld
index 4413097fd5..74fd14a528 100644
--- a/src/platform/i386/linker.ld
+++ b/src/platform/i386/linker.ld
@@ -8,11 +8,20 @@ ENTRY (loader)
 phys = 0x00100000;  		/* This should be COS_MEM_KERN_PA */
 SECTIONS {
 
-    . = 0xc0100000;		/* This should be COS_MEM_KERN_START_VA + COS_MEM_KERN_PA */
+    . = phys;
+    
+    .boottext : AT(phys) ALIGN(8)
+    {
+        loader.o(.text)
+        . = ALIGN(4096);
+    }
+
+    phys = .;
+    . += 0xc0000000;		/* This should be COS_MEM_KERN_START_VA + COS_MEM_KERN_PA */
 
     .text : AT(phys) {
         code = .;
-        *(.multiboot)
+        *(.smptext)
         *(.text)
         *(.rodata)
         . = ALIGN(4096);
@@ -22,6 +31,7 @@ SECTIONS {
 
     .data : AT(phys + (data - code)) {
         data = .;
+        loader.o(.data)
         *(.data)
         . = ALIGN(4096);
     }
@@ -29,7 +39,7 @@ SECTIONS {
     .bss : AT(phys + (bss - code)) {
         bss = .;
         *(.bss)
-	. = ALIGN(4096);
+        . = ALIGN(4096);
     }
 
     /*
@@ -37,21 +47,20 @@ SECTIONS {
      * that is needed in the intial kernel image (referred to by a single 4MB super-page)
      */
     .largebss : AT(phys + (largebss - code)) {
-    	largebss = .;
+        largebss = .;
         *(.largebss)
-	. = ALIGN(4096);
+        . = ALIGN(4096);
     }
     end = .;		/* Unfortunately, this variable will take up the whole page. */
     . = ALIGN(4096);
 
     .initial_component : AT(phys + (initial_component - code)) {
         initial_component = .;
-	*(.initial_component)
+        *(.initial_component)
     }
 
     /DISCARD/ : {
         *(.comment)
-        *(.eh_frame)
         *(.note.gnu.build-id)
     }
 }
diff --git a/src/platform/i386/loader.S b/src/platform/i386/loader.S
index 590772e601..4ae6c88ae2 100644
--- a/src/platform/i386/loader.S
+++ b/src/platform/i386/loader.S
@@ -1,21 +1,21 @@
-#include <shared/cos_config.h>
+#include <chal/shared/cos_config.h>
 #include "chal_asm_inc.h"
-
-.set MULTIBOOT_PAGE_ALIGN,  1<<0
-.set MULTIBOOT_MEMINFO,     1<<1
-.set MULTIBOOT_AOUT_KLUDGE, 1<<16
-.set MULTIBOOT_MAGIC,       0x1BADB002
-.set MULTIBOOT_FLAGS,       MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMINFO
-.set MULTIBOOT_CHECKSUM,    -(MULTIBOOT_MAGIC + MULTIBOOT_FLAGS)
-
-.section .multiboot
-.align 4
-.long MULTIBOOT_MAGIC
-.long MULTIBOOT_FLAGS
-.long MULTIBOOT_CHECKSUM
-
-.set STACKSIZE, 0x1000
-.comm stack, (STACKSIZE * NUM_CPU), 0x1000
+#include "multiboot2.h"
+
+.section .text
+.align 8
+multiboot_start:
+    /* must have multiboot2 header field */
+    .long MULTIBOOT2_HEADER_MAGIC
+    .long MULTIBOOT_ARCHITECTURE_I386
+    .long multiboot_end - multiboot_start
+    .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + (multiboot_end - multiboot_start))
+
+    /* end tag of multiboot2 */
+    .short MULTIBOOT_HEADER_TAG_END
+    .short 0
+    .long 8
+multiboot_end:
 
 .globl loader
 loader:
@@ -32,7 +32,9 @@ loader:
 	orl     $(1<<31), %eax
 	movl    %eax, %cr0
 	cli
-	pushl %esp
+	#pushl %esp
+	movl $COS_MEM_KERN_START_VA, %eax
+	add %eax, %ebx
 	pushl %ecx
 	pushl %ebx
 
@@ -40,8 +42,14 @@ loader:
 	mov $kmain, %eax
 	jmp *%eax
 
-.text
+.section .data
+.set STACKSIZE, 0x1000
+.global stack
+.align 0x1000
+stack:
+.fill (STACKSIZE * NUM_CPU), 1, 0
 
+.section .smptext
 /***
 The following SMP boot code is from xv6, thus:
 
@@ -201,6 +209,3 @@ mov $0x5307, %ax
 mov $0x0001, %bx
 mov $0x0003, %cx
 int $0x15
-
-.org 510
-.word 0xaa55
diff --git a/src/platform/i386/mem_layout.h b/src/platform/i386/mem_layout.h
index df7a70e015..25be9b989e 100644
--- a/src/platform/i386/mem_layout.h
+++ b/src/platform/i386/mem_layout.h
@@ -6,7 +6,7 @@
 #include <shared/cos_config.h>
 #include <retype_tbl.h>
 
-#include "multiboot.h"
+#include "multiboot2.h"
 
 /*
  * Virtual memory layout of the system.  Physical addresses can be
diff --git a/src/platform/i386/miniacpi.c b/src/platform/i386/miniacpi.c
index ce713e0752..04e481133c 100644
--- a/src/platform/i386/miniacpi.c
+++ b/src/platform/i386/miniacpi.c
@@ -3,8 +3,8 @@
 #include "mem_layout.h"
 #include "pgtbl.h"
 
-#define RSDP_LO_ADDRESS ((unsigned char *)0xc00E0000)
-#define RSDP_HI_ADDRESS ((unsigned char *)0xc00FFFFF)
+#define RSDP_LO_ADDRESS ((unsigned char *)(0x000E0000 + COS_MEM_KERN_START_VA))
+#define RSDP_HI_ADDRESS ((unsigned char *)(0x000FFFFF + COS_MEM_KERN_START_VA))
 #define RSDP_ALIGNMENT (16)
 
 struct rsdp {
@@ -33,7 +33,7 @@ struct rsdt {
 	u32_t        oemrevision;
 	u32_t        creatorid;
 	u32_t        creatorrevision;
-	paddr_t      entry[0];
+	u32_t        entry[0];
 } __attribute__((packed));
 
 static struct rsdt *rsdt;
@@ -66,7 +66,9 @@ acpi_find_rsdt(void)
 	}
 
 	if (!rsdp) return NULL;
-
+	printk("\tRDST paddr is @ %p\n", rsdp->rsdtaddress);
+	printk("\tRSDP lenth is :%u\n", rsdp->length);
+	printk("\tXSDT paddr is @ %p\n", rsdp->xsdtaddress);
 	rsdt_pa = (paddr_t)rsdp->rsdtaddress;
 	return device_map_mem(rsdt_pa, 0);
 }
@@ -93,13 +95,37 @@ acpi_chk_header(void *ptr, const char *sig)
 	return 0;
 }
 
+void
+acpi_iterate_tbs(void)
+{
+	size_t  i;
+	size_t entries = (rsdt->head.len - sizeof(struct rsdt)) / 4;
+
+	#define SDT_NAME_SZ 5
+	char name[SDT_NAME_SZ];
+
+	memset(name, 0, SDT_NAME_SZ);
+
+	printk("Supported System Description Tables\n");
+	for (i = 0; i < entries; i++) {
+		struct rsdt *e = (struct rsdt *)device_pa2va(rsdt->entry[i]);
+
+		if (!e) {
+			e = device_map_mem((u32_t)rsdt->entry[i], 0);
+			assert(e);
+		}
+		
+		memcpy(name, e->head.sig, SDT_NAME_SZ - 1);
+		printk("\t%s\n", name);
+	}
+}
 
 static void *
 acpi_find_resource_flags(const char *res_name, pgtbl_flags_t flags)
 {
 	size_t  i;
-
-	for (i = 0; i < (rsdt->head.len - sizeof(struct rsdt)) / sizeof(struct rsdt *); i++) {
+	size_t entries = (rsdt->head.len - sizeof(struct rsdt)) / 4;
+	for (i = 0; i < entries; i++) {
 		struct rsdt *e = (struct rsdt *)device_pa2va(rsdt->entry[i]);
 
 		if (!e) {
@@ -108,7 +134,7 @@ acpi_find_resource_flags(const char *res_name, pgtbl_flags_t flags)
 			 * as the resources should be on the same
 			 * super-page as the parent rsdt.
 			 */
-			e = device_map_mem(rsdt->entry[i], flags);
+			e = device_map_mem((u32_t)rsdt->entry[i], flags);
 			assert(e);
 		}
 		if (!acpi_chk_header(e, res_name)) return e;
@@ -143,9 +169,9 @@ acpi_find_apic(void)
 struct facp {
 	struct acpi_header head;
 	u8_t   _unneeded1[40 - 8]; /* see offsets in spec */
-	paddr_t dsdt;
+	u32_t  dsdt;
 	char   _unneeded2[48 - 44];
-	paddr_t smi_cmd;
+	u32_t  smi_cmd;
 	u8_t   acpi_enable;
 	u8_t   acpi_disable;
 	char   unneeded3[64 - 54];
@@ -325,6 +351,9 @@ acpi_init(void)
 		return; 	/* No acpi? */
 	}
 
+	printk("\tRSDT vaddr is @ %p\n", rsdt);
+	acpi_iterate_tbs();
+
 	timer = acpi_find_timer();
 	if (timer) {
 		hpet = timer_initialize_hpet(timer);
diff --git a/src/platform/i386/multiboot2.h b/src/platform/i386/multiboot2.h
new file mode 100644
index 0000000000..1559603813
--- /dev/null
+++ b/src/platform/i386/multiboot2.h
@@ -0,0 +1,380 @@
+/*  multiboot2.h - Multiboot 2 header file.  */
+/*  Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to
+ *  deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ *  sell copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
+ *  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ *  IN THE SOFTWARE.
+ */
+
+#ifndef MULTIBOOT2_HEADER_H
+#define MULTIBOOT2_HEADER_H
+
+/* How many bytes from the start of the file we search for the header.  */
+#define MULTIBOOT_SEARCH 32768
+#define MULTIBOOT_HEADER_ALIGN 8
+
+/* The magic field should contain this.  */
+#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6
+
+/* This should be in %eax.  */
+#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289
+
+/* Alignment of multiboot modules.  */
+#define MULTIBOOT_MOD_ALIGN 0x00001000
+
+/* Alignment of the multiboot info structure.  */
+#define MULTIBOOT_INFO_ALIGN 0x00000008
+
+/* Flags set in the 'flags' member of the multiboot header.  */
+
+#define MULTIBOOT_TAG_ALIGN 8
+#define MULTIBOOT_TAG_TYPE_END 0
+#define MULTIBOOT_TAG_TYPE_CMDLINE 1
+#define MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME 2
+#define MULTIBOOT_TAG_TYPE_MODULE 3
+#define MULTIBOOT_TAG_TYPE_BASIC_MEMINFO 4
+#define MULTIBOOT_TAG_TYPE_BOOTDEV 5
+#define MULTIBOOT_TAG_TYPE_MMAP 6
+#define MULTIBOOT_TAG_TYPE_VBE 7
+#define MULTIBOOT_TAG_TYPE_FRAMEBUFFER 8
+#define MULTIBOOT_TAG_TYPE_ELF_SECTIONS 9
+#define MULTIBOOT_TAG_TYPE_APM 10
+#define MULTIBOOT_TAG_TYPMULTIBOOT_TAG_TYPE_EFI64E_EFI32 11
+#define MULTIBOOT_TAG_TYPE_EFI64 12
+#define MULTIBOOT_TAG_TYPE_SMBIOS 13
+#define MULTIBOOT_TAG_TYPE_ACPI_OLD 14
+#define MULTIBOOT_TAG_TYPE_ACPI_NEW 15
+#define MULTIBOOT_TAG_TYPE_NETWORK 16
+#define MULTIBOOT_TAG_TYPE_EFI_MMAP 17
+#define MULTIBOOT_TAG_TYPE_EFI_BS 18
+#define MULTIBOOT_TAG_TYPE_EFI32_IH 19
+#define MULTIBOOT_TAG_TYPE_EFI64_IH 20
+#define MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR 21
+
+#define MULTIBOOT_HEADER_TAG_END 0
+#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1
+#define MULTIBOOT_HEADER_TAG_ADDRESS 2
+#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS 3
+#define MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS 4
+#define MULTIBOOT_HEADER_TAG_FRAMEBUFFER 5
+#define MULTIBOOT_HEADER_TAG_MODULE_ALIGN 6
+#define MULTIBOOT_HEADER_TAG_EFI_BS 7
+#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9
+#define MULTIBOOT_HEADER_TAG_RELOCATABLE 10
+
+#define MULTIBOOT_ARCHITECTURE_I386 0
+#define MULTIBOOT_ARCHITECTURE_MIPS32 4
+#define MULTIBOOT_HEADER_TAG_OPTIONAL 1
+
+#define MULTIBOOT_LOAD_PREFERENCE_NONE 0
+#define MULTIBOOT_LOAD_PREFERENCE_LOW 1
+#define MULTIBOOT_LOAD_PREFERENCE_HIGH 2
+
+#define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
+#define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2
+
+#ifndef __ASSEMBLER__
+
+typedef unsigned char      multiboot_uint8_t;
+typedef unsigned short     multiboot_uint16_t;
+typedef unsigned int       multiboot_uint32_t;
+typedef unsigned long long multiboot_uint64_t;
+
+struct multiboot_header {
+	/* Must be MULTIBOOT_MAGIC - see above.  */
+	multiboot_uint32_t magic;
+
+	/* ISA */
+	multiboot_uint32_t architecture;
+
+	/* Total header length.  */
+	multiboot_uint32_t header_length;
+
+	/* The above fields plus this one must equal 0 mod 2^32. */
+	multiboot_uint32_t checksum;
+};
+
+struct multiboot_header_tag {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+};
+
+struct multiboot_header_tag_information_request {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+	multiboot_uint32_t requests[0];
+};
+
+struct multiboot_header_tag_address {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+	multiboot_uint32_t header_addr;
+	multiboot_uint32_t load_addr;
+	multiboot_uint32_t load_end_addr;
+	multiboot_uint32_t bss_end_addr;
+};
+
+struct multiboot_header_tag_entry_address {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+	multiboot_uint32_t entry_addr;
+};
+
+struct multiboot_header_tag_console_flags {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+	multiboot_uint32_t console_flags;
+};
+
+struct multiboot_header_tag_framebuffer {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+	multiboot_uint32_t width;
+	multiboot_uint32_t height;
+	multiboot_uint32_t depth;
+};
+
+struct multiboot_header_tag_module_align {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+};
+
+struct multiboot_header_tag_relocatable {
+	multiboot_uint16_t type;
+	multiboot_uint16_t flags;
+	multiboot_uint32_t size;
+	multiboot_uint32_t min_addr;
+	multiboot_uint32_t max_addr;
+	multiboot_uint32_t align;
+	multiboot_uint32_t preference;
+};
+
+struct multiboot_color {
+	multiboot_uint8_t red;
+	multiboot_uint8_t green;
+	multiboot_uint8_t blue;
+};
+
+struct multiboot_mmap_entry {
+	multiboot_uint64_t addr;
+	multiboot_uint64_t len;
+#define MULTIBOOT_MEMORY_AVAILABLE 1
+#define MULTIBOOT_MEMORY_RESERVED 2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3
+#define MULTIBOOT_MEMORY_NVS 4
+#define MULTIBOOT_MEMORY_BADRAM 5
+	multiboot_uint32_t type;
+	multiboot_uint32_t zero;
+};
+typedef struct multiboot_mmap_entry multiboot_memory_map_t;
+
+struct multiboot_tag {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+};
+
+struct multiboot_tag_string {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	char               string[0];
+};
+
+struct multiboot_tag_module {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t mod_start;
+	multiboot_uint32_t mod_end;
+	char               cmdline[0];
+};
+
+struct multiboot_tag_basic_meminfo {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t mem_lower;
+	multiboot_uint32_t mem_upper;
+};
+
+struct multiboot_tag_bootdev {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t biosdev;
+	multiboot_uint32_t slice;
+	multiboot_uint32_t part;
+};
+
+struct multiboot_tag_mmap {
+	multiboot_uint32_t          type;
+	multiboot_uint32_t          size;
+	multiboot_uint32_t          entry_size;
+	multiboot_uint32_t          entry_version;
+	struct multiboot_mmap_entry entries[0];
+};
+
+struct multiboot_vbe_info_block {
+	multiboot_uint8_t external_specification[512];
+};
+
+struct multiboot_vbe_mode_info_block {
+	multiboot_uint8_t external_specification[256];
+};
+
+struct multiboot_tag_vbe {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+
+	multiboot_uint16_t vbe_mode;
+	multiboot_uint16_t vbe_interface_seg;
+	multiboot_uint16_t vbe_interface_off;
+	multiboot_uint16_t vbe_interface_len;
+
+	struct multiboot_vbe_info_block      vbe_control_info;
+	struct multiboot_vbe_mode_info_block vbe_mode_info;
+};
+
+struct multiboot_tag_framebuffer_common {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+
+	multiboot_uint64_t framebuffer_addr;
+	multiboot_uint32_t framebuffer_pitch;
+	multiboot_uint32_t framebuffer_width;
+	multiboot_uint32_t framebuffer_height;
+	multiboot_uint8_t  framebuffer_bpp;
+#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
+#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1
+#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2
+	multiboot_uint8_t  framebuffer_type;
+	multiboot_uint16_t reserved;
+};
+
+struct multiboot_tag_framebuffer {
+	struct multiboot_tag_framebuffer_common common;
+
+	union {
+		struct {
+			multiboot_uint16_t     framebuffer_palette_num_colors;
+			struct multiboot_color framebuffer_palette[0];
+		};
+		struct {
+			multiboot_uint8_t framebuffer_red_field_position;
+			multiboot_uint8_t framebuffer_red_mask_size;
+			multiboot_uint8_t framebuffer_green_field_position;
+			multiboot_uint8_t framebuffer_green_mask_size;
+			multiboot_uint8_t framebuffer_blue_field_position;
+			multiboot_uint8_t framebuffer_blue_mask_size;
+		};
+	};
+};
+
+struct multiboot_tag_elf_sections {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t num;
+	multiboot_uint32_t entsize;
+	multiboot_uint32_t shndx;
+	char               sections[0];
+};
+
+struct multiboot_tag_apm {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint16_t version;
+	multiboot_uint16_t cseg;
+	multiboot_uint32_t offset;
+	multiboot_uint16_t cseg_16;
+	multiboot_uint16_t dseg;
+	multiboot_uint16_t flags;
+	multiboot_uint16_t cseg_len;
+	multiboot_uint16_t cseg_16_len;
+	multiboot_uint16_t dseg_len;
+};
+
+struct multiboot_tag_efi32 {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t pointer;
+};
+
+struct multiboot_tag_efi64 {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint64_t pointer;
+};
+
+struct multiboot_tag_smbios {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint8_t  major;
+	multiboot_uint8_t  minor;
+	multiboot_uint8_t  reserved[6];
+	multiboot_uint8_t  tables[0];
+};
+
+struct multiboot_tag_old_acpi {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint8_t  rsdp[0];
+};
+
+struct multiboot_tag_new_acpi {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint8_t  rsdp[0];
+};
+
+struct multiboot_tag_network {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint8_t  dhcpack[0];
+};
+
+struct multiboot_tag_efi_mmap {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t descr_size;
+	multiboot_uint32_t descr_vers;
+	multiboot_uint8_t  efi_mmap[0];
+};
+
+struct multiboot_tag_efi32_ih {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t pointer;
+};
+
+struct multiboot_tag_efi64_ih {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint64_t pointer;
+};
+
+struct multiboot_tag_load_base_addr {
+	multiboot_uint32_t type;
+	multiboot_uint32_t size;
+	multiboot_uint32_t load_base_addr;
+};
+
+#endif // __ASSEMBLER__
+
+#endif // MULTIBOOT2_HEADER_H
diff --git a/src/platform/i386/ppos.sh b/src/platform/i386/ppos.sh
deleted file mode 100644
index 8463aa7330..0000000000
--- a/src/platform/i386/ppos.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-./cos_linker "c0.o, ;llboot.o, ;llpong.o, :c0.o-llboot.o" ./gen_client_stub
-
-
-
-
-
-
diff --git a/src/platform/i386/printk.c b/src/platform/i386/printk.c
index 86e803151a..73d9cf6921 100644
--- a/src/platform/i386/printk.c
+++ b/src/platform/i386/printk.c
@@ -30,3 +30,34 @@ printk(const char *fmt, ...)
 		printk_handlers[i](buffer);
 	}
 }
+
+void
+print_pt_regs(struct pt_regs *regs)
+{
+#if defined(__x86_64__)
+	PRINTK("Register hexdump (0x%p):\n", regs);
+	PRINTK("General->   RAX: 0x%p, RBX: 0x%p, RCX: 0x%p, RDX: 0x%p\n",
+		regs->ax, regs->bx, regs->cx, regs->dx);
+	PRINTK("General->   R8: 0x%p, R9: 0x%p, R10: 0x%p, R11: 0x%p\n",
+		regs->r8, regs->r9, regs->r10, regs->r11);
+	PRINTK("General->   R12: 0x%p, R13: 0x%p, R14: 0x%p, R15: 0x%p\n",
+		regs->r12, regs->r13, regs->r14, regs->r15);
+
+	PRINTK("Segment->   CS: 0x%x, DS: 0x%x, ES: 0x%x, FS: 0x%x, GS: 0x%x, SS: 0x%x\n",
+		regs->cs, regs->ds, regs->es, regs->fs, regs->gs, regs->ss);
+	PRINTK("Index->     RSI: 0x%p, RDI: 0x%p, RIP: 0x%p, RSP: 0x%p, RBP: 0x%p\n",
+		regs->si, regs->di, regs->ip, regs->sp, regs->bp);
+	PRINTK("Indicator-> RFLAGS: 0x%p\n", regs->flags);
+	PRINTK("(Exception Error Code-> ORIG_AX: 0x%x)\n", regs->orig_ax);
+#elif defined(__i386__)
+	PRINTK("Register hexdump (0x%p):\n", regs);
+	PRINTK("General->   EAX: 0x%x, EBX: 0x%x, ECX: 0x%x, EDX: 0x%x\n",
+		regs->ax, regs->bx, regs->cx, regs->dx);
+	PRINTK("Segment->   CS: 0x%x, DS: 0x%x, ES: 0x%x, FS: 0x%x, GS: 0x%x, SS: 0x%x\n",
+		regs->cs, regs->ds, regs->es, regs->fs, regs->gs, regs->ss);
+	PRINTK("Index->     ESI: 0x%x, EDI: 0x%x, EIP: 0x%x, ESP: 0x%x, EBP: 0x%x\n",
+		regs->si, regs->di, regs->ip, regs->sp, regs->bp);
+	PRINTK("Indicator-> EFLAGS: 0x%x\n", regs->flags);
+	PRINTK("(Exception Error Code-> ORIG_AX: 0x%x)\n", regs->orig_ax);
+#endif
+}
diff --git a/src/platform/i386/qemu-g.sh b/src/platform/i386/qemu-g.sh
deleted file mode 100755
index 08a130894f..0000000000
--- a/src/platform/i386/qemu-g.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ $# != 1 ]; then
-  echo "Usage: $0 <run-script.sh>"
-  exit 1
-fi
-
-if ! [ -r $1 ]; then
-  echo "Can't open run-script"
-  exit 1
-fi
-
-MODULES=$(sh $1 | awk '/^Writing image/ { print $3; }' | tr '\n' ' ')
-
-qemu-system-i386 -m 128 -nographic -kernel kernel.img -no-reboot -S -s -initrd "$(echo $MODULES | tr ' ' ',')"
-
diff --git a/src/platform/i386/qemu-iso.sh b/src/platform/i386/qemu-iso.sh
deleted file mode 100755
index bd98f0f162..0000000000
--- a/src/platform/i386/qemu-iso.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-COS_ISO=composite.iso
-
-qemu-system-i386 -nographic -cdrom $COS_ISO
diff --git a/src/platform/i386/qemu-mp.sh b/src/platform/i386/qemu-mp.sh
deleted file mode 100755
index 7ffd6df1b6..0000000000
--- a/src/platform/i386/qemu-mp.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-if [ $# != 1 ]; then
-  echo "Usage: $0 <run-script.sh>"
-  exit 1
-fi
-
-if ! [ -r $1 ]; then
-  echo "Can't open run-script"
-  exit 1
-fi
-
-MODULES=$(sh $1 | awk '/^Writing image/ { print $3; }' | tr '\n' ' ')
-
-qemu-system-i386 -m 768 -smp 4 -nographic -kernel kernel.img -no-reboot -s -initrd "$(echo $MODULES | tr ' ' ',')"
diff --git a/src/platform/i386/qemu.sh b/src/platform/i386/qemu.sh
deleted file mode 100755
index d9be382fc3..0000000000
--- a/src/platform/i386/qemu.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ $# != 1 ]; then
-  echo "Usage: $0 <run-script.sh>"
-  exit 1
-fi
-
-if ! [ -r $1 ]; then
-  echo "Can't open run-script"
-  exit 1
-fi
-
-MODULES=$(sh $1 | awk '/^Writing image/ { print $3; }' | tr '\n' ' ')
-
-qemu-system-i386 -m 768 -nographic -kernel kernel.img -no-reboot -s -initrd "$(echo $MODULES | tr ' ' ',')"
-
diff --git a/src/platform/i386/qemu2.sh b/src/platform/i386/qemu2.sh
deleted file mode 100755
index 1018cec693..0000000000
--- a/src/platform/i386/qemu2.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ $# != 1 ]; then
-  echo "Usage: $0 <run-script.sh>"
-  exit 1
-fi
-
-if ! [ -r $1 ]; then
-  echo "Can't open run-script"
-  exit 1
-fi
-
-MODULES=$(sh $1 | awk '/^Writing image/ { print $3; }' | tr '\n' ' ')
-
-qemu -m 128 -nographic -kernel kernel.img -no-reboot -s -initrd "$(echo $MODULES | tr ' ' ',')"
-
diff --git a/src/platform/i386/serial.c b/src/platform/i386/serial.c
index dc21481fd1..39718a06f1 100644
--- a/src/platform/i386/serial.c
+++ b/src/platform/i386/serial.c
@@ -1,7 +1,7 @@
 #define ENABLE_SERIAL
 
 #include "string.h"
-#include "chal/io.h"
+#include "chal/shared/cos_io.h"
 #include "isr.h"
 #include "kernel.h"
 
diff --git a/src/platform/i386/string.c b/src/platform/i386/string.c
index 2058d6175b..580473ca52 100644
--- a/src/platform/i386/string.c
+++ b/src/platform/i386/string.c
@@ -3,27 +3,6 @@
 
 static char *str_buf;
 
-void *
-memcpy(void *dst, const void *src, size_t count)
-{
-	const u8_t *s = (const u8_t *)src;
-	u8_t *      d = (u8_t *)dst;
-
-	for (; count != 0; count--) *d++ = *s++;
-
-	return dst;
-}
-
-void *
-memset(void *dst, int c, size_t count)
-{
-	char *p = (char *)dst;
-
-	for (; count != 0; count--) *p++ = c;
-
-	return dst;
-}
-
 size_t
 strnlen(const char *str, size_t max)
 {
diff --git a/src/platform/i386/vga.c b/src/platform/i386/vga.c
index bdfebe2882..26a03cd715 100644
--- a/src/platform/i386/vga.c
+++ b/src/platform/i386/vga.c
@@ -26,7 +26,7 @@
 #include <chal.h>
 #include "kernel.h"
 #include "string.h"
-#include "chal/io.h"
+#include "chal/shared/cos_io.h"
 #include "isr.h"
 
 /* The number of columns. */
diff --git a/src/platform/i386/vm.c b/src/platform/i386/vm.c
index 8032fce35f..8186849bd2 100644
--- a/src/platform/i386/vm.c
+++ b/src/platform/i386/vm.c
@@ -7,6 +7,7 @@
 #include "isr.h"
 #include "chal_cpu.h"
 #include "mem_layout.h"
+#include "chal_pgtbl.h"
 
 #define LARGE_BSS __attribute__((section(".largebss,\"aw\",@nobits#")))
 
@@ -14,12 +15,12 @@ struct tlb_quiescence tlb_quiescence[NUM_CPU] CACHE_ALIGNED LARGE_BSS;
 struct liveness_entry __liveness_tbl[LTBL_ENTS] CACHE_ALIGNED LARGE_BSS;
 
 #define KERN_INIT_PGD_IDX (COS_MEM_KERN_START_VA >> PGD_SHIFT)
-u32_t boot_comp_pgd[PAGE_SIZE / sizeof(u32_t)] PAGE_ALIGNED = {[0] = 0 | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER,
-                                                               [KERN_INIT_PGD_IDX] = 0 | PGTBL_PRESENT | PGTBL_WRITABLE
-                                                                                     | PGTBL_SUPER};
-u32_t boot_ap_pgd[PAGE_SIZE / sizeof(u32_t)] PAGE_ALIGNED = {[0] = 0 | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER,
-                                                               [KERN_INIT_PGD_IDX] = 0 | PGTBL_PRESENT | PGTBL_WRITABLE
-                                                                                     | PGTBL_SUPER};
+u32_t boot_comp_pgd[PAGE_SIZE / sizeof(u32_t)] PAGE_ALIGNED = {[0] = 0 | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER,
+                                                               [KERN_INIT_PGD_IDX] = 0 | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE
+                                                                                       | X86_PGTBL_SUPER};
+u32_t boot_ap_pgd[PAGE_SIZE / sizeof(u32_t)] PAGE_ALIGNED = {[0] = 0 | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER,
+                                                             [KERN_INIT_PGD_IDX] = 0 | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE
+                                                                                     | X86_PGTBL_SUPER};
 
 void
 kern_retype_initial(void)
@@ -29,7 +30,7 @@ kern_retype_initial(void)
 	assert((int)mem_bootc_start() % RETYPE_MEM_NPAGES == 0);
 	assert((int)mem_bootc_end() % RETYPE_MEM_NPAGES == 0);
 	for (k = mem_bootc_start(); k < mem_bootc_end(); k += PAGE_SIZE * RETYPE_MEM_NPAGES) {
-		if (retypetbl_retype2user((void *)(chal_va2pa(k)))) assert(0);
+		if (retypetbl_retype2user((void *)chal_va2pa(k), PAGE_ORDER)) assert(0);
 	}
 }
 
@@ -44,8 +45,7 @@ u8_t *mem_boot_alloc(int npages) /* boot-time, bump-ptr heap */
 	assert(glb_memlayout.kern_boot_heap <= mem_kmem_end());
 	for (i = (unsigned long)r; i < (unsigned long)glb_memlayout.kern_boot_heap; i += PAGE_SIZE) {
 		if ((unsigned long)i % RETYPE_MEM_NPAGES == 0) {
-			if (retypetbl_retype2kern((void *)chal_va2pa((void *)i))) {
-				die("Retyping to kernel on boot-time heap allocation failed @ 0x%x.\n", i);
+			if (retypetbl_retype2kern((void *)chal_va2pa((void *)i), PAGE_ORDER)) {
 			}
 		}
 	}
@@ -77,9 +77,10 @@ kern_setup_image(void)
 	     i < (unsigned long)round_up_to_pgd_page(kern_pa_end);
 	     i += PGD_RANGE, j++) {
 		assert(j != KERN_INIT_PGD_IDX
-		       || ((boot_comp_pgd[j] | PGTBL_GLOBAL) & ~(PGTBL_MODIFIED | PGTBL_ACCESSED))
-		       == (i | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER | PGTBL_GLOBAL));
-		boot_comp_pgd[j]             = i | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER | PGTBL_GLOBAL;
+			/* FIXME: should make a higher-level macro definition to summarize these default settings... */
+		       || ((boot_comp_pgd[j] | X86_PGTBL_GLOBAL) & ~(X86_PGTBL_MODIFIED | X86_PGTBL_ACCESSED))
+		            == (i | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL));
+		boot_comp_pgd[j]             = i | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL;
 		boot_comp_pgd[i / PGD_RANGE] = 0; /* unmap lower addresses */
 	}
 
@@ -169,7 +170,7 @@ device_map_mem(paddr_t dev_addr, unsigned int pt_extra_flags)
 	/* Allocate a PGD region, and map it in */
 	assert(off < PAGE_SIZE / sizeof(unsigned long));
 	rounded = round_up_to_pgd_page(dev_addr) - PGD_RANGE;
-	boot_comp_pgd[off] = rounded | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER | PGTBL_GLOBAL | pt_extra_flags;
+	boot_comp_pgd[off] = rounded | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL | pt_extra_flags;
 	dev_mem[dev_map_off] = (struct dev_map) {
 		.physaddr = rounded,
 		.virtaddr = (void *)(off * PGD_RANGE)
@@ -192,12 +193,12 @@ kern_paging_map_init(void *pa)
 	for (i = kern_pa_start, j = COS_MEM_KERN_START_VA / PGD_RANGE;
 	     i < (unsigned long)round_up_to_pgd_page(kern_pa_end); i += PGD_RANGE, j++) {
 		assert(j != KERN_INIT_PGD_IDX
-		       || ((boot_comp_pgd[j] | PGTBL_GLOBAL) & ~(PGTBL_MODIFIED | PGTBL_ACCESSED))
-		            == (i | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER | PGTBL_GLOBAL));
+		       || ((boot_comp_pgd[j] | X86_PGTBL_GLOBAL) & ~(X86_PGTBL_MODIFIED | X86_PGTBL_ACCESSED))
+		            == (i | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL));
 		/* lower mapping */
-		boot_comp_pgd[i / PGD_RANGE] = i | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER | PGTBL_GLOBAL;
+		boot_comp_pgd[i / PGD_RANGE] = i | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL;
 		/* higher mapping */
-		boot_comp_pgd[j] = i | PGTBL_PRESENT | PGTBL_WRITABLE | PGTBL_SUPER | PGTBL_GLOBAL;
+		boot_comp_pgd[j] = i | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL;
 	}
 }
 
diff --git a/src/platform/i386/vtxprintf.c b/src/platform/i386/vtxprintf.c
index 47a6e37066..adf6ba08c1 100644
--- a/src/platform/i386/vtxprintf.c
+++ b/src/platform/i386/vtxprintf.c
@@ -34,6 +34,16 @@
 		__mod;                                                                              \
 	})
 
+#if defined(__x86_64__)
+unsigned int do_div64(unsigned long long *num, int base)
+{
+	unsigned int mod = 0;
+	mod = *num % base;
+	*num = *num / base; 
+	return mod;	
+}
+#endif
+
 /* haha, don't need ctype.c */
 #define isdigit(c) ((c) >= '0' && (c) <= '9')
 #define is_digit isdigit
@@ -91,8 +101,13 @@ number(void (*tx_byte)(unsigned char byte), unsigned long long num, int base, in
 	i = 0;
 	if (num == 0)
 		tmp[i++] = '0';
-	else
+	else {
+	#if defined(__x86_64__)
+		while (num != 0) tmp[i++] = digits[do_div64(&num, base)];
+	#elif defined(__i386__)
 		while (num != 0) tmp[i++] = digits[do_div(num, base)];
+	#endif
+	}
 	if (i > precision) precision = i;
 	size -= precision;
 	if (!(type & (ZEROPAD + LEFT)))
diff --git a/src/platform/include/chal_plat.h b/src/platform/include/chal_plat.h
deleted file mode 100644
index 623763cb48..0000000000
--- a/src/platform/include/chal_plat.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef CHAL_PLAT_H
-#define CHAL_PLAT_H
-
-/* This flushes all levels of cache of the current logical CPU. */
-static inline void
-chal_flush_cache(void)
-{
-	asm volatile("wbinvd" : : : "memory");
-}
-
-static inline void
-chal_flush_tlb_global(void)
-{
-}
-static inline void
-chal_remote_tlb_flush(int target_cpu)
-{
-}
-/* This won't flush global TLB (pinned with PGE) entries. */
-static inline void
-chal_flush_tlb(void)
-{
-}
-
-#endif /* CHAL_PLAT_H */
diff --git a/src/platform/x86_64/LICENSE.pintos b/src/platform/x86_64/LICENSE.pintos
new file mode 120000
index 0000000000..212023d853
--- /dev/null
+++ b/src/platform/x86_64/LICENSE.pintos
@@ -0,0 +1 @@
+../i386/LICENSE.pintos
\ No newline at end of file
diff --git a/src/platform/x86_64/Makefile b/src/platform/x86_64/Makefile
new file mode 100644
index 0000000000..43cbf28c00
--- /dev/null
+++ b/src/platform/x86_64/Makefile
@@ -0,0 +1,128 @@
+include Makefile.src
+include Makefile.arch
+
+CC := gcc -m64
+LD := ld -m elf_x86_64 --nmagic
+AS := as --64 -g
+
+INCPATH := ../../kernel/include
+INCS    := -I$(INCPATH) -I$(INCPATH)/shared/ -I$(INCPATH)/chal/
+CFLAGS  := $(ARCH_CFLAGS) -g3 -O3 -ffreestanding -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -nostdinc -nostdlib -fno-pic -mno-red-zone -mcmodel=large -mno-sse -mno-sse2 $(INCS)
+LDFLAGS := -nostdlib -fno-builtin -nostartfiles -nostdinc -nodefaultlibs
+
+KERNEL := kernel.img
+IMAGE  := cos.img
+
+WARNINGS += -Wall
+WARNINGS += -Wcast-align
+WARNINGS += -Wformat=2
+WARNINGS += -Winit-self
+#WARNINGS += -Wmissing-declarations
+#WARNINGS += -Wmissing-prototypes
+WARNINGS += -Wnested-externs
+WARNINGS += -Wno-system-headers
+WARNINGS += -Wold-style-definition
+WARNINGS += -Wredundant-decls
+WARNINGS += -Wsign-compare
+WARNINGS += -Wstrict-prototypes
+WARNINGS += -Wundef
+WARNINGS += -Wvolatile-register-var
+WARNINGS += -Wwrite-strings
+WARNINGS += -Wno-address-of-packed-member
+
+CFLAGS += $(WARNINGS)
+
+OBJS += kernel.o
+OBJS += gdt.o
+OBJS += idt.o
+OBJS += vm.o
+OBJS += printk.o
+OBJS += string.o
+OBJS += vtxprintf.o
+OBJS += tss.o
+OBJS += user.o
+OBJS += serial.o
+OBJS += hpet.o
+OBJS += chal.o
+OBJS += boot_comp.o
+OBJS += miniacpi.o
+#OBJS += console.o
+OBJS += vga.o
+OBJS += exception.o
+OBJS += lapic.o
+OBJS += chal_pgtbl.o
+
+COS_OBJ += pgtbl.o
+COS_OBJ += retype_tbl.o
+COS_OBJ += liveness_tbl.o
+COS_OBJ += tcap.o
+COS_OBJ += capinv.o
+COS_OBJ += captbl.o
+
+DEPS :=$(patsubst %.o, %.d, $(OBJS))
+
+OBJS += $(COS_OBJ)
+
+.PHONY: $(CONSTRUCTOR_COMP)
+
+all: $(KERNEL)
+
+$(KERNEL): linker.ld $(OBJS) loader.o $(CONSTRUCTOR_COMP)
+	$(if $(CONSTRUCTOR_COMP), $(info |     [LD]   Linking in the constructor component $@))
+	$(if $(CONSTRUCTOR_COMP), cp $(CONSTRUCTOR_COMP) constructor; $(LD) -r -b binary constructor -o constructor.o; objcopy --rename-section .data=.initial_component constructor.o;)
+	$(if $(KERNEL_OUTPUT), $(info |     [LD]   Linking $@))
+	$(if $(KERNEL_OUTPUT), $(LD) -T linker.ld loader.o entry.o $(OBJS) $(if $(CONSTRUCTOR_COMP), constructor.o) -o $@)
+	$(if $(KERNEL_OUTPUT), $(info |     [CP]   Copying $@ into $(KERNEL_OUTPUT)))
+	$(if $(KERNEL_OUTPUT), cp $@ $(KERNEL_OUTPUT))
+
+loader.o: loader.S entry.S
+	$(info |     [AS]   Assembling $@)
+	@$(CC) -c -I$(INCPATH) entry.S
+	@$(CC) -c -I$(INCPATH) loader.S
+	
+%.d: %.c
+	@set +e; rm -f $@; \
+	$(CC) -M $(CFLAGS) $< > $@.$$$$ 2>/dev/null; \
+	if [ -s $@.$$$$ ]; then \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	fi; \
+	rm -f $@.$$$$
+
+pgtbl.o: ../../kernel/pgtbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+tcap.o: ../../kernel/tcap.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+retype_tbl.o: ../../kernel/retype_tbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+liveness_tbl.o: ../../kernel/liveness_tbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+capinv.o: ../../kernel/capinv.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+captbl.o: ../../kernel/captbl.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+
+%.o: %.c
+	$(info |     [CC]   Compiling $@)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+clean:
+	@rm -f *.d *.o $(KERNEL)  kernel.iso
+	@rm -rf iso
+	@rm -f constructor
+
+gdb:
+	gdb -x ./gdbinit
+
+-include $(DEPS)
diff --git a/src/platform/x86_64/boot_comp.c b/src/platform/x86_64/boot_comp.c
new file mode 120000
index 0000000000..68f41466c5
--- /dev/null
+++ b/src/platform/x86_64/boot_comp.c
@@ -0,0 +1 @@
+../i386/boot_comp.c
\ No newline at end of file
diff --git a/src/platform/x86_64/boot_comp.h b/src/platform/x86_64/boot_comp.h
new file mode 120000
index 0000000000..ffef0a66d5
--- /dev/null
+++ b/src/platform/x86_64/boot_comp.h
@@ -0,0 +1 @@
+../i386/boot_comp.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal.c b/src/platform/x86_64/chal.c
new file mode 120000
index 0000000000..a7c89f2ef7
--- /dev/null
+++ b/src/platform/x86_64/chal.c
@@ -0,0 +1 @@
+../i386/chal.c
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/call_convention.h b/src/platform/x86_64/chal/call_convention.h
new file mode 120000
index 0000000000..959af8863e
--- /dev/null
+++ b/src/platform/x86_64/chal/call_convention.h
@@ -0,0 +1 @@
+../../i386/chal/call_convention.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/chal_config.h b/src/platform/x86_64/chal/chal_config.h
new file mode 120000
index 0000000000..f3f93e0cba
--- /dev/null
+++ b/src/platform/x86_64/chal/chal_config.h
@@ -0,0 +1 @@
+../../i386/chal/chal_config.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/chal_plat.h b/src/platform/x86_64/chal/chal_plat.h
new file mode 120000
index 0000000000..9bc95febb5
--- /dev/null
+++ b/src/platform/x86_64/chal/chal_plat.h
@@ -0,0 +1 @@
+../../i386/chal/chal_plat.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/chal_proto.h b/src/platform/x86_64/chal/chal_proto.h
new file mode 120000
index 0000000000..f5869a39de
--- /dev/null
+++ b/src/platform/x86_64/chal/chal_proto.h
@@ -0,0 +1 @@
+../../i386/chal/chal_proto.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/cpuid.h b/src/platform/x86_64/chal/cpuid.h
new file mode 120000
index 0000000000..1f17f9de83
--- /dev/null
+++ b/src/platform/x86_64/chal/cpuid.h
@@ -0,0 +1 @@
+../../i386/chal/cpuid.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/defs.h b/src/platform/x86_64/chal/defs.h
new file mode 120000
index 0000000000..6e46cc64a6
--- /dev/null
+++ b/src/platform/x86_64/chal/defs.h
@@ -0,0 +1 @@
+../../i386/chal/defs.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/shared/chal_consts.h b/src/platform/x86_64/chal/shared/chal_consts.h
new file mode 100644
index 0000000000..78778dd544
--- /dev/null
+++ b/src/platform/x86_64/chal/shared/chal_consts.h
@@ -0,0 +1,58 @@
+#ifndef CHAL_CONSTS_H
+#define CHAL_CONSTS_H
+
+#include "../chal_config.h"
+
+struct pt_regs {
+	u64_t ds;
+	u64_t es;
+	u64_t fs;
+	u64_t gs;
+	u64_t r15;
+	u64_t r14;
+	u64_t r13;
+	u64_t r12;
+	u64_t r11;
+	u64_t r10;
+	u64_t r9;
+	u64_t r8;
+	u64_t bx;
+	u64_t cx;
+	u64_t dx;
+	u64_t si;
+	u64_t di;
+	u64_t bp;
+	u64_t ax;
+	u64_t orig_ax; /* error code */
+	u64_t ip;
+	u64_t cs;
+	u64_t flags;
+	u64_t sp;
+	u64_t ss;
+};
+/* Naming scheme : PGT0 -> PGD, PGT1 -> 2-th lvl pgtbl, etc */
+#define PAGE_MASK (~(PAGE_SIZE - 1))
+#define PGD_SHIFT 39
+#define PGD_RANGE (1UL << PGD_SHIFT)
+#define PGD_SIZE PGD_RANGE
+#define PGD_MASK (~(PGD_RANGE - 1))
+#define PGD_PER_PTBL 512
+
+#define PGT1_SHIFT 30
+#define PGT1_RANGE (1UL << PGT1_SHIFT)
+#define PGT1_SIZE PGT1_RANGE
+#define PGT1_MASK (~(PGT1_RANGE - 1))
+#define PGT1_PER_PTBL 512
+
+#define PGT2_SHIFT 21
+#define PGT2_RANGE (1UL << PGT2_SHIFT)
+#define PGT2_SIZE PGT2_RANGE
+#define PGT2_MASK (~(PGT2_RANGE - 1))
+#define PGT2_PER_PTBL 512
+
+#define PGT3_SHIFT 12
+#define PGT3_RANGE (1UL << PGT3_SHIFT)
+#define PGT3_SIZE PGT3_RANGE
+#define PGT3_MASK (~(PGT3_RANGE - 1))
+#define PGT3_PER_PTBL 512
+#endif /* CHAL_CONSTS_H */
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/shared/cos_config.h b/src/platform/x86_64/chal/shared/cos_config.h
new file mode 120000
index 0000000000..74213327e8
--- /dev/null
+++ b/src/platform/x86_64/chal/shared/cos_config.h
@@ -0,0 +1 @@
+../../../i386/chal/shared/cos_config.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/shared/cos_io.h b/src/platform/x86_64/chal/shared/cos_io.h
new file mode 120000
index 0000000000..fb7f95ba6c
--- /dev/null
+++ b/src/platform/x86_64/chal/shared/cos_io.h
@@ -0,0 +1 @@
+../../../i386/chal/shared/cos_io.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal/shared/util.h b/src/platform/x86_64/chal/shared/util.h
new file mode 120000
index 0000000000..6ba3f7d12a
--- /dev/null
+++ b/src/platform/x86_64/chal/shared/util.h
@@ -0,0 +1 @@
+../../../i386/chal/shared/util.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal_asm_inc.h b/src/platform/x86_64/chal_asm_inc.h
new file mode 100644
index 0000000000..c7da88766e
--- /dev/null
+++ b/src/platform/x86_64/chal_asm_inc.h
@@ -0,0 +1,21 @@
+/* Segment selectors for the GDT */
+#define SEL_RPL_USR 0x3
+
+#define SEL_NULL 0x00
+#define SEL_KCSEG 0x08                 /* Kernel code selector. */
+#define SEL_KDSEG 0x10                 /* Kernel data selector. */
+#define SEL_UCSEG (0x20 | SEL_RPL_USR) /* User code selector. */
+#define SEL_UDSEG (0x18 | SEL_RPL_USR) /* User data selector. */
+#define SEL_TSS 0x28                   /* Task-state segment. */
+#define SEL_UGSEG (0x38 | SEL_RPL_USR) /* User TLS selector. */
+#define SEL_UFSEG (0x40 | SEL_RPL_USR) /* User TLS selector in x86_64. */
+
+#define SEL_CNT 9                      /* Number of segments. */
+
+#define STK_INFO_SZ 144                 /* sizeof(struct cos_cpu_local_info) */
+#define STK_INFO_OFF (STK_INFO_SZ + 8) /* sizeof(struct cos_cpu_local_info) + sizeof(long) */
+
+#define SMP_BOOT_PATCH_ADDR 0x70000
+
+#define KERNEL_STACK_OFFSET 0
+#define USER_STACK_OFFSET 8
\ No newline at end of file
diff --git a/src/platform/x86_64/chal_cpu.h b/src/platform/x86_64/chal_cpu.h
new file mode 120000
index 0000000000..574d2b29ab
--- /dev/null
+++ b/src/platform/x86_64/chal_cpu.h
@@ -0,0 +1 @@
+../i386/chal_cpu.h
\ No newline at end of file
diff --git a/src/platform/x86_64/chal_pgtbl.c b/src/platform/x86_64/chal_pgtbl.c
new file mode 120000
index 0000000000..1698524d8a
--- /dev/null
+++ b/src/platform/x86_64/chal_pgtbl.c
@@ -0,0 +1 @@
+../i386/chal_pgtbl.c
\ No newline at end of file
diff --git a/src/platform/x86_64/chal_pgtbl.h b/src/platform/x86_64/chal_pgtbl.h
new file mode 120000
index 0000000000..eb9b9ffaf3
--- /dev/null
+++ b/src/platform/x86_64/chal_pgtbl.h
@@ -0,0 +1 @@
+../i386/chal_pgtbl.h
\ No newline at end of file
diff --git a/src/platform/x86_64/console.c b/src/platform/x86_64/console.c
new file mode 120000
index 0000000000..ef34950f0b
--- /dev/null
+++ b/src/platform/x86_64/console.c
@@ -0,0 +1 @@
+../i386/console.c
\ No newline at end of file
diff --git a/src/platform/x86_64/entry.S b/src/platform/x86_64/entry.S
new file mode 100644
index 0000000000..dbdf41c869
--- /dev/null
+++ b/src/platform/x86_64/entry.S
@@ -0,0 +1,199 @@
+#include "chal_asm_inc.h"
+
+/* Composite pt_regs save/restore */
+#define SAVE_REGS_GENERAL 	\
+	pushq %rax;		\
+	pushq %rbp;		\
+	pushq %rdi;		\
+	pushq %rsi;		\
+	pushq %rdx;		\
+	pushq %rcx;		\
+	pushq %rbx;		\
+	pushq %r8;		\
+	pushq %r9;		\
+	pushq %r10;		\
+	pushq %r11;		\
+	pushq %r12;		\
+	pushq %r13;		\
+	pushq %r14;		\
+	pushq %r15;		\
+
+#define SAVE_REGS_ALL 		\
+	subq $0x30, %rsp;	\
+	SAVE_REGS_GENERAL;	\
+	subq $0x20, %rsp;	\
+
+/* When return to user: ecx => sp, edx => ip. */
+#define RESTORE_REGS_GENERAL	\
+	popq %r15;		\
+	popq %r14;		\
+	popq %r13;		\
+	popq %r12;		\
+	popq %r11;		\
+	popq %r10;		\
+	popq %r9;		\
+	popq %r8;		\
+	popq %rbx;		\
+	popq %rcx;		\
+	popq %rdx;		\
+	popq %rsi;		\
+	popq %rdi;		\
+	popq %rbp;		\
+	popq %rax;		\
+
+#define RESTORE_REGS_ALL	\
+	addq $0x20, %rsp;	\
+	RESTORE_REGS_GENERAL; 	\
+	addq $30, %rsp
+
+#define RET_TO_USER \
+	movq %rbp, %rsp; \
+	sysretq
+
+/* The entire IPC path should be in __ipc_entry section. */
+.section __ipc_entry, "ax"
+.align 16
+.globl sysenter_entry
+sysenter_entry:
+	swapgs
+	movq %gs:KERNEL_STACK_OFFSET, %rsp
+	SAVE_REGS_ALL
+	mov %rsp, %rdi /* pt_reg */
+	call composite_syscall_handler
+
+	swapgs
+	testq %rax, %rax
+	jne restore_from_thd
+
+	RESTORE_REGS_ALL	
+	RET_TO_USER		
+/* we are changing thread contexts, reload all registers */
+
+.align 16
+restore_from_thd:
+	popq %rax
+	movq %rax, %ds
+	popq %rax
+	movq %rax, %es
+	popq %rax
+	movq %rax, %gs
+	RESTORE_REGS_GENERAL
+
+	addq $8, %rsp
+
+	sti
+	iretq
+
+#define IRQPROC(fn)  \
+	SAVE_REGS_GENERAL; 	\
+	movq %gs, %rax;		\
+	pushq %rax;			\
+	movq %es, %rax;		\
+	pushq %rax;			\
+	movq %ds, %rax;		\
+	pushq %rax;			\
+	movq $(SEL_KDSEG), %rax;\
+	mov %rax, %ds;		\
+	mov %rsp, %rdi; 	\
+	call fn;		\
+	testq %rax, %rax;	\
+	jne restore_from_thd;	\
+	RESTORE_REGS_ALL;	\
+	RET_TO_USER
+
+/*
+ * Convention:
+ * C handler is IRQHANDLER_handler, and the irq assembly
+ * routine is IRQHANDLER_irq.
+ */
+#define IRQ(fn)		 	\
+.align 16;			\
+.global fn##_irq;		\
+fn##_irq: 			\
+	cli; 			\
+	push $0;  		\
+	IRQPROC(fn##_handler)
+
+#define IRQ_CODE(fn)		\
+.align 16;			\
+.global fn##_irq;		\
+fn##_irq: 			\
+	cli; 			\
+	IRQPROC(fn##_handler)
+
+#define IRQ_ID(ID)		\
+.align 4;			\
+.global handler_hw_##ID;	\
+handler_hw_##ID:		\
+	cli; 			\
+	push $(ID);		\
+	jmp irqproc
+
+irqproc:
+	IRQPROC(hw_handler)
+
+.text
+IRQ(div_by_zero_err_fault)
+IRQ(debug_trap)
+IRQ(breakpoint_trap)
+IRQ(overflow_trap)
+IRQ(bound_range_exceed_fault)
+IRQ(invalid_opcode_fault)
+IRQ(device_not_avail_fault)
+IRQ_CODE(double_fault_abort)
+IRQ_CODE(invalid_tss_fault)
+IRQ_CODE(seg_not_present_fault)
+IRQ_CODE(stack_seg_fault)
+IRQ_CODE(gen_protect_fault)
+IRQ_CODE(page_fault)
+IRQ(x87_float_pt_except_fault)
+IRQ_CODE(align_check_fault)
+IRQ(machine_check_abort)
+IRQ(smid_float_pt_except_fault)
+IRQ(virtualization_except_fault)
+IRQ_CODE(security_except_fault)
+
+IRQ(periodic)
+IRQ(keyboard)
+IRQ_ID(34)
+IRQ_ID(35)
+IRQ(serial)
+IRQ_ID(37)
+IRQ_ID(38)
+IRQ_ID(39)
+IRQ(oneshot)
+IRQ_ID(41)
+IRQ_ID(42)
+IRQ_ID(43)
+IRQ_ID(44)
+IRQ_ID(45)
+IRQ_ID(46)
+IRQ_ID(47)
+IRQ_ID(48)
+IRQ_ID(49)
+IRQ_ID(50)
+IRQ_ID(51)
+IRQ_ID(52)
+IRQ_ID(53)
+IRQ_ID(54)
+IRQ_ID(55)
+IRQ_ID(56)
+IRQ_ID(57)
+IRQ_ID(58)
+IRQ_ID(59)
+IRQ_ID(60)
+IRQ_ID(61)
+IRQ_ID(62)
+IRQ(lapic_spurious)
+IRQ(lapic_ipi_asnd)
+IRQ(lapic_timer)
+
+/*
+ * Loads the IDT into the processor
+ */
+.global idt_flush
+
+idt_flush:
+    movl 4(%esp), %eax
+    lidt (%eax)
+    ret
diff --git a/src/platform/x86_64/exception.c b/src/platform/x86_64/exception.c
new file mode 120000
index 0000000000..a5cb74713d
--- /dev/null
+++ b/src/platform/x86_64/exception.c
@@ -0,0 +1 @@
+../i386/exception.c
\ No newline at end of file
diff --git a/src/platform/x86_64/gdt.c b/src/platform/x86_64/gdt.c
new file mode 100644
index 0000000000..27d43021f0
--- /dev/null
+++ b/src/platform/x86_64/gdt.c
@@ -0,0 +1,182 @@
+/* Based on code from Pintos. See LICENSE.pintos for licensing information */
+
+#include "kernel.h"
+#include "tss.h"
+#include "chal_asm_inc.h"
+#include "chal_cpu.h"
+
+struct gdt_aligned {
+        u64_t seg_descs[SEL_CNT];
+} __attribute__((aligned(CACHE_LINE)));
+static volatile struct gdt_aligned gdt[NUM_CPU];
+
+/* GDT helpers. */
+static u64_t make_code_desc(int dpl);
+static u64_t make_data_desc(int dpl);
+static void make_tss_desc(volatile u64_t * tss_desc, u64_t tss_addr);
+static void make_gdtr_operand(u8_t gdtr_addr[10], u16_t limit, u64_t base);
+static void flush_selectors(void);
+
+void
+chal_tls_update(vaddr_t addr)
+{
+	int cpu_id = get_cpuid();
+
+	writemsr(MSR_FSBASE, (u32_t)(addr), (u32_t)((addr) >> 32));
+}
+
+/*
+ * Sets up a proper GDT.  The bootstrap loader's GDT didn't include
+ * user-mode selectors or a TSS, but we need both now.
+ */
+void
+gdt_init(const cpuid_t cpu_id)
+{
+	u8_t gdtr_operand[10];
+
+	/* Initialize GDT. */
+	gdt[cpu_id].seg_descs[SEL_NULL / sizeof *gdt[cpu_id].seg_descs]  = 0;
+	gdt[cpu_id].seg_descs[SEL_KCSEG / sizeof *gdt[cpu_id].seg_descs] = make_code_desc(0);
+	gdt[cpu_id].seg_descs[SEL_KDSEG / sizeof *gdt[cpu_id].seg_descs] = make_data_desc(0);
+
+	gdt[cpu_id].seg_descs[SEL_UDSEG / sizeof *gdt[cpu_id].seg_descs] = make_data_desc(3);
+	gdt[cpu_id].seg_descs[SEL_UCSEG / sizeof *gdt[cpu_id].seg_descs] = make_code_desc(3);
+	make_tss_desc(&(gdt[cpu_id].seg_descs[SEL_TSS / sizeof *gdt[cpu_id].seg_descs]), (u64_t)&tss[cpu_id]);
+	gdt[cpu_id].seg_descs[SEL_UGSEG / sizeof *gdt[cpu_id].seg_descs] = make_data_desc(3);
+	gdt[cpu_id].seg_descs[SEL_UFSEG / sizeof *gdt[cpu_id].seg_descs] = make_data_desc(3);
+
+	/*
+	 * Load GDTR, TR.  See [IA32-v3a] 2.4.1 "Global Descriptor
+	 * Table Register (GDTR)", 2.4.4 "Task Register (TR)", and
+	 * 6.2.4 "Task Register".
+	 */
+	make_gdtr_operand(gdtr_operand, sizeof gdt[cpu_id] - 1 ,(u64_t)(gdt + cpu_id));
+	asm volatile("lgdt %0" : : "m"(gdtr_operand));
+	/* 
+	 * Be careful to have the correct tss structure in memory and in gdt,
+	 * qemu does not check tss validity, but real machine does check 
+	 */
+	asm volatile("ltr %w0" : : "r"(SEL_TSS));
+	flush_selectors();
+}
+
+/* System segment or code/data segment? */
+enum seg_class
+{
+	CLS_SYSTEM    = 0, /* System segment. */
+	CLS_CODE_DATA = 1  /* Code or data segment. */
+};
+
+/* Limit has byte or 4 kB page granularity? */
+enum seg_granularity
+{
+	GRAN_BYTE = 0, /* Limit has 1-byte granularity. */
+	GRAN_PAGE = 1  /* Limit has 4 kB granularity. */
+};
+
+
+static void
+make_gdtr_operand(u8_t gdtr_addr[10], u16_t limit, u64_t base)
+{
+	*((u16_t*)(&gdtr_addr[0])) = limit;
+	*((u64_t*)(&gdtr_addr[2])) = base;
+}
+
+static u64_t
+make_code_desc(int dpl)
+{
+	/* 
+	 * make sure to init variables before use, you don't know 
+	 * whether the value comes from registers or memory, if it does 
+	 * comes from memory, value in that address could be random, 
+	 * thus you need to init that memory first. 	
+	 */
+	u32_t e0 = 0, e1 = 0;
+
+	e1 = ((0)
+	      | (10 << 8)       /* Segment type. */
+	      | (1 << 12)       /* 0=system, 1=code/data. */
+	      | (dpl << 13)     /* Descriptor privilege. */
+	      | (1 << 15)       /* Present. */
+	      | (1 << 21)       /* L bit. */
+	      | (0 << 22));       /* D/B bit. */
+
+	return e0 | ((u64_t)e1 << 32);
+}
+
+
+static u64_t
+make_data_desc(int dpl)
+{
+	/* 
+	 * make sure to init variables before use, you don't know 
+	 * whether the value comes from registers or memory, if it does 
+	 * comes from memory, value in that address could be random, 
+	 * thus you need to init that memory first. 
+	 */
+	u32_t e0 = 0, e1 = 0;
+
+	e1 = ((0)
+	      | (2 << 8)        /* Segment type. */
+	      | (1 << 12)       /* 0=system, 1=code/data. */
+	      | (dpl << 13)     /* Descriptor privilege. */
+	      | (1 << 15));     /* Present. */
+
+	return e0 | ((u64_t)e1 << 32);
+}
+
+static void
+make_tss_desc(volatile u64_t * tss_desc, u64_t tss_addr)
+{
+	/* 
+	 * make sure to init variables before use, you don't know 
+	 * whether the value comes from registers or memory, if it does 
+	 * comes from memory, value in that address could be random, 
+	 * thus you need to init that memory first. 	
+	 */
+	u32_t e0 = 0, e1 = 0;
+	u64_t e2 = (tss_addr >> 32) & 0x00000000ffffffff;
+	u32_t base = (u32_t)tss_addr;
+	int type = 9;
+	u32_t limit = 0x67;
+	e0 = (( limit & 0xffff) 		/* Limit 15:0. */
+	      | (base << 16));			/* Base 15:0. */
+
+	e1 = (((base >> 16) & 0xff)		/* Base 23:16. */
+	      | (type << 8)				/* Segment type. */
+	      | (0 << 12)				/* 0=system, 1=code/data. */
+	      | (0 << 13)				/* Descriptor privilege. */
+	      | (1 << 15)             	/* Present. */
+	      | (limit & 0xf0000)     	/* Limit 16:19. */
+	      | (base & 0xff000000)); 	/* Base 31:24. */
+
+	*tss_desc = (e0 | ((u64_t)e1 << 32));	
+	*(tss_desc + 1) = e2;
+}
+
+/*
+ * After changing gdt, the cache in seletors might still use old value
+ * flush them use this function so the cache will use new value
+ */
+static void
+flush_selectors(void)
+{
+	__asm__ __volatile__("mov %0, %%rax   \n\t"   
+						 "mov %%rax, %%ds  \n\t"
+				 		 "mov %%rax, %%ss     \n\t"
+						 "mov $0, %%rax    \n\t"
+						 "mov %%rax, %%es	  \n\t"
+						 "mov %%rax, %%fs     \n\t"   
+						 "mov %%rax, %%gs     \n\t"
+						 "mov %1, %%rax	  \n\t"
+						 "pushq %%rax	  \n\t"
+						 "movabs $label_1, %%rax \n\t"
+						 "pushq %%rax     \n\t"
+						 "lretq    \n\t"
+						 ".global label_1\n\t"
+						 "label_1:\n\t"
+						:                  
+						:"i"(SEL_KDSEG), "i"(SEL_KCSEG)                         
+						:"%rax");                   
+
+}
\ No newline at end of file
diff --git a/src/platform/x86_64/hpet.c b/src/platform/x86_64/hpet.c
new file mode 120000
index 0000000000..e7eaf93b73
--- /dev/null
+++ b/src/platform/x86_64/hpet.c
@@ -0,0 +1 @@
+../i386/hpet.c
\ No newline at end of file
diff --git a/src/platform/x86_64/idt.c b/src/platform/x86_64/idt.c
new file mode 120000
index 0000000000..30c95b16cd
--- /dev/null
+++ b/src/platform/x86_64/idt.c
@@ -0,0 +1 @@
+../i386/idt.c
\ No newline at end of file
diff --git a/src/platform/x86_64/isr.h b/src/platform/x86_64/isr.h
new file mode 120000
index 0000000000..8eab57a552
--- /dev/null
+++ b/src/platform/x86_64/isr.h
@@ -0,0 +1 @@
+../i386/isr.h
\ No newline at end of file
diff --git a/src/platform/x86_64/kernel.c b/src/platform/x86_64/kernel.c
new file mode 120000
index 0000000000..412fe07a90
--- /dev/null
+++ b/src/platform/x86_64/kernel.c
@@ -0,0 +1 @@
+../i386/kernel.c
\ No newline at end of file
diff --git a/src/platform/x86_64/kernel.h b/src/platform/x86_64/kernel.h
new file mode 120000
index 0000000000..72cae04257
--- /dev/null
+++ b/src/platform/x86_64/kernel.h
@@ -0,0 +1 @@
+../i386/kernel.h
\ No newline at end of file
diff --git a/src/platform/x86_64/lapic.c b/src/platform/x86_64/lapic.c
new file mode 120000
index 0000000000..2d9dfafd24
--- /dev/null
+++ b/src/platform/x86_64/lapic.c
@@ -0,0 +1 @@
+../i386/lapic.c
\ No newline at end of file
diff --git a/src/platform/x86_64/linker.ld b/src/platform/x86_64/linker.ld
new file mode 100644
index 0000000000..69f1d65990
--- /dev/null
+++ b/src/platform/x86_64/linker.ld
@@ -0,0 +1,66 @@
+/*
+ * TODO: integrate into the build system to avoid redefining the
+ * constants using "gcc -P -E ldscript.c -o ldscript.ld"
+ */
+
+OUTPUT_FORMAT(elf64-x86-64)
+ENTRY (loader)
+phys = 0x00100000;  		/* This should be COS_MEM_KERN_PA */
+SECTIONS {
+
+    . = phys;
+
+    .boottext : AT(phys) ALIGN(8)
+    {
+       loader.o(.text)
+       . = ALIGN(4096);
+    }
+    
+    phys = .;
+
+    . += 0xffff800000000000;		/* This should be COS_MEM_KERN_START_VA + COS_MEM_KERN_PA */
+
+    .text : AT(phys) {
+        code = .;
+        loader.o(.smptext)
+        *(.text)
+        *(.rodata)
+        . = ALIGN(4096);
+        *(__ipc_entry)
+        . = ALIGN(4096);
+    }
+
+    .data : AT(phys + (data - code)) {
+        data = .;
+        *(.data)
+        . = ALIGN(4096);
+    }
+
+    .bss : AT(phys + (bss - code)) {
+        bss = .;
+        *(.bss)
+        . = ALIGN(4096);
+    }
+
+    /*
+     * We allocate all large allocations after the normal .bss and .data so that data
+     * that is needed in the intial kernel image (referred to by a single 4MB super-page)
+     */
+    .largebss : AT(phys + (largebss - code)) {
+        largebss = .;
+        *(.largebss)
+        . = ALIGN(4096);
+    }
+    end = .;		/* Unfortunately, this variable will take up the whole page. */
+    . = ALIGN(4096);
+
+    .initial_component : AT(phys + (initial_component - code)) {
+        initial_component = .;
+        *(.initial_component)
+    }
+
+    /DISCARD/ : {
+        *(.comment)
+        *(.note.gnu.build-id)
+    }
+}
diff --git a/src/platform/x86_64/loader.S b/src/platform/x86_64/loader.S
new file mode 100644
index 0000000000..a1de71a035
--- /dev/null
+++ b/src/platform/x86_64/loader.S
@@ -0,0 +1,381 @@
+#include "chal/shared/cos_config.h"
+#include "chal_asm_inc.h"
+#include "multiboot2.h"
+
+/* multiboot2 header must be contained completely within the first 32768 bytes of the OS image, and must be 64-bit aligned */
+.section .text
+multiboot_start:
+	/* must have multiboot2 header field */
+	.long MULTIBOOT2_HEADER_MAGIC
+	.long MULTIBOOT_ARCHITECTURE_I386
+	.long multiboot_end - multiboot_start
+	.long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + (multiboot_end - multiboot_start))
+
+	/* end tag of multiboot2 */
+	.short MULTIBOOT_HEADER_TAG_END
+	.short 0
+	.long 8
+
+multiboot_end:
+
+/* 
+ * grub enters 32-bit mode, so your first section should use 32-bit code.
+ * jmp to 64 bit yourself from here.
+ */
+.code32
+.global loader 
+loader:
+	/* save multiboot2 args first */
+	mov %eax, multiboot_magic
+	mov %ebx, multiboot_tags
+
+	/* now enable SSE */
+	mov %cr0, %eax
+	and $0xFFFB, %ax
+	or $0x2, %ax
+	mov %eax, %cr0
+	mov %cr4, %eax
+	or $(3 << 9), %ax
+	mov %eax, %cr4
+	
+	/* repare to enter long(64-bit) mode */
+
+	/* close paging first */
+	mov %cr0, %eax
+	and $(~(1<<31)), %eax
+	mov %eax, %cr0
+
+	/* test if 1G huge page is supported */
+	/* some cpus don't support 1G huge page, we enable this by set qemu -cpu max */
+	mov $0x80000001, %eax
+	cpuid
+	bt $26, %edx
+	jc huge_page_enabled
+	/* TODO: support for cpus which don't have 1G paging scheme here */
+	jmp .
+
+huge_page_enabled:
+	/* we have to set up a temparaily page scheme to before enter long mode */
+	/* we use 1G paging scheme, so only to set p0_pgt, p1_pgt */
+	mov $p1_pgt, %eax
+	or $0x03, %eax
+	mov %eax, p0_pgt
+	mov %eax, (p0_pgt+0x08*256)
+	
+	/* set kernel paging space */
+	movl  $0x00000083, p1_pgt /* 0-1 GB vm -> 0-1 GB pm */
+
+	/* set %cr3 to the physical address of p0_pgt */
+	mov $p0_pgt, %eax
+	mov %eax, %cr3
+
+	/* enable PAE-paging by setting the PAE-bit in %cr4 */
+	mov %cr4, %eax
+	or $(1 << 5), %eax
+	mov %eax, %cr4
+
+	/* set the long mode bit in the EFER MSR */
+	mov $0xC0000080, %ecx
+	rdmsr
+	or $(1 << 8), %eax
+	wrmsr
+
+	/* enable paging and protected mode in cr0 */
+	mov %cr0, %eax
+	or $(1 << 31), %eax
+	mov %eax, %cr0
+
+	/* load GDT so we can use selectors within them */
+	mov $gdt_ptr, %eax
+	lgdt (%eax)
+
+	/* need a jump to flush cs selector */
+.code64
+	mov $entry_64, %rax
+	pushq $0x08
+	pushq %rax
+	lretq
+
+
+entry_64:
+	cli
+
+	/* flush data selectors */
+	mov $0x10, %rax
+	mov %rax, %ds
+	mov %rax, %es
+	mov %rax, %fs
+	mov %rax, %gs
+	mov %rax, %ss
+
+	/* set up a kernel stack for kmain */
+	movabs $(stack + STACKSIZE - STK_INFO_OFF), %rsp
+	xor %rsi, %rsi
+	xor %rdi, %rdi
+	movl multiboot_magic, %esi
+	movl multiboot_tags, %edi
+	movabs $COS_MEM_KERN_START_VA, %rax
+	add %rax, %rdi
+
+	movabs $kmain, %rax
+	pushq $0x08
+	pushq %rax
+	lretq
+	jmp .
+
+.align 8
+.global multiboot_magic
+multiboot_magic:
+	.fill 1, 4, 0
+.global multiboot_tags
+multiboot_tags:
+	.fill 1, 4, 0
+
+/* a simple temporary GDT */
+.align 8
+gdt_table:
+	.quad	0x0000000000000000	// null descriptor
+	.quad	0x0020980000000000	// kernel code descriptor
+	.quad	0x0000920000000000	// kernel data descriptor
+gdt_end:
+
+.global gdt_ptr
+gdt_ptr:
+	.word	gdt_end - gdt_table - 1
+	.quad	gdt_table
+
+/* temporary page directory/tables */
+/* need to be 4k aligned */
+.align 4096
+/* P0 is PGD */
+.global p0_pgt
+p0_pgt:
+	.fill 512, 8, 0
+
+.global p1_pgt
+p1_pgt:
+	.fill 512, 8, 0
+
+.section .data
+.set STACKSIZE, 0x1000
+.global stack
+.align 0x1000
+stack:
+.fill (STACKSIZE * NUM_CPU), 1, 0
+
+.section .smptext
+
+/***
+The following SMP boot code is from xv6, thus:
+
+Copyright (c) 2006-2009 Frans Kaashoek, Robert Morris, Russ Cox,
+                        Massachusetts Institute of Technology
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***/
+
+#define SEG_NULLASM                                             \
+        .word 0, 0;                                             \
+        .byte 0, 0, 0, 0
+
+// The 0xC0 means the limit is in 4096-byte units
+// and (for executable segments) 32-bit mode.
+#define SEG_ASM(type,base,lim)                                  \
+        .word (((lim) >> 12) & 0xffff), ((base) & 0xffff);      \
+        .byte (((base) >> 16) & 0xff), (0x90 | (type)),         \
+                (0xC0 | (((lim) >> 28) & 0xf)), (((base) >> 24) & 0xff)
+
+#define STA_X     0x8       // Executable segment
+#define STA_E     0x4       // Expand down (non-executable segments)
+#define STA_C     0x4       // Conforming code segment (executable only)
+#define STA_W     0x2       // Writeable (non-executable segments)
+#define STA_R     0x2       // Readable (executable segments)
+#define STA_A     0x1       // Accessed
+
+#define CR0_PE          0x00000001      // Protection Enable
+#define CR0_WP          0x00010000      // Write Protect
+#define CR0_PG          0x80000000      // Paging
+
+/*
+ * All of this code is compiled as part of the kernel, but will be
+ * dynamically copied into SMP_BOOT_PATCH_ADDR.  Given that the code
+ * is linked to another set of addresses (in the kernel), we need
+ * to manually relocate many of the addresses here.  Thus, these
+ * macros.
+ */
+#define RELOCATE_ADDR(a)    a - smppatchstart + SMP_BOOT_PATCH_ADDR
+/* when the code segment is = SMP_BOOT_PATCH_ADDR, use this: */
+#define RELOCATE_ADDR_CS(a) a - smppatchstart
+
+.align 4096
+.code16
+.globl smppatchstart
+smppatchstart:
+.globl smploader
+smploader:
+	cli
+
+	movw    %cs, %ax
+	movw    %ax, %ds
+	lgdt    RELOCATE_ADDR_CS(smpgdtdesc) /* using cs as ds: idea taken from Quest */
+	xorw    %ax, %ax
+	movw    %ax, %ds
+
+	movl    %cr0, %eax
+	orl     $CR0_PE, %eax
+	movl    %eax, %cr0
+
+	ljmpl    $(SEL_KCSEG), $RELOCATE_ADDR(smpstart32)
+
+.align 0x10
+.code32
+smpstart32:
+	movw    $(SEL_KDSEG), %ax
+	movw    %ax, %ds
+	movw    %ax, %es
+	movw    %ax, %ss
+	movw    $0, %ax
+	movw    %ax, %fs
+	movw    %ax, %gs
+
+	mov %cr0, %eax
+	and $0xFFFB, %ax	
+	or $0x2, %ax	
+	mov %eax, %cr0
+	mov %cr4, %eax
+	or $(3 << 9), %ax	
+	mov %eax, %cr4
+
+	mov %cr0, %eax
+	and $(~(1<<31)), %eax
+	mov %eax, %cr0
+
+	/* test if 1G huge page is supported */
+	mov $0x80000001, %eax
+	cpuid
+	bt $26, %edx
+	jc smp_huge_page_enabled
+	/* TODO: support for cpus which don't have 1G paging scheme here */
+	jmp .
+
+smp_huge_page_enabled:
+	movl    $p0_pgt, %eax
+	movl    %eax, %cr3
+
+	/* enable PAE-paging by setting the PAE-bit in %cr4 */
+	mov %cr4, %eax
+	or $(1 << 5), %eax
+	mov %eax, %cr4
+
+	/* set the long mode bit in the EFER MSR */
+	mov $0xC0000080, %ecx
+	rdmsr
+	or $(1 << 8), %eax
+	wrmsr
+
+	/* enable paging and protected mode in cr0 */
+	mov %cr0, %eax
+	or $(1 << 31), %eax
+	mov %eax, %cr0
+
+	/* load GDT so we can use selectors within them */
+	mov $gdt_ptr, %eax
+	lgdt (%eax)
+
+.code64
+	mov $RELOCATE_ADDR(smpstack_end) ,%rsp 
+	mov $RELOCATE_ADDR(smp_entry_64), %rax
+	pushq $0x08
+	pushq %rax
+	lretq
+
+smp_entry_64:
+	/* flush data selectors */
+	mov $0x10, %rax	
+	mov %rax, %ds
+	mov %rax, %es
+	mov %rax, %fs
+	mov %rax, %gs
+	mov %rax, %ss
+
+	/* set up a kernel stack for smp_kmain */
+	movq    $RELOCATE_ADDR(smpstack), %rsp
+	movq    (%rsp), %rsp
+	xor %rsi, %rsi
+	xor %rdi, %rdi
+	movl multiboot_magic, %esi
+	movl multiboot_tags, %edi
+	movabs $COS_MEM_KERN_START_VA, %rax
+	add %rax, %rdi
+
+	movabs $smp_kmain, %rax
+	pushq $0x08
+	pushq %rax
+	lretq
+	jmp .
+
+# setup an initial gdt that will be overridden in C code
+.p2align 2
+smpgdt:
+  SEG_NULLASM
+  SEG_ASM(STA_X|STA_R, 0, 0xffffffff)
+  SEG_ASM(STA_W, 0, 0xffffffff)
+
+smpgdtdesc:
+  .word   (smpgdtdesc - smpgdt - 1)
+  .long   RELOCATE_ADDR(smpgdt)
+
+.align 8
+.global smpstack
+smpstack:
+.quad 0xDEADBEEF
+.fill 9, 8 ,0
+smpstack_end:
+
+.globl smppatchend
+smppatchend:
+	nop
+
+/*
+http://wiki.osdev.org/Shutdown
+
+http://stackoverflow.com/questions/21463908/x86-instructions-to-power-off-computer-in-real-mode
+http://stackoverflow.com/questions/678458/shutdown-the-computer-using-assembly
+http://stackoverflow.com/questions/3145569/how-to-power-down-the-computer-from-a-freestanding-environment
+*/
+
+.code16
+.globl shutdown_apm
+shutdown_apm:
+mov $0x5301, %ax
+xor %bx, %bx
+int $0x15
+
+/* Try to set apm version (to 1.2). */
+mov $0x530e, %ax
+xor %bx, %bx
+mov $0x0102, %cx
+int $0x15
+
+/* Turn off the system. */
+mov $0x5307, %ax
+mov $0x0001, %bx
+mov $0x0003, %cx
+int $0x15
\ No newline at end of file
diff --git a/src/platform/x86_64/mem_layout.h b/src/platform/x86_64/mem_layout.h
new file mode 120000
index 0000000000..04466a1759
--- /dev/null
+++ b/src/platform/x86_64/mem_layout.h
@@ -0,0 +1 @@
+../i386/mem_layout.h
\ No newline at end of file
diff --git a/src/platform/x86_64/miniacpi.c b/src/platform/x86_64/miniacpi.c
new file mode 120000
index 0000000000..cdb8d66456
--- /dev/null
+++ b/src/platform/x86_64/miniacpi.c
@@ -0,0 +1 @@
+../i386/miniacpi.c
\ No newline at end of file
diff --git a/src/platform/x86_64/multiboot2.h b/src/platform/x86_64/multiboot2.h
new file mode 120000
index 0000000000..345d6fe3a6
--- /dev/null
+++ b/src/platform/x86_64/multiboot2.h
@@ -0,0 +1 @@
+../i386/multiboot2.h
\ No newline at end of file
diff --git a/src/platform/x86_64/printk.c b/src/platform/x86_64/printk.c
new file mode 120000
index 0000000000..12b3cd740b
--- /dev/null
+++ b/src/platform/x86_64/printk.c
@@ -0,0 +1 @@
+../i386/printk.c
\ No newline at end of file
diff --git a/src/platform/x86_64/serial.c b/src/platform/x86_64/serial.c
new file mode 120000
index 0000000000..06e23ec205
--- /dev/null
+++ b/src/platform/x86_64/serial.c
@@ -0,0 +1 @@
+../i386/serial.c
\ No newline at end of file
diff --git a/src/platform/x86_64/string.c b/src/platform/x86_64/string.c
new file mode 120000
index 0000000000..d63dea8672
--- /dev/null
+++ b/src/platform/x86_64/string.c
@@ -0,0 +1 @@
+../i386/string.c
\ No newline at end of file
diff --git a/src/platform/x86_64/string.h b/src/platform/x86_64/string.h
new file mode 120000
index 0000000000..d0bc9baefe
--- /dev/null
+++ b/src/platform/x86_64/string.h
@@ -0,0 +1 @@
+../i386/string.h
\ No newline at end of file
diff --git a/src/platform/x86_64/tss.c b/src/platform/x86_64/tss.c
new file mode 100644
index 0000000000..d46bc73699
--- /dev/null
+++ b/src/platform/x86_64/tss.c
@@ -0,0 +1,25 @@
+#include "kernel.h"
+#include "tss.h"
+#include "chal_asm_inc.h"
+
+struct tss tss[NUM_CPU];
+#define BITMASK(SHIFT, CNT) (((1ul << (CNT)) - 1) << (SHIFT))
+#define PGSHIFT 0                       /* Index of first offset bit. */
+#define PGBITS 12                       /* Number of offset bits. */
+#define PGSIZE (1 << PGBITS)            /* Bytes in a page. */
+#define PGMASK BITMASK(PGSHIFT, PGBITS) /* Page offset bits (0:30). */
+
+struct kernel_stack_info kernel_stack_info[NUM_CPU];
+
+void
+tss_init(const cpuid_t cpu_id)
+{
+	u64_t rsp;
+
+	tss[cpu_id].bitmap = 0xdfff;
+	tss[cpu_id].rsp0   = (((u64_t)&rsp & ~PGMASK) + PGSIZE - STK_INFO_OFF);
+
+	memset(&kernel_stack_info[cpu_id], 0, sizeof(struct kernel_stack_info));
+
+	kernel_stack_info[cpu_id].kernel_stack_addr = tss[cpu_id].rsp0;
+}
diff --git a/src/platform/x86_64/tss.h b/src/platform/x86_64/tss.h
new file mode 100644
index 0000000000..5df663d456
--- /dev/null
+++ b/src/platform/x86_64/tss.h
@@ -0,0 +1,31 @@
+#ifndef TSS_H
+#define TSS_H
+
+#include "shared/cos_types.h"
+struct tss {
+    u32_t resv0;
+    u64_t rsp0;
+    u64_t rsp1;
+    u64_t rsp2;
+    u64_t resv1;
+    u64_t ist1;
+    u64_t ist2;
+    u64_t ist3;
+    u64_t ist4;
+    u64_t ist5;
+    u64_t ist6;
+    u64_t ist7;
+    u64_t resv2;
+    u16_t resv3;
+    u16_t bitmap;
+} __attribute__((packed));
+
+struct kernel_stack_info {
+	vaddr_t kernel_stack_addr;
+	vaddr_t user_stack_addr;
+};
+
+extern struct tss tss[NUM_CPU];
+extern struct kernel_stack_info kernel_stack_info[NUM_CPU];
+
+#endif /* TSS_H */
diff --git a/src/platform/x86_64/user.c b/src/platform/x86_64/user.c
new file mode 120000
index 0000000000..bd6fc24695
--- /dev/null
+++ b/src/platform/x86_64/user.c
@@ -0,0 +1 @@
+../i386/user.c
\ No newline at end of file
diff --git a/src/platform/x86_64/vga.c b/src/platform/x86_64/vga.c
new file mode 120000
index 0000000000..01bc01ea7b
--- /dev/null
+++ b/src/platform/x86_64/vga.c
@@ -0,0 +1 @@
+../i386/vga.c
\ No newline at end of file
diff --git a/src/platform/x86_64/vm.c b/src/platform/x86_64/vm.c
new file mode 100644
index 0000000000..6080fb0529
--- /dev/null
+++ b/src/platform/x86_64/vm.c
@@ -0,0 +1,207 @@
+#include <cc.h>
+#include <pgtbl.h>
+#include <thd.h>
+
+#include "kernel.h"
+#include "string.h"
+#include "isr.h"
+#include "chal_cpu.h"
+#include "mem_layout.h"
+#include "chal_pgtbl.h"
+
+#define LARGE_BSS __attribute__((section(".largebss,\"aw\",@nobits#")))
+
+struct tlb_quiescence tlb_quiescence[NUM_CPU] CACHE_ALIGNED LARGE_BSS;
+struct liveness_entry __liveness_tbl[LTBL_ENTS] CACHE_ALIGNED LARGE_BSS;
+
+#define KERN_INIT_PGD_IDX ((COS_MEM_KERN_START_VA & COS_MEM_KERN_HIGH_ADDR_VA_PGD_MASK) >> PGD_SHIFT)
+u64_t boot_comp_pgd[PAGE_SIZE / sizeof(u64_t)] PAGE_ALIGNED = {0};
+
+u64_t boot_comp_pgt1[PAGE_SIZE / sizeof(u64_t)] PAGE_ALIGNED = {0};
+
+u64_t boot_ap_pgd[PAGE_SIZE / sizeof(u64_t)] PAGE_ALIGNED = {[0] = 0 | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER,
+                                                             [KERN_INIT_PGD_IDX] = 0 | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE
+                                                                                     | X86_PGTBL_SUPER};
+
+
+void
+kern_retype_initial(void)
+{
+	u8_t *k;
+
+	assert((unsigned long)mem_bootc_start() % RETYPE_MEM_NPAGES == 0);
+	assert((unsigned long)mem_bootc_end() % RETYPE_MEM_NPAGES == 0);
+	for (k = mem_bootc_start(); k < mem_bootc_end(); k += PAGE_SIZE * RETYPE_MEM_NPAGES) {
+		if (retypetbl_retype2user((void *)chal_va2pa(k), PAGE_ORDER)) assert(0);
+	}
+}
+
+u8_t *
+mem_boot_alloc(int npages) /* boot-time, bump-ptr heap */
+{
+	u8_t *        r = glb_memlayout.kern_boot_heap;
+	unsigned long i;
+
+	assert(glb_memlayout.allocs_avail);
+
+	glb_memlayout.kern_boot_heap += npages * (PAGE_SIZE / sizeof(u8_t));
+	assert(glb_memlayout.kern_boot_heap <= mem_kmem_end());
+	for (i = (unsigned long)r; i < (unsigned long)glb_memlayout.kern_boot_heap; i += PAGE_SIZE) {
+		if ((unsigned long)i % RETYPE_MEM_NPAGES == 0) {
+			if (retypetbl_retype2kern((void *)chal_va2pa((void *)i), PAGE_ORDER)) {
+			}
+		}
+	}
+
+	memset((void *)r, 0, npages * (PAGE_SIZE / sizeof(u8_t)));
+
+	return r;
+}
+
+/*
+ * Essentially the kernel's heap pointer. Used for device memory
+ * allocation AFTER memory has been allocated for typeable memory.
+ */
+unsigned long kernel_mapped_offset;
+
+int
+kern_setup_image(void)
+{
+	u64_t i, j;
+	paddr_t       kern_pa_start, kern_pa_end;
+	int cpu_id = get_cpuid();
+
+	printk("\tSetting up initial page directory.\n");
+	kern_pa_start = round_to_pgd_page(chal_va2pa(mem_kern_start())); /* likely 0 */
+	kern_pa_end   = chal_va2pa(mem_kmem_end());
+	/* ASSUMPTION: The static layout of boot_comp_pgd is identical to a pgd post-pgtbl_alloc */
+	/* FIXME: should use pgtbl_extend instead of directly accessing the pgd array... */
+	for (i = kern_pa_start; i < (unsigned long)round_up_to_pgt1_page(kern_pa_end); i += PGT1_RANGE, j++) {
+		boot_comp_pgt1[i / PGT1_RANGE] = i | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL;
+	}
+	boot_comp_pgd[0] = 0; /* unmap lower addresses */
+
+	kernel_mapped_offset = i / PGT1_RANGE;
+	#ifdef ENABLE_VGA
+		/* uses virtual address for VGA */
+		vga_high_init();
+	#endif
+
+	chal_cpu_init();
+	chal_cpu_pgtbl_activate((pgtbl_t)chal_va2pa(boot_comp_pgd));
+	kern_retype_initial();
+
+	return 0;
+}
+
+/***
+ * The device API for allocating virtual memory, and accessing the
+ * device. Functions to map the memory, and to translate to virtual
+ * addresses. As devices are often in high physical memory, these are
+ * not the typical implementations, and require a simply
+ * data-structure to track the mappings. We want to avoid memory
+ * allocation (e.g. for PGD nodes) here, so we map super-pages worth
+ * of memory. This uses a non-trivial amount of kernel virtual memory.
+ *
+ * Note that this is relevant for devices that the kernel needs to
+ * access (timers, ACPI, LAPIC, etc...), and NOT the devices that are
+ * accessed from user-level as the hardware capability provides that
+ * mappings in a more conventional way.
+ *
+ * Thus, this is a simple implementation that assumes that we have
+ * relatively few devices that require mapping. We also bound the
+ * number of regions devoted to devices so that we fail fast if
+ * something strange is configured.
+ */
+
+#define DEV_MAPS_MAX 16
+
+int dev_map_off = 0;
+struct dev_map {
+	paddr_t physaddr;
+	void   *virtaddr;
+} dev_mem[DEV_MAPS_MAX];
+
+void *
+device_pa2va(paddr_t dev_addr)
+{
+	int i;
+
+	for (i = 0; i < dev_map_off; i++) {
+		paddr_t rounded = round_to_pgt1_page(dev_addr);
+		if (round_to_pgt1_page(dev_mem[i].physaddr) == rounded) {
+			return (char *)dev_mem[i].virtaddr + (dev_addr - rounded);
+		}
+	}
+
+	return NULL;
+}
+
+/*
+ * For a device mapped at a physical address, map it into virtual
+ * memory and return the address. This is very wasteful of physical
+ * memory as it uses PGD ranges (4MB) for the allocations. For 64-bit,
+ * a PGT3 is used, ranges a 1GB for allocations, but that should be OK
+ * since we have already mapped all physical memory address before this
+ * step, the remaining slots in page tables are free to use.
+ */
+void *
+device_map_mem(paddr_t dev_addr, unsigned int pt_extra_flags)
+{
+	paddr_t rounded;
+	void   *vaddr;
+	unsigned long off = kernel_mapped_offset;
+
+	boot_state_assert(INIT_UT_MEM);
+	vaddr = device_pa2va(dev_addr);
+	if (vaddr) {
+		boot_comp_pgt1[((unsigned long)vaddr - (unsigned long)(COS_MEM_KERN_START_VA)) / PGT1_RANGE] |= pt_extra_flags; /* use the union of the flags */
+
+		return vaddr;
+	}
+
+	/* Allocate a PGD/PGT3 region, and map it in */
+	assert(off < PAGE_SIZE / sizeof(unsigned long));
+	rounded = round_to_pgt1_page(dev_addr);
+	boot_comp_pgt1[off] = rounded | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL | pt_extra_flags;
+	dev_mem[dev_map_off] = (struct dev_map) {
+		.physaddr = rounded,
+		.virtaddr = (void *)(off * PGT1_RANGE + COS_MEM_KERN_START_VA)
+	};
+	dev_map_off++;
+	kernel_mapped_offset++;
+
+	assert(((unsigned long)device_pa2va(dev_addr) & (PGT1_RANGE-1)) == (dev_addr & (PGT1_RANGE-1)));
+
+	return device_pa2va(dev_addr);
+}
+
+
+void
+kern_paging_map_init(void *pa)
+{
+	u64_t i = 0;
+	paddr_t       kern_pa_start = 0, kern_pa_end = (paddr_t)pa;
+
+	/* lower mapping */
+	boot_comp_pgd[0] = (u64_t)chal_va2pa(&boot_comp_pgt1) | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE;
+	/* higher mapping */
+	boot_comp_pgd[KERN_INIT_PGD_IDX] = (u64_t)chal_va2pa(&boot_comp_pgt1) | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE;
+
+
+	for (i = kern_pa_start; i < (unsigned long)round_up_to_pgt1_page(kern_pa_end); i += PGT1_RANGE) {
+		boot_comp_pgt1[i / PGT1_RANGE] = i | X86_PGTBL_PRESENT | X86_PGTBL_WRITABLE | X86_PGTBL_SUPER | X86_PGTBL_GLOBAL;
+	}
+}
+
+
+void
+paging_init(void)
+{
+	int ret;
+
+	printk("Initializing virtual memory\n");
+	if ((ret = kern_setup_image())) {
+		die("Could not set up kernel image, errno %d.\n", ret);
+	}
+}
\ No newline at end of file
diff --git a/src/platform/x86_64/vtxprintf.c b/src/platform/x86_64/vtxprintf.c
new file mode 120000
index 0000000000..3391ed2cf7
--- /dev/null
+++ b/src/platform/x86_64/vtxprintf.c
@@ -0,0 +1 @@
+../i386/vtxprintf.c
\ No newline at end of file
diff --git a/src/platform/x86_64/vtxprintf.h b/src/platform/x86_64/vtxprintf.h
new file mode 120000
index 0000000000..d49e641432
--- /dev/null
+++ b/src/platform/x86_64/vtxprintf.h
@@ -0,0 +1 @@
+../i386/vtxprintf.h
\ No newline at end of file
diff --git a/tools/arm_qemurun.sh b/tools/arm_qemurun.sh
new file mode 100755
index 0000000000..51342afe96
--- /dev/null
+++ b/tools/arm_qemurun.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+TMPDIR=$2/tmp/
+
+UDISK=uboot.disk
+USFDISKPATH=$TMPDIR/uboot.sfdisk
+UDISKPATH=$TMPDIR/$UDISK
+KERNELDIR=$2/
+KERNELBIN=cos.img.bin
+LOCALDIRNAME=$TMPDIR/p1
+UBOOTELF=u-boot.elf
+UBOOTDIR=$2/../../../cos_u-boot-xlnx/
+
+QEMU=qemu-system-arm
+MACHINE=xilinx-zynq-a9
+
+cleanuploop() {
+	sudo umount $LOCALDIRNAME
+	LOOPDEVNAME=`losetup -l | grep uboot.disk | cut -f1 -d' '`
+	if [ "$LOOPDEVNAME" != "" ]; then
+		echo $LOOPDEVNAME 
+		sudo losetup -d $LOOPDEVNAME
+	fi
+}
+
+cleanup() {
+	cleanuploop
+	sudo rm -rf $TMPDIR
+}
+
+create_sfdisk() {
+cat > $USFDISKPATH <<EOF
+label: dos
+label-id: 0xedb0411a
+device: tmp/uboot.disk
+unit: sectors
+
+tmp/uboot.disk1 : start=        2048, size=       40960, type=83
+
+EOF
+}
+
+setup() {
+	mkdir -p $TMPDIR
+	create_sfdisk
+	LOOPDEV=`losetup -f`
+	echo "Using $LOOPDEV here"
+	dd if=/dev/zero of=$UDISKPATH bs=1M count=256
+	sfdisk $UDISKPATH < $USFDISKPATH
+
+	sudo losetup $LOOPDEV $UDISKPATH
+	LOOPDEVNAME=`losetup -l | grep uboot.disk | cut -f1 -d' '`
+	LOOPPART=$LOOPDEVNAME"p1"
+	sudo partprobe $LOOPDEV
+	sudo mkfs.ext2 -O ^64bit $LOOPPART
+
+	mkdir -p $LOCALDIRNAME
+	sudo mount -t ext2 $LOOPPART $LOCALDIRNAME
+	sudo cp $KERNELDIR/$KERNELBIN $LOCALDIRNAME/$KERNELBIN
+	sudo cp $UBOOTDIR/$UBOOTELF $TMPDIR
+	ls -l $LOCALDIRNAME
+	cleanuploop
+}
+
+
+
+qemu() {
+	cd $TMPDIR ; $QEMU -s -nographic -M $MACHINE -m 1024 -serial /dev/null -serial mon:stdio -display none -kernel $UBOOTELF -sd $UDISK ; cd -
+}
+
+all() {
+	cleanup
+	setup
+	qemu
+}
+
+usage() {
+	echo "$0 <cleanup | setup | qemu | all | usage> <system_binaries composed build>"
+	exit 1
+}
+
+if [ $# != 2 ]; then
+  usage $0
+fi
+
+$1
diff --git a/tools/arm_setenv b/tools/arm_setenv
new file mode 100755
index 0000000000..2b1e024a14
--- /dev/null
+++ b/tools/arm_setenv
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo -n "Setting \"arm-none-eabi-\" environment..."
+export CC=arm-none-eabi-gcc
+export ARCH=arm
+export CROSS_COMPILE=arm-none-eabi-
+export REALGCC=arm-none-eabi-gcc
+
+echo "Done."
+
+echo "Make sure you run it as \". `pwd`/arm_setenv\" for the current session!"
diff --git a/tools/build_iso.sh b/tools/build_iso.sh
new file mode 100755
index 0000000000..301a6ac36b
--- /dev/null
+++ b/tools/build_iso.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+if [ $# != 1 ]; then
+  echo "Usage: $0 <.../cos.img>"
+  exit 1
+fi
+
+if ! [ -r $1 ]; then
+  echo "Can't access system image " $1
+  exit 1
+fi
+
+build_iso()
+{
+	echo "[cos generating ISO image]"
+	local dir=$(cd "$(dirname "$1")"; pwd)  
+	local bin_name=$(basename $1 .img)
+
+	set +e
+	grub=$(command -v grub-mkrescue)
+	grub2=$(command -v grub2-mkrescue)
+	set -e
+
+	local grub_command=""
+	if [ "${grub}" != "" ]
+	then
+		grub_command="grub-mkrescue"
+	elif [ "${grub2}" != "" ]
+	then
+		grub_command="grub2-mkrescue"
+	else
+		echo "Cannot find grub-mkrescue/grub2-mkrescue to generate ISO image."
+		exit 1
+	fi
+
+	cd ${dir}
+	echo "set timeout=0" > grub.cfg
+	echo "set default=0" >> grub.cfg
+	echo "menuentry "composite" {" >> grub.cfg
+	echo "  multiboot2 /boot/${bin_name}.img" >> grub.cfg
+	echo "}" >> grub.cfg
+
+	mkdir -p iso/boot/grub
+	cp grub.cfg iso/boot/grub/
+	cp ${bin_name}.img iso/boot/
+	${grub_command} -d /usr/lib/grub/i386-pc -o ${bin_name}.iso iso
+
+	rm -rf iso grub.cfg
+
+	echo "Successfully generated ISO image: ${dir}/${bin_name}.iso"
+}
+
+build_iso $1
\ No newline at end of file
diff --git a/tools/init_env.sh b/tools/init_env.sh
new file mode 100755
index 0000000000..a225efd35f
--- /dev/null
+++ b/tools/init_env.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# grub-mkrescue/grub2-mkrescue is used to make an ISO image in build_iso.sh, thus install it here
+
+set +e
+grub=$(command -v grub-mkrescue)
+grub2=$(command -v grub2-mkrescue)
+set -e
+
+ubuntu64()
+{
+	# This is used to set evnironment deps in Ubuntu-64 for compile&run x86_32/x86_64 bit Composite
+	# Tested Ubuntu version: 18.04/20.04/21.04
+	local dependencies="build-essential git cargo xorriso mtools qemu-system-i386 gcc-multilib python2.7 python3-pip"
+	sudo apt install ${dependencies} -y
+
+	if [ "${grub}" == "" ] && [ "${grub2}" == "" ]
+	then
+		sudo apt install grub2-common
+	fi
+
+	pip3 install pyelftools
+	pip3 install meson>=0.61.0
+	pip3 install ninja
+
+	# Install rust
+	curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+}
+
+fedora64()
+{
+	# This is used to set evnironment deps in Fedora/CentOS-64 for compile&run x86_32/x86_64 bit Composite
+	# Tested Fedora version: 34/35
+	local dependencies="g++ git cargo python2.7 xorriso mtools qemu glibc-devel.i686 libstdc++-devel.i686 python3-pip"
+	sudo yum groupinstall "Development Tools" -y
+	sudo yum install ${dependencies} -y
+
+	if [ "${grub}" == "" ] && [ "${grub2}" == "" ]
+	then
+		sudo yum install grub2
+	fi
+
+	pip3 install pyelftools
+	pip3 install meson>=0.61.0
+	pip3 install ninja
+	# Install rust
+	curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+}
+
+usage()
+{
+	echo "Usage: " $0 " ubuntu-64|fedora-64"
+	exit 1
+}
+
+case $1 in
+	ubuntu-64 )
+		ubuntu64
+		;;
+	fedora-64 )
+		fedora64
+		;;
+	centos-64 )
+		fedora64
+		;;
+	* )
+		usage
+esac
diff --git a/tools/run.sh b/tools/run.sh
index 9bd4ea7375..9171c4433e 100755
--- a/tools/run.sh
+++ b/tools/run.sh
@@ -1,21 +1,62 @@
-#!/bin/sh
+#!/bin/bash
 
-if [ $# != 1 ]; then
-  echo "Usage: $0 <.../cos.img>"
+if [ $# -lt 2 ]; then
+  echo "Usage: $0 <.../cos.iso > <arch: [x86_64|i386]> [debug]"
   exit 1
-fi
+fi 
 
-if ! [ -r $1 ]; then
-  echo "Can't access system image " $1
-  exit 1
+num_sockets=1
+num_cores=8
+num_threads=1
+vcpus=$[${num_sockets}*${num_cores}*${num_threads}]
+mem_size=1024
+kvm_flag=""
+
+arch=$2
+debug_flag=$3
+nic_flag=$4
+
+if [ ! -f $1 ]
+then
+	echo "Cannot find the image iso"
+	exit 1
 fi
 
-if [ -e "/dev/kvm" ] && [ -r "/dev/kvm" ] && [ -w "/dev/kvm" ]; then
-  KVM_FLAG="-enable-kvm"
-else
-  KVM_FLAG=""
+case ${arch} in
+	x86_64 )
+	;;
+	i386 )
+	;;
+	* )
+	echo "Unsupported architecture"
+	exit 1
+esac
+
+if [ -e "/dev/kvm" ] && [ -r "/dev/kvm" ] && [ -w "/dev/kvm" ]
+then
+	kvm_flag="-enable-kvm"
 fi
 
-# TODO: inherit number of cores from the build
+if [ "${debug_flag}" == "debug" ]
+then
+	debug_flag="-S"
+	kvm_flag=""
+	if [ "${nic_flag}" == "enable-nic" ]
+	then
+		nic_flag=" -netdev type=tap,id=net0,ifname=tap0,script=no,downscript=no -device e1000e,netdev=net0,mac=66:66:66:66:66:66 "
+	fi
+elif [ "${debug_flag}" == "enable-nic" ]
+then
+	debug_flag=""
+	nic_flag=" -netdev type=tap,id=net0,ifname=tap0,script=no,downscript=no -device e1000e,netdev=net0,mac=66:66:66:66:66:66 "
+fi
 
-qemu-system-i386 $KVM_FLAG -m 768 -nographic -smp 1 -kernel $1 -no-reboot -s
+if [ "${arch}" == "x86_64" ]
+then
+	qemu-system-x86_64 ${kvm_flag} -cpu max,+avx -smp ${vcpus},cores=${num_cores},threads=${num_threads},sockets=${num_sockets} -m ${mem_size} -cdrom $1 -no-reboot -nographic -s ${debug_flag} ${nic_flag}
+elif [ "${arch}" == "i386" ]
+then
+	qemu-system-i386 ${kvm_flag} -cpu max -smp ${vcpus},cores=${num_cores},threads=${num_threads},sockets=${num_sockets} -m ${mem_size} -cdrom $1 -no-reboot -nographic -s ${debug_flag} ${nic_flag}
+else
+	echo "Unsupported arch!"
+fi