Don't assume that __IA32__ implies support for native compiled code.

diff --git a/v7/src/microcode/utils.c b/v7/src/microcode/utils.c
index 4b83c68cf2ea0d19984a611f88e17de411328e24..66ad4705237689608efa948879c29e96f5796a51 100644 (file)
--- a/v7/src/microcode/utils.c
+++ b/v7/src/microcode/utils.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: utils.c,v 9.85 2003/02/14 18:28:24 cph Exp $
+$Id: utils.c,v 9.86 2005/07/04 13:51:10 cph Exp $
 
 Copyright (c) 1987-2002 Massachusetts Institute of Technology
 
@@ -1081,7 +1081,10 @@ DEFUN (Translate_To_Point, (Target), SCHEME_OBJECT Target)
   /*NOTREACHED*/
 }
 \f
-#ifndef __OS2__
+#ifdef __WIN32__
+
+#include <windows.h>
+#include "cmpintmd.h"
 
 SCHEME_OBJECT
 DEFUN_VOID (Compiler_Get_Fixed_Objects)
@@ -1096,10 +1099,6 @@ extern SCHEME_OBJECT EXFUN (Re_Enter_Interpreter, (void));
 extern SCHEME_OBJECT EXFUN
   (C_call_scheme, (SCHEME_OBJECT, long, SCHEME_OBJECT *));
 
-#ifdef __WIN32__
-#  include <windows.h>
-#endif
-
 SCHEME_OBJECT
 DEFUN (C_call_scheme, (proc, nargs, argvec),
        SCHEME_OBJECT proc
@@ -1109,7 +1108,7 @@ DEFUN (C_call_scheme, (proc, nargs, argvec),
   SCHEME_OBJECT primitive, prim_lexpr, * sp, result;
   SCHEME_OBJECT * callers_last_return_code;
 
-#ifdef __IA32__
+#ifdef (COMPILER_PROCESSOR_TYPE == COMPILER_IA32_TYPE)
   extern void * C_Frame_Pointer;
   extern void * C_Stack_Pointer;
   void * cfp = C_Frame_Pointer;
@@ -1127,7 +1126,7 @@ DEFUN (C_call_scheme, (proc, nargs, argvec),
       abort_to_interpreter (ERR_CANNOT_RECURSE);
       /*NOTREACHED*/
     sp = sp_register;
-\f
+
    Will_Push ((2 * CONTINUATION_SIZE) + (nargs + STACK_ENV_EXTRA_SLOTS + 1));
     {
       long i;
@@ -1156,7 +1155,7 @@ DEFUN (C_call_scheme, (proc, nargs, argvec),
     Registers[REGBLOCK_LEXPR_ACTUALS] = prim_lexpr;
     Registers[REGBLOCK_PRIMITIVE] = primitive;
   }
-#ifdef __IA32__
+#ifdef (COMPILER_PROCESSOR_TYPE == COMPILER_IA32_TYPE)
 #ifdef CL386
   __finally  
 #endif

diff --git a/v7/src/microcode/uxsig.c b/v7/src/microcode/uxsig.c
index 52f39da9de79ee6c59ca519aa94438b90a135988..dbbfb0e933f82b953bf18f7c31d89d99e8b0ec46 100644 (file)
--- a/v7/src/microcode/uxsig.c
+++ b/v7/src/microcode/uxsig.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxsig.c,v 1.41 2005/06/27 06:03:21 cph Exp $
+$Id: uxsig.c,v 1.42 2005/07/04 13:51:19 cph Exp $
 
 Copyright 1990,1991,1992,1993,1994,1996 Massachusetts Institute of Technology
 Copyright 2000,2001,2005 Massachusetts Institute of Technology
@@ -530,7 +530,8 @@ DEFUN_STD_HANDLER (sighnd_terminate,
     : 0)))
 \f
 #ifdef HAS_COMPILER_SUPPORT
-#  ifdef __IA32__
+#  include "cmpintmd.h"
+#  if (COMPILER_PROCESSOR_TYPE == COMPILER_IA32_TYPE)
 
 #define FPE_RESET_TRAPS()                                              \
 {                                                                      \