Tweeks from RDBrown to fix compiling on HP/UX using HP's compiler.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4af8517df43bc330354b67465e430efb7bff78f1..653c4daf98c1fe202e6fa808b3806462aeda16e3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2001-05-11  Andrew Cagney  <ac131313@redhat.com>
+
+       From 2001-03-26 Rodney Brown <RodneyBrown@mynd.com>
+       * config/pa/tm-hppa.h: Remove trigraph.
+       * hp-symtab-read.c (hpread_type_translate): Provide return value.
+       (hpread_read_struct_type): Remove trigraph. Add parameter in
+       `warning'.
+       (hpread_read_array_type): Provide return value.
+       (hpread_type_lookup): Avoid ambiguous `else'. Provide return
+       value.
+       * hppa-tdep.c (initialize_hp_cxx_exception_support): Remove
+       trigraph.
+
 2001-05-11  Jim Blandy  <jimb@redhat.com>
 
        * mips-tdep.c (mips_store_return_value,

diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index 65b2bbfed6b141a6fb81d4f8b8f8c38778c9ef0e..c3c320ee4663ce9950cc07de269eaf1696434ca7 100644 (file)
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -568,7 +568,7 @@ extern void hppa_pop_frame (void);
 #else /* defined PA_LEVEL_0 */
 
 /* This is the call dummy for a level 0 PA.  Level 0's don't have space
-   registers (or floating point??), so we skip all that inter-space call stuff,
+   registers (or floating point?), so we skip all that inter-space call stuff,
    and avoid touching the fp regs.
 
    call_dummy

diff --git a/gdb/hp-symtab-read.c b/gdb/hp-symtab-read.c
index 397ea5cb09f2523a2d0094df0fe73eea1386c4be..9898cfce7b6598eaa29dd8cade7eeddc296192ba 100644 (file)
--- a/gdb/hp-symtab-read.c
+++ b/gdb/hp-symtab-read.c
@@ -530,7 +530,7 @@ hpread_type_translate (dnttpointer typep)
   if (!typep.dntti.immediate)
     {
       error ("error in hpread_type_translate\n.");
-      return;
+      return FT_VOID;
     }
 
   switch (typep.dntti.type)
@@ -1780,7 +1780,7 @@ hpread_read_struct_type (dnttpointer hp_type, union dnttentry *dn_bufp,
              /* Enums -- will be handled by other code that takes care
                 of DNTT_TYPE_ENUM; here we see only DNTT_TYPE_MEMENUM so
                 it's not clear we could have handled them here at all. */
-             /* FUNC_TEMPLATE: is handled by other code (??). */
+             /* FUNC_TEMPLATE: is handled by other code (?). */
              /* MEMACCESS: modified access for inherited member. Not
                 sure what to do with this, ignoriing it at present. */
 
@@ -1863,7 +1863,8 @@ hpread_read_struct_type (dnttpointer hp_type, union dnttentry *dn_bufp,
        {
          /* neither field nor genfield ?? is this possible?? */
          /* pai:: FIXME walk to the next -- how? */
-         warning ("Internal error: unexpected DNTT kind %d encountered as field of struct");
+         warning ("Internal error: unexpected DNTT kind %d encountered as field of struct",
+                  fieldp->dblock.kind);
          warning ("Skipping remaining fields of struct");
          break;                /* get out of loop of fields */
        }
@@ -2199,7 +2200,7 @@ hpread_read_array_type (dnttpointer hp_type, union dnttentry *dn_bufp,
        (!dn_bufp->darray.arrayisbytes && !dn_bufp->darray.elemisbytes)))
     {
       warning ("error in hpread_array_type.\n");
-      return;
+      return NULL;
     }
   else if (dn_bufp->darray.arraylength == 0x7fffffff)
     {
@@ -2302,14 +2303,17 @@ hpread_type_lookup (dnttpointer hp_type, struct objfile *objfile)
 
   /* First see if it's a simple builtin type.  */
   if (hp_type.dntti.immediate)
-    /* If this is a template argument, the argument number is
-     * encoded in the bitlength. All other cases, just return
-     * GDB's representation of this fundamental type.
-     */
-    if (hp_type.dntti.type == HP_TYPE_TEMPLATE_ARG)
-      return hpread_get_nth_template_arg (objfile, hp_type.dntti.bitlength);
-    else
-      return lookup_fundamental_type (objfile, hpread_type_translate (hp_type));
+    {
+      /* If this is a template argument, the argument number is
+       * encoded in the bitlength. All other cases, just return
+       * GDB's representation of this fundamental type.
+       */
+      if (hp_type.dntti.type == HP_TYPE_TEMPLATE_ARG)
+       return hpread_get_nth_template_arg (objfile, hp_type.dntti.bitlength);
+      else
+       return lookup_fundamental_type (objfile,
+                                       hpread_type_translate (hp_type));
+    }
 
   /* Not a builtin type.  We'll have to read it in.  */
   if (hp_type.dnttp.index < LNTT_SYMCOUNT (objfile))
@@ -2425,7 +2429,7 @@ hpread_type_lookup (dnttpointer hp_type, struct objfile *objfile)
        else
          {
            complain (&hpread_type_lookup_complaint);
-           return;
+           return NULL;
          }
 
        if (dn_bufp->dblock.kind == DNTT_TYPE_STRUCT)

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index d6fa71cbf12a565d9b93f018b23f8861dfd8b96a..072b0a4b9163af4a5b070145c4434fff584d8243 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -4250,7 +4250,7 @@ initialize_hp_cxx_exception_support (void)
       if (!eh_notify_callback_addr)
        {
          /* We can get here either if there is no plabel in the export list
-            for the main image, or if something strange happened (??) */
+            for the main image, or if something strange happened (?) */
          warning ("Couldn't find a plabel (indirect function label) for the exception callback.");
          warning ("GDB will not be able to intercept exception events.");
          return 0;