Index: contrib/gdb/gdb/arch-utils.c
===================================================================
--- contrib/gdb/gdb/arch-utils.c
+++ contrib/gdb/gdb/arch-utils.c
@@ -45,7 +45,7 @@
 {
   char *registers = deprecated_grub_regcache_for_registers (regcache);
   bfd_byte *buf = valbuf;
-  DEPRECATED_EXTRACT_RETURN_VALUE (type, registers, buf); /* OK */
+  DEPRECATED_EXTRACT_RETURN_VALUE (type, registers, (char*)buf); /* OK */
 }
 
 /* Implementation of store return value that grubs the register cache.
@@ -57,7 +57,7 @@
   bfd_byte *b = alloca (TYPE_LENGTH (type));
   gdb_assert (regcache == current_regcache);
   memcpy (b, buf, TYPE_LENGTH (type));
-  DEPRECATED_STORE_RETURN_VALUE (type, b);
+  DEPRECATED_STORE_RETURN_VALUE (type, (char*)b);
 }
 
 
Index: contrib/gdb/gdb/ax-gdb.c
===================================================================
--- contrib/gdb/gdb/ax-gdb.c
+++ contrib/gdb/gdb/ax-gdb.c
@@ -743,6 +743,9 @@
     case TYPE_CODE_ENUM:
       value->type = builtin_type_int;
       break;
+    
+    default:
+      break;
     }
 
   /* If the value is an lvalue, dereference it.  */
Index: contrib/gdb/gdb/breakpoint.c
===================================================================
--- contrib/gdb/gdb/breakpoint.c
+++ contrib/gdb/gdb/breakpoint.c
@@ -2647,7 +2647,7 @@
     /* Is this a catchpoint of a load or unload?  If so, did we
        get a load or unload of the specified library?  If not,
        ignore it. */
-    if ((b->type == bp_catch_load)
+    if (b->type == bp_catch_load)
 #if defined(SOLIB_HAVE_LOAD_EVENT)
 	&& (!SOLIB_HAVE_LOAD_EVENT (PIDGET (inferior_ptid))
 	    || ((b->dll_pathname != NULL)
@@ -2656,10 +2656,10 @@
 			      PIDGET (inferior_ptid)))
 		    != 0)))
 #endif
-      )
+      
       continue;
 
-    if ((b->type == bp_catch_unload)
+    if (b->type == bp_catch_unload)
 #if defined(SOLIB_HAVE_UNLOAD_EVENT)
 	&& (!SOLIB_HAVE_UNLOAD_EVENT (PIDGET (inferior_ptid))
 	    || ((b->dll_pathname != NULL)
@@ -2668,7 +2668,7 @@
 			      PIDGET (inferior_ptid)))
 		    != 0)))
 #endif
-      )
+      
       continue;
 
     if ((b->type == bp_catch_fork)
@@ -5543,7 +5543,6 @@
       sal = sals.sals[i];
       if (find_pc_partial_function (sal.pc, (char **) NULL, &low, &high))
 	{
-	  break_string;
 	  if (extra_args_len)
 	    break_string = xstrprintf ("*0x%s %s", paddr_nz (high),
 				       extra_args);