X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=2b2229b5e9e52ec28739b3bd6a0eb02615782869;hb=6feeea5a596026e3416ec6dcd5cae6fecaeb2e27;hp=293d2a3b47de14782166083716cd5955bb79f916;hpb=7a1f8fbdbab99465793c50bd9fb376c950e7e9d7;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 293d2a3..2b2229b 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -53,6 +53,9 @@ extra-libraries:		"m"		/* for ldexp() */
                               ,"mingwex"
 # endif
 #endif
+#if USE_PAPI
+			     , "papi"
+#endif
 
 #ifdef INSTALLING
 include-dirs:		INCLUDE_DIR
@@ -70,80 +73,80 @@ cc-options:
 
 ld-options:
 #ifdef LEADING_UNDERSCORE
-           "-u", "_GHCziBase_Izh_static_info"
-         , "-u", "_GHCziBase_Czh_static_info"
-         , "-u", "_GHCziFloat_Fzh_static_info"
-         , "-u", "_GHCziFloat_Dzh_static_info"
-         , "-u", "_GHCziPtr_Ptr_static_info"
-         , "-u", "_GHCziWord_Wzh_static_info"
-         , "-u", "_GHCziInt_I8zh_static_info"
-         , "-u", "_GHCziInt_I16zh_static_info"
-         , "-u", "_GHCziInt_I32zh_static_info"
-         , "-u", "_GHCziInt_I64zh_static_info"
-         , "-u", "_GHCziWord_W8zh_static_info"
-         , "-u", "_GHCziWord_W16zh_static_info"
-         , "-u", "_GHCziWord_W32zh_static_info"
-         , "-u", "_GHCziWord_W64zh_static_info"
-         , "-u", "_GHCziStable_StablePtr_static_info"
-         , "-u", "_GHCziBase_Izh_con_info"
-         , "-u", "_GHCziBase_Czh_con_info"
-         , "-u", "_GHCziFloat_Fzh_con_info"
-         , "-u", "_GHCziFloat_Dzh_con_info"
-         , "-u", "_GHCziPtr_Ptr_con_info"
-         , "-u", "_GHCziPtr_FunPtr_con_info"
-         , "-u", "_GHCziStable_StablePtr_con_info"
-         , "-u", "_GHCziBase_False_closure"
-         , "-u", "_GHCziBase_True_closure"
-         , "-u", "_GHCziPack_unpackCString_closure"
-         , "-u", "_GHCziIOBase_stackOverflow_closure"
-         , "-u", "_GHCziIOBase_heapOverflow_closure"
-         , "-u", "_GHCziIOBase_NonTermination_closure"
-         , "-u", "_GHCziIOBase_BlockedOnDeadMVar_closure"
-         , "-u", "_GHCziIOBase_BlockedIndefinitely_closure"
-         , "-u", "_GHCziIOBase_Deadlock_closure"
-         , "-u", "_GHCziIOBase_NestedAtomically_closure"
-         , "-u", "_GHCziWeak_runFinalizzerBatch_closure"
+           "-u", "_base_GHCziBase_Izh_static_info"
+         , "-u", "_base_GHCziBase_Czh_static_info"
+         , "-u", "_base_GHCziFloat_Fzh_static_info"
+         , "-u", "_base_GHCziFloat_Dzh_static_info"
+         , "-u", "_base_GHCziPtr_Ptr_static_info"
+         , "-u", "_base_GHCziWord_Wzh_static_info"
+         , "-u", "_base_GHCziInt_I8zh_static_info"
+         , "-u", "_base_GHCziInt_I16zh_static_info"
+         , "-u", "_base_GHCziInt_I32zh_static_info"
+         , "-u", "_base_GHCziInt_I64zh_static_info"
+         , "-u", "_base_GHCziWord_W8zh_static_info"
+         , "-u", "_base_GHCziWord_W16zh_static_info"
+         , "-u", "_base_GHCziWord_W32zh_static_info"
+         , "-u", "_base_GHCziWord_W64zh_static_info"
+         , "-u", "_base_GHCziStable_StablePtr_static_info"
+         , "-u", "_base_GHCziBase_Izh_con_info"
+         , "-u", "_base_GHCziBase_Czh_con_info"
+         , "-u", "_base_GHCziFloat_Fzh_con_info"
+         , "-u", "_base_GHCziFloat_Dzh_con_info"
+         , "-u", "_base_GHCziPtr_Ptr_con_info"
+         , "-u", "_base_GHCziPtr_FunPtr_con_info"
+         , "-u", "_base_GHCziStable_StablePtr_con_info"
+         , "-u", "_base_GHCziBase_False_closure"
+         , "-u", "_base_GHCziBase_True_closure"
+         , "-u", "_base_GHCziPack_unpackCString_closure"
+         , "-u", "_base_GHCziIOBase_stackOverflow_closure"
+         , "-u", "_base_GHCziIOBase_heapOverflow_closure"
+         , "-u", "_base_GHCziIOBase_NonTermination_closure"
+         , "-u", "_base_GHCziIOBase_BlockedOnDeadMVar_closure"
+         , "-u", "_base_GHCziIOBase_BlockedIndefinitely_closure"
+         , "-u", "_base_GHCziIOBase_Deadlock_closure"
+         , "-u", "_base_GHCziIOBase_NestedAtomically_closure"
+         , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
 #else
-           "-u", "GHCziBase_Izh_static_info"
-         , "-u", "GHCziBase_Czh_static_info"
-         , "-u", "GHCziFloat_Fzh_static_info"
-         , "-u", "GHCziFloat_Dzh_static_info"
-         , "-u", "GHCziPtr_Ptr_static_info"
-         , "-u", "GHCziWord_Wzh_static_info"
-         , "-u", "GHCziInt_I8zh_static_info"
-         , "-u", "GHCziInt_I16zh_static_info"
-         , "-u", "GHCziInt_I32zh_static_info"
-         , "-u", "GHCziInt_I64zh_static_info"
-         , "-u", "GHCziWord_W8zh_static_info"
-         , "-u", "GHCziWord_W16zh_static_info"
-         , "-u", "GHCziWord_W32zh_static_info"
-         , "-u", "GHCziWord_W64zh_static_info"
-         , "-u", "GHCziStable_StablePtr_static_info"
-         , "-u", "GHCziBase_Izh_con_info"
-         , "-u", "GHCziBase_Czh_con_info"
-         , "-u", "GHCziFloat_Fzh_con_info"
-         , "-u", "GHCziFloat_Dzh_con_info"
-         , "-u", "GHCziPtr_Ptr_con_info"
-         , "-u", "GHCziPtr_FunPtr_con_info"
-         , "-u", "GHCziStable_StablePtr_con_info"
-         , "-u", "GHCziBase_False_closure"
-         , "-u", "GHCziBase_True_closure"
-         , "-u", "GHCziPack_unpackCString_closure"
-         , "-u", "GHCziIOBase_stackOverflow_closure"
-         , "-u", "GHCziIOBase_heapOverflow_closure"
-         , "-u", "GHCziIOBase_NonTermination_closure"
-         , "-u", "GHCziIOBase_BlockedOnDeadMVar_closure"
-         , "-u", "GHCziIOBase_BlockedIndefinitely_closure"
-         , "-u", "GHCziIOBase_Deadlock_closure"
-         , "-u", "GHCziIOBase_NestedAtomically_closure"
-         , "-u", "GHCziWeak_runFinalizzerBatch_closure"
+           "-u", "base_GHCziBase_Izh_static_info"
+         , "-u", "base_GHCziBase_Czh_static_info"
+         , "-u", "base_GHCziFloat_Fzh_static_info"
+         , "-u", "base_GHCziFloat_Dzh_static_info"
+         , "-u", "base_GHCziPtr_Ptr_static_info"
+         , "-u", "base_GHCziWord_Wzh_static_info"
+         , "-u", "base_GHCziInt_I8zh_static_info"
+         , "-u", "base_GHCziInt_I16zh_static_info"
+         , "-u", "base_GHCziInt_I32zh_static_info"
+         , "-u", "base_GHCziInt_I64zh_static_info"
+         , "-u", "base_GHCziWord_W8zh_static_info"
+         , "-u", "base_GHCziWord_W16zh_static_info"
+         , "-u", "base_GHCziWord_W32zh_static_info"
+         , "-u", "base_GHCziWord_W64zh_static_info"
+         , "-u", "base_GHCziStable_StablePtr_static_info"
+         , "-u", "base_GHCziBase_Izh_con_info"
+         , "-u", "base_GHCziBase_Czh_con_info"
+         , "-u", "base_GHCziFloat_Fzh_con_info"
+         , "-u", "base_GHCziFloat_Dzh_con_info"
+         , "-u", "base_GHCziPtr_Ptr_con_info"
+         , "-u", "base_GHCziPtr_FunPtr_con_info"
+         , "-u", "base_GHCziStable_StablePtr_con_info"
+         , "-u", "base_GHCziBase_False_closure"
+         , "-u", "base_GHCziBase_True_closure"
+         , "-u", "base_GHCziPack_unpackCString_closure"
+         , "-u", "base_GHCziIOBase_stackOverflow_closure"
+         , "-u", "base_GHCziIOBase_heapOverflow_closure"
+         , "-u", "base_GHCziIOBase_NonTermination_closure"
+         , "-u", "base_GHCziIOBase_BlockedOnDeadMVar_closure"
+         , "-u", "base_GHCziIOBase_BlockedIndefinitely_closure"
+         , "-u", "base_GHCziIOBase_Deadlock_closure"
+         , "-u", "base_GHCziIOBase_NestedAtomically_closure"
+         , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
 #endif
 
 #ifndef mingw32_HOST_OS
 #ifdef LEADING_UNDERSCORE
-	 , "-u", "_GHCziConc_ensureIOManagerIsRunning_closure"
+	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
 #else
-	 , "-u", "GHCziConc_ensureIOManagerIsRunning_closure"
+	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
 #endif
 #endif