|
 |
147e83 |
commit 9b42a0b3a3cc037e6bdd62869d91cb19c80aa0e5
|
|
|
147e83 |
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
|
|
147e83 |
Date: Thu Nov 20 13:17:21 2014 +0530
|
|
|
147e83 |
|
|
|
147e83 |
Remove IS_IN_libdl
|
|
|
147e83 |
|
|
|
147e83 |
Replace with IS_IN (libdl). No changes to generated code on x86_64.
|
|
|
147e83 |
|
|
|
147e83 |
* dlfcn/dladdr.c: Use IS_IN.
|
|
|
147e83 |
* dlfcn/dladdr1.c: Likewise.
|
|
|
147e83 |
* dlfcn/dlclose.c: Likewise.
|
|
|
147e83 |
* dlfcn/dlerror.c: Likewise.
|
|
|
147e83 |
* dlfcn/dlinfo.c: Likewise.
|
|
|
147e83 |
* dlfcn/dlmopen.c: Likewise.
|
|
|
147e83 |
* dlfcn/dlopen.c: Likewise.
|
|
|
147e83 |
* dlfcn/dlsym.c: Likewise.
|
|
|
147e83 |
* dlfcn/dlvsym.c: Likewise.
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dladdr.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dladdr.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dladdr.c
|
|
|
147e83 |
@@ -19,7 +19,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#include <dlfcn.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
int
|
|
|
147e83 |
dladdr (const void *address, Dl_info *info)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dladdr1.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dladdr1.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dladdr1.c
|
|
|
147e83 |
@@ -18,7 +18,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#include <dlfcn.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
int
|
|
|
147e83 |
dladdr1 (const void *address, Dl_info *info, void **extra, int flags)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dlclose.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dlclose.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dlclose.c
|
|
|
147e83 |
@@ -20,7 +20,7 @@
|
|
|
147e83 |
#include <dlfcn.h>
|
|
|
147e83 |
#include <ldsodefs.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
int
|
|
|
147e83 |
dlclose (void *handle)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dlerror.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dlerror.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dlerror.c
|
|
|
147e83 |
@@ -25,7 +25,7 @@
|
|
|
147e83 |
#include <bits/libc-lock.h>
|
|
|
147e83 |
#include <ldsodefs.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
char *
|
|
|
147e83 |
dlerror (void)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dlinfo.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dlinfo.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dlinfo.c
|
|
|
147e83 |
@@ -21,7 +21,7 @@
|
|
|
147e83 |
#include <ldsodefs.h>
|
|
|
147e83 |
#include <libintl.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
int
|
|
|
147e83 |
dlinfo (void *handle, int request, void *arg)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dlmopen.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dlmopen.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dlmopen.c
|
|
|
147e83 |
@@ -23,7 +23,7 @@
|
|
|
147e83 |
#include <unistd.h>
|
|
|
147e83 |
#include <ldsodefs.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
void *
|
|
|
147e83 |
dlmopen (Lmid_t nsid, const char *file, int mode)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dlopen.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dlopen.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dlopen.c
|
|
|
147e83 |
@@ -22,7 +22,7 @@
|
|
|
147e83 |
#include <unistd.h>
|
|
|
147e83 |
#include <ldsodefs.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
void *
|
|
|
147e83 |
dlopen (const char *file, int mode)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dlsym.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dlsym.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dlsym.c
|
|
|
147e83 |
@@ -21,7 +21,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#include <ldsodefs.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
void *
|
|
|
147e83 |
dlsym (void *handle, const char *name)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/dlfcn/dlvsym.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/dlfcn/dlvsym.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/dlfcn/dlvsym.c
|
|
|
147e83 |
@@ -21,7 +21,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#include <ldsodefs.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined SHARED && defined IS_IN_libdl
|
|
|
147e83 |
+#if !defined SHARED && IS_IN (libdl)
|
|
|
147e83 |
|
|
|
147e83 |
void *
|
|
|
147e83 |
weak_function
|