mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-20 16:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug where `mmc --target asm --pic' was not naming the output

Browse Source 
Estimated ours taken: 0.5
Branches: main, release

compiler/compile_target_code.m:
	Fix bug where `mmc --target asm --pic' was not naming the output
	file as `.o' rather than `.pic_o'.
This commit is contained in:
Fergus Henderson
2002-12-03 08:41:56 +00:00
parent 9da8c2d3b4
commit fe21ffe105
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/compile_target_code.m
View File

@@ -282,6 +282,7 @@ split_c_to_obj(ErrorStream, ModuleName,
( { Chunk > NumChunks } -> ( { Chunk > NumChunks } ->
{ Succeeded = yes } { Succeeded = yes }
; ;
% XXX should this use maybe_pic_object_file_extension?
globals__io_lookup_string_option(object_file_extension, Obj), globals__io_lookup_string_option(object_file_extension, Obj),
module_name_to_split_c_file_name(ModuleName, Chunk, module_name_to_split_c_file_name(ModuleName, Chunk,
".c", C_File), ".c", C_File),
@@ -305,14 +306,7 @@ split_c_to_obj(ErrorStream, ModuleName,
compile_c_file(ErrorStream, PIC, ModuleName, Succeeded) --> compile_c_file(ErrorStream, PIC, ModuleName, Succeeded) -->
module_name_to_file_name(ModuleName, ".c", yes, C_File), module_name_to_file_name(ModuleName, ".c", yes, C_File),
( maybe_pic_object_file_extension(PIC, ObjExt),
{ PIC = pic },
globals__io_lookup_string_option(pic_object_file_extension,
ObjExt)
;
{ PIC = non_pic },
globals__io_lookup_string_option(object_file_extension, ObjExt)
),
module_name_to_file_name(ModuleName, ObjExt, yes, O_File), module_name_to_file_name(ModuleName, ObjExt, yes, O_File),
compile_c_file(ErrorStream, PIC, C_File, O_File, Succeeded). compile_c_file(ErrorStream, PIC, C_File, O_File, Succeeded).
@@ -593,6 +587,13 @@ compile_c_file(ErrorStream, PIC, C_File, O_File, Succeeded) -->
invoke_system_command(ErrorStream, verbose_commands, invoke_system_command(ErrorStream, verbose_commands,
Command, Succeeded). Command, Succeeded).
:- pred maybe_pic_object_file_extension(pic::in, string::out,
io__state::di, io__state::uo) is det.
maybe_pic_object_file_extension(pic, ObjExt) -->
globals__io_lookup_string_option(pic_object_file_extension, ObjExt).
maybe_pic_object_file_extension(non_pic, ObjExt) -->
globals__io_lookup_string_option(object_file_extension, ObjExt).
%-----------------------------------------------------------------------------% %-----------------------------------------------------------------------------%
compile_java_file(ErrorStream, ModuleName, Succeeded) --> compile_java_file(ErrorStream, ModuleName, Succeeded) -->
@@ -633,19 +634,24 @@ compile_java_file(ErrorStream, ModuleName, Succeeded) -->
%-----------------------------------------------------------------------------% %-----------------------------------------------------------------------------%
assemble(ErrorStream, PIC, ModuleName, Succeeded) --> assemble(ErrorStream, PIC, ModuleName, Succeeded) -->
globals__io_lookup_bool_option(pic, Pic), % XXX What is the difference between the PIC argument
{ ( Pic = yes ; PIC = pic ) -> % and the setting of the `--pic' option here?
% When can they be different?
globals__io_lookup_bool_option(pic, PicOption),
{ ( PicOption = yes ; PIC = pic ) ->
ReallyPic = pic,
AsmExt = ".pic_s", AsmExt = ".pic_s",
GCCFLAGS_FOR_ASM = "-x assembler ", GCCFLAGS_FOR_ASM = "-x assembler ",
GCCFLAGS_FOR_PIC = "-fpic " GCCFLAGS_FOR_PIC = "-fpic "
; ;
ReallyPic = non_pic,
AsmExt = ".s", AsmExt = ".s",
GCCFLAGS_FOR_ASM = "", GCCFLAGS_FOR_ASM = "",
GCCFLAGS_FOR_PIC = "" GCCFLAGS_FOR_PIC = ""
}, },
module_name_to_file_name(ModuleName, AsmExt, no, AsmFile), module_name_to_file_name(ModuleName, AsmExt, no, AsmFile),
globals__io_lookup_string_option(object_file_extension, Obj), maybe_pic_object_file_extension(ReallyPic, ObjExt),
module_name_to_file_name(ModuleName, Obj, yes, ObjFile), module_name_to_file_name(ModuleName, ObjExt, yes, ObjFile),
globals__io_lookup_bool_option(verbose, Verbose), globals__io_lookup_bool_option(verbose, Verbose),
maybe_write_string(Verbose, "% Assembling `"), maybe_write_string(Verbose, "% Assembling `"),