[PATCH] Correct decoding AUXV on NetBSD

[Kamil Rytarowski <n54@gmx.com>]

The type field is always 32bit. The value field reflects the size of
the register/pointer.

gdb/ChangeLog:

	* auxv.c (default_auxv_parse): Add new variable sizeof_auxv_type
	and use it in extract_unsigned_integer().
---
 gdb/ChangeLog | 5 +++++
 gdb/auxv.c    | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 04db5e76734..5a2eb8e3416 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-14  Kamil Rytarowski  <n54@gmx.com>
+
+	* auxv.c (default_auxv_parse): Add new variable sizeof_auxv_type
+	and use it in extract_unsigned_integer().
+
 2020-03-14  Kamil Rytarowski  <n54@gmx.com>

 	* m68k-bsd-nat.c (fetch_registers): New variable lwp and pass
diff --git a/gdb/auxv.c b/gdb/auxv.c
index c13d7a22eb9..a035034a920 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -258,6 +258,11 @@ default_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
 {
   const int sizeof_auxv_field = gdbarch_ptr_bit (target_gdbarch ())
 				/ TARGET_CHAR_BIT;
+#ifdef __NetBSD__
+  const int sizeof_auxv_type = sizeof(int32_t);
+#else
+  const int sizeof_auxv_type = sizeof_auxv_field;
+#endif
   const enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
   gdb_byte *ptr = *readptr;

@@ -267,7 +272,7 @@ default_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
   if (endptr - ptr < sizeof_auxv_field * 2)
     return -1;

-  *typep = extract_unsigned_integer (ptr, sizeof_auxv_field, byte_order);
+  *typep = extract_unsigned_integer (ptr, sizeof_auxv_type, byte_order);
   ptr += sizeof_auxv_field;
   *valp = extract_unsigned_integer (ptr, sizeof_auxv_field, byte_order);
   ptr += sizeof_auxv_field;
--
2.25.0