Mercurial > hg > aboriginal
changeset 868:ef007d564aad
The mips build broke, this fixes it but isn't in the -stable series yet.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Thu, 29 Oct 2009 12:46:58 -0500 |
| parents | fc7d646d1ebf |
| children | 858297fa5ad0 |
| files | sources/patches/linux-mipsfix.patch |
| diffstat | 1 files changed, 57 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/linux-mipsfix.patch Thu Oct 29 12:46:58 2009 -0500 @@ -0,0 +1,57 @@ +commit d71789b6fa37c21ce5eb588d279f57904a62e7e2 +Author: Manuel Lauss <manuel.lauss@gmail.com> +Date: Thu Sep 24 21:44:24 2009 +0200 + + 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> + +diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile +index e961221..eecd2a9 100644 +--- a/arch/mips/kernel/Makefile ++++ b/arch/mips/kernel/Makefile +@@ -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 \ +diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S +index 9bf0e3d..162b299 100644 +--- a/arch/mips/kernel/vmlinux.lds.S ++++ b/arch/mips/kernel/vmlinux.lds.S +@@ -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 + {