src ld/testsuite/ChangeLog ld/testsuite/ld-arm ...

[mgretton@sourceware.org]

CVSROOT:	/cvs/src
Module name:	src
Changes by:	mgretton@sourceware.org	2010-03-02 11:40:25

Modified files:
	ld/testsuite   : ChangeLog 
	ld/testsuite/ld-arm: arm-elf.exp 
	bfd            : ChangeLog elf32-arm.c 
Added files:
	ld/testsuite/ld-arm: attr-merge-incompatible.d 
	                     attr-merge-incompatiblea.s 
	                     attr-merge-incompatibleb.s 

Log message:
	* ld/testsuite/ld-arm/arm-merge-incompatible.d: New test.
	* ld/testsuite/ld-arm/arm-merge-incompatiblea.s: Likewise.
	* ld/testsuite/ld-arm/arm-merge-incompatibleb.s: Likewise.
	* ld/testsuite/ld-arm/arm-elf.exp: Run the new test.
	* bfd/elf32-arm.c (elf32_arm_merge_eabi_attributes): Add a check of the
	return value from the call to _bfd_elf_merge_object_attributes.

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/ld/testsuite/ChangeLog.diff?cvsroot=src&r1=1.1229&r2=1.1230
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/ld/testsuite/ld-arm/attr-merge-incompatible.d.diff?cvsroot=src&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/ld/testsuite/ld-arm/attr-merge-incompatiblea.s.diff?cvsroot=src&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/ld/testsuite/ld-arm/attr-merge-incompatibleb.s.diff?cvsroot=src&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/ld/testsuite/ld-arm/arm-elf.exp.diff?cvsroot=src&r1=1.73&r2=1.74
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/bfd/ChangeLog.diff?cvsroot=src&r1=1.4945&r2=1.4946
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/bfd/elf32-arm.c.diff?cvsroot=src&r1=1.224&r2=1.225