sh: fix LIBGCC
Commit f15cbe6f1a
(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: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
@@ -95,8 +95,6 @@ head-y := arch/sh/kernel/init_task.o
|
|||||||
head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o
|
head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o
|
||||||
head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.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-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/
|
||||||
core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/
|
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-$(CONFIG_CPU_SH5) += cpu-sh5
|
||||||
cpuincdir-y += cpu-common # Must be last
|
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-y += arch/sh/drivers/
|
||||||
drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
|
drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
|
||||||
|
|
||||||
@@ -161,6 +155,12 @@ KBUILD_CFLAGS += -pipe $(cflags-y)
|
|||||||
KBUILD_CPPFLAGS += $(cflags-y)
|
KBUILD_CPPFLAGS += $(cflags-y)
|
||||||
KBUILD_AFLAGS += $(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
|
PHONY += maketools FORCE
|
||||||
|
|
||||||
maketools: include/linux/version.h FORCE
|
maketools: include/linux/version.h FORCE
|
||||||
|
Reference in New Issue
Block a user