diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 8 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 13 | ||||
| -rw-r--r-- | gas/config/tc-arm.h | 3 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/attr-arch-assumption.d | 11 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/attr-arch-assumption.s | 5 |
6 files changed, 41 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 2488114..1204bdc 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,13 @@ 2014-11-21 Terry Guo <terry.guo@arm.com> + * config/tc-arm.c (md_assemble): Do not consider relaxation. + (md_convert_frag): Test and set target arch attribute accordingly. + (aeabi_set_attribute_string): Turn it into a global function. + * config/tc-arm.h (md_post_relax_hook): Enable it for ARM target. + (aeabi_set_public_attributes): Declare it. + +2014-11-21 Terry Guo <terry.guo@arm.com> + * config/tc-arm.c (fpu_vfp_ext_armv8xd): New. (arm_cpus): Support cortex-m7. (arm_fpus): Support fpv5-sp-d16 and fpv5-d16. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index f692cff..412e8ab 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -17703,9 +17703,9 @@ md_assemble (char *str) /* Many Thumb-2 instructions also have Thumb-1 variants, so explicitly set those bits when Thumb-2 32-bit instructions are seen. ie. anything other than bl/blx and v6-M instructions. - This is overly pessimistic for relaxable instructions. */ - if (((inst.size == 4 && (inst.instruction & 0xf800e800) != 0xf000e800) - || inst.relax) + The impact of relaxable instructions will be considered later after we + finish all relaxation. */ + if ((inst.size == 4 && (inst.instruction & 0xf800e800) != 0xf000e800) && !(ARM_CPU_HAS_FEATURE (*opcode->tvariant, arm_ext_msr) || ARM_CPU_HAS_FEATURE (*opcode->tvariant, arm_ext_barrier))) ARM_MERGE_FEATURE_SETS (thumb_arch_used, thumb_arch_used, @@ -20539,6 +20539,11 @@ md_convert_frag (bfd *abfd, segT asec ATTRIBUTE_UNUSED, fragS *fragp) fixp->fx_file = fragp->fr_file; fixp->fx_line = fragp->fr_line; fragp->fr_fix += fragp->fr_var; + + /* Set whether we use thumb-2 ISA based on final relaxation results. */ + if (thumb_mode && fragp->fr_var == 4 && no_cpu_selected () + && !ARM_CPU_HAS_FEATURE (thumb_arch_used, arm_arch_t2)) + ARM_MERGE_FEATURE_SETS (arm_arch_used, thumb_arch_used, arm_ext_v6t2); } /* Return the size of a relaxable immediate operand instruction. @@ -25125,7 +25130,7 @@ aeabi_set_attribute_string (int tag, const char *value) } /* Set the public EABI object attributes. */ -static void +void aeabi_set_public_attributes (void) { int arch; diff --git a/gas/config/tc-arm.h b/gas/config/tc-arm.h index a7a0cd0..e5d67b3 100644 --- a/gas/config/tc-arm.h +++ b/gas/config/tc-arm.h @@ -116,6 +116,9 @@ extern bfd_boolean tc_start_label_without_colon (char, const char *); #define md_end arm_md_end extern void arm_md_end (void); bfd_boolean arm_is_eabi (void); + +#define md_post_relax_hook aeabi_set_public_attributes () +extern void aeabi_set_public_attributes (void); #endif /* NOTE: The fake label creation in stabs.c:s_stab_generic() has diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 59af872..00a2df0 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2014-11-21 Terry Guo <terry.guo@arm.com> + * gas/arm/attr-arch-assumption.d: New file. + * gas/arm/attr-arch-assumption.s: Likewise. + +2014-11-21 Terry Guo <terry.guo@arm.com> + * gas/arm/armv7e-m+fpv5-d16.s: New. * gas/arm/armv7e-m+fpv5-d16.d: Likewise. * gas/arm/armv7e-m+fpv5-sp-d16.s: Likewise. diff --git a/gas/testsuite/gas/arm/attr-arch-assumption.d b/gas/testsuite/gas/arm/attr-arch-assumption.d new file mode 100644 index 0000000..e5f60b0 --- /dev/null +++ b/gas/testsuite/gas/arm/attr-arch-assumption.d @@ -0,0 +1,11 @@ +# name: arch and isa entries in elf attribute section +# source: attr-arch-assumption.s +# as: +# readelf: -A +# This test is only valid on EABI based ports. +# target: *-*-*eabi* *-*-nacl* + +Attribute Section: aeabi +File Attributes + Tag_CPU_arch: v4T + Tag_THUMB_ISA_use: Thumb-1 diff --git a/gas/testsuite/gas/arm/attr-arch-assumption.s b/gas/testsuite/gas/arm/attr-arch-assumption.s new file mode 100644 index 0000000..b5b9460 --- /dev/null +++ b/gas/testsuite/gas/arm/attr-arch-assumption.s @@ -0,0 +1,5 @@ + .syntax unified + .thumb +foo: + cmp r0, r1 + beq foo |