diff options
| -rw-r--r-- | ports/ChangeLog.mips | 15 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/bits/resource.h | 4 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c | 36 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/mips32/Versions | 6 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist | 4 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/mips64/n32/Versions | 6 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist | 4 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c | 30 |
8 files changed, 75 insertions, 30 deletions
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index d2212a1933..84567997b7 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,5 +1,20 @@ 2013-11-27 Aurelien Jarno <aurelien@aurel32.net> + * sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIM64_INFINITY): Fix + Fix 64-bit value for 32-bit ABIs. + * sysdeps/unix/sysv/linux/mips/getrlimit64.c: Rename generic getrlimit64 + version as getrlimit64@@GLIBC_2_2. Provide the getrlimit64 as + getrlimit64@@GLIBC_2_19. + * sysdeps/unix/sysv/linux/mips/setrlimit64.c: Ditto with setrlimit64. + * sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist (GLIBC_2.19): + Add getrlimit64 and setrlimit64. + * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist: Ditto. + * sysdeps/unix/sysv/linux/mips/mips32/Versions (libc): Add + getrlimit64@@GLIBC_2_19 and setrlimit64@@GLIBC_2_19. + * sysdeps/unix/sysv/linux/mips/mips64/n32/Versions: Ditto. + +2013-11-27 Aurelien Jarno <aurelien@aurel32.net> + * sysdeps/unix/sysv/linux/mips/getrlimit64.c: On O32 and N32 ABIs, include the generic getrlimit64 version as __internal_getrlimit64 and add a wrapper around it to convert the RLIM64_INFINITY constant diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h b/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h index 0882b408f0..e30bbebabc 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h @@ -122,10 +122,10 @@ enum __rlimit_resource # ifndef __USE_FILE_OFFSET64 # define RLIM_INFINITY ((long int)(~0UL >> 1)) # else -# define RLIM_INFINITY 0x7fffffffffffffffULL +# define RLIM_INFINITY 0xffffffffffffffffULL # endif # ifdef __USE_LARGEFILE64 -# define RLIM64_INFINITY 0x7fffffffffffffffULL +# define RLIM64_INFINITY 0xffffffffffffffffULL # endif #endif diff --git a/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c b/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c index 10a5495f8d..bd2e523f81 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c +++ b/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c @@ -15,17 +15,18 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/resource.h> - #if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32 -# define getrlimit64 static __internal_getrlimit64 -# undef libc_hidden_def -# define libc_hidden_def(name) +# include <shlib-compat.h> + +# define getrlimit64 __new_getrlimit64 # include <sysdeps/unix/sysv/linux/getrlimit64.c> # undef getrlimit64 -# undef libc_hidden_def -# define libc_hidden_def(name) hidden_def (name) + +versioned_symbol (libc, __new_getrlimit64, getrlimit64, GLIBC_2_19); +strong_alias (__new_getrlimit64, __GI_getrlimit64) + +# if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_19) /* RLIM64_INFINITY was supposed to be a glibc convention rather than anything seen by the kernel, but it ended being passed to the kernel @@ -33,31 +34,32 @@ the wrong constant value are in the wild, provide a wrapper function fixing the value after the syscall. */ -# define GLIBC_RLIM64_INFINITY 0x7fffffffffffffffULL -# define KERNEL_RLIM64_INFINITY 0xffffffffffffffffULL +# define OLD_RLIM64_INFINITY 0x7fffffffffffffffULL int -getrlimit64 (enum __rlimit_resource resource, - struct rlimit64 *rlimits) +attribute_compat_text_section +__old_getrlimit64 (enum __rlimit_resource resource, + struct rlimit64 *rlimits) { struct rlimit64 krlimits; - if (__internal_getrlimit64 (resource, &krlimits) < 0) + if (__new_getrlimit64 (resource, &krlimits) < 0) return -1; - if (krlimits.rlim_cur == KERNEL_RLIM64_INFINITY) - rlimits->rlim_cur = GLIBC_RLIM64_INFINITY; + if (krlimits.rlim_cur == RLIM64_INFINITY) + rlimits->rlim_cur = OLD_RLIM64_INFINITY; else rlimits->rlim_cur = krlimits.rlim_cur; - if (krlimits.rlim_max == KERNEL_RLIM64_INFINITY) - rlimits->rlim_max = GLIBC_RLIM64_INFINITY; + if (krlimits.rlim_max == RLIM64_INFINITY) + rlimits->rlim_max = OLD_RLIM64_INFINITY; else rlimits->rlim_max = krlimits.rlim_max; return 0; } -libc_hidden_def (getrlimit64) +compat_symbol (libc, __old_getrlimit64, getrlimit64, GLIBC_2_2); +# endif #else /* !_ABI_O32 && !_ABI_N32 */ # include <sysdeps/unix/sysv/linux/getrlimit64.c> diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips32/Versions b/ports/sysdeps/unix/sysv/linux/mips/mips32/Versions new file mode 100644 index 0000000000..9621fb5cae --- /dev/null +++ b/ports/sysdeps/unix/sysv/linux/mips/mips32/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_2.19 { + getrlimit64; + setrlimit64; + } +} diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist b/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist index f01278e4a4..1c3490cdeb 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist +++ b/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist @@ -1403,6 +1403,10 @@ GLIBC_2.18 __cxa_thread_atexit_impl F __mips_fpu_getcw F __mips_fpu_setcw F +GLIBC_2.19 + GLIBC_2.19 A + getrlimit64 F + setrlimit64 F GLIBC_2.2 GLIBC_2.2 A _Exit F diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/Versions b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/Versions new file mode 100644 index 0000000000..9621fb5cae --- /dev/null +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_2.19 { + getrlimit64; + setrlimit64; + } +} diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist index 9dbbd97c8e..3e6ed351b6 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist @@ -1401,6 +1401,10 @@ GLIBC_2.17 GLIBC_2.18 GLIBC_2.18 A __cxa_thread_atexit_impl F +GLIBC_2.19 + GLIBC_2.19 A + getrlimit64 F + setrlimit64 F GLIBC_2.2 GLIBC_2.2 A _Exit F diff --git a/ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c b/ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c index 8609f694f8..33af37b5c9 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c +++ b/ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c @@ -15,41 +15,49 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/resource.h> #if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32 -# define setrlimit64 static __internal_setrlimit64 +# include <shlib-compat.h> + +# define setrlimit64 __new_setrlimit64 # include <sysdeps/unix/sysv/linux/setrlimit64.c> # undef setrlimit64 +versioned_symbol (libc, __new_setrlimit64, setrlimit64, GLIBC_2_19); + +# if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_19) + /* RLIM64_INFINITY was supposed to be a glibc convention rather than anything seen by the kernel, but it ended being passed to the kernel through the prlimit64 syscall. Given that a lot of binaries with the wrong constant value are in the wild, provide a wrapper function fixing the value before the syscall. */ -# define GLIBC_RLIM64_INFINITY 0x7fffffffffffffffULL -# define KERNEL_RLIM64_INFINITY 0xffffffffffffffffULL +# define OLD_RLIM64_INFINITY 0x7fffffffffffffffULL int -setrlimit64 (enum __rlimit_resource resource, - const struct rlimit64 *rlimits) +attribute_compat_text_section +__old_setrlimit64 (enum __rlimit_resource resource, + const struct rlimit64 *rlimits) { struct rlimit64 krlimits; - if (rlimits->rlim_cur == GLIBC_RLIM64_INFINITY) - krlimits.rlim_cur = KERNEL_RLIM64_INFINITY; + if (rlimits->rlim_cur == OLD_RLIM64_INFINITY) + krlimits.rlim_cur = RLIM64_INFINITY; else krlimits.rlim_cur = rlimits->rlim_cur; - if (rlimits->rlim_max == GLIBC_RLIM64_INFINITY) - krlimits.rlim_max = KERNEL_RLIM64_INFINITY; + if (rlimits->rlim_max == OLD_RLIM64_INFINITY) + krlimits.rlim_max = RLIM64_INFINITY; else krlimits.rlim_max = rlimits->rlim_max; - return __internal_setrlimit64 (resource, &krlimits); + return __new_setrlimit64 (resource, &krlimits); } +compat_symbol (libc, __old_setrlimit64, setrlimit64, GLIBC_2_2); +# endif + #else /* !_ABI_O32 && !_ABI_N32 */ # include <sysdeps/unix/sysv/linux/setrlimit64.c> #endif |