diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
| commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
| tree | ba71646a10b518372d110532d86fcf0b98edc14f /src/pkg/runtime/stack.h | |
| parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
| parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
| download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz | |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'src/pkg/runtime/stack.h')
| -rw-r--r-- | src/pkg/runtime/stack.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pkg/runtime/stack.h b/src/pkg/runtime/stack.h index 296eb688d..18ab30b69 100644 --- a/src/pkg/runtime/stack.h +++ b/src/pkg/runtime/stack.h @@ -77,7 +77,8 @@ enum { // If the amount needed for the splitting frame + StackExtra // is less than this number, the stack will have this size instead. StackMin = 8192, - FixedStack = StackMin + StackSystem, + StackSystemRounded = StackSystem + (-StackSystem & (StackMin-1)), + FixedStack = StackMin + StackSystemRounded, // Functions that need frames bigger than this use an extra // instruction to do the stack split check, to avoid overflow @@ -102,7 +103,7 @@ enum { // The assumed size of the top-of-stack data block. // The actual size can be smaller than this but cannot be larger. // Checked in proc.c's runtime.malg. - StackTop = 96, + StackTop = 88, }; // Goroutine preemption request. |