* 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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 15200cd..a014911 100644 (file)
--- 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.
 2010-05-18  Jan Hubicka  <jh@suse.cz>
 
        * gcc.dg/lto/ipacp_0.c: New test.

diff --git a/gcc/testsuite/gcc.target/i386/pr25993.c b/gcc/testsuite/gcc.target/i386/pr25993.c
index b079e25..17b40e5 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr25993.c
+++ b/gcc/testsuite/gcc.target/i386/pr25993.c
@@ -10,7 +10,7 @@ extern int func(void);
 #else
 .global func
 #endif
 #else
 .global func
 #endif

-.type func,@function
+.type func,%function

 .align 4
 func:
         ret
 .align 4
 func:
         ret

diff --git a/gcc/testsuite/lib/lto.exp b/gcc/testsuite/lib/lto.exp
index e5aaf3a..22b7b46 100644 (file)
--- 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
 
     # 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.
 
     # 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]
 
     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
 }
 
     ${tool}_check_compile "$testcase $dest assemble" $optstr $dest $comp_output
 }