From 403e0597cd0cd4ba489614bf2bea72465ce899b9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 8 Apr 2002 18:50:41 +0000 Subject: Update. 2002-04-08 Ulrich Drepper * 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 * 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. --- elf/Makefile | 2 +- elf/dl-dst.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index 43e6222..8819c18 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 05bdee5..dc11e36 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 -- cgit v1.1