Revision: 149126 https://trac.macports.org/changeset/149126 Author: jeremyhu@macports.org Date: 2016-05-31 18:18:58 -0700 (Tue, 31 May 2016) Log Message: ----------- llvm-3.9: Bump to r271348 Revision Links: -------------- https://trac.macports.org/changeset/271348 Modified Paths: -------------- trunk/dports/lang/llvm-3.9/Portfile trunk/dports/lang/llvm-3.9/files/mp-llvm-3.9 Removed Paths: ------------- trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch Modified: trunk/dports/lang/llvm-3.9/Portfile =================================================================== --- trunk/dports/lang/llvm-3.9/Portfile 2016-06-01 00:36:06 UTC (rev 149125) +++ trunk/dports/lang/llvm-3.9/Portfile 2016-06-01 01:18:58 UTC (rev 149126) @@ -69,7 +69,7 @@ } fetch.type svn -svn.revision 270400 +svn.revision 271348 set compiler_rt_rev ${svn.revision} set libcxx_rev ${svn.revision} @@ -104,8 +104,7 @@ patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ - 0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \ - 0004-Remove-override-of-raise-abort-and-__assert_rtn.patch + 0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch if {${subport} eq "clang-${llvm_version}"} { patchfiles-append \ Deleted: trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch =================================================================== --- trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch 2016-06-01 00:36:06 UTC (rev 149125) +++ trunk/dports/lang/llvm-3.9/files/0004-Remove-override-of-raise-abort-and-__assert_rtn.patch 2016-06-01 01:18:58 UTC (rev 149126) @@ -1,62 +0,0 @@ -From 744b351ef28eff3ea4fb1c40e81e8f8e1c034d79 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 16 Jan 2016 10:19:07 -0800 -Subject: [PATCH 4/4] Remove override of raise(), abort(), and __assert_rtn() - -Lion (10.7) and newer versions of OS X implement abort() using pthread_kill(). - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - lib/Support/Unix/Signals.inc | 39 --------------------------------------- - 1 file changed, 39 deletions(-) - -diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc -index 4d687b3..f2797a0 100644 ---- llvm_master/lib/Support/Unix/Signals.inc -+++ macports_master/lib/Support/Unix/Signals.inc -@@ -411,42 +411,3 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) { - } - #endif - } -- -- --/***/ -- --// On Darwin, raise sends a signal to the main thread instead of the current --// thread. This has the unfortunate effect that assert() and abort() will end up --// bypassing our crash recovery attempts. We work around this for anything in --// the same linkage unit by just defining our own versions of the assert handler --// and abort. -- --#if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES) -- --#include <signal.h> --#include <pthread.h> -- --int raise(int sig) { -- return pthread_kill(pthread_self(), sig); --} -- --void __assert_rtn(const char *func, -- const char *file, -- int line, -- const char *expr) { -- if (func) -- fprintf(stderr, "Assertion failed: (%s), function %s, file %s, line %d.\n", -- expr, func, file, line); -- else -- fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n", -- expr, file, line); -- abort(); --} -- --void abort() { -- raise(SIGABRT); -- usleep(1000); -- __builtin_trap(); --} -- --#endif --- -2.7.0 - Modified: trunk/dports/lang/llvm-3.9/files/mp-llvm-3.9 =================================================================== --- trunk/dports/lang/llvm-3.9/files/mp-llvm-3.9 2016-06-01 00:36:06 UTC (rev 149125) +++ trunk/dports/lang/llvm-3.9/files/mp-llvm-3.9 2016-06-01 01:18:58 UTC (rev 149126) @@ -25,6 +25,6 @@ bin/llvm-symbolizer-mp-3.9 bin/llvm-tblgen-mp-3.9 - -bin/macho-dump-mp-3.9 +- bin/opt-mp-3.9 bin/llvm-tblgen-mp-3.9