From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4362 invoked by alias); 18 Jan 2013 12:09:44 -0000 Received: (qmail 4346 invoked by uid 22791); 18 Jan 2013 12:09:43 -0000 X-SWARE-Spam-Status: No, hits=-3.9 required=5.0 tests=AWL,BAYES_00,DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,KHOP_RCVD_TRUST,KHOP_THREADED,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-ia0-f181.google.com (HELO mail-ia0-f181.google.com) (209.85.210.181) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 18 Jan 2013 12:09:36 +0000 Received: by mail-ia0-f181.google.com with SMTP id k25so1310389iah.26 for ; Fri, 18 Jan 2013 04:09:35 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.50.151.195 with SMTP id us3mr1802543igb.40.1358510975587; Fri, 18 Jan 2013 04:09:35 -0800 (PST) Received: by 10.64.34.172 with HTTP; Fri, 18 Jan 2013 04:09:35 -0800 (PST) In-Reply-To: References: Date: Fri, 18 Jan 2013 12:09:00 -0000 Message-ID: Subject: Re: [patch libstdc++]: Fix tests trying to override symbols in shared-library for mingw targets From: Kai Tietz To: Jonathan Wakely Cc: GCC Patches , "libstdc++" Content-Type: text/plain; charset=ISO-8859-1 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-01/txt/msg00958.txt.bz2 2013/1/18 Jonathan Wakely : > On 18 January 2013 10:17, Kai Tietz wrote: >> Hi, >> >> this patch addresses some of libstdc++'s testsuite regressions on >> pe-coff targets due none-overridable symbols in DLL files. >> ChangeLog >> >> * 18_support/50594.cc: Force use of static libstdc++ for >> mingw targets. >> * 19_diagnostics/error_category/operators/equal.cc: Likewise. >> * 19_diagnostics/error_code/cons/1.cc: Likewise. >> * 19_diagnostics/error_code/operators/bool.cc: Likewise. >> * 19_diagnostics/error_code/operators/equal.cc: Likewise. >> * 19_diagnostics/error_condition/cons/1.cc: Likewise. >> * 19_diagnostics/error_condition/operators/bool.cc: Likewise. >> * 19_diagnostics/error_condition/operators/equal.cc: Likewise. >> * 19_diagnostics/error_condition/operators/not_equal.cc: Likewise. >> * 23_containers/set/requirements/exception/basic.cc: Likewise. >> * lib/dg-options.exp (dg-additional-options): Likewise. >> * 26_numerics/headers/cmath/c99_classification_macros_c.cc: Add mingw targets >> as known to fail. >> >> Tested for x86_64-w64-mingw32, i686-w64-mingw32, and >> x86_64-unknown-linux-gnu. Ok for apply? > > Congratulations, you're the first person to touch these files this > year, so you win the privilege of updating the copyright years! ;-) Oh lucky I am, I am winner! .... ;) > (Don't forget that on the trunk now you can replace a series of dates > like 2008, 2009, 2011 with the range 2008-2013.) Sure I will modify the copyright-notice of the files I've touched here. >> Index: testsuite/lib/dg-options.exp >> =================================================================== >> --- testsuite/lib/dg-options.exp (Revision 195288) >> +++ testsuite/lib/dg-options.exp (Arbeitskopie) >> @@ -219,3 +219,25 @@ proc add_options_for_no_pch { flags } { >> # This forces any generated and possibly included PCH to be invalid. >> return "-D__GLIBCXX__=99999999" >> } >> + >> +# Like dg-options, but adds to the default options rather than replacing them. >> + >> +proc dg-additional-options { args } { >> + upvar dg-extra-tool-flags extra-tool-flags >> + >> + if { [llength $args] > 3 } { >> + error "[lindex $args 0]: too many arguments" >> + return >> + } >> + >> + if { [llength $args] >= 3 } { > > Is this condition right or should it check for exactly three? Well, I copied stuff from gcc's testsuite. As we check some lines about for args > 3 and error out, a test for == 3 makes sense, but well, >= 3 is fine too. >> + switch [dg-process-target [lindex $args 2]] { >> + "S" { eval lappend extra-tool-flags [lindex $args 1] } >> + "N" { } >> + "F" { error "[lindex $args 0]: `xfail' not allowed here" } >> + "P" { error "[lindex $args 0]: `xfail' not allowed here" } >> + } >> + } else { >> + eval lappend extra-tool-flags [lindex $args 1] >> + } >> +}