diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/powerpc/elf/rtld-global-offsets.sym | 4 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/dl-machine.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/eventfd.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ulimit.c | 11 |
4 files changed, 15 insertions, 8 deletions
diff --git a/sysdeps/powerpc/elf/rtld-global-offsets.sym b/sysdeps/powerpc/elf/rtld-global-offsets.sym index 830106ba21..ff4e97f2a6 100644 --- a/sysdeps/powerpc/elf/rtld-global-offsets.sym +++ b/sysdeps/powerpc/elf/rtld-global-offsets.sym @@ -2,6 +2,6 @@ #include <ldsodefs.h> -#define rtdl_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) +#define rtld_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) -RTLD_GLOBAL_RO_DL_HWCAP_OFFSET rtdl_global_ro_offsetof (_dl_hwcap) +RTLD_GLOBAL_RO_DL_HWCAP_OFFSET rtld_global_ro_offsetof (_dl_hwcap) diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c index 731d23956d..71540bd185 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.c +++ b/sysdeps/powerpc/powerpc32/dl-machine.c @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation functions. PowerPC version. - Copyright (C) 1995-2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1995-2006, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -501,7 +501,7 @@ __process_machine_rela (struct link_map *map, strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); _dl_error_printf ("\ -%s: Symbol `%s' has different size in shared object, onsider re-linking\n", +%s: Symbol `%s' has different size in shared object, consider re-linking\n", rtld_progname ?: "<program name unknown>", strtab + refsym->st_name); } diff --git a/sysdeps/unix/sysv/linux/eventfd.c b/sysdeps/unix/sysv/linux/eventfd.c index 6ebfed86f1..4cd557983e 100644 --- a/sysdeps/unix/sysv/linux/eventfd.c +++ b/sysdeps/unix/sysv/linux/eventfd.c @@ -24,8 +24,8 @@ int eventfd (int count, int flags) { -#ifdef __NR_eventfd1 - return INLINE_SYSCALL (eventfd1, 1, flags); +#ifdef __NR_eventfd2 + return INLINE_SYSCALL (eventfd2, 2, count, flags); #else /* The old system call has no flag parameter which is bad. So we have to wait until we have to support to pass additional values to the diff --git a/sysdeps/unix/sysv/linux/ulimit.c b/sysdeps/unix/sysv/linux/ulimit.c index 9c309c371d..0b87599fea 100644 --- a/sysdeps/unix/sysv/linux/ulimit.c +++ b/sysdeps/unix/sysv/linux/ulimit.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,92,1994-1998,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,1994-1998,2000,2001,2008 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,26 +48,32 @@ __ulimit (int cmd, ...) /* Get limit on file size. */ if (__getrlimit (RLIMIT_FSIZE, &limit) == 0) /* Convert from bytes to 512 byte units. */ - result = limit.rlim_cur / 512; + result = (limit.rlim_cur == RLIM_INFINITY + ? LONG_MAX : limit.rlim_cur / 512); break; case UL_SETFSIZE: /* Set limit on file size. */ { long int newlimit = va_arg (va, long int); + long int newlen; if ((rlim_t) newlimit > RLIM_INFINITY / 512) { limit.rlim_cur = RLIM_INFINITY; limit.rlim_max = RLIM_INFINITY; + newlen = LONG_MAX; } else { limit.rlim_cur = newlimit * 512; limit.rlim_max = newlimit * 512; + newlen = newlimit; } result = __setrlimit (RLIMIT_FSIZE, &limit); + if (result != -1) + result = newlen; } break; |