Subzero: Second attempt at fixing MacOS 10.6 build.

src/IceCfg.h

 //===- subzero/src/IceCfg.h - Control flow graph ----------------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares the Cfg class, which represents the control flow
@@ skipping 19 matching lines @@
   Cfg &operator=(const Cfg &) = delete;
 
 public:
   ~Cfg();
 
   // TODO(stichnot): Change this to return unique_ptr<Cfg>, and plumb
   // it through the callers, to make ownership and lifetime and
   // destruction requirements more explicit.
   static Cfg *create(GlobalContext *Ctx) {
     Cfg *Func = new Cfg(Ctx);
-    CurrentCfg = Func;
+    ICE_TLS_SET_FIELD(CurrentCfg, Func);
     return Func;
   }
   // Gets a pointer to the current thread's Cfg.
-  static const Cfg *getCurrentCfg() { return CurrentCfg; }
+  static const Cfg *getCurrentCfg() {
+    return ICE_TLS_GET_FIELD(CurrentCfg, const Cfg *);
+  }
   // Gets a pointer to the current thread's Cfg's allocator.
   static ArenaAllocator<> *getCurrentCfgAllocator() {
-    assert(CurrentCfg);
-    return CurrentCfg->Allocator.get();
+    assert(ICE_TLS_GET_FIELD(CurrentCfg, const Cfg *));
+    return ICE_TLS_GET_FIELD(CurrentCfg, const Cfg *)->Allocator.get();
   }
 
   GlobalContext *getContext() const { return Ctx; }
 
   // Manage the name and return type of the function being translated.
   void setFunctionName(const IceString &Name) { FunctionName = Name; }
   IceString getFunctionName() const { return FunctionName; }
   void setReturnType(Type Ty) { ReturnType = Ty; }
 
   // Manage the "internal" attribute of the function.
@@ skipping 147 matching lines @@
   // CurrentNode is maintained during dumping/emitting just for
   // validating Variable::DefNode.  Normally, a traversal over
   // CfgNodes maintains this, but before global operations like
   // register allocation, resetCurrentNode() should be called to avoid
   // spurious validation failures.
   const CfgNode *CurrentNode;
 
   // Maintain a pointer in TLS to the current Cfg being translated.
   // This is primarily for accessing its allocator statelessly, but
   // other uses are possible.
-  ICE_ATTRIBUTE_TLS static const Cfg *CurrentCfg;
+  ICE_TLS_DECLARE_FIELD(CurrentCfg, const Cfg *);
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECFG_H