diff --git a/glibc.spec b/glibc.spec index 1a6f107..0e74f08 100644 --- a/glibc.spec +++ b/glibc.spec @@ -2184,6 +2184,9 @@ update_gconv_modules_cache () %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Wed Sep 14 2022 Florian Weimer - 2.36.9000-7 +- Remove .annobin* symbols from ld.so (#2126477) + * Tue Sep 13 2022 Florian Weimer - 2.36.9000-6 - Drop glibc-deprecated-selinux-makedb.patch. Upstream has been ported to new libselinux. diff --git a/wrap-find-debuginfo.sh b/wrap-find-debuginfo.sh index 6b9a835..42b3609 100644 --- a/wrap-find-debuginfo.sh +++ b/wrap-find-debuginfo.sh @@ -135,6 +135,10 @@ while true ; do 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). +nm --format=just-symbols "$ldso_path" \ + | grep '^\.annobin' > "$ldso_tmp.annobin-symbols" +objcopy --strip-symbols="$ldso_tmp.annobin-symbols" "$ldso_path" # Apply single-file DWARF optimization. dwz $ldso_path