* Makeconfig (run-program-prefix): Fix bogus use of $(findstring ...)

to use $(filter ...) instead.  Same bug fixed in aix conditionals.

	* locale/setlocale.c: Declare postload functions weak.
This commit is contained in:
Roland McGrath 2002-08-28 11:08:46 +00:00
parent 6c0b461a58
commit 27abf7a323
4 changed files with 14 additions and 5 deletions

View file

@ -1,5 +1,10 @@
2002-08-28 Roland McGrath <roland@redhat.com>
* Makeconfig (run-program-prefix): Fix bogus use of $(findstring ...)
to use $(filter ...) instead. Same bug fixed in aix conditionals.
* locale/setlocale.c: Declare postload functions weak.
* elf/tst-tls1-static.c: New file.
* elf/tst-tls2-static.c: New file.
* elf/Makefile ($(tests-static):%=$(objfpx)%.o): Remove rule.

View file

@ -346,6 +346,9 @@ ifeq ($(release),stable)
default_cflags := -g -O2
else
default_cflags := -g -O
ifneq ($(CC),/usr/bin/gcc)
default_cflags := -g -O3 -finline-limit=2000 -march=pentium4
endif
endif
endif
@ -437,7 +440,7 @@ link-libc = -Wl,-rpath-link=$(rpath-link) \
# This is how to find at build-time things that will be installed there.
rpath-dirs = math elf dlfcn nss nis rt resolv crypt
else
ifneq (,$(findstring aix,$(config-os)))
ifneq (,$(filter aix aix%,$(config-os)))
link-libc = $(common-objpfx)libc.a \
$(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
rpath-dirs = math dlfcn nss nis rt resolv crypt
@ -460,7 +463,7 @@ LDFLAGS-soname-fname = -Wl,-soname,$(@F)
LDFLAGS-rdynamic = -rdynamic
LDFLAGS-Bsymbolic = -Bsymbolic
else
ifneq (,$(findstring aix,$(config-os)))
ifneq (,$(filter aix aix%,$(config-os)))
LDFLAGS-rpath-ORIGIN =
LDFLAGS-soname-fname =
LDFLAGS-rdynamic = -Wl,-bdynamic
@ -526,7 +529,8 @@ sysdep-library-path = \
$(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\
$(filter -Wl$(comma)-rpath-link=%,\
$(sysdep-LDFLAGS)))))
run-program-prefix = $(if $(findstring $(notdir $(built-program-file)), $(tests-static)),, \
run-program-prefix = $(if $(filter $(notdir $(built-program-file)),\
$(tests-static)),, \
$(elf-objpfx)$(rtld-installed-name) \
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)))
else

View file

@ -8,7 +8,7 @@
__pthread_handles[0] and __pthread_handles[1].
* Makefile (libpthread-routines): Add pthandles (must be last).
2002-08-26 Brian Youmans <3diff@gnu.org>
2002-08-26 Brian Youmans <3diff@gnu.org>
* Examples/ex10.c: Corrected version number in Lesser GPL copying
permission notice from 2 to 2.1.

View file

@ -90,7 +90,7 @@ const size_t _nl_category_name_sizes[] =
#undef NO_POSTLOAD
#define NO_POSTLOAD _nl_postload_ctype /* Harmless thing known to exist. */
#define DEFINE_CATEGORY(category, category_name, items, postload) \
extern void postload (void);
extern void postload (void); weak_extern (postload)
#include "categories.def"
#undef DEFINE_CATEGORY
#undef NO_POSTLOAD