Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49de935c authored by Adrian Bunk's avatar Adrian Bunk Committed by Paul Mundt
Browse files

sh: fix LIBGCC 



Commit f15cbe6f
(sh: migrate to arch/sh/include/) moved KBUILD_CFLAGS
(which is used by LIBGCC) below LIBGCC, causing build
errors like the following:

<--  snip  -->

...
  LD      .tmp_vmlinux1
arch/sh/kernel/built-in.o: In function `module_clk_recalc':
clock-sh4.c:(.text+0x80f0): undefined reference to `__udivsi3_i4i'
...
make[1]: *** [.tmp_vmlinux1] Error 1

<--  snip  -->

Reported-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4385e12b

arch/sh/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ head-y := arch/sh/kernel/init_task.o 
head-$(CONFIG_SUPERH32)	+= arch/sh/kernel/head_32.o

head-$(CONFIG_SUPERH64)	+= arch/sh/kernel/head_64.o



LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



core-y				+= arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/

core-$(CONFIG_SH_FPU_EMU)	+= arch/sh/math-emu/
@@ -145,10 +143,6 @@ cpuincdir-$(CONFIG_CPU_SH4) += cpu-sh4 
cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5

cpuincdir-y			+= cpu-common	# Must be last



libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)

libs-y				+= $(LIBGCC)



drivers-y			+= arch/sh/drivers/

drivers-$(CONFIG_OPROFILE)	+= arch/sh/oprofile/
@@ -161,6 +155,12 @@ KBUILD_CFLAGS += -pipe $(cflags-y) 
KBUILD_CPPFLAGS		+= $(cflags-y)

KBUILD_AFLAGS		+= $(cflags-y)



LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)

libs-y				+= $(LIBGCC)



PHONY += maketools FORCE



maketools:  include/linux/version.h FORCE