This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Fix ARM EABI attribute merging


This patch fixes a problem with the ARM EABI attribute merging whereby 
merged attributes didn't end up in the output file.  Tested with cross to 
arm-none-eabi; OK to commit?

(This is preliminary to making to attributes support generic to all ELF 
targets as I proposed in 
<http://sourceware.org/ml/binutils/2007-06/msg00156.html>; I'd like to 
keep this bugfix separate from the much larger patch making the code 
generic.)

bfd:
2007-06-24  Joseph Myers  <joseph@codesourcery.com>

	* elf32-arm.c (copy_eabi_attributes): Copy type of attributes.

ld/testsuite:
2007-06-24  Joseph Myers  <joseph@codesourcery.com>

	* ld-arm/attr-merge.s, ld-arm/attr-merge.attr: New.
	* ld-arm/arm-elf.exp (armelftests): Add new test.

diff -rupN binutils-mainline/bfd/elf32-arm.c binutils-mainline-fix1/bfd/elf32-arm.c
--- binutils-mainline/bfd/elf32-arm.c	2007-05-22 17:17:53.000000000 +0000
+++ binutils-mainline-fix1/bfd/elf32-arm.c	2007-06-19 20:25:20.000000000 +0000
@@ -6969,6 +6969,7 @@ copy_eabi_attributes (bfd *ibfd, bfd *ob
   out_attr = &elf32_arm_tdata (obfd)->known_eabi_attributes[4];
   for (i = 4; i < NUM_KNOWN_ATTRIBUTES; i++)
     {
+      out_attr->type = in_attr->type;
       out_attr->i = in_attr->i;
       if (in_attr->s && *in_attr->s)
 	out_attr->s = attr_strdup (obfd, in_attr->s);
diff -rupN binutils-mainline/ld/testsuite/ld-arm/arm-elf.exp binutils-mainline-fix1/ld/testsuite/ld-arm/arm-elf.exp
--- binutils-mainline/ld/testsuite/ld-arm/arm-elf.exp	2007-05-21 06:36:01.000000000 +0000
+++ binutils-mainline-fix1/ld/testsuite/ld-arm/arm-elf.exp	2007-06-19 20:25:52.000000000 +0000
@@ -167,6 +167,9 @@ set armelftests {
      {"jump19" "-static -T arm.ld" "" {jump19.s}
       {{objdump -dr jump19.d}}
       "jump19"}
+     {"EABI attribute merging" "-r" "" {attr-merge.s attr-merge.s}
+      {{readelf -A attr-merge.attr}}
+      "attr-merge"}
 }
 
 run_ld_link_tests $armelftests
diff -rupN binutils-mainline/ld/testsuite/ld-arm/attr-merge.attr binutils-mainline-fix1/ld/testsuite/ld-arm/attr-merge.attr
--- binutils-mainline/ld/testsuite/ld-arm/attr-merge.attr	1970-01-01 00:00:00.000000000 +0000
+++ binutils-mainline-fix1/ld/testsuite/ld-arm/attr-merge.attr	2007-06-19 20:25:19.000000000 +0000
@@ -0,0 +1,12 @@
+Attribute Section: aeabi
+File Attributes
+  Tag_CPU_name: "ARM7TDMI"
+  Tag_CPU_arch: v4T
+  Tag_ABI_PCS_wchar_t: 4
+  Tag_ABI_FP_denormal: Needed
+  Tag_ABI_FP_exceptions: Needed
+  Tag_ABI_FP_number_model: IEEE 754
+  Tag_ABI_align8_needed: Yes
+  Tag_ABI_align8_preserved: Yes, except leaf SP
+  Tag_ABI_enum_size: small
+  Tag_ABI_optimization_goals: Aggressive Debug
diff -rupN binutils-mainline/ld/testsuite/ld-arm/attr-merge.s binutils-mainline-fix1/ld/testsuite/ld-arm/attr-merge.s
--- binutils-mainline/ld/testsuite/ld-arm/attr-merge.s	1970-01-01 00:00:00.000000000 +0000
+++ binutils-mainline-fix1/ld/testsuite/ld-arm/attr-merge.s	2007-06-19 20:25:19.000000000 +0000
@@ -0,0 +1,11 @@
+	.cpu arm7tdmi
+	.fpu softvfp
+	.eabi_attribute 20, 1
+	.eabi_attribute 21, 1
+	.eabi_attribute 23, 3
+	.eabi_attribute 24, 1
+	.eabi_attribute 25, 1
+	.eabi_attribute 26, 1
+	.eabi_attribute 30, 6
+	.eabi_attribute 18, 4
+	.file	"attr-merge.s"

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]