Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Jul 2006 22:45:45 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 101619 for review
Message-ID:  <200607142245.k6EMjjdB055562@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101619

Change 101619 by jb@jb_freebsd2 on 2006/07/14 22:45:25

	Allow this file to be compiled into libc.

Affected files ...

.. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#5 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#5 (text+ko) ====

@@ -119,6 +119,7 @@
 static void init_private(void);
 static void init_main_thread(struct pthread *thread);
 
+#ifndef LIBC_THREADS
 /*
  * All weak references used within libc should be in this table.
  * This is so that static libraries will work.
@@ -246,6 +247,7 @@
 	{DUAL_ENTRY(_pthread_sigmask)},		/* PJT_SIGMASK */
 	{DUAL_ENTRY(_pthread_testcancel)}	/* PJT_TESTCANCEL */
 };
+#endif
 
 static int init_once = 0;
 
@@ -292,6 +294,7 @@
 		/* Only initialize the threaded application once. */
 		return;
 
+#ifndef LIBC_THREADS
 	/*
 	 * Check the size of the jump table to make sure it is preset
 	 * with the correct number of entries.
@@ -299,6 +302,7 @@
 	if (sizeof(jmp_table) != (sizeof(pthread_func_t) * PJT_MAX * 2))
 		PANIC("Thread jump table not properly initialized");
 	memcpy(__thr_jtable, jmp_table, sizeof(jmp_table));
+#endif
 
 	/*
 	 * Check for the special case of this process running as



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607142245.k6EMjjdB055562>