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.

diff --git a/ChangeLog b/ChangeLog
index 5df19cbb94e6ad33d3cd5d034a13758090c347e4..8f06d54b280a34eacb33af39b6cdbdf8cedc2be8 100644 (file)
--- 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 e5598335a1eaff4cafee28bf48f3d37309895dc2..3629135221df947d9f89d82c3bbb04ffbbccae22 100644 (file)
--- 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 6662a94d09303b1f2d4a63b2d3eccca57e7139b4..8ac351ec97e5d6fec0e6d4c62c088f12b79ea677 100644 (file)
--- 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 31455204c34870ce252b2e5eeb606df57e7a5543..7829e1cd671862f4f380e3e096147d12fa567de8 100644 (file)
--- 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>