Merge with klibc-1.4.2

4 files changed, 22 insertions, 23 deletions

diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild
index 7ac2388747a12f..f3901e5ea1e39a 100644
--- a/usr/dash/Kbuild
+++ b/usr/dash/Kbuild
@@ -124,23 +124,23 @@ $(obj)/arith.c $(obj)/arith.h: $(src)/arith.y
 install-y := sh.shared
 
 # Dependencies on generated files.  This really should be automated.
-$(obj)/arith_yylex.o: $(src)/arith.h
-$(obj)/builtins.o: $(src)/builtins.h
-$(obj)/cd.o: $(src)/nodes.h
-$(obj)/eval.o: $(src)/nodes.h $(src)/syntax.h $(src)/builtins.h
-$(obj)/exec.o: $(src)/nodes.h $(src)/builtins.h $(src)/syntax.h
-$(obj)/expand.o: $(src)/nodes.h $(src)/syntax.h
-$(obj)/input.o: $(src)/syntax.h
-$(obj)/jobs.o: $(src)/nodes.h $(src)/syntax.h
-$(obj)/mail.o: $(src)/nodes.h
-$(obj)/main.o: $(src)/nodes.h
-$(obj)/mystring.o: $(src)/syntax.h
-$(obj)/nodes.o: $(src)/nodes.h
-$(obj)/options.o: $(src)/nodes.h
-$(obj)/output.o: $(src)/syntax.h
-$(obj)/parser.o: $(src)/nodes.h $(src)/syntax.h $(src)/builtins.h $(src)/token.h
-$(obj)/redir.o: $(src)/nodes.h
-$(obj)/show.o: $(src)/nodes.h
-$(obj)/syntax.o: $(src)/syntax.h
-$(obj)/trap.o: $(src)/nodes.h $(src)/syntax.h
-$(obj)/var.o: $(src)/nodes.h $(src)/syntax.h
+$(obj)/arith_yylex.o: $(obj)/arith.h
+$(obj)/builtins.o: $(obj)/builtins.h
+$(obj)/cd.o: $(obj)/nodes.h
+$(obj)/eval.o: $(obj)/nodes.h $(obj)/syntax.h $(obj)/builtins.h
+$(obj)/exec.o: $(obj)/nodes.h $(obj)/builtins.h $(obj)/syntax.h
+$(obj)/expand.o: $(obj)/nodes.h $(obj)/syntax.h
+$(obj)/input.o: $(obj)/syntax.h
+$(obj)/jobs.o: $(obj)/nodes.h $(obj)/syntax.h
+$(obj)/mail.o: $(obj)/nodes.h
+$(obj)/main.o: $(obj)/nodes.h
+$(obj)/mystring.o: $(obj)/syntax.h
+$(obj)/nodes.o: $(obj)/nodes.h
+$(obj)/options.o: $(obj)/nodes.h
+$(obj)/output.o: $(obj)/syntax.h
+$(obj)/parser.o: $(obj)/nodes.h $(obj)/syntax.h $(obj)/builtins.h $(obj)/token.h
+$(obj)/redir.o: $(obj)/nodes.h
+$(obj)/show.o: $(obj)/nodes.h
+$(obj)/syntax.o: $(obj)/syntax.h
+$(obj)/trap.o: $(obj)/nodes.h $(obj)/syntax.h
+$(obj)/var.o: $(obj)/nodes.h $(obj)/syntax.h
diff --git a/usr/dash/gendeps.pl b/usr/dash/gendeps.pl
index 2319bd1b4558f0..a53ebedd0ec797 100755
--- a/usr/dash/gendeps.pl
+++ b/usr/dash/gendeps.pl
@@ -22,7 +22,7 @@ while ( defined($file = readdir(DIR)) ) {
 		$header = $1;
 
 		if ( $build_headers{$header} ) {
-		    push(@hdrs, "\$(src)/$header");
+		    push(@hdrs, "\$(obj)/$header");
 		}
 	    }
 	}
diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild
index e7ae1d24b40156..a1d408d59bb908 100644
--- a/usr/klibc/syscalls/Kbuild
+++ b/usr/klibc/syscalls/Kbuild
@@ -64,7 +64,6 @@ quiet_cmd_syscalsz = GEN     $@
 
 $(obj)/typesize.c: $(KLIBCSRC)/syscalls.pl $(obj)/SYSCALLS.i \
                       $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/sysstub.ph \
-                      $(call objectify, $(syscall-objs:.o=.S)) \
                       $(src)/syscommon.h $(obj)/syscalls.nrs FORCE
 	$(call if_changed,syscalsz)
 
diff --git a/usr/klibc/version b/usr/klibc/version
index 347f5833ee6db7..9df886c42a1e20 100644
--- a/usr/klibc/version
+++ b/usr/klibc/version
@@ -1 +1 @@
-1.4.1
+1.4.2