[PATCH] sim/erc32: fix signedness compatiblity and redefinition warnings

[Orgad Shaneh via Gdb-patches <gdb-patches@sourceware.org>]

---
 sim/erc32/func.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sim/erc32/func.c b/sim/erc32/func.c
index ff53f3bca51..9296831bcd9 100644
--- a/sim/erc32/func.c
+++ b/sim/erc32/func.c
@@ -31,6 +31,7 @@
 #include <sys/time.h>
 
 #define	VAL(x)	strtoul(x,(char **)NULL,0)
+void boot_init (void);
 
 struct disassemble_info dinfo;
 struct pstate   sregs;
@@ -747,7 +748,7 @@ static void print_insn_sparc_sis(uint32 addr, struct disassemble_info *info)
 {
     unsigned char           i[4];
 
-    sis_memory_read(addr, i, 4);
+    sis_memory_read(addr, (char *)i, 4);
     dinfo.buffer_vma = addr;
     dinfo.buffer_length = 4;
     dinfo.buffer = i;
@@ -779,7 +780,7 @@ disp_mem(uint32 addr, uint32 len)
 
     uint32          i;
     union {
-	    unsigned char u8[4];
+	    char b8[4];
 	    uint32 u32;
     } data;
     uint32          mem[4], j;
@@ -788,7 +789,7 @@ disp_mem(uint32 addr, uint32 len)
     for (i = addr & ~3; i < ((addr + len) & ~3); i += 16) {
 	printf("\n %8X  ", i);
 	for (j = 0; j < 4; j++) {
-	    sis_memory_read ((i + (j * 4)), data.u8, 4);
+	    sis_memory_read ((i + (j * 4)), data.b8, 4);
 	    printf ("%08x  ", data.u32);
 	    mem[j] = data.u32;
 	}
@@ -809,12 +810,12 @@ dis_mem(uint32 addr, uint32 len, struct disassemble_info *info)
 {
     uint32          i;
     union {
-	    unsigned char u8[4];
+	    char b8[4];
 	    uint32 u32;
     } data;
 
     for (i = addr & -3; i < ((addr & -3) + (len << 2)); i += 4) {
-	sis_memory_read (i, data.u8, 4);
+	sis_memory_read (i, data.b8, 4);
 	printf (" %08x  %08x  ", i, data.u32);
 	print_insn_sparc_sis(i, info);
         if (i >= 0xfffffffc) break;
@@ -996,7 +997,9 @@ sys_halt(void)
 #include "libiberty.h"
 #include "bfd.h"
 
+#ifndef min
 #define min(A, B) (((A) < (B)) ? (A) : (B))
+#endif
 #define LOAD_ADDRESS 0
 
 int
@@ -1068,7 +1071,7 @@ bfd_load (const char *fname)
 		fptr = 0;
 
 		while (section_size > 0) {
-		    char            buffer[1024];
+		    unsigned char   buffer[1024];
 		    int             count;
 
 		    count = min(section_size, 1024);
-- 
2.33.1.windows.1