Merge pull request swiftlang#80 from seabaylea/experimental-overlay

Provide Swift 3 overlay

Author: seabaylea

configure.ac

@@ -108,12 +108,20 @@ AC_ARG_WITH([swift-toolchain],
   [AS_HELP_STRING([--with-swift-toolchain], [Specify path to Swift toolchain])],
   [swift_toolchain_path=${withval}
    AC_DEFINE(HAVE_SWIFT, 1, [Define if building for Swift])
-   SWIFTC="$swift_toolchain_path/bin/swiftc"
+   SWIFT_TOOLCHAIN_PATH="$swift_toolchain_path" 
    have_swift=true],
   [have_swift=false]
 )
 AM_CONDITIONAL(HAVE_SWIFT, $have_swift)
-AC_SUBST([SWIFTC])
+AC_SUBST([SWIFT_TOOLCHAIN_PATH])
+
+#
+# Enable use of gold linker when building the Swift overlay
+# to avoid a symbol relocation issue.
+# Ultimately the request to use gold should be passed in as an arg
+#
+AC_CHECK_PROG(use_gold_linker, ld.gold, true, false)
+AM_CONDITIONAL(USE_GOLD_LINKER, $use_gold_linker)
 
 AC_USE_SYSTEM_EXTENSIONS
 AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects])

dispatch/module.map

@@ -1,4 +1,11 @@
-module Dispatch [system] {
+module Dispatch {
+    requires blocks
+    export *
+    link "dispatch"
+    link "BlocksRuntime"
+}
+
+module CDispatch [system] {
     umbrella header "dispatch.h"
     requires blocks
     export *

src/Makefile.am

@@ -81,8 +81,14 @@ if HAVE_PTHREAD_WORKQUEUES
 endif
 endif
 
+if HAVE_SWIFT
+  SWIFTC=${SWIFT_TOOLCHAIN_PATH}/bin/swiftc
+  SWIFT_RUNTIME_LIBS=$(SWIFT_TOOLCHAIN_PATH)/lib/swift/linux
+  SWIFT_LIBS=-L$(SWIFT_RUNTIME_LIBS) -lswiftCore
+endif
+
 libdispatch_la_LDFLAGS=-avoid-version
-libdispatch_la_LIBADD=$(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
+libdispatch_la_LIBADD=$(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS) $(SWIFT_LIBS)
 
 if HAVE_DARWIN_LD
 libdispatch_la_LDFLAGS+=-Wl,-compatibility_version,1 \
@@ -128,6 +134,10 @@ EXTRA_libdispatch_la_SOURCES+=swift/Dispatch.swift
 EXTRA_libdispatch_la_DEPENDENCIES+=$(abs_builddir)/Dispatch.o $(abs_builddir)/Dispatch.swiftmodule
 libdispatch_la_LIBADD+=$(abs_builddir)/Dispatch.o
 
+if USE_GOLD_LINKER
+libdispatch_la_LDFLAGS+=-Xcompiler -fuse-ld=gold
+endif
+
 SWIFT_OBJECTS=	\
 	$(abs_builddir)/Dispatch.swiftmodule \
 	$(abs_builddir)/Dispatch.swiftdoc \