[commit: ghc] ghc-7.8: Fix check for TLS support in Storage.c (f321edd)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/f321edd759841d5328a9d4fee7f291e21446acc1/ghc

>---------------------------------------------------------------

commit f321edd759841d5328a9d4fee7f291e21446acc1
Author: Austin Seipp <austin at well-typed.com>
Date:   Sun Feb 16 18:49:43 2014 -0600

    Fix check for TLS support in Storage.c
    
    This should have manifested earlier, but for some reason it only seemed
    to trigger on Mavericks.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    
    (cherry picked from commit c83eabf37b884398d911609e46707df771c3fde9)


>---------------------------------------------------------------

f321edd759841d5328a9d4fee7f291e21446acc1
 rts/sm/Storage.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
index c7126fe..df5f4b3 100644
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@ -237,7 +237,7 @@ void storageAddCapabilities (nat from, nat to)
         }
     }
 
-#if defined(THREADED_RTS) && defined(llvm_CC_FLAVOR)
+#if defined(THREADED_RTS) && defined(llvm_CC_FLAVOR) && (CC_SUPPORTS_TLS == 0)
     newThreadLocalKey(&gctKey);
 #endif
 
@@ -261,7 +261,7 @@ freeStorage (rtsBool free_heap)
     closeMutex(&sm_mutex);
 #endif
     stgFree(nurseries);
-#if defined(THREADED_RTS) && defined(llvm_CC_FLAVOR)
+#if defined(THREADED_RTS) && defined(llvm_CC_FLAVOR) && (CC_SUPPORTS_TLS == 0)
     freeThreadLocalKey(&gctKey);
 #endif
     freeGcThreads();