diff options
| -rw-r--r-- | binutils-2.25/gold/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils-2.25/gold/arm.cc | 7 | ||||
| -rw-r--r-- | binutils-2.25/gold/options.h | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/binutils-2.25/gold/ChangeLog b/binutils-2.25/gold/ChangeLog index 608d9fd9..e1ca71fb 100644 --- a/binutils-2.25/gold/ChangeLog +++ b/binutils-2.25/gold/ChangeLog @@ -1,3 +1,10 @@ +2015-07-23 Ian Coolidge <icoolidge@google.com> + Plumb --pic-veneer option for gold. + + * arm.cc (Reloc_stub::stub_type_for_reloc): Plumb to stub + generation. + * options.h (General_options): Add --pic-veneer option. + 2015-07-09 Han Shen <shenhan@google.com> Use "gold_info" instead of "gold_warning" for erratum fix. diff --git a/binutils-2.25/gold/arm.cc b/binutils-2.25/gold/arm.cc index 299290b3..2d10357a 100644 --- a/binutils-2.25/gold/arm.cc +++ b/binutils-2.25/gold/arm.cc @@ -4542,7 +4542,7 @@ Reloc_stub::stub_type_for_reloc( // This is a bit ugly but we want to avoid using a templated class for // big and little endianities. bool may_use_blx; - bool should_force_pic_veneer; + bool should_force_pic_veneer = parameters->options().pic_veneer(); bool thumb2; bool thumb_only; if (parameters->target().is_big_endian()) @@ -4550,7 +4550,7 @@ Reloc_stub::stub_type_for_reloc( const Target_arm<true>* big_endian_target = Target_arm<true>::default_target(); may_use_blx = big_endian_target->may_use_v5t_interworking(); - should_force_pic_veneer = big_endian_target->should_force_pic_veneer(); + should_force_pic_veneer |= big_endian_target->should_force_pic_veneer(); thumb2 = big_endian_target->using_thumb2(); thumb_only = big_endian_target->using_thumb_only(); } @@ -4559,7 +4559,8 @@ Reloc_stub::stub_type_for_reloc( const Target_arm<false>* little_endian_target = Target_arm<false>::default_target(); may_use_blx = little_endian_target->may_use_v5t_interworking(); - should_force_pic_veneer = little_endian_target->should_force_pic_veneer(); + should_force_pic_veneer |= + little_endian_target->should_force_pic_veneer(); thumb2 = little_endian_target->using_thumb2(); thumb_only = little_endian_target->using_thumb_only(); } diff --git a/binutils-2.25/gold/options.h b/binutils-2.25/gold/options.h index 88b62308..9bbcc645 100644 --- a/binutils-2.25/gold/options.h +++ b/binutils-2.25/gold/options.h @@ -987,6 +987,10 @@ class General_options N_("Do not create a position independent executable"), false); + DEFINE_bool(pic_veneer, options::TWO_DASHES, '\0', false, + N_("Force PIC sequences for ARM/Thumb interworking veneers"), + NULL); + DEFINE_bool(pipeline_knowledge, options::ONE_DASH, '\0', false, NULL, N_("(ARM only) Ignore for backward compatibility")); |