aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-08-01 18:13:44 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-08-01 18:23:31 -0400
commit49de935c107a53b0eba336efceb1dc3a8be64f87 (patch)
tree778101ba20e410c4d2c1b98e6a1c332a71d7b768 /arch
parent4385e12b291a6816987cb88a74fc116f520180f8 (diff)
sh: fix LIBGCC
Commit f15cbe6f1a4b4d9df59142fc8e4abb973302cf44 (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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 7b70cfd2516a..01d85c74481d 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -95,8 +95,6 @@ head-y := arch/sh/kernel/init_task.o
95head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o 95head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o
96head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.o 96head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.o
97 97
98LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
99
100core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/ 98core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/
101core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/ 99core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/
102 100
@@ -145,10 +143,6 @@ cpuincdir-$(CONFIG_CPU_SH4) += cpu-sh4
145cpuincdir-$(CONFIG_CPU_SH5) += cpu-sh5 143cpuincdir-$(CONFIG_CPU_SH5) += cpu-sh5
146cpuincdir-y += cpu-common # Must be last 144cpuincdir-y += cpu-common # Must be last
147 145
148libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y)
149libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y)
150libs-y += $(LIBGCC)
151
152drivers-y += arch/sh/drivers/ 146drivers-y += arch/sh/drivers/
153drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/ 147drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
154 148
@@ -161,6 +155,12 @@ KBUILD_CFLAGS += -pipe $(cflags-y)
161KBUILD_CPPFLAGS += $(cflags-y) 155KBUILD_CPPFLAGS += $(cflags-y)
162KBUILD_AFLAGS += $(cflags-y) 156KBUILD_AFLAGS += $(cflags-y)
163 157
158LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
159
160libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y)
161libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y)
162libs-y += $(LIBGCC)
163
164PHONY += maketools FORCE 164PHONY += maketools FORCE
165 165
166maketools: include/linux/version.h FORCE 166maketools: include/linux/version.h FORCE