gdb: Fix build failure in xml-tdesc.c without expat.

[deliverable/binutils-gdb.git] / gdb / xcoffread.c

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 0d497514cd9a670aed9c6953148e295722e03ad7..c67094980a9ff02e8b97e2bf8dc8cb92b3131401 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -1,5 +1,5 @@
 /* Read AIX xcoff symbol tables and convert to internal format, for GDB.
-   Copyright (C) 1986-2015 Free Software Foundation, Inc.
+   Copyright (C) 1986-2016 Free Software Foundation, Inc.
    Derived from coffread.c, dbxread.c, and a lot of hacking.
    Contributed by IBM Corporation.
 
@@ -159,11 +159,14 @@ static const struct dwarf2_debug_sections dwarf2_xcoff_names = {
   { ".dwabrev", NULL },
   { ".dwline", NULL },
   { ".dwloc", NULL },
-  { NULL, NULL }, /* debug_macinfo */
-  { NULL, NULL }, /* debug_macro */
+  /* AIX XCOFF defines one, named DWARF section for macro debug information.
+     XLC does not generate debug_macinfo for DWARF4 and below.
+     The section is assigned to debug_macro for DWARF5 and above. */
+  { NULL, NULL },
+  { ".dwmac", NULL },
   { ".dwstr", NULL },
   { ".dwrnges", NULL },
-  { NULL, NULL }, /* debug_types */
+  { ".dwpbtyp", NULL },
   { NULL, NULL }, /* debug_addr */
   { ".dwframe", NULL },
   { NULL, NULL }, /* eh_frame */
@@ -1079,7 +1082,8 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst)
              {
                char *p;
 
-               p = obstack_alloc (&objfile->objfile_obstack, E_SYMNMLEN + 1);
+               p = (char *) obstack_alloc (&objfile->objfile_obstack,
+                                           E_SYMNMLEN + 1);
                strncpy (p, cs->c_name, E_SYMNMLEN);
                p[E_SYMNMLEN] = '\0';
                cs->c_name = p;
@@ -1561,7 +1565,8 @@ process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile)
          will be patched with the type from its stab entry later on in
          patch_block_stabs (), unless the file was compiled without -g.  */
 
-      SYMBOL_SET_LINKAGE_NAME (sym, SYMNAME_ALLOC (name, symname_alloced));
+      SYMBOL_SET_LINKAGE_NAME (sym, ((const char *)
+                                    SYMNAME_ALLOC (name, symname_alloced)));
       SYMBOL_TYPE (sym) = objfile_type (objfile)->nodebug_text_symbol;
 
       SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK;
@@ -2133,7 +2138,8 @@ swap_sym (struct internal_syment *symbol, union internal_auxent *aux,
             into the minimal symbols.  */
          char *p;
 
-         p = obstack_alloc (&objfile->objfile_obstack, E_SYMNMLEN + 1);
+         p = (char *) obstack_alloc (&objfile->objfile_obstack,
+                                     E_SYMNMLEN + 1);
          strncpy (p, symbol->n_name, E_SYMNMLEN);
          p[E_SYMNMLEN] = '\0';
          *name = p;
@@ -2375,13 +2381,12 @@ scan_xcoff_symtab (struct objfile *objfile)
                    if (first_fun_line_offset == 0 && symbol.n_numaux > 1)
                      first_fun_line_offset =
                        main_aux[0].x_sym.x_fcnary.x_fcn.x_lnnoptr;
-                     {
-                       record_minimal_symbol
-                         (namestring, symbol.n_value,
-                          sclass == C_HIDEXT ? mst_file_text : mst_text,
-                          symbol.n_scnum, objfile);
-                       misc_func_recorded = 1;
-                     }
+
+                   record_minimal_symbol
+                     (namestring, symbol.n_value,
+                      sclass == C_HIDEXT ? mst_file_text : mst_text,
+                      symbol.n_scnum, objfile);
+                   misc_func_recorded = 1;
                    break;
 
                  case XMC_GL:
@@ -2789,7 +2794,7 @@ scan_xcoff_symtab (struct objfile *objfile)
                if (! pst)
                  {
                    int name_len = p - namestring;
-                   char *name = xmalloc (name_len + 1);
+                   char *name = (char *) xmalloc (name_len + 1);
 
                    memcpy (name, namestring, name_len);
                    name[name_len] = '\0';
@@ -2812,7 +2817,7 @@ scan_xcoff_symtab (struct objfile *objfile)
                if (! pst)
                  {
                    int name_len = p - namestring;
-                   char *name = xmalloc (name_len + 1);
+                   char *name = (char *) xmalloc (name_len + 1);
 
                    memcpy (name, namestring, name_len);
                    name[name_len] = '\0';
@@ -2963,7 +2968,9 @@ xcoff_initial_scan (struct objfile *objfile, int symfile_flags)
            length = bfd_section_size (abfd, secp);
            if (length)
              {
-               debugsec = obstack_alloc (&objfile->objfile_obstack, length);
+               debugsec
+                 = (bfd_byte *) obstack_alloc (&objfile->objfile_obstack,
+                                               length);
 
                if (!bfd_get_full_section_contents (abfd, secp, &debugsec))
                  {
@@ -2983,7 +2990,7 @@ xcoff_initial_scan (struct objfile *objfile, int symfile_flags)
     error (_("Error reading symbols from %s: %s"),
           name, bfd_errmsg (bfd_get_error ()));
   size = coff_data (abfd)->local_symesz * num_symbols;
-  info->symtbl = obstack_alloc (&objfile->objfile_obstack, size);
+  info->symtbl = (char *) obstack_alloc (&objfile->objfile_obstack, size);
   info->symtbl_num_syms = num_symbols;
 
   val = bfd_bread (info->symtbl, size, abfd);