diff -Nru binutils-xtensa-lx106-2/debian/changelog binutils-xtensa-lx106-3/debian/changelog
--- binutils-xtensa-lx106-2/debian/changelog	2019-02-22 17:13:02.000000000 +0000
+++ binutils-xtensa-lx106-3/debian/changelog	2019-08-21 11:23:00.000000000 +0000
@@ -1,3 +1,11 @@
+binutils-xtensa-lx106 (3) unstable; urgency=medium
+
+  * Strip new binutils version date suffix from upstream directory name
+    (Closes: #935274)
+  * Don't error out on a compiler warning
+
+ -- Jonathan McDowell <noodles@earth.li>  Wed, 21 Aug 2019 12:23:00 +0100
+
 binutils-xtensa-lx106 (2) unstable; urgency=medium
 
   * Remove unnecessary build-deps (Closes: #921851)
diff -Nru binutils-xtensa-lx106-2/debian/rules binutils-xtensa-lx106-3/debian/rules
--- binutils-xtensa-lx106-2/debian/rules	2018-12-29 18:18:36.000000000 +0000
+++ binutils-xtensa-lx106-3/debian/rules	2019-08-21 11:18:18.000000000 +0000
@@ -13,13 +13,16 @@
 deb_upstream_version := $(shell echo $(deb_version) | cut -d- -f1)
 base_version := $(shell echo $(deb_version) | sed -e 's/\([1-9]\.[0-9]\).*-.*/\1/')
 
-upstream_dir=binutils-$(deb_upstream_version)
+upstream_dir := binutils-$(shell echo $(deb_upstream_version) | sed -Ee 's/\.[0-9]{8}//')
 
 untar_stamp=$(stampdir)/tar
 
 buildflags=$(shell dpkg-buildflags --export=configure)
 BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W binutils-source)
 
+# Need to override the -Wall that will get added otherwise
+CFLAGS="-O2 -g"
+
 configure_flags = \
 	--target=$(target) \
 	--prefix=/usr/lib \
@@ -30,6 +33,7 @@
 	--pdfdir=/usr/share/doc/$(package)/pdf \
 	--mandir=/usr/share/man \
 	--disable-nls \
+	--disable-werror \
 	--enable-plugins \
 	--enable-interwork \
 	--with-system-zlib \