Module Name: src
Committed By: ad
Date: Sat May 16 22:21:18 UTC 2009
Modified Files:
src/lib/libpthread: Makefile pthread_int.h
Log Message:
Remove unused code that's confusing when using cscope/opengrok.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/lib/libpthread/Makefile
cvs rdiff -u -r1.70 -r1.71 src/lib/libpthread/pthread_int.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.55 src/lib/libpthread/Makefile:1.56
--- src/lib/libpthread/Makefile:1.55 Sun Oct 26 00:00:27 2008
+++ src/lib/libpthread/Makefile Sat May 16 22:21:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2008/10/26 00:00:27 mrg Exp $
+# $NetBSD: Makefile,v 1.56 2009/05/16 22:21:18 ad Exp $
#
WARNS= 4
@@ -29,19 +29,8 @@
CPPFLAGS+= -D__LIBPTHREAD_SOURCE__
# XXX: This crappy poke at libc's internals needs to be fixed.
-# We need to put this *after our own includes, so that our "assym.h"
-# gets picked, instead of the libc one
CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${.CURDIR}/../libc
-DPSRCS+= assym.h
-CLEANFILES+= assym.h
-
-assym.h: ${ARCHDIR}/genassym.cf pthread.h pthread_int.h pthread_md.h
- ${_MKTARGET_CREATE}
- ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
- < ${ARCHDIR}/genassym.cf > assym.h.tmp && \
- mv -f assym.h.tmp assym.h
-
LIB= pthread
#
@@ -64,9 +53,8 @@
SRCS+= res_state.c
SRCS+= sem.c
# Architecture-dependent files
-SRCS+= _context_u.S
-.if exists(${ARCHDIR}/pthread_md.c)
-SRCS+= pthread_md.c
+.if exists(${ARCHDIR}/pthread_md.S)
+SRCS+= pthread_md.S
.endif
.if defined(PTHREAD__COMPAT)
@@ -99,10 +87,6 @@
COPTS.pthread.c += -Wno-stack-protector
-_context_u.po: _context_u.o
- ${_MKTARGET_CREATE}
- cp _context_u.o _context_u.po
-
MAN+= affinity.3 pthread.3 \
pthread_attr.3 \
pthread_attr_getname_np.3 \
@@ -162,8 +146,6 @@
MLINKS+= pthread_testcancel.3 pthread_setcancelstate.3
MLINKS+= pthread_testcancel.3 pthread_setcanceltype.3
-pthread_switch.S _context_u.S: assym.h
-
.include <bsd.lib.mk>
.else
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.70 src/lib/libpthread/pthread_int.h:1.71
--- src/lib/libpthread/pthread_int.h:1.70 Sat Jun 28 10:29:37 2008
+++ src/lib/libpthread/pthread_int.h Sat May 16 22:21:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.70 2008/06/28 10:29:37 ad Exp $ */
+/* $NetBSD: pthread_int.h,v 1.71 2009/05/16 22:21:18 ad Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -231,16 +231,6 @@
#define pthread__simple_lock_try(alp) (*pthread__lock_ops->plo_try)(alp)
#define pthread__simple_unlock(alp) (*pthread__lock_ops->plo_unlock)(alp)
-#ifndef _getcontext_u
-int _getcontext_u(ucontext_t *) PTHREAD_HIDE;
-#endif
-#ifndef _setcontext_u
-int _setcontext_u(const ucontext_t *) PTHREAD_HIDE;
-#endif
-#ifndef _swapcontext_u
-int _swapcontext_u(ucontext_t *, const ucontext_t *) PTHREAD_HIDE;
-#endif
-
void pthread__testcancel(pthread_t) PTHREAD_HIDE;
int pthread__find(pthread_t) PTHREAD_HIDE;
