Merge lp:~rsandifo/gcc-linaro/lp809768-4.6 into lp:gcc-linaro/4.6

[Richard Sandiford]

[Linaro Toolchain Builder (cbuild)]

cbuild has taken a snapshot of this branch at r106782 and queued it for build.

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6.tar.xdelta3.xz

and will be built on the following builders:
 a9-builder armv5-builder i686 x86_64

You can track the build queue at:
 http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6
cbuild-ancestor: lp:gcc-linaro/4.6+bzr106781
cbuild-state: check

[Michael Hope (michaelh1)]

cbuild successfully built this on i686-natty-cbuild159-oort8-i686r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6/logs/i686-natty-cbuild159-oort8-i686r1

The testsuite results are the same as the branch point lp:gcc-linaro/4.6+bzr106781

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6/logs/i686-natty-cbuild159-oort8-i686r1/gcc-testsuite.txt

cbuild-checked: i686-natty-cbuild159-oort8-i686r1

[Michael Hope (michaelh1)]

cbuild successfully built this on x86_64-natty-cbuild159-oort3-x86_64r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6/logs/x86_64-natty-cbuild159-oort3-x86_64r1

The testsuite results are the same as the branch point lp:gcc-linaro/4.6+bzr106781

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6/logs/x86_64-natty-cbuild159-oort3-x86_64r1/gcc-testsuite.txt

cbuild-checked: x86_64-natty-cbuild159-oort3-x86_64r1

[Michael Hope (michaelh1)]

cbuild successfully built this on armv7l-natty-cbuild159-ursa1-cortexa9r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6/logs/armv7l-natty-cbuild159-ursa1-cortexa9r1

The testsuite results are the same as the branch point lp:gcc-linaro/4.6+bzr106781

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.6+bzr106782~rsandifo~lp809768-4.6/logs/armv7l-natty-cbuild159-ursa1-cortexa9r1/gcc-testsuite.txt

cbuild-checked: armv7l-natty-cbuild159-ursa1-cortexa9r1

[Ulrich Weigand (uweigand)]

This is OK.

review: Approve

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2011-07-21 10:16:47 +0000
+++ ChangeLog.linaro	2011-07-22 08:38:59 +0000
@@ -1,3 +1,12 @@
[phone]  Richard Sandiford  <[e-mail]>
+
+	gcc/
+	Backport from mainline:
+
+	2011-07-21  Richard Sandiford  <[e-mail]>
+
+	* regcprop.c (maybe_mode_change): Check HARD_REGNO_MODE_OK.
+
 2011-07-21  Richard Sandiford  <[e-mail]>
 
 	gcc/

=== modified file 'gcc/regcprop.c'
--- gcc/regcprop.c	2010-12-17 22:51:25 +0000
+++ gcc/regcprop.c	2011-07-22 08:38:59 +0000
@@ -418,10 +418,9 @@
 
       offset = ((WORDS_BIG_ENDIAN ? wordoffset : 0)
 		+ (BYTES_BIG_ENDIAN ? byteoffset : 0));
-      return gen_rtx_raw_REG (new_mode,
-			      regno + subreg_regno_offset (regno, orig_mode,
-							   offset,
-							   new_mode));
+      regno += subreg_regno_offset (regno, orig_mode, offset, new_mode);
+      if (HARD_REGNO_MODE_OK (regno, new_mode))
+	return gen_rtx_raw_REG (new_mode, regno);
     }
   return NULL_RTX;
 }