summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-08 18:50:41 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-08 18:50:41 +0000
commit403e0597cd0cd4ba489614bf2bea72465ce899b9 (patch)
tree4bba91733fc5e21a76657795f10fc43080ac8bdf /elf
parent4c93a54ca8c197ab73425db52351f110af795957 (diff)
downloadglibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.tar.gz
glibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.tar.xz
glibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.zip
Update.
2002-04-08  Ulrich Drepper  <drepper@redhat.com>

	* cppflags-iterator.mk (cpp-srcs-left): Define NOT_IN_libc instead
	of NOT_IN_LIBC.
	* include/libintl.h: Test for NOT_IN_libc not NOT_IN_LIBC.
	* include/stdlib.h: Likewise.

2002-04-08  Jakub Jelinek  <jakub@redhat.com>

	* elf/Makefile (CFLAGS-.os): Define NOT_IN_libc and IS_IN_rtld
	instead of _RTLD_LOCAL.
	* elf/dl-dst.h: Use IS_IN_rtld instead of _RTLD_LOCAL.
	* include/unistd.h: Likewise.
	* sysdeps/generic/ldsodefs.h: Likewise.

	* stdio-common/_itoa.h (_itoa_word): Only use internal digit arrays
	if in libc or ld.so.

	* include/stdlib.h: For libc itself replace MB_CUR_MAX definition
	with one accessing the locale data structures directly.
	* stdio-common/printf-prs.c: Include localeinfo.h for new
	MB_CUR_MAX definition.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile2
-rw-r--r--elf/dl-dst.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 43e622273c..8819c188c0 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -250,7 +250,7 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' -D'SLIBDIR="$(slibdi
 CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
 CFLAGS-cache.c = $(SYSCONF-FLAGS)
 
-CFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),-D_RTLD_LOCAL)
+CFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),-DNOT_IN_libc -DIS_IN_rtld)
 
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
 generated += $(addsuffix .so,$(strip $(modules-names)))
diff --git a/elf/dl-dst.h b/elf/dl-dst.h
index 05bdee5ee9..dc11e360af 100644
--- a/elf/dl-dst.h
+++ b/elf/dl-dst.h
@@ -64,7 +64,7 @@ extern size_t _dl_dst_count_internal (const char *name, int is_path);
 extern const char *_dl_get_origin (void);
 extern const char *_dl_get_origin_internal (void);
 
-#ifdef _RTLD_LOCAL
+#ifdef IS_IN_rtld
 # define _dl_get_origin INTUSE(_dl_get_origin)
 #endif