From 614c831df40e799401eef4d17f634f22fa86b28d Mon Sep 17 00:00:00 2001 From: Peter S. Mazinger Date: Sat, 26 Mar 2011 17:41:29 +0100 Subject: [PATCH 205/396] 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 --- include/dlfcn.h | 12 +++--------- ldso/libdl/libdl.c | 3 +++ 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 60d61e3..016a069 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -1079,8 +1079,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; @@ -1107,6 +1109,7 @@ int dlinfo(void) } return 0; } +#endif static int do_dladdr(const void *__address, Dl_info * __info) { -- 1.7.0.4