opcodes: bfin: simplify field width processing and fix build warnings

[deliverable/binutils-gdb.git] / gdb / solib-spu.c

diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index f8073dcc6f016a35fad2c92ff0847d7a359a4b36..150ff0feaec412b01d972300c282c3bde948a209 100644 (file)
--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -1,5 +1,5 @@
 /* Cell SPU GNU/Linux support -- shared library handling.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    Contributed by Ulrich Weigand <uweigand@de.ibm.com>.
 
@@ -19,6 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "solib-spu.h"
 #include "gdbcore.h"
 #include "gdb_string.h"
 #include "gdb_assert.h"
@@ -85,13 +86,13 @@ spu_skip_standalone_loader (void)
         this will step past the first instruction of the stand-alone SPE
         executable loader, but we don't care about that.  */
 
-      inferior_thread ()->in_infcall = 1;   /* Suppress MI messages.  */
+      inferior_thread ()->control.in_infcall = 1; /* Suppress MI messages.  */
 
       target_resume (inferior_ptid, 1, TARGET_SIGNAL_0);
       target_wait (minus_one_ptid, &ws, 0);
       set_executing (minus_one_ptid, 0);
 
-      inferior_thread ()->in_infcall = 0;
+      inferior_thread ()->control.in_infcall = 0;
     }
 }
 
@@ -126,8 +127,9 @@ append_ocl_sos (struct so_list **link_ptr)
                  new = XZALLOC (struct so_list);
 
                  /* Encode FD and object ID in path name.  */
-                 xsnprintf (new->so_name, sizeof new->so_name, "@0x%lx <%d>",
-                            data, SPUADDR_SPU (*ocl_program_addr_base));
+                 xsnprintf (new->so_name, sizeof new->so_name, "@%s <%d>",
+                            hex_string (data),
+                            SPUADDR_SPU (*ocl_program_addr_base));
                  strcpy (new->so_original_name, new->so_name);
 
                  *link_ptr = new;
@@ -226,7 +228,7 @@ spu_current_sos (void)
       link_ptr = &new->next;
     }
 
-  /* Append OpenCL sos. */
+  /* Append OpenCL sos.  */
   append_ocl_sos (link_ptr);
 
   return head;
@@ -540,6 +542,9 @@ spu_solib_loaded (struct so_list *so)
     }
 }
 
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_spu_solib;
+
 void
 _initialize_spu_solib (void)
 {