diff -Nru fpc-3.2.0+dfsg/debian/changelog fpc-3.2.0+dfsg/debian/changelog
--- fpc-3.2.0+dfsg/debian/changelog	2021-01-12 11:45:42.000000000 +0000
+++ fpc-3.2.0+dfsg/debian/changelog	2021-01-14 20:35:41.000000000 +0000
@@ -1,3 +1,10 @@
+fpc (3.2.0+dfsg-11+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 20 Oct 2014 23:12:17 +0000]
+  * Set compiler defaults for raspbian.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Jan 2021 20:35:41 +0000
+
 fpc (3.2.0+dfsg-11) bullseye; urgency=medium
 
   * Add missing backslash in fp-compiler.postinst (Closes: #979850)
diff -Nru fpc-3.2.0+dfsg/debian/patches/raspbian.diff fpc-3.2.0+dfsg/debian/patches/raspbian.diff
--- fpc-3.2.0+dfsg/debian/patches/raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ fpc-3.2.0+dfsg/debian/patches/raspbian.diff	2021-01-14 20:35:41.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Change compiler defaults for raspbian
+ We need armv6 and vfpv2 rather than armv7 and vfpv3-d16
+Author: Peter Michael Green <plugwash@debian.org>
+
+--- 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;
+ 
++
+   { 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
diff -Nru fpc-3.2.0+dfsg/debian/patches/series fpc-3.2.0+dfsg/debian/patches/series
--- fpc-3.2.0+dfsg/debian/patches/series	2021-01-11 08:52:15.000000000 +0000
+++ fpc-3.2.0+dfsg/debian/patches/series	2021-01-14 20:35:41.000000000 +0000
@@ -23,3 +23,4 @@
 fix-FTBFS-on-m68k.patch
 Fix-liking-with-libc-when-PIC-is-enabled.patch
 fix-utest-version-lists.patch
+raspbian.diff
diff -Nru fpc-3.2.0+dfsg/debian/source/timestamps fpc-3.2.0+dfsg/debian/source/timestamps
--- fpc-3.2.0+dfsg/debian/source/timestamps	2021-01-11 08:52:15.000000000 +0000
+++ fpc-3.2.0+dfsg/debian/source/timestamps	2021-01-14 20:35:41.000000000 +0000
@@ -205,6 +205,8 @@
 fpcsrc/rtl/linux/sysnr-gen.inc 2020-05-14T13:54+00:00
 fpcsrc/rtl/linux/sysosh.inc 2020-05-14T13:54+00:00
 fpcsrc/rtl/linux/termios.inc 2020-05-14T13:54+00:00
+fpcsrc/rtl/linux/x86_64/si_c.inc 2021-01-14T20:47+00:00
+fpcsrc/rtl/m68k/int64p.inc 2021-01-14T20:47+00:00
 fpcsrc/rtl/unix/cthreads.pp 2020-05-14T13:54+00:00
 fpcsrc/rtl/unix/cwstring.pp 2020-05-14T13:54+00:00
 fpcsrc/rtl/unix/dl.pp 2020-05-14T13:54+00:00
@@ -212,7 +214,6 @@
 fpcsrc/tests/test/units/sysutils/texpfncase.pp 2020-05-14T13:54+00:00
 fpcsrc/tests/utils/testsuite/utests.pp 2020-08-19T00:44+00:00
 fpcsrc/utils/fpcm/fpcmmain.pp 2020-05-14T13:54+00:00
-fpcsrc/utils/fpcm/fpcmwr.pp 2020-05-14T13:54+00:00
 fpcsrc/utils/fpcm/fpmake.pp 2020-05-14T13:54+00:00
 fpcsrc/utils/fpcres/fpcres.pas 2020-05-14T13:54+00:00
 fpcsrc/utils/fpcres/target.pas 2020-05-14T13:54+00:00