2006-11-02 George Staikos <staikos@kde.org>

        Reviewed by Maciej.

        * collector.cpp:
        Remove a deprecated pthreads call.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17566 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6214536dac4d05fab6ab73ab1f26ab2fe488cbc6..e32e195251fbe8119fd868c2e1d0552f243259e9 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-02  George Staikos <staikos@kde.org>
+
+        Reviewed by Maciej.
+
+        * collector.cpp:
+        Remove a deprecated pthreads call.
+
 2006-11-02  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Maciej, landed by Anders.

diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index 108c9957a0fcdceff5df3be9d3b9dbe30d05a7e3..31eb4aa480d3746f9223d1d5b07503cade397212 100644 (file)
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -332,10 +332,11 @@ void Collector::markCurrentThreadConservatively()
         // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
         pthread_getattr_np(thread, &sattr);
 #endif
-        // Should work but fails on Linux (?)
-        //  pthread_attr_getstack(&sattr, &stackBase, &stackSize);
-        pthread_attr_getstackaddr(&sattr, &stackBase);
+        size_t stackSize;
+        int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize);
+        (void)rc; // FIXME: deal with error code somehow?  seems fatal...
         assert(stackBase);
+        stackBase = (void*)(size_t(stackBase) + stackSize);
         stackThread = thread;
     }
 #else