diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-06-04 20:08:39 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-06-04 20:08:39 +0000 |
| commit | 7c4029774102f02c4f085e3a785e4db1ed23600a (patch) | |
| tree | 469187bb750e107097d388578aa2aabad30d160f /toolchain/musl/patches/900-iconv_size_hack.patch | |
| parent | 7ec4092a0cdd64d87a088011b8910084c770bde6 (diff) | |
| download | master-187ad058-7c4029774102f02c4f085e3a785e4db1ed23600a.tar.gz master-187ad058-7c4029774102f02c4f085e3a785e4db1ed23600a.tar.bz2 master-187ad058-7c4029774102f02c4f085e3a785e4db1ed23600a.zip | |
musl: update to version 1.1.9
Patch to 2015-06-04 to fix ldso related regressions on PPC and MIPS.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45886 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/musl/patches/900-iconv_size_hack.patch')
| -rw-r--r-- | toolchain/musl/patches/900-iconv_size_hack.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/musl/patches/900-iconv_size_hack.patch b/toolchain/musl/patches/900-iconv_size_hack.patch index f5418db8f3..f4e2be4d03 100644 --- a/toolchain/musl/patches/900-iconv_size_hack.patch +++ b/toolchain/musl/patches/900-iconv_size_hack.patch @@ -1,6 +1,6 @@ --- a/src/locale/iconv.c +++ b/src/locale/iconv.c -@@ -44,6 +44,7 @@ static const unsigned char charmaps[] = +@@ -38,6 +38,7 @@ static const unsigned char charmaps[] = "ucs4\0ucs4be\0utf32\0utf32be\0\0\300" "ucs4le\0utf32le\0\0\303" "ascii\0usascii\0iso646\0iso646us\0\0\307" @@ -8,7 +8,7 @@ "eucjp\0\0\320" "shiftjis\0sjis\0\0\321" "gb18030\0\0\330" -@@ -51,6 +52,7 @@ static const unsigned char charmaps[] = +@@ -45,6 +46,7 @@ static const unsigned char charmaps[] = "gb2312\0\0\332" "big5\0bigfive\0cp950\0big5hkscs\0\0\340" "euckr\0ksc5601\0ksx1001\0cp949\0\0\350" @@ -16,7 +16,7 @@ #include "codepages.h" ; -@@ -58,6 +60,7 @@ static const unsigned short legacy_chars +@@ -52,6 +54,7 @@ static const unsigned short legacy_chars #include "legacychars.h" }; @@ -24,7 +24,7 @@ static const unsigned short jis0208[84][94] = { #include "jis0208.h" }; -@@ -77,6 +80,7 @@ static const unsigned short hkscs[] = { +@@ -71,6 +74,7 @@ static const unsigned short hkscs[] = { static const unsigned short ksc[93][94] = { #include "ksc.h" }; @@ -32,7 +32,7 @@ static int fuzzycmp(const unsigned char *a, const unsigned char *b) { -@@ -217,6 +221,7 @@ size_t iconv(iconv_t cd0, char **restric +@@ -212,6 +216,7 @@ size_t iconv(iconv_t cd0, char **restric c = ((c-0xd7c0)<<10) + (d-0xdc00); } break; @@ -40,7 +40,7 @@ case SHIFT_JIS: if (c-0xa1 <= 0xdf-0xa1) { c += 0xff61-0xa1; -@@ -363,6 +368,7 @@ size_t iconv(iconv_t cd0, char **restric +@@ -358,6 +363,7 @@ size_t iconv(iconv_t cd0, char **restric c = ksc[c][d]; if (!c) goto ilseq; break; |