diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-24 13:33:20 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-24 13:33:20 +0000 |
| commit | 9b9bdd20462994fc2912d07aebba5d90245be302 (patch) | |
| tree | 4c163ab072f3ea272ca570f9ff9ac01ef21c4b58 | |
| parent | 2e9b342d9f01007b23604f6e54dbb8acce832f57 (diff) | |
| download | gcc-9b9bdd20462994fc2912d07aebba5d90245be302.tar.gz | |
runtime: Fix recent lfstack change on Solaris.
Reviewed-on: https://go-review.googlesource.com/14922
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228087 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/lfstack.goc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 364a5b44b0b..448e5e82bad 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -90ebe729992443dc00b19c76b28d1270e17245a4 +66c113f1af300ce27b99f18f792901d7327d6699 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/lfstack.goc b/libgo/runtime/lfstack.goc index 9eb80d900f9..5ab1baa436e 100644 --- a/libgo/runtime/lfstack.goc +++ b/libgo/runtime/lfstack.goc @@ -29,7 +29,6 @@ static inline LFNode* lfUnpack(uint64 val) { // So we use 17msb of pointers as ABA counter. # define PTR_BITS 47 # endif -# endif # define CNT_BITS (64 - PTR_BITS + 3) static inline uint64 lfPack(LFNode *node, uintptr cnt) { return ((uint64)(node)<<(64-PTR_BITS)) | (cnt&(((1<<CNT_BITS)-1))); @@ -37,6 +36,7 @@ static inline uint64 lfPack(LFNode *node, uintptr cnt) { static inline LFNode* lfUnpack(uint64 val) { return (LFNode*)((val >> CNT_BITS) << 3); } +# endif #else static inline uint64 lfPack(LFNode *node, uintptr cnt) { return ((uint64)(uintptr)(node)<<32) | cnt; |