diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-none-gcc7-bootstrap.changes b/cross-arm-none-gcc7-bootstrap.changes
index 7e263e5..d092ab4 100644
--- a/cross-arm-none-gcc7-bootstrap.changes
+++ b/cross-arm-none-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-none-gcc7.changes b/cross-arm-none-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-arm-none-gcc7.changes
+++ b/cross-arm-none-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes
index 7e263e5..d092ab4 100644
--- a/cross-avr-gcc7-bootstrap.changes
+++ b/cross-avr-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index 7e263e5..d092ab4 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index 7e263e5..d092ab4 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index 7e263e5..d092ab4 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc.spec.in b/gcc.spec.in
index f23bff3..5ec6c07 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1375,6 +1375,9 @@ mkdir ../testresults
 %endif
 
 %install
+# Make sure libtool re-linking libasan at install time doesn't drop the
+# libstdc++ reference to make asan of C++ modules in python work
+export SUSE_ASNEEDED=0
 export NO_BRP_CHECK_BYTECODE_VERSION=true
 cd obj-%{GCCDIST}
 # GCC-TESTSUITE-DELETE-BEGIN
@@ -1383,6 +1386,14 @@ export _POSIX2_VERSION=199209
 export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi}
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# verify libasan really ended up with libstdc++ as NEEDED.
+%ifarch %asan_arch
+  readelf -d $RPM_BUILD_ROOT%{versmainlibdir}/libasan.so.%{libasan_sover}* | grep 'NEEDED.*libstdc++' || exit 1
+%if %{biarch}
+  readelf -d $RPM_BUILD_ROOT%{versmainlibdirbi}/libasan.so.%{libasan_sover}* | grep 'NEEDED.*libstdc++' || exit 1
+%endif
+%endif
+
 # Remove some useless .la files
 for lib in libobjc libgfortran libquadmath libcaf_single \
     libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgo \
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index 7e263e5..d092ab4 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec
index f4b6e54..fbf078e 100644
--- a/gcc7-testresults.spec
+++ b/gcc7-testresults.spec
@@ -759,6 +759,9 @@ mkdir ../testresults
 %endif
 
 %install
+# Make sure libtool re-linking libasan at install time doesn't drop the
+# libstdc++ reference to make asan of C++ modules in python work
+export SUSE_ASNEEDED=0
 export NO_BRP_CHECK_BYTECODE_VERSION=true
 cd obj-%{GCCDIST}
 %if 0%{?run_tests:1} 
diff --git a/gcc7.changes b/gcc7.changes
index 7e263e5..d092ab4 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  9 13:51:55 UTC 2018 - rguenther@suse.com
+
+- Set SUSE_ASNEEDED to zero during %install so libasan keeps its
+  NEEDED entry for libstdc++.so.  [GCC#84428]
+
 -------------------------------------------------------------------
 Fri Apr  6 09:05:43 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc7.spec b/gcc7.spec
index 12aa648..bfdacfe 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -2063,6 +2063,9 @@ mkdir ../testresults
 %endif
 
 %install
+# Make sure libtool re-linking libasan at install time doesn't drop the
+# libstdc++ reference to make asan of C++ modules in python work
+export SUSE_ASNEEDED=0
 export NO_BRP_CHECK_BYTECODE_VERSION=true
 cd obj-%{GCCDIST}
 # Work around tail/head -1 changes
@@ -2070,6 +2073,14 @@ export _POSIX2_VERSION=199209
 export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi}
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# verify libasan really ended up with libstdc++ as NEEDED.
+%ifarch %asan_arch
+  readelf -d $RPM_BUILD_ROOT%{versmainlibdir}/libasan.so.%{libasan_sover}* | grep 'NEEDED.*libstdc++' || exit 1
+%if %{biarch}
+  readelf -d $RPM_BUILD_ROOT%{versmainlibdirbi}/libasan.so.%{libasan_sover}* | grep 'NEEDED.*libstdc++' || exit 1
+%endif
+%endif
+
 # Remove some useless .la files
 for lib in libobjc libgfortran libquadmath libcaf_single \
     libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgo \