Fix more compile time warnings generated by badly indented sources.
This commit is contained in:
parent
b117b11140
commit
bf77df855c
@ -185,3 +185,113 @@
|
||||
|
||||
/* Now let bfd_perform_relocation finish everything up. */
|
||||
return bfd_reloc_continue;
|
||||
--- ../binutils-2.26.orig/bfd/elf64-s390.c 2016-02-09 15:01:11.983640775 +0000
|
||||
+++ bfd/elf64-s390.c 2016-02-09 15:01:37.675779605 +0000
|
||||
@@ -337,10 +337,10 @@ elf_s390_reloc_name_lookup (bfd *abfd AT
|
||||
&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
|
||||
return &elf_howto_table[i];
|
||||
|
||||
- if (strcasecmp (elf64_s390_vtinherit_howto.name, r_name) == 0)
|
||||
- return &elf64_s390_vtinherit_howto;
|
||||
- if (strcasecmp (elf64_s390_vtentry_howto.name, r_name) == 0)
|
||||
- return &elf64_s390_vtentry_howto;
|
||||
+ if (strcasecmp (elf64_s390_vtinherit_howto.name, r_name) == 0)
|
||||
+ return &elf64_s390_vtinherit_howto;
|
||||
+ if (strcasecmp (elf64_s390_vtentry_howto.name, r_name) == 0)
|
||||
+ return &elf64_s390_vtentry_howto;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
--- ../binutils-2.26.orig/bfd/pe-mips.c 2016-02-09 15:01:11.995640840 +0000
|
||||
+++ bfd/pe-mips.c 2016-02-09 15:31:21.348317265 +0000
|
||||
@@ -95,44 +95,44 @@ coff_mips_reloc (bfd *abfd,
|
||||
#define DOIT(x) \
|
||||
x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + (diff >> howto->rightshift)) & 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;
|
||||
+
|
||||
+ case 1:
|
||||
+ {
|
||||
+ short x = bfd_get_16 (abfd, addr);
|
||||
+
|
||||
+ DOIT (x);
|
||||
+ bfd_put_16 (abfd, (bfd_vma) x, addr);
|
||||
+ }
|
||||
+ break;
|
||||
|
||||
- switch (howto->size)
|
||||
+ case 2:
|
||||
{
|
||||
- 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;
|
||||
+ long x = bfd_get_32 (abfd, addr);
|
||||
|
||||
- default:
|
||||
- abort ();
|
||||
+ 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/gas/config/tc-ia64.c 2016-02-09 15:01:12.086641332 +0000
|
||||
+++ gas/config/tc-ia64.c 2016-02-09 15:30:18.562003661 +0000
|
||||
@@ -4360,7 +4360,8 @@ dot_prologue (int dummy ATTRIBUTE_UNUSED
|
||||
as_warn (_("Pointless use of zero first operand to .prologue"));
|
||||
else
|
||||
mask = e.X_add_number;
|
||||
- n = popcount (mask);
|
||||
+
|
||||
+ n = popcount (mask);
|
||||
|
||||
if (sep == ',')
|
||||
parse_operand_and_eval (&e, 0);
|
||||
|
@ -20,7 +20,7 @@
|
||||
Summary: A GNU collection of binary utilities
|
||||
Name: %{?cross}binutils%{?_with_debug:-debug}
|
||||
Version: 2.26
|
||||
Release: 8%{?dist}
|
||||
Release: 9%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Development/Tools
|
||||
URL: http://sources.redhat.com/binutils
|
||||
@ -503,6 +503,10 @@ exit 0
|
||||
%endif # %{isnative}
|
||||
|
||||
%changelog
|
||||
* Tue Feb 09 2016 Nick Clifton <nickc@redhat.com> 2.26-9
|
||||
- Fix indentation in bfd/elf64-s390.c, gas/config/tc-ia64.c
|
||||
and bfd/pe-mips.c to avoid compile time warnings.
|
||||
|
||||
* Thu Feb 04 2016 Nick Clifton <nickc@redhat.com> 2.26-8
|
||||
- Fix indentation in bfd/coff-[i386|x86_64].c to avoid compile time warning.
|
||||
- Suppress GOLD's dir_caches destructor.
|
||||
|
Loading…
Reference in New Issue
Block a user