diff --git a/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h
deleted file mode 100644
index f7cf1ab8a20aa4918dec394e898a17af5f5aea29..0000000000000000000000000000000000000000
--- a/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file is automatically generated.  */
-#ifndef __GNU_LIB_NAMES_H
-# error "Never use <gnu/lib-names-ilp32.h> directly; include <gnu/lib-names.h> instead."
-#endif
-
-#define LD_LINUX_RISCV32_ILP32_SO       "ld-linux-riscv32-ilp32.so.1"
-#define LD_SO                           "ld-linux-riscv32-ilp32.so.1"
-#define LIBANL_SO                       "libanl.so.1"
-#define LIBBROKENLOCALE_SO              "libBrokenLocale.so.1"
-#define LIBC_MALLOC_DEBUG_SO            "libc_malloc_debug.so.0"
-#define LIBC_SO                         "libc.so.6"
-#define LIBDL_SO                        "libdl.so.2"
-#define LIBGCC_S_SO                     "libgcc_s.so.1"
-#define LIBMVEC_SO                      "libmvec.so.1"
-#define LIBM_SO                         "libm.so.6"
-#define LIBNSL_SO                       "libnsl.so.1"
-#define LIBNSS_COMPAT_SO                "libnss_compat.so.2"
-#define LIBNSS_DB_SO                    "libnss_db.so.2"
-#define LIBNSS_DNS_SO                   "libnss_dns.so.2"
-#define LIBNSS_FILES_SO                 "libnss_files.so.2"
-#define LIBNSS_HESIOD_SO                "libnss_hesiod.so.2"
-#define LIBNSS_LDAP_SO                  "libnss_ldap.so.2"
-#define LIBPTHREAD_SO                   "libpthread.so.0"
-#define LIBRESOLV_SO                    "libresolv.so.2"
-#define LIBRT_SO                        "librt.so.1"
-#define LIBTHREAD_DB_SO                 "libthread_db.so.1"
-#define LIBUTIL_SO                      "libutil.so.1"
\ No newline at end of file
diff --git a/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h
new file mode 100644
index 0000000000000000000000000000000000000000..5d0f5d7d666d891a269537ba2ec9a70caad1cb3a
--- /dev/null
+++ b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h
@@ -0,0 +1,27 @@
+/* This file is automatically generated.  */
+#ifndef __GNU_LIB_NAMES_H
+# error "Never use <gnu/lib-names-ilp32d.h> directly; include <gnu/lib-names.h> instead."
+#endif
+
+#define LD_LINUX_RISCV32_ILP32D_SO      "ld-linux-riscv32-ilp32d.so.1"
+#define LD_SO                           "ld-linux-riscv32-ilp32d.so.1"
+#define LIBANL_SO                       "libanl.so.1"
+#define LIBBROKENLOCALE_SO              "libBrokenLocale.so.1"
+#define LIBC_MALLOC_DEBUG_SO            "libc_malloc_debug.so.0"
+#define LIBC_SO                         "libc.so.6"
+#define LIBDL_SO                        "libdl.so.2"
+#define LIBGCC_S_SO                     "libgcc_s.so.1"
+#define LIBMVEC_SO                      "libmvec.so.1"
+#define LIBM_SO                         "libm.so.6"
+#define LIBNSL_SO                       "libnsl.so.1"
+#define LIBNSS_COMPAT_SO                "libnss_compat.so.2"
+#define LIBNSS_DB_SO                    "libnss_db.so.2"
+#define LIBNSS_DNS_SO                   "libnss_dns.so.2"
+#define LIBNSS_FILES_SO                 "libnss_files.so.2"
+#define LIBNSS_HESIOD_SO                "libnss_hesiod.so.2"
+#define LIBNSS_LDAP_SO                  "libnss_ldap.so.2"
+#define LIBPTHREAD_SO                   "libpthread.so.0"
+#define LIBRESOLV_SO                    "libresolv.so.2"
+#define LIBRT_SO                        "librt.so.1"
+#define LIBTHREAD_DB_SO                 "libthread_db.so.1"
+#define LIBUTIL_SO                      "libutil.so.1"
diff --git a/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h
deleted file mode 100644
index 6ce02418e69609f4642a522910708769e96d6ee9..0000000000000000000000000000000000000000
--- a/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* This file is automatically generated.
-   It defines a symbol `__stub_FUNCTION' for each function
-   in the C library which is a stub, meaning it will fail
-   every time called, usually setting errno to ENOSYS.  */
-
-#ifdef _LIBC
- #error Applications may not define the macro _LIBC
-#endif
-
-#define __stub___compat_bdflush
-#define __stub___compat_create_module
-#define __stub___compat_get_kernel_syms
-#define __stub___compat_query_module
-#define __stub___compat_uselib
-#define __stub_chflags
-#define __stub_fchflags
-#define __stub_feclearexcept
-#define __stub_fedisableexcept
-#define __stub_feenableexcept
-#define __stub_fegetenv
-#define __stub_fegetexcept
-#define __stub_fegetexceptflag
-#define __stub_fegetmode
-#define __stub_fegetround
-#define __stub_feholdexcept
-#define __stub_feraiseexcept
-#define __stub_fesetenv
-#define __stub_fesetexcept
-#define __stub_fesetexceptflag
-#define __stub_fesetmode
-#define __stub_fesetround
-#define __stub_fetestexcept
-#define __stub_feupdateenv
-#define __stub_gtty
-#define __stub_revoke
-#define __stub_setlogin
-#define __stub_sigreturn
-#define __stub_stty
\ No newline at end of file
diff --git a/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h
new file mode 100644
index 0000000000000000000000000000000000000000..4d4c0d146a4063129577bff6724df15f3a36b84f
--- /dev/null
+++ b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h
@@ -0,0 +1,24 @@
+/* This file is automatically generated.
+   It defines a symbol `__stub_FUNCTION' for each function
+   in the C library which is a stub, meaning it will fail
+   every time called, usually setting errno to ENOSYS.  */
+
+#ifdef _LIBC
+ #error Applications may not define the macro _LIBC
+#endif
+
+#define __stub___compat_bdflush
+#define __stub___compat_create_module
+#define __stub___compat_get_kernel_syms
+#define __stub___compat_query_module
+#define __stub___compat_uselib
+#define __stub_chflags
+#define __stub_fchflags
+#define __stub_fedisableexcept
+#define __stub_feenableexcept
+#define __stub_fegetexcept
+#define __stub_gtty
+#define __stub_revoke
+#define __stub_setlogin
+#define __stub_sigreturn
+#define __stub_stty
diff --git a/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h b/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h
deleted file mode 100644
index facadbf08830886c6e99cb83aa5782c5412e9e94..0000000000000000000000000000000000000000
--- a/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file is automatically generated.  */
-#ifndef __GNU_LIB_NAMES_H
-# error "Never use <gnu/lib-names-lp64.h> directly; include <gnu/lib-names.h> instead."
-#endif
-
-#define LD_LINUX_RISCV64_LP64_SO        "ld-linux-riscv64-lp64.so.1"
-#define LD_SO                           "ld-linux-riscv64-lp64.so.1"
-#define LIBANL_SO                       "libanl.so.1"
-#define LIBBROKENLOCALE_SO              "libBrokenLocale.so.1"
-#define LIBC_MALLOC_DEBUG_SO            "libc_malloc_debug.so.0"
-#define LIBC_SO                         "libc.so.6"
-#define LIBDL_SO                        "libdl.so.2"
-#define LIBGCC_S_SO                     "libgcc_s.so.1"
-#define LIBMVEC_SO                      "libmvec.so.1"
-#define LIBM_SO                         "libm.so.6"
-#define LIBNSL_SO                       "libnsl.so.1"
-#define LIBNSS_COMPAT_SO                "libnss_compat.so.2"
-#define LIBNSS_DB_SO                    "libnss_db.so.2"
-#define LIBNSS_DNS_SO                   "libnss_dns.so.2"
-#define LIBNSS_FILES_SO                 "libnss_files.so.2"
-#define LIBNSS_HESIOD_SO                "libnss_hesiod.so.2"
-#define LIBNSS_LDAP_SO                  "libnss_ldap.so.2"
-#define LIBPTHREAD_SO                   "libpthread.so.0"
-#define LIBRESOLV_SO                    "libresolv.so.2"
-#define LIBRT_SO                        "librt.so.1"
-#define LIBTHREAD_DB_SO                 "libthread_db.so.1"
-#define LIBUTIL_SO                      "libutil.so.1"
\ No newline at end of file
diff --git a/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h b/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h
new file mode 100644
index 0000000000000000000000000000000000000000..e16743eb16650f8adba82d2a2f287eaf61c9d950
--- /dev/null
+++ b/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h
@@ -0,0 +1,27 @@
+/* This file is automatically generated.  */
+#ifndef __GNU_LIB_NAMES_H
+# error "Never use <gnu/lib-names-lp64d.h> directly; include <gnu/lib-names.h> instead."
+#endif
+
+#define LD_LINUX_RISCV64_LP64D_SO       "ld-linux-riscv64-lp64d.so.1"
+#define LD_SO                           "ld-linux-riscv64-lp64d.so.1"
+#define LIBANL_SO                       "libanl.so.1"
+#define LIBBROKENLOCALE_SO              "libBrokenLocale.so.1"
+#define LIBC_MALLOC_DEBUG_SO            "libc_malloc_debug.so.0"
+#define LIBC_SO                         "libc.so.6"
+#define LIBDL_SO                        "libdl.so.2"
+#define LIBGCC_S_SO                     "libgcc_s.so.1"
+#define LIBMVEC_SO                      "libmvec.so.1"
+#define LIBM_SO                         "libm.so.6"
+#define LIBNSL_SO                       "libnsl.so.1"
+#define LIBNSS_COMPAT_SO                "libnss_compat.so.2"
+#define LIBNSS_DB_SO                    "libnss_db.so.2"
+#define LIBNSS_DNS_SO                   "libnss_dns.so.2"
+#define LIBNSS_FILES_SO                 "libnss_files.so.2"
+#define LIBNSS_HESIOD_SO                "libnss_hesiod.so.2"
+#define LIBNSS_LDAP_SO                  "libnss_ldap.so.2"
+#define LIBPTHREAD_SO                   "libpthread.so.0"
+#define LIBRESOLV_SO                    "libresolv.so.2"
+#define LIBRT_SO                        "librt.so.1"
+#define LIBTHREAD_DB_SO                 "libthread_db.so.1"
+#define LIBUTIL_SO                      "libutil.so.1"
diff --git a/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h b/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h
deleted file mode 100644
index 6ce02418e69609f4642a522910708769e96d6ee9..0000000000000000000000000000000000000000
--- a/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* This file is automatically generated.
-   It defines a symbol `__stub_FUNCTION' for each function
-   in the C library which is a stub, meaning it will fail
-   every time called, usually setting errno to ENOSYS.  */
-
-#ifdef _LIBC
- #error Applications may not define the macro _LIBC
-#endif
-
-#define __stub___compat_bdflush
-#define __stub___compat_create_module
-#define __stub___compat_get_kernel_syms
-#define __stub___compat_query_module
-#define __stub___compat_uselib
-#define __stub_chflags
-#define __stub_fchflags
-#define __stub_feclearexcept
-#define __stub_fedisableexcept
-#define __stub_feenableexcept
-#define __stub_fegetenv
-#define __stub_fegetexcept
-#define __stub_fegetexceptflag
-#define __stub_fegetmode
-#define __stub_fegetround
-#define __stub_feholdexcept
-#define __stub_feraiseexcept
-#define __stub_fesetenv
-#define __stub_fesetexcept
-#define __stub_fesetexceptflag
-#define __stub_fesetmode
-#define __stub_fesetround
-#define __stub_fetestexcept
-#define __stub_feupdateenv
-#define __stub_gtty
-#define __stub_revoke
-#define __stub_setlogin
-#define __stub_sigreturn
-#define __stub_stty
\ No newline at end of file
diff --git a/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h b/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h
new file mode 100644
index 0000000000000000000000000000000000000000..4d4c0d146a4063129577bff6724df15f3a36b84f
--- /dev/null
+++ b/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h
@@ -0,0 +1,24 @@
+/* This file is automatically generated.
+   It defines a symbol `__stub_FUNCTION' for each function
+   in the C library which is a stub, meaning it will fail
+   every time called, usually setting errno to ENOSYS.  */
+
+#ifdef _LIBC
+ #error Applications may not define the macro _LIBC
+#endif
+
+#define __stub___compat_bdflush
+#define __stub___compat_create_module
+#define __stub___compat_get_kernel_syms
+#define __stub___compat_query_module
+#define __stub___compat_uselib
+#define __stub_chflags
+#define __stub_fchflags
+#define __stub_fedisableexcept
+#define __stub_feenableexcept
+#define __stub_fegetexcept
+#define __stub_gtty
+#define __stub_revoke
+#define __stub_setlogin
+#define __stub_sigreturn
+#define __stub_stty