aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2004-02-16 02:03:54 +0000
committerChristopher Faylor <me@cgf.cx>2004-02-16 02:03:54 +0000
commitb4f0009fe3c1a862f6cbdbab0693a32e2a3cf88c (patch)
treebcc1cff08e79958926cf1dbf65f607aa897597e6 /winsup/cygwin
parentcc9c680509923d1e442d3196e1728f9374552fd9 (diff)
downloadnewlib-b4f0009fe3c1a862f6cbdbab0693a32e2a3cf88c.zip
newlib-b4f0009fe3c1a862f6cbdbab0693a32e2a3cf88c.tar.gz
newlib-b4f0009fe3c1a862f6cbdbab0693a32e2a3cf88c.tar.bz2
* cygheap.cc (_csbrk): Report failing condition to stderr rather than strace.
Diffstat (limited to 'winsup/cygwin')
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/cygheap.cc3
-rw-r--r--winsup/cygwin/dcrt0.cc6
3 files changed, 7 insertions, 7 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e1d1fde..fd82590 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-15 Christopher Faylor <cgf@redhat.com>
+
+ * cygheap.cc (_csbrk): Report failing condition to stderr rather than
+ strace.
+
2004-02-14 Christopher Faylor <cgf@redhat.com>
* Makefile.in: Compile syscalls.o with -fomit-frame-pointer.
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index e9dc5d4..5da6fa6 100644
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -205,7 +205,8 @@ _csbrk (int sbs)
/* nothing to do */;
else if (!VirtualAlloc (prebrk, (DWORD) sbs, MEM_COMMIT, PAGE_READWRITE))
{
- malloc_printf ("couldn't commit memory for cygwin heap, %E");
+ malloc_printf ("couldn't commit memory for cygwin heap, prebrk %p, size %d, heapsize now %d, max heap size %d, %E",
+ prebrk, sbs, (char *) cygheap_max - (char *) cygheap, CYGHEAPSIZE);
__seterrno ();
cygheap_max = (char *) cygheap_max - sbs;
return NULL;
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 79d84c4..4d48314 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -743,12 +743,6 @@ dll_crt0_1 (char *)
/* Initialize SIGSEGV handling, etc. */
init_exceptions (&cygwin_except_entry);
- /* Nasty static stuff needed by newlib -- point to a local copy of
- the reent stuff.
- Note: this MUST be done here (before the forkee code) as the
- fork copy code doesn't copy the data in libccrt0.cc (that's why we
- pass in the per_process struct into the .dll from libccrt0). */
-
user_data->resourcelocks->Init ();
user_data->threadinterface->Init ();
ProtectHandle (hMainProc);