[git commit nptl] __uClibc_main: use __pagesize to protect against recursion

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Feb 5 18:19:08 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=8a227f31655d4cf1e06ceb62d6805a88516d69d4
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/misc/internals/__uClibc_main.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 19acbe0..6e520fa 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -168,11 +168,9 @@ extern void __uClibc_init(void);
 libc_hidden_proto(__uClibc_init)
 void __uClibc_init(void)
 {
-    static smallint been_there_done_that;
-
-    if (been_there_done_that)
+    /* Don't recurse */
+    if (__pagesize)
 	return;
-    been_there_done_that++;
 
     /* Setup an initial value.  This may not be perfect, but is
      * better than  malloc using __pagesize=0 for atexit, ctors, etc.  */
-- 
1.6.3.3



More information about the uClibc-cvs mailing list