diff --git a/compiler/globals.pas b/compiler/globals.pas
index f62e633d3c..50263b740d 100644
--- a/compiler/globals.pas
+++ b/compiler/globals.pas
@@ -289,6 +289,9 @@ interface
do_build,
do_release,
do_make : boolean;
+
+ timestr,
+ datestr : string;
{ Path to ppc }
exepath : TPathStr;
{ Path to unicode charmap/collation binaries }
diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index e1b858e642..bfcbd7b855 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -3961,7 +3961,9 @@ A*2CV<x>_Set section threadvar model to <x>
**2CX_Create also smartlinked library
**1d<x>_Defines the symbol <x>
**1D_Generate a DEF file
+**2DD<x>_Set the date string returned by %DATE% to x, it is not checked for being a valid date string
**2Dd<x>_Set description to <x>
+**2DT<x>_Set the time string returned by %TIME% to x, it is not checked for being a valid time string
**2Dv<x>_Set DLL version to <x>
*O2Dw_PM application
**1e<x>_Set path to executable
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index 690006edf6..1582fb5ab0 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -1133,7 +1133,7 @@ const
option_info=11024;
option_help_pages=11025;
- MsgTxtSize = 86201;
+ MsgTxtSize = 86405;
MsgIdxMax : array[1..20] of longint=(
28,106,360,130,99,63,145,36,223,68,
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index a92381feae..d461d97f95 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1,8 +1,8 @@
const msgtxt_codepage=20127;
{$ifdef Delphi}
-const msgtxt : array[0..000359] of string[240]=(
+const msgtxt : array[0..000360] of string[240]=(
{$else Delphi}
-const msgtxt : array[0..000359,1..240] of char=(
+const msgtxt : array[0..000360,1..240] of char=(
{$endif Delphi}
'01000_T_Compiler: $1'#000+
'01001_D_Compiler OS: $1'#000+
@@ -1588,190 +1588,194 @@ const msgtxt : array[0..000359,1..240] of char=(
'**2CX_Create also smartlinked library'#010+
'**1d<x>_Defines the symbol <x>'#010+
'**1D_Generate a DEF file'#010+
+ '**2DD<x>_Set the date string returned by %DATE% to x, it is not checke'+
+ 'd for being a',' valid date string'#010+
'**2Dd<x>_Set description to <x>'#010+
+ '**2DT<x>_Set the time string returned by %TIME% to x, it is not checke'+
+ 'd for being a valid time string'#010+
'**2Dv<x>_Set DLL version to <x>'#010+
- '*O2Dw_PM applicatio','n'#010+
+ '*O2Dw_PM application'#010+
'**1e<x>_Set path to executable'#010+
- '**1E_Same as -Cn'#010+
+ '**1','E_Same as -Cn'#010+
'**1fPIC_Same as -Cg'#010+
'**1F<x>_Set file names and paths:'#010+
'**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
'sed'#010+
'**2Fc<x>_Set input codepage to <x>'#010+
- '**2FC<x>_Set RC compiler bi','nary name to <x>'#010+
- '**2Fd_Disable the compiler'#039's internal directory cache'#010+
+ '**2FC<x>_Set RC compiler binary name to <x>'#010+
+ '**2Fd_Disable the c','ompiler'#039's internal directory cache'#010+
'**2FD<x>_Set the directory where to search for compiler utilities'#010+
'**2Fe<x>_Redirect error output to <x>'#010+
'**2FE<x>_Set exe/unit output path to <x>'#010+
- '**2Ff<x>_Add <x> to fram','ework path (Darwin only), or set IDF path to'+
+ '**2Ff<x>_Add <x> to framework path (Darwin only), or set IDF',' path to'+
' <x> (Xtensa-FreeRTOS)'#010+
'**2FF_Use fpcres as RC to RES compiler instead of windres or gorc'#010+
'**2Fi<x>_Add <x> to include path'#010+
'**2Fl<x>_Add <x> to library path'#010+
'**2FL<x>_Use <x> as dynamic linker'#010+
- '**2Fm<','x>_Load unicode conversion table from <x>.txt in the compiler '+
+ '**2Fm<x>_Load unicode conversion table fro','m <x>.txt in the compiler '+
'dir'#010+
'**2FM<x>_Set the directory where to search for unicode binary files'#010+
'**2FN<x>_Add <x> to list of default unit scopes (namespaces)'#010+
'**2Fo<x>_Add <x> to object path'#010+
- '**2Fr<x>_Load',' error message file <x>'#010+
- '**2FR<x>_Set resource (.res) linker to <x>'#010+
+ '**2Fr<x>_Load error message file <x>'#010+
+ '**2FR<x>_Set',' resource (.res) linker to <x>'#010+
'**2Fu<x>_Add <x> to unit path'#010+
'**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
'**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
- '**2Fw<x>_Load previousl','y stored whole-program optimization feedback '+
+ '**2Fw<x>_Load previously stored whole-program optimization ','feedback '+
'from <x>'#010+
'*g1g_Generate debug information (default format for target)'#010+
'*g2gc_Generate checks for pointers (experimental, only available on so'+
'me targets, might generate false positive)'#010+
- '*g2gh_Use hea','ptrace unit (for memory leak/corruption debugging)'#010+
+ '*g2gh_Use heaptrace unit (for memory leak/corrupt','ion debugging)'#010+
'*g2gl_Use line info unit (show more info with backtraces)'#010+
'*g2gm_Generate Microsoft CodeView debug information (experimental)'#010+
'*g2go<x>_Set debug information options'#010+
- '*g3godwarfsets_ Enable DW','ARF '#039'set'#039' type debug information (b'+
- 'reaks gdb < 6.5)'#010+
+ '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (br',
+ 'eaks 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+
- '*g3godwarfcpp_ Simulate C++ debug informati','on in DWARF'#010+
- '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+
- 'cords in MS LINK format in addition to the DWARF debug information (Op'+
- 'en Watcom Debugger/Linker compatibility)'#010+
+ '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+
+ '*g3godwarfomflinnum_ Gen','erate line number information in OMF LINNUM '+
+ 'records in MS LINK format in addition to the DWARF debug information ('+
+ '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 trashing value)'#010+
+ '*g2gs_Generate Stabs debug information'#010+
+ '*g','2gt_Trash local variables (to detect uninitialized uses; multiple '+
+ #039't'#039' changes the trashing value)'#010+
'*g2gv_Generates programs traceable with Valgrind'#010+
'*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
- '*','g2gw2_Generate DWARFv2 debug information'#010+
+ '*g2gw2_Generate DWARFv2 debug informa','tion'#010+
'*g2gw3_Generate DWARFv3 debug 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 pr','ocessor'#010+
+ '**2iSP_Return compiler host processor'#010+
'**2iTO_Return target OS'#010+
- '**2iTP_Return target processor'#010+
+ '**2i','TP_Return target processor'#010+
'**2iV_Return short compiler version'#010+
'**2iW_Return full compiler version'#010+
'**2ia_Return list of supported ABI targets'#010+
'**2ib_Return the used code generation backend type'#010+
- '**2ic_Return',' list of supported CPU instruction sets'#010+
+ '**2ic_Return list of supported CPU instruction s','ets'#010+
'**2if_Return list of supported FPU instruction sets'#010+
'**2ii_Return list of supported inline assembler modes'#010+
'**2im_Return list of supported modeswitches'#010+
'**2io_Return list of supported optimizations'#010+
- '**2ir','_Return list of recognized compiler and RTL features'#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 supported whole program optimizations'#010+
'**1I<x>_Add <x> to include path'#010+
- '**1k','<x>_Pass <x> to the linker'#010+
- '**1l_Write logo'#010+
+ '**1k<x>_Pass <x> to the linker'#010+
+ '**1l_Writ','e logo'#010+
'**1M<x>_Set language mode to <x> / enable modeswitch <x> (see option -'+
'im)'#010+
'**2Mfpc_Free Pascal dialect (default)'#010+
'**2Mobjfpc_FPC mode with Object Pascal support'#010+
- '**2Mdelphi_Delphi 7 compatibility mode',#010+
- '**2Mtp_TP/BP 7.0 compatibility mode'#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+
- '**2*_Each mode (as listed above)',' enables its default set of modeswit'+
- 'ches.'#010+
+ '**2*_Each mode (as listed above) enables its default set of modeswit','c'+
+ 'hes.'#010+
'**2*_Other modeswitches are disabled and need to be enabled one by ano'+
'ther.'#010+
'**1M<x>-_Disable modeswitch <x> (see option -im)'#010+
'**1n_Do not read the default config files'#010+
- '**1o<x>_Change the name of the ','executable produced to <x>'#010+
- '**1O<x>_Optimizations:'#010+
+ '**1o<x>_Change the name of the executable produced to <x>'#010+
+ '**1O<x>_O','ptimizations:'#010+
'**2O-_Disable optimizations'#010+
'**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
'**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
- '**2O3_Level 3 optimizations (-O2 + slow optimiza','tions)'#010+
- '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+
- 'pected side effects)'#010+
+ '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
+ '**2O4_Level 4 optimizations (','-O3 + optimizations which might have un'+
+ 'expected side effects)'#010+
'**2Oa<x>=<y>_Set alignment'#010+
'**2Oo[NO]<x>_Enable or disable optimizations; see fpc -i or fpc -io fo'+
'r possible values'#010+
- '**2Op<x>_Set target cpu for',' optimizing; see fpc -i or fpc -ic for po'+
+ '**2Op<x>_Set target cpu for optimizing; see fpc -i or fpc -ic f','or po'+
'ssible values'#010+
'**2OW<x>_Generate whole-program optimization feedback for optimization'+
' <x>; see fpc -i or fpc -iw for possible values'#010+
- '**2Ow<x>_Perform whole-program optimization <x>; see fpc -i or fpc ','-'+
- 'iw for possible values'#010+
- '**2Os_Optimize for size rather than speed'#010+
+ '**2Ow<x>_Perform whole-program optimization <x>; see fpc -i or fpc -iw'+
+ ' for possible values'#010+
+ '**2Os_Optimi','ze for size rather than speed'#010+
'**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
'F*1P<x>_Target CPU / compiler related options:'#010+
'F*2PB_Show default compiler binary'#010+
'F*2PP_Show default target cpu'#010+
- 'F*','2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mip'+
+ 'F*2P<x>_Set target CPU (aarch64,arm,av','r,i386,i8086,jvm,m68k,mips,mip'+
'sel,powerpc,powerpc64,sparc,x86_64)'#010+
'**1R<x>_Assembler reading style:'#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+
+ '3*2Rintel_Read Intel style assembler'#010+
+ '4*2Ratt_Read AT&T style a','ssembler'#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<x>_Syntax options:'#010+
'**2S2_Same as -Mobjfpc'#010+
- '**','2Sc_Support operators like C (*=,+=,/= and -=)'#010+
+ '**2Sc_Support operators like C (*=,+=,','/= and -=)'#010+
'**2Sa_Turn on assertions'#010+
'**2Sd_Same as -Mdelphi'#010+
'**2Se<x>_Error options. <x> is a combination of the following:'#010+
'**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
- '**3*_w : Compiler al','so halts after warnings'#010+
- '**3*_n : Compiler also halts after notes'#010+
+ '**3*_w : Compiler also halts after warnings'#010+
+ '**3*_n : Com','piler 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+
- '**2Sg_Enable LABEL and GOTO (default in ','-Mtp and -Mdelphi)'#010+
- '**2Sh_Use reference counted strings (ansistring by default) instead of'+
- ' shortstrings'#010+
+ '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
+ '**2Sh_Use referen','ce counted strings (ansistring by default) instead '+
+ 'of shortstrings'#010+
'**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
'**2Sj_Allows typed constants to be writeable (default in all modes)'#010+
- '*','*2Sk_Load fpcylix unit'#010+
- '**2SI<x>_Set interface style to <x>'#010+
+ '**2Sk_Load fpcylix unit'#010+
+ '**2SI<x>_Set ','interface style to <x>'#010+
'**3SIcom_COM compatible interface (default)'#010+
'**3SIcorba_CORBA compatible interface'#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+
+ '**2Ss_Constructor name must be init (d','estructor 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+
- '**2Sy_@<pointer> returns a typed pointer, ','same as $T+'#010+
- '**1s_Do not call assembler and linker'#010+
+ '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
+ '**1s_Do not call assembl','er 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<x>_Target operating system:'#010+
'3*2Tandroid_Android'#010+
- '3*2Tar','os_AROS'#010+
+ '3*2Taros_AROS'#010+
'3*2Tbeos_BeOS'#010+
- '3*2Tdarwin_Darwin/Mac OS X'#010+
+ '3*2Tdarwin_Dar','win/Mac OS X'#010+
'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 Delorie DOS extender'#010+
'3*2Thaiku_Haiku'#010+
- '3*2Tiphonesim_iPhoneSimulator from ','iOS SDK 3.2+ (older versions: -Td'+
- 'arwin)'#010+
+ '3*2Tiphonesim_iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tdar'+
+ 'w','in)'#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_Novell Netware Module (libc)'#010+
'3*2Topenbsd_OpenBSD'#010+
- '3*2Tos2_OS/2 / eComSt','ation'#010+
+ '3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsymbian_Symbian OS'#010+
- '3*2Tsolaris_Solaris'#010+
+ '3*2Tsol','aris_Solaris'#010+
'3*2Twatcom_Watcom compatible DOS extender'#010+
'3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twin32_Windows 32 Bit'#010+
@@ -1779,8 +1783,8 @@ const msgtxt : array[0..000359,1..240] of char=(
'4*2Tandroid_Android'#010+
'4*2Taros_AROS'#010+
'4*2Tdarwin_Darwin/Mac OS X'#010+
- '4*2Tdragonfly','_DragonFly BSD'#010+
- '4*2Tembedded_Embedded'#010+
+ '4*2Tdragonfly_DragonFly BSD'#010+
+ '4*2Tembedded_Embedded',#010+
'4*2Tfreebsd_FreeBSD'#010+
'4*2Thaiku_Haiku'#010+
'4*2Tiphonesim_iPhoneSimulator'#010+
@@ -1789,9 +1793,9 @@ const msgtxt : array[0..000359,1..240] of char=(
'4*2Topenbsd_OpenBSD'#010+
'4*2Tsolaris_Solaris'#010+
'4*2Twin64_Win64 (64 bit Windows systems)'#010+
- '6*2Tamiga_Commodore Am','iga'#010+
+ '6*2Tamiga_Commodore Amiga'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
- '6*2Tembedded_Embedded'#010+
+ '6*2Tem','bedded_Embedded'#010+
'6*2Tlinux_Linux'#010+
'6*2Tnetbsd_NetBSD'#010+
'6*2Tmacosclassic_Classic Mac OS'#010+
@@ -1800,8 +1804,8 @@ const msgtxt : array[0..000359,1..240] of char=(
'8*2Tmsdos_MS-DOS (and compatible)'#010+
'8*2Twin16_Windows 16 Bit'#010+
'A*2Tandroid_Android'#010+
- 'A*2','Taros_AROS'#010+
- 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
+ 'A*2Taros_AROS'#010+
+ 'A*2Tdarwin_Darwin/iPhoneO','S/iOS'#010+
'A*2Tembedded_Embedded'#010+
'A*2Tfreertos_FreeRTOS'#010+
'A*2Tgba_Game Boy Advance'#010+
@@ -1811,9 +1815,9 @@ const msgtxt : array[0..000359,1..240] of char=(
'A*2Tpalmos_PalmOS'#010+
'A*2Tsymbian_Symbian'#010+
'A*2Twince_Windows CE'#010+
- 'a*2Tandroid_Andr','oid'#010+
+ 'a*2Tandroid_Android'#010+
'a*2Tdarwin_Darwin/iOS'#010+
- 'a*2Tlinux_Linux'#010+
+ 'a*2Tlinux_','Linux'#010+
'a*2Twin64_Windows 64'#010+
'J*2Tandroid_Android'#010+
'J*2Tjava_Java'#010+
@@ -1824,9 +1828,9 @@ const msgtxt : array[0..000359,1..240] of char=(
'M*2Tlinux_Linux'#010+
'P*2Taix_AIX'#010+
'P*2Tamiga_AmigaOS'#010+
- 'P*2Tdarwin_Darwin','/Mac OS X'#010+
+ 'P*2Tdarwin_Darwin/Mac OS X'#010+
'P*2Tembedded_Embedded'#010+
- 'P*2Tlinux_Linux'#010+
+ 'P*2T','linux_Linux'#010+
'P*2Tmacosclassic_Classic Mac OS'#010+
'P*2Tmorphos_MorphOS'#010+
'P*2Tnetbsd_NetBSD'#010+
@@ -1836,9 +1840,9 @@ const msgtxt : array[0..000359,1..240] of char=(
'p*2Tembedded_Embedded'#010+
'p*2Tlinux_Linux'#010+
'R*2Tlinux_Linux'#010+
- 'R*2Tembedded_Embe','dded'#010+
+ 'R*2Tembedded_Embedded'#010+
'r*2Tlinux_Linux'#010+
- 'r*2Tembedded_Embedded'#010+
+ 'r*2Tembedded_Em','bedded'#010+
'S*2Tlinux_Linux'#010+
'S*2Tsolaris_Solaris'#010+
's*2Tlinux_Linux'#010+
@@ -1848,153 +1852,152 @@ const msgtxt : array[0..000359,1..240] of char=(
'x*2Tlinux_Linux'#010+
'Z*2Tembedded_Embedded'#010+
'Z*2Tzxspectrum_ZX Spectrum'#010+
- 'Z*2Tmsxdos_MSX','-DOS'#010+
- '**1u<x>_Undefines the symbol <x>'#010+
+ 'Z*2Tmsxdos_MSX-DOS'#010+
+ '**1u<x>_Undefines the symbol <x','>'#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 recompiled)'#010+
'**2Us_Compile a system unit'#010+
- '**1v<x>_Be verbose. <x> is ','a combination of the following letters:'#010+
+ '**1v<x>_Be verbose. <x> is a combination of the following lette','rs:'#010+
'**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+
'**2*_w : Show warnings u : Show unit info'#010+
'**2*_n : Show notes t : Show tried/used files'#010+
- '**2*_h : Sh','ow hints c : Show conditionals'#010+
+ '**2*_h : Show hints c : Show c','onditionals'#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','*_a : Show everything x : Show info about invoked too'+
+ '**2*_a : Show everything x ',': Show info about invoked too'+
'ls'#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*_z : Write output to stderr ',' lots of debugging info'#010+
- '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
+ '**2*_z : Write output to stderr lots of debugging info'#010+
+ '**2*_m<','x>,<y> : Do not show messages numbered <x> and <y>'#010+
'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
'or version)'#010+
'**1W<x>_Target-specific options (targets)'#010+
- '3*2WA_Specify native type application',' (Windows)'#010+
- '4*2WA_Specify native type application (Windows)'#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 library (Darwin)'#010+
- 'a*2Wb_Create a bundle instead of a library (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<x>_','Set image base to <x> (Windows, Symbian)'#010+
+ '3*2WB<x>_Set image base to <x> (Windows, Symb','ian)'#010+
'4*2WB_Create a relocatable image (Windows)'#010+
'4*2WB<x>_Set image base to <x> (Windows)'#010+
'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
'A*2WB<x>_Set image base to <x> (Windows, Symbian)'#010+
- 'Z*2WB<x>_Set ','image base to <x> (ZX Spectrum)'#010+
- '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
+ 'Z*2WB<x>_Set image base to <x> (ZX Spectrum)'#010+
+ '3*2W','C_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 application (Classic Ma','c OS)'#010+
- '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
+ 'P*2WC_Specify console type application (Classic Mac OS)'#010+
+ '3*2WD_Use DEFFILE to export fu','nctions 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 (Darwin)'#010+
- '4*2We_Use ','external resources (Darwin)'#010+
- 'a*2We_Use external resources (Darwin)'#010+
+ '4*2We_Use external resources (Darwin)'#010+
+ 'a*2We_Us','e 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 (EMX, OS/2)'#010+
- '3*2WG','_Specify graphic type application (EMX, OS/2, Windows)'#010+
+ '3*2WG_Specify graphic type application (E','MX, 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 internal resources (D','arwin)'#010+
- '4*2Wi_Use internal 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 of import secti','ons (Windows)'#010+
- '4*2WI_Turn on/off the usage of 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<x>_Set memory model'#010+
- '8*3Wm','Tiny_Tiny memory model'#010+
- '8*3WmSmall_Small memory model (default)'#010+
+ '8*3WmTiny_Tiny memory model'#010+
+ '8*3WmSmall_Sm','all 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<x>_Minimum Mac OS X deployment version: 10.4, 1','0.5.1, ... (Dar'+
- 'win)'#010+
- '4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
+ '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
+ '4*2WM<x>_Minimum',' Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+
+ 'win)'#010+
'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
'P*2WM<x>_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'+
+ '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<x>_Specify the controller',' type; see fpc -i or fpc -iu for poss'+
+ 'A*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for pos','s'+
'ible values'#010+
'm*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
'le values'#010+
'R*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
'le values'#010+
- 'V*2Wp<x>_Specify the controller',' type; see fpc -i or fpc -iu for poss'+
+ 'V*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for pos','s'+
'ible values'#010+
'x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
'le values'#010+
'3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
- '4*2WP<x>_Minimum iOS deployment version: 8','.0, 8.0.2, ... (iphonesim)'+
- #010+
- 'a*2WP<x>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
+ '4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+
+ 'a*2WP<x>_','Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
'A*2WP<x>_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+
+ '4*2WR_Generate relocation code (Windows)'#010+
+ 'A*2WR_Generate relocation code (Win','dows)'#010+
'8*2Wt<x>_Set the target executable format'#010+
'8*3Wtexe_Create a DOS .EXE file (default)'#010+
'8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
- 'P*2WT_Specify MPW tool type application (Classic Mac ','OS)'#010+
- '**2WX_Enable executable stack (Linux)'#010+
+ 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
+ '**2WX_Enable executable stack (L','inux)'#010+
'**1X_Executable options:'#010+
'**2X9_Generate linkerscript for GNU Binutils ld older than version 2.1'+
'9.1 (Linux)'#010+
'**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
'ux)'#010+
- '**2Xd_Do not sear','ch default library path (sometimes required for cro'+
+ '**2Xd_Do not search default library path (sometimes r','equired for cro'+
'ss-compiling when not using -XR)'#010+
'**2Xe_Use external linker'#010+
'**2Xf_Substitute pthread library name for linking (BSD)'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink section '+
- 'to e','xecutable'#010+
- '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+
+ 'to executable'#010+
+ '**2XD_Try to link units dy','namically (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_Use internal linker'#010+
'L*2XlS<x>_LLVM utilties suffix (e.g. -7 in case clang is called clang-'+
'7)'#010+
'**2XLA_Define library substitutions for linking'#010+
- '**2XLO_Define o','rder of library linking'#010+
- '**2XLD_Exclude default order of standard libraries'#010+
+ '**2XLO_Define order of library linking'#010+
+ '**2XLD_Exclu','de default order of standard libraries'#010+
'**2Xm_Generate link map'#010+
'**2XM<x>_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, AIX',
- ')'#010+
- 'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
+ '**2Xn_Use target system native linker instead of GNU ld (Solaris, AIX)'+
+ #010+
+ 'F*2Xp<x>_First search for the comp','iler binary in the directory <x>'#010+
'**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
'**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
- 'ile, see the ld manual for more information) (BeO','S, Linux)'#010+
- '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
- ', Linux, Mac OS, Solaris)'#010+
+ 'ile, see the ld manual for more information) (BeOS, Linux)'#010+
+ '**2XR<x>_Prepend <x> to al','l linker search paths (BeOS, Darwin, FreeB'+
+ 'SD, Linux, Mac OS, Solaris)'#010+
'**2Xs_Strip all symbols from executable'#010+
'**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
- '**2Xt_Link with static l','ibraries (-static is passed to linker)'#010+
+ '**2Xt_Link with static libraries (-static is passed to linke','r)'#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+
'**1*_'#010+
- '**1?_Show this ','help'#010+
- '**1h_Shows this help without waiting'
+ '**1?_Show this help'#010+
+ '**1h_Shows this help without wa','iting'
);
diff --git a/compiler/options.pas b/compiler/options.pas
index 406f8b8071..7e860ea9cf 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -1586,6 +1586,16 @@ begin
description:=Copy(more,j+1,255);
break;
end;
+ 'D' :
+ begin
+ datestr:=Copy(more,j+1,255);
+ break;
+ end;
+ 'T' :
+ begin
+ timestr:=Copy(more,j+1,255);
+ break;
+ end;
'v' :
begin
dllversion:=Copy(more,j+1,255);
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index c15e45e3df..b411063c4d 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -2520,9 +2520,15 @@ type
macroIsString:=true;
case hs of
'TIME':
- hs:=gettimestr;
+ if timestr<>'' then
+ hs:=timestr
+ else
+ hs:=gettimestr;
'DATE':
- hs:=getdatestr;
+ if datestr<>'' then
+ hs:=datestr
+ else
+ hs:=getdatestr;
'DATEYEAR':
begin
hs:=tostr(startsystime.Year);