From: Ian Lynagh Date: Wed, 14 Jul 2010 18:47:15 +0000 (+0000) Subject: Change some TARGET checks to HOST checks X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=75fea0db6f7d187aea994485a9b85c4d2b44fb83 Change some TARGET checks to HOST checks --- diff --git a/includes/RtsAPI.h b/includes/RtsAPI.h index 98bf730..1444dbc 100644 --- a/includes/RtsAPI.h +++ b/includes/RtsAPI.h @@ -169,7 +169,7 @@ rts_getSchedStatus (Capability *cap); // Note that RtsAPI.h is also included by foreign export stubs in // the base package itself. // -#if defined(mingw32_TARGET_OS) && defined(__PIC__) && !defined(COMPILING_BASE_PACKAGE) +#if defined(mingw32_HOST_OS) && defined(__PIC__) && !defined(COMPILING_BASE_PACKAGE) __declspec(dllimport) extern StgWord base_GHCziTopHandler_runIO_closure[]; __declspec(dllimport) extern StgWord base_GHCziTopHandler_runNonIO_closure[]; #else diff --git a/includes/stg/DLL.h b/includes/stg/DLL.h index 245bcd1..7d40960 100644 --- a/includes/stg/DLL.h +++ b/includes/stg/DLL.h @@ -14,7 +14,7 @@ #ifndef __STGDLL_H__ #define __STGDLL_H__ 1 -#if defined(__PIC__) && defined(mingw32_TARGET_OS) +#if defined(__PIC__) && defined(mingw32_HOST_OS) # define DLL_IMPORT_DATA_REF(x) (_imp__##x) # define DLL_IMPORT_DATA_VARNAME(x) *_imp__##x # if __GNUC__ && !defined(__declspec) @@ -45,7 +45,7 @@ #else #define DLL_IMPORT #define DLL_IMPORT_RTS DLLIMPORT -# if defined(__PIC__) && defined(mingw32_TARGET_OS) +# if defined(__PIC__) && defined(mingw32_HOST_OS) # define DLL_IMPORT_DATA_VAR(x) _imp__##x # else # define DLL_IMPORT_DATA_VAR(x) x diff --git a/includes/stg/TailCalls.h b/includes/stg/TailCalls.h index bffd39c..40c7ce7 100644 --- a/includes/stg/TailCalls.h +++ b/includes/stg/TailCalls.h @@ -182,7 +182,7 @@ but uses $$dyncall if necessary to cope, just in case you aren't. -------------------------------------------------------------------------- */ -#ifdef hppa1_1_hp_hpux_TARGET +#ifdef hppa1_1_hp_hpux_HOST #define JMP_(cont) \ do { void *_procedure = (void *)(cont); \ @@ -191,7 +191,7 @@ but uses $$dyncall if necessary to cope, just in case you aren't. goto *_procedure; \ } while(0) -#endif /* hppa1_1_hp_hpux_TARGET */ +#endif /* hppa1_1_hp_hpux_HOST */ /* ----------------------------------------------------------------------------- Tail calling on PowerPC