Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/binutils.git#d5e63f6505da9b8093e5137e1a967051bb447abe
This commit is contained in:
DistroBaker 2021-01-18 19:00:47 +00:00
parent 52c43d9b5b
commit fb5bfbf826
2 changed files with 68 additions and 1 deletions

View File

@ -0,0 +1,47 @@
--- binutils.orig/gas/dwarf2dbg.c 2021-01-18 15:02:20.322260068 +0000
+++ binutils-2.35.1/gas/dwarf2dbg.c 2021-01-18 15:04:20.078481127 +0000
@@ -537,7 +537,11 @@ dwarf2_gen_line_info (addressT ofs, stru
if (loc->line == 0)
return;
if (loc->filenum == 0 && DWARF2_LINE_VERSION < 5)
- return;
+ {
+ dwarf_level = 5;
+ if (DWARF2_LINE_VERSION < 5)
+ return;
+ }
/* Don't emit sequences of line symbols for the same line when the
symbols apply to assembler code. It is necessary to emit
@@ -1030,9 +1034,13 @@ dwarf2_directive_filename (void)
if ((offsetT) num < 1 && DWARF2_LINE_VERSION < 5)
{
- as_bad (_("file number less than one"));
- ignore_rest_of_line ();
- return NULL;
+ dwarf_level = 5;
+ if (DWARF2_LINE_VERSION < 5)
+ {
+ as_bad (_("file number less than one"));
+ ignore_rest_of_line ();
+ return NULL;
+ }
}
/* FIXME: Should we allow ".file <N>\n" as an expression meaning
@@ -1129,8 +1137,12 @@ dwarf2_directive_loc (int dummy ATTRIBUT
{
if (filenum != 0 || DWARF2_LINE_VERSION < 5)
{
- as_bad (_("file number less than one"));
- return;
+ dwarf_level = 5;
+ if (DWARF2_LINE_VERSION < 5)
+ {
+ as_bad (_("file number less than one"));
+ return;
+ }
}
}

View File

@ -39,7 +39,7 @@
Summary: A GNU collection of binary utilities
Name: binutils%{?name_cross}%{?_with_debug:-debug}
Version: 2.35.1
Release: 21%{?dist}
Release: 23%{?dist}
License: GPLv3+
URL: https://sourceware.org/binutils
@ -70,6 +70,10 @@ URL: https://sourceware.org/binutils
# Disable if it is necessary to work around bugs in LTO.
%define enable_lto 1
# Enable support for generating new dtags in the linker
# Disable if it is necessary to use RPATH instead.
%define enable_new_dtags 0
# Enable the compression of debug sections as default behaviour of the
# assembler and linker. This option is disabled for now. The assembler and
# linker have command line options to override the default behaviour.
@ -303,6 +307,11 @@ Patch29: binutils-duplicate-sections.patch
# Lifetime: Permanent.
Patch30: binutils-use-long-long.patch
# Purpose: Have the assembler automatically detect the use of DWARF-5
# file numbers, and enable DWARF-5 support.
# Lifetime: Fixed in 2.36.
Patch31: binutils-gas-auto-dwarf-5.patch
#----------------------------------------------------------------------------
Provides: bundled(libiberty)
@ -603,6 +612,9 @@ popd
%if %{enable_lto}
--enable-lto \
%endif
%if %{enable_new_dtags}
--enable-new-dtags \
%endif
%if %{default_compress_debug}
--enable-compressed-debug-sections=all \
%else
@ -768,6 +780,8 @@ rm -rf %{buildroot}%{_infodir}
#rm -rf {buildroot}{_prefix}/share/locale
#rm -rf {buildroot}{_mandir}
rm -rf %{buildroot}%{_libdir}/libiberty.a
# Remove libtool files, which reference the .so libs
rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
%endif
# This one comes from gcc
@ -882,6 +896,12 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Mon Jan 18 2021 Nick Clifton <nickc@redhat.com> - 2.35.1-23
- Add a fix to gas to automatically enable DWARF-5 style file name tables.
* Fri Jan 15 2021 Nick Clifton <nickc@redhat.com> - 2.35.1-22
- Add an option (currently disabled) to build a linker which generates new dtags.
* Tue Jan 12 2021 Nick Clifton <nickc@redhat.com> - 2.35.1-21
- Ensure that bfd.h is the same for i686- and x86_64 versions of the devel rpm. (#1915317)