Commit 1ada6375 authored by John van Groningen's avatar John van Groningen

link _startup3.o and _startup4.o on 64 bit windows

parent 33fce725
......@@ -12,7 +12,7 @@ import PmTypes
//ifWindows w o :== o
standardStaticLibraries :: !Processor !LinkMethod -> List String
standardObjectFiles :: !Bool !Bool !Processor -> List String
standardObjectFiles :: !Bool !Bool !Processor !Bool -> List String
getLibs :: ![String] !*Files -> (!(![String],![String]),!*Files)
:: CompilerProcessIds
......
......@@ -59,8 +59,8 @@ standardStaticLibraries processor method
LM_Static -> (Nil)
LM_Dynamic -> (Nil)
standardObjectFiles :: !Bool !Bool !Processor -> List String
standardObjectFiles stack_traces profiling processor
standardObjectFiles :: !Bool !Bool !Processor !Bool -> List String
standardObjectFiles stack_traces profiling processor use_64_bit_processor
| stack_traces
= ( MakeObjPathname processor "_startupTrace" :! rest)
| profiling
......
......@@ -783,9 +783,11 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
# execpath = fulPath app_path prj_path` execpath
# ps = showInfo (Level2 ("Linking '" +++ RemovePath execpath +++ "'")) ps
# (use_64_bit_processor,ps) = getCurrent64BitProcessor ps
// runtime objects and dynamic libs
# stdl = Concat sys_libs (standardStaticLibraries tp lo.method)
# stdo = Concat sys_objs (standardObjectFiles ao.stack_traces ao.profiling tp)
# stdo = Concat sys_objs (standardObjectFiles ao.stack_traces ao.profiling tp use_64_bit_processor)
# (stdoOk,ofiles,abcPathsCache)
= case ao.standard_rte of
True -> GetPathNames stdo Nil abcPathsCache
......@@ -834,7 +836,6 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
# ofiles = Reverse2 clmodpaths ofiles
# (use_64_bit_processor,ps) = getCurrent64BitProcessor ps
// module imported objects and dynamic libs
# abcLinkInfo = PR_GetABCLinkInfo project
# linkObjFileNames = Map (append_object_file_extension_if_dot_at_end tp use_64_bit_processor) abcLinkInfo.linkObjFileNames
......
......@@ -9,7 +9,7 @@ import PmCompilerOptions
import PmTypes
standardStaticLibraries :: !Processor !LinkMethod -> List String
standardObjectFiles :: !Bool !Bool !Processor -> List String
standardObjectFiles :: !Bool !Bool !Processor !Bool -> List String
getLibs :: ![String] !*Files -> (!(![String],![String]),!*Files)
......
......@@ -41,13 +41,13 @@ standardStaticLibraries _ method
morelibs // Note that these dependencies are introduced by StdEnv and should be encoded there.
= "user_library" :! "gdi_library" :! "comdlg_library" :! Nil
standardObjectFiles :: !Bool !Bool !Processor-> List String
standardObjectFiles stack_traces profiling _
| stack_traces
= ("_startup0.o" :! "_startup1Trace.o" :! "_startup2.o" :! "_system.o" :! Nil)
| profiling
= ("_startup0.o" :! "_startup1Profile.o" :! "_startup2.o" :! "_system.o" :! Nil)
= ("_startup0.o" :! "_startup1.o" :! "_startup2.o" :! "_system.o" :! Nil)
standardObjectFiles :: !Bool !Bool !Processor !Bool -> List String
standardObjectFiles stack_traces profiling _ use_64_bit_processor
#! startup1_file = if stack_traces "_startup1Trace.o"
(if profiling "_startup1Profile.o" "_startup1.o")
| not use_64_bit_processor
= ("_startup0.o" :! startup1_file :! "_startup2.o" :! "_system.o" :! Nil)
= ("_startup0.o" :! startup1_file :! "_startup2.o" :! "_startup3.o" :! "_startup4.o" :! "_system.o" :! Nil)
//-- interface to static libraries...
......
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