From 79974a96713d98fd78bf838755c31fc44f2d0a48 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 30 Mar 2020 19:58:49 +0000 Subject: [PATCH] + -XlS option to specify a suffix for externally called LLVM utilities, e.g. -XlS-7 to call clang-7 instead of clang) * IMPORTANT: changed the -CL llvm code generation options to -Cl, for consistency with the new -Xl option (-XL was already taken) git-svn-id: trunk@44436 - --- compiler/assemble.pas | 8 +- compiler/globals.pas | 5 + compiler/llvm/agllvm.pas | 4 +- compiler/msg/errore.msg | 9 +- compiler/msgidx.inc | 2 +- compiler/msgtxt.inc | 251 ++++++++++++++++++++------------------- compiler/options.pas | 38 ++++-- compiler/systems.pas | 1 + 8 files changed, 175 insertions(+), 143 deletions(-) diff --git a/compiler/assemble.pas b/compiler/assemble.pas index 01eb2b239d..d18021c70f 100644 --- a/compiler/assemble.pas +++ b/compiler/assemble.pas @@ -822,16 +822,20 @@ Implementation var asfound : boolean; UtilExe : string; + asmbin : TCmdStr; begin asfound:=false; + asmbin:=asminfo^.asmbin; + if (af_llvm in asminfo^.flags) then + asmbin:=asmbin+llvmutilssuffix; if cs_link_on_target in current_settings.globalswitches then begin { If linking on target, don't add any path PM } - FindAssembler:=utilsprefix+ChangeFileExt(asminfo^.asmbin,target_info.exeext); + FindAssembler:=utilsprefix+ChangeFileExt(asmbin,target_info.exeext); exit; end else - UtilExe:=utilsprefix+ChangeFileExt(asminfo^.asmbin,source_info.exeext); + UtilExe:=utilsprefix+ChangeFileExt(asmbin,source_info.exeext); if lastas<>ord(asminfo^.id) then begin lastas:=ord(asminfo^.id); diff --git a/compiler/globals.pas b/compiler/globals.pas index 999f6a5333..db591dbb80 100644 --- a/compiler/globals.pas +++ b/compiler/globals.pas @@ -273,6 +273,10 @@ interface utilsdirectory : TPathStr; { targetname specific prefix used by these utils (options -XP) } utilsprefix : TCmdStr; + + { Suffix for LLVM utilities, e.g. '-7' for clang-7 } + llvmutilssuffix : TCmdStr; + cshared : boolean; { pass --shared to ld to link C libs shared} Dontlinkstdlibpath: Boolean; { Don't add std paths to linkpath} rlinkpath : TCmdStr; { rpath-link linkdir override} @@ -1608,6 +1612,7 @@ implementation { Utils directory } utilsdirectory:=''; utilsprefix:=''; + llvmutilssuffix:=''; cshared:=false; rlinkpath:=''; sysrootpath:=''; diff --git a/compiler/llvm/agllvm.pas b/compiler/llvm/agllvm.pas index 2da31f3924..82ed6d9919 100644 --- a/compiler/llvm/agllvm.pas +++ b/compiler/llvm/agllvm.pas @@ -1735,7 +1735,7 @@ implementation asmbin : 'llc'; asmcmd: '$OPT -o $OBJ $ASM'; supported_targets : [system_x86_64_linux,system_x86_64_darwin,system_aarch64_linux,system_arm_linux]; - flags : [af_smartlink_sections]; + flags : [af_smartlink_sections,af_llvm]; labelprefix : 'L'; comment : '; '; dollarsign: '$'; @@ -1749,7 +1749,7 @@ implementation asmbin : 'clang'; asmcmd: '$OPT $DARWINVERSION -c -o $OBJ $ASM'; supported_targets : [system_x86_64_linux,system_x86_64_darwin,system_aarch64_linux,system_arm_linux]; - flags : [af_smartlink_sections]; + flags : [af_smartlink_sections,af_llvm]; labelprefix : 'L'; comment : '; '; dollarsign: '$'; diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index e6f5d3b92d..0d24a3d29f 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -3890,10 +3890,10 @@ S*2Aas_Assemble using GNU AS **2Ch[,m]_ bytes min heap size (between 1023 and 67107840) and optionally [m] max heap size **2Ci_IO-checking A*2CI_Select instruction set on ARM: ARM or THUMB -L*2CL_LLVM code generation options -L*3CLflto_Enable Link-time optimisation (needed both when compiling units and programs/libraries) -L*3CLfltonosystem_Disable LTO for the system unit (needed with at least Xcode 10.2 and earlier due to linker bugs) -L*3CLv_LLVM target version: 3.3, 3.4, .., Xcode-6.4, .., Xcode-10.1, 7.0, 8.0 +l*2CL_LLVM code generation options +l*3CLflto_Enable Link-time optimisation (needed both when compiling units and programs/libraries) +l*3CLfltonosystem_Disable LTO for the system unit (needed with at least Xcode 10.2 and earlier due to linker bugs) +l*3CLv_LLVM target version: Xcode-10.1, 7.0, 8.0, .., 10.0 **2Cn_Omit linking stage P*2CN_Generate nil-pointer checks (AIX-only) **2Co_Check overflow of integer operations @@ -4275,6 +4275,7 @@ P*2WT_Specify MPW tool type application (Classic Mac OS) **2Xg_Create debuginfo in a separate file and add a debuglink section to executable **2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC) **2Xi_Use internal linker +L*2XlS_LLVM utilties suffix (e.g. -7 in case clang is called clang-7) **2XLA_Define library substitutions for linking **2XLO_Define order of library linking **2XLD_Exclude default order of standard libraries diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index fcc6186782..caedaa6992 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -1124,7 +1124,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 84782; + MsgTxtSize = 84836; MsgIdxMax : array[1..20] of longint=( 28,106,356,128,99,63,143,35,223,68, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index cf144a0f6f..7b2253b9d0 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1507,230 +1507,229 @@ const msgtxt : array[0..000353,1..240] of char=( 'ptionally [m] max heap size'#010+ '**2Ci_IO-checking'#010+ 'A*2CI_Select instruction set on ARM: ARM or THUMB'#010+ - 'L*2CL_LLVM c','ode generation options'#010+ - 'L*3CLflto_Enable Link-time optimisation (needed both when compiling un'+ + 'l*2CL_LLVM c','ode generation options'#010+ + 'l*3CLflto_Enable Link-time optimisation (needed both when compiling un'+ 'its and programs/libraries)'#010+ - 'L*3CLfltonosystem_Disable LTO for the system unit (needed with at leas'+ + 'l*3CLfltonosystem_Disable LTO for the system unit (needed with at leas'+ 't Xcode 10.2 and earlier due to linker bugs)'#010+ - 'L*3C','Lv_LLVM target version: 3.3, 3.4, .., Xcode-6.4, .., Xcode-10'+ - '.1, 7.0, 8.0'#010+ + 'l*3C','Lv_LLVM target version: Xcode-10.1, 7.0, 8.0, .., 10.0'#010+ '**2Cn_Omit linking stage'#010+ 'P*2CN_Generate nil-pointer checks (AIX-only)'#010+ '**2Co_Check overflow of integer operations'#010+ - '**2CO_Check for possible overflow of integer opera','tions'#010+ - '**2Cp_Select instruction set; see fpc -i or fpc -ic for possible va'+ - 'lues'#010+ + '**2CO_Check for possible overflow of integer operations'#010+ + '**2Cp_Sele','ct instruction set; see fpc -i or fpc -ic for possible '+ + 'values'#010+ '**2CP=_ packing settings'#010+ '**3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+ 'and 8'#010+ - '**3CPPACKENUM=_ enum packing: 0, 1, 2 and 4 o','r DEFAULT or NOR'+ - 'MAL'#010+ + '**3CPPACKENUM=_ enum packing: 0, 1, 2 and 4 or DEFAULT or NORMA'+ + 'L',#010+ '**3CPPACKRECORD=_ record packing: 0 or DEFAULT or NORMAL, 1, 2,'+ ' 4, 8, 16 and 32'#010+ '**2Cr_Range checking'#010+ '**2CR_Verify object method call validity'#010+ '**2Cs_Set stack checking size to '#010+ - '**2Ct_Stack checking (for testi','ng only, see manual)'#010+ + '**2Ct_Stack checking (for testing only, see manual',')'#010+ '8*2CT_Target-specific code generation options'#010+ '3*2CT_Target-specific code generation options'#010+ '4*2CT_Target-specific code generation options'#010+ 'p*2CT_Target-specific code generation options'#010+ - 'P*2CT_Target-specifi','c code generation options'#010+ + 'P*2CT_Target-specific code generation o','ptions'#010+ 'J*2CT_Target-specific code generation options'#010+ 'A*2CT_Target-specific code generation options'#010+ 'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+ ' (AIX)'#010+ - 'P*3CTsmalltoc_ Generate smaller TOCs at',' the expense of execution spe'+ + 'P*3CTsmalltoc_ Generate smaller TOCs at the expense of exe','cution spe'+ 'ed (AIX)'#010+ 'J*3CTautogetterprefix=X_ Automatically create getters for properties '+ 'with prefix X (empty string disables)'#010+ 'J*3CTautosetterprefix=X_ Automatically create setters for properties '+ - 'with prefix X (empty str','ing disables)'#010+ - '8*3CTcld_ Emit a CLD instruction before using the x86 '+ - 'string instructions'#010+ + 'with prefix X (empty string disables)'#010+ + '8*3CT','cld_ Emit a CLD instruction before using the x8'+ + '6 string instructions'#010+ '3*3CTcld_ Emit a CLD instruction before using the x86 '+ 'string instructions'#010+ - '4*3CTcld_ Emit a CLD instructi','on before using the x8'+ + '4*3CTcld_ Emit a CLD instruction before using the',' x8'+ '6 string instructions'#010+ '8*3CTfarprocspushoddbp_ Increment BP before pushing it in the pr'+ 'ologue of far functions'#010+ 'J*3CTcompactintarrayinit_ Generate smaller (but potentially slower) co'+ - 'de for initializing integer arra','y constants'#010+ - 'J*3CTenumfieldinit_ Initialize enumeration fields in constructor'+ - 's to enumtype(0), after calling inherited constructors'#010+ + 'de for initializing integer array constants'#010+ + 'J*3CTen','umfieldinit_ Initialize enumeration fields in construct'+ + 'ors to enumtype(0), after calling inherited constructors'#010+ 'J*3CTinitlocals_ Initialize local variables that trigger a JV'+ - 'M bytecode verification error if ','used uninitialized (slows down code'+ + 'M bytecode verification error if used uninitialized ','(slows down code'+ ')'#010+ 'J*3CTlowercaseprocstart_ Lowercase the first character of procedure/f'+ 'unction/method names'#010+ 'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if possi'+ 'ble'#010+ - 'J*2Cv_Var/out parameter copy-out check','ing'#010+ - 'A*2CV_Set section threadvar model to '#010+ + 'J*2Cv_Var/out parameter copy-out checking'#010+ + 'A*2CV_Set se','ction threadvar model to '#010+ '**2CX_Create also smartlinked library'#010+ '**1d_Defines the symbol '#010+ '**1D_Generate a DEF file'#010+ '**2Dd_Set description to '#010+ '**2Dv_Set DLL version to '#010+ '*O2Dw_PM application'#010+ - '**1e_Set p','ath to executable'#010+ - '**1E_Same as -Cn'#010+ + '**1e_Set path to executable'#010+ + '*','*1E_Same as -Cn'#010+ '**1fPIC_Same as -Cg'#010+ '**1F_Set file names and paths:'#010+ '**2Fa[,y]_(for a program) load units and [y] before uses is par'+ 'sed'#010+ '**2Fc_Set input codepage to '#010+ - '**2FC_Set RC compiler binary name to '#010+ - '**2Fd_Disable the compiler'#039's internal directory cache'#010+ + '**2FC_Set RC compiler binary name to '#010+ + '**2Fd_Disable the',' compiler'#039's internal directory cache'#010+ '**2FD_Set the directory where to search for compiler utilities'#010+ '**2Fe_Redirect error output to '#010+ '**2Ff_Add to framework path (Darwin only)'#010+ - '**2FE_Set exe/unit output pa','th to '#010+ - '**2Fi_Add to include path'#010+ + '**2FE_Set exe/unit output path to '#010+ + '**2Fi_','Add to include path'#010+ '**2Fl_Add to library path'#010+ '**2FL_Use as dynamic linker'#010+ '**2Fm_Load unicode conversion table from .txt in the compiler di'+ 'r'#010+ - '**2FM_Set the directory where to search for unicode bi','nary files'#010+ - '**2FN_Add to list of default unit scopes (namespaces)'#010+ + '**2FM_Set the directory where to search for unicode binary files'#010+ + '**2FN','_Add to list of default unit scopes (namespaces)'#010+ '**2Fo_Add to object path'#010+ '**2Fr_Load error message file '#010+ '**2FR_Set resource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ - '**2FU_Set unit output p','ath to , overrides -FE'#010+ + '**2FU_Set unit output path to , overrid','es -FE'#010+ '**2FW_Store generated whole-program optimization feedback in '#010+ '**2Fw_Load previously stored whole-program optimization feedback fr'+ 'om '#010+ '*g1g_Generate debug information (default format for target)'#010+ - '*g2gc_Gen','erate checks for pointers (experimental, only available on '+ + '*g2gc_Generate checks for po','inters (experimental, only available on '+ 'some targets, might generate false positive)'#010+ '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ '*g2gl_Use line info unit (show more info with backtraces)'#010+ - '*g2gm_Generate',' Microsoft CodeView debug information (experimental)'#010+ + '*g2gm_Generate Microsoft CodeView',' debug information (experimental)'#010+ '*g2go_Set debug information options'#010+ '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+ 'aks gdb < 6.5)'#010+ '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+ - #010, - '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+ - 'ame'#010+ + #010+ + '*g3godwarfmethodcla','ssprefix_ Prefix method names in DWARF with class'+ + ' name'#010+ '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+ '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+ - 'cords in MS LINK format in addition to th','e DWARF debug information ('+ + 'cords in MS LINK format in addition to the DWARF debug infor','mation ('+ 'Open Watcom Debugger/Linker compatibility)'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ '*g2gs_Generate Stabs debug information'#010+ '*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+ - 't'#039' changes the trash','ing value)'#010+ - '*g2gv_Generates programs traceable with Valgrind'#010+ + 't'#039' changes the trashing value)'#010+ + '*g2gv_Ge','nerates programs traceable with Valgrind'#010+ '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+ '*g2gw2_Generate DWARFv2 debug information'#010+ '*g2gw3_Generate DWARFv3 debug information'#010+ - '*g2gw4_Generate DWARFv4 debug informatio','n (experimental)'#010+ - '**1i_Information'#010+ + '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+ + '**','1i_Information'#010+ '**2iD_Return compiler date'#010+ '**2iSO_Return compiler OS'#010+ '**2iSP_Return compiler host processor'#010+ '**2iTO_Return target OS'#010+ '**2iTP_Return target processor'#010+ '**2iV_Return short compiler version'#010+ - '**2iW_Return full compil','er version'#010+ - '**2ia_Return list of supported ABI targets'#010+ + '**2iW_Return full compiler version'#010+ + '**2ia_Re','turn list of supported ABI targets'#010+ '**2ic_Return list of supported CPU instruction sets'#010+ '**2if_Return list of supported FPU instruction sets'#010+ '**2ii_Return list of supported inline assembler modes'#010+ - '**2im_Return list of support','ed modeswitches'#010+ - '**2io_Return list of supported optimizations'#010+ + '**2im_Return list of supported modeswitches'#010+ + '**2','io_Return list of supported optimizations'#010+ '**2ir_Return list of recognized compiler and RTL features'#010+ '**2it_Return list of supported targets'#010+ '**2iu_Return list of supported microcontroller types'#010+ - '**2iw_Return list of supporte','d whole program optimizations'#010+ + '**2iw_Return list of supported whole program opt','imizations'#010+ '**1I_Add to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_Write logo'#010+ '**1M_Set language mode to / enable modeswitch (see option -'+ 'im)'#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '**2Mobjfpc_FPC mode',' with Object Pascal support'#010+ + '**2Mobjfpc_FPC mode with Object Pascal',' support'#010+ '**2Mdelphi_Delphi 7 compatibility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+ '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ '**2Miso_ISO 7185 mode'#010+ '**2Mextendedpascal_ISO 10206 mode'#010+ - '**2Mdelphiunicode_Delphi ','2009 and later compatibility mode'#010+ + '**2Mdelphiunicode_Delphi 2009 and later comp','atibility mode'#010+ '**2*_Each mode (as listed above) enables its default set of modeswitch'+ 'es.'#010+ '**2*_Other modeswitches are disabled and need to be enabled one by ano'+ 'ther.'#010+ '**1M-_Disable modeswitch (see option -im)'#010+ - '**1n_Do',' not read the default config files'#010+ + '**1n_Do not read the defau','lt config files'#010+ '**1o_Change the name of the executable produced to '#010+ '**1O_Optimizations:'#010+ '**2O-_Disable optimizations'#010+ '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ - '**2O2_Level 2 optimizations (-O1 + qui','ck optimizations)'#010+ - '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ + '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ + '*','*2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+ 'pected side effects)'#010+ '**2Oa=_Set alignment'#010+ - '**2Oo[NO]_Enable or disable optimizations; see',' fpc -i or fpc -io '+ - 'for possible values'#010+ + '**2Oo[NO]_Enable or disable optimizations; see fpc -i or fpc -io ','f'+ + 'or possible values'#010+ '**2Op_Set target cpu for optimizing; see fpc -i or fpc -ic for poss'+ 'ible values'#010+ '**2OW_Generate whole-program optimization feedback for optimization'+ ' ; see fpc -i or fpc -iw for possible values'#010+ - '*','*2Ow_Perform whole-program optimization ; see fpc -i or fpc -'+ + '**2Ow_Perform who','le-program optimization ; see fpc -i or fpc -'+ 'iw for possible values'#010+ '**2Os_Optimize for size rather than speed'#010+ '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ 'F*1P_Target CPU / compiler related options:'#010+ - 'F','*2PB_Show default compiler binary'#010+ + 'F*2PB_Show default c','ompiler binary'#010+ 'F*2PP_Show default target cpu'#010+ 'F*2P_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipse'+ 'l,powerpc,powerpc64,sparc,x86_64)'#010+ '**1R_Assembler reading style:'#010+ - '**2Rdefault_Use default assembler for t','arget'#010+ - '3*2Ratt_Read AT&T style assembler'#010+ + '**2Rdefault_Use default assembler for target'#010+ + '3*2Ratt_Read ','AT&T style assembler'#010+ '3*2Rintel_Read Intel style assembler'#010+ '4*2Ratt_Read AT&T style assembler'#010+ '4*2Rintel_Read Intel style assembler'#010+ '8*2Ratt_Read AT&T style assembler'#010+ '8*2Rintel_Read Intel style assembler'#010+ - '6*2RMOT_Read Motorola',' style assembler'#010+ - '**1S_Syntax options:'#010+ + '6*2RMOT_Read Motorola style assembler'#010+ + '**','1S_Syntax options:'#010+ '**2S2_Same as -Mobjfpc'#010+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ '**2Sa_Turn on assertions'#010+ '**2Sd_Same as -Mdelphi'#010+ '**2Se_Error options. is a combination of the following:'#010+ - '**3*_ : Compi','ler halts after the errors (default is 1)'#010+ + '**3*_ : Compiler halts after the',' errors (default is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ '**3*_n : Compiler also halts after notes'#010+ '**3*_h : Compiler also halts after hints'#010+ - '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc',' '+ - '-ir for possible values)'#010+ + '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc -'+ + 'ir for possible v','alues)'#010+ '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ '**2Sh_Use reference counted strings (ansistring by default) instead of'+ ' shortstrings'#010+ '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ - '**2','Sj_Allows typed constants to be writeable (default in all modes)'#010+ + '**2Sj_Allows typed con','stants to be writeable (default in all modes)'#010+ '**2Sk_Load fpcylix unit'#010+ '**2SI_Set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ '**3SIcorba_CORBA compatible interface'#010+ - '**2Sm_Support macros like C (glob','al)'#010+ - '**2So_Same as -Mtp'#010+ + '**2Sm_Support macros like C (global)'#010+ + '**2So_Same as -','Mtp'#010+ '**2Sr_Transparent file names in ISO mode'#010+ '**2Ss_Constructor name must be init (destructor must be done)'#010+ '**2Sv_Support vector processing (use CPU vector extensions if availabl'+ 'e)'#010+ - '**2Sx_Enable exception keywords (default ','in Delphi/ObjFPC modes)'#010+ + '**2Sx_Enable exception keywords (default in Delphi/ObjFPC mo','des)'#010+ '**2Sy_@ returns a typed pointer, same as $T+'#010+ '**1s_Do not call assembler and linker'#010+ '**2sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ - '**2sr_Skip register allocation phase (use with',' -alr)'#010+ - '**1T_Target operating system:'#010+ + '**2sr_Skip register allocation phase (use with -alr)'#010+ + '**1T_Targ','et operating system:'#010+ '3*2Tandroid_Android'#010+ '3*2Taros_AROS'#010+ '3*2Tbeos_BeOS'#010+ @@ -1738,15 +1737,15 @@ const msgtxt : array[0..000353,1..240] of char=( '3*2Tembedded_Embedded'#010+ '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ - '3*2Tgo32v2_Version 2 of DJ Delori','e DOS extender'#010+ - '3*2Thaiku_Haiku'#010+ + '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ + '3*2T','haiku_Haiku'#010+ '3*2Tiphonesim_iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tdar'+ 'win)'#010+ '3*2Tlinux_Linux'#010+ '3*2Tnativent_Native NT API (experimental)'#010+ '3*2Tnetbsd_NetBSD'#010+ '3*2Tnetware_Novell Netware Module (clib)'#010+ - '3*2Tnetwlibc_Nove','ll Netware Module (libc)'#010+ + '3*2Tnetwlibc_Novell Netware Module (','libc)'#010+ '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsymbian_Symbian OS'#010+ @@ -1755,8 +1754,8 @@ const msgtxt : array[0..000353,1..240] of char=( '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ - '4*2Taros','_AROS'#010+ - '4*2Tdarwin_Darwin/Mac OS X'#010+ + '4*2Taros_AROS'#010+ + '4*2Tdarwin_Da','rwin/Mac OS X'#010+ '4*2Tdragonfly_DragonFly BSD'#010+ '4*2Tembedded_Embedded'#010+ '4*2Tfreebsd_FreeBSD'#010+ @@ -1765,8 +1764,8 @@ const msgtxt : array[0..000353,1..240] of char=( '4*2Tnetbsd_NetBSD'#010+ '4*2Topenbsd_OpenBSD'#010+ '4*2Tsolaris_Solaris'#010+ - '4*2Twin64_Win64 (64 bit Windows s','ystems)'#010+ - '6*2Tamiga_Commodore Amiga'#010+ + '4*2Twin64_Win64 (64 bit Windows systems)'#010+ + '6*2Tamiga_C','ommodore Amiga'#010+ '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tembedded_Embedded'#010+ '6*2Tlinux_Linux'#010+ @@ -1776,8 +1775,8 @@ const msgtxt : array[0..000353,1..240] of char=( '8*2Tembedded_Embedded'#010+ '8*2Tmsdos_MS-DOS (and compatible)'#010+ '8*2Twin16_Windows 16 Bit'#010+ - 'A*2Tandr','oid_Android'#010+ - 'A*2Taros_AROS'#010+ + 'A*2Tandroid_Android'#010+ + 'A*2Taro','s_AROS'#010+ 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+ 'A*2Tembedded_Embedded'#010+ 'A*2Tgba_Game Boy Advance'#010+ @@ -1788,8 +1787,8 @@ const msgtxt : array[0..000353,1..240] of char=( 'A*2Tsymbian_Symbian'#010+ 'A*2Twince_Windows CE'#010+ 'a*2Tdarwin_Darwin/iOS'#010+ - 'a','*2Tlinux_Linux'#010+ - 'J*2Tandroid_Android'#010+ + 'a*2Tlinux_Linux'#010+ + 'J*2T','android_Android'#010+ 'J*2Tjava_Java'#010+ 'm*2Tandroid_Android'#010+ 'm*2Tembedded_Embedded'#010+ @@ -1800,8 +1799,8 @@ const msgtxt : array[0..000353,1..240] of char=( 'P*2Tamiga_AmigaOS'#010+ 'P*2Tdarwin_Darwin/Mac OS X'#010+ 'P*2Tembedded_Embedded'#010+ - 'P*2Tlinux_Linux'#010, - 'P*2Tmacos_Mac OS (classic)'#010+ + 'P*2Tlinux_Linux'#010+ + 'P*2Tmacos_Mac OS (c','lassic)'#010+ 'P*2Tmorphos_MorphOS'#010+ 'P*2Tnetbsd_NetBSD'#010+ 'P*2Twii_Wii'#010+ @@ -1813,147 +1812,151 @@ const msgtxt : array[0..000353,1..240] of char=( 'R*2Tembedded_Embedded'#010+ 'r*2Tlinux_Linux'#010+ 'r*2Tembedded_Embedded'#010+ - 'S*2Tlinux_','Linux'#010+ - 'S*2Tsolaris_Solaris'#010+ + 'S*2Tlinux_Linux'#010+ + 'S*2Tsolaris_S','olaris'#010+ 's*2Tlinux_Linux'#010+ 'V*2Tembedded_Embedded'#010+ '**1u_Undefines the symbol '#010+ '**1U_Unit options:'#010+ '**2Un_Do not check where the unit name matches the file name'#010+ - '**2Ur_Generate release unit files (never automatically recompil','ed)'#010+ - '**2Us_Compile a system unit'#010+ + '**2Ur_Generate release unit files (never automatically recompiled)'#010+ + '**2Us_Compile a',' system unit'#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*_n : Show n','otes t : Show tried/used files'#010+ + '**2*_n : Show notes ',' t : Show tried/used files'#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*_s',' : Show time stamps q : Show message numbers'#010+ + '**2*_s : Show time stamps',' q : Show message numbers'#010+ '**2*_a : Show everything x : Show info about invoked tools'+ #010+ '**2*_b : Write file names messages p : Write tree.log with parse tre'+ 'e'#010+ - '**2*_ with full path v : ','Write fpcdebug.txt with'#010+ + '**2*_ with full path v : Write fpcdebug.txt ','with'#010+ '**2*_z : Write output to stderr lots of debugging info'#010+ '**2*_m, : Do not show messages numbered and '#010+ 'F*1V_Append '#039'-'#039' to the used compiler binary name (e.g. f'+ 'or version)'#010+ - '**1W_Target-speci','fic options (targets)'#010+ + '**1W_Target-specific options (target','s)'#010+ '3*2WA_Specify native type application (Windows)'#010+ '4*2WA_Specify native type application (Windows)'#010+ 'A*2WA_Specify native type application (Windows)'#010+ '3*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'P*2Wb_Create a bundle ','instead of a library (Darwin)'#010+ + 'P*2Wb_Create a bundle instead of a librar','y (Darwin)'#010+ 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+ 'a*2Wb_Create a bundle instead of a library (Darwin)'#010+ 'A*2Wb_Create a bundle instead of a library (Darwin)'#010+ '4*2Wb_Create a bundle instead of a library (Darwin)'#010+ - '3*','2WB_Create a relocatable image (Windows, Symbian)'#010+ + '3*2WB_Create a reloca','table image (Windows, Symbian)'#010+ '3*2WB_Set image base to (Windows, Symbian)'#010+ '4*2WB_Create a relocatable image (Windows)'#010+ '4*2WB_Set image base to (Windows)'#010+ 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ - 'A*2W','B_Set image base to (Windows, Symbian)'#010+ + 'A*2WB_Set image base',' to (Windows, Symbian)'#010+ '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ '4*2WC_Specify console type application (Windows)'#010+ 'A*2WC_Specify console type application (Windows)'#010+ - 'P*2WC_Specify console type applicati','on (Classic Mac OS)'#010+ + 'P*2WC_Specify console type application (Classic Mac OS)',#010+ '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - '3*2We_Use external resources (Darw','in)'#010+ - '4*2We_Use external resources (Darwin)'#010+ + '3*2We_Use external resources (Darwin)'#010+ + '4*2We_Use exter','nal resources (Darwin)'#010+ 'a*2We_Use external resources (Darwin)'#010+ 'A*2We_Use external resources (Darwin)'#010+ 'P*2We_Use external resources (Darwin)'#010+ 'p*2We_Use external resources (Darwin)'#010+ - '3*2WF_Specify full-screen type application (EM','X, OS/2)'#010+ - '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ + '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ + '3*2WG_Spec','ify graphic type application (EMX, OS/2, Windows)'#010+ '4*2WG_Specify graphic type application (Windows)'#010+ 'A*2WG_Specify graphic type application (Windows)'#010+ 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ - '3*2Wi_Use interna','l resources (Darwin)'#010+ + '3*2Wi_Use internal resources (Darwin',')'#010+ '4*2Wi_Use internal resources (Darwin)'#010+ 'a*2Wi_Use internal resources (Darwin)'#010+ 'A*2Wi_Use internal resources (Darwin)'#010+ 'P*2Wi_Use internal resources (Darwin)'#010+ 'p*2Wi_Use internal resources (Darwin)'#010+ - '3*2WI_Turn on/off the usage o','f import sections (Windows)'#010+ + '3*2WI_Turn on/off the usage of import sections (','Windows)'#010+ '4*2WI_Turn on/off the usage of import sections (Windows)'#010+ 'A*2WI_Turn on/off the usage of import sections (Windows)'#010+ '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+ 'e segment)'#010+ - '8*2Wm_Set memo','ry model'#010+ - '8*3WmTiny_Tiny memory model'#010+ + '8*2Wm_Set memory model'#010+ + '8*3WmTiny_','Tiny memory model'#010+ '8*3WmSmall_Small memory model (default)'#010+ '8*3WmMedium_Medium memory model'#010+ '8*3WmCompact_Compact memory model'#010+ '8*3WmLarge_Large memory model'#010+ '8*3WmHuge_Huge memory model'#010+ - '3*2WM_Minimum Mac OS X deployment ve','rsion: 10.4, 10.5.1, ... (Dar'+ + '3*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1',', ... (Dar'+ 'win)'#010+ '4*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ 'p*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ - 'P*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ','... (Dar'+ - 'win)'#010+ - '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ + 'P*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ + 'n)'#010+ + '3*2WN_','Do not generate relocation code, needed for debugging (Windows'+ + ')'#010+ '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - 'A*2Wp_Specify ','the controller type; see fpc -i or fpc -iu for poss'+ + 'A*2Wp_Specify the controller type','; see fpc -i or fpc -iu for poss'+ 'ible values'#010+ 'm*2Wp_Specify the controller type; see fpc -i or fpc -iu for possib'+ 'le values'#010+ 'V*2Wp_Specify the controller type; see fpc -i or fpc -iu for possib'+ 'le values'#010+ - '3*2WP_Minimum ','iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'+ + '3*2WP_Minimum iOS deployment vers','ion: 3.0, 5.0.1, ... (iphonesim)'+ #010+ '4*2WP_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+ 'a*2WP_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+ - 'A*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ','... (Darwin)'#010+ - '3*2WR_Generate relocation code (Windows)'#010+ + 'A*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+ + '3*2WR_','Generate relocation code (Windows)'#010+ '4*2WR_Generate relocation code (Windows)'#010+ 'A*2WR_Generate relocation code (Windows)'#010+ '8*2Wt_Set the target executable format'#010+ '8*3Wtexe_Create a DOS .EXE file (default)'#010+ - '8*3Wtcom_Create a DO','S .COM file (requires tiny memory model)'#010+ + '8*3Wtcom_Create a DOS .COM file (requir','es tiny memory model)'#010+ 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ '**2WX_Enable executable stack (Linux)'#010+ '**1X_Executable options:'#010+ '**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+ - '9.1 (Linu','x)'#010+ - '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ - 'ux)'#010+ + '9.1 (Linux)'#010+ + '**2Xc_Pass --sha','red/-dynamic to the linker (BeOS, Darwin, FreeBSD, L'+ + 'inux)'#010+ '**2Xd_Do not search default library path (sometimes required for cross'+ '-compiling when not using -XR)'#010+ '**2Xe_Use external linker'#010+ - '**2Xf_Substitute pthread library nam','e for linking (BSD)'#010+ + '**2Xf_Substitute pthread library name for linking (BSD)',#010+ '**2Xg_Create debuginfo in a separate file and add a debuglink section '+ 'to executable'#010+ '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ - '**2XLA_Define library substitutions for li','nking'#010+ + 'L*2XlS_LLVM utilties suffix (e.g. -7 in case clang is call','ed clan'+ + 'g-7)'#010+ + '**2XLA_Define library substitutions for linking'#010+ '**2XLO_Define order of library linking'#010+ '**2XLD_Exclude default order of standard libraries'#010+ '**2Xm_Generate link map'#010+ '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ - 's '#039'main'#039')'#010+ - '**2Xn_Use target system native linker instead of',' GNU ld (Solaris, AI'+ - 'X)'#010+ + 's '#039'm','ain'#039')'#010+ + '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+ + #010+ 'F*2Xp_First search for the compiler binary in the directory '#010+ '**2XP_Prepend the binutils names with the prefix '#010+ - '**2Xr_Set the linker'#039's rlink-path to (needed for cross comp'+ - 'ile, see the ld manual for m','ore information) (BeOS, Linux)'#010+ + '**2Xr_Set the linker'#039's rlink-path to ',' (needed for cross co'+ + 'mpile, see the ld manual for more information) (BeOS, Linux)'#010+ '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ ', Linux, Mac OS, Solaris)'#010+ '**2Xs_Strip all symbols from executable'#010+ - '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ - '**2','Xt_Link with static libraries (-static is passed to linker)'#010+ + '**2XS_Try to link u','nits statically (default, defines FPC_LINK_STATIC'+ + ')'#010+ + '**2Xt_Link with static libraries (-static is passed to linker)'#010+ '**2Xv_Generate table for Virtual Entry calls'#010+ '**2XV_Use VLink as external linker (default on Amiga, MorphOS)'#010+ - '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010, + '**2XX_Try to',' smartlink units (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_Show this help'#010+ '**1h_Shows this help without waiting' diff --git a/compiler/options.pas b/compiler/options.pas index 1f2c3f74a7..7179a8611e 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -1341,7 +1341,7 @@ begin end; {$endif arm} {$ifdef llvm} - 'L': + 'l': begin l:=j+1; while l<=length(More) do @@ -1363,14 +1363,14 @@ begin exclude(init_settings.moduleswitches,cs_lto); end; 'ltonosystem': - begin - if not disable then - begin - include(init_settings.globalswitches,cs_lto_nosystem); - end - else - exclude(init_settings.globalswitches,cs_lto_nosystem); - end; + begin + if not disable then + begin + include(init_settings.globalswitches,cs_lto_nosystem); + end + else + exclude(init_settings.globalswitches,cs_lto_nosystem); + end; else begin IllegalPara(opt); @@ -2677,7 +2677,25 @@ begin else include(init_settings.globalswitches,cs_link_native); end; - +{$ifdef llvm} + 'l' : + begin + if j=length(more) then + IllegalPara(opt) + else + begin + case more[j+1] of + 'S': + begin + llvmutilssuffix:=copy(more,j+2,length(more)); + j:=length(more); + end + else + IllegalPara(opt); + end; + end; + end; +{$endif} 'm' : begin If UnsetBool(More, j, opt, false) then diff --git a/compiler/systems.pas b/compiler/systems.pas index c5a1eb17a4..27b8fa09da 100644 --- a/compiler/systems.pas +++ b/compiler/systems.pas @@ -76,6 +76,7 @@ interface ,af_no_debug ,af_stabs_use_function_absolute_addresses ,af_no_stabs + ,af_llvm ); pasminfo = ^tasminfo;