Add AArch64 HWCAPs from Linux 5.0.

[thirdparty/glibc.git] / iconvdata / iso8859-1.c

diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c
index 9e5007f77d7470b1aa6eca589376f6a2c7d86404..e5375395886213b054684dd45254a1b9a4706379 100644 (file)
--- a/iconvdata/iso8859-1.c
+++ b/iconvdata/iso8859-1.c
@@ -1,22 +1,21 @@
 /* Conversion to and from ISO 8859-1.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <dlfcn.h>
 #include <stdint.h>
@@ -29,13 +28,19 @@
 #define DEFINE_FINI            1
 #define MIN_NEEDED_FROM                1
 #define MIN_NEEDED_TO          4
+#define ONE_DIRECTION          0
 
 /* First define the conversion function from ISO 8859-1 to UCS4.  */
 #define MIN_NEEDED_INPUT       MIN_NEEDED_FROM
 #define MIN_NEEDED_OUTPUT      MIN_NEEDED_TO
 #define LOOPFCT                        FROM_LOOP
 #define BODY \
-  *((uint32_t *) outptr)++ = *inptr++;
+  *((uint32_t *) outptr) = *inptr++;                                         \
+  outptr += sizeof (uint32_t);
+#define ONEBYTE_BODY \
+  {                                                                          \
+    return c;                                                                \
+  }
 #include <iconv/loop.c>
 
 
@@ -46,10 +51,12 @@
 #define BODY \
   {                                                                          \
     uint32_t ch = *((const uint32_t *) inptr);                               \
-    if (__builtin_expect (ch, 0) > 0xff)                                     \
+    if (__glibc_unlikely (ch > 0xff))                                        \
       {                                                                              \
+       UNICODE_TAG_HANDLER (ch, 4);                                          \
+                                                                             \
        /* We have an illegal character.  */                                  \
-       STANDARD_ERR_HANDLER (4);                                             \
+       STANDARD_TO_LOOP_ERR_HANDLER (4);                                     \
       }                                                                              \
     else                                                                     \
       *outptr++ = (unsigned char) ch;                                        \