David Abdurachmanov
41d16420dd
Backport: - https://git.savannah.gnu.org/cgit/grub.git/commit/?id=a57977b5faf800ac68f7dfe6b84138208c7e6072 - https://git.savannah.gnu.org/cgit/grub.git/commit/?id=11268841e2e0130a862d15fce86d42cd6501bb49 Hopefully this fixes: BUILDSTDERR: __clzdi2 in zstd is not defined Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
47 lines
2.2 KiB
Diff
47 lines
2.2 KiB
Diff
From 84fd2050be1186255d66a9d462ef11a2bb9fae30 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schwab <schwab@suse.de>
|
|
Date: Thu, 19 Sep 2019 09:39:04 +0200
|
|
Subject: [PATCH 1/2] RISC-V: Add __clzdi2 symbol
|
|
|
|
This is needed for the zstd module build for riscv64-emu.
|
|
|
|
Signed-off-by: Andreas Schwab <schwab@suse.de>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
configure.ac | 2 +-
|
|
include/grub/compiler-rt-emu.h | 5 +++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 5076d63..eff160b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1444,7 +1444,7 @@ fi
|
|
|
|
# Check for libgcc symbols
|
|
if test x"$platform" = xemu; then
|
|
-AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)
|
|
+AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __clzdi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)
|
|
fi
|
|
|
|
if test "x$TARGET_APPLE_LINKER" = x1 ; then
|
|
diff --git a/include/grub/compiler-rt-emu.h b/include/grub/compiler-rt-emu.h
|
|
index b21425d..fde620a 100644
|
|
--- a/include/grub/compiler-rt-emu.h
|
|
+++ b/include/grub/compiler-rt-emu.h
|
|
@@ -74,6 +74,11 @@ unsigned
|
|
EXPORT_FUNC (__ctzsi2) (grub_uint32_t x);
|
|
#endif
|
|
|
|
+#ifdef HAVE___CLZDI2
|
|
+int
|
|
+EXPORT_FUNC (__clzdi2) (grub_uint64_t x);
|
|
+#endif
|
|
+
|
|
#ifdef HAVE___AEABI_UIDIV
|
|
grub_uint32_t
|
|
EXPORT_FUNC (__aeabi_uidiv) (grub_uint32_t a, grub_uint32_t b);
|
|
--
|
|
2.24.0
|
|
|