* LP: #1927192: Don't run dh_strip in debhelper v8 mode, and don't
    strip ld.so.
 
diff -Nru glibc-2.31/debian/rules.d/debhelper.mk glibc-2.31/debian/rules.d/debhelper.mk
--- glibc-2.31/debian/rules.d/debhelper.mk	2020-12-16 12:04:55.000000000 +0100
+++ glibc-2.31/debian/rules.d/debhelper.mk	2021-05-20 11:02:29.000000000 +0200
@@ -51,7 +51,7 @@
 	# work even without that package installed.
 	if test "$(NOSTRIP_$(curpass))" != 1; then					\
 	  if test "$(DEBUG_$(curpass))" = 1; then					\
-	    DH_COMPAT=8 dh_strip -p$(curpass) -Xlibpthread $(DH_STRIP_DEBUG_PACKAGE);	\
+	    dh_strip -p$(curpass) -Xlibpthread -Xld-$(GLIBC_VERSION).so $(DH_STRIP_DEBUG_PACKAGE);	\
 	    for f in $$(find debian/$(curpass) -name libpthread-\*.so) ; do		\
 	      dbgfile=$$(LC_ALL=C readelf -n $$f | sed -e '/Build ID:/!d'		\
 	        -e "s#^.*Build ID: \([0-9a-f]\{2\}\)\([0-9a-f]\+\)#\1/\2.debug#") ;	\
@@ -63,7 +63,7 @@
 	                                 --remove-section=.note $$f ;			\
 	    done ;									\
 	  else										\
-	    DH_COMPAT=8 dh_strip -p$(curpass) -Xlibpthread;				\
+	    dh_strip -p$(curpass) -Xlibpthread -Xld-$(GLIBC_VERSION).so;		\
 	  fi ;										\
 	  for f in $$(find debian/$(curpass) -name \*crt\*.o) ; do			\
 	    $(DEB_HOST_GNU_TYPE)-strip --strip-debug --remove-section=.comment		\