From: Peter Michael Green <plugwash@raspbian.org>
Date: Mon, 24 Aug 2020 23:51:36 +0000 (+0000)
Subject: Update raspbian quilt patch for fpc 3.2
X-Git-Tag: archive/raspbian/3.2.0+dfsg-8+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cfad8a7c7998bfe25f320a0902abba62849db672;p=fpc.git

Update raspbian quilt patch for fpc 3.2
---

diff --git a/debian/patches/raspbian.diff b/debian/patches/raspbian.diff
index a42b77c7..fa315d17 100644
--- a/debian/patches/raspbian.diff
+++ b/debian/patches/raspbian.diff
@@ -2,55 +2,33 @@ Description: Change compiler defaults for raspbian
  We need armv6 and vfpv2 rather than armv7 and vfpv3-d16
 Author: Peter Michael Green <plugwash@debian.org>
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: fpc-3.0.0+dfsg/fpcsrc/compiler/options.pas
-===================================================================
---- fpc-3.0.0+dfsg.orig/fpcsrc/compiler/options.pas
-+++ fpc-3.0.0+dfsg/fpcsrc/compiler/options.pas
-@@ -3692,7 +3692,8 @@ begin
-     begin
-       if not(option.FPUSetExplicitly) then
-         begin
--          init_settings.fputype:=fpu_vfpv3_d16
-+          //RPI -- reduce default fpu to vfpv2
-+          init_settings.fputype:=fpu_vfpv2
-         end
-       else
-         begin
-@@ -3729,10 +3730,9 @@ begin
+--- fpc-3.2.0+dfsg.orig/fpcsrc/compiler/options.pas
++++ fpc-3.2.0+dfsg/fpcsrc/compiler/options.pas
+@@ -4067,25 +4067,15 @@ begin
        end;
    end;
  
--{ set default cpu type to ARMv7a for ARMHF unless specified otherwise }
-+{ set default cpu type to ARMv6 for Raspbian 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
-@@ -3741,12 +3741,6 @@ if (target_info.abi = abi_eabihf) 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}
-   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}
  
-   if (init_settings.instructionset=is_thumb) and not(CPUARM_HAS_THUMB2 in cpu_capabilities[init_settings.cputype]) then
+       { Set FPU type }
+       if not(option.FPUSetExplicitly) then