Commit d71789b6 authored Sep 24, 2009 by Manuel Lauss Committed by Sam Ravnborg Sep 25, 2009

mips: fix build of vmlinux.lds



Commit 51b563fc ("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>

parent 94e0fb08

arch/mips/kernel/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		# Makefile for the Linux/MIPS kernel.
		#

		CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS)

		extra-y := head.o init_task.o vmlinux.lds

		obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \

arch/mips/kernel/vmlinux.lds.S

+6 −6

Original line number	Diff line number	Diff line
		@@ -11,15 +11,15 @@ PHDRS {
		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;
		else
		#else
		jiffies = jiffies_64 + 4;
		endif
		else
		#endif
		#else
		jiffies = jiffies_64;
		endif
		#endif

		SECTIONS
		{