--- gforth/engine/threaded.h	2005/08/16 13:46:49	1.34
+++ gforth/engine/threaded.h	2008/08/09 13:24:25	1.39
@@ -1,12 +1,12 @@
 /* This file defines a number of threading schemes.
 
-  Copyright (C) 1995, 1996,1997,1999,2003,2004 Free Software Foundation, Inc.
+  Copyright (C) 1995, 1996,1997,1999,2003,2004,2005,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/.
 
 
   This files defines macros for threading. Many sets of macros are
@@ -91,11 +90,24 @@
 
 */
 
-#ifdef GCC_PR15242_WORKAROUND
+#if !defined(GCC_PR15242_WORKAROUND)
+#if __GNUC__ == 3
+/* various gcc-3.x version have problems (including PR15242) that are
+   solved with this workaround */
+#define GCC_PR15242_WORKAROUND 1
+#else
+/* other gcc versions are better off without the workaround for
+   primitives that are not relocatable */
+#define GCC_PR15242_WORKAROUND 0
+#endif
+#endif
+
+#if GCC_PR15242_WORKAROUND
 #define DO_GOTO goto before_goto
 #else
 #define DO_GOTO goto *real_ca
 #endif
+
 #ifndef GOTO_ALIGN
 #define GOTO_ALIGN
 #endif
@@ -123,7 +135,7 @@ before_goto: goto *real_ca; after_goto:
 #  define SET_IP(p)	do {ip=(p); cfa=*ip;} while(0)
 #  define NEXT_INST	(cfa)
 #  define INC_IP(const_inc)	do {cfa=IP[const_inc]; ip+=(const_inc);} while(0)
-#  define DEF_CA	Label ca;
+#  define DEF_CA	Label MAYBE_UNUSED ca;
 #  define NEXT_P1	do {\
   if (DEBUG_DITC && (cfa<=vm_prims+DOESJUMP || cfa>=vm_prims+npriminfos)) \
     fprintf(stderr,"NEXT encountered prim %p at ip=%p\n", cfa, ip); \
@@ -174,7 +186,7 @@ before_goto: goto *real_ca; after_goto:
 */
 #define KILLS asm("":"=X"(cfa));
 
-#warning direct threading scheme 8: cfa dead, i386 hack
+/* #warning direct threading scheme 8: cfa dead, i386 hack */
 #  define NEXT_P0
 #  define CFA		cfa
 #  define IP		(ip)
@@ -190,7 +202,7 @@ before_goto: goto *real_ca; after_goto:
 #else
 /* indirect THREADED  */
 
-#warning indirect threading scheme 8: low latency,cisc
+/* #warning indirect threading scheme 8: low latency,cisc */
 #  define NEXT_P0
 #  define CFA		cfa
 #  define IP		(ip)