kbuild fixes

kbuild fixes

[Sam Ravnborg]

Hi Linus - please push these fixes.

2 kbuild related fixes:

o kbuild: fix make O=
o kbuild: use lds.* infrastructure in arch/i386/kernel/Makefile

The first one shows up only when using make O= poiting to a fresh directory tree.
The good thing is that it showed that some people actually uses O= ;-)
Thanks to you who reported this issue.

The second one was Rusty deciding to preprocess a lds.S file, in parallel
with me adding the new infrastructure.

Please pull:
	bk pull bk://linux-sam.bkbits.net/kbuild

Patches as follow-up to this mail.

	Sam

kbuild: fix make O= build

[Sam Ravnborg]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/08/26 21:13:39+02:00 sam@mars.ravnborg.org 
#   kbuild: Fix make O=
#   
#   A bug that slipped through when introducing Makefile.host.
#   A good way to check if people actually uses make O= ;-)
#   
#   Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
# 
# scripts/Makefile.host
#   2004/08/26 21:13:23+02:00 sam@mars.ravnborg.org +1 -0
#   Fix make O= build.
#   
#   When we put correct prefix on obj-dris the output directory is created if needed
# 
diff -Nru a/scripts/Makefile.host b/scripts/Makefile.host
--- a/scripts/Makefile.host	2004-08-26 21:22:06 +02:00
+++ b/scripts/Makefile.host	2004-08-26 21:22:06 +02:00
@@ -73,6 +73,7 @@
 host-cxxobjs	:= $(addprefix $(obj)/,$(host-cxxobjs))
 host-cshlib	:= $(addprefix $(obj)/,$(host-cshlib))
 host-cshobjs	:= $(addprefix $(obj)/,$(host-cshobjs))
+obj-dirs        := $(addprefix $(obj)/,$(obj-dirs))
 
 #####
 # Handle options to gcc. Support building with separate output directory

kbuild: use *.lds infrastructure in arch/i386/kernel/Makefile

[Sam Ravnborg]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/08/26 21:20:43+02:00 sam@mars.ravnborg.org 
#   kbuild: use *.lds infrastructure in arch/i386/kernel
#   
#   Rusty decided to preprocess a *.lds.S file in parallele with the new *.lds infrastructure
#   being added to kbuild. Fix that up.
#   Also added the file to targets so we do not see recompile each time the kernel is build.
#   
#   Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
# 
# arch/i386/kernel/Makefile
#   2004/08/26 21:20:27+02:00 sam@mars.ravnborg.org +4 -3
#   Use new infrastructure for .lds files.
#   Rusty decided to preporocess a .lds file in parallel
#   with the new infrastructure being added.
# 
diff -Nru a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/Makefile	2004-08-26 21:21:27 +02:00
+++ b/arch/i386/kernel/Makefile	2004-08-26 21:21:27 +02:00
@@ -41,20 +41,21 @@
 # Note: kbuild does not track this dependency due to usage of .incbin
 $(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
 targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
+targets += vsyscall.lds
 
 # The DSO images are built using a special linker script.
 quiet_cmd_syscall = SYSCALL $@
       cmd_syscall = $(CC) -nostdlib $(SYSCFLAGS_$(@F)) \
 		          -Wl,-T,$(filter-out FORCE,$^) -o $@
 
-export AFLAGS_vsyscall.lds.o += -P -C -U$(ARCH)
+export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
 
 vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1
 SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
 SYSCFLAGS_vsyscall-int80.so	= $(vsyscall-flags)
 
 $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
-$(obj)/vsyscall-%.so: $(src)/vsyscall.lds.s $(obj)/vsyscall-%.o FORCE
+$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
 	$(call if_changed,syscall)
 
 # We also create a special relocatable object that should mirror the symbol
@@ -65,5 +66,5 @@
 $(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
 
 SYSCFLAGS_vsyscall-syms.o = -r
-$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds.s $(obj)/vsyscall-sysenter.o FORCE
+$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds $(obj)/vsyscall-sysenter.o FORCE
 	$(call if_changed,syscall)