aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRask Ingemann Lambertsen <rask@sygehus.dk>2009-03-02 10:46:01 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-02 10:46:01 +0000
commit4e3e58ca4efbac9e8bdc05b728369e279fecc8d3 (patch)
tree1262f1845c7c2ce73fbbc19d7434c1539d604d82
parent6d4f252dce85b42042cfe0cc266f6568a859b4ff (diff)
ARM/S3C2440: Don't build armv4t modules we can't load
The kernel can't load armv4t modules ("unknown relocation: 40"). This patch fixes the ARM makefile accordingly to tell GCC to generate armv4 code instead of armv4t code. The assembler still needs to allow armv4t instructions for some object files which are linked into the kernel. Signed-off-by: Rask Ingemann Lambertsen <rask@sygehus.dk>
-rw-r--r--arch/arm/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 24e0f018769..3d6601b1629 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -55,7 +55,8 @@ ifeq ($(CONFIG_CPU_32v6),y)
arch-$(CONFIG_CPU_32v6K) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)
endif
arch-$(CONFIG_CPU_32v5) :=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)
-arch-$(CONFIG_CPU_32v4T) :=-D__LINUX_ARM_ARCH__=4 -march=armv4t
+# We can't load armv4t modules, but still need to assemble some armv4t code to be linked in.
+arch-$(CONFIG_CPU_32v4T) :=-D__LINUX_ARM_ARCH__=4 -march=armv4 -Wa,-march=armv4t
arch-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 -march=armv4
arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3