Manuel Lauss wrote:
> On Thu, Sep 24, 2009 at 11:24 AM, Manuel Lauss
> <manuel.lauss@xxxxxxxxxxxxxx> wrote:
>>> I'm away from my machine atm.
>>> Could you try to add the following to arch/mips/kernel/makefile:
>>>
>>> CPPFFLAGS_vmlinux.lds += $(KBUILD_CFLAGS)
>>>
>>> This should fix it.
>> Thank you, that did it.
>
> Spoke too soon:
>
> This leaves unprocessed directives in vmlinux.lds:
>
> [...]
> OUTPUT_ARCH(mips)
> ENTRY(kernel_entry)
> PHDRS {
> text PT_LOAD FLAGS(7); /* RWX */
> note PT_NOTE FLAGS(4); /* R__ */
> }
> ifdef 1
> ifdef 1
> jiffies = jiffies_64;
> else
> jiffies = jiffies_64 + 4;
> endif
> else
> jiffies = jiffies_6
... which is of course easily fixed after consumption of
unhealthy amounts of coffee.
Patch below works for me.
Thank you Sam!
Manuel Lauss
---
From: Manuel Lauss <manuel.lauss@xxxxxxxxx>
Subject: [PATCH] MIPS: fix build of vmlinux.lds
Commit 51b563fc93c8cb5bff1d67a0a71c374e4a4ea049 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@xxxxxxxxx>
---
arch/mips/kernel/Makefile | 2 ++
arch/mips/kernel/vmlinux.lds.S | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index e961221..8e26e9c 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -91,3 +91,5 @@ CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/n
obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT) += 8250-platform.o
EXTRA_CFLAGS += -Werror
+
+CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS)
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
{
--
1.6.5.rc1
