(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

1 files changed, 9 insertions, 44 deletions

diff --git a/intl/Makefile b/intl/Makefile
index 9da445a..32212c0 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -25,22 +25,11 @@ routines = bindtextdom dcgettext dgettext gettext	\
 	   finddomain loadmsgcat localealias textdomain
 aux =	   l10nflist explodename plural plural-exp hash-string
 distribute = gmo.h gettextP.h hash-string.h loadinfo.h locale.alias \
-	     plural.y plural-exp.h plural-eval.c po2test.sed \
-	     tst-gettext.sh \
-	     tst-translit.sh translit.po \
-	     tst-gettext2.sh tstlang1.po tstlang2.po \
-	     tst-codeset.sh tstcodeset.po \
-	     tst-gettext3.sh \
-	     tst-gettext4.sh tst-gettext4-de.po tst-gettext4-fr.po \
-	     tst-gettext5.sh
+	     plural.y plural-exp.h po2test.sed tst-gettext.sh tst-translit.sh \
+	     translit.po tst-gettext2.sh tstlang1.po tstlang2.po tstcodeset.po\
+	     tst-codeset.sh plural-eval.c
 
-include ../Makeconfig
-
-multithread-test-srcs := tst-gettext4 tst-gettext5
-test-srcs := tst-gettext tst-translit tst-gettext2 tst-codeset tst-gettext3
-ifeq ($(have-thread-library),yes)
-test-srcs += $(multithread-test-srcs)
-endif
+test-srcs := tst-gettext tst-translit tst-gettext2 tst-codeset
 tests = tst-ngettext
 
 before-compile = $(objpfx)msgs.h
@@ -50,6 +39,8 @@ install-others = $(inst_msgcatdir)/locale.alias
 generated = msgs.h mtrace-tst-gettext tst-gettext.mtrace
 generated-dirs := domaindir localedir
 
+include ../Makeconfig
+
 ifneq (no,$(BISON))
 plural.c: plural.y
 	$(BISON) $(BISONFLAGS) $@ $^
@@ -65,10 +56,7 @@ ifeq (no,$(cross-compiling))
 ifeq (yes,$(build-shared))
 ifneq ($(strip $(MSGFMT)),:)
 tests: $(objpfx)tst-translit.out $(objpfx)tst-gettext2.out \
-       $(objpfx)tst-codeset.out $(objpfx)tst-gettext3.out
-ifeq ($(have-thread-library),yes)
-tests: $(objpfx)tst-gettext4.out $(objpfx)tst-gettext5.out
-endif
+       $(objpfx)tst-codeset.out
 ifneq (no,$(PERL))
 tests: $(objpfx)mtrace-tst-gettext
 endif
@@ -84,12 +72,6 @@ $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
 	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
 $(objpfx)tst-codeset.out: tst-codeset.sh $(objpfx)tst-codeset
 	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
-$(objpfx)tst-gettext3.out: tst-gettext3.sh $(objpfx)tst-gettext3
-	$(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
-$(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
-$(objpfx)tst-gettext5.out: tst-gettext5.sh $(objpfx)tst-gettext5
-	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
 endif
 endif
 
@@ -98,30 +80,13 @@ $(objpfx)msgs.h: po2test.sed ../po/de.po
 	LC_ALL=C sed -f $^ > $@
 
 CFLAGS-tst-gettext.c = -DTESTSTRS_H=\"$(objpfx)msgs.h\"
-CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\"
 CFLAGS-tst-gettext2.c = -DOBJPFX=\"$(objpfx)\"
+CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\"
 CFLAGS-tst-codeset.c = -DOBJPFX=\"$(objpfx)\"
-CFLAGS-tst-gettext3.c = -DOBJPFX=\"$(objpfx)\"
-CFLAGS-tst-gettext4.c = -DOBJPFX=\"$(objpfx)\"
-CFLAGS-tst-gettext5.c = -DOBJPFX=\"$(objpfx)\"
-
-ifeq ($(have-thread-library),yes)
-ifeq (yes,$(build-shared))
-$(addprefix $(objpfx),$(multithread-test-srcs)): $(shared-thread-library)
-else
-$(addprefix $(objpfx),$(multithread-test-srcs)): $(static-thread-library)
-endif
-ifeq (yes,$(build-bounded))
-$(multithread-test-srcs:%=$(objpfx)%-bp): $(bounded-thread-library)
-endif
-endif
 
 $(objpfx)tst-translit.out: $(objpfx)tst-gettext.out
 $(objpfx)tst-gettext2.out: $(objpfx)tst-gettext.out
 $(objpfx)tst-codeset.out: $(objpfx)tst-gettext.out
-$(objpfx)tst-gettext3.out: $(objpfx)tst-gettext.out
-$(objpfx)tst-gettext4.out: $(objpfx)tst-gettext.out
-$(objpfx)tst-gettext5.out: $(objpfx)tst-gettext.out
 
 CPPFLAGS += -D'LOCALEDIR="$(msgcatdir)"' \
 	    -D'LOCALE_ALIAS_PATH="$(msgcatdir)"'