From 58a7baa62b5b3da0ce203ea740f58eca68734a81 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 24 Jul 2012 17:11:09 +0000 Subject: [PATCH] * build an armhf armv6 compiler if it is built by an armhf armv6 compiler git-svn-id: trunk@21966 - --- compiler/options.pas | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/compiler/options.pas b/compiler/options.pas index b1ede54375..98b5221cd8 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -3175,10 +3175,21 @@ if (target_info.system=system_arm_darwin) then { set default cpu type to ARMv7 for ARMHF unless specified otherwise } if (target_info.abi = abi_eabihf) then begin +{$ifdef CPUARMV6} + { if the compiler is built for armv6, then + inherit this setting, e.g. Raspian is armhf but + only armv6, this makes rebuilds of the compiler + easier } + if not option.CPUSetExplicitly then + init_settings.cputype:=cpu_armv6; + if not option.OptCPUSetExplicitly then + init_settings.optimizecputype:=cpu_armv6; +{$else CPUARMV6} if not option.CPUSetExplicitly then init_settings.cputype:=cpu_armv7; if not option.OptCPUSetExplicitly then init_settings.optimizecputype:=cpu_armv7; +{$endif CPUARMV6} end; {$endif arm}