import binutils-2.30-93.el8
This commit is contained in:
parent
c0f7dba1a9
commit
60624efec1
|
@ -0,0 +1,547 @@
|
||||||
|
diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.30/bfd/elfnn-aarch64.c
|
||||||
|
--- binutils.orig/bfd/elfnn-aarch64.c 2020-11-04 14:53:52.144476367 +0000
|
||||||
|
+++ binutils-2.30/bfd/elfnn-aarch64.c 2020-11-04 14:56:42.275422499 +0000
|
||||||
|
@@ -2191,6 +2191,9 @@ struct elf_aarch64_obj_tdata
|
||||||
|
|
||||||
|
/* Zero to warn when linking objects with incompatible wchar_t sizes. */
|
||||||
|
int no_wchar_size_warning;
|
||||||
|
+
|
||||||
|
+ /* All GNU_PROPERTY_AARCH64_FEATURE_1_AND properties. */
|
||||||
|
+ uint32_t gnu_and_prop;
|
||||||
|
};
|
||||||
|
|
||||||
|
#define elf_aarch64_tdata(bfd) \
|
||||||
|
@@ -9311,6 +9314,32 @@ elfNN_aarch64_backend_symbol_processing
|
||||||
|
sym->flags |= BSF_KEEP;
|
||||||
|
}
|
||||||
|
|
||||||
|
+/* Implement elf_backend_setup_gnu_properties for AArch64. It serves as a
|
||||||
|
+ wrapper function for _bfd_aarch64_elf_link_setup_gnu_properties to account
|
||||||
|
+ for the effect of GNU properties of the output_bfd. */
|
||||||
|
+static bfd *
|
||||||
|
+elfNN_aarch64_link_setup_gnu_properties (struct bfd_link_info *info)
|
||||||
|
+{
|
||||||
|
+ uint32_t prop = elf_aarch64_tdata (info->output_bfd)->gnu_and_prop;
|
||||||
|
+ bfd *pbfd = _bfd_aarch64_elf_link_setup_gnu_properties (info, &prop);
|
||||||
|
+ elf_aarch64_tdata (info->output_bfd)->gnu_and_prop = prop;
|
||||||
|
+ return pbfd;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Implement elf_backend_merge_gnu_properties for AArch64. It serves as a
|
||||||
|
+ wrapper function for _bfd_aarch64_elf_merge_gnu_properties to account
|
||||||
|
+ for the effect of GNU properties of the output_bfd. */
|
||||||
|
+static bfd_boolean
|
||||||
|
+elfNN_aarch64_merge_gnu_properties (struct bfd_link_info *info,
|
||||||
|
+ bfd *abfd,
|
||||||
|
+ elf_property *aprop,
|
||||||
|
+ elf_property *bprop)
|
||||||
|
+{
|
||||||
|
+ uint32_t prop
|
||||||
|
+ = elf_aarch64_tdata (info->output_bfd)->gnu_and_prop;
|
||||||
|
+ return _bfd_aarch64_elf_merge_gnu_properties (info, abfd, aprop,
|
||||||
|
+ bprop, prop);
|
||||||
|
+}
|
||||||
|
|
||||||
|
/* We use this so we can override certain functions
|
||||||
|
(though currently we don't). */
|
||||||
|
@@ -9453,6 +9482,12 @@ const struct elf_size_info elfNN_aarch64
|
||||||
|
#define elf_backend_symbol_processing \
|
||||||
|
elfNN_aarch64_backend_symbol_processing
|
||||||
|
|
||||||
|
+#define elf_backend_setup_gnu_properties \
|
||||||
|
+ elfNN_aarch64_link_setup_gnu_properties
|
||||||
|
+
|
||||||
|
+#define elf_backend_merge_gnu_properties \
|
||||||
|
+ elfNN_aarch64_merge_gnu_properties
|
||||||
|
+
|
||||||
|
#define elf_backend_can_refcount 1
|
||||||
|
#define elf_backend_can_gc_sections 1
|
||||||
|
#define elf_backend_plt_readonly 1
|
||||||
|
diff -rup binutils.orig/bfd/elfxx-aarch64.c binutils-2.30/bfd/elfxx-aarch64.c
|
||||||
|
--- binutils.orig/bfd/elfxx-aarch64.c 2020-11-04 14:53:52.138476401 +0000
|
||||||
|
+++ binutils-2.30/bfd/elfxx-aarch64.c 2020-11-04 14:56:42.276422492 +0000
|
||||||
|
@@ -660,3 +660,183 @@ _bfd_aarch64_elf_write_core_note (bfd *a
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+/* Find the first input bfd with GNU property and merge it with GPROP. If no
|
||||||
|
+ such input is found, add it to a new section at the last input. Update
|
||||||
|
+ GPROP accordingly. */
|
||||||
|
+bfd *
|
||||||
|
+_bfd_aarch64_elf_link_setup_gnu_properties (struct bfd_link_info *info,
|
||||||
|
+ uint32_t *gprop)
|
||||||
|
+{
|
||||||
|
+ asection *sec;
|
||||||
|
+ bfd *pbfd;
|
||||||
|
+ bfd *ebfd = NULL;
|
||||||
|
+ elf_property *prop;
|
||||||
|
+
|
||||||
|
+ uint32_t gnu_prop = *gprop;
|
||||||
|
+
|
||||||
|
+ /* Find a normal input file with GNU property note. */
|
||||||
|
+ for (pbfd = info->input_bfds;
|
||||||
|
+ pbfd != NULL;
|
||||||
|
+ pbfd = pbfd->link.next)
|
||||||
|
+ if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour
|
||||||
|
+ && bfd_count_sections (pbfd) != 0)
|
||||||
|
+ {
|
||||||
|
+ ebfd = pbfd;
|
||||||
|
+
|
||||||
|
+ if (elf_properties (pbfd) != NULL)
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* If ebfd != NULL it is either an input with property note or the last
|
||||||
|
+ input. Either way if we have gnu_prop, we should add it (by creating
|
||||||
|
+ a section if needed). */
|
||||||
|
+ if (ebfd != NULL && gnu_prop)
|
||||||
|
+ {
|
||||||
|
+ prop = _bfd_elf_get_property (ebfd,
|
||||||
|
+ GNU_PROPERTY_AARCH64_FEATURE_1_AND,
|
||||||
|
+ 4);
|
||||||
|
+ prop->u.number |= gnu_prop;
|
||||||
|
+ prop->pr_kind = property_number;
|
||||||
|
+
|
||||||
|
+ /* pbfd being NULL implies ebfd is the last input. Create the GNU
|
||||||
|
+ property note section. */
|
||||||
|
+ if (pbfd == NULL)
|
||||||
|
+ {
|
||||||
|
+ sec = bfd_make_section_with_flags (ebfd,
|
||||||
|
+ NOTE_GNU_PROPERTY_SECTION_NAME,
|
||||||
|
+ (SEC_ALLOC
|
||||||
|
+ | SEC_LOAD
|
||||||
|
+ | SEC_IN_MEMORY
|
||||||
|
+ | SEC_READONLY
|
||||||
|
+ | SEC_HAS_CONTENTS
|
||||||
|
+ | SEC_DATA));
|
||||||
|
+ if (sec == NULL)
|
||||||
|
+ info->callbacks->einfo (
|
||||||
|
+ _("%F%P: failed to create GNU property section\n"));
|
||||||
|
+
|
||||||
|
+ elf_section_type (sec) = SHT_NOTE;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ pbfd = _bfd_elf_link_setup_gnu_properties (info);
|
||||||
|
+
|
||||||
|
+ if (bfd_link_relocatable (info))
|
||||||
|
+ return pbfd;
|
||||||
|
+
|
||||||
|
+ /* If pbfd has any GNU_PROPERTY_AARCH64_FEATURE_1_AND properties, update
|
||||||
|
+ gnu_prop accordingly. */
|
||||||
|
+ if (pbfd != NULL)
|
||||||
|
+ {
|
||||||
|
+ elf_property_list *p;
|
||||||
|
+
|
||||||
|
+ /* The property list is sorted in order of type. */
|
||||||
|
+ for (p = elf_properties (pbfd); p; p = p->next)
|
||||||
|
+ {
|
||||||
|
+ /* Check for all GNU_PROPERTY_AARCH64_FEATURE_1_AND. */
|
||||||
|
+ if (GNU_PROPERTY_AARCH64_FEATURE_1_AND == p->property.pr_type)
|
||||||
|
+ {
|
||||||
|
+ gnu_prop = (p->property.u.number
|
||||||
|
+ & (GNU_PROPERTY_AARCH64_FEATURE_1_PAC
|
||||||
|
+ | GNU_PROPERTY_AARCH64_FEATURE_1_BTI));
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ else if (GNU_PROPERTY_AARCH64_FEATURE_1_AND < p->property.pr_type)
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ *gprop = gnu_prop;
|
||||||
|
+ return pbfd;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Define elf_backend_parse_gnu_properties for AArch64. */
|
||||||
|
+enum elf_property_kind
|
||||||
|
+_bfd_aarch64_elf_parse_gnu_properties (bfd *abfd, unsigned int type,
|
||||||
|
+ bfd_byte *ptr, unsigned int datasz)
|
||||||
|
+{
|
||||||
|
+ elf_property *prop;
|
||||||
|
+
|
||||||
|
+ switch (type)
|
||||||
|
+ {
|
||||||
|
+ case GNU_PROPERTY_AARCH64_FEATURE_1_AND:
|
||||||
|
+ if (datasz != 4)
|
||||||
|
+ {
|
||||||
|
+ _bfd_error_handler
|
||||||
|
+ ( _("error: %pB: <corrupt AArch64 used size: 0x%x>"),
|
||||||
|
+ abfd, datasz);
|
||||||
|
+ return property_corrupt;
|
||||||
|
+ }
|
||||||
|
+ prop = _bfd_elf_get_property (abfd, type, datasz);
|
||||||
|
+ /* Combine properties of the same type. */
|
||||||
|
+ prop->u.number |= bfd_h_get_32 (abfd, ptr);
|
||||||
|
+ prop->pr_kind = property_number;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ default:
|
||||||
|
+ return property_ignored;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return property_number;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Merge AArch64 GNU property BPROP with APROP also accounting for PROP.
|
||||||
|
+ If APROP isn't NULL, merge it with BPROP and/or PROP. Vice-versa if BROP
|
||||||
|
+ isn't NULL. Return TRUE if there is any update to APROP or if BPROP should
|
||||||
|
+ be merge with ABFD. */
|
||||||
|
+bfd_boolean
|
||||||
|
+_bfd_aarch64_elf_merge_gnu_properties (struct bfd_link_info *info
|
||||||
|
+ ATTRIBUTE_UNUSED,
|
||||||
|
+ bfd *abfd ATTRIBUTE_UNUSED,
|
||||||
|
+ elf_property *aprop,
|
||||||
|
+ elf_property *bprop,
|
||||||
|
+ uint32_t prop)
|
||||||
|
+{
|
||||||
|
+ unsigned int orig_number;
|
||||||
|
+ bfd_boolean updated = FALSE;
|
||||||
|
+ unsigned int pr_type = aprop != NULL ? aprop->pr_type : bprop->pr_type;
|
||||||
|
+
|
||||||
|
+ switch (pr_type)
|
||||||
|
+ {
|
||||||
|
+ case GNU_PROPERTY_AARCH64_FEATURE_1_AND:
|
||||||
|
+ {
|
||||||
|
+ if (aprop != NULL && bprop != NULL)
|
||||||
|
+ {
|
||||||
|
+ orig_number = aprop->u.number;
|
||||||
|
+ aprop->u.number = (orig_number & bprop->u.number) | prop;
|
||||||
|
+ updated = orig_number != aprop->u.number;
|
||||||
|
+ /* Remove the property if all feature bits are cleared. */
|
||||||
|
+ if (aprop->u.number == 0)
|
||||||
|
+ aprop->pr_kind = property_remove;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ /* If either is NULL, the AND would be 0 so, if there is
|
||||||
|
+ any PROP, asign it to the input that is not NULL. */
|
||||||
|
+ if (prop)
|
||||||
|
+ {
|
||||||
|
+ if (aprop != NULL)
|
||||||
|
+ {
|
||||||
|
+ orig_number = aprop->u.number;
|
||||||
|
+ aprop->u.number = prop;
|
||||||
|
+ updated = orig_number != aprop->u.number;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ bprop->u.number = prop;
|
||||||
|
+ updated = TRUE;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ /* No PROP and BPROP is NULL, so remove APROP. */
|
||||||
|
+ else if (aprop != NULL)
|
||||||
|
+ {
|
||||||
|
+ aprop->pr_kind = property_remove;
|
||||||
|
+ updated = TRUE;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ default:
|
||||||
|
+ abort ();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return updated;
|
||||||
|
+}
|
||||||
|
diff -rup binutils.orig/bfd/elfxx-aarch64.h binutils-2.30/bfd/elfxx-aarch64.h
|
||||||
|
--- binutils.orig/bfd/elfxx-aarch64.h 2020-11-04 14:53:52.134476424 +0000
|
||||||
|
+++ binutils-2.30/bfd/elfxx-aarch64.h 2020-11-04 14:56:42.276422492 +0000
|
||||||
|
@@ -65,3 +65,19 @@ _bfd_aarch64_elf_write_core_note (bfd *,
|
||||||
|
#define elf_backend_grok_prstatus _bfd_aarch64_elf_grok_prstatus
|
||||||
|
#define elf_backend_grok_psinfo _bfd_aarch64_elf_grok_psinfo
|
||||||
|
#define elf_backend_write_core_note _bfd_aarch64_elf_write_core_note
|
||||||
|
+
|
||||||
|
+extern bfd *
|
||||||
|
+_bfd_aarch64_elf_link_setup_gnu_properties (struct bfd_link_info *,
|
||||||
|
+ uint32_t *);
|
||||||
|
+
|
||||||
|
+extern enum elf_property_kind
|
||||||
|
+_bfd_aarch64_elf_parse_gnu_properties (bfd *, unsigned int,
|
||||||
|
+ bfd_byte *, unsigned int);
|
||||||
|
+
|
||||||
|
+extern bfd_boolean
|
||||||
|
+_bfd_aarch64_elf_merge_gnu_properties (struct bfd_link_info *, bfd *,
|
||||||
|
+ elf_property *, elf_property *,
|
||||||
|
+ uint32_t);
|
||||||
|
+
|
||||||
|
+#define elf_backend_parse_gnu_properties \
|
||||||
|
+ _bfd_aarch64_elf_parse_gnu_properties
|
||||||
|
diff -rup binutils.orig/binutils/readelf.c binutils-2.30/binutils/readelf.c
|
||||||
|
--- binutils.orig/binutils/readelf.c 2020-11-04 14:53:51.723478764 +0000
|
||||||
|
+++ binutils-2.30/binutils/readelf.c 2020-11-04 14:56:42.277422485 +0000
|
||||||
|
@@ -17103,6 +17103,33 @@ decode_x86_feature_2 (unsigned int bitma
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
+decode_aarch64_feature_1_and (unsigned int bitmask)
|
||||||
|
+{
|
||||||
|
+ while (bitmask)
|
||||||
|
+ {
|
||||||
|
+ unsigned int bit = bitmask & (- bitmask);
|
||||||
|
+
|
||||||
|
+ bitmask &= ~ bit;
|
||||||
|
+ switch (bit)
|
||||||
|
+ {
|
||||||
|
+ case GNU_PROPERTY_AARCH64_FEATURE_1_BTI:
|
||||||
|
+ printf ("BTI");
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case GNU_PROPERTY_AARCH64_FEATURE_1_PAC:
|
||||||
|
+ printf ("PAC");
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ default:
|
||||||
|
+ printf (_("<unknown: %x>"), bit);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ if (bitmask)
|
||||||
|
+ printf (", ");
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
print_gnu_property_note (Filedata * filedata, Elf_Internal_Note * pnote)
|
||||||
|
{
|
||||||
|
unsigned char * ptr = (unsigned char *) pnote->descdata;
|
||||||
|
@@ -17236,6 +17263,18 @@ print_gnu_property_note (Filedata * file
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ else if (filedata->file_header.e_machine == EM_AARCH64)
|
||||||
|
+ {
|
||||||
|
+ if (type == GNU_PROPERTY_AARCH64_FEATURE_1_AND)
|
||||||
|
+ {
|
||||||
|
+ printf ("AArch64 feature: ");
|
||||||
|
+ if (datasz != 4)
|
||||||
|
+ printf (_("<corrupt length: %#x> "), datasz);
|
||||||
|
+ else
|
||||||
|
+ decode_aarch64_feature_1_and (byte_get (ptr, 4));
|
||||||
|
+ goto next;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
diff -rup binutils.orig/include/elf/common.h binutils-2.30/include/elf/common.h
|
||||||
|
--- binutils.orig/include/elf/common.h 2020-11-04 14:53:52.155476304 +0000
|
||||||
|
+++ binutils-2.30/include/elf/common.h 2020-11-04 14:56:42.277422485 +0000
|
||||||
|
@@ -832,6 +832,12 @@
|
||||||
|
#define GNU_PROPERTY_X86_FEATURE_2_XSAVEOPT (1U << 8)
|
||||||
|
#define GNU_PROPERTY_X86_FEATURE_2_XSAVEC (1U << 9)
|
||||||
|
|
||||||
|
+/* AArch64 specific GNU PROPERTY. */
|
||||||
|
+#define GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000
|
||||||
|
+
|
||||||
|
+#define GNU_PROPERTY_AARCH64_FEATURE_1_BTI (1U << 0)
|
||||||
|
+#define GNU_PROPERTY_AARCH64_FEATURE_1_PAC (1U << 1)
|
||||||
|
+
|
||||||
|
/* Values used in GNU .note.ABI-tag notes (NT_GNU_ABI_TAG). */
|
||||||
|
#define GNU_ABI_TAG_LINUX 0
|
||||||
|
#define GNU_ABI_TAG_HURD 1
|
||||||
|
diff -rup binutils.orig/ld/testsuite/ld-aarch64/aarch64-elf.exp binutils-2.30/ld/testsuite/ld-aarch64/aarch64-elf.exp
|
||||||
|
--- binutils.orig/ld/testsuite/ld-aarch64/aarch64-elf.exp 2020-11-04 14:53:51.843478081 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-aarch64/aarch64-elf.exp 2020-11-04 14:56:42.278422479 +0000
|
||||||
|
@@ -337,6 +337,10 @@ run_dump_test_lp64 "variant_pcs-r"
|
||||||
|
run_dump_test_lp64 "variant_pcs-shared"
|
||||||
|
run_dump_test_lp64 "variant_pcs-now"
|
||||||
|
|
||||||
|
+run_dump_test "property-bti-pac1"
|
||||||
|
+run_dump_test "property-bti-pac2"
|
||||||
|
+run_dump_test "property-bti-pac3"
|
||||||
|
+
|
||||||
|
set aarch64elflinktests {
|
||||||
|
{"ld-aarch64/so with global symbol" "-shared" "" "" {copy-reloc-so.s}
|
||||||
|
{} "copy-reloc-so.so"}
|
||||||
|
--- /dev/null 2020-11-04 08:04:13.849482156 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-aarch64/property-bti-pac1.d 2020-11-04 14:56:42.278422479 +0000
|
||||||
|
@@ -0,0 +1,11 @@
|
||||||
|
+#name: GNU Property (single input, combine section)
|
||||||
|
+#source: property-bti-pac1.s
|
||||||
|
+#as: -march=armv8.5-a -defsym __mult__=0
|
||||||
|
+#ld: -shared
|
||||||
|
+#readelf: -n
|
||||||
|
+#target: *linux*
|
||||||
|
+
|
||||||
|
+Displaying notes found in: .note.gnu.property
|
||||||
|
+ Owner Data size Description
|
||||||
|
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
|
||||||
|
+ Properties: AArch64 feature: BTI, PAC
|
||||||
|
--- /dev/null 2020-11-04 08:04:13.849482156 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-aarch64/property-bti-pac1.s 2020-11-04 14:56:42.278422479 +0000
|
||||||
|
@@ -0,0 +1,37 @@
|
||||||
|
+ .text
|
||||||
|
+ .globl _start
|
||||||
|
+ .type _start,@function
|
||||||
|
+_start:
|
||||||
|
+ mov x1, #2
|
||||||
|
+.ifndef __mult__
|
||||||
|
+ bl foo
|
||||||
|
+.endif
|
||||||
|
+ .section ".note.gnu.property", "a"
|
||||||
|
+ .p2align 3
|
||||||
|
+ .long 1f - 0f /* name length */
|
||||||
|
+ .long 5f - 2f /* data length */
|
||||||
|
+ .long 5 /* note type */
|
||||||
|
+0: .asciz "GNU" /* vendor name */
|
||||||
|
+1:
|
||||||
|
+ .p2align 3
|
||||||
|
+2: .long 0xc0000000 /* pr_type. */
|
||||||
|
+ .long 4f - 3f /* pr_datasz. */
|
||||||
|
+3:
|
||||||
|
+ .long 0x2 /* PAC. */
|
||||||
|
+4:
|
||||||
|
+ .p2align 3
|
||||||
|
+5:
|
||||||
|
+ .p2align 3
|
||||||
|
+ .long 1f - 0f /* name length */
|
||||||
|
+ .long 5f - 2f /* data length */
|
||||||
|
+ .long 5 /* note type */
|
||||||
|
+0: .asciz "GNU" /* vendor name */
|
||||||
|
+1:
|
||||||
|
+ .p2align 3
|
||||||
|
+2: .long 0xc0000000 /* pr_type. */
|
||||||
|
+ .long 4f - 3f /* pr_datasz. */
|
||||||
|
+3:
|
||||||
|
+ .long 0x1 /* BTI. */
|
||||||
|
+4:
|
||||||
|
+ .p2align 3
|
||||||
|
+5:
|
||||||
|
--- /dev/null 2020-11-04 08:04:13.849482156 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-aarch64/property-bti-pac2.s 2020-11-04 14:56:42.278422479 +0000
|
||||||
|
@@ -0,0 +1,50 @@
|
||||||
|
+ .text
|
||||||
|
+ .global foo
|
||||||
|
+ .type foo, %function
|
||||||
|
+foo:
|
||||||
|
+ sub sp, sp, #16
|
||||||
|
+ mov w0, 9
|
||||||
|
+ str w0, [sp, 12]
|
||||||
|
+ ldr w0, [sp, 12]
|
||||||
|
+ add w0, w0, 4
|
||||||
|
+ str w0, [sp, 12]
|
||||||
|
+ nop
|
||||||
|
+ add sp, sp, 16
|
||||||
|
+ ret
|
||||||
|
+ .size foo, .-foo
|
||||||
|
+ .global bar
|
||||||
|
+ .type bar, %function
|
||||||
|
+.ifdef __property_bti__
|
||||||
|
+ .section ".note.gnu.property", "a"
|
||||||
|
+ .p2align 3
|
||||||
|
+ .long 1f - 0f /* name length */
|
||||||
|
+ .long 5f - 2f /* data length */
|
||||||
|
+ .long 5 /* note type */
|
||||||
|
+0: .asciz "GNU" /* vendor name */
|
||||||
|
+1:
|
||||||
|
+ .p2align 3
|
||||||
|
+2: .long 0xc0000000 /* pr_type. */
|
||||||
|
+ .long 4f - 3f /* pr_datasz. */
|
||||||
|
+3:
|
||||||
|
+ .long 0x1 /* BTI. */
|
||||||
|
+4:
|
||||||
|
+ .p2align 3
|
||||||
|
+5:
|
||||||
|
+.endif
|
||||||
|
+.ifdef __property_pac__
|
||||||
|
+ .section ".note.gnu.property", "a"
|
||||||
|
+ .p2align 3
|
||||||
|
+ .long 1f - 0f /* name length */
|
||||||
|
+ .long 5f - 2f /* data length */
|
||||||
|
+ .long 5 /* note type */
|
||||||
|
+0: .asciz "GNU" /* vendor name */
|
||||||
|
+1:
|
||||||
|
+ .p2align 3
|
||||||
|
+2: .long 0xc0000000 /* pr_type. */
|
||||||
|
+ .long 4f - 3f /* pr_datasz. */
|
||||||
|
+3:
|
||||||
|
+ .long 0x2 /* PAC. */
|
||||||
|
+4:
|
||||||
|
+ .p2align 3
|
||||||
|
+5:
|
||||||
|
+.endif
|
||||||
|
--- /dev/null 2020-11-04 08:04:13.849482156 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-aarch64/property-bti-pac2.d 2020-11-04 14:56:42.278422479 +0000
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+#name: GNU Property (combine multiple with BTI)
|
||||||
|
+#source: property-bti-pac1.s
|
||||||
|
+#source: property-bti-pac2.s
|
||||||
|
+#as: -mabi=lp64 -defsym __property_bti__=1
|
||||||
|
+#ld: -e _start
|
||||||
|
+#readelf: -n
|
||||||
|
+#target: *linux*
|
||||||
|
+
|
||||||
|
+Displaying notes found in: .note.gnu.property
|
||||||
|
+ Owner Data size Description
|
||||||
|
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
|
||||||
|
+ Properties: AArch64 feature: BTI
|
||||||
|
--- /dev/null 2020-11-04 08:04:13.849482156 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-aarch64/property-bti-pac3.d 2020-11-04 14:56:42.278422479 +0000
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+#name: GNU Property (combine multiple with PAC)
|
||||||
|
+#source: property-bti-pac1.s
|
||||||
|
+#source: property-bti-pac2.s
|
||||||
|
+#as: -mabi=lp64 -defsym __property_pac__=1
|
||||||
|
+#ld: -e _start
|
||||||
|
+#readelf: -n
|
||||||
|
+#target: *linux*
|
||||||
|
+
|
||||||
|
+Displaying notes found in: .note.gnu.property
|
||||||
|
+ Owner Data size Description
|
||||||
|
+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0
|
||||||
|
+ Properties: AArch64 feature: PAC
|
||||||
|
diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.30/bfd/elfnn-aarch64.c
|
||||||
|
--- binutils.orig/bfd/elfnn-aarch64.c 2020-11-25 11:53:26.648275978 +0000
|
||||||
|
+++ binutils-2.30/bfd/elfnn-aarch64.c 2020-11-25 12:21:39.276864970 +0000
|
||||||
|
@@ -9331,12 +9331,14 @@ elfNN_aarch64_link_setup_gnu_properties
|
||||||
|
for the effect of GNU properties of the output_bfd. */
|
||||||
|
static bfd_boolean
|
||||||
|
elfNN_aarch64_merge_gnu_properties (struct bfd_link_info *info,
|
||||||
|
- bfd *abfd,
|
||||||
|
- elf_property *aprop,
|
||||||
|
- elf_property *bprop)
|
||||||
|
+ bfd *abfd,
|
||||||
|
+ bfd *bbfd ATTRIBUTE_UNUSED,
|
||||||
|
+ elf_property *aprop,
|
||||||
|
+ elf_property *bprop)
|
||||||
|
{
|
||||||
|
uint32_t prop
|
||||||
|
= elf_aarch64_tdata (info->output_bfd)->gnu_and_prop;
|
||||||
|
+
|
||||||
|
return _bfd_aarch64_elf_merge_gnu_properties (info, abfd, aprop,
|
||||||
|
bprop, prop);
|
||||||
|
}
|
||||||
|
diff -rup binutils.orig/bfd/elfxx-aarch64.c binutils-2.30/bfd/elfxx-aarch64.c
|
||||||
|
--- binutils.orig/bfd/elfxx-aarch64.c 2020-11-25 11:53:26.655275930 +0000
|
||||||
|
+++ binutils-2.30/bfd/elfxx-aarch64.c 2020-11-25 12:21:34.689895875 +0000
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include "elfxx-aarch64.h"
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <string.h>
|
||||||
|
+#include "libbfd.h"
|
||||||
|
|
||||||
|
#define MASK(n) ((1u << (n)) - 1)
|
||||||
|
|
||||||
|
@@ -835,7 +836,10 @@ _bfd_aarch64_elf_merge_gnu_properties (s
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
- abort ();
|
||||||
|
+ _bfd_error_handler
|
||||||
|
+ ( _("error: %pB: <corrupt AArch64 property note: 0x%x>"),
|
||||||
|
+ abfd, pr_type);
|
||||||
|
+ return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return updated;
|
||||||
|
diff -rup binutils.orig/ld/testsuite/ld-aarch64/property-bti-pac1.d binutils-2.30/ld/testsuite/ld-aarch64/property-bti-pac1.d
|
||||||
|
--- binutils.orig/ld/testsuite/ld-aarch64/property-bti-pac1.d 2020-11-25 11:53:26.344278044 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-aarch64/property-bti-pac1.d 2020-11-25 11:57:53.179471900 +0000
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
#name: GNU Property (single input, combine section)
|
||||||
|
#source: property-bti-pac1.s
|
||||||
|
-#as: -march=armv8.5-a -defsym __mult__=0
|
||||||
|
+#as: -defsym __mult__=0
|
||||||
|
#ld: -shared
|
||||||
|
#readelf: -n
|
||||||
|
#target: *linux*
|
|
@ -0,0 +1,29 @@
|
||||||
|
--- binutils.orig/bfd/elflink.c 2020-12-08 17:45:26.487260908 +0000
|
||||||
|
+++ binutils-2.30/bfd/elflink.c 2020-12-08 17:48:06.650728413 +0000
|
||||||
|
@@ -1895,7 +1895,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
|
||||||
|
if (skip)
|
||||||
|
goto nondefault;
|
||||||
|
|
||||||
|
- if (hi->def_regular)
|
||||||
|
+ if (hi->def_regular || ELF_COMMON_DEF_P (hi))
|
||||||
|
{
|
||||||
|
/* If the undecorated symbol will have a version added by a
|
||||||
|
script different to H, then don't indirect to/from the
|
||||||
|
@@ -2236,7 +2236,7 @@ _bfd_elf_link_assign_sym_version (struct
|
||||||
|
|
||||||
|
/* We only need version numbers for symbols defined in regular
|
||||||
|
objects. */
|
||||||
|
- if (!h->def_regular)
|
||||||
|
+ if (!h->def_regular && !ELF_COMMON_DEF_P (h))
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
|
bed = get_elf_backend_data (info->output_bfd);
|
||||||
|
@@ -9957,7 +9957,7 @@ elf_link_output_extsym (struct bfd_hash_
|
||||||
|
Elf_Internal_Versym iversym;
|
||||||
|
Elf_External_Versym *eversym;
|
||||||
|
|
||||||
|
- if (!h->def_regular)
|
||||||
|
+ if (!h->def_regular && !ELF_COMMON_DEF_P (h))
|
||||||
|
{
|
||||||
|
if (h->verinfo.verdef == NULL
|
||||||
|
|| (elf_dyn_lib_class (h->verinfo.verdef->vd_bfd)
|
|
@ -0,0 +1,251 @@
|
||||||
|
diff -rup binutils.orig/include/bfdlink.h binutils-2.30/include/bfdlink.h
|
||||||
|
--- binutils.orig/include/bfdlink.h 2020-11-02 10:04:27.457826514 +0000
|
||||||
|
+++ binutils-2.30/include/bfdlink.h 2020-11-02 10:05:14.723537971 +0000
|
||||||
|
@@ -339,6 +339,9 @@ struct bfd_link_info
|
||||||
|
/* TRUE if the LTO plugin is active. */
|
||||||
|
unsigned int lto_plugin_active: 1;
|
||||||
|
|
||||||
|
+ /* TRUE if all LTO IR symbols have been read. */
|
||||||
|
+ unsigned int lto_all_symbols_read : 1;
|
||||||
|
+
|
||||||
|
/* TRUE if global symbols in discarded sections should be stripped. */
|
||||||
|
unsigned int strip_discarded: 1;
|
||||||
|
|
||||||
|
diff -rup binutils.orig/ld/ldlang.c binutils-2.30/ld/ldlang.c
|
||||||
|
--- binutils.orig/ld/ldlang.c 2020-11-02 10:04:16.852890551 +0000
|
||||||
|
+++ binutils-2.30/ld/ldlang.c 2020-11-02 10:06:12.285185841 +0000
|
||||||
|
@@ -7162,6 +7162,7 @@ lang_process (void)
|
||||||
|
if (plugin_call_all_symbols_read ())
|
||||||
|
einfo (_("%P%F: %s: plugin reported error after all symbols read\n"),
|
||||||
|
plugin_error_plugin ());
|
||||||
|
+ link_info.lto_all_symbols_read = TRUE;
|
||||||
|
/* Open any newly added files, updating the file chains. */
|
||||||
|
open_input_bfds (*added.tail, OPEN_BFD_NORMAL);
|
||||||
|
/* Restore the global list pointer now they have all been added. */
|
||||||
|
diff -rup binutils.orig/ld/plugin.c binutils-2.30/ld/plugin.c
|
||||||
|
--- binutils.orig/ld/plugin.c 2020-11-02 10:04:16.852890551 +0000
|
||||||
|
+++ binutils-2.30/ld/plugin.c 2020-11-02 10:08:11.010459546 +0000
|
||||||
|
@@ -1355,12 +1355,16 @@ plugin_notice (struct bfd_link_info *inf
|
||||||
|
new value from a real BFD. Weak symbols are not normally
|
||||||
|
overridden by a new weak definition, and strong symbols
|
||||||
|
will normally cause multiple definition errors. Avoid
|
||||||
|
- this by making the symbol appear to be undefined. */
|
||||||
|
- if (((h->type == bfd_link_hash_defweak
|
||||||
|
- || h->type == bfd_link_hash_defined)
|
||||||
|
- && is_ir_dummy_bfd (sym_bfd = h->u.def.section->owner))
|
||||||
|
- || (h->type == bfd_link_hash_common
|
||||||
|
- && is_ir_dummy_bfd (sym_bfd = h->u.c.p->section->owner)))
|
||||||
|
+ this by making the symbol appear to be undefined.
|
||||||
|
+
|
||||||
|
+ NB: We change the previous definition in the IR object to
|
||||||
|
+ undefweak only after all LTO symbols have been read. */
|
||||||
|
+ if (info->lto_all_symbols_read
|
||||||
|
+ && (((h->type == bfd_link_hash_defweak
|
||||||
|
+ || h->type == bfd_link_hash_defined)
|
||||||
|
+ && is_ir_dummy_bfd (sym_bfd = h->u.def.section->owner))
|
||||||
|
+ || (h->type == bfd_link_hash_common
|
||||||
|
+ && is_ir_dummy_bfd (sym_bfd = h->u.c.p->section->owner))))
|
||||||
|
{
|
||||||
|
h->type = bfd_link_hash_undefweak;
|
||||||
|
h->u.undef.abfd = sym_bfd;
|
||||||
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.30/ld/testsuite/ld-plugin/lto.exp
|
||||||
|
--- binutils.orig/ld/testsuite/ld-plugin/lto.exp 2020-11-02 10:04:16.926890104 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/lto.exp 2020-11-02 10:12:09.551000288 +0000
|
||||||
|
@@ -214,6 +214,36 @@ set lto_link_tests [list \
|
||||||
|
[list "Build pr22502b.o" \
|
||||||
|
"$plug_opt" "-flto $lto_no_fat" \
|
||||||
|
{pr22502b.c}] \
|
||||||
|
+ [list "Build pr26262b.o" \
|
||||||
|
+ "" "-O2" \
|
||||||
|
+ {pr26262b.c} {} "" "c"] \
|
||||||
|
+ [list "Build pr26262c.o" \
|
||||||
|
+ "" "-O2" \
|
||||||
|
+ {pr26262c.c} {} "" "c"] \
|
||||||
|
+ [list "Build pr26267a.o" \
|
||||||
|
+ "" "-O2 -flto $lto_no_fat" \
|
||||||
|
+ {pr26267a.c} {} "" "c"] \
|
||||||
|
+ [list "Build pr26267b.o" \
|
||||||
|
+ "" "-O2" \
|
||||||
|
+ {pr26267b.c} {} "" "c"] \
|
||||||
|
+ [list "Build pr26267c.o" \
|
||||||
|
+ "" "-O2" \
|
||||||
|
+ {pr26267c.c} {} "" "c"] \
|
||||||
|
+ [list "Build pr26267a" \
|
||||||
|
+ "" "-O2" \
|
||||||
|
+ {pr26267a.c} {} "" "c"] \
|
||||||
|
+ [list "Build pr26267a" \
|
||||||
|
+ "-flto tmpdir/pr26267a.o tmpdir/pr26267b.o tmpdir/pr26267c.o" \
|
||||||
|
+ "-flto $lto_no_fat" \
|
||||||
|
+ {dummy.c} \
|
||||||
|
+ {{error_output "pr26267.err"}} \
|
||||||
|
+ "pr26267a"] \
|
||||||
|
+ [list "Build pr26267b" \
|
||||||
|
+ "-flto tmpdir/pr26267b.o tmpdir/pr26267c.o tmpdir/pr26267a.o" \
|
||||||
|
+ "-flto $lto_no_fat" \
|
||||||
|
+ {dummy.c} \
|
||||||
|
+ {{error_output "pr26267.err"}} \
|
||||||
|
+ "pr26267b"] \
|
||||||
|
]
|
||||||
|
|
||||||
|
if { [at_least_gcc_version 4 7] } {
|
||||||
|
@@ -373,6 +403,16 @@ set lto_run_tests [list \
|
||||||
|
[list "Run pr22502" \
|
||||||
|
"-O2 -flto tmpdir/pr22502a.o tmpdir/pr22502b.o" "" \
|
||||||
|
{dummy.c} "pr20267" "pass.out" "-flto -O2" "c"] \
|
||||||
|
+ [list "Run pr26262a" \
|
||||||
|
+ "-O2 -flto" "" \
|
||||||
|
+ {pr26262a.c} "pr26262a" "pass.out" \
|
||||||
|
+ "-flto -O2" "c" "" \
|
||||||
|
+ "tmpdir/pr26262b.o tmpdir/pr26262c.o"] \
|
||||||
|
+ [list "Run pr26262b" \
|
||||||
|
+ "-flto -O2 tmpdir/pr26262b.o tmpdir/pr26262c.o" "" \
|
||||||
|
+ {pr26262a.c} "pr26262b" "pass.out" \
|
||||||
|
+ "-flto -O2" "c" "" \
|
||||||
|
+ ""] \
|
||||||
|
]
|
||||||
|
|
||||||
|
if { [at_least_gcc_version 4 7] } {
|
||||||
|
Only in binutils-2.30/ld/testsuite/ld-plugin: pr26262a.c
|
||||||
|
Only in binutils-2.30/ld/testsuite/ld-plugin: pr26262b.c
|
||||||
|
Only in binutils-2.30/ld/testsuite/ld-plugin: pr26267.err
|
||||||
|
Only in binutils-2.30/ld/testsuite/ld-plugin: pr26267a.c
|
||||||
|
Only in binutils-2.30/ld/testsuite/ld-plugin: pr26267b.c
|
||||||
|
Only in binutils-2.30/ld/testsuite/ld-plugin: pr26267c.c
|
||||||
|
--- /dev/null 2020-11-02 08:23:19.196542384 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26262a.c 2020-11-02 10:13:16.624589913 +0000
|
||||||
|
@@ -0,0 +1,21 @@
|
||||||
|
+#include <stdio.h>
|
||||||
|
+
|
||||||
|
+int counter;
|
||||||
|
+extern void foo (void);
|
||||||
|
+extern void xxx (void);
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+bar (void)
|
||||||
|
+{
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+main(void)
|
||||||
|
+{
|
||||||
|
+ bar ();
|
||||||
|
+ foo ();
|
||||||
|
+ xxx ();
|
||||||
|
+ if (counter == 1)
|
||||||
|
+ printf ("PASS\n");
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
--- /dev/null 2020-11-02 08:23:19.196542384 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26262b.c 2020-11-02 10:13:27.358523487 +0000
|
||||||
|
@@ -0,0 +1,16 @@
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+
|
||||||
|
+extern int counter;
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+foo (void)
|
||||||
|
+{
|
||||||
|
+ counter++;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+__attribute__((weak))
|
||||||
|
+void
|
||||||
|
+bar (void)
|
||||||
|
+{
|
||||||
|
+ abort ();
|
||||||
|
+}
|
||||||
|
--- /dev/null 2020-11-02 08:23:19.196542384 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26262c.c 2020-11-02 10:47:59.031665605 +0000
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+extern void bar (void);
|
||||||
|
+void
|
||||||
|
+xxx (void)
|
||||||
|
+{
|
||||||
|
+ bar ();
|
||||||
|
+}
|
||||||
|
--- /dev/null 2020-11-02 08:23:19.196542384 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26267c.c 2020-11-02 10:13:39.665447327 +0000
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+extern void bar (void);
|
||||||
|
+void
|
||||||
|
+xxx (void)
|
||||||
|
+{
|
||||||
|
+ bar ();
|
||||||
|
+}
|
||||||
|
--- /dev/null 2020-11-02 08:23:19.196542384 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26267b.c 2020-11-02 10:13:43.648422679 +0000
|
||||||
|
@@ -0,0 +1,15 @@
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+
|
||||||
|
+extern int counter;
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+foo (void)
|
||||||
|
+{
|
||||||
|
+ counter++;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+bar (void)
|
||||||
|
+{
|
||||||
|
+ abort ();
|
||||||
|
+}
|
||||||
|
--- /dev/null 2020-11-02 08:23:19.196542384 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26267a.c 2020-11-02 10:13:47.556398495 +0000
|
||||||
|
@@ -0,0 +1,21 @@
|
||||||
|
+#include <stdio.h>
|
||||||
|
+
|
||||||
|
+int counter;
|
||||||
|
+extern void foo (void);
|
||||||
|
+extern void xxx (void);
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+bar (void)
|
||||||
|
+{
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+main(void)
|
||||||
|
+{
|
||||||
|
+ bar ();
|
||||||
|
+ foo ();
|
||||||
|
+ xxx ();
|
||||||
|
+ if (counter == 1)
|
||||||
|
+ printf ("PASS\n");
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
--- /dev/null 2020-11-02 08:23:19.196542384 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26267.err 2020-11-02 10:14:01.785310441 +0000
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+#...
|
||||||
|
+.*: multiple definition of `bar'; .*
|
||||||
|
+#...
|
||||||
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/pr26267.err binutils-2.30/ld/testsuite/ld-plugin/pr26267.err
|
||||||
|
--- binutils.orig/ld/testsuite/ld-plugin/pr26267.err 2020-11-02 12:51:28.751137533 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/pr26267.err 2020-11-02 13:01:38.430679516 +0000
|
||||||
|
@@ -1,3 +1,3 @@
|
||||||
|
#...
|
||||||
|
-.*: multiple definition of `bar'; .*
|
||||||
|
+.*: multiple definition of `bar'.*
|
||||||
|
#...
|
||||||
|
--- binutils.orig/ld/testsuite/ld-plugin/lto.exp 2020-11-02 12:51:28.751137533 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/lto.exp 2020-11-02 13:10:49.531708566 +0000
|
||||||
|
@@ -404,15 +404,13 @@ set lto_run_tests [list \
|
||||||
|
"-O2 -flto tmpdir/pr22502a.o tmpdir/pr22502b.o" "" \
|
||||||
|
{dummy.c} "pr20267" "pass.out" "-flto -O2" "c"] \
|
||||||
|
[list "Run pr26262a" \
|
||||||
|
- "-O2 -flto" "" \
|
||||||
|
+ "-O2 -flto tmpdir/pr26262b.o tmpdir/pr26262c.o" "" \
|
||||||
|
{pr26262a.c} "pr26262a" "pass.out" \
|
||||||
|
- "-flto -O2" "c" "" \
|
||||||
|
- "tmpdir/pr26262b.o tmpdir/pr26262c.o"] \
|
||||||
|
+ "-flto -O2" "c" "" ] \
|
||||||
|
[list "Run pr26262b" \
|
||||||
|
"-flto -O2 tmpdir/pr26262b.o tmpdir/pr26262c.o" "" \
|
||||||
|
{pr26262a.c} "pr26262b" "pass.out" \
|
||||||
|
- "-flto -O2" "c" "" \
|
||||||
|
- ""] \
|
||||||
|
+ "-flto -O2" "c" "" ] \
|
||||||
|
]
|
||||||
|
|
||||||
|
if { [at_least_gcc_version 4 7] } {
|
|
@ -0,0 +1,138 @@
|
||||||
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.35.1/ld/testsuite/ld-plugin/lto.exp
|
||||||
|
--- binutils.orig/ld/testsuite/ld-plugin/lto.exp 2020-10-09 11:46:13.571665439 +0100
|
||||||
|
+++ binutils-2.35.1/ld/testsuite/ld-plugin/lto.exp 2020-10-09 11:47:59.113302758 +0100
|
||||||
|
@@ -319,27 +319,6 @@ set lto_link_elf_tests [list \
|
||||||
|
[list "PR ld/13244" \
|
||||||
|
"-shared -O2 -fPIC -flto -fuse-linker-plugin -nostdlib" "-O2 -fno-early-inlining -flto" \
|
||||||
|
{pr13244.c} {{"readelf" {-s --wide} "pr13244.d"}} "pr13244.so" "c"] \
|
||||||
|
- [list "Build libpr15146a.a" \
|
||||||
|
- "$plug_opt" "-flto -O2" \
|
||||||
|
- {pr15146a.c} {} "lib15146a.a"] \
|
||||||
|
- [list "Build pr15146b.so" \
|
||||||
|
- "-shared" "-O2 -fpic" \
|
||||||
|
- {pr15146b.c} {} "pr15146b.so" "c"] \
|
||||||
|
- [list "Build pr15146c.so" \
|
||||||
|
- "-shared -Wl,--no-as-needed tmpdir/pr15146b.so" "-O2 -fpic" \
|
||||||
|
- {pr15146c.c} {} "pr15146c.so" "c"] \
|
||||||
|
- [list "PR ld/15146 (1)" \
|
||||||
|
- "-O2 -flto -fuse-linker-plugin -Wl,-rpath-link,. -Wl,--no-copy-dt-needed-entries -Wl,--no-as-needed tmpdir/pr15146a.o tmpdir/pr15146c.so" "" \
|
||||||
|
- {dummy.c} {{"readelf" {-d} "pr15146.d"}} "pr15146a.exe"] \
|
||||||
|
- [list "Build libpr15146d.a" \
|
||||||
|
- "$plug_opt" "-flto -O2" \
|
||||||
|
- {pr15146d.c} {} "lib15146d.a"] \
|
||||||
|
- [list "Build libpr16746a.a" \
|
||||||
|
- "" "" \
|
||||||
|
- {pr16746a.c pr16746b.c} {} "lib15146a.a"] \
|
||||||
|
- [list "Build libpr16746b.a" \
|
||||||
|
- "$plug_opt" "-O2 -flto" \
|
||||||
|
- {pr16746c.c pr16746d.c} {} "lib15146b.a"] \
|
||||||
|
[list "PR ld/16746 (1)" \
|
||||||
|
"-O2 -flto -fuse-linker-plugin tmpdir/pr16746a.o tmpdir/pr16746c.o" "-O2 -flto" \
|
||||||
|
{dummy.c} {} "pr16746a.exe"] \
|
||||||
|
@@ -602,13 +581,6 @@ run_cc_link_tests $lto_compile_elf_tests
|
||||||
|
# Restrict these to ELF targets that support shared libs and PIC.
|
||||||
|
if { [is_elf_format] && [check_lto_shared_available] } {
|
||||||
|
run_cc_link_tests $lto_link_elf_tests
|
||||||
|
- set testname "PR ld/15146 (2)"
|
||||||
|
- set exec_output [run_host_cmd "$CC" "-O2 -flto -fuse-linker-plugin -Wl,-rpath-link,. -Wl,--no-copy-dt-needed-entries -Wl,--no-as-needed tmpdir/pr15146d.o tmpdir/pr15146c.so"]
|
||||||
|
- if { [ regexp "undefined reference to symbol '\\.?xxx'" $exec_output ] } {
|
||||||
|
- pass $testname
|
||||||
|
- } {
|
||||||
|
- fail $testname
|
||||||
|
- }
|
||||||
|
set testname "PR ld/16746 (3)"
|
||||||
|
set exec_output [run_host_cmd "$CC" "-O2 -flto -fuse-linker-plugin tmpdir/pr16746b.o tmpdir/pr16746d.o"]
|
||||||
|
if { [ regexp "warning: \\.?foobar" $exec_output ] && ![ regexp "symbol from plugin" $exec_output ] } {
|
||||||
|
|
||||||
|
diff -rup binutils.orig/bfd/elflink.c binutils-2.35.1/bfd/elflink.c
|
||||||
|
--- binutils.orig/bfd/elflink.c 2020-10-09 11:46:14.151663446 +0100
|
||||||
|
+++ binutils-2.35.1/bfd/elflink.c 2020-10-09 11:46:27.222618528 +0100
|
||||||
|
@@ -4970,11 +4970,7 @@ elf_link_add_object_symbols (bfd *abfd,
|
||||||
|
object and a shared object. */
|
||||||
|
bfd_boolean dynsym = FALSE;
|
||||||
|
|
||||||
|
- /* Plugin symbols aren't normal. Don't set def_regular or
|
||||||
|
- ref_regular for them, or make them dynamic. */
|
||||||
|
- if ((abfd->flags & BFD_PLUGIN) != 0)
|
||||||
|
- ;
|
||||||
|
- else if (! dynamic)
|
||||||
|
+ if (! dynamic)
|
||||||
|
{
|
||||||
|
if (! definition)
|
||||||
|
{
|
||||||
|
@@ -5155,10 +5151,6 @@ elf_link_add_object_symbols (bfd *abfd,
|
||||||
|
&& !bfd_link_relocatable (info))
|
||||||
|
dynsym = FALSE;
|
||||||
|
|
||||||
|
- /* Nor should we make plugin symbols dynamic. */
|
||||||
|
- if ((abfd->flags & BFD_PLUGIN) != 0)
|
||||||
|
- dynsym = FALSE;
|
||||||
|
-
|
||||||
|
if (definition)
|
||||||
|
{
|
||||||
|
h->target_internal = isym->st_target_internal;
|
||||||
|
@@ -5185,7 +5177,7 @@ elf_link_add_object_symbols (bfd *abfd,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (dynsym && h->dynindx == -1)
|
||||||
|
+ if (dynsym && (abfd->flags & BFD_PLUGIN) == 0 && h->dynindx == -1)
|
||||||
|
{
|
||||||
|
if (! bfd_elf_link_record_dynamic_symbol (info, h))
|
||||||
|
goto error_free_vers;
|
||||||
|
|
||||||
|
--- binutils.orig/ld/testsuite/ld-plugin/lto.exp 2020-10-28 12:23:49.034685727 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/lto.exp 2020-10-28 12:24:48.288484833 +0000
|
||||||
|
@@ -265,12 +265,6 @@ set lto_link_elf_tests [list \
|
||||||
|
[list "PR ld/13244" \
|
||||||
|
"-shared -O2 -fPIC -flto -fuse-linker-plugin -nostdlib" "-O2 -fno-early-inlining -flto" \
|
||||||
|
{pr13244.c} {{"readelf" {-s --wide} "pr13244.d"}} "pr13244.so" "c"] \
|
||||||
|
- [list "PR ld/16746 (1)" \
|
||||||
|
- "-O2 -flto -fuse-linker-plugin tmpdir/pr16746a.o tmpdir/pr16746c.o" "-O2 -flto" \
|
||||||
|
- {dummy.c} {} "pr16746a.exe"] \
|
||||||
|
- [list "PR ld/16746 (2)" \
|
||||||
|
- "-O2 -flto -fuse-linker-plugin tmpdir/pr16746c.o tmpdir/pr16746a.o" "-O2 -flto" \
|
||||||
|
- {dummy.c} {} "pr16746b.exe"] \
|
||||||
|
[list "Build pr21382a.o" \
|
||||||
|
"" "-O2 -flto" \
|
||||||
|
{pr21382a.c} {} "" "c"] \
|
||||||
|
@@ -424,25 +418,6 @@ run_cc_link_tests $lto_link_tests
|
||||||
|
# by some elf tests besides shared libs tests. So, always compile them.
|
||||||
|
run_cc_link_tests $lto_compile_elf_tests
|
||||||
|
|
||||||
|
-# Restrict these to ELF targets that support shared libs and PIC.
|
||||||
|
-if { [is_elf_format] && [check_lto_shared_available] } {
|
||||||
|
- run_cc_link_tests $lto_link_elf_tests
|
||||||
|
- set testname "PR ld/16746 (3)"
|
||||||
|
- set exec_output [run_host_cmd "$CC" "-O2 -flto -fuse-linker-plugin tmpdir/pr16746b.o tmpdir/pr16746d.o"]
|
||||||
|
- if { [ regexp "warning: \\.?foobar" $exec_output ] && ![ regexp "symbol from plugin" $exec_output ] } {
|
||||||
|
- pass $testname
|
||||||
|
- } {
|
||||||
|
- fail $testname
|
||||||
|
- }
|
||||||
|
- set testname "PR ld/16746 (4)"
|
||||||
|
- set exec_output [run_host_cmd "$CC" "-O2 -flto -fuse-linker-plugin tmpdir/pr16746d.o tmpdir/pr16746b.o"]
|
||||||
|
- if { [ regexp "warning: \\.?foobar" $exec_output ] && ![ regexp "symbol from plugin" $exec_output ] } {
|
||||||
|
- pass $testname
|
||||||
|
- } {
|
||||||
|
- fail $testname
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
set testname "Build liblto-11.a"
|
||||||
|
remote_file host delete "tmpdir/liblto-11.a"
|
||||||
|
set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
|
||||||
|
--- binutils.orig/ld/testsuite/ld-plugin/lto.exp 2020-10-28 12:47:18.581911539 +0000
|
||||||
|
+++ binutils-2.30/ld/testsuite/ld-plugin/lto.exp 2020-10-28 12:50:25.048280769 +0000
|
||||||
|
@@ -418,6 +418,11 @@ run_cc_link_tests $lto_link_tests
|
||||||
|
# by some elf tests besides shared libs tests. So, always compile them.
|
||||||
|
run_cc_link_tests $lto_compile_elf_tests
|
||||||
|
|
||||||
|
+# Restrict these to ELF targets that support shared libs and PIC.
|
||||||
|
+if { [is_elf_format] && [check_lto_shared_available] } {
|
||||||
|
+ run_cc_link_tests $lto_link_elf_tests
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
set testname "Build liblto-11.a"
|
||||||
|
remote_file host delete "tmpdir/liblto-11.a"
|
||||||
|
set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
|
|
@ -0,0 +1,42 @@
|
||||||
|
--- binutils.orig/binutils/objcopy.c 2021-02-18 11:35:48.062479490 +0000
|
||||||
|
+++ binutils-2.30/binutils/objcopy.c 2021-02-18 11:36:52.207071148 +0000
|
||||||
|
@@ -2224,6 +2224,11 @@ merge_gnu_build_notes (bfd * ab
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (start > end)
|
||||||
|
+ /* This can happen with PPC64LE binaries where empty notes are
|
||||||
|
+ encoded as start = end + 4. */
|
||||||
|
+ start = end;
|
||||||
|
+
|
||||||
|
if (is_open_note (pnote))
|
||||||
|
{
|
||||||
|
if (start)
|
||||||
|
--- binutils.orig/binutils/objcopy.c 2021-02-22 16:04:09.390542219 +0000
|
||||||
|
+++ binutils-2.30/binutils/objcopy.c 2021-02-22 16:04:32.214392597 +0000
|
||||||
|
@@ -2195,23 +2195,8 @@ merge_gnu_build_notes (bfd * ab
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 8:
|
||||||
|
- if (! is_64bit (abfd))
|
||||||
|
- {
|
||||||
|
- start = bfd_get_32 (abfd, pnote->note.descdata);
|
||||||
|
- end = bfd_get_32 (abfd, pnote->note.descdata + 4);
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- start = bfd_get_64 (abfd, pnote->note.descdata);
|
||||||
|
- /* FIXME: For version 1 and 2 notes we should try to
|
||||||
|
- calculate the end address by finding a symbol whose
|
||||||
|
- value is START, and then adding in its size.
|
||||||
|
-
|
||||||
|
- For now though, since v1 and v2 was not intended to
|
||||||
|
- handle gaps, we chose an artificially large end
|
||||||
|
- address. */
|
||||||
|
- end = (bfd_vma) 0x7ffffffffffffffUL;
|
||||||
|
- }
|
||||||
|
+ start = bfd_get_32 (abfd, pnote->note.descdata);
|
||||||
|
+ end = bfd_get_32 (abfd, pnote->note.descdata + 4);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 16:
|
|
@ -29,23 +29,6 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.30/ld/testsuit
|
||||||
{pr12942b.cc} {} "" "c++"] \
|
{pr12942b.cc} {} "" "c++"] \
|
||||||
]]
|
]]
|
||||||
}
|
}
|
||||||
@@ -547,13 +547,16 @@ if { [at_least_gcc_version 4 7] } {
|
|
||||||
}
|
|
||||||
|
|
||||||
# Run "ld -r" to generate inputs for complex LTO tests.
|
|
||||||
+setup_xfail "*-*-*"
|
|
||||||
run_dump_test "lto-3r"
|
|
||||||
remote_exec host "mv" "tmpdir/dump tmpdir/lto-3.o"
|
|
||||||
+setup_xfail "*-*-*"
|
|
||||||
run_dump_test "lto-5r"
|
|
||||||
remote_exec host "mv" "tmpdir/dump tmpdir/lto-5.o"
|
|
||||||
|
|
||||||
run_cc_link_tests $lto_link_symbol_tests
|
|
||||||
|
|
||||||
+setup_xfail "*-*-*"
|
|
||||||
run_ld_link_tests [list \
|
|
||||||
[list "PR ld/19317 (2)" \
|
|
||||||
"-r tmpdir/pr19317.o" "" "" \
|
|
||||||
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d
|
||||||
--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d 2020-04-06 13:46:34.060525235 +0100
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d 2020-04-06 13:46:34.060525235 +0100
|
||||||
+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d 2020-04-06 14:22:06.280196979 +0100
|
+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d 2020-04-06 14:22:06.280196979 +0100
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
--- binutils.orig/binutils/objcopy.c 2020-10-30 14:21:10.448328799 +0000
|
||||||
|
+++ binutils-2.30/binutils/objcopy.c 2020-10-30 14:22:08.406136672 +0000
|
||||||
|
@@ -3257,14 +3257,12 @@ copy_object (bfd *ibfd, bfd *obfd, const
|
||||||
|
/* It is likely that output sections are in the same order
|
||||||
|
as the input sections, but do not assume that this is
|
||||||
|
the case. */
|
||||||
|
- if (strcmp (bfd_section_name (obfd, merged->sec),
|
||||||
|
- bfd_section_name (obfd, osec)) != 0)
|
||||||
|
+ if (merged->sec->output_section != osec)
|
||||||
|
{
|
||||||
|
for (merged = merged_note_sections;
|
||||||
|
merged != NULL;
|
||||||
|
merged = merged->next)
|
||||||
|
- if (strcmp (bfd_section_name (obfd, merged->sec),
|
||||||
|
- bfd_section_name (obfd, osec)) == 0)
|
||||||
|
+ if (merged->sec->output_section == osec)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (merged == NULL)
|
File diff suppressed because it is too large
Load Diff
|
@ -1,31 +1,93 @@
|
||||||
# Binutils SPEC file. Can be invoked with the following parameters:
|
|
||||||
|
# Determine if this is a native build or a cross build.
|
||||||
|
#
|
||||||
|
# For a cross build add --define "binutils_target <target>" to the command
|
||||||
|
# line when building the rpms.
|
||||||
|
#
|
||||||
|
# For example:
|
||||||
|
# --define "binutils_target aarch64-linux-gnu"
|
||||||
|
#
|
||||||
|
# Cross builds will create a set of binutils executables that will run on the
|
||||||
|
# host machine but which will create binaries suitable for running on the
|
||||||
|
# target machine. The cross tools will have the target name as a prefix,
|
||||||
|
# but for compatibility with the kernel the rpms will use the target name
|
||||||
|
# as an infix. So for example building with the above define will create a
|
||||||
|
# set of rpms like this:
|
||||||
|
#
|
||||||
|
# binutils-aarch64-linux-gnu-2.35.1-14.fc34.x86_64.rpm
|
||||||
|
# binutils-aarch64-linux-gnu-debuginfo-2.35.1-14.fc34.x86_64.rpm
|
||||||
|
# [etc]
|
||||||
|
#
|
||||||
|
# and the rpms will contain files like:
|
||||||
|
#
|
||||||
|
# /usr/bin/aarch64-linux-gnu-addr2line
|
||||||
|
# /usr/bin/aarch64-linux-gnu-ar
|
||||||
|
# /usr/bin/aarch64-linux-gnu-as
|
||||||
|
# [etc]
|
||||||
|
|
||||||
|
%if 0%{!?binutils_target:1}
|
||||||
|
|
||||||
|
%define binutils_target %{_target_platform}
|
||||||
|
%define isnative 1
|
||||||
|
%define enable_shared 1
|
||||||
|
|
||||||
|
%else
|
||||||
|
|
||||||
|
%define cross %{binutils_target}-
|
||||||
|
%define name_cross -%{binutils_target}
|
||||||
|
%define isnative 0
|
||||||
|
%define enable_shared 0
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Summary: A GNU collection of binary utilities
|
||||||
|
Name: binutils%{?name_cross}%{?_with_debug:-debug}
|
||||||
|
Version: 2.30
|
||||||
|
Release: 93%{?dist}
|
||||||
|
License: GPLv3+
|
||||||
|
URL: https://sourceware.org/binutils
|
||||||
|
|
||||||
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Binutils SPEC file. Can be invoked with the following parameters to change
|
||||||
|
# the default behaviour:
|
||||||
|
|
||||||
# --define "binutils_target arm-linux-gnu" to create arm-linux-gnu-binutils.
|
# --define "binutils_target arm-linux-gnu" to create arm-linux-gnu-binutils.
|
||||||
# --with=bootstrap: Build with minimal dependencies.
|
#
|
||||||
# --with=debug: Build without optimizations and without splitting the debuginfo.
|
# --with bootstrap Build with minimal dependencies.
|
||||||
# --without=docs: Skip building documentation.
|
# --with debug Build without optimizations and without splitting
|
||||||
# --without=testsuite: Do not run the testsuite. Default is to run it.
|
# the debuginfo into a separate file.
|
||||||
# --with=testsuite: Run the testsuite. Default when --with=debug is not to run it.
|
# --without docs Skip building documentation.
|
||||||
|
# Default is with docs, except when building a cross binutils.
|
||||||
|
# --without testsuite Do not run the testsuite. Default is to run it.
|
||||||
|
# --without gold Disable building of the GOLD linker.
|
||||||
|
# --with clang To force building with the CLANG.
|
||||||
|
# --without debuginfod Disable support for debuginfod.
|
||||||
|
|
||||||
#---Start of Configure Options-----------------------------------------------
|
#---Start of Configure Options-----------------------------------------------
|
||||||
|
|
||||||
# Do not create deterministic archives by default (cf: BZ 1195883)
|
# Create deterministic archives (ie ones without timestamps).
|
||||||
|
# Default is off because of BZ 1195883.
|
||||||
%define enable_deterministic_archives 0
|
%define enable_deterministic_archives 0
|
||||||
|
|
||||||
# Enable support for GCC LTO compilation.
|
# Enable support for GCC LTO compilation.
|
||||||
|
# Disable if it is necessary to work around bugs in LTO.
|
||||||
%define enable_lto 1
|
%define enable_lto 1
|
||||||
|
|
||||||
# Disable the default generation of compressed debug sections.
|
# 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.
|
||||||
%define default_compress_debug 0
|
%define default_compress_debug 0
|
||||||
|
|
||||||
# Default to read-only-relocations (relro) in shared binaries.
|
# Default to read-only-relocations (relro) in shared binaries.
|
||||||
|
# This is enabled as a security feature.
|
||||||
%define default_relro 1
|
%define default_relro 1
|
||||||
|
|
||||||
# Disable the default generation of GNU Build notes by the assembler.
|
# Enable the default generation of GNU Build notes by the assembler.
|
||||||
# This has turned out to be problematic for the i686 architecture.
|
# This option is disabled as it has turned out to be problematic for the i686
|
||||||
# although the exact reason has not been determined. (See BZ 1572485)
|
# architecture, although the exact reason has not been determined. (See
|
||||||
# It also breaks building EFI binaries on AArch64, as these cannot have
|
# BZ 1572485). It also breaks building EFI binaries on AArch64, as these
|
||||||
# relocations against absolute symbols.
|
# cannot have relocations against absolute symbols.
|
||||||
%define default_generate_notes 0
|
%define default_generate_notes 0
|
||||||
|
|
||||||
# Enable thread support in the GOLD linker (if it is being built). This is
|
# Enable thread support in the GOLD linker (if it is being built). This is
|
||||||
|
@ -44,6 +106,8 @@
|
||||||
%bcond_without docs
|
%bcond_without docs
|
||||||
# Default: Always run the testsuite.
|
# Default: Always run the testsuite.
|
||||||
%bcond_without testsuite
|
%bcond_without testsuite
|
||||||
|
# Default: Build the gold linker.
|
||||||
|
%bcond_without gold
|
||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%undefine with_docs
|
%undefine with_docs
|
||||||
|
@ -54,31 +118,13 @@
|
||||||
%undefine with_testsuite
|
%undefine with_testsuite
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{!?binutils_target:1}
|
|
||||||
%define binutils_target %{_target_platform}
|
|
||||||
%define isnative 1
|
|
||||||
%define enable_shared 1
|
|
||||||
%else
|
|
||||||
%define cross %{binutils_target}-
|
|
||||||
%define isnative 0
|
|
||||||
%define enable_shared 0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
Summary: A GNU collection of binary utilities
|
|
||||||
Name: %{?cross}binutils%{?_with_debug:-debug}
|
|
||||||
Version: 2.30
|
|
||||||
Release: 79%{?dist}
|
|
||||||
License: GPLv3+
|
|
||||||
URL: https://sourceware.org/binutils
|
|
||||||
|
|
||||||
# Note - the Linux Kernel binutils releases are too unstable and contain
|
# Note - the Linux Kernel binutils releases are too unstable and contain
|
||||||
# too many controversial patches so we stick with the official FSF version
|
# too many controversial patches so we stick with the official FSF version
|
||||||
# instead.
|
# instead.
|
||||||
|
|
||||||
Source: https://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz
|
Source: https://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz
|
||||||
|
|
||||||
Source2: binutils-2.19.50.0.1-output-format.sed
|
Source2: binutils-2.19.50.0.1-output-format.sed
|
||||||
|
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
|
@ -126,7 +172,6 @@ Patch03: binutils-2.22.52.0.1-export-demangle.h.patch
|
||||||
# order.
|
# order.
|
||||||
Patch04: binutils-2.22.52.0.4-no-config-h-check.patch
|
Patch04: binutils-2.22.52.0.4-no-config-h-check.patch
|
||||||
|
|
||||||
# Purpose: Import H.J.Lu's Kernel LTO patch.
|
|
||||||
# Lifetime: Permanent, but needs continual updating.
|
# Lifetime: Permanent, but needs continual updating.
|
||||||
# FIXME: Try removing....
|
# FIXME: Try removing....
|
||||||
Patch05: binutils-2.26-lto.patch
|
Patch05: binutils-2.26-lto.patch
|
||||||
|
@ -478,11 +523,46 @@ Patch76: binutils-s390-alignment-hints.patch
|
||||||
# Lifetime: Fixed in 2.32
|
# Lifetime: Fixed in 2.32
|
||||||
Patch77: binutils-x86-gas-scaled-8-bit-displacements.patch
|
Patch77: binutils-x86-gas-scaled-8-bit-displacements.patch
|
||||||
|
|
||||||
|
# Purpose: Allow plugin syms to mark as-needed shared libs needed.
|
||||||
|
# Lifetime: Fixed in 2.36
|
||||||
|
Patch78: binutils-plugin-as-needed.patch
|
||||||
|
|
||||||
|
# Purpose: Fix merging attributes in the presence of multiple
|
||||||
|
# same-named sections.
|
||||||
|
# Lifetime: Fixed in 2.36
|
||||||
|
Patch79: binutils-strip-merge.patch
|
||||||
|
|
||||||
|
# Purpose: Properly override IR definitions
|
||||||
|
# Lifetime: Fixed in 2.35
|
||||||
|
Patch80: binutils-ld-IR-override.patch
|
||||||
|
|
||||||
|
# Purpose: Add support for Intel's TPAUSE and UNWAIT instructions.
|
||||||
|
# Lifetime: Fixed in 2.31
|
||||||
|
Patch81: binutils-x86-tpause.patch
|
||||||
|
|
||||||
|
# Purpose: Add support for AArch64 GNU Property notes
|
||||||
|
# Lifetime: Fixed in 2.34
|
||||||
|
Patch82: binutils-aarch64-properties.patch
|
||||||
|
|
||||||
|
# Purpose: Fix the version selected when merging common symbols
|
||||||
|
# and normal symbols.
|
||||||
|
# Lifetime: Fixed in 2.36
|
||||||
|
Patch83: binutils-common-sym-versioning.patch
|
||||||
|
|
||||||
|
# Purpose: Fix merging empty ppc64le notes.
|
||||||
|
# Lifetime: Fixed in 2.37
|
||||||
|
Patch84: binutils-ppc64le-note-merge.patch
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
Provides: bundled(libiberty)
|
Provides: bundled(libiberty)
|
||||||
|
BuildRequires: autoconf automake
|
||||||
|
|
||||||
|
%if %{with gold}
|
||||||
%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
|
%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
|
||||||
|
%else
|
||||||
|
%define gold_arches none
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%define build_gold no
|
%define build_gold no
|
||||||
|
@ -679,6 +759,13 @@ using libelf instead of BFD.
|
||||||
%patch75 -p1
|
%patch75 -p1
|
||||||
%patch76 -p1
|
%patch76 -p1
|
||||||
%patch77 -p1
|
%patch77 -p1
|
||||||
|
%patch78 -p1
|
||||||
|
%patch79 -p1
|
||||||
|
%patch80 -p1
|
||||||
|
%patch81 -p1
|
||||||
|
%patch82 -p1
|
||||||
|
%patch83 -p1
|
||||||
|
%patch84 -p1
|
||||||
|
|
||||||
# We cannot run autotools as there is an exact requirement of autoconf-2.59.
|
# We cannot run autotools as there is an exact requirement of autoconf-2.59.
|
||||||
# FIXME - this is no longer true. Maybe try reinstating autotool use ?
|
# FIXME - this is no longer true. Maybe try reinstating autotool use ?
|
||||||
|
@ -759,7 +846,18 @@ case %{binutils_target} in ppc64le*)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case %{binutils_target} in x86_64*|i?86*|arm*|aarch64*)
|
# BZ 1920373: Enable PEP support for all targets as the PERF package's
|
||||||
|
# testsuite expects to be able to read PE format files ragrdless of
|
||||||
|
# the host's architecture.
|
||||||
|
case %{binutils_target} in
|
||||||
|
s390*)
|
||||||
|
# FIXME: For some unknown reason settting --enable-targets=x86_64-pep
|
||||||
|
# here breaks the building of GOLD. I have no idea why, and not enough
|
||||||
|
# knowledge of how gold is configured to fix quickly. So instead I have
|
||||||
|
# found that supporting "all" targets works.
|
||||||
|
CARGS="$CARGS --enable-targets=all"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
CARGS="$CARGS --enable-targets=x86_64-pep"
|
CARGS="$CARGS --enable-targets=x86_64-pep"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -966,14 +1064,16 @@ $OUTPUT_FORMAT
|
||||||
INPUT ( %{_libdir}/libopcodes.a -lbfd )
|
INPUT ( %{_libdir}/libopcodes.a -lbfd )
|
||||||
EOH
|
EOH
|
||||||
|
|
||||||
%else # !isnative
|
%else
|
||||||
# For cross-binutils we drop the documentation.
|
# For cross-binutils we drop the documentation.
|
||||||
rm -rf %{buildroot}%{_infodir}
|
rm -rf %{buildroot}%{_infodir}
|
||||||
# We keep these as one can have native + cross binutils of different versions.
|
# We keep these as one can have native + cross binutils of different versions.
|
||||||
#rm -rf {buildroot}{_prefix}/share/locale
|
#rm -rf {buildroot}{_prefix}/share/locale
|
||||||
#rm -rf {buildroot}{_mandir}
|
#rm -rf {buildroot}{_mandir}
|
||||||
rm -rf %{buildroot}%{_libdir}/libiberty.a
|
rm -rf %{buildroot}%{_libdir}/libiberty.a
|
||||||
%endif # !isnative
|
# Remove libtool files, which reference the .so libs
|
||||||
|
rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
|
||||||
|
%endif
|
||||||
|
|
||||||
# This one comes from gcc
|
# This one comes from gcc
|
||||||
rm -f %{buildroot}%{_infodir}/dir
|
rm -f %{buildroot}%{_infodir}/dir
|
||||||
|
@ -1010,7 +1110,7 @@ fi
|
||||||
if [ $1 = 0 ]; then
|
if [ $1 = 0 ]; then
|
||||||
%{_sbindir}/alternatives --auto %{?cross}ld
|
%{_sbindir}/alternatives --auto %{?cross}ld
|
||||||
fi
|
fi
|
||||||
%endif # both ld.gold and ld.bfd
|
%endif
|
||||||
|
|
||||||
%if %{isnative}
|
%if %{isnative}
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
@ -1021,8 +1121,8 @@ fi
|
||||||
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
|
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
|
||||||
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz
|
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz
|
||||||
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz
|
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz
|
||||||
%endif # with docs
|
%endif
|
||||||
%endif # isnative
|
%endif
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
@ -1034,7 +1134,7 @@ if [ $1 = 0 ]; then
|
||||||
%{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.bfd
|
%{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.bfd
|
||||||
%{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.gold
|
%{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.gold
|
||||||
fi
|
fi
|
||||||
%endif # both ld.gold and ld.bfd
|
%endif
|
||||||
|
|
||||||
%if %{isnative}
|
%if %{isnative}
|
||||||
if [ $1 = 0 ]; then
|
if [ $1 = 0 ]; then
|
||||||
|
@ -1047,7 +1147,7 @@ if [ $1 = 0 ]; then
|
||||||
/sbin/install-info --quiet --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz
|
/sbin/install-info --quiet --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
%endif # isnative
|
%endif
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
@ -1064,7 +1164,7 @@ exit 0
|
||||||
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz
|
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz
|
||||||
/sbin/install-info --quiet --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz
|
/sbin/install-info --quiet --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz
|
||||||
fi
|
fi
|
||||||
%endif # isnative
|
%endif
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -1078,29 +1178,32 @@ exit 0
|
||||||
%ghost %{_bindir}/%{?cross}ld
|
%ghost %{_bindir}/%{?cross}ld
|
||||||
%else
|
%else
|
||||||
%{_bindir}/%{?cross}ld*
|
%{_bindir}/%{?cross}ld*
|
||||||
%endif # both ld.gold and ld.bfd
|
%endif
|
||||||
|
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
%if %{isnative}
|
||||||
%{_infodir}/as.info.gz
|
%{_infodir}/as.info.gz
|
||||||
%{_infodir}/binutils.info.gz
|
%{_infodir}/binutils.info.gz
|
||||||
%{_infodir}/gprof.info.gz
|
%{_infodir}/gprof.info.gz
|
||||||
%{_infodir}/ld.info.gz
|
%{_infodir}/ld.info.gz
|
||||||
%{_infodir}/standards.info.gz
|
%{_infodir}/standards.info.gz
|
||||||
%endif # with docs
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{enable_shared}
|
%if %{enable_shared}
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
%exclude %{_libdir}/libbfd.so
|
%exclude %{_libdir}/libbfd.so
|
||||||
%exclude %{_libdir}/libopcodes.so
|
%exclude %{_libdir}/libopcodes.so
|
||||||
%endif # enable_shared
|
%endif
|
||||||
|
|
||||||
%if %{isnative}
|
%if %{isnative}
|
||||||
|
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
%{_infodir}/[^b]*info*
|
%{_infodir}/[^b]*info*
|
||||||
%{_infodir}/binutils*info*
|
%{_infodir}/binutils*info*
|
||||||
%endif # with docs
|
%{_infodir}/bfd*info*
|
||||||
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_prefix}/include/*
|
%{_prefix}/include/*
|
||||||
|
@ -1108,14 +1211,53 @@ exit 0
|
||||||
%{_libdir}/libbfd.so
|
%{_libdir}/libbfd.so
|
||||||
%{_libdir}/libopcodes.so
|
%{_libdir}/libopcodes.so
|
||||||
|
|
||||||
%if %{with docs}
|
%endif
|
||||||
%{_infodir}/bfd*info*
|
|
||||||
%endif # with docs
|
|
||||||
|
|
||||||
%endif # isnative
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 18 2021 Nick Clifton <nickc@redhat.com> - 2.30-93
|
||||||
|
- Fix merging ppc64le notes. (#1928936)
|
||||||
|
|
||||||
|
* Thu Feb 18 2021 Nick Clifton <nickc@redhat.com> - 2.30-92
|
||||||
|
- Fix merging ppc64le notes. (#1928936)
|
||||||
|
|
||||||
|
* Tue Feb 02 2021 Nick Clifton <nickc@redhat.com> - 2.30-91
|
||||||
|
- Enable PEP support for all targets. (#1920373)
|
||||||
|
|
||||||
|
* Mon Jan 11 2021 Nick Clifton <nickc@redhat.com> - 2.30-90
|
||||||
|
- NVR bump in order to regain access to gating test results.
|
||||||
|
|
||||||
|
* Wed Dec 09 2020 Nick Clifton <nickc@redhat.com> - 2.30-89
|
||||||
|
- Fix snafu preventing the building of the GOLD linekr.
|
||||||
|
|
||||||
|
* Wed Dec 09 2020 Nick Clifton <nickc@redhat.com> - 2.30-88
|
||||||
|
- Fix versioning when merging common and normal symbols. (#1904942)
|
||||||
|
- Add cross binutils support.
|
||||||
|
|
||||||
|
* Wed Nov 25 2020 Nick Clifton <nickc@redhat.com> - 2.30-87
|
||||||
|
- Fix bug in patch for AArch64 GNU Property notes support. (#1889643)
|
||||||
|
|
||||||
|
* Wed Nov 04 2020 Nick Clifton <nickc@redhat.com> - 2.30-86
|
||||||
|
- Add support for AArch64 GNU Property notes. (#1889643)
|
||||||
|
|
||||||
|
* Tue Nov 03 2020 Nick Clifton <nickc@redhat.com> - 2.30-85
|
||||||
|
- Add support for the TPAUSE and UNWAIT instructions in the x86 assembler. (#1893292)
|
||||||
|
|
||||||
|
* Mon Nov 02 2020 Nick Clifton <nickc@redhat.com> - 2.30-84
|
||||||
|
- Fix problem in linker testsuite triggered by the as-needed update. (#1886071)
|
||||||
|
|
||||||
|
* Fri Oct 30 2020 Nick Clifton <nickc@redhat.com> - 2.30-83
|
||||||
|
- Fix merging attributes in the presence of multiple same-named sections. (#1893197)
|
||||||
|
|
||||||
|
* Wed Oct 28 2020 Nick Clifton <nickc@redhat.com> - 2.30-82
|
||||||
|
- Fix problem in linker testsuite triggered by the as-needed update. (#1886071)
|
||||||
|
|
||||||
|
* Fri Oct 23 2020 Nick Clifton <nickc@redhat.com> - 2.30-81
|
||||||
|
- Allow plugin syms to mark as-needed shared libs needed. (#1886071)
|
||||||
|
|
||||||
|
* Wed Sep 16 2020 Nick Clifton <nickc@redhat.com> - 2.30-80
|
||||||
|
- NVR Bump to allow rebuild.
|
||||||
|
|
||||||
* Fri Aug 21 2020 Nick Clifton <nickc@redhat.com> - 2.30-79
|
* Fri Aug 21 2020 Nick Clifton <nickc@redhat.com> - 2.30-79
|
||||||
- Fix x86 assembler's handling of non-8-bit displacements. (#1869401)
|
- Fix x86 assembler's handling of non-8-bit displacements. (#1869401)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue