From d0d8eb4328dbc619a6a19f81c722aa06828766bf Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 25 Sep 2018 16:49:25 +0000 Subject: Unify more sys/procfs.h headers. This patch continues the process of unifying sys/procfs.h headers for architectures using the Linux kernel. A bits/procfs-id.h header is added to define __pr_uid_t and __pr_gid_t for the types of pr_uid and pr_gid; the default version of this header uses unsigned int. On some architectures, sys/procfs.h has copies of 32-bit structures for 64-bit builds; those move into a bits/procfs-extra.h header (they can't go in bits/procfs.h because they have to come *after* other declarations from sys/procfs.h). Given appropriate versions of these headers, six more architectures can then move to providing only bits/procfs*.h without duplicating the rest of the contents of sys/procfs.h. Only alpha needs a further bits/ header to be added before it can stop having its own sys/procfs.h. Tested for x86_64 and x86, and with build-many-glibcs.py. * sysdeps/unix/sysv/linux/sys/procfs.h: Include and . (struct elf_prpsinfo): Use __pr_uid_t and __pr_gid_t as types of pr_uid and pr_gid. * sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc] (sysdep_headers): Add bits/procfs-id.h and bits/procfs-extra.h. * sysdeps/unix/sysv/linux/bits/procfs-extra.h: New file. * sysdeps/unix/sysv/linux/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs-extra.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs-extra.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs-id.h: Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs.h: Likewise. * sysdeps/unix/sysv/linux/arm/sys/procfs.h: Remove file. * sysdeps/unix/sysv/linux/m68k/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/s390/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sh/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/x86/sys/procfs.h: Likewise. --- sysdeps/unix/sysv/linux/sys/procfs.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sys') diff --git a/sysdeps/unix/sysv/linux/sys/procfs.h b/sysdeps/unix/sysv/linux/sys/procfs.h index 759570c..6ef577e 100644 --- a/sysdeps/unix/sysv/linux/sys/procfs.h +++ b/sysdeps/unix/sysv/linux/sys/procfs.h @@ -39,6 +39,10 @@ types needed. */ #include +/* bits/procfs-id.h must define __pr_uid_t and __pr_gid_t, the types + of pr_uid and pr_gid. */ +#include + __BEGIN_DECLS /* Signal info. */ @@ -84,8 +88,8 @@ struct elf_prpsinfo char pr_zomb; /* Zombie. */ char pr_nice; /* Nice val. */ unsigned long int pr_flag; /* Flags. */ - unsigned int pr_uid; - unsigned int pr_gid; + __pr_uid_t pr_uid; + __pr_gid_t pr_gid; int pr_pid, pr_ppid, pr_pgrp, pr_sid; /* Lots missing */ char pr_fname[16]; /* Filename of executable. */ @@ -113,4 +117,8 @@ typedef struct elf_prpsinfo prpsinfo_t; __END_DECLS +/* On some architectures, provide other-ABI variants of the above + types. */ +#include + #endif /* sys/procfs.h. */ -- cgit v1.1