X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Felf-linux-core.h;h=db635f4abbad6d115253eb588d40e4c8baa864db;hb=957b1d8f2ff6c3fdf8f0fc00ab5e2ac9f82254a9;hp=20eef9ab3a72710173cd4f1d2ce0306a43ffb03d;hpb=a2f63b2e7a5da01ff828b45c7e0e57265ee24131;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/elf-linux-core.h b/bfd/elf-linux-core.h
index 20eef9ab3a..db635f4abb 100644
--- a/bfd/elf-linux-core.h
+++ b/bfd/elf-linux-core.h
@@ -1,5 +1,5 @@
 /* Definitions for PRPSINFO structures under ELF on GNU/Linux.
-   Copyright (C) 2013-2017 Free Software Foundation, Inc.
+   Copyright (C) 2013-2021 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -45,8 +45,8 @@ struct elf_external_linux_prpsinfo32_ugid32
     char pr_ppid[4];
     char pr_pgrp[4];
     char pr_sid[4];
-    char pr_fname[16];			/* Filename of executable.  */
-    char pr_psargs[80];			/* Initial part of arg list.  */
+    char pr_fname[16] ATTRIBUTE_NONSTRING;  /* Filename of executable.  */
+    char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list.  */
   };
 
 /* Helper function to copy an elf_internal_linux_prpsinfo in host
@@ -97,8 +97,8 @@ struct elf_external_linux_prpsinfo32_ugid16
     char pr_ppid[4];
     char pr_pgrp[4];
     char pr_sid[4];
-    char pr_fname[16];			/* Filename of executable.  */
-    char pr_psargs[80];			/* Initial part of arg list.  */
+    char pr_fname[16] ATTRIBUTE_NONSTRING;  /* Filename of executable.  */
+    char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list.  */
   };
 
 /* Helper function to copy an elf_internal_linux_prpsinfo in host
@@ -129,10 +129,14 @@ swap_linux_prpsinfo32_ugid16_out
    ABI-defined, thus we choose to use char arrays here in order to
    avoid dealing with different types in different architectures.
 
+   This is the variant for targets which use a 32-bit data type for
+   UID and GID, as most Linux ports do.  The SH64 port uses a 16-bit
+   data type instead; see below for the alternative variant.
+
    This structure will ultimately be written in the corefile's note
    section, as the PRPSINFO.  */
 
-struct elf_external_linux_prpsinfo64
+struct elf_external_linux_prpsinfo64_ugid32
   {
     char pr_state;			/* Numeric process state.  */
     char pr_sname;			/* Char for pr_state.  */
@@ -146,17 +150,18 @@ struct elf_external_linux_prpsinfo64
     char pr_ppid[4];
     char pr_pgrp[4];
     char pr_sid[4];
-    char pr_fname[16];			/* Filename of executable.  */
-    char pr_psargs[80];			/* Initial part of arg list.  */
+    char pr_fname[16] ATTRIBUTE_NONSTRING;  /* Filename of executable.  */
+    char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list.  */
   };
 
 /* Helper function to copy an elf_internal_linux_prpsinfo in host
-   endian to an elf_external_linux_prpsinfo64 in target endian.  */
+   endian to an elf_external_linux_prpsinfo64_ugid32 in target endian.  */
 
 static inline void
-swap_linux_prpsinfo64_out (bfd *obfd,
-			   const struct elf_internal_linux_prpsinfo *from,
-			   struct elf_external_linux_prpsinfo64 *to)
+swap_linux_prpsinfo64_ugid32_out
+  (bfd *obfd,
+   const struct elf_internal_linux_prpsinfo *from,
+   struct elf_external_linux_prpsinfo64_ugid32 *to)
 {
   bfd_put_8 (obfd, from->pr_state, &to->pr_state);
   bfd_put_8 (obfd, from->pr_sname, &to->pr_sname);
@@ -173,4 +178,57 @@ swap_linux_prpsinfo64_out (bfd *obfd,
   strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs));
 }
 
+/* External 64-bit structure for PRPSINFO.  This structure is
+   ABI-defined, thus we choose to use char arrays here in order to
+   avoid dealing with different types in different architectures.
+
+   This is the variant for the SH64 port which uses a 16-bit data
+   type for UID and GID.  Most Linux ports use a 32-bit data type
+   instead; see above for the alternative variant.
+
+   This structure will ultimately be written in the corefile's note
+   section, as the PRPSINFO.  */
+
+struct elf_external_linux_prpsinfo64_ugid16
+  {
+    char pr_state;			/* Numeric process state.  */
+    char pr_sname;			/* Char for pr_state.  */
+    char pr_zomb;			/* Zombie.  */
+    char pr_nice;			/* Nice val.  */
+    char gap[4];
+    char pr_flag[8];			/* Flags.  */
+    char pr_uid[2];
+    char pr_gid[2];
+    char pr_pid[4];
+    char pr_ppid[4];
+    char pr_pgrp[4];
+    char pr_sid[4];
+    char pr_fname[16] ATTRIBUTE_NONSTRING;  /* Filename of executable.  */
+    char pr_psargs[80] ATTRIBUTE_NONSTRING; /* Initial part of arg list.  */
+  };
+
+/* Helper function to copy an elf_internal_linux_prpsinfo in host
+   endian to an elf_external_linux_prpsinfo64_ugid16 in target endian.  */
+
+static inline void
+swap_linux_prpsinfo64_ugid16_out
+  (bfd *obfd,
+   const struct elf_internal_linux_prpsinfo *from,
+   struct elf_external_linux_prpsinfo64_ugid16 *to)
+{
+  bfd_put_8 (obfd, from->pr_state, &to->pr_state);
+  bfd_put_8 (obfd, from->pr_sname, &to->pr_sname);
+  bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb);
+  bfd_put_8 (obfd, from->pr_nice, &to->pr_nice);
+  bfd_put_64 (obfd, from->pr_flag, to->pr_flag);
+  bfd_put_16 (obfd, from->pr_uid, to->pr_uid);
+  bfd_put_16 (obfd, from->pr_gid, to->pr_gid);
+  bfd_put_32 (obfd, from->pr_pid, to->pr_pid);
+  bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid);
+  bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp);
+  bfd_put_32 (obfd, from->pr_sid, to->pr_sid);
+  strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname));
+  strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs));
+}
+
 #endif