Merge GDB 7.5.1

gdb/proc-utils.h

 /* Machine independent support for SVR4 /proc (process file system) for GDB.
    Copyright (C) 1999-2000, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
@@ skipping 11 matching lines @@
  * Pretty-print functions for /proc data 
  */
 
 extern void proc_prettyprint_why (unsigned long why, unsigned long what,
                                   int verbose);
 
 extern void proc_prettyprint_syscalls (sysset_t *sysset, int verbose);
 
 extern void proc_prettyprint_syscall (int num, int verbose);
 
-extern void proc_prettyprint_flags (unsigned long flags, int verbose);
+extern void proc_prettyprint_signalset (sigset_t *sigset, int verbose);
+
+extern void proc_prettyprint_signal (int signo, int verbose);
+
+extern void proc_prettyprint_faultset (fltset_t *fltset, int verbose);
+
+extern void proc_prettyprint_fault (int faultno, int verbose);
+
+extern void proc_prettyprint_actionset (struct sigaction *actions,
+                                        int verbose);
 
 extern void proc_prettyfprint_signalset (FILE *file, sigset_t *sigset,
                                          int verbose);
 
 extern void proc_prettyfprint_faultset (FILE *file, fltset_t *fltset,
                                         int verbose);
 
 extern void proc_prettyfprint_syscall (FILE *file, int num, int verbose);
 
 extern void proc_prettyfprint_signal (FILE *file, int signo, int verbose);
 
 extern void proc_prettyfprint_flags (FILE *file, unsigned long flags,
                                      int verbose);
 
 extern void proc_prettyfprint_why (FILE *file, unsigned long why, 
                                    unsigned long what, int verbose);
 
 extern void proc_prettyfprint_fault (FILE *file, int faultno, int verbose);
 
 extern void proc_prettyfprint_syscalls (FILE *file, sysset_t *sysset,
                                         int verbose);
 
 extern void proc_prettyfprint_status (long, int, int, int);
 
 
+/* From proc-flags.c */
+
+/*
+ * Pretty-print the prstatus flags.
+ */
+
+extern void proc_prettyprint_flags (unsigned long flags, int verbose);
+
+extern void proc_prettyfprint_flags (FILE *file, unsigned long flags,
+                                     int verbose);
+
+
 /* From proc-api.c */
 
 /*
  * Trace functions for /proc api.
  */
 
 extern  int   write_with_trace (int, void *, size_t, char *, int);
 extern  off_t lseek_with_trace (int, off_t,  int,    char *, int);
 extern  int   ioctl_with_trace (int, long, void *, char *, int);
 extern  pid_t wait_with_trace  (int *, char *, int);
@@ skipping 21 matching lines @@
 #define PROC_PRETTYFPRINT_STATUS(X,Y,Z,T) \
      proc_prettyfprint_status (X, Y, Z, T)
 
 /* Define the type (and more importantly the width) of the control
    word used to write to the /proc/PID/ctl file.  */
 #if defined (PROC_CTL_WORD_TYPE)
 typedef PROC_CTL_WORD_TYPE procfs_ctl_t;
 #else
 typedef long procfs_ctl_t;
 #endif