* elf32-arm.c (elf32_arm_modify_segment_map): New function.

	(elf32_arm_additional_program_headers): Likewise.
	(elf_backend_modify_segment_map): Define.
	(elf_backend_additional_program_headers): Likewise.
	(elf32_arm_symbian_modify_segment_map): Use
	elf32_arm_modify_segment_map.

	* binutils/readelf.c (get_arm_segment_type): New function.
	(get_segment_type): Use it.

	* arm.h (PT_ARM_EXIDX): Define.

2 files changed, 24 insertions, 0 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8520871c0b..0455b5f42b 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-17  Paul Brook <paul@codesourcery.com>
+	    Dan Jacobowitz <dan@codesourcery.com>
+	    Mark Mitchell  <mark@codesourcery.com>
+
+	* binutils/readelf.c (get_arm_segment_type): New function.
+	(get_segment_type): Use it.
+
 2005-03-18  Paul Brook  <paul@codesourcery.com>
 
 	* objdump.c (objdump_print_addr): Avoid uninitialized warning.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 9c4d2a44b0..31fd3fa0e9 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2235,6 +2235,20 @@ get_osabi_name (unsigned int osabi)
 }
 
 static const char *
+get_arm_segment_type (unsigned long type)
+{
+  switch (type)
+    {
+    case PT_ARM_EXIDX:
+      return "EXIDX";
+    default:
+      break;
+    }
+
+  return NULL;
+}
+
+static const char *
 get_mips_segment_type (unsigned long type)
 {
   switch (type)
@@ -2324,6 +2338,9 @@ get_segment_type (unsigned long p_type)
 
 	  switch (elf_header.e_machine)
 	    {
+	    case EM_ARM:
+	      result = get_arm_segment_type (p_type);
+	      break;
 	    case EM_MIPS:
 	    case EM_MIPS_RS3_LE:
 	      result = get_mips_segment_type (p_type);