diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bp-thunks.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/Makefile | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/bp-thunks.h | 7 |
4 files changed, 14 insertions, 8 deletions
diff --git a/sysdeps/generic/bp-thunks.h b/sysdeps/generic/bp-thunks.h index 5d2e40d914..85f398fee4 100644 --- a/sysdeps/generic/bp-thunks.h +++ b/sysdeps/generic/bp-thunks.h @@ -1,5 +1,5 @@ /* Bounded-pointer syscall thunk support. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Greg McGary <greg@mcgary.org> @@ -21,6 +21,8 @@ #ifndef _bpthunks_h_ #define _bpthunks_h_ +#ifndef __ASSEMBLER__ + /* This header is included by the syscall BP thunks defined in sysd-syscalls, as created by sysdeps/unix/make-syscalls.sh. It includes all headers that contain prototype declarations for system @@ -63,4 +65,6 @@ #include <sys/utsname.h> #include <sys/wait.h> +#endif /* Not __ASSEMBLER__. */ + #endif /* _bpthunks_h_ */ diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile index 12a46246d7..5b326e032c 100644 --- a/sysdeps/unix/Makefile +++ b/sysdeps/unix/Makefile @@ -293,6 +293,7 @@ ifdef unix-stub-syscalls sysdep_routines += stub-syscalls $(objpfx)stub-syscalls.c: $(common-objpfx)sysd-syscalls \ $(..)sysdeps/unix/Makefile + $(make-target-directory) (echo '#include <errno.h>'; \ echo 'long int _no_syscall (void)'; \ echo '{ __set_errno (ENOSYS); return -1L; }'; \ @@ -338,10 +339,10 @@ endif # The syscall objects depend on s-proto.d or s-proto-cancel.d, which # are generated to specify dependencies generated syscalls have on # headers. -ifdef subdir -ifndef no_deps # These deps use file names relative to a subdir, so don't # include them in the parent directory. +ifneq (,$(filter $(unix-syscalls),$(routines) $(sysdep_routines) $(aux))) +ifndef no_deps -include $(common-objpfx)s-proto.d -include $(common-objpfx)s-proto-bp.d -include $(common-objpfx)s-proto-cancel.d @@ -350,8 +351,7 @@ endif $(common-objpfx)s-%.d: $(..)sysdeps/unix/s-%.S \ $(wildcard $(+sysdep_dirs:%=%/syscalls.list)) -# Don't try to use compat.h in the db2 subdir - $(subst -include ./compat.h,,$(+make-deps)) + $(+make-deps) common-generated += s-proto.d s-proto-bp.d s-proto-cancel.d postclean-generated += sysd-syscalls diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index dcffc97986..9df9d6a206 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -29,6 +29,7 @@ install-others += $(inst_includedir)/bits/syscall.h # For bi-arch platforms, the CPU/Makefile defines {32,64}bit-predefine and # we generate a file that uses <bits/wordsize.h>. $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscall.h + $(make-target-directory) rm -f $(@:.h=.d)-t { \ echo '/* Generated at libc build time from kernel syscall list. */';\ diff --git a/sysdeps/unix/sysv/linux/i386/bp-thunks.h b/sysdeps/unix/sysv/linux/i386/bp-thunks.h index d46ea8f278..59a42ddefe 100644 --- a/sysdeps/unix/sysv/linux/i386/bp-thunks.h +++ b/sysdeps/unix/sysv/linux/i386/bp-thunks.h @@ -1,3 +1,4 @@ -#include <sysdeps/generic/bp-thunks.h> - -#include <sys/vm86.h> +#ifndef __ASSEMBLER__ +# include <sysdeps/generic/bp-thunks.h> +# include <sys/vm86.h> +#endif |