With these backports, these tests now pass for GDC and we don't
need the special cases in the Makefiles anymore.

--
Johannes

---
libphobos/ChangeLog:

2018-11-28  Johannes Pfau  <johannesp...@gmail.com>

        * libdruntime/Makefile.am: Test rt.util.typeinfo and 
core.internal.convert.
        * libdruntime/Makefile.in: Rebuild.


 libphobos/libdruntime/Makefile.am | 12 ++----------
 libphobos/libdruntime/Makefile.in | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/libphobos/libdruntime/Makefile.am 
b/libphobos/libdruntime/Makefile.am
index e14cc031eea..e8a4691ebd2 100644
--- a/libphobos/libdruntime/Makefile.am
+++ b/libphobos/libdruntime/Makefile.am
@@ -79,16 +79,8 @@ ALL_DRUNTIME_COMPILE_DSOURCES += 
$(DRUNTIME_DSOURCES_GENERATED)
 
 ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
        $(DRUNTIME_SSOURCES)
-REAL_DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
-REAL_DRUNTIME_TEST_OBJECTS  = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
-# Workaround issue #
-DRUNTIME_TEST_OBJECTS  = $(filter-out rt/util/typeinfo.t.o \
-       core/internal/convert.t.o, $(REAL_DRUNTIME_TEST_OBJECTS)) \
-       rt/util/typeinfo.o core/internal/convert.o
-
-DRUNTIME_TEST_LOBJECTS  = $(filter-out rt/util/typeinfo.t.lo \
-       core/internal/convert.t.lo, $(REAL_DRUNTIME_TEST_LOBJECTS)) \
-       rt/util/typeinfo.lo core/internal/convert.lo
+DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
+DRUNTIME_TEST_OBJECTS  = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
 
 
 # Main library build definitions
diff --git a/libphobos/libdruntime/Makefile.in 
b/libphobos/libdruntime/Makefile.in
index d07a8f98099..c0ca4385a21 100644
--- a/libphobos/libdruntime/Makefile.in
+++ b/libphobos/libdruntime/Makefile.in
@@ -744,16 +744,8 @@ ALL_DRUNTIME_COMPILE_DSOURCES = $(DRUNTIME_DSOURCES) 
$(am__append_1) \
 ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
        $(DRUNTIME_SSOURCES)
 
-REAL_DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
-REAL_DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
-# Workaround issue #
-DRUNTIME_TEST_OBJECTS = $(filter-out rt/util/typeinfo.t.o \
-       core/internal/convert.t.o, $(REAL_DRUNTIME_TEST_OBJECTS)) \
-       rt/util/typeinfo.o core/internal/convert.o
-
-DRUNTIME_TEST_LOBJECTS = $(filter-out rt/util/typeinfo.t.lo \
-       core/internal/convert.t.lo, $(REAL_DRUNTIME_TEST_LOBJECTS)) \
-       rt/util/typeinfo.lo core/internal/convert.lo
+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
-- 
2.19.1

Reply via email to