diff -u gcc-6-6.4.0/debian/changelog gcc-6-6.4.0/debian/changelog
--- gcc-6-6.4.0/debian/changelog
+++ gcc-6-6.4.0/debian/changelog
@@ -1,3 +1,17 @@
+gcc-6 (6.4.0-22ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build from upstream sources.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 24 Sep 2018 14:09:02 +0200
+
+gcc-6 (6.4.0-22) unstable; urgency=medium
+
+  * Update to SVN 20180921 (r264530) from the gcc-6-branch.
+    - Fix libsanitizer build failure on sparc64.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 24 Sep 2018 13:50:28 +0200
+
 gcc-6 (6.4.0-21ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian; remaining changes:
diff -u gcc-6-6.4.0/debian/patches/svn-updates.diff gcc-6-6.4.0/debian/patches/svn-updates.diff
--- gcc-6-6.4.0/debian/patches/svn-updates.diff
+++ gcc-6-6.4.0/debian/patches/svn-updates.diff
@@ -1,10 +1,10 @@
-# DP: updates from the 6 branch upto 20180921 (r264459).
+# DP: updates from the 6 branch upto 20180924 (r264530).
 
 last_update()
 {
 	cat > ${dir}LAST_UPDATED <EOF
-Fri Sep 21 09:58:50 CEST 2018
-Fri Sep 21 07:58:50 UTC 2018 (revision 264459)
+Mon Sep 24 13:28:31 CEST 2018
+Mon Sep 24 11:28:31 UTC 2018 (revision 264530)
 EOF
 }
 
@@ -463,7 +463,7 @@
 +  || defined(__x86_64__)
 +#define SIZEOF_STRUCT_USTAT 32
 +#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
-+  || defined(__powerpc__) || defined(__s390__)
++  || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
 +#define SIZEOF_STRUCT_USTAT 20
 +#else
 +#error Unknown size of struct ustat
@@ -525,7 +525,16 @@
 ===================================================================
 --- a/src/libsanitizer/ChangeLog	(.../tags/gcc_6_4_0_release)
 +++ b/src/libsanitizer/ChangeLog	(.../branches/gcc-6-branch)
-@@ -1,3 +1,25 @@
+@@ -1,3 +1,34 @@
++2017-09-23  Matthias Klose  <doko@ubuntu.com>
++
++	Backported from the gcc-7-branch:
++	2018-05-31  Matthias Klose  <doko@ubuntu.com>
++
++	PR sanitizer/86012
++	* sanitizer_common/sanitizer_platform_limits_posix.cc: Define
++	SIZEOF_STRUCT_USTAT for 32bit sparc.
++
 +2017-09-21  Matthias Klose  <doko@ubuntu.com>
 +
 +	Backported from the gcc-7-branch:
@@ -11284,7 +11293,7 @@
 +++ b/src/gcc/DATESTAMP	(.../branches/gcc-6-branch)
 @@ -1 +1 @@
 -20170704
-+20180921
++20180924
 Index: gcc/valtrack.c
 ===================================================================
 --- a/src/gcc/valtrack.c	(.../tags/gcc_6_4_0_release)
diff -u gcc-6-6.4.0/debian/rules.defs gcc-6-6.4.0/debian/rules.defs
--- gcc-6-6.4.0/debian/rules.defs
+++ gcc-6-6.4.0/debian/rules.defs
@@ -1593,7 +1593,7 @@
     with_check := disabled for $(DEB_HOST_ARCH), testsuite timeouts with expect
   endif
 endif
-with_check := disabled for this upload
+#with_check := disabled for this upload
 
 # not a dependency on all archs, but if available, use it for the testsuite
 ifneq (,$(wildcard /usr/bin/localedef))
diff -u gcc-6-6.4.0/debian/rules.parameters gcc-6-6.4.0/debian/rules.parameters
--- gcc-6-6.4.0/debian/rules.parameters
+++ gcc-6-6.4.0/debian/rules.parameters
@@ -2,14 +2,14 @@
 GCC_VERSION	:= 6.4.0
 NEXT_GCC_VERSION	:= 6.4.1
 BASE_VERSION	:= 6
-SOURCE_VERSION	:= 6.4.0-21ubuntu1
-DEB_VERSION	:= 6.4.0-21ubuntu1
-DEB_EVERSION	:= 1:6.4.0-21ubuntu1
-DEB_GDC_VERSION	:= 6.4.0-21ubuntu1
+SOURCE_VERSION	:= 6.4.0-22ubuntu1
+DEB_VERSION	:= 6.4.0-22ubuntu1
+DEB_EVERSION	:= 1:6.4.0-22ubuntu1
+DEB_GDC_VERSION	:= 6.4.0-22ubuntu1
 DEB_SOVERSION	:= 5
 DEB_SOEVERSION	:= 1:5
 DEB_LIBGCC_SOVERSION	:= 
-DEB_LIBGCC_VERSION	:= 1:6.4.0-21ubuntu1
+DEB_LIBGCC_VERSION	:= 1:6.4.0-22ubuntu1
 DEB_STDCXX_SOVERSION	:= 5
 DEB_GCJ_SOVERSION	:= 5
 PKG_GCJ_EXT	:= 17