Verified Commit e4a0fd07 authored by Camil Staps's avatar Camil Staps
Browse files

64-bit Windows fixes: use size_t to write options file; only link _startup3.o...

64-bit Windows fixes: use size_t to write options file; only link _startup3.o and _startup4.o on 64-bit Windows
parent bc5944c6
Pipeline #45860 passed with stage
in 1 minute and 14 seconds
......@@ -3094,12 +3094,12 @@ int create_options_file (char **options_file_name_p)
#else
# ifdef _WINDOWS_
# ifdef A_64
((long*)&data[140])[0]=heap_size;
((long*)&data[140])[1]=ab_stack_size;
((long*)&data[140])[2]=flags;
((long*)&data[140])[3]=initial_heap_size;
((long*)&data[140])[4]=heap_size_multiple;
((long*)&data[140])[5]=0/*min_write_heap_size*/;
((size_t*)&data[140])[0]=heap_size;
((size_t*)&data[140])[1]=ab_stack_size;
((size_t*)&data[140])[2]=flags;
((size_t*)&data[140])[3]=initial_heap_size;
((size_t*)&data[140])[4]=heap_size_multiple;
((size_t*)&data[140])[5]=0/*min_write_heap_size*/;
# else
((int*)&data[140])[0]=heap_size;
((int*)&data[140])[1]=ab_stack_size;
......@@ -3365,11 +3365,13 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
need_file ("_startup2",OBJECT_FILE_EXTENSION,startup2_file_name);
*arg++=startup2_file_name;
# ifdef A_64
need_file ("_startup3",OBJECT_FILE_EXTENSION,startup3_file_name);
*arg++=startup3_file_name;
need_file ("_startup4",OBJECT_FILE_EXTENSION,startup4_file_name);
*arg++=startup4_file_name;
# endif
# else
if ((clean_options & NO_TIME_PROFILE_MASK)!=0){
......
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