diff -Nru fpc-3.2.2+dfsg/debian/changelog fpc-3.2.2+dfsg/debian/changelog
--- fpc-3.2.2+dfsg/debian/changelog	2021-10-30 12:46:26.000000000 +0000
+++ fpc-3.2.2+dfsg/debian/changelog	2022-02-20 19:45:37.000000000 +0000
@@ -1,3 +1,17 @@
+fpc (3.2.2+dfsg-4+rpi2) bookworm-staging; urgency=medium
+
+  * Apply hack to work around binutils bug https://sourceware.org/bugzilla/show_bug.cgi?id=28848
+  * Fix clean target.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 20 Feb 2022 19:45:37 +0000
+
+fpc (3.2.2+dfsg-4+rpi1) bookworm-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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 07 Dec 2021 14:56:06 +0000
+
 fpc (3.2.2+dfsg-4) unstable; urgency=medium
 
   * Updated list of expected failed tests.
diff -Nru fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch
--- fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch	1970-01-01 00:00:00.000000000 +0000
+++ fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch	2022-02-20 19:36:30.000000000 +0000
@@ -0,0 +1,14 @@
+Set ABI tags in cprt0.as to work around binutils fussiness
+
+This should not be pushed upstream or to Debian as it will almost certainly
+break things on soft float targets.
+
+--- fpc-3.2.2+dfsg/fpcsrc/rtl/linux/arm/cprt0.as	2013-06-27 14:01:18.000000000 +0000
++++ fpc-3.2.2+dfsg/fpcsrc/rtl/linux/arm/cprt0.as	2022-02-20 19:18:21.442456415 +0000
+@@ -146,3 +146,6 @@
+ 3:      .align 4
+ 
+ .section .note.GNU-stack,"",%progbits
++
++.eabi_attribute 28, 1 @Tag_ABI_VFP_args
++.eabi_attribute 10, 2 @Tag_FP_arch
diff -Nru fpc-3.2.2+dfsg/debian/patches/raspbian.diff fpc-3.2.2+dfsg/debian/patches/raspbian.diff
--- fpc-3.2.2+dfsg/debian/patches/raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ fpc-3.2.2+dfsg/debian/patches/raspbian.diff	2021-12-07 14:56:06.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.2+dfsg/debian/patches/series fpc-3.2.2+dfsg/debian/patches/series
--- fpc-3.2.2+dfsg/debian/patches/series	2021-10-23 14:26:00.000000000 +0000
+++ fpc-3.2.2+dfsg/debian/patches/series	2022-02-20 19:36:55.000000000 +0000
@@ -23,3 +23,5 @@
 m68k-disable-FPU-inlining.patch
 Fix-liking-with-libc-when-PIC-is-enabled.patch
 fix-utest-version-lists.patch
+raspbian.diff
+force-abi-tags-in-cprt0.patch
diff -Nru fpc-3.2.2+dfsg/debian/rules fpc-3.2.2+dfsg/debian/rules
--- fpc-3.2.2+dfsg/debian/rules	2021-10-23 14:26:00.000000000 +0000
+++ fpc-3.2.2+dfsg/debian/rules	2022-02-20 19:45:37.000000000 +0000
@@ -242,6 +242,9 @@
 	rm -f $(DEB_BUILD_FPC_OPT)
 	rm -f $(DEB_HOST_FPC_OPT)
 
+	#cleanup a file that got left behind by a failed build
+	rm -f fpcdocs/link*.res
+
 	dh_clean
 
 FPCMAKEFILES=fpcsrc/Makefile.fpc $(shell find demo fpcdocs -name Makefile.fpc)