Set LC_ALL=C rather than unsetting LC_COLLATE for sort.

26 files changed, 132 insertions, 80 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fe5a8b9..a08f5d8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (SRC-POTFILES.in, BLD-POTFILES.in): Set LC_ALL=C.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
 2008-08-02  Alan Modra  <amodra@bigpond.net.au>
 
 	* elf32-spu.c (mark_overlay_section): Move code calculating
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 0fd2fe9..befb9f1 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -698,12 +698,12 @@ BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES)
 
 po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES)
 	for file in $(SRC_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.src \
+	  | LC_ALL=C sort > tmp.src \
 	  && mv tmp.src $(srcdir)/po/SRC-POTFILES.in
 
 po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
 	for file in $(BLD_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.bld \
+	  | LC_ALL=C sort > tmp.bld \
 	  && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in
 
 all diststuff: info
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 6c0a9cd..8509f1e 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -994,15 +994,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+	      cd $(srcdir) && $(AUTOMAKE) --cygnus  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	  $(AUTOMAKE) --cygnus  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -1321,12 +1321,12 @@ uninstall-info: uninstall-info-recursive
 
 po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES)
 	for file in $(SRC_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.src \
+	  | LC_ALL=C sort > tmp.src \
 	  && mv tmp.src $(srcdir)/po/SRC-POTFILES.in
 
 po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
 	for file in $(BLD_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.bld \
+	  | LC_ALL=C sort > tmp.bld \
 	  && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in
 
 all diststuff: info
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index afe567a..af13921 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -1,19 +1,19 @@
 aix386-core.c
 aix5ppc-core.c
-aout0.c
-aout32.c
-aout64.c
 aout-adobe.c
 aout-arm.c
 aout-cris.c
-aoutf1.h
 aout-ns32k.c
 aout-sparcle.c
 aout-target.h
 aout-tic30.c
+aout0.c
+aout32.c
+aout64.c
+aoutf1.h
 aoutx.h
-archive64.c
 archive.c
+archive64.c
 archures.c
 armnetbsd.c
 bfd.c
@@ -25,20 +25,16 @@ cache.c
 cf-i386lynx.c
 cf-sparclynx.c
 cisco-core.c
-coff64-rs6000.c
 coff-alpha.c
 coff-apollo.c
 coff-arm.c
 coff-aux.c
-coffcode.h
-coffgen.c
 coff-go32.c
 coff-h8300.c
 coff-h8500.c
 coff-i386.c
 coff-i860.c
 coff-i960.c
-cofflink.c
 coff-m68k.c
 coff-m88k.c
 coff-maxq.c
@@ -49,7 +45,6 @@ coff-sh.c
 coff-sparc.c
 coff-stgo32.c
 coff-svm68k.c
-coffswap.h
 coff-tic30.c
 coff-tic4x.c
 coff-tic54x.c
@@ -60,6 +55,12 @@ coff-we32k.c
 coff-x86_64.c
 coff-z80.c
 coff-z8k.c
+coff64-rs6000.c
+coffcode.h
+coffgen.c
+cofflink.c
+coffswap.h
+compress.c
 corefile.c
 cpu-alpha.c
 cpu-arc.c
@@ -140,12 +141,20 @@ efi-bsdrv-x86_64.c
 efi-rtdrv-ia32.c
 efi-rtdrv-ia64.c
 efi-rtdrv-x86_64.c
+elf-attrs.c
+elf-bfd.h
+elf-eh-frame.c
+elf-hppa.h
+elf-m10200.c
+elf-m10300.c
+elf-strtab.c
+elf-vxworks.c
+elf.c
 elf32-am33lin.c
 elf32-arc.c
 elf32-arm.c
 elf32-avr.c
 elf32-bfin.c
-elf32.c
 elf32-cr16.c
 elf32-cr16c.c
 elf32-cris.c
@@ -183,10 +192,10 @@ elf32-pj.c
 elf32-ppc.c
 elf32-s390.c
 elf32-score.c
-elf32-sh64.c
-elf32-sh64-com.c
-elf32-sh.c
 elf32-sh-symbian.c
+elf32-sh.c
+elf32-sh64-com.c
+elf32-sh64.c
 elf32-sparc.c
 elf32-spu.c
 elf32-v850.c
@@ -194,8 +203,8 @@ elf32-vax.c
 elf32-xc16x.c
 elf32-xstormy16.c
 elf32-xtensa.c
+elf32.c
 elf64-alpha.c
-elf64.c
 elf64-gen.c
 elf64-hppa.c
 elf64-hppa.h
@@ -206,19 +215,11 @@ elf64-s390.c
 elf64-sh64.c
 elf64-sparc.c
 elf64-x86-64.c
-elf-attrs.c
-elf-bfd.h
-elf.c
+elf64.c
 elfcode.h
 elfcore.h
-elf-eh-frame.c
-elf-hppa.h
 elflink.c
-elf-m10200.c
-elf-m10300.c
 elfn32-mips.c
-elf-strtab.c
-elf-vxworks.c
 elfxx-mips.c
 elfxx-sparc.c
 epoc-pe-arm.c
@@ -270,16 +271,16 @@ mipsbsd.c
 mmo.c
 netbsd.h
 newsos3.c
+nlm-target.h
+nlm.c
 nlm32-alpha.c
-nlm32.c
 nlm32-i386.c
 nlm32-ppc.c
 nlm32-sparc.c
+nlm32.c
 nlm64.c
-nlm.c
 nlmcode.h
 nlmswap.h
-nlm-target.h
 ns32k.h
 ns32knetbsd.c
 oasys.c
@@ -287,29 +288,29 @@ opncls.c
 osf-core.c
 pc532-mach.c
 pdp11.c
-pe-arm.c
 pe-arm-wince.c
+pe-arm.c
+pe-i386.c
+pe-mcore.c
+pe-mips.c
+pe-ppc.c
+pe-sh.c
+pe-x86_64.c
+pef-traceback.h
 pef.c
 pef.h
-pef-traceback.h
-pe-i386.c
-pei-arm.c
 pei-arm-wince.c
-peicode.h
+pei-arm.c
 pei-i386.c
 pei-mcore.c
 pei-mips.c
 pei-ppc.c
 pei-sh.c
 pei-x86_64.c
-pe-mcore.c
-pe-mips.c
-pe-ppc.c
-pe-sh.c
-pe-x86_64.c
+peicode.h
 ppcboot.c
-reloc16.c
 reloc.c
+reloc16.c
 riscix.c
 sco5-core.c
 section.c
@@ -320,8 +321,8 @@ sparclinux.c
 sparclynx.c
 sparcnetbsd.c
 srec.c
-stabs.c
 stab-syms.c
+stabs.c
 sunos.c
 syms.c
 targets.c
@@ -332,14 +333,14 @@ vaxbsd.c
 vaxnetbsd.c
 versados.c
 version.h
-vms.c
 vms-gsd.c
-vms.h
 vms-hdr.c
 vms-misc.c
 vms-tir.c
-xcofflink.c
+vms.c
+vms.h
 xcoff-target.h
+xcofflink.c
 xsym.c
 xsym.h
 xtensa-isa.c
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b7db161..1023e26 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (POTFILES.in): Set LC_ALL=C.
+	* Makefile.in: Regenerate.
+
 2008-08-04  Markus Weiss  <weissms@aros.org>
 
 	* readelf.c (get_osabi_name <ELFOSABI_AROS>): Change name.
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 4ed37d8..3a1d19a 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -147,7 +147,7 @@ install-html-recursive:
 
 POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
 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
 
 EXPECT = expect
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 6eeab88..14b9732 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -534,15 +534,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+	      cd $(srcdir) && $(AUTOMAKE) --cygnus  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	  $(AUTOMAKE) --cygnus  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -1007,7 +1007,7 @@ install-html-recursive:
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 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
 
 check-DEJAGNU: site.exp
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
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 48508a9..858845d 100644
--- a/gold/ChangeLog
+++ b/gold/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-07-29  Ian Lance Taylor  <iant@google.com>
 
 	* script.cc (Script_options::finalize_symbols): Finalize SECTIONS
diff --git a/gold/Makefile.am b/gold/Makefile.am
index b5a5e54..e706703 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -157,7 +157,7 @@ install-data-local: install-info
 POTFILES= $(CCFILES) $(HFILES) $(TARGETSOURCES)
 
 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
 
 # Bootstrap test support.  We use ld-new to build ld1, then use ld1 to
diff --git a/gold/Makefile.in b/gold/Makefile.in
index 0077308..bbc5417 100644
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -1095,7 +1095,7 @@ install-exec-local: ld-new$(EXEEXT)
 install-data-local: install-info
 
 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
 
 # Bootstrap test support.  We use ld-new to build ld1, then use ld1 to
diff --git a/gold/po/POTFILES.in b/gold/po/POTFILES.in
index 3776c86..4d6122c 100644
--- a/gold/po/POTFILES.in
+++ b/gold/po/POTFILES.in
@@ -6,8 +6,14 @@ common.cc
 common.h
 compressed_output.cc
 compressed_output.h
+copy-relocs.cc
+copy-relocs.h
+cref.cc
+cref.h
 defstd.cc
 defstd.h
+descriptors.cc
+descriptors.h
 dirsearch.cc
 dirsearch.h
 dwarf_reader.cc
@@ -28,6 +34,8 @@ gold.h
 i386.cc
 layout.cc
 layout.h
+mapfile.cc
+mapfile.h
 merge.cc
 merge.h
 object.cc
@@ -38,8 +46,11 @@ output.cc
 output.h
 parameters.cc
 parameters.h
+powerpc.cc
 readsyms.cc
 readsyms.h
+reduced_debug_output.cc
+reduced_debug_output.h
 reloc-types.h
 reloc.cc
 reloc.h
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index c798958..9faca5a 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (POTFILES.in): Set LC_ALL=C.
+	* Makefile.in: Regenerate.
+
 2008-07-30  Alan Modra  <amodra@bigpond.net.au>
 
 	* corefile.c, symtab.c: Silence gcc warnings.
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index e9ed845..0b9bc27 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -52,7 +52,7 @@ diststuff: $(BUILT_SOURCES) info $(man_MANS)
 
 POTFILES = $(sources) $(noinst_HEADERS)
 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
 
 MANCONF  = -Dman
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index efa9181..ad4af39 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -826,7 +826,7 @@ diststuff: $(BUILT_SOURCES) info $(man_MANS)
 	    FUNCTION=`(echo $*|sed -e 's,.*/,,g' -e 's/_bl//')`_blurb \
 	    FILE=$*.m $(srcdir)/$*.m
 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
 
 config.texi:
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7ed7e09..534a270 100644
--- a/ld/ChangeLog
+++ b/ld/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-03  Alan Modra  <amodra@bigpond.net.au>
 
 	* Makefile.am (spu_ovl.o): Merge rule into..
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 5c212d7..2e40b6f 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -459,7 +459,7 @@ EMULATION_FILES = emultempl/pe.em emultempl/armcoff.em
 POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES)
 
 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
 
 ldmain.o: ldmain.c config.status
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 185d440..2dc1fa2 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1295,7 +1295,7 @@ deffilep.o:
 	$(COMPILE) -c $< $(NO_WERROR)
 
 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
 
 ldmain.o: ldmain.c config.status
diff --git a/ld/po/POTFILES.in b/ld/po/POTFILES.in
index 3118cfa..48172c4 100644
--- a/ld/po/POTFILES.in
+++ b/ld/po/POTFILES.in
@@ -2,6 +2,7 @@ deffile.h
 elf-hints-local.h
 emultempl/armcoff.em
 emultempl/pe.em
+ld.h
 ldcref.c
 ldctor.c
 ldctor.h
@@ -11,7 +12,6 @@ ldexp.c
 ldexp.h
 ldfile.c
 ldfile.h
-ld.h
 ldlang.c
 ldlang.h
 ldlex.h
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 4f5b607..a80ef1d 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/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>
 
 	* ppc-dis.c (powerpc_init_dialect): Handle power7 and vsx options.
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 3500f19..4e54000 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -393,7 +393,7 @@ libopcodes.a: stamp-lib ; @true
 
 POTFILES = $(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
 
 install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libopcodes
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 9885783..ec9ae40 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -991,7 +991,7 @@ stamp-lib: libopcodes.la
 
 libopcodes.a: stamp-lib ; @true
 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
 
 install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libopcodes
diff --git a/opcodes/po/POTFILES.in b/opcodes/po/POTFILES.in
index 250ad36..e64b68a 100644
--- a/opcodes/po/POTFILES.in
+++ b/opcodes/po/POTFILES.in
@@ -22,9 +22,9 @@ d10v-dis.c
 d10v-opc.c
 d30v-dis.c
 d30v-opc.c
-disassemble.c
 dis-buf.c
 dis-init.c
+disassemble.c
 dlx-dis.c
 fr30-asm.c
 fr30-desc.c
@@ -60,12 +60,12 @@ ia64-dis.c
 ia64-gen.c
 ia64-opc-a.c
 ia64-opc-b.c
-ia64-opc.c
 ia64-opc-d.c
 ia64-opc-f.c
-ia64-opc.h
 ia64-opc-i.c
 ia64-opc-m.c
+ia64-opc.c
+ia64-opc.h
 ip2k-asm.c
 ip2k-desc.c
 ip2k-desc.h
@@ -114,9 +114,9 @@ mep-dis.c
 mep-ibld.c
 mep-opc.c
 mep-opc.h
-mips16-opc.c
 mips-dis.c
 mips-opc.c
+mips16-opc.c
 mmix-dis.c
 mmix-opc.c
 mt-asm.c
@@ -147,11 +147,11 @@ s390-mkopc.c
 s390-opc.c
 score-dis.c
 score-opc.h
+sh-dis.c
+sh-opc.h
 sh64-dis.c
 sh64-opc.c
 sh64-opc.h
-sh-dis.c
-sh-opc.h
 sparc-dis.c
 sparc-opc.c
 spu-dis.c
@@ -185,5 +185,5 @@ xstormy16-opc.h
 xtensa-dis.c
 z80-dis.c
 z8k-dis.c
-z8kgen.c
 z8k-opc.h
+z8kgen.c