libphobos: Remove --enable-druntime-gc configure option.

This is yet another old option that would have been somewhat useful back
before the D front-end implementation was able to support compiling
without the Druntime library.

Now however, -fno-druntime makes the gcstub package redundant, so the
option has been removed, along with the package itself.

libphobos/ChangeLog:

	* configure: Regenerate.
	* libdruntime/Makefile.am (ALL_DRUNTIME_INSTALL_DSOURCES): Remove
	DRUNTIME_DSOURCES_GC and DRUNTIME_DSOURCES_GCSTUB.
	(DRUNTIME_DSOURCES): Add gc/*.d sources.
	(DRUNTIME_DSOURCES_GC): Remove.
	(DRUNTIME_DSOURCES_GCSTUB): Remove.
	* libdruntime/Makefile.in: Regenerate.
	* libdruntime/gcstub/gc.d: Remove.
	* m4/druntime.m4 (DRUNTIME_GC): Remove.

libphobos/ChangeLog

 2020-04-09  Iain Buclaw  <ibuclaw@gdcproject.org>
 
+	* configure: Regenerate.
+	* libdruntime/Makefile.am (ALL_DRUNTIME_INSTALL_DSOURCES): Remove
+	DRUNTIME_DSOURCES_GC and DRUNTIME_DSOURCES_GCSTUB.
+	(DRUNTIME_DSOURCES): Add gc/*.d sources.
+	(DRUNTIME_DSOURCES_GC): Remove.
+	(DRUNTIME_DSOURCES_GCSTUB): Remove.
+	* libdruntime/Makefile.in: Regenerate.
+	* libdruntime/gcstub/gc.d: Remove.
+	* m4/druntime.m4 (DRUNTIME_GC): Remove.
+
+2020-04-09  Iain Buclaw  <ibuclaw@gdcproject.org>
+
 	PR d/94305
 	* Makefile.in: Regenerate.
 	* configure: Regenerate.

libphobos/configure

@@ -701,8 +701,6 @@ DRUNTIME_CPU_ARM_FALSE
 DRUNTIME_CPU_ARM_TRUE
 DRUNTIME_CPU_AARCH64_FALSE
 DRUNTIME_CPU_AARCH64_TRUE
-DRUNTIME_GC_ENABLE_FALSE
-DRUNTIME_GC_ENABLE_TRUE
 libphobos_srcdir
 libphobos_builddir
 get_gcc_base_ver
@@ -835,7 +833,6 @@ with_gnu_ld
 enable_libtool_lock
 with_gcc_major_version_only
 enable_werror
-enable_druntime_gc
 with_libatomic
 with_libbacktrace
 with_target_system_zlib
@@ -1485,7 +1482,6 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-werror         turns on -Werror [default=no]
-  --enable-druntime-gc    enable D runtime garbage collector (default: yes)
   --enable-version-specific-runtime-libs
                           Specify that runtime libraries should be installed
                           in a compiler-specific directory
@@ -11649,7 +11645,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11652 "configure"
+#line 11648 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11755,7 +11751,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11758 "configure"
+#line 11754 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13981,24 +13977,7 @@ fi
       WERROR_FLAG="-Werror"
   fi
 
-
-    # Check whether --enable-druntime-gc was given.
-if test "${enable_druntime_gc+set}" = set; then :
-  enableval=$enable_druntime_gc; enable_druntime_gc=no
-else
-  enable_druntime_gc=yes
-fi
-
-
-   if test "$enable_druntime_gc" = "yes"; then
-  DRUNTIME_GC_ENABLE_TRUE=
-  DRUNTIME_GC_ENABLE_FALSE='#'
-else
-  DRUNTIME_GC_ENABLE_TRUE='#'
-  DRUNTIME_GC_ENABLE_FALSE=
-fi
-
-
+DRUNTIME_GC
 
   druntime_target_cpu_parsed=""
   case "$target_cpu" in
@@ -15510,10 +15489,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 "${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
-fi
 if test -z "${DRUNTIME_CPU_AARCH64_TRUE}" && test -z "${DRUNTIME_CPU_AARCH64_FALSE}"; then
   as_fn_error $? "conditional \"DRUNTIME_CPU_AARCH64\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

libphobos/libdruntime/Makefile.am

@@ -28,7 +28,6 @@ AM_DFLAGS= \
 
 # Install all D and DI files
 ALL_DRUNTIME_INSTALL_DSOURCES = $(DRUNTIME_DSOURCES) \
-	$(DRUNTIME_DSOURCES_GC) $(DRUNTIME_DSOURCES_GCSTUB) \
 	$(DRUNTIME_DSOURCES_BIONIC) $(DRUNTIME_DSOURCES_DARWIN) \
 	$(DRUNTIME_DSOURCES_DRAGONFLYBSD) $(DRUNTIME_DSOURCES_FREEBSD) \
 	$(DRUNTIME_DSOURCES_LINUX) $(DRUNTIME_DSOURCES_NETBSD) \
@@ -40,12 +39,6 @@ ALL_DRUNTIME_INSTALL_DSOURCES = $(DRUNTIME_DSOURCES) \
 # Setup source files depending on configure
 DRUNTIME_SOURCES_CONFIGURED =
 
-# GC sources
-if DRUNTIME_GC_ENABLE
-    DRUNTIME_SOURCES_CONFIGURED += $(DRUNTIME_DSOURCES_GC)
-else
-    DRUNTIME_SOURCES_CONFIGURED += $(DRUNTIME_DSOURCES_GCSTUB)
-endif
 # OS specific sources
 if DRUNTIME_OS_POSIX
     DRUNTIME_SOURCES_CONFIGURED += $(DRUNTIME_DSOURCES_POSIX)
@@ -168,7 +161,9 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
 	core/stdc/wctype.d core/sync/barrier.d core/sync/condition.d \
 	core/sync/config.d core/sync/exception.d core/sync/mutex.d \
 	core/sync/rwmutex.d core/sync/semaphore.d core/thread.d core/time.d \
-	core/vararg.d gcc/attribute.d gcc/backtrace.d gcc/builtins.d gcc/deh.d \
+	core/vararg.d gc/bits.d gc/config.d gc/gcinterface.d \
+	gc/impl/conservative/gc.d gc/impl/manual/gc.d gc/os.d gc/pooltable.d \
+	gc/proxy.d gcc/attribute.d gcc/backtrace.d gcc/builtins.d gcc/deh.d \
 	gcc/emutls.d gcc/gthread.d gcc/sections/android.d \
 	gcc/sections/elf_shared.d gcc/sections/osx.d gcc/sections/package.d \
 	gcc/sections/win32.d gcc/sections/win64.d gcc/unwind/arm.d \
@@ -199,12 +194,6 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
 DRUNTIME_DSOURCES_STDCXX = core/stdcpp/exception.d \
 	core/stdcpp/typeinfo.d
 
-DRUNTIME_DSOURCES_GC = gc/bits.d gc/config.d gc/gcinterface.d \
-	gc/impl/conservative/gc.d gc/impl/manual/gc.d gc/os.d gc/pooltable.d \
-	gc/proxy.d
-
-DRUNTIME_DSOURCES_GCSTUB = gcstub/gc.d
-
 DRUNTIME_DSOURCES_BIONIC = core/sys/bionic/fcntl.d \
 	core/sys/bionic/string.d core/sys/bionic/unistd.d
 

libphobos/libdruntime/gcstub/gc.d

-/**
- * This module contains a minimal garbage collector implementation according to
- * published requirements.  This library is mostly intended to serve as an
- * example, but it is usable in applications which do not rely on a garbage
- * collector to clean up memory (ie. when dynamic array resizing is not used,
- * and all memory allocated with 'new' is freed deterministically with
- * 'delete').
- *
- * Please note that block attribute data must be tracked, or at a minimum, the
- * FINALIZE bit must be tracked for any allocated memory block because calling
- * rt_finalize on a non-object block can result in an access violation.  In the
- * allocator below, this tracking is done via a leading uint bitmask.  A real
- * allocator may do better to store this data separately, similar to the basic
- * GC.
- *
- * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * Authors:   Sean Kelly
- */
-
-/*          Copyright Sean Kelly 2005 - 2009.
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE or copy at
- *          http://www.boost.org/LICENSE_1_0.txt)
- */
-module gc.gc;
-
-private
-{
-    import core.stdc.stdlib;
-    import core.stdc.stdio;
-
-    static import core.memory;
-    private alias BlkAttr = core.memory.GC.BlkAttr;
-    private alias BlkInfo = core.memory.GC.BlkInfo;
-
-    extern (C) void thread_init();
-    extern (C) void onOutOfMemoryError(void* pretend_sideffect = null) @trusted pure nothrow @nogc; /* dmd @@@BUG11461@@@ */
-
-    struct Proxy
-    {
-        extern (C) void function() gc_enable;
-        extern (C) void function() gc_disable;
-        extern (C) void function() gc_collect;
-        extern (C) void function() gc_minimize;
-
-        extern (C) uint function(void*) gc_getAttr;
-        extern (C) uint function(void*, uint) gc_setAttr;
-        extern (C) uint function(void*, uint) gc_clrAttr;
-
-        extern (C) void*   function(size_t, uint, const TypeInfo) gc_malloc;
-        extern (C) BlkInfo function(size_t, uint, const TypeInfo) gc_qalloc;
-        extern (C) void*   function(size_t, uint, const TypeInfo) gc_calloc;
-        extern (C) void*   function(void*, size_t, uint ba, const TypeInfo) gc_realloc;
-        extern (C) size_t  function(void*, size_t, size_t, const TypeInfo) gc_extend;
-        extern (C) size_t  function(size_t) gc_reserve;
-        extern (C) void    function(void*) gc_free;
-
-        extern (C) void*   function(void*) gc_addrOf;
-        extern (C) size_t  function(void*) gc_sizeOf;
-
-        extern (C) BlkInfo function(void*) gc_query;
-
-        extern (C) void function(void*) gc_addRoot;
-        extern (C) void function(void*, size_t, const TypeInfo ti) gc_addRange;
-
-        extern (C) void function(void*) gc_removeRoot;
-        extern (C) void function(void*) gc_removeRange;
-        extern (C) void function(in void[]) gc_runFinalizers;
-
-        extern (C) bool function() gc_inFinalizer;
-    }
-
-    __gshared Proxy  pthis;
-    __gshared Proxy* proxy;
-
-    void initProxy()
-    {
-        pthis.gc_enable = &gc_enable;
-        pthis.gc_disable = &gc_disable;
-        pthis.gc_collect = &gc_collect;
-        pthis.gc_minimize = &gc_minimize;
-
-        pthis.gc_getAttr = &gc_getAttr;
-        pthis.gc_setAttr = &gc_setAttr;
-        pthis.gc_clrAttr = &gc_clrAttr;
-
-        pthis.gc_malloc = &gc_malloc;
-        pthis.gc_qalloc = &gc_qalloc;
-        pthis.gc_calloc = &gc_calloc;
-        pthis.gc_realloc = &gc_realloc;
-        pthis.gc_extend = &gc_extend;
-        pthis.gc_reserve = &gc_reserve;
-        pthis.gc_free = &gc_free;
-
-        pthis.gc_addrOf = &gc_addrOf;
-        pthis.gc_sizeOf = &gc_sizeOf;
-
-        pthis.gc_query = &gc_query;
-
-        pthis.gc_addRoot = &gc_addRoot;
-        pthis.gc_addRange = &gc_addRange;
-
-        pthis.gc_removeRoot = &gc_removeRoot;
-        pthis.gc_removeRange = &gc_removeRange;
-        pthis.gc_runFinalizers = &gc_runFinalizers;
-
-        pthis.gc_inFinalizer = &gc_inFinalizer;
-    }
-
-    __gshared void** roots  = null;
-    __gshared size_t nroots = 0;
-
-    struct Range
-    {
-        void*  pos;
-        size_t len;
-        TypeInfo ti; // should be tail const, but doesn't exist for references
-    }
-
-    __gshared Range* ranges  = null;
-    __gshared size_t nranges = 0;
-}
-
-extern (C) void gc_init()
-{
-    // NOTE: The GC must initialize the thread library before its first
-    //       collection, and always before returning from gc_init().
-    thread_init();
-    initProxy();
-}
-
-extern (C) void gc_term()
-{
-    free( roots );
-    free( ranges );
-}
-
-extern (C) void gc_enable()
-{
-    if ( proxy is null )
-        return;
-    return proxy.gc_enable();
-}
-
-extern (C) void gc_disable()
-{
-    if ( proxy is null )
-        return;
-    return proxy.gc_disable();
-}
-
-extern (C) void gc_collect()
-{
-    if ( proxy is null )
-        return;
-    return proxy.gc_collect();
-}
-
-extern (C) void gc_minimize()
-{
-    if ( proxy is null )
-        return;
-    return proxy.gc_minimize();
-}
-
-extern (C) uint gc_getAttr( void* p )
-{
-    if ( proxy is null )
-        return 0;
-    return proxy.gc_getAttr( p );
-}
-
-extern (C) uint gc_setAttr( void* p, uint a )
-{
-    if ( proxy is null )
-        return 0;
-    return proxy.gc_setAttr( p, a );
-}
-
-extern (C) uint gc_clrAttr( void* p, uint a )
-{
-    if ( proxy is null )
-        return 0;
-    return proxy.gc_clrAttr( p, a );
-}
-
-extern (C) void* gc_malloc( size_t sz, uint ba = 0, const TypeInfo ti = null )
-{
-    if ( proxy is null )
-    {
-        void* p = malloc( sz );
-
-        if ( sz && p is null )
-            onOutOfMemoryError();
-        return p;
-    }
-    return proxy.gc_malloc( sz, ba, ti );
-}
-
-extern (C) BlkInfo gc_qalloc( size_t sz, uint ba = 0, const TypeInfo ti = null )
-{
-    if ( proxy is null )
-    {
-        BlkInfo retval;
-        retval.base = gc_malloc(sz, ba);
-        retval.size = sz;
-        retval.attr = ba;
-        return retval;
-    }
-    return proxy.gc_qalloc( sz, ba, ti );
-}
-
-extern (C) void* gc_calloc( size_t sz, uint ba = 0, const TypeInfo ti = null )
-{
-    if ( proxy is null )
-    {
-        void* p = calloc( 1, sz );
-
-        if ( sz && p is null )
-            onOutOfMemoryError();
-        return p;
-    }
-    return proxy.gc_calloc( sz, ba, ti );
-}
-
-extern (C) void* gc_realloc( void* p, size_t sz, uint ba = 0, const TypeInfo ti = null )
-{
-    if ( proxy is null )
-    {
-        p = realloc( p, sz );
-
-        if ( sz && p is null )
-            onOutOfMemoryError();
-        return p;
-    }
-    return proxy.gc_realloc( p, sz, ba, ti );
-}
-
-extern (C) size_t gc_extend( void* p, size_t mx, size_t sz, const TypeInfo ti = null )
-{
-    if ( proxy is null )
-        return 0;
-    return proxy.gc_extend( p, mx, sz, ti );
-}
-
-extern (C) size_t gc_reserve( size_t sz )
-{
-    if ( proxy is null )
-        return 0;
-    return proxy.gc_reserve( sz );
-}
-
-extern (C) void gc_free( void* p )
-{
-    if ( proxy is null )
-        return free( p );
-    return proxy.gc_free( p );
-}
-
-extern (C) void* gc_addrOf( void* p )
-{
-    if ( proxy is null )
-        return null;
-    return proxy.gc_addrOf( p );
-}
-
-extern (C) size_t gc_sizeOf( void* p )
-{
-    if ( proxy is null )
-        return 0;
-    return proxy.gc_sizeOf( p );
-}
-
-extern (C) BlkInfo gc_query( void* p )
-{
-    if ( proxy is null )
-        return BlkInfo.init;
-    return proxy.gc_query( p );
-}
-
-extern (C) void gc_addRoot( void* p )
-{
-    if ( proxy is null )
-    {
-        void** r = cast(void**) realloc( roots,
-                                         (nroots+1) * roots[0].sizeof );
-        if ( r is null )
-            onOutOfMemoryError();
-        r[nroots++] = p;
-        roots = r;
-        return;
-    }
-    return proxy.gc_addRoot( p );
-}
-
-extern (C) void gc_addRange( void* p, size_t sz, const TypeInfo ti = null )
-{
-    //printf("gcstub::gc_addRange() proxy = %p\n", proxy);
-    if ( proxy is null )
-    {
-        Range* r = cast(Range*) realloc( ranges,
-                                         (nranges+1) * ranges[0].sizeof );
-        if ( r is null )
-            onOutOfMemoryError();
-        r[nranges].pos = p;
-        r[nranges].len = sz;
-        r[nranges].ti = cast()ti;
-        ranges = r;
-        ++nranges;
-        return;
-    }
-    return proxy.gc_addRange( p, sz, ti );
-}
-
-extern (C) void gc_removeRoot( void *p )
-{
-    if ( proxy is null )
-    {
-        for ( size_t i = 0; i < nroots; ++i )
-        {
-            if ( roots[i] is p )
-            {
-                roots[i] = roots[--nroots];
-                return;
-            }
-        }
-        assert( false );
-    }
-    return proxy.gc_removeRoot( p );
-}
-
-extern (C) void gc_removeRange( void *p )
-{
-    if ( proxy is null )
-    {
-        for ( size_t i = 0; i < nranges; ++i )
-        {
-            if ( ranges[i].pos is p )
-            {
-                ranges[i] = ranges[--nranges];
-                return;
-            }
-        }
-        assert( false );
-    }
-    return proxy.gc_removeRange( p );
-}
-
-extern (C) void gc_runFinalizers( in void[] segment )
-{
-    if ( proxy !is null )
-        proxy.gc_runFinalizers( segment );
-}
-
-extern (C) bool gc_inFinalizer()
-{
-    if ( proxy !is null )
-        return proxy.gc_inFinalizer();
-    return false;
-}
-
-extern (C) Proxy* gc_getProxy()
-{
-    return &pthis;
-}
-
-export extern (C) void gc_setProxy( Proxy* p )
-{
-    if ( proxy !is null )
-    {
-        // TODO: Decide if this is an error condition.
-    }
-    proxy = p;
-    foreach ( r; roots[0 .. nroots] )
-        proxy.gc_addRoot( r );
-    foreach ( r; ranges[0 .. nranges] )
-        proxy.gc_addRange( r.pos, r.len, r.ti );
-}
-
-export extern (C) void gc_clrProxy()
-{
-    foreach ( r; ranges[0 .. nranges] )
-        proxy.gc_removeRange( r.pos );
-    foreach ( r; roots[0 .. nroots] )
-        proxy.gc_removeRoot( r );
-    proxy = null;
-}

libphobos/m4/druntime.m4

@@ -116,19 +116,3 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
   gdc_include_dir='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d'
   AC_SUBST(gdc_include_dir)
 ])
-
-
-# DRUNTIME_GC
-# -----------
-# Add the --enable-druntime-gc option and create the
-# DRUNTIME_GC_ENABLE conditional
-AC_DEFUN([DRUNTIME_GC],
-[
-  dnl switch between gc and gcstub
-  AC_ARG_ENABLE(druntime-gc,
-    AC_HELP_STRING([--enable-druntime-gc],
-                   [enable D runtime garbage collector (default: yes)]),
-    [enable_druntime_gc=no],[enable_druntime_gc=yes])
-
-  AM_CONDITIONAL([DRUNTIME_GC_ENABLE], [test "$enable_druntime_gc" = "yes"])
-])