From 323ee3f41cb9db7160cbe159000ebce076efb48e Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Mon, 4 Aug 2008 06:55:33 +0000
Subject: Set LC_ALL=C rather than unsetting LC_COLLATE for sort.

---
 gas/ChangeLog      |  6 ++++++
 gas/Makefile.am    |  2 +-
 gas/Makefile.in    |  2 +-
 gas/po/POTFILES.in | 12 ++++++------
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'gas')

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c2bb544..2e91817 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (POTFILES.in): Set LC_ALL=C.
+	* Makefile.in: Regenerate.
+	* po/POTFILES.in: Regenerate.
+
 2008-08-01  Peter Bergner  <bergner@vnet.ibm.com>
 
 	* config/tc-ppc.c (parse_cpu): Rename altivec_or_spe to retain_flags.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index c4589b8..a8b61cf 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -472,7 +472,7 @@ POTFILES = $(MULTI_CFILES) $(CONFIG_ATOF_CFILES) $(TARG_ENV_HFILES) $(OBJ_FORMAT
 	$(OBJ_FORMAT_CFILES) $(TARGET_CPU_HFILES) $(TARGET_CPU_CFILES) \
 	$(HFILES) $(CFILES)
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 # Note: GASP is now deprecated and has been removed.  It is still
diff --git a/gas/Makefile.in b/gas/Makefile.in
index cc90b3c..d827a57 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -2530,7 +2530,7 @@ uninstall-info: uninstall-info-recursive
 	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 diststuff: $(EXTRA_DIST) info
diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index cedb562..42a543e 100644
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -117,10 +117,10 @@ config/tc-s390.c
 config/tc-s390.h
 config/tc-score.c
 config/tc-score.h
-config/tc-sh64.c
-config/tc-sh64.h
 config/tc-sh.c
 config/tc-sh.h
+config/tc-sh64.c
+config/tc-sh64.h
 config/tc-sparc.c
 config/tc-sparc.h
 config/tc-spu.c
@@ -155,8 +155,8 @@ config/te-freebsd.h
 config/te-generic.h
 config/te-gnu.h
 config/te-go32.h
-config/te-hppa64.h
 config/te-hppa.h
+config/te-hppa64.h
 config/te-hppalinux64.h
 config/te-i386aix.h
 config/te-ia64aix.h
@@ -165,8 +165,8 @@ config/te-lnews.h
 config/te-lynx.h
 config/te-mach.h
 config/te-macos.h
-config/te-nbsd532.h
 config/te-nbsd.h
+config/te-nbsd532.h
 config/te-netware.h
 config/te-pc532mach.h
 config/te-pe.h
@@ -189,14 +189,14 @@ dwarf2dbg.h
 ecoff.c
 ecoff.h
 ehopt.c
-emul.h
 emul-target.h
+emul.h
 expr.c
 expr.h
 flonum-copy.c
-flonum.h
 flonum-konst.c
 flonum-mult.c
+flonum.h
 frags.c
 frags.h
 hash.c
-- 
cgit v1.1