diff options
| -rw-r--r-- | sysdeps/ia64/memchr.S | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sysdeps/ia64/memchr.S b/sysdeps/ia64/memchr.S index 56d8056839..355effe94b 100644 --- a/sysdeps/ia64/memchr.S +++ b/sysdeps/ia64/memchr.S @@ -1,6 +1,6 @@ /* Optimized version of the standard memchr() function. This file is part of the GNU C Library. - Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2003, 2010 Free Software Foundation, Inc. Contributed by Dan Pop <Dan.Pop@cern.ch>. The GNU C Library is free software; you can redistribute it and/or @@ -21,9 +21,9 @@ /* Return: the address of the first occurence of chr in str or NULL Inputs: - in0: str - in1: chr - in2: byte count + in0: str + in1: chr + in2: byte count This implementation assumes little endian mode. For big endian mode, the instruction czx1.r should be replaced by czx1.l. @@ -62,13 +62,13 @@ ENTRY(__memchr) .rotr value[MEMLAT+1], addr[MEMLAT+3], aux[2], poschr[2] .rotp p[MEMLAT+3] .save ar.lc, saved_lc - mov saved_lc = ar.lc // save the loop counter + mov saved_lc = ar.lc // save the loop counter .save pr, saved_pr mov saved_pr = pr // save the predicates .body - mov ret0 = str + mov ret0 = str add last = str, in2 // last byte - and tmp = 7, str // tmp = str % 8 + and tmp = 7, str // tmp = str % 8 cmp.ne p7, p0 = r0, r0 // clear p7 extr.u chr = in1, 0, 8 // chr = (unsigned char) in1 mov len = in2 @@ -89,7 +89,7 @@ ENTRY(__memchr) .str_aligned: cmp.ne p6, p0 = r0, r0 // clear p6 shr.u loopcnt = len, 3 // loopcnt = len / 8 - and len = 7, len ;; // remaining len = len & 7 + and len = 7, len ;; // remaining len = len & 7 adds loopcnt = -1, loopcnt mov ar.ec = MEMLAT + 3 mux1 chrx8 = chr, @brcst ;; // get a word full of chr @@ -120,7 +120,7 @@ ENTRY(__memchr) mov ret0 = r0 ;; // return NULL .foundit: .pred.rel "mutex" p6, p7 -(p6) adds ret0 = -1, ret0 // if we got here from l1 or l3 +(p6) adds ret0 = -1, ret0 // if we got here from l1 or l3 (p7) add ret0 = addr[MEMLAT+2], poschr[1] // if we got here from l2 mov pr = saved_pr, -1 mov ar.lc = saved_lc diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c index bf07f68eec..d5793b3905 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2010 Free Software Foundation, Inc. Contributed by Andreas Krebbel <Andreas.Krebbel@de.ibm.com>. This file is part of the GNU C Library. @@ -31,7 +31,7 @@ calls. */ #define ALLOCATE_UTMP32_OUT(OUT) \ static struct utmp32 *OUT = NULL; \ - \ + \ if (OUT == NULL) \ { \ OUT = malloc (sizeof (struct utmp32)); \ diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c index f566f50bea..790b46466e 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2010 Free Software Foundation, Inc. Contributed by Andreas Krebbel <Andreas.Krebbel@de.ibm.com>. This file is part of the GNU C Library. @@ -34,7 +34,7 @@ calls. */ #define ALLOCATE_UTMPX32_OUT(OUT) \ static struct utmpx32 *OUT = NULL; \ - \ + \ if (OUT == NULL) \ { \ OUT = malloc (sizeof (struct utmpx32)); \ diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h index c61e1cd879..dedc6c6be8 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h @@ -1,5 +1,5 @@ /* The `struct utmp' type, describing entries in the utmp file. GNU version. - Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008 + Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. |