search for: socketcommon

...ocketcalls.h We no longer generate assembly stubs for socketcalls on any architecture, so <linux/net.h> is perfectly usable as is. Signed-off-by: H. Peter Anvin <hpa at linux.intel.com> --- usr/include/sys/socketcalls.h | 28 ---------------------------- usr/klibc/socketcalls/socketcommon.h | 1 - 2 files changed, 29 deletions(-) diff --git a/usr/include/sys/socketcalls.h b/usr/include/sys/socketcalls.h deleted file mode 100644 index 1c4367d..0000000 --- a/usr/include/sys/socketcalls.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * sys/socketcalls.h - */ - -#ifndef _SYS_SOCKETCALLS_H -#de...

...$(klibc-dir)/SOCKETCALLS.def \ +$(obj)/socketcalls.mk: $(KLIBSRC)/socketcalls.pl \ + $(KLIBSRC)/SOCKETCALLS.def \ $(call objectify, $(socketcall-objs:.o=.S)) \ - $(klibc-dir)/socketcommon.h + $(KLIBSRC)/socketcommon.h $(call cmd,socketcalls) diff --git a/klibc/syscalls/Kbuild b/klibc/syscalls/Kbuild --- a/klibc/syscalls/Kbuild +++ b/klibc/syscalls/Kbuild @@ -11,8 +11,6 @@ endif # Composite object containing all .o file always := syscalls.o -klibc-di...

...print OUT "\tjmp __socketcall_common\n"; - print OUT "\t.size ${name},.-${name}\n"; - close(OUT); - } else { - open(OUT, "> ${outputdir}/${name}.c") - or die "$0: Cannot open ${outputdir}/${name}.c\n"; - - print OUT "#include \"socketcommon.h\"\n"; - print OUT "\n"; - print OUT "#if _KLIBC_SYS_SOCKETCALL || !defined(__NR_${name})\n\n"; + print OUT "#include \"socketcommon.h\"\n"; + print OUT "\n"; + print OUT "#if _KLIBC_SYS_SOCKETCALL || !defined(__NR_${name})\n...

...ls/Kbuild index 648c928..d70b15f 100644 --- a/usr/klibc/socketcalls/Kbuild +++ b/usr/klibc/socketcalls/Kbuild @@ -48,3 +48,6 @@ $(obj)/socketcalls.mk: $(srctree)/$(KLIBCSRC)/socketcalls.pl \ $(obj)/SOCKETCALLS.i \ $(src)/socketcommon.h $(call cmd,socketcalls) + +# Used by if_changed and friends +PHONY += FORCE diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild index 4dbbc31..c94f65c 100644 --- a/usr/klibc/syscalls/Kbuild +++ b/usr/klibc/syscalls/Kbuild @@ -95,3 +95,6 @@ $(obj)/syscalls.mk: $(srctree)/$(K...

Remove FORCE from the list used by if_changed and friends. Otherwise the target will always be considered out of date when built with make 3.82.

...nclude "SOCKETCALLS.def" +#endif diff --git a/usr/klibc/socketcalls.pl b/usr/klibc/socketcalls.pl index e6f75ab..01993e8 100644 --- a/usr/klibc/socketcalls.pl +++ b/usr/klibc/socketcalls.pl @@ -63,7 +63,7 @@ while ( defined($line = <FILE>) ) { print OUT "#include \"socketcommon.h\"\n"; print OUT "\n"; - print OUT "#ifndef __NR_${name}\n\n"; + print OUT "#if (defined(__sparc__) && !defined(__arch64__)) || !defined __NR_${name}\n\n"; print OUT "extern long __socketcall(int, const unsigned long *);\n\...

...(socket, address, addr_len, 0); +} + +#endif diff --git a/usr/klibc/socketcalls.pl b/usr/klibc/socketcalls.pl index 9df5949..70ded0b 100644 --- a/usr/klibc/socketcalls.pl +++ b/usr/klibc/socketcalls.pl @@ -47,11 +47,22 @@ while ( defined($line = <FILE>) ) { print OUT "#include \"socketcommon.h\"\n"; print OUT "\n"; - print OUT "#if _KLIBC_SYS_SOCKETCALL || !defined(__NR_${name})\n\n"; + print OUT "#if _KLIBC_SYS_SOCKETCALL\n"; + print OUT "# define DO_THIS_SOCKETCALL\n"; + print OUT "#else\n"; + print OUT "# if !defined...

...nclude "SOCKETCALLS.def" +#endif diff --git a/usr/klibc/socketcalls.pl b/usr/klibc/socketcalls.pl index e6f75ab..01993e8 100644 --- a/usr/klibc/socketcalls.pl +++ b/usr/klibc/socketcalls.pl @@ -63,7 +63,7 @@ while ( defined($line = <FILE>) ) { print OUT "#include \"socketcommon.h\"\n"; print OUT "\n"; - print OUT "#ifndef __NR_${name}\n\n"; + print OUT "#if (defined(__sparc__) && !defined(__arch64__)) || !defined __NR_${name}\n\n"; print OUT "extern long __socketcall(int, const unsigned long *);\n\...

Hi Peter & others. Here are three patches that does the following: #1 - Update kbuild part of klibc so make clean works Adds gzip including a sample kbuild file #2 - Factor out definition of usr/ to two variables #3 - Move kbuild files to reflect location in the kernel As requested in earlier mail I need a bit of guidiance of what you expect from the kernel integrated parts of klibc.

....lax/libapi.a/omstem.o .libs/libxapian.lax/libapi.a/version.o .libs/libxapian.lax/libapi.a/omdocument.o .libs/libxapian.lax/libapi.a/omdatabase.o .libs/libxapian.lax/libapi.a/omquery.o .libs/libxapian.lax/libnet.a/socketclient.o .libs/libxapian.lax/libnet.a/tcpclient.o .libs/libxapian.lax/libnet.a/socketcommon.o .libs/libxapian.lax/libnet.a/progclient.o .libs/libxapian.lax/libnet.a/omerr_string.o .libs/libxapian.lax/libnet.a/omlinebuf.o .libs/libxapian.lax/libnet.a/socketserver.o .libs/libxapian.lax/libnet.a/tcpserver.o .libs/libxapian.lax/libnet.a/progserver.o .libs/libxapian.lax/libqueryparser.a/query...

The following patchset implements 3 seperate series of changes. External Building ================= Patches 1 through 8 enable to use of klibc's build system while leaving the src tree pristine (and potentially read only). Specifically: - srctree=<Sources for klibc> - objtree=<Ouput directory for klibc> - KLIBCKERNELSRC=<Kernel sources> - KLIBCKERNELOBJ=<Kernel

I have updated the klibc patchset based on feedback received. In particular, the patchset has been reorganized so as not to break git-bisect. Additionally, this updates the patch base to 2.6.17-git12 (d38b69689c349f35502b92e20dafb30c62d49d63) and klibc 1.4.8; the main difference on the klibc side is removal of obsolete code. This is also available as a git tree at: