runtime: Fixes for Alpha.
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 7 Nov 2013 23:38:47 +0000 (23:38 +0000)
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 7 Nov 2013 23:38:47 +0000 (23:38 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204551 138bc75d-0d04-0410-961f-82ee72b054a4

libgo/runtime/mheap.c
libgo/runtime/proc.c

index 1b6cfd3..62070f3 100644 (file)
@@ -68,6 +68,7 @@ runtime_MHeap_Init(MHeap *h)
 void
 runtime_MHeap_MapSpans(MHeap *h)
 {
+       uintptr pagesize;
        uintptr n;
 
        // Map spans array, PageSize at a time.
@@ -76,6 +77,8 @@ runtime_MHeap_MapSpans(MHeap *h)
                n -= (uintptr)h->arena_start;
        n = n / PageSize * sizeof(h->spans[0]);
        n = ROUND(n, PageSize);
+       pagesize = getpagesize();
+       n = ROUND(n, pagesize);
        if(h->spans_mapped >= n)
                return;
        runtime_SysMap((byte*)h->spans + h->spans_mapped, n - h->spans_mapped, &mstats.other_sys);
index ab7cde4..7011f14 100644 (file)
@@ -2098,7 +2098,7 @@ runtime_malg(int32 stacksize, byte** ret_stack, size_t* ret_stacksize)
                __splitstack_block_signals_context(&newg->stack_context[0],
                                                   &dont_block_signals, nil);
 #else
-               *ret_stack = runtime_mallocgc(stacksize, FlagNoProfiling|FlagNoGC, 0, 0);
+               *ret_stack = runtime_mallocgc(stacksize, 0, FlagNoProfiling|FlagNoGC);
                *ret_stacksize = stacksize;
                newg->gcinitial_sp = *ret_stack;
                newg->gcstack_size = stacksize;