summary refs log tree commit diff
path: root/dlfcn
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-03-27 05:18:47 +0000
committerRoland McGrath <roland@gnu.org>2000-03-27 05:18:47 +0000
commit16710d582967555671fc8f4a188bbea7432f2e7d (patch)
treed5d70f9fa5a6fb14db92c24d6c40248f37cfd9f8 /dlfcn
parent54f6cbb3795fbc9c65965a88e3cd2a60d05acc6d (diff)
downloadglibc-16710d582967555671fc8f4a188bbea7432f2e7d.tar.gz
glibc-16710d582967555671fc8f4a188bbea7432f2e7d.tar.xz
glibc-16710d582967555671fc8f4a188bbea7432f2e7d.zip
* dlfcn/dlopen.c: Use <shlib-compat.h> macros.
	* dlfcn/dlopenold.c: Likewise.
	* nss/getXXbyYY_r.c: Likewise.
	* nss/getXXent_r.c: Likewise.
	* hurd/hurdinit.c: Likewise.
	* hurd/compat-20.c: Likewise.
	* libio/oldiofopen.c: Likewise.
	* libio/oldiofclose.c: Likewise.
	* libio/oldiofdopen.c: Likewise.
	* libio/oldfileops.c: Likewise.
	* libio/oldstdfiles.c: Likewise.
	* libio/oldiofsetpos.c: Likewise.
	* libio/oldiofgetpos.c: Likewise.
	* libio/oldiofgetpos64.c: Likewise.
	* libio/oldiofsetpos64.c: Likewise.
	* libio/oldiopopen.c: Likewise.
	* libio/oldpclose.c: Likewise.
	* libio/oldtmpfile.c: Likewise.
	* libio/freopen.c (freopen): Likewise.
	* libio/iofclose.c (_IO_new_fclose): Likewise.
Diffstat (limited to 'dlfcn')
-rw-r--r--dlfcn/dlopen.c9
-rw-r--r--dlfcn/dlopenold.c5
2 files changed, 6 insertions, 8 deletions
diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 66c43de059..76636fdba4 100644
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -1,5 +1,5 @@
 /* Load a shared object at run time.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,2000 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
@@ -50,8 +50,5 @@ __dlopen_check (const char *file, int mode)
 
   return _dlerror_run (dlopen_doit, &args) ? NULL : args.new;
 }
-#if defined PIC && defined DO_VERSIONING
-default_symbol_version (__dlopen_check, dlopen, GLIBC_2.1);
-#else
-weak_alias (__dlopen_check, dlopen)
-#endif
+#include <shlib-compat.h>
+versioned_symbol (libdl, __dlopen_check, dlopen, GLIBC_2_1);
diff --git a/dlfcn/dlopenold.c b/dlfcn/dlopenold.c
index bc7fd37e3f..3fc39d6999 100644
--- a/dlfcn/dlopenold.c
+++ b/dlfcn/dlopenold.c
@@ -22,7 +22,8 @@
 
 /* This file is for compatibility with glibc 2.0.  Compile it only if
    versioning is used.  */
-#if defined PIC && DO_VERSIONING
+#include <shlib-compat.h>
+#if SHLIB_COMPAT (libdl, GLIBC_2_0, GLIBC_2_1)
 
 struct dlopen_args
 {
@@ -58,5 +59,5 @@ __dlopen_nocheck (const char *file, int mode)
 
   return _dlerror_run (dlopen_doit, &args) ? NULL : args.new;
 }
-symbol_version (__dlopen_nocheck, dlopen, GLIBC_2.0);
+compat_symbol (libdl, __dlopen_nocheck, dlopen, GLIBC_2_0);
 #endif