[141734] trunk/dports/lang/llvm-3.8
jeremyhu at macports.org
jeremyhu at macports.org
Sat Dec 12 02:47:00 PST 2015
Revision: 141734
https://trac.macports.org/changeset/141734
Author: jeremyhu at macports.org
Date: 2015-10-26 21:39:28 -0700 (Mon, 26 Oct 2015)
Log Message:
-----------
llvm-3.8: Bump to r251269 and some ASan changes
Revision Links:
--------------
https://trac.macports.org/changeset/251269
Modified Paths:
--------------
trunk/dports/lang/llvm-3.8/Portfile
trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
Added Paths:
-----------
trunk/dports/lang/llvm-3.8/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch
Modified: trunk/dports/lang/llvm-3.8/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.8/Portfile 2015-10-27 04:33:16 UTC (rev 141733)
+++ trunk/dports/lang/llvm-3.8/Portfile 2015-10-27 04:39:28 UTC (rev 141734)
@@ -64,7 +64,7 @@
}
fetch.type svn
-svn.revision 250632
+svn.revision 251269
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
@@ -120,6 +120,7 @@
2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch \
2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch \
+ 2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch \
3001-buildit-build-fix-for-Leopard.patch \
3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
@@ -408,6 +409,11 @@
file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Release+Debug+Asserts
file delete -force ${destroot}${sub_prefix}/libexec/clang-format/CMakeLists.txt
file delete -force ${destroot}${sub_prefix}/libexec/clang-format/ClangFormat.cpp
+
+ system "install_name_tool -id @rpath/libclang_rt.asan_iossim_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_iossim_dynamic.dylib"
+ system "install_name_tool -id @rpath/libclang_rt.asan_osx_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib"
+ system "install_name_tool -id @rpath/libclang_rt.ubsan_iossim_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.ubsan_iossim_dynamic.dylib"
+ system "install_name_tool -id @rpath/libclang_rt.ubsan_osx_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.ubsan_osx_dynamic.dylib"
}
}
Modified: trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-10-27 04:33:16 UTC (rev 141733)
+++ trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-10-27 04:39:28 UTC (rev 141734)
@@ -1,7 +1,7 @@
-From 1029c2e458e233b7818453d757245f99b19032b8 Mon Sep 17 00:00:00 2001
+From a321b5175583de50ac1239776a54ddf5b95cf651 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH 2001/2006] MacPorts Only: Comment out SL cctools workaround
+Subject: [PATCH 2001/2007] MacPorts Only: Comment out SL cctools workaround
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
---
@@ -30,5 +30,5 @@
# If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
# are intended to support and limit what we try to build to that.
--
-2.6.1
+2.6.2
Modified: trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-10-27 04:33:16 UTC (rev 141733)
+++ trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-10-27 04:39:28 UTC (rev 141734)
@@ -1,7 +1,7 @@
-From c2fb5e01140603d1c40b7ac44b56e9efe8eba680 Mon Sep 17 00:00:00 2001
+From 2292a6f81d1f49f3fdfa9d325fa994f676252591 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH 2002/2006] Update CheckArches to fallback on Intel/ppc if ld
+Subject: [PATCH 2002/2007] Update CheckArches to fallback on Intel/ppc if ld
-v doesn't report supported architectures
Older versions of ld64 (eg: Xcode 3.x) do not report this.
@@ -28,5 +28,5 @@
-integrated-as \
$(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
--
-2.6.1
+2.6.2
Modified: trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-10-27 04:33:16 UTC (rev 141733)
+++ trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-10-27 04:39:28 UTC (rev 141734)
@@ -1,7 +1,7 @@
-From 4dc615877d820549a0df45b1ba8bd5067fac7a85 Mon Sep 17 00:00:00 2001
+From 7d4590c76d48df29165a93704765922e514972e8 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:45:27 -0800
-Subject: [PATCH 2003/2006] Fall back on xcodebuild -sdk when xcrun --sdk is
+Subject: [PATCH 2003/2007] Fall back on xcodebuild -sdk when xcrun --sdk is
not supported
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -25,5 +25,5 @@
fi; \
echo $$result)
--
-2.6.1
+2.6.2
Modified: trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-10-27 04:33:16 UTC (rev 141733)
+++ trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-10-27 04:39:28 UTC (rev 141734)
@@ -1,7 +1,7 @@
-From 3d46c40327fb50e58d366b4920fc73811ea67c21 Mon Sep 17 00:00:00 2001
+From e4b2ca3c0b7864503b69c6dd4ca8a08d82672ddc Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2004/2006] On darwin, build ppc slices of the compiler runtime
+Subject: [PATCH 2004/2007] On darwin, build ppc slices of the compiler runtime
if requested and supported by the SDK and toolchain
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -51,5 +51,5 @@
UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
--
-2.6.1
+2.6.2
Modified: trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-10-27 04:33:16 UTC (rev 141733)
+++ trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-10-27 04:39:28 UTC (rev 141734)
@@ -1,7 +1,7 @@
-From 51d0af047b872208032de38754c5b7944c20ba0e Mon Sep 17 00:00:00 2001
+From 54d35960b799a78ead02b4288ee4de7e4a92d8c9 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed, 14 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2005/2006] MacPorts Only: Don't build x86_64h slice of
+Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of
compiler-rt
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -52,5 +52,5 @@
Configs += ubsan_iossim_dynamic
UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
--
-2.6.1
+2.6.2
Modified: trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-10-27 04:33:16 UTC (rev 141733)
+++ trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-10-27 04:39:28 UTC (rev 141734)
@@ -1,7 +1,7 @@
-From 5a29c8761b7240ab0b5d2fd743a0eebe18f15bd7 Mon Sep 17 00:00:00 2001
+From 960ad7a967a124a32360f15b7f33d1d1842d44ce Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun, 11 Oct 2015 09:02:26 -0700
-Subject: [PATCH 2006/2006] MacPorts Only: Fix regression introduced when
+Subject: [PATCH 2006/2007] MacPorts Only: Fix regression introduced when
fixing PR24776
Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb
@@ -9,7 +9,7 @@
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
---
make/platform/clang_darwin.mk | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
index 8200c8a..a634a3f 100644
@@ -25,5 +25,5 @@
$(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
-isysroot $(3) \
--
-2.6.1
+2.6.2
Added: trunk/dports/lang/llvm-3.8/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/2007-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-10-27 04:39:28 UTC (rev 141734)
@@ -0,0 +1,65 @@
+From a08e5cb1b4ca37e33ae8efa8d39a7f90931e8d7f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 25 Oct 2015 16:03:00 -0700
+Subject: [PATCH 2007/2007] Save the ASan report in the OS X crash log
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/asan/asan_report.cc | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/lib/asan/asan_report.cc macports_master/projects/compiler-rt/lib/asan/asan_report.cc
+index 957ac14..0ee03b9 100644
+--- llvm_master/projects/compiler-rt/lib/asan/asan_report.cc
++++ macports_master/projects/compiler-rt/lib/asan/asan_report.cc
+@@ -24,6 +24,18 @@
+ #include "sanitizer_common/sanitizer_stackdepot.h"
+ #include "sanitizer_common/sanitizer_symbolizer.h"
+
++// Apple CrashReporter support.
++#ifdef __APPLE__
++extern "C" {
++static char __crashreporter_info_buff__[1 << 16] = { 0 };
++static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];
++asm (".desc ___crashreporter_info__, 0x10");
++
++#include <string.h>
++#define CRSetCrashLogMessage(msg) strlcpy(__crashreporter_info_buff__, msg, sizeof(__crashreporter_info_buff__));
++}
++#endif
++
+ namespace __asan {
+
+ // -------------------- User-specified callbacks ----------------- {{{1
+@@ -46,6 +58,16 @@ static bool report_happened = false;
+ static ReportData report_data = {};
+
+ void AppendToErrorMessageBuffer(const char *buffer) {
++#if __APPLE__
++ // For the Apple CrashReporter support: Always store reports into buffer.
++ if (!error_message_buffer) {
++ error_message_buffer_size = 1 << 16;
++ error_message_buffer =
++ (char*)MmapOrDie(error_message_buffer_size, __func__);
++ error_message_buffer_pos = 0;
++ }
++#endif
++
+ if (error_message_buffer) {
+ uptr length = internal_strlen(buffer);
+ CHECK_GE(error_message_buffer_size, error_message_buffer_pos);
+@@ -664,6 +686,11 @@ class ScopedInErrorReport {
+ // Print memory stats.
+ if (flags()->print_stats)
+ __asan_print_accumulated_stats();
++
++#ifdef __APPLE__
++ CRSetCrashLogMessage(error_message_buffer);
++#endif
++
+ if (error_report_callback) {
+ error_report_callback(error_message_buffer);
+ }
+--
+2.6.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/f01d5ce8/attachment-0001.html>
More information about the macports-changes
mailing list