diff --git a/Win/PmCleanSystem.dcl b/Win/PmCleanSystem.dcl index d7a8af1006a30a8a64f0687b7c045bc9b1381d91..eaffa5857666a27967b590f2f10716e6ea114656 100644 --- a/Win/PmCleanSystem.dcl +++ b/Win/PmCleanSystem.dcl @@ -111,8 +111,8 @@ Link :: // Links the given file: !String // name of file containing symbols to be exported from dll !Pathname // startup directory !String // path to dynamic linker - !Bool // 64 bit target processor !Processor // target processor + !Bool // 64 bit target processor !*(PSt .l) // state -> ( !*(PSt .l) // state diff --git a/Win/PmCleanSystem.icl b/Win/PmCleanSystem.icl index 0af8d5a219143918e8d3a57bbbd92d24896b5f7b..1b331055650d7948394a851652852114d19fd274 100644 --- a/Win/PmCleanSystem.icl +++ b/Win/PmCleanSystem.icl @@ -482,7 +482,7 @@ ReadErrorAndWarningMessages file MakeCompilerOptionsString :: !CompileOrCheckSyntax !Bool !Bool !Bool !CompilerOptions -> String MakeCompilerOptionsString compileOrCheckSyntax projectMemoryProfiling projectTimeProfiling projectEagerOrDynamic - {neverMemoryProfile, neverTimeProfile,sa,gw,gc,listTypes,attr,reuseUniqueNodes} + {neverMemoryProfile, neverTimeProfile,sa,gw,gc,listTypes,attr,reuseUniqueNodes,fusion} = options where memoryProfileSwitch @@ -530,9 +530,11 @@ where | reuseUniqueNodes = " -ou" = "" - - options = checksyntax +++ timeProfileSwitch +++ memoryProfileSwitch +++ dynamicLinkSwitch +++ strictness +++ - warnings +++ comments +++listtypes+++show_attr+++reuse+++" " + add_fusion_option s = if fusion (s+++" -fusion") s; + + options = add_fusion_option (checksyntax +++ timeProfileSwitch +++ memoryProfileSwitch +++ dynamicLinkSwitch + +++ strictness +++ warnings +++ comments +++listtypes+++show_attr+++reuse) + +++" " /* Generates code for the given file: @@ -606,12 +608,12 @@ where Link :: !String !(WindowFun *(PSt .l)) !Pathname !ApplicationOptions !Pathname !(List Pathname) !(List Pathname) !(List Pathname) !Bool !Bool !Bool !Bool !String - !Bool !String !Pathname !String !Bool !Processor !*(PSt .l) + !Bool !String !Pathname !String !Processor !Bool !*(PSt .l) -> (!*(PSt .l),!Bool) Link linker` winfun path applicationOptions=:{ss,hs,initial_heap_size,profiling,heap_size_multiple,o,memoryProfilingMinimumHeapSize=minheap} optionspathname library_file_names object_file_names static_libraries static gen_relocs gen_linkmap - link_resources resource_path gen_dll dll_syms startupdir dynlstr use_64_bit_processor _ ps + link_resources resource_path gen_dll dll_syms startupdir dynlstr _ use_64_bit_processor ps # (ok,linker,linkerdir) = mangleLinker linker` startupdir | not ok # ps = winfun [linker] ps