Эх сурвалжийг харах

mips: fix build of vmlinux.lds

Commit 51b563fc93c8cb5bff1d67a0a71c374e4a4ea049 ("arm, cris, mips,
sparc, powerpc, um, xtensa: fix build with bash 4.0") removed a few
CPPFLAGS with vital include paths necessary to build vmlinux.lds
on MIPS, and moved the calculation of the 'jiffies' symbol
directly to vmlinux.lds.S but forgot to change make ifdef/... to
cpp macros.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
[sam: moved assignment of CPPFLAGS arch/mips/kernel/Makefile]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
Manuel Lauss 15 жил өмнө
parent
commit
d71789b6fa

+ 2 - 0
arch/mips/kernel/Makefile

@@ -2,6 +2,8 @@
 # Makefile for the Linux/MIPS kernel.
 # Makefile for the Linux/MIPS kernel.
 #
 #
 
 
+CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS)
+
 extra-y		:= head.o init_task.o vmlinux.lds
 extra-y		:= head.o init_task.o vmlinux.lds
 
 
 obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \
 obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \

+ 6 - 6
arch/mips/kernel/vmlinux.lds.S

@@ -11,15 +11,15 @@ PHDRS {
 	note PT_NOTE FLAGS(4);	/* R__ */
 	note PT_NOTE FLAGS(4);	/* R__ */
 }
 }
 
 
-ifdef CONFIG_32BIT
-	ifdef CONFIG_CPU_LITTLE_ENDIAN
+#ifdef CONFIG_32BIT
+	#ifdef CONFIG_CPU_LITTLE_ENDIAN
 		jiffies  = jiffies_64;
 		jiffies  = jiffies_64;
-	else
+	#else
 		jiffies  = jiffies_64 + 4;
 		jiffies  = jiffies_64 + 4;
-	endif
-else
+	#endif
+#else
 	jiffies  = jiffies_64;
 	jiffies  = jiffies_64;
-endif
+#endif
 
 
 SECTIONS
 SECTIONS
 {
 {