Change sbrk() to take an int rather than an intptr_t (following the OpenBSD way

rather than the Linux way; various non-C bits of the ACK assume it takes an
int, so it's cleaner).

diff --git a/plat/cpm/include/unistd.h b/plat/cpm/include/unistd.h
index 2af9db9..ea4f51c 100644 (file)
--- a/plat/cpm/include/unistd.h
+++ b/plat/cpm/include/unistd.h
@@ -37,7 +37,7 @@ extern char** environ;
 
 extern void _exit(int);
 extern pid_t getpid(void);
-extern void* sbrk(intptr_t increment);
+extern void* sbrk(int increment);
 extern int isatty(int d);
 extern off_t lseek(int fildes, off_t offset, int whence);
 extern int close(int d);

diff --git a/plat/cpm/libsys/brk.c b/plat/cpm/libsys/brk.c
index e29dc56..0b83b25 100644 (file)
--- a/plat/cpm/libsys/brk.c
+++ b/plat/cpm/libsys/brk.c
@@ -28,7 +28,7 @@ int brk(void* newend)
        return 0;
 }
 
-void* sbrk(intptr_t increment)
+void* sbrk(int increment)
 {
        char* old;
        

diff --git a/plat/linux/libsys/sbrk.c b/plat/linux/libsys/sbrk.c
index 0948a41..7aeeecb 100644 (file)
--- a/plat/linux/libsys/sbrk.c
+++ b/plat/linux/libsys/sbrk.c
@@ -22,7 +22,7 @@ int brk(void* end)
        return e;
 }
 
-void* sbrk(intptr_t increment)
+void* sbrk(int increment)
 {
        char* old;
        char* new;

diff --git a/plat/linux386/include/unistd.h b/plat/linux386/include/unistd.h
index 715e321..35dc8dd 100644 (file)
--- a/plat/linux386/include/unistd.h
+++ b/plat/linux386/include/unistd.h
@@ -67,7 +67,7 @@ extern char** environ;
 extern void _exit(int);
 extern pid_t getpid(void);
 extern int brk(void* ptr);
-extern void* sbrk(intptr_t increment);
+extern void* sbrk(int increment);
 extern int isatty(int d);
 
 /* Signal handling */

diff --git a/plat/linux68k/include/unistd.h b/plat/linux68k/include/unistd.h
index 5cbdc1b..307192f 100644 (file)
--- a/plat/linux68k/include/unistd.h
+++ b/plat/linux68k/include/unistd.h
@@ -65,7 +65,7 @@ extern char** environ;
 extern void _exit(int);
 extern pid_t getpid(void);
 extern int brk(void* ptr);
-extern void* sbrk(intptr_t increment);
+extern void* sbrk(int increment);
 extern int isatty(int d);
 
 /* Signal handling */

diff --git a/plat/linuxppc/include/unistd.h b/plat/linuxppc/include/unistd.h
index 5cbdc1b..307192f 100644 (file)
--- a/plat/linuxppc/include/unistd.h
+++ b/plat/linuxppc/include/unistd.h
@@ -65,7 +65,7 @@ extern char** environ;
 extern void _exit(int);
 extern pid_t getpid(void);
 extern int brk(void* ptr);
-extern void* sbrk(intptr_t increment);
+extern void* sbrk(int increment);
 extern int isatty(int d);
 
 /* Signal handling */

diff --git a/plat/pc86/include/unistd.h b/plat/pc86/include/unistd.h
index 2af9db9..ea4f51c 100644 (file)
--- a/plat/pc86/include/unistd.h
+++ b/plat/pc86/include/unistd.h
@@ -37,7 +37,7 @@ extern char** environ;
 
 extern void _exit(int);
 extern pid_t getpid(void);
-extern void* sbrk(intptr_t increment);
+extern void* sbrk(int increment);
 extern int isatty(int d);
 extern off_t lseek(int fildes, off_t offset, int whence);
 extern int close(int d);

diff --git a/plat/pc86/libsys/brk.c b/plat/pc86/libsys/brk.c
index 02e2133..952a9c7 100644 (file)
--- a/plat/pc86/libsys/brk.c
+++ b/plat/pc86/libsys/brk.c
@@ -28,7 +28,7 @@ int brk(void* newend)
        return 0;
 }
 
-void* sbrk(intptr_t increment)
+void* sbrk(int increment)
 {
        char* old;
        

diff --git a/plat/qemuppc/include/unistd.h b/plat/qemuppc/include/unistd.h
index 5cbdc1b..307192f 100644 (file)
--- a/plat/qemuppc/include/unistd.h
+++ b/plat/qemuppc/include/unistd.h
@@ -65,7 +65,7 @@ extern char** environ;
 extern void _exit(int);
 extern pid_t getpid(void);
 extern int brk(void* ptr);
-extern void* sbrk(intptr_t increment);
+extern void* sbrk(int increment);
 extern int isatty(int d);
 
 /* Signal handling */

diff --git a/plat/qemuppc/libsys/brk.c b/plat/qemuppc/libsys/brk.c
index 02e2133..952a9c7 100644 (file)
--- a/plat/qemuppc/libsys/brk.c
+++ b/plat/qemuppc/libsys/brk.c
@@ -28,7 +28,7 @@ int brk(void* newend)
        return 0;
 }
 
-void* sbrk(intptr_t increment)
+void* sbrk(int increment)
 {
        char* old;
        

diff --git a/plat/rpi/include/unistd.h b/plat/rpi/include/unistd.h
index a4d0c45..196b823 100644 (file)
--- a/plat/rpi/include/unistd.h
+++ b/plat/rpi/include/unistd.h
@@ -59,7 +59,7 @@ extern char** environ;
 
 extern void _exit(int);
 extern pid_t getpid(void);
-extern void* sbrk(intptr_t increment);
+extern void* sbrk(int increment);
 extern int isatty(int d);
 extern off_t lseek(int fildes, off_t offset, int whence);
 extern int close(int d);

diff --git a/plat/rpi/libsys/brk.c b/plat/rpi/libsys/brk.c
index 36c7d4a..171b8e5 100644 (file)
--- a/plat/rpi/libsys/brk.c
+++ b/plat/rpi/libsys/brk.c
@@ -30,7 +30,7 @@ int brk(void* newend)
        return 0;
 }
 
-void* sbrk(intptr_t increment)
+void* sbrk(int increment)
 {
        char* old;