[src/trunk]: src/lib/libpthread XXX: Work around libpthread's "intimate" conn...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4bb7e0e2478e
branches:  trunk
changeset: 584317:4bb7e0e2478e
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 13 02:45:38 2005 +0000

description:
XXX: Work around libpthread's "intimate" connection with libc.

diffstat:

 lib/libpthread/Makefile             |  4 +++-
 lib/libpthread/pthread_cancelstub.c |  6 ++++--
 lib/libpthread/pthread_sig.c        |  5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diffs (71 lines):

diff -r 6df0b283e424 -r 4bb7e0e2478e lib/libpthread/Makefile
--- a/lib/libpthread/Makefile   Tue Sep 13 02:30:23 2005 +0000
+++ b/lib/libpthread/Makefile   Tue Sep 13 02:45:38 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.33 2005/06/17 18:37:24 peter Exp $
+#      $NetBSD: Makefile,v 1.34 2005/09/13 02:45:38 christos Exp $
 #
 
 WARNS= 2
@@ -17,6 +17,8 @@
        @echo "WARNING: no ARCHSUBDIR for ${MACHINE_ARCH}/${MACHINE_CPU}; skipping..."
 .endif
 
+# XXX: This crappy poke at libc's internals needs to be fixed.
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${.CURDIR}/../libc
 INCS=  pthread.h pthread_types.h pthread_queue.h
 INCSDIR=/usr/include
 
diff -r 6df0b283e424 -r 4bb7e0e2478e lib/libpthread/pthread_cancelstub.c
--- a/lib/libpthread/pthread_cancelstub.c       Tue Sep 13 02:30:23 2005 +0000
+++ b/lib/libpthread/pthread_cancelstub.c       Tue Sep 13 02:45:38 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_cancelstub.c,v 1.12 2005/03/21 09:00:49 kleink Exp $   */
+/*     $NetBSD: pthread_cancelstub.c,v 1.13 2005/09/13 02:45:38 christos Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_cancelstub.c,v 1.12 2005/03/21 09:00:49 kleink Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.13 2005/09/13 02:45:38 christos Exp $");
 
 /*
  * This is necessary because the names are always weak (they are not
@@ -68,6 +68,8 @@
 #include <sys/select.h>
 #include <sys/socket.h>
 
+#include <compat/sys/mman.h>
+
 #include "pthread.h"
 #include "pthread_int.h"
 
diff -r 6df0b283e424 -r 4bb7e0e2478e lib/libpthread/pthread_sig.c
--- a/lib/libpthread/pthread_sig.c      Tue Sep 13 02:30:23 2005 +0000
+++ b/lib/libpthread/pthread_sig.c      Tue Sep 13 02:45:38 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_sig.c,v 1.41 2005/07/26 20:16:07 christos Exp $        */
+/*     $NetBSD: pthread_sig.c,v 1.42 2005/09/13 02:45:38 christos Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_sig.c,v 1.41 2005/07/26 20:16:07 christos Exp $");
+__RCSID("$NetBSD: pthread_sig.c,v 1.42 2005/09/13 02:45:38 christos Exp $");
 
 /* We're interposing a specific version of the signal interface. */
 #define        __LIBC12_SOURCE__
@@ -54,6 +54,7 @@
 #include <string.h>            /* for memcpy() */
 #include <ucontext.h>
 #include <unistd.h>
+#include <compat/include/signal.h>
 #include <sys/syscall.h>
 
 #include <sched.h>