about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-12-03 10:00:22 +0000
committerRoland McGrath <roland@gnu.org>1995-12-03 10:00:22 +0000
commit683158e0c42dc68e3c43a32b6e5d832c5280e94e (patch)
treea760f36d0950bcd7be070a6424349341ee179f5a /sysdeps/unix/sysv/linux
parent0fe4e552917483253b68ac9800b8bd292bf3a51d (diff)
downloadglibc-683158e0c42dc68e3c43a32b6e5d832c5280e94e.tar.gz
glibc-683158e0c42dc68e3c43a32b6e5d832c5280e94e.tar.xz
glibc-683158e0c42dc68e3c43a32b6e5d832c5280e94e.zip
* sysdeps/mach/hurd/brk.c (DATA_SIZE): Bump to 128MB. cvs/libc-951204 cvs/libc-951203
	(_hurd_set_brk): Try to allocate more space when we run out.
	* sysdeps/generic/sbrk.c: If __curbrk is zero, call __brk with
	zero and examine it again.
	* sysdeps/unix/sysv/linux/i386/brk.c: New file.
	* sysdeps/unix/sysv/linux/i386/brk.S: File removed.
	* sysdeps/unix/sysv/linux/i386/sbrk.S: File removed.
	* sysdeps/unix/sysv/linux/dl-sysdep.c: New file.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/dl-sysdep.c44
-rw-r--r--sysdeps/unix/sysv/linux/i386/brk.c49
2 files changed, 93 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
new file mode 100644
index 0000000000..94e1879f2d
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
@@ -0,0 +1,44 @@
+/* Dynamic linker system dependencies for Linux.
+Copyright (C) 1995 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+/* Linux needs some special initialization, but otherwise uses
+   the generic dynamic linker system interface code.  */
+
+#include <unistd.h>
+
+#define DL_SYSDEP_INIT frob_brk ()
+
+static inline void
+frob_brk (void)
+{
+  extern void _end;
+  __brk (0);			/* Initialize the break.  */
+  if (__sbrk (0) == &_end)
+    {
+      /* The dynamic linker was run as a program, and so the initial break
+	 starts just after our bss, at &_end.  The malloc in dl-minimal.c
+	 will consume the rest of this page, so tell the kernel to move the
+	 break up that far.  When the user program examines its break, it
+	 will see this new value and not clobber our data.  */
+      size_t pg = __getpagesize ();
+      __sbrk (pg - ((&_end - (void *) 0) & pg));
+    }
+}
+
+#include <sysdeps/generic/dl-sysdep.c>
diff --git a/sysdeps/unix/sysv/linux/i386/brk.c b/sysdeps/unix/sysv/linux/i386/brk.c
new file mode 100644
index 0000000000..9963e0777b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/brk.c
@@ -0,0 +1,49 @@
+/* brk system call for Linux/i386.
+Copyright (C) 1995 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+#include <sysdep.h>
+
+void *__curbrk;
+
+int
+__brk (void *addr)
+{
+  void *newbrk, *scratch;
+
+  asm ("movl %%ebx, %1\n"	/* Save %ebx in scratch register.  */
+       "movl %3, %%ebx\n"	/* Put ADDR in %ebx to be syscall arg.  */
+       "int $0x80 # %2\n"	/* Perform the system call.  */
+       "movl %1, %%ebx\n"	/* Restore %ebx from scratch register.  */
+       : "=a" (newbrk), "=r" (scratch)
+       : "0" (SYS_ify (brk)), "g" (addr));
+
+  __curbrk = newbrk;
+
+  if (newbrk < addr)
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+
+  return 0;
+}
+weak_alias (__brk, brk)
+