From 95856847798749c0a1d55fac0dcb62d300402a9c Mon Sep 17 00:00:00 2001
From: ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 18 May 2010 19:05:09 +0000
Subject: [PATCH] 	* gcc.target/i386/20011009-1.c (COMMENT): Define. 
 (main): Use it. 	* gcc.target/i386/pr25993.c [__sun__]: Use .globl. 
 * lib/lto.exp (lto_prune_warns): Fix location line regex. 	Prune another
 location line format. 	(lto-obj): Call lto_prune_warns on comp_output.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159538 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                    | 9 +++++++++
 gcc/testsuite/gcc.target/i386/20011009-1.c | 8 +++++++-
 gcc/testsuite/gcc.target/i386/pr25993.c    | 4 ++++
 gcc/testsuite/lib/lto.exp                  | 5 ++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 15200cd..a014911 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.target/i386/20011009-1.c (COMMENT): Define.
+	(main): Use it.
+	* gcc.target/i386/pr25993.c [__sun__]: Use .globl.
+	* lib/lto.exp (lto_prune_warns): Fix location line regex.
+	Prune another location line format.
+	(lto-obj): Call lto_prune_warns on comp_output.
+
 2010-05-18  Jan Hubicka  <jh@suse.cz>
 
 	* gcc.dg/lto/ipacp_0.c: New test.
diff --git a/gcc/testsuite/gcc.target/i386/20011009-1.c b/gcc/testsuite/gcc.target/i386/20011009-1.c
index 99173a1..e79a475 100644
--- a/gcc/testsuite/gcc.target/i386/20011009-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011009-1.c
@@ -4,11 +4,17 @@
 extern void abort (void);
 extern void exit (int);
 
+#ifdef __sun__
+#define COMMENT "/"
+#else
+#define COMMENT "#"
+#endif
+
 int main ()
 {
   int x;
 
-  asm ("movl $26, %0 # 26 |-> reg \n\t"
+  asm ("movl $26, %0 " COMMENT " 26 |-> reg \n\t"
        "movl $28, %0" : "=r" (x));
   if (x != 28)
     abort ();
diff --git a/gcc/testsuite/gcc.target/i386/pr25993.c b/gcc/testsuite/gcc.target/i386/pr25993.c
index 38d0e0f..17b40e5 100644
--- a/gcc/testsuite/gcc.target/i386/pr25993.c
+++ b/gcc/testsuite/gcc.target/i386/pr25993.c
@@ -5,7 +5,11 @@
 #ifndef __ASSEMBLER__
 extern int func(void);
 #else
+#ifdef __sun__
+.globl func
+#else
 .global func
+#endif
 .type func,%function
 .align 4
 func:
diff --git a/gcc/testsuite/lib/lto.exp b/gcc/testsuite/lib/lto.exp
index e5aaf3a..22b7b46 100644
--- a/gcc/testsuite/lib/lto.exp
+++ b/gcc/testsuite/lib/lto.exp
@@ -27,7 +27,8 @@ proc lto_prune_warns { text } {
 
     # And any stray location lines.
     regsub -all "(^|\n)\[^\n\]*: In function \[^\n\]*" $text "" text
-    regsub -all "(^|\n)In file included from :\[^\n\]*" $text "" text
+    regsub -all "(^|\n)In file included from \[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[ \t\]*from \[^\n\]*" $text "" text
 
     # Sun ld warns about common symbols with differing sizes.  Unlike GNU ld
     # --warn-common (off by default), they cannot be disabled.
@@ -137,6 +138,8 @@ proc lto-obj { source dest optall optfile optstr xfaildata } {
 
     set compiler_conditional_xfail_data $xfaildata
     set comp_output [${tool}_target_compile "$source" "$dest" object $options]
+    # Prune unimportant visibility warnings before checking output.
+    set comp_output [lto_prune_warns $comp_output]
     ${tool}_check_compile "$testcase $dest assemble" $optstr $dest $comp_output
 }
 
-- 
2.7.4