This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Ok to check in? Andreas. |> Here is an addendum to get the right dependencies also for bp thunks, and |> to fix sysdeps/generic/bp-thunks.h to make it really generic. |> |> Andreas. |> |> 2002-12-30 Andreas Schwab <schwab@suse.de> |> |> * sysdeps/unix/Makefile: Include $(common-objpfx)s-proto-bp.d. |> (common-generated): Add s-proto-bp.d. |> * sysdeps/unix/make-syscalls.sh: Use s-proto-bp.d for dependencies |> of bp thunks. |> * sysdeps/unix/s-proto-bp.S: New file. |> * sysdeps/generic/bp-thunks.h: Don't include <sys/vm86.h> here. |> Use <io/sys/sendfile.h> instead of <sys/sendfile.h>. |> * sysdeps/unix/sysv/linux/i386/bp-thunks.h: New file. |> |> Index: sysdeps/generic/bp-thunks.h |> =================================================================== |> RCS file: /cvs/glibc/libc/sysdeps/generic/bp-thunks.h,v |> retrieving revision 1.5 |> diff -u -p -a -r1.5 bp-thunks.h |> --- sysdeps/generic/bp-thunks.h 6 Jul 2001 04:55:48 -0000 1.5 |> +++ sysdeps/generic/bp-thunks.h 30 Dec 2002 11:32:30 -0000 |> @@ -51,7 +51,7 @@ |> #include <sys/quota.h> |> #include <sys/resource.h> |> #include <sys/select.h> |> -#include <sys/sendfile.h> |> +#include <io/sys/sendfile.h> |> #include <sys/socket.h> |> #include <sys/stat.h> |> #include <sys/statfs.h> |> @@ -61,7 +61,6 @@ |> #include <sys/times.h> |> #include <sys/timex.h> |> #include <sys/utsname.h> |> -#include <sys/vm86.h> |> #include <sys/wait.h> |> |> #endif /* _bpthunks_h_ */ |> Index: sysdeps/unix/Makefile |> =================================================================== |> RCS file: /cvs/glibc/libc/sysdeps/unix/Makefile,v |> retrieving revision 1.85 |> diff -u -p -a -r1.85 Makefile |> --- sysdeps/unix/Makefile 30 Dec 2002 00:12:47 -0000 1.85 |> +++ sysdeps/unix/Makefile 30 Dec 2002 11:32:36 -0000 |> @@ -305,6 +305,7 @@ ifndef no_deps |> # These deps use file names relative to a subdir, so don't |> # include them in the parent directory. |> -include $(common-objpfx)s-proto.d |> +-include $(common-objpfx)s-proto-bp.d |> -include $(common-objpfx)s-proto-cancel.d |> endif |> endif |> @@ -314,7 +315,7 @@ $(common-objpfx)s-%.d: $(..)sysdeps/unix |> # Don't try to use compat.h in the db2 subdir |> $(subst -include ./compat.h,,$(+make-deps)) |> |> -common-generated += s-proto.d s-proto-cancel.d |> +common-generated += s-proto.d s-proto-bp.d s-proto-cancel.d |> postclean-generated += sysd-syscalls |> |> endif |> Index: sysdeps/unix/make-syscalls.sh |> =================================================================== |> RCS file: /cvs/glibc/libc/sysdeps/unix/make-syscalls.sh,v |> retrieving revision 1.31 |> diff -u -p -a -r1.31 make-syscalls.sh |> --- sysdeps/unix/make-syscalls.sh 30 Dec 2002 00:12:47 -0000 1.31 |> +++ sysdeps/unix/make-syscalls.sh 30 Dec 2002 11:32:36 -0000 |> @@ -248,7 +248,7 @@ shared-only-routines += $file |> # generate makefile envelope & rule head |> echo "ifeq (,\$(filter $file,\$(bp-thunks)))" |> echo "bp-thunks += $file" |> - echo "\$(objpfx)\$(bppfx)$file.ob: \$(common-objpfx)s-proto$cancellable.d" |> + echo "\$(objpfx)\$(bppfx)$file.ob: \$(common-objpfx)s-proto-bp.d" |> |> # generate macro head |> echo " (echo '#define $callname(`echo $arglist | \ |> Index: sysdeps/unix/s-proto-bp.S |> =================================================================== |> RCS file: sysdeps/unix/s-proto-bp.S |> diff -N sysdeps/unix/s-proto-bp.S |> --- /dev/null 1 Jan 1970 00:00:00 -0000 |> +++ sysdeps/unix/s-proto-bp.S 30 Dec 2002 11:32:36 -0000 |> @@ -0,0 +1,4 @@ |> +/* This file exists just to have its dependencies determined. |> + Those dependencies are then used for the bp thunk objects. */ |> + |> +#include <bp-thunks.h> |> Index: sysdeps/unix/sysv/linux/i386/bp-thunks.h |> =================================================================== |> RCS file: sysdeps/unix/sysv/linux/i386/bp-thunks.h |> diff -N sysdeps/unix/sysv/linux/i386/bp-thunks.h |> --- /dev/null 1 Jan 1970 00:00:00 -0000 |> +++ sysdeps/unix/sysv/linux/i386/bp-thunks.h 30 Dec 2002 11:32:36 -0000 |> @@ -0,0 +1,3 @@ |> +#include <sysdeps/generic/bp-thunks.h> |> + |> +#include <sys/vm86.h> -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |