From 27abf7a3239c71af0151d33b3b85141305c370bf Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Wed, 28 Aug 2002 11:08:46 +0000
Subject: [PATCH] * 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.
---
 ChangeLog              |  5 +++++
 Makeconfig             | 10 +++++++---
 linuxthreads/ChangeLog |  2 +-
 locale/setlocale.c     |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0cfa53..0c18dd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/Makeconfig b/Makeconfig
index 2d2f895..b8fa624 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -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
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 1114321..0d3f95c 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -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.
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 296903f..1944336 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -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
-- 
2.7.4