Unexec removal: Remove HYBRID_MALLOC support

* src/gmalloc.c (gdefault_morecore): Remove HYBRID_MALLOC code.
(allocated_via_gmalloc, hybrid_malloc, hybrid_calloc, hybrid_free_1)
(hybrid_free, hybrid_aligned_alloc, hybrid_realloc): Remove functions.

* msdos/sed1v2.inp:
* msdos/sedlibmk.inp:
* src/alloc.c (GC_MALLOC_CHECK, USE_ALIGNED_ALLOC)
(refill_memory_reserve, aligned_alloc):
* src/emacs.c (main):
* src/lastfile.c (my_edata):
* src/lisp.h:
* src/ralloc.c:
* src/sysdep.c (get_current_dir_name_or_unreachable):
* src/xdisp.c (decode_mode_spec): Remove HYBRID_MALLOC conditions.

* configure.ac (hybrid_malloc, HYBRID_MALLOC): Remove variables and
dependent code.
* src/conf_post.h (hybrid_malloc, hybrid_calloc, hybrid_free)
(hybrid_aligned_alloc, hybrid_realloc): Remove conditional prototypes.
* src/Makefile.in (HYBRID_MALLOC): Remove variable.
(base_obj): Remove sheap.o
(LIBEGNU_ARCHIVE):
* lib/Makefile.in (libgnu_a_OBJECTS): Remove libegnu.a support.

1 files changed, 2 insertions, 8 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index a87b7b1f31b..e3d42bd68f5 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -94,9 +94,8 @@ not_emacs_OBJECTS = regex.o malloc/%.o free.o
 libgnu_a_OBJECTS = fingerprint.o $(gl_LIBOBJS) \
   $(patsubst %.c,%.o,$(filter %.c,$(libgnu_a_SOURCES)))
 for_emacs_OBJECTS = $(filter-out $(not_emacs_OBJECTS),$(libgnu_a_OBJECTS))
-libegnu_a_OBJECTS = $(patsubst %.o,e-%.o,$(for_emacs_OBJECTS))
 
-$(libegnu_a_OBJECTS) $(libgnu_a_OBJECTS): $(BUILT_SOURCES)
+$(libgnu_a_OBJECTS): $(BUILT_SOURCES)
 
 .SUFFIXES: .c
 .c.o:
@@ -104,18 +103,13 @@ $(libegnu_a_OBJECTS) $(libgnu_a_OBJECTS): $(BUILT_SOURCES)
 e-%.o: %.c
         $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -Demacs -o $@ $<
 
-all: libgnu.a $(if $(HYBRID_MALLOC),libegnu.a)
+all: libgnu.a
 
 libgnu.a: $(libgnu_a_OBJECTS)
         $(AM_V_AR)rm -f $@
         $(AM_V_at)$(AR) $(ARFLAGS) $@ $(libgnu_a_OBJECTS)
         $(AM_V_at)$(RANLIB) $@
 
-libegnu.a: $(libegnu_a_OBJECTS)
-        $(AM_V_AR)rm -f $@
-        $(AM_V_at)$(AR) $(ARFLAGS) $@ $(libegnu_a_OBJECTS)
-        $(AM_V_at)$(RANLIB) $@
-
 ETAGS = ../lib-src/etags$(EXEEXT)
 $(ETAGS):
         $(MAKE) -C $(dir $@) $(notdir $@)