JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dll_init.cc (dll_list::alloc): Add DLL name to fabort output. Fix 

fabort string in case of bss start.
This commit is contained in:
Corinna Vinschen 2012-02-08 14:41:51 +00:00
parent 9553860f41
commit 25e67cd634
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-08 Corinna Vinschen <corinna@vinschen.de>
* dll_init.cc (dll_list::alloc): Add DLL name to fabort output. Fix
fabort string in case of bss start.
2012-02-08 Corinna Vinschen <corinna@vinschen.de> 2012-02-08 Corinna Vinschen <corinna@vinschen.de>
* include/sys/sysmacros.h: Include sys/types.h. * include/sys/sysmacros.h: Include sys/types.h.

16
winsup/cygwin/dll_init.cc
View File

@ -149,17 +149,17 @@ dll_list::alloc (HINSTANCE h, per_process *p, dll_type type)
else else
{ {
if (d->p.data_start != p->data_start) if (d->p.data_start != p->data_start)
fabort ("data segment start: parent(%p) != child(%p)", fabort ("%W: data segment start: parent(%p) != child(%p)",
d->p.data_start, p->data_start); name, d->p.data_start, p->data_start);
else if (d->p.data_end != p->data_end) else if (d->p.data_end != p->data_end)
fabort ("data segment end: parent(%p) != child(%p)", fabort ("%W: data segment end: parent(%p) != child(%p)",
d->p.data_end, p->data_end); name, d->p.data_end, p->data_end);
else if (d->p.bss_start != p->bss_start) else if (d->p.bss_start != p->bss_start)
fabort ("data segment start: parent(%p) != child(%p)", fabort ("%W: bss segment start: parent(%p) != child(%p)",
d->p.bss_start, p->bss_start); name, d->p.bss_start, p->bss_start);
else if (d->p.bss_end != p->bss_end) else if (d->p.bss_end != p->bss_end)
fabort ("bss segment end: parent(%p) != child(%p)", fabort ("%W: bss segment end: parent(%p) != child(%p)",
d->p.bss_end, p->bss_end); name, d->p.bss_end, p->bss_end);
} }
d->p = p; d->p = p;
} }