1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00

getrlimit64: fix for 32-bit configurations with default version >= 2.2

Commit 24731685 ("prlimit: Translate old_rlimit from RLIM64_INFINITY to
RLIM_INFINITY") broken the getrlimit64 for 32-bit configurations which
do no need the 2GiB limited compat getrlimit (default version >= 2.2).

This patch fixes that by restoring the weak alias in that case.

Changelog:
	* sysdeps/unix/sysv/linux/getrlimit64 (getrlimit64)
	[!__RLIM_T_MATCHES_RLIM64_T]
	[!SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_2)]: Define as weak alias of
	__getrlimit64. Add libc_hidden_weak.
This commit is contained in:
Aurelien Jarno
2018-01-07 20:33:26 +01:00
parent 200fc24b9d
commit c2e014cc33
2 changed files with 10 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2018-01-07 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/unix/sysv/linux/getrlimit64 (getrlimit64)
[!__RLIM_T_MATCHES_RLIM64_T]
[!SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_2)]: Define as weak alias of
__getrlimit64. Add libc_hidden_weak.
2018-01-06 Palmer Dabbelt <palmer@sifive.com> 2018-01-06 Palmer Dabbelt <palmer@sifive.com>
* elf/elf.h (R_RISCV_NONE): New define. * elf/elf.h (R_RISCV_NONE): New define.

View File

@ -81,4 +81,7 @@ __old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
} }
versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_2); versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_2);
compat_symbol (libc, __old_getrlimit64, getrlimit64, GLIBC_2_1); compat_symbol (libc, __old_getrlimit64, getrlimit64, GLIBC_2_1);
#else
weak_alias (__getrlimit64, getrlimit64)
libc_hidden_weak (getrlimit64)
#endif /* __RLIM_T_MATCHES_RLIM64_T */ #endif /* __RLIM_T_MATCHES_RLIM64_T */