--- gforth/fi2c.fs	2007/03/25 21:30:59	1.18
+++ gforth/fi2c.fs	2010/01/08 18:54:34	1.23
@@ -1,12 +1,12 @@
 \ Convert image to C include file
 
-\ Copyright (C) 1998,1999,2002,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1998,1999,2002,2003,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 require string.fs
 
@@ -82,7 +81,7 @@ s" NULL" groups @ cell+ $!
 	    IF
 		11 /string $has? 0= IF r@ scan-ifs  THEN
 	    ELSE  2dup s" #else" prefix?
-		IF  r@ scan-ifs
+		IF  2drop r@ scan-ifs
 		ELSE  2dup s" GROUP(" prefix?
 		    IF  2drop drop 1+ 0  ELSE
 			2dup s" INST_ADDR(" prefix?
@@ -170,7 +169,7 @@ Variable bitmap-chars
 			." INST_ADDR(" type ." )"
 		    THEN
 		ELSE
-		    dup IF  ." ((void*)image)+"  THEN  .08x
+		    dup IF  ." ((void*)image)+"  $10 -  THEN  .08x
 		THEN
 	    ELSE
 		." (void*)" .08x
@@ -199,7 +198,8 @@ Variable bitmap-chars
 
 : fi2c ( addr u -- )  base @ >r hex
     read-image
-    ." static void* image[" .imagesize ." ] = {" cr .image ." };" cr
+    \    .\" const static __attribute__ ((__section__ (\".rodata\"))) void* image[" .imagesize ." ] = {" cr .image ." };" cr
+    .\" static void* image[" .imagesize ." ] = {" cr .image ." };" cr
     ." #ifdef USE_RELOC" cr
     ." const char reloc_bits[" .relocsize ." ] = {" cr .reloc ." };" cr
     ." #endif" cr