[PATCH 2/2] MIPS: Fix RLIM64_INFINITY constant for O32 and N32 ABIs

[Aurelien Jarno <aurelien at aurel32 dot net>]

Fix the RLIM64_INFINITY constant for O32 and N32 ABIs to match the
kernel one. Change the getrlimit64/setrlimit64 into old compat symbols,
and provide the Linux generic getrlimit64/setrlimit64 functions as
GLIBC_2_19 version.
---
 ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c |   33 ++++++++++++----------
 ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c |   28 +++++++++++-------
 2 files changed, 36 insertions(+), 25 deletions(-)

2013-11-20  Aurelien Jarno <aurelien@aurel32.net>

        * sysdeps/unix/sysv/linux/sparc/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.

diff --git a/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c b/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c
index cb0b2de..a062a1e 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/getrlimit64.c
@@ -20,16 +20,18 @@
 #include <sys/types.h>
 #include <sysdep.h>
 #include <kernel-features.h>
+#include <shlib-compat.h>
 
 #if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32
 
-# define getrlimit64 static __internal_getrlimit64
-# undef libc_hidden_def
-# define libc_hidden_def(name)
+# 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
@@ -37,31 +39,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/setrlimit64.c b/ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c
index 0514f12..0d1e68e 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/setrlimit64.c
@@ -20,40 +20,48 @@
 #include <sys/types.h>
 #include <sysdep.h>
 #include <kernel-features.h>
+#include <shlib-compat.h>
 
 #if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32
 
-# define setrlimit64 static __internal_setrlimit64
+# 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
-- 
1.7.10.4