Skip to contentSkip to conversation

BK Changeset 1.615 - Makefile fix breaks i386...

DISCUSSION Petr Vandrovec 2 participants 2 messages Sep 5, 2002

lore
Share & tools
lore
#0 lore raw

Hi David,
after your $ARCH => $(ARCH) fix in main Makefile make system
on my machine now believes that arch/i386/vmlinux.lds should be built through vmlinux.lds.S => (rule in Makefile) vmlinux.lds.s => (default as,ld) => vmlinux.lds, although neither of vmlinux.lds.S nor vmlinux.lds.s does exist :-( So build fails.

I was not able to fix problem other way than moving
arch/$(ARCH)/vmlinux.lds.s rule down to arch's Makefiles, but I believe that there must be some better way to do that...
Thanks,
Petr Vandrovec [email protected]

#1 lore raw
Quoted 10 lines · Petr Vandrovec

Hi David,
after your $ARCH => $(ARCH) fix in main Makefile make system
on my machine now believes that arch/i386/vmlinux.lds should be built through vmlinux.lds.S => (rule in Makefile) vmlinux.lds.s => (default as,ld) => vmlinux.lds, although neither of vmlinux.lds.S nor vmlinux.lds.s does exist :-( So build fails.

I was not able to fix problem other way than moving
arch/$(ARCH)/vmlinux.lds.s rule down to arch's Makefiles, but I believe that there must be some better way to do that...

Ugh, sorry, that's all my bad - I accidentally included a cset in the latest merge which I didn't mean to, since it was not tested properly yet (obviously ;).

Now, since it happened anyway:

The plan is to always feed the linker script through cpp - many archs do it already anyway, so doing it always makes things more consistent.

Andrew Morton also has a patch which needs preprocessing vmlinux.lds on i386, which is an additional reason, another one is the building in a separate objdir (That's for later, though)

So, the attached patch finishes this work at least for i386, un-breaking it.

Linus, please apply.

--Kai

Pull from http://linux-isdn.bkbits.net/linux-2.5.make

(Merging changesets omitted for clarity)

-----------------------------------------------------------------------------
[email protected], 2002-09-05 10:07:47-05:00, [email protected]
kbuild: Preprocess vmlinux.lds on i386 as well.

We want do so on all architectures for consistency, and i386 will need the preprocessing soon anyway.

----------------------------------------------------------------------------

 arch/i386/vmlinux.lds     |  101 ----------------------------------------------
 b/arch/i386/Makefile      |    4 -
 b/arch/i386/vmlinux.lds.S |  101 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 103 deletions(-)

=============================================================================
unified diffs follow for reference
=============================================================================

-----------------------------------------------------------------------------
[email protected], 2002-09-05 10:07:47-05:00, [email protected]
kbuild: Preprocess vmlinux.lds on i386 as well.

We want do so on all architectures for consistency, and i386 will need the preprocessing soon anyway.

---------------------------------------------------------------------------

arch/i386/Makefile +2 -2
diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile
@@ -18,7 +18,7 @@
 
 LDFLAGS		:= -m elf_i386
 OBJCOPYFLAGS	:= -O binary -R .note -R .comment -S
-LDFLAGS_vmlinux := -T arch/i386/vmlinux.lds -e stext
+LDFLAGS_vmlinux := -T arch/i386/vmlinux.lds.s -e stext
 
 CFLAGS += -pipe
 
@@ -104,7 +104,7 @@
 
 MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot
 
-vmlinux: arch/i386/vmlinux.lds
+vmlinux: arch/i386/vmlinux.lds.s
 
 .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
 		clean archclean archmrproper
arch/i386/vmlinux.lds deleted +0 -101

101 lines not on this page · raw message

arch/i386/vmlinux.lds.S new file +101 -0

101 lines not on this page · raw message