summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-04-19 20:59:52 +0000
committerflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-04-19 20:59:52 +0000
commit2255f866a9ea0fa853a81d488d16f49011f48c31 (patch)
treeb1a4f5fdc2852d19cf407a78613c0e30d8bf65be
parent32794e2a57cdd16585506e52824ce0ca7252e962 (diff)
downloadfpc-2255f866a9ea0fa853a81d488d16f49011f48c31.tar.gz
+ initial support for arm-freertos largely based on patch by Michael Ring
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@44871 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat
-rw-r--r--compiler/aggas.pas2
-rw-r--r--compiler/arm/agarmgas.pas2
-rw-r--r--compiler/arm/cpuelf.pas2
-rw-r--r--compiler/arm/cpuinfo.pas10
-rw-r--r--compiler/arm/cputarg.pas4
-rw-r--r--compiler/options.pas7
-rw-r--r--compiler/systems.inc3
-rw-r--r--compiler/systems.pas2
-rw-r--r--compiler/systems/i_freertos.pas67
-rw-r--r--compiler/systems/t_embed.pas3
-rw-r--r--compiler/systems/t_freertos.pas526
-rw-r--r--compiler/utils/ppuutils/ppudump.pp3
-rw-r--r--rtl/freertos/Makefile.fpc6
-rw-r--r--utils/fpcm/fpcmake.inc920
-rw-r--r--utils/fpcm/fpcmake.ini7
-rw-r--r--utils/fpcm/fpcmmain.pp2
-rw-r--r--utils/fpcm/revision.inc2
17 files changed, 632 insertions, 936 deletions
diff --git a/compiler/aggas.pas b/compiler/aggas.pas
index bcf00ded31..637763cb57 100644
--- a/compiler/aggas.pas
+++ b/compiler/aggas.pas
@@ -199,7 +199,7 @@ implementation
(atype<>sec_toc) and
(atype<>sec_user) and
{ on embedded systems every byte counts, so smartlink bss too }
- ((atype<>sec_bss) or (target_info.system in systems_embedded));
+ ((atype<>sec_bss) or (target_info.system in (systems_embedded+systems_freertos)));
end;
function TGNUAssembler.sectionname(atype:TAsmSectiontype;const aname:string;aorder:TAsmSectionOrder):string;
diff --git a/compiler/arm/agarmgas.pas b/compiler/arm/agarmgas.pas
index a24f9365cf..e51b715f41 100644
--- a/compiler/arm/agarmgas.pas
+++ b/compiler/arm/agarmgas.pas
@@ -442,7 +442,7 @@ unit agarmgas;
asmbin : 'as';
asmcmd : '-o $OBJ $EXTRAOPT $ASM';
supported_targets : [system_arm_linux,system_arm_netbsd,system_arm_wince,system_arm_gba,system_arm_palmos,system_arm_nds,
- system_arm_embedded,system_arm_symbian,system_arm_android,system_arm_aros];
+ system_arm_embedded,system_arm_symbian,system_arm_android,system_arm_aros,system_arm_freertos];
flags : [af_needar,af_smartlink_sections];
labelprefix : '.L';
comment : '# ';
diff --git a/compiler/arm/cpuelf.pas b/compiler/arm/cpuelf.pas
index ad48f706e4..311b5144f0 100644
--- a/compiler/arm/cpuelf.pas
+++ b/compiler/arm/cpuelf.pas
@@ -974,7 +974,7 @@ implementation
supported_targets : [system_arm_embedded,system_arm_darwin,
system_arm_linux,system_arm_netbsd,
system_arm_gba,system_arm_nds,
- system_arm_aros];
+ system_arm_aros,system_arm_freertos];
flags : [af_outputbinary,af_smartlink_sections,af_supports_dwarf];
labelprefix : '.L';
comment : '';
diff --git a/compiler/arm/cpuinfo.pas b/compiler/arm/cpuinfo.pas
index 5f809a5ef9..3dee47ea97 100644
--- a/compiler/arm/cpuinfo.pas
+++ b/compiler/arm/cpuinfo.pas
@@ -347,6 +347,9 @@ Type
ct_stm32f756xe,
ct_stm32f756xg,
+ ct_stm32g071rb,
+ ct_nucleog071rb,
+
{ TI - Fury Class - 64 K Flash, 16 K SRAM Devices }
ct_lm3s1110,
ct_lm3s1133,
@@ -819,8 +822,8 @@ Const
(controllertypestr:'STM32F401RD'; controllerunitstr:'STM32F401XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00060000; srambase:$20000000; sramsize:$00018000),
(controllertypestr:'STM32F401VD'; controllerunitstr:'STM32F401XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00060000; srambase:$20000000; sramsize:$00018000),
(controllertypestr:'STM32F401CE'; controllerunitstr:'STM32F401XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00080000; srambase:$20000000; sramsize:$00018000),
- (controllertypestr:'STM32F401RE'; controllerunitstr:'STM32F401XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00080000; srambase:$20000000; sramsize:$00018000),
- (controllertypestr:'NUCLEOF401RE'; controllerunitstr:'STM32F401XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00080000; srambase:$20000000; sramsize:$00018000),
+ (controllertypestr:'STM32F401RE'; controllerunitstr:'STM32F401XE'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00080000; srambase:$20000000; sramsize:$00018000),
+ (controllertypestr:'NUCLEOF401RE'; controllerunitstr:'STM32F401XE'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00080000; srambase:$20000000; sramsize:$00018000),
(controllertypestr:'STM32F401VE'; controllerunitstr:'STM32F401XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00080000; srambase:$20000000; sramsize:$00018000),
(controllertypestr:'STM32F407VG'; controllerunitstr:'STM32F407XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00100000; srambase:$20000000; sramsize:$00020000),
(controllertypestr:'DISCOVERYF407VG'; controllerunitstr:'STM32F407XX'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00100000; srambase:$20000000; sramsize:$00020000),
@@ -870,6 +873,9 @@ Const
(controllertypestr:'STM32F756XE'; controllerunitstr:'STM32F756'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00080000; srambase:$20010000; sramsize:$00040000),
(controllertypestr:'STM32F756XG'; controllerunitstr:'STM32F756'; cputype:cpu_armv7em; fputype:fpu_soft; flashbase:$08000000; flashsize:$00100000; srambase:$20010000; sramsize:$00040000),
+ (controllertypestr:'STM32G071RB' ; controllerunitstr:'STM32G071XX' ; cputype:cpu_armv6m; fputype:fpu_soft; flashbase:$08000000; flashsize:$00020000; srambase:$20000000; sramsize:$00009000),
+ (controllertypestr:'NUCLEOG071RB' ; controllerunitstr:'STM32G071XX' ; cputype:cpu_armv6m; fputype:fpu_soft; flashbase:$08000000; flashsize:$00020000; srambase:$20000000; sramsize:$00009000),
+
(controllertypestr:'LM3S1110'; controllerunitstr:'LM3FURY'; cputype:cpu_armv7m; fputype:fpu_soft; flashbase:$00000000; flashsize:$00010000; srambase:$20000000; sramsize:$00004000),
(controllertypestr:'LM3S1133'; controllerunitstr:'LM3FURY'; cputype:cpu_armv7m; fputype:fpu_soft; flashbase:$00000000; flashsize:$00010000; srambase:$20000000; sramsize:$00004000),
(controllertypestr:'LM3S1138'; controllerunitstr:'LM3FURY'; cputype:cpu_armv7m; fputype:fpu_soft; flashbase:$00000000; flashsize:$00010000; srambase:$20000000; sramsize:$00004000),
diff --git a/compiler/arm/cputarg.pas b/compiler/arm/cputarg.pas
index 5d5e280729..5e3f3c31a6 100644
--- a/compiler/arm/cputarg.pas
+++ b/compiler/arm/cputarg.pas
@@ -68,6 +68,10 @@ implementation
{$ifndef NOTARGETAROS}
,t_aros
{$endif}
+ {$ifndef NOTARGETFREERTOS}
+ ,t_freertos
+ {$endif}
+
{**************************************
Assemblers
diff --git a/compiler/options.pas b/compiler/options.pas
index 70b178fbb7..2bc40937c1 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -3940,7 +3940,7 @@ begin
end;
{ Set up default value for the heap }
- if target_info.system in systems_embedded then
+ if target_info.system in (systems_embedded+systems_freertos) then
begin
case target_info.system of
{$ifdef AVR}
@@ -3950,6 +3950,11 @@ begin
else
heapsize:=128;
{$endif AVR}
+ system_arm_freertos:
+ heapsize:=8192;
+ system_xtensa_freertos:
+ { keep default value }
+ ;
system_arm_embedded:
heapsize:=256;
system_mipsel_embedded:
diff --git a/compiler/systems.inc b/compiler/systems.inc
index 1fed2fc62e..218b14078d 100644
--- a/compiler/systems.inc
+++ b/compiler/systems.inc
@@ -193,7 +193,8 @@
system_x86_64_haiku, { 102 }
system_xtensa_embedded, { 103 }
system_xtensa_freertos, { 104 }
- system_xtensa_linux { 105 }
+ system_xtensa_linux, { 105 }
+ system_arm_freertos { 106 }
);
type
diff --git a/compiler/systems.pas b/compiler/systems.pas
index cdd5b9a057..05042881ec 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -305,7 +305,7 @@ interface
system_xtensa_embedded];
{ all FreeRTOS systems }
- systems_freertos = [system_xtensa_freertos];
+ systems_freertos = [system_xtensa_freertos,system_arm_freertos];
{ all systems that allow section directive }
systems_allow_section = systems_embedded;
diff --git a/compiler/systems/i_freertos.pas b/compiler/systems/i_freertos.pas
index a36c696e29..6715da2ff8 100644
--- a/compiler/systems/i_freertos.pas
+++ b/compiler/systems/i_freertos.pas
@@ -718,6 +718,73 @@ unit i_freertos;
llvmdatalayout : 'e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32-S32';
);
+ system_arm_freertos_info : tsysteminfo =
+ (
+ system : system_arm_freertos;
+ name : 'FreeRTOS';
+ shortname : 'freertos';
+ flags : [tf_needs_symbol_size,tf_files_case_sensitive,tf_requires_proper_alignment,
+ tf_smartlink_sections,tf_init_final_units_by_calls];
+ cpu : cpu_arm;
+ unit_env : '';
+ extradefines : '';
+ exeext : '';
+ defext : '.def';
+ scriptext : '.sh';
+ smartext : '.sl';
+ unitext : '.ppu';
+ unitlibext : '.ppl';
+ asmext : '.s';
+ objext : '.o';
+ resext : '.res';
+ resobjext : '.or';
+ sharedlibext : '.so';
+ staticlibext : '.a';
+ staticlibprefix : 'libp';
+ sharedlibprefix : 'lib';
+ sharedClibext : '.so';
+ staticClibext : '.a';
+ staticClibprefix : 'lib';
+ sharedClibprefix : 'lib';
+ importlibprefix : 'libimp';
+ importlibext : '.a';
+ Cprefix : '';
+ newline : #10;
+ dirsep : '/';
+ assem : as_gas;
+ assemextern : as_gas;
+ link : ld_none;
+ linkextern : ld_freertos;
+ ar : ar_gnu_ar;
+ res : res_none;
+ dbg : dbg_dwarf2;
+ script : script_unix;
+ endian : endian_little;
+ alignment :
+ (
+ procalign : 4;
+ loopalign : 4;
+ jumpalign : 0;
+ jumpalignskipmax : 0;
+ coalescealign : 0;
+ coalescealignskipmax: 0;
+ constalignmin : 0;
+ constalignmax : 4;
+ varalignmin : 0;
+ varalignmax : 4;
+ localalignmin : 4;
+ localalignmax : 16;
+ recordalignmin : 0;
+ recordalignmax : 4;
+ maxCrecordalign : 4
+ );
+ first_parm_offset : 8;
+ stacksize : 65536;
+ stackalign : 16;
+ abi : abi_default;
+ llvmdatalayout : 'e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32-S32';
+ );
+
implementation
initialization
diff --git a/compiler/systems/t_embed.pas b/compiler/systems/t_embed.pas
index a4294f3d54..cdc2cc7167 100644
--- a/compiler/systems/t_embed.pas
+++ b/compiler/systems/t_embed.pas
@@ -471,6 +471,9 @@ begin
ct_stm32f756xe,
ct_stm32f756xg,
+ ct_stm32g071rb,
+ ct_nucleog071rb,
+
{ TI - 64 K Flash, 16 K SRAM Devices }
ct_lm3s1110,
ct_lm3s1133,
diff --git a/compiler/systems/t_freertos.pas b/compiler/systems/t_freertos.pas
index b453be6d2a..44d8d37ab2 100644
--- a/compiler/systems/t_freertos.pas
+++ b/compiler/systems/t_freertos.pas
@@ -222,479 +222,55 @@ begin
end;
{$ifdef ARM}
- case current_settings.controllertype of
- ct_none:
- begin
- end;
- ct_lpc810m021fn8,
- ct_lpc811m001fdh16,
- ct_lpc812m101fdh16,
- ct_lpc812m101fd20,
- ct_lpc812m101fdh20,
- ct_lpc1110fd20,
- ct_lpc1111fdh20_002,
- ct_lpc1111fhn33_101,
- ct_lpc1111fhn33_102,
- ct_lpc1111fhn33_103,
- ct_lpc1111fhn33_201,
- ct_lpc1111fhn33_202,
- ct_lpc1111fhn33_203,
- ct_lpc1112fd20_102,
- ct_lpc1112fdh20_102,
- ct_lpc1112fdh28_102,
- ct_lpc1112fhn33_101,
- ct_lpc1112fhn33_102,
- ct_lpc1112fhn33_103,
- ct_lpc1112fhn33_201,
- ct_lpc1112fhn24_202,
- ct_lpc1112fhn33_202,
- ct_lpc1112fhn33_203,
- ct_lpc1112fhi33_202,
- ct_lpc1112fhi33_203,
- ct_lpc1113fhn33_201,
- ct_lpc1113fhn33_202,
- ct_lpc1113fhn33_203,
- ct_lpc1113fhn33_301,
- ct_lpc1113fhn33_302,
- ct_lpc1113fhn33_303,
- ct_lpc1113bfd48_301,
- ct_lpc1113bfd48_302,
- ct_lpc1113bfd48_303,
- ct_lpc1114fdh28_102,
- ct_lpc1114fn28_102,
- ct_lpc1114fhn33_201,
- ct_lpc1114fhn33_202,
- ct_lpc1114fhn33_203,
- ct_lpc1114fhn33_301,
- ct_lpc1114fhn33_302,
- ct_lpc1114fhn33_303,
- ct_lpc1114fhn33_333,
- ct_lpc1114fhi33_302,
- ct_lpc1114fhi33_303,
- ct_lpc1114bfd48_301,
- ct_lpc1114bfd48_302,
- ct_lpc1114bfd48_303,
- ct_lpc1114bfd48_323,
- ct_lpc1114bfd48_333,
- ct_lpc1115bfd48_303,
- ct_lpc11c12fd48_301,
- ct_lpc11c14fd48_301,
- ct_lpc11c22fd48_301,
- ct_lpc11c24fd48_301,
- ct_lpc11d24fd48_301,
- ct_lpc1224fbd48_101,
- ct_lpc1224fbd48_121,
- ct_lpc1224fbd64_101,
- ct_lpc1224fbd64_121,
- ct_lpc1225fbd48_301,
- ct_lpc1225fbd48_321,
- ct_lpc1225fbd64_301,
- ct_lpc1225fbd64_321,
- ct_lpc1226fbd48_301,
- ct_lpc1226fbd64_301,
- ct_lpc1227fbd48_301,
- ct_lpc1227fbd64_301,
- ct_lpc12d27fbd100_301,
- ct_lpc1311fhn33,
- ct_lpc1311fhn33_01,
- ct_lpc1313fhn33,
- ct_lpc1313fhn33_01,
- ct_lpc1313fbd48,
- ct_lpc1313fbd48_01,
- ct_lpc1315fhn33,
- ct_lpc1315fbd48,
- ct_lpc1316fhn33,
- ct_lpc1316fbd48,
- ct_lpc1317fhn33,
- ct_lpc1317fbd48,
- ct_lpc1317fbd64,
- ct_lpc1342fhn33,
- ct_lpc1342fbd48,
- ct_lpc1343fhn33,
- ct_lpc1343fbd48,
- ct_lpc1345fhn33,
- ct_lpc1345fbd48,
- ct_lpc1346fhn33,
- ct_lpc1346fbd48,
- ct_lpc1347fhn33,
- ct_lpc1347fbd48,
- ct_lpc1347fbd64,
- ct_lpc2114,
- ct_lpc2124,
- ct_lpc2194,
- ct_lpc1768,
- ct_at91sam7s256,
- ct_at91sam7se256,
- ct_at91sam7x256,
- ct_at91sam7xc256,
-
- ct_stm32f030c6,
- ct_stm32f030c8,
- ct_stm32f030f4,
- ct_stm32f030k6,
- ct_stm32f030r8,
- ct_stm32f050c4,
- ct_stm32f050c6,
- ct_stm32f050f4,
- ct_stm32f050f6,
- ct_stm32f050g4,
- ct_stm32f050g6,
- ct_stm32f050k4,
- ct_stm32f050k6,
- ct_stm32f051c4,
- ct_stm32f051c6,
- ct_stm32f051c8,
- ct_stm32f051k4,
- ct_stm32f051k6,
- ct_stm32f051k8,
- ct_stm32f051r4,
- ct_stm32f051r6,
- ct_stm32f051r8,
-
- ct_stm32f091cc,
- ct_stm32f091cb,
- ct_stm32f091rc,
- ct_stm32f091rb,
- ct_stm32f091vc,
- ct_stm32f091vb,
-
- ct_stm32f100x4,
- ct_stm32f100x6,
- ct_stm32f100x8,
- ct_stm32f100xB,
- ct_stm32f100xC,
- ct_stm32f100xD,
- ct_stm32f100xE,
- ct_stm32f101x4,
- ct_stm32f101x6,
- ct_stm32f101x8,
- ct_stm32f101xB,
- ct_stm32f101xC,
- ct_stm32f101xD,
- ct_stm32f101xE,
- ct_stm32f101xF,
- ct_stm32f101xG,
- ct_stm32f102x4,
- ct_stm32f102x6,
- ct_stm32f102x8,
- ct_stm32f102xB,
- ct_stm32f103x4,
- ct_stm32f103x6,
- ct_stm32f103x8,
- ct_stm32f103xB,
- ct_stm32f103xC,
- ct_stm32f103xD,
- ct_stm32f103xE,
- ct_stm32f103xF,
- ct_stm32f103xG,
- ct_stm32f107x8,
- ct_stm32f107xB,
- ct_stm32f107xC,
- ct_stm32f105r8,
- ct_stm32f105rb,
- ct_stm32f105rc,
- ct_stm32f105v8,
- ct_stm32f105vb,
- ct_stm32f105vc,
- ct_stm32f107rb,
- ct_stm32f107rc,
- ct_stm32f107vb,
- ct_stm32f107vc,
-
- ct_stm32f401cb,
- ct_stm32f401rb,
- ct_stm32f401vb,
- ct_stm32f401cc,
- ct_stm32f401rc,
- ct_stm32f401vc,
- ct_discoveryf401vc,
- ct_stm32f401cd,
- ct_stm32f401rd,
- ct_stm32f401vd,
- ct_stm32f401ce,
- ct_stm32f401re,
- ct_nucleof401re,
- ct_stm32f401ve,
- ct_stm32f407vg,
- ct_discoveryf407vg,
- ct_stm32f407ig,
- ct_stm32f407zg,
- ct_stm32f407ve,
- ct_stm32f407ze,
- ct_stm32f407ie,
- ct_stm32f411cc,
- ct_stm32f411rc,
- ct_stm32f411vc,
- ct_stm32f411ce,
- ct_stm32f411re,
- ct_nucleof411re,
- ct_stm32f411ve,
- ct_discoveryf411ve,
- ct_stm32f429vg,
- ct_stm32f429zg,
- ct_stm32f429ig,
- ct_stm32f429vi,
- ct_stm32f429zi,
- ct_discoveryf429zi,
- ct_stm32f429ii,
- ct_stm32f429ve,
- ct_stm32f429ze,
- ct_stm32f429ie,
- ct_stm32f429bg,
- ct_stm32f429bi,
- ct_stm32f429be,
- ct_stm32f429ng,
- ct_stm32f429ni,
- ct_stm32f429ne,
- ct_stm32f446mc,
- ct_stm32f446rc,
- ct_stm32f446vc,
- ct_stm32f446zc,
- ct_stm32f446me,
- ct_stm32f446re,
- ct_nucleof446re,
- ct_stm32f446ve,
- ct_stm32f446ze,
-
- ct_stm32f745xe,
- ct_stm32f745xg,
- ct_stm32f746xe,
- ct_stm32f746xg,
- ct_stm32f756xe,
- ct_stm32f756xg,
-
- { TI - 64 K Flash, 16 K SRAM Devices }
- ct_lm3s1110,
- ct_lm3s1133,
- ct_lm3s1138,
- ct_lm3s1150,
- ct_lm3s1162,
- ct_lm3s1165,
- ct_lm3s1166,
- ct_lm3s2110,
- ct_lm3s2139,
- ct_lm3s6100,
- ct_lm3s6110,
-
- { TI 128 K Flash, 32 K SRAM devices - Fury Class }
- ct_lm3s1601,
- ct_lm3s1608,
- ct_lm3s1620,
- ct_lm3s1635,
- ct_lm3s1636,
- ct_lm3s1637,
- ct_lm3s1651,
- ct_lm3s2601,
- ct_lm3s2608,
- ct_lm3s2620,
- ct_lm3s2637,
- ct_lm3s2651,
- ct_lm3s6610,
- ct_lm3s6611,
- ct_lm3s6618,
- ct_lm3s6633,
- ct_lm3s6637,
- ct_lm3s8630,
-
- { TI 256 K Flase, 32 K SRAM devices - Fury Class }
- ct_lm3s1911,
- ct_lm3s1918,
- ct_lm3s1937,
- ct_lm3s1958,
- ct_lm3s1960,
- ct_lm3s1968,
- ct_lm3s1969,
- ct_lm3s2911,
- ct_lm3s2918,
- ct_lm3s2919,
- ct_lm3s2939,
- ct_lm3s2948,
- ct_lm3s2950,
- ct_lm3s2965,
- ct_lm3s6911,
- ct_lm3s6918,
- ct_lm3s6938,
- ct_lm3s6950,
- ct_lm3s6952,
- ct_lm3s6965,
- ct_lm3s8930,
- ct_lm3s8933,
- ct_lm3s8938,
- ct_lm3s8962,
- ct_lm3s8970,
- ct_lm3s8971,
-
- { TI - Tempest Tempest - 256 K Flash, 64 K SRAM }
- ct_lm3s5951,
- ct_lm3s5956,
- ct_lm3s1b21,
- ct_lm3s2b93,
- ct_lm3s5b91,
- ct_lm3s9b81,
- ct_lm3s9b90,
- ct_lm3s9b92,
- ct_lm3s9b95,
- ct_lm3s9b96,
-
- ct_lm3s5d51,
-
- { TI - Stellaris something }
- ct_lm4f120h5,
-
- { Infineon }
- ct_xmc4500x1024,
- ct_xmc4500x768,
- ct_xmc4502x768,
- ct_xmc4504x512,
-
- { Allwinner }
- ct_allwinner_a20,
-
- { Freescale }
- ct_mk20dx128vfm5,
- ct_mk20dx128vft5,
- ct_mk20dx128vlf5,
- ct_mk20dx128vlh5,
- ct_teensy30,
- ct_mk20dx128vmp5,
-
- ct_mk20dx32vfm5,
- ct_mk20dx32vft5,
- ct_mk20dx32vlf5,
- ct_mk20dx32vlh5,
- ct_mk20dx32vmp5,
-
- ct_mk20dx64vfm5,
- ct_mk20dx64vft5,
- ct_mk20dx64vlf5,
- ct_mk20dx64vlh5,
- ct_mk20dx64vmp5,
-
- ct_mk20dx128vlh7,
- ct_mk20dx128vlk7,
- ct_mk20dx128vll7,
- ct_mk20dx128vmc7,
-
- ct_mk20dx256vlh7,
- ct_mk20dx256vlk7,
- ct_mk20dx256vll7,
- ct_mk20dx256vmc7,
- ct_teensy31,
- ct_teensy32,
-
- ct_mk20dx64vlh7,
- ct_mk20dx64vlk7,
- ct_mk20dx64vmc7,
-
- ct_mk22fn512cap12,
- ct_mk22fn512cbp12,
- ct_mk22fn512vdc12,
- ct_mk22fn512vlh12,
- ct_mk22fn512vll12,
- ct_mk22fn512vmp12,
- ct_freedom_k22f,
-
- { Atmel }
- ct_sam3x8e,
- ct_arduino_due,
- ct_flip_n_click,
-
- { Nordic Semiconductor }
- ct_nrf51422_xxaa,
- ct_nrf51422_xxab,
- ct_nrf51422_xxac,
- ct_nrf51822_xxaa,
- ct_nrf51822_xxab,
- ct_nrf51822_xxac,
- ct_nrf52832_xxaa,
- ct_nrf52840_xxaa,
-
- ct_sc32442b,
-
- { Raspberry Pi 2 }
- ct_raspi2,
-
- ct_thumb2bare:
- begin
- with embedded_controllers[current_settings.controllertype] do
- with linkres do
- begin
- if (embedded_controllers[current_settings.controllertype].controllerunitstr='MK20D5')
- or (embedded_controllers[current_settings.controllertype].controllerunitstr='MK20D7')
- or (embedded_controllers[current_settings.controllertype].controllerunitstr='MK22F51212')
- or (embedded_controllers[current_settings.controllertype].controllerunitstr='MK64F12') then
- Add('ENTRY(_LOWLEVELSTART)')
- else
- Add('ENTRY(_START)');
- Add('MEMORY');
- Add('{');
- if flashsize<>0 then
- begin
- LinkStr := ' flash : ORIGIN = 0x' + IntToHex(flashbase,8)
- + ', LENGTH = 0x' + IntToHex(flashsize,8);
- Add(LinkStr);
- end;
-
- LinkStr := ' ram : ORIGIN = 0x' + IntToHex(srambase,8)
- + ', LENGTH = 0x' + IntToHex(sramsize,8);
- Add(LinkStr);
-
- Add('}');
- Add('_stack_top = 0x' + IntToHex(sramsize+srambase,8) + ';');
-
- // Add Checksum Calculation for LPC Controllers so that the bootloader starts the uploaded binary
- writeln(controllerunitstr);
- if (controllerunitstr = 'LPC8xx') or (controllerunitstr = 'LPC11XX') or (controllerunitstr = 'LPC122X') then
- Add('Startup_Checksum = 0 - (_stack_top + _START + 1 + NonMaskableInt_interrupt + 1 + Hardfault_interrupt + 1);');
- if (controllerunitstr = 'LPC13XX') then
- Add('Startup_Checksum = 0 - (_stack_top + _START + 1 + NonMaskableInt_interrupt + 1 + MemoryManagement_interrupt + 1 + BusFault_interrupt + 1 + UsageFault_interrupt + 1);');
- end;
- end
- else
- if not (cs_link_nolink in current_settings.globalswitches) then
- internalerror(200902011);
- end;
+ with embedded_controllers[current_settings.controllertype] do
+ with linkres do
+ begin
+ Add('ENTRY(_START)');
+ Add('MEMORY');
+ Add('{');
+ if flashsize<>0 then
+ begin
+ LinkStr := ' flash : ORIGIN = 0x' + IntToHex(flashbase,8)
+ + ', LENGTH = 0x' + IntToHex(flashsize,8);
+ Add(LinkStr);
+ end;
- with linkres do
- begin
- Add('SECTIONS');
- Add('{');
- Add(' .text :');
- Add(' {');
- Add(' _text_start = .;');
- Add(' KEEP(*(.init .init.*))');
- if (embedded_controllers[current_settings.controllertype].controllerunitstr='MK20D5')
- or (embedded_controllers[current_settings.controllertype].controllerunitstr='MK20D7')
- or (embedded_controllers[current_settings.controllertype].controllerunitstr='MK22F51212')
- or (embedded_controllers[current_settings.controllertype].controllerunitstr='MK64F12') then
- begin
- Add(' . = 0x400;');
- Add(' KEEP(*(.flash_config *.flash_config.*))');
- end;
- Add(' *(.text .text.*)');
- Add(' *(.strings)');
- Add(' *(.rodata .rodata.*)');
- Add(' *(.comment)');
- Add(' . = ALIGN(4);');
- Add(' _etext = .;');
- if embedded_controllers[current_settings.controllertype].flashsize<>0 then
- begin
- Add(' } >flash');
- Add(' .note.gnu.build-id : { *(.note.gnu.build-id) } >flash ');
- end
- else
- begin
- Add(' } >ram');
- Add(' .note.gnu.build-id : { *(.note.gnu.build-id) } >ram ');
- end;
+ LinkStr := ' ram : ORIGIN = 0x' + IntToHex(srambase,8)
+ + ', LENGTH = 0x' + IntToHex(sramsize,8);
+ Add(LinkStr);
+
+ Add('}');
+ Add('_stack_top = 0x' + IntToHex(sramsize+srambase,8) + ';');
+ Add('SECTIONS');
+ Add('{');
+ Add(' .text :');
+ Add(' {');
+ Add(' _text_start = .;');
+ Add(' KEEP(*(.init .init.*))');
+ Add(' *(.text .text.*)');
+ Add(' *(.strings)');
+ Add(' *(.rodata .rodata.*)');
+ Add(' *(.comment)');
+ Add(' . = ALIGN(4);');
+ Add(' _etext = .;');
+ if flashsize<>0 then
+ begin
+ Add(' } >flash');
+ Add(' .note.gnu.build-id : { *(.note.gnu.build-id) } >flash ');
+ end
+ else
+ begin
+ Add(' } >ram');
+ Add(' .note.gnu.build-id : { *(.note.gnu.build-id) } >ram ');
+ end;
- Add(' .data :');
- Add(' {');
- Add(' _data = .;');
- Add(' *(.data .data.*)');
- Add(' KEEP (*(.fpc .fpc.n_version .fpc.n_links))');
- Add(' _edata = .;');
- if embedded_controllers[current_settings.controllertype].flashsize<>0 then
+ Add(' .data :');
+ Add(' {');
+ Add(' _data = .;');
+ Add(' *(.data .data.*)');
+ Add(' KEEP (*(.fpc .fpc.n_version .fpc.n_links))');
+ Add(' _edata = .;');
+ if flashsize<>0 then
begin
Add(' } >ram AT >flash');
end
@@ -708,8 +284,8 @@ begin
Add(' *(.bss .bss.*)');
Add(' *(COMMON)');
Add(' } >ram');
- Add('. = ALIGN(4);');
- Add('_bss_end = . ;');
+ Add(' . = ALIGN(4);');
+ Add(' _bss_end = . ;');
Add('}');
Add('_end = .;');
end;
@@ -1804,8 +1380,8 @@ function TlinkerFreeRTOS.postprocessexecutable(const fn : string;isdll:boolean):
initialization
{$ifdef arm}
- RegisterLinker(ld_freertos,TLinkerEmbedded);
- RegisterTarget(system_arm_embedded_info);
+ RegisterLinker(ld_freertos,TlinkerFreeRTOS);
+ RegisterTarget(system_arm_freertos_info);
{$endif arm}
{$ifdef avr}
diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp
index c401880c2d..dba3c613f1 100644
--- a/compiler/utils/ppuutils/ppudump.pp
+++ b/compiler/utils/ppuutils/ppudump.pp
@@ -223,7 +223,8 @@ const
{ 102 } 'Haiku-x86-64',
{ 103 } 'Embedded-Xtensa',
{ 104 } 'FreeRTos-Xtensa',
- { 105 } 'Linux-Xtensa'
+ { 105 } 'Linux-Xtensa',
+ { 106 } 'FreeRTos-arm'
);
const
diff --git a/rtl/freertos/Makefile.fpc b/rtl/freertos/Makefile.fpc
index 41d1f350f8..704f0ec702 100644
--- a/rtl/freertos/Makefile.fpc
+++ b/rtl/freertos/Makefile.fpc
@@ -73,11 +73,11 @@ CPU_SPECIFIC_COMMON_UNITS=
ifeq ($(ARCH),arm)
CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo
ifeq ($(SUBARCH),armv7m)
-CPU_UNITS=lm3fury lm3tempest stm32f10x_ld stm32f10x_md stm32f10x_hd stm32f10x_xl stm32f10x_conn stm32f10x_cl lpc13xx lpc1768 lm4f120 sam3x8e xmc4500 cortexm3 cortexm4 # thumb2_bare
+CPU_UNITS=stm32f103xe cortexm3 cortexm4 # thumb2_bare
CPU_UNITS_DEFINED=1
endif
ifeq ($(SUBARCH),armv7em)
-CPU_UNITS=lm4f120 xmc4500 mk20d5 mk20d7 mk22f51212 mk64f12 stm32f401xx stm32f407xx stm32f411xe stm32f429xx stm32f446xx stm32f745 stm32f746 stm32f756 nrf52 cortexm3 cortexm4 cortexm7 # thumb2_bare
+CPU_UNITS=stm32f401xe cortexm3 cortexm4 cortexm7 # thumb2_bare
CPU_UNITS_DEFINED=1
endif
ifeq ($(SUBARCH),armv4t)
@@ -89,7 +89,7 @@ CPU_UNITS=lpc21x4 at91sam7x256 sc32442b
CPU_UNITS_DEFINED=1
endif
ifeq ($(SUBARCH),armv6m)
-CPU_UNITS=lpc8xx lpc11xx lpc122x stm32f0xx nrf51 cortexm0
+CPU_UNITS=stm32g071xx cortexm0
CPU_UNITS_DEFINED=1
endif
ifeq ($(SUBARCH),armv7a)
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index c28dfdf857..a3ea57d3fb 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1,7 +1,7 @@
{$ifdef Delphi}
-const fpcmakeini : array[0..246] of string[240]=(
+const fpcmakeini : array[0..248] of string[240]=(
{$else Delphi}
-const fpcmakeini : array[0..246,1..240] of char=(
+const fpcmakeini : array[0..248,1..240] of char=(
{$endif Delphi}
';'#010+
'; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
@@ -317,13 +317,29 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override FPCOPT+=-Cp$(SUBARCH)'#010+
'endif'#010+
#010+
+ 'ifeq ($(FULL_TARGET),xtensa-freertos)'#010+
+ 'ifeq ($(SUBARCH),)'#010+
+ '$(error When compiling for xtensa-freertos, a sub-architecture (e.g. S'+
+ 'UBARCH=lx106 or SUBARCH=lx6) must be defined)'#010+
+ 'endif'#010+
+ 'overr','ide FPCOPT+=-Cp$(SUBARCH)'#010+
+ 'endif'#010+
+ #010+
+ 'ifeq ($(FULL_TARGET),arm-freertos)'#010+
+ 'ifeq ($(SUBARCH),)'#010+
+ '$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBA'+
+ 'RCH=armv6m or SUBARCH=armv7em) must be defined)'#010+
+ 'endif'#010+
+ 'override FPCOPT+=-Cp$(SUBARCH',')'#010+
+ 'endif'#010+
+ #010+
'# Full name of the target, including CPU and OS. For OSs limited'#010+
'# to 8.3 we only use the target OS'#010+
'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+
'TARGETSUFFIX=$(OS_TARGET)'#010+
- 'SOURCESUF','FIX=$(OS_SOURCE)'#010+
+ 'SOURCESUFFIX=$(OS_SOURCE)'#010+
'else'#010+
- 'ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)'#010+
+ 'ifneq ($(findstring $(OS_','TARGET),$(LIMIT83fs)),)'#010+
'TARGETSUFFIX=$(OS_TARGET)'#010+
'else'#010+
'TARGETSUFFIX=$(FULL_TARGET)'#010+
@@ -333,15 +349,15 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Cross compile flag'#010+
'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#010+
- 'CROSSCOMPI','LE=1'#010+
+ 'CROSSCOMPILE=1'#010+
'endif'#010+
#010+
- '# Check if the Makefile supports this target, but not'#010+
+ '# Check if the Makefile supports th','is target, but not'#010+
'# when the make target is to rebuild the makefile'#010+
'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+
'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#010+
- '$(error The Makefile ','doesn'#039't support target $(FULL_TARGET), plea'+
- 'se run fpcmake first)'#010+
+ '$(error The Makefile doesn'#039't support target $(FULL_TARGET), please'+
+ ' r','un fpcmake first)'#010+
'endif'#010+
'endif'#010+
#010+
@@ -352,8 +368,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'BSDhier=1'#010+
'endif'#010+
#010+
- '# Detect Linux, will also use',' its own directory hierarchy.'#010+
- 'ifeq ($(OS_TARGET),linux)'#010+
+ '# Detect Linux, will also use its own directory hierarchy.'#010+
+ 'ifeq ($(OS_TARGET','),linux)'#010+
'linuxHier=1'#010+
'endif'#010+
#010+
@@ -367,53 +383,52 @@ const fpcmakeini : array[0..246,1..240] of char=(
'export BUILDNATIVE'#010+
'endif'#010+
#010+
- 'export OS_TARGET OS_SOURCE ARCH CPU','_TARGET CPU_SOURCE FULL_TARGET FU'+
- 'LL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+
+ 'export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL'+
+ '_SOURCE TARG','ETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+
#010+
'[fpmakefpcdetect]'#010+
'#####################################################################'#010+
'# FPC Binary and Version Detection'#010+
- '##################################','##################################'+
- '#'#010+
- '# If FPCFPMAKE is not set and we'#039're cross-compiling, try to find a'+
- #010+
+ '#####################################################################'#010+
+ '# If FPCFPM','AKE is not set and we'#039're cross-compiling, try to find'+
+ ' a'#010+
'# native compiler.'#010+
'ifndef FPCFPMAKE'#010+
#010+
'ifdef CROSSCOMPILE'#010+
'# Search for the (native) ppc compiler which is used to do the latest '+
'build'#010+
- '# of ','the native rtl'#010+
+ '# of the native rtl'#010+
#010+
- 'ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDI'+
- 'R)))),)'#010+
+ 'ifeq ($(strip $(wildcard $(adds','uffix /compiler/ppc$(SRCEXEEXT),$(FPC'+
+ 'DIR)))),)'#010+
'# If that compiler is not found, use the common, installed native comp'+
'iler'#010+
'# Note that in this case FPCFPMAKE is not exported, because it could b'+
- 'e',' that'#010+
- '# a more suitable compiler is compiled later on'#010+
+ 'e that'#010+
+ '# a more suitable compiler is compiled la','ter on'#010+
'# check if fpc exists'#010+
'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+
')))'#010+
'ifneq ($(FPCPROG),)'#010+
'FPCPROG:=$(firstword $(FPCPROG))'#010+
'FPCFPMAKE:=$(shell $(FPCPROG) -PB)'#010+
- '# ','if a native compiler is not found, fall back to fpc'#010+
+ '# if a native compiler is not found, fall back to',' fpc'#010+
'ifeq ($(strip $(wildcard $(FPCFPMAKE))),)'#010+
'FPCFPMAKE:=$(firstword $(FPCPROG))'#010+
'endif'#010+
'else'#010+
'# fpc binary not found, fallback to ppc386'#010+
- 'override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsu','ffix /ppc38'+
- '6$(SRCEXEEXT),$(SEARCHPATH)))))'#010+
- 'endif'#010+
+ 'override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$'+
+ '(SRCEXEEXT),$(SEARCHPATH)))))'#010+
+ 'endi','f'#010+
'else'#010+
'# Use the ppc compiler. Because the path to the compiler is relative, '+
'do not'#010+
'# evaluate the variable here, but do that on the fly.'#010+
- 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$','(SRCEXEEXT),$'+
- '(FPCDIR))))'#010+
- 'FPMAKE_SKIP_CONFIG=-n'#010+
+ 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(F'+
+ 'PCDIR))))'#010+
+ 'FPMAKE_SKIP_CONFIG=-n'#010,
'export FPCFPMAKE'#010+
'export FPMAKE_SKIP_CONFIG'#010+
'endif'#010+
@@ -427,19 +442,19 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[fpcdircheckenv]'#010+
- '###################################################################','#'+
- '#'#010+
- '# FPCDIR Setting'#010+
'#####################################################################'#010+
+ '# FPCDIR Setting'#010+
+ '###########################','#########################################'+
+ '#'#010+
#010+
'# Test FPCDIR to look if the RTL dir exists'#010+
'ifdef FPCDIR'#010+
'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+
'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+
- 'over','ride FPCDIR=wrong'#010+
+ 'override FPCDIR=wrong'#010+
'endif'#010+
'else'#010+
- 'override FPCDIR=wrong'#010+
+ 'override FPCDIR=wr','ong'#010+
'endif'#010+
#010+
'# Default FPCDIR from Makefile.fpc'#010+
@@ -447,12 +462,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifeq ($(FPCDIR),wrong)'#010+
'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+
'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+
- 'overrid','e FPCDIR=wrong'#010+
+ 'override FPCDIR=wrong'#010+
'endif'#010+
'endif'#010+
'endif'#010+
#010+
- '[fpcdirdetect]'#010+
+ '[fpcdirdetect',']'#010+
'# Detect FPCDIR'#010+
'ifeq ($(FPCDIR),wrong)'#010+
'ifdef inUnix'#010+
@@ -460,14 +475,14 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+
'endif'#010+
- 'els','e'#010+
- 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+
- 'suffix /$(FPC),$(SEARCHPATH))))))'#010+
+ 'else'#010+
+ 'override FPCDIR:=$(subst /$(FPC),,$(firstword',' $(strip $(wildcard $(a'+
+ 'ddsuffix /$(FPC),$(SEARCHPATH))))))'#010+
'override FPCDIR:=$(FPCDIR)/..'#010+
'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+
'override FPCDIR:=$(FPCDIR)/..'#010+
- 'ifeq ($(wildcard $(addpref','ix $(FPCDIR)/,rtl)),)'#010+
- 'override FPCDIR:=$(BASEDIR)'#010+
+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+
+ 'override FPCDIR:=$(BASEDI','R)'#010+
'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+
'override FPCDIR=c:/pp'#010+
'endif'#010+
@@ -478,10 +493,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Cross binaries dir'#010+
'ifndef CROSSBINDIR'#010+
- 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUF','FIX))'#010+
+ 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+
'endif'#010+
#010+
- '# Default binutils prefix for cross compile when the'#010+
+ '# Default binutils prefix for cros','s compile when the'#010+
'# crossbindir is not set (except for Darwin)'#010+
'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+
'ifeq ($(OS_SOURCE),darwin)'#010+
@@ -489,18 +504,18 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- 'ifndef BINUTILSPREFI','X'#010+
+ 'ifndef BINUTILSPREFIX'#010+
'ifndef CROSSBINDIR'#010+
'ifdef CROSSCOMPILE'#010+
- 'ifneq ($(OS_TARGET),msdos)'#010+
+ 'ifneq (','$(OS_TARGET),msdos)'#010+
'ifndef DARWIN2DARWIN'#010+
'ifneq ($(CPU_TARGET),jvm)'#010+
'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+
#010+
'# For Android use standard NDK prefixes'#010+
'ifeq ($(OS_TARGET),android)'#010+
- 'ifeq ($(CPU_TA','RGET),arm)'#010+
- 'BINUTILSPREFIX=arm-linux-androideabi-'#010+
+ 'ifeq ($(CPU_TARGET),arm)'#010+
+ 'BINUTILSPREFIX=arm-linux-androideabi','-'#010+
'else'#010+
'ifeq ($(CPU_TARGET),i386)'#010+
'BINUTILSPREFIX=i686-linux-android-'#010+
@@ -515,19 +530,19 @@ const fpcmakeini : array[0..246,1..240] of char=(
'else'#010+
'BINUTILSPREFIX=$(OS_TARGET)-'#010+
'endif'#010+
- 'endif',#010+
+ 'endif'#010+
'endif'#010+
'endif'#010+
#010+
- '# Try first the full target name, otherwise try only'#010+
+ '# Try first the full target name,',' otherwise try only'#010+
'# the OS for backwards compatibility'#010+
'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+
'ifeq ($(UNITSDIR),)'#010+
'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+
'endif'#010+
#010+
- '# Pa','ckages dir'#010+
- 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)'#010+
+ '# Packages dir'#010+
+ 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(','FPCDIR)/packages)'#010+
#010+
#010+
'[shelltools]'#010+
@@ -535,7 +550,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Shell tools'#010+
'#####################################################################'#010+
#010+
- '# Ech','o that can redir (must be able run in the default OS shell)'#010+
+ '# Echo that can redir (must be able run in the defau','lt OS shell)'#010+
'ifndef ECHOREDIR'#010+
'ifndef inUnix'#010+
'ECHOREDIR=echo'#010+
@@ -551,10 +566,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Copy a whole tree'#010+
'ifndef COPYTREE'#010+
- 'COPYT','REE:=$(CPPROG) -Rfp'#010+
+ 'COPYTREE:=$(CPPROG) -Rfp'#010+
'endif'#010+
#010+
- '# Copy a whole tree'#010+
+ '# Copy a whole tree'#010,
'ifndef MKDIRTREE'#010+
'MKDIRTREE:=$(MKDIRPROG) -p'#010+
'endif'#010+
@@ -570,11 +585,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# Check deltree program'#010+
- 'ifn','def DELTREE'#010+
+ 'ifndef DELTREE'#010+
'DELTREE:=$(RMPROG) -rf'#010+
'endif'#010+
#010+
- '# To install files'#010+
+ '# To ','install files'#010+
'ifndef INSTALL'#010+
'ifdef inUnix'#010+
'INSTALL:=$(GINSTALL) -c -m 644'#010+
@@ -586,13 +601,13 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# To install programs'#010+
'ifndef INSTALLEXE'#010+
'ifdef inUnix'#010+
- 'INSTALLEXE:=$(GINSTALL) -c -m 75','5'#010+
+ 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+
'else'#010+
'INSTALLEXE:=$(COPY)'#010+
'endif'#010+
'endif'#010+
#010+
- '# To make a directory.'#010+
+ '# To ma','ke a directory.'#010+
'ifndef MKDIR'#010+
'MKDIR:=$(GINSTALL) -m 755 -d'#010+
'endif'#010+
@@ -602,9 +617,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[defaultdirs]'#010+
- '#######################################','#############################'+
- '#'#010+
- '# Default Directories'#010+
+ '#####################################################################'#010+
+ '# Default Direct','ories'#010+
'#####################################################################'#010+
#010+
'# Units dir'#010+
@@ -613,8 +627,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# Units dir'#010+
- 'ifdef REQUIRE_PACKAGESD','IR'#010+
- 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+
+ 'ifdef REQUIRE_PACKAGESDIR'#010+
+ 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)',#010+
'endif'#010+
#010+
#010+
@@ -623,8 +637,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# use the source os as default'#010+
'ifdef ZIPINSTALL'#010+
'# Zipinstall'#010+
- 'ifneq ($(','findstring $(OS_TARGET),$(UNIXs)),)'#010+
- 'UNIXHier=1'#010+
+ 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+
+ 'UNIXHier=1'#010,
'endif'#010+
'else'#010+
'# Normal install'#010+
@@ -636,11 +650,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# When install prefix is not set try to use prefix'#010+
'ifndef INSTALL_PREFIX'#010+
'ifdef PREFIX'#010+
- 'INSTALL_PR','EFIX=$(PREFIX)'#010+
+ 'INSTALL_PREFIX=$(PREFIX)'#010+
'endif'#010+
'endif'#010+
#010+
- '# set the prefix directory where to install everything'#010+
+ '# set the prefix di','rectory where to install everything'#010+
'ifndef INSTALL_PREFIX'#010+
'ifdef UNIXHier'#010+
'INSTALL_PREFIX=/usr/local'#010+
@@ -649,32 +663,32 @@ const fpcmakeini : array[0..246,1..240] of char=(
'INSTALL_BASEDIR:=/pp'#010+
'else'#010+
'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+
- 'endi','f'#010+
+ 'endif'#010+
'endif'#010+
'endif'#010+
'export INSTALL_PREFIX'#010+
#010+
- '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+
+ '# Export a','lso INSTALL_SOURCESUBDIR set so it will be'#010+
'# used recursively for all subdirs'#010+
'ifdef INSTALL_FPCSUBDIR'#010+
'export INSTALL_FPCSUBDIR'#010+
'endif'#010+
#010+
'# Where to place the resulting zip files'#010+
- 'ifndef DIST_DESTDI','R'#010+
+ 'ifndef DIST_DESTDIR'#010+
'DIST_DESTDIR:=$(BASEDIR)'#010+
'endif'#010+
- 'export DIST_DESTDIR'#010+
+ 'export DIST_DE','STDIR'#010+
#010+
'# EXE/PPU Target directories'#010+
'ifndef COMPILER_UNITTARGETDIR'#010+
'ifdef PACKAGEDIR_MAIN'#010+
'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+
'else'#010+
- 'COMPILER_UNITTARGETDIR=units/$(TARGE','TSUFFIX)'#010+
+ 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+
'endif'#010+
'endif'#010+
- 'ifndef COMPILER_TARGETDIR'#010+
+ 'ifndef COMPILER_TARGETDIR'#010,
'COMPILER_TARGETDIR=.'#010+
'endif'#010+
#010+
@@ -683,7 +697,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Install Directories'#010+
'#####################################################################'#010+
#010+
- '#',' set the base directory where to install everything'#010+
+ '# set the base directory where to install everyt','hing'#010+
'ifndef INSTALL_BASEDIR'#010+
'ifdef UNIXHier'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
@@ -691,10 +705,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
'else'#010+
'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+
'endif'#010+
- 'e','lse'#010+
+ 'else'#010+
'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+
'endif'#010+
- 'endif'#010+
+ 'en','dif'#010+
#010+
'# set the directory where to install the binaries'#010+
'ifndef INSTALL_BINDIR'#010+
@@ -702,7 +716,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+
'else'#010+
'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+
- '# for FPC packages ','install the binaries under their target subdir'#010+
+ '# for FPC packages install the binaries under their target subdir'#010,
'ifdef INSTALL_FPCPACKAGE'#010+
'ifdef CROSSCOMPILE'#010+
'ifdef CROSSINSTALL'#010+
@@ -711,9 +725,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
'endif'#010+
'else'#010+
- 'INSTALL_BINDIR',':=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
- 'endif'#010+
+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
'endif'#010+
+ 'endif',#010+
'endif'#010+
'endif'#010+
#010+
@@ -722,8 +736,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
'ifdef PACKAGE_NAME'#010+
- 'INSTAL','L_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
- 'endif'#010+
+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
+ 'e','ndif'#010+
'endif'#010+
'endif'#010+
#010+
@@ -736,8 +750,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- '# Where the',' source files will be stored'#010+
- 'ifndef INSTALL_SOURCEDIR'#010+
+ '# Where the source files will be stored'#010+
+ 'ifndef INSTALL_SOU','RCEDIR'#010+
'ifdef UNIXHier'#010+
'ifdef BSDhier'#010+
'SRCPREFIXDIR=share/src'#010+
@@ -750,15 +764,15 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
'ifdef INSTALL_FPCSUBDIR'#010+
- 'INSTALL','_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSI'+
+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/f','pc-$(FPC_VERSI'+
'ON)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+
'else'#010+
'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+
')/$(PACKAGE_NAME)'#010+
'endif'#010+
'else'#010+
- 'INSTALL_SOURCEDIR:=$(INSTALL_PREFI','X)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+
- '-$(PACKAGE_VERSION)'#010+
+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+
+ '(PACKAGE_VE','RSION)'#010+
'endif'#010+
'else'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
@@ -766,10 +780,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+
'CKAGE_NAME)'#010+
'else'#010+
- 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/s','ource/$(PACKAGE_NAME)'#010+
+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+
'endif'#010+
'else'#010+
- 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+
+ 'INSTALL_SOURCE','DIR:=$(INSTALL_BASEDIR)/source'#010+
'endif'#010+
'endif'#010+
'endif'#010+
@@ -781,21 +795,21 @@ const fpcmakeini : array[0..246,1..240] of char=(
'DOCPREFIXDIR=share/doc'#010+
'else'#010+
'ifdef linuxHier'#010+
- 'DOCPREFIXDI','R=share/doc'#010+
+ 'DOCPREFIXDIR=share/doc'#010+
'else'#010+
'DOCPREFIXDIR=doc'#010+
'endif'#010+
'endif'#010+
- 'ifdef INSTALL_FPCPACKAGE'#010+
+ 'i','fdef INSTALL_FPCPACKAGE'#010+
'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+
'(PACKAGE_NAME)'#010+
'else'#010+
'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+
- 'CKAGE_VER','SION)'#010+
+ 'CKAGE_VERSION)'#010+
'endif'#010+
'else'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
- 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
+ 'INSTA','LL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
'else'#010+
'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+
'endif'#010+
@@ -803,8 +817,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# Where to install the examples, under linux we use the doc dir'#010+
- '# because the co','pytree command will create a subdir itself'#010+
- 'ifndef INSTALL_EXAMPLEDIR'#010+
+ '# because the copytree command will create a subdir itself'#010+
+ 'ifnd','ef INSTALL_EXAMPLEDIR'#010+
'ifdef UNIXHier'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
#010+
@@ -813,10 +827,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
')/$(PACKAGE_NAME)'#010+
'else'#010+
'ifdef linuxHier'#010+
- 'INSTALL','_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+
+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+
'else'#010+
- 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+
- '$(PACKAGE_NAME)'#010+
+ 'IN','STALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/example'+
+ 's/$(PACKAGE_NAME)'#010+
'endif'#010+
'endif'#010+
#010+
@@ -824,11 +838,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'ifdef BSDhier'#010+
'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+
- '(PACKA','GE_VERSION)'#010+
+ '(PACKAGE_VERSION)'#010+
'else'#010+
'ifdef linuxHier'#010+
- 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+
- 'GE_VERSION)'#010+
+ 'INSTALL_EXAMPL','EDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PAC'+
+ 'KAGE_VERSION)'#010+
'else'#010+
'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+
'RSION)'#010+
@@ -837,8 +851,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'endif'#010+
'else'#010+
- 'ifdef INSTALL_FPCPA','CKAGE'#010+
- 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+
+ 'ifdef INSTALL_FPCPACKAGE'#010+
+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/ex','amples/$(PACKAGE_NAME)'#010+
'else'#010+
'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+
'endif'#010+
@@ -847,24 +861,23 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Where the some extra (data)files will be stored'#010+
'ifndef INSTALL_DATADIR'#010+
- 'INSTALL_DATADIR=$(INSTALL','_BASEDIR)'#010+
+ 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+
'endif'#010+
#010+
'ifndef INSTALL_SHAREDDIR'#010+
- 'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+
+ 'INSTA','LL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+
'endif'#010+
#010+
'#####################################################################'#010+
'# Cross compile dirs'#010+
- '############################################################','########'+
- '#'#010+
+ '#####################################################################'#010+
#010+
'ifdef CROSSCOMPILE'#010+
- '# Directory where the cross compile tools are stored.'#010+
+ '# Directory where',' the cross compile tools are stored.'#010+
'# First check if they are available in FPCDIR. If no targets/ subdir'#010+
'# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+
'ifndef CROSSBINDIR'#010+
- 'CROSSBINDIR:=','$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+
+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX','))'#010+
'ifeq ($(CROSSBINDIR),)'#010+
'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+
'(FULL_SOURCE))'#010+
@@ -876,20 +889,20 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[dirlibc]'#010+
- '# On linux, try to find where libg','cc.a is.'#010+
+ '# On linux, try to find where libgcc.a is.'#010+
'ifeq ($(OS_SOURCE),linux)'#010+
#010+
- '# Amd64 to i386?'#010+
+ '# Amd64 to ','i386?'#010+
'ifndef GCCLIBDIR'#010+
'ifeq ($(CPU_TARGET),i386)'#010+
'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+
'ifeq ($(BINUTILSPREFIX),)'#010+
'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+
'endif'#010+
- 'e','ndif'#010+
+ 'endif'#010+
'endif'#010+
'ifeq ($(CPU_TARGET),powerpc64)'#010+
- 'ifeq ($(BINUTILSPREFIX),)'#010+
+ 'ifeq ','($(BINUTILSPREFIX),)'#010+
'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+
'endif'#010+
'endif'#010+
@@ -897,9 +910,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Try cross gcc'#010+
'ifndef GCCLIBDIR'#010+
- 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX',')gcc$(SRCEX'+
- 'EEXT),$(SEARCHPATH))))'#010+
- 'ifneq ($(CROSSGCC),)'#010+
+ 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+
+ 'XT),$(SEARCHPATH))))'#010+
+ 'ifneq ($(CROS','SGCC),)'#010+
'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+
'endif'#010+
'endif'#010+
@@ -909,21 +922,22 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifeq ($(OS_SOURCE),netbsd)'#010+
'OTHERLIBDIR:=/usr/pkg/lib'#010+
'endif'#010+
- 'export GCCLIBDIR OTHERLIBDIR',#010+
+ 'export GCCLIBDIR OTHERLIBDIR'#010+
'endif'#010+
#010+
#010+
'[extensions]'#010+
- '#####################################################################'#010+
+ '#########################','###########################################'+
+ '#'#010+
'# Default extensions'#010+
'#####################################################################'#010+
#010+
'# Default needed extensions (Go32v2,Linux)'#010+
- 'BATCHEXT=.bat',#010+
+ 'BATCHEXT=.bat'#010+
'LOADEREXT=.as'#010+
'EXEEXT=.exe'#010+
'PPLEXT=.ppl'#010+
- 'PPUEXT=.ppu'#010+
+ 'PPUEXT=.','ppu'#010+
'OEXT=.o'#010+
'LTOEXT=.bc'#010+
'ASMEXT=.s'#010+
@@ -934,10 +948,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
'STATICLIBPREFIX=libp'#010+
'IMPORTLIBPREFIX=libimp'#010+
'RSTEXT=.rst'#010+
- '# external debug info for executable',#010+
+ '# external debug info for executable'#010+
'EXEDBGEXT=.dbg'#010+
- '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+
- ' has this'#010+
+ '#DEBUGSYMEXT #for debugger symb','ol files, define only for targets whi'+
+ 'ch has this'#010+
#010+
'# Go32v1'#010+
'ifeq ($(OS_TARGET),go32v1)'#010+
@@ -948,12 +962,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Go32v2'#010+
'ifeq ($(OS_TARGET),go32v2)'#010+
'STATICLIBPREFIX='#010+
- 'SHORTSUFFIX=dos',#010+
+ 'SHORTSUFFIX=dos'#010+
'IMPORTLIBPREFIX='#010+
'endif'#010+
#010+
'# watcom'#010+
- 'ifeq ($(OS_TARGET),watcom)'#010+
+ 'ifeq ($(OS_TA','RGET),watcom)'#010+
'STATICLIBPREFIX='#010+
'OEXT=.obj'#010+
'ASMEXT=.asm'#010+
@@ -965,11 +979,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Android native'#010+
'ifneq ($(CPU_TARGET),jvm)'#010+
'ifeq ($(OS_TARGET),android)'#010+
- 'BATCHEXT=.s','h'#010+
+ 'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'HASSHAREDLIB=1'#010+
'SHORTSUFFIX=lnx'#010+
- 'endif'#010+
+ 'endif'#010,
'endif'#010+
#010+
'# Linux'#010+
@@ -985,11 +999,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'HASSHAREDLIB=1'#010+
- 'SHORTSUFFIX','=df'#010+
+ 'SHORTSUFFIX=df'#010+
'endif'#010+
#010+
'# FreeBSD'#010+
- 'ifeq ($(OS_TARGET),freebsd)'#010+
+ 'ifeq ($(OS_TARGET),freebsd',')'#010+
'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'HASSHAREDLIB=1'#010+
@@ -1005,11 +1019,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# OpenBSD'#010+
- 'ifeq ($(OS_TARGET),openbsd)',#010+
+ 'ifeq ($(OS_TARGET),openbsd)'#010+
'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'HASSHAREDLIB=1'#010+
- 'SHORTSUFFIX=obs'#010+
+ 'SHORTSUFFI','X=obs'#010+
'endif'#010+
#010+
'# Win32'#010+
@@ -1024,13 +1038,13 @@ const fpcmakeini : array[0..246,1..240] of char=(
'AOUTEXT=.out'#010+
'STATICLIBPREFIX='#010+
'SHAREDLIBEXT=.dll'#010+
- 'SHORTSUFFIX=','os2'#010+
+ 'SHORTSUFFIX=os2'#010+
'ECHO=echo'#010+
'IMPORTLIBPREFIX='#010+
'endif'#010+
#010+
'# EMX'#010+
- 'ifeq ($(OS_TARGET),emx)'#010+
+ 'ife','q ($(OS_TARGET),emx)'#010+
'BATCHEXT=.cmd'#010+
'AOUTEXT=.out'#010+
'STATICLIBPREFIX='#010+
@@ -1043,12 +1057,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Amiga'#010+
'ifeq ($(OS_TARGET),amiga)'#010+
'EXEEXT='#010+
- 'SHAREDLIBEXT=.libr','ary'#010+
+ 'SHAREDLIBEXT=.library'#010+
'SHORTSUFFIX=amg'#010+
'endif'#010+
#010+
'# AROS'#010+
- 'ifeq ($(OS_TARGET),aros)'#010+
+ 'ifeq ($(OS_TA','RGET),aros)'#010+
'EXEEXT='#010+
'SHAREDLIBEXT=.library'#010+
'SHORTSUFFIX=aros'#010+
@@ -1063,12 +1077,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Atari'#010+
'ifeq ($(OS_TARGET),atari)'#010+
- 'EX','EEXT=.ttp'#010+
+ 'EXEEXT=.ttp'#010+
'SHORTSUFFIX=ata'#010+
'endif'#010+
#010+
'# BeOS'#010+
- 'ifeq ($(OS_TARGET),beos)'#010+
+ 'ifeq ($','(OS_TARGET),beos)'#010+
'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'SHORTSUFFIX=be'#010+
@@ -1084,12 +1098,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Solaris'#010+
'ifeq ($(OS_TARGET),solaris)'#010+
'BATCHEXT=.sh'#010+
- 'EXE','EXT='#010+
+ 'EXEEXT='#010+
'SHORTSUFFIX=sun'#010+
'endif'#010+
#010+
'# QNX'#010+
- 'ifeq ($(OS_TARGET),qnx)'#010+
+ 'ifeq ($(OS_TA','RGET),qnx)'#010+
'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'SHORTSUFFIX=qnx'#010+
@@ -1104,9 +1118,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# Netware libc'#010+
- 'ifeq ($(O','S_TARGET),netwlibc)'#010+
+ 'ifeq ($(OS_TARGET),netwlibc)'#010+
'EXEEXT=.nlm'#010+
- 'STATICLIBPREFIX='#010+
+ 'STATICLIBPREFIX','='#010+
'SHORTSUFFIX=nwl'#010+
'IMPORTLIBPREFIX=imp'#010+
'endif'#010+
@@ -1121,9 +1135,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# Darwin'#010+
- 'ifneq ($(findstring $(OS_','TARGET),darwin iphonesim),)'#010+
+ 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+
'BATCHEXT=.sh'#010+
- 'EXEEXT='#010+
+ 'EXEEXT','='#010+
'HASSHAREDLIB=1'#010+
'SHORTSUFFIX=dwn'#010+
'EXEDBGEXT=.dSYM'#010+
@@ -1138,12 +1152,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Symbian OS'#010+
'ifeq ($(OS_TARGET),symbian)'#010+
- 'SHAREDLIBEXT=.','dll'#010+
+ 'SHAREDLIBEXT=.dll'#010+
'SHORTSUFFIX=symbian'#010+
'endif'#010+
#010+
'# NativeNT'#010+
- 'ifeq ($(OS_TARGET),NativeNT)'#010+
+ 'ifeq ','($(OS_TARGET),NativeNT)'#010+
'SHAREDLIBEXT=.dll'#010+
'SHORTSUFFIX=nativent'#010+
'endif'#010+
@@ -1157,11 +1171,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# AIX'#010+
'ifeq ($(OS_TARGET),aix)'#010+
- 'BATCHEXT=.s','h'#010+
+ 'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'SHAREDLIBEXT=.a'#010+
'SHORTSUFFIX=aix'#010+
- 'endif'#010+
+ 'endif',#010+
#010+
'# Java'#010+
'ifeq ($(OS_TARGET),java)'#010+
@@ -1176,12 +1190,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifeq ($(OS_TARGET),android)'#010+
'OEXT=.class'#010+
'ASMEXT=.j'#010+
- 'SHARE','DLIBEXT=.jar'#010+
+ 'SHAREDLIBEXT=.jar'#010+
'SHORTSUFFIX=android'#010+
'endif'#010+
'endif'#010+
#010+
- '# MS-DOS'#010+
+ '#',' MS-DOS'#010+
'ifeq ($(OS_TARGET),msdos)'#010+
'STATICLIBPREFIX='#010+
'STATICLIBEXT=.a'#010+
@@ -1193,13 +1207,13 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifeq ($(CPU_TARGET),i8086)'#010+
'STATICLIBPREFIX='#010+
'STATICLIBEXT=.a'#010+
- 'els','e'#010+
+ 'else'#010+
'EXEEXT=.bin'#010+
'endif'#010+
'SHORTSUFFIX=emb'#010+
'endif'#010+
#010+
- '# Win16'#010+
+ '# Wi','n16'#010+
'ifeq ($(OS_TARGET),win16)'#010+
'STATICLIBPREFIX='#010+
'STATICLIBEXT=.a'#010+
@@ -1210,7 +1224,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# For 8.3 limited OS'#039's the short suffixes'#010+
'# Otherwise use the full source/target names'#010+
- 'i','fneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+
+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)',#010+
'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+
'ZIPSUFFIX=$(SHORTSUFFIX)'#010+
'ZIPCROSSPREFIX='#010+
@@ -1219,9 +1233,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'else'#010+
'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+
'ZIPSOURCESUFFIX=.source'#010+
- 'ZIPEXAMPLESUFFIX=.','examples'#010+
+ 'ZIPEXAMPLESUFFIX=.examples'#010+
'ifdef CROSSCOMPILE'#010+
- 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+
+ 'ZIPSUFFIX=.$(SOURCE','SUFFIX)'#010+
'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+
'else'#010+
'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+
@@ -1231,17 +1245,18 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'[defaulttools]'#010+
'#####################################################################'#010+
- '# Defau','lt Tools'#010+
- '#####################################################################'#010+
+ '# Default Tools'#010+
+ '######################################','##############################'+
+ '#'#010+
#010+
'# Names of the binutils tools'#010+
'ASNAME=$(BINUTILSPREFIX)as'#010+
'LDNAME=$(BINUTILSPREFIX)ld'#010+
'ARNAME=$(BINUTILSPREFIX)ar'#010+
'RCNAME=$(BINUTILSPREFIX)rc'#010+
- 'NASMNAME=$(BINUTILSPRE','FIX)nasm'#010+
+ 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+
#010+
- '# assembler, redefine it if cross compiling'#010+
+ '# assembler, redefine it if cross com','piling'#010+
'ifndef ASPROG'#010+
'ifdef CROSSBINDIR'#010+
'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+
@@ -1253,9 +1268,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# linker, but probably not used'#010+
'ifndef LDPROG'#010+
'ifdef CROSSBINDIR'#010+
- 'LDPROG=$(CR','OSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+
+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+
'else'#010+
- 'LDPROG=$(LDNAME)'#010+
+ 'LDPROG=$(','LDNAME)'#010+
'endif'#010+
'endif'#010+
#010+
@@ -1270,9 +1285,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Archiver'#010+
'ifndef ARPROG'#010+
- 'ifdef CROSSBINDI','R'#010+
+ 'ifdef CROSSBINDIR'#010+
'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+
- 'else'#010+
+ 'e','lse'#010+
'ARPROG=$(ARNAME)'#010+
'endif'#010+
'endif'#010+
@@ -1283,12 +1298,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+
'else'#010+
'NASMPROG=$(NASMNAME)'#010+
- 'en','dif'#010+
+ 'endif'#010+
'endif'#010+
#010+
'# Override defaults'#010+
'AS=$(ASPROG)'#010+
- 'LD=$(LDPROG)'#010+
+ 'LD=','$(LDPROG)'#010+
'RC=$(RCPROG)'#010+
'AR=$(ARPROG)'#010+
'NASM=$(NASMPROG)'#010+
@@ -1301,13 +1316,13 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# ldconfig to rebuild .so cache'#010+
- 'ifdef inUni','x'#010+
+ 'ifdef inUnix'#010+
'LDCONFIG=ldconfig'#010+
'else'#010+
'LDCONFIG='#010+
'endif'#010+
#010+
- 'ifdef DATE'#010+
+ 'ifdef',' DATE'#010+
'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+
'else'#010+
'DATESTR='#010+
@@ -1324,16 +1339,17 @@ const fpcmakeini : array[0..246,1..240] of char=(
'else'#010+
'TAROPT=vz'#010+
'TAREXT=.tar.gz'#010+
- 'endi','f'#010+
+ 'endif'#010+
#010+
#010+
'[command_begin]'#010+
- '#####################################################################'#010+
+ '###########################','#########################################'+
+ '#'#010+
'# Compiler Command Line'#010+
'#####################################################################'#010+
#010+
- '# Load commandline OPTDEF and add FPC_CPU define, for c','ompiling the'#010+
- '# compiler this needs to be turned off'#010+
+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+
+ '# compiler this needs to be turned',' off'#010+
'ifndef NOCPUDEF'#010+
'override FPCOPTDEF=$(ARCH)'#010+
'endif'#010+
@@ -1344,8 +1360,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override FPCOPT+=-T$(OS_TARGET)'#010+
'endif'#010+
#010+
- 'if','neq ($(CPU_TARGET),$(CPU_SOURCE))'#010+
- 'override FPCOPT+=-P$(ARCH)'#010+
+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+
+ 'override FPCO','PT+=-P$(ARCH)'#010+
'endif'#010+
#010+
'ifeq ($(OS_SOURCE),openbsd)'#010+
@@ -1353,9 +1369,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+
'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+
'endif'#010+
- #010,
+ #010+
'ifndef CROSSBOOTSTRAP'#010+
- 'ifneq ($(BINUTILSPREFIX),)'#010+
+ 'ifneq ($(BINUTILSPREFIX),',')'#010+
'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+
'endif'#010+
'ifneq ($(BINUTILSPREFIX),)'#010+
@@ -1365,17 +1381,17 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# When BINUTILSPREFIX is given and we are not cross-compiling then use'+
#010+
- '# i','t while compiling the fpmake file. (For example to build i386-fre'+
+ '# it while compiling the fpmake file. (For example',' to build i386-fre'+
'ebsd'#010+
'# with BINUTILSPREFIX=i386-)'#010+
'ifndef CROSSCOMPILE'#010+
'ifneq ($(BINUTILSPREFIX),)'#010+
'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+
'override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+
- 'endi','f'#010+
+ 'endif'#010+
'endif'#010+
#010+
- '# User dirs should be first, so they are looked at first'#010+
+ '# User dirs should be first, so they a','re looked at first'#010+
'ifdef UNITDIR'#010+
'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
'endif'#010+
@@ -1383,10 +1399,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
'endif'#010+
'ifdef OBJDIR'#010+
- 'override FPCOPT+=$(addprefix -Fo,','$(OBJDIR))'#010+
+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
'endif'#010+
'ifdef INCDIR'#010+
- 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
+ 'override FPCOPT+=','$(addprefix -Fi,$(INCDIR))'#010+
'endif'#010+
#010+
'# Smartlinking'#010+
@@ -1401,11 +1417,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Debug'#010+
'ifdef DEBUG'#010+
- 'override F','PCOPT+=-gl'#010+
+ 'override FPCOPT+=-gl'#010+
'override FPCOPTDEF+=DEBUG'#010+
'endif'#010+
#010+
- '# Release mode'#010+
+ '# R','elease mode'#010+
'# (strip, optimize and don'#039't load fpc.cfg)'#010+
'ifdef RELEASE'#010+
'FPCCPUOPT:=-O2'#010+
@@ -1415,12 +1431,12 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Strip'#010+
'ifdef STRIP'#010+
- 'override FPCO','PT+=-Xs'#010+
+ 'override FPCOPT+=-Xs'#010+
'endif'#010+
#010+
'# Optimizer'#010+
'ifdef OPTIMIZE'#010+
- 'override FPCOPT+=-O2'#010+
+ 'overr','ide FPCOPT+=-O2'#010+
'endif'#010+
#010+
'# Verbose settings (warning,note,info)'#010+
@@ -1431,17 +1447,17 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Needed compiler options'#010+
'ifdef COMPILER_OPTIONS'#010+
'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
- 'e','ndif'#010+
+ 'endif'#010+
'ifdef COMPILER_UNITDIR'#010+
- 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
+ 'override FPCOPT+=$(','addprefix -Fu,$(COMPILER_UNITDIR))'#010+
'endif'#010+
'ifdef COMPILER_LIBRARYDIR'#010+
'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
'endif'#010+
'ifdef COMPILER_OBJECTDIR'#010+
- 'override FPCOPT+=$(addprefix -Fo,$(COM','PILER_OBJECTDIR))'#010+
+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
'endif'#010+
- 'ifdef COMPILER_INCLUDEDIR'#010+
+ 'ifdef COMPILER_INCLUDED','IR'#010+
'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
'endif'#010+
#010+
@@ -1450,9 +1466,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override FPCOPT+=-FD$(CROSSBINDIR)'#010+
'endif'#010+
#010+
- '# Target dirs and the prefix to use for cle','an/install'#010+
+ '# Target dirs and the prefix to use for clean/install'#010+
'ifdef COMPILER_TARGETDIR'#010+
- 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
+ 'override FP','COPT+=-FE$(COMPILER_TARGETDIR)'#010+
'ifeq ($(COMPILER_TARGETDIR),.)'#010+
'override TARGETDIRPREFIX='#010+
'else'#010+
@@ -1460,17 +1476,17 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- '# Unit target dir (default is units/<cp','u>-<os>/'#010+
+ '# Unit target dir (default is units/<cpu>-<os>/'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
- 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
+ 'override ','FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
'override UNITTARGETDIRPREFIX='#010+
'else'#010+
'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+
'endif'#010+
'else'#010+
- 'ifdef COMPILER_TARG','ETDIR'#010+
- 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
+ 'ifdef COMPILER_TARGETDIR'#010+
+ 'override COMPILER_UNITTARGETDIR=$(COMPILE','R_TARGETDIR)'#010+
'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
'endif'#010+
'endif'#010+
@@ -1480,21 +1496,21 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# create always pic'#039'ed code on x86_64, mips and mipsel'#010+
- '# on unix-like sy','stems'#010+
- 'ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linu'+
- 'x solaris),)'#010+
+ '# on unix-like systems'#010+
+ 'ifneq ($(findstring $(OS_TARGET),dragonfl','y freebsd openbsd netbsd li'+
+ 'nux solaris),)'#010+
'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)'#010+
'override FPCOPT+=-Cg'#010+
'endif'#010+
'endif'#010+
#010+
'ifdef LINKSHARED'#010+
- '#!!! deactived for testing override FPCOPT+=','-XD'#010+
+ '#!!! deactived for testing override FPCOPT+=-XD'#010+
'endif'#010+
#010+
#010+
'[command_libc]'#010+
- '# Add GCC lib path if asked'#010+
+ '# Add GCC lib path i','f asked'#010+
'ifdef GCCLIBDIR'#010+
'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
'override FPCMAKEOPT+=-Fl$(GCCLIBDIR)'#010+
@@ -1505,7 +1521,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[command_end]'#010+
- '# Ad','d commandline options last so they can override'#010+
+ '# Add commandline options last so they can override',#010+
'ifdef OPT'#010+
'override FPCOPT+=$(OPT)'#010+
'endif'#010+
@@ -1513,10 +1529,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
'# Override options to compile the fpmake-binary with command-line opti'+
'ons provided in FPMAKEBUILDOPT'#010+
'ifdef FPMAKEBUILDOPT'#010+
- 'override FPMAKE_BUILD_OPT+=$(','FPMAKEBUILDOPT)'#010+
+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+
'endif'#010+
#010+
- '# Add defines from FPCOPTDEF to FPCOPT'#010+
+ '# Add defines from FPCOP','TDEF to FPCOPT'#010+
'ifdef FPCOPTDEF'#010+
'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
'endif'#010+
@@ -1526,9 +1542,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override FPCOPT+=@$(CFGFILE)'#010+
'endif'#010+
#010+
- '# Use the environment to pa','ss commandline options?'#010+
+ '# Use the environment to pass commandline options?'#010+
'ifdef USEENV'#010+
- 'override FPCEXTCMD:=$(FPCOPT)'#010+
+ 'override F','PCEXTCMD:=$(FPCOPT)'#010+
'override FPCOPT:=!FPCEXTCMD'#010+
'export FPCEXTCMD'#010+
'endif'#010+
@@ -1536,9 +1552,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
#010+
- 'ifneq ($(AFULL_TARGET)',',$(AFULL_SOURCE))'#010+
+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+
'override ACROSSCOMPILE=1'#010+
- 'endif'#010+
+ 'endi','f'#010+
#010+
'ifdef ACROSSCOMPILE'#010+
'override FPCOPT+=$(CROSSOPT)'#010+
@@ -1548,8 +1564,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+
#010+
'# also call ppas if with command option -s'#010+
- '# but only if the FULL','_SOURCE and FULL_TARGET are equal'#010+
- '# or if -sh is used'#010+
+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+
+ '# or if -sh i','s used'#010+
'ifneq (,$(findstring -sh ,$(COMPILER)))'#010+
'UseEXECPPAS=1'#010+
'endif'#010+
@@ -1558,11 +1574,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
'UseEXECPPAS=1'#010+
'endif'#010+
'endif'#010+
- 'ifneq ($(UseEXECPPAS),1)',#010+
+ 'ifneq ($(UseEXECPPAS),1)'#010+
'EXECPPAS='#010+
'else'#010+
'ifdef RUNBATCH'#010+
- 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+
+ 'EXECPPAS:=@$(RUN','BATCH) $(PPAS)'#010+
'else'#010+
'EXECPPAS:=@$(PPAS)'#010+
'endif'#010+
@@ -1572,21 +1588,20 @@ const fpcmakeini : array[0..246,1..240] of char=(
'[loaderrules]'#010+
'#####################################################################'#010+
'# Loaders'#010+
- '##############################################','######################'+
- '#'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_loaders'#010+
#010+
- 'ifneq ($(TARGET_LOADERS),)'#010+
+ 'i','fneq ($(TARGET_LOADERS),)'#010+
'override ALLTARGET+=fpc_loaders'#010+
'override CLEANTARGET+=fpc_loaders_clean'#010+
'override INSTALLTARGET+=fpc_loaders_install'#010+
#010+
- 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGE','T_LOADERS))'#010+
+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
'endif'#010+
#010+
'%$(OEXT): %$(LOADEREXT)'#010+
- 'ifdef COMPILER_UNITTARGETDIR'#010+
+ 'ifde','f COMPILER_UNITTARGETDIR'#010+
' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
'else'#010+
' $(AS) -o $*$(OEXT) $<'#010+
@@ -1594,10 +1609,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+
#010+
- 'fpc_loaders_cl','ean:'#010+
+ 'fpc_loaders_clean:'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
- ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+
- ')'#010+
+ ' -$(DE','L) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILE'+
+ 'S))'#010+
'else'#010+
' -$(DEL) $(LOADEROFILES)'#010+
'endif'#010+
@@ -1605,7 +1620,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
'fpc_loaders_install:'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
- ' ',' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+
+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGE','TDIR)/,$(LOADEROF'+
'ILES)) $(INSTALL_UNITDIR)'#010+
'else'#010+
' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
@@ -1614,8 +1629,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'[unitrules]'#010+
'#####################################################################'#010+
- '#',' Units'#010+
- '#####################################################################'#010+
+ '# Units'#010+
+ '########################################','############################'+
+ '#'#010+
#010+
'.PHONY: fpc_units'#010+
#010+
@@ -1623,41 +1639,42 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override ALLTARGET+=fpc_units'#010+
#010+
'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
- 'ove','rride IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+
+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT','),$(TARGET_IMPLICI'+
'TUNITS))'#010+
'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
'endif'#010+
#010+
- 'fpc_units: $(COMPILER_UNITTAR','GETDIR) $(UNITPPUFILES)'#010+
+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+
#010+
#010+
'[exerules]'#010+
- '#####################################################################'#010+
+ '##########','##########################################################'+
+ '#'#010+
'# Exes'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_exes'#010+
#010+
- '# Programs are not needed for a cross',' installation'#010+
+ '# Programs are not needed for a cross installation'#010+
'ifndef CROSSINSTALL'#010+
- 'ifneq ($(TARGET_PROGRAMS),)'#010+
+ 'ifneq ($(TARG','ET_PROGRAMS),)'#010+
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+
- 'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STA','TICLIBPREFIX),$(adds'+
- 'uffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREF'+
+ 'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuf'+
+ 'fix $(STATICLIBEXT),$(TAR','GET_PROGRAMS))) $(addprefix $(IMPORTLIBPREF'+
'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+
#010+
- 'override ALLTARGET+=fpc_exes'#010,
+ 'override ALLTARGET+=fpc_exes'#010+
'override INSTALLEXEFILES+=$(EXEFILES)'#010+
- 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
+ 'override ','CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+
'ifeq ($(OS_TARGET),os2)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
'endif'#010+
- 'ifeq ($(OS_TAR','GET),emx)'#010+
- 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
+ 'ifeq ($(OS_TARGET),emx)'#010+
+ 'override CLEANEXEFILES+=$(addsuffix $','(AOUTEXT),$(TARGET_PROGRAMS))'#010+
'endif'#010+
'endif'#010+
'endif'#010+
@@ -1666,10 +1683,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[rstrules]'#010+
- '#############################################################','#######'+
- '#'#010+
- '# Resource strings'#010+
'#####################################################################'#010+
+ '# Resource strings'#010+
+ '###################','#################################################'+
+ '#'#010+
#010+
'ifdef TARGET_RSTS'#010+
'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
@@ -1679,7 +1696,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[examplerules]'#010+
- '#######','#############################################################'+
+ '######################################################','##############'+
'#'#010+
'# Examples'#010+
'#####################################################################'#010+
@@ -1688,23 +1705,23 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'ifneq ($(TARGET_EXAMPLES),)'#010+
'HASEXAMPLES=1'#010+
- 'override EXAMPLESOURCEFILES=$(w','ildcard $(addsuffix .pp,$(TARGET_EXAM'+
- 'PLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_'+
+ 'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+
+ 'ES)) $(a','ddsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_'+
'EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
- 'override EXAMPLEOFI','LES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+
+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(','ad'+
'dsuffix $(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$'+
'(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLI'+
- 'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMP','LES)))'#010+
- 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+
- #010+
+ 'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+
+ 'override EXAMPLEDBGFILES:=$(addsuffix $(','EXEDBGEXT),$(TARGET_EXAMPLES'+
+ '))'#010+
#010+
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+
'ifeq ($(OS_TARGET),os2)'#010+
- 'override CLEANEXEFILES+=$(addsuffi','x $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endif'#010+
- 'ifeq ($(OS_TARGET),emx)'#010+
+ 'ifeq ($(','OS_TARGET),emx)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endif'#010+
'endif'#010+
@@ -1712,18 +1729,19 @@ const fpcmakeini : array[0..246,1..240] of char=(
'HASEXAMPLES=1'#010+
'endif'#010+
#010+
- 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix ','_all,$(TARGET_EXAMPLED'+
- 'IRS))'#010+
+ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+
+ 'S))'#010+
#010+
#010+
'[compilerules]'#010+
- '#####################################################################'#010+
+ '##','##################################################################'+
+ '#'#010+
'# General compile rules'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_all fpc_smart fpc_','debug fpc_release fpc_shared'#010+
+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+
#010+
- '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
+ '$(FPCMADE): $(ALL','DEPENDENCIES) $(ALLTARGET)'#010+
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
#010+
'fpc_all: $(FPCMADE)'#010+
@@ -1734,19 +1752,19 @@ const fpcmakeini : array[0..246,1..240] of char=(
'fpc_debug:'#010+
' $(MAKE) all DEBUG=1'#010+
#010+
- 'fp','c_release:'#010+
+ 'fpc_release:'#010+
' $(MAKE) all RELEASE=1'#010+
#010+
- '# General compile rules, available for both possible .pp and .pas exte'+
- 'nsions'#010+
+ '# Gen','eral compile rules, available for both possible .pp and .pas ex'+
+ 'tensions'#010+
#010+
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+
'c .res'#010+
#010+
'$(COMPILER_UNITTARGETDIR):'#010+
- ' $(MKDIR','TREE) $(COMPILER_UNITTARGETDIR)'#010+
+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
#010+
- '$(COMPILER_TARGETDIR):'#010+
+ '$(COMPILER_TAR','GETDIR):'#010+
' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
#010+
'%$(PPUEXT): %.pp'#010+
@@ -1757,11 +1775,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
- '%$(EXEEXT): %.pp'#010,
+ '%$(EXEEXT): %.pp'#010+
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
- '%$(EXEEXT): %.pas'#010+
+ '%$(','EXEEXT): %.pas'#010+
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
@@ -1773,21 +1791,22 @@ const fpcmakeini : array[0..246,1..240] of char=(
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
- '%.res: %.r','c'#010+
+ '%.res: %.rc'#010+
' windres -i $< -o $@'#010+
#010+
- '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
+ '# Search paths f','or .ppu, .pp, .pas, .lpr, .dpr'#010+
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
- 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCL','UDEDIR)'#010+
- 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+ 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COM','PILER_INCLUDEDIR)'#010+
'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+
'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
#010+
- '[sharedrules',']'#010+
- '#####################################################################'#010+
+ '[sharedrules]'#010+
+ '#############################################','#######################'+
+ '#'#010+
'# Library'#010+
'#####################################################################'#010+
#010+
@@ -1795,11 +1814,11 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'override INSTALLTARGET+=fpc_shared_install'#010+
#010+
- 'ifndef SHARED_LIBVERSIO','N'#010+
+ 'ifndef SHARED_LIBVERSION'#010+
'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
'endif'#010+
#010+
- 'ifndef SHARED_LIBNAME'#010+
+ 'ifnde','f SHARED_LIBNAME'#010+
'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
'endif'#010+
#010+
@@ -1808,8 +1827,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'N)$(SHAREDLIBEXT)'#010+
'endif'#010+
#010+
- '# Default sharedlib ','units are all unit objects'#010+
- 'ifndef SHARED_LIBUNITS'#010+
+ '# Default sharedlib units are all unit objects'#010+
+ 'ifndef SHARED_LIBUNI','TS'#010+
'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
'IBUNITS))'#010+
@@ -1817,90 +1836,90 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'fpc_shared:'#010+
'ifdef HASSHAREDLIB'#010+
- ' $(MAKE)',' all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010,
'ifneq ($(SHARED_BUILD),n)'#010+
' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+
'endif'#010+
'else'#010+
- ' @$(ECHO) S','hared Libraries not supported'#010+
+ ' @$(ECHO) Shared Libraries not supported'#010+
'endif'#010+
#010+
- 'fpc_shared_install:'#010+
+ 'fpc_shared','_install:'#010+
'ifneq ($(SHARED_BUILD),n)'#010+
'ifneq ($(SHARED_LIBUNITS),)'#010+
'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
- ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)',' $(IN'+
- 'STALL_SHAREDDIR)'#010+
+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
+ 'ALL_SHAREDDIR)'#010+
'endif'#010+
'endif'#010+
'endif'#010+
#010+
- '[installrules]'#010+
+ '[insta','llrules]'#010+
'#####################################################################'#010+
'# Install rules'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_install fpc_sou','rceinstall fpc_exampleinstall'#010+
+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
#010+
- 'ifdef INSTALL_UNITS'#010+
+ 'ifdef INSTALL_UN','ITS'#010+
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
'endif'#010+
#010+
'ifdef INSTALL_BUILDUNIT'#010+
'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+
'(INSTALLPPUFILES))'#010+
- 'end','if'#010+
+ 'endif'#010+
#010+
'ifdef INSTALLPPUFILES'#010+
- '# Avoid getting the same name twice as some install EXE fail'#010+
+ '# Avoid getting the s','ame name twice as some install EXE fail'#010+
'# in this case, happends for instance for OS/2 target'#010+
'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+
'IBEXT))'#010+
- 'override INSTALLPPULI','NKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU','F'+
+ 'ILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(S'+
+ 'TATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))'+
+ ' $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(IN'+
+ 'STALLPPUFILES)))'#010+
+ 'else'#010+
+ 'overrid','e INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
- ') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(','STATICLIBEXT),$'+
- '(INSTALLPPUFILES)))'#010+
- 'else'#010+
- 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
- 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+
- 'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPP','UFILES))'+
')'#010+
'endif'#010+
#010+
- 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
+ 'ifneq ($(UNITTARGETDIRPREFIX),',')'#010+
'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+
- 'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INS','TAL'+
- 'LPPUFILENAMES))'#010+
- 'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+
- 'FIX),$(INSTALLPPULINKFILENAMES)))'#010+
+ 'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+
+ 'PUFILENAMES))'#010+
+ 'override INSTALLPPULINKFILES','=$(wildcard $(addprefix $(UNITTARGETDIRP'+
+ 'REFIX),$(INSTALLPPULINKFILENAMES)))'#010+
'endif'#010+
'# Implicitly install Package.fpc'#010+
'override INSTALL_CREATEPACKAGEFPC=1'#010+
'endif'#010+
#010+
'ifdef INSTALLEXEFILES'#010+
- 'ifneq ($(TARG','ETDIRPREFIX),)'#010+
- 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
- 'STALLEXEFILES)))'#010+
+ 'ifneq ($(TARGETDIRPREFIX),)'#010+
+ 'override INSTALLEXEFILES:=$(addp','refix $(TARGETDIRPREFIX),$(notdir $('+
+ 'INSTALLEXEFILES)))'#010+
'endif'#010+
'endif'#010+
#010+
'fpc_install: all $(INSTALLTARGET)'#010+
'ifdef INSTALLEXEFILES'#010+
' $(MKDIR) $(INSTALL_BINDIR)'#010+
- ' $(INSTALLEXE) $(INSTALLEXE','FILES) $(INSTALL_BINDIR)'#010+
+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
'endif'#010+
- 'ifdef INSTALL_CREATEPACKAGEFPC'#010+
+ 'ifdef INSTALL_CR','EATEPACKAGEFPC'#010+
'ifdef FPCMAKE'#010+
'# If the fpcpackage variable is set then create and install Package.fp'+
'c,'#010+
'# a safety check is done if Makefile.fpc is available'#010+
'ifdef PACKAGE_VERSION'#010+
- 'ifneq ($(wildca','rd Makefile.fpc),)'#010+
- ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
+ 'ifneq ($(wildcard Makefile.fpc),)'#010+
+ ' $(FPCMAKE) -p -T$(CP','U_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
'endif'#010+
@@ -1908,14 +1927,14 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'endif'#010+
'ifdef INSTALLPPUFILES'#010+
- ' $(MKDIR) $(INSTAL','L_UNITDIR)'#010+
- ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
+ ' $(INSTALL) $(INSTALLPPUFILES',') $(INSTALL_UNITDIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+
' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
'endif'#010+
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
- ' ',' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIB','DIR)'#010+
'ifdef inUnix'#010+
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
'endif'#010+
@@ -1923,44 +1942,46 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'ifdef INSTALL_FILES'#010+
' $(MKDIR) $(INSTALL_DATADIR)'#010+
- ' $(INSTALL) $(INSTALL_FILES) $(IN','STALL_DATADIR)'#010+
+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
'endif'#010+
#010+
- 'fpc_sourceinstall: distclean'#010+
+ 'fpc_sourceinstall: distcl','ean'#010+
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
#010+
'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+
'ARGET_EXAMPLEDIRS))'#010+
- 'ifdef ','HASEXAMPLES'#010+
- ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
+ 'ifdef HASEXAMPLES'#010+
+ ' $(MKDIR) $(INSTALL_EXAMPLED','IR)'#010+
'endif'#010+
'ifdef EXAMPLESOURCEFILES'#010+
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
- ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL','_'+
- 'EXAMPLEDIR)'#010+
+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
+ 'AMPLEDIR)'#010+
'endif'#010+
#010+
'[distinstallrules]'#010+
- '#####################################################################'#010+
+ '########','############################################################'+
+ '#'#010+
'# Dist Install'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_distinstall'#010+
#010+
- 'fpc_distinstall: ins','tall exampleinstall'#010+
+ 'fpc_distinstall: install exampleinstall'#010+
#010+
#010+
'[zipinstallrules]'#010+
- '#####################################################################'#010+
+ '#######','#############################################################'+
+ '#'#010+
'# Zip'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipex','ampleinstall'#010+
+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
#010+
- '# Temporary path to pack a file, can only use a single deep'#010+
+ '# Temporary path to pack a file, ','can only use a single deep'#010+
'# subdir, because the deltree can'#039't see the whole tree to remove'#010+
'ifndef PACKDIR'#010+
'ifndef inUnix'#010+
@@ -1970,7 +1991,7 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- '#',' Maybe create default zipname from packagename'#010+
+ '# Maybe create default zipname from packagename'#010,
'ifndef ZIPNAME'#010+
'ifdef DIST_ZIPNAME'#010+
'ZIPNAME=$(DIST_ZIPNAME)'#010+
@@ -1983,9 +2004,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
'endif'#010+
#010+
- '# Z','ipTarget'#010+
+ '# ZipTarget'#010+
'ifndef ZIPTARGET'#010+
- 'ifdef DIST_ZIPTARGET'#010+
+ 'ifdef DIST_ZIPTARGET'#010,
'ZIPTARGET=DIST_ZIPTARGET'#010+
'else'#010+
'ZIPTARGET=install'#010+
@@ -2000,48 +2021,48 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'# Use a wrapper script by default for Os/2'#010+
- 'ifndef ','inUnix'#010+
+ 'ifndef inUnix'#010+
'USEZIPWRAPPER=1'#010+
'endif'#010+
#010+
- '# We need to be able to run in the current OS so fix'#010+
+ '# We need to be a','ble to run in the current OS so fix'#010+
'# the path separator'#010+
'ifdef USEZIPWRAPPER'#010+
'ZIPPATHSEP=$(PATHSEP)'#010+
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
'else'#010+
'ZIPPATHSEP=/'#010+
- 'endif'#010,
+ 'endif'#010+
#010+
'# Create commands to create the zip/tar file'#010+
- 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
+ 'Z','IPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
'ifdef USETAR'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
- 'ZIPCMD_ZIP:=$(TARPRO','G) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
'else'#010+
- 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
+ 'ZIPDESTFIL','E:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
'TFILE) *'#010+
'endif'#010+
#010+
'fpc_zipinstall:'#010+
- ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PA','CKDIR) ZIPINSTALL=1'#010+
- ' $(MKDIR) $(DIST_DESTDIR)'#010+
+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
+ ' $(MKDIR) $(DIST_DES','TDIR)'#010+
' $(DEL) $(ZIPDESTFILE)'#010+
'ifdef USEZIPWRAPPER'#010+
'# Handle gecho separate as we need to espace \ with \\'#010+
'ifneq ($(ECHOREDIR),echo)'#010+
- ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))"',' > $(ZIPWRAP'+
- 'PER)'#010+
- ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
- #010+
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
+ 'R)'#010+
+ ' $(ECHOREDIR) -e "$(sub','st \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+
+ 'R)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
'ER)'#010+
'else'#010+
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
- ' echo $(ZIPCMD_ZIP) ','>> $(ZIPWRAPPER)'#010+
- ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
+ ' echo $(ZIPCMD_CDBASE) ','>> $(ZIPWRAPPER)'#010+
'endif'#010+
'ifdef inUnix'#010+
' /bin/sh $(ZIPWRAPPER)'#010+
@@ -2053,8 +2074,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'endif'#010+
' $(DEL) $(ZIPWRAPPER)'#010+
- 'else'#010,
- ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
+ 'else'#010+
+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZI','PCMD_CDBASE)'#010+
'endif'#010+
' $(DELTREE) $(PACKDIR)'#010+
#010+
@@ -2063,9 +2084,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'SOURCESUFFIX)'#010+
#010+
'fpc_zipexampleinstall:'#010+
- 'ifdef HASEXAM','PLES'#010+
- ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
- 'PEXAMPLESUFFIX)'#010+
+ 'ifdef HASEXAMPLES'#010+
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=e','xampleinstall ZIPSUFFIX=$('+
+ 'ZIPEXAMPLESUFFIX)'#010+
'endif'#010+
#010+
'fpc_zipdistinstall:'#010+
@@ -2073,25 +2094,25 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[cleanrules]'#010+
- '######################################################','##############'+
- '#'#010+
- '# Clean rules'#010+
'#####################################################################'#010+
+ '# Clean rules'#010+
+ '#################','###################################################'+
+ '#'#010+
#010+
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
#010+
'ifdef EXEFILES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
'))'#010+
- 'overr','ide CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXE'+
+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPR','EFIX),$(CLEANEXE'+
'DBGFILES))'#010+
'endif'#010+
#010+
'ifdef CLEAN_PROGRAMS'#010+
'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
'XEEXT), $(CLEAN_PROGRAMS)))'#010+
- 'override CLEANEXEDBGFILES+=$(addprefix $','(TARGETDIRPREFIX),$(addsuffi'+
- 'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+
+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+
+ '$(EXEDBGEXT), $(C','LEAN_PROGRAMS)))'#010+
'endif'#010+
#010+
'ifdef CLEAN_UNITS'#010+
@@ -2099,29 +2120,29 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
#010+
'ifdef CLEANPPUFILES'#010+
- 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANP','PUFILE'+
- 'S)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+
+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
+ ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPP','UFILES)) $(addprefix $(STATIC'+
'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+
'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+
'ILES)))'#010+
- 'ifdef DEBUGSYMEX','T'#010+
- 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
- 'UFILES))'#010+
+ 'ifdef DEBUGSYMEXT'#010+
+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT)',',$(DEBUGSYMEXT),$(CLEAN'+
+ 'PPUFILES))'#010+
'endif'#010+
'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+
'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+
'LENAMES))'#010+
- 'override CLEANPPULINKFILENAM','ES:=$(CLEANPPULINKFILES)'#010+
- 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+
- 'X),$(CLEANPPULINKFILENAMES)))'#010+
+ 'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+
+ 'override CLEANPPULINKF','ILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+
+ 'FIX),$(CLEANPPULINKFILENAMES)))'#010+
'endif'#010+
#010+
'fpc_clean: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
- '# DELTREE instead of DE','L because on Mac OS X these are directories'#010+
- 'ifdef CLEANEXEDBGFILES'#010+
+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+
+ 'ifd','ef CLEANEXEDBGFILES'#010+
' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+
'endif'#010+
'ifdef CLEANPPUFILES'#010+
@@ -2129,9 +2150,10 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CLEANPPULINKFILES)'#010+
- 'e','ndif'#010+
+ 'endif'#010+
'ifdef CLEANRSTFILES'#010+
- ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
+ ' -$(DEL) $(addp','refix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+
+ #010+
'endif'#010+
'ifdef CLEAN_FILES'#010+
' -$(DEL) $(CLEAN_FILES)'#010+
@@ -2139,16 +2161,16 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifdef LIB_NAME'#010+
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
'endif'#010+
- ' -$(DEL) $(FP','CMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT'+
+ ' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEX','T'+
')'#010+
' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
'ipt.res *_link.res'#010+
' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
'TCHEXT)'#010+
#010+
- 'fpc_cleanall: $(CLEANT','ARGET)'#010+
+ 'fpc_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
- ' -$(DEL) $(CLEANEXEFILES)'#010+
+ ' -$(DEL) $(CL','EANEXEFILES)'#010+
'endif'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
'ifdef CLEANPPUFILES'#010+
@@ -2157,8 +2179,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CLEANPPULINKFILES)'#010+
'endif'#010+
- 'ifdef CLEANRS','TFILES'#010+
- ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
+ 'ifdef CLEANRSTFILES'#010+
+ ' -$(DEL) $(addprefix $(UNITTARGET','DIRPREFIX),$(CLEANRSTFILES))'+
+ #010+
'endif'#010+
'endif'#010+
'ifdef CLEAN_FILES'#010+
@@ -2166,15 +2189,15 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
' -$(DELTREE) units'#010+
' -$(DELTREE) bin'#010+
- ' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) ','*$(RSTEXT) *$(ASMEXT)'+
- ' *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
+ ' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+
+ '$(STATICLIBEXT) *$(SHARE','DLIBEXT) *$(PPLEXT)'#010+
'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+
' -$(DEL) fpcmade.* Package.fpc *.fpm'#010+
- ' -$(DEL) $(FPCEXTFILE) $(REDIR','FILE) script*.res link*.res *_s'+
- 'cript.res *_link.res'#010+
+ ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
+ 'ipt.res *_link','.res'#010+
' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
'TCHEXT)'#010+
'ifdef AOUTEXT'#010+
@@ -2183,8 +2206,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'ifdef DEBUGSYMEXT'#010+
' -$(DEL) *$(DEBUGSYMEXT)'#010+
'endif'#010+
- 'ifdef ','LOCALFPMAKEBIN'#010+
- ' -$(DEL) $(LOCALFPMAKEBIN)'#010+
+ 'ifdef LOCALFPMAKEBIN'#010+
+ ' -$(DEL) $(LOCALFPMAKEBIN',')'#010+
' -$(DEL) $(FPMAKEBINOBJ)'#010+
'endif'#010+
#010+
@@ -2194,8 +2217,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
'[baseinforules]'#010+
'#####################################################################'#010+
'# Base info rules'#010+
- '######################','##############################################'+
- '#'#010+
+ '#####################################################################',
+ #010+
#010+
'.PHONY: fpc_baseinfo'#010+
#010+
@@ -2205,94 +2228,94 @@ const fpcmakeini : array[0..246,1..240] of char=(
' @$(ECHO)'#010+
' @$(ECHO) == Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
- ' @$(ECHO',') Package Version.. $(PACKAGE_VERSION)'#010+
- ' @$(ECHO)'#010+
+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
+ ' ',' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) FPC.......... $(FPC)'#010+
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
- ' @$(ECHO) Source CPU... $(CPU','_SOURCE)'#010+
- ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
+ ' @$(ECHO) Target CPU... $(CPU_','TARGET)'#010+
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
- ' ',' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010,
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Required ','pkgs... $(REQUIRE_PACKAGES)'#010+
+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Basedir......... $(BASEDIR)'#010+
+ ' ',' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
- ' ',' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
- ' @$(ECHO)'#010+
+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
+ ' ',' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Tools info =='#010+
' @$(ECHO)'#010+
- ' @$(EC','HO) As........ $(AS)'#010+
- ' @$(ECHO) Ld........ $(LD)'#010+
+ ' @$(ECHO) As........ $(AS)'#010+
+ ' @$(ECHO) Ld.....','... $(LD)'#010+
' @$(ECHO) Ar........ $(AR)'#010+
' @$(ECHO) Rc........ $(RC)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Mv........ $(MVPROG)'#010+
' @$(ECHO) Cp........ $(CPPROG)'#010+
- ' @$(ECHO) ','Rm........ $(RMPROG)'#010+
- ' @$(ECHO) GInstall.. $(GINSTALL)'#010+
+ ' @$(ECHO) Rm........ $(RMPROG)'#010+
+ ' @$(ECHO) GInstall','.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+
' @$(ECHO) Shell..... $(SHELL)'#010+
' @$(ECHO) Date...... $(DATE)'#010+
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
- ' @$(ECHO) PPUMove.','.. $(PPUMOVE)'#010+
- ' @$(ECHO) Zip....... $(ZIPPROG)'#010+
+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
+ ' @$(ECHO) Zip....... $(ZI','PPROG)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
- ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010,
- ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+
+ ' @$(ECHO) Target Implicit Units. $(TARG','ET_IMPLICITUNITS)'#010+
' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
- ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)',#010+
- ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
+ ' @$(ECHO) Target ExampleDirs.... $(TAR','GET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Install Units...','.... $(INSTALL_UNITS)'#010+
- ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
+ ' @$(ECHO) Install',' Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Install info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
- ' @$(ECHO) ZipName.............. ','$(ZIPNAME)'#010+
- ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
+ ' @$(ECHO) ZipPrefix.........','... $(ZIPPREFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
- ' @$','(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACK','AGE)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
- ' @$(ECHO) Install library dir.. $(INSTALL_LIBD','IR)'#010+
- ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
+ ' @$(ECHO) Install units dir.... $(I','NSTALL_UNITDIR)'#010+
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
- ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLED','IR)'#010+
- ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
+ ' @$(ECHO) Install data dir..... $(I','NSTALL_DATADIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO)'#010+
#010+
'[inforules]'#010+
- '##################','##################################################'+
+ '#################################################################','###'+
'#'#010+
'# Info rules'#010+
'#####################################################################'#010+
@@ -2302,37 +2325,38 @@ const fpcmakeini : array[0..246,1..240] of char=(
'fpc_info: $(INFORULES)'#010+
#010+
'[makefilerules]'#010+
- '##############################################','######################'+
- '#'#010+
- '# Rebuild Makefile'#010+
'#####################################################################'#010+
+ '# Rebuild Makefile'#010+
+ '####','################################################################'+
+ '#'#010+
#010+
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
' \'#010+
' fpc_makefile_dirs'#010+
#010+
'fpc_makefile:'#010+
- ' $(FP','CMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
#010+
- 'fpc_makefile_sub1:'#010+
+ 'fpc_make','file_sub1:'#010+
'ifdef TARGET_DIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
'T_DIRS))'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
- ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Make','file.fpc,$(TAR'+
- 'GET_EXAMPLEDIRS))'#010+
+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
+ 'T_EXAMPLEDIRS))'#010+
'endif'#010+
#010+
- 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
- 'EXAMPLEDIRS))'#010+
+ 'fpc_make','file_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+
+ 'T_EXAMPLEDIRS))'#010+
#010+
'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
#010+
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+
- '[localmakefil','e]'#010+
- '#####################################################################'#010+
+ '[localmakefile]'#010+
+ '############################################','########################'+
+ '#'#010+
'# Local Makefile'#010+
'#####################################################################'#010+
#010+
@@ -2342,15 +2366,16 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
#010+
'[userrules]'#010+
- '######','##############################################################'+
+ '#####################################################','###############'+
'#'#010+
'# Users rules'#010+
'#####################################################################'#010+
#010+
'[lclrules]'#010+
'#####################################################################'#010+
- '# LCL Rule','s'#010+
- '#####################################################################'#010+
+ '# LCL Rules'#010+
+ '#############################################','#######################'+
+ '#'#010+
#010+
'# LCL Platform'#010+
'ifndef LCL_PLATFORM'#010+
@@ -2362,9 +2387,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'endif'#010+
'export LCL_PLATFORM'#010+
#010+
- '# Check if',' the specified LCLDIR is correct'#010+
+ '# Check if the specified LCLDIR is correct'#010+
'ifdef LCLDIR'#010+
- 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
+ 'o','verride LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
@@ -2372,9 +2397,9 @@ const fpcmakeini : array[0..246,1..240] of char=(
'override LCLDIR=wrong'#010+
'endif'#010+
#010+
- '# Check if the default LCLDIR is correct',#010+
+ '# Check if the default LCLDIR is correct'#010+
'ifdef DEFAULT_LCLDIR'#010+
- 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
+ 'override LCLDIR:=$(subst ','\,/,$(DEFAULT_LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
@@ -2382,8 +2407,8 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Check for development version'#010+
'ifeq ($(LCLDIR),wrong)'#010+
- 'override LCLDIR=$(subst /uni','ts/$(LCL_PLATFORM),,$(firstword $(wildca'+
- 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
+ ' $(ad','dsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
@@ -2391,68 +2416,69 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'# Check for release version'#010+
'ifeq ($(LCLDIR),wrong)'#010+
- 'override LCLDIR=$(subst /uni','ts/$(LCL_PLATFORM),,$(firstword $(wildca'+
- 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
+ ' $(ad','dsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
'# Generate dirs'#010+
- 'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM',') $(LCL'+
- 'DIR)/units)'#010+
- 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+
- 'ts $(LCLDIR)/components)'#010+
+ 'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDI'+
+ 'R)/units)'#010+
+ 'override LCLCOMPONENTDIR=$(w','ildcard $(LCLDIR)/.. $(LCLDIR)/../compon'+
+ 'ents $(LCLDIR)/components)'#010+
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
#010+
'# Add LCL dirs to paths'#010+
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
- 'override CO','MPILER_UNITDIR+=$(LCLUNITDIR)'#010+
+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
#010+
'[lclinforules]'#010+
- '#####################################################################'#010+
+ '#','###################################################################'+
+ '#'#010+
'# LCL Info rules'#010+
'#####################################################################'#010+
'override INFORULES+=lclinfo'#010+
#010+
- '.PHONY: ','lclinfo'#010+
+ '.PHONY: lclinfo'#010+
#010+
'lclinfo:'#010+
- ' @$(ECHO) == LCL info =='#010+
+ ' @$(ECHO) == LCL info',' =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
- ' @$(E','CHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010,
' @$(ECHO)'#010+
#010+
'[fpmakeprerules]'#010+
'#####################################################################'#010+
'# fpmake prerules'#010+
- '#####################################################################'#010,
+ '#####################################################################'#010+
'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+
- 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+
+ 'FPMAKEBINOBJ=fpmak','e$(OEXT) fpmake$(LTOEXT)'#010+
'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+
#010+
'# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+
'd --cpu parameters'#010+
'ifdef OS_TARGET'#010+
- 'FPC_TARGETOPT+=--os=$(OS_TA','RGET)'#010+
+ 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+
'endif'#010+
'ifdef CPU_TARGET'#010+
- 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+
+ 'FPC_TARGETOPT+=--c','pu=$(CPU_TARGET)'#010+
'endif'#010+
#010+
'# Get the location of the bootstrap-fpmkunit units'#010+
'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+
- 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAG','ESDIR))))))'#010+
+ 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+
'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+
- 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+
- ')'#010+
+ 'UNI','TDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+
+ 'IX)'#010+
'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+
'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+
- 'FPMKUNIT_PPU','=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+
- 'endif'#010+
+ 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+
+ 'endif'#010,
#010+
'ifdef FPMAKE_SKIP_CONFIG'#010+
'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+
@@ -2461,30 +2487,30 @@ const fpcmakeini : array[0..246,1..240] of char=(
'[fpmakerules]'#010+
'#####################################################################'#010+
'# fpmake rules'#010+
- '############','########################################################'+
+ '###########################################################','#########'+
'#'#010+
'.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+
'pleinstall'#010+
#010+
'# Do not pass the Makefile'#039's unit and binary target locations. fpm'+
'ake uses it'#039's own.'#010+
- 'override FPCOPT',':=$(filter-out -FU%,$(FPCOPT))'#010+
- 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+
+ 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+
+ 'override FPCOPT:','=$(filter-out -FE%,$(FPCOPT))'#010+
'# Compose general fpmake-parameters'#010+
'ifdef FPMAKEOPT'#010+
'FPMAKE_OPT+=$(FPMAKEOPT)'#010+
'endif'#010+
'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+
- 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packa','ges'#010+
+ 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+
'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+
- 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+
+ 'FPMAKE_OPT+=$(','addprefix -o ,$(FPCOPT))'#010+
'FPMAKE_OPT+=--compiler=$(FPC)'#010+
'FPMAKE_OPT+=-bu'#010+
#010+
'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+
'ifdef UNIXHier'#010+
'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+
- 'FPM','AKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VER'+
+ 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIB','DIR)/fpc/$(FPC_VER'+
'SION)'#010+
'else'#010+
'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+
@@ -2492,22 +2518,22 @@ const fpcmakeini : array[0..246,1..240] of char=(
#010+
'override ALLTARGET+=fpc_fpmake'#010+
'override INSTALLTARGET+=fpc_fpmake_install'#010+
- 'override EXAMPLEINSTALLTARGET+=fpc_','fpmake_exampleinstall'#010+
- '# If no fpmake exists and (dist)clean is called, do not try to build f'+
- 'pmake, it will'#010+
+ 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+
+ '# If no fpmake exists and',' (dist)clean is called, do not try to build'+
+ ' fpmake, it will'#010+
'# most often fail because the dependencies are cleared.'#010+
'# In case of a clean, simply do nothing'#010+
- 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),',')'#010+
+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+
'override CLEANTARGET+=fpc_fpmake_clean'#010+
- 'endif'#010+
+ 'endif'#010,
#010+
'$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+
' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+
'T=,$(FPMAKE_BUILD_OPT))'#010+
#010+
'$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+
- ' $(FPCFPMAKE) fpm','ake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNI'+
- 'TDIR)) $(FPMAKE_BUILD_OPT)'#010+
+ ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+
+ 'I','R)) $(FPMAKE_BUILD_OPT)'#010+
#010+
'fpc_fpmake: $(FPMAKEBIN)'#010+
' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+
@@ -2515,15 +2541,15 @@ const fpcmakeini : array[0..246,1..240] of char=(
'fpc_fpmake_clean: $(FPMAKEBIN)'#010+
' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+
#010+
- 'fpc_fpma','ke_install: $(FPMAKEBIN)'#010+
- ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+
- 'PT)'#010+
+ 'fpc_fpmake_install: $(FPMAKEBIN)'#010+
+ ' $(LOCALFPM','AKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL'+
+ '_OPT)'#010+
#010+
'# This is not completely valid. Exampleinstall should only install the'+
' examples, while'#010+
- '# fpmake -ie installs everything, including the examp','les. This also '+
- 'means that on'#010+
- '# a distinstall fpmake install wil be called twice.'#010+
+ '# fpmake -ie installs everything, including the examples. This also me'+
+ 'ans that on'#010+
+ '# a distinstall fp','make install wil be called twice.'#010+
'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+
' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+
'LL_OPT)'#010
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index a4a03e655b..ce74ae9520 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -302,6 +302,13 @@ endif
override FPCOPT+=-Cp$(SUBARCH)
endif
+ifeq ($(FULL_TARGET),arm-freertos)
+ifeq ($(SUBARCH),)
+$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined)
+endif
+override FPCOPT+=-Cp$(SUBARCH)
+endif
+
# Full name of the target, including CPU and OS. For OSs limited
# to 8.3 we only use the target OS
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp
index a7e81ce31b..a9a71440a5 100644
--- a/utils/fpcm/fpcmmain.pp
+++ b/utils/fpcm/fpcmmain.pp
@@ -155,7 +155,7 @@ interface
{dragonfly} ( false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
{ win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false, false),
{ wasm } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false),
- { freertos }( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true )
+ { freertos }( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true )
);
type
diff --git a/utils/fpcm/revision.inc b/utils/fpcm/revision.inc
index c4e38b05ac..314dd66fc0 100644
--- a/utils/fpcm/revision.inc
+++ b/utils/fpcm/revision.inc
@@ -1 +1 @@
-'2020-04-19 hash 9219aaf4db'
+'0 rev 0'
View Lorry Controller Status