Don't call uname or getrlimit in libpthread init function

diff --git a/ChangeLog b/ChangeLog
index 7eff3a8363051d4e3c4cf6b0dae5dd2202596ab1..b2d74eaf590705081b8ef42d656d2314807aaad1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-10  Andreas Schwab  <schwab@redhat.com>
+
+       * sysdeps/unix/sysv/linux/i386/Versions: Export __uname under
+       GLIBC_PRIVATE.
+       * nptl/Versions: Export __getrlimit under GLIBC_PRIVATE.
+       * sysdeps/unix/sysv/linux/i386/smp.h: Call __uname instead of uname.
+       * nptl/nptl-init.c: Call __getrlimit instead of getrlimit.
+
 2010-05-28  Luis Machado  <luisgpm@br.ibm.com>
 
        * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.

diff --git a/nptl/Versions b/nptl/Versions
index f74941fa92bdf124cb7397de08fdaf98054d5534..52ca0bfee08b4bd5ed476e7f63a474b8e791a596 100644 (file)
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -29,6 +29,7 @@ libc {
   GLIBC_PRIVATE {
     # Internal libc interface to libpthread
     __libc_dl_error_tsd;
+    __getrlimit;
   }
 }
 

diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 851bab2bf1998d4ef772768d39efddf76d13cad2..c663f21ba631fe2a2bf4028f4b7a913146602d48 100644 (file)
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void)
   /* Determine the default allowed stack size.  This is the size used
      in case the user does not specify one.  */
   struct rlimit limit;
-  if (getrlimit (RLIMIT_STACK, &limit) != 0
+  if (__getrlimit (RLIMIT_STACK, &limit) != 0
       || limit.rlim_cur == RLIM_INFINITY)
     /* The system limit is not usable.  Use an architecture-specific
        default.  */

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/Versions b/nptl/sysdeps/unix/sysv/linux/i386/Versions
new file mode 100644 (file)
index 0000000..9d53804
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions
@@ -0,0 +1,6 @@
+libc {
+  GLIBC_PRIVATE {
+    # Internal libc interface to libpthread
+    __uname;
+  }
+}

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/linux/i386/smp.h
index f68a0c075860e9d8869970026ce84a48bbb7e802..bdff66555ee0e5d1563d440bb083f28844125ad5 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h
@@ -37,7 +37,7 @@ is_smp_system (void)
   char *cp;
 
   /* Try reading the number using `sysctl' first.  */
-  if (uname (&u.uts) == 0)
+  if (__uname (&u.uts) == 0)
     cp = u.uts.version;
   else
     {