From 3ebb8806635b8fb707dc0f260be902a9ae592ee0 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 2 Aug 2024 08:35:05 +0200 Subject: [PATCH] glibc: Replace ilp32/lp64 headers with ilp32d/lp64d. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The former are soft float; the latter are hard float. We primarily care about hard float here. Signed-off-by: Alex Rønne Petersen --- .../gnu/lib-names-ilp32d.h} | 8 ++++---- .../gnu/{stubs-ilp32.h => stubs-ilp32d.h} | 16 +--------------- .../gnu/lib-names-lp64d.h} | 8 ++++---- .../gnu/{stubs-lp64.h => stubs-lp64d.h} | 16 +--------------- 4 files changed, 10 insertions(+), 38 deletions(-) rename lib/libc/include/{riscv64-linux-gnu/gnu/lib-names-lp64.h => riscv32-linux-gnu/gnu/lib-names-ilp32d.h} (80%) rename lib/libc/include/riscv32-linux-gnu/gnu/{stubs-ilp32.h => stubs-ilp32d.h} (63%) rename lib/libc/include/{riscv32-linux-gnu/gnu/lib-names-ilp32.h => riscv64-linux-gnu/gnu/lib-names-lp64d.h} (82%) rename lib/libc/include/riscv64-linux-gnu/gnu/{stubs-lp64.h => stubs-lp64d.h} (63%) diff --git a/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h similarity index 80% rename from lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h rename to lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h index facadbf088..5d0f5d7d66 100644 --- a/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h +++ b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h @@ -1,10 +1,10 @@ /* This file is automatically generated. */ #ifndef __GNU_LIB_NAMES_H -# error "Never use directly; include instead." +# error "Never use directly; include instead." #endif -#define LD_LINUX_RISCV64_LP64_SO "ld-linux-riscv64-lp64.so.1" -#define LD_SO "ld-linux-riscv64-lp64.so.1" +#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" @@ -24,4 +24,4 @@ #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 +#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-ilp32d.h similarity index 63% rename from lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h rename to lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h index 6ce02418e6..4d4c0d146a 100644 --- a/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h +++ b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h @@ -14,25 +14,11 @@ #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 +#define __stub_stty diff --git a/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h b/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h similarity index 82% rename from lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h rename to lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h index f7cf1ab8a2..e16743eb16 100644 --- a/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h +++ b/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h @@ -1,10 +1,10 @@ /* This file is automatically generated. */ #ifndef __GNU_LIB_NAMES_H -# error "Never use directly; include instead." +# error "Never use directly; include instead." #endif -#define LD_LINUX_RISCV32_ILP32_SO "ld-linux-riscv32-ilp32.so.1" -#define LD_SO "ld-linux-riscv32-ilp32.so.1" +#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" @@ -24,4 +24,4 @@ #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 +#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-lp64d.h similarity index 63% rename from lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h rename to lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h index 6ce02418e6..4d4c0d146a 100644 --- a/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h +++ b/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h @@ -14,25 +14,11 @@ #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 +#define __stub_stty