From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 20 May 2002 20:11:09 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~21729
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c393b689f8a9c5e64048b4a4295abedcff6ef8c;p=external%2Fglibc.git

Update.

2002-05-16  Bruno Haible  <bruno@clisp.org>

	* MakeTAGS (libc.pot): Don't sort the output.
	* po/header.pot: Update to match xgettext 0.11 output.

2002-05-16  Bruno Haible  <bruno@clisp.org>

	* MakeTAGS (subdirs): Remove duplicates.
---

diff --git a/ChangeLog b/ChangeLog
index e917180..e8e28df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-16  Bruno Haible  <bruno@clisp.org>
+
+	* MakeTAGS (libc.pot): Don't sort the output.
+	* po/header.pot: Update to match xgettext 0.11 output.
+
+2002-05-16  Bruno Haible  <bruno@clisp.org>
+
+	* MakeTAGS (subdirs): Remove duplicates.
+
 2002-05-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/errlist.c: Remove extra weak alias
diff --git a/MakeTAGS b/MakeTAGS
index 8e7781a..e96dda4 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -62,10 +62,11 @@ all-dirs := $(subdir-dirs) \
 ifndef subdir
 subdirs := $(subdirs) \
 	   $(filter-out $(subdirs),\
-			$(shell sed -e 's/\#.*$$//' \
-				    $(wildcard $(addsuffix /Subdirs,\
-							   $(all-dirs)))\
-				    /dev/null))
+			$(sort \
+			  $(shell sed -e 's/\#.*$$//' \
+				      $(wildcard $(addsuffix /Subdirs,\
+							     $(all-dirs)))\
+				      /dev/null)))
 all-dist = $(foreach Dist,$(wildcard $(all-dirs:%=%/Dist)),\
 		     $(addprefix $(Dist:%/Dist=%)/,\
 				 $(filter %.c %.h %.S %.s,\
@@ -172,7 +173,7 @@ $P/libc.pot: $(all-pot)
 	sed -e 's/VERSION/$(version)/' \
 	    -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
 	    po/header.pot > $@.new
-	$(XGETTEXT) -d - --omit-header -n -s $^ >> $@.new
+	$(XGETTEXT) -d - --omit-header -n $^ >> $@.new
 	mv -f $@.new $@
 ifeq ($(with-cvs),yes)
 	test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9a58488..0ab1e1c 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/alpha/pt-machine.c (THREAD_SELF): Remove clobber.
+	Patch by Glen Nakamura <gen@flex.com>.
+
 2002-05-03  Ulrich Drepper  <drepper@redhat.com>
 
 	* signals.c: Move sighandler functions to...
diff --git a/linuxthreads/sysdeps/alpha/pt-machine.h b/linuxthreads/sysdeps/alpha/pt-machine.h
index 3d5ade6..83f8e50 100644
--- a/linuxthreads/sysdeps/alpha/pt-machine.h
+++ b/linuxthreads/sysdeps/alpha/pt-machine.h
@@ -76,7 +76,7 @@ testandset (int *spinlock)
 #define THREAD_SELF \
 ({									      \
   register pthread_descr __self __asm__("$0");				      \
-  __asm__ ("call_pal %1" : "=r"(__self) : "i"(PAL_rduniq) : "$0");	      \
+  __asm__ ("call_pal %1" : "=r"(__self) : "i"(PAL_rduniq));		      \
   __self;								      \
 })
 
diff --git a/po/header.pot b/po/header.pot
index ea05c22..8789e5c 100644
--- a/po/header.pot
+++ b/po/header.pot
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libc VERSION\n"
 "POT-Creation-Date: DATE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+DIST\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"