summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-03 08:26:04 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-03 09:11:45 +0200
commit6f1c701026287f6928d3bdd1aea7359308635abe (patch)
tree8dcf3b5a755f131435a912f7629478deaff74264 /include
parent0c1c3a771eceec46e66ce1183cf988e2303bd373 (diff)
downloadglibc-6f1c701026287f6928d3bdd1aea7359308635abe.tar.gz
glibc-6f1c701026287f6928d3bdd1aea7359308635abe.tar.xz
glibc-6f1c701026287f6928d3bdd1aea7359308635abe.zip
dlfcn: Cleanups after -ldl is no longer required
This commit removes the ELF constructor and internal variables from
dlfcn/dlfcn.c.  The file now serves the same purpose as
nptl/libpthread-compat.c, so it is renamed to dlfcn/libdl-compat.c.
The use of libdl-shared-only-routines ensures that libdl.a is empty.

This commit adjusts the test suite not to use $(libdl).  The libdl.so
symbolic link is no longer installed.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/dlfcn.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 4274eddbc9..711bbb0f12 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -19,16 +19,6 @@
 extern int __libc_argc attribute_hidden;
 extern char **__libc_argv attribute_hidden;
 
-#ifdef SHARED
-/* Locally stored program arguments.  */
-extern int __dlfcn_argc attribute_hidden;
-extern char **__dlfcn_argv attribute_hidden;
-#else
-# define __dlfcn_argc __libc_argc
-# define __dlfcn_argv __libc_argv
-#endif
-
-
 /* Now define the internal interfaces.  */
 
 /* Use RTLD_NOW here because:
@@ -101,14 +91,6 @@ libc_hidden_proto (_dl_vsym)
 extern int _dlerror_run (void (*operate) (void *), void *args);
 libc_hidden_proto (_dlerror_run)
 
-#ifdef SHARED
-# define DL_CALLER_DECL /* Nothing */
-# define DL_CALLER RETURN_ADDRESS (0)
-#else
-# define DL_CALLER_DECL , void *dl_caller
-# define DL_CALLER dl_caller
-#endif
-
 struct dlfcn_hook
 {
   void *(*dlopen) (const char *file, int mode, void *dl_caller);