diff --git a/musl-cross-make-confs/Makefile.arch_indep b/musl-cross-make-confs/Makefile.arch_indep
index c254a9f..1bee6d4 100644
--- a/musl-cross-make-confs/Makefile.arch_indep
+++ b/musl-cross-make-confs/Makefile.arch_indep
@@ -136,7 +136,7 @@ endif
 ARCH         := $(shell uname -m | sed 's/^\(arm\).*/\1/g')
 
 # versions
-GCCVER       := 9.2.0
+GCCVER       := 9.4.0
 BINUTILSVER  := 2.33.1
 MUSLVER      := 1.1.24
 ISLVER       := 0.21
diff --git a/musl-cross-make-confs/patches/9999-crosware-gcc-9.4.0-libstdcpp-v3-configure.diff b/musl-cross-make-confs/patches/9999-crosware-gcc-9.4.0-libstdcpp-v3-configure.diff
new file mode 100644
index 0000000..1ea5817
--- /dev/null
+++ b/musl-cross-make-confs/patches/9999-crosware-gcc-9.4.0-libstdcpp-v3-configure.diff
@@ -0,0 +1,13 @@
+--- gcc-9.4.0.PRISTINE/libstdc++-v3/configure	2021-06-01 07:53:06.000000000 +0000
++++ gcc-9.4.0/libstdc++-v3/configure	2021-09-22 23:14:46.492397188 +0000
+@@ -15467,8 +15467,8 @@
+   glibcxx_compiler_shared_flag="-D_GLIBCXX_SHARED"
+ 
+ else
+-  glibcxx_lt_pic_flag=
+-  glibcxx_compiler_pic_flag=
++  glibcxx_lt_pic_flag="-prefer-pic"
++  glibcxx_compiler_pic_flag="$lt_prog_compiler_pic_CXX"
+   glibcxx_compiler_shared_flag=
+ fi
+ 
diff --git a/musl-cross-make-confs/patches/9999-crosware-ldso_gcc-9.4.0.diff b/musl-cross-make-confs/patches/9999-crosware-ldso_gcc-9.4.0.diff
new file mode 100644
index 0000000..14856ea
--- /dev/null
+++ b/musl-cross-make-confs/patches/9999-crosware-ldso_gcc-9.4.0.diff
@@ -0,0 +1,59 @@
+--- gcc-9.2.0.PRISTINE/gcc/config/aarch64/aarch64-linux.h
++++ gcc-9.2.0/gcc/config/aarch64/aarch64-linux.h
+@@ -21,10 +21,10 @@
+ #ifndef GCC_AARCH64_LINUX_H
+ #define GCC_AARCH64_LINUX_H
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define GLIBC_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/aarch64-linux-musl/lib/ld.so"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/aarch64-linux-musl/lib/ld.so"
+ 
+ #undef  ASAN_CC1_SPEC
+ #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
+--- gcc-9.2.0.PRISTINE/gcc/config/arm/linux-eabi.h
++++ gcc-9.2.0/gcc/config/arm/linux-eabi.h
+@@ -88,8 +88,7 @@
+ #else
+ #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
+ #endif
+-#define MUSL_DYNAMIC_LINKER \
+-  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/arm-linux-musleabihf/lib/ld.so"
+ 
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+--- gcc-9.2.0.PRISTINE/gcc/config/i386/linux.h
++++ gcc-9.2.0/gcc/config/i386/linux.h
+@@ -23,4 +23,4 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/i686-linux-musl/lib/ld.so"
+--- gcc-9.2.0.PRISTINE/gcc/config/i386/linux64.h
++++ gcc-9.2.0/gcc/config/i386/linux64.h
+@@ -32,8 +32,8 @@
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+-#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/usr/local/crosware/software/statictoolchain/current/i686-linux-musl/lib/ld.so"
+ #undef MUSL_DYNAMIC_LINKER64
+-#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/usr/local/crosware/software/statictoolchain/current/x86_64-linux-musl/lib/ld.so"
+ #undef MUSL_DYNAMIC_LINKERX32
+ #define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+--- gcc-9.2.0.PRISTINE/gcc/config/riscv/linux.h
++++ gcc-9.2.0/gcc/config/riscv/linux.h
+@@ -33,7 +33,7 @@
+   "%{mabi=lp64d:}"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1"
++#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/riscv64-linux-musl/lib/ld.so"
+ 
+ /* Because RISC-V only has word-sized atomics, it requries libatomic where
+    others do not.  So link libatomic by default, as needed.  */