forked from mirrors/nixpkgs
24 lines
826 B
Diff
24 lines
826 B
Diff
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
|
|
index 9f956d3..f5b61f1 100644
|
|
--- a/bfd/elf32-arm.c
|
|
+++ b/bfd/elf32-arm.c
|
|
@@ -19585,7 +19585,10 @@ elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
|
|
#undef ELF_MAXPAGESIZE
|
|
#define ELF_MAXPAGESIZE 0x1000
|
|
|
|
+/* Prioritize elf32-*arm (priority 1) over elf32-*arm-vxworks (priority 2) */
|
|
+#define elf_match_priority 2
|
|
#include "elf32-target.h"
|
|
+#undef elf_match_priority
|
|
|
|
|
|
/* Merge backend specific data from an object file to the output
|
|
@@ -19974,4 +19977,7 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt,
|
|
#undef ELF_MAXPAGESIZE
|
|
#define ELF_MAXPAGESIZE 0x8000
|
|
|
|
+/* Prioritize elf32-*arm (priority 1) over elf32-*arm-symbian (priority 2) */
|
|
+#define elf_match_priority 2
|
|
#include "elf32-target.h"
|
|
+#undef elf_match_priority
|