Undo previous delta. Add comment explaining why.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8e93def18ddb2f947a14735052c42d74cf8a68d1..50e254676af52803204a675bc4c02950363da350 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-23  Nick Clifton  <nickc@redhat.com>
+
+       * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Undo
+       previous change.  Add comment explaining why.
+
 2002-08-23  Stephen Clarke <stephen.clarke@superh.com>
 
        * elf32-sh.c (elf_sh_plt0_entry_be, elf_sh_plt0_entry_le): Copy

diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
index cf4942a2b6ef25d848b0c67a31b9c05bdb34c406..eb4a69b04d0583dbd8a255580c540f72e5848db5 100644 (file)
--- a/bfd/elf-eh-frame.c
+++ b/bfd/elf-eh-frame.c
@@ -506,7 +506,12 @@ _bfd_elf_discard_section_eh_frame (abfd, info, sec, ehdrsec,
            }
          read_uleb128 (cie.code_align, buf);
          read_sleb128 (cie.data_align, buf);
-         cie.ra_column = *buf++;
+         /* Note - in DWARF2 the return address column is an unsigned byte.
+            In DWARF3 it is a ULEB128.  We are following DWARF3.  For most
+            ports this will not matter as the value will be less than 128.
+            For the others (eg FRV, SH, MMIX, IA64) they need a fixed GCC
+            which conforms to the DWARF3 standard.  */
+         read_uleb128 (cie.ra_column, buf);
          ENSURE_NO_RELOCS (buf);
          cie.lsda_encoding = DW_EH_PE_omit;
          cie.fde_encoding = DW_EH_PE_omit;