--- gforth/machpc.fs.in	2005/08/21 22:09:14	1.11
+++ gforth/machpc.fs.in	2007/01/21 17:29:54	1.13
@@ -1,7 +1,7 @@
 \ machpc.fs is generated; source: machpc.fs.in
 \ generic mach file for pc gforth				03sep97jaw
 
-\ Copyright (C) 1995,1996,1997,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,2000,2003,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -23,6 +23,9 @@ true DefaultValue NIL  \ relocating
 
 >ENVIRON
 
+@EC_MODE@ DefaultValue ec
+
+has? ec 0= [IF]
 true DefaultValue file		\ controls the presence of the
 				\ file access wordset
 true DefaultValue OS		\ flag to indicate a operating system
@@ -59,7 +62,6 @@ true DefaultValue abranch       \ enable
 
 false DefaultValue control-rack \ disable return stack use for control flow
 
-false DefaultValue ec
 false DefaultValue crlf
 
 $100 DefaultValue kernel-start
@@ -69,3 +71,50 @@ cell 2 = [IF] &32 KB [ELSE] $100000 cell
 &16 KB		DefaultValue fstack-size
 &15 KB		DefaultValue rstack-size
 &14 KB &512 +	DefaultValue lstack-size
+[ELSE]
+false DefaultValue file		\ controls the presence of the
+				\ file access wordset
+false DefaultValue OS		\ flag to indicate a operating system
+
+@FFCALLFLAG@ DefaultValue ffcall \ Foreign Function Calls
+
+@LIBFFIFLAG@ DefaultValue libffi \ Foreign Function Calls
+
+@OLDCALLFLAG@ DefaultValue oldcall \ old Foreign Function Calls
+
+true DefaultValue prims		\ true: primitives are c-code
+
+false DefaultValue floating	\ floating point wordset is present
+
+true DefaultValue glocals	\ gforth locals are present
+				\ will be loaded
+true DefaultValue dcomps	\ double number comparisons
+
+true DefaultValue hash		\ hashing primitives are loaded/present
+
+true DefaultValue xconds	\ used together with glocals,
+				\ special conditionals supporting gforths'
+				\ local variables
+true DefaultValue header	\ save a header information
+
+true DefaultValue backtrace	\ enables backtrace code
+
+true DefaultValue new-input	\ enables object oriented input
+
+@PEEPHOLEFLAG@ DefaultValue peephole      \ enables peephole optimizer
+
+
+true DefaultValue abranch       \ enables absolute branches
+
+false DefaultValue control-rack \ disable return stack use for control flow
+
+false DefaultValue crlf
+
+$100 DefaultValue kernel-start
+cell 2 = [IF] &32 KB [ELSE] &64 KB [THEN] DefaultValue kernel-size
+
+&1 KB		DefaultValue stack-size
+&0 KB		DefaultValue fstack-size
+&1 KB		DefaultValue rstack-size
+&1 KB		DefaultValue lstack-size
+[THEN]