[PR,d/89255,2/3] Replace libphobos check programs with dg-runtest

Message ID CABOHX+cvXN-cfDHv8ffS6g7W3jn92A+DCfv1dC=U51fm_nfs0g@mail.gmail.com
State New
Headers show
Series
  • Untitled series #12370
Related show

Commit Message

Iain Buclaw March 29, 2019, 5:54 p.m.
Following on from the first patch, this removes the unittest.exp
script, and splits the druntime/phobos and static/shared combinations
into four separate test scripts.

By using dg-runtest, the unittest tests now honour `--target_board`.
It should also resolve the first part of PR d/88654 where there was a
concern that the timeout for unittest.exp wasn't working.

Assuming that the first is OK, this is a pretty obvious change.

-- 
Iain
---
libphobos/ChangeLog:

2019-03-29  Iain Buclaw  <ibuclaw@gdcproject.org>

        PR d/89255
        * configure.ac (ENABLE_SHARED, ENABLE_STATIC): Remove conditionals.
        * configure: Rebuild.
        * d_rules.am (%.t.lo, %.t.o): Remove rules.
        (unittest_static_LINK, unittest_LINK, libgdruntime_t_la_LINK,
        libgphobos_t_la_LINK): Remove variables.
        * libdruntime/Makefile.am (DRUNTIME_TEST_LOBJECTS,
        DRUNTIME_TEST_OBJECTS, check_PROGRAMS, check_LTLIBRARIES,
        unittest_static_SOURCES, unittest_static_LIBTOOLFLAGS,
        unittest_static_LDFLAGS, unittest_static_LDADD,
        EXTRA_unittest_static_DEPENDENCIES, libgdruntime_t_la_SOURCES,
        libgdruntime_t_la_LIBTOOLFLAGS, libgdruntime_t_la_LDFLAGS,
        libgdruntime_t_la_LIBADD, EXTRA_libgdruntime_t_la_DEPENDENCIES,
        unittest_SOURCES, unittest_LIBTOOLFLAGS, unittest_LDFLAGS,
        unittest_LDADD): Remove variables.
        (clean-local): Remove rule.
        * libdruntime/Makefile.in: Rebuild.
        * src/Makefile.am (PHOBOS_TEST_LOBJECTS,
        PHOBOS_TEST_OBJECTS, check_PROGRAMS, check_LTLIBRARIES,
        unittest_static_SOURCES, unittest_static_LIBTOOLFLAGS,
        unittest_static_LDFLAGS, unittest_static_LDADD,
        EXTRA_unittest_static_DEPENDENCIES, libgdruntime_t_la_SOURCES,
        libgdruntime_t_la_LIBTOOLFLAGS, libgdruntime_t_la_LDFLAGS,
        libgdruntime_t_la_LIBADD, EXTRA_libgdruntime_t_la_DEPENDENCIES,
        unittest_SOURCES, unittest_LIBTOOLFLAGS, unittest_LDFLAGS,
        unittest_LDADD): Remove variables.
        (clean-local): Remove rule.
        * src/Makefile.in: Rebuild.
        * testsuite/lib/libphobos.exp (filter_libphobos_unittests): New proc.
        * testsuite/libphobos.druntime/druntime.exp: New file.
        * testsuite/libphobos.druntime_shared/druntime_shared.exp: New file.
        * testsuite/libphobos.phobos/phobos.exp: New file.
        * testsuite/libphobos.phobos_shared/phobos_shared.exp: New file.
        * testsuite/libphobos.unittests/unittests.exp: Remove.
        * testsuite/test_runner.d: Remove.
        * testsuite/testsuite_flags.in: Add phobos to --gdcpaths.

---

Comments

Iain Buclaw April 12, 2019, 6:32 a.m. | #1
Patch updated and committed to trunk as r270302.
-- 
Iain
---
libphobos/ChangeLog:

2019-04-12  Iain Buclaw  <ibuclaw@gdcproject.org>

        * configure.ac (ENABLE_SHARED, ENABLE_STATIC): Remove conditionals.
        * configure: Regenerate.
        * d_rules.am (%.t.lo, %.t.o): Remove rules.
        (unittest_static_LINK, unittest_LINK, libgdruntime_t_la_LINK,
        libgphobos_t_la_LINK): Remove variables.
        * libdruntime/Makefile.am (DRUNTIME_TEST_LOBJECTS,
        DRUNTIME_TEST_OBJECTS, check_PROGRAMS, check_LTLIBRARIES,
        unittest_static_SOURCES, unittest_static_LIBTOOLFLAGS,
        unittest_static_LDFLAGS, unittest_static_LDADD,
        EXTRA_unittest_static_DEPENDENCIES, libgdruntime_t_la_SOURCES,
        libgdruntime_t_la_LIBTOOLFLAGS, libgdruntime_t_la_LDFLAGS,
        libgdruntime_t_la_LIBADD, EXTRA_libgdruntime_t_la_DEPENDENCIES,
        unittest_SOURCES, unittest_LIBTOOLFLAGS, unittest_LDFLAGS,
        unittest_LDADD): Remove variables.
        (clean-local): Remove rule.
        * libdruntime/Makefile.in: Regenerate.
        * src/Makefile.am (PHOBOS_TEST_LOBJECTS,
        PHOBOS_TEST_OBJECTS, check_PROGRAMS, check_LTLIBRARIES,
        unittest_static_SOURCES, unittest_static_LIBTOOLFLAGS,
        unittest_static_LDFLAGS, unittest_static_LDADD,
        EXTRA_unittest_static_DEPENDENCIES, libgdruntime_t_la_SOURCES,
        libgdruntime_t_la_LIBTOOLFLAGS, libgdruntime_t_la_LDFLAGS,
        libgdruntime_t_la_LIBADD, EXTRA_libgdruntime_t_la_DEPENDENCIES,
        unittest_SOURCES, unittest_LIBTOOLFLAGS, unittest_LDFLAGS,
        unittest_LDADD): Remove variables.
        (clean-local): Remove rule.
        * src/Makefile.in: Regenerate.
        * testsuite/lib/libphobos.exp (libphobos_test_name): New global.
        (libphobos_init): Set libphobos_test_name.
        (libphobos-dg-test): Override name if libphobos_test_name is set.
        (filter_libphobos_unittests): New proc.
        * testsuite/libphobos.aa/aa.exp: Don't load libphobos-dg.exp.
        * testsuite/libphobos.cycles/cycles.exp: Set libphobos_test_name.
        * testsuite/libphobos.druntime/druntime.exp: New file.
        * testsuite/libphobos.druntime_shared/druntime_shared.exp: New file.
        * testsuite/libphobos.phobos/phobos.exp: New file.
        * testsuite/libphobos.phobos_shared/phobos_shared.exp: New file.
        * testsuite/libphobos.shared/shared.exp: Use dg-runtest to run tests.
        * testsuite/libphobos.hash/hash.exp: Don't load libphobos-dg.exp
        * testsuite/libphobos.init_fini/init_fini.exp: Likewise.
        * testsuite/libphobos.thread/thread.exp: Likewise.
        * testsuite/libphobos.typeinfo/typeinfo.exp: Likewise.
        * testsuite/libphobos.unittests/unittests.exp: Remove.
        * testsuite/test_runner.d: Remove.
        * testsuite/testsuite_flags.in: Add phobos to --gdcpaths.

---
diff --git a/libphobos/configure b/libphobos/configure
index d86934b59a5..f359a6c9e3b 100755
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -687,10 +687,6 @@ libphobos_builddir
 get_gcc_base_ver
 phobos_compiler_shared_flag
 phobos_compiler_pic_flag
-ENABLE_STATIC_FALSE
-ENABLE_STATIC_TRUE
-ENABLE_SHARED_FALSE
-ENABLE_SHARED_TRUE
 CPP
 OTOOL64
 OTOOL
@@ -11499,7 +11495,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11502 "configure"
+#line 11498 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11605,7 +11601,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11608 "configure"
+#line 11604 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13747,22 +13743,6 @@ GDCFLAGS=$lt_save_DFLAGS
 
   GDCFLAGS=$gdc_save_DFLAGS
 
- if test "$enable_shared" = "yes"; then
-  ENABLE_SHARED_TRUE=
-  ENABLE_SHARED_FALSE='#'
-else
-  ENABLE_SHARED_TRUE='#'
-  ENABLE_SHARED_FALSE=
-fi
-
- if test "$enable_static" = "yes"; then
-  ENABLE_STATIC_TRUE=
-  ENABLE_STATIC_FALSE='#'
-else
-  ENABLE_STATIC_TRUE='#'
-  ENABLE_STATIC_FALSE=
-fi
-
 
 # libtool variables for Phobos shared and position-independent compiles.
 #
@@ -15190,14 +15170,6 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_SHARED_TRUE}" && test -z "${ENABLE_SHARED_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_SHARED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_STATIC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DRUNTIME_GC_ENABLE_TRUE}" && test -z "${DRUNTIME_GC_ENABLE_FALSE}"; then
   as_fn_error $? "conditional \"DRUNTIME_GC_ENABLE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/libphobos/configure.ac b/libphobos/configure.ac
index 8cc735563cb..362f7537ffb 100644
--- a/libphobos/configure.ac
+++ b/libphobos/configure.ac
@@ -75,8 +75,6 @@ AC_SUBST(CFLAGS_FOR_BUILD)
 LT_INIT(dlopen)
 AM_PROG_LIBTOOL
 WITH_LOCAL_DRUNTIME([LT_LANG([D])], [])
-AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = "yes"])
-AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = "yes"])
 
 # libtool variables for Phobos shared and position-independent compiles.
 #
diff --git a/libphobos/d_rules.am b/libphobos/d_rules.am
index 7c174b91d03..1358ae91475 100644
--- a/libphobos/d_rules.am
+++ b/libphobos/d_rules.am
@@ -33,29 +33,6 @@ toolexeclibdir = $(libphobos_toolexeclibdir)
 LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(GDC) $(AM_DFLAGS)
 
-# Unittest rules. Unfortunately we can't use _DFLAGS in automake without
-# explicit D support, so use this hack.
-# Compile D sources with libtool and test flags
-%.t.lo : %.d
-	$(LTDCOMPILE) $(GDCFLAGSX) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
-
-# Compile objects for static linking with test flags
-# Automake breaks empty rules, so use the shell NOP :
-%.t.o : %.t.lo
-	@:
-
-# Override executable linking commands: We have to use GDC for linking
-# to make sure we link pthreads and other dependencies
-unittest_static_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_static_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_static_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-unittest_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
 # Also override library link commands: This is not strictly
 # required, but we want to record additional dependencies such
 # as pthread in the library
@@ -63,15 +40,6 @@ libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgdruntime_t_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgdruntime_t_la_LDFLAGS) $(LDFLAGS) -o $@
-
 libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@
-
-libgphobos_t_la_LINK = $(LIBTOOL) --tag=D \
-	$(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(libgphobos_t_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am
index 53d03b1e82a..abefb435dc7 100644
--- a/libphobos/libdruntime/Makefile.am
+++ b/libphobos/libdruntime/Makefile.am
@@ -93,18 +93,6 @@ ALL_DRUNTIME_COMPILE_DSOURCES += $(DRUNTIME_DSOURCES_GENERATED)
 
 ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
 	$(DRUNTIME_SSOURCES)
-DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
-DRUNTIME_TEST_OBJECTS  = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
-
-# Main library build definitions
-check_PROGRAMS =
-if ENABLE_SHARED
-  check_LTLIBRARIES = libgdruntime_t.la
-  check_PROGRAMS += unittest
-endif
-if ENABLE_STATIC
-  check_PROGRAMS += unittest_static
-endif
 
 toolexeclib_LTLIBRARIES = libgdruntime.la
 libgdruntime_la_SOURCES = $(ALL_DRUNTIME_SOURCES)
@@ -114,36 +102,6 @@ libgdruntime_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../src,-Bgcc \
 libgdruntime_la_LIBADD = $(LIBATOMIC) $(LIBBACKTRACE)
 libgdruntime_la_DEPENDENCIES = $(DRTSTUFF)
 
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(DRUNTIME_CSOURCES) \
-    $(DRUNTIME_SSOURCES)
-unittest_static_LIBTOOLFLAGS =
-unittest_static_LDFLAGS = -Wc,-nophoboslib
-unittest_static_LDADD = $(DRUNTIME_TEST_OBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_unittest_static_DEPENDENCIES = $(DRUNTIME_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgdruntime_t_la_SOURCES = $(DRUNTIME_CSOURCES) $(DRUNTIME_SSOURCES)
-libgdruntime_t_la_LIBTOOLFLAGS =
-# Automake by default does not generate shared libs for non-installed
-# libraries. Use -rpath to force shared lib generation.
-libgdruntime_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgdruntime_t_la_LIBADD = $(DRUNTIME_TEST_LOBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_libgdruntime_t_la_DEPENDENCIES = $(DRUNTIME_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS =
-unittest_LDFLAGS = -Wc,-nophoboslib
-unittest_LDADD = libgdruntime_t.la
-
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(DRUNTIME_TEST_LOBJECTS)
-	rm -f $(DRUNTIME_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in
index 100312ebf2d..2cf1d312ec7 100644
--- a/libphobos/libdruntime/Makefile.in
+++ b/libphobos/libdruntime/Makefile.in
@@ -121,9 +121,6 @@ target_triplet = @target@
 @DRUNTIME_OS_LINUX_TRUE@am__append_10 = $(DRUNTIME_DSOURCES_LINUX)
 @DRUNTIME_OS_MINGW_TRUE@am__append_11 = $(DRUNTIME_DSOURCES_WINDOWS)
 @DRUNTIME_OS_SOLARIS_TRUE@am__append_12 = $(DRUNTIME_DSOURCES_SOLARIS)
-check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
-@ENABLE_SHARED_TRUE@am__append_13 = unittest
-@ENABLE_STATIC_TRUE@am__append_14 = unittest_static
 subdir = libdruntime
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -434,574 +431,6 @@ am__objects_29 = libgdruntime_la-threadasm.lo
 am__objects_30 = $(am__objects_27) $(am__objects_28) $(am__objects_29)
 am_libgdruntime_la_OBJECTS = $(am__objects_30)
 libgdruntime_la_OBJECTS = $(am_libgdruntime_la_OBJECTS)
-am__DEPENDENCIES_2 = core/atomic.t.lo core/attribute.t.lo \
-	core/bitop.t.lo core/checkedint.t.lo core/cpuid.t.lo \
-	core/demangle.t.lo core/exception.t.lo \
-	core/internal/abort.t.lo core/internal/arrayop.t.lo \
-	core/internal/convert.t.lo core/internal/hash.t.lo \
-	core/internal/spinlock.t.lo core/internal/string.t.lo \
-	core/internal/traits.t.lo core/math.t.lo core/memory.t.lo \
-	core/runtime.t.lo core/simd.t.lo core/stdc/assert_.t.lo \
-	core/stdc/complex.t.lo core/stdc/config.t.lo \
-	core/stdc/ctype.t.lo core/stdc/errno.t.lo core/stdc/fenv.t.lo \
-	core/stdc/float_.t.lo core/stdc/inttypes.t.lo \
-	core/stdc/limits.t.lo core/stdc/locale.t.lo \
-	core/stdc/math.t.lo core/stdc/signal.t.lo \
-	core/stdc/stdarg.t.lo core/stdc/stddef.t.lo \
-	core/stdc/stdint.t.lo core/stdc/stdio.t.lo \
-	core/stdc/stdlib.t.lo core/stdc/string.t.lo \
-	core/stdc/tgmath.t.lo core/stdc/time.t.lo \
-	core/stdc/wchar_.t.lo core/stdc/wctype.t.lo \
-	core/sync/barrier.t.lo core/sync/condition.t.lo \
-	core/sync/config.t.lo core/sync/exception.t.lo \
-	core/sync/mutex.t.lo core/sync/rwmutex.t.lo \
-	core/sync/semaphore.t.lo core/thread.t.lo core/time.t.lo \
-	core/vararg.t.lo gcc/attribute.t.lo gcc/backtrace.t.lo \
-	gcc/builtins.t.lo gcc/deh.t.lo gcc/unwind/arm.t.lo \
-	gcc/unwind/arm_common.t.lo gcc/unwind/c6x.t.lo \
-	gcc/unwind/generic.t.lo gcc/unwind/package.t.lo \
-	gcc/unwind/pe.t.lo object.t.lo rt/aApply.t.lo rt/aApplyR.t.lo \
-	rt/aaA.t.lo rt/adi.t.lo rt/arrayassign.t.lo rt/arraycast.t.lo \
-	rt/arraycat.t.lo rt/cast_.t.lo rt/config.t.lo \
-	rt/critical_.t.lo rt/deh.t.lo rt/dmain2.t.lo rt/invariant.t.lo \
-	rt/lifetime.t.lo rt/memory.t.lo rt/minfo.t.lo rt/monitor_.t.lo \
-	rt/obj.t.lo rt/qsort.t.lo rt/sections.t.lo \
-	rt/sections_android.t.lo rt/sections_elf_shared.t.lo \
-	rt/sections_osx.t.lo rt/sections_solaris.t.lo \
-	rt/sections_win32.t.lo rt/sections_win64.t.lo rt/switch_.t.lo \
-	rt/tlsgc.t.lo rt/typeinfo/ti_Acdouble.t.lo \
-	rt/typeinfo/ti_Acfloat.t.lo rt/typeinfo/ti_Acreal.t.lo \
-	rt/typeinfo/ti_Adouble.t.lo rt/typeinfo/ti_Afloat.t.lo \
-	rt/typeinfo/ti_Ag.t.lo rt/typeinfo/ti_Aint.t.lo \
-	rt/typeinfo/ti_Along.t.lo rt/typeinfo/ti_Areal.t.lo \
-	rt/typeinfo/ti_Ashort.t.lo rt/typeinfo/ti_C.t.lo \
-	rt/typeinfo/ti_byte.t.lo rt/typeinfo/ti_cdouble.t.lo \
-	rt/typeinfo/ti_cent.t.lo rt/typeinfo/ti_cfloat.t.lo \
-	rt/typeinfo/ti_char.t.lo rt/typeinfo/ti_creal.t.lo \
-	rt/typeinfo/ti_dchar.t.lo rt/typeinfo/ti_delegate.t.lo \
-	rt/typeinfo/ti_double.t.lo rt/typeinfo/ti_float.t.lo \
-	rt/typeinfo/ti_idouble.t.lo rt/typeinfo/ti_ifloat.t.lo \
-	rt/typeinfo/ti_int.t.lo rt/typeinfo/ti_ireal.t.lo \
-	rt/typeinfo/ti_long.t.lo rt/typeinfo/ti_n.t.lo \
-	rt/typeinfo/ti_ptr.t.lo rt/typeinfo/ti_real.t.lo \
-	rt/typeinfo/ti_short.t.lo rt/typeinfo/ti_ubyte.t.lo \
-	rt/typeinfo/ti_ucent.t.lo rt/typeinfo/ti_uint.t.lo \
-	rt/typeinfo/ti_ulong.t.lo rt/typeinfo/ti_ushort.t.lo \
-	rt/typeinfo/ti_void.t.lo rt/typeinfo/ti_wchar.t.lo \
-	rt/util/array.t.lo rt/util/container/array.t.lo \
-	rt/util/container/common.t.lo rt/util/container/hashtab.t.lo \
-	rt/util/container/treap.t.lo rt/util/random.t.lo \
-	rt/util/typeinfo.t.lo rt/util/utf.t.lo
-am__DEPENDENCIES_3 = gc/bits.t.lo gc/config.t.lo gc/gcinterface.t.lo \
-	gc/impl/conservative/gc.t.lo gc/impl/manual/gc.t.lo gc/os.t.lo \
-	gc/pooltable.t.lo gc/proxy.t.lo
-@DRUNTIME_GC_ENABLE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
-am__DEPENDENCIES_5 = gcstub/gc.t.lo
-@DRUNTIME_GC_ENABLE_FALSE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = core/sys/posix/aio.t.lo \
-	core/sys/posix/arpa/inet.t.lo core/sys/posix/config.t.lo \
-	core/sys/posix/dirent.t.lo core/sys/posix/dlfcn.t.lo \
-	core/sys/posix/fcntl.t.lo core/sys/posix/grp.t.lo \
-	core/sys/posix/iconv.t.lo core/sys/posix/inttypes.t.lo \
-	core/sys/posix/libgen.t.lo core/sys/posix/mqueue.t.lo \
-	core/sys/posix/net/if_.t.lo core/sys/posix/netdb.t.lo \
-	core/sys/posix/netinet/in_.t.lo \
-	core/sys/posix/netinet/tcp.t.lo core/sys/posix/poll.t.lo \
-	core/sys/posix/pthread.t.lo core/sys/posix/pwd.t.lo \
-	core/sys/posix/sched.t.lo core/sys/posix/semaphore.t.lo \
-	core/sys/posix/setjmp.t.lo core/sys/posix/signal.t.lo \
-	core/sys/posix/spawn.t.lo core/sys/posix/stdio.t.lo \
-	core/sys/posix/stdlib.t.lo core/sys/posix/sys/filio.t.lo \
-	core/sys/posix/sys/ioccom.t.lo core/sys/posix/sys/ioctl.t.lo \
-	core/sys/posix/sys/ipc.t.lo core/sys/posix/sys/mman.t.lo \
-	core/sys/posix/sys/msg.t.lo core/sys/posix/sys/resource.t.lo \
-	core/sys/posix/sys/select.t.lo core/sys/posix/sys/shm.t.lo \
-	core/sys/posix/sys/socket.t.lo core/sys/posix/sys/stat.t.lo \
-	core/sys/posix/sys/statvfs.t.lo core/sys/posix/sys/time.t.lo \
-	core/sys/posix/sys/ttycom.t.lo core/sys/posix/sys/types.t.lo \
-	core/sys/posix/sys/uio.t.lo core/sys/posix/sys/un.t.lo \
-	core/sys/posix/sys/utsname.t.lo core/sys/posix/sys/wait.t.lo \
-	core/sys/posix/syslog.t.lo core/sys/posix/termios.t.lo \
-	core/sys/posix/time.t.lo core/sys/posix/ucontext.t.lo \
-	core/sys/posix/unistd.t.lo core/sys/posix/utime.t.lo
-@DRUNTIME_OS_UNIX_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-am__DEPENDENCIES_9 = core/sys/darwin/crt_externs.t.lo \
-	core/sys/darwin/dlfcn.t.lo core/sys/darwin/execinfo.t.lo \
-	core/sys/darwin/mach/dyld.t.lo \
-	core/sys/darwin/mach/getsect.t.lo \
-	core/sys/darwin/mach/kern_return.t.lo \
-	core/sys/darwin/mach/loader.t.lo \
-	core/sys/darwin/mach/port.t.lo \
-	core/sys/darwin/mach/semaphore.t.lo \
-	core/sys/darwin/mach/thread_act.t.lo \
-	core/sys/darwin/netinet/in_.t.lo core/sys/darwin/pthread.t.lo \
-	core/sys/darwin/sys/cdefs.t.lo core/sys/darwin/sys/event.t.lo \
-	core/sys/darwin/sys/mman.t.lo
-@DRUNTIME_OS_DARWIN_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9)
-am__DEPENDENCIES_11 = core/sys/dragonflybsd/dlfcn.t.lo \
-	core/sys/dragonflybsd/execinfo.t.lo \
-	core/sys/dragonflybsd/netinet/in_.t.lo \
-	core/sys/dragonflybsd/pthread_np.t.lo \
-	core/sys/dragonflybsd/sys/_bitset.t.lo \
-	core/sys/dragonflybsd/sys/_cpuset.t.lo \
-	core/sys/dragonflybsd/sys/cdefs.t.lo \
-	core/sys/dragonflybsd/sys/elf.t.lo \
-	core/sys/dragonflybsd/sys/elf32.t.lo \
-	core/sys/dragonflybsd/sys/elf64.t.lo \
-	core/sys/dragonflybsd/sys/elf_common.t.lo \
-	core/sys/dragonflybsd/sys/event.t.lo \
-	core/sys/dragonflybsd/sys/link_elf.t.lo \
-	core/sys/dragonflybsd/sys/mman.t.lo \
-	core/sys/dragonflybsd/time.t.lo
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@am__DEPENDENCIES_12 =  \
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@	$(am__DEPENDENCIES_11)
-am__DEPENDENCIES_13 = core/sys/bionic/fcntl.t.lo \
-	core/sys/bionic/unistd.t.lo
-@DRUNTIME_OS_ANDROID_TRUE@am__DEPENDENCIES_14 =  \
-@DRUNTIME_OS_ANDROID_TRUE@	$(am__DEPENDENCIES_13)
-am__DEPENDENCIES_15 = core/sys/freebsd/dlfcn.t.lo \
-	core/sys/freebsd/execinfo.t.lo \
-	core/sys/freebsd/netinet/in_.t.lo \
-	core/sys/freebsd/pthread_np.t.lo \
-	core/sys/freebsd/sys/_bitset.t.lo \
-	core/sys/freebsd/sys/_cpuset.t.lo \
-	core/sys/freebsd/sys/cdefs.t.lo core/sys/freebsd/sys/elf.t.lo \
-	core/sys/freebsd/sys/elf32.t.lo \
-	core/sys/freebsd/sys/elf64.t.lo \
-	core/sys/freebsd/sys/elf_common.t.lo \
-	core/sys/freebsd/sys/event.t.lo \
-	core/sys/freebsd/sys/link_elf.t.lo \
-	core/sys/freebsd/sys/mman.t.lo core/sys/freebsd/sys/mount.t.lo \
-	core/sys/freebsd/time.t.lo core/sys/freebsd/unistd.t.lo
-@DRUNTIME_OS_FREEBSD_TRUE@am__DEPENDENCIES_16 =  \
-@DRUNTIME_OS_FREEBSD_TRUE@	$(am__DEPENDENCIES_15)
-am__DEPENDENCIES_17 = core/sys/netbsd/dlfcn.t.lo \
-	core/sys/netbsd/execinfo.t.lo core/sys/netbsd/sys/elf.t.lo \
-	core/sys/netbsd/sys/elf32.t.lo core/sys/netbsd/sys/elf64.t.lo \
-	core/sys/netbsd/sys/elf_common.t.lo \
-	core/sys/netbsd/sys/event.t.lo \
-	core/sys/netbsd/sys/link_elf.t.lo \
-	core/sys/netbsd/sys/mman.t.lo core/sys/netbsd/time.t.lo
-@DRUNTIME_OS_NETBSD_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_17)
-am__DEPENDENCIES_19 = core/sys/openbsd/dlfcn.t.lo
-@DRUNTIME_OS_OPENBSD_TRUE@am__DEPENDENCIES_20 =  \
-@DRUNTIME_OS_OPENBSD_TRUE@	$(am__DEPENDENCIES_19)
-am__DEPENDENCIES_21 = core/sys/linux/config.t.lo \
-	core/sys/linux/dlfcn.t.lo core/sys/linux/elf.t.lo \
-	core/sys/linux/epoll.t.lo core/sys/linux/errno.t.lo \
-	core/sys/linux/execinfo.t.lo core/sys/linux/fcntl.t.lo \
-	core/sys/linux/ifaddrs.t.lo core/sys/linux/link.t.lo \
-	core/sys/linux/netinet/in_.t.lo \
-	core/sys/linux/netinet/tcp.t.lo core/sys/linux/sched.t.lo \
-	core/sys/linux/stdio.t.lo core/sys/linux/sys/auxv.t.lo \
-	core/sys/linux/sys/eventfd.t.lo core/sys/linux/sys/file.t.lo \
-	core/sys/linux/sys/inotify.t.lo core/sys/linux/sys/mman.t.lo \
-	core/sys/linux/sys/netinet/tcp.t.lo \
-	core/sys/linux/sys/prctl.t.lo core/sys/linux/sys/signalfd.t.lo \
-	core/sys/linux/sys/socket.t.lo core/sys/linux/sys/sysinfo.t.lo \
-	core/sys/linux/sys/time.t.lo core/sys/linux/sys/xattr.t.lo \
-	core/sys/linux/termios.t.lo core/sys/linux/time.t.lo \
-	core/sys/linux/timerfd.t.lo core/sys/linux/tipc.t.lo \
-	core/sys/linux/unistd.t.lo
-@DRUNTIME_OS_LINUX_TRUE@am__DEPENDENCIES_22 = $(am__DEPENDENCIES_21)
-am__DEPENDENCIES_23 = core/sys/windows/accctrl.t.lo \
-	core/sys/windows/aclapi.t.lo core/sys/windows/aclui.t.lo \
-	core/sys/windows/basetsd.t.lo core/sys/windows/basetyps.t.lo \
-	core/sys/windows/cderr.t.lo core/sys/windows/cguid.t.lo \
-	core/sys/windows/com.t.lo core/sys/windows/comcat.t.lo \
-	core/sys/windows/commctrl.t.lo core/sys/windows/commdlg.t.lo \
-	core/sys/windows/core.t.lo core/sys/windows/cpl.t.lo \
-	core/sys/windows/cplext.t.lo core/sys/windows/custcntl.t.lo \
-	core/sys/windows/dbghelp.t.lo \
-	core/sys/windows/dbghelp_types.t.lo core/sys/windows/dbt.t.lo \
-	core/sys/windows/dde.t.lo core/sys/windows/ddeml.t.lo \
-	core/sys/windows/dhcpcsdk.t.lo core/sys/windows/dlgs.t.lo \
-	core/sys/windows/dll.t.lo core/sys/windows/docobj.t.lo \
-	core/sys/windows/errorrep.t.lo core/sys/windows/exdisp.t.lo \
-	core/sys/windows/exdispid.t.lo core/sys/windows/httpext.t.lo \
-	core/sys/windows/idispids.t.lo core/sys/windows/imagehlp.t.lo \
-	core/sys/windows/imm.t.lo core/sys/windows/intshcut.t.lo \
-	core/sys/windows/ipexport.t.lo core/sys/windows/iphlpapi.t.lo \
-	core/sys/windows/ipifcons.t.lo core/sys/windows/iprtrmib.t.lo \
-	core/sys/windows/iptypes.t.lo core/sys/windows/isguids.t.lo \
-	core/sys/windows/lm.t.lo core/sys/windows/lmaccess.t.lo \
-	core/sys/windows/lmalert.t.lo core/sys/windows/lmapibuf.t.lo \
-	core/sys/windows/lmat.t.lo core/sys/windows/lmaudit.t.lo \
-	core/sys/windows/lmbrowsr.t.lo core/sys/windows/lmchdev.t.lo \
-	core/sys/windows/lmconfig.t.lo core/sys/windows/lmcons.t.lo \
-	core/sys/windows/lmerr.t.lo core/sys/windows/lmerrlog.t.lo \
-	core/sys/windows/lmmsg.t.lo core/sys/windows/lmremutl.t.lo \
-	core/sys/windows/lmrepl.t.lo core/sys/windows/lmserver.t.lo \
-	core/sys/windows/lmshare.t.lo core/sys/windows/lmsname.t.lo \
-	core/sys/windows/lmstats.t.lo core/sys/windows/lmsvc.t.lo \
-	core/sys/windows/lmuse.t.lo core/sys/windows/lmuseflg.t.lo \
-	core/sys/windows/lmwksta.t.lo core/sys/windows/lzexpand.t.lo \
-	core/sys/windows/mapi.t.lo core/sys/windows/mciavi.t.lo \
-	core/sys/windows/mcx.t.lo core/sys/windows/mgmtapi.t.lo \
-	core/sys/windows/mmsystem.t.lo core/sys/windows/msacm.t.lo \
-	core/sys/windows/mshtml.t.lo core/sys/windows/mswsock.t.lo \
-	core/sys/windows/nb30.t.lo core/sys/windows/nddeapi.t.lo \
-	core/sys/windows/nspapi.t.lo core/sys/windows/ntdef.t.lo \
-	core/sys/windows/ntdll.t.lo core/sys/windows/ntldap.t.lo \
-	core/sys/windows/ntsecapi.t.lo core/sys/windows/ntsecpkg.t.lo \
-	core/sys/windows/oaidl.t.lo core/sys/windows/objbase.t.lo \
-	core/sys/windows/objfwd.t.lo core/sys/windows/objidl.t.lo \
-	core/sys/windows/objsafe.t.lo core/sys/windows/ocidl.t.lo \
-	core/sys/windows/odbcinst.t.lo core/sys/windows/ole.t.lo \
-	core/sys/windows/ole2.t.lo core/sys/windows/ole2ver.t.lo \
-	core/sys/windows/oleacc.t.lo core/sys/windows/oleauto.t.lo \
-	core/sys/windows/olectl.t.lo core/sys/windows/olectlid.t.lo \
-	core/sys/windows/oledlg.t.lo core/sys/windows/oleidl.t.lo \
-	core/sys/windows/pbt.t.lo core/sys/windows/powrprof.t.lo \
-	core/sys/windows/prsht.t.lo core/sys/windows/psapi.t.lo \
-	core/sys/windows/rapi.t.lo core/sys/windows/ras.t.lo \
-	core/sys/windows/rasdlg.t.lo core/sys/windows/raserror.t.lo \
-	core/sys/windows/rassapi.t.lo core/sys/windows/reason.t.lo \
-	core/sys/windows/regstr.t.lo core/sys/windows/richedit.t.lo \
-	core/sys/windows/richole.t.lo core/sys/windows/rpc.t.lo \
-	core/sys/windows/rpcdce.t.lo core/sys/windows/rpcdce2.t.lo \
-	core/sys/windows/rpcdcep.t.lo core/sys/windows/rpcndr.t.lo \
-	core/sys/windows/rpcnsi.t.lo core/sys/windows/rpcnsip.t.lo \
-	core/sys/windows/rpcnterr.t.lo core/sys/windows/schannel.t.lo \
-	core/sys/windows/secext.t.lo core/sys/windows/security.t.lo \
-	core/sys/windows/servprov.t.lo core/sys/windows/setupapi.t.lo \
-	core/sys/windows/shellapi.t.lo core/sys/windows/shldisp.t.lo \
-	core/sys/windows/shlguid.t.lo core/sys/windows/shlobj.t.lo \
-	core/sys/windows/shlwapi.t.lo core/sys/windows/snmp.t.lo \
-	core/sys/windows/sql.t.lo core/sys/windows/sqlext.t.lo \
-	core/sys/windows/sqltypes.t.lo core/sys/windows/sqlucode.t.lo \
-	core/sys/windows/sspi.t.lo core/sys/windows/stacktrace.t.lo \
-	core/sys/windows/stat.t.lo core/sys/windows/subauth.t.lo \
-	core/sys/windows/threadaux.t.lo core/sys/windows/tlhelp32.t.lo \
-	core/sys/windows/tmschema.t.lo core/sys/windows/unknwn.t.lo \
-	core/sys/windows/uuid.t.lo core/sys/windows/vfw.t.lo \
-	core/sys/windows/w32api.t.lo core/sys/windows/winbase.t.lo \
-	core/sys/windows/winber.t.lo core/sys/windows/wincon.t.lo \
-	core/sys/windows/wincrypt.t.lo core/sys/windows/windef.t.lo \
-	core/sys/windows/windows.t.lo core/sys/windows/winerror.t.lo \
-	core/sys/windows/wingdi.t.lo core/sys/windows/winhttp.t.lo \
-	core/sys/windows/wininet.t.lo core/sys/windows/winioctl.t.lo \
-	core/sys/windows/winldap.t.lo core/sys/windows/winnetwk.t.lo \
-	core/sys/windows/winnls.t.lo core/sys/windows/winnt.t.lo \
-	core/sys/windows/winperf.t.lo core/sys/windows/winreg.t.lo \
-	core/sys/windows/winsock2.t.lo core/sys/windows/winspool.t.lo \
-	core/sys/windows/winsvc.t.lo core/sys/windows/winuser.t.lo \
-	core/sys/windows/winver.t.lo core/sys/windows/wtsapi32.t.lo \
-	core/sys/windows/wtypes.t.lo
-@DRUNTIME_OS_MINGW_TRUE@am__DEPENDENCIES_24 = $(am__DEPENDENCIES_23)
-am__DEPENDENCIES_25 = core/sys/solaris/dlfcn.t.lo \
-	core/sys/solaris/elf.t.lo core/sys/solaris/execinfo.t.lo \
-	core/sys/solaris/libelf.t.lo core/sys/solaris/link.t.lo \
-	core/sys/solaris/sys/elf.t.lo \
-	core/sys/solaris/sys/elf_386.t.lo \
-	core/sys/solaris/sys/elf_SPARC.t.lo \
-	core/sys/solaris/sys/elf_amd64.t.lo \
-	core/sys/solaris/sys/elf_notes.t.lo \
-	core/sys/solaris/sys/elftypes.t.lo \
-	core/sys/solaris/sys/link.t.lo \
-	core/sys/solaris/sys/priocntl.t.lo \
-	core/sys/solaris/sys/procset.t.lo \
-	core/sys/solaris/sys/types.t.lo core/sys/solaris/time.t.lo
-@DRUNTIME_OS_SOLARIS_TRUE@am__DEPENDENCIES_26 =  \
-@DRUNTIME_OS_SOLARIS_TRUE@	$(am__DEPENDENCIES_25)
-am__DEPENDENCIES_27 = gcc/config.t.lo gcc/libbacktrace.t.lo
-am__DEPENDENCIES_28 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \
-	$(am__DEPENDENCIES_6) $(am__DEPENDENCIES_8) \
-	$(am__DEPENDENCIES_10) $(am__DEPENDENCIES_12) \
-	$(am__DEPENDENCIES_14) $(am__DEPENDENCIES_16) \
-	$(am__DEPENDENCIES_18) $(am__DEPENDENCIES_20) \
-	$(am__DEPENDENCIES_22) $(am__DEPENDENCIES_24) \
-	$(am__DEPENDENCIES_26) $(am__DEPENDENCIES_27)
-am__DEPENDENCIES_29 = $(am__DEPENDENCIES_28)
-libgdruntime_t_la_DEPENDENCIES = $(am__DEPENDENCIES_29) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_31 = libgdruntime_t_la-errno_.lo \
-	libgdruntime_t_la-bss_section.lo
-am__objects_32 = libgdruntime_t_la-threadasm.lo
-am_libgdruntime_t_la_OBJECTS = $(am__objects_31) $(am__objects_32)
-libgdruntime_t_la_OBJECTS = $(am_libgdruntime_t_la_OBJECTS)
-@ENABLE_SHARED_TRUE@am_libgdruntime_t_la_rpath =
-@ENABLE_SHARED_TRUE@am__EXEEXT_1 = unittest$(EXEEXT)
-@ENABLE_STATIC_TRUE@am__EXEEXT_2 = unittest_static$(EXEEXT)
-am_unittest_OBJECTS = ../testsuite/test_runner.$(OBJEXT)
-unittest_OBJECTS = $(am_unittest_OBJECTS)
-unittest_DEPENDENCIES = libgdruntime_t.la
-am__objects_33 = errno_.$(OBJEXT) bss_section.$(OBJEXT)
-am__objects_34 = threadasm.$(OBJEXT)
-am_unittest_static_OBJECTS = ../testsuite/test_runner.$(OBJEXT) \
-	$(am__objects_33) $(am__objects_34)
-unittest_static_OBJECTS = $(am_unittest_static_OBJECTS)
-am__DEPENDENCIES_30 = core/atomic.t.o core/attribute.t.o \
-	core/bitop.t.o core/checkedint.t.o core/cpuid.t.o \
-	core/demangle.t.o core/exception.t.o core/internal/abort.t.o \
-	core/internal/arrayop.t.o core/internal/convert.t.o \
-	core/internal/hash.t.o core/internal/spinlock.t.o \
-	core/internal/string.t.o core/internal/traits.t.o \
-	core/math.t.o core/memory.t.o core/runtime.t.o core/simd.t.o \
-	core/stdc/assert_.t.o core/stdc/complex.t.o \
-	core/stdc/config.t.o core/stdc/ctype.t.o core/stdc/errno.t.o \
-	core/stdc/fenv.t.o core/stdc/float_.t.o core/stdc/inttypes.t.o \
-	core/stdc/limits.t.o core/stdc/locale.t.o core/stdc/math.t.o \
-	core/stdc/signal.t.o core/stdc/stdarg.t.o core/stdc/stddef.t.o \
-	core/stdc/stdint.t.o core/stdc/stdio.t.o core/stdc/stdlib.t.o \
-	core/stdc/string.t.o core/stdc/tgmath.t.o core/stdc/time.t.o \
-	core/stdc/wchar_.t.o core/stdc/wctype.t.o \
-	core/sync/barrier.t.o core/sync/condition.t.o \
-	core/sync/config.t.o core/sync/exception.t.o \
-	core/sync/mutex.t.o core/sync/rwmutex.t.o \
-	core/sync/semaphore.t.o core/thread.t.o core/time.t.o \
-	core/vararg.t.o gcc/attribute.t.o gcc/backtrace.t.o \
-	gcc/builtins.t.o gcc/deh.t.o gcc/unwind/arm.t.o \
-	gcc/unwind/arm_common.t.o gcc/unwind/c6x.t.o \
-	gcc/unwind/generic.t.o gcc/unwind/package.t.o \
-	gcc/unwind/pe.t.o object.t.o rt/aApply.t.o rt/aApplyR.t.o \
-	rt/aaA.t.o rt/adi.t.o rt/arrayassign.t.o rt/arraycast.t.o \
-	rt/arraycat.t.o rt/cast_.t.o rt/config.t.o rt/critical_.t.o \
-	rt/deh.t.o rt/dmain2.t.o rt/invariant.t.o rt/lifetime.t.o \
-	rt/memory.t.o rt/minfo.t.o rt/monitor_.t.o rt/obj.t.o \
-	rt/qsort.t.o rt/sections.t.o rt/sections_android.t.o \
-	rt/sections_elf_shared.t.o rt/sections_osx.t.o \
-	rt/sections_solaris.t.o rt/sections_win32.t.o \
-	rt/sections_win64.t.o rt/switch_.t.o rt/tlsgc.t.o \
-	rt/typeinfo/ti_Acdouble.t.o rt/typeinfo/ti_Acfloat.t.o \
-	rt/typeinfo/ti_Acreal.t.o rt/typeinfo/ti_Adouble.t.o \
-	rt/typeinfo/ti_Afloat.t.o rt/typeinfo/ti_Ag.t.o \
-	rt/typeinfo/ti_Aint.t.o rt/typeinfo/ti_Along.t.o \
-	rt/typeinfo/ti_Areal.t.o rt/typeinfo/ti_Ashort.t.o \
-	rt/typeinfo/ti_C.t.o rt/typeinfo/ti_byte.t.o \
-	rt/typeinfo/ti_cdouble.t.o rt/typeinfo/ti_cent.t.o \
-	rt/typeinfo/ti_cfloat.t.o rt/typeinfo/ti_char.t.o \
-	rt/typeinfo/ti_creal.t.o rt/typeinfo/ti_dchar.t.o \
-	rt/typeinfo/ti_delegate.t.o rt/typeinfo/ti_double.t.o \
-	rt/typeinfo/ti_float.t.o rt/typeinfo/ti_idouble.t.o \
-	rt/typeinfo/ti_ifloat.t.o rt/typeinfo/ti_int.t.o \
-	rt/typeinfo/ti_ireal.t.o rt/typeinfo/ti_long.t.o \
-	rt/typeinfo/ti_n.t.o rt/typeinfo/ti_ptr.t.o \
-	rt/typeinfo/ti_real.t.o rt/typeinfo/ti_short.t.o \
-	rt/typeinfo/ti_ubyte.t.o rt/typeinfo/ti_ucent.t.o \
-	rt/typeinfo/ti_uint.t.o rt/typeinfo/ti_ulong.t.o \
-	rt/typeinfo/ti_ushort.t.o rt/typeinfo/ti_void.t.o \
-	rt/typeinfo/ti_wchar.t.o rt/util/array.t.o \
-	rt/util/container/array.t.o rt/util/container/common.t.o \
-	rt/util/container/hashtab.t.o rt/util/container/treap.t.o \
-	rt/util/random.t.o rt/util/typeinfo.t.o rt/util/utf.t.o
-am__DEPENDENCIES_31 = gc/bits.t.o gc/config.t.o gc/gcinterface.t.o \
-	gc/impl/conservative/gc.t.o gc/impl/manual/gc.t.o gc/os.t.o \
-	gc/pooltable.t.o gc/proxy.t.o
-@DRUNTIME_GC_ENABLE_TRUE@am__DEPENDENCIES_32 = $(am__DEPENDENCIES_31)
-am__DEPENDENCIES_33 = gcstub/gc.t.o
-@DRUNTIME_GC_ENABLE_FALSE@am__DEPENDENCIES_34 =  \
-@DRUNTIME_GC_ENABLE_FALSE@	$(am__DEPENDENCIES_33)
-am__DEPENDENCIES_35 = core/sys/posix/aio.t.o \
-	core/sys/posix/arpa/inet.t.o core/sys/posix/config.t.o \
-	core/sys/posix/dirent.t.o core/sys/posix/dlfcn.t.o \
-	core/sys/posix/fcntl.t.o core/sys/posix/grp.t.o \
-	core/sys/posix/iconv.t.o core/sys/posix/inttypes.t.o \
-	core/sys/posix/libgen.t.o core/sys/posix/mqueue.t.o \
-	core/sys/posix/net/if_.t.o core/sys/posix/netdb.t.o \
-	core/sys/posix/netinet/in_.t.o core/sys/posix/netinet/tcp.t.o \
-	core/sys/posix/poll.t.o core/sys/posix/pthread.t.o \
-	core/sys/posix/pwd.t.o core/sys/posix/sched.t.o \
-	core/sys/posix/semaphore.t.o core/sys/posix/setjmp.t.o \
-	core/sys/posix/signal.t.o core/sys/posix/spawn.t.o \
-	core/sys/posix/stdio.t.o core/sys/posix/stdlib.t.o \
-	core/sys/posix/sys/filio.t.o core/sys/posix/sys/ioccom.t.o \
-	core/sys/posix/sys/ioctl.t.o core/sys/posix/sys/ipc.t.o \
-	core/sys/posix/sys/mman.t.o core/sys/posix/sys/msg.t.o \
-	core/sys/posix/sys/resource.t.o core/sys/posix/sys/select.t.o \
-	core/sys/posix/sys/shm.t.o core/sys/posix/sys/socket.t.o \
-	core/sys/posix/sys/stat.t.o core/sys/posix/sys/statvfs.t.o \
-	core/sys/posix/sys/time.t.o core/sys/posix/sys/ttycom.t.o \
-	core/sys/posix/sys/types.t.o core/sys/posix/sys/uio.t.o \
-	core/sys/posix/sys/un.t.o core/sys/posix/sys/utsname.t.o \
-	core/sys/posix/sys/wait.t.o core/sys/posix/syslog.t.o \
-	core/sys/posix/termios.t.o core/sys/posix/time.t.o \
-	core/sys/posix/ucontext.t.o core/sys/posix/unistd.t.o \
-	core/sys/posix/utime.t.o
-@DRUNTIME_OS_UNIX_TRUE@am__DEPENDENCIES_36 = $(am__DEPENDENCIES_35)
-am__DEPENDENCIES_37 = core/sys/darwin/crt_externs.t.o \
-	core/sys/darwin/dlfcn.t.o core/sys/darwin/execinfo.t.o \
-	core/sys/darwin/mach/dyld.t.o core/sys/darwin/mach/getsect.t.o \
-	core/sys/darwin/mach/kern_return.t.o \
-	core/sys/darwin/mach/loader.t.o core/sys/darwin/mach/port.t.o \
-	core/sys/darwin/mach/semaphore.t.o \
-	core/sys/darwin/mach/thread_act.t.o \
-	core/sys/darwin/netinet/in_.t.o core/sys/darwin/pthread.t.o \
-	core/sys/darwin/sys/cdefs.t.o core/sys/darwin/sys/event.t.o \
-	core/sys/darwin/sys/mman.t.o
-@DRUNTIME_OS_DARWIN_TRUE@am__DEPENDENCIES_38 = $(am__DEPENDENCIES_37)
-am__DEPENDENCIES_39 = core/sys/dragonflybsd/dlfcn.t.o \
-	core/sys/dragonflybsd/execinfo.t.o \
-	core/sys/dragonflybsd/netinet/in_.t.o \
-	core/sys/dragonflybsd/pthread_np.t.o \
-	core/sys/dragonflybsd/sys/_bitset.t.o \
-	core/sys/dragonflybsd/sys/_cpuset.t.o \
-	core/sys/dragonflybsd/sys/cdefs.t.o \
-	core/sys/dragonflybsd/sys/elf.t.o \
-	core/sys/dragonflybsd/sys/elf32.t.o \
-	core/sys/dragonflybsd/sys/elf64.t.o \
-	core/sys/dragonflybsd/sys/elf_common.t.o \
-	core/sys/dragonflybsd/sys/event.t.o \
-	core/sys/dragonflybsd/sys/link_elf.t.o \
-	core/sys/dragonflybsd/sys/mman.t.o \
-	core/sys/dragonflybsd/time.t.o
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@am__DEPENDENCIES_40 =  \
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@	$(am__DEPENDENCIES_39)
-am__DEPENDENCIES_41 = core/sys/bionic/fcntl.t.o \
-	core/sys/bionic/unistd.t.o
-@DRUNTIME_OS_ANDROID_TRUE@am__DEPENDENCIES_42 =  \
-@DRUNTIME_OS_ANDROID_TRUE@	$(am__DEPENDENCIES_41)
-am__DEPENDENCIES_43 = core/sys/freebsd/dlfcn.t.o \
-	core/sys/freebsd/execinfo.t.o core/sys/freebsd/netinet/in_.t.o \
-	core/sys/freebsd/pthread_np.t.o \
-	core/sys/freebsd/sys/_bitset.t.o \
-	core/sys/freebsd/sys/_cpuset.t.o \
-	core/sys/freebsd/sys/cdefs.t.o core/sys/freebsd/sys/elf.t.o \
-	core/sys/freebsd/sys/elf32.t.o core/sys/freebsd/sys/elf64.t.o \
-	core/sys/freebsd/sys/elf_common.t.o \
-	core/sys/freebsd/sys/event.t.o \
-	core/sys/freebsd/sys/link_elf.t.o \
-	core/sys/freebsd/sys/mman.t.o core/sys/freebsd/sys/mount.t.o \
-	core/sys/freebsd/time.t.o core/sys/freebsd/unistd.t.o
-@DRUNTIME_OS_FREEBSD_TRUE@am__DEPENDENCIES_44 =  \
-@DRUNTIME_OS_FREEBSD_TRUE@	$(am__DEPENDENCIES_43)
-am__DEPENDENCIES_45 = core/sys/netbsd/dlfcn.t.o \
-	core/sys/netbsd/execinfo.t.o core/sys/netbsd/sys/elf.t.o \
-	core/sys/netbsd/sys/elf32.t.o core/sys/netbsd/sys/elf64.t.o \
-	core/sys/netbsd/sys/elf_common.t.o \
-	core/sys/netbsd/sys/event.t.o core/sys/netbsd/sys/link_elf.t.o \
-	core/sys/netbsd/sys/mman.t.o core/sys/netbsd/time.t.o
-@DRUNTIME_OS_NETBSD_TRUE@am__DEPENDENCIES_46 = $(am__DEPENDENCIES_45)
-am__DEPENDENCIES_47 = core/sys/openbsd/dlfcn.t.o
-@DRUNTIME_OS_OPENBSD_TRUE@am__DEPENDENCIES_48 =  \
-@DRUNTIME_OS_OPENBSD_TRUE@	$(am__DEPENDENCIES_47)
-am__DEPENDENCIES_49 = core/sys/linux/config.t.o \
-	core/sys/linux/dlfcn.t.o core/sys/linux/elf.t.o \
-	core/sys/linux/epoll.t.o core/sys/linux/errno.t.o \
-	core/sys/linux/execinfo.t.o core/sys/linux/fcntl.t.o \
-	core/sys/linux/ifaddrs.t.o core/sys/linux/link.t.o \
-	core/sys/linux/netinet/in_.t.o core/sys/linux/netinet/tcp.t.o \
-	core/sys/linux/sched.t.o core/sys/linux/stdio.t.o \
-	core/sys/linux/sys/auxv.t.o core/sys/linux/sys/eventfd.t.o \
-	core/sys/linux/sys/file.t.o core/sys/linux/sys/inotify.t.o \
-	core/sys/linux/sys/mman.t.o core/sys/linux/sys/netinet/tcp.t.o \
-	core/sys/linux/sys/prctl.t.o core/sys/linux/sys/signalfd.t.o \
-	core/sys/linux/sys/socket.t.o core/sys/linux/sys/sysinfo.t.o \
-	core/sys/linux/sys/time.t.o core/sys/linux/sys/xattr.t.o \
-	core/sys/linux/termios.t.o core/sys/linux/time.t.o \
-	core/sys/linux/timerfd.t.o core/sys/linux/tipc.t.o \
-	core/sys/linux/unistd.t.o
-@DRUNTIME_OS_LINUX_TRUE@am__DEPENDENCIES_50 = $(am__DEPENDENCIES_49)
-am__DEPENDENCIES_51 = core/sys/windows/accctrl.t.o \
-	core/sys/windows/aclapi.t.o core/sys/windows/aclui.t.o \
-	core/sys/windows/basetsd.t.o core/sys/windows/basetyps.t.o \
-	core/sys/windows/cderr.t.o core/sys/windows/cguid.t.o \
-	core/sys/windows/com.t.o core/sys/windows/comcat.t.o \
-	core/sys/windows/commctrl.t.o core/sys/windows/commdlg.t.o \
-	core/sys/windows/core.t.o core/sys/windows/cpl.t.o \
-	core/sys/windows/cplext.t.o core/sys/windows/custcntl.t.o \
-	core/sys/windows/dbghelp.t.o \
-	core/sys/windows/dbghelp_types.t.o core/sys/windows/dbt.t.o \
-	core/sys/windows/dde.t.o core/sys/windows/ddeml.t.o \
-	core/sys/windows/dhcpcsdk.t.o core/sys/windows/dlgs.t.o \
-	core/sys/windows/dll.t.o core/sys/windows/docobj.t.o \
-	core/sys/windows/errorrep.t.o core/sys/windows/exdisp.t.o \
-	core/sys/windows/exdispid.t.o core/sys/windows/httpext.t.o \
-	core/sys/windows/idispids.t.o core/sys/windows/imagehlp.t.o \
-	core/sys/windows/imm.t.o core/sys/windows/intshcut.t.o \
-	core/sys/windows/ipexport.t.o core/sys/windows/iphlpapi.t.o \
-	core/sys/windows/ipifcons.t.o core/sys/windows/iprtrmib.t.o \
-	core/sys/windows/iptypes.t.o core/sys/windows/isguids.t.o \
-	core/sys/windows/lm.t.o core/sys/windows/lmaccess.t.o \
-	core/sys/windows/lmalert.t.o core/sys/windows/lmapibuf.t.o \
-	core/sys/windows/lmat.t.o core/sys/windows/lmaudit.t.o \
-	core/sys/windows/lmbrowsr.t.o core/sys/windows/lmchdev.t.o \
-	core/sys/windows/lmconfig.t.o core/sys/windows/lmcons.t.o \
-	core/sys/windows/lmerr.t.o core/sys/windows/lmerrlog.t.o \
-	core/sys/windows/lmmsg.t.o core/sys/windows/lmremutl.t.o \
-	core/sys/windows/lmrepl.t.o core/sys/windows/lmserver.t.o \
-	core/sys/windows/lmshare.t.o core/sys/windows/lmsname.t.o \
-	core/sys/windows/lmstats.t.o core/sys/windows/lmsvc.t.o \
-	core/sys/windows/lmuse.t.o core/sys/windows/lmuseflg.t.o \
-	core/sys/windows/lmwksta.t.o core/sys/windows/lzexpand.t.o \
-	core/sys/windows/mapi.t.o core/sys/windows/mciavi.t.o \
-	core/sys/windows/mcx.t.o core/sys/windows/mgmtapi.t.o \
-	core/sys/windows/mmsystem.t.o core/sys/windows/msacm.t.o \
-	core/sys/windows/mshtml.t.o core/sys/windows/mswsock.t.o \
-	core/sys/windows/nb30.t.o core/sys/windows/nddeapi.t.o \
-	core/sys/windows/nspapi.t.o core/sys/windows/ntdef.t.o \
-	core/sys/windows/ntdll.t.o core/sys/windows/ntldap.t.o \
-	core/sys/windows/ntsecapi.t.o core/sys/windows/ntsecpkg.t.o \
-	core/sys/windows/oaidl.t.o core/sys/windows/objbase.t.o \
-	core/sys/windows/objfwd.t.o core/sys/windows/objidl.t.o \
-	core/sys/windows/objsafe.t.o core/sys/windows/ocidl.t.o \
-	core/sys/windows/odbcinst.t.o core/sys/windows/ole.t.o \
-	core/sys/windows/ole2.t.o core/sys/windows/ole2ver.t.o \
-	core/sys/windows/oleacc.t.o core/sys/windows/oleauto.t.o \
-	core/sys/windows/olectl.t.o core/sys/windows/olectlid.t.o \
-	core/sys/windows/oledlg.t.o core/sys/windows/oleidl.t.o \
-	core/sys/windows/pbt.t.o core/sys/windows/powrprof.t.o \
-	core/sys/windows/prsht.t.o core/sys/windows/psapi.t.o \
-	core/sys/windows/rapi.t.o core/sys/windows/ras.t.o \
-	core/sys/windows/rasdlg.t.o core/sys/windows/raserror.t.o \
-	core/sys/windows/rassapi.t.o core/sys/windows/reason.t.o \
-	core/sys/windows/regstr.t.o core/sys/windows/richedit.t.o \
-	core/sys/windows/richole.t.o core/sys/windows/rpc.t.o \
-	core/sys/windows/rpcdce.t.o core/sys/windows/rpcdce2.t.o \
-	core/sys/windows/rpcdcep.t.o core/sys/windows/rpcndr.t.o \
-	core/sys/windows/rpcnsi.t.o core/sys/windows/rpcnsip.t.o \
-	core/sys/windows/rpcnterr.t.o core/sys/windows/schannel.t.o \
-	core/sys/windows/secext.t.o core/sys/windows/security.t.o \
-	core/sys/windows/servprov.t.o core/sys/windows/setupapi.t.o \
-	core/sys/windows/shellapi.t.o core/sys/windows/shldisp.t.o \
-	core/sys/windows/shlguid.t.o core/sys/windows/shlobj.t.o \
-	core/sys/windows/shlwapi.t.o core/sys/windows/snmp.t.o \
-	core/sys/windows/sql.t.o core/sys/windows/sqlext.t.o \
-	core/sys/windows/sqltypes.t.o core/sys/windows/sqlucode.t.o \
-	core/sys/windows/sspi.t.o core/sys/windows/stacktrace.t.o \
-	core/sys/windows/stat.t.o core/sys/windows/subauth.t.o \
-	core/sys/windows/threadaux.t.o core/sys/windows/tlhelp32.t.o \
-	core/sys/windows/tmschema.t.o core/sys/windows/unknwn.t.o \
-	core/sys/windows/uuid.t.o core/sys/windows/vfw.t.o \
-	core/sys/windows/w32api.t.o core/sys/windows/winbase.t.o \
-	core/sys/windows/winber.t.o core/sys/windows/wincon.t.o \
-	core/sys/windows/wincrypt.t.o core/sys/windows/windef.t.o \
-	core/sys/windows/windows.t.o core/sys/windows/winerror.t.o \
-	core/sys/windows/wingdi.t.o core/sys/windows/winhttp.t.o \
-	core/sys/windows/wininet.t.o core/sys/windows/winioctl.t.o \
-	core/sys/windows/winldap.t.o core/sys/windows/winnetwk.t.o \
-	core/sys/windows/winnls.t.o core/sys/windows/winnt.t.o \
-	core/sys/windows/winperf.t.o core/sys/windows/winreg.t.o \
-	core/sys/windows/winsock2.t.o core/sys/windows/winspool.t.o \
-	core/sys/windows/winsvc.t.o core/sys/windows/winuser.t.o \
-	core/sys/windows/winver.t.o core/sys/windows/wtsapi32.t.o \
-	core/sys/windows/wtypes.t.o
-@DRUNTIME_OS_MINGW_TRUE@am__DEPENDENCIES_52 = $(am__DEPENDENCIES_51)
-am__DEPENDENCIES_53 = core/sys/solaris/dlfcn.t.o \
-	core/sys/solaris/elf.t.o core/sys/solaris/execinfo.t.o \
-	core/sys/solaris/libelf.t.o core/sys/solaris/link.t.o \
-	core/sys/solaris/sys/elf.t.o core/sys/solaris/sys/elf_386.t.o \
-	core/sys/solaris/sys/elf_SPARC.t.o \
-	core/sys/solaris/sys/elf_amd64.t.o \
-	core/sys/solaris/sys/elf_notes.t.o \
-	core/sys/solaris/sys/elftypes.t.o \
-	core/sys/solaris/sys/link.t.o \
-	core/sys/solaris/sys/priocntl.t.o \
-	core/sys/solaris/sys/procset.t.o \
-	core/sys/solaris/sys/types.t.o core/sys/solaris/time.t.o
-@DRUNTIME_OS_SOLARIS_TRUE@am__DEPENDENCIES_54 =  \
-@DRUNTIME_OS_SOLARIS_TRUE@	$(am__DEPENDENCIES_53)
-am__DEPENDENCIES_55 = gcc/config.t.o gcc/libbacktrace.t.o
-am__DEPENDENCIES_56 = $(am__DEPENDENCIES_30) $(am__DEPENDENCIES_32) \
-	$(am__DEPENDENCIES_34) $(am__DEPENDENCIES_36) \
-	$(am__DEPENDENCIES_38) $(am__DEPENDENCIES_40) \
-	$(am__DEPENDENCIES_42) $(am__DEPENDENCIES_44) \
-	$(am__DEPENDENCIES_46) $(am__DEPENDENCIES_48) \
-	$(am__DEPENDENCIES_50) $(am__DEPENDENCIES_52) \
-	$(am__DEPENDENCIES_54) $(am__DEPENDENCIES_55)
-am__DEPENDENCIES_57 = $(am__DEPENDENCIES_56)
-unittest_static_DEPENDENCIES = $(am__DEPENDENCIES_57) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -1048,8 +477,7 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libgdruntime_la_SOURCES) $(libgdruntime_t_la_SOURCES) \
-	$(unittest_SOURCES) $(unittest_static_SOURCES)
+SOURCES = $(libgdruntime_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -1228,19 +656,6 @@ LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(GDC) $(AM_DFLAGS)
 
 
-# Override executable linking commands: We have to use GDC for linking
-# to make sure we link pthreads and other dependencies
-unittest_static_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_static_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_static_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-unittest_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-
 # Also override library link commands: This is not strictly
 # required, but we want to record additional dependencies such
 # as pthread in the library
@@ -1248,19 +663,10 @@ libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgdruntime_t_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgdruntime_t_la_LDFLAGS) $(LDFLAGS) -o $@
-
 libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgphobos_t_la_LINK = $(LIBTOOL) --tag=D \
-	$(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(libgphobos_t_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
 
 # Include D build rules
 
@@ -1298,9 +704,6 @@ ALL_DRUNTIME_COMPILE_DSOURCES = $(DRUNTIME_DSOURCES) $(am__append_1) \
 ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
 	$(DRUNTIME_SSOURCES)
 
-DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
-DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
-@ENABLE_SHARED_TRUE@check_LTLIBRARIES = libgdruntime_t.la
 toolexeclib_LTLIBRARIES = libgdruntime.la
 libgdruntime_la_SOURCES = $(ALL_DRUNTIME_SOURCES)
 libgdruntime_la_LIBTOOLFLAGS = 
@@ -1309,30 +712,6 @@ libgdruntime_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../src,-Bgcc \
 
 libgdruntime_la_LIBADD = $(LIBATOMIC) $(LIBBACKTRACE)
 libgdruntime_la_DEPENDENCIES = $(DRTSTUFF)
-
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(DRUNTIME_CSOURCES) \
-    $(DRUNTIME_SSOURCES)
-
-unittest_static_LIBTOOLFLAGS = 
-unittest_static_LDFLAGS = -Wc,-nophoboslib
-unittest_static_LDADD = $(DRUNTIME_TEST_OBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_unittest_static_DEPENDENCIES = $(DRUNTIME_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgdruntime_t_la_SOURCES = $(DRUNTIME_CSOURCES) $(DRUNTIME_SSOURCES)
-libgdruntime_t_la_LIBTOOLFLAGS = 
-# Automake by default does not generate shared libs for non-installed
-# libraries. Use -rpath to force shared lib generation.
-libgdruntime_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgdruntime_t_la_LIBADD = $(DRUNTIME_TEST_LOBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_libgdruntime_t_la_DEPENDENCIES = $(DRUNTIME_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS = 
-unittest_LDFLAGS = -Wc,-nophoboslib
-unittest_LDADD = libgdruntime_t.la
 DRUNTIME_DSOURCES_GENERATED = gcc/config.d gcc/libbacktrace.d
 # Source file definitions. Boring stuff, auto-generated with
 # https://gist.github.com/jpf91/8ad1dbc9902d6ad876313f134c6527d1
@@ -1600,17 +979,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-clean-checkLTLIBRARIES:
-	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
-	@list='$(check_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
 install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
@@ -2261,33 +1629,8 @@ gcc/libbacktrace.lo: gcc/$(am__dirstamp)
 libgdruntime.la: $(libgdruntime_la_OBJECTS) $(libgdruntime_la_DEPENDENCIES) $(EXTRA_libgdruntime_la_DEPENDENCIES) 
 	$(AM_V_GEN)$(libgdruntime_la_LINK) -rpath $(toolexeclibdir) $(libgdruntime_la_OBJECTS) $(libgdruntime_la_LIBADD) $(LIBS)
 
-libgdruntime_t.la: $(libgdruntime_t_la_OBJECTS) $(libgdruntime_t_la_DEPENDENCIES) $(EXTRA_libgdruntime_t_la_DEPENDENCIES) 
-	$(AM_V_GEN)$(libgdruntime_t_la_LINK) $(am_libgdruntime_t_la_rpath) $(libgdruntime_t_la_OBJECTS) $(libgdruntime_t_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-../testsuite/$(am__dirstamp):
-	@$(MKDIR_P) ../testsuite
-	@: > ../testsuite/$(am__dirstamp)
-../testsuite/test_runner.$(OBJEXT): ../testsuite/$(am__dirstamp)
-
-unittest$(EXEEXT): $(unittest_OBJECTS) $(unittest_DEPENDENCIES) $(EXTRA_unittest_DEPENDENCIES) 
-	@rm -f unittest$(EXEEXT)
-	$(AM_V_GEN)$(unittest_LINK) $(unittest_OBJECTS) $(unittest_LDADD) $(LIBS)
-
-unittest_static$(EXEEXT): $(unittest_static_OBJECTS) $(unittest_static_DEPENDENCIES) $(EXTRA_unittest_static_DEPENDENCIES) 
-	@rm -f unittest_static$(EXEEXT)
-	$(AM_V_GEN)$(unittest_static_LINK) $(unittest_static_OBJECTS) $(unittest_static_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../testsuite/*.$(OBJEXT)
 	-rm -f core/*.$(OBJEXT)
 	-rm -f core/*.lo
 	-rm -f core/internal/*.$(OBJEXT)
@@ -2384,15 +1727,6 @@ distclean-compile:
 libgdruntime_la-threadasm.lo: core/threadasm.S
 	$(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o libgdruntime_la-threadasm.lo `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S
 
-libgdruntime_t_la-threadasm.lo: core/threadasm.S
-	$(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(libgdruntime_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o libgdruntime_t_la-threadasm.lo `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S
-
-threadasm.o: core/threadasm.S
-	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o threadasm.o `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S
-
-threadasm.obj: core/threadasm.S
-	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o threadasm.obj `if test -f 'core/threadasm.S'; then $(CYGPATH_W) 'core/threadasm.S'; else $(CYGPATH_W) '$(srcdir)/core/threadasm.S'; fi`
-
 .c.o:
 	$(AM_V_CC)$(COMPILE) -c -o $@ $<
 
@@ -2408,24 +1742,6 @@ libgdruntime_la-errno_.lo: core/stdc/errno_.c
 libgdruntime_la-bss_section.lo: rt/bss_section.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_la-bss_section.lo `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c
 
-libgdruntime_t_la-errno_.lo: core/stdc/errno_.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_t_la-errno_.lo `test -f 'core/stdc/errno_.c' || echo '$(srcdir)/'`core/stdc/errno_.c
-
-libgdruntime_t_la-bss_section.lo: rt/bss_section.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_t_la-bss_section.lo `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c
-
-errno_.o: core/stdc/errno_.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno_.o `test -f 'core/stdc/errno_.c' || echo '$(srcdir)/'`core/stdc/errno_.c
-
-errno_.obj: core/stdc/errno_.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno_.obj `if test -f 'core/stdc/errno_.c'; then $(CYGPATH_W) 'core/stdc/errno_.c'; else $(CYGPATH_W) '$(srcdir)/core/stdc/errno_.c'; fi`
-
-bss_section.o: rt/bss_section.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bss_section.o `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c
-
-bss_section.obj: rt/bss_section.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bss_section.obj `if test -f 'rt/bss_section.c'; then $(CYGPATH_W) 'rt/bss_section.c'; else $(CYGPATH_W) '$(srcdir)/rt/bss_section.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -2545,7 +1861,6 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
@@ -2578,7 +1893,6 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../testsuite/$(am__dirstamp)
 	-rm -f core/$(am__dirstamp)
 	-rm -f core/internal/$(am__dirstamp)
 	-rm -f core/stdc/$(am__dirstamp)
@@ -2625,8 +1939,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -2695,23 +2008,22 @@ ps-am:
 uninstall-am: uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-toolexeclibDATA install-toolexeclibLTLIBRARIES \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-toolexeclibDATA \
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-toolexeclibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-toolexeclibDATA \
+	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
 .PRECIOUS: Makefile
@@ -2725,30 +2037,12 @@ uninstall-am: uninstall-toolexeclibDATA \
 .d.lo:
 	$(LTDCOMPILE) $(GDCFLAGS) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
 
-# Unittest rules. Unfortunately we can't use _DFLAGS in automake without
-# explicit D support, so use this hack.
-# Compile D sources with libtool and test flags
-%.t.lo : %.d
-	$(LTDCOMPILE) $(GDCFLAGSX) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
-
-# Compile objects for static linking with test flags
-# Automake breaks empty rules, so use the shell NOP :
-%.t.o : %.t.lo
-	@:
-
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@gcc/drtbegin.o: gcc/drtstuff.c
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@	$(COMPILE) -DDRT_BEGIN -c -o $@ $<
 
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@gcc/drtend.o: gcc/drtstuff.c
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@	$(COMPILE) -DDRT_END -c -o $@ $<
 
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(DRUNTIME_TEST_LOBJECTS)
-	rm -f $(DRUNTIME_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am
index c5d8a31d90d..ee595fa4542 100644
--- a/libphobos/src/Makefile.am
+++ b/libphobos/src/Makefile.am
@@ -35,8 +35,6 @@ ALL_PHOBOS_INSTALL_DSOURCES = $(PHOBOS_DSOURCES)
 ALL_PHOBOS_COMPILE_DSOURCES = $(PHOBOS_DSOURCES)
 
 ALL_PHOBOS_SOURCES = $(ALL_PHOBOS_COMPILE_DSOURCES)
-PHOBOS_TEST_LOBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.lo)
-PHOBOS_TEST_OBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.o)
 
 # Main library build definitions
 if DRUNTIME_ZLIB_SYSTEM
@@ -44,14 +42,6 @@ if DRUNTIME_ZLIB_SYSTEM
 else
     ZLIB_SRC = $(ZLIB_CSOURCES)
 endif
-check_PROGRAMS =
-if ENABLE_SHARED
-    check_LTLIBRARIES = libgphobos_t.la
-    check_PROGRAMS += unittest
-endif
-if ENABLE_STATIC
-    check_PROGRAMS += unittest_static
-endif
 
 toolexeclib_DATA = libgphobos.spec
 toolexeclib_LTLIBRARIES = libgphobos.la
@@ -62,35 +52,6 @@ libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
 libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la
 libgphobos_la_DEPENDENCIES = libgphobos.spec
 
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(ZLIB_SRC)
-unittest_static_LIBTOOLFLAGS =
-unittest_static_LDFLAGS = -Wc,-nophoboslib -static-libtool-libs
-unittest_static_LDADD = $(PHOBOS_TEST_OBJECTS) \
-    ../libdruntime/libgdruntime.la
-EXTRA_unittest_static_DEPENDENCIES = $(PHOBOS_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgphobos_t_la_SOURCES = $(ZLIB_SRC)
-libgphobos_t_la_LIBTOOLFLAGS =
-libgphobos_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgphobos_t_la_LIBADD = $(PHOBOS_TEST_LOBJECTS) \
-    ../libdruntime/libgdruntime.la
-EXTRA_libgphobos_t_la_DEPENDENCIES = $(PHOBOS_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS =
-unittest_LDFLAGS = -Wc,-nophoboslib -shared
-unittest_LDADD = libgphobos_t.la ../libdruntime/libgdruntime.la
-
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(PHOBOS_TEST_LOBJECTS)
-	rm -f $(PHOBOS_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in
index 1f8889fe90c..776db981f16 100644
--- a/libphobos/src/Makefile.in
+++ b/libphobos/src/Makefile.in
@@ -90,9 +90,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
-@ENABLE_SHARED_TRUE@am__append_1 = unittest
-@ENABLE_STATIC_TRUE@am__append_2 = unittest_static
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -230,193 +227,6 @@ am__objects_4 = libgphobos_la-adler32.lo libgphobos_la-compress.lo \
 @DRUNTIME_ZLIB_SYSTEM_FALSE@am__objects_5 = $(am__objects_4)
 am_libgphobos_la_OBJECTS = $(am__objects_3) $(am__objects_5)
 libgphobos_la_OBJECTS = $(am_libgphobos_la_OBJECTS)
-am__DEPENDENCIES_1 = etc/c/curl.t.lo etc/c/sqlite3.t.lo \
-	etc/c/zlib.t.lo std/algorithm/comparison.t.lo \
-	std/algorithm/internal.t.lo std/algorithm/iteration.t.lo \
-	std/algorithm/mutation.t.lo std/algorithm/package.t.lo \
-	std/algorithm/searching.t.lo std/algorithm/setops.t.lo \
-	std/algorithm/sorting.t.lo std/array.t.lo std/ascii.t.lo \
-	std/base64.t.lo std/bigint.t.lo std/bitmanip.t.lo \
-	std/compiler.t.lo std/complex.t.lo std/concurrency.t.lo \
-	std/container/array.t.lo std/container/binaryheap.t.lo \
-	std/container/dlist.t.lo std/container/package.t.lo \
-	std/container/rbtree.t.lo std/container/slist.t.lo \
-	std/container/util.t.lo std/conv.t.lo std/csv.t.lo \
-	std/datetime/date.t.lo std/datetime/interval.t.lo \
-	std/datetime/package.t.lo std/datetime/stopwatch.t.lo \
-	std/datetime/systime.t.lo std/datetime/timezone.t.lo \
-	std/demangle.t.lo std/digest/crc.t.lo std/digest/digest.t.lo \
-	std/digest/hmac.t.lo std/digest/md.t.lo \
-	std/digest/murmurhash.t.lo std/digest/package.t.lo \
-	std/digest/ripemd.t.lo std/digest/sha.t.lo std/encoding.t.lo \
-	std/exception.t.lo \
-	std/experimental/allocator/building_blocks/affix_allocator.t.lo \
-	std/experimental/allocator/building_blocks/allocator_list.t.lo \
-	std/experimental/allocator/building_blocks/bitmapped_block.t.lo \
-	std/experimental/allocator/building_blocks/bucketizer.t.lo \
-	std/experimental/allocator/building_blocks/fallback_allocator.t.lo \
-	std/experimental/allocator/building_blocks/free_list.t.lo \
-	std/experimental/allocator/building_blocks/free_tree.t.lo \
-	std/experimental/allocator/building_blocks/kernighan_ritchie.t.lo \
-	std/experimental/allocator/building_blocks/null_allocator.t.lo \
-	std/experimental/allocator/building_blocks/package.t.lo \
-	std/experimental/allocator/building_blocks/quantizer.t.lo \
-	std/experimental/allocator/building_blocks/region.t.lo \
-	std/experimental/allocator/building_blocks/scoped_allocator.t.lo \
-	std/experimental/allocator/building_blocks/segregator.t.lo \
-	std/experimental/allocator/building_blocks/stats_collector.t.lo \
-	std/experimental/allocator/common.t.lo \
-	std/experimental/allocator/gc_allocator.t.lo \
-	std/experimental/allocator/mallocator.t.lo \
-	std/experimental/allocator/mmap_allocator.t.lo \
-	std/experimental/allocator/package.t.lo \
-	std/experimental/allocator/showcase.t.lo \
-	std/experimental/allocator/typed.t.lo \
-	std/experimental/checkedint.t.lo \
-	std/experimental/logger/core.t.lo \
-	std/experimental/logger/filelogger.t.lo \
-	std/experimental/logger/multilogger.t.lo \
-	std/experimental/logger/nulllogger.t.lo \
-	std/experimental/logger/package.t.lo \
-	std/experimental/typecons.t.lo std/file.t.lo std/format.t.lo \
-	std/functional.t.lo std/getopt.t.lo std/internal/cstring.t.lo \
-	std/internal/math/biguintcore.t.lo \
-	std/internal/math/biguintnoasm.t.lo \
-	std/internal/math/errorfunction.t.lo \
-	std/internal/math/gammafunction.t.lo \
-	std/internal/scopebuffer.t.lo \
-	std/internal/test/dummyrange.t.lo std/internal/test/range.t.lo \
-	std/internal/test/uda.t.lo std/internal/unicode_comp.t.lo \
-	std/internal/unicode_decomp.t.lo \
-	std/internal/unicode_grapheme.t.lo \
-	std/internal/unicode_norm.t.lo \
-	std/internal/unicode_tables.t.lo \
-	std/internal/windows/advapi32.t.lo std/json.t.lo std/math.t.lo \
-	std/mathspecial.t.lo std/meta.t.lo std/mmfile.t.lo \
-	std/net/curl.t.lo std/net/isemail.t.lo std/numeric.t.lo \
-	std/outbuffer.t.lo std/parallelism.t.lo std/path.t.lo \
-	std/process.t.lo std/random.t.lo std/range/interfaces.t.lo \
-	std/range/package.t.lo std/range/primitives.t.lo \
-	std/regex/internal/backtracking.t.lo \
-	std/regex/internal/generator.t.lo std/regex/internal/ir.t.lo \
-	std/regex/internal/kickstart.t.lo \
-	std/regex/internal/parser.t.lo std/regex/internal/tests.t.lo \
-	std/regex/internal/thompson.t.lo std/regex/package.t.lo \
-	std/signals.t.lo std/socket.t.lo std/stdint.t.lo \
-	std/stdio.t.lo std/string.t.lo std/system.t.lo std/traits.t.lo \
-	std/typecons.t.lo std/typetuple.t.lo std/uni.t.lo std/uri.t.lo \
-	std/utf.t.lo std/uuid.t.lo std/variant.t.lo \
-	std/windows/charset.t.lo std/windows/registry.t.lo \
-	std/windows/syserror.t.lo std/xml.t.lo std/zip.t.lo \
-	std/zlib.t.lo
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
-libgphobos_t_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
-	../libdruntime/libgdruntime.la
-am__objects_6 = libgphobos_t_la-adler32.lo libgphobos_t_la-compress.lo \
-	libgphobos_t_la-crc32.lo libgphobos_t_la-deflate.lo \
-	libgphobos_t_la-gzclose.lo libgphobos_t_la-gzlib.lo \
-	libgphobos_t_la-gzread.lo libgphobos_t_la-gzwrite.lo \
-	libgphobos_t_la-infback.lo libgphobos_t_la-inffast.lo \
-	libgphobos_t_la-inflate.lo libgphobos_t_la-inftrees.lo \
-	libgphobos_t_la-trees.lo libgphobos_t_la-uncompr.lo \
-	libgphobos_t_la-zutil.lo
-@DRUNTIME_ZLIB_SYSTEM_FALSE@am__objects_7 = $(am__objects_6)
-am_libgphobos_t_la_OBJECTS = $(am__objects_7)
-libgphobos_t_la_OBJECTS = $(am_libgphobos_t_la_OBJECTS)
-@ENABLE_SHARED_TRUE@am_libgphobos_t_la_rpath =
-@ENABLE_SHARED_TRUE@am__EXEEXT_1 = unittest$(EXEEXT)
-@ENABLE_STATIC_TRUE@am__EXEEXT_2 = unittest_static$(EXEEXT)
-am_unittest_OBJECTS = ../testsuite/test_runner.$(OBJEXT)
-unittest_OBJECTS = $(am_unittest_OBJECTS)
-unittest_DEPENDENCIES = libgphobos_t.la ../libdruntime/libgdruntime.la
-am__objects_8 = adler32.$(OBJEXT) compress.$(OBJEXT) crc32.$(OBJEXT) \
-	deflate.$(OBJEXT) gzclose.$(OBJEXT) gzlib.$(OBJEXT) \
-	gzread.$(OBJEXT) gzwrite.$(OBJEXT) infback.$(OBJEXT) \
-	inffast.$(OBJEXT) inflate.$(OBJEXT) inftrees.$(OBJEXT) \
-	trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT)
-@DRUNTIME_ZLIB_SYSTEM_FALSE@am__objects_9 = $(am__objects_8)
-am_unittest_static_OBJECTS = ../testsuite/test_runner.$(OBJEXT) \
-	$(am__objects_9)
-unittest_static_OBJECTS = $(am_unittest_static_OBJECTS)
-am__DEPENDENCIES_4 = etc/c/curl.t.o etc/c/sqlite3.t.o etc/c/zlib.t.o \
-	std/algorithm/comparison.t.o std/algorithm/internal.t.o \
-	std/algorithm/iteration.t.o std/algorithm/mutation.t.o \
-	std/algorithm/package.t.o std/algorithm/searching.t.o \
-	std/algorithm/setops.t.o std/algorithm/sorting.t.o \
-	std/array.t.o std/ascii.t.o std/base64.t.o std/bigint.t.o \
-	std/bitmanip.t.o std/compiler.t.o std/complex.t.o \
-	std/concurrency.t.o std/container/array.t.o \
-	std/container/binaryheap.t.o std/container/dlist.t.o \
-	std/container/package.t.o std/container/rbtree.t.o \
-	std/container/slist.t.o std/container/util.t.o std/conv.t.o \
-	std/csv.t.o std/datetime/date.t.o std/datetime/interval.t.o \
-	std/datetime/package.t.o std/datetime/stopwatch.t.o \
-	std/datetime/systime.t.o std/datetime/timezone.t.o \
-	std/demangle.t.o std/digest/crc.t.o std/digest/digest.t.o \
-	std/digest/hmac.t.o std/digest/md.t.o \
-	std/digest/murmurhash.t.o std/digest/package.t.o \
-	std/digest/ripemd.t.o std/digest/sha.t.o std/encoding.t.o \
-	std/exception.t.o \
-	std/experimental/allocator/building_blocks/affix_allocator.t.o \
-	std/experimental/allocator/building_blocks/allocator_list.t.o \
-	std/experimental/allocator/building_blocks/bitmapped_block.t.o \
-	std/experimental/allocator/building_blocks/bucketizer.t.o \
-	std/experimental/allocator/building_blocks/fallback_allocator.t.o \
-	std/experimental/allocator/building_blocks/free_list.t.o \
-	std/experimental/allocator/building_blocks/free_tree.t.o \
-	std/experimental/allocator/building_blocks/kernighan_ritchie.t.o \
-	std/experimental/allocator/building_blocks/null_allocator.t.o \
-	std/experimental/allocator/building_blocks/package.t.o \
-	std/experimental/allocator/building_blocks/quantizer.t.o \
-	std/experimental/allocator/building_blocks/region.t.o \
-	std/experimental/allocator/building_blocks/scoped_allocator.t.o \
-	std/experimental/allocator/building_blocks/segregator.t.o \
-	std/experimental/allocator/building_blocks/stats_collector.t.o \
-	std/experimental/allocator/common.t.o \
-	std/experimental/allocator/gc_allocator.t.o \
-	std/experimental/allocator/mallocator.t.o \
-	std/experimental/allocator/mmap_allocator.t.o \
-	std/experimental/allocator/package.t.o \
-	std/experimental/allocator/showcase.t.o \
-	std/experimental/allocator/typed.t.o \
-	std/experimental/checkedint.t.o \
-	std/experimental/logger/core.t.o \
-	std/experimental/logger/filelogger.t.o \
-	std/experimental/logger/multilogger.t.o \
-	std/experimental/logger/nulllogger.t.o \
-	std/experimental/logger/package.t.o \
-	std/experimental/typecons.t.o std/file.t.o std/format.t.o \
-	std/functional.t.o std/getopt.t.o std/internal/cstring.t.o \
-	std/internal/math/biguintcore.t.o \
-	std/internal/math/biguintnoasm.t.o \
-	std/internal/math/errorfunction.t.o \
-	std/internal/math/gammafunction.t.o \
-	std/internal/scopebuffer.t.o std/internal/test/dummyrange.t.o \
-	std/internal/test/range.t.o std/internal/test/uda.t.o \
-	std/internal/unicode_comp.t.o std/internal/unicode_decomp.t.o \
-	std/internal/unicode_grapheme.t.o \
-	std/internal/unicode_norm.t.o std/internal/unicode_tables.t.o \
-	std/internal/windows/advapi32.t.o std/json.t.o std/math.t.o \
-	std/mathspecial.t.o std/meta.t.o std/mmfile.t.o \
-	std/net/curl.t.o std/net/isemail.t.o std/numeric.t.o \
-	std/outbuffer.t.o std/parallelism.t.o std/path.t.o \
-	std/process.t.o std/random.t.o std/range/interfaces.t.o \
-	std/range/package.t.o std/range/primitives.t.o \
-	std/regex/internal/backtracking.t.o \
-	std/regex/internal/generator.t.o std/regex/internal/ir.t.o \
-	std/regex/internal/kickstart.t.o std/regex/internal/parser.t.o \
-	std/regex/internal/tests.t.o std/regex/internal/thompson.t.o \
-	std/regex/package.t.o std/signals.t.o std/socket.t.o \
-	std/stdint.t.o std/stdio.t.o std/string.t.o std/system.t.o \
-	std/traits.t.o std/typecons.t.o std/typetuple.t.o std/uni.t.o \
-	std/uri.t.o std/utf.t.o std/uuid.t.o std/variant.t.o \
-	std/windows/charset.t.o std/windows/registry.t.o \
-	std/windows/syserror.t.o std/xml.t.o std/zip.t.o std/zlib.t.o
-am__DEPENDENCIES_5 = $(am__DEPENDENCIES_4)
-am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5)
-unittest_static_DEPENDENCIES = $(am__DEPENDENCIES_6) \
-	../libdruntime/libgdruntime.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -453,8 +263,7 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libgphobos_la_SOURCES) $(libgphobos_t_la_SOURCES) \
-	$(unittest_SOURCES) $(unittest_static_SOURCES)
+SOURCES = $(libgphobos_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -633,19 +442,6 @@ LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(GDC) $(AM_DFLAGS)
 
 
-# Override executable linking commands: We have to use GDC for linking
-# to make sure we link pthreads and other dependencies
-unittest_static_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_static_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_static_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-unittest_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-
 # Also override library link commands: This is not strictly
 # required, but we want to record additional dependencies such
 # as pthread in the library
@@ -653,19 +449,10 @@ libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgdruntime_t_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgdruntime_t_la_LDFLAGS) $(LDFLAGS) -o $@
-
 libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgphobos_t_la_LINK = $(LIBTOOL) --tag=D \
-	$(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(libgphobos_t_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
 
 # Include D build rules
 
@@ -686,13 +473,10 @@ ALL_PHOBOS_INSTALL_DSOURCES = $(PHOBOS_DSOURCES)
 # Setup source files depending on configure
 ALL_PHOBOS_COMPILE_DSOURCES = $(PHOBOS_DSOURCES)
 ALL_PHOBOS_SOURCES = $(ALL_PHOBOS_COMPILE_DSOURCES)
-PHOBOS_TEST_LOBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.lo)
-PHOBOS_TEST_OBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.o)
 @DRUNTIME_ZLIB_SYSTEM_FALSE@ZLIB_SRC = $(ZLIB_CSOURCES)
 
 # Main library build definitions
 @DRUNTIME_ZLIB_SYSTEM_TRUE@ZLIB_SRC = 
-@ENABLE_SHARED_TRUE@check_LTLIBRARIES = libgphobos_t.la
 toolexeclib_DATA = libgphobos.spec
 toolexeclib_LTLIBRARIES = libgphobos.la
 libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) $(ZLIB_SRC)
@@ -703,30 +487,6 @@ libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
 libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la
 libgphobos_la_DEPENDENCIES = libgphobos.spec
 
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(ZLIB_SRC)
-unittest_static_LIBTOOLFLAGS = 
-unittest_static_LDFLAGS = -Wc,-nophoboslib -static-libtool-libs
-unittest_static_LDADD = $(PHOBOS_TEST_OBJECTS) \
-    ../libdruntime/libgdruntime.la
-
-EXTRA_unittest_static_DEPENDENCIES = $(PHOBOS_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgphobos_t_la_SOURCES = $(ZLIB_SRC)
-libgphobos_t_la_LIBTOOLFLAGS = 
-libgphobos_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgphobos_t_la_LIBADD = $(PHOBOS_TEST_LOBJECTS) \
-    ../libdruntime/libgdruntime.la
-
-EXTRA_libgphobos_t_la_DEPENDENCIES = $(PHOBOS_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS = 
-unittest_LDFLAGS = -Wc,-nophoboslib -shared
-unittest_LDADD = libgphobos_t.la ../libdruntime/libgdruntime.la
-
 # Zlib sources when not using system libz
 ZLIB_CSOURCES = $(top_srcdir)/../zlib/adler32.c $(top_srcdir)/../zlib/compress.c \
 	$(top_srcdir)/../zlib/crc32.c $(top_srcdir)/../zlib/deflate.c \
@@ -842,17 +602,6 @@ $(am__aclocal_m4_deps):
 libgphobos.spec: $(top_builddir)/config.status $(srcdir)/libgphobos.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
-clean-checkLTLIBRARIES:
-	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
-	@list='$(check_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
 install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
@@ -1114,33 +863,8 @@ std/zlib.lo: std/$(am__dirstamp)
 libgphobos.la: $(libgphobos_la_OBJECTS) $(libgphobos_la_DEPENDENCIES) $(EXTRA_libgphobos_la_DEPENDENCIES) 
 	$(AM_V_GEN)$(libgphobos_la_LINK) -rpath $(toolexeclibdir) $(libgphobos_la_OBJECTS) $(libgphobos_la_LIBADD) $(LIBS)
 
-libgphobos_t.la: $(libgphobos_t_la_OBJECTS) $(libgphobos_t_la_DEPENDENCIES) $(EXTRA_libgphobos_t_la_DEPENDENCIES) 
-	$(AM_V_GEN)$(libgphobos_t_la_LINK) $(am_libgphobos_t_la_rpath) $(libgphobos_t_la_OBJECTS) $(libgphobos_t_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-../testsuite/$(am__dirstamp):
-	@$(MKDIR_P) ../testsuite
-	@: > ../testsuite/$(am__dirstamp)
-../testsuite/test_runner.$(OBJEXT): ../testsuite/$(am__dirstamp)
-
-unittest$(EXEEXT): $(unittest_OBJECTS) $(unittest_DEPENDENCIES) $(EXTRA_unittest_DEPENDENCIES) 
-	@rm -f unittest$(EXEEXT)
-	$(AM_V_GEN)$(unittest_LINK) $(unittest_OBJECTS) $(unittest_LDADD) $(LIBS)
-
-unittest_static$(EXEEXT): $(unittest_static_OBJECTS) $(unittest_static_DEPENDENCIES) $(EXTRA_unittest_static_DEPENDENCIES) 
-	@rm -f unittest_static$(EXEEXT)
-	$(AM_V_GEN)$(unittest_static_LINK) $(unittest_static_OBJECTS) $(unittest_static_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../testsuite/*.$(OBJEXT)
 	-rm -f etc/c/*.$(OBJEXT)
 	-rm -f etc/c/*.lo
 	-rm -f std/*.$(OBJEXT)
@@ -1237,141 +961,6 @@ libgphobos_la-uncompr.lo: $(top_srcdir)/../zlib/uncompr.c
 libgphobos_la-zutil.lo: $(top_srcdir)/../zlib/zutil.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-zutil.lo `test -f '$(top_srcdir)/../zlib/zutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/zutil.c
 
-libgphobos_t_la-adler32.lo: $(top_srcdir)/../zlib/adler32.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-adler32.lo `test -f '$(top_srcdir)/../zlib/adler32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/adler32.c
-
-libgphobos_t_la-compress.lo: $(top_srcdir)/../zlib/compress.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-compress.lo `test -f '$(top_srcdir)/../zlib/compress.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/compress.c
-
-libgphobos_t_la-crc32.lo: $(top_srcdir)/../zlib/crc32.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-crc32.lo `test -f '$(top_srcdir)/../zlib/crc32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/crc32.c
-
-libgphobos_t_la-deflate.lo: $(top_srcdir)/../zlib/deflate.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-deflate.lo `test -f '$(top_srcdir)/../zlib/deflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/deflate.c
-
-libgphobos_t_la-gzclose.lo: $(top_srcdir)/../zlib/gzclose.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzclose.lo `test -f '$(top_srcdir)/../zlib/gzclose.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzclose.c
-
-libgphobos_t_la-gzlib.lo: $(top_srcdir)/../zlib/gzlib.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzlib.lo `test -f '$(top_srcdir)/../zlib/gzlib.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzlib.c
-
-libgphobos_t_la-gzread.lo: $(top_srcdir)/../zlib/gzread.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzread.lo `test -f '$(top_srcdir)/../zlib/gzread.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzread.c
-
-libgphobos_t_la-gzwrite.lo: $(top_srcdir)/../zlib/gzwrite.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzwrite.lo `test -f '$(top_srcdir)/../zlib/gzwrite.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzwrite.c
-
-libgphobos_t_la-infback.lo: $(top_srcdir)/../zlib/infback.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-infback.lo `test -f '$(top_srcdir)/../zlib/infback.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/infback.c
-
-libgphobos_t_la-inffast.lo: $(top_srcdir)/../zlib/inffast.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-inffast.lo `test -f '$(top_srcdir)/../zlib/inffast.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inffast.c
-
-libgphobos_t_la-inflate.lo: $(top_srcdir)/../zlib/inflate.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-inflate.lo `test -f '$(top_srcdir)/../zlib/inflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inflate.c
-
-libgphobos_t_la-inftrees.lo: $(top_srcdir)/../zlib/inftrees.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-inftrees.lo `test -f '$(top_srcdir)/../zlib/inftrees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inftrees.c
-
-libgphobos_t_la-trees.lo: $(top_srcdir)/../zlib/trees.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-trees.lo `test -f '$(top_srcdir)/../zlib/trees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/trees.c
-
-libgphobos_t_la-uncompr.lo: $(top_srcdir)/../zlib/uncompr.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-uncompr.lo `test -f '$(top_srcdir)/../zlib/uncompr.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/uncompr.c
-
-libgphobos_t_la-zutil.lo: $(top_srcdir)/../zlib/zutil.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-zutil.lo `test -f '$(top_srcdir)/../zlib/zutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/zutil.c
-
-adler32.o: $(top_srcdir)/../zlib/adler32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.o `test -f '$(top_srcdir)/../zlib/adler32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/adler32.c
-
-adler32.obj: $(top_srcdir)/../zlib/adler32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.obj `if test -f '$(top_srcdir)/../zlib/adler32.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/adler32.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/adler32.c'; fi`
-
-compress.o: $(top_srcdir)/../zlib/compress.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compress.o `test -f '$(top_srcdir)/../zlib/compress.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/compress.c
-
-compress.obj: $(top_srcdir)/../zlib/compress.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compress.obj `if test -f '$(top_srcdir)/../zlib/compress.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/compress.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/compress.c'; fi`
-
-crc32.o: $(top_srcdir)/../zlib/crc32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crc32.o `test -f '$(top_srcdir)/../zlib/crc32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/crc32.c
-
-crc32.obj: $(top_srcdir)/../zlib/crc32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crc32.obj `if test -f '$(top_srcdir)/../zlib/crc32.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/crc32.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/crc32.c'; fi`
-
-deflate.o: $(top_srcdir)/../zlib/deflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.o `test -f '$(top_srcdir)/../zlib/deflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/deflate.c
-
-deflate.obj: $(top_srcdir)/../zlib/deflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.obj `if test -f '$(top_srcdir)/../zlib/deflate.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/deflate.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/deflate.c'; fi`
-
-gzclose.o: $(top_srcdir)/../zlib/gzclose.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzclose.o `test -f '$(top_srcdir)/../zlib/gzclose.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzclose.c
-
-gzclose.obj: $(top_srcdir)/../zlib/gzclose.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzclose.obj `if test -f '$(top_srcdir)/../zlib/gzclose.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzclose.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzclose.c'; fi`
-
-gzlib.o: $(top_srcdir)/../zlib/gzlib.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzlib.o `test -f '$(top_srcdir)/../zlib/gzlib.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzlib.c
-
-gzlib.obj: $(top_srcdir)/../zlib/gzlib.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzlib.obj `if test -f '$(top_srcdir)/../zlib/gzlib.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzlib.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzlib.c'; fi`
-
-gzread.o: $(top_srcdir)/../zlib/gzread.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzread.o `test -f '$(top_srcdir)/../zlib/gzread.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzread.c
-
-gzread.obj: $(top_srcdir)/../zlib/gzread.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzread.obj `if test -f '$(top_srcdir)/../zlib/gzread.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzread.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzread.c'; fi`
-
-gzwrite.o: $(top_srcdir)/../zlib/gzwrite.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzwrite.o `test -f '$(top_srcdir)/../zlib/gzwrite.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzwrite.c
-
-gzwrite.obj: $(top_srcdir)/../zlib/gzwrite.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzwrite.obj `if test -f '$(top_srcdir)/../zlib/gzwrite.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzwrite.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzwrite.c'; fi`
-
-infback.o: $(top_srcdir)/../zlib/infback.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infback.o `test -f '$(top_srcdir)/../zlib/infback.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/infback.c
-
-infback.obj: $(top_srcdir)/../zlib/infback.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infback.obj `if test -f '$(top_srcdir)/../zlib/infback.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/infback.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/infback.c'; fi`
-
-inffast.o: $(top_srcdir)/../zlib/inffast.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inffast.o `test -f '$(top_srcdir)/../zlib/inffast.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inffast.c
-
-inffast.obj: $(top_srcdir)/../zlib/inffast.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inffast.obj `if test -f '$(top_srcdir)/../zlib/inffast.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/inffast.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/inffast.c'; fi`
-
-inflate.o: $(top_srcdir)/../zlib/inflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inflate.o `test -f '$(top_srcdir)/../zlib/inflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inflate.c
-
-inflate.obj: $(top_srcdir)/../zlib/inflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inflate.obj `if test -f '$(top_srcdir)/../zlib/inflate.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/inflate.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/inflate.c'; fi`
-
-inftrees.o: $(top_srcdir)/../zlib/inftrees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inftrees.o `test -f '$(top_srcdir)/../zlib/inftrees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inftrees.c
-
-inftrees.obj: $(top_srcdir)/../zlib/inftrees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inftrees.obj `if test -f '$(top_srcdir)/../zlib/inftrees.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/inftrees.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/inftrees.c'; fi`
-
-trees.o: $(top_srcdir)/../zlib/trees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trees.o `test -f '$(top_srcdir)/../zlib/trees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/trees.c
-
-trees.obj: $(top_srcdir)/../zlib/trees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trees.obj `if test -f '$(top_srcdir)/../zlib/trees.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/trees.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/trees.c'; fi`
-
-uncompr.o: $(top_srcdir)/../zlib/uncompr.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uncompr.o `test -f '$(top_srcdir)/../zlib/uncompr.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/uncompr.c
-
-uncompr.obj: $(top_srcdir)/../zlib/uncompr.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uncompr.obj `if test -f '$(top_srcdir)/../zlib/uncompr.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/uncompr.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/uncompr.c'; fi`
-
-zutil.o: $(top_srcdir)/../zlib/zutil.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zutil.o `test -f '$(top_srcdir)/../zlib/zutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/zutil.c
-
-zutil.obj: $(top_srcdir)/../zlib/zutil.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zutil.obj `if test -f '$(top_srcdir)/../zlib/zutil.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/zutil.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/zutil.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1470,7 +1059,6 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
@@ -1503,7 +1091,6 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../testsuite/$(am__dirstamp)
 	-rm -f etc/c/$(am__dirstamp)
 	-rm -f std/$(am__dirstamp)
 	-rm -f std/algorithm/$(am__dirstamp)
@@ -1529,8 +1116,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -1599,23 +1185,22 @@ ps-am:
 uninstall-am: uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-toolexeclibDATA install-toolexeclibLTLIBRARIES \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-toolexeclibDATA \
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-toolexeclibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-toolexeclibDATA \
+	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
 .PRECIOUS: Makefile
@@ -1629,24 +1214,6 @@ uninstall-am: uninstall-toolexeclibDATA \
 .d.lo:
 	$(LTDCOMPILE) $(GDCFLAGS) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
 
-# Unittest rules. Unfortunately we can't use _DFLAGS in automake without
-# explicit D support, so use this hack.
-# Compile D sources with libtool and test flags
-%.t.lo : %.d
-	$(LTDCOMPILE) $(GDCFLAGSX) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
-
-# Compile objects for static linking with test flags
-# Automake breaks empty rules, so use the shell NOP :
-%.t.o : %.t.lo
-	@:
-
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(PHOBOS_TEST_LOBJECTS)
-	rm -f $(PHOBOS_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp
index 1944c7d546c..6d113bc5172 100644
--- a/libphobos/testsuite/lib/libphobos.exp
+++ b/libphobos/testsuite/lib/libphobos.exp
@@ -46,6 +46,12 @@ proc libphobos-dg-test { prog do_what extra_tool_flags } {
     set compile_type ""
     set output_file ""
 
+    global libphobos_test_name
+    if { $libphobos_test_name != "" } {
+	upvar name name
+	set name $libphobos_test_name
+    }
+
     # Set up the compiler flags, based on what we're going to do.
     switch $do_what {
 	"run" {
@@ -110,6 +116,10 @@ proc libphobos_init { args } {
     global libphobos_run_args
     set libphobos_run_args ""
 
+    # If the name of the test should be something else.
+    global libphobos_test_name
+    set libphobos_test_name ""
+
     # Default settings.
     set blddir [lookfor_file [get_multilibs] libphobos]
     set flags_file "${blddir}/testsuite/testsuite_flags"
@@ -191,3 +201,20 @@ proc libphobos_target_compile { source dest type options } {
 
     return $comp_output
 }
+
+#
+# Helper used by libphobos and libdruntime unittest runner, filters out
+# D sources that may contain a unittest function.
+#
+
+proc filter_libphobos_unittests { list } {
+    set res {}
+    foreach filename $list {
+	set fid [open $filename r]
+	if [regexp -- {unittest} [read $fid [file size $filename]]] {
+	    lappend res $filename
+	}
+	close $fid
+    }
+    return $res
+}
diff --git a/libphobos/testsuite/libphobos.aa/aa.exp b/libphobos/testsuite/libphobos.aa/aa.exp
index cba00169bd3..94a07663fc2 100644
--- a/libphobos/testsuite/libphobos.aa/aa.exp
+++ b/libphobos/testsuite/libphobos.aa/aa.exp
@@ -14,8 +14,6 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-load_lib libphobos-dg.exp
-
 # Initialize dg.
 dg-init
 
diff --git a/libphobos/testsuite/libphobos.cycles/cycles.exp b/libphobos/testsuite/libphobos.cycles/cycles.exp
index 5ea2fe4879e..9c6dea89a46 100644
--- a/libphobos/testsuite/libphobos.cycles/cycles.exp
+++ b/libphobos/testsuite/libphobos.cycles/cycles.exp
@@ -41,8 +41,10 @@ foreach cycle_test $cycle_test_list {
     set expected_fail [lindex $cycle_test 2]
 
     foreach test $tests {
+	set libphobos_test_name "[dg-trim-dirname $srcdir $test] $libphobos_run_args"
 	set shouldfail $expected_fail
-	dg-test $test "" $DEFAULT_DFLAGS
+	dg-runtest $test "" $DEFAULT_DFLAGS
+	set libphobos_test_name ""
     }
 
     set shouldfail 0
diff --git a/libphobos/testsuite/libphobos.druntime/druntime.exp b/libphobos/testsuite/libphobos.druntime/druntime.exp
new file mode 100644
index 00000000000..f93562b476b
--- /dev/null
+++ b/libphobos/testsuite/libphobos.druntime/druntime.exp
@@ -0,0 +1,36 @@
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target static] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../libdruntime "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+foreach test $tests {
+    set libphobos_test_name "$subdir/[dg-trim-dirname $srcdir/../libdruntime $test]"
+    dg-runtest $test "" "-fmain -fbuilding-libphobos-tests"
+    set libphobos_test_name ""
+}
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp b/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp
new file mode 100644
index 00000000000..77b0402d029
--- /dev/null
+++ b/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp
@@ -0,0 +1,37 @@
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target shared] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../libdruntime "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+foreach test $tests {
+    set libphobos_test_name "$subdir/[dg-trim-dirname $srcdir/../libdruntime $test]"
+    dg-runtest $test "-fversion=Shared -shared-libphobos" \
+	"-fmain -fbuilding-libphobos-tests -fno-moduleinfo"
+    set libphobos_test_name ""
+}
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.hash/hash.exp b/libphobos/testsuite/libphobos.hash/hash.exp
index cba00169bd3..94a07663fc2 100644
--- a/libphobos/testsuite/libphobos.hash/hash.exp
+++ b/libphobos/testsuite/libphobos.hash/hash.exp
@@ -14,8 +14,6 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-load_lib libphobos-dg.exp
-
 # Initialize dg.
 dg-init
 
diff --git a/libphobos/testsuite/libphobos.init_fini/init_fini.exp b/libphobos/testsuite/libphobos.init_fini/init_fini.exp
index 3e760d3e370..d35df567ab3 100644
--- a/libphobos/testsuite/libphobos.init_fini/init_fini.exp
+++ b/libphobos/testsuite/libphobos.init_fini/init_fini.exp
@@ -14,8 +14,6 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-load_lib libphobos-dg.exp
-
 # Initialize dg.
 dg-init
 
diff --git a/libphobos/testsuite/libphobos.phobos/phobos.exp b/libphobos/testsuite/libphobos.phobos/phobos.exp
new file mode 100644
index 00000000000..8ace023a832
--- /dev/null
+++ b/libphobos/testsuite/libphobos.phobos/phobos.exp
@@ -0,0 +1,36 @@
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target static] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../src "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+foreach test $tests {
+    set libphobos_test_name "$subdir/[dg-trim-dirname $srcdir/../src $test]"
+    dg-runtest $test "" "-fmain -fbuilding-libphobos-tests"
+    set libphobos_test_name ""
+}
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp b/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp
new file mode 100644
index 00000000000..b0510914499
--- /dev/null
+++ b/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp
@@ -0,0 +1,37 @@
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target shared] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../src "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+foreach test $tests {
+    set libphobos_test_name "$subdir/[dg-trim-dirname $srcdir/../src $test]"
+    dg-runtest $test "-fversion=Shared -shared-libphobos" \
+	"-fmain -fbuilding-libphobos-tests -fno-moduleinfo"
+    set libphobos_test_name ""
+}
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.shared/shared.exp b/libphobos/testsuite/libphobos.shared/shared.exp
index 7765634090c..d897db7d61e 100644
--- a/libphobos/testsuite/libphobos.shared/shared.exp
+++ b/libphobos/testsuite/libphobos.shared/shared.exp
@@ -68,34 +68,34 @@ shared_library "$srcdir/$subdir/plugin.d" "plugin2.so" ""
 dg-init
 
 # Main loop.
-dg-test "$srcdir/$subdir/link.d" "-I$srcdir/$subdir lib.so -shared-libphobos" \
+dg-runtest "$srcdir/$subdir/link.d" "-I$srcdir/$subdir lib.so -shared-libphobos" \
 	"$DEFAULT_DFLAGS"
 
-dg-test "$srcdir/$subdir/link_linkdep.d" \
+dg-runtest "$srcdir/$subdir/link_linkdep.d" \
 	"-I$srcdir/$subdir liblinkdep.so lib.so -shared-libphobos" \
 	"$DEFAULT_DFLAGS"
 
-dg-test "$srcdir/$subdir/link_loaddep.d" \
+dg-runtest "$srcdir/$subdir/link_loaddep.d" \
 	"-I$srcdir/$subdir libloaddep.so -shared-libphobos" "$DEFAULT_DFLAGS"
 
 # dlopen() tests.
 if [is-effective-target dlopen] {
-    dg-test "$srcdir/$subdir/load.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
-    dg-test "$srcdir/$subdir/load_linkdep.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
-    dg-test "$srcdir/$subdir/load_loaddep.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
-    dg-test "$srcdir/$subdir/load_13414.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
-    dg-test "$srcdir/$subdir/finalize.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
+    dg-runtest "$srcdir/$subdir/load.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
+    dg-runtest "$srcdir/$subdir/load_linkdep.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
+    dg-runtest "$srcdir/$subdir/load_loaddep.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
+    dg-runtest "$srcdir/$subdir/load_13414.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
+    dg-runtest "$srcdir/$subdir/finalize.d" "-shared-libphobos -ldl" "$DEFAULT_DFLAGS"
 }
 
 # C program link tests.
 if { [is-effective-target dlopen] && [is-effective-target pthread] } {
-    dg-test "$srcdir/$subdir/linkD.c" "lib.so -ldl -pthread" "$DEFAULT_CFLAGS"
-    dg-test "$srcdir/$subdir/linkDR.c" "-shared-libphobos -ldl -pthread" "$DEFAULT_CFLAGS"
-    dg-test "$srcdir/$subdir/host.c" "-ldl -pthread" "$DEFAULT_CFLAGS"
+    dg-runtest "$srcdir/$subdir/linkD.c" "lib.so -ldl -pthread" "$DEFAULT_CFLAGS"
+    dg-runtest "$srcdir/$subdir/linkDR.c" "-shared-libphobos -ldl -pthread" "$DEFAULT_CFLAGS"
+    dg-runtest "$srcdir/$subdir/host.c" "-ldl -pthread" "$DEFAULT_CFLAGS"
 
     # Test requires a command line argument to be passed to the program.
     set libphobos_run_args "${blddir}/src/.libs/libgphobos.${shlib_ext}"
-    dg-test "$srcdir/$subdir/loadDR.c" "-ldl -pthread -g" "$DEFAULT_CFLAGS"
+    dg-runtest "$srcdir/$subdir/loadDR.c" "-ldl -pthread -g" "$DEFAULT_CFLAGS"
     set libphobos_run_args ""
 }
 
diff --git a/libphobos/testsuite/libphobos.thread/thread.exp b/libphobos/testsuite/libphobos.thread/thread.exp
index 3e760d3e370..d35df567ab3 100644
--- a/libphobos/testsuite/libphobos.thread/thread.exp
+++ b/libphobos/testsuite/libphobos.thread/thread.exp
@@ -14,8 +14,6 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-load_lib libphobos-dg.exp
-
 # Initialize dg.
 dg-init
 
diff --git a/libphobos/testsuite/libphobos.typeinfo/typeinfo.exp b/libphobos/testsuite/libphobos.typeinfo/typeinfo.exp
index 3e760d3e370..d35df567ab3 100644
--- a/libphobos/testsuite/libphobos.typeinfo/typeinfo.exp
+++ b/libphobos/testsuite/libphobos.typeinfo/typeinfo.exp
@@ -14,8 +14,6 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-load_lib libphobos-dg.exp
-
 # Initialize dg.
 dg-init
 
diff --git a/libphobos/testsuite/libphobos.unittests/unittests.exp b/libphobos/testsuite/libphobos.unittests/unittests.exp
deleted file mode 100644
index b734a9b98d8..00000000000
--- a/libphobos/testsuite/libphobos.unittests/unittests.exp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 2017-2019 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GCC; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-# Immediately exit if we can't run target executables.
-if { ![isnative] } {
-    return
-}
-
-proc unittest_list_modules { prog } {
-    # Running the test runner without arguments prints a list of all
-    # modules that have unittests compiled in.
-    set result [libphobos_load "$prog" "" ""]
-    return [lindex $result 1]
-}
-
-# Runs all unittests for each module compiled into the test program.
-proc unittest_run_tests { name prog } {
-    foreach module [unittest_list_modules $prog] {
-	set result [libphobos_load "$prog" "$module" ""]
-	set status [lindex $result 0]
-	$status "libphobos.unittests/$name/$module"
-    }
-}
-
-proc unittester { name prog } {
-    if [file exists $prog] {
-	unittest_run_tests $name $prog
-    }
-}
-
-# List of test runners.
-if [is-effective-target static] {
-    unittester "druntime/static" "$objdir/../libdruntime/unittest_static$exeext"
-    unittester "phobos/static" "$objdir/../src/unittest_static$exeext"
-}
-
-if [is-effective-target shared] {
-    unittester "druntime/shared" "$objdir/../libdruntime/unittest$exeext"
-    unittester "phobos/shared" "$objdir/../src/unittest$exeext"
-}
diff --git a/libphobos/testsuite/test_runner.d b/libphobos/testsuite/test_runner.d
deleted file mode 100644
index c9a908ae146..00000000000
--- a/libphobos/testsuite/test_runner.d
+++ /dev/null
@@ -1,95 +0,0 @@
-import core.runtime, core.time : MonoTime;
-import core.stdc.stdio;
-
-ModuleInfo* getModuleInfo(string name)
-{
-    foreach (m; ModuleInfo)
-        if (m.name == name) return m;
-    assert(0, "module '"~name~"' not found");
-}
-
-bool tester()
-{
-    return Runtime.args.length > 1 ? testModules() : printAll();
-}
-
-string mode;
-
-
-bool testModules()
-{
-    bool ret = true;
-    foreach(name; Runtime.args[1..$])
-    {
-        immutable pkg = ".package";
-        immutable pkgLen = pkg.length;
-
-        if (name.length > pkgLen && name[$ - pkgLen .. $] == pkg)
-            name = name[0 .. $ - pkgLen];
-
-        doTest(getModuleInfo(name), ret);
-    }
-
-    return ret;
-}
-
-bool printAll()
-{
-    foreach (m; ModuleInfo)
-    {
-        if (m.unitTest)
-        {
-            string name = m.name;
-            printf("%.*s\n", cast(int)name.length, name.ptr);
-        }
-    }
-    return true;
-}
-
-
-void doTest(ModuleInfo* moduleInfo, ref bool ret)
-{
-    if (auto fp = moduleInfo.unitTest)
-    {
-        auto name = moduleInfo.name;
-        try
-        {
-            immutable t0 = MonoTime.currTime;
-            fp();
-            printf("%.3fs PASS %.*s %.*s\n",
-                   (MonoTime.currTime - t0).total!"msecs" / 1000.0,
-                   cast(uint)mode.length, mode.ptr,
-                   cast(uint)name.length, name.ptr);
-        }
-        catch (Throwable e)
-        {
-            auto msg = e.toString();
-            printf("****** FAIL %.*s %.*s\n%.*s\n",
-                   cast(uint)mode.length, mode.ptr,
-                   cast(uint)name.length, name.ptr,
-                   cast(uint)msg.length, msg.ptr);
-            ret = false;
-        }
-    }
-}
-
-
-shared static this()
-{
-    version(D_Coverage)
-    {
-        import core.runtime : dmd_coverSetMerge;
-        dmd_coverSetMerge(true);
-    }
-    Runtime.moduleUnitTester = &tester;
-
-    debug mode = "debug";
-    else  mode =  "release";
-    static if ((void*).sizeof == 4) mode ~= "32";
-    else static if ((void*).sizeof == 8) mode ~= "64";
-    else static assert(0, "You must be from the future!");
-}
-
-void main()
-{
-}
diff --git a/libphobos/testsuite/testsuite_flags.in b/libphobos/testsuite/testsuite_flags.in
index 0326401e459..fa57de27a5a 100755
--- a/libphobos/testsuite/testsuite_flags.in
+++ b/libphobos/testsuite/testsuite_flags.in
@@ -35,7 +35,8 @@ case ${query} in
       GDCPATHS_default="-nostdinc"
       GDCPATHS_config="-B${BUILD_DIR}/src
                        -I${BUILD_DIR}/libdruntime
-                       -I${SRC_DIR}/libdruntime"
+                       -I${SRC_DIR}/libdruntime
+                       -I${SRC_DIR}/src"
       echo ${GDCPATHS_default} ${GDCPATHS_config}
       ;;
     --gdcldflags)

Patch

diff --git a/libphobos/configure b/libphobos/configure
index d86934b59a5..f359a6c9e3b 100755
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -687,10 +687,6 @@  libphobos_builddir
 get_gcc_base_ver
 phobos_compiler_shared_flag
 phobos_compiler_pic_flag
-ENABLE_STATIC_FALSE
-ENABLE_STATIC_TRUE
-ENABLE_SHARED_FALSE
-ENABLE_SHARED_TRUE
 CPP
 OTOOL64
 OTOOL
@@ -11499,7 +11495,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11502 "configure"
+#line 11498 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11605,7 +11601,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11608 "configure"
+#line 11604 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13747,22 +13743,6 @@  GDCFLAGS=$lt_save_DFLAGS
 
   GDCFLAGS=$gdc_save_DFLAGS
 
- if test "$enable_shared" = "yes"; then
-  ENABLE_SHARED_TRUE=
-  ENABLE_SHARED_FALSE='#'
-else
-  ENABLE_SHARED_TRUE='#'
-  ENABLE_SHARED_FALSE=
-fi
-
- if test "$enable_static" = "yes"; then
-  ENABLE_STATIC_TRUE=
-  ENABLE_STATIC_FALSE='#'
-else
-  ENABLE_STATIC_TRUE='#'
-  ENABLE_STATIC_FALSE=
-fi
-
 
 # libtool variables for Phobos shared and position-independent compiles.
 #
@@ -15190,14 +15170,6 @@  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_SHARED_TRUE}" && test -z "${ENABLE_SHARED_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_SHARED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_STATIC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DRUNTIME_GC_ENABLE_TRUE}" && test -z "${DRUNTIME_GC_ENABLE_FALSE}"; then
   as_fn_error $? "conditional \"DRUNTIME_GC_ENABLE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/libphobos/configure.ac b/libphobos/configure.ac
index 8cc735563cb..362f7537ffb 100644
--- a/libphobos/configure.ac
+++ b/libphobos/configure.ac
@@ -75,8 +75,6 @@  AC_SUBST(CFLAGS_FOR_BUILD)
 LT_INIT(dlopen)
 AM_PROG_LIBTOOL
 WITH_LOCAL_DRUNTIME([LT_LANG([D])], [])
-AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = "yes"])
-AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = "yes"])
 
 # libtool variables for Phobos shared and position-independent compiles.
 #
diff --git a/libphobos/d_rules.am b/libphobos/d_rules.am
index 7c174b91d03..1358ae91475 100644
--- a/libphobos/d_rules.am
+++ b/libphobos/d_rules.am
@@ -33,29 +33,6 @@  toolexeclibdir = $(libphobos_toolexeclibdir)
 LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(GDC) $(AM_DFLAGS)
 
-# Unittest rules. Unfortunately we can't use _DFLAGS in automake without
-# explicit D support, so use this hack.
-# Compile D sources with libtool and test flags
-%.t.lo : %.d
-	$(LTDCOMPILE) $(GDCFLAGSX) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
-
-# Compile objects for static linking with test flags
-# Automake breaks empty rules, so use the shell NOP :
-%.t.o : %.t.lo
-	@:
-
-# Override executable linking commands: We have to use GDC for linking
-# to make sure we link pthreads and other dependencies
-unittest_static_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_static_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_static_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-unittest_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
 # Also override library link commands: This is not strictly
 # required, but we want to record additional dependencies such
 # as pthread in the library
@@ -63,15 +40,6 @@  libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgdruntime_t_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgdruntime_t_la_LDFLAGS) $(LDFLAGS) -o $@
-
 libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@
-
-libgphobos_t_la_LINK = $(LIBTOOL) --tag=D \
-	$(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(libgphobos_t_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am
index 53d03b1e82a..abefb435dc7 100644
--- a/libphobos/libdruntime/Makefile.am
+++ b/libphobos/libdruntime/Makefile.am
@@ -93,18 +93,6 @@  ALL_DRUNTIME_COMPILE_DSOURCES += $(DRUNTIME_DSOURCES_GENERATED)
 
 ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
 	$(DRUNTIME_SSOURCES)
-DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
-DRUNTIME_TEST_OBJECTS  = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
-
-# Main library build definitions
-check_PROGRAMS =
-if ENABLE_SHARED
-  check_LTLIBRARIES = libgdruntime_t.la
-  check_PROGRAMS += unittest
-endif
-if ENABLE_STATIC
-  check_PROGRAMS += unittest_static
-endif
 
 toolexeclib_LTLIBRARIES = libgdruntime.la
 libgdruntime_la_SOURCES = $(ALL_DRUNTIME_SOURCES)
@@ -114,36 +102,6 @@  libgdruntime_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../src,-Bgcc \
 libgdruntime_la_LIBADD = $(LIBATOMIC) $(LIBBACKTRACE)
 libgdruntime_la_DEPENDENCIES = $(DRTSTUFF)
 
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(DRUNTIME_CSOURCES) \
-    $(DRUNTIME_SSOURCES)
-unittest_static_LIBTOOLFLAGS =
-unittest_static_LDFLAGS = -Wc,-nophoboslib
-unittest_static_LDADD = $(DRUNTIME_TEST_OBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_unittest_static_DEPENDENCIES = $(DRUNTIME_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgdruntime_t_la_SOURCES = $(DRUNTIME_CSOURCES) $(DRUNTIME_SSOURCES)
-libgdruntime_t_la_LIBTOOLFLAGS =
-# Automake by default does not generate shared libs for non-installed
-# libraries. Use -rpath to force shared lib generation.
-libgdruntime_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgdruntime_t_la_LIBADD = $(DRUNTIME_TEST_LOBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_libgdruntime_t_la_DEPENDENCIES = $(DRUNTIME_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS =
-unittest_LDFLAGS = -Wc,-nophoboslib
-unittest_LDADD = libgdruntime_t.la
-
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(DRUNTIME_TEST_LOBJECTS)
-	rm -f $(DRUNTIME_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in
index 100312ebf2d..2cf1d312ec7 100644
--- a/libphobos/libdruntime/Makefile.in
+++ b/libphobos/libdruntime/Makefile.in
@@ -121,9 +121,6 @@  target_triplet = @target@
 @DRUNTIME_OS_LINUX_TRUE@am__append_10 = $(DRUNTIME_DSOURCES_LINUX)
 @DRUNTIME_OS_MINGW_TRUE@am__append_11 = $(DRUNTIME_DSOURCES_WINDOWS)
 @DRUNTIME_OS_SOLARIS_TRUE@am__append_12 = $(DRUNTIME_DSOURCES_SOLARIS)
-check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
-@ENABLE_SHARED_TRUE@am__append_13 = unittest
-@ENABLE_STATIC_TRUE@am__append_14 = unittest_static
 subdir = libdruntime
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -434,574 +431,6 @@  am__objects_29 = libgdruntime_la-threadasm.lo
 am__objects_30 = $(am__objects_27) $(am__objects_28) $(am__objects_29)
 am_libgdruntime_la_OBJECTS = $(am__objects_30)
 libgdruntime_la_OBJECTS = $(am_libgdruntime_la_OBJECTS)
-am__DEPENDENCIES_2 = core/atomic.t.lo core/attribute.t.lo \
-	core/bitop.t.lo core/checkedint.t.lo core/cpuid.t.lo \
-	core/demangle.t.lo core/exception.t.lo \
-	core/internal/abort.t.lo core/internal/arrayop.t.lo \
-	core/internal/convert.t.lo core/internal/hash.t.lo \
-	core/internal/spinlock.t.lo core/internal/string.t.lo \
-	core/internal/traits.t.lo core/math.t.lo core/memory.t.lo \
-	core/runtime.t.lo core/simd.t.lo core/stdc/assert_.t.lo \
-	core/stdc/complex.t.lo core/stdc/config.t.lo \
-	core/stdc/ctype.t.lo core/stdc/errno.t.lo core/stdc/fenv.t.lo \
-	core/stdc/float_.t.lo core/stdc/inttypes.t.lo \
-	core/stdc/limits.t.lo core/stdc/locale.t.lo \
-	core/stdc/math.t.lo core/stdc/signal.t.lo \
-	core/stdc/stdarg.t.lo core/stdc/stddef.t.lo \
-	core/stdc/stdint.t.lo core/stdc/stdio.t.lo \
-	core/stdc/stdlib.t.lo core/stdc/string.t.lo \
-	core/stdc/tgmath.t.lo core/stdc/time.t.lo \
-	core/stdc/wchar_.t.lo core/stdc/wctype.t.lo \
-	core/sync/barrier.t.lo core/sync/condition.t.lo \
-	core/sync/config.t.lo core/sync/exception.t.lo \
-	core/sync/mutex.t.lo core/sync/rwmutex.t.lo \
-	core/sync/semaphore.t.lo core/thread.t.lo core/time.t.lo \
-	core/vararg.t.lo gcc/attribute.t.lo gcc/backtrace.t.lo \
-	gcc/builtins.t.lo gcc/deh.t.lo gcc/unwind/arm.t.lo \
-	gcc/unwind/arm_common.t.lo gcc/unwind/c6x.t.lo \
-	gcc/unwind/generic.t.lo gcc/unwind/package.t.lo \
-	gcc/unwind/pe.t.lo object.t.lo rt/aApply.t.lo rt/aApplyR.t.lo \
-	rt/aaA.t.lo rt/adi.t.lo rt/arrayassign.t.lo rt/arraycast.t.lo \
-	rt/arraycat.t.lo rt/cast_.t.lo rt/config.t.lo \
-	rt/critical_.t.lo rt/deh.t.lo rt/dmain2.t.lo rt/invariant.t.lo \
-	rt/lifetime.t.lo rt/memory.t.lo rt/minfo.t.lo rt/monitor_.t.lo \
-	rt/obj.t.lo rt/qsort.t.lo rt/sections.t.lo \
-	rt/sections_android.t.lo rt/sections_elf_shared.t.lo \
-	rt/sections_osx.t.lo rt/sections_solaris.t.lo \
-	rt/sections_win32.t.lo rt/sections_win64.t.lo rt/switch_.t.lo \
-	rt/tlsgc.t.lo rt/typeinfo/ti_Acdouble.t.lo \
-	rt/typeinfo/ti_Acfloat.t.lo rt/typeinfo/ti_Acreal.t.lo \
-	rt/typeinfo/ti_Adouble.t.lo rt/typeinfo/ti_Afloat.t.lo \
-	rt/typeinfo/ti_Ag.t.lo rt/typeinfo/ti_Aint.t.lo \
-	rt/typeinfo/ti_Along.t.lo rt/typeinfo/ti_Areal.t.lo \
-	rt/typeinfo/ti_Ashort.t.lo rt/typeinfo/ti_C.t.lo \
-	rt/typeinfo/ti_byte.t.lo rt/typeinfo/ti_cdouble.t.lo \
-	rt/typeinfo/ti_cent.t.lo rt/typeinfo/ti_cfloat.t.lo \
-	rt/typeinfo/ti_char.t.lo rt/typeinfo/ti_creal.t.lo \
-	rt/typeinfo/ti_dchar.t.lo rt/typeinfo/ti_delegate.t.lo \
-	rt/typeinfo/ti_double.t.lo rt/typeinfo/ti_float.t.lo \
-	rt/typeinfo/ti_idouble.t.lo rt/typeinfo/ti_ifloat.t.lo \
-	rt/typeinfo/ti_int.t.lo rt/typeinfo/ti_ireal.t.lo \
-	rt/typeinfo/ti_long.t.lo rt/typeinfo/ti_n.t.lo \
-	rt/typeinfo/ti_ptr.t.lo rt/typeinfo/ti_real.t.lo \
-	rt/typeinfo/ti_short.t.lo rt/typeinfo/ti_ubyte.t.lo \
-	rt/typeinfo/ti_ucent.t.lo rt/typeinfo/ti_uint.t.lo \
-	rt/typeinfo/ti_ulong.t.lo rt/typeinfo/ti_ushort.t.lo \
-	rt/typeinfo/ti_void.t.lo rt/typeinfo/ti_wchar.t.lo \
-	rt/util/array.t.lo rt/util/container/array.t.lo \
-	rt/util/container/common.t.lo rt/util/container/hashtab.t.lo \
-	rt/util/container/treap.t.lo rt/util/random.t.lo \
-	rt/util/typeinfo.t.lo rt/util/utf.t.lo
-am__DEPENDENCIES_3 = gc/bits.t.lo gc/config.t.lo gc/gcinterface.t.lo \
-	gc/impl/conservative/gc.t.lo gc/impl/manual/gc.t.lo gc/os.t.lo \
-	gc/pooltable.t.lo gc/proxy.t.lo
-@DRUNTIME_GC_ENABLE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
-am__DEPENDENCIES_5 = gcstub/gc.t.lo
-@DRUNTIME_GC_ENABLE_FALSE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = core/sys/posix/aio.t.lo \
-	core/sys/posix/arpa/inet.t.lo core/sys/posix/config.t.lo \
-	core/sys/posix/dirent.t.lo core/sys/posix/dlfcn.t.lo \
-	core/sys/posix/fcntl.t.lo core/sys/posix/grp.t.lo \
-	core/sys/posix/iconv.t.lo core/sys/posix/inttypes.t.lo \
-	core/sys/posix/libgen.t.lo core/sys/posix/mqueue.t.lo \
-	core/sys/posix/net/if_.t.lo core/sys/posix/netdb.t.lo \
-	core/sys/posix/netinet/in_.t.lo \
-	core/sys/posix/netinet/tcp.t.lo core/sys/posix/poll.t.lo \
-	core/sys/posix/pthread.t.lo core/sys/posix/pwd.t.lo \
-	core/sys/posix/sched.t.lo core/sys/posix/semaphore.t.lo \
-	core/sys/posix/setjmp.t.lo core/sys/posix/signal.t.lo \
-	core/sys/posix/spawn.t.lo core/sys/posix/stdio.t.lo \
-	core/sys/posix/stdlib.t.lo core/sys/posix/sys/filio.t.lo \
-	core/sys/posix/sys/ioccom.t.lo core/sys/posix/sys/ioctl.t.lo \
-	core/sys/posix/sys/ipc.t.lo core/sys/posix/sys/mman.t.lo \
-	core/sys/posix/sys/msg.t.lo core/sys/posix/sys/resource.t.lo \
-	core/sys/posix/sys/select.t.lo core/sys/posix/sys/shm.t.lo \
-	core/sys/posix/sys/socket.t.lo core/sys/posix/sys/stat.t.lo \
-	core/sys/posix/sys/statvfs.t.lo core/sys/posix/sys/time.t.lo \
-	core/sys/posix/sys/ttycom.t.lo core/sys/posix/sys/types.t.lo \
-	core/sys/posix/sys/uio.t.lo core/sys/posix/sys/un.t.lo \
-	core/sys/posix/sys/utsname.t.lo core/sys/posix/sys/wait.t.lo \
-	core/sys/posix/syslog.t.lo core/sys/posix/termios.t.lo \
-	core/sys/posix/time.t.lo core/sys/posix/ucontext.t.lo \
-	core/sys/posix/unistd.t.lo core/sys/posix/utime.t.lo
-@DRUNTIME_OS_UNIX_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-am__DEPENDENCIES_9 = core/sys/darwin/crt_externs.t.lo \
-	core/sys/darwin/dlfcn.t.lo core/sys/darwin/execinfo.t.lo \
-	core/sys/darwin/mach/dyld.t.lo \
-	core/sys/darwin/mach/getsect.t.lo \
-	core/sys/darwin/mach/kern_return.t.lo \
-	core/sys/darwin/mach/loader.t.lo \
-	core/sys/darwin/mach/port.t.lo \
-	core/sys/darwin/mach/semaphore.t.lo \
-	core/sys/darwin/mach/thread_act.t.lo \
-	core/sys/darwin/netinet/in_.t.lo core/sys/darwin/pthread.t.lo \
-	core/sys/darwin/sys/cdefs.t.lo core/sys/darwin/sys/event.t.lo \
-	core/sys/darwin/sys/mman.t.lo
-@DRUNTIME_OS_DARWIN_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9)
-am__DEPENDENCIES_11 = core/sys/dragonflybsd/dlfcn.t.lo \
-	core/sys/dragonflybsd/execinfo.t.lo \
-	core/sys/dragonflybsd/netinet/in_.t.lo \
-	core/sys/dragonflybsd/pthread_np.t.lo \
-	core/sys/dragonflybsd/sys/_bitset.t.lo \
-	core/sys/dragonflybsd/sys/_cpuset.t.lo \
-	core/sys/dragonflybsd/sys/cdefs.t.lo \
-	core/sys/dragonflybsd/sys/elf.t.lo \
-	core/sys/dragonflybsd/sys/elf32.t.lo \
-	core/sys/dragonflybsd/sys/elf64.t.lo \
-	core/sys/dragonflybsd/sys/elf_common.t.lo \
-	core/sys/dragonflybsd/sys/event.t.lo \
-	core/sys/dragonflybsd/sys/link_elf.t.lo \
-	core/sys/dragonflybsd/sys/mman.t.lo \
-	core/sys/dragonflybsd/time.t.lo
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@am__DEPENDENCIES_12 =  \
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@	$(am__DEPENDENCIES_11)
-am__DEPENDENCIES_13 = core/sys/bionic/fcntl.t.lo \
-	core/sys/bionic/unistd.t.lo
-@DRUNTIME_OS_ANDROID_TRUE@am__DEPENDENCIES_14 =  \
-@DRUNTIME_OS_ANDROID_TRUE@	$(am__DEPENDENCIES_13)
-am__DEPENDENCIES_15 = core/sys/freebsd/dlfcn.t.lo \
-	core/sys/freebsd/execinfo.t.lo \
-	core/sys/freebsd/netinet/in_.t.lo \
-	core/sys/freebsd/pthread_np.t.lo \
-	core/sys/freebsd/sys/_bitset.t.lo \
-	core/sys/freebsd/sys/_cpuset.t.lo \
-	core/sys/freebsd/sys/cdefs.t.lo core/sys/freebsd/sys/elf.t.lo \
-	core/sys/freebsd/sys/elf32.t.lo \
-	core/sys/freebsd/sys/elf64.t.lo \
-	core/sys/freebsd/sys/elf_common.t.lo \
-	core/sys/freebsd/sys/event.t.lo \
-	core/sys/freebsd/sys/link_elf.t.lo \
-	core/sys/freebsd/sys/mman.t.lo core/sys/freebsd/sys/mount.t.lo \
-	core/sys/freebsd/time.t.lo core/sys/freebsd/unistd.t.lo
-@DRUNTIME_OS_FREEBSD_TRUE@am__DEPENDENCIES_16 =  \
-@DRUNTIME_OS_FREEBSD_TRUE@	$(am__DEPENDENCIES_15)
-am__DEPENDENCIES_17 = core/sys/netbsd/dlfcn.t.lo \
-	core/sys/netbsd/execinfo.t.lo core/sys/netbsd/sys/elf.t.lo \
-	core/sys/netbsd/sys/elf32.t.lo core/sys/netbsd/sys/elf64.t.lo \
-	core/sys/netbsd/sys/elf_common.t.lo \
-	core/sys/netbsd/sys/event.t.lo \
-	core/sys/netbsd/sys/link_elf.t.lo \
-	core/sys/netbsd/sys/mman.t.lo core/sys/netbsd/time.t.lo
-@DRUNTIME_OS_NETBSD_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_17)
-am__DEPENDENCIES_19 = core/sys/openbsd/dlfcn.t.lo
-@DRUNTIME_OS_OPENBSD_TRUE@am__DEPENDENCIES_20 =  \
-@DRUNTIME_OS_OPENBSD_TRUE@	$(am__DEPENDENCIES_19)
-am__DEPENDENCIES_21 = core/sys/linux/config.t.lo \
-	core/sys/linux/dlfcn.t.lo core/sys/linux/elf.t.lo \
-	core/sys/linux/epoll.t.lo core/sys/linux/errno.t.lo \
-	core/sys/linux/execinfo.t.lo core/sys/linux/fcntl.t.lo \
-	core/sys/linux/ifaddrs.t.lo core/sys/linux/link.t.lo \
-	core/sys/linux/netinet/in_.t.lo \
-	core/sys/linux/netinet/tcp.t.lo core/sys/linux/sched.t.lo \
-	core/sys/linux/stdio.t.lo core/sys/linux/sys/auxv.t.lo \
-	core/sys/linux/sys/eventfd.t.lo core/sys/linux/sys/file.t.lo \
-	core/sys/linux/sys/inotify.t.lo core/sys/linux/sys/mman.t.lo \
-	core/sys/linux/sys/netinet/tcp.t.lo \
-	core/sys/linux/sys/prctl.t.lo core/sys/linux/sys/signalfd.t.lo \
-	core/sys/linux/sys/socket.t.lo core/sys/linux/sys/sysinfo.t.lo \
-	core/sys/linux/sys/time.t.lo core/sys/linux/sys/xattr.t.lo \
-	core/sys/linux/termios.t.lo core/sys/linux/time.t.lo \
-	core/sys/linux/timerfd.t.lo core/sys/linux/tipc.t.lo \
-	core/sys/linux/unistd.t.lo
-@DRUNTIME_OS_LINUX_TRUE@am__DEPENDENCIES_22 = $(am__DEPENDENCIES_21)
-am__DEPENDENCIES_23 = core/sys/windows/accctrl.t.lo \
-	core/sys/windows/aclapi.t.lo core/sys/windows/aclui.t.lo \
-	core/sys/windows/basetsd.t.lo core/sys/windows/basetyps.t.lo \
-	core/sys/windows/cderr.t.lo core/sys/windows/cguid.t.lo \
-	core/sys/windows/com.t.lo core/sys/windows/comcat.t.lo \
-	core/sys/windows/commctrl.t.lo core/sys/windows/commdlg.t.lo \
-	core/sys/windows/core.t.lo core/sys/windows/cpl.t.lo \
-	core/sys/windows/cplext.t.lo core/sys/windows/custcntl.t.lo \
-	core/sys/windows/dbghelp.t.lo \
-	core/sys/windows/dbghelp_types.t.lo core/sys/windows/dbt.t.lo \
-	core/sys/windows/dde.t.lo core/sys/windows/ddeml.t.lo \
-	core/sys/windows/dhcpcsdk.t.lo core/sys/windows/dlgs.t.lo \
-	core/sys/windows/dll.t.lo core/sys/windows/docobj.t.lo \
-	core/sys/windows/errorrep.t.lo core/sys/windows/exdisp.t.lo \
-	core/sys/windows/exdispid.t.lo core/sys/windows/httpext.t.lo \
-	core/sys/windows/idispids.t.lo core/sys/windows/imagehlp.t.lo \
-	core/sys/windows/imm.t.lo core/sys/windows/intshcut.t.lo \
-	core/sys/windows/ipexport.t.lo core/sys/windows/iphlpapi.t.lo \
-	core/sys/windows/ipifcons.t.lo core/sys/windows/iprtrmib.t.lo \
-	core/sys/windows/iptypes.t.lo core/sys/windows/isguids.t.lo \
-	core/sys/windows/lm.t.lo core/sys/windows/lmaccess.t.lo \
-	core/sys/windows/lmalert.t.lo core/sys/windows/lmapibuf.t.lo \
-	core/sys/windows/lmat.t.lo core/sys/windows/lmaudit.t.lo \
-	core/sys/windows/lmbrowsr.t.lo core/sys/windows/lmchdev.t.lo \
-	core/sys/windows/lmconfig.t.lo core/sys/windows/lmcons.t.lo \
-	core/sys/windows/lmerr.t.lo core/sys/windows/lmerrlog.t.lo \
-	core/sys/windows/lmmsg.t.lo core/sys/windows/lmremutl.t.lo \
-	core/sys/windows/lmrepl.t.lo core/sys/windows/lmserver.t.lo \
-	core/sys/windows/lmshare.t.lo core/sys/windows/lmsname.t.lo \
-	core/sys/windows/lmstats.t.lo core/sys/windows/lmsvc.t.lo \
-	core/sys/windows/lmuse.t.lo core/sys/windows/lmuseflg.t.lo \
-	core/sys/windows/lmwksta.t.lo core/sys/windows/lzexpand.t.lo \
-	core/sys/windows/mapi.t.lo core/sys/windows/mciavi.t.lo \
-	core/sys/windows/mcx.t.lo core/sys/windows/mgmtapi.t.lo \
-	core/sys/windows/mmsystem.t.lo core/sys/windows/msacm.t.lo \
-	core/sys/windows/mshtml.t.lo core/sys/windows/mswsock.t.lo \
-	core/sys/windows/nb30.t.lo core/sys/windows/nddeapi.t.lo \
-	core/sys/windows/nspapi.t.lo core/sys/windows/ntdef.t.lo \
-	core/sys/windows/ntdll.t.lo core/sys/windows/ntldap.t.lo \
-	core/sys/windows/ntsecapi.t.lo core/sys/windows/ntsecpkg.t.lo \
-	core/sys/windows/oaidl.t.lo core/sys/windows/objbase.t.lo \
-	core/sys/windows/objfwd.t.lo core/sys/windows/objidl.t.lo \
-	core/sys/windows/objsafe.t.lo core/sys/windows/ocidl.t.lo \
-	core/sys/windows/odbcinst.t.lo core/sys/windows/ole.t.lo \
-	core/sys/windows/ole2.t.lo core/sys/windows/ole2ver.t.lo \
-	core/sys/windows/oleacc.t.lo core/sys/windows/oleauto.t.lo \
-	core/sys/windows/olectl.t.lo core/sys/windows/olectlid.t.lo \
-	core/sys/windows/oledlg.t.lo core/sys/windows/oleidl.t.lo \
-	core/sys/windows/pbt.t.lo core/sys/windows/powrprof.t.lo \
-	core/sys/windows/prsht.t.lo core/sys/windows/psapi.t.lo \
-	core/sys/windows/rapi.t.lo core/sys/windows/ras.t.lo \
-	core/sys/windows/rasdlg.t.lo core/sys/windows/raserror.t.lo \
-	core/sys/windows/rassapi.t.lo core/sys/windows/reason.t.lo \
-	core/sys/windows/regstr.t.lo core/sys/windows/richedit.t.lo \
-	core/sys/windows/richole.t.lo core/sys/windows/rpc.t.lo \
-	core/sys/windows/rpcdce.t.lo core/sys/windows/rpcdce2.t.lo \
-	core/sys/windows/rpcdcep.t.lo core/sys/windows/rpcndr.t.lo \
-	core/sys/windows/rpcnsi.t.lo core/sys/windows/rpcnsip.t.lo \
-	core/sys/windows/rpcnterr.t.lo core/sys/windows/schannel.t.lo \
-	core/sys/windows/secext.t.lo core/sys/windows/security.t.lo \
-	core/sys/windows/servprov.t.lo core/sys/windows/setupapi.t.lo \
-	core/sys/windows/shellapi.t.lo core/sys/windows/shldisp.t.lo \
-	core/sys/windows/shlguid.t.lo core/sys/windows/shlobj.t.lo \
-	core/sys/windows/shlwapi.t.lo core/sys/windows/snmp.t.lo \
-	core/sys/windows/sql.t.lo core/sys/windows/sqlext.t.lo \
-	core/sys/windows/sqltypes.t.lo core/sys/windows/sqlucode.t.lo \
-	core/sys/windows/sspi.t.lo core/sys/windows/stacktrace.t.lo \
-	core/sys/windows/stat.t.lo core/sys/windows/subauth.t.lo \
-	core/sys/windows/threadaux.t.lo core/sys/windows/tlhelp32.t.lo \
-	core/sys/windows/tmschema.t.lo core/sys/windows/unknwn.t.lo \
-	core/sys/windows/uuid.t.lo core/sys/windows/vfw.t.lo \
-	core/sys/windows/w32api.t.lo core/sys/windows/winbase.t.lo \
-	core/sys/windows/winber.t.lo core/sys/windows/wincon.t.lo \
-	core/sys/windows/wincrypt.t.lo core/sys/windows/windef.t.lo \
-	core/sys/windows/windows.t.lo core/sys/windows/winerror.t.lo \
-	core/sys/windows/wingdi.t.lo core/sys/windows/winhttp.t.lo \
-	core/sys/windows/wininet.t.lo core/sys/windows/winioctl.t.lo \
-	core/sys/windows/winldap.t.lo core/sys/windows/winnetwk.t.lo \
-	core/sys/windows/winnls.t.lo core/sys/windows/winnt.t.lo \
-	core/sys/windows/winperf.t.lo core/sys/windows/winreg.t.lo \
-	core/sys/windows/winsock2.t.lo core/sys/windows/winspool.t.lo \
-	core/sys/windows/winsvc.t.lo core/sys/windows/winuser.t.lo \
-	core/sys/windows/winver.t.lo core/sys/windows/wtsapi32.t.lo \
-	core/sys/windows/wtypes.t.lo
-@DRUNTIME_OS_MINGW_TRUE@am__DEPENDENCIES_24 = $(am__DEPENDENCIES_23)
-am__DEPENDENCIES_25 = core/sys/solaris/dlfcn.t.lo \
-	core/sys/solaris/elf.t.lo core/sys/solaris/execinfo.t.lo \
-	core/sys/solaris/libelf.t.lo core/sys/solaris/link.t.lo \
-	core/sys/solaris/sys/elf.t.lo \
-	core/sys/solaris/sys/elf_386.t.lo \
-	core/sys/solaris/sys/elf_SPARC.t.lo \
-	core/sys/solaris/sys/elf_amd64.t.lo \
-	core/sys/solaris/sys/elf_notes.t.lo \
-	core/sys/solaris/sys/elftypes.t.lo \
-	core/sys/solaris/sys/link.t.lo \
-	core/sys/solaris/sys/priocntl.t.lo \
-	core/sys/solaris/sys/procset.t.lo \
-	core/sys/solaris/sys/types.t.lo core/sys/solaris/time.t.lo
-@DRUNTIME_OS_SOLARIS_TRUE@am__DEPENDENCIES_26 =  \
-@DRUNTIME_OS_SOLARIS_TRUE@	$(am__DEPENDENCIES_25)
-am__DEPENDENCIES_27 = gcc/config.t.lo gcc/libbacktrace.t.lo
-am__DEPENDENCIES_28 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \
-	$(am__DEPENDENCIES_6) $(am__DEPENDENCIES_8) \
-	$(am__DEPENDENCIES_10) $(am__DEPENDENCIES_12) \
-	$(am__DEPENDENCIES_14) $(am__DEPENDENCIES_16) \
-	$(am__DEPENDENCIES_18) $(am__DEPENDENCIES_20) \
-	$(am__DEPENDENCIES_22) $(am__DEPENDENCIES_24) \
-	$(am__DEPENDENCIES_26) $(am__DEPENDENCIES_27)
-am__DEPENDENCIES_29 = $(am__DEPENDENCIES_28)
-libgdruntime_t_la_DEPENDENCIES = $(am__DEPENDENCIES_29) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_31 = libgdruntime_t_la-errno_.lo \
-	libgdruntime_t_la-bss_section.lo
-am__objects_32 = libgdruntime_t_la-threadasm.lo
-am_libgdruntime_t_la_OBJECTS = $(am__objects_31) $(am__objects_32)
-libgdruntime_t_la_OBJECTS = $(am_libgdruntime_t_la_OBJECTS)
-@ENABLE_SHARED_TRUE@am_libgdruntime_t_la_rpath =
-@ENABLE_SHARED_TRUE@am__EXEEXT_1 = unittest$(EXEEXT)
-@ENABLE_STATIC_TRUE@am__EXEEXT_2 = unittest_static$(EXEEXT)
-am_unittest_OBJECTS = ../testsuite/test_runner.$(OBJEXT)
-unittest_OBJECTS = $(am_unittest_OBJECTS)
-unittest_DEPENDENCIES = libgdruntime_t.la
-am__objects_33 = errno_.$(OBJEXT) bss_section.$(OBJEXT)
-am__objects_34 = threadasm.$(OBJEXT)
-am_unittest_static_OBJECTS = ../testsuite/test_runner.$(OBJEXT) \
-	$(am__objects_33) $(am__objects_34)
-unittest_static_OBJECTS = $(am_unittest_static_OBJECTS)
-am__DEPENDENCIES_30 = core/atomic.t.o core/attribute.t.o \
-	core/bitop.t.o core/checkedint.t.o core/cpuid.t.o \
-	core/demangle.t.o core/exception.t.o core/internal/abort.t.o \
-	core/internal/arrayop.t.o core/internal/convert.t.o \
-	core/internal/hash.t.o core/internal/spinlock.t.o \
-	core/internal/string.t.o core/internal/traits.t.o \
-	core/math.t.o core/memory.t.o core/runtime.t.o core/simd.t.o \
-	core/stdc/assert_.t.o core/stdc/complex.t.o \
-	core/stdc/config.t.o core/stdc/ctype.t.o core/stdc/errno.t.o \
-	core/stdc/fenv.t.o core/stdc/float_.t.o core/stdc/inttypes.t.o \
-	core/stdc/limits.t.o core/stdc/locale.t.o core/stdc/math.t.o \
-	core/stdc/signal.t.o core/stdc/stdarg.t.o core/stdc/stddef.t.o \
-	core/stdc/stdint.t.o core/stdc/stdio.t.o core/stdc/stdlib.t.o \
-	core/stdc/string.t.o core/stdc/tgmath.t.o core/stdc/time.t.o \
-	core/stdc/wchar_.t.o core/stdc/wctype.t.o \
-	core/sync/barrier.t.o core/sync/condition.t.o \
-	core/sync/config.t.o core/sync/exception.t.o \
-	core/sync/mutex.t.o core/sync/rwmutex.t.o \
-	core/sync/semaphore.t.o core/thread.t.o core/time.t.o \
-	core/vararg.t.o gcc/attribute.t.o gcc/backtrace.t.o \
-	gcc/builtins.t.o gcc/deh.t.o gcc/unwind/arm.t.o \
-	gcc/unwind/arm_common.t.o gcc/unwind/c6x.t.o \
-	gcc/unwind/generic.t.o gcc/unwind/package.t.o \
-	gcc/unwind/pe.t.o object.t.o rt/aApply.t.o rt/aApplyR.t.o \
-	rt/aaA.t.o rt/adi.t.o rt/arrayassign.t.o rt/arraycast.t.o \
-	rt/arraycat.t.o rt/cast_.t.o rt/config.t.o rt/critical_.t.o \
-	rt/deh.t.o rt/dmain2.t.o rt/invariant.t.o rt/lifetime.t.o \
-	rt/memory.t.o rt/minfo.t.o rt/monitor_.t.o rt/obj.t.o \
-	rt/qsort.t.o rt/sections.t.o rt/sections_android.t.o \
-	rt/sections_elf_shared.t.o rt/sections_osx.t.o \
-	rt/sections_solaris.t.o rt/sections_win32.t.o \
-	rt/sections_win64.t.o rt/switch_.t.o rt/tlsgc.t.o \
-	rt/typeinfo/ti_Acdouble.t.o rt/typeinfo/ti_Acfloat.t.o \
-	rt/typeinfo/ti_Acreal.t.o rt/typeinfo/ti_Adouble.t.o \
-	rt/typeinfo/ti_Afloat.t.o rt/typeinfo/ti_Ag.t.o \
-	rt/typeinfo/ti_Aint.t.o rt/typeinfo/ti_Along.t.o \
-	rt/typeinfo/ti_Areal.t.o rt/typeinfo/ti_Ashort.t.o \
-	rt/typeinfo/ti_C.t.o rt/typeinfo/ti_byte.t.o \
-	rt/typeinfo/ti_cdouble.t.o rt/typeinfo/ti_cent.t.o \
-	rt/typeinfo/ti_cfloat.t.o rt/typeinfo/ti_char.t.o \
-	rt/typeinfo/ti_creal.t.o rt/typeinfo/ti_dchar.t.o \
-	rt/typeinfo/ti_delegate.t.o rt/typeinfo/ti_double.t.o \
-	rt/typeinfo/ti_float.t.o rt/typeinfo/ti_idouble.t.o \
-	rt/typeinfo/ti_ifloat.t.o rt/typeinfo/ti_int.t.o \
-	rt/typeinfo/ti_ireal.t.o rt/typeinfo/ti_long.t.o \
-	rt/typeinfo/ti_n.t.o rt/typeinfo/ti_ptr.t.o \
-	rt/typeinfo/ti_real.t.o rt/typeinfo/ti_short.t.o \
-	rt/typeinfo/ti_ubyte.t.o rt/typeinfo/ti_ucent.t.o \
-	rt/typeinfo/ti_uint.t.o rt/typeinfo/ti_ulong.t.o \
-	rt/typeinfo/ti_ushort.t.o rt/typeinfo/ti_void.t.o \
-	rt/typeinfo/ti_wchar.t.o rt/util/array.t.o \
-	rt/util/container/array.t.o rt/util/container/common.t.o \
-	rt/util/container/hashtab.t.o rt/util/container/treap.t.o \
-	rt/util/random.t.o rt/util/typeinfo.t.o rt/util/utf.t.o
-am__DEPENDENCIES_31 = gc/bits.t.o gc/config.t.o gc/gcinterface.t.o \
-	gc/impl/conservative/gc.t.o gc/impl/manual/gc.t.o gc/os.t.o \
-	gc/pooltable.t.o gc/proxy.t.o
-@DRUNTIME_GC_ENABLE_TRUE@am__DEPENDENCIES_32 = $(am__DEPENDENCIES_31)
-am__DEPENDENCIES_33 = gcstub/gc.t.o
-@DRUNTIME_GC_ENABLE_FALSE@am__DEPENDENCIES_34 =  \
-@DRUNTIME_GC_ENABLE_FALSE@	$(am__DEPENDENCIES_33)
-am__DEPENDENCIES_35 = core/sys/posix/aio.t.o \
-	core/sys/posix/arpa/inet.t.o core/sys/posix/config.t.o \
-	core/sys/posix/dirent.t.o core/sys/posix/dlfcn.t.o \
-	core/sys/posix/fcntl.t.o core/sys/posix/grp.t.o \
-	core/sys/posix/iconv.t.o core/sys/posix/inttypes.t.o \
-	core/sys/posix/libgen.t.o core/sys/posix/mqueue.t.o \
-	core/sys/posix/net/if_.t.o core/sys/posix/netdb.t.o \
-	core/sys/posix/netinet/in_.t.o core/sys/posix/netinet/tcp.t.o \
-	core/sys/posix/poll.t.o core/sys/posix/pthread.t.o \
-	core/sys/posix/pwd.t.o core/sys/posix/sched.t.o \
-	core/sys/posix/semaphore.t.o core/sys/posix/setjmp.t.o \
-	core/sys/posix/signal.t.o core/sys/posix/spawn.t.o \
-	core/sys/posix/stdio.t.o core/sys/posix/stdlib.t.o \
-	core/sys/posix/sys/filio.t.o core/sys/posix/sys/ioccom.t.o \
-	core/sys/posix/sys/ioctl.t.o core/sys/posix/sys/ipc.t.o \
-	core/sys/posix/sys/mman.t.o core/sys/posix/sys/msg.t.o \
-	core/sys/posix/sys/resource.t.o core/sys/posix/sys/select.t.o \
-	core/sys/posix/sys/shm.t.o core/sys/posix/sys/socket.t.o \
-	core/sys/posix/sys/stat.t.o core/sys/posix/sys/statvfs.t.o \
-	core/sys/posix/sys/time.t.o core/sys/posix/sys/ttycom.t.o \
-	core/sys/posix/sys/types.t.o core/sys/posix/sys/uio.t.o \
-	core/sys/posix/sys/un.t.o core/sys/posix/sys/utsname.t.o \
-	core/sys/posix/sys/wait.t.o core/sys/posix/syslog.t.o \
-	core/sys/posix/termios.t.o core/sys/posix/time.t.o \
-	core/sys/posix/ucontext.t.o core/sys/posix/unistd.t.o \
-	core/sys/posix/utime.t.o
-@DRUNTIME_OS_UNIX_TRUE@am__DEPENDENCIES_36 = $(am__DEPENDENCIES_35)
-am__DEPENDENCIES_37 = core/sys/darwin/crt_externs.t.o \
-	core/sys/darwin/dlfcn.t.o core/sys/darwin/execinfo.t.o \
-	core/sys/darwin/mach/dyld.t.o core/sys/darwin/mach/getsect.t.o \
-	core/sys/darwin/mach/kern_return.t.o \
-	core/sys/darwin/mach/loader.t.o core/sys/darwin/mach/port.t.o \
-	core/sys/darwin/mach/semaphore.t.o \
-	core/sys/darwin/mach/thread_act.t.o \
-	core/sys/darwin/netinet/in_.t.o core/sys/darwin/pthread.t.o \
-	core/sys/darwin/sys/cdefs.t.o core/sys/darwin/sys/event.t.o \
-	core/sys/darwin/sys/mman.t.o
-@DRUNTIME_OS_DARWIN_TRUE@am__DEPENDENCIES_38 = $(am__DEPENDENCIES_37)
-am__DEPENDENCIES_39 = core/sys/dragonflybsd/dlfcn.t.o \
-	core/sys/dragonflybsd/execinfo.t.o \
-	core/sys/dragonflybsd/netinet/in_.t.o \
-	core/sys/dragonflybsd/pthread_np.t.o \
-	core/sys/dragonflybsd/sys/_bitset.t.o \
-	core/sys/dragonflybsd/sys/_cpuset.t.o \
-	core/sys/dragonflybsd/sys/cdefs.t.o \
-	core/sys/dragonflybsd/sys/elf.t.o \
-	core/sys/dragonflybsd/sys/elf32.t.o \
-	core/sys/dragonflybsd/sys/elf64.t.o \
-	core/sys/dragonflybsd/sys/elf_common.t.o \
-	core/sys/dragonflybsd/sys/event.t.o \
-	core/sys/dragonflybsd/sys/link_elf.t.o \
-	core/sys/dragonflybsd/sys/mman.t.o \
-	core/sys/dragonflybsd/time.t.o
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@am__DEPENDENCIES_40 =  \
-@DRUNTIME_OS_DRAGONFLYBSD_TRUE@	$(am__DEPENDENCIES_39)
-am__DEPENDENCIES_41 = core/sys/bionic/fcntl.t.o \
-	core/sys/bionic/unistd.t.o
-@DRUNTIME_OS_ANDROID_TRUE@am__DEPENDENCIES_42 =  \
-@DRUNTIME_OS_ANDROID_TRUE@	$(am__DEPENDENCIES_41)
-am__DEPENDENCIES_43 = core/sys/freebsd/dlfcn.t.o \
-	core/sys/freebsd/execinfo.t.o core/sys/freebsd/netinet/in_.t.o \
-	core/sys/freebsd/pthread_np.t.o \
-	core/sys/freebsd/sys/_bitset.t.o \
-	core/sys/freebsd/sys/_cpuset.t.o \
-	core/sys/freebsd/sys/cdefs.t.o core/sys/freebsd/sys/elf.t.o \
-	core/sys/freebsd/sys/elf32.t.o core/sys/freebsd/sys/elf64.t.o \
-	core/sys/freebsd/sys/elf_common.t.o \
-	core/sys/freebsd/sys/event.t.o \
-	core/sys/freebsd/sys/link_elf.t.o \
-	core/sys/freebsd/sys/mman.t.o core/sys/freebsd/sys/mount.t.o \
-	core/sys/freebsd/time.t.o core/sys/freebsd/unistd.t.o
-@DRUNTIME_OS_FREEBSD_TRUE@am__DEPENDENCIES_44 =  \
-@DRUNTIME_OS_FREEBSD_TRUE@	$(am__DEPENDENCIES_43)
-am__DEPENDENCIES_45 = core/sys/netbsd/dlfcn.t.o \
-	core/sys/netbsd/execinfo.t.o core/sys/netbsd/sys/elf.t.o \
-	core/sys/netbsd/sys/elf32.t.o core/sys/netbsd/sys/elf64.t.o \
-	core/sys/netbsd/sys/elf_common.t.o \
-	core/sys/netbsd/sys/event.t.o core/sys/netbsd/sys/link_elf.t.o \
-	core/sys/netbsd/sys/mman.t.o core/sys/netbsd/time.t.o
-@DRUNTIME_OS_NETBSD_TRUE@am__DEPENDENCIES_46 = $(am__DEPENDENCIES_45)
-am__DEPENDENCIES_47 = core/sys/openbsd/dlfcn.t.o
-@DRUNTIME_OS_OPENBSD_TRUE@am__DEPENDENCIES_48 =  \
-@DRUNTIME_OS_OPENBSD_TRUE@	$(am__DEPENDENCIES_47)
-am__DEPENDENCIES_49 = core/sys/linux/config.t.o \
-	core/sys/linux/dlfcn.t.o core/sys/linux/elf.t.o \
-	core/sys/linux/epoll.t.o core/sys/linux/errno.t.o \
-	core/sys/linux/execinfo.t.o core/sys/linux/fcntl.t.o \
-	core/sys/linux/ifaddrs.t.o core/sys/linux/link.t.o \
-	core/sys/linux/netinet/in_.t.o core/sys/linux/netinet/tcp.t.o \
-	core/sys/linux/sched.t.o core/sys/linux/stdio.t.o \
-	core/sys/linux/sys/auxv.t.o core/sys/linux/sys/eventfd.t.o \
-	core/sys/linux/sys/file.t.o core/sys/linux/sys/inotify.t.o \
-	core/sys/linux/sys/mman.t.o core/sys/linux/sys/netinet/tcp.t.o \
-	core/sys/linux/sys/prctl.t.o core/sys/linux/sys/signalfd.t.o \
-	core/sys/linux/sys/socket.t.o core/sys/linux/sys/sysinfo.t.o \
-	core/sys/linux/sys/time.t.o core/sys/linux/sys/xattr.t.o \
-	core/sys/linux/termios.t.o core/sys/linux/time.t.o \
-	core/sys/linux/timerfd.t.o core/sys/linux/tipc.t.o \
-	core/sys/linux/unistd.t.o
-@DRUNTIME_OS_LINUX_TRUE@am__DEPENDENCIES_50 = $(am__DEPENDENCIES_49)
-am__DEPENDENCIES_51 = core/sys/windows/accctrl.t.o \
-	core/sys/windows/aclapi.t.o core/sys/windows/aclui.t.o \
-	core/sys/windows/basetsd.t.o core/sys/windows/basetyps.t.o \
-	core/sys/windows/cderr.t.o core/sys/windows/cguid.t.o \
-	core/sys/windows/com.t.o core/sys/windows/comcat.t.o \
-	core/sys/windows/commctrl.t.o core/sys/windows/commdlg.t.o \
-	core/sys/windows/core.t.o core/sys/windows/cpl.t.o \
-	core/sys/windows/cplext.t.o core/sys/windows/custcntl.t.o \
-	core/sys/windows/dbghelp.t.o \
-	core/sys/windows/dbghelp_types.t.o core/sys/windows/dbt.t.o \
-	core/sys/windows/dde.t.o core/sys/windows/ddeml.t.o \
-	core/sys/windows/dhcpcsdk.t.o core/sys/windows/dlgs.t.o \
-	core/sys/windows/dll.t.o core/sys/windows/docobj.t.o \
-	core/sys/windows/errorrep.t.o core/sys/windows/exdisp.t.o \
-	core/sys/windows/exdispid.t.o core/sys/windows/httpext.t.o \
-	core/sys/windows/idispids.t.o core/sys/windows/imagehlp.t.o \
-	core/sys/windows/imm.t.o core/sys/windows/intshcut.t.o \
-	core/sys/windows/ipexport.t.o core/sys/windows/iphlpapi.t.o \
-	core/sys/windows/ipifcons.t.o core/sys/windows/iprtrmib.t.o \
-	core/sys/windows/iptypes.t.o core/sys/windows/isguids.t.o \
-	core/sys/windows/lm.t.o core/sys/windows/lmaccess.t.o \
-	core/sys/windows/lmalert.t.o core/sys/windows/lmapibuf.t.o \
-	core/sys/windows/lmat.t.o core/sys/windows/lmaudit.t.o \
-	core/sys/windows/lmbrowsr.t.o core/sys/windows/lmchdev.t.o \
-	core/sys/windows/lmconfig.t.o core/sys/windows/lmcons.t.o \
-	core/sys/windows/lmerr.t.o core/sys/windows/lmerrlog.t.o \
-	core/sys/windows/lmmsg.t.o core/sys/windows/lmremutl.t.o \
-	core/sys/windows/lmrepl.t.o core/sys/windows/lmserver.t.o \
-	core/sys/windows/lmshare.t.o core/sys/windows/lmsname.t.o \
-	core/sys/windows/lmstats.t.o core/sys/windows/lmsvc.t.o \
-	core/sys/windows/lmuse.t.o core/sys/windows/lmuseflg.t.o \
-	core/sys/windows/lmwksta.t.o core/sys/windows/lzexpand.t.o \
-	core/sys/windows/mapi.t.o core/sys/windows/mciavi.t.o \
-	core/sys/windows/mcx.t.o core/sys/windows/mgmtapi.t.o \
-	core/sys/windows/mmsystem.t.o core/sys/windows/msacm.t.o \
-	core/sys/windows/mshtml.t.o core/sys/windows/mswsock.t.o \
-	core/sys/windows/nb30.t.o core/sys/windows/nddeapi.t.o \
-	core/sys/windows/nspapi.t.o core/sys/windows/ntdef.t.o \
-	core/sys/windows/ntdll.t.o core/sys/windows/ntldap.t.o \
-	core/sys/windows/ntsecapi.t.o core/sys/windows/ntsecpkg.t.o \
-	core/sys/windows/oaidl.t.o core/sys/windows/objbase.t.o \
-	core/sys/windows/objfwd.t.o core/sys/windows/objidl.t.o \
-	core/sys/windows/objsafe.t.o core/sys/windows/ocidl.t.o \
-	core/sys/windows/odbcinst.t.o core/sys/windows/ole.t.o \
-	core/sys/windows/ole2.t.o core/sys/windows/ole2ver.t.o \
-	core/sys/windows/oleacc.t.o core/sys/windows/oleauto.t.o \
-	core/sys/windows/olectl.t.o core/sys/windows/olectlid.t.o \
-	core/sys/windows/oledlg.t.o core/sys/windows/oleidl.t.o \
-	core/sys/windows/pbt.t.o core/sys/windows/powrprof.t.o \
-	core/sys/windows/prsht.t.o core/sys/windows/psapi.t.o \
-	core/sys/windows/rapi.t.o core/sys/windows/ras.t.o \
-	core/sys/windows/rasdlg.t.o core/sys/windows/raserror.t.o \
-	core/sys/windows/rassapi.t.o core/sys/windows/reason.t.o \
-	core/sys/windows/regstr.t.o core/sys/windows/richedit.t.o \
-	core/sys/windows/richole.t.o core/sys/windows/rpc.t.o \
-	core/sys/windows/rpcdce.t.o core/sys/windows/rpcdce2.t.o \
-	core/sys/windows/rpcdcep.t.o core/sys/windows/rpcndr.t.o \
-	core/sys/windows/rpcnsi.t.o core/sys/windows/rpcnsip.t.o \
-	core/sys/windows/rpcnterr.t.o core/sys/windows/schannel.t.o \
-	core/sys/windows/secext.t.o core/sys/windows/security.t.o \
-	core/sys/windows/servprov.t.o core/sys/windows/setupapi.t.o \
-	core/sys/windows/shellapi.t.o core/sys/windows/shldisp.t.o \
-	core/sys/windows/shlguid.t.o core/sys/windows/shlobj.t.o \
-	core/sys/windows/shlwapi.t.o core/sys/windows/snmp.t.o \
-	core/sys/windows/sql.t.o core/sys/windows/sqlext.t.o \
-	core/sys/windows/sqltypes.t.o core/sys/windows/sqlucode.t.o \
-	core/sys/windows/sspi.t.o core/sys/windows/stacktrace.t.o \
-	core/sys/windows/stat.t.o core/sys/windows/subauth.t.o \
-	core/sys/windows/threadaux.t.o core/sys/windows/tlhelp32.t.o \
-	core/sys/windows/tmschema.t.o core/sys/windows/unknwn.t.o \
-	core/sys/windows/uuid.t.o core/sys/windows/vfw.t.o \
-	core/sys/windows/w32api.t.o core/sys/windows/winbase.t.o \
-	core/sys/windows/winber.t.o core/sys/windows/wincon.t.o \
-	core/sys/windows/wincrypt.t.o core/sys/windows/windef.t.o \
-	core/sys/windows/windows.t.o core/sys/windows/winerror.t.o \
-	core/sys/windows/wingdi.t.o core/sys/windows/winhttp.t.o \
-	core/sys/windows/wininet.t.o core/sys/windows/winioctl.t.o \
-	core/sys/windows/winldap.t.o core/sys/windows/winnetwk.t.o \
-	core/sys/windows/winnls.t.o core/sys/windows/winnt.t.o \
-	core/sys/windows/winperf.t.o core/sys/windows/winreg.t.o \
-	core/sys/windows/winsock2.t.o core/sys/windows/winspool.t.o \
-	core/sys/windows/winsvc.t.o core/sys/windows/winuser.t.o \
-	core/sys/windows/winver.t.o core/sys/windows/wtsapi32.t.o \
-	core/sys/windows/wtypes.t.o
-@DRUNTIME_OS_MINGW_TRUE@am__DEPENDENCIES_52 = $(am__DEPENDENCIES_51)
-am__DEPENDENCIES_53 = core/sys/solaris/dlfcn.t.o \
-	core/sys/solaris/elf.t.o core/sys/solaris/execinfo.t.o \
-	core/sys/solaris/libelf.t.o core/sys/solaris/link.t.o \
-	core/sys/solaris/sys/elf.t.o core/sys/solaris/sys/elf_386.t.o \
-	core/sys/solaris/sys/elf_SPARC.t.o \
-	core/sys/solaris/sys/elf_amd64.t.o \
-	core/sys/solaris/sys/elf_notes.t.o \
-	core/sys/solaris/sys/elftypes.t.o \
-	core/sys/solaris/sys/link.t.o \
-	core/sys/solaris/sys/priocntl.t.o \
-	core/sys/solaris/sys/procset.t.o \
-	core/sys/solaris/sys/types.t.o core/sys/solaris/time.t.o
-@DRUNTIME_OS_SOLARIS_TRUE@am__DEPENDENCIES_54 =  \
-@DRUNTIME_OS_SOLARIS_TRUE@	$(am__DEPENDENCIES_53)
-am__DEPENDENCIES_55 = gcc/config.t.o gcc/libbacktrace.t.o
-am__DEPENDENCIES_56 = $(am__DEPENDENCIES_30) $(am__DEPENDENCIES_32) \
-	$(am__DEPENDENCIES_34) $(am__DEPENDENCIES_36) \
-	$(am__DEPENDENCIES_38) $(am__DEPENDENCIES_40) \
-	$(am__DEPENDENCIES_42) $(am__DEPENDENCIES_44) \
-	$(am__DEPENDENCIES_46) $(am__DEPENDENCIES_48) \
-	$(am__DEPENDENCIES_50) $(am__DEPENDENCIES_52) \
-	$(am__DEPENDENCIES_54) $(am__DEPENDENCIES_55)
-am__DEPENDENCIES_57 = $(am__DEPENDENCIES_56)
-unittest_static_DEPENDENCIES = $(am__DEPENDENCIES_57) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -1048,8 +477,7 @@  AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libgdruntime_la_SOURCES) $(libgdruntime_t_la_SOURCES) \
-	$(unittest_SOURCES) $(unittest_static_SOURCES)
+SOURCES = $(libgdruntime_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -1228,19 +656,6 @@  LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(GDC) $(AM_DFLAGS)
 
 
-# Override executable linking commands: We have to use GDC for linking
-# to make sure we link pthreads and other dependencies
-unittest_static_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_static_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_static_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-unittest_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-
 # Also override library link commands: This is not strictly
 # required, but we want to record additional dependencies such
 # as pthread in the library
@@ -1248,19 +663,10 @@  libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgdruntime_t_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgdruntime_t_la_LDFLAGS) $(LDFLAGS) -o $@
-
 libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgphobos_t_la_LINK = $(LIBTOOL) --tag=D \
-	$(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(libgphobos_t_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
 
 # Include D build rules
 
@@ -1298,9 +704,6 @@  ALL_DRUNTIME_COMPILE_DSOURCES = $(DRUNTIME_DSOURCES) $(am__append_1) \
 ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
 	$(DRUNTIME_SSOURCES)
 
-DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
-DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
-@ENABLE_SHARED_TRUE@check_LTLIBRARIES = libgdruntime_t.la
 toolexeclib_LTLIBRARIES = libgdruntime.la
 libgdruntime_la_SOURCES = $(ALL_DRUNTIME_SOURCES)
 libgdruntime_la_LIBTOOLFLAGS = 
@@ -1309,30 +712,6 @@  libgdruntime_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../src,-Bgcc \
 
 libgdruntime_la_LIBADD = $(LIBATOMIC) $(LIBBACKTRACE)
 libgdruntime_la_DEPENDENCIES = $(DRTSTUFF)
-
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(DRUNTIME_CSOURCES) \
-    $(DRUNTIME_SSOURCES)
-
-unittest_static_LIBTOOLFLAGS = 
-unittest_static_LDFLAGS = -Wc,-nophoboslib
-unittest_static_LDADD = $(DRUNTIME_TEST_OBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_unittest_static_DEPENDENCIES = $(DRUNTIME_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgdruntime_t_la_SOURCES = $(DRUNTIME_CSOURCES) $(DRUNTIME_SSOURCES)
-libgdruntime_t_la_LIBTOOLFLAGS = 
-# Automake by default does not generate shared libs for non-installed
-# libraries. Use -rpath to force shared lib generation.
-libgdruntime_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgdruntime_t_la_LIBADD = $(DRUNTIME_TEST_LOBJECTS) $(LIBATOMIC) $(LIBBACKTRACE)
-EXTRA_libgdruntime_t_la_DEPENDENCIES = $(DRUNTIME_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS = 
-unittest_LDFLAGS = -Wc,-nophoboslib
-unittest_LDADD = libgdruntime_t.la
 DRUNTIME_DSOURCES_GENERATED = gcc/config.d gcc/libbacktrace.d
 # Source file definitions. Boring stuff, auto-generated with
 # https://gist.github.com/jpf91/8ad1dbc9902d6ad876313f134c6527d1
@@ -1600,17 +979,6 @@  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-clean-checkLTLIBRARIES:
-	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
-	@list='$(check_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
 install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
@@ -2261,33 +1629,8 @@  gcc/libbacktrace.lo: gcc/$(am__dirstamp)
 libgdruntime.la: $(libgdruntime_la_OBJECTS) $(libgdruntime_la_DEPENDENCIES) $(EXTRA_libgdruntime_la_DEPENDENCIES) 
 	$(AM_V_GEN)$(libgdruntime_la_LINK) -rpath $(toolexeclibdir) $(libgdruntime_la_OBJECTS) $(libgdruntime_la_LIBADD) $(LIBS)
 
-libgdruntime_t.la: $(libgdruntime_t_la_OBJECTS) $(libgdruntime_t_la_DEPENDENCIES) $(EXTRA_libgdruntime_t_la_DEPENDENCIES) 
-	$(AM_V_GEN)$(libgdruntime_t_la_LINK) $(am_libgdruntime_t_la_rpath) $(libgdruntime_t_la_OBJECTS) $(libgdruntime_t_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-../testsuite/$(am__dirstamp):
-	@$(MKDIR_P) ../testsuite
-	@: > ../testsuite/$(am__dirstamp)
-../testsuite/test_runner.$(OBJEXT): ../testsuite/$(am__dirstamp)
-
-unittest$(EXEEXT): $(unittest_OBJECTS) $(unittest_DEPENDENCIES) $(EXTRA_unittest_DEPENDENCIES) 
-	@rm -f unittest$(EXEEXT)
-	$(AM_V_GEN)$(unittest_LINK) $(unittest_OBJECTS) $(unittest_LDADD) $(LIBS)
-
-unittest_static$(EXEEXT): $(unittest_static_OBJECTS) $(unittest_static_DEPENDENCIES) $(EXTRA_unittest_static_DEPENDENCIES) 
-	@rm -f unittest_static$(EXEEXT)
-	$(AM_V_GEN)$(unittest_static_LINK) $(unittest_static_OBJECTS) $(unittest_static_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../testsuite/*.$(OBJEXT)
 	-rm -f core/*.$(OBJEXT)
 	-rm -f core/*.lo
 	-rm -f core/internal/*.$(OBJEXT)
@@ -2384,15 +1727,6 @@  distclean-compile:
 libgdruntime_la-threadasm.lo: core/threadasm.S
 	$(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o libgdruntime_la-threadasm.lo `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S
 
-libgdruntime_t_la-threadasm.lo: core/threadasm.S
-	$(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(libgdruntime_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o libgdruntime_t_la-threadasm.lo `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S
-
-threadasm.o: core/threadasm.S
-	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o threadasm.o `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S
-
-threadasm.obj: core/threadasm.S
-	$(AM_V_CPPAS)$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o threadasm.obj `if test -f 'core/threadasm.S'; then $(CYGPATH_W) 'core/threadasm.S'; else $(CYGPATH_W) '$(srcdir)/core/threadasm.S'; fi`
-
 .c.o:
 	$(AM_V_CC)$(COMPILE) -c -o $@ $<
 
@@ -2408,24 +1742,6 @@  libgdruntime_la-errno_.lo: core/stdc/errno_.c
 libgdruntime_la-bss_section.lo: rt/bss_section.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_la-bss_section.lo `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c
 
-libgdruntime_t_la-errno_.lo: core/stdc/errno_.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_t_la-errno_.lo `test -f 'core/stdc/errno_.c' || echo '$(srcdir)/'`core/stdc/errno_.c
-
-libgdruntime_t_la-bss_section.lo: rt/bss_section.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_t_la-bss_section.lo `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c
-
-errno_.o: core/stdc/errno_.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno_.o `test -f 'core/stdc/errno_.c' || echo '$(srcdir)/'`core/stdc/errno_.c
-
-errno_.obj: core/stdc/errno_.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno_.obj `if test -f 'core/stdc/errno_.c'; then $(CYGPATH_W) 'core/stdc/errno_.c'; else $(CYGPATH_W) '$(srcdir)/core/stdc/errno_.c'; fi`
-
-bss_section.o: rt/bss_section.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bss_section.o `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c
-
-bss_section.obj: rt/bss_section.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bss_section.obj `if test -f 'rt/bss_section.c'; then $(CYGPATH_W) 'rt/bss_section.c'; else $(CYGPATH_W) '$(srcdir)/rt/bss_section.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -2545,7 +1861,6 @@  cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
@@ -2578,7 +1893,6 @@  clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../testsuite/$(am__dirstamp)
 	-rm -f core/$(am__dirstamp)
 	-rm -f core/internal/$(am__dirstamp)
 	-rm -f core/stdc/$(am__dirstamp)
@@ -2625,8 +1939,7 @@  maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -2695,23 +2008,22 @@  ps-am:
 uninstall-am: uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-toolexeclibDATA install-toolexeclibLTLIBRARIES \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-toolexeclibDATA \
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-toolexeclibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-toolexeclibDATA \
+	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
 .PRECIOUS: Makefile
@@ -2725,30 +2037,12 @@  uninstall-am: uninstall-toolexeclibDATA \
 .d.lo:
 	$(LTDCOMPILE) $(GDCFLAGS) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
 
-# Unittest rules. Unfortunately we can't use _DFLAGS in automake without
-# explicit D support, so use this hack.
-# Compile D sources with libtool and test flags
-%.t.lo : %.d
-	$(LTDCOMPILE) $(GDCFLAGSX) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
-
-# Compile objects for static linking with test flags
-# Automake breaks empty rules, so use the shell NOP :
-%.t.o : %.t.lo
-	@:
-
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@gcc/drtbegin.o: gcc/drtstuff.c
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@	$(COMPILE) -DDRT_BEGIN -c -o $@ $<
 
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@gcc/drtend.o: gcc/drtstuff.c
 @DRUNTIME_OS_MINFO_BRACKETING_FALSE@	$(COMPILE) -DDRT_END -c -o $@ $<
 
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(DRUNTIME_TEST_LOBJECTS)
-	rm -f $(DRUNTIME_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am
index c5d8a31d90d..ee595fa4542 100644
--- a/libphobos/src/Makefile.am
+++ b/libphobos/src/Makefile.am
@@ -35,8 +35,6 @@  ALL_PHOBOS_INSTALL_DSOURCES = $(PHOBOS_DSOURCES)
 ALL_PHOBOS_COMPILE_DSOURCES = $(PHOBOS_DSOURCES)
 
 ALL_PHOBOS_SOURCES = $(ALL_PHOBOS_COMPILE_DSOURCES)
-PHOBOS_TEST_LOBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.lo)
-PHOBOS_TEST_OBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.o)
 
 # Main library build definitions
 if DRUNTIME_ZLIB_SYSTEM
@@ -44,14 +42,6 @@  if DRUNTIME_ZLIB_SYSTEM
 else
     ZLIB_SRC = $(ZLIB_CSOURCES)
 endif
-check_PROGRAMS =
-if ENABLE_SHARED
-    check_LTLIBRARIES = libgphobos_t.la
-    check_PROGRAMS += unittest
-endif
-if ENABLE_STATIC
-    check_PROGRAMS += unittest_static
-endif
 
 toolexeclib_DATA = libgphobos.spec
 toolexeclib_LTLIBRARIES = libgphobos.la
@@ -62,35 +52,6 @@  libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
 libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la
 libgphobos_la_DEPENDENCIES = libgphobos.spec
 
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(ZLIB_SRC)
-unittest_static_LIBTOOLFLAGS =
-unittest_static_LDFLAGS = -Wc,-nophoboslib -static-libtool-libs
-unittest_static_LDADD = $(PHOBOS_TEST_OBJECTS) \
-    ../libdruntime/libgdruntime.la
-EXTRA_unittest_static_DEPENDENCIES = $(PHOBOS_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgphobos_t_la_SOURCES = $(ZLIB_SRC)
-libgphobos_t_la_LIBTOOLFLAGS =
-libgphobos_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgphobos_t_la_LIBADD = $(PHOBOS_TEST_LOBJECTS) \
-    ../libdruntime/libgdruntime.la
-EXTRA_libgphobos_t_la_DEPENDENCIES = $(PHOBOS_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS =
-unittest_LDFLAGS = -Wc,-nophoboslib -shared
-unittest_LDADD = libgphobos_t.la ../libdruntime/libgdruntime.la
-
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(PHOBOS_TEST_LOBJECTS)
-	rm -f $(PHOBOS_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in
index 1f8889fe90c..776db981f16 100644
--- a/libphobos/src/Makefile.in
+++ b/libphobos/src/Makefile.in
@@ -90,9 +90,6 @@  POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
-@ENABLE_SHARED_TRUE@am__append_1 = unittest
-@ENABLE_STATIC_TRUE@am__append_2 = unittest_static
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -230,193 +227,6 @@  am__objects_4 = libgphobos_la-adler32.lo libgphobos_la-compress.lo \
 @DRUNTIME_ZLIB_SYSTEM_FALSE@am__objects_5 = $(am__objects_4)
 am_libgphobos_la_OBJECTS = $(am__objects_3) $(am__objects_5)
 libgphobos_la_OBJECTS = $(am_libgphobos_la_OBJECTS)
-am__DEPENDENCIES_1 = etc/c/curl.t.lo etc/c/sqlite3.t.lo \
-	etc/c/zlib.t.lo std/algorithm/comparison.t.lo \
-	std/algorithm/internal.t.lo std/algorithm/iteration.t.lo \
-	std/algorithm/mutation.t.lo std/algorithm/package.t.lo \
-	std/algorithm/searching.t.lo std/algorithm/setops.t.lo \
-	std/algorithm/sorting.t.lo std/array.t.lo std/ascii.t.lo \
-	std/base64.t.lo std/bigint.t.lo std/bitmanip.t.lo \
-	std/compiler.t.lo std/complex.t.lo std/concurrency.t.lo \
-	std/container/array.t.lo std/container/binaryheap.t.lo \
-	std/container/dlist.t.lo std/container/package.t.lo \
-	std/container/rbtree.t.lo std/container/slist.t.lo \
-	std/container/util.t.lo std/conv.t.lo std/csv.t.lo \
-	std/datetime/date.t.lo std/datetime/interval.t.lo \
-	std/datetime/package.t.lo std/datetime/stopwatch.t.lo \
-	std/datetime/systime.t.lo std/datetime/timezone.t.lo \
-	std/demangle.t.lo std/digest/crc.t.lo std/digest/digest.t.lo \
-	std/digest/hmac.t.lo std/digest/md.t.lo \
-	std/digest/murmurhash.t.lo std/digest/package.t.lo \
-	std/digest/ripemd.t.lo std/digest/sha.t.lo std/encoding.t.lo \
-	std/exception.t.lo \
-	std/experimental/allocator/building_blocks/affix_allocator.t.lo \
-	std/experimental/allocator/building_blocks/allocator_list.t.lo \
-	std/experimental/allocator/building_blocks/bitmapped_block.t.lo \
-	std/experimental/allocator/building_blocks/bucketizer.t.lo \
-	std/experimental/allocator/building_blocks/fallback_allocator.t.lo \
-	std/experimental/allocator/building_blocks/free_list.t.lo \
-	std/experimental/allocator/building_blocks/free_tree.t.lo \
-	std/experimental/allocator/building_blocks/kernighan_ritchie.t.lo \
-	std/experimental/allocator/building_blocks/null_allocator.t.lo \
-	std/experimental/allocator/building_blocks/package.t.lo \
-	std/experimental/allocator/building_blocks/quantizer.t.lo \
-	std/experimental/allocator/building_blocks/region.t.lo \
-	std/experimental/allocator/building_blocks/scoped_allocator.t.lo \
-	std/experimental/allocator/building_blocks/segregator.t.lo \
-	std/experimental/allocator/building_blocks/stats_collector.t.lo \
-	std/experimental/allocator/common.t.lo \
-	std/experimental/allocator/gc_allocator.t.lo \
-	std/experimental/allocator/mallocator.t.lo \
-	std/experimental/allocator/mmap_allocator.t.lo \
-	std/experimental/allocator/package.t.lo \
-	std/experimental/allocator/showcase.t.lo \
-	std/experimental/allocator/typed.t.lo \
-	std/experimental/checkedint.t.lo \
-	std/experimental/logger/core.t.lo \
-	std/experimental/logger/filelogger.t.lo \
-	std/experimental/logger/multilogger.t.lo \
-	std/experimental/logger/nulllogger.t.lo \
-	std/experimental/logger/package.t.lo \
-	std/experimental/typecons.t.lo std/file.t.lo std/format.t.lo \
-	std/functional.t.lo std/getopt.t.lo std/internal/cstring.t.lo \
-	std/internal/math/biguintcore.t.lo \
-	std/internal/math/biguintnoasm.t.lo \
-	std/internal/math/errorfunction.t.lo \
-	std/internal/math/gammafunction.t.lo \
-	std/internal/scopebuffer.t.lo \
-	std/internal/test/dummyrange.t.lo std/internal/test/range.t.lo \
-	std/internal/test/uda.t.lo std/internal/unicode_comp.t.lo \
-	std/internal/unicode_decomp.t.lo \
-	std/internal/unicode_grapheme.t.lo \
-	std/internal/unicode_norm.t.lo \
-	std/internal/unicode_tables.t.lo \
-	std/internal/windows/advapi32.t.lo std/json.t.lo std/math.t.lo \
-	std/mathspecial.t.lo std/meta.t.lo std/mmfile.t.lo \
-	std/net/curl.t.lo std/net/isemail.t.lo std/numeric.t.lo \
-	std/outbuffer.t.lo std/parallelism.t.lo std/path.t.lo \
-	std/process.t.lo std/random.t.lo std/range/interfaces.t.lo \
-	std/range/package.t.lo std/range/primitives.t.lo \
-	std/regex/internal/backtracking.t.lo \
-	std/regex/internal/generator.t.lo std/regex/internal/ir.t.lo \
-	std/regex/internal/kickstart.t.lo \
-	std/regex/internal/parser.t.lo std/regex/internal/tests.t.lo \
-	std/regex/internal/thompson.t.lo std/regex/package.t.lo \
-	std/signals.t.lo std/socket.t.lo std/stdint.t.lo \
-	std/stdio.t.lo std/string.t.lo std/system.t.lo std/traits.t.lo \
-	std/typecons.t.lo std/typetuple.t.lo std/uni.t.lo std/uri.t.lo \
-	std/utf.t.lo std/uuid.t.lo std/variant.t.lo \
-	std/windows/charset.t.lo std/windows/registry.t.lo \
-	std/windows/syserror.t.lo std/xml.t.lo std/zip.t.lo \
-	std/zlib.t.lo
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
-libgphobos_t_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
-	../libdruntime/libgdruntime.la
-am__objects_6 = libgphobos_t_la-adler32.lo libgphobos_t_la-compress.lo \
-	libgphobos_t_la-crc32.lo libgphobos_t_la-deflate.lo \
-	libgphobos_t_la-gzclose.lo libgphobos_t_la-gzlib.lo \
-	libgphobos_t_la-gzread.lo libgphobos_t_la-gzwrite.lo \
-	libgphobos_t_la-infback.lo libgphobos_t_la-inffast.lo \
-	libgphobos_t_la-inflate.lo libgphobos_t_la-inftrees.lo \
-	libgphobos_t_la-trees.lo libgphobos_t_la-uncompr.lo \
-	libgphobos_t_la-zutil.lo
-@DRUNTIME_ZLIB_SYSTEM_FALSE@am__objects_7 = $(am__objects_6)
-am_libgphobos_t_la_OBJECTS = $(am__objects_7)
-libgphobos_t_la_OBJECTS = $(am_libgphobos_t_la_OBJECTS)
-@ENABLE_SHARED_TRUE@am_libgphobos_t_la_rpath =
-@ENABLE_SHARED_TRUE@am__EXEEXT_1 = unittest$(EXEEXT)
-@ENABLE_STATIC_TRUE@am__EXEEXT_2 = unittest_static$(EXEEXT)
-am_unittest_OBJECTS = ../testsuite/test_runner.$(OBJEXT)
-unittest_OBJECTS = $(am_unittest_OBJECTS)
-unittest_DEPENDENCIES = libgphobos_t.la ../libdruntime/libgdruntime.la
-am__objects_8 = adler32.$(OBJEXT) compress.$(OBJEXT) crc32.$(OBJEXT) \
-	deflate.$(OBJEXT) gzclose.$(OBJEXT) gzlib.$(OBJEXT) \
-	gzread.$(OBJEXT) gzwrite.$(OBJEXT) infback.$(OBJEXT) \
-	inffast.$(OBJEXT) inflate.$(OBJEXT) inftrees.$(OBJEXT) \
-	trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT)
-@DRUNTIME_ZLIB_SYSTEM_FALSE@am__objects_9 = $(am__objects_8)
-am_unittest_static_OBJECTS = ../testsuite/test_runner.$(OBJEXT) \
-	$(am__objects_9)
-unittest_static_OBJECTS = $(am_unittest_static_OBJECTS)
-am__DEPENDENCIES_4 = etc/c/curl.t.o etc/c/sqlite3.t.o etc/c/zlib.t.o \
-	std/algorithm/comparison.t.o std/algorithm/internal.t.o \
-	std/algorithm/iteration.t.o std/algorithm/mutation.t.o \
-	std/algorithm/package.t.o std/algorithm/searching.t.o \
-	std/algorithm/setops.t.o std/algorithm/sorting.t.o \
-	std/array.t.o std/ascii.t.o std/base64.t.o std/bigint.t.o \
-	std/bitmanip.t.o std/compiler.t.o std/complex.t.o \
-	std/concurrency.t.o std/container/array.t.o \
-	std/container/binaryheap.t.o std/container/dlist.t.o \
-	std/container/package.t.o std/container/rbtree.t.o \
-	std/container/slist.t.o std/container/util.t.o std/conv.t.o \
-	std/csv.t.o std/datetime/date.t.o std/datetime/interval.t.o \
-	std/datetime/package.t.o std/datetime/stopwatch.t.o \
-	std/datetime/systime.t.o std/datetime/timezone.t.o \
-	std/demangle.t.o std/digest/crc.t.o std/digest/digest.t.o \
-	std/digest/hmac.t.o std/digest/md.t.o \
-	std/digest/murmurhash.t.o std/digest/package.t.o \
-	std/digest/ripemd.t.o std/digest/sha.t.o std/encoding.t.o \
-	std/exception.t.o \
-	std/experimental/allocator/building_blocks/affix_allocator.t.o \
-	std/experimental/allocator/building_blocks/allocator_list.t.o \
-	std/experimental/allocator/building_blocks/bitmapped_block.t.o \
-	std/experimental/allocator/building_blocks/bucketizer.t.o \
-	std/experimental/allocator/building_blocks/fallback_allocator.t.o \
-	std/experimental/allocator/building_blocks/free_list.t.o \
-	std/experimental/allocator/building_blocks/free_tree.t.o \
-	std/experimental/allocator/building_blocks/kernighan_ritchie.t.o \
-	std/experimental/allocator/building_blocks/null_allocator.t.o \
-	std/experimental/allocator/building_blocks/package.t.o \
-	std/experimental/allocator/building_blocks/quantizer.t.o \
-	std/experimental/allocator/building_blocks/region.t.o \
-	std/experimental/allocator/building_blocks/scoped_allocator.t.o \
-	std/experimental/allocator/building_blocks/segregator.t.o \
-	std/experimental/allocator/building_blocks/stats_collector.t.o \
-	std/experimental/allocator/common.t.o \
-	std/experimental/allocator/gc_allocator.t.o \
-	std/experimental/allocator/mallocator.t.o \
-	std/experimental/allocator/mmap_allocator.t.o \
-	std/experimental/allocator/package.t.o \
-	std/experimental/allocator/showcase.t.o \
-	std/experimental/allocator/typed.t.o \
-	std/experimental/checkedint.t.o \
-	std/experimental/logger/core.t.o \
-	std/experimental/logger/filelogger.t.o \
-	std/experimental/logger/multilogger.t.o \
-	std/experimental/logger/nulllogger.t.o \
-	std/experimental/logger/package.t.o \
-	std/experimental/typecons.t.o std/file.t.o std/format.t.o \
-	std/functional.t.o std/getopt.t.o std/internal/cstring.t.o \
-	std/internal/math/biguintcore.t.o \
-	std/internal/math/biguintnoasm.t.o \
-	std/internal/math/errorfunction.t.o \
-	std/internal/math/gammafunction.t.o \
-	std/internal/scopebuffer.t.o std/internal/test/dummyrange.t.o \
-	std/internal/test/range.t.o std/internal/test/uda.t.o \
-	std/internal/unicode_comp.t.o std/internal/unicode_decomp.t.o \
-	std/internal/unicode_grapheme.t.o \
-	std/internal/unicode_norm.t.o std/internal/unicode_tables.t.o \
-	std/internal/windows/advapi32.t.o std/json.t.o std/math.t.o \
-	std/mathspecial.t.o std/meta.t.o std/mmfile.t.o \
-	std/net/curl.t.o std/net/isemail.t.o std/numeric.t.o \
-	std/outbuffer.t.o std/parallelism.t.o std/path.t.o \
-	std/process.t.o std/random.t.o std/range/interfaces.t.o \
-	std/range/package.t.o std/range/primitives.t.o \
-	std/regex/internal/backtracking.t.o \
-	std/regex/internal/generator.t.o std/regex/internal/ir.t.o \
-	std/regex/internal/kickstart.t.o std/regex/internal/parser.t.o \
-	std/regex/internal/tests.t.o std/regex/internal/thompson.t.o \
-	std/regex/package.t.o std/signals.t.o std/socket.t.o \
-	std/stdint.t.o std/stdio.t.o std/string.t.o std/system.t.o \
-	std/traits.t.o std/typecons.t.o std/typetuple.t.o std/uni.t.o \
-	std/uri.t.o std/utf.t.o std/uuid.t.o std/variant.t.o \
-	std/windows/charset.t.o std/windows/registry.t.o \
-	std/windows/syserror.t.o std/xml.t.o std/zip.t.o std/zlib.t.o
-am__DEPENDENCIES_5 = $(am__DEPENDENCIES_4)
-am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5)
-unittest_static_DEPENDENCIES = $(am__DEPENDENCIES_6) \
-	../libdruntime/libgdruntime.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -453,8 +263,7 @@  AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libgphobos_la_SOURCES) $(libgphobos_t_la_SOURCES) \
-	$(unittest_SOURCES) $(unittest_static_SOURCES)
+SOURCES = $(libgphobos_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -633,19 +442,6 @@  LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(GDC) $(AM_DFLAGS)
 
 
-# Override executable linking commands: We have to use GDC for linking
-# to make sure we link pthreads and other dependencies
-unittest_static_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_static_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_static_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-unittest_LINK = $(LIBTOOL) --tag=D \
-	$(unittest_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
-
 # Also override library link commands: This is not strictly
 # required, but we want to record additional dependencies such
 # as pthread in the library
@@ -653,19 +449,10 @@  libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgdruntime_t_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgdruntime_t_la_LDFLAGS) $(LDFLAGS) -o $@
-
 libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \
 	$(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@
 
-libgphobos_t_la_LINK = $(LIBTOOL) --tag=D \
-	$(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(GDC) $(AM_CFLAGS) $(CFLAGS) $(libgphobos_t_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-
 
 # Include D build rules
 
@@ -686,13 +473,10 @@  ALL_PHOBOS_INSTALL_DSOURCES = $(PHOBOS_DSOURCES)
 # Setup source files depending on configure
 ALL_PHOBOS_COMPILE_DSOURCES = $(PHOBOS_DSOURCES)
 ALL_PHOBOS_SOURCES = $(ALL_PHOBOS_COMPILE_DSOURCES)
-PHOBOS_TEST_LOBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.lo)
-PHOBOS_TEST_OBJECTS = $(ALL_PHOBOS_COMPILE_DSOURCES:.d=.t.o)
 @DRUNTIME_ZLIB_SYSTEM_FALSE@ZLIB_SRC = $(ZLIB_CSOURCES)
 
 # Main library build definitions
 @DRUNTIME_ZLIB_SYSTEM_TRUE@ZLIB_SRC = 
-@ENABLE_SHARED_TRUE@check_LTLIBRARIES = libgphobos_t.la
 toolexeclib_DATA = libgphobos.spec
 toolexeclib_LTLIBRARIES = libgphobos.la
 libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) $(ZLIB_SRC)
@@ -703,30 +487,6 @@  libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
 libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la
 libgphobos_la_DEPENDENCIES = libgphobos.spec
 
-# For static unittest, link objects directly
-unittest_static_SOURCES = ../testsuite/test_runner.d $(ZLIB_SRC)
-unittest_static_LIBTOOLFLAGS = 
-unittest_static_LDFLAGS = -Wc,-nophoboslib -static-libtool-libs
-unittest_static_LDADD = $(PHOBOS_TEST_OBJECTS) \
-    ../libdruntime/libgdruntime.la
-
-EXTRA_unittest_static_DEPENDENCIES = $(PHOBOS_TEST_OBJECTS)
-
-# For unittest with dynamic library
-libgphobos_t_la_SOURCES = $(ZLIB_SRC)
-libgphobos_t_la_LIBTOOLFLAGS = 
-libgphobos_t_la_LDFLAGS = -Wc,-nophoboslib -rpath /foo -shared
-libgphobos_t_la_LIBADD = $(PHOBOS_TEST_LOBJECTS) \
-    ../libdruntime/libgdruntime.la
-
-EXTRA_libgphobos_t_la_DEPENDENCIES = $(PHOBOS_TEST_LOBJECTS)
-
-# For unittest
-unittest_SOURCES = ../testsuite/test_runner.d
-unittest_LIBTOOLFLAGS = 
-unittest_LDFLAGS = -Wc,-nophoboslib -shared
-unittest_LDADD = libgphobos_t.la ../libdruntime/libgdruntime.la
-
 # Zlib sources when not using system libz
 ZLIB_CSOURCES = $(top_srcdir)/../zlib/adler32.c $(top_srcdir)/../zlib/compress.c \
 	$(top_srcdir)/../zlib/crc32.c $(top_srcdir)/../zlib/deflate.c \
@@ -842,17 +602,6 @@  $(am__aclocal_m4_deps):
 libgphobos.spec: $(top_builddir)/config.status $(srcdir)/libgphobos.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
-clean-checkLTLIBRARIES:
-	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
-	@list='$(check_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
 install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
@@ -1114,33 +863,8 @@  std/zlib.lo: std/$(am__dirstamp)
 libgphobos.la: $(libgphobos_la_OBJECTS) $(libgphobos_la_DEPENDENCIES) $(EXTRA_libgphobos_la_DEPENDENCIES) 
 	$(AM_V_GEN)$(libgphobos_la_LINK) -rpath $(toolexeclibdir) $(libgphobos_la_OBJECTS) $(libgphobos_la_LIBADD) $(LIBS)
 
-libgphobos_t.la: $(libgphobos_t_la_OBJECTS) $(libgphobos_t_la_DEPENDENCIES) $(EXTRA_libgphobos_t_la_DEPENDENCIES) 
-	$(AM_V_GEN)$(libgphobos_t_la_LINK) $(am_libgphobos_t_la_rpath) $(libgphobos_t_la_OBJECTS) $(libgphobos_t_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-../testsuite/$(am__dirstamp):
-	@$(MKDIR_P) ../testsuite
-	@: > ../testsuite/$(am__dirstamp)
-../testsuite/test_runner.$(OBJEXT): ../testsuite/$(am__dirstamp)
-
-unittest$(EXEEXT): $(unittest_OBJECTS) $(unittest_DEPENDENCIES) $(EXTRA_unittest_DEPENDENCIES) 
-	@rm -f unittest$(EXEEXT)
-	$(AM_V_GEN)$(unittest_LINK) $(unittest_OBJECTS) $(unittest_LDADD) $(LIBS)
-
-unittest_static$(EXEEXT): $(unittest_static_OBJECTS) $(unittest_static_DEPENDENCIES) $(EXTRA_unittest_static_DEPENDENCIES) 
-	@rm -f unittest_static$(EXEEXT)
-	$(AM_V_GEN)$(unittest_static_LINK) $(unittest_static_OBJECTS) $(unittest_static_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f ../testsuite/*.$(OBJEXT)
 	-rm -f etc/c/*.$(OBJEXT)
 	-rm -f etc/c/*.lo
 	-rm -f std/*.$(OBJEXT)
@@ -1237,141 +961,6 @@  libgphobos_la-uncompr.lo: $(top_srcdir)/../zlib/uncompr.c
 libgphobos_la-zutil.lo: $(top_srcdir)/../zlib/zutil.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-zutil.lo `test -f '$(top_srcdir)/../zlib/zutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/zutil.c
 
-libgphobos_t_la-adler32.lo: $(top_srcdir)/../zlib/adler32.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-adler32.lo `test -f '$(top_srcdir)/../zlib/adler32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/adler32.c
-
-libgphobos_t_la-compress.lo: $(top_srcdir)/../zlib/compress.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-compress.lo `test -f '$(top_srcdir)/../zlib/compress.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/compress.c
-
-libgphobos_t_la-crc32.lo: $(top_srcdir)/../zlib/crc32.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-crc32.lo `test -f '$(top_srcdir)/../zlib/crc32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/crc32.c
-
-libgphobos_t_la-deflate.lo: $(top_srcdir)/../zlib/deflate.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-deflate.lo `test -f '$(top_srcdir)/../zlib/deflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/deflate.c
-
-libgphobos_t_la-gzclose.lo: $(top_srcdir)/../zlib/gzclose.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzclose.lo `test -f '$(top_srcdir)/../zlib/gzclose.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzclose.c
-
-libgphobos_t_la-gzlib.lo: $(top_srcdir)/../zlib/gzlib.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzlib.lo `test -f '$(top_srcdir)/../zlib/gzlib.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzlib.c
-
-libgphobos_t_la-gzread.lo: $(top_srcdir)/../zlib/gzread.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzread.lo `test -f '$(top_srcdir)/../zlib/gzread.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzread.c
-
-libgphobos_t_la-gzwrite.lo: $(top_srcdir)/../zlib/gzwrite.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-gzwrite.lo `test -f '$(top_srcdir)/../zlib/gzwrite.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzwrite.c
-
-libgphobos_t_la-infback.lo: $(top_srcdir)/../zlib/infback.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-infback.lo `test -f '$(top_srcdir)/../zlib/infback.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/infback.c
-
-libgphobos_t_la-inffast.lo: $(top_srcdir)/../zlib/inffast.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-inffast.lo `test -f '$(top_srcdir)/../zlib/inffast.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inffast.c
-
-libgphobos_t_la-inflate.lo: $(top_srcdir)/../zlib/inflate.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-inflate.lo `test -f '$(top_srcdir)/../zlib/inflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inflate.c
-
-libgphobos_t_la-inftrees.lo: $(top_srcdir)/../zlib/inftrees.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-inftrees.lo `test -f '$(top_srcdir)/../zlib/inftrees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inftrees.c
-
-libgphobos_t_la-trees.lo: $(top_srcdir)/../zlib/trees.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-trees.lo `test -f '$(top_srcdir)/../zlib/trees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/trees.c
-
-libgphobos_t_la-uncompr.lo: $(top_srcdir)/../zlib/uncompr.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-uncompr.lo `test -f '$(top_srcdir)/../zlib/uncompr.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/uncompr.c
-
-libgphobos_t_la-zutil.lo: $(top_srcdir)/../zlib/zutil.c
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_t_la-zutil.lo `test -f '$(top_srcdir)/../zlib/zutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/zutil.c
-
-adler32.o: $(top_srcdir)/../zlib/adler32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.o `test -f '$(top_srcdir)/../zlib/adler32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/adler32.c
-
-adler32.obj: $(top_srcdir)/../zlib/adler32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.obj `if test -f '$(top_srcdir)/../zlib/adler32.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/adler32.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/adler32.c'; fi`
-
-compress.o: $(top_srcdir)/../zlib/compress.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compress.o `test -f '$(top_srcdir)/../zlib/compress.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/compress.c
-
-compress.obj: $(top_srcdir)/../zlib/compress.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compress.obj `if test -f '$(top_srcdir)/../zlib/compress.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/compress.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/compress.c'; fi`
-
-crc32.o: $(top_srcdir)/../zlib/crc32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crc32.o `test -f '$(top_srcdir)/../zlib/crc32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/crc32.c
-
-crc32.obj: $(top_srcdir)/../zlib/crc32.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crc32.obj `if test -f '$(top_srcdir)/../zlib/crc32.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/crc32.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/crc32.c'; fi`
-
-deflate.o: $(top_srcdir)/../zlib/deflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.o `test -f '$(top_srcdir)/../zlib/deflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/deflate.c
-
-deflate.obj: $(top_srcdir)/../zlib/deflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.obj `if test -f '$(top_srcdir)/../zlib/deflate.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/deflate.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/deflate.c'; fi`
-
-gzclose.o: $(top_srcdir)/../zlib/gzclose.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzclose.o `test -f '$(top_srcdir)/../zlib/gzclose.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzclose.c
-
-gzclose.obj: $(top_srcdir)/../zlib/gzclose.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzclose.obj `if test -f '$(top_srcdir)/../zlib/gzclose.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzclose.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzclose.c'; fi`
-
-gzlib.o: $(top_srcdir)/../zlib/gzlib.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzlib.o `test -f '$(top_srcdir)/../zlib/gzlib.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzlib.c
-
-gzlib.obj: $(top_srcdir)/../zlib/gzlib.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzlib.obj `if test -f '$(top_srcdir)/../zlib/gzlib.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzlib.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzlib.c'; fi`
-
-gzread.o: $(top_srcdir)/../zlib/gzread.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzread.o `test -f '$(top_srcdir)/../zlib/gzread.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzread.c
-
-gzread.obj: $(top_srcdir)/../zlib/gzread.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzread.obj `if test -f '$(top_srcdir)/../zlib/gzread.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzread.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzread.c'; fi`
-
-gzwrite.o: $(top_srcdir)/../zlib/gzwrite.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzwrite.o `test -f '$(top_srcdir)/../zlib/gzwrite.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzwrite.c
-
-gzwrite.obj: $(top_srcdir)/../zlib/gzwrite.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzwrite.obj `if test -f '$(top_srcdir)/../zlib/gzwrite.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/gzwrite.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/gzwrite.c'; fi`
-
-infback.o: $(top_srcdir)/../zlib/infback.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infback.o `test -f '$(top_srcdir)/../zlib/infback.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/infback.c
-
-infback.obj: $(top_srcdir)/../zlib/infback.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infback.obj `if test -f '$(top_srcdir)/../zlib/infback.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/infback.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/infback.c'; fi`
-
-inffast.o: $(top_srcdir)/../zlib/inffast.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inffast.o `test -f '$(top_srcdir)/../zlib/inffast.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inffast.c
-
-inffast.obj: $(top_srcdir)/../zlib/inffast.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inffast.obj `if test -f '$(top_srcdir)/../zlib/inffast.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/inffast.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/inffast.c'; fi`
-
-inflate.o: $(top_srcdir)/../zlib/inflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inflate.o `test -f '$(top_srcdir)/../zlib/inflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inflate.c
-
-inflate.obj: $(top_srcdir)/../zlib/inflate.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inflate.obj `if test -f '$(top_srcdir)/../zlib/inflate.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/inflate.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/inflate.c'; fi`
-
-inftrees.o: $(top_srcdir)/../zlib/inftrees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inftrees.o `test -f '$(top_srcdir)/../zlib/inftrees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inftrees.c
-
-inftrees.obj: $(top_srcdir)/../zlib/inftrees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inftrees.obj `if test -f '$(top_srcdir)/../zlib/inftrees.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/inftrees.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/inftrees.c'; fi`
-
-trees.o: $(top_srcdir)/../zlib/trees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trees.o `test -f '$(top_srcdir)/../zlib/trees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/trees.c
-
-trees.obj: $(top_srcdir)/../zlib/trees.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trees.obj `if test -f '$(top_srcdir)/../zlib/trees.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/trees.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/trees.c'; fi`
-
-uncompr.o: $(top_srcdir)/../zlib/uncompr.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uncompr.o `test -f '$(top_srcdir)/../zlib/uncompr.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/uncompr.c
-
-uncompr.obj: $(top_srcdir)/../zlib/uncompr.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uncompr.obj `if test -f '$(top_srcdir)/../zlib/uncompr.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/uncompr.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/uncompr.c'; fi`
-
-zutil.o: $(top_srcdir)/../zlib/zutil.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zutil.o `test -f '$(top_srcdir)/../zlib/zutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/zutil.c
-
-zutil.obj: $(top_srcdir)/../zlib/zutil.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zutil.obj `if test -f '$(top_srcdir)/../zlib/zutil.c'; then $(CYGPATH_W) '$(top_srcdir)/../zlib/zutil.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../zlib/zutil.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1470,7 +1059,6 @@  cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
@@ -1503,7 +1091,6 @@  clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../testsuite/$(am__dirstamp)
 	-rm -f etc/c/$(am__dirstamp)
 	-rm -f std/$(am__dirstamp)
 	-rm -f std/algorithm/$(am__dirstamp)
@@ -1529,8 +1116,7 @@  maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -1599,23 +1185,22 @@  ps-am:
 uninstall-am: uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-toolexeclibLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-toolexeclibDATA install-toolexeclibLTLIBRARIES \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-toolexeclibDATA \
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-toolexeclibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-toolexeclibDATA \
+	install-toolexeclibLTLIBRARIES installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-toolexeclibDATA \
 	uninstall-toolexeclibLTLIBRARIES
 
 .PRECIOUS: Makefile
@@ -1629,24 +1214,6 @@  uninstall-am: uninstall-toolexeclibDATA \
 .d.lo:
 	$(LTDCOMPILE) $(GDCFLAGS) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
 
-# Unittest rules. Unfortunately we can't use _DFLAGS in automake without
-# explicit D support, so use this hack.
-# Compile D sources with libtool and test flags
-%.t.lo : %.d
-	$(LTDCOMPILE) $(GDCFLAGSX) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
-
-# Compile objects for static linking with test flags
-# Automake breaks empty rules, so use the shell NOP :
-%.t.o : %.t.lo
-	@:
-
-# Extra install and clean rules.
-# This does not delete the .libs/.t.o files, but deleting
-# the .lo is good enough to rerun the rules
-clean-local:
-	rm -f $(PHOBOS_TEST_LOBJECTS)
-	rm -f $(PHOBOS_TEST_OBJECTS)
-
 # Handles generated files as well
 install-data-local:
 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp
index 1944c7d546c..191ee33304d 100644
--- a/libphobos/testsuite/lib/libphobos.exp
+++ b/libphobos/testsuite/lib/libphobos.exp
@@ -191,3 +191,20 @@  proc libphobos_target_compile { source dest type options } {
 
     return $comp_output
 }
+
+#
+# Helper used by libphobos and libdruntime unittest runner, filters out
+# D sources that may contain a unittest function.
+#
+
+proc filter_libphobos_unittests { list } {
+    set res {}
+    foreach filename $list {
+	set fid [open $filename r]
+	if [regexp -- {unittest} [read $fid [file size $filename]]] {
+	    lappend res $filename
+	}
+	close $fid
+    }
+    return $res
+}
diff --git a/libphobos/testsuite/libphobos.druntime/druntime.exp b/libphobos/testsuite/libphobos.druntime/druntime.exp
new file mode 100644
index 00000000000..c5274df6657
--- /dev/null
+++ b/libphobos/testsuite/libphobos.druntime/druntime.exp
@@ -0,0 +1,32 @@ 
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target static] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../libdruntime "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+dg-runtest $tests "" "-fmain -fbuilding-libphobos-tests"
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp b/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp
new file mode 100644
index 00000000000..d7f151b74af
--- /dev/null
+++ b/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp
@@ -0,0 +1,33 @@ 
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target shared] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../libdruntime "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+dg-runtest $tests "-fversion=Shared -shared-libphobos" \
+    "-fmain -fbuilding-libphobos-tests -fno-moduleinfo"
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.phobos/phobos.exp b/libphobos/testsuite/libphobos.phobos/phobos.exp
new file mode 100644
index 00000000000..17a2a52126f
--- /dev/null
+++ b/libphobos/testsuite/libphobos.phobos/phobos.exp
@@ -0,0 +1,32 @@ 
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target static] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../src "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+dg-runtest $tests "" "-fmain -fbuilding-libphobos-tests"
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp b/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp
new file mode 100644
index 00000000000..1566d5e5747
--- /dev/null
+++ b/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp
@@ -0,0 +1,33 @@ 
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Immediately exit if we can't run target executables.
+if { ![isnative] || ![is-effective-target shared] } {
+    return
+}
+
+# Gather a list of all tests.
+set tests [lsort [filter_libphobos_unittests [find $srcdir/../src "*.d"]]]
+
+# Initialize dg.
+dg-init
+
+# Main loop.
+dg-runtest $tests "-fversion=Shared -shared-libphobos" \
+    "-fmain -fbuilding-libphobos-tests -fno-moduleinfo"
+
+# All done.
+dg-finish
diff --git a/libphobos/testsuite/libphobos.unittests/unittests.exp b/libphobos/testsuite/libphobos.unittests/unittests.exp
deleted file mode 100644
index b734a9b98d8..00000000000
--- a/libphobos/testsuite/libphobos.unittests/unittests.exp
+++ /dev/null
@@ -1,53 +0,0 @@ 
-# Copyright (C) 2017-2019 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GCC; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-# Immediately exit if we can't run target executables.
-if { ![isnative] } {
-    return
-}
-
-proc unittest_list_modules { prog } {
-    # Running the test runner without arguments prints a list of all
-    # modules that have unittests compiled in.
-    set result [libphobos_load "$prog" "" ""]
-    return [lindex $result 1]
-}
-
-# Runs all unittests for each module compiled into the test program.
-proc unittest_run_tests { name prog } {
-    foreach module [unittest_list_modules $prog] {
-	set result [libphobos_load "$prog" "$module" ""]
-	set status [lindex $result 0]
-	$status "libphobos.unittests/$name/$module"
-    }
-}
-
-proc unittester { name prog } {
-    if [file exists $prog] {
-	unittest_run_tests $name $prog
-    }
-}
-
-# List of test runners.
-if [is-effective-target static] {
-    unittester "druntime/static" "$objdir/../libdruntime/unittest_static$exeext"
-    unittester "phobos/static" "$objdir/../src/unittest_static$exeext"
-}
-
-if [is-effective-target shared] {
-    unittester "druntime/shared" "$objdir/../libdruntime/unittest$exeext"
-    unittester "phobos/shared" "$objdir/../src/unittest$exeext"
-}
diff --git a/libphobos/testsuite/test_runner.d b/libphobos/testsuite/test_runner.d
deleted file mode 100644
index c9a908ae146..00000000000
--- a/libphobos/testsuite/test_runner.d
+++ /dev/null
@@ -1,95 +0,0 @@ 
-import core.runtime, core.time : MonoTime;
-import core.stdc.stdio;
-
-ModuleInfo* getModuleInfo(string name)
-{
-    foreach (m; ModuleInfo)
-        if (m.name == name) return m;
-    assert(0, "module '"~name~"' not found");
-}
-
-bool tester()
-{
-    return Runtime.args.length > 1 ? testModules() : printAll();
-}
-
-string mode;
-
-
-bool testModules()
-{
-    bool ret = true;
-    foreach(name; Runtime.args[1..$])
-    {
-        immutable pkg = ".package";
-        immutable pkgLen = pkg.length;
-
-        if (name.length > pkgLen && name[$ - pkgLen .. $] == pkg)
-            name = name[0 .. $ - pkgLen];
-
-        doTest(getModuleInfo(name), ret);
-    }
-
-    return ret;
-}
-
-bool printAll()
-{
-    foreach (m; ModuleInfo)
-    {
-        if (m.unitTest)
-        {
-            string name = m.name;
-            printf("%.*s\n", cast(int)name.length, name.ptr);
-        }
-    }
-    return true;
-}
-
-
-void doTest(ModuleInfo* moduleInfo, ref bool ret)
-{
-    if (auto fp = moduleInfo.unitTest)
-    {
-        auto name = moduleInfo.name;
-        try
-        {
-            immutable t0 = MonoTime.currTime;
-            fp();
-            printf("%.3fs PASS %.*s %.*s\n",
-                   (MonoTime.currTime - t0).total!"msecs" / 1000.0,
-                   cast(uint)mode.length, mode.ptr,
-                   cast(uint)name.length, name.ptr);
-        }
-        catch (Throwable e)
-        {
-            auto msg = e.toString();
-            printf("****** FAIL %.*s %.*s\n%.*s\n",
-                   cast(uint)mode.length, mode.ptr,
-                   cast(uint)name.length, name.ptr,
-                   cast(uint)msg.length, msg.ptr);
-            ret = false;
-        }
-    }
-}
-
-
-shared static this()
-{
-    version(D_Coverage)
-    {
-        import core.runtime : dmd_coverSetMerge;
-        dmd_coverSetMerge(true);
-    }
-    Runtime.moduleUnitTester = &tester;
-
-    debug mode = "debug";
-    else  mode =  "release";
-    static if ((void*).sizeof == 4) mode ~= "32";
-    else static if ((void*).sizeof == 8) mode ~= "64";
-    else static assert(0, "You must be from the future!");
-}
-
-void main()
-{
-}
diff --git a/libphobos/testsuite/testsuite_flags.in b/libphobos/testsuite/testsuite_flags.in
index 0326401e459..fa57de27a5a 100755
--- a/libphobos/testsuite/testsuite_flags.in
+++ b/libphobos/testsuite/testsuite_flags.in
@@ -35,7 +35,8 @@  case ${query} in
       GDCPATHS_default="-nostdinc"
       GDCPATHS_config="-B${BUILD_DIR}/src
                        -I${BUILD_DIR}/libdruntime
-                       -I${SRC_DIR}/libdruntime"
+                       -I${SRC_DIR}/libdruntime
+                       -I${SRC_DIR}/src"
       echo ${GDCPATHS_default} ${GDCPATHS_config}
       ;;
     --gdcldflags)