Merge version 2.33.1-2+rpi1 and 2.33.1-4 to produce 2.33.1-4+rpi1

diff --cc debian/changelog
index 0107c6da8dad18b01446f071b78a6f2da7d4deb6,cf714ef89bcbca53b9c4ba90d631bbf1023e05cf..3c9705a291afb308645719ffbc11dd0f7cf03fa6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- binutils (2.33.1-2+rpi1) bullseye-staging; urgency=medium
++binutils (2.33.1-4+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Nov 2019 07:28:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Nov 2019 20:28:20 +0000
++
+ binutils (2.33.1-4) unstable; urgency=medium
+ 
+   * Configure with --enable-mips-fix-loongson3-llsc=yes on mipsel, mips64el,
+     mipsn32el (YunQiang Su).
+   * Enable building mipsel and mips64el targets on arm64 and ppc64el (YunQiang
+     Su). Addresses: #938979.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 21 Nov 2019 15:28:14 +0100
  
  binutils (2.33.1-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge