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

Commit 260e98ed authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3761/1: fix armv4t breakage after adding thumb interworking to userspace helpers 



Patch from Lennert Buytenhek

On armv4t systems, we have always compiled the kernel with -march=armv4
instead of -march=armv4t, which means that any use of bx will bomb out.

Commit ba9b5d76 introduced the use of
bx in the kernel, which means we need to compile with -march=armv4t on
armv4t systems now.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 863dab45

arch/arm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ comma = , 
# testing for a specific architecture or later rather impossible.

arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)

arch-$(CONFIG_CPU_32v6K)	:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)

arch-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4)

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

arch-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3 -march=armv3

arch/arm/mm/Kconfig

+9 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ config CPU_ARM710 
config CPU_ARM720T

	bool "Support ARM720T processor" if !ARCH_CLPS711X && !ARCH_L7200 && !ARCH_CDB89712 && ARCH_INTEGRATOR

	default y if ARCH_CLPS711X || ARCH_L7200 || ARCH_CDB89712 || ARCH_H720X

	select CPU_32v4

	select CPU_32v4T

	select CPU_ABRT_LV4T

	select CPU_CACHE_V4

	select CPU_CACHE_VIVT
@@ -64,7 +64,7 @@ config CPU_ARM920T 
	bool "Support ARM920T processor"

	depends on ARCH_EP93XX || ARCH_INTEGRATOR || CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200

	default y if CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_AT91RM9200

	select CPU_32v4

	select CPU_32v4T

	select CPU_ABRT_EV4T

	select CPU_CACHE_V4WT

	select CPU_CACHE_VIVT
@@ -85,7 +85,7 @@ config CPU_ARM922T 
	bool "Support ARM922T processor" if ARCH_INTEGRATOR

	depends on ARCH_LH7A40X || ARCH_INTEGRATOR

	default y if ARCH_LH7A40X

	select CPU_32v4

	select CPU_32v4T

	select CPU_ABRT_EV4T

	select CPU_CACHE_V4WT

	select CPU_CACHE_VIVT
@@ -104,7 +104,7 @@ config CPU_ARM925T 
 	bool "Support ARM925T processor" if ARCH_OMAP1

 	depends on ARCH_OMAP15XX

 	default y if ARCH_OMAP15XX

	select CPU_32v4

	select CPU_32v4T

	select CPU_ABRT_EV4T

	select CPU_CACHE_V4WT

	select CPU_CACHE_VIVT
@@ -285,6 +285,11 @@ config CPU_32v4 
	select TLS_REG_EMUL if SMP || !MMU

	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP



config CPU_32v4T

	bool

	select TLS_REG_EMUL if SMP || !MMU

	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP



config CPU_32v5

	bool

	select TLS_REG_EMUL if SMP || !MMU