paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 22:09:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Fix commit 19061, by restoring cs_link_smart code and disabling

Browse Source 
cs_create_smart if using dwarf information and external assembler
   debug information as this is not compatible.
 * Added a different message for cs_create_smart.

git-svn-id: trunk@19065 -
This commit is contained in:
pierre 2011-09-14 13:38:15 +00:00
parent f9fbe661f0
commit a5d2840980
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/msg/errore.msg
View File

@ -2819,7 +2819,7 @@ unit_u_indirect_crc_changed=10062_U_Indirect interface (objects/classes) CRC cha
# #
# Options # Options
# #
# 11048 is the last used one # 11049 is the last used one
# #
option_usage=11000_O_$1 [options] <inputfile> [options] option_usage=11000_O_$1 [options] <inputfile> [options]
# BeginOfTeX # BeginOfTeX
@ -2945,6 +2945,9 @@ option_ignored_target=11047_W_Option "$1" is ignored for the current target plat
option_debug_external_unsupported=11048_W_Disabling external debug information because it is unsupported for the selected target/debug format combination. option_debug_external_unsupported=11048_W_Disabling external debug information because it is unsupported for the selected target/debug format combination.
% Not all debug formats can be stored in an external file on all platforms. In particular, on % Not all debug formats can be stored in an external file on all platforms. In particular, on
% Mac OS X only DWARF debug information can be stored externally. % Mac OS X only DWARF debug information can be stored externally.
option_dwarf_smartlink_creation=11049_N_DWARF debug information cannot be used with smart linking with external assembler, disabling static library creation.
% Smart linking is currently incompatble with DWARF debug information on most
% platforms, so smart linking is disabled in such cases.
%\end{description} %\end{description}
# EndOfTeX # EndOfTeX

10
compiler/options.pas
View File

@ -2307,9 +2307,17 @@ begin
if (paratargetdbg in [dbg_dwarf2,dbg_dwarf3]) and if (paratargetdbg in [dbg_dwarf2,dbg_dwarf3]) and
not(target_info.system in systems_darwin) then not(target_info.system in systems_darwin) then
begin begin
{ smart linking does not yet work with DWARF debug info on most targets } { smartlink creation does not yet work with DWARF
debug info on most targets, but it works in internal assembler }
if (cs_create_smart in init_settings.moduleswitches) and if (cs_create_smart in init_settings.moduleswitches) and
not (af_outputbinary in target_asm.flags) then not (af_outputbinary in target_asm.flags) then
begin
Message(option_dwarf_smartlink_creation);
exclude(init_settings.moduleswitches,cs_create_smart);
end;
{ smart linking does not yet work with DWARF debug info on most targets }
if (cs_link_smart in init_settings.globalswitches) then
begin begin
Message(option_dwarf_smart_linking); Message(option_dwarf_smart_linking);
ForceStaticLinking; ForceStaticLinking;