Manual merge of version 12+rpi1 and 15 to produce 15+rpi1

diff --cc debian/changelog
index 0aea1fa338de6f90eb802e825beb52f55496e599,d7e08d592f2d8c085ea679f8eed783cc3839678f..ea2af9804467efda90d0539a2fbfc41a28ef2a14
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,32 @@@
- gcc-12-cross (12+rpi1) bookworm-staging; urgency=medium
++gcc-12-cross (15+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from gcc-10-cross 11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Sep 2020 23:26:27 +0000]
 +  * Build sufficient cross-compilers on armhf to build u-boot.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 27 Sep 2022 10:24:01 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 23 May 2023 14:47:13 +0000
++
+ gcc-12-cross (15) unstable; urgency=medium
+ 
+   * Build using gcc 12.2.0-14.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 15 Jan 2023 11:54:18 +0100
+ 
+ gcc-12-cross (14) unstable; urgency=medium
+ 
+   * Build using gcc 12.2.0-13.
+   * Update VCS attributes.
+   * Bump standards version.
+   * Tighten build dependency on dpkg-dev.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 07 Jan 2023 09:12:52 +0100
+ 
+ gcc-12-cross (13) unstable; urgency=medium
+ 
+   * Build using gcc 12.2.0-7.
+   * Add arc changes.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 02 Nov 2022 16:48:53 +0100
  
  gcc-12-cross (12) unstable; urgency=medium
  

diff --cc debian/control
index f9aefb8a98e8c131d1797e8c7629a1fddf4e1aaa,afaa160c943aeb0cee7af05fa6e06e170fc73a47..677fc33544f00ce14e612345bf595c3cbd3731b9
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,16 -3,16 +3,16 @@@ Section: deve
  Priority: optional
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.6.0
- Build-Depends: gcc-12-source (>= 12.2.0-3~),
-   gcc-12-base (>= 12.2.0-3~),
-   binutils-multiarch (>= 2.37-5),
+ Standards-Version: 4.6.2
+ Build-Depends: gcc-12-source (>= 12.2.0-14~),
+   gcc-12-base (>= 12.2.0-14~),
+   binutils-multiarch (>= 2.39-6),
    autoconf2.69, bison (>= 1:2.3),
-   chrpath, debhelper (>= 9), dpkg-dev (>= 1.14.15), flex, gawk, gettext,
+   chrpath, debhelper (>= 9), dpkg-dev (>= 1.21.17), flex, gawk, gettext,
    gperf (>= 3.0.1), 
-   binutils-x86-64-linux-gnu (>= 2.37-5) [amd64 arm64 i386 ppc64el x32 armhf], binutils-i686-linux-gnu (>= 2.37-5) [amd64 arm64 ppc64el x32 armhf], binutils-riscv64-linux-gnu (>= 2.37-5) [amd64 i386 x32 arm64 ppc64el armhf], binutils-aarch64-linux-gnu (>= 2.37-5) [amd64 i386 x32 ppc64el armhf],
 -  binutils-x86-64-linux-gnu (>= 2.39-6) [amd64 arm64 i386 ppc64el x32], binutils-s390x-linux-gnu (>= 2.39-6) [amd64 i386 x32 arm64 ppc64el], binutils-powerpc64le-linux-gnu (>= 2.39-6) [amd64 i386 x32 ppc64 arm64], binutils-aarch64-linux-gnu (>= 2.39-6) [amd64 i386 x32 ppc64el], binutils-arm-linux-gnueabihf (>= 2.39-6) [amd64 i386 x32 arm64 ppc64el], binutils-arm-linux-gnueabi (>= 2.39-6) [amd64 i386 x32 arm64 ppc64el], binutils-i686-linux-gnu (>= 2.39-6) [amd64 arm64 ppc64el x32],
 -  libc6-dev-amd64-cross (>= 2.32) [amd64 arm64 i386 ppc64el x32], libc6-dev-s390x-cross (>= 2.32) [amd64 i386 x32 arm64 ppc64el], libc6-dev-ppc64el-cross (>= 2.32) [amd64 i386 x32 ppc64 arm64], libc6-dev-arm64-cross (>= 2.32) [amd64 i386 x32 ppc64el], libc6-dev-armhf-cross (>= 2.32) [amd64 i386 x32 arm64 ppc64el], libc6-dev-armel-cross (>= 2.32) [amd64 i386 x32 arm64 ppc64el], libc6-dev-i386-cross (>= 2.32) [amd64 arm64 ppc64el x32], libc6-dev-i386-amd64-cross [amd64 arm64 i386 ppc64el x32], libc6-dev-x32-amd64-cross [amd64 arm64 i386 ppc64el x32], libc6-dev-amd64-i386-cross [amd64 arm64 ppc64el x32], libc6-dev-x32-i386-cross [amd64 arm64 ppc64el x32], libc6-dev-s390-s390x-cross [amd64 i386 x32 arm64 ppc64el],
 -  linux-libc-dev-amd64-cross [amd64 arm64 i386 ppc64el x32], linux-libc-dev-s390x-cross [amd64 i386 x32 arm64 ppc64el], linux-libc-dev-ppc64el-cross [amd64 i386 x32 ppc64 arm64], linux-libc-dev-arm64-cross [amd64 i386 x32 ppc64el], linux-libc-dev-armhf-cross [amd64 i386 x32 arm64 ppc64el], linux-libc-dev-armel-cross [amd64 i386 x32 arm64 ppc64el], linux-libc-dev-i386-cross [amd64 arm64 ppc64el x32],
++  binutils-x86-64-linux-gnu (>= 2.39-6) [amd64 arm64 i386 ppc64el x32 armhf], binutils-i686-linux-gnu (>= 2.39-6) [amd64 arm64 ppc64el x32 armhf], binutils-riscv64-linux-gnu (>= 2.37-5) [amd64 i386 x32 arm64 ppc64el armhf], binutils-aarch64-linux-gnu (>= 2.39-6) [amd64 i386 x32 ppc64el armhf],
 +  libc6-dev-amd64-cross (>= 2.32) [amd64 arm64 i386 ppc64el x32 armhf], libc6-dev-i386-cross (>= 2.32) [amd64 arm64 ppc64el x32 armhf], libc6-dev-riscv64-cross (>= 2.32) [amd64 i386 x32 arm64 ppc64el armhf], libc6-dev-arm64-cross (>= 2.32) [amd64 i386 x32 ppc64el armhf], libc6-dev-i386-amd64-cross [amd64 arm64 i386 ppc64el x32 armhf], libc6-dev-x32-amd64-cross [amd64 arm64 i386 ppc64el x32 armhf], libc6-dev-amd64-i386-cross [amd64 arm64 ppc64el x32 armhf], libc6-dev-x32-i386-cross [amd64 arm64 ppc64el x32 armhf],
 +  linux-libc-dev-amd64-cross [amd64 arm64 i386 ppc64el x32 armhf], linux-libc-dev-i386-cross [amd64 arm64 ppc64el x32 armhf], linux-libc-dev-riscv64-cross [amd64 i386 x32 arm64 ppc64el armhf], linux-libc-dev-arm64-cross [amd64 i386 x32 ppc64el armhf],
    libisl-dev (>= 0.22.1-1~), libmpc-dev,
    libmpfr-dev (>= 2.3.0), libtool, lsb-release, m4, make (>= 3.81),
    dwz, pkg-config, libgc-dev,

diff --cc debian/rules
index a12a32111d4161a51d39f4903e41efbb430676f5,68fad8cb6e106305730931c649f2f94a8f79e873..cfc3661beb2ad28f0f17cfd8e54a1ffd9b04aa69
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -52,12 -51,13 +51,13 @@@ CROSS_BIARCH_s390x:=s39
  HOST_ARCHS_alpha = amd64 i386 x32
  # FIXME: adding amd64 in HOST_ARCHS_amd64 hard codes the indep build
  # to amd64 buildds ...
 -HOST_ARCHS_amd64 = amd64 arm64 i386 ppc64el x32
 +HOST_ARCHS_amd64 = amd64 arm64 i386 ppc64el x32 armhf
+ HOST_ARCHS_arc = amd64 i386 x32
  HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el
  HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el
 -HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el
 +HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el armhf
  HOST_ARCHS_hppa = amd64 i386 x32
 -HOST_ARCHS_i386 = amd64 arm64 ppc64el x32
 +HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 armhf
  HOST_ARCHS_m68k = amd64 i386 x32
  HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el
  HOST_ARCHS_ppc64 = amd64 i386 x32