From eb09d6061c7c0099bf575d6712722a48fa0f9072 Mon Sep 17 00:00:00 2001 From: carl Date: Thu, 28 Mar 2002 20:46:44 +0000 Subject: [PATCH] - remove go32v1 support --- compiler/fmodule.pas | 8 ++++---- compiler/fppu.pas | 8 ++++---- compiler/i386/cputarg.pas | 8 ++++---- compiler/i386/ra386att.pas | 7 +++++-- compiler/msg/errord.msg | 1 - compiler/msg/errore.msg | 1 - compiler/msg/errores.msg | 1 - compiler/msg/errorf.msg | 1 - compiler/msg/errorn.msg | 1 - compiler/msg/errorr.msg | 1 - compiler/msg/errorrw.msg | 1 - compiler/msgidx.inc | 2 +- compiler/msgtxt.inc | 19 +++++++++---------- compiler/systems.pas | 11 +++++------ compiler/utils/ppudump.pp | 11 +++++++---- rtl/inc/objects.pp | 13 ++++--------- rtl/inc/os_types.pp | 10 ++++------ 17 files changed, 47 insertions(+), 57 deletions(-) diff --git a/compiler/fmodule.pas b/compiler/fmodule.pas index d3eb131bf5..dd764835d1 100644 --- a/compiler/fmodule.pas +++ b/compiler/fmodule.pas @@ -24,9 +24,6 @@ unit fmodule; {$i defines.inc} -{$ifdef go32v1} - {$define shortasmprefix} -{$endif} {$ifdef go32v2} {$define shortasmprefix} {$endif} @@ -587,7 +584,10 @@ uses end. { $Log$ - Revision 1.19 2001-11-06 14:53:48 jonas + Revision 1.20 2002-03-28 20:46:59 carl + - remove go32v1 support + + Revision 1.19 2001/11/06 14:53:48 jonas * compiles again with -dmemdebug Revision 1.18 2001/08/04 10:23:54 peter diff --git a/compiler/fppu.pas b/compiler/fppu.pas index 6059fcd7f5..1f1bd3e7ca 100644 --- a/compiler/fppu.pas +++ b/compiler/fppu.pas @@ -26,9 +26,6 @@ unit fppu; { close ppufiles on system that are short on file handles like DOS system PM } -{$ifdef GO32V1} - {$define SHORT_ON_FILE_HANDLES} -{$endif GO32V1} {$ifdef GO32V2} {$define SHORT_ON_FILE_HANDLES} {$endif GO32V2} @@ -1181,7 +1178,10 @@ uses end. { $Log$ - Revision 1.11 2002-01-19 14:20:13 peter + Revision 1.12 2002-03-28 20:46:44 carl + - remove go32v1 support + + Revision 1.11 2002/01/19 14:20:13 peter * check for -Un when loading ppu with wrong name Revision 1.10 2001/08/19 09:39:27 peter diff --git a/compiler/i386/cputarg.pas b/compiler/i386/cputarg.pas index 48cc4c830f..4388affdc5 100644 --- a/compiler/i386/cputarg.pas +++ b/compiler/i386/cputarg.pas @@ -54,9 +54,6 @@ implementation {$ifndef NOTARGETNETWARE} ,t_nwm {$endif} - {$ifndef NOTARGETGO32V1} - ,t_go32v1 - {$endif} {$ifndef NOTARGETGO32V2} ,t_go32v2 {$endif} @@ -85,7 +82,10 @@ implementation end. { $Log$ - Revision 1.2 2001-06-03 15:12:47 peter + Revision 1.3 2002-03-28 20:48:04 carl + - remove go32v1 support + + Revision 1.2 2001/06/03 15:12:47 peter * t_beos target inclusion Revision 1.1 2001/04/18 22:02:01 peter diff --git a/compiler/i386/ra386att.pas b/compiler/i386/ra386att.pas index df55241b4a..f93996d8ec 100644 --- a/compiler/i386/ra386att.pas +++ b/compiler/i386/ra386att.pas @@ -1994,7 +1994,7 @@ Begin Begin Consume(AS_ALIGN); l1:=BuildConstExpression(false,false); - if (target_info.target in [target_i386_GO32V1,target_i386_GO32V2]) then + if (target_info.target in [target_i386_GO32V2]) then begin l2:=1; if (l1>=0) and (l1<=16) then @@ -2135,7 +2135,10 @@ finalization end. { $Log$ - Revision 1.16 2002-01-24 18:25:53 peter + Revision 1.17 2002-03-28 20:48:25 carl + - remove go32v1 support + + Revision 1.16 2002/01/24 18:25:53 peter * implicit result variable generation for assembler routines * removed m_tp modeswitch, use m_tp7 or not(m_fpc) instead diff --git a/compiler/msg/errord.msg b/compiler/msg/errord.msg index 00f0c02734..883c98cd56 100644 --- a/compiler/msg/errord.msg +++ b/compiler/msg/errord.msg @@ -1815,7 +1815,6 @@ option_help_pages=11025_[ 3*3Op2_Optimierungen fr Pentium/PentiumMMX (R) 3*3Op3_Optimierungen fr PPro/PII/c6x86/K6 (R) 3*1T_Ziel-Betriebssystem -3*2TGO32V1_Version 1 von DJ Delorie's DOS extender () 3*2TGO32V2_Version 2 von DJ Delorie's DOS extender 3*2TLINUX_Linux 3*2TOS2_OS/2 2.x diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 09631cdbda..873d2cbb3c 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -1996,7 +1996,6 @@ option_help_pages=11025_[ 3*3Op2_set target processor to Pentium/PentiumMMX (tm) 3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm) 3*1T_Target operating system: -3*2TGO32V1_version 1 of DJ Delorie DOS extender 3*2TGO32V2_version 2 of DJ Delorie DOS extender 3*2TLINUX_Linux 3*2Tnetware_Novell Netware Module (experimental) diff --git a/compiler/msg/errores.msg b/compiler/msg/errores.msg index 847f5f91f4..dc4f7f4578 100644 --- a/compiler/msg/errores.msg +++ b/compiler/msg/errores.msg @@ -1868,7 +1868,6 @@ option_help_pages=11025_[ 3*3Op2_pone el procesador de destino en Pentium/PentiumMMX (tm) 3*3Op3_pone el procesador de destino en PPro/PII/c6x86/K6 (tm) 3*1T_Sistema operativo de destino -3*2TGO32V1_versi¢n 1 del extensor del DOS de DJ Delorie 3*2TGO32V2_versi¢n 2 del extensor del DOS de DJ Delorie 3*2TLINUX_Linux 3*2TOS2_OS/2 2.x diff --git a/compiler/msg/errorf.msg b/compiler/msg/errorf.msg index 65a7654ddc..a115a6afeb 100644 --- a/compiler/msg/errorf.msg +++ b/compiler/msg/errorf.msg @@ -1854,7 +1854,6 @@ option_help_pages=11025_[ 3*3Op2_d‚finit Pentium/PentiumMMX (tm) comme processeur cycle 3*3Op3_d‚finit PPro/PII/c6x86/K6 (tm) comme processeur cycle 3*1T_systŠme d'explioitation cible : -3*2TGO32V1_version 1 de l'extension DOS de DJ Delorie 3*2TGO32V2_version 2 de l'extension DOS de DJ Delorie 3*2TLINUX_Linux 3*2TOS2_OS/2 2.x diff --git a/compiler/msg/errorn.msg b/compiler/msg/errorn.msg index cfa77eef46..421eae7349 100644 --- a/compiler/msg/errorn.msg +++ b/compiler/msg/errorn.msg @@ -1895,7 +1895,6 @@ option_help_pages=11025_[ 3*3Op2_Stel doel processor in op Pentium/PentiumMMX (tm) 3*3Op3_Stel doel processor in op PPro/PII/c6x86/K6 (tm) 6*1T_Doel besturingssysteem: -3*2TGO32V1_version 1 of DJ Delorie DOS extender 3*2TGO32V2_version 2 of DJ Delorie DOS extender 3*2TLINUX_Linux 3*2TOS2_OS/2 2.x diff --git a/compiler/msg/errorr.msg b/compiler/msg/errorr.msg index a65a9a2b0d..6e31528198 100644 --- a/compiler/msg/errorr.msg +++ b/compiler/msg/errorr.msg @@ -1978,7 +1978,6 @@ option_help_pages=11025_[ 3*3Op2_¤«ï ¯à®æ¥áá®à Pentium/PentiumMMX (tm) 3*3Op3_¯à®æ¥áá®à Pentium PRO/Pentium II/Cyrix 6X86/AMD K6 (tm) 3*1T_⨯ ®¯¥à æ¨®­­ ï á¨á⥬ë, ¤«ï ª®â®p®© ¯p®¨á室¨â ª®¬¯¨«ïæ¨ï: -3*2TGO32V1_version 1 (DJ Delorie à áè¨à¨â¥«ì DOS) 3*2TGO32V2_version 2 (DJ Delorie à áè¨à¨â¥«ì DOS) 3*2TLINUX_Linux 3*2TOS2_OS/2 2.x diff --git a/compiler/msg/errorrw.msg b/compiler/msg/errorrw.msg index ef3cb110ac..7f628b6736 100644 --- a/compiler/msg/errorrw.msg +++ b/compiler/msg/errorrw.msg @@ -1978,7 +1978,6 @@ option_help_pages=11025_[ 3*3Op2_äëÿ ïðîöåññîð Pentium/PentiumMMX (tm) 3*3Op3_ïðîöåññîð Pentium PRO/Pentium II/Cyrix 6X86/AMD K6 (tm) 3*1T_òèï îïåðàöèîííàÿ ñèñòåìû, äëÿ êîòîpîé ïpîèñõîäèò êîìïèëÿöèÿ: -3*2TGO32V1_version 1 (DJ Delorie ðàñøèðèòåëü DOS) 3*2TGO32V2_version 2 (DJ Delorie ðàñøèðèòåëü DOS) 3*2TLINUX_Linux 3*2TOS2_OS/2 2.x diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 9b581422e5..b2a62eaf8e 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -604,7 +604,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 33812; + MsgTxtSize = 33764; MsgIdxMax : array[1..20] of longint=( 17,62,184,38,41,41,98,17,35,42, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 0bb9ae4609..0ca5a71e20 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -793,36 +793,35 @@ const msgtxt : array[0..000140,1..240] of char=( '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+ '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+ '3*1T_Target operating system:'#010+ - '3*2TGO32V1_version 1 of DJ Delorie DOS e','xtender'#010+ - '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+ + '3*2TGO32V2_version 2 of DJ Delorie DOS e','xtender'#010+ '3*2TLINUX_Linux'#010+ '3*2Tnetware_Novell Netware Module (experimental)'#010+ '3*2TOS2_OS/2 2.x'#010+ '3*2TSUNOS_SunOS/Solaris'#010+ '3*2TWin32_Windows 32 Bit'#010+ '3*1W_Win32 target options'#010+ - '3*2WB_Set Image base ','to Hexadecimal value'#010+ - '3*2WC_Specify console type application'#010+ + '3*2WB_Set Image base to Hexadecimal value'#010+ + '3*2WC_Specify console t','ype application'#010+ '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+ '3*2WF_Specify full-screen type application (OS/2 only)'#010+ '3*2WG_Specify graphic type application'#010+ - '3*2WN_Do not generate relocati','on code (necessary for debugging)'#010+ - '3*2WR_Generate relocation code'#010+ + '3*2WN_Do not generate relocation code (necessary for debugging)'#010+ + '3*2WR_Generate',' relocation code'#010+ '6*1A_output format'#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+ '6*1O_optimizations:'#010+ - '6*2Oa','_turn on the optimizer'#010+ - '6*2Og_generate smaller code'#010+ + '6*2Oa_turn on the optimizer'#010+ + '6*2Og_generate smaller co','de'#010+ '6*2OG_generate faster code (default)'#010+ '6*2Ox_optimize maximum (still BUGGY!!!)'#010+ '6*2O2_set target processor to a MC68020+'#010+ '6*1R_assembler reading style:'#010+ - '6*2RMOT_read motorola style assembler'#010, + '6*2RMOT_read motorola style assembler'#010+ '6*1T_Target operating system:'#010+ - '6*2TAMIGA_Commodore Amiga'#010+ + '6*2TAMIGA_Commo','dore Amiga'#010+ '6*2TATARI_Atari ST/STe/TT'#010+ '6*2TMACOS_Macintosh m68k'#010+ '6*2TLINUX_Linux-68k'#010+ diff --git a/compiler/systems.pas b/compiler/systems.pas index d7d3f80136..6a4f487bb8 100644 --- a/compiler/systems.pas +++ b/compiler/systems.pas @@ -83,7 +83,7 @@ interface ttarget = ( target_none, { 0 } - target_i386_GO32V1, { 1 } + obsolete_target_i386_GO32V1,{ 1 } target_i386_GO32V2, { 2 } target_i386_linux, { 3 } target_i386_OS2, { 4 } @@ -581,9 +581,6 @@ begin source_info.name:=''; { please note then we use cpu86 and cpu68 here on purpose !! } {$ifdef cpu86} - {$ifdef GO32V1} - set_source(target_i386_GO32V1); - {$else} {$ifdef GO32V2} set_source(target_i386_GO32V2); {$else} @@ -622,7 +619,6 @@ begin {$endif win32} {$endif os2} {$endif go32v2} - {$endif go32v1} {$endif cpu86} {$ifdef cpu68} {$ifdef AMIGA} @@ -682,7 +678,10 @@ finalization end. { $Log$ - Revision 1.34 2002-01-29 19:44:50 peter + Revision 1.35 2002-03-28 20:47:45 carl + - remove go32v1 support + + Revision 1.34 2002/01/29 19:44:50 peter * fixed updatealignment to not override settings with undefined values diff --git a/compiler/utils/ppudump.pp b/compiler/utils/ppudump.pp index bbbd14d564..fe34015cba 100644 --- a/compiler/utils/ppudump.pp +++ b/compiler/utils/ppudump.pp @@ -67,8 +67,8 @@ type { taken from systems.pas } ttarget = ( - target_none, { 0 } - target_i386_GO32V1, { 1 } + target_none, { 0 } + obsolete_target_i386_GO32V1,{ 1 } target_i386_GO32V2, { 2 } target_i386_linux, { 3 } target_i386_OS2, { 4 } @@ -92,7 +92,7 @@ type const Targets : array[ttarget] of string[12]=( { 0 } 'none', - { 1 } 'GO32V1', + { 1 } '', { 2 } 'GO32V2', { 3 } 'Linux-i386', { 4 } 'OS/2', @@ -1647,7 +1647,10 @@ begin end. { $Log$ - Revision 1.13 2002-03-28 16:44:59 armin + Revision 1.14 2002-03-28 20:48:52 carl + - remove go32v1 support + + Revision 1.13 2002/03/28 16:44:59 armin + new flag if unit has local threadvars Revision 1.12 2002/03/01 14:08:47 peter diff --git a/rtl/inc/objects.pp b/rtl/inc/objects.pp index 0fe3e0e198..e648b69183 100644 --- a/rtl/inc/objects.pp +++ b/rtl/inc/objects.pp @@ -149,14 +149,6 @@ TYPE {---------------------------------------------------------------------------} { OS dependent File type / consts } {---------------------------------------------------------------------------} -{$IFDEF GO32V1} -type - FNameStr = String[79]; - THandle = Integer; -const - MaxReadBytes = $fffe; - invalidhandle = -1; -{$ENDIF} {$IFDEF GO32V2} type FNameStr = String; @@ -2841,7 +2833,10 @@ END; END. { $Log$ - Revision 1.8 2001-07-31 19:36:09 peter + Revision 1.9 2002-03-28 20:56:00 carl + - remove go32v1 support + + Revision 1.8 2001/07/31 19:36:09 peter * wordrec for big endian Revision 1.7 2001/07/30 21:38:55 peter diff --git a/rtl/inc/os_types.pp b/rtl/inc/os_types.pp index 3efa9dc68e..f0b863bac4 100644 --- a/rtl/inc/os_types.pp +++ b/rtl/inc/os_types.pp @@ -13,11 +13,6 @@ INTERFACE TYPE // ordinal types -{$ifdef Go32v1} - tOS_INT = LongInt; - tOS_UINT = DWord; -{$define OS_TYPES} -{$endif} {$ifdef Go32v2} tOS_INT = LongInt; tOS_UINT = DWord; @@ -70,7 +65,10 @@ IMPLEMENTATION end. $Log$ - Revision 1.4 2002-03-16 12:46:09 armin + Revision 1.5 2002-03-28 20:57:41 carl + - remove go32v1 support + + Revision 1.4 2002/03/16 12:46:09 armin + Netware added Revision 1.3 2000/11/13 13:40:04 marco