From 055db850c62d966e5f6b7e6f97fed1adbb87cc42 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 24 Sep 2015 13:33:20 +0000
Subject: [PATCH] runtime: Fix recent lfstack change on Solaris.

    Reviewed-on: https://go-review.googlesource.com/14922

From-SVN: r228087
---
 gcc/go/gofrontend/MERGE   | 2 +-
 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;