Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master

diff --cc ChangeLog
index 59f059afa685fe54e0fc05a08c489061b1bc8816,b27323cdb70a48e3ac6b39156c38066f33fc020b..19e0f0022c616d41906aad4ad61c7dde7865f729
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,18 +1,22 @@@
- 2011-06-21  Andreas Schwab  <schwab@redhat.com>
+ 2011-06-27  Andreas Schwab  <schwab@redhat.com>
  
-       * iconvdata/gb18030.c: Regenerate tables.
+       * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP
+       two-byte characters.
+ 
+ 2011-06-22  Andreas Schwab  <schwab@redhat.com>
+ 
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Fix last change.
  
- 2011-06-16  Andreas Schwab  <schwab@redhat.com>
+ 2011-06-21  Ulrich Drepper  <drepper@gmail.com>
  
        [BZ #12885]
-       * sysdeps/posix/getaddrinfo.c (gaih_inet): Filter results from
-       gethostbyname4_r according to request flags.
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): When looking up only IPv6
+       addresses using gethostbyname4_r ignore IPv4 addresses.
+ 
++2011-06-21  Andreas Schwab  <schwab@redhat.com>
++
++      * iconvdata/gb18030.c: Regenerate tables.
 +
  2011-06-15  Ulrich Drepper  <drepper@gmail.com>
  
        * resolv/res_send.c (__libc_res_nsend): Fix typos in last patch.  We

diff --cc iconvdata/gb18030.c
index 4c8148fcc2b4b7c0535f13fcdaccc85039919622,a06b75d03b3f3592d4f6754d1ae05050aecfb9cb..e3aaac2eb05e7ee5f2d59f50d70262a3c142a444
--- 1/iconvdata/gb18030.c
--- 2/iconvdata/gb18030.c
+++ b/iconvdata/gb18030.c
@@@ -24318,28 -18232,18 +24318,28 @@@ static const unsigned char __ucs_to_gb1
            else if (cp[0] == 0 && cp[1] == 0)                                \
              len = 0;                                                        \
          }                                                                   \
 +      else if (ch >= 0xFFE6 && ch <= 0xFFFF)                                \
 +        {                                                                   \
 +          idx = ch - 0x6604;                                                \
 +          len = 4;                                                          \
 +        }                                                                   \
        else if (ch == 0x20087)                                               \
-         idx = 0xfe51;                                                       \
+         cp = (const unsigned char *) "\xfe\x51";                            \
        else if (ch == 0x20089)                                               \
-         idx = 0xfe52;                                                       \
+         cp = (const unsigned char *) "\xfe\x52";                            \
        else if (ch == 0x200CC)                                               \
-         idx = 0xfe53;                                                       \
+         cp = (const unsigned char *) "\xfe\x53";                            \
        else if (ch == 0x215d7)                                               \
-         idx = 0xfe6c;                                                       \
+         cp = (const unsigned char *) "\xfe\x6c";                            \
        else if (ch == 0x2298F)                                               \
-         idx = 0xfe76;                                                       \
+         cp = (const unsigned char *) "\xfe\x76";                            \
        else if (ch == 0x241FE)                                               \
-         idx = 0xfe91;                                                       \
+         cp = (const unsigned char *) "\xfe\x91";                            \
 +      else if (ch >= 0x10000 && ch <= 0x10FFFF)                             \
 +        {                                                                   \
 +          idx = ch + 0x1E248;                                               \
 +          len = 4;                                                          \
 +        }                                                                   \
        else                                                                  \
          len = 0;                                                            \
                                                                              \

diff --cc sysdeps/posix/getaddrinfo.c
Simple merge