Corrected fix for formatting problems.
This commit is contained in:
parent
18938e5300
commit
783dd1f082
@ -77,190 +77,3 @@
|
||||
# Check if size relocation works at run-time.
|
||||
catch "exec tmpdir/size-7.exe > tmpdir/dump.out" exec_output
|
||||
if ![string match "" $exec_output] then {
|
||||
--- binutils-2.26.orig/bfd/coff-i386.c 2016-02-04 10:31:44.684793142 +0000
|
||||
+++ binutils-2.26/bfd/coff-i386.c 2016-02-04 10:32:02.106891045 +0000
|
||||
@@ -139,41 +139,41 @@ coff_i386_reloc (bfd *abfd,
|
||||
#define DOIT(x) \
|
||||
x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
|
||||
|
||||
- if (diff != 0)
|
||||
- {
|
||||
- reloc_howto_type *howto = reloc_entry->howto;
|
||||
- unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
+ if (diff != 0)
|
||||
+ {
|
||||
+ reloc_howto_type *howto = reloc_entry->howto;
|
||||
+ unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
+
|
||||
+ switch (howto->size)
|
||||
+ {
|
||||
+ case 0:
|
||||
+ {
|
||||
+ char x = bfd_get_8 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_8 (abfd, x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
|
||||
- switch (howto->size)
|
||||
+ case 1:
|
||||
{
|
||||
- case 0:
|
||||
- {
|
||||
- char x = bfd_get_8 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_8 (abfd, x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 1:
|
||||
- {
|
||||
- short x = bfd_get_16 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 2:
|
||||
- {
|
||||
- long x = bfd_get_32 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
+ short x = bfd_get_16 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
|
||||
- default:
|
||||
- abort ();
|
||||
+ case 2:
|
||||
+ {
|
||||
+ long x = bfd_get_32 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
}
|
||||
- }
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ abort ();
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Now let bfd_perform_relocation finish everything up. */
|
||||
return bfd_reloc_continue;
|
||||
--- binutils-2.26.orig/bfd/coff-x86_64.c 2016-02-04 10:31:44.686793153 +0000
|
||||
+++ binutils-2.26/bfd/coff-x86_64.c 2016-02-04 10:33:02.044227862 +0000
|
||||
@@ -138,59 +138,61 @@ coff_amd64_reloc (bfd *abfd,
|
||||
#define DOIT(x) \
|
||||
x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
|
||||
|
||||
- if (diff != 0)
|
||||
- {
|
||||
- reloc_howto_type *howto = reloc_entry->howto;
|
||||
- unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
-
|
||||
- /* FIXME: We do not have an end address for data, so we cannot
|
||||
- accurately range check any addresses computed against it.
|
||||
- cf: PR binutils/17512: file: 1085-1761-0.004.
|
||||
- For now we do the best that we can. */
|
||||
- if (addr < (unsigned char *) data || addr > ((unsigned char *) data) + input_section->size)
|
||||
+ if (diff != 0)
|
||||
+ {
|
||||
+ reloc_howto_type *howto = reloc_entry->howto;
|
||||
+ unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
+
|
||||
+ /* FIXME: We do not have an end address for data, so we cannot
|
||||
+ accurately range check any addresses computed against it.
|
||||
+ cf: PR binutils/17512: file: 1085-1761-0.004.
|
||||
+ For now we do the best that we can. */
|
||||
+ if (addr < (unsigned char *) data
|
||||
+ || addr > ((unsigned char *) data) + input_section->size)
|
||||
+ {
|
||||
+ bfd_set_error (bfd_error_bad_value);
|
||||
+ return bfd_reloc_notsupported;
|
||||
+ }
|
||||
+
|
||||
+ switch (howto->size)
|
||||
+ {
|
||||
+ case 0:
|
||||
{
|
||||
- bfd_set_error (bfd_error_bad_value);
|
||||
- return bfd_reloc_notsupported;
|
||||
+ char x = bfd_get_8 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_8 (abfd, x, addr);
|
||||
}
|
||||
+ break;
|
||||
|
||||
- switch (howto->size)
|
||||
+ case 1:
|
||||
{
|
||||
- case 0:
|
||||
- {
|
||||
- char x = bfd_get_8 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_8 (abfd, x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 1:
|
||||
- {
|
||||
- short x = bfd_get_16 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 2:
|
||||
- {
|
||||
- long x = bfd_get_32 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
- case 4:
|
||||
- {
|
||||
- long long x = bfd_get_64 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_64 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- default:
|
||||
- bfd_set_error (bfd_error_bad_value);
|
||||
- return bfd_reloc_notsupported;
|
||||
+ short x = bfd_get_16 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
}
|
||||
- }
|
||||
+ break;
|
||||
+
|
||||
+ case 2:
|
||||
+ {
|
||||
+ long x = bfd_get_32 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
+ case 4:
|
||||
+ {
|
||||
+ long long x = bfd_get_64 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_64 (abfd, (bfd_vma) x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ bfd_set_error (bfd_error_bad_value);
|
||||
+ return bfd_reloc_notsupported;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Now let bfd_perform_relocation finish everything up. */
|
||||
return bfd_reloc_continue;
|
||||
|
187
binutils-2.26-formatting.patch
Normal file
187
binutils-2.26-formatting.patch
Normal file
@ -0,0 +1,187 @@
|
||||
--- ../binutils-2.26.orig/bfd/coff-i386.c 2016-02-04 10:31:44.684793142 +0000
|
||||
+++ bfd/coff-i386.c 2016-02-04 10:32:02.106891045 +0000
|
||||
@@ -139,41 +139,41 @@ coff_i386_reloc (bfd *abfd,
|
||||
#define DOIT(x) \
|
||||
x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
|
||||
|
||||
- if (diff != 0)
|
||||
- {
|
||||
- reloc_howto_type *howto = reloc_entry->howto;
|
||||
- unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
+ if (diff != 0)
|
||||
+ {
|
||||
+ reloc_howto_type *howto = reloc_entry->howto;
|
||||
+ unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
+
|
||||
+ switch (howto->size)
|
||||
+ {
|
||||
+ case 0:
|
||||
+ {
|
||||
+ char x = bfd_get_8 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_8 (abfd, x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
|
||||
- switch (howto->size)
|
||||
+ case 1:
|
||||
{
|
||||
- case 0:
|
||||
- {
|
||||
- char x = bfd_get_8 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_8 (abfd, x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 1:
|
||||
- {
|
||||
- short x = bfd_get_16 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 2:
|
||||
- {
|
||||
- long x = bfd_get_32 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
+ short x = bfd_get_16 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
|
||||
- default:
|
||||
- abort ();
|
||||
+ case 2:
|
||||
+ {
|
||||
+ long x = bfd_get_32 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
}
|
||||
- }
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ abort ();
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Now let bfd_perform_relocation finish everything up. */
|
||||
return bfd_reloc_continue;
|
||||
--- ../binutils-2.26.orig/bfd/coff-x86_64.c 2016-02-04 10:31:44.686793153 +0000
|
||||
+++ bfd/coff-x86_64.c 2016-02-04 10:33:02.044227862 +0000
|
||||
@@ -138,59 +138,61 @@ coff_amd64_reloc (bfd *abfd,
|
||||
#define DOIT(x) \
|
||||
x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
|
||||
|
||||
- if (diff != 0)
|
||||
- {
|
||||
- reloc_howto_type *howto = reloc_entry->howto;
|
||||
- unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
-
|
||||
- /* FIXME: We do not have an end address for data, so we cannot
|
||||
- accurately range check any addresses computed against it.
|
||||
- cf: PR binutils/17512: file: 1085-1761-0.004.
|
||||
- For now we do the best that we can. */
|
||||
- if (addr < (unsigned char *) data || addr > ((unsigned char *) data) + input_section->size)
|
||||
+ if (diff != 0)
|
||||
+ {
|
||||
+ reloc_howto_type *howto = reloc_entry->howto;
|
||||
+ unsigned char *addr = (unsigned char *) data + reloc_entry->address;
|
||||
+
|
||||
+ /* FIXME: We do not have an end address for data, so we cannot
|
||||
+ accurately range check any addresses computed against it.
|
||||
+ cf: PR binutils/17512: file: 1085-1761-0.004.
|
||||
+ For now we do the best that we can. */
|
||||
+ if (addr < (unsigned char *) data
|
||||
+ || addr > ((unsigned char *) data) + input_section->size)
|
||||
+ {
|
||||
+ bfd_set_error (bfd_error_bad_value);
|
||||
+ return bfd_reloc_notsupported;
|
||||
+ }
|
||||
+
|
||||
+ switch (howto->size)
|
||||
+ {
|
||||
+ case 0:
|
||||
{
|
||||
- bfd_set_error (bfd_error_bad_value);
|
||||
- return bfd_reloc_notsupported;
|
||||
+ char x = bfd_get_8 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_8 (abfd, x, addr);
|
||||
}
|
||||
+ break;
|
||||
|
||||
- switch (howto->size)
|
||||
+ case 1:
|
||||
{
|
||||
- case 0:
|
||||
- {
|
||||
- char x = bfd_get_8 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_8 (abfd, x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 1:
|
||||
- {
|
||||
- short x = bfd_get_16 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- case 2:
|
||||
- {
|
||||
- long x = bfd_get_32 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
- case 4:
|
||||
- {
|
||||
- long long x = bfd_get_64 (abfd, addr);
|
||||
- DOIT (x);
|
||||
- bfd_put_64 (abfd, (bfd_vma) x, addr);
|
||||
- }
|
||||
- break;
|
||||
-
|
||||
- default:
|
||||
- bfd_set_error (bfd_error_bad_value);
|
||||
- return bfd_reloc_notsupported;
|
||||
+ short x = bfd_get_16 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
}
|
||||
- }
|
||||
+ break;
|
||||
+
|
||||
+ case 2:
|
||||
+ {
|
||||
+ long x = bfd_get_32 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_32 (abfd, (bfd_vma) x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
+ case 4:
|
||||
+ {
|
||||
+ long long x = bfd_get_64 (abfd, addr);
|
||||
+ DOIT (x);
|
||||
+ bfd_put_64 (abfd, (bfd_vma) x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ bfd_set_error (bfd_error_bad_value);
|
||||
+ return bfd_reloc_notsupported;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Now let bfd_perform_relocation finish everything up. */
|
||||
return bfd_reloc_continue;
|
@ -20,7 +20,7 @@
|
||||
Summary: A GNU collection of binary utilities
|
||||
Name: %{?cross}binutils%{?_with_debug:-debug}
|
||||
Version: 2.26
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Development/Tools
|
||||
URL: http://sources.redhat.com/binutils
|
||||
@ -56,6 +56,7 @@ Patch13: binutils-2.23.2-aarch64-em.patch
|
||||
Patch14: binutils-2.24-ldforcele.patch
|
||||
# Patch15: binutils-2.25.1-plugin-format-checking.patch
|
||||
Patch16: binutils-2.25.1-cleansweep.patch
|
||||
Patch17: binutils-2.26-formatting.patch
|
||||
|
||||
Provides: bundled(libiberty)
|
||||
|
||||
@ -180,6 +181,7 @@ using libelf instead of BFD.
|
||||
%endif
|
||||
# %patch15 -p1
|
||||
%patch16 -p0
|
||||
%patch17 -p0
|
||||
|
||||
# We cannot run autotools as there is an exact requirement of autoconf-2.59.
|
||||
|
||||
@ -499,7 +501,7 @@ exit 0
|
||||
%endif # %{isnative}
|
||||
|
||||
%changelog
|
||||
* Thu Feb 04 2016 Nick Clifton <nickc@redhat.com> 2.26-6
|
||||
* Thu Feb 04 2016 Nick Clifton <nickc@redhat.com> 2.26-7
|
||||
- Fix indentation in bfd/coff-[i386|x86_64].c to avoid compile time warning.
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.26-5
|
||||
|
Loading…
Reference in New Issue
Block a user