diff -Nru klibc-2.0.7/debian/changelog klibc-2.0.7/debian/changelog
--- klibc-2.0.7/debian/changelog	2019-10-08 01:14:11.000000000 +0000
+++ klibc-2.0.7/debian/changelog	2019-10-15 13:14:45.000000000 +0000
@@ -1,3 +1,10 @@
+klibc (2.0.7-1+rpi1) bullseye-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>  Tue, 15 Oct 2019 13:14:45 +0000
+
 klibc (2.0.7-1) unstable; urgency=medium
 
   [ Ben Hutchings ]
diff -Nru klibc-2.0.7/debian/rules klibc-2.0.7/debian/rules
--- klibc-2.0.7/debian/rules	2019-10-08 01:14:09.000000000 +0000
+++ klibc-2.0.7/debian/rules	2019-10-15 13:14:45.000000000 +0000
@@ -16,7 +16,7 @@
 KLIBC_MAKEFLAGS := CONFIG_AEABI=y
 endif
 ifeq ($(DEB_HOST_ARCH),armhf)
-KLIBC_MAKEFLAGS := CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y
+KLIBC_MAKEFLAGS := CONFIG_AEABI=y CPU_ARCH=armv6 CPU_TUNE=arm1176jzf-s CONFIG_KLIBC_THUMB=n
 endif
 ifeq ($(DEB_HOST_ARCH),hppa)
 KLIBCARCH := parisc