From ee82b6ea0be2fc873112d710b84c35381fd49e2f Mon Sep 17 00:00:00 2001
From: Tomas Hajny <hajny@freepascal.org>
Date: Tue, 23 Dec 2014 23:08:43 +0000
Subject: [PATCH] * do not mention OS/2 and EMX on option list for x86_64
git-svn-id: trunk@29318 -
---
compiler/msg/errord.msg | 4 ++--
compiler/msg/errordu.msg | 4 ++--
compiler/msg/errore.msg | 4 ++--
compiler/msg/errorpt.msg | 4 ++--
compiler/msg/errorptu.msg | 4 ++--
compiler/msgidx.inc | 2 +-
compiler/msgtxt.inc | 48 +++++++++++++++++++--------------------
7 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/compiler/msg/errord.msg b/compiler/msg/errord.msg
index 34d92e210c..9872115fa6 100644
--- a/compiler/msg/errord.msg
+++ b/compiler/msg/errord.msg
@@ -3768,7 +3768,7 @@ A*2Wb_Erzeuge statt einer Bibliothek ein Bundle (Darwin)
A*2WB_Erzeuge ein relozierbares Image (Windows, Symbian)
A*2WBxxxx_Setze die Imagebasis auf xxxx (Windows)
3*2WC_Spezifiziere "console type application" (EMX, OS/2, Windows)
-4*2WC_Spezifiziere "console type application" (EMX, OS/2, Windows)
+4*2WC_Spezifiziere "console type application" (Windows)
A*2WC_Spezifiziere "console type application" (Windows)
P*2WC_Spezifiziere "console type application" (Classic Mac OS)
3*2WD_Benutze DEFFILE um Funktionen der DLL oder EXE zu exportieren (Windows)
@@ -3781,7 +3781,7 @@ P*2We_Benutze externe Resourcen (Darwin)
p*2We_Benutze externe Resourcen (Darwin)
3*2WF_Spezifiziere "full-screen type application" (EMX, OS/2)
3*2WG_Spezifiziere "graphic type application" (EMX, OS/2, Windows)
-4*2WG_Spezifiziere "graphic type application" (EMX, OS/2, Windows)
+4*2WG_Spezifiziere "graphic type application" (Windows)
A*2WG_Spezifiziere "graphic type application" (Windows)
P*2WG_Spezifiziere "graphic type application" (Classic Mac OS)
3*2Wi_Benutze interne Resourcen (Darwin)
diff --git a/compiler/msg/errordu.msg b/compiler/msg/errordu.msg
index 1c6dd05290..af754ba2f2 100644
--- a/compiler/msg/errordu.msg
+++ b/compiler/msg/errordu.msg
@@ -3768,7 +3768,7 @@ A*2Wb_Erzeuge statt einer Bibliothek ein Bundle (Darwin)
A*2WB_Erzeuge ein relozierbares Image (Windows, Symbian)
A*2WBxxxx_Setze die Imagebasis auf xxxx (Windows)
3*2WC_Spezifiziere "console type application" (EMX, OS/2, Windows)
-4*2WC_Spezifiziere "console type application" (EMX, OS/2, Windows)
+4*2WC_Spezifiziere "console type application" (Windows)
A*2WC_Spezifiziere "console type application" (Windows)
P*2WC_Spezifiziere "console type application" (Classic Mac OS)
3*2WD_Benutze DEFFILE um Funktionen der DLL oder EXE zu exportieren (Windows)
@@ -3781,7 +3781,7 @@ P*2We_Benutze externe Resourcen (Darwin)
p*2We_Benutze externe Resourcen (Darwin)
3*2WF_Spezifiziere "full-screen type application" (EMX, OS/2)
3*2WG_Spezifiziere "graphic type application" (EMX, OS/2, Windows)
-4*2WG_Spezifiziere "graphic type application" (EMX, OS/2, Windows)
+4*2WG_Spezifiziere "graphic type application" (Windows)
A*2WG_Spezifiziere "graphic type application" (Windows)
P*2WG_Spezifiziere "graphic type application" (Classic Mac OS)
3*2Wi_Benutze interne Resourcen (Darwin)
diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 4ff4c1ee2d..32f0312f03 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -3779,7 +3779,7 @@ A*2Wb_Create a bundle instead of a library (Darwin)
A*2WB_Create a relocatable image (Windows, Symbian)
A*2WBxxxx_Set image base to xxxx (Windows, Symbian)
3*2WC_Specify console type application (EMX, OS/2, Windows)
-4*2WC_Specify console type application (EMX, OS/2, Windows)
+4*2WC_Specify console type application (Windows)
A*2WC_Specify console type application (Windows)
P*2WC_Specify console type application (Classic Mac OS)
3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)
@@ -3792,7 +3792,7 @@ P*2We_Use external resources (Darwin)
p*2We_Use external resources (Darwin)
3*2WF_Specify full-screen type application (EMX, OS/2)
3*2WG_Specify graphic type application (EMX, OS/2, Windows)
-4*2WG_Specify graphic type application (EMX, OS/2, Windows)
+4*2WG_Specify graphic type application (Windows)
A*2WG_Specify graphic type application (Windows)
P*2WG_Specify graphic type application (Classic Mac OS)
3*2Wi_Use internal resources (Darwin)
diff --git a/compiler/msg/errorpt.msg b/compiler/msg/errorpt.msg
index 6c5b74f43c..5564f56258 100644
--- a/compiler/msg/errorpt.msg
+++ b/compiler/msg/errorpt.msg
@@ -3384,7 +3384,7 @@ A*2Wb_Cria um encarte ao inv
A*2WB_Cria uma imagem reloc�vel (Windows, Symbian)
A*2WBxxxx_Define base da imagem para xxxx (Windows, Symbian)
3*2WC_Especifica aplica��o do tipo console (EMX, OS/2, Windows)
-4*2WC_Especifica aplica��o do tipo console (EMX, OS/2, Windows)
+4*2WC_Especifica aplica��o do tipo console (Windows)
A*2WC_Especifica aplica��o do tipo console (Windows)
P*2WC_Especifica aplica��o do tipo console (Classic Mac OS)
3*2WD_Usa DEFFILE para exportar fun��es de DLL ou EXE (Windows)
@@ -3397,7 +3397,7 @@ P*2We_Usa recursos externos (Darwin)
p*2We_Usa recursos externos (Darwin)
3*2WF_Especifica aplica��o do tipo tela-cheia (EMX, OS/2)
3*2WG_Especifica aplica��o do tipo gr�fica (EMX, OS/2, Windows)
-4*2WG_Especifica aplica��o do tipo gr�fica (EMX, OS/2, Windows)
+4*2WG_Especifica aplica��o do tipo gr�fica (Windows)
A*2WG_Especifica aplica��o do tipo gr�fica (Windows)
P*2WG_Especifica aplica��o do tipo gr�fica (Classic Mac OS)
3*2Wi_Usa recursos internos (Darwin)
diff --git a/compiler/msg/errorptu.msg b/compiler/msg/errorptu.msg
index fbb5cba4cc..ba0a7fe5eb 100644
--- a/compiler/msg/errorptu.msg
+++ b/compiler/msg/errorptu.msg
@@ -3384,7 +3384,7 @@ A*2Wb_Cria um encarte ao invés de uma biblioteca (Darwin)
A*2WB_Cria uma imagem relocável (Windows, Symbian)
A*2WBxxxx_Define base da imagem para xxxx (Windows, Symbian)
3*2WC_Especifica aplicação do tipo console (EMX, OS/2, Windows)
-4*2WC_Especifica aplicação do tipo console (EMX, OS/2, Windows)
+4*2WC_Especifica aplicação do tipo console (Windows)
A*2WC_Especifica aplicação do tipo console (Windows)
P*2WC_Especifica aplicação do tipo console (Classic Mac OS)
3*2WD_Usa DEFFILE para exportar funções de DLL ou EXE (Windows)
@@ -3397,7 +3397,7 @@ P*2We_Usa recursos externos (Darwin)
p*2We_Usa recursos externos (Darwin)
3*2WF_Especifica aplicação do tipo tela-cheia (EMX, OS/2)
3*2WG_Especifica aplicação do tipo gráfica (EMX, OS/2, Windows)
-4*2WG_Especifica aplicação do tipo gráfica (EMX, OS/2, Windows)
+4*2WG_Especifica aplicação do tipo gráfica (Windows)
A*2WG_Especifica aplicação do tipo gráfica (Windows)
P*2WG_Especifica aplicação do tipo gráfica (Classic Mac OS)
3*2Wi_Usa recursos internos (Darwin)
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index b94baeb6f0..4735622bdd 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -1000,7 +1000,7 @@ const
option_info=11024;
option_help_pages=11025;
- MsgTxtSize = 74512;
+ MsgTxtSize = 74490;
MsgIdxMax : array[1..20] of longint=(
26,99,339,123,95,57,126,27,202,64,
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index cdf217a428..add9e8db95 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1632,94 +1632,94 @@ const msgtxt : array[0..000310,1..240] of char=(
'A*2WB_Create a relocatable image (Windows,',' Symbian)'#010+
'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
'3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
- '4*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_Spe','cify console type application (Classic Mac OS)'#010+
+ 'P*2WC_Specify consol','e 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_U','se external resources (Darwin)'#010+
+ '3*2We_Use external',' resources (Darwin)'#010+
'4*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 (EMX, OS/2)'#010+
- '3*','2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
- '4*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
+ '3*2WG_Specify',' 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+
- '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+
'P*2Wi_Use internal resources (Darwin)'#010+
'p*2Wi_Use internal resources (Darwin)'#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+
+ '4*2WI_Turn on/off the usage of i','mport sections (Windows)'#010+
'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
'8*2Wm<x>_Set memory model'#010+
'8*3WmTiny_Tiny memory model'#010+
'8*3WmSmall_Small memory model (default)'#010+
'8*3WmMedium_Medium memory model'#010+
- '8*3WmCompa','ct_Compact memory model'#010+
+ '8*3WmCompact_Compact memory mode','l'#010+
'8*3WmLarge_Large memory model'#010+
'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, ... (Darwi'+
'n)'#010+
- 'p*2WM<x>_Minimum Mac OS X deployment ver','sion: 10.4, 10.5.1, ... (Dar'+
+ 'p*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+
'3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
- '4*2WN_Do not generate relocation code, needed for debugging (Win','dows'+
+ '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
+ 'A*2WN_Do not gen','erate relocation code, needed for debugging (Windows'+
')'#010+
- 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'A*2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for possi'+
'ble values'#010+
'm*2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for possi'+
'ble values'#010+
- 'V*','2Wpxxxx_Specify the controller type; see fpc -i or fpc -iu for pos'+
+ 'V*2Wpxxxx_Specify the co','ntroller type; see fpc -i or fpc -iu for pos'+
'sible values'#010+
'3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#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+
+ '3*2WR_Generate relocation code (Windows)'#010+
+ '4*2WR_G','enerate relocation code (Windows)'#010+
'A*2WR_Generate relocation code (Windows)'#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+
+ '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
+ 'P*2WT_Specify MPW to','ol type application (Classic Mac OS)'#010+
'**2WX_Enable executable stack (Linux)'#010+
'**1X_Executable options:'#010+
'**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
'ux)'#010+
- '**2Xd_Do not search default library path (so','metimes required for cro'+
+ '**2Xd_Do not search default library path (sometimes required for c','ro'+
'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 executable'#010+
- '**2XD_Try to link',' units dynamically (defines FPC_LINK_DYNAMIC)'#010+
+ '**2XD_Try to link units dynamically ',' (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_Use internal linker'#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<x>_Set the name of the '#039'main'#039' program routine (default'+
+ '**2XM<x>_Set the name o','f the '#039'main'#039' program routine (default'+
' is '#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+
- '**2XP<x>_Prepend the binutils n','ames with the prefix <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) (BeOS, Linux)'#010+
'**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
- ', Linux, Mac OS, Sol','aris)'#010+
- '**2Xs_Strip all symbols from executable'#010+
+ ', 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 libraries (-static is passed to linker)'#010+
'**2Xv_Generate table for Virtual Entry calls'#010+
- '**2XX_Try to sma','rtlink 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'