aboutsummaryrefslogtreecommitdiff
path: root/extra-lib.mk
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 /extra-lib.mk
parent279bc5b3c384c09746fbadb2b68c6db9e833c064 (diff)
downloadglibc-a10178bda190a62e7e3f56773f55f23cf06848a7.zip
glibc-a10178bda190a62e7e3f56773f55f23cf06848a7.tar.gz
glibc-a10178bda190a62e7e3f56773f55f23cf06848a7.tar.bz2
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 'extra-lib.mk')
-rw-r--r--extra-lib.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra-lib.mk b/extra-lib.mk
index fd8812c..c719bd9 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -106,4 +106,4 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib)
+CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1