diff options
| -rw-r--r-- | sys/compat/freebsd32/freebsd32.h | 26 | ||||
| -rw-r--r-- | sys/mips/include/reg.h | 4 | ||||
| -rw-r--r-- | sys/powerpc/include/reg.h | 4 | ||||
| -rw-r--r-- | sys/sparc64/include/reg.h | 6 | ||||
| -rw-r--r-- | sys/sys/procfs.h | 25 | ||||
| -rw-r--r-- | sys/x86/include/reg.h | 1 | ||||
| -rw-r--r-- | usr.bin/gcore/elf32core.c | 18 |
7 files changed, 38 insertions, 46 deletions
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index ed3df7ac0ee5..982b44e0a1ad 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -243,32 +243,6 @@ struct i386_ldt_args32 { uint32_t num; }; -/* - * Alternative layouts for <sys/procfs.h> - */ -struct prstatus32 { - int pr_version; - u_int pr_statussz; - u_int pr_gregsetsz; - u_int pr_fpregsetsz; - int pr_osreldate; - int pr_cursig; - pid_t pr_pid; - struct reg32 pr_reg; -}; - -struct prpsinfo32 { - int pr_version; - u_int pr_psinfosz; - char pr_fname[PRFNAMESZ+1]; - char pr_psargs[PRARGSZ+1]; -}; - -struct thrmisc32 { - char pr_tname[MAXCOMLEN+1]; - u_int _pad; -}; - struct mq_attr32 { int mq_flags; int mq_maxmsg; diff --git a/sys/mips/include/reg.h b/sys/mips/include/reg.h index c240506f7896..0dc36c6b3204 100644 --- a/sys/mips/include/reg.h +++ b/sys/mips/include/reg.h @@ -70,7 +70,7 @@ struct dbreg { unsigned long junk; }; -#ifdef COMPAT_FREEBSD32 +#ifdef __LP64__ /* Must match struct trapframe */ struct reg32 { uint32_t r_regs[NUMSAVEREGS]; @@ -83,6 +83,8 @@ struct fpreg32 { struct dbreg32 { uint32_t junk; }; + +#define __HAVE_REG32 #endif #ifdef _KERNEL diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h index f6c17226648a..e77625ab8ddf 100644 --- a/sys/powerpc/include/reg.h +++ b/sys/powerpc/include/reg.h @@ -39,7 +39,7 @@ struct dbreg { unsigned int junk; }; -#ifdef COMPAT_FREEBSD32 +#ifdef __LP64__ /* Must match struct trapframe */ struct reg32 { int32_t fixreg[32]; @@ -61,6 +61,8 @@ struct vmxreg32 { struct dbreg32 { struct dbreg data; }; + +#define __HAVE_REG32 #endif #ifdef _KERNEL diff --git a/sys/sparc64/include/reg.h b/sys/sparc64/include/reg.h index d2241861d209..8a4dd2acb9e5 100644 --- a/sys/sparc64/include/reg.h +++ b/sys/sparc64/include/reg.h @@ -98,6 +98,12 @@ struct dbreg { int dummy; }; +/* + * NB: sparcv8 binaries are not supported even though this header + * defines the relevant structures. + */ +#define __HAVE_REG32 + #ifdef _KERNEL /* * XXX these interfaces are MI, so they should be declared in a MI place. diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h index cab9c30e44a8..7066a9891a94 100644 --- a/sys/sys/procfs.h +++ b/sys/sys/procfs.h @@ -89,4 +89,29 @@ typedef struct thrmisc { typedef uint64_t psaddr_t; /* An address in the target process. */ +#ifdef __HAVE_REG32 +typedef struct prstatus32 { + int32_t pr_version; + uint32_t pr_statussz; + uint32_t pr_gregsetsz; + uint32_t pr_fpregsetsz; + int32_t pr_osreldate; + int32_t pr_cursig; + int32_t pr_pid; + struct reg32 pr_reg; +} prstatus32_t; + +typedef struct prpsinfo32 { + int32_t pr_version; + uint32_t pr_psinfosz; + char pr_fname[PRFNAMESZ+1]; + char pr_psargs[PRARGSZ+1]; +} prpsinfo32_t; + +struct thrmisc32 { + char pr_tname[MAXCOMLEN+1]; + uint32_t _pad; +}; +#endif /* __HAVE_REG32 */ + #endif /* _SYS_PROCFS_H_ */ diff --git a/sys/x86/include/reg.h b/sys/x86/include/reg.h index 56668ea82d6a..a1452ccf5717 100644 --- a/sys/x86/include/reg.h +++ b/sys/x86/include/reg.h @@ -91,6 +91,7 @@ #define __fpreg64 fpreg #define __dbreg32 dbreg32 #define __dbreg64 dbreg +#define __HAVE_REG32 #endif /* diff --git a/usr.bin/gcore/elf32core.c b/usr.bin/gcore/elf32core.c index de48500a1f71..d13a4efdced6 100644 --- a/usr.bin/gcore/elf32core.c +++ b/usr.bin/gcore/elf32core.c @@ -8,24 +8,6 @@ #include <sys/procfs.h> -struct prpsinfo32 { - int pr_version; - u_int pr_psinfosz; - char pr_fname[PRFNAMESZ+1]; - char pr_psargs[PRARGSZ+1]; -}; - -struct prstatus32 { - int pr_version; - u_int pr_statussz; - u_int pr_gregsetsz; - u_int pr_fpregsetsz; - int pr_osreldate; - int pr_cursig; - pid_t pr_pid; - struct reg32 pr_reg; -}; - #define ELFCORE_COMPAT_32 1 #include "elfcore.c" |