Re: Do we still need ggc-simple

[Steven Bosscher <stevenb at suse dot de>]

On Sunday 28 December 2003 19:33, Mark Mitchell wrote:
> On Sun, 2003-12-14 at 02:35, Nick Burrett wrote:
> > Steven Bosscher wrote:
> > > On Wednesday 10 December 2003 11:41, Nick Burrett wrote:
> > >>Steven Bosscher wrote:
> > >>>Why do we still have ggc-simple?  Are there any targets for which
> > >>>ggc-page doesn't work?
> > >>
> > >>Yes (arm-riscos-aof), though it is maintained outside of the GCC tree.
> > >
> > > OK.  So I like bitching.
> > >
> > > Why is arm-riscos-aof not using ggc-page with malloc?
> >
> > Sorry.  The last time I looked to make the decision on using ggc-page or
> > ggc-simple, I figured that ggc-page was a solely mmap implementation.
> > Upon reading the code further, I notice it isn't and therefore I will
> > drop my requirement for ggc-simple.
>
> Based on this discussion, I will pre-approve a patch to remove all
> traces of ggc-simple.c from the mainline.

Thanks Mark.

I have just commited the following patch to mainline.

Gr.
Steven

	* Makefile.in: Remove rule for ggc-simple.o.
	* configure.ac: Don't allow ggc-simple to be selected.
	* configure: Regenerate.
	* ggc-simple.c: Remove.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1224
diff -c -3 -p -r1.1224 Makefile.in
*** Makefile.in	17 Jan 2004 00:37:37 -0000	1.1224
--- Makefile.in	17 Jan 2004 20:55:30 -0000
*************** gtype-desc.o: gtype-desc.c $(CONFIG_H) $
*** 1459,1467 ****
  ggc-common.o: ggc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GGC_H) \
  	$(HASHTAB_H) toplev.h $(PARAMS_H) hosthooks.h
  
- ggc-simple.o: ggc-simple.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
- 	flags.h $(GGC_H) varray.h $(TIMEVAR_H) $(TM_P_H) $(PARAMS_H)
- 
  ggc-page.o: ggc-page.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
  	flags.h toplev.h $(GGC_H) $(TIMEVAR_H) $(TM_P_H) $(PARAMS_H)
  
--- 1459,1464 ----
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure,v
retrieving revision 1.794
diff -c -3 -p -r1.794 configure
*** configure	15 Jan 2004 04:02:11 -0000	1.794
--- configure	17 Jan 2004 20:55:52 -0000
*************** Optional Packages:
*** 909,915 ****
    --with-dwarf2           force the default debug format to be DWARF 2
    --with-sysroot=DIR Search for usr/lib, usr/include, et al, within DIR.
    --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
!   --with-gc={simple,page,zone} choose the garbage collection mechanism to use
                            with the compiler
    --with-system-zlib      use installed libz
    --with-slibdir=DIR      shared libraries in DIR LIBDIR
--- 909,915 ----
    --with-dwarf2           force the default debug format to be DWARF 2
    --with-sysroot=DIR Search for usr/lib, usr/include, et al, within DIR.
    --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
!   --with-gc={page,zone}   choose the garbage collection mechanism to use
                            with the compiler
    --with-system-zlib      use installed libz
    --with-slibdir=DIR      shared libraries in DIR LIBDIR
*************** fi
*** 11297,11303 ****
  if test "${with_gc+set}" = set; then
    withval="$with_gc"
    case "$withval" in
!   simple | page | zone)
      GGC=ggc-$withval
      ;;
    *)
--- 11297,11303 ----
  if test "${with_gc+set}" = set; then
    withval="$with_gc"
    case "$withval" in
!   page | zone)
      GGC=ggc-$withval
      ;;
    *)
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.6
diff -c -3 -p -r2.6 configure.ac
*** configure.ac	15 Jan 2004 04:02:11 -0000	2.6
--- configure.ac	17 Jan 2004 20:55:57 -0000
*************** AC_SUBST(gthread_flags)
*** 2710,2719 ****
  
  # Find out what GC implementation we want, or may, use.
  AC_ARG_WITH(gc,
! [  --with-gc={simple,page,zone} choose the garbage collection mechanism to use
                            with the compiler],
  [case "$withval" in
!   simple | page | zone)
      GGC=ggc-$withval
      ;;
    *)
--- 2710,2719 ----
  
  # Find out what GC implementation we want, or may, use.
  AC_ARG_WITH(gc,
! [  --with-gc={page,zone}   choose the garbage collection mechanism to use
                            with the compiler],
  [case "$withval" in
!   page | zone)
      GGC=ggc-$withval
      ;;
    *)