r4327 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2010-06-07 08:37:13 +0000 (Mon, 07 Jun 2010)
New Revision: 4327
Added:
glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Restore patches/hurd-i386/submitted-getnprocs.diff which got lost during
the 2.11 merge.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-06-06 22:21:17 UTC (rev 4326)
+++ glibc-package/trunk/debian/changelog 2010-06-07 08:37:13 UTC (rev 4327)
@@ -4,6 +4,8 @@
* Add patches/hurd-i386/cvs-linkat.diff to fix new coreutils' ln.
* Add patches/hurd-i386/submitted-ttyname.diff to fix io/tst-ttyname_r,
marked as such in testsuite-checking/expected-results-i486-gnu-libc.
+ * Restore patches/hurd-i386/submitted-getnprocs.diff which got lost during
+ the 2.11 merge.
-- Samuel Thibault <sthibault@debian.org> Wed, 02 Jun 2010 23:54:34 +0200
Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-getnprocs.diff 2010-06-07 08:37:13 UTC (rev 4327)
@@ -0,0 +1,42 @@
+2010-01-26 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/getsysstats.c (get_nprocs_conf, get_nprocs,
+ get_phys_pages, get_avphys_pages): Add weak aliases.
+
+---
+ getsysstats.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c
+index d2bebb6..a7e0804 100644
+--- a/sysdeps/mach/getsysstats.c
++++ b/sysdeps/mach/getsysstats.c
+@@ -40,6 +40,7 @@ __get_nprocs_conf ()
+
+ return hbi.max_cpus;
+ }
++weak_alias (__get_nprocs_conf, get_nprocs_conf)
+
+ /* Return the number of processors currently available on the system. */
+ int
+@@ -58,6 +59,7 @@ __get_nprocs ()
+
+ return hbi.avail_cpus;
+ }
++weak_alias (__get_nprocs, get_nprocs)
+
+ /* Return the number of physical pages on the system. */
+ long int
+@@ -76,6 +78,7 @@ __get_phys_pages ()
+
+ return hbi.memory_size / __vm_page_size;
+ }
++weak_alias (__get_phys_pages, get_phys_pages)
+
+ /* Return the number of available physical pages */
+ long int
+@@ -100,3 +103,4 @@ __get_avphys_pages ()
+
+ return vs.free_count;
+ }
++weak_alias (__get_avphys_pages, get_avphys_pages)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-06-06 22:21:17 UTC (rev 4326)
+++ glibc-package/trunk/debian/patches/series 2010-06-07 08:37:13 UTC (rev 4327)
@@ -123,6 +123,7 @@
hurd-i386/submitted-regex_internal.diff
hurd-i386/cvs-linkat.diff
hurd-i386/submitted-ttyname.diff
+hurd-i386/submitted-getnprocs.diff
ia64/local-dlfptr.diff
ia64/submitted-sysconf.diff
Reply to: