svn commit: r198437 - projects/clangbsd/lib/libc/gen
Roman Divacky
rdivacky at FreeBSD.org
Sat Oct 24 08:25:44 UTC 2009
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
More information about the svn-src-projects
mailing list