Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / sysdeps / sparc / sparc32 / strcat.S

diff --git a/sysdeps/sparc/sparc32/strcat.S b/sysdeps/sparc/sparc32/strcat.S
index d9010876720f583d6d8bc0bd5119dd50c1fd76e6..cfa2bbd5b72053dc4134ac8d38d987fa52c9c0b6 100644 (file)
--- a/sysdeps/sparc/sparc32/strcat.S
+++ b/sysdeps/sparc/sparc32/strcat.S
@@ -1,23 +1,22 @@
 /* strcat (dest, src) -- Append SRC on the end of DEST.
    For SPARC v7.
-   Copyright (C) 1996, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jj@ultra.linux.cz>.
 
    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 <sysdep.h>
 
@@ -38,36 +37,14 @@
 
        .text
        .align          4
-10:    cmp             %o4, 2
-       be              1f
-        cmp            %o4, 3
-       ldub            [%o1], %o5
-       add             %o1, 1, %o1
-       stb             %o5, [%o0]
-       be              3f
-        cmp            %o5, 0
-       be              0f
-        add            %o0, 1, %o0
-1:     lduh            [%o1], %o5
-       add             %o1, 2, %o1
-       srl             %o5, 8, %o4
-       cmp             %o4, 0
-       stb             %o4, [%o0]
-       bne,a           2f
-        stb            %o5, [%o0 + 1]
-       retl
-        mov            %g2, %o0
-2:     andcc           %o5, 0xff, %o5
-       bne             4f
-        add            %o0, 2, %o0
-       retl
-        mov            %g2, %o0
-3:     bne             4f
-        add            %o0, 1, %o0
-       retl
-        mov            %g2, %o0
 
-11:    ldub            [%o0], %o5
+ENTRY(strcat)
+       mov             %o0, %g2
+       andcc           %o0, 3, %g0
+       be              30f
+        sethi          %hi(0x80808080), %o4
+
+       ldub            [%o0], %o5
        cmp             %o5, 0
        be              1f
         add            %o0, 1, %o0
@@ -93,12 +70,7 @@
        b               3f
         sub            %o0, 1, %o0
 
-ENTRY(strcat)
-       mov             %o0, %g2
-       andcc           %o0, 3, %g0
-       bne             11b
-        sethi          %hi(0x80808080), %o4
-       or              %o4, %lo(0x80808080), %o3
+30:    or              %o4, %lo(0x80808080), %o3
 7:     sethi           %hi(0x01010101), %o4
 8:     or              %o4, %lo(0x01010101), %o2
 9:     ld              [%o0], %o5
@@ -128,8 +100,39 @@ ENTRY(strcat)
         ld             [%o0], %o5
        sub             %o0, 1, %o0
 3:     andcc           %o1, 3, %o4
-       bne             10b
-4:      andcc          %o0, 3, %g3
+       be              4f
+        nop
+
+       cmp             %o4, 2
+       be              11f
+        cmp            %o4, 3
+       ldub            [%o1], %o5
+       add             %o1, 1, %o1
+       stb             %o5, [%o0]
+       be              13f
+        cmp            %o5, 0
+       be              0f
+        add            %o0, 1, %o0
+11:    lduh            [%o1], %o5
+       add             %o1, 2, %o1
+       srl             %o5, 8, %o4
+       cmp             %o4, 0
+       stb             %o4, [%o0]
+       bne,a           12f
+        stb            %o5, [%o0 + 1]
+       retl
+        mov            %g2, %o0
+12:    andcc           %o5, 0xff, %o5
+       bne             4f
+        add            %o0, 2, %o0
+       retl
+        mov            %g2, %o0
+13:    bne             4f
+        add            %o0, 1, %o0
+       retl
+        mov            %g2, %o0
+
+4:     andcc           %o0, 3, %g3
        bne             12f
 1:     ld              [%o1], %o5
        add             %o1, 4, %o1
@@ -346,3 +349,4 @@ ENTRY(strcat)
        retl
         mov            %g2, %o0
 END(strcat)
+libc_hidden_builtin_def (strcat)