summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-26 16:41:29 (GMT)
committer Peter S. Mazinger <ps.m@gmx.net>2011-03-26 16:41:29 (GMT)
commitf3c9dc499c5c787ddd8c4320f2d44d2ae6e40c22 (patch)
treef30d14033ed08a460ad59557401739c9a510a622
parente4b3328110bad8970b9271e4fbf9887c4e04dd3c (diff)
downloaduClibc-f3c9dc499c5c787ddd8c4320f2d44d2ae6e40c22.tar.gz
uClibc-f3c9dc499c5c787ddd8c4320f2d44d2ae6e40c22.tar.bz2
libdl.c: disable dlinfo
dlinfo is a GNU extension, it should be of the same type as on glibc. Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
-rw-r--r--include/dlfcn.h12
-rw-r--r--ldso/libdl/libdl.c3
2 files changed, 6 insertions, 9 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 2348e43..6d2b05c 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,6 +1,5 @@
/* User functions for run-time dynamic loading.
- Copyright (C) 1995-1999,2000,2001,2003,2004,2006
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2001,2003,2004,2006,2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -52,6 +51,7 @@ typedef long int Lmid_t;
# endif
#endif
+
__BEGIN_DECLS
/* Open the shared object FILE and map it in; return a handle that can be
@@ -166,7 +166,7 @@ enum
segment, or if the calling thread has not allocated a block for it. */
RTLD_DI_TLS_DATA = 10,
- RTLD_DI_MAX = 10,
+ RTLD_DI_MAX = 10
};
@@ -186,12 +186,6 @@ typedef struct
unsigned int dls_cnt; /* Number of elements in `dls_serpath'. */
Dl_serpath dls_serpath[1]; /* Actually longer, dls_cnt elements. */
} Dl_serinfo;
-
-#else
-
-/* Get information about the shared objects currently loaded */
-extern int dlinfo (void);
-
#endif
#endif /* __USE_GNU */
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index e442e90..3341f03 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -975,8 +975,10 @@ char *dlerror(void)
* Dump information to stderr about the current loaded modules
*/
#ifdef __USE_GNU
+# if 0
static const char type[][4] = { "Lib", "Exe", "Int", "Mod" };
+/* reimplement this, being a GNU extension it should be the same as on glibc */
int dlinfo(void)
{
struct elf_resolve *tpnt;
@@ -1003,6 +1005,7 @@ int dlinfo(void)
}
return 0;
}
+#endif
int dladdr(const void *__address, Dl_info * __info)
{