Use | 1 for bit setting
Daniel Jacobowitz
drow@false.org
Mon Jun 30 18:18:00 GMT 2008
Christophe found this confusing in my last patch, so I've fixed it.
I also expanded some comments for a construct that confused me while I
was testing this... checked in.
--
Daniel Jacobowitz
CodeSourcery
2008-06-30 Daniel Jacobowitz <dan@codesourcery.com>
* elf32-arm.c (record_arm_to_thumb_glue, record_thumb_to_arm_glue):
Expand comments.
(arm_map_one_stub): Use | 1 when setting the low bit.
Index: elf32-arm.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-arm.c,v
retrieving revision 1.149
diff -u -p -r1.149 elf32-arm.c
--- elf32-arm.c 25 Jun 2008 14:28:47 -0000 1.149
+++ elf32-arm.c 30 Jun 2008 15:30:17 -0000
@@ -3981,7 +3981,8 @@ record_arm_to_thumb_glue (struct bfd_lin
/* The only trick here is using hash_table->arm_glue_size as the value.
Even though the section isn't allocated yet, this is where we will be
- putting it. */
+ putting it. The +1 on the value marks that the stub has not been
+ output yet - not that it is a Thumb function. */
bh = NULL;
val = globals->arm_glue_size + 1;
_bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner,
@@ -4047,6 +4048,10 @@ record_thumb_to_arm_glue (struct bfd_lin
return;
}
+ /* The only trick here is using hash_table->thumb_glue_size as the value.
+ Even though the section isn't allocated yet, this is where we will be
+ putting it. The +1 on the value marks that the stub has not been
+ output yet - not that it is a Thumb function. */
bh = NULL;
val = hash_table->thumb_glue_size + 1;
_bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
@@ -11240,7 +11245,7 @@ arm_map_one_stub (struct bfd_hash_entry
return FALSE;
break;
case arm_thumb_thumb_stub_long_branch:
- if (!elf32_arm_output_stub_sym (osi, stub_name, addr + 1, 16))
+ if (!elf32_arm_output_stub_sym (osi, stub_name, addr | 1, 16))
return FALSE;
if (!elf32_arm_output_map_sym (osi, ARM_MAP_THUMB, addr))
return FALSE;
@@ -11248,7 +11253,7 @@ arm_map_one_stub (struct bfd_hash_entry
return FALSE;
break;
case arm_thumb_arm_v4t_stub_long_branch:
- if (!elf32_arm_output_stub_sym (osi, stub_name, addr + 1, 20))
+ if (!elf32_arm_output_stub_sym (osi, stub_name, addr | 1, 20))
return FALSE;
if (!elf32_arm_output_map_sym (osi, ARM_MAP_THUMB, addr))
return FALSE;
More information about the Binutils
mailing list