Fri Apr 12 18:14:23 2013 UTC ()
Weak alias directly to the catchall stub and don't strong alias twice.


(joerg)
diff -r1.24 -r1.25 src/lib/libc/thread-stub/thread-stub.c
cvs diff -r1.24 -r1.25 src/lib/libc/thread-stub/thread-stub.c (expand / switch to unified diff)

--- src/lib/libc/thread-stub/thread-stub.c 2013/04/05 20:15:42 1.24
+++ src/lib/libc/thread-stub/thread-stub.c 2013/04/12 18:14:22 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: thread-stub.c,v 1.24 2013/04/05 20:15:42 christos Exp $ */ 1/* $NetBSD: thread-stub.c,v 1.25 2013/04/12 18:14:22 joerg Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2003, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2003, 2009 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe. 8 * by Jason R. Thorpe.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -21,27 +21,27 @@ @@ -21,27 +21,27 @@
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33#if defined(LIBC_SCCS) && !defined(lint) 33#if defined(LIBC_SCCS) && !defined(lint)
34__RCSID("$NetBSD: thread-stub.c,v 1.24 2013/04/05 20:15:42 christos Exp $"); 34__RCSID("$NetBSD: thread-stub.c,v 1.25 2013/04/12 18:14:22 joerg Exp $");
35#endif /* LIBC_SCCS and not lint */ 35#endif /* LIBC_SCCS and not lint */
36 36
37/* 37/*
38 * Stubs for thread operations, for use when threads are not used by 38 * Stubs for thread operations, for use when threads are not used by
39 * the application. See "reentrant.h" for details. 39 * the application. See "reentrant.h" for details.
40 */ 40 */
41 41
42#ifdef _REENTRANT 42#ifdef _REENTRANT
43 43
44#define __LIBC_THREAD_STUBS 44#define __LIBC_THREAD_STUBS
45 45
46#include "namespace.h" 46#include "namespace.h"
47#include "reentrant.h" 47#include "reentrant.h"
@@ -134,33 +134,32 @@ __libc_mutexattr_catchall_stub(mutexattr @@ -134,33 +134,32 @@ __libc_mutexattr_catchall_stub(mutexattr
134 134
135 CHECK_NOT_THREADED(); 135 CHECK_NOT_THREADED();
136 136
137 return (0); 137 return (0);
138} 138}
139 139
140/* condition variables */ 140/* condition variables */
141 141
142int __libc_cond_catchall_stub(cond_t *); 142int __libc_cond_catchall_stub(cond_t *);
143 143
144__weak_alias(__libc_cond_init,__libc_cond_init_stub) 144__weak_alias(__libc_cond_init,__libc_cond_init_stub)
145__weak_alias(__libc_cond_signal,__libc_cond_catchall_stub) 145__weak_alias(__libc_cond_signal,__libc_cond_catchall_stub)
146__weak_alias(__libc_cond_broadcast,__libc_cond_catchall_stub) 146__weak_alias(__libc_cond_broadcast,__libc_cond_catchall_stub)
147__weak_alias(__libc_cond_wait,__libc_cond_wait_stub) 147__weak_alias(__libc_cond_wait,__libc_cond_catchall_stub)
148__weak_alias(__libc_cond_timedwait,__libc_cond_timedwait_stub) 148__weak_alias(__libc_cond_timedwait,__libc_cond_timedwait_stub)
149__weak_alias(__libc_cond_destroy,__libc_cond_catchall_stub) 149__weak_alias(__libc_cond_destroy,__libc_cond_catchall_stub)
150 150
151__strong_alias(__libc_cond_signal_stub,__libc_cond_catchall_stub) 151__strong_alias(__libc_cond_signal_stub,__libc_cond_catchall_stub)
152__strong_alias(__libc_cond_broadcast_stub,__libc_cond_catchall_stub) 152__strong_alias(__libc_cond_broadcast_stub,__libc_cond_catchall_stub)
153__strong_alias(__libc_cond_wait_stub,__libc_cond_catchall_stub) 
154__strong_alias(__libc_cond_destroy_stub,__libc_cond_catchall_stub) 153__strong_alias(__libc_cond_destroy_stub,__libc_cond_catchall_stub)
155 154
156int 155int
157__libc_cond_init_stub(cond_t *c, const condattr_t *a) 156__libc_cond_init_stub(cond_t *c, const condattr_t *a)
158{ 157{
159 /* LINTED deliberate lack of effect */ 158 /* LINTED deliberate lack of effect */
160 (void)c; 159 (void)c;
161 /* LINTED deliberate lack of effect */ 160 /* LINTED deliberate lack of effect */
162 (void)a; 161 (void)a;
163 162
164 CHECK_NOT_THREADED(); 163 CHECK_NOT_THREADED();
165 164
166 return (0); 165 return (0);