Missing bits from the old Swift2 wrapping overlay changes that

allow 'make check' to pass by adding dependency on libswiftCore
to the test programs when libdispatch was built with Swift support.

Author: dgrove-oss

configure.ac

@@ -94,6 +94,8 @@ AS_IF([test "x$enable_apple_tsd_optimizations" = "xyes"],
     [Define to use non-portable pthread TSD optimizations for Mac OS X)])]
 )
 
+AC_CANONICAL_TARGET
+
 #
 # Enable building Swift overlay support into libdispatch
 #
@@ -102,11 +104,21 @@ AC_ARG_WITH([swift-toolchain],
   [swift_toolchain_path=${withval}
    AC_DEFINE(HAVE_SWIFT, 1, [Define if building for Swift])
    SWIFTC="$swift_toolchain_path/bin/swiftc"
+   case $target_os in
+      linux*)
+	    os_string="linux"
+	    ;;
+	  *)
+        os_string=$target_os
+		;;
+	esac
+   SWIFT_LIBDIR="$swift_toolchain_path/lib/swift/$os_string/$target_cpu"
    have_swift=true],
   [have_swift=false]
 )
 AM_CONDITIONAL(HAVE_SWIFT, $have_swift)
 AC_SUBST([SWIFTC])
+AC_SUBST([SWIFT_LIBDIR])
 
 #
 # Enable use of gold linker when building the Swift overlay
@@ -120,7 +132,6 @@ AM_CONDITIONAL(USE_GOLD_LINKER, $use_gold_linker)
 # Enable __thread based TSD on platforms where it is efficient
 # Allow override based on command line argument to configure
 #
-AC_CANONICAL_TARGET
 AC_ARG_ENABLE([thread-local-storage],
   [AS_HELP_STRING([--enable-thread-local-storage],
     [Enable usage of thread local storage via __thread])],,

src/swift/DispatchStubs.cc

@@ -185,3 +185,13 @@ SOURCE(SIGNAL)
 SOURCE(TIMER)
 SOURCE(VNODE)
 SOURCE(WRITE)
+
+// See comment in CFFuntime.c explaining why objc_retainAutoreleasedReturnValue is needed.
+extern "C" void swift_release(void *);
+extern "C" void * objc_retainAutoreleasedReturnValue(void *obj) {
+    if (obj) {
+        swift_release(obj);
+        return obj;
+    }
+    else return NULL;
+}

tests/Makefile.am

@@ -121,7 +121,11 @@ if HAVE_PTHREAD_WORKQUEUES
 endif
 endif
 
-LDADD=libbsdtests.la $(top_builddir)/src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
+if HAVE_SWIFT
+  SWIFT_LIBS=-L$(SWIFT_LIBDIR) -lswiftCore
+endif
+
+LDADD=libbsdtests.la $(top_builddir)/src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS) $(SWIFT_LIBS)
 libbsdtests_la_LDFLAGS=-avoid-version
 
 bsdtestsummarize_LDADD=-lm $(BSD_OVERLAY_LIBS)