X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=rts%2FRtsStartup.c;h=d1025a3a8b17d12884f1873eab78dc46ad4708e1;hb=a84385fa752d8fa800a2155cce95f47c68b74e2b;hp=774de72e380cb0c29e6fe9db9069c6fca239c553;hpb=bf4d6a58a1079b944ffc4bdd41d57403a7727046;p=ghc-hetmet.git

diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index 774de72..d1025a3 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -167,28 +167,8 @@ hs_init(int *argc, char **argv[])
     argv++; argc--;
 #endif
 
-    /* Initialise the performance tracking library */
 #ifdef USE_PAPI
-    {
-	int ver;
-	if ((ver = PAPI_library_init(PAPI_VER_CURRENT)) != PAPI_VER_CURRENT) {
-	    if (ver > 0) {
-		errorBelch("PAPI_library_init: wrong version: %x", ver);
-		stg_exit(EXIT_FAILURE);
-	    } else {
-		sysErrorBelch("PAPI_library_init");
-		stg_exit(EXIT_FAILURE);
-	    }
-	}
-    }
-#ifdef THREADED_RTS
-    {
-	int err;
-	if ((err = PAPI_thread_init(osThreadId)) < 0) {
-	    barf("PAPI_thread_init: %d",err);
-	}
-    }
-#endif
+    papi_init();
 #endif
 
     /* Set the RTS flags to default values. */