diff options
| author | joerg <joerg@pkgsrc.org> | 2013-09-21 09:40:36 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-09-21 09:40:36 +0000 |
| commit | 585c7d995d134e4c8b6bb82d5de8cd9ce3dc5904 (patch) | |
| tree | 629aad0039a44a0b8b4b366fbf95c6d76df2175e /x11 | |
| parent | 2f2a6258e76f235cf4d21be4a58ded2c7d9b5772 (diff) | |
| download | pkgsrc-585c7d995d134e4c8b6bb82d5de8cd9ce3dc5904.tar.gz | |
Use a more robust way to find the current stack frame. Fixes infinite
loop when trying to load the script binding, if build with clang.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 235725d5d8a..fb20b1b1079 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.88 2013/08/29 13:00:41 joerg Exp $ +$NetBSD: distinfo,v 1.89 2013/09/21 09:40:36 joerg Exp $ SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d @@ -41,6 +41,7 @@ SHA1 (patch-src_3rdparty_clucene_src_CLucene_config_repl__tchar.h) = 3f19ae44da3 SHA1 (patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8f43ece880786f7dc9352322d922c7fff652a36f SHA1 (patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 4f03369a9e5681f5babe8f6d5f8aaf560f45a855 SHA1 (patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h) = 41c2cf95b81157f3809acb7bd82fe7e098e2abb8 +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp) = 93d5de2e9aff4dcc2e8317296801fac7e16ec613 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h) = 66b510e7f8a3a33f9934ad77bbe00a6c24b60d74 diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp new file mode 100644 index 00000000000..c38d4c173f8 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp,v 1.1 2013/09/21 09:40:36 joerg Exp $ + +--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp.orig 2013-09-20 19:13:54.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +@@ -823,10 +823,8 @@ void Heap::markConservatively(MarkStack& + + void NEVER_INLINE Heap::markCurrentThreadConservativelyInternal(MarkStack& markStack) + { +- void* dummy; +- void* stackPointer = &dummy; + void* stackBase = currentThreadStackBase(); +- markConservatively(markStack, stackPointer, stackBase); ++ markConservatively(markStack, __builtin_frame_address(0), stackBase); + } + + #if COMPILER(GCC) |