This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.20-278-g6d03458


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  6d03458e40bdb08d99d05bc7b298b00ad77d8e2b (commit)
      from  97114a383fc167a64b0c85c9c5eaeb4f3ecd28f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6d03458e40bdb08d99d05bc7b298b00ad77d8e2b

commit 6d03458e40bdb08d99d05bc7b298b00ad77d8e2b
Author: Carlos O'Donell <carlos@redhat.com>
Date:   Sat Nov 29 01:21:58 2014 -0500

    Use ALIGN_UP in nptl/nptl-init.c
    
    Replace bespoke code to align a value with
    the ALIGN_UP macro to make it easier to read.

diff --git a/ChangeLog b/ChangeLog
index 39e70e1..5c49d7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-29  Carlos O'Donell  <carlos@redhat.com>
 
+	* nptl/nptl-init.c: Include libc-internal.h.
+	(__pthread_initialize_minimal_internal): Use ROUND_UP.
+
 	* elf/ldconfig.c (search_dir): Expand comment.
 
 2014-11-29  Joseph Myers  <joseph@codesourcery.com>
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 831d762..dcb77c5 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -35,7 +35,7 @@
 #include <smp.h>
 #include <lowlevellock.h>
 #include <kernel-features.h>
-
+#include <libc-internal.h>
 
 #ifndef TLS_MULTIPLE_THREADS_IN_TCB
 /* Pointer to the corresponding variable in libc.  */
@@ -451,7 +451,7 @@ __pthread_initialize_minimal_internal (void)
     limit.rlim_cur = minstack;
 
   /* Round the resource limit up to page size.  */
-  limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz;
+  limit.rlim_cur = ALIGN_UP (limit.rlim_cur, pagesz);
   lll_lock (__default_pthread_attr_lock, LLL_PRIVATE);
   __default_pthread_attr.stacksize = limit.rlim_cur;
   __default_pthread_attr.guardsize = GLRO (dl_pagesize);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    3 +++
 nptl/nptl-init.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]