diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-20 12:33:44 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-24 11:41:43 +0530 |
| commit | fb6784e3068a747ead34e6dee6a9a1978668a955 (patch) | |
| tree | b086bcf40ac2582d20a20e5be02e3bdf996af1ec | |
| parent | 2886d2d14dd7de6339b04505c5d2f9fc5c844751 (diff) | |
| download | glibc-fb6784e3068a747ead34e6dee6a9a1978668a955.tar.gz glibc-fb6784e3068a747ead34e6dee6a9a1978668a955.tar.xz glibc-fb6784e3068a747ead34e6dee6a9a1978668a955.zip | |
Remove IS_IN_ldconfig
Replace with IS_IN (ldconfig). No change in generated code. * elf/Makefile (CFLAGS-ldconfig.c): Remove definition of IS_IN_ldconfig. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Use IS_IN. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: Likewise.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 5df19cbb94..8f06d54b28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com> + * elf/Makefile (CFLAGS-ldconfig.c): Remove definition of + IS_IN_ldconfig. + * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Use IS_IN. + * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: Likewise. + * include/shlib-compat.h [!NOT_IN_libc]: Remove. * nss/nss_files/files-parse.c (IS_IN_libc): Replace with IS_IN (libc). diff --git a/elf/Makefile b/elf/Makefile index e5598335a1..3629135221 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -437,7 +437,7 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 -DNOT_IN_libc=1 + -D'SLIBDIR="$(slibdir)"' -DNOT_IN_libc libof-ldconfig = ldconfig CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c index 6662a94d09..8ac351ec97 100644 --- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c @@ -1,4 +1,4 @@ -#ifdef IS_IN_ldconfig +#if IS_IN (ldconfig) # include <sysdeps/i386/dl-procinfo.c> #else # include <sysdeps/generic/dl-procinfo.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h index 31455204c3..7829e1cd67 100644 --- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h @@ -1,4 +1,4 @@ -#ifdef IS_IN_ldconfig +#if IS_IN (ldconfig) # include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> #else # include <sysdeps/generic/dl-procinfo.h> |