diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 26c6fd3bee6..45b9bb673a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* pe.c (arm_pe_unique_section): Const-ify.
+	* pe.h (TARGET_ASM_NAMED_SECTION): Undef before defining.
+	(switch_to_section): Add static prototype.
+
+	* output.h (drectve_section): Prototype.
+
 2001-10-19  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* config.gcc (i[34567]86-*-gnu*, arc-*-elf*, d30v-*,
diff --git a/gcc/config/arm/pe.c b/gcc/config/arm/pe.c
index 9e7e95a5765..8360f85c44c 100644
--- a/gcc/config/arm/pe.c
+++ b/gcc/config/arm/pe.c
@@ -257,7 +257,7 @@ arm_pe_unique_section (decl, reloc)
   int len;
   const char * name;
   char * string;
-  char * prefix;
+  const char * prefix;
 
   name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
   /* Strip off any encoding in fnname.  */
diff --git a/gcc/config/arm/pe.h b/gcc/config/arm/pe.h
index 6d4f61d942f..3a9ad7cdff5 100644
--- a/gcc/config/arm/pe.h
+++ b/gcc/config/arm/pe.h
@@ -123,6 +123,7 @@ Boston, MA 02111-1307, USA.  */
 #define SUPPORTS_ONE_ONLY 1
 
 /* Switch into a generic section.  */
+#undef TARGET_ASM_NAMED_SECTION
 #define TARGET_ASM_NAMED_SECTION  default_pe_asm_named_section
 
 /* This outputs a lot of .req's to define alias for various registers.
@@ -234,7 +235,8 @@ drectve_section ()							\
    ASM_DECLARE_OBJECT_NAME and then switch back to the original section
    afterwards.  */
 #define SWITCH_TO_SECTION_FUNCTION				\
-void								\
+static void switch_to_section PARAMS ((enum in_section, tree)); \
+static void							\
 switch_to_section (section, decl)				\
      enum in_section section;					\
      tree decl;							\
diff --git a/gcc/output.h b/gcc/output.h
index 1e97c212536..18afc85c6e2 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -194,6 +194,10 @@ extern void fini_section PARAMS ((void));
 extern void tdesc_section PARAMS ((void));
 #endif
 
+#ifdef DRECTVE_SECTION_ASM_OP
+extern void drectve_section PARAMS ((void));
+#endif
+
 #ifdef TREE_CODE
 /* Tell assembler to change to section NAME for DECL.
    If DECL is NULL, just switch to section NAME.