aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty Plummer <ntzrmtthihu777@gmail.com>2017-07-31 10:31:18 +0100
committerNick Clifton <nickc@redhat.com>2017-07-31 10:31:18 +0100
commit54387c7fe27848e41a51c1eccc6a24b3d6d3441f (patch)
tree13c2f4e4e65ce5e5c5319ac7e8e8aadc765f31be
parent791fb3d7a58b86e5f30229625dfd33659f33fd6e (diff)
Fix compiling zlib using x86_64-musl.
PR 21861 * winduni.c (codepages): Use cp1252 for codepage 0.
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/winduni.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index f450a33acd..c4510a30e1 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-31 Marty Plummer <ntzrmtthihu777@gmail.com>
+
+ PR 21861
+ * winduni.c (codepages): Use cp1252 for codepage 0.
+
2017-07-25 Nick Clifton <nickc@redhat.com>
PR 21820
diff --git a/binutils/winduni.c b/binutils/winduni.c
index 9868d4bc11..ec4f71c5ba 100644
--- a/binutils/winduni.c
+++ b/binutils/winduni.c
@@ -57,7 +57,7 @@ static int unichar_isascii (const unichar *, rc_uint_type);
/* Codepages mapped. */
static local_iconv_map codepages[] =
{
- { 0, "MS-ANSI" },
+ { 0, "cp1252" },
{ 1, "WINDOWS-1252" },
{ 437, "MS-ANSI" },
{ 737, "MS-GREEK" },