diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-09-24 13:33:20 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-09-24 13:33:20 +0000 |
| commit | 055db850c62d966e5f6b7e6f97fed1adbb87cc42 (patch) | |
| tree | 4c163ab072f3ea272ca570f9ff9ac01ef21c4b58 /libgo | |
| parent | f08e13f110744086fb7f2257f0e9bf0f8f820dfa (diff) | |
| download | gcc-055db850c62d966e5f6b7e6f97fed1adbb87cc42.tar.gz | |
runtime: Fix recent lfstack change on Solaris.
Reviewed-on: https://go-review.googlesource.com/14922
From-SVN: r228087
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/runtime/lfstack.goc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |