From: Peter Michael Green <plugwash@debian.org>
Date: Tue, 21 Sep 2021 19:22:17 +0000 (+0100)
Subject: Change compiler defaults for raspbian
X-Git-Tag: archive/raspbian/3.2.2+dfsg-4+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a854d869540c2b3d805b011b7a2722dcb5873b8f;p=fpc.git

Change compiler defaults for raspbian

We need armv6 and vfpv2 rather than armv7 and vfpv3-d16

Gbp-Pq: Name raspbian.diff
---

diff --git a/fpcsrc/compiler/options.pas b/fpcsrc/compiler/options.pas
index 2cc36670..17319fab 100644
--- a/fpcsrc/compiler/options.pas
+++ b/fpcsrc/compiler/options.pas
@@ -4067,25 +4067,15 @@ begin
       end;
   end;
 
+
   { ARMHF defaults }
   if (target_info.abi = abi_eabihf) then
-    { set default cpu type to ARMv7a for ARMHF unless specified otherwise }
+    { set default cpu type to ARMv6 for ARMHF unless specified otherwise }
     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_armv7a;
-      if not option.OptCPUSetExplicitly then
-        init_settings.optimizecputype:=cpu_armv7a;
-    {$endif CPUARMV6}
 
       { Set FPU type }
       if not(option.FPUSetExplicitly) then