From 548f2726ce84ff4fc97fed6824faaa1745520a37 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@oarcorp.com>
Date: Tue, 11 Nov 2008 22:20:54 +0000
Subject: [PATCH] 2008-11-10  Joel Sherrill <joel.sherrill@oarcorp.com>

	* erc32.c, exec.c: Fix warnings.
---
 sim/erc32/ChangeLog | 4 ++++
 sim/erc32/erc32.c   | 5 +++--
 sim/erc32/exec.c    | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 27d99f542a..c4a3db5428 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-10  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* erc32.c, exec.c: Fix warnings.
+
 2008-07-11  Hans-Peter Nilsson  <hp@axis.com>
 
 	* configure: Regenerate to track ../common/common.m4 changes.
diff --git a/sim/erc32/erc32.c b/sim/erc32/erc32.c
index 0b3f3ac9f1..c79dfd63f6 100644
--- a/sim/erc32/erc32.c
+++ b/sim/erc32/erc32.c
@@ -24,6 +24,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 #include <termios.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
@@ -1659,7 +1660,7 @@ memory_read(asi, addr, data, sz, ws)
 	errmec = 0;
 	return(1);
     }
-#endif;
+#endif
 
     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
 	fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz);
@@ -1736,7 +1737,7 @@ memory_write(asi, addr, data, sz, ws)
 	errmec = 0;
 	return(1);
     }
-#endif;
+#endif
 
     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
 	if (mem_accprot) {
diff --git a/sim/erc32/exec.c b/sim/erc32/exec.c
index c9765d9ed6..0aca49e826 100644
--- a/sim/erc32/exec.c
+++ b/sim/erc32/exec.c
@@ -1713,7 +1713,7 @@ fpexec(op3, rd, rs1, rs2, sregs)
     	    sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1];
     	    sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1];
     default:
-      ;
+      break;
     }
 #endif
 
@@ -1886,7 +1886,7 @@ fpexec(op3, rd, rs1, rs2, sregs)
 	sregs->fs[rd & ~1] = sregs->fdp[rd | 1];
 	sregs->fs[rd | 1] = sregs->fdp[rd & ~1];
     default:
-      ;
+      break;
     }
 #endif
     if (sregs->fpstate == FP_EXC_PE) {
-- 
2.11.0