# HG changeset patch
# User Ross Younger <wry@ecoscentric.com>
# Date 1407832490 -43200
# Node ID 17169b710e76cade81e4ae71f398cafb6d487fb8
# Parent  56fc685b878cc8d80c3afe227f0a68b29c139550
Fix bit rot: make nand package build with recent gcc

diff --git a/packages/devs/nand/synth/current/ChangeLog b/packages/devs/nand/synth/current/ChangeLog
--- a/packages/devs/nand/synth/current/ChangeLog
+++ b/packages/devs/nand/synth/current/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-01  Ross Younger  <wry@ecoscentric.com>
+
+	* nand_synth.c: Make it build with recent gcc
+
 2010-05-11  Ross Younger  <wry@ecoscentric.com>
 
 	* nand_synth.c, nand_synth.cdl: Allow simulation of multiple
diff --git a/packages/devs/nand/synth/current/src/nand_synth.c b/packages/devs/nand/synth/current/src/nand_synth.c
--- a/packages/devs/nand/synth/current/src/nand_synth.c
+++ b/packages/devs/nand/synth/current/src/nand_synth.c
@@ -60,6 +60,10 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#ifndef CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES
+#define CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES 0
+#endif
+
 // ----------------------------------------------------------------------------
 // Multiple devices can be supported in future by #include'ing this file
 // from several different modules (possibly generated) e.g. nand_synth_dev0.c,
diff --git a/packages/io/nand/current/ChangeLog b/packages/io/nand/current/ChangeLog
--- a/packages/io/nand/current/ChangeLog
+++ b/packages/io/nand/current/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-11  Ross Younger  <wry@ecoscentric.com>
+
+	* nand.c nand_bbt.c nand_synth.c: Make build with recent gcc
+
 2010-04-20  Ross Younger  <wry@eCosCentric.com>
 
 	* nand_ecc.h nand.c: Expand ECC interface to allow different
diff --git a/packages/io/nand/current/src/nand.c b/packages/io/nand/current/src/nand.c
--- a/packages/io/nand/current/src/nand.c
+++ b/packages/io/nand/current/src/nand.c
@@ -449,6 +449,7 @@ int nandi_read_whole_page_raw(cyg_nand_d
 
         if (dest) {
             int step;
+            (void)step;
             while (remain) {
                 step = read_data_stride;
                 CYG_ASSERTC(remain >= read_data_stride);
diff --git a/packages/io/nand/current/src/nand_bbt.c b/packages/io/nand/current/src/nand_bbt.c
--- a/packages/io/nand/current/src/nand_bbt.c
+++ b/packages/io/nand/current/src/nand_bbt.c
@@ -601,6 +601,7 @@ static int bbti_write_one_table(cyg_nand
     CYG_BYTE *iptr = dev->bbt.data;
     int to_write = bbt_disk_size; // on-chip size, number of bytes
     int i_locked = 0;
+    (void) i_locked;
 
     LOCK_PAGEBUF();