PR binutils/13409

	* winduni.c (codepages[]): Use UTF-16LE.
	(wind_MultiByteToWideChar): Likewise.
	(wind_WideCharToMultiByte): Likewise.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e8c2eaec53c3440c9134ef9d4ffdfdfd164e5d08..8ae4ebcb577afb0eaf6f64dc34399e30842c67f7 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-27  Phil Krylov <phil.krylov@gmail.com>
+
+       PR binutils/13409
+       * winduni.c (codepages[]): Use UTF-16LE.
+       (wind_MultiByteToWideChar): Likewise.
+       (wind_WideCharToMultiByte): Likewise.
+
 2013-03-27  Alan Modra  <amodra@gmail.com>
 
        PR binutils/15206

diff --git a/binutils/winduni.c b/binutils/winduni.c
index 76404cace9f9826576b08620f91c16c5def4848d..8a96ac0edfaf9f606be9f8f4f2d6233598902d55 100644 (file)
--- a/binutils/winduni.c
+++ b/binutils/winduni.c
@@ -1,6 +1,5 @@
 /* winduni.c -- unicode support for the windres program.
-   Copyright 1997, 1998, 2000, 2001, 2003, 2005, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright 1997-2013 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Rewritten by Kai Tietz, Onevision.
 
@@ -85,7 +84,7 @@ static local_iconv_map codepages[] =
   { 1258, "WINDOWS-1258" },
   { CP_UTF7, "UTF-7" },
   { CP_UTF8, "UTF-8" },
-  { CP_UTF16, "UTF-16" },
+  { CP_UTF16, "UTF-16LE" },
   { (rc_uint_type) -1, NULL }
 };
 
@@ -770,7 +769,7 @@ wind_MultiByteToWideChar (rc_uint_type cp, const char *mb,
 
   if (!mb || !iconv_name)
     return 0;
-  iconv_t cd = iconv_open ("UTF-16", iconv_name);
+  iconv_t cd = iconv_open ("UTF-16LE", iconv_name);
 
   while (1)
     {
@@ -843,7 +842,7 @@ wind_WideCharToMultiByte (rc_uint_type cp, const unichar *u, char *mb, rc_uint_t
 
   if (!u || !iconv_name)
     return 0;
-  iconv_t cd = iconv_open (iconv_name, "UTF-16");
+  iconv_t cd = iconv_open (iconv_name, "UTF-16LE");
 
   while (1)
     {