X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2Fcutils.c;h=157c90290d8ac249e47924e5e0bacce46ae52819;hp=08832f298d5d956cfd474b7dcf1fd80d2aaa6568;hb=9a82b1ffa35fa4c3927c66a1037a37d436cf6aac;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1 diff --git a/compiler/parser/cutils.c b/compiler/parser/cutils.c index 08832f2..157c902 100644 --- a/compiler/parser/cutils.c +++ b/compiler/parser/cutils.c @@ -3,17 +3,8 @@ These utility routines are used various places in the GHC library. */ -/* For GHC 4.08, we are relying on the fact that RtsFlags has - * compatible layout with the current version, because we're - * #including the current version of RtsFlags.h below. 4.08 didn't - * ship with its own RtsFlags.h, unfortunately. For later GHC - * versions, we #include the correct RtsFlags.h. - */ -#if __GLASGOW_HASKELL__ < 502 -#include "../includes/Rts.h" -#include "../includes/RtsFlags.h" -#else #include "Rts.h" +#if __GLASGOW_HASKELL__ <= 610 #include "RtsFlags.h" #endif @@ -31,19 +22,19 @@ and causes gcc to require too many registers on x84 */ HsInt -ghc_strlen( HsAddr a ) +ghc_strlen( HsPtr a ) { return (strlen((char *)a)); } HsInt -ghc_memcmp( HsAddr a1, HsAddr a2, HsInt len ) +ghc_memcmp( HsPtr a1, HsPtr a2, HsInt len ) { return (memcmp((char *)a1, a2, len)); } HsInt -ghc_memcmp_off( HsAddr a1, HsInt i, HsAddr a2, HsInt len ) +ghc_memcmp_off( HsPtr a1, HsInt i, HsPtr a2, HsInt len ) { return (memcmp((char *)a1 + i, a2, len)); } @@ -51,10 +42,7 @@ ghc_memcmp_off( HsAddr a1, HsInt i, HsAddr a2, HsInt len ) void enableTimingStats( void ) /* called from the driver */ { -#if __GLASGOW_HASKELL__ >= 411 RtsFlags.GcFlags.giveStats = ONELINE_GC_STATS; -#endif - /* ignored when bootstrapping with an older GHC */ } void