Ticket #29981: all.patch

bfd/mach-o.c

@@ -2524 +2524 @@
     case BFD_MACH_O_LC_FVMFILE:
     case BFD_MACH_O_LC_PREPAGE:
     case BFD_MACH_O_LC_ROUTINES:
+    case BFD_MACH_O_LC_ROUTINES_64:
       break;
     case BFD_MACH_O_LC_SUB_FRAMEWORK:
     case BFD_MACH_O_LC_SUB_UMBRELLA:

gdb/dwarf2-frame.c

@@ -1654 +1654 @@
 #define DW64_CIE_ID ~0
 #endif
 
+enum eh_frame_type{
+    eh_cie_type_id=1,
+    eh_fde_type_id=2,
+    eh_cie_or_fde_type_id=3
+};
+
 static gdb_byte *decode_frame_entry (struct comp_unit *unit, gdb_byte *start,
                                      int eh_frame_p,
                                      struct dwarf2_cie_table *cie_table,
-                                     struct dwarf2_fde_table *fde_table);
+                                     struct dwarf2_fde_table *fde_table,
+                                     enum eh_frame_type entry_type);
 
 /* Decode the next CIE or FDE.  Return NULL if invalid input, otherwise
    the next byte to be processed.  */
 static gdb_byte *
 decode_frame_entry_1 (struct comp_unit *unit, gdb_byte *start, int eh_frame_p,
                       struct dwarf2_cie_table *cie_table,
-                      struct dwarf2_fde_table *fde_table)
+                      struct dwarf2_fde_table *fde_table, enum eh_frame_type entry_type)
 {
   struct gdbarch *gdbarch = get_objfile_arch (unit->objfile);
   gdb_byte *buf, *end;
@@ -1715 +1722 @@
       char *augmentation;
       unsigned int cie_version;
 
+      gdb_assert((entry_type & eh_cie_type_id)!=0);
+
       /* Record the offset into the .debug_frame section of this CIE.  */
       cie_pointer = start - unit->dwarf_frame_buffer;
 
@@ -1879 +1888 @@
       /* This is a FDE.  */
       struct dwarf2_fde *fde;
 
+      gdb_assert((entry_type & eh_fde_type_id)!=0);
+
       /* In an .eh_frame section, the CIE pointer is the delta between the
          address within the FDE where the CIE pointer is stored and the
          address of the CIE.  Convert it to an offset into the .eh_frame
@@ -1900 +1911 @@
       if (fde->cie == NULL)
         {
           decode_frame_entry (unit, unit->dwarf_frame_buffer + cie_pointer,
-                              eh_frame_p, cie_table, fde_table);
+                              eh_frame_p, cie_table, fde_table,eh_cie_type_id);
           fde->cie = find_cie (cie_table, cie_pointer);
         }
 
@@ -1945 +1956 @@
 static gdb_byte *
 decode_frame_entry (struct comp_unit *unit, gdb_byte *start, int eh_frame_p,
                     struct dwarf2_cie_table *cie_table,
-                    struct dwarf2_fde_table *fde_table)
+                    struct dwarf2_fde_table *fde_table,enum eh_frame_type entry_type)
 {
   enum { NONE, ALIGN4, ALIGN8, FAIL } workaround = NONE;
   gdb_byte *ret;
@@ -1954 +1965 @@
   while (1)
     {
       ret = decode_frame_entry_1 (unit, start, eh_frame_p,
-                                  cie_table, fde_table);
+                                  cie_table, fde_table,entry_type);
       if (ret != NULL)
         break;
 
@@ -2109 +2120 @@
       frame_ptr = unit->dwarf_frame_buffer;
       while (frame_ptr < unit->dwarf_frame_buffer + unit->dwarf_frame_size)
         frame_ptr = decode_frame_entry (unit, frame_ptr, 1,
-                                        &cie_table, &fde_table);
+                                        &cie_table, &fde_table, eh_cie_or_fde_type_id);
 
       if (cie_table.num_entries != 0)
         {
@@ -2129 +2140 @@
       frame_ptr = unit->dwarf_frame_buffer;
       while (frame_ptr < unit->dwarf_frame_buffer + unit->dwarf_frame_size)
         frame_ptr = decode_frame_entry (unit, frame_ptr, 0,
-                                        &cie_table, &fde_table);
+                                        &cie_table, &fde_table, eh_cie_or_fde_type_id);
     }
 
   /* Discard the cie_table, it is no longer needed.  */

gdb/dwarf2read.c

@@ -1359 +1359 @@
 
   if (info->size > 4 * pagesize && (sectp->flags & SEC_RELOC) == 0)
     {
-      off_t pg_offset = sectp->filepos & ~(pagesize - 1);
-      size_t map_length = info->size + sectp->filepos - pg_offset;
+      off_t filePos = (off_t)sectp->filepos+((abfd->my_archive == NULL)?0:abfd->origin);
+      off_t pg_offset =  filePos & ~((off_t)pagesize - 1);
+      size_t map_length = info->size + filePos - pg_offset;
       caddr_t retbuf = bfd_mmap (abfd, 0, map_length, PROT_READ,
                                  MAP_PRIVATE, pg_offset);
 
       if (retbuf != MAP_FAILED)
         {
           info->was_mmapped = 1;
-          info->buffer = retbuf + (sectp->filepos & (pagesize - 1)) ;
+          info->buffer = retbuf + (filePos - pg_offset) ;
 #if HAVE_POSIX_MADVISE
           posix_madvise (retbuf, map_length, POSIX_MADV_WILLNEED);
 #endif