Merge lp:~michaelh1/gcc-linaro/lp-602171 into lp:gcc-linaro/4.4

[Michael Hope]

Fixes LP: #602171

[Loïc Minier (lool)]

review: Abstain

[Michael Hope (michaelh1)]

Note that r93536, which is the main body, and r93537, which fixes a double-paste, need to be merged.

[Andrew Stubbs (ams-codesourcery)]

The patch looks fine, but the ChangeLog could use a little work.

Next time, please do it like this:

2010-07-13 Michael Hope <email address hidden>

 LP: #602171

 Backport from FSF (r159776):
        2010-05-24 Paul Brook <email address hidden>
 * gcc.target/i386/pr9771-1.c: Move code out of main to allow frame
 pointer elimination.

I.e. no need to add your own changelog, and omit the extra text.

This is fine this time though. I'll merge it myself so that it doesn't interfere with the release process.

Thanks

review: Approve

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2010-07-09 11:47:12 +0000
+++ ChangeLog.linaro	2010-07-12 21:45:00 +0000
@@ -1,3 +1,20 @@
[phone]  Michael Hope  <[e-mail]>
+
+	LP: #602171
+	* gcc/testsuite/gcc.target/i386/pr9771-1.c: Merge r159776 from FSF
+	GCC into the Linaro branch.
+	* gcc/testsuite/gcc.target/arm/frame-pointer-1.c: Likewise.
+
+	Original entry:
+        2010-05-24  Paul Brook  <[e-mail]>
+
+	* gcc.target/arm/frame-pointer-1.c: New test.
+	* gcc.target/i386/pr9771-1.c: Move code out of main to allow frame
+	pointer elimination.
+
+	Note that the change was already present but the test cases hadn't
+	been updated.
+
 2010-07-09  Andrew Stubbs  <[e-mail]>
 
 	gcc/

=== modified file 'gcc/testsuite/gcc.target/i386/pr9771-1.c'
--- gcc/testsuite/gcc.target/i386/pr9771-1.c	2007-08-22 08:59:14 +0000
+++ gcc/testsuite/gcc.target/i386/pr9771-1.c	2010-07-12 21:45:00 +0000
@@ -28,7 +28,10 @@
   *adr = save;
 }
 
-int main()
+/* This must not be inlined becuase main() requires the frame pointer
+   for stack alignment.  */
+void test(void) __attribute__((noinline));
+void test(void)
 {
   B = &x;
 
@@ -42,3 +45,9 @@
   exit(0);
 }
 
+int main()
+{
+  test();
+  return 0;
+
+}