diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 032e60c0c9..237111de16 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -1920,6 +1920,8 @@ sym_e_objc_formal_class_not_resolved=05080_E_No complete definition of the forma
 % However, as soon as you wish to actually do something with an entity of this class type (such as
 % access one of its fields, send a message to it, or use it to inherit from), the compiler requires the full definition
 % of the class to be in scope.
+sym_e_interprocgoto_into_init_final_code_not_allowed=05081_E_Gotos into initialization or finalization blocks of units are not allowed
+% Gotos into initialization or finalization blockse of units are not allowed.
 %
 % \end{description}
 #
@@ -2057,6 +2059,11 @@ cg_f_unknown_type_in_unit=06050_F_Cannot find type "$1" in unit "$2". Check if y
 % and you didn't change the runtime library code, it's very likely that the runtime library
 % you're using doesn't match the compiler in use. If you changed the runtime library this error means
 % that you removed a type which the compiler needs for internal use.
+cg_e_interprocedural_goto_only_to_outer_scope_allowed=06051_E_Interprocedural gotos are allowed only to outer subroutines
+% Gotos between subroutines are only allowed if the goto jumps from an inner to an outer subroutine or
+% from a subroutine to the main program
+cg_e_labels_cannot_defined_outside_declaration_scope=06052_E_Label must be defined in the same scope as it is declared
+% In ISO mode, labels must be defined in the same scope as they are declared.
 % \end{description}
 # EndOfTeX
 
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index d6931a830f..48b735a3ca 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -538,6 +538,7 @@ const
   sym_w_non_implemented_unit=05078;
   sym_w_experimental_unit=05079;
   sym_e_objc_formal_class_not_resolved=05080;
+  sym_e_interprocgoto_into_init_final_code_not_allowed=05081;
   cg_e_parasize_too_big=06009;
   cg_e_file_must_call_by_reference=06012;
   cg_e_cant_use_far_pointer_there=06013;
@@ -566,6 +567,8 @@ const
   cg_h_inherited_ignored=06048;
   cg_e_goto_label_not_found=06049;
   cg_f_unknown_type_in_unit=06050;
+  cg_e_interprocedural_goto_only_to_outer_scope_allowed=06051;
+  cg_e_labels_cannot_defined_outside_declaration_scope=06052;
   asmr_d_start_reading=07000;
   asmr_d_finish_reading=07001;
   asmr_e_none_label_contain_at=07002;
@@ -864,9 +867,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 56901;
+  MsgTxtSize = 57117;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,88,297,96,81,51,110,22,202,63,
+    24,88,297,96,82,53,110,22,202,63,
     49,20,1,1,1,1,1,1,1,1
   );
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index 746eb49b3a..be21bd6a45 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -636,386 +636,388 @@ const msgtxt : array[0..000237,1..240] of char=(
   '05079_W_Unit "$1','" is experimental'#000+
   '05080_E_No complete definition of the formally declared objcclass "$1"'+
   ' is in scope'#000+
+  '05081_E_Gotos into initialization or finalization blocks of units are '+
+  'not allowed'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
-  '06012_E_File types must be var parameters'#000+
-  '06013_E_The use of a far pointer isn'#039't allowed th','ere'#000+
+  '06012_E_F','ile types must be var parameters'#000+
+  '06013_E_The use of a far pointer isn'#039't allowed there'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
   '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
-  '06018_W_unreachable code'#000+
+  '06018_W_unreachable ','code'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06027_DL_Register $1 weight',' $2 $3'#000+
+  '06027_DL_Register $1 weight $2 $3'#000+
   '06029_DL_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
-  '06033_E_No code for inline procedure stored'#000+
+  '06033_E_No code for inline pro','cedure stored'#000+
   '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'se','d, use (set)length instead'#000+
+  'sed, use (set)length instead'#000+
   '06037_E_Constructors or destructors cannot be called inside a '#039'wit'+
   'h'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
-  '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Control flow statements are','n'#039't allowed in a finally bloc'+
-  'k'#000+
+  '06','039_E_Jump in or outside of an exception block'#000+
+  '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
   '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
-  '06043_E_Local variables size exceeds supported limit'#000+
+  '06043_E_Loca','l variables size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
-  '06045_E_CONTINU','E not allowed'#000+
+  '06045_E_CONTINUE not allowed'#000+
   '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
   'me library.'#000+
-  '06047_F_Cannot find system type "$1". Check if you use the correct run'+
-  ' time library.'#000+
+  '06047_F_Cannot find system type "$1". Check if you use the cor','rect r'+
+  'un time library.'#000+
   '06048_H_Inherited call to abstract method ignored'#000+
-  '06049_E_G','oto label "$1" not defined or optimized away'#000+
+  '06049_E_Goto label "$1" not defined or optimized away'#000+
   '06050_F_Cannot find type "$1" in unit "$2". Check if you use the corre'+
   'ct run time library.'#000+
+  '06051_E_Interprocedura','l gotos are allowed only to outer subroutines'#000+
+  '06052_E_Label must be defined in the same scope as it is declared'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
   '07001_DL_Finished $1 styled assembler parsing'#000+
-  '07002_E_Non-','label pattern contains @'#000+
+  '07002_E_Non-label pattern contains @',#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
-  '07009_E_need to u','se $ here'#000+
-  '07010_E_Cannot use multiple relocatable symbols'#000+
+  '07009_E_need to use $ here'#000+
+  '07010_E_Cannot',' use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
-  '07015_E_You cannot reach $','1 from that code'#000+
-  '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
+  '07015_E_You cannot reach $1 from that code'#000+
+  '07016_E','_Local symbols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
-  '07020_E_Multiple index register us','age'#000+
-  '07021_E_Invalid operand type'#000+
+  '07020_E_Multiple index register usage'#000+
+  '07021_E_Invalid oper','and type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
-  '07027_E_esc','ape sequence ignored: $1'#000+
+  '07027_E_escape sequence ignored: $1',#000+
   '07028_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '07032_W_Calling an ov','erload function in assembler'#000+
+  '07032_W_Calling an overload function in assem','bler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
-  '07038_E_Error converting ','hexadecimal $1'#000+
-  '07039_H_$1 translated to $2'#000+
+  '07038_E_Error converting hexadecimal $1'#000+
+  '07039_H_$','1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
-  '07043_W_Procedures can'#039't return any value in asm cod','e'#000+
-  '07044_E_SEG not supported'#000+
+  '07043_W_Procedures can'#039't return any value in asm code'#000+
+  '07044_E_SEG not suppor','ted'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07','049_E_Assembler syntax error in operand'#000+
+  '07049_E_Assembler syntax e','rror in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
   '07053_E_Unrecognized opcode $1'#000+
-  '07054_E_Invalid or mis','sing opcode'#000+
-  '07055_E_Invalid combination of prefix and opcode: $1'#000+
+  '07054_E_Invalid or missing opcode'#000+
+  '07055_E_Inva','lid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
-  '07061_E_Und','efined local symbol $1'#000+
-  '07062_E_Unknown label identifier $1'#000+
+  '07061_E_Undefined local symbol $1'#000+
+  '0','7062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
-  '07068_E_Invalid floating point exp','ression'#000+
-  '07069_E_Wrong symbol type'#000+
+  '07068_E_Invalid floating point expression'#000+
+  '07069_E_Wrong sy','mbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
-  '07074_No type of va','riable specified'#000+
-  '07075_E_assembler code not returned to text section'#000+
+  '07074_No type of variable specified'#000+
+  '07075_E','_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
-  '07079_W_32bit constant created ','for address'#000+
-  '07080_N_.align is target specific, use .balign or .p2align'#000+
+  '07079_W_32bit constant created for address'#000+
+  '07080_N_.ali','gn is target specific, use .balign or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified and unable to determine the size of',' the op'+
-  'erands'#000+
-  '07084_E_Cannot use RESULT in this function'#000+
+  '07083_E_No size specified and unable to determine the size of the oper'+
+  'ands'#000+
+  '07084_E_Ca','nnot use RESULT in this function'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
-  '07089_E_Char < not',' allowed here'#000+
-  '07090_E_Char > not allowed here'#000+
+  '07089_E_Char < not allowed here'#000+
+  '07090_E_Ch','ar > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
   '07097_E_Higher cpu mode required ($1)'#000+
-  '07098_W_No size spec','ified and unable to determine the size of the op'+
+  '07098_W_No size specified and unable to dete','rmine the size of the op'+
   'erands, using DWORD as default'#000+
   '07099_E_Syntax error while trying to parse a shifter operand'#000+
   '07100_E_Address of packed component is not at a byte boundary'#000+
-  '07101_W_No size specified and unable t','o determine the size of the op'+
+  '07101_W_No size specified and unable to determine the size of ','the op'+
   'erands, using BYTE as default'#000+
   '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
   '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
   #000+
-  '07104_W_Use of -offset(%ebp) is not recommended for ','local variable a'+
-  'ccess'#000+
-  '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
-  ' lost'#000+
+  '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
+  'ess'#000+
+  '07','105_W_Use of -offset(%esp), access may cause a crash or value may '+
+  'be lost'#000+
   '07106_E_VMTOffset must be used in combination with a virtual method, a'+
   'nd "$1" is not virtual'#000+
-  '07107_E_Generating PIC, but reference is not PIC-','safe'#000+
-  '07108_E_All registers in a register set must be of the same kind and w'+
-  'idth'#000+
+  '07107_E_Generating PIC, but reference is not PIC-safe'#000+
+  '07108_E_All registe','rs in a register set must be of the same kind and'+
+  ' width'#000+
   '07109_E_A register set cannot be empty'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direc','t not support for binary writers'#000+
+  '08003_F_Direct not support for binary',' writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit ','references not supported'#000+
+  '08008_E_Asm: 16 Bit references not supported',#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '08014_E_Asm: Com','p type not supported for this target'#000+
+  '08014_E_Asm: Comp type not supported for',' this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
   '08019_E_Asm: Invalid register $1'#000+
-  '08020_E_Asm: 16 o','r 32 Bit references not supported'#000+
+  '08020_E_Asm: 16 or 32 Bit references not ','supported'#000+
   '08021_E_Asm: 64 Bit operands not supported'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assembler file: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
-  '09004_E_Can'#039't c','reate archive file: $1'#000+
-  '09005_E_Assembler $1 not found, switching to external assembling'#000+
+  '09004_E_Can'#039't create archive file: $1'#000+
+  '0','9005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
   'ssembling'#000+
-  '09009','_I_Assembling $1'#000+
-  '09010_I_Assembling with smartlinking $1'#000+
+  '09009_I_Assembling $1'#000+
+  '09010_I','_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call the linker, switching to external linki','ng'#000+
+  '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
-  '09016_E_Util $1 not found, switching to external linking'#000+
+  '09','016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
-  '09021_E_','resource compiler "$1" not found, switching to external mode'+
+  '09021_E_resource compiler "$1" n','ot found, switching to external mode'+
   #000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
   'king'#000+
   '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
   #000+
-  '09025_T_uni','t $1 can'#039't be shared linked, switching to static link'+
+  '09025_T_unit $1 can'#039't be shared lin','ked, switching to static link'+
   'ing'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
-  '09029_E_Error while c','ompiling resources'#000+
-  '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+
-  'al mode'#000+
+  '09029_E_Error while compiling resources'#000+
+  '09030','_E_Can'#039't call the resource compiler "$1", switching to exte'+
+  'rnal mode'#000+
   '09031_E_Can'#039't open resource file "$1"'#000+
   '09032_E_Can'#039't write resource file "$1"'#000+
   '09128_F_Can'#039't post process executable $1'#000+
-  '09129_F_Can'#039't open executable',' $1'#000+
-  '09130_X_Size of Code: $1 bytes'#000+
+  '09129_F_Can'#039't open executable $1'#000+
+  '09130_X_Size of Code',': $1 bytes'#000+
   '09131_X_Size of initialized data: $1 bytes'#000+
   '09132_X_Size of uninitialized data: $1 bytes'#000+
   '09133_X_Stack space reserved: $1 bytes'#000+
   '09134_X_Stack space committed: $1 bytes'#000+
-  '09200_F_Executable image size is too b','ig for $1 target.'#000+
-  '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
-  ' "$2".'#000+
+  '09200_F_Executable image size is too big for $1 target.'#000+
+  '09201_','W_Object file "$1" contains 32-bit absolute relocation to symb'+
+  'ol "$2".'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU Fil','e too short'#000+
-  '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
+  '10006_U_PPU File too short'#000+
+  '10007_U_PPU ','Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't Wr','ite PPU-File'#000+
-  '10014_F_Error reading PPU-File'#000+
+  '10013_F_Can'#039't Write PPU-File'#000+
+  '10014_F_Err','or reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1 ','and $2'#000+
-  '10021_F_Can'#039't compile unit $1, no sources available'#000+
+  '10020_F_Circular unit reference between $1 and $2'#000+
+  '10021_F_Can'#039't com','pile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1 used by $2'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '100','26_F_There were $1 errors compiling module, stopping'#000+
+  '10026_F_There were $1 error','s compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '1003','1_U_Recompiling unit, shared lib is older than ppufile'#000+
+  '10031_U_Recompiling unit, sh','ared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
-  '10036_U','_Second load for unit $1'#000+
+  '10036_U_Second load for unit $1',#000+
   '10037_U_PPU Check file $1 time $2'#000+
   '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
   '10041_U_File $1 is newer than PPU file $2'#000+
   '10042_U_Trying to use a unit which was compiled with a different FPU m'+
-  'ode'#000,
-  '10043_U_Loading interface units from $1'#000+
+  'ode'#000+
+  '10043_U_Loading interfac','e units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+
   '10045_U_Interface CRC changed for unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
-  '10048_U_Adding dependency: $1 d','epends on $2'#000+
-  '10049_U_No reload, is caller: $1'#000+
+  '10048_U_Adding dependency: $1 depends on $2'#000+
+  '10049_U_No ','reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
   '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
-  '10055_','U_Loading unit $1'#000+
-  '10056_U_Finished loading unit $1'#000+
+  '10055_U_Loading unit $1'#000+
+  '10056_','U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
   '10058_U_Re-resolving unit $1'#000+
   '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
   '10060_U_Unloading resource unit $1 (not needed)'#000+
-  '10061_E_Unit $1 ','was compiled using a different whole program optimiz'+
+  '10061_E_Unit $1 was compiled using a dif','ferent whole program optimiz'+
   'ation feedback input ($2, $3); recompile it without wpo or use the sam'+
   'e wpo feedback input file for this compilation invocation'#000+
-  '10062_U_Indirect interface (objects/classes) CRC changed for',' unit $1'+
-  #000+
-  '11000_O_$1 [options] <inputfile> [options]'#000+
+  '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+
+  '11000_O_$1 [opt','ions] <inputfile> [options]'#000+
   '11001_W_Only one source file supported, changing source file to compil'+
   'e from "$1" into "$2"'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
-  '11','004_F_No source file name in command line'#000+
+  '11004_F_No source file nam','e in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
-  '11010_D_Reading further options',' from $1'#000+
-  '11011_W_Target is already set to: $1'#000+
+  '11010_D_Reading further options from $1'#000+
+  '11011_W_Target ','is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+
   'ntered'#000+
-  '11014_F_In options file $1 at line $2 unexpect','ed \var{\#ENDIFs} enco'+
-  'untered'#000+
+  '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun',
+  'tered'#000+
   '11015_F_Open conditional at the end of the options file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_W_You are using the obsolete switch $1'#000+
-  '1','1019_W_You are using the obsolete switch $1, please use $2'#000+
+  '11019_W_You are using the',' obsolete switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
   '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
-  '11026_T_Reading ','options from file $1'#000+
-  '11027_T_Reading options from environment $1'#000+
+  '11026_T_Reading options from file $1'#000+
+  '110','27_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029_O_*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
-  '11036_D','_interpreting firstpass option "$1"'#000+
+  '11036_D_interpreting firstpass ','option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
   '11035_D_found source file name "$1"'#000+
   '11039_E_Unknown code page'#000+
   '11040_F_Config file $1 is a directory'#000+
-  '11041_W_Assembler output selected',' "$1" cannot generate debug info, d'+
+  '11041_W_Assembler output selected "$1" cannot generate de','bug info, d'+
   'ebugging disabled'#000+
   '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
   '11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+
   'var{\#IF(N)DEF} found'#000+
-  '11044_F_Option "$1" is not,',' or not yet, supported on the current tar'+
+  '11044_F_Option "$1" is not, or not yet, supported o','n the current tar'+
   'get platform'#000+
   '11045_F_The feature "$1" is not, or not yet, supported on the selected'+
   ' target platform'#000+
   '11046_N_DWARF debug information cannot be used with smart linking on t'+
-  'his target, switching to stat','ic linking'#000+
-  '11047_W_Option "$1" is ignored for the current target platform.'#000+
+  'his target, switching to static linking'#000+
+  '11047_W_Optio','n "$1" is ignored for the current target platform.'#000+
   '11048_W_Disabling external debug information because it is unsupported'+
   ' for the selected target/debug format combination.'#000+
-  '12000_F_Cannot open whole program optimizati','on feedback file "$1"'#000+
-  '12001_D_Processing whole program optimization information in wpo feedb'+
-  'ack file "$1"'#000+
+  '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
+  '12','001_D_Processing whole program optimization information in wpo fee'+
+  'dback file "$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
   ' in wpo feedback file "$1"'#000+
-  '12003_E_Expected section header, but ','got "$2" at line $1 of wpo feed'+
+  '12003_E_Expected section header, but got "$2" at line $1 of w','po feed'+
   'back file'#000+
   '12004_W_No handler registered for whole program optimization section "'+
   '$2" at line $1 of wpo feedback file, ignoring'#000+
   '12005_D_Found whole program optimization section "$1" with information'+
   ' about "$2"'#000+
-  '1','2006_F_The selected whole program optimizations require a previousl'+
+  '12006_F_The selected whol','e program optimizations require a previousl'+
   'y generated feedback file (use -Fw to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
   'am optimization found'#000+
-  '12008_F_Specify a whole program op','timization feedback file to store '+
+  '12008_F_Specify a whole program optimization feedback file',' to store '+
   'the generated info in (using -FW)'#000+
   '12009_E_Not generating any whole program optimization information, yet'+
   ' a feedback file was specified (using -FW)'#000+
-  '12010_E_Not performing any whole program optimizations, yet',' an input'+
-  ' feedback file was specified (using -Fw)'#000+
+  '12010_E_Not performing any whole program optimizations, yet an input f'+
+  'eedback file ','was specified (using -Fw)'#000+
   '12011_D_Skipping whole program optimization section "$1", because not '+
   'needed by the requested optimizations'#000+
   '12012_W_Overriding previously read information for "$1" from feedback '+
-  'input file u','sing information in section "$2"'#000+
+  'input file using information in sect','ion "$2"'#000+
   '12013_E_Cannot extract symbol liveness information from program when s'+
   'tripping symbols, use -Xs-'#000+
   '12014_E_Cannot extract symbol liveness information from program when w'+
   'hen not linking'#000+
-  '12015_F_Cannot find "$1"',' or "$2" to extract symbol liveness informat'+
+  '12015_F_Cannot find "$1" or "$2" to extract symb','ol liveness informat'+
   'ion from linked program'#000+
   '12016_E_Error during reading symbol liveness information produced by "'+
   '$1"'#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
   'ion from linked program'#000+
-  '1201','8_E_Collection of symbol liveness information can only help when'+
+  '12018_E_Collection of symbol',' liveness information can only help when'+
   ' using smart linking, use -CX -XX'#000+
   '12019_E_Cannot create specified whole program optimisation feedback fi'+
   'le "$1"'#000+
-  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] fo','r $F'+
-  'PCCPU'#010+
-  'Copyright (c) 1993-2009 by Florian Klaempfl'#000+
+  '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
+  'CPU'#010+
+  'Copyright (c) ','1993-2009 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
@@ -1025,9 +1027,9 @@ const msgtxt : array[0..000237,1..240] of char=(
   '  $OSTARGETS'#010+
   #010+
   'Supported CPU instruction sets:'#010+
-  '  $INSTRUCTIO','NSETS'#010+
+  '  $INSTRUCTIONSETS'#010+
   #010+
-  'Supported FPU instruction sets:'#010+
+  'Supported FPU ins','truction sets:'#010+
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
   'Supported ABI targets:'#010+
@@ -1040,199 +1042,200 @@ const msgtxt : array[0..000237,1..240] of char=(
   '  All'#010+
   '  $WPOPTIMIZATIONS'#010+
   #010+
-  'Supported Microcontroller types:',#010+
+  'Supported Microcontroller types:'#010+
   '  $CONTROLLERTYPES'#010+
   #010+
-  'This program comes under the GNU General Public Licence'#010+
+  'Thi','s program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs, suggestions, etc. to:'#010+
   '                 http://bugs.freepascal.org'#010+
   'or'#010+
   '                 bugs@freepascal.org'#000+
-  '11025','_**0*_Put + after a boolean switch option to enable it, - to di'+
+  '11025_**0*_Put + after a bool','ean switch option to enable it, - to di'+
   'sable it'#010+
   '**1a_The compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_List sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file'#010+
-  '*L2ap_Use pipes inste','ad of creating temporary assembler files'#010+
+  '*L2ap_Use pipes instead of creating temporary',' assembler files'#010+
   '**2ar_List register allocation/release info in assembler file'#010+
   '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
-  '3*2Aas_Assemble using ','GNU AS'#010+
-  '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
+  '3*2Aas_Assemble using GNU AS'#010+
+  '3*2Amacho_Mach-O ','(Darwin, Intel 32 bit) using internal writer'#010+
   '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
-  '3*2Anasmwdosx_Win32/WDOSX object file using',' Nasm'#010+
-  '3*2Awasm_Obj file using Wasm (Watcom)'#010+
+  '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
+  '3*2Awasm_Obj file ','using Wasm (Watcom)'#010+
   '3*2Anasmobj_Obj file using Nasm'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
   '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
-  '3*2Acoff_COFF (Go32v2) using internal writ','er'#010+
-  '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
+  '3*2Acoff_COFF (Go32v2) using internal writer'#010+
+  '3*2Apecoff_PE-COFF (W','in32) using internal writer'#010+
   '4*2Aas_Assemble using GNU AS'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   'A*2Aas_Assemble using GNU AS'#010+
-  'P*','2Aas_Assemble using GNU AS'#010+
+  'P*2Aas_Assemble using GNU ','AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
   '**1b_Generate browser info'#010+
   '**2bl_Generate local symbol info'#010+
   '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
-  '**2Cb_Generate b','ig-endian code'#010+
-  '**2Cc<x>_Set default calling convention to <x>'#010+
+  '**2Cb_Generate big-endian code'#010+
+  '**2Cc<x>_','Set default calling convention to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
-  'lue','s'#010+
-  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
+  'lues'#010+
+  '**2CF<x>_Minimal float','ing point constant precision (default, 32, 64)'+
+  #010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_Omit linking stage'#010+
   '**2Co_Check overflow of integer operations'#010+
-  '**2CO_C','heck for possible overflow of integer operations'#010+
+  '**2CO_Check for possible overfl','ow of integer operations'#010+
   '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
   '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
-  '**2Cr_Range checking',#010+
-  '**2CR_Verify object method call validity'#010+
+  '**2Cr_Range checking'#010+
+  '**2CR_Verify object met','hod call validity'#010+
   '**2Cs<n>_Set stack checking size to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)'#010+
   '**2CX_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
-  '**2Dd<x>_Set',' description to <x>'#010+
-  '**2Dv<x>_Set DLL version to <x>'#010+
+  '**2Dd<x>_Set description to <x>'#010+
+  '**2D','v<x>_Set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#010+
   '**1E_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 i','s p'+
-  'arsed'#010+
-  '**2Fc<x>_Set input codepage to <x>'#010+
+  '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
+  'sed'#010+
+  '**2Fc<x>_Set in','put codepage to <x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
   '**2FD<x>_Set the directory where to search for compiler utilities'#010+
-  '**2Fe<x>_Redirect error output t','o <x>'#010+
-  '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
+  '**2Fe<x>_Redirect error output to <x>'#010+
+  '**2Ff<x>_Add <x> t','o framework path (Darwin only)'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#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 from <x>.txt in the compiler',' '+
   'dir'#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+
   '**2Fu<x>_Add <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
-  '**2FW<x>_Store ge','nerated whole-program optimization feedback in <x>'#010+
+  '**2FW<x>_Store generated whole-program op','timization feedback in <x>'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
   '*g1g_Generate debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers'#010+
-  '*g2gh_Use heaptra','ce unit (for memory leak/corruption debugging)'#010+
+  '*g2gh_Use heaptrace unit (for memory leak','/corruption debugging)'#010+
   '*g2gl_Use line info unit (show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
   '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
   'aks gdb < 6.5)'#010+
-  '*g3gostabsabsinclud','es_ Store absolute/full include file paths in Sta'+
+  '*g3gostabsabsincludes_ Store absolute/full ','include file paths in Sta'+
   'bs'#010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
   '*g2gp_Preserve case in stabs symbol names'#010+
   '*g2gs_Generate Stabs debug information'#010+
-  '*g2gt_Trash local variables (to d','etect uninitialized uses)'#010+
+  '*g2gt_Trash local variables (to detect uninitialized uses',')'#010+
   '*g2gv_Generates 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+
   '**1i_Information'#010+
-  '**2iD_Re','turn compiler date'#010+
-  '**2iV_Return short compiler version'#010+
+  '**2iD_Return compiler date'#010+
+  '**2iV','_Return short compiler version'#010+
   '**2iW_Return full compiler version'#010+
   '**2iSO_Return compiler OS'#010+
   '**2iSP_Return compiler host processor'#010+
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
-  '**1I<x>_Add <x> to include path',#010+
-  '**1k<x>_Pass <x> to the linker'#010+
+  '**1I<x>_Add <x> to include path'#010+
+  '**1k<x>_Pass <x> to the',' linker'#010+
   '**1l_Write logo'#010+
   '**1M<x>_Set language mode to <x>'#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+
-  '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
+  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
+  '**2Mmacpas_Macintosh Pa','scal dialects compatibility mode'#010+
   '**1n_Do not read the default config files'#010+
   '**1N<x>_Node tree optimizations'#010+
   '**2Nu_Unroll loops'#010+
   '**1o<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
-  '**2O-_Dis','able optimizations'#010+
-  '**2O1_Level 1 optimizations (quick and debugger friendly)'#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 optimizations)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable or di','sable optimizations, see fpc -i for possibl'+
+  '**2Oo[NO]<x>_Enable or disable optimizations, see',' fpc -i for possibl'+
   'e values'#010+
   '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
   #010+
   '**2OW<x>_Generate whole-program optimization feedback for optimization'+
   ' <x>, see fpc -i for possible values'#010+
-  '**2Ow<x>_P','erform whole-program optimization <x>, see fpc -i for poss'+
+  '**2Ow<x>_Perform whole-program opt','imization <x>, see fpc -i for poss'+
   'ible values'#010+
   '**2Os_Optimize for size rather than speed'#010+
   '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_Assembler reading style:'#010+
-  '**2Rdefault_Use default assembler f','or target'#010+
-  '3*2Ratt_Read AT&T style assembler'#010+
+  '**2Rdefault_Use default assembler for target'#010+
+  '3*2Ratt_Read A','T&T style assembler'#010+
   '3*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+
-  '**2Sa_Turn on assertions'#010,
+  '**2Sa_Turn on assertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
-  '**2Se<x>_Error options. <x> is a combination of the following:'#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 also halts after warnings'#010+
   '**3*_n : Compiler also halts after notes'#010+
-  '**3*_h ',': Compiler also halts after hints'#010+
+  '**3*_h : Compiler also halts af','ter hints'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use ansistrings by default instead of shortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
-  '**2Sk_Load fpcylix uni','t'#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+
   '**2Ss_Constructor name must be init (destructor must be done)'#010+
-  '**','2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
+  '**2Sx_Enable exception key','words (default in Delphi/ObjFPC modes)'#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<x>_','Target operating system:'#010+
+  '**1T<x>_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*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Ne','tware Module (libc)'#010+
-  '3*2Topenbsd_OpenBSD'#010+
+  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
+  '3*2T','openbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
@@ -1240,8 +1243,8 @@ const msgtxt : array[0..000237,1..240] of char=(
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
-  '4*2Tlinux','_Linux'#010+
-  '6*2Tamiga_Commodore Amiga'#010+
+  '4*2Tlinux_Linux'#010+
+  '6*2Tamiga_Commodo','re Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
   '6*2Tmacos_Macintosh m68k (not supported)'#010+
@@ -1249,90 +1252,91 @@ const msgtxt : array[0..000237,1..240] of char=(
   'A*2Tlinux_Linux'#010+
   'A*2Twince_Windows CE'#010+
   'P*2Tamiga_AmigaOS on PowerPC'#010+
-  'P*2Tdarwin_Darwin and Mac OS X on P','owerPC'#010+
-  'P*2Tlinux_Linux on PowerPC'#010+
+  'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
+  'P*2Tlinux_Linux o','n PowerPC'#010+
   'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#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 rele','ase unit files (never automatically recompiled)'#010+
+  '**2Ur_Generate release unit files (never au','tomatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
   '**1v<x>_Be verbose. <x> 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*_i : Show general info           d : Show debug info'#010+
-  '**2*_l : Show linenumbers       ','     r : Rhide/GCC compatibility mod'+
+  '**2*_l : Show linenumbers            r : Rhide/GCC compa','tibility mod'+
   'e'#010+
   '**2*_s : Show time stamps            q : Show message numbers'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*_b : Write file names messages   p : Write tree.log with parse tre',
+  '**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 pat','h              v : Write fpcdebug.txt with'#010+
   '**2*_                                    lots of debugging info'#010+
   '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
   '3*1W<x>_Target-specific options (targets)'#010+
-  'A*1W<x>_Ta','rget-specific options (targets)'#010+
+  'A*1W<x>_Target-specific options (t','argets)'#010+
   'P*1W<x>_Target-specific options (targets)'#010+
   'p*1W<x>_Target-specific options (targets)'#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 bundl','e instead of a library (Darwin)'#010+
+  'p*2Wb_Create a bundle instead of a library (','Darwin)'#010+
   '3*2WB_Create a relocatable image (Windows)'#010+
   'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
-  'P*2W','C_Specify console type application (Classic Mac OS)'#010+
+  'P*2WC_Specify console type a','pplication (Classic Mac OS)'#010+
   '3*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 resourc','es (Darwin)'#010+
-  'A*2We_Use external resources (Darwin)'#010+
+  '4*2We_Use external resources (Darwin)'#010+
+  'A*2We_Use ex','ternal 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+
-  'A*2WG_Specify graphic type application (Windows)'#010+
+  '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
+  'A*2WG_Specify graphic t','ype application (Windows)'#010+
   'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
   'p*2Wi_Use internal resources (Darwin)'#010+
-  '3*2WN_Do not generat','e relocation code, needed for debugging (Windows'+
+  '3*2WN_Do not generate relocation code, neede','d for debugging (Windows'+
   ')'#010+
   'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
   'A*2WR_Generate relocation code (Windows)'#010+
-  'P*2WT_Specify MPW tool type applicatio','n (Classic Mac OS)'#010+
-  '3*2WX_Enable executable stack (Linux)'#010+
+  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
+  '3*2WX','_Enable executable stack (Linux)'#010+
   'A*2WX_Enable executable stack (Linux)'#010+
   'p*2WX_Enable executable stack (Linux)'#010+
   'P*2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
-  '**2Xc_Pass --shared/-dynamic to the linker (','BeOS, Darwin, FreeBSD, L'+
-  'inux)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, L','i'+
+  'nux)'#010+
   '**2Xd_Do not use standard library search path (needed for cross compil'+
   'e)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
-  '**2XD_Try to link units dyn','amically      (defines FPC_LINK_DYNAMIC)'#010+
+  '**2XD_Try to link units dynamically      (defines F','PC_LINK_DYNAMIC)'#010+
   '**2Xi_Use internal linker'#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+
   '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_Set the link','er'#039's rlink-path to <x> (needed for cross co'+
+  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (','needed for cross co'+
   'mpile, 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, Solaris)'#010+
-  '**2Xs_Strip all symbols from executable'#010,
-  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#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+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
-  '**1h_Shows this',' help without waiting'
+  '**1h_Shows this help without waiting'
 );
diff --git a/compiler/nbas.pas b/compiler/nbas.pas
index a8b56f4daa..7c0181807f 100644
--- a/compiler/nbas.pas
+++ b/compiler/nbas.pas
@@ -245,7 +245,7 @@ implementation
     procedure addstatement(var laststatement:tstatementnode;n:tnode);
       begin
         if assigned(laststatement.right) then
-         internalerror(200204201);
+          internalerror(200204201);
         laststatement.right:=cstatementnode.create(n,nil);
         laststatement:=tstatementnode(laststatement.right);
       end;
diff --git a/compiler/nflw.pas b/compiler/nflw.pas
index 0816dde7b3..93455a7591 100644
--- a/compiler/nflw.pas
+++ b/compiler/nflw.pas
@@ -1688,10 +1688,37 @@ implementation
 
         { The labelnode can already be set when
           this node was copied }
-        if not assigned(labelnode) then
+        if not(assigned(labelnode)) then
           begin
-            if assigned(labelsym.code) then
+            { inner procedure goto? }
+            if assigned(labelsym.code) and
+              ((assigned(labelsym.owner) and (current_procinfo.procdef.parast.symtablelevel=labelsym.owner.symtablelevel)) or
+              { generated by the optimizer? }
+               not(assigned(labelsym.owner))) then
               labelnode:=tlabelnode(labelsym.code)
+            else if (m_iso in current_settings.modeswitches) and
+              assigned(labelsym.owner) then
+              begin
+                if current_procinfo.procdef.parast.symtablelevel>labelsym.owner.symtablelevel then
+                  begin
+                    { don't mess with the exception blocks, global gotos in/out side exception blocks are not allowed }
+                    if exceptionblock>0 then
+                      CGMessage(cg_e_goto_inout_of_exception_block);
+
+                    if assigned(labelsym.jumpbuf) then
+                      begin
+                        labelsym.nonlocal:=true;
+                        result:=ccallnode.createintern('fpc_longjmp',
+                          ccallparanode.create(cordconstnode.create(1,sinttype,true),
+                          ccallparanode.create(cloadnode.create(labelsym.jumpbuf,labelsym.jumpbuf.owner),
+                        nil)));
+                      end
+                    else
+                      CGMessage1(cg_e_goto_label_not_found,labelsym.realname);
+                  end
+                else
+                  CGMessage(cg_e_interprocedural_goto_only_to_outer_scope_allowed);
+              end
             else
               CGMessage1(cg_e_goto_label_not_found,labelsym.realname);
           end;
@@ -1799,20 +1826,23 @@ implementation
 
     function tlabelnode.pass_1 : tnode;
       begin
-         result:=nil;
-         expectloc:=LOC_VOID;
-         if assigned(left) then
-           firstpass(left);
+        result:=nil;
+        expectloc:=LOC_VOID;
+        if assigned(left) then
+          firstpass(left);
+        if (m_iso in current_settings.modeswitches) and
+          (current_procinfo.procdef.parast.symtablelevel<>labsym.owner.symtablelevel) then
+          CGMessage(cg_e_labels_cannot_defined_outside_declaration_scope)
       end;
 
 
    function tlabelnode.dogetcopy : tnode;
      begin
-        if not(assigned(copiedto)) then
-          copiedto:=tlabelnode(inherited dogetcopy);
-        copiedto.exceptionblock:=exceptionblock;
+       if not(assigned(copiedto)) then
+         copiedto:=tlabelnode(inherited dogetcopy);
+       copiedto.exceptionblock:=exceptionblock;
 
-        result:=copiedto;
+       result:=copiedto;
      end;
 
 
diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas
index 22a8bec2be..1b3d5e8f9c 100644
--- a/compiler/pdecl.pas
+++ b/compiler/pdecl.pas
@@ -268,6 +268,8 @@ implementation
 
 
     procedure label_dec;
+      var
+        labelsym : tlabelsym;
       begin
          consume(_LABEL);
          if not(cs_support_goto in current_settings.moduleswitches) then
@@ -278,9 +280,25 @@ implementation
            else
              begin
                 if token=_ID then
-                 symtablestack.top.insert(tlabelsym.create(orgpattern))
+                  labelsym:=tlabelsym.create(orgpattern)
                 else
-                 symtablestack.top.insert(tlabelsym.create(pattern));
+                  labelsym:=tlabelsym.create(pattern);
+                symtablestack.top.insert(labelsym);
+                if m_iso in current_settings.modeswitches then
+                  begin
+                    if symtablestack.top.symtabletype=localsymtable then
+                      begin
+                        labelsym.jumpbuf:=tlocalvarsym.create('LABEL$_'+labelsym.name,vs_value,rec_jmp_buf,[]);
+                        symtablestack.top.insert(labelsym.jumpbuf);
+                      end
+                    else
+                      begin
+                        labelsym.jumpbuf:=tstaticvarsym.create('LABEL$_'+labelsym.name,vs_value,rec_jmp_buf,[]);
+                        symtablestack.top.insert(labelsym.jumpbuf);
+                        insertbssdata(tstaticvarsym(labelsym.jumpbuf));
+                      end;
+                    include(labelsym.jumpbuf.symoptions,sp_internal);
+                  end;
                 consume(token);
              end;
            if token<>_SEMICOLON then consume(_COMMA);
diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index 728451df88..32dab85877 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -1674,6 +1674,9 @@ implementation
                             tlabelsym(srsym).nonlocal:=true;
                             exclude(current_procinfo.procdef.procoptions,po_inline);
                           end;
+                        if tlabelsym(srsym).nonlocal and
+                          (current_procinfo.procdef.proctypeoption in [potype_unitinit,potype_unitfinalize]) then
+                          Message(sym_e_interprocgoto_into_init_final_code_not_allowed);
                         tlabelsym(srsym).defined:=true;
                         p1:=clabelnode.create(nil,tlabelsym(srsym));
                         tlabelsym(srsym).code:=p1;
diff --git a/compiler/pstatmnt.pas b/compiler/pstatmnt.pas
index 9520a5a0be..06a72e2818 100644
--- a/compiler/pstatmnt.pas
+++ b/compiler/pstatmnt.pas
@@ -1067,7 +1067,8 @@ implementation
                      else
                        begin
                          { goto is only allowed to labels within the current scope }
-                         if srsym.owner<>current_procinfo.procdef.localst then
+                         if not(m_iso in current_settings.modeswitches) and
+                           (srsym.owner<>current_procinfo.procdef.localst) then
                            CGMessage(parser_e_goto_outside_proc);
                          code:=cgotonode.create(tlabelsym(srsym));
                          tgotonode(code).labelsym:=tlabelsym(srsym);
@@ -1140,7 +1141,16 @@ implementation
                    (srsym.typ=labelsym) then
                  begin
                    if tlabelsym(srsym).defined then
-                    Message(sym_e_label_already_defined);
+                     Message(sym_e_label_already_defined);
+                   if symtablestack.top.symtablelevel<>srsymtable.symtablelevel then
+                     begin
+                       tlabelsym(srsym).nonlocal:=true;
+                       exclude(current_procinfo.procdef.procoptions,po_inline);
+                     end;
+                   if tlabelsym(srsym).nonlocal and
+                     (current_procinfo.procdef.proctypeoption in [potype_unitinit,potype_unitfinalize]) then
+                     Message(sym_e_interprocgoto_into_init_final_code_not_allowed);
+
                    tlabelsym(srsym).defined:=true;
                    p:=clabelnode.create(nil,tlabelsym(srsym));
                    tlabelsym(srsym).code:=p;
diff --git a/compiler/psub.pas b/compiler/psub.pas
index 4206d8bf71..689e9eae66 100644
--- a/compiler/psub.pas
+++ b/compiler/psub.pas
@@ -268,6 +268,21 @@ implementation
       end;
 
 
+    procedure add_label_init(p:TObject;arg:pointer);
+      begin
+        if tstoredsym(p).typ=labelsym then
+          begin
+            addstatement(tstatementnode(arg^),
+              cifnode.create(caddnode.create(equaln,
+                ccallnode.createintern('fpc_setjmp',
+                  ccallparanode.create(cloadnode.create(tlabelsym(p).jumpbuf,tlabelsym(p).jumpbuf.owner),nil)),
+                cordconstnode.create(1,sinttype,true))
+              ,cgotonode.create(tlabelsym(p)),nil)
+            );
+          end;
+      end;
+
+
     function generate_bodyentry_block:tnode;
       var
         srsym        : tsym;
@@ -365,6 +380,8 @@ implementation
                   internalerror(200305104);
               end;
           end;
+        if m_iso in current_settings.modeswitches then
+          tsymtable(current_procinfo.procdef.localst).SymList.ForEachCall(@add_label_init,@newstatement);
       end;
 
 
diff --git a/compiler/symdef.pas b/compiler/symdef.pas
index 8941022d09..cf8d4b8fac 100644
--- a/compiler/symdef.pas
+++ b/compiler/symdef.pas
@@ -695,6 +695,9 @@ interface
          of all interfaces         }
        rec_tguid : trecorddef;
 
+       { pointer to jump buffer }
+       rec_jmp_buf : trecorddef;
+
        { Objective-C base types }
        objc_metaclasstype,
        objc_superclasstype,
@@ -2677,6 +2680,7 @@ implementation
            end
          else
            tstoredsymtable(symtable).deref;
+
          { assign TGUID? load only from system unit }
          if not(assigned(rec_tguid)) and
             (upper(typename)='TGUID') and
@@ -2684,6 +2688,14 @@ implementation
             assigned(owner.name) and
             (owner.name^='SYSTEM') then
            rec_tguid:=self;
+
+         { assign JMP_BUF? load only from system unit }
+         if not(assigned(rec_jmp_buf)) and
+            (upper(typename)='JMP_BUF') and
+            assigned(owner) and
+            assigned(owner.name) and
+            (owner.name^='SYSTEM') then
+           rec_jmp_buf:=self;
       end;
 
 
diff --git a/compiler/symsym.pas b/compiler/symsym.pas
index bc92260d3d..11c3c55394 100644
--- a/compiler/symsym.pas
+++ b/compiler/symsym.pas
@@ -58,6 +58,9 @@ interface
             be a tnode }
           code : pointer;
 
+          { points to the jump buffer }
+          jumpbuf : tstoredsym;
+
           { when the label is defined in an asm block, this points to the
             generated asmlabel }
           asmblocklabel : tasmlabel;
diff --git a/rtl/arm/setjump.inc b/rtl/arm/setjump.inc
index 9c4dd68795..39494e2ff4 100644
--- a/rtl/arm/setjump.inc
+++ b/rtl/arm/setjump.inc
@@ -14,7 +14,7 @@
 
  **********************************************************************}
 
-function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];nostackframe;
+function fpc_setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];nostackframe; compilerproc;
   asm
     {$if defined(FPUVFPV2) or defined(FPUVFPV3)}
     {$if defined(CPUARMV3) or defined(CPUARMV4) or defined(CPUARMV5)}
@@ -39,7 +39,7 @@ function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJM
   end;
 
 
-procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP'];
+procedure fpc_longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP']; compilerproc;
   asm
     {$if defined(CPUCORTEXM3) or defined(CPUARMV7M)}
     mov     ip, r0
diff --git a/rtl/arm/setjumph.inc b/rtl/arm/setjumph.inc
index 8ec7b99b70..a823abddae 100644
--- a/rtl/arm/setjumph.inc
+++ b/rtl/arm/setjumph.inc
@@ -23,7 +23,7 @@ type
    end;
    pjmp_buf = ^jmp_buf;
 
-function setjmp(var S : jmp_buf) : longint;
-procedure longjmp(var S : jmp_buf;value : longint);
+function setjmp(var S : jmp_buf) : longint;[external name 'FPC_SETJMP'];
+procedure longjmp(var S : jmp_buf;value : longint);[external name 'FPC_LONGJMP'];
 
 
diff --git a/rtl/avr/setjump.inc b/rtl/avr/setjump.inc
index 94a2ab014d..be2a0c181c 100644
--- a/rtl/avr/setjump.inc
+++ b/rtl/avr/setjump.inc
@@ -14,12 +14,12 @@
 
  **********************************************************************}
 
-function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];nostackframe;
+function fpc_setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];nostackframe;compilerproc;
   asm
   end;
 
 
-procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP'];
+procedure fpc_longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP'];compilerproc;
   asm
   end;
 
diff --git a/rtl/avr/setjumph.inc b/rtl/avr/setjumph.inc
index 761dd555f7..f27b3c9cbc 100644
--- a/rtl/avr/setjumph.inc
+++ b/rtl/avr/setjumph.inc
@@ -19,7 +19,7 @@ type
    end;
    pjmp_buf = ^jmp_buf;
 
-function setjmp(var S : jmp_buf) : longint;
-procedure longjmp(var S : jmp_buf;value : longint);
+function setjmp(var S : jmp_buf) : longint;[external name 'FPC_SETJMP'];
+procedure longjmp(var S : jmp_buf;value : longint);[external name 'FPC_LONGJMP'];
 
 
diff --git a/rtl/i386/setjump.inc b/rtl/i386/setjump.inc
index 7ead23e1cb..316531c531 100644
--- a/rtl/i386/setjump.inc
+++ b/rtl/i386/setjump.inc
@@ -13,7 +13,7 @@
 
  **********************************************************************}
 
-Function SetJmp (Var S : Jmp_buf) : longint;assembler;nostackframe;[Public, alias : 'FPC_SETJMP'];
+Function fpc_SetJmp (Var S : Jmp_buf) : longint;assembler;nostackframe;[Public, alias : 'FPC_SETJMP']; compilerproc;
 asm
 {$ifndef REGCALL}
   movl 4(%esp),%eax
@@ -35,7 +35,7 @@ asm
 end;
 
 
-Procedure longJmp (Var S : Jmp_buf; value : longint); assembler;nostackframe;[Public, alias : 'FPC_LONGJMP'];
+Procedure fpc_longJmp (Var S : Jmp_buf; value : longint); assembler;nostackframe;[Public, alias : 'FPC_LONGJMP']; compilerproc;
 asm
 {$ifdef REGCALL}
   xchgl %edx,%eax
diff --git a/rtl/i386/setjumph.inc b/rtl/i386/setjumph.inc
index 8200dfa964..abea48264c 100644
--- a/rtl/i386/setjumph.inc
+++ b/rtl/i386/setjumph.inc
@@ -20,6 +20,6 @@ Type
     end;
   PJmp_buf = ^jmp_buf;
 
-Function Setjmp (Var S : Jmp_buf) : longint;
-Procedure longjmp (Var S : Jmp_buf; value : longint);
+Function Setjmp (Var S : Jmp_buf) : longint; [external name 'FPC_SETJMP'];
+Procedure longjmp (Var S : Jmp_buf; value : longint); [external name 'FPC_LONGJMP'];
 
diff --git a/rtl/inc/compproc.inc b/rtl/inc/compproc.inc
index e8fe6db36b..57fb881703 100644
--- a/rtl/inc/compproc.inc
+++ b/rtl/inc/compproc.inc
@@ -717,4 +717,5 @@ function fpc_int64_to_double(i: int64): double; compilerproc;
 function fpc_qword_to_double(q: qword): double; compilerproc;
 {$endif FPC_INCLUDE_SOFTWARE_INT64_TO_DOUBLE}
 
-
+function fpc_setjmp(var s : jmp_buf) : longint; compilerproc;
+procedure fpc_longjmp(var s : jmp_buf; value : longint); compilerproc;
diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc
index 2dd46542c8..4193ad6a99 100644
--- a/rtl/inc/system.inc
+++ b/rtl/inc/system.inc
@@ -1434,3 +1434,45 @@ begin
   CtrlBreakHandler := Handler;
 end;
 {$ENDIF FPC_HAS_SETCTRLBREAKHANDLER}
+
+Function fpc_marklabel (Var S : Jmp_buf) : longint;assembler;nostackframe;
+asm
+{$ifndef REGCALL}
+  movl 4(%esp),%eax
+{$endif}
+  movl %ebx,Jmp_buf.ebx(%eax)
+  movl %esi,Jmp_buf.esi(%eax)
+  movl %edi,Jmp_buf.edi(%eax)
+  movl %ebp,Jmp_buf.bp(%eax)
+{$ifdef REGCALL}
+  leal 4(%esp),%edi
+{$else}
+  leal 8(%esp),%edi
+{$endif}
+  movl %edi,Jmp_buf.sp(%eax)
+  movl (%esp),%edi
+  movl %edi,Jmp_buf.pc(%eax)
+  movl Jmp_buf.edi(%eax),%edi
+  xorl %eax,%eax
+end;
+
+
+procedure fpc_dogoto(Var S : Jmp_buf); assembler;nostackframe;
+asm
+{$ifdef REGCALL}
+  xchgl %edx,%eax
+{$else}
+  movl 4(%esp),%edx
+  movl 8(%esp),%eax
+{$endif}
+  movl $1,%eax
+  movl Jmp_buf.ebx(%edx),%ebx
+  movl Jmp_buf.esi(%edx),%esi
+  movl Jmp_buf.edi(%edx),%edi
+  movl Jmp_buf.bp(%edx),%ebp
+  movl Jmp_buf.sp(%edx),%esp
+  // we should also clear the fpu
+  // fninit no must be done elsewhere PM
+  // or we should reset the control word also
+  jmp Jmp_buf.pc(%edx)
+end;
diff --git a/rtl/m68k/setjump.inc b/rtl/m68k/setjump.inc
index 0d6d6b6bd6..eb859a0e46 100644
--- a/rtl/m68k/setjump.inc
+++ b/rtl/m68k/setjump.inc
@@ -16,18 +16,10 @@
            Set_Jmp/Long_jmp
  **********************************************************************}
 
-Function SetJmp (Var S : Jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];
-
+Function fpc_SetJmp (Var S : Jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];compilerproc;
 asm
 end;
 
-Procedure longJmp (Var S : Jmp_buf; value : longint); assembler;[Public, alias : 'FPC_LONGJMP'];
-
+Procedure fpc_longJmp (Var S : Jmp_buf; value : longint); assembler;[Public, alias : 'FPC_LONGJMP'];compilerproc;
 asm
 end;
-
-{
-  Revision 1.4  2005/02/14 17:13:30  peter
-    * truncate log
-
-}
diff --git a/rtl/m68k/setjumph.inc b/rtl/m68k/setjumph.inc
index 70a5cc287f..587434ce57 100644
--- a/rtl/m68k/setjumph.inc
+++ b/rtl/m68k/setjumph.inc
@@ -25,6 +25,6 @@ Type
   end;
   PJmp_buf = ^jmp_buf;
 
-Function Setjmp (Var S : Jmp_buf) : longint;
-Procedure longjmp (Var S : Jmp_buf; value : longint);
+Function Setjmp (Var S : Jmp_buf) : longint;[external name 'FPC_SETJMP'];
+Procedure longjmp (Var S : Jmp_buf; value : longint);[external name 'FPC_LONGJMP'];
 
diff --git a/rtl/mips/setjump.inc b/rtl/mips/setjump.inc
index 87d01379d4..c2c8d0b956 100644
--- a/rtl/mips/setjump.inc
+++ b/rtl/mips/setjump.inc
@@ -13,7 +13,7 @@
 
  **********************************************************************}
 
-procedure longjmp(var s : jmp_buf;value:longint);assembler;nostackframe;[Public,alias:'FPC_LONGJMP'];
+procedure fpc_longjmp(var s : jmp_buf;value:longint);assembler;nostackframe;[Public,alias:'FPC_LONGJMP'];compilerproc;
   asm
     lw $31,0($4) #PC
     lw $sp,4($4) #SP
@@ -33,7 +33,7 @@ procedure longjmp(var s : jmp_buf;value:longint);assembler;nostackframe;[Public,
   end;
 
 
-function setjmp(var S:jmp_buf):longint;assembler;nostackframe;[Public,alias:'FPC_SETJMP'];
+function fpc_setjmp(var S:jmp_buf):longint;assembler;nostackframe;[Public,alias:'FPC_SETJMP'];compilerproc;
   asm
     sw $31,0($4) #PC
     sw $sp,4($4) #SP
diff --git a/rtl/mips/setjumph.inc b/rtl/mips/setjumph.inc
index 95da715fcb..8c747f7d85 100644
--- a/rtl/mips/setjumph.inc
+++ b/rtl/mips/setjumph.inc
@@ -20,5 +20,5 @@ type
   end;
   Pjmp_buf=^jmp_buf;
 
-function setjmp(var S:jmp_buf):longint;
-procedure longjmp(var S:jmp_buf;value:longint);
+function setjmp(var S:jmp_buf):longint;[external name 'FPC_SETJMP'];
+procedure longjmp(var S:jmp_buf;value:longint);[external name 'FPC_LONGJMP'];
diff --git a/rtl/powerpc/setjump.inc b/rtl/powerpc/setjump.inc
index 8e278abe47..380250263a 100644
--- a/rtl/powerpc/setjump.inc
+++ b/rtl/powerpc/setjump.inc
@@ -14,7 +14,7 @@
 
  **********************************************************************}
 
-function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP']; nostackframe;
+function fpc_setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP']; nostackframe; compilerproc;
   asm
      stw     r1,0(r3)
      mflr    r0
@@ -97,7 +97,7 @@ function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJM
      li      r3,0
   end;
 
-procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP']; nostackframe;
+procedure fpc_longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP']; nostackframe; compilerproc;
   asm
      lwz     r1,0(r3)
      lwz     r2,4(r3)
diff --git a/rtl/powerpc/setjumph.inc b/rtl/powerpc/setjumph.inc
index 9b247bc03d..563882b9a3 100644
--- a/rtl/powerpc/setjumph.inc
+++ b/rtl/powerpc/setjumph.inc
@@ -23,6 +23,6 @@ type
    end;
    pjmp_buf = ^jmp_buf;
 
-function setjmp(var S : jmp_buf) : longint;
-procedure longjmp(var S : jmp_buf;value : longint);
+function setjmp(var S : jmp_buf) : longint;[external name 'FPC_SETJMP'];
+procedure longjmp(var S : jmp_buf;value : longint);[external name 'FPC_LONGJMP'];
 
diff --git a/rtl/powerpc64/setjump.inc b/rtl/powerpc64/setjump.inc
index e6099ec7eb..1c9349e477 100644
--- a/rtl/powerpc64/setjump.inc
+++ b/rtl/powerpc64/setjump.inc
@@ -29,7 +29,7 @@
    end;
    pjmp_buf = ^jmp_buf;}
 
-function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP']; nostackframe;
+function fpc_setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP']; nostackframe; compilerproc;
   asm
      std     r1,0(r3)    // store r1
      mflr    r0
@@ -76,7 +76,7 @@ function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJM
      li      r3,0
   end;
 
-procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP']; nostackframe;
+procedure fpc_longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP']; nostackframe; compilerproc;
   asm
      ld      r1,0(r3)    // load r1
      ld      r2,8(r3)    // load r2
diff --git a/rtl/powerpc64/setjumph.inc b/rtl/powerpc64/setjumph.inc
index 83a4a68826..6ff0d1034e 100644
--- a/rtl/powerpc64/setjumph.inc
+++ b/rtl/powerpc64/setjumph.inc
@@ -21,6 +21,6 @@ type
    end;
    pjmp_buf = ^jmp_buf;
 
-function setjmp(var S : jmp_buf) : longint;
-procedure longjmp(var S : jmp_buf;value : longint);
+function setjmp(var S : jmp_buf) : longint;[external name 'FPC_SETJMP'];
+procedure longjmp(var S : jmp_buf;value : longint);[external name 'FPC_LONGJMP'];
 
diff --git a/rtl/sparc/setjump.inc b/rtl/sparc/setjump.inc
index 92b17deb73..62f8910e79 100644
--- a/rtl/sparc/setjump.inc
+++ b/rtl/sparc/setjump.inc
@@ -18,7 +18,7 @@
 #define RW_FP [%fp + 0x48]
 }
 
-procedure longjmp(var s : jmp_buf;value:longint);assembler;nostackframe;[Public,alias:'FPC_LONGJMP'];
+procedure fpc_longjmp(var s : jmp_buf;value:longint);assembler;nostackframe;[Public,alias:'FPC_LONGJMP'];compilerproc;
   asm
     // Store our arguments in global registers so we can still
     // use them while unwinding frames and their register windows.
@@ -79,7 +79,7 @@ procedure longjmp(var s : jmp_buf;value:longint);assembler;nostackframe;[Public,
   end;
 
 
-function setjmp(var S:jmp_buf):longint;assembler;nostackframe;[Public,alias:'FPC_SETJMP'];
+function fpc_setjmp(var S:jmp_buf):longint;assembler;nostackframe;[Public,alias:'FPC_SETJMP'];compilerproc;
   asm
     // We don't create a stackframe so we can save PC,SP and FP of the caller
     st      %o7, [%o0+8]
diff --git a/rtl/sparc/setjumph.inc b/rtl/sparc/setjumph.inc
index 9b9a1b4a63..1cfc063a27 100644
--- a/rtl/sparc/setjumph.inc
+++ b/rtl/sparc/setjumph.inc
@@ -48,5 +48,5 @@ type
   end;
   Pjmp_buf=^jmp_buf;
 
-function setjmp(var S:jmp_buf):longint;
-procedure longjmp(var S:jmp_buf;value:longint);
+function setjmp(var S:jmp_buf):longint;[external name 'FPC_SETJMP'];
+procedure longjmp(var S:jmp_buf;value:longint);[external name 'FPC_LONGJMP'];
diff --git a/rtl/x86_64/setjump.inc b/rtl/x86_64/setjump.inc
index 129f084524..3c4b266009 100644
--- a/rtl/x86_64/setjump.inc
+++ b/rtl/x86_64/setjump.inc
@@ -14,7 +14,7 @@
 
  **********************************************************************}
 
-function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];nostackframe;
+function fpc_setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];nostackframe;compilerproc;
   asm
 {$ifdef win64}
     // Save registers.
@@ -48,7 +48,7 @@ function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJM
   end;
 
 
-procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP'];
+procedure fpc_longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP'];compilerproc;
   asm
 {$ifdef win64}
     // Restore registers.
diff --git a/rtl/x86_64/setjumph.inc b/rtl/x86_64/setjumph.inc
index 1a0ce9eb03..c653bc7b44 100644
--- a/rtl/x86_64/setjumph.inc
+++ b/rtl/x86_64/setjumph.inc
@@ -23,6 +23,6 @@ type
    end;
    pjmp_buf = ^jmp_buf;
 
-function setjmp(var S : jmp_buf) : longint;
-procedure longjmp(var S : jmp_buf;value : longint);
+function setjmp(var S : jmp_buf) : longint;[external name 'FPC_SETJMP'];
+procedure longjmp(var S : jmp_buf;value : longint);[external name 'FPC_LONGJMP'];