Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options
A kernel with both ARMv6 and ARMv7 selected results in build errors.
Fix this by specifying the proper architectures for these assembly
files.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+12
arch/arm/mm/Makefile
+12
arch/arm/mm/Makefile
···
27
obj-$(CONFIG_CPU_ABRT_EV6) += abort-ev6.o
28
obj-$(CONFIG_CPU_ABRT_EV7) += abort-ev7.o
29
30
obj-$(CONFIG_CPU_PABRT_LEGACY) += pabort-legacy.o
31
obj-$(CONFIG_CPU_PABRT_V6) += pabort-v6.o
32
obj-$(CONFIG_CPU_PABRT_V7) += pabort-v7.o
···
41
obj-$(CONFIG_CPU_CACHE_V6) += cache-v6.o
42
obj-$(CONFIG_CPU_CACHE_V7) += cache-v7.o
43
obj-$(CONFIG_CPU_CACHE_FA) += cache-fa.o
44
45
obj-$(CONFIG_CPU_COPY_V3) += copypage-v3.o
46
obj-$(CONFIG_CPU_COPY_V4WT) += copypage-v4wt.o
···
63
obj-$(CONFIG_CPU_TLB_V6) += tlb-v6.o
64
obj-$(CONFIG_CPU_TLB_V7) += tlb-v7.o
65
obj-$(CONFIG_CPU_TLB_FA) += tlb-fa.o
66
67
obj-$(CONFIG_CPU_ARM610) += proc-arm6_7.o
68
obj-$(CONFIG_CPU_ARM710) += proc-arm6_7.o
···
92
obj-$(CONFIG_CPU_FEROCEON) += proc-feroceon.o
93
obj-$(CONFIG_CPU_V6) += proc-v6.o
94
obj-$(CONFIG_CPU_V7) += proc-v7.o
95
96
obj-$(CONFIG_CACHE_FEROCEON_L2) += cache-feroceon-l2.o
97
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
···
27
obj-$(CONFIG_CPU_ABRT_EV6) += abort-ev6.o
28
obj-$(CONFIG_CPU_ABRT_EV7) += abort-ev7.o
29
30
+
AFLAGS_abort-ev6.o :=-Wa,-march=armv6k
31
+
AFLAGS_abort-ev7.o :=-Wa,-march=armv7-a
32
+
33
obj-$(CONFIG_CPU_PABRT_LEGACY) += pabort-legacy.o
34
obj-$(CONFIG_CPU_PABRT_V6) += pabort-v6.o
35
obj-$(CONFIG_CPU_PABRT_V7) += pabort-v7.o
···
38
obj-$(CONFIG_CPU_CACHE_V6) += cache-v6.o
39
obj-$(CONFIG_CPU_CACHE_V7) += cache-v7.o
40
obj-$(CONFIG_CPU_CACHE_FA) += cache-fa.o
41
+
42
+
AFLAGS_cache-v6.o :=-Wa,-march=armv6
43
+
AFLAGS_cache-v7.o :=-Wa,-march=armv7-a
44
45
obj-$(CONFIG_CPU_COPY_V3) += copypage-v3.o
46
obj-$(CONFIG_CPU_COPY_V4WT) += copypage-v4wt.o
···
57
obj-$(CONFIG_CPU_TLB_V6) += tlb-v6.o
58
obj-$(CONFIG_CPU_TLB_V7) += tlb-v7.o
59
obj-$(CONFIG_CPU_TLB_FA) += tlb-fa.o
60
+
61
+
AFLAGS_tlb-v6.o :=-Wa,-march=armv6
62
+
AFLAGS_tlb-v7.o :=-Wa,-march=armv7-a
63
64
obj-$(CONFIG_CPU_ARM610) += proc-arm6_7.o
65
obj-$(CONFIG_CPU_ARM710) += proc-arm6_7.o
···
83
obj-$(CONFIG_CPU_FEROCEON) += proc-feroceon.o
84
obj-$(CONFIG_CPU_V6) += proc-v6.o
85
obj-$(CONFIG_CPU_V7) += proc-v7.o
86
+
87
+
AFLAGS_proc-v6.o :=-Wa,-march=armv6
88
+
AFLAGS_proc-v7.o :=-Wa,-march=armv7-a
89
90
obj-$(CONFIG_CACHE_FEROCEON_L2) += cache-feroceon-l2.o
91
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o