From 52ebab2b488baa671b08ce9c6f560a0ee40ba890 Mon Sep 17 00:00:00 2001
From: Janis Johnson <janis187@us.ibm.com>
Date: Thu, 6 Nov 2008 00:05:09 +0000
Subject: [PATCH] sourcebuild.texi (Torture Tests): Add
 ADDITIONAL_TORTURE_OPTIONS.

gcc/
	* doc/sourcebuild.texi (Torture Tests): Add ADDITIONAL_TORTURE_OPTIONS.
gcc/testsuite/
	* lib/c-torture.exp: Use ADDITIONAL_TORTURE_OPTIONS if defined.
	* lib/gcc-dg.exp: Ditto.
	* lib/fortran-torture.exp: Ditto.
	* lib/objc-torture.exp: Ditto.

From-SVN: r141630
---
 gcc/ChangeLog                         |  4 ++++
 gcc/doc/sourcebuild.texi              | 10 +++++++++-
 gcc/testsuite/ChangeLog               |  7 +++++++
 gcc/testsuite/lib/c-torture.exp       |  5 +++++
 gcc/testsuite/lib/fortran-torture.exp |  4 ++++
 gcc/testsuite/lib/gcc-dg.exp          |  5 +++++
 gcc/testsuite/lib/objc-torture.exp    |  5 +++++
 7 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80a53a7..a3d2629 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-05  Janis Johnson  <janis187@us.ibm.com>
+
+	* doc/sourcebuild.texi (Torture Tests): Add ADDITIONAL_TORTURE_OPTIONS.
+
 2008-11-06  Ben Elliston  <bje@au.ibm.com>	
 
 	* config/rs6000/rs6000.c (rs6000_override_options): Comment fix.
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 85febd2..e0ed42f 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -1573,4 +1573,12 @@ to call the torture procedures if the tests should use the list in
 @var{DG_TORTURE_OPTIONS} defined in @file{gcc-dg.exp}.
 
 Most uses of torture options can override the default lists by defining
-@var{TORTURE_OPTIONS} in a @file{.dejagnurc} file.
+@var{TORTURE_OPTIONS} or add to the default list by defining
+@var{ADDITIONAL_TORTURE_OPTIONS}.  Define these in a @file{.dejagnurc}
+file or add them to the @file{site.exp} file; for example
+
+@smallexample
+set ADDITIONAL_TORTURE_OPTIONS  [list @\
+  @{ -O2 -ftree-loop-linear @} @\
+  @{ -O2 -fpeel-loops @} ]
+@end smallexample
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 198a00f..76de5b9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-05  Janis Johnson  <janis187@us.ibm.com>
+
+	* lib/c-torture.exp: Use ADDITIONAL_TORTURE_OPTIONS if defined.
+	* lib/gcc-dg.exp: Ditto.
+	* lib/fortran-torture.exp: Ditto.
+	* lib/objc-torture.exp: Ditto.
+
 2008-11-05  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/38025
diff --git a/gcc/testsuite/lib/c-torture.exp b/gcc/testsuite/lib/c-torture.exp
index 6413b2d..bfc6a56 100644
--- a/gcc/testsuite/lib/c-torture.exp
+++ b/gcc/testsuite/lib/c-torture.exp
@@ -43,6 +43,11 @@ if [info exists TORTURE_OPTIONS] {
 	{ -Os } ]
 }
 
+if [info exists ADDITIONAL_TORTURE_OPTIONS] {
+    set C_TORTURE_OPTIONS \
+	[concat $C_TORTURE_OPTIONS $ADDITIONAL_TORTURE_OPTIONS]
+}
+
 global GCC_UNDER_TEST
 if ![info exists GCC_UNDER_TEST] {
     set GCC_UNDER_TEST "[find_gcc]"
diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index 7527a0a..1e92d10 100644
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -82,6 +82,10 @@ proc get-fortran-torture-options { } {
 	lappend options $vectorizer_options
     }
 
+    if [info exists ADDITIONAL_TORTURE_OPTIONS] {
+	set options [concat $options $ADDITIONAL_TORTURE_OPTIONS]
+    }
+
     return $options
 }
 
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 1497ce3..5d1efbb 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -53,6 +53,11 @@ if [info exists TORTURE_OPTIONS] {
 	{ -Os } ]
 }
 
+if [info exists ADDITIONAL_TORTURE_OPTIONS] {
+    set DG_TORTURE_OPTIONS \
+	[concat $DG_TORTURE_OPTIONS $ADDITIONAL_TORTURE_OPTIONS]
+}
+
 global GCC_UNDER_TEST
 if ![info exists GCC_UNDER_TEST] {
     set GCC_UNDER_TEST "[find_gcc]"
diff --git a/gcc/testsuite/lib/objc-torture.exp b/gcc/testsuite/lib/objc-torture.exp
index 31967f4..0d03159 100644
--- a/gcc/testsuite/lib/objc-torture.exp
+++ b/gcc/testsuite/lib/objc-torture.exp
@@ -60,6 +60,11 @@ if [info exists TORTURE_OPTIONS] {
 	" -Os " ]
 }
 
+if [info exists ADDITIONAL_TORTURE_OPTIONS] {
+  set OBJC_TORTURE_OPTIONS \
+	[concat $OBJC_TORTURE_OPTIONS $ADDITIONAL_TORTURE_OPTIONS]
+}
+
 #
 # objc-torture-compile -- runs the Tege OBJC-torture test
 #
-- 
2.7.4