diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f5e780e8cc2..1590e2d9b02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-01  Paul Brook  <paul@codesourcery.com>
+
+	* config/arm/crti.asm: Give _init and _fini function type.
+
 2004-10-01  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* common.opt (ftree-loop-ivcanon): Enable by default.
@@ -6,7 +10,7 @@
 	(canonicalize_induction_variables, tree_unroll_loops_completely):
 	Reset scev info.
 
-2004-01-01  Paul Brook  <paul@codesourcery.com>
+2004-10-01  Paul Brook  <paul@codesourcery.com>
 
 	* config/arm/arm.c (thumb_compute_saved_rag_mask): Or with bitmask,
 	not register number.
diff --git a/gcc/config/arm/crti.asm b/gcc/config/arm/crti.asm
index 3597e42b02e..4b47f41290e 100644
--- a/gcc/config/arm/crti.asm
+++ b/gcc/config/arm/crti.asm
@@ -35,6 +35,12 @@
 # .init sections.  Users may put any desired instructions in those
 # sections.
 
+#ifdef __ELF__
+#define TYPE(x) .type x,function
+#else
+#define TYPE(x)
+#endif
+
 	# Note - this macro is complemented by the FUNC_END macro
 	# in crtn.asm.  If you change this macro you must also change
 	# that macro match.
@@ -60,6 +66,7 @@
 #ifdef __thumb__
 	.thumb_func
 #endif
+	TYPE(_init)
 _init:
 	FUNC_START
 	
@@ -70,6 +77,7 @@ _init:
 #ifdef __thumb__
 	.thumb_func
 #endif
+	TYPE(_fini)
 _fini:
 	FUNC_START