[klibc] [PATCH 07/16] Update syscalls.pl commands to use $(srctree)

Mike Waychison mikew at google.com
Mon Mar 1 23:46:04 PST 2010


Change the Makefile to refer to $(srctree) instead of $(KBUILD_SRC) for
syscalls.pl commands.  While here, clean up the whitespace.

Signed-off-by: Mike Waychison <mikew at google.com>
---
 usr/klibc/syscalls/Kbuild |   55 ++++++++++++++++++++++++---------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild
index 8a5b94d..4dbbc31 100644
--- a/usr/klibc/syscalls/Kbuild
+++ b/usr/klibc/syscalls/Kbuild
@@ -53,18 +53,20 @@ $(obj)/syscalls.nrs: $(KLIBCINC)/sys/syscall.h FORCE
 
 # Generate typesize.c
 quiet_cmd_syscalsz = GEN     $@
-      cmd_syscalsz = mkdir -p $(KLIBCINC)/klibc/;                           \
-                     $(PERL) $(KLIBCSRC)/syscalls.pl -1 $(obj)/SYSCALLS.i   \
-                             $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph    \
-                             $(KLIBCARCH) $(KLIBCBITSIZE) $(obj)/syscalls.nrs \
-                             $(obj)                                         \
-                             $(KLIBCINC)/klibc/havesyscall.h 		    \
-			     $(obj)/typesize.c > $@                      \
-                             || ( rm -f $@ ; exit 1 )
-
-$(obj)/typesize.c: $(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i \
-                      $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph \
-                      $(src)/syscommon.h $(obj)/syscalls.nrs FORCE
+      cmd_syscalsz = \
+            mkdir -p $(KLIBCINC)/klibc/;                                    \
+            $(PERL) $(srctree)/$(KLIBCSRC)/syscalls.pl                      \
+                  -1 $(obj)/SYSCALLS.i                                      \
+                  $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph    \
+                  $(KLIBCARCH) $(KLIBCBITSIZE) $(obj)/syscalls.nrs          \
+                  $(obj)                                                    \
+                  $(KLIBCINC)/klibc/havesyscall.h                           \
+                  $(obj)/typesize.c > $@                                    \
+                  || ( rm -f $@ ; exit 1 )
+
+$(obj)/typesize.c: $(srctree)/$(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i     \
+                   $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph   \
+                   $(src)/syscommon.h $(obj)/syscalls.nrs FORCE
 	$(call if_changed,syscalsz)
 
 # Convert typesize.o to typesize.bin
@@ -77,18 +79,19 @@ $(obj)/typesize.bin: $(obj)/typesize.o FORCE
 # Generate $(KLIBINC)/klibc/havesyscall.h + makefile fragment
 # Using sysstub.pl in arch dir generate all .S files
 quiet_cmd_syscalls = GEN     $@
-      cmd_syscalls = mkdir -p $(KLIBCINC)/klibc/;                           \
-                     $(PERL) $(KLIBCSRC)/syscalls.pl -2 $(obj)/SYSCALLS.i   \
-                             $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph    \
-                             $(KLIBCARCH) $(KLIBCBITSIZE) $(obj)/syscalls.nrs \
-                             $(obj)                                         \
-                             $(KLIBCINC)/klibc/havesyscall.h 		    \
-			     $(obj)/typesize.bin > $@                    \
-                             || ( rm -f $@ ; exit 1 )
-
-$(obj)/syscalls.mk: $(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i \
-                    $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph \
-                    $(call objectify, $(syscall-objs:.o=.S)) \
-                    $(src)/syscommon.h $(obj)/syscalls.nrs \
-		    $(obj)/typesize.bin FORCE
+      cmd_syscalls = \
+            mkdir -p $(KLIBCINC)/klibc/;                                    \
+            $(PERL) $(srctree)/$(KLIBCSRC)/syscalls.pl -2 $(obj)/SYSCALLS.i \
+                  $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph    \
+                  $(KLIBCARCH) $(KLIBCBITSIZE) $(obj)/syscalls.nrs          \
+                  $(obj)                                                    \
+                  $(KLIBCINC)/klibc/havesyscall.h                           \
+                  $(obj)/typesize.bin > $@                                  \
+                  || ( rm -f $@ ; exit 1 )
+
+$(obj)/syscalls.mk: $(srctree)/$(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i   \
+                    $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph \
+                    $(call objectify, $(syscall-objs:.o=.S))               \
+                    $(src)/syscommon.h $(obj)/syscalls.nrs                 \
+                    $(obj)/typesize.bin FORCE
 	$(call if_changed,syscalls)



More information about the klibc mailing list