[101965] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Tue Jan 22 23:36:50 PST 2013


Revision: 101965
          https://trac.macports.org/changeset/101965
Author:   jeremyhu at macports.org
Date:     2013-01-22 23:36:50 -0800 (Tue, 22 Jan 2013)
Log Message:
-----------
{clang,dragonegg,llvm}-3.3: Bump to r173123

Revision Links:
--------------
    https://trac.macports.org/changeset/173123

Modified Paths:
--------------
    trunk/dports/lang/dragonegg-3.3/Portfile
    trunk/dports/lang/llvm-3.3/Portfile

Removed Paths:
-------------
    trunk/dports/lang/llvm-3.3/files/asan-pthread_workqueue.patch

Modified: trunk/dports/lang/dragonegg-3.3/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.3/Portfile	2013-01-23 07:07:33 UTC (rev 101964)
+++ trunk/dports/lang/dragonegg-3.3/Portfile	2013-01-23 07:36:50 UTC (rev 101965)
@@ -29,7 +29,7 @@
 depends_skip_archcheck-append gcc${gcc_version}
 
 fetch.type              svn
-svn.revision            171297
+svn.revision            173123
 version                 ${llvm_version}-r${svn.revision}
 worksrcdir              trunk
 svn.url                 http://llvm.org/svn/llvm-project/dragonegg/trunk

Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile	2013-01-23 07:07:33 UTC (rev 101964)
+++ trunk/dports/lang/llvm-3.3/Portfile	2013-01-23 07:36:50 UTC (rev 101965)
@@ -49,7 +49,7 @@
 }
 
 fetch.type              svn
-svn.revision            171297
+svn.revision            173123
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
@@ -81,8 +81,7 @@
     }
 
     patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
-                         0001-Comment-out-SL-cctools-workaround.patch \
-                         asan-pthread_workqueue.patch
+                         0001-Comment-out-SL-cctools-workaround.patch
 
     build.target        clang-only
     destroot.target     install-clang

Deleted: trunk/dports/lang/llvm-3.3/files/asan-pthread_workqueue.patch
===================================================================
--- trunk/dports/lang/llvm-3.3/files/asan-pthread_workqueue.patch	2013-01-23 07:07:33 UTC (rev 101964)
+++ trunk/dports/lang/llvm-3.3/files/asan-pthread_workqueue.patch	2013-01-23 07:36:50 UTC (rev 101965)
@@ -1,79 +0,0 @@
---- a/projects/compiler-rt/lib/asan/asan_mac.cc.orig	2012-12-31 14:29:07.000000000 -0800
-+++ b/projects/compiler-rt/lib/asan/asan_mac.cc	2013-01-02 13:26:59.000000000 -0800
-@@ -256,9 +256,6 @@ mach_error_t __interception_deallocate_i
- // The implementation details are at
- //   http://libdispatch.macosforge.org/trac/browser/trunk/src/queue.c
- 
--typedef void* pthread_workqueue_t;
--typedef void* pthread_workitem_handle_t;
--
- typedef void* dispatch_group_t;
- typedef void* dispatch_queue_t;
- typedef void* dispatch_source_t;
-@@ -289,9 +286,6 @@ void dispatch_barrier_async_f(dispatch_q
-                               dispatch_function_t func);
- void dispatch_group_async_f(dispatch_group_t group, dispatch_queue_t dq,
-                             void *ctxt, dispatch_function_t func);
--int pthread_workqueue_additem_np(pthread_workqueue_t workq,
--    void *(*workitem_func)(void *), void * workitem_arg,
--    pthread_workitem_handle_t * itemhandlep, unsigned int *gencountp);
- }  // extern "C"
- 
- static ALWAYS_INLINE
-@@ -446,43 +440,6 @@ INTERCEPTOR(void, dispatch_source_set_ev
- }
- #endif
- 
--// The following stuff has been extremely helpful while looking for the
--// unhandled functions that spawned jobs on Chromium shutdown. If the verbosity
--// level is 2 or greater, we wrap pthread_workqueue_additem_np() in order to
--// find the points of worker thread creation (each of such threads may be used
--// to run several tasks, that's why this is not enough to support the whole
--// libdispatch API.
--extern "C"
--void *wrap_workitem_func(void *arg) {
--  if (flags()->verbosity >= 2) {
--    Report("wrap_workitem_func: %p, pthread_self: %p\n", arg, pthread_self());
--  }
--  asan_block_context_t *ctxt = (asan_block_context_t*)arg;
--  worker_t fn = (worker_t)(ctxt->func);
--  void *result =  fn(ctxt->block);
--  GET_STACK_TRACE_THREAD;
--  asan_free(arg, &stack, FROM_MALLOC);
--  return result;
--}
--
--INTERCEPTOR(int, pthread_workqueue_additem_np, pthread_workqueue_t workq,
--    void *(*workitem_func)(void *), void * workitem_arg,
--    pthread_workitem_handle_t * itemhandlep, unsigned int *gencountp) {
--  GET_STACK_TRACE_THREAD;
--  asan_block_context_t *asan_ctxt =
--      (asan_block_context_t*) asan_malloc(sizeof(asan_block_context_t), &stack);
--  asan_ctxt->block = workitem_arg;
--  asan_ctxt->func = (dispatch_function_t)workitem_func;
--  asan_ctxt->parent_tid = asanThreadRegistry().GetCurrentTidOrInvalid();
--  if (flags()->verbosity >= 2) {
--    Report("pthread_workqueue_additem_np: %p\n", asan_ctxt);
--    PRINT_CURRENT_STACK();
--  }
--  return REAL(pthread_workqueue_additem_np)(workq, wrap_workitem_func,
--                                            asan_ctxt, itemhandlep,
--                                            gencountp);
--}
--
- // See http://opensource.apple.com/source/CF/CF-635.15/CFString.c
- int __CFStrIsConstant(CFStringRef str) {
-   CFRuntimeBase *base = (CFRuntimeBase*)str;
-@@ -514,12 +471,6 @@ void InitializeMacInterceptors() {
-   CHECK(INTERCEPT_FUNCTION(dispatch_after_f));
-   CHECK(INTERCEPT_FUNCTION(dispatch_barrier_async_f));
-   CHECK(INTERCEPT_FUNCTION(dispatch_group_async_f));
--  // We don't need to intercept pthread_workqueue_additem_np() to support the
--  // libdispatch API, but it helps us to debug the unsupported functions. Let's
--  // intercept it only during verbose runs.
--  if (flags()->verbosity >= 2) {
--    CHECK(INTERCEPT_FUNCTION(pthread_workqueue_additem_np));
--  }
-   // Normally CFStringCreateCopy should not copy constant CF strings.
-   // Replacing the default CFAllocator causes constant strings to be copied
-   // rather than just returned, which leads to bugs in big applications like
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130122/ea88a396/attachment.html>


More information about the macports-changes mailing list