7 files changed, 4 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index 4d671f9..320299c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gcc-5 (5-20150226-2) UNRELEASED; urgency=medium
 
   * Enable libsanitizer for AArch64.
+  * Remove the support to build empty libsanitizer packages on powerpc
+    and ppc64; libsanitizer should be stable on these architectures.
 
  -- Matthias Klose <doko@debian.org>  Thu, 26 Feb 2015 14:13:18 +0100
 
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index c730b44..56a8574 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -102,11 +102,9 @@ ifeq ($(with_qmath),yes)
 		$(d_gcc)/$(docdir)/$(p_xbase)/quadmath/changelog
 endif
 ifeq ($(with_asan),yes)
-  ifneq ($(empty_sanitizer_packages),yes)
 	mv $(d)/$(usr_lib)/libsanitizer*.spec $(d_gcc)/$(gcc_lib_dir)/
 	cp -p $(srcdir)/libsanitizer/ChangeLog \
 		$(d_gcc)/$(docdir)/$(p_xbase)/sanitizer/changelog
-  endif
 endif
 ifeq ($(with_cilkrts),yes)
 	mv $(d)/$(usr_lib)/libcilkrts.spec $(d_gcc)/$(gcc_lib_dir)/
diff --git a/debian/rules.d/binary-libasan.mk b/debian/rules.d/binary-libasan.mk
index 95f0a02..8822034 100644
--- a/debian/rules.d/binary-libasan.mk
+++ b/debian/rules.d/binary-libasan.mk
@@ -25,8 +25,7 @@ define __do_asan
 
 	rm -rf $(d_l) $(d_d)
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
-	$(if $(empty_sanitizer_packages),, \
-	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libasan.so.* )
+	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libasan.so.*
 
 	debian/dh_doclink -p$(p_l) $(p_base)
 	debian/dh_doclink -p$(p_d) $(p_base)
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index a2c78bb..2d17710 100644
--- a/debian/rules.d/binary-libgcc.mk
+++ b/debian/rules.d/binary-libgcc.mk
@@ -237,7 +237,6 @@ define __do_gcc_devels2
 	$(if $(filter yes, $(with_atomic)),
 		$(call install_gcc_lib,libatomic,$(ATOMIC_SONAME),$(1),$(2))
 	)
-	$(if $(empty_sanitizer_packages),,
 	$(if $(filter yes, $(with_asan)),
 		$(call install_gcc_lib,libasan,$(ASAN_SONAME),$(1),$(2))
 		mv $(4)/libasan_preinit.o debian/$(2)/$(3)/;
@@ -251,7 +250,6 @@ define __do_gcc_devels2
 	$(if $(filter yes, $(with_ubsan)),
 		$(call install_gcc_lib,libubsan,$(UBSAN_SONAME),$(1),$(2))
 	)
-	)
 	$(if $(filter yes, $(with_vtv)),
 		$(call install_gcc_lib,libvtv,$(VTV_SONAME),$(1),$(2))
 	)
diff --git a/debian/rules.d/binary-libubsan.mk b/debian/rules.d/binary-libubsan.mk
index 278ee49..f6a2c49 100644
--- a/debian/rules.d/binary-libubsan.mk
+++ b/debian/rules.d/binary-libubsan.mk
@@ -25,8 +25,7 @@ define __do_ubsan
 
 	rm -rf $(d_l) $(d_d)
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
-	$(if $(empty_sanitizer_packages),, \
-	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libubsan.so.* )
+	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libubsan.so.*
 
 	debian/dh_doclink -p$(p_l) $(p_base)
 	debian/dh_doclink -p$(p_d) $(p_base)
diff --git a/debian/rules.defs b/debian/rules.defs
index 2cebffc..118ec89 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1064,13 +1064,6 @@ ifneq (,$(filter $(DEB_TARGET_ARCH),$(ubsan_archs)))
   with_ubsan := yes
 endif
 
-# not yet completely ported, and causing kernel crashes running the tests
-ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc ppc64 ppc64el))
-  ifneq (,$(filter $(distrelease),squeeze wheezy jessie sid precise trusty utopic vivid))
-    empty_sanitizer_packages := yes
-  endif
-endif
-
 # libvtv --------------------
 with_vtv :=
 with_vtv := $(call envfilt, vtv, , , $(with_vtv))
diff --git a/debian/rules2 b/debian/rules2
index eb57c02..b093b21 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -269,10 +269,6 @@ ifneq ($(with_asan),yes)
   CONFARGS += --disable-libsanitizer
 endif
 
-ifeq ($(empty_sanitizer_packages),yes)
-  CONFARGS += --disable-libsanitizer
-endif
-
 ifneq ($(with_qmath),yes)
   CONFARGS += --disable-libquadmath
 endif