diff options
-rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
-rw-r--r-- | libgo/runtime/go-context.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 73c432c..5a97fab 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -4150db0e4613043e38a146a971e5b0dcacad7c2a +2e623bff8a5855bb6268c69bb04eb37cac8f2dc2 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-context.S b/libgo/runtime/go-context.S index 0cd2242..8beeebf 100644 --- a/libgo/runtime/go-context.S +++ b/libgo/runtime/go-context.S @@ -57,7 +57,7 @@ __go_makecontext: addq %rcx, %rdx // Align the SP, and push a dummy return address. - andq $~0xfULL, %rdx + andq $~0xf, %rdx subq $8, %rdx movq $0, (%rdx) |