| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From b8bd638f71649980e114548d8eeecba34683af42 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mahesh Bodapati <mbodapat@xilinx.com> |
| 3 | Date: Sun, 2 Dec 2018 14:49:14 +0530 |
| 4 | Subject: [PATCH] fixed Build issue which are due to conflicts in patches. |
| 5 | |
| 6 | Signed-off-by: Mahesh Bodapati <mbodapat@xilinx.com> |
| 7 | Signed-off-by: Nagaraju Mekala <nagaraju.mekala@xilinx.com> |
| 8 | |
| 9 | --- |
| 10 | bfd/elf32-microblaze.c | 1 + |
| 11 | bfd/elf64-microblaze.c | 12 ++++++------ |
| 12 | gas/config/tc-microblaze.c | 4 ++-- |
| 13 | 3 files changed, 9 insertions(+), 8 deletions(-) |
| 14 | |
| 15 | diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c |
| 16 | index 2d8c062..6a795c5 100644 |
| 17 | --- a/bfd/elf32-microblaze.c |
| 18 | +++ b/bfd/elf32-microblaze.c |
| 19 | @@ -1996,6 +1996,7 @@ microblaze_elf_relax_section (bfd *abfd, |
| 20 | /* This was a PC-relative instruction that was |
| 21 | completely resolved. */ |
| 22 | int sfix, efix; |
| 23 | + unsigned int val; |
| 24 | bfd_vma target_address; |
| 25 | target_address = irel->r_addend + irel->r_offset; |
| 26 | sfix = calc_fixup (irel->r_offset, 0, sec); |
| 27 | diff --git a/bfd/elf64-microblaze.c b/bfd/elf64-microblaze.c |
| 28 | index ef6a870..bed534e 100644 |
| 29 | --- a/bfd/elf64-microblaze.c |
| 30 | +++ b/bfd/elf64-microblaze.c |
| 31 | @@ -2854,14 +2854,14 @@ microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info, |
| 32 | /* If this is a weak symbol, and there is a real definition, the |
| 33 | processor independent code will have arranged for us to see the |
| 34 | real definition first, and we can just use the same value. */ |
| 35 | - if (h->u.weakdef != NULL) |
| 36 | + if (h->is_weakalias) |
| 37 | { |
| 38 | - BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined |
| 39 | - || h->u.weakdef->root.type == bfd_link_hash_defweak); |
| 40 | - h->root.u.def.section = h->u.weakdef->root.u.def.section; |
| 41 | - h->root.u.def.value = h->u.weakdef->root.u.def.value; |
| 42 | + struct elf_link_hash_entry *def = weakdef (h); |
| 43 | + BFD_ASSERT (def->root.type == bfd_link_hash_defined); |
| 44 | + h->root.u.def.section = def->root.u.def.section; |
| 45 | + h->root.u.def.value = def->root.u.def.value; |
| 46 | return TRUE; |
| 47 | - } |
| 48 | + } |
| 49 | |
| 50 | /* This is a reference to a symbol defined by a dynamic object which |
| 51 | is not a function. */ |
| 52 | diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c |
| 53 | index c6d2e4c..b3e49f0 100644 |
| 54 | --- a/gas/config/tc-microblaze.c |
| 55 | +++ b/gas/config/tc-microblaze.c |
| 56 | @@ -118,9 +118,9 @@ const relax_typeS md_relax_table[] = |
| 57 | { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 }, /* 15: TLSGOTTPREL_OFFSET. */ |
| 58 | { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 }, /* 16: TLSTPREL_OFFSET. */ |
| 59 | { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 }, /* 17: TEXT_OFFSET. */ |
| 60 | - { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 } /* 18: TEXT_PC_OFFSET. */ |
| 61 | + { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 }, /* 18: TEXT_PC_OFFSET. */ |
| 62 | // { 0x7fffffff, 0x80000000, INST_WORD_SIZE*2, 0 } /* 16: TLSTPREL_OFFSET. */ |
| 63 | - { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE, 0 } /* 19: DEFINED_64_OFFSET. */ |
| 64 | + { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE, 0 }, /* 19: DEFINED_64_OFFSET. */ |
| 65 | { 0x7fffffffffffffff, 0x8000000000000000, INST_WORD_SIZE*2, 0 } /* 20: DEFINED_64_PC_OFFSET. */ |
| 66 | }; |
| 67 | |