From 451e3b67a442f0ece7844a78363c5d49abe3a0cf Mon Sep 17 00:00:00 2001
From: davidxu <davidxu@FreeBSD.org>
Date: Tue, 5 Jan 2010 06:21:29 +0000
Subject: Remove extra new semaphore stubs, because libc already has them, and
 ld can find the newest version which is default.

Poked by: kan@
---
 lib/libthr/pthread.map          |   7 ---
 lib/libthr/thread/thr_sem_new.c | 103 ----------------------------------------
 2 files changed, 110 deletions(-)
 delete mode 100644 lib/libthr/thread/thr_sem_new.c

diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map
index 0ade298..6460bec 100644
--- a/lib/libthr/pthread.map
+++ b/lib/libthr/pthread.map
@@ -396,11 +396,4 @@ FBSD_1.1 {
 
 FBSD_1.2 {
 	openat;
-	sem_destroy;
-	sem_getvalue;
-	sem_init;
-	sem_post;
-	sem_timedwait;
-	sem_trywait;
-	sem_wait;
 };
diff --git a/lib/libthr/thread/thr_sem_new.c b/lib/libthr/thread/thr_sem_new.c
deleted file mode 100644
index 689b252..0000000
--- a/lib/libthr/thread/thr_sem_new.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2010 David Xu <davidxu@freebsd.org>.
- * All rights reserved.
- * 
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), 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 COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- *
- * $FreeBSD$
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <time.h>
-#include <semaphore.h>
-#include "un-namespace.h"
-
-#include "thr_private.h"
-
-__weak_reference(_sem_init, sem_init);
-__weak_reference(_sem_destroy, sem_destroy);
-__weak_reference(_sem_getvalue, sem_getvalue);
-__weak_reference(_sem_trywait, sem_trywait);
-__weak_reference(_sem_wait, sem_wait);
-__weak_reference(_sem_timedwait, sem_timedwait);
-__weak_reference(_sem_post, sem_post);
-
-extern int _libc_sem_init(sem_t *sem, int pshared, unsigned int value);
-extern int _libc_sem_destroy(sem_t *sem);
-extern int _libc_sem_getvalue(sem_t * __restrict sem, int * __restrict sval);
-extern int _libc_sem_trywait(sem_t *sem);
-extern int _libc_sem_wait(sem_t *sem);
-extern int _libc_sem_timedwait(sem_t * __restrict sem,
-    const struct timespec * __restrict abstime);
-extern int _libc_sem_post(sem_t *sem);
-
-int
-_sem_init(sem_t *sem, int pshared, unsigned int value)
-{
-	return _libc_sem_init(sem, pshared, value);
-}
-
-int
-_sem_destroy(sem_t *sem)
-{
-	return _libc_sem_destroy(sem);
-}
-
-int
-_sem_getvalue(sem_t * __restrict sem, int * __restrict sval)
-{
-	return _libc_sem_getvalue(sem, sval);
-}
-
-int
-_sem_trywait(sem_t *sem)
-{
-	return _libc_sem_trywait(sem);
-}
-
-int
-_sem_wait(sem_t *sem)
-{
-	return _libc_sem_wait(sem);
-}
-
-int
-_sem_timedwait(sem_t * __restrict sem,
-    const struct timespec * __restrict abstime)
-{
-	return _libc_sem_timedwait(sem, abstime);
-}
-
-int
-_sem_post(sem_t *sem)
-{
-	return _libc_sem_post(sem);
-}
-- 
cgit v1.1