[Patch, Arm, BFD] Fix get_value_helper

[Patch, Arm, BFD] Fix get_value_helper

[Sudakshina Das]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

Hi

In one of my recent patches for Armv8.1-M, I defined a helper function which missed an argument that should have been passed to it instead of declaring it inside. This patch fixes this.

Builds and regression tested on arm-none-eabi.
Is this ok for trunk?

Thanks
Sudi

bfd/ChangeLog:

2019-04-23  Sudakshina Das  <sudi.das@arm.com>

	PR/target 24460
	* elf32-arm.c (get_value_helper): Add new argument branch_type.
	(elf32_arm_final_link_relocate): Update calls to get_value_helper.

[-- Attachment #2: rb11111.patch --]
[-- Type: application/octet-stream, Size: 1788 bytes --]

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 337961d26e16c6458f41d54b2e8dbe6891a5017c..87d78b4882c61cad4e6e2c34cb726cbb89281f73 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -10306,10 +10306,10 @@ get_value_helper (bfd_vma plt_offset,
 		  const char *sym_name,
 		  unsigned char st_type,
 		  struct elf32_arm_link_hash_table *globals,
+		  enum arm_st_branch_type branch_type,
 		  bfd_boolean *unresolved_reloc_p)
 {
   bfd_vma value = 0;
-  enum arm_st_branch_type branch_type;
   enum elf32_arm_stub_type stub_type = arm_stub_none;
   struct elf32_arm_stub_hash_entry *stub_entry;
   struct elf32_arm_link_hash_entry *hash
@@ -12973,7 +12973,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *	    howto,
 
 	value = get_value_helper (plt_offset, splt, input_section, sym_sec, h,
 				  info, input_bfd, rel, sym_name, st_type,
-				  globals, unresolved_reloc_p);
+				  globals, branch_type, unresolved_reloc_p);
 
 	relocation  = value + addend;
 	relocation -= (input_section->output_section->vma
@@ -13018,7 +13018,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *	    howto,
 
 	value = get_value_helper (plt_offset, splt, input_section, sym_sec, h,
 				  info, input_bfd, rel, sym_name, st_type,
-				  globals, unresolved_reloc_p);
+				  globals, branch_type, unresolved_reloc_p);
 
 	relocation  = value + addend;
 	relocation -= (input_section->output_section->vma
@@ -13063,7 +13063,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *	    howto,
 
 	value = get_value_helper (plt_offset, splt, input_section, sym_sec, h,
 				  info, input_bfd, rel, sym_name, st_type,
-				  globals, unresolved_reloc_p);
+				  globals, branch_type, unresolved_reloc_p);
 
 	relocation  = value + addend;
 	relocation -= (input_section->output_section->vma

Re: [Patch, Arm, BFD] Fix get_value_helper

[Nick Clifton]

Hi Sudi,

> bfd/ChangeLog:
> 2019-04-23  Sudakshina Das  <sudi.das@arm.com>
> 
> 	PR/target 24460
> 	* elf32-arm.c (get_value_helper): Add new argument branch_type.
> 	(elf32_arm_final_link_relocate): Update calls to get_value_helper.

Approved - please apply.

I assume that you will also close the PR too ?

Cheers
  Nick