summary refs log tree commit diff
path: root/elf/rtld-Rules
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-20 12:03:11 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-24 11:41:42 +0530
commita10178bda190a62e7e3f56773f55f23cf06848a7 (patch)
treeaec76d63ed6098f2ec59bd6a057a537ec8cd38e8 /elf/rtld-Rules
parent279bc5b3c384c09746fbadb2b68c6db9e833c064 (diff)
downloadglibc-a10178bda190a62e7e3f56773f55f23cf06848a7.tar.gz
glibc-a10178bda190a62e7e3f56773f55f23cf06848a7.tar.xz
glibc-a10178bda190a62e7e3f56773f55f23cf06848a7.zip
Remove IN_LIB
Replace with IS_IN and IS_IN_LIB macros instead.  This change results
in a change in generated code, because it fixes a subtle bug.  The bug
was introduced when systemtap probes were added to lowlevellock.h,
which resulted in stap-probe.h being included in a number of places.
stap-probe.h always defines IN_LIB, which breaks a check in errno.h
and netdb.h since they rely on that macro to decide whether to
implement an internal version of a declaration or an external one.

The components that see a code change due to this are:

iconv_prog
libmemusage.so
libpcprofile.so
libSegFault.so
libutil.so.1
locale
localedef
nscd

All other built components (i.e. libc, libpthread, etc.) remain
unchanged by this on x86_64.

	* elf/Makefile (CPPFLAGS-.os): Remove IN_LIB.
	* elf/rtld-Rules (rtld-CPPFLAGS): Likewise.
	* extra-lib.mk (CPPFLAGS-$(lib)): Likewise.
	* include/libc-symbols.h (IS_IN_LIB): New macro.
	* include/errno.h: Use IS_IN_LIB instead of IN_LIB.
	* include/netdb.h: Likewise.
	* include/stap-probe.h: Remove all uses of IN_LIB.
Diffstat (limited to 'elf/rtld-Rules')
-rw-r--r--elf/rtld-Rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index f2cc4a1b8d..4d22436da2 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -144,6 +144,6 @@ lib := rtld
 include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
 
 # This here is the whole point of all the shenanigans.
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1
 
 endif