SHA256
3
0
forked from pool/binutils

Meeh, refresh patch with fuzz.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=190
This commit is contained in:
Michael Matz 2015-07-09 14:47:53 +00:00 committed by Git OBS Bridge
parent d30ea5816d
commit 347c51db60

View File

@ -37,13 +37,13 @@ include/elf/
include/elf/s390.h | 15 +++++++++++-- include/elf/s390.h | 15 +++++++++++--
6 files changed, 159 insertions(+), 3 deletions(-) 6 files changed, 159 insertions(+), 3 deletions(-)
diff --git a/bfd/elf-s390-common.c b/bfd/elf-s390-common.c Index: binutils-2.25.0/bfd/elf-s390-common.c
index c74883c..de87ff8 100644 ===================================================================
--- a/bfd/elf-s390-common.c --- binutils-2.25.0.orig/bfd/elf-s390-common.c 2015-07-09 16:44:50.000000000 +0200
+++ b/bfd/elf-s390-common.c +++ binutils-2.25.0/bfd/elf-s390-common.c 2015-07-09 16:44:51.000000000 +0200
@@ -242,3 +242,61 @@ elf_s390_add_symbol_hook (bfd *abfd, @@ -254,3 +254,61 @@ elf_s390_elf_sort_relocs_p (asection *se
{
return TRUE; return (sec->flags & SEC_CODE) == 0;
} }
+ +
+/* Merge object attributes from IBFD into OBFD. Raise an error if +/* Merge object attributes from IBFD into OBFD. Raise an error if
@ -103,11 +103,11 @@ index c74883c..de87ff8 100644
+ +
+ return TRUE; + return TRUE;
+} +}
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c Index: binutils-2.25.0/bfd/elf32-s390.c
index ebcb028..64819b9 100644 ===================================================================
--- a/bfd/elf32-s390.c --- binutils-2.25.0.orig/bfd/elf32-s390.c 2015-07-09 16:44:50.000000000 +0200
+++ b/bfd/elf32-s390.c +++ binutils-2.25.0/bfd/elf32-s390.c 2015-07-09 16:44:51.000000000 +0200
@@ -3980,9 +3980,18 @@ elf_s390_plt_sym_val (bfd_vma i, const asection *plt, @@ -4001,9 +4001,18 @@ elf_s390_plt_sym_val (bfd_vma i, const a
return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE; return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE;
} }
@ -126,11 +126,11 @@ index ebcb028..64819b9 100644
elf_elfheader (obfd)->e_flags |= elf_elfheader (ibfd)->e_flags; elf_elfheader (obfd)->e_flags |= elf_elfheader (ibfd)->e_flags;
return TRUE; return TRUE;
} }
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c Index: binutils-2.25.0/bfd/elf64-s390.c
index b2f1aa5..bbdee31 100644 ===================================================================
--- a/bfd/elf64-s390.c --- binutils-2.25.0.orig/bfd/elf64-s390.c 2015-07-09 16:44:50.000000000 +0200
+++ b/bfd/elf64-s390.c +++ binutils-2.25.0/bfd/elf64-s390.c 2015-07-09 16:44:51.000000000 +0200
@@ -3766,6 +3766,21 @@ elf_s390_plt_sym_val (bfd_vma i, const asection *plt, @@ -3766,6 +3766,21 @@ elf_s390_plt_sym_val (bfd_vma i, const a
return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE; return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE;
} }
@ -152,7 +152,7 @@ index b2f1aa5..bbdee31 100644
/* Why was the hash table entry size definition changed from /* Why was the hash table entry size definition changed from
ARCH_SIZE/8 to 4? This breaks the 64 bit dynamic linker and ARCH_SIZE/8 to 4? This breaks the 64 bit dynamic linker and
this is the only reason for the s390_elf64_size_info structure. */ this is the only reason for the s390_elf64_size_info structure. */
@@ -3824,7 +3839,8 @@ const struct elf_size_info s390_elf64_size_info = @@ -3824,7 +3839,8 @@ const struct elf_size_info s390_elf64_si
#define bfd_elf64_bfd_is_local_label_name elf_s390_is_local_label_name #define bfd_elf64_bfd_is_local_label_name elf_s390_is_local_label_name
#define bfd_elf64_bfd_link_hash_table_create elf_s390_link_hash_table_create #define bfd_elf64_bfd_link_hash_table_create elf_s390_link_hash_table_create
#define bfd_elf64_bfd_reloc_type_lookup elf_s390_reloc_type_lookup #define bfd_elf64_bfd_reloc_type_lookup elf_s390_reloc_type_lookup
@ -162,11 +162,11 @@ index b2f1aa5..bbdee31 100644
#define elf_backend_adjust_dynamic_symbol elf_s390_adjust_dynamic_symbol #define elf_backend_adjust_dynamic_symbol elf_s390_adjust_dynamic_symbol
#define elf_backend_check_relocs elf_s390_check_relocs #define elf_backend_check_relocs elf_s390_check_relocs
diff --git a/binutils/readelf.c b/binutils/readelf.c Index: binutils-2.25.0/binutils/readelf.c
index 0c00b2f..9ae3cc6 100644 ===================================================================
--- a/binutils/readelf.c --- binutils-2.25.0.orig/binutils/readelf.c 2015-07-09 16:44:50.000000000 +0200
+++ b/binutils/readelf.c +++ binutils-2.25.0/binutils/readelf.c 2015-07-09 16:44:51.000000000 +0200
@@ -12273,6 +12273,41 @@ display_power_gnu_attribute (unsigned char * p, @@ -12462,6 +12462,41 @@ display_power_gnu_attribute (unsigned ch
return display_tag_value (tag & 1, p, end); return display_tag_value (tag & 1, p, end);
} }
@ -208,7 +208,7 @@ index 0c00b2f..9ae3cc6 100644
static void static void
display_sparc_hwcaps (int mask) display_sparc_hwcaps (int mask)
{ {
@@ -13044,6 +13079,13 @@ process_power_specific (FILE * file) @@ -13233,6 +13268,13 @@ process_power_specific (FILE * file)
} }
static int static int
@ -222,7 +222,7 @@ index 0c00b2f..9ae3cc6 100644
process_sparc_specific (FILE * file) process_sparc_specific (FILE * file)
{ {
return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL,
@@ -14803,6 +14845,10 @@ process_arch_specific (FILE * file) @@ -15046,6 +15088,10 @@ process_arch_specific (FILE * file)
case EM_PPC: case EM_PPC:
return process_power_specific (file); return process_power_specific (file);
break; break;
@ -233,11 +233,11 @@ index 0c00b2f..9ae3cc6 100644
case EM_SPARC: case EM_SPARC:
case EM_SPARC32PLUS: case EM_SPARC32PLUS:
case EM_SPARCV9: case EM_SPARCV9:
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo Index: binutils-2.25.0/gas/doc/as.texinfo
index 2c7d71e..21e11c4 100644 ===================================================================
--- a/gas/doc/as.texinfo --- binutils-2.25.0.orig/gas/doc/as.texinfo 2015-07-09 16:44:51.000000000 +0200
+++ b/gas/doc/as.texinfo +++ binutils-2.25.0/gas/doc/as.texinfo 2015-07-09 16:44:51.000000000 +0200
@@ -7086,6 +7086,22 @@ The vector ABI used by this object file. The value will be: @@ -7086,6 +7086,22 @@ The vector ABI used by this object file.
@end itemize @end itemize
@end table @end table
@ -260,22 +260,21 @@ index 2c7d71e..21e11c4 100644
@node Defining New Object Attributes @node Defining New Object Attributes
@section Defining New Object Attributes @section Defining New Object Attributes
diff --git a/include/elf/s390.h b/include/elf/s390.h Index: binutils-2.25.0/include/elf/s390.h
index 02e1db2..2aea3bb 100644 ===================================================================
--- a/include/elf/s390.h --- binutils-2.25.0.orig/include/elf/s390.h 2015-01-15 09:57:57.000000000 +0100
+++ b/include/elf/s390.h +++ binutils-2.25.0/include/elf/s390.h 2015-07-09 16:44:51.000000000 +0200
@@ -129,6 +129,17 @@ START_RELOC_NUMBERS (elf_s390_reloc_type) @@ -129,6 +129,17 @@ START_RELOC_NUMBERS (elf_s390_reloc_type
RELOC_NUMBER (R_390_GNU_VTENTRY, 251) RELOC_NUMBER (R_390_GNU_VTENTRY, 251)
END_RELOC_NUMBERS (R_390_max) END_RELOC_NUMBERS (R_390_max)
-#endif /* _ELF_390_H */ -#endif /* _ELF_390_H */
-
+/* Object attribute tags. */ +/* Object attribute tags. */
+enum +enum
+{ +{
+ /* 0-3 are generic. */ + /* 0-3 are generic. */
+ /* 4 is reserved for the FP ABI. */ + /* 4 is reserved for the FP ABI. */
+
+ /* Vector ABI: + /* Vector ABI:
+ 0 = not affected by the vector ABI, or not tagged. + 0 = not affected by the vector ABI, or not tagged.
+ 1 = software vector ABI being used + 1 = software vector ABI being used
@ -284,6 +283,3 @@ index 02e1db2..2aea3bb 100644
+}; +};
+#endif /* _ELF_390_H */ +#endif /* _ELF_390_H */
--
2.3.0