[PATCH] Fix IRIX compilation failure in solib-irix.c (take 2)

[Roger Sayle <roger at eyesopen dot com>]

Hi Dan,

On Mon, 24 Jul 2006, Daniel Jacobowitz wrote:
> Would it work to (A) add ".b" to the end of the expressions, and
> (B) change gdb_int32_bytes and gdb_int64_bytes to use gdb_byte?
> We try to avoid these casts; they're usually symptomatic of a type
> problem elsewhere.

Ah, clever.  Yep, that fixes the build problem on IRIX for me.
The following patch has been tested by building on mips-sgi-irix6.5.
Many thanks for the suggestion.


2006-07-24  Roger Sayle  <roger@eyesopen.com>
	    Daniel Jacobowitz  <dan@codesourcery.com>

	* solib-irix.c (gdb_int32_bytes): Use gdb_byte instead of char.
	(gdb_int64_bytes): Likewise.
	(fetch_lm_info): Use .b fields of gdb_int32_bytes and gdb_int64_bytes
	as first argument to extract_unsigned_integer to silence compiler
	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	24 Jul 2006 21:45:20 -0000
*************** struct lm_info
*** 62,73 ****

  typedef struct
  {
!   char b[4];
  }
  gdb_int32_bytes;
  typedef struct
  {
!   char b[8];
  }
  gdb_int64_bytes;

--- 62,73 ----

  typedef struct
  {
!   gdb_byte b[4];
  }
  gdb_int32_bytes;
  typedef struct
  {
!   gdb_byte b[8];
  }
  gdb_int64_bytes;

*************** 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,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.b, 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))
      {
--- 168,174 ----
  	- extract_mips_address (&obj_buf[248], 4);

      }
!   else if (extract_unsigned_integer (buf.oi32.oi_size.b,
  				     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))
      {
--- 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.b,
  						  sizeof (buf.oi32.
  							  oi_pathname_len));
      }
!   else if (extract_unsigned_integer (buf.oi64.oi_size.b,
  				     sizeof (buf.oi64.oi_size))
  	   == sizeof (buf.oi64))
      {
*************** fetch_lm_info (CORE_ADDR addr)
*** 212,218 ****
  				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));
      }
--- 212,218 ----
  				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.b,
  						  sizeof (buf.oi64.
  							  oi_pathname_len));
      }


Roger
--

Attachment: patchg3.txt
Description: Text document