From patchwork Mon Sep 12 22:50:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lawrence Crowl X-Patchwork-Id: 114427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id C270BB71C3 for ; Tue, 13 Sep 2011 08:50:53 +1000 (EST) Received: (qmail 6738 invoked by alias); 12 Sep 2011 22:50:49 -0000 Received: (qmail 6728 invoked by uid 22791); 12 Sep 2011 22:50:47 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 12 Sep 2011 22:50:31 +0000 Received: from wpaz21.hot.corp.google.com (wpaz21.hot.corp.google.com [172.24.198.85]) by smtp-out.google.com with ESMTP id p8CMoVdb006096; Mon, 12 Sep 2011 15:50:31 -0700 Received: from jade.mtv.corp.google.com (jade.mtv.corp.google.com [172.18.110.116]) by wpaz21.hot.corp.google.com with ESMTP id p8CMoQLi005377; Mon, 12 Sep 2011 15:50:26 -0700 Received: by jade.mtv.corp.google.com (Postfix, from userid 21482) id D8CE322267E; Mon, 12 Sep 2011 15:50:25 -0700 (PDT) To: reply@codereview.appspotmail.com, dnovillo@google.com, gcc-patches@gcc.gnu.org Subject: [pph] Restore -fno-dwarf2-cfi-asm. (issue4992051) Message-Id: <20110912225025.D8CE322267E@jade.mtv.corp.google.com> Date: Mon, 12 Sep 2011 15:50:25 -0700 (PDT) From: crowl@google.com (Lawrence Crowl) X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Restore compiling the tests with -fno-dwarf2-cfi-asm. Failure to do so results in different assembly output on different platforms due to --- This patch is available for review at http://codereview.appspot.com/4992051 different assembler support for exceptions. Index: gcc/testsuite/ChangeLog.pph 2011-09-12 Lawrence Crowl * lib/dg-pph.exp: Restore -fno-dwarf2-cfi-asm option for stability across platforms. Index: gcc/testsuite/lib/dg-pph.exp =================================================================== --- gcc/testsuite/lib/dg-pph.exp (revision 178792) +++ gcc/testsuite/lib/dg-pph.exp (working copy) @@ -19,10 +19,13 @@ load_lib copy-file.exp +# Options needed for assembly stability across platforms. +set stable "-fno-dwarf2-cfi-asm" + # Generate a PPH image from a header file. proc dg-pph-hdr { subdir test options mapflag suffix } { - global runtests dg-do-what-default + global runtests dg-do-what-default stable # If we're only testing specific files and this isn't one of them, skip it. if { ![runtest_file_p $runtests $test] } { @@ -34,7 +37,7 @@ proc dg-pph-hdr { subdir test options ma verbose -log "\nTesting $nshort, $options" set dg-do-what-default preparse - dg-test -keep-output $test "-fpph-gen $options $mapflag -I." "" + dg-test -keep-output $test "-fpph-gen $options $mapflag $stable" "" if { [file_on_host exists "$bname.s"] } { file_on_host delete "$bname.s" @@ -45,7 +48,7 @@ proc dg-pph-hdr { subdir test options ma # as they represent files that are not compatible with PPH. proc dg-pph-neg { subdir test options mapflag suffix } { - global runtests dg-do-what-default + global runtests dg-do-what-default stable # If we're only testing specific files and this isn't one of them, skip it. if { ![runtest_file_p $runtests $test] } { @@ -57,7 +60,7 @@ proc dg-pph-neg { subdir test options ma verbose -log "\nTesting $nshort, $options" set dg-do-what-default compile - dg-test -keep-output $test "$options $mapflag -I. -fno-dwarf2-cfi-asm" "" + dg-test -keep-output $test "$options $mapflag $stable" "" if { [file_on_host exists "$bname.s"] } { file_on_host delete "$bname.s" @@ -71,7 +74,7 @@ proc dg-pph-neg { subdir test options ma # assembly outputs are identical. proc dg-pph-pos { subdir test options mapflag suffix } { - global runtests dg-do-what-default + global runtests dg-do-what-default stable # If we're only testing specific files and this isn't one of them, skip it. if { ![runtest_file_p $runtests $test] } { @@ -109,7 +112,8 @@ proc dg-pph-pos { subdir test options ma # Now, compile the file but prune the result to avoid considering # it part of the testsuite. We just want to compile it to provide # a base assembly output to compare against. - set comp_output [g++-dg-test $test compile "$options $other_options"] + set full_options "$options $other_options $stable" + set comp_output [g++-dg-test $test compile "$full_options"] set comp_output [g++-dg-prune $target_triplet $comp_output] # Wanted assembly, so quit if it did not compile successfully. @@ -127,7 +131,7 @@ proc dg-pph-pos { subdir test options ma verbose -log "" # Compile a second time using the PPH files. - dg-test -keep-output $test "$options $mapflag" "" + dg-test -keep-output $test "$options $mapflag $stable" "" if { !$is_asm } { # No assembly means we cannot compare them,