From 0b5bef5fb753fa949c2fe6fa8e612678591e94bf Mon Sep 17 00:00:00 2001 From: jb Date: Thu, 30 Apr 1998 09:04:10 +0000 Subject: [PATCH] Change the name of this source file so that libc_r builds it instead of the one in libc that contains the weak symbol for __error. FreeBSD's make accumulates paths to the point that it can find *anything*, possibly including the car keys. --- lib/libc_r/sys/Makefile.inc | 4 +- lib/libc_r/sys/{__error.c => uthread_error.c} | 0 lib/libkse/sys/Makefile.inc | 4 +- lib/libkse/sys/thr_error.c | 50 +++++++++++++++++++ lib/libpthread/sys/Makefile.inc | 4 +- lib/libpthread/sys/thr_error.c | 50 +++++++++++++++++++ 6 files changed, 106 insertions(+), 6 deletions(-) rename lib/libc_r/sys/{__error.c => uthread_error.c} (100%) create mode 100644 lib/libkse/sys/thr_error.c create mode 100644 lib/libpthread/sys/thr_error.c diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc index 79d1758aba70..50952cdfad1a 100644 --- a/lib/libc_r/sys/Makefile.inc +++ b/lib/libc_r/sys/Makefile.inc @@ -1,6 +1,6 @@ -# $Id: Makefile.inc,v 1.7 1997/05/03 03:57:21 jb Exp $ +# $Id: Makefile.inc,v 1.8 1998/04/29 11:03:34 jb Exp $ .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} -SRCS+= __error.c _atomic_lock.S +SRCS+= uthread_error.c _atomic_lock.S diff --git a/lib/libc_r/sys/__error.c b/lib/libc_r/sys/uthread_error.c similarity index 100% rename from lib/libc_r/sys/__error.c rename to lib/libc_r/sys/uthread_error.c diff --git a/lib/libkse/sys/Makefile.inc b/lib/libkse/sys/Makefile.inc index 79d1758aba70..50952cdfad1a 100644 --- a/lib/libkse/sys/Makefile.inc +++ b/lib/libkse/sys/Makefile.inc @@ -1,6 +1,6 @@ -# $Id: Makefile.inc,v 1.7 1997/05/03 03:57:21 jb Exp $ +# $Id: Makefile.inc,v 1.8 1998/04/29 11:03:34 jb Exp $ .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} -SRCS+= __error.c _atomic_lock.S +SRCS+= uthread_error.c _atomic_lock.S diff --git a/lib/libkse/sys/thr_error.c b/lib/libkse/sys/thr_error.c new file mode 100644 index 000000000000..545dfb06652c --- /dev/null +++ b/lib/libkse/sys/thr_error.c @@ -0,0 +1,50 @@ +/* + * Copyright (c) 1995 John Birrell . + * Copyright (c) 1994 by Chris Provenzano, proven@mit.edu + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by John Birrell + * and Chris Provenzano. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ +#ifdef _THREAD_SAFE +#include +#include "pthread_private.h" +extern int errno; + +int * __error() +{ + int *p_errno; + if (_thread_run == _thread_initial) { + p_errno = &errno; + } else { + p_errno = &_thread_run->error; + } + return(p_errno); +} +#endif diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc index 79d1758aba70..50952cdfad1a 100644 --- a/lib/libpthread/sys/Makefile.inc +++ b/lib/libpthread/sys/Makefile.inc @@ -1,6 +1,6 @@ -# $Id: Makefile.inc,v 1.7 1997/05/03 03:57:21 jb Exp $ +# $Id: Makefile.inc,v 1.8 1998/04/29 11:03:34 jb Exp $ .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} -SRCS+= __error.c _atomic_lock.S +SRCS+= uthread_error.c _atomic_lock.S diff --git a/lib/libpthread/sys/thr_error.c b/lib/libpthread/sys/thr_error.c new file mode 100644 index 000000000000..545dfb06652c --- /dev/null +++ b/lib/libpthread/sys/thr_error.c @@ -0,0 +1,50 @@ +/* + * Copyright (c) 1995 John Birrell . + * Copyright (c) 1994 by Chris Provenzano, proven@mit.edu + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by John Birrell + * and Chris Provenzano. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ +#ifdef _THREAD_SAFE +#include +#include "pthread_private.h" +extern int errno; + +int * __error() +{ + int *p_errno; + if (_thread_run == _thread_initial) { + p_errno = &errno; + } else { + p_errno = &_thread_run->error; + } + return(p_errno); +} +#endif