diff options
author | David Leonard <d@cvs.openbsd.org> | 1999-11-25 07:01:48 +0000 |
---|---|---|
committer | David Leonard <d@cvs.openbsd.org> | 1999-11-25 07:01:48 +0000 |
commit | 0fe78c3128864d128b2b10153b8d533ff8c00375 (patch) | |
tree | 5229c3d97eed15f4d71927a5f454180aef2632f6 /lib/libc_r/sys | |
parent | ed00fa742a6455d22e3b56cf846dc5acd7a51fd7 (diff) |
sync with FreeBSD
Diffstat (limited to 'lib/libc_r/sys')
-rw-r--r-- | lib/libc_r/sys/Makefile.inc | 18 | ||||
-rw-r--r-- | lib/libc_r/sys/uthread_error.c | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc index 2c4ee0df2fd..79b6afe2a4d 100644 --- a/lib/libc_r/sys/Makefile.inc +++ b/lib/libc_r/sys/Makefile.inc @@ -1,17 +1,23 @@ -# $Id: Makefile.inc,v 1.3 1999/01/06 05:36:18 d Exp $ -# $OpenBSD: Makefile.inc,v 1.3 1999/01/06 05:36:18 d Exp $ +# $Id: Makefile.inc,v 1.4 1999/11/25 07:01:29 d Exp $ +# $OpenBSD: Makefile.inc,v 1.4 1999/11/25 07:01:29 d Exp $ .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} -SRCS+= uthread_error.c _atomic_lock.c slow_atomic_lock.c +SRCS+= uthread_error.c _atomic_lock.c slow_atomic_lock.c SRCS+= _sys_aliases.c CLEANFILES += _sys_aliases.c _sys_aliases.c: ${.CURDIR}/Makefile ${LIBCSRCDIR}/sys/Makefile.inc - (echo '#include <sys/cdefs.h>'; \ - for fn in ${ASM:R} ${PSEUDO:R} ""; do \ + echo '#include <sys/cdefs.h>' > ${.TARGET} +.if ${MACHINE} == "alpha" + # This kludge will disappear when we shift to -lpthread + echo '#define __indr_reference(old,new)' \ + '__asm__(".globl "#new";"#new": jmp $$31,"#old)' > ${.TARGET} + +.endif + for fn in ${ASM:R} ${PSEUDO:R} ""; do \ case $$fn in ${HIDDEN_SYSCALLS:.o=|}"") : stays hidden ;; \ *) echo "__indr_reference(_thread_sys_$$fn,$$fn);";; \ esac; \ - done ) > ${.TARGET} + done >> ${.TARGET} diff --git a/lib/libc_r/sys/uthread_error.c b/lib/libc_r/sys/uthread_error.c index 545dfb06652..08740ed92ff 100644 --- a/lib/libc_r/sys/uthread_error.c +++ b/lib/libc_r/sys/uthread_error.c @@ -1,3 +1,4 @@ +/* $OpenBSD: uthread_error.c,v 1.2 1999/11/25 07:01:30 d Exp $ */ /* * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. * Copyright (c) 1994 by Chris Provenzano, proven@mit.edu @@ -31,6 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $FreeBSD: uthread_error.c,v 1.2 1999/08/05 12:14:13 deischen Exp $ */ #ifdef _THREAD_SAFE #include <pthread.h> |