[144733] trunk/dports/lang/llvm-3.8
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 16 12:27:08 PST 2016
Revision: 144733
https://trac.macports.org/changeset/144733
Author: jeremyhu at macports.org
Date: 2016-01-16 12:27:08 -0800 (Sat, 16 Jan 2016)
Log Message:
-----------
llvm-3.8: Bump to current master and remove raise(), abort(), and __assert_rtn() overrides
Modified Paths:
--------------
trunk/dports/lang/llvm-3.8/Portfile
trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch
Added Paths:
-----------
trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch
Modified: trunk/dports/lang/llvm-3.8/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.8/Portfile 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/Portfile 2016-01-16 20:27:08 UTC (rev 144733)
@@ -69,17 +69,17 @@
}
fetch.type svn
-svn.revision 257459
+svn.revision 257997
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
set clang-modernize_rev ${svn.revision}
version ${llvm_version}-r${svn.revision}
revision 1
-worksrcdir trunk
-svn.url https://llvm.org/svn/llvm-project/llvm/trunk
-#worksrcdir release_${llvm_version_no_dot}
-#svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
+#worksrcdir trunk
+#svn.url https://llvm.org/svn/llvm-project/llvm/trunk
+worksrcdir release_${llvm_version_no_dot}
+svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
default_variants-append +assertions
default_variants-append +debug
@@ -109,6 +109,7 @@
0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \
0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch \
+ 0007-Remove-override-of-raise-abort-and-__assert_rtn.patch \
llvm-skip-unittests.patch
if {${subport} eq "clang-${llvm_version}"} {
Modified: trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2016-01-16 20:27:08 UTC (rev 144733)
@@ -1,7 +1,7 @@
-From f16c7c7c57b0c1c0c319dcfd2fc75b6f74754d77 Mon Sep 17 00:00:00 2001
+From 6bba00c71e59ac9cd2db1e630fe4a94b7451a220 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 09:03:43 -0800
-Subject: [PATCH 1/6] Set the Mach-O CPU Subtype to ppc7400 when targeting
+Subject: [PATCH 1/7] Set the Mach-O CPU Subtype to ppc7400 when targeting
Leopard
http://llvm.org/bugs/show_bug.cgi?id=18463
@@ -11,10 +11,10 @@
lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
-diff --git llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+diff --git llvm_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
index b6dd595..11a7953 100644
---- llvm_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
-+++ macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+--- llvm_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
++++ macports_release_38/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
@@ -201,16 +201,23 @@ public:
// FIXME: This should be in a separate file.
namespace {
@@ -51,5 +51,5 @@
uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(TT.getOS());
bool IsLittleEndian = TT.getArch() == Triple::ppc64le;
--
-2.4.5
+2.7.0
Modified: trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch 2016-01-16 20:27:08 UTC (rev 144733)
@@ -1,7 +1,7 @@
-From 926188bfdadd442ec13728899368293231fd94d7 Mon Sep 17 00:00:00 2001
+From 1c7867cfc6dd0ebf1450001d634a7e7e0a313e6a Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun, 18 Jan 2015 11:18:13 -0800
-Subject: [PATCH 2/6] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
+Subject: [PATCH 2/7] Define EXC_MASK_CRASH and MACH_EXCEPTION_CODES if they're
not defined in the SDK
The 10.4 SDK does not define these macros
@@ -11,11 +11,11 @@
lib/Support/Unix/Signals.inc | 9 +++++++++
1 file changed, 9 insertions(+)
-diff --git llvm_master/lib/Support/Unix/Signals.inc macports_master/lib/Support/Unix/Signals.inc
-index bfe2a3a..adcec0c 100644
---- llvm_master/lib/Support/Unix/Signals.inc
-+++ macports_master/lib/Support/Unix/Signals.inc
-@@ -502,6 +502,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) {
+diff --git llvm_release_38/lib/Support/Unix/Signals.inc macports_release_38/lib/Support/Unix/Signals.inc
+index 061cdb3..4d687b3 100644
+--- llvm_release_38/lib/Support/Unix/Signals.inc
++++ macports_release_38/lib/Support/Unix/Signals.inc
+@@ -387,6 +387,15 @@ void llvm::sys::PrintStackTraceOnErrorSignal(bool DisableCrashReporting) {
AddSignalHandler(PrintStackTraceSignalHandler, nullptr);
#if defined(__APPLE__) && defined(ENABLE_CRASH_OVERRIDES)
@@ -32,5 +32,5 @@
if (DisableCrashReporting || getenv("LLVM_DISABLE_CRASH_REPORT")) {
mach_port_t self = mach_task_self();
--
-2.4.5
+2.7.0
Modified: trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0003-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2016-01-16 20:27:08 UTC (rev 144733)
@@ -1,17 +1,17 @@
-From f6ed98762356a8013899b2b4deee7584c2e1c396 Mon Sep 17 00:00:00 2001
+From 6719d80f133381ed543e73ef853ab326e0445657 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 16:33:09 -0800
-Subject: [PATCH 3/6] MacPorts Only: Update install targets for clang subport
+Subject: [PATCH 3/7] MacPorts Only: Update install targets for clang subport
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
---
Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git llvm_master/Makefile macports_master/Makefile
+diff --git llvm_release_38/Makefile macports_release_38/Makefile
index 2b9468a..19fbfdc 100644
---- llvm_master/Makefile
-+++ macports_master/Makefile
+--- llvm_release_38/Makefile
++++ macports_release_38/Makefile
@@ -70,9 +70,11 @@ ifeq ($(MAKECMDGOALS),install-clang)
DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
tools/clang/tools/libclang \
@@ -27,5 +27,5 @@
NO_INSTALL = 1
endif
--
-2.4.5
+2.7.0
Modified: trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0004-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2016-01-16 20:27:08 UTC (rev 144733)
@@ -1,7 +1,7 @@
-From 9e8b2808ef169b554819db23add3acc5ae33e984 Mon Sep 17 00:00:00 2001
+From 23339e9b32d7456ec6a964f9cda01dac78f1128d Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 16:34:41 -0800
-Subject: [PATCH 4/6] MacPorts Only: Use full path for the dylib id instead of
+Subject: [PATCH 4/7] MacPorts Only: Use full path for the dylib id instead of
@rpath
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -9,11 +9,11 @@
Makefile.rules | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git llvm_master/Makefile.rules macports_master/Makefile.rules
-index 24cac3b..8775589 100644
---- llvm_master/Makefile.rules
-+++ macports_master/Makefile.rules
-@@ -598,7 +598,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+diff --git llvm_release_38/Makefile.rules macports_release_38/Makefile.rules
+index a67aef7..def94c0 100644
+--- llvm_release_38/Makefile.rules
++++ macports_release_38/Makefile.rules
+@@ -600,7 +600,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
ifneq ($(HOST_OS),Darwin)
LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
else
@@ -28,5 +28,5 @@
endif
endif
--
-2.4.5
+2.7.0
Modified: trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0005-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2016-01-16 20:27:08 UTC (rev 144733)
@@ -1,7 +1,7 @@
-From a735f95fdb9839db8c70a836998c591773b28cba Mon Sep 17 00:00:00 2001
+From 25522bcea0e4f092f32ed4ab05d34d37618623a8 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 16:41:30 -0800
-Subject: [PATCH 5/6] MacPorts Only: Don't embed the deployment target in the
+Subject: [PATCH 5/7] MacPorts Only: Don't embed the deployment target in the
asm when using -fno-integrated-as
http://llvm.org/bugs/show_bug.cgi?id=21636
@@ -11,19 +11,19 @@
lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-index b574a51..f821a9f 100644
---- llvm_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-+++ macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-@@ -189,7 +189,7 @@ bool AsmPrinter::doInitialization(Module &M) {
- // use the directive, where it would need the same conditionalization
+diff --git llvm_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+index 5f67d3d..8824bd3 100644
+--- llvm_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
++++ macports_release_38/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+@@ -193,7 +193,7 @@ bool AsmPrinter::doInitialization(Module &M) {
// anyway.
Triple TT(getTargetTriple());
-- if (TT.isOSDarwin()) {
-+ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
+ // If there is a version specified, Major will be non-zero.
+- if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0) {
++ if (TT.isOSDarwin() && TT.getOSMajorVersion() != 0 && MAI->useIntegratedAssembler()) {
unsigned Major, Minor, Update;
- TT.getOSVersion(Major, Minor, Update);
- // If there is a version specified, Major will be non-zero.
+ MCVersionMinType VersionType;
+ if (TT.isWatchOS()) {
--
-2.4.5
+2.7.0
Modified: trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2016-01-16 20:26:53 UTC (rev 144732)
+++ trunk/dports/lang/llvm-3.8/files/0006-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2016-01-16 20:27:08 UTC (rev 144733)
@@ -1,19 +1,19 @@
-From fd3f7b3caf4f4334352860052adf8f22c76ed9a4 Mon Sep 17 00:00:00 2001
+From bda46b8c958c6ad05fdfdb8baed181ac3d4a138f Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 16:43:00 -0800
-Subject: [PATCH 6/6] MacPorts Only: Skip checking for python in configure
+Subject: [PATCH 6/7] MacPorts Only: Skip checking for python in configure
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
---
configure | 87 ---------------------------------------------------------------
1 file changed, 87 deletions(-)
-diff --git llvm_master/configure macports_master/configure
-index a5acfde..c5a3f61 100755
---- llvm_master/configure
-+++ macports_master/configure
-@@ -8468,93 +8468,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
- echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&6; }
+diff --git llvm_release_38/configure macports_release_38/configure
+index c94fb13..0d01ba1 100755
+--- llvm_release_38/configure
++++ macports_release_38/configure
+@@ -8483,93 +8483,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&6; }
-# Check whether --with-python was given.
@@ -107,5 +107,5 @@
echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
if test "${ac_cv_lib_m_sin+set}" = set; then
--
-2.4.5
+2.7.0
Added: trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/0007-Remove-override-of-raise-abort-and-__assert_rtn.patch 2016-01-16 20:27:08 UTC (rev 144733)
@@ -0,0 +1,62 @@
+From 51958b26c17d9d51ca5f7bb1ee52af34ef5f444b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 16 Jan 2016 10:19:07 -0800
+Subject: [PATCH 7/7] 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 at apple.com>
+---
+ lib/Support/Unix/Signals.inc | 39 ---------------------------------------
+ 1 file changed, 39 deletions(-)
+
+diff --git llvm_release_38/lib/Support/Unix/Signals.inc macports_release_38/lib/Support/Unix/Signals.inc
+index 4d687b3..f2797a0 100644
+--- llvm_release_38/lib/Support/Unix/Signals.inc
++++ macports_release_38/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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160116/dac72304/attachment.html>
More information about the macports-changes
mailing list