Re: [PATCH] revised m32r target

[Andrew Cagney <ac131313@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

> 2003-07-28  Kei Sakamoto  <sakamoto.kei@renesas.com>
> 
>         * m32r-rom.c (m32r_upload_command): Use hostent only when 
>         gethostname succeeds, in order to avoid a compilation
>         warning.
>         * m32r-tdep.c (m32r_store_return_value): Add a cast to
>         remove a compiler warning.
> 
I've checked in all the attached.  Next I'll:
- commit src/configure change to gcc's master repository
- import everything to 6.0 branch.
Almost there!

Andrew


[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 4113 bytes --]

2003-08-01  Andrew Cagney  <cagney@redhat.com>

	* NEWS: Mention that m32r is multi-arch.
	From 2003-07-28 Kei Sakamoto <sakamoto.kei@renesas.com>:
	* configure.tgt: Recognize m32r-*-*.
	* config/m32r/tm-m32r.h: Delete file.
	* config/m32r/m32r.mt: New file.
	* m32r-rom.c (m32r_upload_command): Use hostent only when 
        gethostname succeeds, in order to avoid a compilation
        warning.
	* m32r-tdep.c (m32r_store_return_value): Add a cast to remove a
	compiler warning.

Index: NEWS
===================================================================
RCS file: /cvs/src/src/gdb/NEWS,v
retrieving revision 1.114
diff -u -r1.114 NEWS
--- NEWS	24 Jul 2003 19:59:33 -0000	1.114
+++ NEWS	1 Aug 2003 21:10:19 -0000
@@ -46,6 +46,7 @@
 * Multi-arched targets.
 
 HP/PA HPUX11, 32bit ABI (partial)	hppa*-*-hpux* except hppa*64*-*-hpux11*
+Mitsubishi M32R/D w/simulator			m32r-*-elf*
 
 * OBSOLETE configurations and files
 
@@ -54,7 +55,6 @@
 configurations, the next release of GDB will have their sources
 permanently REMOVED.
 
-Mitsubishi M32R/D w/simulator			m32r-*-elf*
 Z8000 simulator		  		z8k-zilog-none 	  or z8ksim
 Matsushita MN10200 w/simulator			mn10200-*-*
 H8/500 simulator 			h8500-hitachi-hms or h8500hms
Index: configure.tgt
===================================================================
RCS file: /cvs/src/src/gdb/configure.tgt,v
retrieving revision 1.110
diff -u -r1.110 configure.tgt
--- configure.tgt	27 Jul 2003 15:42:20 -0000	1.110
+++ configure.tgt	1 Aug 2003 21:10:20 -0000
@@ -114,7 +114,7 @@
 			;;
 ia64*-*-*)		gdb_target=ia64 ;;
 
-# OBSOLETE m32r-*-elf*)		gdb_target=m32r ;;
+m32r-*-*)		gdb_target=m32r ;;
 
 m68hc11*-*-*|m6811*-*-*)	gdb_target=m68hc11 ;;
 
@@ -266,6 +266,7 @@
 case "${gdb_target}" in
 d10v)		gdb_multi_arch=yes ;;
 fbsd64)		gdb_multi_arch=yes ;;
+m32r)		gdb_multi_arch=yes ;;
 m68hc11)	gdb_multi_arch=yes ;;
 mn10300)	gdb_multi_arch=yes ;;
 x86-64linux)    gdb_multi_arch=yes ;;
Index: m32r-rom.c
===================================================================
RCS file: /cvs/src/src/gdb/m32r-rom.c,v
retrieving revision 1.12
diff -u -r1.12 m32r-rom.c
--- m32r-rom.c	27 Jul 2003 15:38:16 -0000	1.12
+++ m32r-rom.c	1 Aug 2003 21:10:20 -0000
@@ -492,16 +492,18 @@
       buf[0] = 0;
       gethostname (buf, sizeof (buf));
       if (buf[0] != 0)
-	hostent = gethostbyname (buf);
-      if (hostent != 0)
 	{
+	  hostent = gethostbyname (buf);
+	  if (hostent != 0)
+	    {
 #if 1
-	  memcpy (&inet_addr.s_addr, hostent->h_addr,
-		  sizeof (inet_addr.s_addr));
-	  server_addr = (char *) inet_ntoa (inet_addr);
+	      memcpy (&inet_addr.s_addr, hostent->h_addr,
+		      sizeof (inet_addr.s_addr));
+	      server_addr = (char *) inet_ntoa (inet_addr);
 #else
-	  server_addr = (char *) inet_ntoa (hostent->h_addr);
+	      server_addr = (char *) inet_ntoa (hostent->h_addr);
 #endif
+	    }
 	}
       if (server_addr == 0)	/* failed? */
 	error
Index: m32r-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/m32r-tdep.c,v
retrieving revision 1.16
diff -u -r1.16 m32r-tdep.c
--- m32r-tdep.c	27 Jul 2003 15:38:16 -0000	1.16
+++ m32r-tdep.c	1 Aug 2003 21:10:21 -0000
@@ -286,7 +286,7 @@
 
   if (len > 4)
     {
-      regval = extract_unsigned_integer (valbuf + 4, len - 4);
+      regval = extract_unsigned_integer ((char *) valbuf + 4, len - 4);
       regcache_cooked_write_unsigned (regcache, RET1_REGNUM + 1, regval);
     }
 }
Index: config/m32r/m32r.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/m32r/m32r.mt,v
retrieving revision 1.5
diff -u -r1.5 m32r.mt
--- config/m32r/m32r.mt	4 Feb 2003 23:26:43 -0000	1.5
+++ config/m32r/m32r.mt	1 Aug 2003 21:10:22 -0000
@@ -1,5 +1,4 @@
-# OBSOLETE # Target: Mitsubishi m32r processor
-# OBSOLETE TDEPFILES= m32r-tdep.o monitor.o m32r-rom.o dsrec.o
-# OBSOLETE TM_FILE= tm-m32r.h
-# OBSOLETE SIM_OBS = remote-sim.o
-# OBSOLETE SIM = ../sim/m32r/libsim.a
+# Target: Renesas m32r processor
+TDEPFILES= m32r-tdep.o monitor.o m32r-rom.o dsrec.o
+SIM_OBS = remote-sim.o
+SIM = ../sim/m32r/libsim.a