[131763] trunk/dports/lang/llvm-3.5
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 17 18:36:51 PST 2015
Revision: 131763
https://trac.macports.org/changeset/131763
Author: jeremyhu at macports.org
Date: 2015-01-17 18:36:51 -0800 (Sat, 17 Jan 2015)
Log Message:
-----------
llvm-3.5: Cleanup patches
Modified Paths:
--------------
trunk/dports/lang/llvm-3.5/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.5/files/0000-MacPorts-Only-Helper-script-for-generating-patches.patch
trunk/dports/lang/llvm-3.5/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.5/files/0002-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
trunk/dports/lang/llvm-3.5/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
trunk/dports/lang/llvm-3.5/files/0004-MacPorts-Only-Skip-checking-for-python-in-configure.patch
trunk/dports/lang/llvm-3.5/files/0005-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.5/files/1000-MacPorts-Only-Helper-script-for-generating-patches.patch
trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.5/files/2000-MacPorts-Only-Helper-script-for-generating-patches.patch
trunk/dports/lang/llvm-3.5/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.5/files/2002-Do-not-build-a-separate-x86_64h-Haswell-slice-for-th.patch
trunk/dports/lang/llvm-3.5/files/2003-Build-Darwin-libclang_rt-libraries-against-real-SDKs.patch
trunk/dports/lang/llvm-3.5/files/2004-Clean-up-indentation-after-previous-change.patch
trunk/dports/lang/llvm-3.5/files/2005-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.5/files/2006-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
trunk/dports/lang/llvm-3.5/files/3000-MacPorts-Only-Helper-script-for-generating-patches.patch
trunk/dports/lang/llvm-3.5/files/3001-buildit-build-fix-for-Leopard.patch
trunk/dports/lang/llvm-3.5/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
trunk/dports/lang/llvm-3.5/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
trunk/dports/lang/llvm-3.5/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
trunk/dports/lang/llvm-3.5/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
trunk/dports/lang/llvm-3.5/files/leopard-no-blocks.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.5/files/0001-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch
trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.5/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
trunk/dports/lang/llvm-3.5/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
trunk/dports/lang/llvm-3.5/files/clang-format.patch
trunk/dports/lang/llvm-3.5/files/clang-modernize.patch
trunk/dports/lang/llvm-3.5/files/fix-dylib-ids.patch
trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.5/files/install_target.patch
trunk/dports/lang/llvm-3.5/files/llvm-integrated-as.patch
trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch
trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch
trunk/dports/lang/llvm-3.5/files/skip-python-check.patch
trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-01-18 02:36:51 UTC (rev 131763)
@@ -113,29 +113,37 @@
rmd160 076eb242253a7cc1c54d993912c847343c244347 \
sha256 ac12ec5ff2119ac1d2916c105920e1880321a7d97b6f5ec5957a588450704f04
-patchfiles install_target.patch \
- fix-dylib-ids.patch
-
patch.pre_args -p1
+patchfiles \
+ 0000-MacPorts-Only-Helper-script-for-generating-patches.patch \
+ 0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \
+ 0002-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \
+ 0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
+ 0004-MacPorts-Only-Skip-checking-for-python-in-configure.patch \
+ 0005-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
-if {${subport} eq "llvm-${llvm_version}"} {
- # Prevent configure from failing if an acceptable Python is not
- # found (#32575, #42051, #46321). Python is only used for testing,
- # and we don't run or install the tests.
- patchfiles-append skip-python-check.patch
-} elseif {${subport} eq "clang-${llvm_version}"} {
- patchfiles-append scan-build-PR-35006.patch \
- 0001-Comment-out-SL-cctools-workaround.patch \
- 0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
- 0001-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
- 0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
- 0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
- llvm-integrated-as.patch \
- clang-format.patch \
- clang-modernize.patch \
- snowleopard-cmath.patch \
- move-clang-resources.patch \
- fix-libclang_rt-dylib-ids.patch
+if {${subport} eq "clang-${llvm_version}"} {
+ patchfiles-append \
+ 1000-MacPorts-Only-Helper-script-for-generating-patches.patch \
+ 1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
+ 1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
+ 1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
+ 1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
+ 1006-Default-to-ppc7400-for-OSX-10.5.patch \
+ 2000-MacPorts-Only-Helper-script-for-generating-patches.patch \
+ 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
+ 2002-Do-not-build-a-separate-x86_64h-Haswell-slice-for-th.patch \
+ 2003-Build-Darwin-libclang_rt-libraries-against-real-SDKs.patch \
+ 2004-Clean-up-indentation-after-previous-change.patch \
+ 2005-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
+ 2006-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
+ 3000-MacPorts-Only-Helper-script-for-generating-patches.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 \
+ 3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
+ 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
build.target clang-only
destroot.target install-clang
@@ -225,7 +233,7 @@
}
if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
- patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
+ patchfiles-append leopard-no-asan.patch leopard-no-blocks.patch
}
# TODO: The llvm build system sets a 10.1 deployment target on Yosemite
Added: trunk/dports/lang/llvm-3.5/files/0000-MacPorts-Only-Helper-script-for-generating-patches.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0000-MacPorts-Only-Helper-script-for-generating-patches.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0000-MacPorts-Only-Helper-script-for-generating-patches.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,32 @@
+From 0f5238c04fa58298341104cc592fe204cf36df95 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:46:30 -0800
+Subject: [PATCH 0/5] MacPorts Only: Helper script for generating patches
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit d528883e9c6a2f9e957738571e4ddd67bbe597a0)
+---
+ create_macports_patches.sh | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100755 create_macports_patches.sh
+
+diff --git llvm_release_35/create_macports_patches.sh macports_release_35/create_macports_patches.sh
+new file mode 100755
+index 0000000..02b1b11
+--- /dev/null
++++ macports_release_35/create_macports_patches.sh
+@@ -0,0 +1,11 @@
++#!/bin/bash
++
++parse_git_branch()
++{
++ ref=$(git symbolic-ref HEAD 2> /dev/null) || return;
++ echo ${ref#refs/heads/}
++}
++
++branch=$(parse_git_branch)
++
++git format-patch origin/${branch} --src-prefix=llvm_${branch}/ --dst-prefix=macports_${branch}/ --start-number=0000
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.5/files/0001-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0001-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/0001-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,118 +0,0 @@
-From c5a619419ccbf96191124fd93b53570084565450 Mon Sep 17 00:00:00 2001
-From: Rafael Espindola <rafael.espindola at gmail.com>
-Date: Thu, 28 Aug 2014 21:23:05 +0000
-Subject: [PATCH] Call powerpc-darwin external tools with -arch ppc.
-
-With this patch we call external tools for powerpc-darwin with "-arch ppc"
-instead of "-arch powerpc", so as to be compatible with the cctools assembler
-and ld64 linker.
-
-Patch by Stephen Drake!
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@216687 91177308-0d34-0410-b5e6-96231b3b80d8
-(cherry picked from commit 52fc295aad114ea91f4118d5e48fdfa142871704)
----
- lib/Driver/ToolChains.cpp | 2 +-
- lib/Driver/Tools.cpp | 14 +++-----------
- test/Driver/darwin-arch-default.c | 40 +++++++++++++++++++++++++++++++++++++--
- 3 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git tools/clang/lib/Driver/ToolChains.cpp tools/clang/lib/Driver/ToolChains.cpp
-index b46f69d..3e6768f 100644
---- a/tools/clang/lib/Driver/ToolChains.cpp
-+++ b/tools/clang/lib/Driver/ToolChains.cpp
-@@ -156,7 +156,7 @@ static bool isSoftFloatABI(const ArgList &Args) {
- StringRef MachO::getMachOArchName(const ArgList &Args) const {
- switch (getTriple().getArch()) {
- default:
-- return getArchName();
-+ return getDefaultUniversalArchName();
-
- case llvm::Triple::thumb:
- case llvm::Triple::arm: {
-diff --git tools/clang/lib/Driver/Tools.cpp tools/clang/lib/Driver/Tools.cpp
-index 198e82e..68d5fc6 100644
---- a/tools/clang/lib/Driver/Tools.cpp
-+++ b/tools/clang/lib/Driver/Tools.cpp
-@@ -4870,19 +4870,10 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
- RenderExtraToolArgs(JA, CmdArgs);
-
- // If using a driver driver, force the arch.
-- llvm::Triple::ArchType Arch = getToolChain().getArch();
- if (getToolChain().getTriple().isOSDarwin()) {
- CmdArgs.push_back("-arch");
--
-- // FIXME: Remove these special cases.
-- if (Arch == llvm::Triple::ppc)
-- CmdArgs.push_back("ppc");
-- else if (Arch == llvm::Triple::ppc64)
-- CmdArgs.push_back("ppc64");
-- else if (Arch == llvm::Triple::ppc64le)
-- CmdArgs.push_back("ppc64le");
-- else
-- CmdArgs.push_back(Args.MakeArgString(getToolChain().getArchName()));
-+ CmdArgs.push_back(
-+ Args.MakeArgString(getToolChain().getDefaultUniversalArchName()));
- }
-
- // Try to force gcc to match the tool chain we want, if we recognize
-@@ -4890,6 +4881,7 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
- //
- // FIXME: The triple class should directly provide the information we want
- // here.
-+ llvm::Triple::ArchType Arch = getToolChain().getArch();
- if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::ppc)
- CmdArgs.push_back("-m32");
- else if (Arch == llvm::Triple::x86_64 || Arch == llvm::Triple::ppc64 ||
-diff --git tools/clang/test/Driver/darwin-arch-default.c tools/clang/test/Driver/darwin-arch-default.c
-index 60bf61d..e7e5e89 100644
---- a/tools/clang/test/Driver/darwin-arch-default.c
-+++ b/tools/clang/test/Driver/darwin-arch-default.c
-@@ -2,6 +2,42 @@
- //
- // RUN: %clang -target powerpc-apple-darwin8 -### \
- // RUN: -ccc-print-phases %s 2> %t
--// RUN: FileCheck --check-prefix=CHECK-POWERPC < %t %s
-+// RUN: FileCheck --check-prefix=CHECK-BIND-PPC < %t %s
- //
--// CHECK-POWERPC: bind-arch, "ppc"
-+// CHECK-BIND-PPC: bind-arch, "ppc"
-+//
-+// RUN: %clang -target powerpc64-apple-darwin8 -### \
-+// RUN: -ccc-print-phases %s 2> %t
-+// RUN: FileCheck --check-prefix=CHECK-BIND-PPC64 < %t %s
-+//
-+// CHECK-BIND-PPC64: bind-arch, "ppc64"
-+
-+// Check that the correct arch name is passed to the external assembler
-+//
-+// RUN: %clang -target powerpc-apple-darwin8 -### \
-+// RUN: -no-integrated-as -c %s 2> %t
-+// RUN: FileCheck --check-prefix=CHECK-AS-PPC < %t %s
-+//
-+// CHECK-AS-PPC: {{as(.exe)?"}}
-+// CHECK-AS-PPC: "-arch" "ppc"
-+//
-+// RUN: %clang -target powerpc64-apple-darwin8 -### \
-+// RUN: -no-integrated-as -c %s 2> %t
-+// RUN: FileCheck --check-prefix=CHECK-AS-PPC64 < %t %s
-+//
-+// CHECK-AS-PPC64: {{as(.exe)?"}}
-+// CHECK-AS-PPC64: "-arch" "ppc64"
-+
-+// Check that the correct arch name is passed to the external linker
-+//
-+// RUN: %clang -target powerpc-apple-darwin8 -### %s 2> %t
-+// RUN: FileCheck --check-prefix=CHECK-LD-PPC < %t %s
-+//
-+// CHECK-LD-PPC: {{ld(.exe)?"}}
-+// CHECK-LD-PPC: "-arch" "ppc"
-+//
-+// RUN: %clang -target powerpc64-apple-darwin8 -### %s 2> %t
-+// RUN: FileCheck --check-prefix=CHECK-LD-PPC64 < %t %s
-+//
-+// CHECK-LD-PPC64: {{ld(.exe)?"}}
-+// CHECK-LD-PPC64: "-arch" "ppc64"
---
-2.2.2
-
Deleted: trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,61 +0,0 @@
-Index: llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.5.0.src.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -47,11 +47,11 @@ XCRunSdkPath = \
-
- CC := $(call XCRun,clang)
- LD := $(shell $(CC) -print-prog-name=ld)
--AR := $(call XCRun,ar)
--RANLIB := $(call XCRun,ranlib)
--STRIP := $(call XCRun,strip)
--LIPO := $(call XCRun,lipo)
--DSYMUTIL := $(call XCRun,dsymutil)
-+AR := @@PREFIX@@/bin/ar
-+RANLIB := @@PREFIX@@/bin/ranlib
-+STRIP := @@PREFIX@@/bin/strip
-+LIPO := @@PREFIX@@/bin/lipo
-+DSYMUTIL := @@PREFIX@@/bin/dsymutil
-
- Configs :=
- UniversalArchs :=
-@@ -110,12 +110,12 @@ UniversalArchs.ubsan_osx := $(call Check
- # object files. If we are on that platform, strip out all ARM archs. We still
- # build the libraries themselves so that Clang can find them where it expects
- # them, even though they might not have an expected slice.
--ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
--UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
--UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
--UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
--UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
--endif
-+#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
-+#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
-+#UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
-+#UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
-+#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
-+#endif
-
- # 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.
-Index: llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-===================================================================
---- llvm-3.5.0.src.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-+++ llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-@@ -33,11 +33,11 @@ XCRun = \
- ###
-
- CC := $(call XCRun,clang)
--AR := $(call XCRun,ar)
--RANLIB := $(call XCRun,ranlib)
--STRIP := $(call XCRun,strip)
--LIPO := $(call XCRun,lipo)
--DSYMUTIL := $(call XCRun,dsymutil)
-+AR := @@PREFIX@@/bin/ar
-+RANLIB := @@PREFIX@@/bin/ranlib
-+STRIP := @@PREFIX@@/bin/strip
-+LIPO := @@PREFIX@@/bin/lipo
-+DSYMUTIL := @@PREFIX@@/bin/dsymutil
-
- Configs :=
- UniversalArchs :=
Deleted: trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,26 +0,0 @@
-From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Wed, 7 Jan 2015 03:42:15 -0800
-Subject: [PATCH] Leopard: Default to -fno-blocks
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/Driver/ToolChains.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
-index 876bb01..27aa2ee 100644
---- a/tools/clang/lib/Driver/ToolChains.h
-+++ b/tools/clang/lib/Driver/ToolChains.h
-@@ -257,7 +257,7 @@ public:
- bool IsBlocksDefault() const override {
- // Always allow blocks on Apple; users interested in versioning are
- // expected to use /usr/include/Blocks.h.
-- return true;
-+ return false;
- }
- bool IsIntegratedAssemblerDefault() const override {
- // Default integrated assembler to on for Apple's MachO targets.
---
-2.2.1
-
Added: trunk/dports/lang/llvm-3.5/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,32 @@
+From ea0c76fae7748f01635156c61338136fce7a1eaa 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 1/5] MacPorts Only: Update install targets for clang subport
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit b514fa09a560de0b3241c6af0d134bae09a6aec3)
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_35/Makefile macports_release_35/Makefile
+index 2b9468a..19fbfdc 100644
+--- llvm_release_35/Makefile
++++ macports_release_35/Makefile
+@@ -70,9 +70,11 @@ ifeq ($(MAKECMDGOALS),install-clang)
+ DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
+ tools/clang/tools/libclang \
+ tools/clang/tools/c-index-test \
+- tools/clang/include/clang-c \
+ tools/clang/runtime tools/clang/docs \
+- tools/lto
++ tools/clang/include tools/clang/lib \
++ tools/clang/tools/clang-format \
++ tools/clang/tools/extra/clang-modernize \
++ tools/clang/tools/extra/clang-apply-replacements
+ OPTIONAL_DIRS :=
+ NO_INSTALL = 1
+ endif
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,28 +0,0 @@
-From c6dc32fab57dc55f266c6a7dbc0b4ccbf84f75f7 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] 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.
-
-http://www.llvm.org/bugs/show_bug.cgi?id=22182
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- make/platform/clang_darwin.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
-index 6f62170..0120547 100644
---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ b/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -20,6 +20,8 @@ CheckArches = \
- if $(LD) -v 2>&1 | grep "configured to support" \
- | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
- result="$$result$$arch "; \
-+ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
-+ result="$$result$$arch "; \
- else \
- printf 1>&2 \
- "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'"; \
Added: trunk/dports/lang/llvm-3.5/files/0002-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0002-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0002-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,33 @@
+From 6b629a4619e352e34b12f105eae5581fd64c9573 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 2/5] MacPorts Only: Use full path for the dylib id instead of
+ @rpath
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 101281fb51d2ce628839134eeedb9533d4506192)
+---
+ Makefile.rules | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git llvm_release_35/Makefile.rules macports_release_35/Makefile.rules
+index ebebc0a..b0bb378 100644
+--- llvm_release_35/Makefile.rules
++++ macports_release_35/Makefile.rules
+@@ -599,7 +599,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+ ifneq ($(HOST_OS),Darwin)
+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
+ else
+- LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
++ LD.Flags += -Wl,-install_name
++ ifdef LOADABLE_MODULE
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
++ else
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
++ endif
+ endif
+ endif
+ endif
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.5/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,46 +0,0 @@
-From e34bdf68de77066864ff3238d89fd19e19b3b508 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Fri, 16 Jan 2015 21:34:36 -0800
-Subject: [PATCH 3/4] Fix <local> and <iterator> when building with Lion and
- newer Availability.h
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit e8d7616436baea0e0ff1dd78bd8d8dfc5d367e44)
----
- include/iterator | 4 ++--
- include/locale | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/iterator b/include/iterator
-index f338e01..64b52e7 100644
---- a/projects/libcxx/include/iterator
-+++ b/projects/libcxx/include/iterator
-@@ -913,8 +913,8 @@ public:
- _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
-
- #if !defined(__APPLE__) || \
-- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-+ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-+ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-
- template <class _Ch, class _Tr>
- friend
-diff --git a/include/locale b/include/locale
-index fcff402..10d8ca9 100644
---- a/projects/libcxx/include/locale
-+++ b/projects/libcxx/include/locale
-@@ -1467,8 +1467,8 @@ __pad_and_output(_OutputIterator __s,
- }
-
- #if !defined(__APPLE__) || \
-- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-+ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-+ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-
- template <class _CharT, class _Traits>
- _LIBCPP_HIDDEN
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.5/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,30 @@
+From 8a552d6acf08e708c4545d943d205dde00281fe2 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 3/5] 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
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit ff5040cbee319c918097b40312ca3c9d6ba5f19a)
+---
+ lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_release_35/lib/CodeGen/AsmPrinter/AsmPrinter.cpp macports_release_35/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+index 424e759..f766513 100644
+--- llvm_release_35/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
++++ macports_release_35/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+@@ -186,7 +186,7 @@ bool AsmPrinter::doInitialization(Module &M) {
+ // use the directive, where it would need the same conditionalization
+ // anyway.
+ Triple TT(getTargetTriple());
+- if (TT.isOSDarwin()) {
++ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
+ unsigned Major, Minor, Update;
+ TT.getOSVersion(Major, Minor, Update);
+ // If there is a version specified, Major will be non-zero.
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/0004-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0004-MacPorts-Only-Skip-checking-for-python-in-configure.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0004-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,115 @@
+From c15b0db6296b9ba48e1796b46401c2431a8f5c0f 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 4/5] MacPorts Only: Skip checking for python in configure
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit cf8cce2b5201c8113a73bb2c0c5e5f6a2d9085b8)
+
+Conflicts:
+ configure
+---
+ configure | 87 ---------------------------------------------------------------
+ 1 file changed, 87 deletions(-)
+
+diff --git llvm_release_35/configure macports_release_35/configure
+index 4242042..452c18d 100755
+--- llvm_release_35/configure
++++ macports_release_35/configure
+@@ -8176,93 +8176,6 @@ fi
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
+
+
+-# Check whether --with-python was given.
+-if test "${with_python+set}" = set; then
+- withval=$with_python; PYTHON="$withval"
+-fi
+-
+-
+-if test -n "$PYTHON" && test -x "$PYTHON" ; then
+- { echo "$as_me:$LINENO: checking for python" >&5
+-echo $ECHO_N "checking for python... $ECHO_C" >&6; }
+- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5
+-echo "${ECHO_T}user defined: $with_python" >&6; }
+-else
+- if test -n "$PYTHON" ; then
+- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5
+-echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
+- fi
+-
+- # Extract the first word of "python python2 python26", so it can be a program name with args.
+-set dummy python python2 python26; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PYTHON in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
+-echo "$as_me: error: could not find python 2.5 or higher" >&2;}
+- { (exit 1); exit 1; }; }"
+- ;;
+-esac
+-fi
+-PYTHON=$ac_cv_path_PYTHON
+-if test -n "$PYTHON"; then
+- { echo "$as_me:$LINENO: result: $PYTHON" >&5
+-echo "${ECHO_T}$PYTHON" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-fi
+-
+-{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
+-echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
+-ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
+-ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
+-ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
+-ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
+-if test "$ac_python_version_major" -gt "2" || \
+- (test "$ac_python_version_major" -eq "2" && \
+- test "$ac_python_version_minor" -ge "5") ; then
+- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
+-echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+ { echo "$as_me:$LINENO: checking for sin in -lm" >&5
+ echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_sin+set}" = set; then
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.5/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,320 +0,0 @@
-From bab1ec954fe3ca9d6733da96c2d1bf46bd9345e7 Mon Sep 17 00:00:00 2001
-From: David Fang <fang at csl.cornell.edu>
-Date: Wed, 15 Jan 2014 21:27:34 -0800
-Subject: [PATCH 4/4] implement atomic<> using mutex/lock_guard for 64b ops on
- 32b PPC not pretty, not fast, but passes atomic tests
-
-(cherry picked from commit 8ec078a3bf34383cf8a0cbc6294ddf0da6bc3bed)
-
-Conflicts:
- include/atomic
----
- include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
- include/atomic | 46 ++++++++++
- 2 files changed, 286 insertions(+)
- create mode 100644 include/__atomic_locked
-
-diff --git a/include/__atomic_locked b/include/__atomic_locked
-new file mode 100644
-index 0000000..f10dd74
---- /dev/null
-+++ b/projects/libcxx/include/__atomic_locked
-@@ -0,0 +1,240 @@
-+// -*- C++ -*-
-+//===--------------------------- __atomic_locked --------------------------===//
-+//
-+// The LLVM Compiler Infrastructure
-+//
-+// This file is distributed under the University of Illinois Open Source
-+// License. See LICENSE.TXT for details.
-+//
-+//===----------------------------------------------------------------------===//
-+
-+#ifndef _LIBCPP_ATOMIC_LOCKED
-+#define _LIBCPP_ATOMIC_LOCKED
-+
-+#include <__mutex_base> // for mutex and lock_guard
-+
-+/**
-+ This provides slow-but-usable lock-based atomic access to
-+ structures for which atomic lock-free functions are missing.
-+ This is motivated by the desire for 64b atomic operations
-+ on 32b PowerPC architectures.
-+**/
-+
-+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-+#pragma GCC system_header
-+#endif
-+
-+_LIBCPP_BEGIN_NAMESPACE_STD
-+
-+template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
-+struct __atomic_mutex_locked // false
-+{
-+ mutable _Atomic(_Tp) __a_;
-+ mutable mutex __lock_;
-+ typedef lock_guard<mutex> lock_type;
-+
-+ _Tp& na(void) const { return reinterpret_cast<_Tp&>(__a_); }
-+ volatile _Tp& na(void) const volatile { return reinterpret_cast<volatile _Tp&>(__a_); }
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool is_lock_free() const volatile _NOEXCEPT
-+ {return false;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool is_lock_free() const _NOEXCEPT
-+ {return false;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ void store(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_)); na() = __d; }
-+ _LIBCPP_INLINE_VISIBILITY
-+ void store(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
-+ { const lock_type g(__lock_); na() = __d; }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp load(memory_order = memory_order_seq_cst) const volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_)); return na(); }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp load(memory_order = memory_order_seq_cst) const _NOEXCEPT
-+ { const lock_type g(__lock_); return na(); }
-+ _LIBCPP_INLINE_VISIBILITY
-+ operator _Tp() const volatile _NOEXCEPT {return load();}
-+ _LIBCPP_INLINE_VISIBILITY
-+ operator _Tp() const _NOEXCEPT {return load();}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_));
-+ // or use std::swap
-+ const _Tp ret = na(); na() = __d; return ret; }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
-+ { const lock_type g(__lock_);
-+ // or use std::swap
-+ const _Tp ret = na(); na() = __d; return ret; }
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
-+ memory_order __s, memory_order __f) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_));
-+ if (na() == __e) { na() = __d; return true; }
-+ else { __e = na(); return false; }
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
-+ memory_order __s, memory_order __f) _NOEXCEPT
-+ { const lock_type g(__lock_);
-+ if (na() == __e) { na() = __d; return true; }
-+ else { __e = na(); return false; }
-+ }
-+
-+ // for now, _weak inditinguishable from _strong
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
-+ memory_order __s, memory_order __f) volatile _NOEXCEPT
-+ {return compare_exchange_weak(__e, __d, __s, __f);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
-+ memory_order __s, memory_order __f) _NOEXCEPT
-+ {return compare_exchange_weak(__e, __d, __s, __f);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
-+ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-+ {return compare_exchange_weak(__e, __d, __m, __m);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_weak(_Tp& __e, _Tp __d,
-+ memory_order __m = memory_order_seq_cst) _NOEXCEPT
-+ {return compare_exchange_weak(__e, __d, __m, __m);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
-+ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-+ {return compare_exchange_strong(__e, __d, __m, __m);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ bool compare_exchange_strong(_Tp& __e, _Tp __d,
-+ memory_order __m = memory_order_seq_cst) _NOEXCEPT
-+ {return compare_exchange_strong(__e, __d, __m, __m);}
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-+ __atomic_mutex_locked() _NOEXCEPT = default;
-+#else
-+ __atomic_mutex_locked() _NOEXCEPT : __a_() {}
-+#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __a_(__d) {}
-+#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-+ __atomic_mutex_locked(const __atomic_mutex_locked&) = delete;
-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) = delete;
-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile = delete;
-+#else // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-+private:
-+ __atomic_mutex_locked(const __atomic_mutex_locked&);
-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&);
-+ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile;
-+#endif // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-+}; // end struct __atomic_mutex_locked
-+
-+// atomic<Integral>
-+
-+template <class _Tp>
-+struct __atomic_mutex_locked<_Tp, true>
-+ : public __atomic_mutex_locked<_Tp, false>
-+{
-+ typedef __atomic_mutex_locked<_Tp, false> __base;
-+ typedef typename __base::lock_type lock_type;
-+ using __base::__lock_;
-+ using __base::na;
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+ __atomic_mutex_locked() _NOEXCEPT _LIBCPP_DEFAULT
-+ _LIBCPP_INLINE_VISIBILITY
-+ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __base(__d) {}
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_));
-+ const _Tp ret = na(); na() += __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-+ { const lock_type g(__lock_);
-+ const _Tp ret = na(); na() += __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_));
-+ const _Tp ret = na(); na() -= __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-+ { const lock_type g(__lock_);
-+ const _Tp ret = na(); na() -= __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_));
-+ const _Tp ret = na(); na() &= __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-+ { const lock_type g(__lock_);
-+ const _Tp ret = na(); na() &= __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_));
-+ const _Tp ret = na(); na() |= __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-+ { const lock_type g(__lock_);
-+ const _Tp ret = na(); na() |= __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-+ { const lock_type g(const_cast<mutex&>(__lock_));
-+ const _Tp ret = na(); na() ^= __op; return ret;
-+ }
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-+ { const lock_type g(__lock_);
-+ const _Tp ret = na(); na() ^= __op; return ret;
-+ }
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator++(int) volatile _NOEXCEPT {return fetch_add(_Tp(1));}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator++(int) _NOEXCEPT {return fetch_add(_Tp(1));}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator--(int) volatile _NOEXCEPT {return fetch_sub(_Tp(1));}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator--(int) _NOEXCEPT {return fetch_sub(_Tp(1));}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator++() volatile _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator++() _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator--() volatile _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator--() _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator+=(_Tp __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator+=(_Tp __op) _NOEXCEPT {return fetch_add(__op) + __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator-=(_Tp __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator-=(_Tp __op) _NOEXCEPT {return fetch_sub(__op) - __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator&=(_Tp __op) volatile _NOEXCEPT {return fetch_and(__op) & __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator&=(_Tp __op) _NOEXCEPT {return fetch_and(__op) & __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator|=(_Tp __op) volatile _NOEXCEPT {return fetch_or(__op) | __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator|=(_Tp __op) _NOEXCEPT {return fetch_or(__op) | __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator^=(_Tp __op) volatile _NOEXCEPT {return fetch_xor(__op) ^ __op;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator^=(_Tp __op) _NOEXCEPT {return fetch_xor(__op) ^ __op;}
-+};
-+
-+_LIBCPP_END_NAMESPACE_STD
-+
-+#endif // _LIBCPP_ATOMIC_LOCKED
-diff --git a/include/atomic b/include/atomic
-index f6ab1cb..e580315 100644
---- a/projects/libcxx/include/atomic
-+++ b/projects/libcxx/include/atomic
-@@ -1528,4 +1528,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
-
- _LIBCPP_END_NAMESPACE_STD
-
-+#if defined(__ppc__) && !defined(__ppc64__)
-+// specialize fallback implementation where 64b atomics are missing
-+#include <__atomic_locked>
-+
-+_LIBCPP_BEGIN_NAMESPACE_STD
-+
-+template <>
-+struct atomic<long long> : public __atomic_mutex_locked<long long>
-+{
-+ typedef long long _Tp;
-+ typedef __atomic_mutex_locked<_Tp> __base;
-+ _LIBCPP_INLINE_VISIBILITY
-+ atomic() _NOEXCEPT _LIBCPP_DEFAULT
-+ _LIBCPP_INLINE_VISIBILITY
-+ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator=(_Tp __d) volatile _NOEXCEPT
-+ {__base::store(__d); return __d;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator=(_Tp __d) _NOEXCEPT
-+ {__base::store(__d); return __d;}
-+};
-+
-+template <>
-+struct atomic<unsigned long long> :
-+ public __atomic_mutex_locked<unsigned long long>
-+{
-+ typedef unsigned long long _Tp;
-+ typedef __atomic_mutex_locked<_Tp> __base;
-+ _LIBCPP_INLINE_VISIBILITY
-+ atomic() _NOEXCEPT _LIBCPP_DEFAULT
-+ _LIBCPP_INLINE_VISIBILITY
-+ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
-+
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator=(_Tp __d) volatile _NOEXCEPT
-+ {__base::store(__d); return __d;}
-+ _LIBCPP_INLINE_VISIBILITY
-+ _Tp operator=(_Tp __d) _NOEXCEPT
-+ {__base::store(__d); return __d;}
-+};
-+
-+_LIBCPP_END_NAMESPACE_STD
-+#endif // defined(__ppc__) && !defined(__ppc64__)
-+
- #endif // _LIBCPP_ATOMIC
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.5/files/0005-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/0005-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/0005-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,58 @@
+From 9ae8c7a2886dcdd9c142710e1dc044e538675784 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 5/5] Set the Mach-O CPU Subtype to ppc7400 when targeting
+ Leopard
+
+http://llvm.org/bugs/show_bug.cgi?id=18463
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 53f17b9930d8ace72f8a8f241bc54ce65e29ecd0)
+---
+ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git llvm_release_35/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_release_35/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+index c54d5e7..21f1f8f 100644
+--- llvm_release_35/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
++++ macports_release_35/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+@@ -205,16 +205,23 @@ public:
+ // FIXME: This should be in a separate file.
+ namespace {
+ class DarwinPPCAsmBackend : public PPCAsmBackend {
++ Triple TheTriple;
+ public:
+- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, false) { }
++ DarwinPPCAsmBackend(const Target &T, StringRef TT) : PPCAsmBackend(T, false), TheTriple(TT) { }
+
+ MCObjectWriter *createObjectWriter(raw_ostream &OS) const override {
+ bool is64 = getPointerSize() == 8;
++ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
++
++ if (TheTriple.isOSDarwin() && !TheTriple.isMacOSXVersionLT(10,5)) {
++ CS = MachO::CPU_SUBTYPE_POWERPC_7400;
++ }
++
+ return createPPCMachObjectWriter(
+ OS,
+ /*Is64Bit=*/is64,
+ (is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
+- MachO::CPU_SUBTYPE_POWERPC_ALL);
++ CS);
+ }
+ };
+
+@@ -236,8 +243,9 @@ namespace {
+ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
+ const MCRegisterInfo &MRI,
+ StringRef TT, StringRef CPU) {
++
+ if (Triple(TT).isOSDarwin())
+- return new DarwinPPCAsmBackend(T);
++ return new DarwinPPCAsmBackend(T, TT);
+
+ uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(Triple(TT).getOS());
+ bool IsLittleEndian = Triple(TT).getArch() == Triple::ppc64le;
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1000-MacPorts-Only-Helper-script-for-generating-patches.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1000-MacPorts-Only-Helper-script-for-generating-patches.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1000-MacPorts-Only-Helper-script-for-generating-patches.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,31 @@
+From e66ecc100df472f6bef60da6a4b5a2f127a393a8 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:48:39 -0800
+Subject: [PATCH 1000/1006] MacPorts Only: Helper script for generating patches
+
+(cherry picked from commit 3b10caae75afbafcea4b29f5b780dd5a3d684694)
+---
+ create_macports_patches.sh | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100755 create_macports_patches.sh
+
+diff --git llvm_release_35/tools/clang/create_macports_patches.sh macports_release_35/tools/clang/create_macports_patches.sh
+new file mode 100755
+index 0000000..e51c371
+--- /dev/null
++++ macports_release_35/tools/clang/create_macports_patches.sh
+@@ -0,0 +1,11 @@
++#!/bin/bash
++
++parse_git_branch()
++{
++ ref=$(git symbolic-ref HEAD 2> /dev/null) || return;
++ echo ${ref#refs/heads/}
++}
++
++branch=$(parse_git_branch)
++
++git format-patch origin/${branch} --src-prefix=llvm_${branch}/tools/clang/ --dst-prefix=macports_${branch}/tools/clang/ --start-number=1000
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,88 @@
+From be249dfc99009e07f65c01463ac62d9592aa00d7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:50:24 -0800
+Subject: [PATCH 1001/1006] MacPorts Only: Prepare clang-format for replacement
+ with absolute path
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit d95bdf342037ee815fa21e871dd9479bc3572550)
+
+Conflicts:
+ tools/clang-format/clang-format.el
+ tools/clang-format/clang-format.py
+---
+ tools/clang-format/clang-format-bbedit.applescript | 2 +-
+ tools/clang-format/clang-format-diff.py | 2 +-
+ tools/clang-format/clang-format-sublime.py | 2 +-
+ tools/clang-format/clang-format.el | 2 +-
+ tools/clang-format/clang-format.py | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git llvm_release_35/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_release_35/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+index fa88fe9..eb09448 100644
+--- llvm_release_35/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ macports_release_35/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -15,7 +15,7 @@ tell application "BBEdit"
+ end tell
+
+ set filePath to urlToPOSIXPath(fileURL)
+-set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
++set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
+
+ tell application "BBEdit"
+ -- "set contents of text document 1 to newContents" scrolls to the bottom while
+diff --git llvm_release_35/tools/clang/tools/clang-format/clang-format-diff.py macports_release_35/tools/clang/tools/clang-format/clang-format-diff.py
+index d6d0d44..217ba85 100755
+--- llvm_release_35/tools/clang/tools/clang-format/clang-format-diff.py
++++ macports_release_35/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -32,7 +32,7 @@ import sys
+
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+
+ def main():
+diff --git llvm_release_35/tools/clang/tools/clang-format/clang-format-sublime.py macports_release_35/tools/clang/tools/clang-format/clang-format-sublime.py
+index 16ff56e..4b68104 100644
+--- llvm_release_35/tools/clang/tools/clang-format/clang-format-sublime.py
++++ macports_release_35/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
+ import subprocess
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
+diff --git llvm_release_35/tools/clang/tools/clang-format/clang-format.el macports_release_35/tools/clang/tools/clang-format/clang-format.el
+index 520a3e2..f63731b 100644
+--- llvm_release_35/tools/clang/tools/clang-format/clang-format.el
++++ macports_release_35/tools/clang/tools/clang-format/clang-format.el
+@@ -13,7 +13,7 @@
+
+ ;; *Location of the clang-format binary. If it is on your PATH, a full path name
+ ;; need not be specified.
+-(defvar clang-format-binary "clang-format")
++(defvar clang-format-binary "@CLANG_FORMAT_PATH@")
+
+ (defun clang-format-region ()
+ "Use clang-format to format the currently active region."
+diff --git llvm_release_35/tools/clang/tools/clang-format/clang-format.py macports_release_35/tools/clang/tools/clang-format/clang-format.py
+index 16a1879..1107737 100644
+--- llvm_release_35/tools/clang/tools/clang-format/clang-format.py
++++ macports_release_35/tools/clang/tools/clang-format/clang-format.py
+@@ -24,7 +24,7 @@ import sys
+ import vim
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,30 @@
+From 61fae0901db990788b0db66406afdfb4ba75f2dc Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:55:27 -0800
+Subject: [PATCH 1002/1006] MacPorts Only: Fix name of scan-view executable
+ inside scan-build
+
+http://trac.macports.org/ticket/35006
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit cf37a2cc4435f757228e928f5fbfb6cadd1b2e21)
+---
+ tools/scan-build/scan-build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_release_35/tools/clang/tools/scan-build/scan-build macports_release_35/tools/clang/tools/scan-build/scan-build
+index 153be2d..e2ce273 100755
+--- llvm_release_35/tools/clang/tools/scan-build/scan-build
++++ macports_release_35/tools/clang/tools/scan-build/scan-build
+@@ -1727,6 +1727,8 @@ if (defined $OutputFormat) {
+ Diag "Analysis run complete.\n";
+ Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+ my $ScanView = Cwd::realpath("$RealBin/scan-view");
++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
+ if (! -x $ScanView) { $ScanView = "scan-view"; }
+ exec $ScanView, "$HtmlDir";
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,28 @@
+From f4ceb2cbee715c5c3e795818b21dfd70928d6a81 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:56:44 -0800
+Subject: [PATCH 1003/1006] MacPorts Only: Fix libclang_rt dylib ids
+
+We should probably not be shipping these.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 1e79aa1d2d652fe79c244c185eeff76c2e40caf2)
+---
+ runtime/compiler-rt/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git llvm_release_35/tools/clang/runtime/compiler-rt/Makefile macports_release_35/tools/clang/runtime/compiler-rt/Makefile
+index ccd83a3..d858338 100644
+--- llvm_release_35/tools/clang/runtime/compiler-rt/Makefile
++++ macports_release_35/tools/clang/runtime/compiler-rt/Makefile
+@@ -242,6 +242,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
+ $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
+ $(Echo) Installing compiler runtime library: $1/$$*
+ $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
++ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
+
+ # Rule to install runtime libraries.
+ RuntimeLibraryInstall.$1: \
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,75 @@
+From a16420beabdb6d675c48d4c546fb827247e4d287 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:58:25 -0800
+Subject: [PATCH 1004/1006] MacPorts Only: Relocate clang resources using llvm
+ version
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 0111fcf6f32dfeb41ae0b1e9be0258b899d97200)
+---
+ lib/Headers/Makefile | 3 ++-
+ runtime/compiler-rt/Makefile | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_35/tools/clang/lib/Headers/Makefile macports_release_35/tools/clang/lib/Headers/Makefile
+index 903acac..7c37992 100644
+--- llvm_release_35/tools/clang/lib/Headers/Makefile
++++ macports_release_35/tools/clang/lib/Headers/Makefile
+@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
+
+@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
+ # Hook into the standard Makefile rules.
+ all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
+
+-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
++PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
+
+ INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
+ INSTHEADERS += $(PROJ_headers)/arm_neon.h
+diff --git llvm_release_35/tools/clang/runtime/compiler-rt/Makefile macports_release_35/tools/clang/runtime/compiler-rt/Makefile
+index d858338..02ce6b6 100644
+--- llvm_release_35/tools/clang/runtime/compiler-rt/Makefile
++++ macports_release_35/tools/clang/runtime/compiler-rt/Makefile
+@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
++PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
+
+ ResourceLibDir := $(ResourceDir)/lib
+ ResourceIncludeDir := $(ResourceDir)/include
+@@ -263,9 +264,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
+ RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
+ .PHONY: RuntimeHeaderInstall
+
++# Make sure $(PROJ_resources) exists before creating the symlink.
++$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
++ $(Echo) Creating compiler runtime compatibility symlink
++ $(Verb) $(MKDIR) $(dir $@)
++ $(Verb) ln -s $(LLVM_VERSION) $@
++
++MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
++.PHONY: MacPortsClangResSymlinkInstall
++
+ # Hook into the standard Makefile rules.
+ all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
+ install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
++ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
++install-local:: MacPortsClangResSymlinkInstall
++endif
+ clean-local:: CleanRuntimeLibraries
+
+ endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,118 @@
+From 85b43b6a6cabfbf2b8b65c91c921c92a86e2ffee Mon Sep 17 00:00:00 2001
+From: Rafael Espindola <rafael.espindola at gmail.com>
+Date: Thu, 28 Aug 2014 21:23:05 +0000
+Subject: [PATCH 1005/1006] Call powerpc-darwin external tools with -arch ppc.
+
+With this patch we call external tools for powerpc-darwin with "-arch ppc"
+instead of "-arch powerpc", so as to be compatible with the cctools assembler
+and ld64 linker.
+
+Patch by Stephen Drake!
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@216687 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 52fc295aad114ea91f4118d5e48fdfa142871704)
+---
+ lib/Driver/ToolChains.cpp | 2 +-
+ lib/Driver/Tools.cpp | 14 +++-----------
+ test/Driver/darwin-arch-default.c | 40 +++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git llvm_release_35/tools/clang/lib/Driver/ToolChains.cpp macports_release_35/tools/clang/lib/Driver/ToolChains.cpp
+index b46f69d..3e6768f 100644
+--- llvm_release_35/tools/clang/lib/Driver/ToolChains.cpp
++++ macports_release_35/tools/clang/lib/Driver/ToolChains.cpp
+@@ -156,7 +156,7 @@ static bool isSoftFloatABI(const ArgList &Args) {
+ StringRef MachO::getMachOArchName(const ArgList &Args) const {
+ switch (getTriple().getArch()) {
+ default:
+- return getArchName();
++ return getDefaultUniversalArchName();
+
+ case llvm::Triple::thumb:
+ case llvm::Triple::arm: {
+diff --git llvm_release_35/tools/clang/lib/Driver/Tools.cpp macports_release_35/tools/clang/lib/Driver/Tools.cpp
+index 198e82e..68d5fc6 100644
+--- llvm_release_35/tools/clang/lib/Driver/Tools.cpp
++++ macports_release_35/tools/clang/lib/Driver/Tools.cpp
+@@ -4870,19 +4870,10 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
+ RenderExtraToolArgs(JA, CmdArgs);
+
+ // If using a driver driver, force the arch.
+- llvm::Triple::ArchType Arch = getToolChain().getArch();
+ if (getToolChain().getTriple().isOSDarwin()) {
+ CmdArgs.push_back("-arch");
+-
+- // FIXME: Remove these special cases.
+- if (Arch == llvm::Triple::ppc)
+- CmdArgs.push_back("ppc");
+- else if (Arch == llvm::Triple::ppc64)
+- CmdArgs.push_back("ppc64");
+- else if (Arch == llvm::Triple::ppc64le)
+- CmdArgs.push_back("ppc64le");
+- else
+- CmdArgs.push_back(Args.MakeArgString(getToolChain().getArchName()));
++ CmdArgs.push_back(
++ Args.MakeArgString(getToolChain().getDefaultUniversalArchName()));
+ }
+
+ // Try to force gcc to match the tool chain we want, if we recognize
+@@ -4890,6 +4881,7 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
+ //
+ // FIXME: The triple class should directly provide the information we want
+ // here.
++ llvm::Triple::ArchType Arch = getToolChain().getArch();
+ if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::ppc)
+ CmdArgs.push_back("-m32");
+ else if (Arch == llvm::Triple::x86_64 || Arch == llvm::Triple::ppc64 ||
+diff --git llvm_release_35/tools/clang/test/Driver/darwin-arch-default.c macports_release_35/tools/clang/test/Driver/darwin-arch-default.c
+index 60bf61d..e7e5e89 100644
+--- llvm_release_35/tools/clang/test/Driver/darwin-arch-default.c
++++ macports_release_35/tools/clang/test/Driver/darwin-arch-default.c
+@@ -2,6 +2,42 @@
+ //
+ // RUN: %clang -target powerpc-apple-darwin8 -### \
+ // RUN: -ccc-print-phases %s 2> %t
+-// RUN: FileCheck --check-prefix=CHECK-POWERPC < %t %s
++// RUN: FileCheck --check-prefix=CHECK-BIND-PPC < %t %s
+ //
+-// CHECK-POWERPC: bind-arch, "ppc"
++// CHECK-BIND-PPC: bind-arch, "ppc"
++//
++// RUN: %clang -target powerpc64-apple-darwin8 -### \
++// RUN: -ccc-print-phases %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-BIND-PPC64 < %t %s
++//
++// CHECK-BIND-PPC64: bind-arch, "ppc64"
++
++// Check that the correct arch name is passed to the external assembler
++//
++// RUN: %clang -target powerpc-apple-darwin8 -### \
++// RUN: -no-integrated-as -c %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-AS-PPC < %t %s
++//
++// CHECK-AS-PPC: {{as(.exe)?"}}
++// CHECK-AS-PPC: "-arch" "ppc"
++//
++// RUN: %clang -target powerpc64-apple-darwin8 -### \
++// RUN: -no-integrated-as -c %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-AS-PPC64 < %t %s
++//
++// CHECK-AS-PPC64: {{as(.exe)?"}}
++// CHECK-AS-PPC64: "-arch" "ppc64"
++
++// Check that the correct arch name is passed to the external linker
++//
++// RUN: %clang -target powerpc-apple-darwin8 -### %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-LD-PPC < %t %s
++//
++// CHECK-LD-PPC: {{ld(.exe)?"}}
++// CHECK-LD-PPC: "-arch" "ppc"
++//
++// RUN: %clang -target powerpc64-apple-darwin8 -### %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-LD-PPC64 < %t %s
++//
++// CHECK-LD-PPC64: {{ld(.exe)?"}}
++// CHECK-LD-PPC64: "-arch" "ppc64"
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,27 @@
+From fb1d2809e5d8bc633fb5e4131e1896078fb2da70 Mon Sep 17 00:00:00 2001
+From: Iain Sandoe <iain at codesourcery.com>
+Date: Sun, 27 Jul 2014 20:35:16 +0100
+Subject: [PATCH 1006/1006] Default to ppc7400 for OSX 10.5+
+
+(cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
+---
+ lib/Driver/Tools.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git llvm_release_35/tools/clang/lib/Driver/Tools.cpp macports_release_35/tools/clang/lib/Driver/Tools.cpp
+index 68d5fc6..066f7d5 100644
+--- llvm_release_35/tools/clang/lib/Driver/Tools.cpp
++++ macports_release_35/tools/clang/lib/Driver/Tools.cpp
+@@ -1392,6 +1392,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
+ TargetCPUName = "ppc64";
+ else if (T.getArch() == llvm::Triple::ppc64le)
+ TargetCPUName = "ppc64le";
++ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
++ // For 10.5+ Altivec is assumed available.
++ TargetCPUName = "7400";
+ else
+ TargetCPUName = "ppc";
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/2000-MacPorts-Only-Helper-script-for-generating-patches.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/2000-MacPorts-Only-Helper-script-for-generating-patches.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/2000-MacPorts-Only-Helper-script-for-generating-patches.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,32 @@
+From 4d88b179de726032cf0f07b139844911bc14278a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:25:13 -0800
+Subject: [PATCH 2000/2006] MacPorts Only: Helper script for generating patches
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit aef4d1dce0385f1e897fe7d1f511f7fd8a1ae322)
+---
+ create_macports_patches.sh | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100755 create_macports_patches.sh
+
+diff --git llvm_release_35/projects/compiler-rt/create_macports_patches.sh macports_release_35/projects/compiler-rt/create_macports_patches.sh
+new file mode 100755
+index 0000000..4d0bc99
+--- /dev/null
++++ macports_release_35/projects/compiler-rt/create_macports_patches.sh
+@@ -0,0 +1,11 @@
++#!/bin/bash
++
++parse_git_branch()
++{
++ ref=$(git symbolic-ref HEAD 2> /dev/null) || return;
++ echo ${ref#refs/heads/}
++}
++
++branch=$(parse_git_branch)
++
++git format-patch origin/${branch} --src-prefix=llvm_${branch}/projects/compiler-rt/ --dst-prefix=macports_${branch}/projects/compiler-rt/ --start-number=2000
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,37 @@
+From 6bbdf306119e75b71b2ef893f77d668d9ae85e0a 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
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 2972ffafff4a394f521986b47810324cd1b7e3ba)
+---
+ make/platform/clang_darwin.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+index 50f8b01..2e455e5 100644
+--- llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -110,12 +110,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
+ # object files. If we are on that platform, strip out all ARM archs. We still
+ # build the libraries themselves so that Clang can find them where it expects
+ # them, even though they might not have an expected slice.
+-ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
+-UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
+-UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
+-UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
+-UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
+-endif
++#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
++#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
++#UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
++#UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
++#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
++#endif
+
+ # 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.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/2002-Do-not-build-a-separate-x86_64h-Haswell-slice-for-th.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/2002-Do-not-build-a-separate-x86_64h-Haswell-slice-for-th.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/2002-Do-not-build-a-separate-x86_64h-Haswell-slice-for-th.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,84 @@
+From b97ea4165e1e20a6937d34af8460a8a9008ddef9 Mon Sep 17 00:00:00 2001
+From: Bob Wilson <bob.wilson at apple.com>
+Date: Mon, 10 Nov 2014 17:05:21 +0000
+Subject: [PATCH 2002/2006] Do not build a separate x86_64h Haswell slice for
+ the iOS simulator.
+
+r199996 added new x86_64h slices for all the Darwin compiler_rt libraries
+that had an x86_64 slice, but that is overkill for the iOS Simulator
+platform where the x86_64h slice is never used.
+
+git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@221610 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 60927db68941599e8e1bda74e64a1142642f3829)
+
+Conflicts:
+ make/platform/clang_darwin.mk
+---
+ make/platform/clang_darwin.mk | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+index 2e455e5..4030383 100644
+--- llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -71,7 +71,7 @@ UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4)
+ # Configuration for targeting iOS for a couple of functions that didn't
+ # make it into libSystem.
+ Configs += ios
+-UniversalArchs.ios := $(call CheckArches,i386 x86_64 x86_64h armv7,ios)
++UniversalArchs.ios := $(call CheckArches,i386 x86_64 armv7,ios)
+
+ # Configuration for targeting OSX. These functions may not be in libSystem
+ # so we should provide our own.
+@@ -85,13 +85,13 @@ UniversalArchs.cc_kext := $(call CheckArches,armv7 i386 x86_64 x86_64h,cc_kext)
+ # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used
+ # a different code generation strategy).
+ Configs += cc_kext_ios5
+-UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64 x86_64h armv7,cc_kext_ios5)
++UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64 armv7,cc_kext_ios5)
+
+ # Configurations which define the profiling support functions.
+ Configs += profile_osx
+ UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64 x86_64h,profile_osx)
+ Configs += profile_ios
+-UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 x86_64h armv7,profile_ios)
++UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
+
+ # Configurations which define the ASAN support functions.
+ Configs += asan_osx_dynamic
+@@ -100,7 +100,7 @@ UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_o
+ IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
+ ifneq ($(IOSSIM_SDK_PATH),)
+ Configs += asan_iossim_dynamic
+-UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_iossim_dynamic)
++UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic)
+ endif
+
+ Configs += ubsan_osx
+@@ -172,7 +172,6 @@ CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin
+
+ CFLAGS.ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+ CFLAGS.ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+-CFLAGS.ios.x86_64h := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+ CFLAGS.ios.armv7 := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
+ CFLAGS.ios.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
+ CFLAGS.ios.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
+@@ -193,7 +192,6 @@ CFLAGS.profile_osx.x86_64 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
+ CFLAGS.profile_osx.x86_64h := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
+ CFLAGS.profile_ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+ CFLAGS.profile_ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+-CFLAGS.profile_ios.x86_64h := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+ CFLAGS.profile_ios.armv7 := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
+ CFLAGS.profile_ios.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
+ CFLAGS.profile_ios.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
+@@ -218,7 +216,6 @@ FUNCTIONS.ios := divmodsi4 udivmodsi4 mulosi4 mulodi4 muloti4
+ FUNCTIONS.ios.i386 := $(FUNCTIONS.ios) \
+ divsi3 udivsi3
+ FUNCTIONS.ios.x86_64 := $(FUNCTIONS.ios.i386)
+-FUNCTIONS.ios.x86_64h := $(FUNCTIONS.ios.x86_64)
+
+ FUNCTIONS.osx := mulosi4 mulodi4 muloti4
+
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/2003-Build-Darwin-libclang_rt-libraries-against-real-SDKs.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/2003-Build-Darwin-libclang_rt-libraries-against-real-SDKs.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/2003-Build-Darwin-libclang_rt-libraries-against-real-SDKs.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,830 @@
+From b685e04c707b14dbf27fc0d7d2ba9d3649fea5bb Mon Sep 17 00:00:00 2001
+From: Bob Wilson <bob.wilson at apple.com>
+Date: Mon, 10 Nov 2014 19:38:15 +0000
+Subject: [PATCH 2003/2006] Build Darwin libclang_rt libraries against real
+ SDKs.
+
+The minimal fake SDK was very useful in allowing us to build for all
+Darwin platforms without needing access to the real SDKs, but it did
+not support building any of the sanitizer runtimes. It's important to
+fix that. As a consequence, if you don't have the iOS SDKs installed,
+we will now skip building the iOS-specific libclang_rt libraries.
+rdar://problem/18825276
+
+git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@221621 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit f028d70fcadd9b6c4d3ce1dd1af89703e422f6fa)
+
+Conflicts:
+ SDKs/darwin/usr/include/stdio.h
+ SDKs/darwin/usr/include/string.h
+ SDKs/darwin/usr/include/sys/fcntl.h
+ make/platform/clang_darwin.mk
+---
+ CMakeLists.txt | 1 -
+ SDKs/darwin/README.txt | 3 --
+ SDKs/darwin/usr/include/errno.h | 17 -------
+ SDKs/darwin/usr/include/fcntl.h | 17 -------
+ SDKs/darwin/usr/include/inttypes.h | 86 -----------------------------------
+ SDKs/darwin/usr/include/limits.h | 23 ----------
+ SDKs/darwin/usr/include/stdio.h | 90 -------------------------------------
+ SDKs/darwin/usr/include/stdlib.h | 32 -------------
+ SDKs/darwin/usr/include/string.h | 52 ---------------------
+ SDKs/darwin/usr/include/sys/errno.h | 31 -------------
+ SDKs/darwin/usr/include/sys/fcntl.h | 52 ---------------------
+ SDKs/darwin/usr/include/sys/mman.h | 42 -----------------
+ SDKs/darwin/usr/include/sys/stat.h | 25 -----------
+ SDKs/darwin/usr/include/sys/types.h | 20 ---------
+ make/platform/clang_darwin.mk | 88 +++++++++++++++++++++---------------
+ 15 files changed, 52 insertions(+), 527 deletions(-)
+ delete mode 100644 SDKs/darwin/README.txt
+ delete mode 100644 SDKs/darwin/usr/include/errno.h
+ delete mode 100644 SDKs/darwin/usr/include/fcntl.h
+ delete mode 100644 SDKs/darwin/usr/include/inttypes.h
+ delete mode 100644 SDKs/darwin/usr/include/limits.h
+ delete mode 100644 SDKs/darwin/usr/include/stdio.h
+ delete mode 100644 SDKs/darwin/usr/include/stdlib.h
+ delete mode 100644 SDKs/darwin/usr/include/string.h
+ delete mode 100644 SDKs/darwin/usr/include/sys/errno.h
+ delete mode 100644 SDKs/darwin/usr/include/sys/fcntl.h
+ delete mode 100644 SDKs/darwin/usr/include/sys/mman.h
+ delete mode 100644 SDKs/darwin/usr/include/sys/stat.h
+ delete mode 100644 SDKs/darwin/usr/include/sys/types.h
+
+diff --git llvm_release_35/projects/compiler-rt/CMakeLists.txt macports_release_35/projects/compiler-rt/CMakeLists.txt
+index f35a096..57362ac 100644
+--- llvm_release_35/projects/compiler-rt/CMakeLists.txt
++++ macports_release_35/projects/compiler-rt/CMakeLists.txt
+@@ -160,7 +160,6 @@ include(CompilerRTUtils)
+ set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ # Setup custom SDK sysroots.
+-set(COMPILER_RT_DARWIN_SDK_SYSROOT ${COMPILER_RT_SOURCE_DIR}/SDKs/darwin)
+ set(COMPILER_RT_LINUX_SDK_SYSROOT ${COMPILER_RT_SOURCE_DIR}/SDKs/linux)
+
+ set(COMPILER_RT_EXTRA_ANDROID_HEADERS ${COMPILER_RT_SOURCE_DIR}/android/include)
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/README.txt macports_release_35/projects/compiler-rt/SDKs/darwin/README.txt
+deleted file mode 100644
+index ea30af3..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/README.txt
++++ /dev/null
+@@ -1,3 +0,0 @@
+-The Darwin platforms are all similar enough we roll them into one SDK, and use
+-preprocessor tricks to get the right definitions for the few things which
+-diverge between OS X and iOS.
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/errno.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/errno.h
+deleted file mode 100644
+index f06e537..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/errno.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-/* ===-- errno.h - stub SDK header for compiler-rt --------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#include <sys/errno.h>
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/fcntl.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/fcntl.h
+deleted file mode 100644
+index a5f91e3..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/fcntl.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-/* ===-- fcntl.h - stub SDK header for compiler-rt --------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#include <sys/fcntl.h>
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/inttypes.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/inttypes.h
+deleted file mode 100644
+index 406fa6f..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/inttypes.h
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/* ===-- inttypes.h - stub SDK header for compiler-rt -----------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __INTTYPES_H__
+-#define __INTTYPES_H__
+-
+-#if __WORDSIZE == 64
+-#define __INTTYPE_PRI64__ "l"
+-#else
+-#define __INTTYPE_PRI64__ "ll"
+-#endif
+-
+-#define PRId8 "hhd"
+-#define PRId16 "hd"
+-#define PRId32 "d"
+-#define PRId64 __INTTYPE_PRI64__ "d"
+-
+-#define PRIi8 "hhi"
+-#define PRIi16 "hi"
+-#define PRIi32 "i"
+-#define PRIi64 __INTTYPE_PRI64__ "i"
+-
+-#define PRIo8 "hho"
+-#define PRIo16 "ho"
+-#define PRIo32 "o"
+-#define PRIo64 __INTTYPE_PRI64__ "o"
+-
+-#define PRIu8 "hhu"
+-#define PRIu16 "hu"
+-#define PRIu32 "u"
+-#define PRIu64 __INTTYPE_PRI64__ "u"
+-
+-#define PRIx8 "hhx"
+-#define PRIx16 "hx"
+-#define PRIx32 "x"
+-#define PRIx64 __INTTYPE_PRI64__ "x"
+-
+-#define PRIX8 "hhX"
+-#define PRIX16 "hX"
+-#define PRIX32 "X"
+-#define PRIX64 __INTTYPE_PRI64__ "X"
+-
+-#define SCNd8 "hhd"
+-#define SCNd16 "hd"
+-#define SCNd32 "d"
+-#define SCNd64 __INTTYPE_PRI64__ "d"
+-
+-#define SCNi8 "hhi"
+-#define SCNi16 "hi"
+-#define SCNi32 "i"
+-#define SCNi64 __INTTYPE_PRI64__ "i"
+-
+-#define SCNo8 "hho"
+-#define SCNo16 "ho"
+-#define SCNo32 "o"
+-#define SCNo64 __INTTYPE_PRI64__ "o"
+-
+-#define SCNu8 "hhu"
+-#define SCNu16 "hu"
+-#define SCNu32 "u"
+-#define SCNu64 __INTTYPE_PRI64__ "u"
+-
+-#define SCNx8 "hhx"
+-#define SCNx16 "hx"
+-#define SCNx32 "x"
+-#define SCNx64 __INTTYPE_PRI64__ "x"
+-
+-#define SCNX8 "hhX"
+-#define SCNX16 "hX"
+-#define SCNX32 "X"
+-#define SCNX64 __INTTYPE_PRI64__ "X"
+-
+-#endif /* __INTTYPES_H__ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/limits.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/limits.h
+deleted file mode 100644
+index 5495a78..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/limits.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/* ===-- limits.h - stub SDK header for compiler-rt -------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __LIMITS_H__
+-#define __LIMITS_H__
+-
+-/* This is only here as a landing pad for the include_next from the compiler's
+- built-in limits.h. */
+-
+-#endif /* __LIMITS_H__ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/stdio.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/stdio.h
+deleted file mode 100644
+index 629b450..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/stdio.h
++++ /dev/null
+@@ -1,90 +0,0 @@
+-/* ===-- stdio.h - stub SDK header for compiler-rt --------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __STDIO_H__
+-#define __STDIO_H__
+-
+-#if defined(__cplusplus)
+-extern "C" {
+-#endif
+-
+-typedef struct __sFILE FILE;
+-typedef __SIZE_TYPE__ size_t;
+-
+-/* Determine the appropriate fdopen, fopen(), and fwrite() functions. */
+-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
+-# if defined(__i386)
+-# define __FDOPEN_NAME "_fdopen$UNIX2003"
+-# define __FOPEN_NAME "_fopen$UNIX2003"
+-# define __FWRITE_NAME "_fwrite$UNIX2003"
+-# elif defined(__x86_64__)
+-# define __FDOPEN_NAME "_fdopen"
+-# define __FOPEN_NAME "_fopen"
+-# define __FWRITE_NAME "_fwrite"
+-# elif defined(__arm)
+-# define __FDOPEN_NAME "_fdopen"
+-# define __FOPEN_NAME "_fopen"
+-# define __FWRITE_NAME "_fwrite"
+-# else
+-# error "unrecognized architecture for targeting OS X"
+-# endif
+-#elif defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
+-# if defined(__i386) || defined (__x86_64)
+-# define __FDOPEN_NAME "_fdopen"
+-# define __FOPEN_NAME "_fopen"
+-# define __FWRITE_NAME "_fwrite"
+-# elif defined(__arm)
+-# define __FDOPEN_NAME "_fdopen"
+-# define __FOPEN_NAME "_fopen"
+-# define __FWRITE_NAME "_fwrite"
+-# else
+-# error "unrecognized architecture for targeting iOS"
+-# endif
+-#else
+-# error "unrecognized architecture for targeting Darwin"
+-#endif
+-
+-# define stderr __stderrp
+-extern FILE *__stderrp;
+-
+-#ifndef SEEK_SET
+-#define SEEK_SET 0 /* set file offset to offset */
+-#endif
+-#ifndef SEEK_CUR
+-#define SEEK_CUR 1 /* set file offset to current plus offset */
+-#endif
+-#ifndef SEEK_END
+-#define SEEK_END 2 /* set file offset to EOF plus offset */
+-#endif
+-
+-int fclose(FILE *);
+-int fflush(FILE *);
+-FILE *fopen(const char * __restrict, const char * __restrict) __asm(__FOPEN_NAME);
+-FILE *fdopen(int, const char *) __asm(__FDOPEN_NAME);
+-int fprintf(FILE * __restrict, const char * __restrict, ...);
+-int fputc(int, FILE *);
+-size_t fwrite(const void * __restrict, size_t, size_t, FILE * __restrict)
+- __asm(__FWRITE_NAME);
+-size_t fread(void * __restrict, size_t, size_t, FILE * __restrict);
+-long ftell(FILE *);
+-int fseek(FILE *, long, int);
+-int snprintf(char * __restrict, size_t, const char * __restrict, ...);
+-
+-#if defined(__cplusplus)
+-}
+-#endif
+-
+-#endif /* __STDIO_H__ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/stdlib.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/stdlib.h
+deleted file mode 100644
+index b6d3171..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/stdlib.h
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/* ===-- stdlib.h - stub SDK header for compiler-rt -------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __STDLIB_H__
+-#define __STDLIB_H__
+-
+-#define NULL ((void *)0)
+-
+-typedef __SIZE_TYPE__ size_t;
+-
+-void abort(void) __attribute__((__noreturn__));
+-int atexit(void (*)(void));
+-int atoi(const char *);
+-void free(void *);
+-char *getenv(const char *);
+-void *malloc(size_t);
+-void *realloc(void *, size_t);
+-
+-#endif /* __STDLIB_H__ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/string.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/string.h
+deleted file mode 100644
+index 1a00574..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/string.h
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/* ===-- string.h - stub SDK header for compiler-rt -------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __STRING_H__
+-#define __STRING_H__
+-
+-typedef __SIZE_TYPE__ size_t;
+-
+-int memcmp(const void *, const void *, size_t);
+-void *memcpy(void *, const void *, size_t);
+-void *memset(void *, int, size_t);
+-char *strcat(char *, const char *);
+-char *strcpy(char *, const char *);
+-char *strdup(const char *);
+-size_t strlen(const char *);
+-char *strncpy(char *, const char *, size_t);
+-
+-/* Determine the appropriate strerror() function. */
+-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
+-# if defined(__i386)
+-# define __STRERROR_NAME "_strerror$UNIX2003"
+-# elif defined(__x86_64__) || defined(__arm)
+-# define __STRERROR_NAME "_strerror"
+-# else
+-# error "unrecognized architecture for targeting OS X"
+-# endif
+-#elif defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
+-# if defined(__i386) || defined (__x86_64) || defined(__arm)
+-# define __STRERROR_NAME "_strerror"
+-# else
+-# error "unrecognized architecture for targeting iOS"
+-# endif
+-#else
+-# error "unrecognized architecture for targeting Darwin"
+-#endif
+-
+-char *strerror(int) __asm(__STRERROR_NAME);
+-
+-#endif /* __STRING_H__ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/errno.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/errno.h
+deleted file mode 100644
+index 4befe38..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/errno.h
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/* ===-- errno.h - stub SDK header for compiler-rt --------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef _SYS_ERRNO_H_
+-#define _SYS_ERRNO_H_
+-
+-#if defined(__cplusplus)
+-extern "C" {
+-#endif
+-
+-extern int *__error(void);
+-#define errno (*__error())
+-
+-#if defined(__cplusplus)
+-}
+-#endif
+-
+-#endif
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/fcntl.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/fcntl.h
+deleted file mode 100644
+index e121949..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/fcntl.h
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/* ===-- fcntl.h - stub SDK header for compiler-rt --------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef _SYS_FCNTL_H_
+-#define _SYS_FCNTL_H_
+-
+-/* Determine the appropriate open function. */
+-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
+-# if defined(__i386)
+-# define __OPEN_NAME "_open$UNIX2003"
+-# elif defined(__x86_64__)
+-# define __OPEN_NAME "_open"
+-# elif defined(__arm)
+-# define __OPEN_NAME "_open"
+-# else
+-# error "unrecognized architecture for targeting OS X"
+-# endif
+-#elif defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
+-# if defined(__i386) || defined (__x86_64)
+-# define __OPEN_NAME "_open"
+-# elif defined(__arm)
+-# define __OPEN_NAME "_open"
+-# else
+-# error "unrecognized architecture for targeting iOS"
+-# endif
+-#else
+-# error "unrecognized architecture for targeting Darwin"
+-#endif
+-
+-#define O_RDONLY 0x0000 /* open for reading only */
+-#define O_WRONLY 0x0001 /* open for writing only */
+-#define O_RDWR 0x0002 /* open for reading and writing */
+-#define O_ACCMODE 0x0003 /* mask for above modes */
+-
+-#define O_CREAT 0x0200 /* create if nonexistent */
+-
+-int open(const char *, int, ...) __asm(__OPEN_NAME);
+-
+-#endif /* !_SYS_FCNTL_H_ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/mman.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/mman.h
+deleted file mode 100644
+index 84561f1..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/mman.h
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/* ===-- mman.h - stub SDK header for compiler-rt ---------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __SYS_MMAN_H__
+-#define __SYS_MMAN_H__
+-
+-typedef __SIZE_TYPE__ size_t;
+-
+-#define PROT_NONE 0x00
+-#define PROT_READ 0x01
+-#define PROT_WRITE 0x02
+-#define PROT_EXEC 0x04
+-
+-#define MAP_SHARED 0x0001
+-#define MAP_PRIVATE 0x0002
+-
+-#define MAP_FILE 0x0000
+-#define MAP_ANON 0x1000
+-
+-#define MS_ASYNC 0x0001
+-#define MS_INVALIDATE 0x0002
+-#define MS_SYNC 0x0010
+-
+-void *mmap(void *addr, size_t len, int prot, int flags, int fd,
+- long long offset);
+-int munmap(void *addr, size_t len);
+-int msync(void *addr, size_t len, int flags);
+-
+-#endif /* __SYS_MMAN_H__ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/stat.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/stat.h
+deleted file mode 100644
+index 6225f90..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/stat.h
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/* ===-- stat.h - stub SDK header for compiler-rt ---------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __SYS_STAT_H__
+-#define __SYS_STAT_H__
+-
+-typedef unsigned short uint16_t;
+-typedef uint16_t mode_t;
+-
+-int mkdir(const char *, mode_t);
+-
+-#endif /* __SYS_STAT_H__ */
+diff --git llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/types.h macports_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/types.h
+deleted file mode 100644
+index b425767..0000000
+--- llvm_release_35/projects/compiler-rt/SDKs/darwin/usr/include/sys/types.h
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/* ===-- types.h - stub SDK header for compiler-rt --------------------------===
+- *
+- * The LLVM Compiler Infrastructure
+- *
+- * This file is dual licensed under the MIT and the University of Illinois Open
+- * Source Licenses. See LICENSE.TXT for details.
+- *
+- * ===-----------------------------------------------------------------------===
+- *
+- * This is a stub SDK header file. This file is not part of the interface of
+- * this library nor an official version of the appropriate SDK header. It is
+- * intended only to stub the features of this header required by compiler-rt.
+- *
+- * ===-----------------------------------------------------------------------===
+- */
+-
+-#ifndef __SYS_TYPES_H__
+-#define __SYS_TYPES_H__
+-
+-#endif /* __SYS_TYPES_H__ */
+diff --git llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+index 4030383..1358b17 100644
+--- llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -6,16 +6,21 @@
+
+ Description := Static runtime libraries for clang/Darwin.
+
+-# A function that ensures we don't try to build for architectures that we
+-# don't have working toolchains for.
++# A function that ensures we don't try to build for architectures and SDKs
++# that we don't have working toolchains for. Arguments:
++# (1): List of architectures
++# (2): Library name
++# (3): SDK path
++# The result is a possibly empty subset of the architectures from argument 1.
+ CheckArches = \
+ $(shell \
+ result=""; \
+- for arch in $(1); do \
++ if [ "X$(3)" != X ]; then \
++ for arch in $(1); do \
+ if $(CC) -arch $$arch -c \
+ -integrated-as \
+ $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
+- -isysroot $(ProjSrcRoot)/SDKs/darwin \
++ -isysroot $(3) \
+ -o /dev/null > /dev/null 2> /dev/null; then \
+ if $(LD) -v 2>&1 | grep "configured to support" \
+ | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+@@ -30,7 +35,8 @@ CheckArches = \
+ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'"; \
+ printf 1>&2 " (clang does not support it)\n"; \
+ fi; \
+- done; \
++ done; \
++ fi; \
+ echo $$result)
+
+ XCRun = \
+@@ -53,6 +59,10 @@ STRIP := $(call XCRun,strip)
+ LIPO := $(call XCRun,lipo)
+ DSYMUTIL := $(call XCRun,dsymutil)
+
++OSX_SDK := $(call XCRunSdkPath,macosx)
++IOS_SDK := $(call XCRunSdkPath,iphoneos)
++IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
++
+ Configs :=
+ UniversalArchs :=
+
+@@ -60,51 +70,53 @@ UniversalArchs :=
+ # still be referenced from Darwin system headers. This symbol is only ever
+ # needed on i386.
+ Configs += eprintf
+-UniversalArchs.eprintf := $(call CheckArches,i386,eprintf)
++UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK))
+
+ # Configuration for targeting 10.4. We need a few functions missing from
+ # libgcc_s.10.4.dylib. We only build x86 slices since clang doesn't really
+ # support targeting PowerPC.
+ Configs += 10.4
+-UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4)
++UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4,$(OSX_SDK))
+
+ # Configuration for targeting iOS for a couple of functions that didn't
+ # make it into libSystem.
+ Configs += ios
+-UniversalArchs.ios := $(call CheckArches,i386 x86_64 armv7,ios)
++UniversalArchs.ios := $(call CheckArches,i386 x86_64,ios,$(IOSSIM_SDK))
++UniversalArchs.ios += $(call CheckArches,armv7,ios,$(IOS_SDK))
+
+ # Configuration for targeting OSX. These functions may not be in libSystem
+ # so we should provide our own.
+ Configs += osx
+-UniversalArchs.osx := $(call CheckArches,i386 x86_64 x86_64h,osx)
++UniversalArchs.osx := $(call CheckArches,i386 x86_64 x86_64h,osx,$(OSX_SDK))
+
+ # Configuration for use with kernel/kexts.
+ Configs += cc_kext
+-UniversalArchs.cc_kext := $(call CheckArches,armv7 i386 x86_64 x86_64h,cc_kext)
++UniversalArchs.cc_kext := $(call CheckArches,i386 x86_64 x86_64h,cc_kext,$(OSX_SDK))
++UniversalArchs.cc_kext += $(call CheckArches,armv7,cc_kext,$(IOS_SDK))
+
+ # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used
+-# a different code generation strategy).
++# a different code generation strategy). Note: the x86_64 slice is unused but
++# it avoids build problems (see pr14013).
+ Configs += cc_kext_ios5
+-UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64 armv7,cc_kext_ios5)
++UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64,cc_kext_ios5,$(IOSSIM_SDK))
++UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
+
+ # Configurations which define the profiling support functions.
+ Configs += profile_osx
+-UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64 x86_64h,profile_osx)
++UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64 x86_64h,profile_osx,$(OSX_SDK))
+ Configs += profile_ios
+-UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
++UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
++UniversalArchs.profile_ios += $(call CheckArches,armv7,profile_ios,$(IOS_SDK))
+
+ # Configurations which define the ASAN support functions.
+ Configs += asan_osx_dynamic
+-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic)
++UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
+
+-IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
+-ifneq ($(IOSSIM_SDK_PATH),)
+ Configs += asan_iossim_dynamic
+-UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic)
+-endif
++UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
+
+ Configs += ubsan_osx
+-UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
++UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
+
+ # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
+ # object files. If we are on that platform, strip out all ARM archs. We still
+@@ -119,17 +131,18 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
+
+ # 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.
+-#
+-# We make sure to remove empty configs if we end up dropping all the requested
+-# archs for a particular config.
+ ifneq ($(RC_SUPPORTED_ARCHS),)
+ $(foreach config,$(Configs),\
+ $(call Set,UniversalArchs.$(config),\
+- $(filter $(RC_SUPPORTED_ARCHS),$(UniversalArchs.$(config))))\
+- $(if $(UniversalArchs.$(config)),,\
+- $(call Set,Configs,$(filter-out $(config),$(Configs)))))
++ $(filter $(RC_SUPPORTED_ARCHS),$(UniversalArchs.$(config))))
+ endif
+
++# Remove empty configs if we end up dropping all the requested
++# archs for a particular config.
++$(foreach config,$(Configs),\
++ $(if $(strip $(UniversalArchs.$(config))),,\
++ $(call Set,Configs,$(filter-out $(config),$(Configs)))))
++
+ ###
+
+ # Forcibly strip off any -arch, as that totally breaks our universal support.
+@@ -147,28 +160,31 @@ IOS_DEPLOYMENT_ARGS := -mios-version-min=1.0
+ IOS6_DEPLOYMENT_ARGS := -mios-version-min=6.0
+ IOSSIM_DEPLOYMENT_ARGS := -mios-simulator-version-min=1.0
+
+-# Use our stub SDK as the sysroot to support more portable building.
+-OSX_DEPLOYMENT_ARGS += -isysroot $(ProjSrcRoot)/SDKs/darwin
+-IOS_DEPLOYMENT_ARGS += -isysroot $(ProjSrcRoot)/SDKs/darwin
+-IOS6_DEPLOYMENT_ARGS += -isysroot $(ProjSrcRoot)/SDKs/darwin
+-IOSSIM_DEPLOYMENT_ARGS += -isysroot $(ProjSrcRoot)/SDKs/darwin
++OSX_DEPLOYMENT_ARGS += -isysroot $(OSX_SDK)
++IOS_DEPLOYMENT_ARGS += -isysroot $(IOS_SDK)
++IOS6_DEPLOYMENT_ARGS += -isysroot $(IOS_SDK)
++IOSSIM_DEPLOYMENT_ARGS += -isysroot $(IOSSIM_SDK)
+
+ CFLAGS.eprintf := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
+ CFLAGS.10.4 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
+-# FIXME: We can't build ASAN with our stub SDK yet.
++
+ CFLAGS.asan_osx_dynamic := \
+- $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin \
++ $(CFLAGS) -mmacosx-version-min=10.6 \
++ -isysroot $(OSX_SDK) \
++ -fno-builtin \
+ -gline-tables-only \
+ -DMAC_INTERPOSE_FUNCTIONS=1
+
+ CFLAGS.asan_iossim_dynamic := \
+ $(CFLAGS) -mios-simulator-version-min=7.0 \
+- -isysroot $(IOSSIM_SDK_PATH) \
++ -isysroot $(IOSSIM_SDK) \
+ -fno-builtin \
+ -gline-tables-only \
+ -DMAC_INTERPOSE_FUNCTIONS=1
+
+-CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin
++CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.6 \
++ -isysroot $(OSX_SDK) \
++ -fno-builtin
+
+ CFLAGS.ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+ CFLAGS.ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
+@@ -206,7 +222,7 @@ SHARED_LIBRARY.asan_iossim_dynamic := 1
+ # or -Wl,-syslibroot.
+ LDFLAGS.asan_iossim_dynamic := -undefined dynamic_lookup \
+ -Wl,-ios_simulator_version_min,7.0.0 \
+- -mios-simulator-version-min=7.0 -isysroot $(IOSSIM_SDK_PATH)
++ -mios-simulator-version-min=7.0 -isysroot $(IOSSIM_SDK)
+
+ FUNCTIONS.eprintf := eprintf
+ FUNCTIONS.10.4 := eprintf floatundidf floatundisf floatundixf
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/2004-Clean-up-indentation-after-previous-change.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/2004-Clean-up-indentation-after-previous-change.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/2004-Clean-up-indentation-after-previous-change.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,62 @@
+From ca5f37834f494bfc968dcb3c54df85ed98e7e827 Mon Sep 17 00:00:00 2001
+From: Bob Wilson <bob.wilson at apple.com>
+Date: Mon, 10 Nov 2014 19:38:18 +0000
+Subject: [PATCH 2004/2006] Clean up indentation after previous change.
+
+git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@221622 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 7c2a39493c7e0ee26078a380ca0f0890dd7566eb)
+---
+ make/platform/clang_darwin.mk | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+index 1358b17..6d3a0f8 100644
+--- llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -16,26 +16,26 @@ CheckArches = \
+ $(shell \
+ result=""; \
+ if [ "X$(3)" != X ]; then \
+- for arch in $(1); do \
+- if $(CC) -arch $$arch -c \
+- -integrated-as \
+- $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
+- -isysroot $(3) \
+- -o /dev/null > /dev/null 2> /dev/null; then \
+- if $(LD) -v 2>&1 | grep "configured to support" \
+- | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+- result="$$result$$arch "; \
++ for arch in $(1); do \
++ if $(CC) -arch $$arch -c \
++ -integrated-as \
++ $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
++ -isysroot $(3) \
++ -o /dev/null > /dev/null 2> /dev/null; then \
++ if $(LD) -v 2>&1 | grep "configured to support" \
++ | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
++ result="$$result$$arch "; \
++ else \
++ printf 1>&2 \
++ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
++ printf 1>&2 " (ld does not support it)\n"; \
++ fi; \
+ else \
+ printf 1>&2 \
+- "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'"; \
+- printf 1>&2 " (ld does not support it)\n"; \
++ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'"; \
++ printf 1>&2 " (clang does not support it)\n"; \
+ fi; \
+- else \
+- printf 1>&2 \
+- "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'"; \
+- printf 1>&2 " (clang does not support it)\n"; \
+- fi; \
+- done; \
++ done; \
+ fi; \
+ echo $$result)
+
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/2005-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/2005-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/2005-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,32 @@
+From d181817db18a2172b616050e9d8d674d0d1ca003 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 2005/2006] 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.
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22182
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit b16ca706de5eeb244b1fe889760ae4339b23a170)
+---
+ make/platform/clang_darwin.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+index 6d3a0f8..2917c1e 100644
+--- llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -25,6 +25,8 @@ CheckArches = \
+ if $(LD) -v 2>&1 | grep "configured to support" \
+ | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+ result="$$result$$arch "; \
++ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
++ result="$$result$$arch "; \
+ else \
+ printf 1>&2 \
+ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/2006-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/2006-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/2006-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,30 @@
+From 0d05e3a5a64eb7640c627c2e45af69c670cc7215 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 2006/2006] Fall back on xcodebuild -sdk when xcrun --sdk is
+ not supported
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit e1ded9c3e06fb5c97d8936b77ccf8982e52a7b69)
+---
+ make/platform/clang_darwin.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+index 2917c1e..068034e 100644
+--- llvm_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_35/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -49,6 +49,10 @@ XCRun = \
+ XCRunSdkPath = \
+ $(shell \
+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
+ if [ "$$?" != "0" ]; then result=""; fi; \
+ echo $$result)
+ ###
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/3000-MacPorts-Only-Helper-script-for-generating-patches.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/3000-MacPorts-Only-Helper-script-for-generating-patches.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/3000-MacPorts-Only-Helper-script-for-generating-patches.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,32 @@
+From 2783417c99be6610bdcbfc72b3d80800de26384a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:11:35 -0800
+Subject: [PATCH 3000/3005] MacPorts Only: Helper script for generating patches
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 534fe4429053a7bec4fff1ef3de779871602dc93)
+---
+ create_macports_patches.sh | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100755 create_macports_patches.sh
+
+diff --git llvm_release_35/projects/libcxx/create_macports_patches.sh macports_release_35/projects/libcxx/create_macports_patches.sh
+new file mode 100755
+index 0000000..938e468
+--- /dev/null
++++ macports_release_35/projects/libcxx/create_macports_patches.sh
+@@ -0,0 +1,11 @@
++#!/bin/bash
++
++parse_git_branch()
++{
++ ref=$(git symbolic-ref HEAD 2> /dev/null) || return;
++ echo ${ref#refs/heads/}
++}
++
++branch=$(parse_git_branch)
++
++git format-patch origin/${branch} --src-prefix=llvm_${branch}/projects/libcxx/ --dst-prefix=macports_${branch}/projects/libcxx/ --start-number=3000
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/3001-buildit-build-fix-for-Leopard.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/3001-buildit-build-fix-for-Leopard.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/3001-buildit-build-fix-for-Leopard.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,36 @@
+From 8d4893c2ab7645f9b19a048aaf745289e723b0f6 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri, 16 Jan 2015 21:10:35 -0800
+Subject: [PATCH 3001/3005] buildit build fix for Leopard
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit b46773a9b7d9867cbfc74d203cd9a444e323d1f7)
+---
+ lib/buildit | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_35/projects/libcxx/lib/buildit macports_release_35/projects/libcxx/lib/buildit
+index 7e3bc2e..2740dee 100755
+--- llvm_release_35/projects/libcxx/lib/buildit
++++ macports_release_35/projects/libcxx/lib/buildit
+@@ -50,7 +50,7 @@ case $TRIPLE in
+ RC_CFLAGS="-arch i386 -arch x86_64"
+ fi
+ SOEXT=dylib
+- if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.6" ]
++ if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.5" ] || [ "$MACOSX_DEPLOYMENT_TARGET" = "10.6" ]
+ then
+ EXTRA_FLAGS="-nostdinc++ -std=c++11 -U__STRICT_ANSI__"
+ LDSHARED_FLAGS="-o libc++.1.dylib \
+@@ -59,7 +59,7 @@ case $TRIPLE in
+ -install_name /usr/lib/libc++.1.dylib \
+ -Wl,-reexport_library,/usr/lib/libc++abi.dylib \
+ -Wl,-unexported_symbols_list,libc++unexp.exp \
+- /usr/lib/libSystem.B.dylib"
++ /usr/lib/libSystem.B.dylib /usr/lib/libgcc_s.1.dylib"
+ else
+ if [ -n "$SDKROOT" ]
+ then
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,29 @@
+From fc993bc4bd6624e829fc7f41244faa1f420219ad Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri, 16 Jan 2015 21:11:37 -0800
+Subject: [PATCH 3002/3005] buildit: Set compatibility version to
+ RC_ProjectSourceVersion
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit ce37e96b968fbcc4b6aef18b1a163d297db903b2)
+---
+ lib/buildit | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git llvm_release_35/projects/libcxx/lib/buildit macports_release_35/projects/libcxx/lib/buildit
+index 2740dee..c74683f 100755
+--- llvm_release_35/projects/libcxx/lib/buildit
++++ macports_release_35/projects/libcxx/lib/buildit
+@@ -54,7 +54,8 @@ case $TRIPLE in
+ then
+ EXTRA_FLAGS="-nostdinc++ -std=c++11 -U__STRICT_ANSI__"
+ LDSHARED_FLAGS="-o libc++.1.dylib \
+- -dynamiclib -nodefaultlibs -current_version 1 \
++ -dynamiclib -nodefaultlibs \
++ -current_version ${RC_ProjectSourceVersion} \
+ -compatibility_version 1 \
+ -install_name /usr/lib/libc++.1.dylib \
+ -Wl,-reexport_library,/usr/lib/libc++abi.dylib \
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,46 @@
+From cdc5ffb91f0bf80bdf1281f4e0132b225a3ee0bc Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri, 16 Jan 2015 21:34:36 -0800
+Subject: [PATCH 3003/3005] Fix <local> and <iterator> when building with Lion
+ and newer Availability.h
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit cb271d6ce269bbddc916643c495ccbdfde6e3054)
+---
+ include/iterator | 4 ++--
+ include/locale | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git llvm_release_35/projects/libcxx/include/iterator macports_release_35/projects/libcxx/include/iterator
+index f338e01..64b52e7 100644
+--- llvm_release_35/projects/libcxx/include/iterator
++++ macports_release_35/projects/libcxx/include/iterator
+@@ -913,8 +913,8 @@ public:
+ _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
+
+ #if !defined(__APPLE__) || \
+- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
+- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
++ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
+
+ template <class _Ch, class _Tr>
+ friend
+diff --git llvm_release_35/projects/libcxx/include/locale macports_release_35/projects/libcxx/include/locale
+index fcff402..10d8ca9 100644
+--- llvm_release_35/projects/libcxx/include/locale
++++ macports_release_35/projects/libcxx/include/locale
+@@ -1467,8 +1467,8 @@ __pad_and_output(_OutputIterator __s,
+ }
+
+ #if !defined(__APPLE__) || \
+- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
+- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
++ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
+
+ template <class _CharT, class _Traits>
+ _LIBCPP_HIDDEN
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,42 @@
+From dea158e4d824860a1a75922b12ec21cea6aed8ac Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:26:20 -0800
+Subject: [PATCH 3004/3005] Fix missing long long math prototypes when using
+ the Snow Leopard SDK
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit afdc64a717d3b284f920944146952bcbbc111cd0)
+---
+ include/cmath | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git llvm_release_35/projects/libcxx/include/cmath macports_release_35/projects/libcxx/include/cmath
+index 964c672..c6f13af 100644
+--- llvm_release_35/projects/libcxx/include/cmath
++++ macports_release_35/projects/libcxx/include/cmath
+@@ -301,6 +301,22 @@ long double truncl(long double x);
+ #include <math.h>
+ #include <type_traits>
+
++#ifdef __APPLE__
++#include <Availability.h>
++#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
++/* These prototypes are incorrectly omitted from <math.h> on Snow Leopard despite being available */
++extern "C" {
++ extern long long int llrintl(long double);
++ extern long long int llrint(double);
++ extern long long int llrintf(float);
++
++ extern long long int llroundl(long double);
++ extern long long int llround(double);
++ extern long long int llroundf(float);
++}
++#endif
++#endif // __APPLE__
++
+ #ifdef _LIBCPP_MSVCRT
+ #include "support/win32/math_win32.h"
+ #endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,320 @@
+From 89b579c10f9a95a39a0f7bf8560c505a0d2d0eee Mon Sep 17 00:00:00 2001
+From: David Fang <fang at csl.cornell.edu>
+Date: Wed, 15 Jan 2014 21:27:34 -0800
+Subject: [PATCH 3005/3005] implement atomic<> using mutex/lock_guard for 64b
+ ops on 32b PPC not pretty, not fast, but passes atomic tests
+
+(cherry picked from commit 88eccd6a4edd5675ab6657464c004a249893c974)
+
+Conflicts:
+ include/atomic
+---
+ include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
+ include/atomic | 46 ++++++++++
+ 2 files changed, 286 insertions(+)
+ create mode 100644 include/__atomic_locked
+
+diff --git llvm_release_35/projects/libcxx/include/__atomic_locked macports_release_35/projects/libcxx/include/__atomic_locked
+new file mode 100644
+index 0000000..f10dd74
+--- /dev/null
++++ macports_release_35/projects/libcxx/include/__atomic_locked
+@@ -0,0 +1,240 @@
++// -*- C++ -*-
++//===--------------------------- __atomic_locked --------------------------===//
++//
++// The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++#ifndef _LIBCPP_ATOMIC_LOCKED
++#define _LIBCPP_ATOMIC_LOCKED
++
++#include <__mutex_base> // for mutex and lock_guard
++
++/**
++ This provides slow-but-usable lock-based atomic access to
++ structures for which atomic lock-free functions are missing.
++ This is motivated by the desire for 64b atomic operations
++ on 32b PowerPC architectures.
++**/
++
++#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
++#pragma GCC system_header
++#endif
++
++_LIBCPP_BEGIN_NAMESPACE_STD
++
++template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
++struct __atomic_mutex_locked // false
++{
++ mutable _Atomic(_Tp) __a_;
++ mutable mutex __lock_;
++ typedef lock_guard<mutex> lock_type;
++
++ _Tp& na(void) const { return reinterpret_cast<_Tp&>(__a_); }
++ volatile _Tp& na(void) const volatile { return reinterpret_cast<volatile _Tp&>(__a_); }
++
++ _LIBCPP_INLINE_VISIBILITY
++ bool is_lock_free() const volatile _NOEXCEPT
++ {return false;}
++ _LIBCPP_INLINE_VISIBILITY
++ bool is_lock_free() const _NOEXCEPT
++ {return false;}
++ _LIBCPP_INLINE_VISIBILITY
++ void store(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_)); na() = __d; }
++ _LIBCPP_INLINE_VISIBILITY
++ void store(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_); na() = __d; }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp load(memory_order = memory_order_seq_cst) const volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_)); return na(); }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp load(memory_order = memory_order_seq_cst) const _NOEXCEPT
++ { const lock_type g(__lock_); return na(); }
++ _LIBCPP_INLINE_VISIBILITY
++ operator _Tp() const volatile _NOEXCEPT {return load();}
++ _LIBCPP_INLINE_VISIBILITY
++ operator _Tp() const _NOEXCEPT {return load();}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ // or use std::swap
++ const _Tp ret = na(); na() = __d; return ret; }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ // or use std::swap
++ const _Tp ret = na(); na() = __d; return ret; }
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ if (na() == __e) { na() = __d; return true; }
++ else { __e = na(); return false; }
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) _NOEXCEPT
++ { const lock_type g(__lock_);
++ if (na() == __e) { na() = __d; return true; }
++ else { __e = na(); return false; }
++ }
++
++ // for now, _weak inditinguishable from _strong
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) volatile _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __s, __f);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __s, __f);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __m, __m);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __m, __m);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ {return compare_exchange_strong(__e, __d, __m, __m);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ {return compare_exchange_strong(__e, __d, __m, __m);}
++
++ _LIBCPP_INLINE_VISIBILITY
++#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
++ __atomic_mutex_locked() _NOEXCEPT = default;
++#else
++ __atomic_mutex_locked() _NOEXCEPT : __a_() {}
++#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
++
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __a_(__d) {}
++#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
++ __atomic_mutex_locked(const __atomic_mutex_locked&) = delete;
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) = delete;
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile = delete;
++#else // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
++private:
++ __atomic_mutex_locked(const __atomic_mutex_locked&);
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&);
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile;
++#endif // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
++}; // end struct __atomic_mutex_locked
++
++// atomic<Integral>
++
++template <class _Tp>
++struct __atomic_mutex_locked<_Tp, true>
++ : public __atomic_mutex_locked<_Tp, false>
++{
++ typedef __atomic_mutex_locked<_Tp, false> __base;
++ typedef typename __base::lock_type lock_type;
++ using __base::__lock_;
++ using __base::na;
++
++ _LIBCPP_INLINE_VISIBILITY
++ __atomic_mutex_locked() _NOEXCEPT _LIBCPP_DEFAULT
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __base(__d) {}
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() += __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() += __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() -= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() -= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() &= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() &= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() |= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() |= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() ^= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() ^= __op; return ret;
++ }
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++(int) volatile _NOEXCEPT {return fetch_add(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++(int) _NOEXCEPT {return fetch_add(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--(int) volatile _NOEXCEPT {return fetch_sub(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--(int) _NOEXCEPT {return fetch_sub(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++() volatile _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++() _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--() volatile _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--() _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator+=(_Tp __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator+=(_Tp __op) _NOEXCEPT {return fetch_add(__op) + __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator-=(_Tp __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator-=(_Tp __op) _NOEXCEPT {return fetch_sub(__op) - __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator&=(_Tp __op) volatile _NOEXCEPT {return fetch_and(__op) & __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator&=(_Tp __op) _NOEXCEPT {return fetch_and(__op) & __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator|=(_Tp __op) volatile _NOEXCEPT {return fetch_or(__op) | __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator|=(_Tp __op) _NOEXCEPT {return fetch_or(__op) | __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator^=(_Tp __op) volatile _NOEXCEPT {return fetch_xor(__op) ^ __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator^=(_Tp __op) _NOEXCEPT {return fetch_xor(__op) ^ __op;}
++};
++
++_LIBCPP_END_NAMESPACE_STD
++
++#endif // _LIBCPP_ATOMIC_LOCKED
+diff --git llvm_release_35/projects/libcxx/include/atomic macports_release_35/projects/libcxx/include/atomic
+index f6ab1cb..e580315 100644
+--- llvm_release_35/projects/libcxx/include/atomic
++++ macports_release_35/projects/libcxx/include/atomic
+@@ -1528,4 +1528,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
+
+ _LIBCPP_END_NAMESPACE_STD
+
++#if defined(__ppc__) && !defined(__ppc64__)
++// specialize fallback implementation where 64b atomics are missing
++#include <__atomic_locked>
++
++_LIBCPP_BEGIN_NAMESPACE_STD
++
++template <>
++struct atomic<long long> : public __atomic_mutex_locked<long long>
++{
++ typedef long long _Tp;
++ typedef __atomic_mutex_locked<_Tp> __base;
++ _LIBCPP_INLINE_VISIBILITY
++ atomic() _NOEXCEPT _LIBCPP_DEFAULT
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) volatile _NOEXCEPT
++ {__base::store(__d); return __d;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) _NOEXCEPT
++ {__base::store(__d); return __d;}
++};
++
++template <>
++struct atomic<unsigned long long> :
++ public __atomic_mutex_locked<unsigned long long>
++{
++ typedef unsigned long long _Tp;
++ typedef __atomic_mutex_locked<_Tp> __base;
++ _LIBCPP_INLINE_VISIBILITY
++ atomic() _NOEXCEPT _LIBCPP_DEFAULT
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) volatile _NOEXCEPT
++ {__base::store(__d); return __d;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) _NOEXCEPT
++ {__base::store(__d); return __d;}
++};
++
++_LIBCPP_END_NAMESPACE_STD
++#endif // defined(__ppc__) && !defined(__ppc64__)
++
+ #endif // _LIBCPP_ATOMIC
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.5/files/clang-format.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/clang-format.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/clang-format.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,79 +0,0 @@
-Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-+++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-@@ -15,7 +15,7 @@ tell application "BBEdit"
- end tell
-
- set filePath to urlToPOSIXPath(fileURL)
--set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-+set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-
- tell application "BBEdit"
- -- "set contents of text document 1 to newContents" scrolls to the bottom while
-Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-diff.py
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-diff.py
-@@ -32,7 +32,7 @@ import sys
-
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
-
- def main():
-Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.el
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format.el
-+++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.el
-@@ -13,7 +13,7 @@
-
- ;; *Location of the clang-format binary. If it is on your PATH, a full path name
- ;; need not be specified.
--(defvar clang-format-binary "clang-format")
-+(defvar clang-format-binary "@CLANG_FORMAT_PATH@")
-
- (defun clang-format-region ()
- "Use clang-format to format the currently active region."
-Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.py
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format.py
-+++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format.py
-@@ -24,7 +24,7 @@ import sys
- import vim
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
- # Change this to format according to other formatting styles. See the output of
- # 'clang-format --help' for a list of supported styles. The default looks for
-Index: llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-sublime.py
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/tools/clang-format/clang-format-sublime.py
-+++ llvm-3.5.0.src/tools/clang/tools/clang-format/clang-format-sublime.py
-@@ -18,7 +18,7 @@ import sublime_plugin
- import subprocess
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
- # Change this to format according to other formatting styles. See the output of
- # 'clang-format --help' for a list of supported styles. The default looks for
-Index: llvm-3.5.0.src/Makefile
-===================================================================
---- llvm-3.5.0.src.orig/Makefile
-+++ llvm-3.5.0.src/Makefile
-@@ -71,7 +71,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
- tools/clang/tools/libclang \
- tools/clang/tools/c-index-test \
- tools/clang/runtime tools/clang/docs \
-- tools/clang/include tools/clang/lib
-+ tools/clang/include tools/clang/lib \
-+ tools/clang/tools/clang-format
- OPTIONAL_DIRS :=
- NO_INSTALL = 1
- endif
Deleted: trunk/dports/lang/llvm-3.5/files/clang-modernize.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/clang-modernize.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/clang-modernize.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,13 +0,0 @@
---- a/Makefile 2014-05-29 08:40:41.000000000 -0500
-+++ b/Makefile 2014-05-29 08:41:52.000000000 -0500
-@@ -72,7 +72,9 @@
- tools/clang/tools/c-index-test \
- tools/clang/runtime tools/clang/docs \
- tools/clang/include tools/clang/lib \
-- tools/clang/tools/clang-format
-+ tools/clang/tools/clang-format \
-+ tools/clang/tools/extra/clang-modernize \
-+ tools/clang/tools/extra/clang-apply-replacements
- OPTIONAL_DIRS :=
- NO_INSTALL = 1
- endif
Deleted: trunk/dports/lang/llvm-3.5/files/fix-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/fix-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/fix-dylib-ids.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,18 +0,0 @@
-Index: llvm-3.5.0.src/Makefile.rules
-===================================================================
---- llvm-3.5.0.src.orig/Makefile.rules
-+++ llvm-3.5.0.src/Makefile.rules
-@@ -599,7 +599,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS),
- ifneq ($(HOST_OS),Darwin)
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- else
-- LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-+ LD.Flags += -Wl,-install_name
-+ ifdef LOADABLE_MODULE
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
-+ else
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
-+ endif
- endif
- endif
- endif
Deleted: trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,21 +0,0 @@
-Index: llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile
-@@ -222,8 +222,6 @@ $(ResourceLibDir)/$1/libclang_rt.%.dylib
- $(ResourceLibDir)/$1/.dir
- $(Echo) Copying runtime library $1/$$* to build dir
- $(Verb) cp $(PROJ_OBJ_DIR)/clang_$1/$$*/libcompiler_rt.dylib $$@
-- $(Echo) Fixing LC_ID_DYLIB of $$@
-- $(Verb) install_name_tool $$@ -id $$@
- RuntimeLibrary.$1: \
- $(RuntimeLibrary.$1.Configs:%=$(ResourceLibDir)/$1/libclang_rt.%)
- .PHONY: RuntimeLibrary.$1
-@@ -243,6 +241,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.d
- $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
- $(Echo) Installing compiler runtime library: $1/$$*
- $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
-+ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
-
- # Rule to install runtime libraries.
- RuntimeLibraryInstall.$1: \
Deleted: trunk/dports/lang/llvm-3.5/files/install_target.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/install_target.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/install_target.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,13 +0,0 @@
---- a/Makefile 2013-10-02 08:42:23.000000000 -0700
-+++ b/Makefile 2013-10-24 10:57:33.000000000 -0700
-@@ -70,9 +70,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
- DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
- tools/clang/tools/libclang \
- tools/clang/tools/c-index-test \
-- tools/clang/include/clang-c \
- tools/clang/runtime tools/clang/docs \
-- tools/lto
-+ tools/clang/include tools/clang/lib
- OPTIONAL_DIRS :=
- NO_INSTALL = 1
- endif
Copied: trunk/dports/lang/llvm-3.5/files/leopard-no-blocks.patch (from rev 131762, trunk/dports/lang/llvm-3.5/files/0001-Leopard-Default-to-fno-blocks.patch)
===================================================================
--- trunk/dports/lang/llvm-3.5/files/leopard-no-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/leopard-no-blocks.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -0,0 +1,26 @@
+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
Deleted: trunk/dports/lang/llvm-3.5/files/llvm-integrated-as.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/llvm-integrated-as.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/llvm-integrated-as.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,15 +0,0 @@
-http://llvm.org/bugs/show_bug.cgi?id=21636
-
-Index: lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-===================================================================
---- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-@@ -186,7 +186,7 @@
- // use the directive, where it would need the same conditionalization
- // anyway.
- Triple TT(getTargetTriple());
-- if (TT.isOSDarwin()) {
-+ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
- unsigned Major, Minor, Update;
- TT.getOSVersion(Major, Minor, Update);
- // If there is a version specified, Major will be non-zero.
Deleted: trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,59 +0,0 @@
-Index: llvm-3.5.0.src/tools/clang/lib/Headers/Makefile
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/lib/Headers/Makefile
-+++ llvm-3.5.0.src/tools/clang/lib/Headers/Makefile
-@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
-
-@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SR
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
-
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
-
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- INSTHEADERS += $(PROJ_headers)/arm_neon.h
-Index: llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile
-@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
--PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
-
- ResourceLibDir := $(ResourceDir)/lib
- ResourceIncludeDir := $(ResourceDir)/include
-@@ -262,9 +263,21 @@ $(PROJ_resources_include)/sanitizer: $(R
- RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
- .PHONY: RuntimeHeaderInstall
-
-+# Make sure $(PROJ_resources) exists before creating the symlink.
-+$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
-+ $(Echo) Creating compiler runtime compatibility symlink
-+ $(Verb) $(MKDIR) $(dir $@)
-+ $(Verb) ln -s $(LLVM_VERSION) $@
-+
-+MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
-+.PHONY: MacPortsClangResSymlinkInstall
-+
- # Hook into the standard Makefile rules.
- all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
- install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
-+ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
-+install-local:: MacPortsClangResSymlinkInstall
-+endif
- clean-local:: CleanRuntimeLibraries
-
- endif
Deleted: trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/scan-build-PR-35006.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,13 +0,0 @@
-Index: llvm-3.5.0.src/tools/clang/tools/scan-build/scan-build
-===================================================================
---- llvm-3.5.0.src.orig/tools/clang/tools/scan-build/scan-build
-+++ llvm-3.5.0.src/tools/clang/tools/scan-build/scan-build
-@@ -1727,6 +1727,8 @@ if (defined $OutputFormat) {
- Diag "Analysis run complete.\n";
- Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
- my $ScanView = Cwd::realpath("$RealBin/scan-view");
-+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
-+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
- if (! -x $ScanView) { $ScanView = "scan-view"; }
- exec $ScanView, "$HtmlDir";
- }
Deleted: trunk/dports/lang/llvm-3.5/files/skip-python-check.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/skip-python-check.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/skip-python-check.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,98 +0,0 @@
-Index: llvm-3.5.0.src/configure
-===================================================================
---- llvm-3.5.0.src.orig/configure
-+++ llvm-3.5.0.src/configure
-@@ -8176,93 +8176,6 @@ fi
- echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
-
-
--# Check whether --with-python was given.
--if test "${with_python+set}" = set; then
-- withval=$with_python; PYTHON="$withval"
--fi
--
--
--if test -n "$PYTHON" && test -x "$PYTHON" ; then
-- { echo "$as_me:$LINENO: checking for python" >&5
--echo $ECHO_N "checking for python... $ECHO_C" >&6; }
-- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5
--echo "${ECHO_T}user defined: $with_python" >&6; }
--else
-- if test -n "$PYTHON" ; then
-- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5
--echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
-- fi
--
-- # Extract the first word of "python python2 python26", so it can be a program name with args.
--set dummy python python2 python26; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PYTHON+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $PYTHON in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
--echo "$as_me: error: could not find python 2.5 or higher" >&2;}
-- { (exit 1); exit 1; }; }"
-- ;;
--esac
--fi
--PYTHON=$ac_cv_path_PYTHON
--if test -n "$PYTHON"; then
-- { echo "$as_me:$LINENO: result: $PYTHON" >&5
--echo "${ECHO_T}$PYTHON" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--fi
--
--{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
--echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
--ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
--ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
--ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
--ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
--if test "$ac_python_version_major" -gt "2" || \
-- (test "$ac_python_version_major" -eq "2" && \
-- test "$ac_python_version_minor" -ge "5") ; then
-- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
--echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
--else
-- { echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.5
--See \`config.log' for more details." >&5
--echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.5
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--
--
- { echo "$as_me:$LINENO: checking for sin in -lm" >&5
- echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_m_sin+set}" = set; then
Deleted: trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch 2015-01-18 02:19:23 UTC (rev 131762)
+++ trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch 2015-01-18 02:36:51 UTC (rev 131763)
@@ -1,25 +0,0 @@
---- a/projects/libcxx/include/cmath 2013-08-29 16:50:48.000000000 -0700
-+++ b/projects/libcxx/include/cmath 2014-04-13 19:01:12.000000000 -0700
-@@ -301,6 +301,22 @@ long double truncl(long double x);
- #include <math.h>
- #include <type_traits>
-
-+#ifdef __APPLE__
-+#include <Availability.h>
-+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
-+/* These prototypes are incorrectly omitted from <math.h> on Snow Leopard despite being available */
-+extern "C" {
-+ extern long long int llrintl(long double);
-+ extern long long int llrint(double);
-+ extern long long int llrintf(float);
-+
-+ extern long long int llroundl(long double);
-+ extern long long int llround(double);
-+ extern long long int llroundf(float);
-+}
-+#endif
-+#endif // __APPLE__
-+
- #ifdef _LIBCPP_MSVCRT
- #include "support/win32/math_win32.h"
- #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150117/61a3d498/attachment-0001.html>
More information about the macports-changes
mailing list