Manual merge of version 2.0.8-6.1+rpi1 and 2.0.10-4 to produce 2.0.10-4+rpi1

diff --cc debian/changelog
index bfafe983253ef3140aa7c55bb6f03f04f2b516ee,e55077c91a1e7f926c9a30b03f10d9dc623f8cb7..3cbcf8851b86758f859f728d3a48211d89f0f014
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,59 +1,66 @@@
- klibc (2.0.8-6.1+rpi1) bullseye-staging; urgency=medium
++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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Jun 2021 20:07:05 +0000
++ -- 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
+   * d/salsa-ci.yml: Add CI configuration for salsa.debian.org
+   * d/tests: Add klcc smoke test
+   * Fix header installation from out-of-tree build (Closes: #1004465)
+ 
+  -- Ben Hutchings <benh@debian.org>  Mon, 31 Jan 2022 00:28:16 +0100
+ 
+ klibc (2.0.10-3) unstable; urgency=medium
+ 
+   * ia64: Fix out-of-tree build
+ 
+  -- Ben Hutchings <benh@debian.org>  Sat, 01 Jan 2022 16:55:44 +0100
+ 
+ klibc (2.0.10-2) unstable; urgency=medium
+ 
+   * Use KCFLAGS to pass options to Kbuild, rather than CFLAGS and LDFLAGS
+     (fixes FTBFS on several architectures)
+ 
+  -- Ben Hutchings <benh@debian.org>  Fri, 31 Dec 2021 15:05:03 +0100
+ 
+ klibc (2.0.10-1) unstable; urgency=medium
+ 
+   * New upstream version:
+     - Build fixes for Clang (Closes: #787063):
+       - Kbuild: Fix include path for Clang builds
+       - sparc64: Remove redundant/unsupported compiler option -mptr64
+       - s390: mmap: Change inline assembly to work with Clang
+   * debian/rules: Pass through $(CC), $(CC_FOR_BUILD), and $(LD) to ease
+     building with alternate toolchain
+   * debian/rules: Build under debian/build
+   * debian/rules: Put test output under debian/build
+   * Fix warnings from dh_missing:
+     - debian/not-installed: Note duplicate klibc-<hash>.so as not installed
+     - debian/libklibc-dev.manpages: Install klcc.1 from debian/tmp
+   * debian/*.{install,manpages}: Delete redundant debian/tmp/ prefixes
+   * libklibc-dev: Add generated perl dependency for klcc
+   * debian/*.lintian-overrides: Delete obsolete overrides
+   * debian/libklibc.lintian-overrides: Override
+     arch-dependent-file-not-in-arch-specific-directory
+   * Kbuild: Use provided CFLAGS, LDFLAGS
+   * debian/rules: Use -f{debug,macro}-prefix-map to keep build dir out of
+     binaries
+ 
+  -- Ben Hutchings <benh@debian.org>  Thu, 30 Dec 2021 21:54:47 +0100
+ 
+ klibc (2.0.9-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * armhf: Update compiler options for gcc 11 (Closes: #996906)
+   * sig{set,long}jmp: do not ignore sigsetjmp's second argument
+     (Closes: #988027)
+   * Fix implementation of utimes
+ 
+  -- Ben Hutchings <benh@debian.org>  Mon, 27 Dec 2021 00:17:05 +0100
  
  klibc (2.0.8-6.1) unstable; urgency=medium
  

diff --cc debian/rules
index e7a5d8fe010d38ad83d497746defd90e9053b4fe,ce1380efb0e9ad31e6f2cf2fb7b88e517610c068..966a9c41a888a2d6fed22c210361c4f3b24ffad7
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -16,7 -20,7 +20,7 @@@ ifeq ($(DEB_HOST_ARCH),armel
  KLIBC_MAKEFLAGS := CONFIG_AEABI=y
  endif
  ifeq ($(DEB_HOST_ARCH),armhf)
- KLIBC_MAKEFLAGS := CONFIG_AEABI=y CPU_ARCH=armv6 CPU_TUNE=arm1176jzf-s CONFIG_KLIBC_THUMB=n
 -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