From 591bb6da2e5b1a7906feb36963fe692612331c35 Mon Sep 17 00:00:00 2001
From: Arjun Shankar <arjun@redhat.com>
Date: Thu, 6 Oct 2022 17:08:12 +0200
Subject: [PATCH] Import glibc-2.34-44.fc35 from f35

* Thu Oct 06 2022 Arjun Shankar <arjun@redhat.com> - 2.34-44
- wrap-find-debuginfo.sh: Use nm --format=posix instead of --format=just-symbols

Resolves: #2115831
---
 glibc.spec             | 5 ++++-
 wrap-find-debuginfo.sh | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index a393e5e..62d9d14 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -148,7 +148,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 43%{?dist}
+Release: 44%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -2641,6 +2641,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Thu Oct 06 2022 Arjun Shankar <arjun@redhat.com> - 2.34-44
+- wrap-find-debuginfo.sh: Use nm --format=posix instead of --format=just-symbols
+
 * Mon Oct 03 2022 Arjun Shankar <arjun@redhat.com> - 2.34-43
 - Remove .annobin* symbols from ld.so (#2126477)
 
diff --git a/wrap-find-debuginfo.sh b/wrap-find-debuginfo.sh
index d26f8eb..38c27d0 100644
--- a/wrap-find-debuginfo.sh
+++ b/wrap-find-debuginfo.sh
@@ -136,7 +136,7 @@ done
 debug_base_name=${last_arg:-$RPM_BUILD_ROOT}
 $debugedit -b "$debug_base_name" -d "$debug_dest_name" -n $ldso_path
 # Remove the .annobin* symbols (and only them).
-if nm --format=just-symbols "$ldso_path" \
+if nm --format=posix "$ldso_path" | cut -d' ' -f1 \
 	| grep '^\.annobin' > "$ldso_tmp.annobin-symbols"; then
     objcopy --strip-symbols="$ldso_tmp.annobin-symbols" "$ldso_path"
 fi