diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 35a30d053c..79dc9c37e4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Tue Mar 24 13:26:25 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* config/rs6000.mh:  Update (for Fred's new mmalloc)
+	flags to disable use of GNU malloc/mmalloc.
+	* munch:  Change SYSV rule to allow .text before the label,
+	as well as after, to work for AIX.
+	* gdbtypes.h:  Minor clarifiction.
+
 Tue Mar 24 07:26:19 1992  Michael Tiemann  (tiemann@cygnus.com)
 
 	* buildsym.c (read_struct_type): Handle cretinous dbx symbol name
diff --git a/gdb/config/rs6000.mh b/gdb/config/rs6000.mh
index cd80d89532..8f5f05ef7c 100644
--- a/gdb/config/rs6000.mh
+++ b/gdb/config/rs6000.mh
@@ -22,6 +22,6 @@ XM_FILE= xm-rs6000.h
 XM_CFLAGS = -bnodelcsect
 
 # Because of shared libraries, we risk ending up with *two*
-# versions of malloc if we use GNU malloc ...
-GNU_MALLOC =
-MALLOC_CFLAGS = -DNO_MALLOC_CHECK
+# incompatible versions of malloc if we use GNU malloc ...
+MMALLOC_LIB = 
+MMALLOC_DISABLE = -DNO_MMALLOC
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 6306e78305..8877f8392c 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -130,7 +130,7 @@ struct type
 
   /* For a pointer type, describes the type of object pointed to.
      For an array type, describes the type of the elements.
-     For a function or method type, describes the type of the value.
+     For a function or method type, describes the type of the return value.
      For a range type, describes the type of the full range.
      Unused otherwise.  */
 
diff --git a/gdb/munch b/gdb/munch
index 7d96a476a4..740c670b8d 100755
--- a/gdb/munch
+++ b/gdb/munch
@@ -23,8 +23,8 @@ if test "`$MUNCH_NM main.o | egrep main | egrep FUNC | egrep GLOB`" != "" ; then
 elif test "`$MUNCH_NM main.o | egrep '[TD] _?main$'`" = "" ; then
     # System V style nm
     shift;
-    $MUNCH_NM $* | egrep '^(.*[^a-zA-Z_]_|_)_?initialize_.*\.text' | \
-	sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)[^a-zA-Z0-9_].*$/   {extern void \1 (); \1 ();}/'
+    $MUNCH_NM $* | egrep '^(.*[^a-zA-Z_]_|_)_?initialize_.*' | egrep '\.text'|\
+	sed -e 's/^.*\(_initialize_[a-zA-Z0-9_]*\)/   {extern void \1 (); \1 ();}/'
 else
     # BSD style nm
     # We now accept either text or data symbols, since the RT/PC uses data.