<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119154] trunk/dports/lang/llvm-3.3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119154">119154</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-04-18 01:49:01 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>clang-3.3: Fix -export_dynamic link issue and disable ubsan_osx on Leopard (#43353)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm33Portfile">trunk/dports/lang/llvm-3.3/Portfile</a></li>
<li><a href="#trunkdportslangllvm33filesleopardnoasanpatch">trunk/dports/lang/llvm-3.3/files/leopard-no-asan.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm33filesexport_dynamicpatch">trunk/dports/lang/llvm-3.3/files/export_dynamic.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm33Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.3/Portfile (119153 => 119154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/Portfile 2014-04-18 08:36:35 UTC (rev 119153)
+++ trunk/dports/lang/llvm-3.3/Portfile 2014-04-18 08:49:01 UTC (rev 119154)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> set llvm_version 3.3
</span><span class="cx"> revision 1
</span><span class="cx"> name llvm-${llvm_version}
</span><del>-subport clang-${llvm_version} { revision 2 }
</del><ins>+subport clang-${llvm_version} { revision 3 }
</ins><span class="cx"> set suffix mp-${llvm_version}
</span><span class="cx"> set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
</span><span class="cx"> dist_subdir llvm
</span><span class="lines">@@ -95,7 +95,8 @@
</span><span class="cx"> patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
</span><span class="cx"> 0001-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx"> mavericks-libc++.patch \
</span><del>- snowleopard-cmath.patch
</del><ins>+ snowleopard-cmath.patch \
+ export_dynamic.patch
</ins><span class="cx">
</span><span class="cx"> build.target clang-only
</span><span class="cx"> destroot.target install-clang
</span></span></pre></div>
<a id="trunkdportslangllvm33filesexport_dynamicpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.3/files/export_dynamic.patch (0 => 119154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/files/export_dynamic.patch (rev 0)
+++ trunk/dports/lang/llvm-3.3/files/export_dynamic.patch 2014-04-18 08:49:01 UTC (rev 119154)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+commit bd77c59acc58e797756b0fcc6739319587e95d85
+Author: Bob Wilson <bob.wilson@apple.com>
+Date: Fri Aug 2 22:25:34 2013 +0000
+
+ Only use the Darwin linker's -export_dynamic option with supported versions.
+
+ Related to <rdar://problem/14578094>.
+
+ git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187680 91177308-0d34-0410-b5e6-96231b3b80d8
+
+diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
+index 33e2803..dfaffaa 100644
+--- a/tools/clang/lib/Driver/Tools.cpp
++++ b/tools/clang/lib/Driver/Tools.cpp
+@@ -4517,6 +4517,9 @@ void darwin::Link::AddLinkArgs(Compilation &C,
+ CmdArgs.push_back("-demangle");
+ }
+
++ if (Args.hasArg(options::OPT_rdynamic) && Version[0] >= 137)
++ CmdArgs.push_back("-export_dynamic");
++
+ // If we are using LTO, then automatically create a temporary file path for
+ // the linker to use, so that it's lifetime will extend past a possible
+ // dsymutil step.
+@@ -4724,9 +4727,6 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA,
+ if (Args.hasArg(options::OPT_ObjC) || Args.hasArg(options::OPT_ObjCXX))
+ CmdArgs.push_back("-ObjC");
+
+- if (Args.hasArg(options::OPT_rdynamic))
+- CmdArgs.push_back("-export_dynamic");
+-
+ CmdArgs.push_back("-o");
+ CmdArgs.push_back(Output.getFilename());
+
+diff --git a/test/Driver/darwin-ld.c b/test/Driver/darwin-ld.c
+index cd511e0..d6c5170 100644
+--- a/tools/clang/test/Driver/darwin-ld.c
++++ b/tools/clang/test/Driver/darwin-ld.c
+@@ -130,3 +130,17 @@
+ // RUN: FileCheck -check-prefix=LINK_PG %s < %t.log
+ // LINK_PG: -lgcrt1.o
+ // LINK_PG: -no_new_main
++
++// RUN: %clang -target x86_64-apple-darwin12 -rdynamic -### %t.o \
++// RUN: -mlinker-version=100 2> %t.log
++// RUN: FileCheck -check-prefix=LINK_NO_EXPORT_DYNAMIC %s < %t.log
++// LINK_NO_EXPORT_DYNAMIC: {{ld(.exe)?"}}
++// LINK_NO_EXPORT_DYNAMIC-NOT: "-export_dynamic"
++
++// RUN: %clang -target x86_64-apple-darwin12 -rdynamic -### %t.o \
++// RUN: -mlinker-version=137 2> %t.log
++// RUN: FileCheck -check-prefix=LINK_EXPORT_DYNAMIC %s < %t.log
++// LINK_EXPORT_DYNAMIC: {{ld(.exe)?"}}
++// LINK_EXPORT_DYNAMIC: "-export_dynamic"
++
++
</ins></span></pre></div>
<a id="trunkdportslangllvm33filesleopardnoasanpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.3/files/leopard-no-asan.patch (119153 => 119154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.3/files/leopard-no-asan.patch 2014-04-18 08:36:35 UTC (rev 119153)
+++ trunk/dports/lang/llvm-3.3/files/leopard-no-asan.patch 2014-04-18 08:49:01 UTC (rev 119154)
</span><span class="lines">@@ -17,18 +17,23 @@
</span><span class="cx"> -Configs += asan_osx_dynamic
</span><span class="cx"> -UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
</span><span class="cx"> -
</span><del>- Configs += ubsan_osx
- UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
</del><ins>+-Configs += ubsan_osx
+-UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
++#Configs += ubsan_osx
++#UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
</ins><span class="cx">
</span><span class="cx"> Index: llvm-3.3/tools/clang/runtime/compiler-rt/Makefile
</span><span class="cx"> ===================================================================
</span><del>---- llvm-3.3/tools/clang/runtime/compiler-rt/Makefile (revision 185755)
-+++ llvm-3.3/tools/clang/runtime/compiler-rt/Makefile (working copy)
-@@ -75,7 +75,6 @@
- RuntimeDirs += darwin
</del><ins>+--- a/tools/clang/runtime/compiler-rt/Makefile.orig 2013-11-15 15:12:44.000000000 -0800
++++ a/tools/clang/runtime/compiler-rt/Makefile 2014-04-17 22:18:44.000000000 -0700
+@@ -81,9 +81,7 @@ ifeq ($(OS),Darwin)
+ RuntimeDirs += darwin darwin_embedded
</ins><span class="cx"> RuntimeLibrary.darwin.Configs := \
</span><span class="cx"> eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
</span><del>-- asan_osx.a asan_osx_dynamic.dylib \
- profile_osx.a profile_ios.a \
- ubsan_osx.a
- endif
</del><ins>+- asan_osx_dynamic.dylib \
+- profile_osx.a profile_ios.a \
+- ubsan_osx.a
++ profile_osx.a profile_ios.a
+ RuntimeLibrary.darwin_embedded.Configs := \
+ soft_static.a hard_static.a soft_pic.a hard_pic.a
+
</ins></span></pre>
</div>
</div>
</body>
</html>