diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f297a94a03..69bc79dcd82 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,21 @@
+2001-10-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (rtlanal.o): Depend on $(TM_P_H).
+	* arm-protos.h (rdata_section, zero_init_section, common_section):
+	Prototype.
+	* arm.h (ASM_OUTPUT_DEF_FROM_DECLS): Const-ify.
+	* avr.h (ASM_OUTPUT_SKIP): Rename macro parameter to avoid
+	traditional mode stringification.
+	* function.c (thread_prologue_and_epilogue_insns): Wrap variable
+	in macros controling its use.
+	* rtlanal.c: Include tm_p.h.
+	* varasm.c (asm_output_aligned_bss): Mark parameter with
+	ATTRIBUTE_UNUSED.
+	(assemble_constant_align, assemble_start_function, assemble_align,
+	assemble_variable, assemble_trampoline_template,
+	output_constant_def_contents): Wrap potentially empty if-stmt body
+	in brackets.
+
 2001-10-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* a29k-protos.h (literal_section): Prototype.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index b1bf1c3627e..c9309727512 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1385,7 +1385,7 @@ print-rtl.o : print-rtl.c $(GCONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) \
     hard-reg-set.h $(BASIC_BLOCK_H)
 	$(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-rtlanal.o : rtlanal.c $(CONFIG_H) $(SYSTEM_H) toplev.h $(RTL_H) hard-reg-set.h
+rtlanal.o : rtlanal.c $(CONFIG_H) $(SYSTEM_H) toplev.h $(RTL_H) hard-reg-set.h $(TM_P_H)
 errors.o : errors.c $(GCONFIG_H) $(SYSTEM_H) errors.h
 	$(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index 2c3f8318ea1..77a33e5cd0a 100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #ifndef GCC_ARM_PROTOS_H
 #define GCC_ARM_PROTOS_H
 
+extern void   rdata_section		PARAMS ((void));
 extern void   arm_override_options	PARAMS ((void));
 extern int    use_return_insn		PARAMS ((int));
 extern int    arm_regno_class 		PARAMS ((int));
@@ -144,6 +145,8 @@ extern char * aof_data_section		PARAMS ((void));
 extern void   aof_add_import		PARAMS ((char *));
 extern void   aof_delete_import		PARAMS ((char *));
 extern void   aof_dump_imports		PARAMS ((FILE *));
+extern void   zero_init_section		PARAMS ((void));
+extern void   common_section		PARAMS ((void));
 #endif /* AOF_ASSEMBLER */
 
 #endif /* RTX_CODE */
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 462a291beea..fcd3d42ce34 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2614,8 +2614,8 @@ extern int making_const_table;
 #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL1, DECL2)		\
   do						   		\
     {								\
-      char * LABEL1 = XSTR (XEXP (DECL_RTL (decl), 0), 0);	\
-      char * LABEL2 = IDENTIFIER_POINTER (DECL2);		\
+      const char *const LABEL1 = XSTR (XEXP (DECL_RTL (decl), 0), 0); \
+      const char *const LABEL2 = IDENTIFIER_POINTER (DECL2);	\
 								\
       if (TARGET_THUMB && TREE_CODE (DECL1) == FUNCTION_DECL)	\
 	{							\
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 9ded05e361e..7a89ad5027f 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -2587,8 +2587,8 @@ sprintf (STRING, "*.%s%d", PREFIX, NUM)
    If this macro is not defined, nothing special is output at the end
    of the jump-table.  */
 
-#define ASM_OUTPUT_SKIP(STREAM, n)		\
-fprintf (STREAM, "\t.skip %d,0\n", n)
+#define ASM_OUTPUT_SKIP(STREAM, N)		\
+fprintf (STREAM, "\t.skip %d,0\n", N)
 /* A C statement to output to the stdio stream STREAM an assembler
    instruction to advance the location counter by NBYTES bytes.
    Those bytes should be zero when loaded.  NBYTES will be a C
diff --git a/gcc/function.c b/gcc/function.c
index 51beeef08cb..553ab91768f 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -7189,7 +7189,9 @@ thread_prologue_and_epilogue_insns (f)
 {
   int inserted = 0;
   edge e;
+#if defined (HAVE_sibcall_epilogue) || defined (HAVE_epilogue) || defined (HAVE_return) || defined (HAVE_prologue)
   rtx seq;
+#endif
 #ifdef HAVE_prologue
   rtx prologue_end = NULL_RTX;
 #endif
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 9cf879c1377..4aa90304bd6 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -25,6 +25,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "toplev.h"
 #include "rtl.h"
 #include "hard-reg-set.h"
+#include "tm_p.h"
 
 /* Forward declarations */
 static void set_of_1		PARAMS ((rtx, rtx, void *));
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 525d9c3e4b2..24c96cf213f 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -524,7 +524,7 @@ asm_output_bss (file, decl, name, size, rounded)
 static void
 asm_output_aligned_bss (file, decl, name, size, align)
      FILE *file;
-     tree decl;
+     tree decl ATTRIBUTE_UNUSED;
      const char *name;
      int size, align;
 {
@@ -1029,7 +1029,9 @@ assemble_constant_align (exp)
 #endif
 
   if (align > BITS_PER_UNIT)
-    ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
+    {
+      ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
+    }
 }
 
 /* Output a string of literal assembler code
@@ -1208,7 +1210,9 @@ assemble_start_function (decl, fnname)
   /* Tell assembler to move to target machine's alignment for functions.  */
   align = floor_log2 (FUNCTION_BOUNDARY / BITS_PER_UNIT);
   if (align > 0)
-    ASM_OUTPUT_ALIGN (asm_out_file, align);
+    {
+      ASM_OUTPUT_ALIGN (asm_out_file, align);
+    }
 
   /* Handle a user-specified function alignment.
      Note that we still need to align to FUNCTION_BOUNDARY, as above,
@@ -1324,7 +1328,9 @@ assemble_align (align)
      int align;
 {
   if (align > BITS_PER_UNIT)
-    ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
+    {
+      ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
+    }
 }
 
 /* Assemble a string constant with the specified C string as contents.  */
@@ -1682,8 +1688,10 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
 
   /* Output the alignment of this data.  */
   if (align > BITS_PER_UNIT)
-    ASM_OUTPUT_ALIGN (asm_out_file,
-		      floor_log2 (DECL_ALIGN (decl) / BITS_PER_UNIT));
+    {
+      ASM_OUTPUT_ALIGN (asm_out_file,
+			floor_log2 (DECL_ALIGN (decl) / BITS_PER_UNIT));
+    }
 
   /* Do any machine/system dependent processing of the object.  */
 #ifdef ASM_DECLARE_OBJECT_NAME
@@ -1905,7 +1913,9 @@ assemble_trampoline_template ()
   /* Write the assembler code to define one.  */
   align = floor_log2 (TRAMPOLINE_ALIGNMENT / BITS_PER_UNIT);
   if (align > 0)
-    ASM_OUTPUT_ALIGN (asm_out_file, align);
+    {
+      ASM_OUTPUT_ALIGN (asm_out_file, align);
+    }
 
   ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LTRAMP", 0);
   TRAMPOLINE_TEMPLATE (asm_out_file);
@@ -3462,7 +3472,9 @@ output_constant_def_contents (exp, reloc, labelno)
     }
 
   if (align > BITS_PER_UNIT)
-    ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
+    {
+      ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
+    }
 
   /* Output the label itself.  */
   ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LC", labelno);