projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a715796)
Calculate ARM arch attribute after relaxation
authorTerry Guo <terry.guo@arm.com>
Fri, 21 Nov 2014 03:54:39 +0000 (11:54 +0800)
committerTerry Guo <terry.guo@arm.com>
Fri, 21 Nov 2014 03:54:39 +0000 (11:54 +0800)
gas/
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.

gas/testsuite/
2014-11-21  Terry Guo  <terry.guo@arm.com>

* gas/arm/attr-arch-assumption.d: New file.
* gas/arm/attr-arch-assumption.s: Likewise.

ld/testsuite/
2014-11-21  Terry Guo  <terry.guo@arm.com>

* ld-arm/tls-longplt-lib.s: Require ARMv6T2.
* ld-arm/tls-longplt.s: Likewise.
* ld-arm/tls-longplt-lib.d: Updated.
* ld-arm/tls-longplt.d: Likewise.

gas/ChangeLog patch | blob | history
gas/config/tc-arm.c patch | blob | history
gas/config/tc-arm.h patch | blob | history
gas/testsuite/ChangeLog patch | blob | history
gas/testsuite/gas/arm/attr-arch-assumption.d [new file with mode: 0644] patch | blob
gas/testsuite/gas/arm/attr-arch-assumption.s [new file with mode: 0644] patch | blob
ld/testsuite/ChangeLog patch | blob | history
ld/testsuite/ld-arm/tls-longplt-lib.d patch | blob | history
ld/testsuite/ld-arm/tls-longplt-lib.s patch | blob | history
ld/testsuite/ld-arm/tls-longplt.d patch | blob | history
ld/testsuite/ld-arm/tls-longplt.s patch | blob | history

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 24881141e1ada7871fb4853b81a5a1e307ac5548..1204bdc9b8cadb42cb45b6d4a63edadb55eb4dc1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+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.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index f692cffe1c0ac82d0648d68c71dcfb2a72d56ea3..412e8ab0521cca6ee32d25afb72a59952a69fa7f 100644 (file)
--- 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 a7a0cd0d6ec1db5b52c48bd5d75f8afb9b5099f9..e5d67b3788867295a0d920249ec53a631c31472e 100644 (file)
--- 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 59af8726fdff79b72d827b316cf8777b3f683308..00a2df036dd4857082be06e5a0ad139a07ea6b92 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gas/testsuite/gas/arm/attr-arch-assumption.d b/gas/testsuite/gas/arm/attr-arch-assumption.d
new file mode 100644 (file)
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 (file)
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
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index c1b97bb39f2a84868a93e8c18520fdda2fc7fa11..0068a85a464b256a318b41c99b77535e596aa301 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-21  Terry Guo  <terry.guo@arm.com>
+
+       * ld-arm/tls-longplt-lib.s: Require ARMv6T2.
+       * ld-arm/tls-longplt.s: Likewise.
+       * ld-arm/tls-longplt-lib.d: Updated.
+       * ld-arm/tls-longplt.d: Likewise.
+
 2014-11-21  Terry Guo  <terry.guo@arm.com>
 
        * ld-arm/attr-merge-vfp-4-sp.s: New test source file.
diff --git a/ld/testsuite/ld-arm/tls-longplt-lib.d b/ld/testsuite/ld-arm/tls-longplt-lib.d
index 2c81fbe202fafcdbeb90c5d1e7871e3b93564aa2..97aaad818e195eb77c5dfe03381a3de7b983eb17 100644 (file)
--- a/ld/testsuite/ld-arm/tls-longplt-lib.d
+++ b/ld/testsuite/ld-arm/tls-longplt-lib.d
@@ -32,7 +32,7 @@ Disassembly of section .text:
     81e4:      000080b4        .word   0x000080b4
     81e8:      4801            ldr     r0, \[pc, #4\]  ; .*
     81ea:      f7ff efe0       blx     81ac <.*>
-    81ee:      46c0            nop                     ; .*
+    81ee:      bf00            nop
     81f0:      000080a5        .word   0x000080a5
 
 Disassembly of section .foo:
@@ -48,7 +48,7 @@ Disassembly of section .foo:
  400101c:      fc00f284        .word   0xfc00f284
  4001020:      4801            ldr     r0, \[pc, #4\]  ; .*
  4001022:      f000 e806       blx     4001030 .*
- 4001026:      46c0            nop                     ; .*
+ 4001026:      bf00            nop
  4001028:      fc00f26d        .word   0xfc00f26d
  400102c:      00000000        .word   0x00000000
 
diff --git a/ld/testsuite/ld-arm/tls-longplt-lib.s b/ld/testsuite/ld-arm/tls-longplt-lib.s
index e0650cb0e65d98f5b653c84fe455855280560b7b..8cdfe273d4bf91a2c7ef44f909b293c52480d0bd 100644 (file)
--- a/ld/testsuite/ld-arm/tls-longplt-lib.s
+++ b/ld/testsuite/ld-arm/tls-longplt-lib.s
@@ -1,4 +1,5 @@
        .syntax unified
+       .arch armv6t2
        .text
 text:
        .arm
diff --git a/ld/testsuite/ld-arm/tls-longplt.d b/ld/testsuite/ld-arm/tls-longplt.d
index 175c56179a6b4b75c3f887a7f7cb271388598984..afa6b062d0bfaa9e5e53e5bf7d957da58b80ce30 100644 (file)
--- a/ld/testsuite/ld-arm/tls-longplt.d
+++ b/ld/testsuite/ld-arm/tls-longplt.d
@@ -32,7 +32,7 @@ Disassembly of section .text:
     81e8:      000080d4        .word   0x000080d4
     81ec:      4801            ldr     r0, \[pc, #4\]  ; .*
     81ee:      f7ff efe0       blx     81b0 .*
-    81f2:      46c0            nop                     ; .*
+    81f2:      bf00            nop
     81f4:      000080c5        .word   0x000080c5
 
 Disassembly of section .foo:
@@ -48,7 +48,7 @@ Disassembly of section .foo:
  400101c:      fc00f2a0        .word   0xfc00f2a0
  4001020:      4801            ldr     r0, \[pc, #4\]  ; .*
  4001022:      f000 f809       bl      4001038 .*
- 4001026:      46c0            nop                     ; .*
+ 4001026:      bf00            nop
  4001028:      fc00f291        .word   0xfc00f291
  400102c:      00000000        .word   0x00000000
 
diff --git a/ld/testsuite/ld-arm/tls-longplt.s b/ld/testsuite/ld-arm/tls-longplt.s
index 42eea19c3fcf0054dc06ffce5bd7c56d5d2914b0..37d166f980c5da8753988f319c08d4e95123124b 100644 (file)
--- a/ld/testsuite/ld-arm/tls-longplt.s
+++ b/ld/testsuite/ld-arm/tls-longplt.s
@@ -1,4 +1,5 @@
        .syntax unified
+       .arch armv6t2
        .text
 text:
        .arm