From 656e11a924eb4555d6c5650d6fa8d5ae2049cc44 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 29 Jan 2013 13:58:18 +0000
Subject: [PATCH] runtime: SPARCv9 fixes for lfstack.

From Rainer Orth.

From-SVN: r195534
---
 libgo/runtime/lfstack.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libgo/runtime/lfstack.c b/libgo/runtime/lfstack.c
index 783595abe7ab..00b60081e88b 100644
--- a/libgo/runtime/lfstack.c
+++ b/libgo/runtime/lfstack.c
@@ -19,7 +19,10 @@
 
 #if __SIZEOF_POINTER__ == 8 && defined(__sparc__)
 // SPARC64 uses all 64 bits of virtual addresses.  Use low-order three
-bits as ABA counter.
+// bits as ABA counter.
+#undef PTR_BITS
+#undef CNT_MASK
+#undef PTR_MASK
 #define PTR_BITS 0
 #define CNT_MASK 7
 #define PTR_MASK ((0ull-1)<<3)