sh: Migrate necessary libgcc bits in to arch/sh/lib for SUPERH32.

This moves in the necessary libgcc bits for SUPERH32 and drops the
libgcc linking for the regular targets. This in turn allows us to rip
out quite a few hacks both in sh_ksyms_32 and arch/sh/Makefile.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 13 insertions, 1 deletions

diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 596421821d08..a30acb8342d9 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -5,6 +5,18 @@
 lib-y  = delay.o memset.o memmove.o memchr.o \
          checksum.o strlen.o div64.o div64-generic.o
 
+# Extracted from libgcc
+lib-y += movmem.o ashldi3.o ashrdi3.o lshrdi3.o \
+         ashlsi3.o ashrsi3.o ashiftrt.o lshrsi3.o \
+         udiv_qrnnd.o
+
+udivsi3-y                       := udivsi3-Os.o
+
+ifneq ($(CONFIG_CC_OPTIMIZE_FOR_SIZE),y)
+udivsi3-$(CONFIG_CPU_SH3)       := udivsi3.o
+udivsi3-$(CONFIG_CPU_SH4)       := udivsi3.o
+endif
+
 obj-y                           += io.o
 
 memcpy-y                        := memcpy.o
@@ -12,6 +24,6 @@ memcpy-$(CONFIG_CPU_SH4)	:= memcpy-sh4.o
 
 lib-$(CONFIG_MMU)               += copy_page.o clear_page.o
 lib-$(CONFIG_FUNCTION_TRACER)   += mcount.o
-lib-y                           += $(memcpy-y)
+lib-y                           += $(memcpy-y) $(udivsi3-y)
 
 EXTRA_CFLAGS += -Werror