diff -Nru klibc-2.0.10/debian/changelog klibc-2.0.10/debian/changelog
--- klibc-2.0.10/debian/changelog	2022-01-30 23:28:16.000000000 +0000
+++ klibc-2.0.10/debian/changelog	2022-02-03 18:25:41.000000000 +0000
@@ -1,3 +1,10 @@
+klibc (2.0.10-4+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 2.0.4-2+rpi1 by Peter Michael Green <plugwash@p10link.net> at Wed, 26 Nov 2014 22:01:00 +0000]
+  * Change compiler settings to values suitable for raspberry pi
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 Feb 2022 18:25:41 +0000
+
 klibc (2.0.10-4) unstable; urgency=medium
 
   * d/control, d/rules: Remove ccache from $PATH instead of Build-Conflicting
diff -Nru klibc-2.0.10/debian/rules klibc-2.0.10/debian/rules
--- klibc-2.0.10/debian/rules	2022-01-30 22:49:22.000000000 +0000
+++ klibc-2.0.10/debian/rules	2022-02-03 18:25:41.000000000 +0000
@@ -20,7 +20,7 @@
 KLIBC_MAKEFLAGS := CONFIG_AEABI=y
 endif
 ifeq ($(DEB_HOST_ARCH),armhf)
-KLIBC_MAKEFLAGS := CONFIG_AEABI=y CPU_ARCH=armv7-a+fp CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y
+KLIBC_MAKEFLAGS := CONFIG_AEABI=y CPU_ARCH=armv6+fp CPU_TUNE=arm1176jzf-s CONFIG_KLIBC_THUMB=n
 endif
 ifeq ($(DEB_HOST_ARCH),hppa)
 KLIBCARCH := parisc