Merge GDB 7.5.1

gdb/auxv.c

Index: gdb/auxv.c
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 23d1480689e2bca3c0119e52d5d6b9d1e209cc12..12dcb8929d0e02730db41acc08a365af988cb71e 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -445,6 +445,10 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
 	  TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec);
 	  TAG (AT_SYSINFO, _("Special system info/entry points"), hex);
 	  TAG (AT_SYSINFO_EHDR, _("System-supplied DSO's ELF header"), hex);
+	  TAG (AT_L1I_CACHESHAPE, _("L1 Instruction cache information"), hex);
+	  TAG (AT_L1D_CACHESHAPE, _("L1 Data cache information"), hex);
+	  TAG (AT_L2_CACHESHAPE, _("L2 cache information"), hex);
+	  TAG (AT_L3_CACHESHAPE, _("L3 cache information"), hex);
 	  TAG (AT_SUN_UID, _("Effective user ID"), dec);
 	  TAG (AT_SUN_RUID, _("Real user ID"), dec);
 	  TAG (AT_SUN_GID, _("Effective group ID"), dec);
@@ -483,7 +487,7 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
 
 	    get_user_print_options (&opts);
 	    if (opts.addressprint)
-	      fprintf_filtered (file, "%s", paddress (target_gdbarch, val));
+	      fprintf_filtered (file, "%s ", paddress (target_gdbarch, val));
 	    val_print_string (builtin_type (target_gdbarch)->builtin_char,
 			      NULL, val, -1, file, &opts);
 	    fprintf_filtered (file, "\n");