From cd38c236a07e5f91b60f21a947d77a007b63686f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1roly=20Balogh?= Date: Sat, 7 Jan 2006 04:46:27 +0000 Subject: [PATCH] + made the compiler to know about PowerPC AmigaOS git-svn-id: trunk@2201 - --- compiler/msg/errore.msg | 3 ++- compiler/msgidx.inc | 2 +- compiler/msgtxt.inc | 29 +++++++++++++++-------------- compiler/powerpc/cputarg.pas | 3 +++ compiler/systems/i_amiga.pas | 4 ++-- compiler/systems/t_amiga.pas | 9 +++++++-- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 44bb70b68b..6c58df4b61 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2366,11 +2366,12 @@ S*2Aas_assemble using GNU AS 4*2Tlinux_Linux 6*2Tamiga_Commodore Amiga 6*2Tatari_Atari ST/STe/TT -6*2Tlinux_Linux-68k +6*2Tlinux_Linux/m68k 6*2Tmacos_Macintosh m68k (not supported) 6*2Tpalmos_PalmOS A*2Tlinux_Linux A*2Twince_Windows CE +P*2Tamiga_AmigaOS on PowerPC P*2Tdarwin_Darwin and MacOS X on PowerPC P*2Tlinux_Linux on PowerPC P*2Tmacos_MacOS (classic) on PowerPC diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 2249fdb606..951b6c24af 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -668,7 +668,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 39674; + MsgTxtSize = 39703; MsgIdxMax : array[1..20] of longint=( 19,74,219,59,61,47,100,20,135,60, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 98414035c8..11707f491f 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -910,55 +910,56 @@ const msgtxt : array[0..000165,1..240] of char=( '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ 'A*2Twince_Windows CE'#010+ - 'P*2Tdarw','in_Darwin and MacOS X on PowerPC'#010+ + 'P*2Tamig','a_AmigaOS on PowerPC'#010+ + 'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ 'P*2Tmacos_MacOS (classic) on PowerPC'#010+ 'P*2Tmorphos_MorphOS'#010+ 'S*2Tlinux_Linux'#010+ '**1u_undefines the symbol '#010+ '**1U_unit options:'#010+ - '**2Un_don'#039't check the unit name'#010+ - '**2Ur_generate release ','unit files'#010+ + '**2Un_don'#039't check the unit',' name'#010+ + '**2Ur_generate release unit files'#010+ '**2Us_compile a system unit'#010+ '**1v_Be verbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ - '**2*_w : Show warnings u : Show unit info'#010+ - '**2*_n :',' Show notes t : Show tried/used files'#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 mode', - #010+ + '**2*_l : Show linenumbers r :',' Rhide/GCC compatibility mod'+ + 'e'#010+ '**2*_a : Show everything x : Executable info (Win32 only)'#010+ '**2*_b : Write file names messages with full path'#010+ '**2*_v : write fpcdebug.txt with p : Write tree.log with parse tre'+ 'e'#010+ - '**2*_ lots of debugging info'#010+ - '3*1W_Win32-l','ike target options'#010+ + '**2*_ lots of d','ebugging info'#010+ + '3*1W_Win32-like target options'#010+ '3*2WB_Create a relocatable image'#010+ '3*2WB_Set Image base to Hexadecimal value'#010+ '3*2WC_Specify console type 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*2WF_Specify full-','screen type application (OS/2 only)'#010+ '3*2WG_Specify graphic type application'#010+ '3*2WN_Do not generate relocation code (necessary for debugging)'#010+ '3*2WR_Generate relocation code'#010+ 'P*2WC_Specify console type application (MacOS only)'#010+ - 'P*2WG_Specify graphic type application (MacOS o','nly)'#010+ + 'P*2WG_Specify grap','hic type application (MacOS only)'#010+ 'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+ '**1X_executable options:'#010+ '**2Xc_pass --shared to the linker (Unix only)'#010+ '**2Xd_don'#039't use standard library search path (needed for cross com'+ 'pile)'#010+ - '**2XD_try to link units dynamic ',' (defines FPC_LINK_DYNAMIC)'#010+ + '**2X','D_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+ '**2Xm_generate link map'#010+ '**2XM_set the name of the '#039'main'#039' program routine (default i'+ 's '#039'main'#039')'#010+ '**2XP_prepend the binutils names with the prefix '#010+ - '**2Xr_set library search path to (needed for c','ross compile)'#010+ + '**2Xr_set library sea','rch path to (needed for cross compile)'#010+ '**2Xs_strip all symbols from executable'#010+ '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+ '**2Xt_link with static libraries (-static is passed to linker)'#010+ - '**2XX_try to link units smart (defines FPC_LI','NK_SMART)'#010+ + '**2XX_try to link units sma','rt (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_shows this help'#010+ '**1h_shows this help without waiting'#000 diff --git a/compiler/powerpc/cputarg.pas b/compiler/powerpc/cputarg.pas index f3bc579da7..bb6b7b3464 100644 --- a/compiler/powerpc/cputarg.pas +++ b/compiler/powerpc/cputarg.pas @@ -47,6 +47,9 @@ implementation {$ifndef NOTARGETMORPHOS} ,t_morph {$endif} + {$ifndef NOTARGETAMIGA} + ,t_amiga + {$endif} {************************************** Assemblers diff --git a/compiler/systems/i_amiga.pas b/compiler/systems/i_amiga.pas index 139eff7cfd..ee58d229f5 100644 --- a/compiler/systems/i_amiga.pas +++ b/compiler/systems/i_amiga.pas @@ -94,7 +94,7 @@ unit i_amiga; ( system : system_powerpc_Amiga; name : 'AmigaOS for PowerPC'; - shortname : 'amigappc'; + shortname : 'amiga'; flags : []; cpu : cpu_powerpc; unit_env : ''; @@ -163,7 +163,7 @@ initialization {$endif CPU68} {$ifdef CPUPOWERPC} {$ifdef AMIGA} -// set_source_info(system_powerpc_Amiga_info); + set_source_info(system_powerpc_Amiga_info); {$endif AMIGA} {$endif CPUPOWERPC} end. diff --git a/compiler/systems/t_amiga.pas b/compiler/systems/t_amiga.pas index 95e9d340b9..5f605da7bb 100644 --- a/compiler/systems/t_amiga.pas +++ b/compiler/systems/t_amiga.pas @@ -1,7 +1,7 @@ { Copyright (c) 2001-2002 by Peter Vreman - This unit implements support import,export,link routines + This unit implements support import, export, link routines for the (m68k/powerpc) Amiga target This program is free software; you can redistribute it and/or modify @@ -39,5 +39,10 @@ implementation *****************************************************************************} initialization - RegisterTarget(system_m68k_amiga_info); +{$ifdef m68k} + RegisterTarget(system_m68k_Amiga_info); +{$endif m68k} +{$ifdef powerpc} + RegisterTarget(system_powerpc_Amiga_info); +{$endif powerpc} end.