* sysdeps/ia64/strncpy.S: Only segfault in .recovery2 if some bits

	from the next quad are needed.

diff --git a/ChangeLog b/ChangeLog
index 0d63f41..d46b7d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-30  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/ia64/strncpy.S: Only segfault in .recovery2 if some bits
+       from the next quad are needed.
+
 2002-09-30  Roland McGrath  <roland@redhat.com>
 
        * elf/tls-macros.h (TLS_LD, TLS_GD): Use call insn, not callq.

diff --git a/sysdeps/ia64/strncpy.S b/sysdeps/ia64/strncpy.S
index f5c1c9d..202741f 100644 (file)
--- a/sysdeps/ia64/strncpy.S
+++ b/sysdeps/ia64/strncpy.S
@@ -1,6 +1,6 @@
 /* Optimized version of the standard strncpy() function.
    This file is part of the GNU C Library.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Dan Pop <Dan.Pop@cern.ch>
              and Jakub Jelinek <jakub@redhat.com>.
 
@@ -210,8 +210,11 @@ ENTRY(strncpy)
        mov     pr = saved_pr, -1       // restore the predicate registers
        br.ret.sptk.many b0
 .recovery2:
+       add     c = 8, len
        add     tmp = -8, asrc ;;
-       ld8     r[0] = [tmp]
+       cmp.gtu p8, p5 = c, thresh ;;
+(p8)   ld8     r[0] = [tmp]
+(p5)   mov     r[0] = r0
        br.cond.sptk .back2
 .recovery3:
        add     tmp = -MEMLAT * 8, src ;;