Commit 3f796fbb authored by John van Groningen's avatar John van Groningen

swap use_64_bit_processor and processor arguments of function Link,

pass -fusion to compiler
parent 55efd424
...@@ -111,8 +111,8 @@ Link :: // Links the given file: ...@@ -111,8 +111,8 @@ Link :: // Links the given file:
!String // name of file containing symbols to be exported from dll !String // name of file containing symbols to be exported from dll
!Pathname // startup directory !Pathname // startup directory
!String // path to dynamic linker !String // path to dynamic linker
!Bool // 64 bit target processor
!Processor // target processor !Processor // target processor
!Bool // 64 bit target processor
!*(PSt .l) // state !*(PSt .l) // state
-> ->
( !*(PSt .l) // state ( !*(PSt .l) // state
......
...@@ -482,7 +482,7 @@ ReadErrorAndWarningMessages file ...@@ -482,7 +482,7 @@ ReadErrorAndWarningMessages file
MakeCompilerOptionsString :: !CompileOrCheckSyntax !Bool !Bool !Bool !CompilerOptions -> String MakeCompilerOptionsString :: !CompileOrCheckSyntax !Bool !Bool !Bool !CompilerOptions -> String
MakeCompilerOptionsString compileOrCheckSyntax projectMemoryProfiling projectTimeProfiling projectEagerOrDynamic MakeCompilerOptionsString compileOrCheckSyntax projectMemoryProfiling projectTimeProfiling projectEagerOrDynamic
{neverMemoryProfile, neverTimeProfile,sa,gw,gc,listTypes,attr,reuseUniqueNodes} {neverMemoryProfile, neverTimeProfile,sa,gw,gc,listTypes,attr,reuseUniqueNodes,fusion}
= options = options
where where
memoryProfileSwitch memoryProfileSwitch
...@@ -530,9 +530,11 @@ where ...@@ -530,9 +530,11 @@ where
| reuseUniqueNodes | reuseUniqueNodes
= " -ou" = " -ou"
= "" = ""
add_fusion_option s = if fusion (s+++" -fusion") s;
options = checksyntax +++ timeProfileSwitch +++ memoryProfileSwitch +++ dynamicLinkSwitch +++ strictness +++
warnings +++ comments +++listtypes+++show_attr+++reuse+++" " options = add_fusion_option (checksyntax +++ timeProfileSwitch +++ memoryProfileSwitch +++ dynamicLinkSwitch
+++ strictness +++ warnings +++ comments +++listtypes+++show_attr+++reuse)
+++" "
/* Generates code for the given file: /* Generates code for the given file:
...@@ -606,12 +608,12 @@ where ...@@ -606,12 +608,12 @@ where
Link :: !String !(WindowFun *(PSt .l)) !Pathname !ApplicationOptions Link :: !String !(WindowFun *(PSt .l)) !Pathname !ApplicationOptions
!Pathname !(List Pathname) !(List Pathname) !(List Pathname) !Bool !Bool !Bool !Bool !String !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) -> (!*(PSt .l),!Bool)
Link linker` winfun path Link linker` winfun path
applicationOptions=:{ss,hs,initial_heap_size,profiling,heap_size_multiple,o,memoryProfilingMinimumHeapSize=minheap} 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 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 # (ok,linker,linkerdir) = mangleLinker linker` startupdir
| not ok | not ok
# ps = winfun [linker] ps # ps = winfun [linker] ps
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment