From 7b25ea29a8dc17c5b1dfbf25508236cfc5d83782 Mon Sep 17 00:00:00 2001
From: Janis Johnson <janis187@us.ibm.com>
Date: Mon, 12 Oct 2009 17:13:41 +0000
Subject: [PATCH] re PR testsuite/41659 (FAIL: gcc.dg/lto/20090914-2
 c_lto_20090914-2_0.o assemble, -O0 -fwhopr)

	PR testsuite/41659
	* gcc.dg/lto/20090914-2.c: Use dg-skip-if to skip test.
	* lib/lto.exp (lto-get-options-main): Report error for using "target"
	or "xfail" with dg-lto-dg.

From-SVN: r152671
---
 gcc/testsuite/ChangeLog                 |  7 +++++++
 gcc/testsuite/gcc.dg/lto/20090914-2_0.c |  3 ++-
 gcc/testsuite/lib/lto.exp               | 10 ++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 07c5ef5c442..3979761acad 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-12  Janis Johnson  <janis187@us.ibm.com>
+
+	PR testsuite/41659
+	* gcc.dg/lto/20090914-2.c: Use dg-skip-if to skip test.
+	* lib/lto.exp (lto-get-options-main): Report error for using "target"
+	or "xfail" with dg-lto-dg.
+
 2009-10-12  Stefan Dösinger  <stefan@codeweavers.com>
 
 	* gcc.target/i386/ms_hook_prologue.c: New testcase.
diff --git a/gcc/testsuite/gcc.dg/lto/20090914-2_0.c b/gcc/testsuite/gcc.dg/lto/20090914-2_0.c
index f78ecf8899f..908af697ff8 100644
--- a/gcc/testsuite/gcc.dg/lto/20090914-2_0.c
+++ b/gcc/testsuite/gcc.dg/lto/20090914-2_0.c
@@ -1,4 +1,5 @@
-/* { dg-lto-do run { target x86_64-*-* i?86-*-* } } */
+/* { dg-lto-do run */
+/* { dg-skip-if "x86 only" { ! { x86_64-*-* i?86-*-* } } { "*" } { "" } }
 
 /* Doesn't work without this dummy function with -fwhopr.  */
 int foo(void) { }
diff --git a/gcc/testsuite/lib/lto.exp b/gcc/testsuite/lib/lto.exp
index 7f2d7ecec83..cccd64220bc 100644
--- a/gcc/testsuite/lib/lto.exp
+++ b/gcc/testsuite/lib/lto.exp
@@ -191,6 +191,16 @@ proc lto-get-options-main { src } {
 		   || ![string compare "dg-options" $cmd] } {
 	    warning "lto.exp does not support $cmd in primary source file"
 	} elseif { ![string compare "dg-lto-do" $cmd] } {
+	    if { [llength $op] > 3 } {
+		set kw [lindex [lindex $op 3] 0]
+		if [string match "target" $kw] {
+		    perror "$src: dg-lto-do does not support \"target\""
+		} elseif [string match "xfail" $kw] {
+		    perror "$src: dg-lto-do does not support \"xfail\""
+		} else {
+		    perror "$src: dg-lto-do takes a single argument"
+		}
+	    }
 	    set dgdo [lindex $op 2]
 	    verbose "dg-lto-do command for \"$op\" is $dgdo"
 	    if { ![string compare "assemble" $dgdo] } {