diff options
| -rw-r--r-- | sysdeps/generic/bp-thunks.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/unix/make-syscalls.sh | 2 | ||||
| -rw-r--r-- | sysdeps/unix/s-proto-bp.S | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/bp-thunks.h | 3 |
5 files changed, 11 insertions, 4 deletions
diff --git a/sysdeps/generic/bp-thunks.h b/sysdeps/generic/bp-thunks.h index fa5b71fe0e..5d2e40d914 100644 --- a/sysdeps/generic/bp-thunks.h +++ b/sysdeps/generic/bp-thunks.h @@ -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_ */ diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile index d6aabb4c98..0d8284ecd3 100644 --- a/sysdeps/unix/Makefile +++ b/sysdeps/unix/Makefile @@ -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/s-%.S \ # 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 diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index bbc8d43108..2c384f5e92 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -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 | \ diff --git a/sysdeps/unix/s-proto-bp.S b/sysdeps/unix/s-proto-bp.S new file mode 100644 index 0000000000..ba0363e16f --- /dev/null +++ b/sysdeps/unix/s-proto-bp.S @@ -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> diff --git a/sysdeps/unix/sysv/linux/i386/bp-thunks.h b/sysdeps/unix/sysv/linux/i386/bp-thunks.h new file mode 100644 index 0000000000..d46ea8f278 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/bp-thunks.h @@ -0,0 +1,3 @@ +#include <sysdeps/generic/bp-thunks.h> + +#include <sys/vm86.h> |