lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mips: fix build of vmlinux.lds

Browse Source 
Commit 51b563fc93 ("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>
This commit is contained in:
Manuel Lauss
2009-09-24 21:44:24 +02:00
committed by Sam Ravnborg
parent 94e0fb086f
commit d71789b6fa
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/kernel/Makefile
View File

@@ -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 \

12
arch/mips/kernel/vmlinux.lds.S
View File

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