riscv64-emu: add __clzdi2 symbol
PATCH 1/1 riscv64-emu: add __clzdi2 symbol
This is needed for the zstd module.
Signed-off-by Andreas Schwab <[email protected]>
--- configure.ac | 2 +- include/grub/compiler-rt-emu.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
configure.ac +1 -1
@@ -1370,7 +1370,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
include/grub/compiler-rt-emu.h +5 -0
@@ -74,6 +74,11 @@ unsignedEXPORT_FUNC (__ctzsi2) (grub_uint32_t x);#endif +#ifdef HAVE___CLZDI2 +unsigned +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);
Signature · 6 lines
2.23.0 -- Andreas Schwab, SUSE Labs, [email protected] GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
Adding Alex and Eric...
Quoted 26 lines · Andreas Schwab
This is needed for the zstd module.
Signed-off-by Andreas Schwab <[email protected]>--- configure.ac | 2 +- include/grub/compiler-rt-emu.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)configure.ac +1
-1@@ -1370,7 +1370,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 ; theninclude/grub/compiler-rt-emu.h +0
-0
include/grub/compiler-rt-emu.h unsigned · line 81
Quoted 8 lines
include/grub/compiler-rt-emu.h +5
-0@@ -74,6 +74,11 @@ unsignedEXPORT_FUNC (__ctzsi2) (grub_uint32_t x);#endif +#ifdef HAVE___CLZDI2 +unsigned +EXPORT_FUNC (__clzdi2 ) (grub_uint64_t x); +#endif +
Hmmm... Is __clzdi2() declaration correct? Please take a look at grub-core/kern/compiler-rt.c. __clzdi2() returns int instead of unsigned there. Hence, it should be fixed here or there.
Daniel
Quoted 1 line · Daniel Kiper
Hmmm... Is
__clzdi2()declaration correct?
It doesn't really matter, since nobody is using the prototype. It's only used for generating the symbol list.
Andreas.
Signature · 3 lines
Andreas Schwab, SUSE Labs, [email protected] GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
PATCH v2 1/1 riscv64-emu: add __clzdi2 symbol
In reply to Daniel KiperThis is needed for the zstd module.
Signed-off-by Andreas Schwab <[email protected]>
--- configure.ac | 2 +- include/grub/compiler-rt-emu.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
configure.ac +1 -1
@@ -1370,7 +1370,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
include/grub/compiler-rt-emu.h +5 -0
@@ -74,6 +74,11 @@ unsignedEXPORT_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);
Signature · 7 lines
2.23.0 -- Andreas Schwab, SUSE Labs, [email protected] GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
Quoted 3 lines · Andreas Schwab
This is needed for the zstd module.
Signed-off-by Andreas Schwab <[email protected]>
Reviewed-by Daniel Kiper <[email protected]>
Daniel