xtensa: don't link with libgcc
Max Filippov
maintainercover xtensa: don't link with libgcc
Hello,
this series removes xtensa kernel dependency on the libgcc by providing assembly sources for optimized compiler support functions and using generic implementations for the rest.
Max Filippov (2):
xtensa: add helpers for division, remainder and shifts
xtensa: don't link with libgcc
arch/xtensa/Kconfig | 3 + arch/xtensa/Makefile | 6 +- arch/xtensa/include/asm/asmmacro.h | 34 ++++++++ arch/xtensa/kernel/xtensa_ksyms.c | 14 --- arch/xtensa/lib/Makefile | 2 + arch/xtensa/lib/ashldi3.S | 28 ++++++ arch/xtensa/lib/ashrdi3.S | 28 ++++++ arch/xtensa/lib/divsi3.S | 74 ++++++++++++++++ arch/xtensa/lib/lshrdi3.S | 28 ++++++ arch/xtensa/lib/modsi3.S | 87 +++++++++++++++++++ arch/xtensa/lib/mulsi3.S | 133 +++++++++++++++++++++++++++++ arch/xtensa/lib/udivsi3.S | 68 +++++++++++++++ arch/xtensa/lib/umodsi3.S | 57 +++++++++++++ 13 files changed, 543 insertions(+), 19 deletions(-) create mode 100644 arch/xtensa/lib/ashldi3.S create mode 100644 arch/xtensa/lib/ashrdi3.S create mode 100644 arch/xtensa/lib/divsi3.S create mode 100644 arch/xtensa/lib/lshrdi3.S create mode 100644 arch/xtensa/lib/modsi3.S create mode 100644 arch/xtensa/lib/mulsi3.S create mode 100644 arch/xtensa/lib/udivsi3.S create mode 100644 arch/xtensa/lib/umodsi3.S
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH 1/2 xtensa: add helpers for division, remainder and shifts
Don't rely on libgcc presence, build own versions of the helpers with correct ABI.
--- arch/xtensa/include/asm/asmmacro.h | 34 ++++++++ arch/xtensa/lib/Makefile | 2 + arch/xtensa/lib/ashldi3.S | 28 ++++++ arch/xtensa/lib/ashrdi3.S | 28 ++++++ arch/xtensa/lib/divsi3.S | 74 ++++++++++++++++ arch/xtensa/lib/lshrdi3.S | 28 ++++++ arch/xtensa/lib/modsi3.S | 87 +++++++++++++++++++ arch/xtensa/lib/mulsi3.S | 133 +++++++++++++++++++++++++++++ arch/xtensa/lib/udivsi3.S | 68 +++++++++++++++ arch/xtensa/lib/umodsi3.S | 57 +++++++++++++ 10 files changed, 539 insertions(+) create mode 100644 arch/xtensa/lib/ashldi3.S create mode 100644 arch/xtensa/lib/ashrdi3.S create mode 100644 arch/xtensa/lib/divsi3.S create mode 100644 arch/xtensa/lib/lshrdi3.S create mode 100644 arch/xtensa/lib/modsi3.S create mode 100644 arch/xtensa/lib/mulsi3.S create mode 100644 arch/xtensa/lib/udivsi3.S create mode 100644 arch/xtensa/lib/umodsi3.S
arch/xtensa/include/asm/asmmacro.h +34 -0
@@ -191,6 +191,40 @@#endif .endm + .macro do_nsau cnt, val, tmp, a +#if XCHAL_HAVE_NSA + nsau \cnt, \val +#else + mov \a, \val + movi \cnt, 0 + extui \tmp, \a, 16, 16 + bnez \tmp, 0f + movi \cnt, 16 + slli \a, \a, 16 +0: + extui \tmp, \a, 24, 8 + bnez \tmp, 1f + addi \cnt, \cnt, 8 + slli \a, \a, 8 +1: + movi \tmp, __nsau_data + extui \a, \a, 24, 8 + add \tmp, \tmp, \a + l8ui \tmp, \tmp, 0 + add \cnt, \cnt, \tmp +#endif /* !XCHAL_HAVE_NSA */ + .endm + + .macro do_abs dst, src, tmp +#if XCHAL_HAVE_ABS + abs \dst, \src +#else + neg \tmp, \src + movgez \tmp, \src, \src + mov \dst, \tmp +#endif + .endm + #define XTENSA_STACK_ALIGNMENT 16 #if defined(__XTENSA_WINDOWED_ABI__)
arch/xtensa/lib/Makefile +2 -0
@@ -4,5 +4,7 @@ # lib-y += memcopy.o memset.o checksum.o \ + ashldi3.o ashrdi3.o lshrdi3.o \ + divsi3.o udivsi3.o modsi3.o umodsi3.o mulsi3.o \ usercopy.o strncpy_user.o strnlen_user.o lib-$(CONFIG_PCI) += pci-auto.o
arch/xtensa/lib/ashldi3.S new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH GCC-exception-2.0 */ +#include <linux/linkage.h> +#include <asm/asmmacro.h> +#include <asm/core.h> + +#ifdef __XTENSA_EB__ +#define uh a2 +#define ul a3 +#else +#define uh a3 +#define ul a2 +#endif /* __XTENSA_EB__ */ + +ENTRY(__ashldi3) + + abi_entry_default + ssl a4 + bgei a4, 32, .Llow_only + src uh, uh, ul + sll ul, ul + abi_ret_default + +.Llow_only: + sll uh, ul + movi ul, 0 + abi_ret_default + +ENDPROC(__ashldi3)
arch/xtensa/lib/ashrdi3.S new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH GCC-exception-2.0 */ +#include <linux/linkage.h> +#include <asm/asmmacro.h> +#include <asm/core.h> + +#ifdef __XTENSA_EB__ +#define uh a2 +#define ul a3 +#else +#define uh a3 +#define ul a2 +#endif /* __XTENSA_EB__ */ + +ENTRY(__ashrdi3) + + abi_entry_default + ssr a4 + bgei a4, 32, .Lhigh_only + src ul, uh, ul + sra uh, uh + abi_ret_default + +.Lhigh_only: + sra ul, uh + srai uh, uh, 31 + abi_ret_default + +ENDPROC(__ashrdi3)
arch/xtensa/lib/divsi3.S new file +74 -0
74 lines not on this page · raw message
arch/xtensa/lib/lshrdi3.S new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH GCC-exception-2.0 */ +#include <linux/linkage.h> +#include <asm/asmmacro.h> +#include <asm/core.h> + +#ifdef __XTENSA_EB__ +#define uh a2 +#define ul a3 +#else +#define uh a3 +#define ul a2 +#endif /* __XTENSA_EB__ */ + +ENTRY(__lshrdi3) + + abi_entry_default + ssr a4 + bgei a4, 32, .Lhigh_only + src ul, uh, ul + srl uh, uh + abi_ret_default + +.Lhigh_only: + srl ul, uh + movi uh, 0 + abi_ret_default + +ENDPROC(__lshrdi3)
arch/xtensa/lib/modsi3.S new file +87 -0
87 lines not on this page · raw message
arch/xtensa/lib/mulsi3.S new file +133 -0
133 lines not on this page · raw message
arch/xtensa/lib/udivsi3.S new file +68 -0
68 lines not on this page · raw message
arch/xtensa/lib/umodsi3.S new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.30.2
Max Filippov
maintainerPATCH 2/2 xtensa: don't link with libgcc
In reply to Max Filippovlibgcc may be absent or may have different ABI than the kernel. Don't link with it. Drop declarations and export for helpers that are not implemented. Use generic versions of DI mode multiplication and comparisons. Drop register window spilling helper as it should never be used by the compiler-generated code.
--- arch/xtensa/Kconfig | 3 +++ arch/xtensa/Makefile | 6 +----- arch/xtensa/kernel/xtensa_ksyms.c | 14 -------------- 3 files changed, 4 insertions(+), 19 deletions(-)
arch/xtensa/Kconfig +3 -0
@@ -20,6 +20,9 @@ config XTENSA select DMA_REMAP if MMU select GENERIC_ATOMIC64 select GENERIC_IRQ_SHOW + select GENERIC_LIB_CMPDI2 + select GENERIC_LIB_MULDI3 + select GENERIC_LIB_UCMPDI2 select GENERIC_PCI_IOMAP select GENERIC_SCHED_CLOCK select HAVE_ARCH_AUDITSYSCALL
arch/xtensa/Makefile +1 -5
@@ -51,13 +51,9 @@ KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs)) KBUILD_DEFCONFIG := iss_defconfig -# Find libgcc.a - -LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) - head-y := arch/xtensa/kernel/head.o -libs-y += arch/xtensa/lib/ $(LIBGCC) +libs-y += arch/xtensa/lib/ boot := arch/xtensa/boot
arch/xtensa/kernel/xtensa_ksyms.c +0 -14
@@ -59,32 +59,18 @@ extern long long __ashldi3(long long, int);extern long long __lshrdi3 (long long ,int );extern int __divsi3 (int ,int );extern int __modsi3 (int ,int ); -extern long long __muldi3 (long long ,long long );extern int __mulsi3 (int ,int );extern unsigned int __udivsi3 (unsigned int ,unsigned int );extern unsigned int __umodsi3 (unsigned int ,unsigned int ); -extern unsigned long long __umoddi3 (unsigned long long ,unsigned long long ); -extern unsigned long long __udivdi3 (unsigned long long ,unsigned long long ); -extern int __ucmpdi2 (int ,int );EXPORT_SYMBOL (__ashldi3);EXPORT_SYMBOL (__ashrdi3);EXPORT_SYMBOL (__lshrdi3);EXPORT_SYMBOL (__divsi3);EXPORT_SYMBOL (__modsi3); -EXPORT_SYMBOL (__muldi3);EXPORT_SYMBOL (__mulsi3);EXPORT_SYMBOL (__udivsi3);EXPORT_SYMBOL (__umodsi3); -EXPORT_SYMBOL (__udivdi3); -EXPORT_SYMBOL (__umoddi3); -EXPORT_SYMBOL (__ucmpdi2); - -void __xtensa_libgcc_window_spill (void ) -{ -BUG (); -} -EXPORT_SYMBOL (__xtensa_libgcc_window_spill);unsigned int __sync_fetch_and_and_4 (volatile void *p,unsigned int v) {
Signature · 1 line
2.30.2