diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6bb47dd385..382b0a02fb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,28 @@
+Sun Aug 25 00:09:47 1996  Fred Fish  <fnf@rtl.cygnus.com>
+
+	* rs6000-tdep.c: Fix typo in comment.
+	* valops.c (call_function_by_hand): Set using_gcc to 2
+	for code compiled without -g, per comment in code.
+	* config/a29k/tm-a29k.h (STACK_ALIGN): Add comment.
+	* config/sparc/tm-sparc.h (STACK_ALIGN): Add comment.
+	* config/sparc/tm-sp64.h (STACK_ALIGN): Add comment.
+	* config/pyr/tm-pyr.h (STACK_ALIGN): Add comment.
+	* config/m88k/tm-m88k.h (STACK_ALIGN): Add comment.
+	* config/pa/tm-hppa.h (PUSH_ARGUMENTS): Enclose args in ()'s.
+	(STACK_ALIGN): Add comment, move to be with other associated
+ 	macros, and document.
+	* config/mips/tm-mips.h (PUSH_ARGUMENTS): Enclose args in ()'s.
+	(STACK_ALIGN): Remove completely, handled by PUSH_ARGUMENTS.
+	* config/alpha/tm-alpha.h (PUSH_ARGUMENTS): Enclose args in ()'s.
+	* config/rs6000/tm-rs6000.h (STACK_ALIGN): Remove completely,
+	handled by PUSH_ARGUMENTS.
+	(PUSH_ARGUMENTS): Enclose args in ()'s.
+	
+Fri Aug 23 13:55:05 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* infrun.c (wait_for_inferior):  Try to reenable shared library
+	breakpoints even if auto_solib_load is not set.
+
 Fri Aug 23 00:44:57 1996  Fred Fish  <fnf@cygnus.com>
 
 	* gdbtk.c (gdbtk_init): Check for a DISPLAY env variable and
diff --git a/gdb/config/a29k/tm-a29k.h b/gdb/config/a29k/tm-a29k.h
index 24a3e08a79..5fecca1026 100644
--- a/gdb/config/a29k/tm-a29k.h
+++ b/gdb/config/a29k/tm-a29k.h
@@ -60,7 +60,9 @@ CORE_ADDR skip_prologue ();
 
 #define INNER_THAN <
 
-/* Stack must be aligned on 32-bit word boundaries.  */
+/* Stack must be aligned on 32-bit boundaries when synthesizing
+   function calls. */
+
 #define STACK_ALIGN(ADDR) (((ADDR) + 3) & ~3)
 
 /* Sequence of bytes for breakpoint instruction.  */
diff --git a/gdb/config/m88k/tm-m88k.h b/gdb/config/m88k/tm-m88k.h
index a4416124e4..3c0acd94e4 100644
--- a/gdb/config/m88k/tm-m88k.h
+++ b/gdb/config/m88k/tm-m88k.h
@@ -589,7 +589,10 @@ extern void m88k_push_dummy_frame();
   pc = text_end;							\
 }
 
-#define STACK_ALIGN(addr) (((addr)+7) & -8)
+/* Stack must be aligned on 64-bit boundaries when synthesizing
+   function calls. */
+
+#define STACK_ALIGN(addr) (((addr) + 7) & -8)
 
 #define STORE_STRUCT_RETURN(addr, sp) \
     write_register (SRA_REGNUM, (addr))
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 95b9f07736..841b7fee50 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -339,12 +339,12 @@ extern void mips_find_saved_regs PARAMS ((struct frame_info *));
 
 /* Things needed for making the inferior call functions.  */
 
-/* Stack has strict alignment. However, use PUSH_ARGUMENTS
-   to take care of it. */
-/*#define STACK_ALIGN(addr)	(((addr)+3)&~3)*/
+/* Stack must be aligned on 32-bit boundaries when synthesizing
+   function calls.  We don't need STACK_ALIGN, PUSH_ARGUMENTS will
+   handle it. */
 
 #define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
-    sp = mips_push_arguments(nargs, args, sp, struct_return, struct_addr)
+    sp = mips_push_arguments((nargs), (args), (sp), (struct_return), (struct_addr))
 extern CORE_ADDR
 mips_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
 
diff --git a/gdb/config/sparc/tm-sp64.h b/gdb/config/sparc/tm-sp64.h
index 3cef0fcb1e..c35a45861e 100644
--- a/gdb/config/sparc/tm-sp64.h
+++ b/gdb/config/sparc/tm-sp64.h
@@ -24,10 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "sparc/tm-sparc.h"
 
-/* Stack has strict alignment.  */
+/* Stack must be aligned on 128-bit boundaries when synthesizing
+   function calls. */
 
 #undef  STACK_ALIGN
-#define STACK_ALIGN(ADDR) (((ADDR)+15)&-16)
+#define STACK_ALIGN(ADDR) (((ADDR) + 15 ) & -16)
 
 /* Number of machine registers.  */
 
diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h
index 663f6d9b1c..b42865769a 100644
--- a/gdb/config/sparc/tm-sparc.h
+++ b/gdb/config/sparc/tm-sparc.h
@@ -106,9 +106,10 @@ extern CORE_ADDR sparc_pc_adjust PARAMS ((CORE_ADDR));
 
 #define INNER_THAN <
 
-/* Stack has strict alignment.  */
+/* Stack must be aligned on 64-bit boundaries when synthesizing
+   function calls. */
 
-#define STACK_ALIGN(ADDR) (((ADDR)+7)&-8)
+#define STACK_ALIGN(ADDR) (((ADDR) + 7) & -8)
 
 /* Sequence of bytes for breakpoint instruction (ta 1). */
 
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index e1aeab5121..ea7be55ac0 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -683,7 +683,7 @@ rs6000_fix_call_dummy (dummyname, pc, fun, nargs, args, type, gcc_p)
    stack.
 
    If the function is returning a structure, then the return address is passed
-   in r3, then the first 7 words of the parametes can be passed in registers,
+   in r3, then the first 7 words of the parameters can be passed in registers,
    starting from r4. */
 
 CORE_ADDR