* cygheap.cc (_cygheap_mid): Drop unneeded section attribute.

(cygheap_init): Just zero cygheap structure.
* cygwin.sc: Keep 16 byte alignment but drop all other alignments related to
cygheap.  Eliminate unused __cygheap_end1.
This commit is contained in:
Christopher Faylor 2011-02-11 16:05:26 +00:00
parent 5ec0839c12
commit cc25fb3641
3 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,10 @@
2011-02-11 Christopher Faylor <me+cygwin@cgf.cx>
* cygheap.cc (_cygheap_mid): Drop unneeded section attribute.
(cygheap_init): Just zero cygheap structure.
* cygwin.sc: Keep 16 byte alignment but drop all other alignments
related to cygheap. Eliminate unused __cygheap_end1.
2011-02-11 Corinna Vinschen <corinna@vinschen.de> 2011-02-11 Corinna Vinschen <corinna@vinschen.de>
* cygwin.sc: Raise default cygheap size to 1 Meg. Set alignment to * cygwin.sc: Raise default cygheap size to 1 Meg. Set alignment to

View File

@ -33,7 +33,7 @@ static mini_cygheap NO_COPY cygheap_at_start =
init_cygheap NO_COPY *cygheap = (init_cygheap *) &cygheap_at_start; init_cygheap NO_COPY *cygheap = (init_cygheap *) &cygheap_at_start;
void NO_COPY *cygheap_max; void NO_COPY *cygheap_max;
extern "C" char _cygheap_mid[] __attribute__((section(".cygheap"))); extern "C" char _cygheap_mid[];
extern "C" char _cygheap_end[]; extern "C" char _cygheap_end[];
static NO_COPY muto cygheap_protect; static NO_COPY muto cygheap_protect;
@ -159,7 +159,7 @@ cygheap_init ()
if (cygheap == &cygheap_at_start) if (cygheap == &cygheap_at_start)
{ {
cygheap = (init_cygheap *) memset (_cygheap_start, 0, cygheap = (init_cygheap *) memset (_cygheap_start, 0,
_cygheap_mid - _cygheap_start); sizeof (*cygheap));
cygheap_max = cygheap; cygheap_max = cygheap;
_csbrk (sizeof (*cygheap)); _csbrk (sizeof (*cygheap));
/* Default locale settings. */ /* Default locale settings. */

View File

@ -100,17 +100,13 @@ SECTIONS
SORT(*)(.idata$7) SORT(*)(.idata$7)
. = ALIGN(16); . = ALIGN(16);
__cygheap_start = ABSOLUTE(.); __cygheap_start = ABSOLUTE(.);
. = ALIGN(0x10000);
} }
.cygheap ALIGN(__section_alignment__) : .cygheap ALIGN(__section_alignment__) :
{ {
__cygheap_mid = .; __cygheap_mid = .;
*(.cygheap)
. = . + (1024 * 1024); . = . + (1024 * 1024);
. = ALIGN(0x10000); __cygheap_end = ABSOLUTE(.);
} }
__cygheap_end = ABSOLUTE(.);
__cygheap_end1 = __cygheap_mid + SIZEOF(.cygheap);
/DISCARD/ : /DISCARD/ :
{ {
*(.debug$S) *(.debug$S)