From owner-svn-src-projects@FreeBSD.ORG  Sat Oct 24 08:25:44 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BB051065676;
	Sat, 24 Oct 2009 08:25:44 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5A168FC0A;
	Sat, 24 Oct 2009 08:25:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9O8PhpH085303;
	Sat, 24 Oct 2009 08:25:43 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9O8Ph50085301;
	Sat, 24 Oct 2009 08:25:43 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200910240825.n9O8Ph50085301@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Sat, 24 Oct 2009 08:25:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198437 - projects/clangbsd/lib/libc/gen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Oct 2009 08:25:44 -0000

Author: rdivacky
Date: Sat Oct 24 08:25:43 2009
New Revision: 198437
URL: http://svn.freebsd.org/changeset/base/198437

Log:
  revert the #pragma weak stuff to HEAD version. clang can handle it now

Modified:
  projects/clangbsd/lib/libc/gen/dlfcn.c

Modified: projects/clangbsd/lib/libc/gen/dlfcn.c
==============================================================================
--- projects/clangbsd/lib/libc/gen/dlfcn.c	Sat Oct 24 07:43:17 2009	(r198436)
+++ projects/clangbsd/lib/libc/gen/dlfcn.c	Sat Oct 24 08:25:43 2009	(r198437)
@@ -46,35 +46,36 @@ static const char sorry[] = "Service una
  * be weak symbols so that the dynamic linker can override them.
  */
 
+#pragma weak _rtld_error
 void
 _rtld_error(const char *fmt, ...)
 {
 }
-#pragma weak _rtld_error
 
+#pragma weak dladdr
 int
 dladdr(const void *addr, Dl_info *dlip)
 {
 	_rtld_error(sorry);
 	return 0;
 }
-#pragma weak dladdr
 
+#pragma weak dlclose
 int
 dlclose(void *handle)
 {
 	_rtld_error(sorry);
 	return -1;
 }
-#pragma weak dlclose
 
+#pragma weak dlerror
 const char *
 dlerror(void)
 {
 	return sorry;
 }
-#pragma weak dlerror
 
+#pragma weak dllockinit
 void
 dllockinit(void *context,
 	   void *(*lock_create)(void *context),
@@ -87,32 +88,32 @@ dllockinit(void *context,
 	if (context_destroy != NULL)
 		context_destroy(context);
 }
-#pragma weak dllockinit
 
+#pragma weak dlopen
 void *
 dlopen(const char *name, int mode)
 {
 	_rtld_error(sorry);
 	return NULL;
 }
-#pragma weak dlopen
 
+#pragma weak dlsym
 void *
 dlsym(void * __restrict handle, const char * __restrict name)
 {
 	_rtld_error(sorry);
 	return NULL;
 }
-#pragma weak dlsym
 
+#pragma weak dlfunc
 dlfunc_t
 dlfunc(void * __restrict handle, const char * __restrict name)
 {
 	_rtld_error(sorry);
 	return NULL;
 }
-#pragma weak dlfunc
 
+#pragma weak dlvsym
 void *
 dlvsym(void * __restrict handle, const char * __restrict name,
     const char * __restrict version)
@@ -120,23 +121,23 @@ dlvsym(void * __restrict handle, const c
 	_rtld_error(sorry);
 	return NULL;
 }
-#pragma weak dlvsym
 
+#pragma weak dlinfo
 int
 dlinfo(void * __restrict handle, int request, void * __restrict p)
 {
 	_rtld_error(sorry);
 	return 0;
 }
-#pragma weak dlinfo
 
+#pragma weak _rtld_thread_init
 void
 _rtld_thread_init(void * li)
 {
 	_rtld_error(sorry);
 }
-#pragma weak _rtld_thread_init
 
+#pragma weak dl_iterate_phdr
 int
 dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *),
     void *data)
@@ -144,16 +145,15 @@ dl_iterate_phdr(int (*callback)(struct d
 	_rtld_error(sorry);
 	return 0;
 }
-#pragma weak dl_iterate_phdr
 
+#pragma weak _rtld_atfork_pre
 void
 _rtld_atfork_pre(int *locks)
 {
 }
-#pragma weak _rtld_atfork_pre
 
+#pragma weak _rtld_atfork_post
 void
 _rtld_atfork_post(int *locks)
 {
 }
-#pragma weak _rtld_atfork_post