s/___brk_addr/__curbrk/g

Some utilities, such as valgrind, have a legitimate reason to know the address
of the current brk.  Since we know such utils will peek under our skirt, we
might as well give them what they expect and not use a gratuitously different
symbol name.
 -Erik

3 files changed, 17 insertions, 18 deletions

diff --git a/libc/sysdeps/linux/cris/__init_brk.c b/libc/sysdeps/linux/cris/__init_brk.c
index 15decd12b..211ae9136 100644
--- a/libc/sysdeps/linux/cris/__init_brk.c
+++ b/libc/sysdeps/linux/cris/__init_brk.c
@@ -5,25 +5,24 @@
 #include <errno.h>
 #include "sysdep.h"
 
-void * ___brk_addr = 0;
+void * __curbrk = 0;
 
 int
 __init_brk (void)
 {
-    if (___brk_addr == 0) {
-	    /* 
-		 * Notice that we don't need to save/restore the GOT
+    if (__curbrk == 0) {
+	    /* Notice that we don't need to save/restore the GOT
 	     * register since that is not call clobbered by the syscall.
 	     */
 	    asm ("clear.d $r10\n\t"
 		 "movu.w " STR(__NR_brk) ",$r9\n\t"
 		 "break 13\n\t"
 		 "move.d $r10, %0"
-		 : "=r" (___brk_addr)
+		 : "=r" (__curbrk)
 		 :
 		 : "r9", "r10");
-	    
-	    if (___brk_addr == 0) {
+
+	    if (__curbrk == 0) {
 		    __set_errno(ENOMEM);
 		    return -1;
 	    }
diff --git a/libc/sysdeps/linux/cris/brk.c b/libc/sysdeps/linux/cris/brk.c
index d94f85726..0bc08d5e6 100644
--- a/libc/sysdeps/linux/cris/brk.c
+++ b/libc/sysdeps/linux/cris/brk.c
@@ -3,14 +3,14 @@
 #include <errno.h>
 #include "sysdep.h"
 
-extern void * ___brk_addr;
+extern void * __curbrk;
 
 extern int __init_brk (void);
 
 int brk(void * end_data_seg)
 {
 	if (__init_brk () == 0) {
-		/* 
+		/*
 		 * Notice that we don't need to save/restore the GOT
 		 * register since that is not call clobbered by the syscall.
 		 */
@@ -18,14 +18,14 @@ int brk(void * end_data_seg)
 		     "movu.w " STR(__NR_brk) ",$r9\n\t"
 		     "break 13\n\t"
 		     "move.d $r10, %0"
-		     : "=r" (___brk_addr)
+		     : "=r" (__curbrk)
 		     : "g" (end_data_seg)
 		     : "r9", "r10");
-		
-		if (___brk_addr == end_data_seg)
+
+		if (__curbrk == end_data_seg)
 			return 0;
 		__set_errno(ENOMEM);
 	}
 	return -1;
-	
+
 }
diff --git a/libc/sysdeps/linux/cris/sbrk.c b/libc/sysdeps/linux/cris/sbrk.c
index cec93420e..1ed1d9df9 100644
--- a/libc/sysdeps/linux/cris/sbrk.c
+++ b/libc/sysdeps/linux/cris/sbrk.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include "sysdep.h"
 
-extern void * ___brk_addr;
+extern void * __curbrk;
 
 extern int __init_brk (void);
 
@@ -13,9 +13,9 @@ void *
 sbrk(intptr_t increment)
 {
 	if (__init_brk () == 0) {
-		void * tmp = ___brk_addr + increment;
+		void * tmp = __curbrk + increment;
 
-		/* 
+		/*
 		 * Notice that we don't need to save/restore the GOT
 		 * register since that is not call clobbered by the syscall.
 		 */
@@ -23,11 +23,11 @@ sbrk(intptr_t increment)
 		     "movu.w " STR(__NR_brk) ",$r9\n\t"
 		     "break 13\n\t"
 		     "move.d $r10, %0"
-		     : "=r" (___brk_addr)
+		     : "=r" (__curbrk)
 		     : "g" (tmp)
 		     : "r9", "r10");
 
-		if (___brk_addr == tmp)
+		if (__curbrk == tmp)
 			return tmp - increment;
 		__set_errno(ENOMEM);
 		return ((void *) -1);