From a9df6b2252191b5e881a9dde984500b264181a54 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 14 Jan 2011 13:53:02 +0000 Subject: [PATCH] fix ARI warnings introduced by ia64-hpux patches gdb/ChangeLog: * ia64-hpux-nat.c (ia64_hpux_fetch_register): Remove trailing new-line at end of warning message. (ia64_hpux_store_register): Remove trailing new-line at end of error message. * ia64-hpux-tdep.c: Rephrase comment. * solib-ia64-hpux.c (struct dld_info): Change type of field dld_flags from "long long" to ULONGEST. --- gdb/ChangeLog | 10 ++++++++++ gdb/ia64-hpux-nat.c | 4 ++-- gdb/ia64-hpux-tdep.c | 10 +++++----- gdb/solib-ia64-hpux.c | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 13746fe0836..9178110d5e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2011-01-14 Joel Brobecker + + * ia64-hpux-nat.c (ia64_hpux_fetch_register): Remove trailing + new-line at end of warning message. + (ia64_hpux_store_register): Remove trailing new-line at end of + error message. + * ia64-hpux-tdep.c: Rephrase comment. + * solib-ia64-hpux.c (struct dld_info): Change type of field + dld_flags from "long long" to ULONGEST. + 2011-01-14 Pedro Alves * target.h (deprecated_child_ops): Delete declaration. diff --git a/gdb/ia64-hpux-nat.c b/gdb/ia64-hpux-nat.c index 32160aad612..b5c8b805a11 100644 --- a/gdb/ia64-hpux-nat.c +++ b/gdb/ia64-hpux-nat.c @@ -252,7 +252,7 @@ ia64_hpux_fetch_register (struct regcache *regcache, int regnum) buf = alloca (len * sizeof (gdb_byte)); status = ia64_hpux_read_register_from_save_state_t (offset, buf, len); if (status < 0) - warning (_("Failed to read register value for %s.\n"), + warning (_("Failed to read register value for %s."), gdbarch_register_name (gdbarch, regnum)); regcache_raw_supply (regcache, regnum, buf); @@ -312,7 +312,7 @@ ia64_hpux_store_register (const struct regcache *regcache, int regnum) status = ia64_hpux_write_register_to_saved_state_t (offset, buf, len); if (status < 0) - error (_("failed to write register value for %s.\n"), + error (_("failed to write register value for %s."), gdbarch_register_name (gdbarch, regnum)); } diff --git a/gdb/ia64-hpux-tdep.c b/gdb/ia64-hpux-tdep.c index c03a00e0f63..e90a45020eb 100644 --- a/gdb/ia64-hpux-tdep.c +++ b/gdb/ia64-hpux-tdep.c @@ -36,11 +36,11 @@ prior to the call, but this does not include stacked registers because they are seen by GDB as pseudo registers. - On Linux, these stacked registers can be saved by simply creating - a new register frame, or in other words by moving the BSP. But the - HP/UX kernel does not allow this. So we rely on this code instead, - that makes functions calls whose only purpose is to create new - register frames. + With Linux kernels, these stacked registers can be saved by simply + creating a new register frame, or in other words by moving the BSP. + But the HP/UX kernel does not allow this. So we rely on this code + instead, that makes functions calls whose only purpose is to create + new register frames. The array below is the result obtained after assembling the code shown below. It's an array of bytes in order to make it independent diff --git a/gdb/solib-ia64-hpux.c b/gdb/solib-ia64-hpux.c index 01d44a997fd..f6dd2dd27b4 100644 --- a/gdb/solib-ia64-hpux.c +++ b/gdb/solib-ia64-hpux.c @@ -310,7 +310,7 @@ ia64_hpux_find_start_vma (bfd *abfd, CORE_ADDR *text_start, for (i = 0; i < i_ehdrp->e_phnum; i++) { - if (bfd_bread ((PTR) & phdr, sizeof (phdr), abfd) != sizeof (phdr)) + if (bfd_bread (&phdr, sizeof (phdr), abfd) != sizeof (phdr)) error (_("failed to read segment %d in %s"), i, abfd->filename); if (phdr.p_flags & PF_X @@ -416,7 +416,7 @@ ia64_hpux_get_load_info_addr (void) struct dld_info { - long long dld_flags; + ULONGEST dld_flags; CORE_ADDR load_map; }; -- 2.30.2