diff options
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/alpha/memchr.S | 29 | ||||
-rw-r--r-- | sysdeps/alpha/strncmp.S | 8 | ||||
-rw-r--r-- | sysdeps/generic/paths.h | 1 | ||||
-rw-r--r-- | sysdeps/gnu/utmpbits.h | 6 | ||||
-rw-r--r-- | sysdeps/mach/hurd/ttyname_r.c | 4 | ||||
-rw-r--r-- | sysdeps/mach/hurd/xmknod.c | 30 | ||||
-rw-r--r-- | sysdeps/unix/inet/Subdirs | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/paths.h | 1 |
8 files changed, 42 insertions, 38 deletions
diff --git a/sysdeps/alpha/memchr.S b/sysdeps/alpha/memchr.S index ecd26e8..7456735 100644 --- a/sysdeps/alpha/memchr.S +++ b/sysdeps/alpha/memchr.S @@ -1,22 +1,21 @@ /* Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. Contributed by David Mosberger (davidm@cs.arizona.edu). -This file is part of the GNU C Library. + 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. -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. + 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. -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. - -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., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + 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. */ /* Finds characters in a memory area. Optimized for the Alpha architecture: @@ -53,7 +52,6 @@ ENTRY(memchr) ldq_u t0, 0(a0) # load first quadword (a0 may be misaligned) addq a0, a2, t4 and a1, 0xff, a1 # a1 = 00000000000000ch - ldq_u t5, -1(t4) sll a1, 8, t1 # t1 = 000000000000ch00 cmpult a2, 9, t3 or t1, a1, a1 # a1 = 000000000000chch @@ -66,6 +64,7 @@ ENTRY(memchr) beq t3, $first_quad + ldq_u t5, -1(t4) extqh t5, a0, t5 mov a0, v0 or t6, t5, t0 # t0 = quadword starting at a0 diff --git a/sysdeps/alpha/strncmp.S b/sysdeps/alpha/strncmp.S index 6827590..a6c6c61 100644 --- a/sysdeps/alpha/strncmp.S +++ b/sysdeps/alpha/strncmp.S @@ -62,8 +62,8 @@ $aligned: ornot t0, t3, t0 # .. e1 : cmpbge zero, t1, t7 # e0 : bits set iff null found beq a2, $eoc # .. e1 : check end of count - unop # : - bne t7, $eos # e1 : + subq a2, 1, a2 # e0 : + bne t7, $eos # .. e1 : /* Aligned compare main loop. On entry to this basic block: @@ -73,8 +73,8 @@ $aligned: $a_loop: xor t0, t1, t2 # e0 : bne t2, $wordcmp # .. e1 (zdb) - ldq_u t1, 0(a1) # e0 : - ldq_u t0, 0(a0) # .. e1 : + ldq_u t1, 8(a1) # e0 : + ldq_u t0, 8(a0) # .. e1 : addq a1, 8, a1 # e0 : addq a0, 8, a0 # .. e1 : cmpbge zero, t1, t7 # e0 : diff --git a/sysdeps/generic/paths.h b/sysdeps/generic/paths.h index e5f3401..3e6053a 100644 --- a/sysdeps/generic/paths.h +++ b/sysdeps/generic/paths.h @@ -56,6 +56,7 @@ #define _PATH_MNTTAB "/etc/fstab" #define _PATH_MOUNTED "/var/run/mtab" #define _PATH_NOLOGIN "/etc/nologin" +#define _PATH_PRESERVE "/var/preserve" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHADOW "/etc/shadow" #define _PATH_SHELLS "/etc/shells" diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h index 5bb230b..4ba3a19 100644 --- a/sysdeps/gnu/utmpbits.h +++ b/sysdeps/gnu/utmpbits.h @@ -90,13 +90,15 @@ struct utmp as DEAD_PROCESS. */ long ut_session; /* Session ID, used for windowing. */ struct timeval ut_tv; /* Time entry was made. */ - int32_t ut_addr[4]; /* Internet address of remote host. */ + int32_t ut_addr_v6[4]; /* Internet address of remote host. */ enum utlogin ut_login; /* To store information about source. */ short int ut_syslen; /* Significant length of ut_host. */ char pad[14]; /* Reserved for future use. */ }; -#define ut_time ut_tv.tv_sec /* Backwards compatibility. */ +/* Backwards compatibility hacks. */ +#define ut_time ut_tv.tv_sec +#define ut_addr ut_addr_v6[0] /* Tell the user that we have a modern system with UT_HOST, UT_PID, UT_TYPE, UT_ID and UT_TV fields. */ diff --git a/sysdeps/mach/hurd/ttyname_r.c b/sysdeps/mach/hurd/ttyname_r.c index 05c2a6f..8a2cdd6 100644 --- a/sysdeps/mach/hurd/ttyname_r.c +++ b/sysdeps/mach/hurd/ttyname_r.c @@ -26,7 +26,7 @@ /* Store at most BUFLEN characters of the pathname of the terminal FD is open on in BUF. Return 0 on success, -1 otherwise. */ int -ttyname_r (int fd, char *buf, size_t buflen) +__ttyname_r (int fd, char *buf, size_t buflen) { error_t err; char nodename[1024]; /* XXX */ @@ -47,3 +47,5 @@ ttyname_r (int fd, char *buf, size_t buflen) memcpy (buf, nodename, len); return 0; } + +weak_alias (__ttyname_r, ttyname_r) diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c index 3552874..fefc955 100644 --- a/sysdeps/mach/hurd/xmknod.c +++ b/sysdeps/mach/hurd/xmknod.c @@ -1,20 +1,20 @@ /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. -This file is part of the GNU C Library. + This file is part of the GNU C Library. -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. + 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. -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. + 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. -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., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + 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. */ #include <errno.h> #include <sys/stat.h> @@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */ #include <string.h> /* Temporary hack; this belongs in a header file, probably types.h. */ -#define major(x) ((int)(((unsigned) (x) >> 8) & 0xff)) +#define major(x) ((int)(((unsigned int) (x) >> 8) & 0xff)) #define minor(x) ((int)((x) & 0xff)) @@ -111,5 +111,3 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) return __hurd_fail (err); return 0; } - -weak_alias (__mknod, mknod) diff --git a/sysdeps/unix/inet/Subdirs b/sysdeps/unix/inet/Subdirs index 4a40811..bce3ada 100644 --- a/sysdeps/unix/inet/Subdirs +++ b/sysdeps/unix/inet/Subdirs @@ -1,3 +1,4 @@ inet +nis resolv sunrpc diff --git a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h index eaa6aa6..f5629fc 100644 --- a/sysdeps/unix/sysv/linux/paths.h +++ b/sysdeps/unix/sysv/linux/paths.h @@ -56,6 +56,7 @@ #define _PATH_MNTTAB "/etc/fstab" #define _PATH_MOUNTED "/etc/mtab" #define _PATH_NOLOGIN "/etc/nologin" +#define _PATH_PRESERVE "/var/preserve" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHADOW "/etc/shadow" #define _PATH_SHELLS "/etc/shells" |