From: James Greenhalgh <james.greenhalgh@arm.com>
Date: Tue, 1 Jul 2014 17:58:11 +0000 (+0000)
Subject: gcc/testsuite/
X-Git-Tag: releases/gcc-5.1.0~6540
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=454a17a31e4d68df961e769fc2b9233204bb3adc;p=thirdparty%2Fgcc.git

gcc/testsuite/

	* gcc.target/aarch64/aapcs64/aapcs64.exp:
	(additional_flags_for_func_ret): New variable based on $additional_flags
	with -fno-use-caller-save.
	(func-ret-*.c): Use the new variable.

Co-Authored-By: Yufeng Zhang <yufeng.zhang@arm.com>

From-SVN: r212206
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 229b3c8d5904..6c0e2acf8fe2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2014-07-01  James Greenhalgh  <james.greenhalgh@arm.com>
+	    Yufeng Zhang  <yufeng.zhang@arm.com>
+
+	* gcc.target/aarch64/aapcs64/aapcs64.exp:
+	(additional_flags_for_func_ret): New variable based on $additional_flags
+	with -fno-use-caller-save.
+	(func-ret-*.c): Use the new variable.
+
 2014-07-01  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/59637
diff --git a/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp b/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp
index 195f977c2dcc..fdfbff103ad6 100644
--- a/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp
+++ b/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp
@@ -48,11 +48,15 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/va_arg-*.c]] {
 }
 
 # Test function return value.
+#   Disable -fuse-caller-save to prevent the compiler from generating
+#   conflicting code.
+set additional_flags_for_func_ret $additional_flags
+append additional_flags_for_func_ret " -fno-use-caller-save"
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/func-ret-*.c]] {
     if {[runtest_file_p $runtests $src]} {
 	    c-torture-execute [list $src \
 				    $srcdir/$subdir/abitest.S] \
-				    $additional_flags
+				    $additional_flags_for_func_ret
     }
 }