Imported from ../bash-2.03.tar.gz.

lib/malloc/Makefile.in

@@ -13,10 +13,13 @@ INSTALL_DATA = @INSTALL_DATA@
 CC = @CC@
 RANLIB = @RANLIB@
 AR = @AR@
+ARFLAGS = @ARFLAGS@
 RM = rm -f
 CP = cp
 MV = mv
 
+SHELL = @MAKE_SHELL@
+
 PROFILE_FLAGS = 
 
 CFLAGS = @CFLAGS@
@@ -63,32 +66,32 @@ all:		malloc
 
 malloc: ${MALLOC_OBJS}
 	${RM} libmalloc.a
-	${AR} cr libmalloc.a ${MALLOC_OBJS}
+	${AR} ${ARFLAGS} libmalloc.a ${MALLOC_OBJS}
 	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
 nmalloc: ${NMALLOC_OBJS}
 	${RM} libmalloc.a
-	${AR} cr libmalloc.a ${NMALLOC_OBJS}
+	${AR} ${ARFLAGS} libmalloc.a ${NMALLOC_OBJS}
 	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
 nmalloc2: ${NMALLOC2_OBJS}
 	${RM} libmalloc.a
-	${AR} cr libmalloc.a ${NMALLOC2_OBJS}
+	${AR} ${ARFLAGS} libmalloc.a ${NMALLOC2_OBJS}
 	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
 gmalloc: ${GMALLOC_OBJS}
 	${RM} libmalloc.a
-	${AR} cr libmalloc.a ${GMALLOC_OBJS}
+	${AR} ${ARFLAGS} libmalloc.a ${GMALLOC_OBJS}
 	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
 ngmalloc: ${NGMALLOC_OBJS}
 	${RM} libmalloc.a
-	${AR} cr libmalloc.a ${NGMALLOC_OBJS}
+	${AR} ${ARFLAGS} libmalloc.a ${NGMALLOC_OBJS}
 	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
 stubmalloc: ${STUB_OBJS}
 	${RM} libmalloc.a
-	${AR} cr libmalloc.a ${STUB_OBJS}
+	${AR} ${ARFLAGS} libmalloc.a ${STUB_OBJS}
 	-test -n "$(RANLIB)" && $(RANLIB) libmalloc.a
 
 alloca.o:	$(srcdir)/$(ALLOCA_SOURCE)

lib/malloc/malloc.c

@@ -184,7 +184,7 @@ struct bucket_stats {
    enough room in the block for the new size.  Range checking is always
    done. */
 union mhead {
-  double mh_align;
+  bits64_t mh_align;					/* 8 */
   struct {
     char     mi_alloc;	/* ISALLOC or ISFREE */		/* 1 */
     char     mi_index;	/* index in nextf[] */		/* 1 */
@@ -200,8 +200,8 @@ union mhead {
 
 /* Access free-list pointer of a block.
    It is stored at block + sizeof (char *).
-   This is not a field in the mhead structure
-   because we want sizeof (struct mhead)
+   This is not a field in the minfo structure member of union mhead
+   because we want sizeof (union mhead)
    to describe the overhead for when the block is in use,
    and we do not want the free-list pointer to count in that.  */
 
@@ -490,6 +490,8 @@ morecore_done:
 #else
 #  if defined (HAVE_POSIX_SIGNALS)
   sigprocmask (SIG_SETMASK, &oset, (sigset_t *)NULL);
+#  else
+  ; /* nothing to do, but need a null statement before the brace */
 #  endif
 #endif /* HAVE_BSD_SIGNALS */
 }