[PATCH] Fix IRIX compilation failure in solib-irix.c

Roger Sayle
2006-07-21T05:21:33Z

Building mainline gdb on mips-sgi-irix6.5 during the compilation of
gdb/solib-irix.c due to the interaction of -Werror and the compilation
warnings caused by the implicit cases of the first argument in the
calls to extract_unsigned_integer.

The obvious fix is to cast the problematic arguments to gdb_byte*
as expected by extract_unsigned_integer. This allows the build of
gdb to complete without MIPS/IRIX.

Ok for mainline? Although I have a gdb copyright assignment on file,
I don't have write access to src, so I'd appreciate it if someone could
commit this for me. Thanks in advance,

2006-07-20 Roger Sayle <roger@eyesopen.com>

* solib-irix.c (fetch_lm_info): Cast the first argument of
extract_unsigned_integer to "const gdb_byte*" to silence warnings.

Index: solib-irix.c
===================================================================
RCS file: /cvs/src/src/gdb/solib-irix.c,v
retrieving revision 1.10
diff -c -3 -p -r1.10 solib-irix.c
*** solib-irix.c 18 Apr 2006 19:20:06 -0000 1.10
--- solib-irix.c 21 Jul 2006 05:03:31 -0000
*************** fetch_lm_info (CORE_ADDR addr)
*** 152,158 ****
being at the end of a page or the like.) */
read_memory (addr, (char *) &buf, sizeof (buf.ol32));

! if (extract_unsigned_integer (&buf.magic, sizeof (buf.magic)) != 0xffffffff)
{
/* Use buf.ol32... */
char obj_buf[432];
--- 152,160 ----
being at the end of a page or the like.) */
read_memory (addr, (char *) &buf, sizeof (buf.ol32));

! if (extract_unsigned_integer ((const gdb_byte*) &buf.magic,
! sizeof (buf.magic))
! != 0xffffffff)
{
/* Use buf.ol32... */
char obj_buf[432];
*************** fetch_lm_info (CORE_ADDR addr)
*** 168,174 ****
- extract_mips_address (&obj_buf[248], 4);

}
! else if (extract_unsigned_integer (&buf.oi32.oi_size,
sizeof (buf.oi32.oi_size))
== sizeof (buf.oi32))
{
--- 170,176 ----
- extract_mips_address (&obj_buf[248], 4);

}
! else if (extract_unsigned_integer ((const gdb_byte *) &buf.oi32.oi_size,
sizeof (buf.oi32.oi_size))
== sizeof (buf.oi32))
{
*************** fetch_lm_info (CORE_ADDR addr)
*** 188,198 ****
sizeof (buf.oi32.oi_orig_ehdr));
li.pathname_addr = extract_mips_address (&buf.oi32.oi_pathname,
sizeof (buf.oi32.oi_pathname));
! li.pathname_len = extract_unsigned_integer (&buf.oi32.oi_pathname_len,
! sizeof (buf.oi32.
! oi_pathname_len));
}
! else if (extract_unsigned_integer (&buf.oi64.oi_size,
sizeof (buf.oi64.oi_size))
== sizeof (buf.oi64))
{
--- 190,200 ----
sizeof (buf.oi32.oi_orig_ehdr));
li.pathname_addr = extract_mips_address (&buf.oi32.oi_pathname,
sizeof (buf.oi32.oi_pathname));
! li.pathname_len = extract_unsigned_integer
! ((const gdb_byte *) &buf.oi32.oi_pathname_len,
! sizeof (buf.oi32.oi_pathname_len));
}
! else if (extract_unsigned_integer ((const gdb_byte *) &buf.oi64.oi_size,
sizeof (buf.oi64.oi_size))
== sizeof (buf.oi64))
{
*************** fetch_lm_info (CORE_ADDR addr)
*** 212,220 ****
sizeof (buf.oi64.oi_orig_ehdr));
li.pathname_addr = extract_mips_address (&buf.oi64.oi_pathname,
sizeof (buf.oi64.oi_pathname));
! li.pathname_len = extract_unsigned_integer (&buf.oi64.oi_pathname_len,
! sizeof (buf.oi64.
! oi_pathname_len));
}
else
{
--- 214,222 ----
sizeof (buf.oi64.oi_orig_ehdr));
li.pathname_addr = extract_mips_address (&buf.oi64.oi_pathname,
sizeof (buf.oi64.oi_pathname));
! li.pathname_len = extract_unsigned_integer
! ((const gdb_byte *) &buf.oi64.oi_pathname_len,
! sizeof (buf.oi64.oi_pathname_len));
}
else
{

Roger
--