Module Name: src
Committed By: matt
Date: Fri Apr 29 07:43:19 UTC 2011
Modified Files:
src/distrib/sets/lists/comp [matt-nb5-mips64]: mi
Added Files:
src/sys/sys [matt-nb5-mips64]: tls.h
Log Message:
Bring in <sys/tls.h> from current.
To generate a diff of this commit:
cvs rdiff -u -r1.1201.2.9.2.1.2.4 -r1.1201.2.9.2.1.2.5 \
src/distrib/sets/lists/comp/mi
cvs rdiff -u -r0 -r1.1.4.2 src/sys/sys/tls.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1201.2.9.2.1.2.4 src/distrib/sets/lists/comp/mi:1.1201.2.9.2.1.2.5
--- src/distrib/sets/lists/comp/mi:1.1201.2.9.2.1.2.4 Wed Apr 21 05:20:40 2010
+++ src/distrib/sets/lists/comp/mi Fri Apr 29 07:43:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1201.2.9.2.1.2.4 2010/04/21 05:20:40 matt Exp $
+# $NetBSD: mi,v 1.1201.2.9.2.1.2.5 2011/04/29 07:43:18 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2049,6 +2049,7 @@
./usr/include/sys/timepps.h comp-c-include
./usr/include/sys/times.h comp-c-include
./usr/include/sys/timex.h comp-c-include
+./usr/include/sys/tls.h comp-c-include
./usr/include/sys/tprintf.h comp-obsolete obsolete
./usr/include/sys/trace.h comp-c-include
./usr/include/sys/tree.h comp-c-include
Added files:
Index: src/sys/sys/tls.h
diff -u /dev/null src/sys/sys/tls.h:1.1.4.2
--- /dev/null Fri Apr 29 07:43:20 2011
+++ src/sys/sys/tls.h Fri Apr 29 07:43:19 2011
@@ -0,0 +1,61 @@
+/* $NetBSD: tls.h,v 1.1.4.2 2011/04/29 07:43:19 matt Exp $ */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#ifndef _SYS_TLS_H_
+#define _SYS_TLS_H_
+
+#include <sys/cdefs.h>
+#include <machine/types.h>
+
+#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
+
+#if defined(__HAVE_TLS_VARIANT_I) && defined(__HAVE_TLS_VARIANT_II)
+#error Only one TLS variant can be supported at a time
+#endif
+
+struct tls_tcb {
+#ifdef __HAVE_TLS_VARIANT_I
+ void **tcb_dtv;
+ void *tcb_pthread;
+#else
+ void *tcb_self;
+ void **tcb_dtv;
+ void *tcb_pthread;
+#endif
+};
+
+__BEGIN_DECLS
+struct tls_tcb *_rtld_tls_allocate(void);
+void _rtld_tls_free(struct tls_tcb *);
+void _rtld_tls_static_setup(void);
+__END_DECLS
+#endif /* __HAVE_TLS_VARIANT_I || __HAVE_TLS_VARIANT_II */
+
+#endif /* _SYS_TLS_H_ */
