debian/changelog

@@ -70,6 +70,9 @@ glibc (2.29-0experimental0) UNRELEASED; urgency=medium
   * debian/patches/any/git-socket-constants.diff: backport upstream change to
     use in-tree copy of SO_ constants for !__USE_MISC to fix compatibility
     with recent kernel headers.
+  * debian/shlibs-add-udebs: remove the udeb entries automatically added by
+    dh_makeshlibs before proceeding to workaround debhelper bugs#934889 and
+    #934891.
   [ YunQiang Su ]
   * Fix ld.so link on mips{64,n32}r6{,el}.  Closes: #933513.

debian/shlibs-add-udebs

@@ -40,6 +40,10 @@ expr_libc2="libutil$W libcrypt$W librt$W libpthread$W libmvec$W"
 expr_libc3="libnss_dns$W libnss_files$W"
 expr_hurd="libmachuser$W libhurduser$W"
 
+# Remove udeb entries wrongly added by dh_makeshlibs (see bugs #934889
+# and #934891)
+sed -i -e '/^udeb:/d' $shlibs_file
+
 for expr in $expr_libc1 $expr_libc2 $expr_libc3 $expr_hurd; do
 	add_udeb_line "$expr" $package-udeb
 done

debian/testsuite-xfail-debian.mk

@@ -873,31 +873,9 @@ endif
 # riscv64
 ######################################################################
 ifeq ($(config-machine)-$(config-os),riscv64-linux-gnu)
-test-xfail-test-double-isgreater = yes
-test-xfail-test-double-isgreaterequal = yes
-test-xfail-test-double-isless = yes
-test-xfail-test-double-islessequal = yes
-test-xfail-test-float-isgreater = yes
-test-xfail-test-float-isgreaterequal = yes
-test-xfail-test-float-isless = yes
-test-xfail-test-float-islessequal = yes
-test-xfail-test-float32-isgreater = yes
-test-xfail-test-float32-isgreaterequal = yes
-test-xfail-test-float32-isless = yes
-test-xfail-test-float32-islessequal = yes
-test-xfail-test-float32x-isgreater = yes
-test-xfail-test-float32x-isgreaterequal = yes
-test-xfail-test-float32x-isless = yes
-test-xfail-test-float32x-islessequal = yes
-test-xfail-test-float64-isgreater = yes
-test-xfail-test-float64-isgreaterequal = yes
-test-xfail-test-float64-isless = yes
-test-xfail-test-float64-islessequal = yes
 test-xfail-tst-cond-except = yes
 test-xfail-tst-cond24 = yes
 test-xfail-tst-cond25 = yes
-test-xfail-tst-execstack = yes
-test-xfail-tst-execstack-needed = yes
 test-xfail-tst-malloc-usable-tunables = yes
 test-xfail-tst-resolv-res_init = yes
 test-xfail-tst-resolv-res_init-thread = yes