From patchwork Wed Jan 5 12:03:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Tietz X-Patchwork-Id: 77587 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 1EDEBB7063 for ; Wed, 5 Jan 2011 23:07:58 +1100 (EST) Received: (qmail 26481 invoked by alias); 5 Jan 2011 12:07:48 -0000 Received: (qmail 26450 invoked by uid 22791); 5 Jan 2011 12:07:40 -0000 X-SWARE-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RFC_ABUSE_POST X-Spam-Check-By: sourceware.org Received: from mail-qy0-f175.google.com (HELO mail-qy0-f175.google.com) (209.85.216.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 05 Jan 2011 12:03:22 +0000 Received: by qyk8 with SMTP id 8so17112049qyk.20 for ; Wed, 05 Jan 2011 04:03:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.192.149 with SMTP id dq21mr8818146qcb.57.1294229000741; Wed, 05 Jan 2011 04:03:20 -0800 (PST) Received: by 10.229.214.131 with HTTP; Wed, 5 Jan 2011 04:03:20 -0800 (PST) Date: Wed, 5 Jan 2011 13:03:20 +0100 Message-ID: Subject: [patch testsuite g++.dg]: Enable some tests for x86_64-*-mingw*, too From: Kai Tietz To: GCC Patches 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 Hello, ChangeLog gcc/testsuite 2011-01-05 Kai Tietz * g++.dg/ext/dllimport1.C: Add test for x86_64-*-mingw*. * g++.dg/ext/dllimport10.C: Likewise. * g++.dg/ext/dllimport11.C: Likewise. * g++.dg/ext/dllimport12.C: Likewise. * g++.dg/ext/dllimport13.C: Likewise. * g++.dg/ext/dllimport2.C: Likewise. * g++.dg/ext/dllimport3.C: Likewise. * g++.dg/ext/dllimport4.C: Likewise. * g++.dg/ext/dllimport5.C: Likewise. * g++.dg/ext/dllimport6.C: Likewise. * g++.dg/ext/dllimport8.C: Likewise. * g++.dg/ext/dllimport9.C: Likewise. * g++.dg/ext/selectany2.C: Enable test for x86_64-*-mingw* targets, too. Additionally enable test for i?86-*-mingw*. * g++.dg/ext/selectany1.C: Likewise. Remove guard variable check. Tested for i686-pc-cygwin, i686-w64-mingw32, and x86_64-w64-mingw32. Ok for apply? Regards, Kai Index: dllimport1.C =================================================================== --- dllimport1.C (revision 168505) +++ dllimport1.C (working copy) @@ -1,5 +1,5 @@ // PR c++/7910 -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // { dg-options { -Wall -W } } class __attribute__((dllimport)) Foo @@ -28,4 +28,4 @@ void Bar::dummy_bar_func() {} -// { dg-final { scan-assembler-not "__imp___ZN3Foo14dummy_foo_fun" } } +// { dg-final { scan-assembler-not "__imp\[_\]*__ZN3Foo14dummy_foo_fun" } } Index: dllimport10.C =================================================================== --- dllimport10.C (revision 168505) +++ dllimport10.C (working copy) @@ -1,7 +1,7 @@ // PR c++/5287, c++/11021 // Inherit a virtual method from a dllimport'd base class. -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } struct __attribute__((dllimport)) A { Index: dllimport11.C =================================================================== --- dllimport11.C (revision 168505) +++ dllimport11.C (working copy) @@ -1,6 +1,6 @@ // PR target/23589 // Template member functions do not get dllimport status of class. -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } struct __attribute__((dllimport)) Foo { Index: dllimport12.C =================================================================== --- dllimport12.C (revision 168505) +++ dllimport12.C (working copy) @@ -1,7 +1,7 @@ // PR target/27650 // Don't use dllimport semantics on virtual methods when initializing // vtables -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // Use import lib thunk for vtable entry of explicitly virtual method, struct base Index: dllimport13.C =================================================================== --- dllimport13.C (revision 168505) +++ dllimport13.C (working copy) @@ -1,7 +1,7 @@ // PR c++/34749 // Ensure dllimport is handled correctly for friends -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } int __declspec (dllimport) bar(); int __declspec (dllimport) baz(); Index: dllimport2.C =================================================================== --- dllimport2.C (revision 168505) +++ dllimport2.C (working copy) @@ -1,4 +1,4 @@ -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // PR c++/9738 Dllimport attribute is overriden by later definition/redeclaration void __attribute__((dllimport)) Bar(void); Index: dllimport3.C =================================================================== --- dllimport3.C (revision 168505) +++ dllimport3.C (working copy) @@ -1,4 +1,4 @@ -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // PR 10148 Dllimport attribute of object is overriden by later // redefinition without attribute. Index: dllimport4.C =================================================================== --- dllimport4.C (revision 168505) +++ dllimport4.C (working copy) @@ -1,5 +1,5 @@ // Report error if dllimport attribute in definition itself. -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } __attribute__((dllimport)) void bar () { } // { dg-error "definition" } Index: dllimport5.C =================================================================== --- dllimport5.C (revision 168505) +++ dllimport5.C (working copy) @@ -1,4 +1,4 @@ -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // Report error if static symbol definition has dllimport attribute. __attribute__((dllimport)) Index: dllimport6.C =================================================================== --- dllimport6.C (revision 168505) +++ dllimport6.C (working copy) @@ -1,4 +1,4 @@ -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // Mark class static members as dllimport. struct Baz @@ -25,6 +25,6 @@ return (a + b + c + *baz); } -// { dg-final { scan-assembler __imp___ZN3Bar3twoE } } -// { dg-final { scan-assembler __imp___ZN3Bar5threeE } } -// { dg-final { scan-assembler __imp___ZN3Bar8null_bazE } } +// { dg-final { scan-assembler __imp\[_\]*__ZN3Bar3twoE } } +// { dg-final { scan-assembler __imp\[_\]*__ZN3Bar5threeE } } +// { dg-final { scan-assembler __imp\[_\]*__ZN3Bar8null_bazE } } Index: dllimport8.C =================================================================== --- dllimport8.C (revision 168505) +++ dllimport8.C (working copy) @@ -2,7 +2,7 @@ // Ignore dllimport of static members if marked inlined. // or if definition follows declaration in dllimported class. -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // { dg-options { -Wall -W } } struct __attribute__((dllimport)) Foo @@ -26,4 +26,4 @@ Foo::static_func2(); } -// { dg-final { scan-assembler-not "__imp__" } } +// { dg-final { scan-assembler-not "__imp_" } } Index: dllimport9.C =================================================================== --- dllimport9.C (revision 168505) +++ dllimport9.C (working copy) @@ -1,5 +1,5 @@ // Handle dllimport attribute for functions declared inline. -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // { dg-options { -W } } inline __attribute__((dllimport)) void bar() { } // { dg-warning "inline" } @@ -20,4 +20,4 @@ aBlah.out_blah (); } -// { dg-final { scan-assembler-not "__imp__" } } +// { dg-final { scan-assembler-not "__imp_" } } Index: selectany1.C =================================================================== --- selectany1.C (revision 168505) +++ selectany1.C (working copy) @@ -1,11 +1,10 @@ // { dg-do compile { target i?86-pc-cygwin } } -// { dg-do compile { target i?86-pc-mingw* } } +// { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } } // Check that selectany attribute puts symbols into link-once sections. // { dg-final { scan-assembler "\.section\t\.data\\\$foo\[^\n\]*\n\t\.linkonce discard" } } // { dg-final { scan-assembler "\.section\t\.data\\\$x\[^\n\]*\n\t\.linkonce discard" } } -// { dg-final { scan-assembler-dem "\nguard variable for x:" } } __declspec (selectany) int foo = 1; Index: selectany2.C =================================================================== --- selectany2.C (revision 168505) +++ selectany2.C (working copy) @@ -1,5 +1,5 @@ // { dg-do compile { target i?86-pc-cygwin } } -// { dg-do compile { target i?86-pc-mingw* } } +// { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } } // Check for errors with invalid usage of selectany attribute.