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

* applied patches from Sergey Korshunoff

Browse Source
This commit is contained in:
peter 2001-02-05 21:26:36 +00:00
parent 575329b520
commit 6656025337
1 changed files with 96 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
compiler/options.pas
View File

@ -128,6 +128,29 @@ begin
end; end;
end; end;
procedure set_default_link_type;
begin
if (target_os.id=os_i386_win32) then
begin
def_symbol('FPC_LINK_SMART');
undef_symbol('FPC_LINK_STATIC');
undef_symbol('FPC_LINK_DYNAMIC');
initglobalswitches:=initglobalswitches+[cs_link_smart];
initglobalswitches:=initglobalswitches-[cs_link_shared,cs_link_static];
end
else
begin
undef_symbol('FPC_LINK_SMART');
def_symbol('FPC_LINK_STATIC');
undef_symbol('FPC_LINK_DYNAMIC');
initglobalswitches:=initglobalswitches+[cs_link_static];
initglobalswitches:=initglobalswitches-[cs_link_shared,cs_link_smart];
end;
end;
{**************************************************************************** {****************************************************************************
Toption Toption
****************************************************************************} ****************************************************************************}
@ -187,13 +210,10 @@ var
s : string; s : string;
p : pchar; p : pchar;
begin begin
MaybeLoadMessageFile; WriteLogo;
Lines:=4;
Message1(option_usage,system.paramstr(0)); Message1(option_usage,system.paramstr(0));
lastident:=0; lastident:=0;
if DoWriteLogo then
lines:=3
else
lines:=1;
p:=MessagePChar(option_help_pages); p:=MessagePChar(option_help_pages);
while assigned(p) do while assigned(p) do
begin begin
@ -203,6 +223,12 @@ begin
show:=false; show:=false;
{ parse options } { parse options }
case s[1] of case s[1] of
{$ifdef UNITALIASES}
'a',
{$endif}
{$ifdef EXTDEBUG}
'e',
{$endif EXTDEBUG}
{$ifdef i386} {$ifdef i386}
'3', '3',
{$endif} {$endif}
@ -241,11 +267,11 @@ begin
outline:=7; outline:=7;
end; end;
'2' : begin '2' : begin
ident:=11; ident:=6;
outline:=11; outline:=11;
end; end;
'3' : begin '3' : begin
ident:=21; ident:=9;
outline:=6; outline:=6;
end; end;
end; end;
@ -335,7 +361,8 @@ begin
'l' : initglobalswitches:=initglobalswitches+[cs_asm_source]; 'l' : initglobalswitches:=initglobalswitches+[cs_asm_source];
'r' : initglobalswitches:=initglobalswitches+[cs_asm_regalloc]; 'r' : initglobalswitches:=initglobalswitches+[cs_asm_regalloc];
't' : initglobalswitches:=initglobalswitches+[cs_asm_tempalloc]; 't' : initglobalswitches:=initglobalswitches+[cs_asm_tempalloc];
'-' : initglobalswitches:=initglobalswitches-[cs_asm_leave,cs_asm_source,cs_asm_regalloc]; '-' : initglobalswitches:=initglobalswitches-
[cs_asm_leave, cs_asm_source,cs_asm_regalloc, cs_asm_tempalloc];
else else
IllegalPara(opt); IllegalPara(opt);
end; end;
@ -370,19 +397,19 @@ begin
IllegalPara(opt); IllegalPara(opt);
{$endif} {$endif}
end; end;
'B' : if more='' then 'B' : if UnSetBool(more,0) then
do_build:=true do_build:=false
else else
if more = '-' then do_build:=true;
do_build := False
else
IllegalPara(opt);
'C' : begin 'C' : begin
j := 1; j := 1;
while j <= length(more) Do while j <= length(more) Do
Begin Begin
case more[j] of case more[j] of
'a' : Simplify_ppu:=true; 'a' : If UnsetBool(More, j) then
Simplify_ppu:=false
else
Simplify_ppu:=true;
'h' : 'h' :
begin begin
val(copy(more,j+1,length(more)-j),heapsize,code); val(copy(more,j+1,length(more)-j),heapsize,code);
@ -499,6 +526,11 @@ begin
break; break;
end; end;
'w' : usewindowapi:=true; 'w' : usewindowapi:=true;
'-' : begin
initglobalswitches:=initglobalswitches-
[cs_link_deffile];
usewindowapi:=false;
end;
else else
IllegalPara(opt); IllegalPara(opt);
end; end;
@ -595,11 +627,14 @@ begin
ParaLinkOptions:=ParaLinkOptions+' '+More ParaLinkOptions:=ParaLinkOptions+' '+More
else else
IllegalPara(opt); IllegalPara(opt);
'l' : if more='' then 'l' : if UnSetBool(more,0) then
DoWriteLogo:=true DoWriteLogo:=false
else else
IllegalPara(opt); DoWriteLogo:=true;
'm' : parapreprocess:=true; 'm' : if UnSetBool(more,0) then
parapreprocess:=false
else
parapreprocess:=true;
'n' : if More='' then 'n' : if More='' then
begin begin
read_configfile:=false; read_configfile:=false;
@ -634,9 +669,15 @@ begin
end; end;
end; end;
{$ifdef Unix} {$ifdef Unix}
'P' : initglobalswitches:=initglobalswitches+[cs_asm_pipe]; 'P' : if UnsetBool(More, 0) then
{$endif} initglobalswitches:=initglobalswitches-[cs_asm_pipe]
's' : initglobalswitches:=initglobalswitches+[cs_asm_extern,cs_link_extern]; else
initglobalswitches:=initglobalswitches+[cs_asm_pipe];
{$endif Unix}
's' : if UnsetBool(More, 0) then
initglobalswitches:=initglobalswitches-[cs_asm_extern,cs_link_extern]
else
initglobalswitches:=initglobalswitches+[cs_asm_extern,cs_link_extern];
'S' : begin 'S' : begin
if more[1]='I' then if more[1]='I' then
begin begin
@ -666,7 +707,16 @@ begin
'p' : SetCompileMode('GPC',true); 'p' : SetCompileMode('GPC',true);
's' : initglobalswitches:=initglobalswitches+[cs_constructor_name]; 's' : initglobalswitches:=initglobalswitches+[cs_constructor_name];
't' : initmoduleswitches:=initmoduleswitches+[cs_static_keyword]; 't' : initmoduleswitches:=initmoduleswitches+[cs_static_keyword];
'v' : Message1(option_obsolete_switch,'-Sv'); '-' : begin
initglobalswitches:=initglobalswitches -
[cs_constructor_name];
initlocalswitches:=InitLocalswitches -
[cs_do_assertion, cs_ansistrings];
initmoduleswitches:=initmoduleswitches -
[cs_support_c_operators, cs_support_goto,
cs_support_inline, cs_support_macro,
cs_static_keyword];
end;
else else
IllegalPara(opt); IllegalPara(opt);
end; end;
@ -719,6 +769,11 @@ begin
break; break;
end; end;
's' : initmoduleswitches:=initmoduleswitches+[cs_compilesystem]; 's' : initmoduleswitches:=initmoduleswitches+[cs_compilesystem];
'-' : begin
initmoduleswitches:=initmoduleswitches
- [cs_compilesystem]
+ [cs_check_unit_name];
end;
else else
IllegalPara(opt); IllegalPara(opt);
end; end;
@ -747,14 +802,16 @@ begin
break; break;
end; end;
'C': apptype:=app_cui; 'C': apptype:=app_cui;
'D': ForceDeffileForExport:=true; 'D': if UnsetBool(More, j) then
ForceDeffileForExport:=false
else
ForceDeffileForExport:=true;
'F': apptype:=app_fs; 'F': apptype:=app_fs;
'G': apptype:=app_gui; 'G': apptype:=app_gui;
'N': begin 'N': begin
RelocSection:=false; RelocSection:=false;
RelocSectionSetExplicitly:=true; RelocSectionSetExplicitly:=true;
end; end;
'R': begin 'R': begin
RelocSection:=true; RelocSection:=true;
RelocSectionSetExplicitly:=true; RelocSectionSetExplicitly:=true;
@ -793,6 +850,10 @@ begin
initglobalswitches:=initglobalswitches-[cs_link_shared,cs_link_static]; initglobalswitches:=initglobalswitches-[cs_link_shared,cs_link_static];
LinkTypeSetExplicitly:=true; LinkTypeSetExplicitly:=true;
end; end;
'-' : begin
initglobalswitches:=initglobalswitches-[cs_link_toc, cs_link_strip, cs_link_staticflag];
set_default_link_type;
end;
else else
IllegalPara(opt); IllegalPara(opt);
end; end;
@ -1208,11 +1269,6 @@ var
configpath : pathstr; configpath : pathstr;
begin begin
option:=coption.create; option:=coption.create;
{ Load messages }
if (cmd='') and (paramcount=0) then
option.WriteHelpPages;
disable_configfile:=false; disable_configfile:=false;
{ default defines } { default defines }
@ -1363,6 +1419,10 @@ begin
option.writequickinfo; option.writequickinfo;
end; end;
{ Write help pages }
if (cmd='') and (paramcount=0) then
Option.WriteHelpPages;
{ Stop if errors in options } { Stop if errors in options }
if ErrorCount>0 then if ErrorCount>0 then
StopOptions; StopOptions;
@ -1481,24 +1541,8 @@ begin
initglobalswitches:=initglobalswitches-[cs_link_strip]; initglobalswitches:=initglobalswitches-[cs_link_strip];
if not LinkTypeSetExplicitly then if not LinkTypeSetExplicitly then
begin set_default_link_type;
if (target_os.id=os_i386_win32) then
begin
def_symbol('FPC_LINK_SMART');
undef_symbol('FPC_LINK_STATIC');
undef_symbol('FPC_LINK_DYNAMIC');
initglobalswitches:=initglobalswitches+[cs_link_smart];
initglobalswitches:=initglobalswitches-[cs_link_shared,cs_link_static];
end
else
begin
undef_symbol('FPC_LINK_SMART');
def_symbol('FPC_LINK_STATIC');
undef_symbol('FPC_LINK_DYNAMIC');
initglobalswitches:=initglobalswitches+[cs_link_static];
initglobalswitches:=initglobalswitches-[cs_link_shared,cs_link_smart];
end;
end;
{ Set defines depending on the target } { Set defines depending on the target }
if (target_info.target in [target_i386_GO32V1,target_i386_GO32V2]) then if (target_info.target in [target_i386_GO32V1,target_i386_GO32V2]) then
def_symbol('DPMI'); { MSDOS is not defined in BP when target is DPMI } def_symbol('DPMI'); { MSDOS is not defined in BP when target is DPMI }
@ -1518,7 +1562,10 @@ finalization
end. end.
{ {
$Log$ $Log$
Revision 1.27 2001-01-20 18:36:51 hajny Revision 1.28 2001-02-05 21:26:36 peter
* applied patches from Sergey Korshunoff
Revision 1.27 2001/01/20 18:36:51 hajny
+ APPTYPE support under OS/2, app_fs, GetEnvPChar for OS/2 + APPTYPE support under OS/2, app_fs, GetEnvPChar for OS/2
Revision 1.26 2001/01/12 19:21:09 peter Revision 1.26 2001/01/12 19:21:09 peter