up to 2.40

diff --git a/binutils.spec b/binutils.spec
index bb8fe05c412a71501b289696e388aa2740561b6f..bb502e979c770895f750017f2589efadf17e085e 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -30,13 +30,13 @@ Summary(ru.UTF-8):  Набор инструментов GNU для построе
 Summary(tr.UTF-8):     GNU geliştirme araçları
 Summary(uk.UTF-8):     Набір інструментів GNU для побудови виконуваних програм
 Name:          binutils
-Version:       2.39
-Release:       3
+Version:       2.40
+Release:       1
 Epoch:         4
 License:       GPL v3+
 Group:         Development/Tools
 Source0:       https://ftp.gnu.org/gnu/binutils/%{name}-%{version}.tar.lz
-# Source0-md5: 061a1460a09cc71e51886c008be55d44
+# Source0-md5: be3411283c27eb0984104a2fda12e102
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6
 Patch1:                %{name}-info.patch
@@ -47,7 +47,6 @@ Patch6:               %{name}-absolute-gnu_debuglink-path.patch
 Patch7:                %{name}-libtool-m.patch
 Patch9:                %{name}-tooldir.patch
 Patch10:       %{name}-sanity-check.patch
-Patch11:       pr29451.patch
 URL:           http://www.sourceware.org/binutils/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.11
@@ -70,6 +69,7 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: texinfo >= 4.2
 BuildRequires: zlib-devel
 %{?with_tests:BuildRequires:   zlib-static}
+BuildRequires: zstd-devel
 %{?with_debuginfod:Requires:   elfutils-debuginfod-libs >= 0.179}
 Conflicts:     gcc-c++ < 5:3.3
 Conflicts:     modutils < 2.4.17
@@ -164,7 +164,6 @@ Biblioteki statyczne GNU binutils (libbfd, libopcodes).
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 
 %{__sed} -i -e '1s,.*env perl,#!%{__perl},' gprofng/gp-display-html/gp-display-html.in
 
@@ -357,6 +356,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/gprof.info*
 %{?with_gprofng:%{_infodir}/gprofng.info*}
 %{_infodir}/ld.info*
+%{_infodir}/sframe-spec.info*
 %{_mandir}/man1/addr2line.1*
 %{_mandir}/man1/ar.1*
 %{_mandir}/man1/as.1*
@@ -397,6 +397,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libctf-nobfd.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libctf-nobfd.so.0
 %attr(755,root,root) %{_libdir}/libopcodes-%{version}.so
+%attr(755,root,root) %{_libdir}/libsframe.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsframe.so.0
 %dir %{_libdir}/bfd-plugins
 %attr(755,root,root) %{_libdir}/bfd-plugins/libdep.so
 
@@ -406,12 +408,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libctf.so
 %attr(755,root,root) %{_libdir}/libctf-nobfd.so
 %attr(755,root,root) %{_libdir}/libopcodes.so
+%attr(755,root,root) %{_libdir}/libsframe.so
 %{?with_gprofng:%attr(755,root,root) %{_libdir}/gprofng/libgprofng.so}
 %{_libdir}/libbfd.la
 %{_libdir}/libctf.la
 %{_libdir}/libctf-nobfd.la
 %{_libdir}/libopcodes.la
 %{_libdir}/libiberty.a
+%{_libdir}/libsframe.la
 %{_includedir}/ansidecl.h
 %{_includedir}/bfd.h
 %{_includedir}/bfdlink.h
@@ -420,6 +424,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/diagnostics.h
 %{_includedir}/dis-asm.h
 %{_includedir}/plugin-api.h
+%{_includedir}/sframe-api.h
+%{_includedir}/sframe.h
 %{_includedir}/symcat.h
 %{_includedir}/libiberty
 %if %{with gprofng}
@@ -435,3 +441,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libctf.a
 %{_libdir}/libctf-nobfd.a
 %{_libdir}/libopcodes.a
+%{_libdir}/libsframe.a

diff --git a/pr29451.patch b/pr29451.patch
deleted file mode 100644 (file)
index 9a822ee..0000000
--- a/pr29451.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e8cf73215187b0c08679d726a5cc7c019fa3ea2e Mon Sep 17 00:00:00 2001
-From: Jan Beulich <jbeulich@suse.com>
-Date: Wed, 10 Aug 2022 10:34:22 +0200
-Subject: [PATCH] gas/Dwarf: properly skip zero-size functions
-
-PR gas/29451
-
-While out_debug_abbrev() properly skips such functions, out_debug_info()
-mistakenly didn't. It needs to calculate the high_pc expression ahead of
-time, in order to skip emitting any data for the function if the value
-is zero.
-
-The one case which would still leave a zero-size entry is when
-symbol_get_obj(symp)->size ends up evaluating to zero. I hope we can
-expect that to not be the case, otherwise we'd need to have a way to
-post-process .debug_info contents between resolving expressions and
-actually writing the data out to the file. Even then it wouldn't be
-entirely obvious in which way to alter the data.
-
-(cherry picked from commit d7abcbcea5ddd40a3bf28758b62f35933c59f996)
----
- gas/dwarf2dbg.c | 39 ++++++++++++++++++++-------------------
- 1 file changed, 20 insertions(+), 19 deletions(-)
-
-diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
-index 868ec79ee2c..f346bd6a412 100644
---- a/gas/dwarf2dbg.c
-+++ b/gas/dwarf2dbg.c
-@@ -2882,6 +2882,7 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg,
-       {
-         const char *name;
-         size_t len;
-+        expressionS size = { .X_op = O_constant };
- 
-         /* Skip warning constructs (see above).  */
-         if (symbol_get_bfdsym (symp)->flags & BSF_WARNING)
-@@ -2895,6 +2896,18 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg,
-         if (!S_IS_DEFINED (symp) || !S_IS_FUNCTION (symp))
-           continue;
- 
-+#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */
-+        size.X_add_number = S_GET_SIZE (symp);
-+        if (size.X_add_number == 0 && IS_ELF
-+            && symbol_get_obj (symp)->size != NULL)
-+          {
-+            size.X_op = O_add;
-+            size.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size);
-+          }
-+#endif
-+        if (size.X_op == O_constant && size.X_add_number == 0)
-+          continue;
-+
-         subseg_set (str_seg, 0);
-         name_sym = symbol_temp_new_now_octets ();
-         name = S_GET_NAME (symp);
-@@ -2920,29 +2933,17 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg,
-         emit_expr (&exp, sizeof_address);
- 
-         /* DW_AT_high_pc */
--        exp.X_op = O_constant;
--#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */
--        exp.X_add_number = S_GET_SIZE (symp);
--        if (exp.X_add_number == 0 && IS_ELF
--            && symbol_get_obj (symp)->size != NULL)
--          {
--            exp.X_op = O_add;
--            exp.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size);
--          }
--#else
--        exp.X_add_number = 0;
--#endif
-         if (DWARF2_VERSION < 4)
-           {
--            if (exp.X_op == O_constant)
--              exp.X_op = O_symbol;
--            exp.X_add_symbol = symp;
--            emit_expr (&exp, sizeof_address);
-+            if (size.X_op == O_constant)
-+              size.X_op = O_symbol;
-+            size.X_add_symbol = symp;
-+            emit_expr (&size, sizeof_address);
-           }
--        else if (exp.X_op == O_constant)
--          out_uleb128 (exp.X_add_number);
-+        else if (size.X_op == O_constant)
-+          out_uleb128 (size.X_add_number);
-         else
--          emit_leb128_expr (symbol_get_value_expression (exp.X_op_symbol), 0);
-+          emit_leb128_expr (symbol_get_value_expression (size.X_op_symbol), 0);
-       }
- 
-       /* End of children.  */
--- 
-2.31.1
-