diff --git a/gas/ChangeLog b/gas/ChangeLog
index 27e3cce89e..8a1989fc41 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-09  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-arm.c (s_arm_unwind_fnend): Use R_ARM_PREL31 relocation
+	for function start.
+
 2004-12-09  Ian Lance Taylor  <ian@wasabisystems.com>
 
 	* config/tc-mips.c (append_insn): If we emit a nop during a relax
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index ff2e4aafcd..009be15193 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -14079,7 +14079,7 @@ s_arm_unwind_fnend (int ignored ATTRIBUTE_UNUSED)
 
   /* Self relative offset of the function start.  */
   fix_new (frag_now, where, 4, unwind.proc_start, 0, 1,
-	   BFD_RELOC_32);
+	   BFD_RELOC_ARM_PREL31);
 
   if (val)
     /* Inline exception table entry.  */
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c9dedbc9f9..095611378b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-09  Paul Brook  <paul@codesourcery.com>
+
+	* gas/arm/unwind.d: Expect R_ARM_PREL31 relocations.
+
 2004-12-09  Ian Lance Taylor  <ian@wasabisystems.com>
 
 	* gas/mips/branch-swap.d: Pass -32 to as.
diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
index 7be60b4b59..dfa7d0dd3c 100644
--- a/gas/testsuite/gas/arm/unwind.d
+++ b/gas/testsuite/gas/arm/unwind.d
@@ -10,14 +10,14 @@ OFFSET   TYPE              VALUE
 
 RELOCATION RECORDS FOR \[.ARM.exidx\]:
 OFFSET   TYPE              VALUE 
-00000000 R_ARM_REL32       .text
-00000008 R_ARM_REL32       .text
+00000000 R_ARM_PREL31      .text
+00000008 R_ARM_PREL31      .text
 0000000c R_ARM_PREL31      .ARM.extab
-00000010 R_ARM_REL32       .text
+00000010 R_ARM_PREL31      .text
 00000014 R_ARM_PREL31      .ARM.extab
-00000018 R_ARM_REL32       .text
+00000018 R_ARM_PREL31      .text
 0000001c R_ARM_PREL31      .ARM.extab
-00000020 R_ARM_REL32       .text
+00000020 R_ARM_PREL31      .text
 
 
 Contents of section .text: