fix for i386 OS X

svn: r2231
This commit is contained in:
Matthew Flatt 2006-02-15 13:47:50 +00:00
parent 599b3d9191
commit 1688611b34

View File

@ -646,9 +646,17 @@
# if defined(OS_X) || defined(XONX) # if defined(OS_X) || defined(XONX)
#ifdef XONX #ifdef XONX
# ifdef __POWERPC__
# define SCHEME_PLATFORM_LIBRARY_SUBPATH "ppc-darwin" # define SCHEME_PLATFORM_LIBRARY_SUBPATH "ppc-darwin"
# else
# define SCHEME_PLATFORM_LIBRARY_SUBPATH "i386-darwin"
# endif
#else #else
# ifdef __POWERPC__
# define SCHEME_PLATFORM_LIBRARY_SUBPATH "ppc-macosx" # define SCHEME_PLATFORM_LIBRARY_SUBPATH "ppc-macosx"
# else
# define SCHEME_PLATFORM_LIBRARY_SUBPATH "i386-macosx"
# endif
#endif #endif
# include "uconfig.h" # include "uconfig.h"
@ -662,7 +670,9 @@
#endif #endif
# define STACK_GROWS_DOWN # define STACK_GROWS_DOWN
#ifdef __POWERPC__
# define SCHEME_BIG_ENDIAN # define SCHEME_BIG_ENDIAN
#endif
# define USE_MAP_ANON # define USE_MAP_ANON
# define USE_CARBON_FP_PREDS # define USE_CARBON_FP_PREDS
@ -680,9 +690,9 @@
# define MACOS_UNICODE_SUPPORT # define MACOS_UNICODE_SUPPORT
#endif #endif
# ifndef OS_X #ifndef OS_X
# define OS_X 1 # define OS_X 1
# endif #endif
#ifdef __POWERPC__ #ifdef __POWERPC__
# define MZ_USE_JIT_PPC # define MZ_USE_JIT_PPC
@ -696,7 +706,7 @@
/************** Darwin x86 ****************/ /************** Darwin x86 ****************/
# if defined(__APPLE__) && defined(__MACH__) && defined(__i386__) # if defined(__APPLE__) && defined(__MACH__) && defined(__i386__) && !defined(OS_X)
# define SCHEME_PLATFORM_LIBRARY_SUBPATH "i386-darwin" # define SCHEME_PLATFORM_LIBRARY_SUBPATH "i386-darwin"
@ -711,10 +721,12 @@
# define USE_TM_GMTOFF_FIELD # define USE_TM_GMTOFF_FIELD
# define FLAGS_ALREADY_SET # define USE_UNDERSCORE_SETJMP
# define MZ_USE_JIT_I386 # define MZ_USE_JIT_I386
# define FLAGS_ALREADY_SET
# endif # endif
/************ Macintosh with CodeWarrior (not OS X) *************/ /************ Macintosh with CodeWarrior (not OS X) *************/