diff --git a/compiler/globals.pas b/compiler/globals.pas index bcacf336f0..b3d50b9dc4 100644 --- a/compiler/globals.pas +++ b/compiler/globals.pas @@ -162,6 +162,7 @@ interface unitsearchpath, objectsearchpath, includesearchpath : TSearchPathList; + autoloadunits : string; { linking } usewindowapi : boolean; @@ -2290,7 +2291,12 @@ end; end. { $Log$ - Revision 1.168 2005-02-06 19:55:19 peter + Revision 1.169 2005-02-06 21:33:28 peter + * -Fa option added, it'll load the units before the uses + line is parsed. Can be used to load cthreads from the commandline. + Example '-g -Faheaptrc,lineinfo' is the same as '-ghl' + + Revision 1.168 2005/02/06 19:55:19 peter * oldfpccall fixed Revision 1.167 2005/02/05 16:17:19 florian diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 50a306b93b..07e1035e78 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2192,6 +2192,7 @@ S*2Aas_assemble using GNU AS **1e_set path to executable **1E_same as -Cn **1F_set file names and paths: +**2Fa[,y]_for a program load first units and [y] before uses is parsed **2Fc_sets input codepage to **2FD_sets the directory where to search for compiler utilities **2Fe_redirect error output to diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index fa11e31681..a6d19f7b20 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -650,7 +650,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 37975; + MsgTxtSize = 38053; MsgIdxMax : array[1..20] of longint=( 19,68,214,59,57,46,100,20,35,60, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index c4ff3112f5..5581b4dd16 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -771,158 +771,160 @@ const msgtxt : array[0..000158,1..240] of char=( '**1e_set path to executable'#010+ '**1E_same as -Cn'#010+ '**1F_set file names and paths:'#010+ + '**2Fa[,y]_for a program load first units and [y] before uses is'+ + ' parsed'#010+ '**2Fc_sets input codepage to '#010+ - '**2FD_sets the directory where to search for compiler utilities'#010+ - '**2Fe_redirect erro','r output to '#010+ + '**2FD_se','ts the directory where to search for compiler utilities'#010+ + '**2Fe_redirect error output to '#010+ '**2FE_set exe/unit output path to '#010+ '**2Fi_adds to include path'#010+ '**2Fl_adds to library path'#010+ '**2FL_uses as dynamic linker'#010+ - '**2Fo_adds to object path'#010+ + '*','*2Fo_adds to object path'#010+ '**2Fr_load error message file '#010+ - '**2Fu_','adds to unit path'#010+ + '**2Fu_adds to unit path'#010+ '**2FU_set unit output path to , overrides -FE'#010+ '*g1g_generate debugger information:'#010+ '*g2gc_generate checks for pointers'#010+ '*g2gd_use dbx'#010+ - '*g2gg_use gsym'#010+ + '*g2','gg_use gsym'#010+ '*g2gh_use heap trace unit (for memory leak debugging)'#010+ - '*g2gl_use li','ne info unit to show more info for backtraces'#010+ + '*g2gl_use line info unit to show more info for backtraces'#010+ '*g2gv_generates programs tracable with valgrind'#010+ '*g2gw_generate dwarf debugging info'#010+ '**1i_information'#010+ - '**2iD_return compiler date'#010+ + '**2iD_return co','mpiler date'#010+ '**2iV_return compiler version'#010+ '**2iSO_return compiler OS'#010+ - '**2iSP_ret','urn compiler processor'#010+ + '**2iSP_return compiler processor'#010+ '**2iTO_return target OS'#010+ '**2iTP_return target processor'#010+ '**1I_adds to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_write logo'#010+ - '**1M_set language mode to '#010+ + '**1M','_set language mode to '#010+ '**2Mfpc_free pascal dialect (default)'#010+ - '**2Mobjfpc_','switch some Delphi 2 extensions on'#010+ + '**2Mobjfpc_switch some Delphi 2 extensions on'#010+ '**2Mdelphi_tries to be Delphi compatible'#010+ '**2Mtp_tries to be TP/BP 7.0 compatible'#010+ '**2Mgpc_tries to be gpc compatible'#010+ - '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+ - '**1n_don'#039't read the de','fault config file'#010+ + '**2Mmacpas_','tries to be compatible to the macintosh pascal dialects'#010+ + '**1n_don'#039't read the default config file'#010+ '**1o_change the name of the executable produced to '#010+ '**1O_optimizations:'#010+ '3*2Og_generate smaller code'#010+ - '3*2OG_generate faster code (default)'#010+ + '3*2OG_generate faster code (default',')'#010+ '**2Or_keep certain variables in registers'#010+ - '3*2Ou_enable uncertain optimizatio','ns (see docs)'#010+ + '3*2Ou_enable uncertain optimizations (see docs)'#010+ '3*2O1_level 1 optimizations (quick optimizations)'#010+ '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+ - '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+ + '3*2O3_level 3 optimizations (-O2 repeated','ly, max 5 times)'#010+ '3*2Op_target processor:'#010+ - '3*3Op1_set target processor to 386','/486'#010+ + '3*3Op1_set target processor to 386/486'#010+ '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+ '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+ '6*2Og_generate smaller code'#010+ - '6*2OG_generate faster code (default)'#010+ + '6*2OG_generate faste','r code (default)'#010+ '6*2Ox_optimize maximum (still BUGGY!!!)'#010+ - '6*2O0_set target proc','essor to a MC68000'#010+ + '6*2O0_set target processor to a MC68000'#010+ '6*2O2_set target processor to a MC68020+ (default)'#010+ '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+ - '**1R_assembler reading style:'#010+ + '**1R_assembler reading style:',#010+ '**2Rdefault_use default assembler'#010+ '3*2Ratt_read AT&T style assembler'#010+ - '3*2Rintel','_read Intel style assembler'#010+ + '3*2Rintel_read Intel style assembler'#010+ '6*2RMOT_read motorola style assembler'#010+ '**1S_syntax options:'#010+ '**2S2_same as -Mobjfpc'#010+ - '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+ + '**2Sc_supports operators like C (*=,+=,/= and -=)',#010+ '**2Sa_include assertion code.'#010+ '**2Sd_same as -Mdelphi'#010+ - '**2Se_error options. ',' is a combination of the following:'#010+ + '**2Se_error options. is a combination of the following:'#010+ '**3*_ : compiler stops after the errors (default is 1)'#010+ '**3*_w : compiler stops also after warnings'#010+ - '**3*_n : compiler stops also after notes'#010+ + '**3*_n : compiler',' stops also after notes'#010+ '**3*_h : compiler stops also after hints'#010+ - '**2Sg_allow L','ABEL and GOTO'#010+ + '**2Sg_allow LABEL and GOTO'#010+ '**2Sh_Use ansistrings'#010+ '**2Si_support C++ styled INLINE'#010+ '**2SI_set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ - '**3SIcorba_CORBA compatible interface'#010+ + '**3SIcorba_COR','BA compatible interface'#010+ '**2Sm_support macros like C (global)'#010+ - '**2So_same as -Mt','p'#010+ + '**2So_same as -Mtp'#010+ '**2Sp_same as -Mgpc'#010+ '**2Ss_constructor name must be init (destructor must be done)'#010+ '**2St_allow static keyword in objects'#010+ '**1s_don'#039't call assembler and linker'#010+ - '**2sh_Generate script to link on host'#010+ + '**2','sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ - '**2','sr_Skip register allocation phase (use with -alr)'#010+ + '**2sr_Skip register allocation phase (use with -alr)'#010+ '**1T_Target operating system:'#010+ '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ - '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ + '3*2Tgo32v','2_Version 2 of DJ Delorie DOS extender'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnetbsd_NetBSD'#010+ - '3*2Tn','etware_Novell Netware Module (clib)'#010+ + '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsunos_SunOS/Solaris'#010+ - '3*2Twatcom_Watcom compatible DOS extender'#010+ + '3*2Twatcom_Wa','tcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ - '3*2Twin32_Windows 32',' Bit'#010+ + '3*2Twin32_Windows 32 Bit'#010+ '4*2Tlinux_Linux'#010+ '6*2Tamiga_Commodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux-68k'#010+ '6*2Tmacos_Macintosh m68k (not supported)'#010+ '6*2Tpalmos_PalmOS'#010+ - 'A*2Tlinux_Linux'#010+ + 'A*2Tlinux_','Linux'#010+ 'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ - 'P*2T','macos_MacOS (classic) on PowerPC'#010+ + 'P*2Tmacos_MacOS (classic) on PowerPC'#010+ 'P*2Tmorphos_MorphOS'#010+ 'S*2Tlinux_Linux'#010+ '**1u_undefines the symbol '#010+ '**1U_unit options:'#010+ '**2Un_don'#039't check the unit name'#010+ - '**2Ur_generate release unit files'#010+ + '**2Ur_gen','erate release unit files'#010+ '**2Us_compile a system unit'#010+ - '**1v_Be verbose. i','s a combination of the following letters:'#010+ + '**1v_Be verbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ - '**2*_w : Show warnings u : Show unit info'#010+ + '**2*_w : Show warnings u : Show unit',' info'#010+ '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h : ','Show hints c : Show conditionals'#010+ + '**2*_h : Show hints c : Show conditionals'#010+ '**2*_i : Show general info d : Show debug info'#010+ - '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ - '**2*_a : Show everything x : Executable info (Win32',' only'+ - ')'#010+ + '**2*_l : Show linenumbers r : Rhide/GCC comp','atibility mod'+ + 'e'#010+ + '**2*_a : Show everything x : Executable info (Win32 only)'#010+ '**2*_v : write fpcdebug.txt with p : Write tree.log with parse tre'+ 'e'#010+ '**2*_ lots of debugging info'#010+ '3*1W_Win32-like target options'#010+ - '3*2WB_Set Image base to Hexadecimal value'#010+ + '3*2WB_Set Imag','e base to Hexadecimal value'#010+ '3*2WC_Specify console type application'#010+ - '3*2WD_U','se DEFFILE to export functions of DLL or EXE'#010+ + '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+ '3*2WF_Specify full-screen type application (OS/2 only)'#010+ '3*2WG_Specify graphic type application'#010+ - '3*2WN_Do not generate relocation code (necessary for debugging)'#010+ + '3*2WN_Do not generate r','elocation code (necessary for debugging)'#010+ '3*2WR_Generate relocation code'#010+ - 'P*2WC_','Specify console type application (MacOS only)'#010+ + 'P*2WC_Specify console type application (MacOS only)'#010+ 'P*2WG_Specify graphic type application (MacOS only)'#010+ 'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+ - '**1X_executable options:'#010+ + '**1X_','executable options:'#010+ '**2Xc_link with the c library'#010+ - '**2Xd_don'#039't use standard lib','rary search path (needed for cross c'+ - 'ompile)'#010+ + '**2Xd_don'#039't use standard library search path (needed for cross com'+ + 'pile)'#010+ '**2XD_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+ - '**2XP_prepend the binutils names with the prefix '#010+ + '**2XP_prepend the binutils names with the prefi','x '#010+ '**2Xr_set library search path to (needed for cross compile)'#010+ - '**2Xs','_strip all symbols from executable'#010+ + '**2Xs_strip all symbols from executable'#010+ '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+ - '**2Xt_link with static libraries (-static is passed to linker)'#010+ + '**2Xt_link with static libraries (-static is passed to linke','r)'#010+ '**2XX_try to link units smart (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ - '**1','?_shows this help'#010+ + '**1?_shows this help'#010+ '**1h_shows this help without waiting'#000 ); diff --git a/compiler/options.pas b/compiler/options.pas index 565451dea9..f9981971f6 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -644,6 +644,8 @@ begin Delete(more,1,1); DefaultReplacements(More); case c of + 'a' : + autoloadunits:=more; 'c' : begin if not(cpavailable(more)) then @@ -2090,7 +2092,12 @@ finalization end. { $Log$ - Revision 1.163 2005-02-05 10:24:17 florian + Revision 1.164 2005-02-06 21:33:28 peter + * -Fa option added, it'll load the units before the uses + line is parsed. Can be used to load cthreads from the commandline. + Example '-g -Faheaptrc,lineinfo' is the same as '-ghl' + + Revision 1.163 2005/02/05 10:24:17 florian *** empty log message *** Revision 1.162 2005/01/20 17:05:53 peter diff --git a/compiler/pmodules.pas b/compiler/pmodules.pas index 3c0c2aaf80..9da140d2cb 100644 --- a/compiler/pmodules.pas +++ b/compiler/pmodules.pas @@ -475,6 +475,20 @@ implementation end; + procedure loadautounits; + var + hs,s : string; + begin + hs:=autoloadunits; + repeat + s:=GetToken(hs,','); + if s='' then + break; + AddUnit(s); + until false; + end; + + procedure loadunits; var s,sorg : stringid; @@ -1347,10 +1361,10 @@ implementation current_module.realmodulename:=stringdup(orgpattern); current_module.islibrary:=true; exportlib.preparelib(orgpattern); - + if tf_library_needs_pic in target_info.flags then include(aktmoduleswitches,cs_create_pic); - + consume(_ID); consume(_SEMICOLON); end @@ -1404,6 +1418,9 @@ implementation current_module.localmacrosymtable.next:=macrosymtablestack; macrosymtablestack:=current_module.localmacrosymtable; + { Load units provided on the command line } + loadautounits; + {Load the units used by the program we compile.} if token=_USES then loadunits; @@ -1605,7 +1622,12 @@ implementation end. { $Log$ - Revision 1.183 2005-02-06 11:15:31 peter + Revision 1.184 2005-02-06 21:33:28 peter + * -Fa option added, it'll load the units before the uses + line is parsed. Can be used to load cthreads from the commandline. + Example '-g -Faheaptrc,lineinfo' is the same as '-ghl' + + Revision 1.183 2005/02/06 11:15:31 peter * removed $threading Revision 1.182 2005/02/06 00:05:56 florian