* gc++filt.m4: New file.

[deliverable/binutils-gdb.git] / gdb / coff-pe-read.c

diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index 8087430b3ea69336622268aee6c46dd0bcb6128b..3e2b89c3283ceb4bb3603f4a537e7b92f72c07cd 100644 (file)
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -2,7 +2,7 @@
    convert to internal format, for GDB. Used as a last resort if no
    debugging symbols recognized.
 
-   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -108,7 +108,6 @@ add_pe_exported_sym (char *sym_name,
 
   char *qualified_name = 0;
   int dll_name_len = strlen (dll_name);
-  int count;
 
   /* Generate a (hopefully unique) qualified name using the first part
      of the dll name, e.g. KERNEL32!AddAtomA. This matches the style
@@ -191,6 +190,8 @@ read_pe_exported_syms (struct objfile *objfile)
   unsigned char *expdata, *erva;
   unsigned long name_rvas, ordinals, nexp, ordbase;
   char *dll_name;
+  int is_pe64 = 0;
+  int is_pe32 = 0;
 
   /* Array elements are for text, data and bss in that order
      Initialization with start_rva > end_rva guarantees that
@@ -205,26 +206,44 @@ read_pe_exported_syms (struct objfile *objfile)
 
   char const *target = bfd_get_target (objfile->obfd);
 
-  if ((strcmp (target, "pe-i386") != 0) && (strcmp (target, "pei-i386") != 0))
+  is_pe64 = (strcmp (target, "pe-x86-64") == 0
+            || strcmp (target, "pei-x86-64") == 0);
+  is_pe32 = (strcmp (target, "pe-i386") == 0
+            || strcmp (target, "pei-i386") == 0
+            || strcmp (target, "pe-arm-wince-little") == 0
+            || strcmp (target, "pei-arm-wince-little") == 0);
+
+  if (!is_pe32 && !is_pe64)
     {
-      /* This is not an i386 format file. Abort now, because the code
-         is untested on anything else. *FIXME* test on further
-         architectures and loosen or remove this test. */
+      /* This is not a recognized PE format file.  Abort now, because
+        the code is untested on anything else.  *FIXME* test on
+        further architectures and loosen or remove this test. */
       return;
     }
 
   /* Get pe_header, optional header and numbers of export entries.  */
   pe_header_offset = pe_get32 (dll, 0x3c);
   opthdr_ofs = pe_header_offset + 4 + 20;
-  num_entries = pe_get32 (dll, opthdr_ofs + 92);
+  if (is_pe64)
+    num_entries = pe_get32 (dll, opthdr_ofs + 108);
+  else
+    num_entries = pe_get32 (dll, opthdr_ofs + 92);
 
   if (num_entries < 1)         /* No exports.  */
     {
       return;
     }
 
-  export_rva = pe_get32 (dll, opthdr_ofs + 96);
-  export_size = pe_get32 (dll, opthdr_ofs + 100);
+  if (is_pe64)
+    {
+      export_rva = pe_get32 (dll, opthdr_ofs + 112);
+      export_size = pe_get32 (dll, opthdr_ofs + 116);
+    }
+  else
+    {
+      export_rva = pe_get32 (dll, opthdr_ofs + 96);
+      export_size = pe_get32 (dll, opthdr_ofs + 100);
+    }
   nsections = pe_get16 (dll, pe_header_offset + 4 + 2);
   secptr = (pe_header_offset + 4 + 20 +
            pe_get16 (dll, pe_header_offset + 4 + 16));
@@ -263,7 +282,6 @@ read_pe_exported_syms (struct objfile *objfile)
       unsigned long secptr1 = secptr + 40 * i;
       unsigned long vsize = pe_get32 (dll, secptr1 + 8);
       unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-      unsigned long flags = pe_get32 (dll, secptr1 + 36);
       char sec_name[9];
       int sectix;