From patchwork Mon Oct 6 11:53:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 396788 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EAE9914008F for ; Mon, 6 Oct 2014 22:53:29 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=X4nOsdl7Hvlm8udK9 chO27wbWpJeFiWbO9Zxt7ZxSAW8p1d4Btu/B0Fti1+VlgMEJfr/sAJ9gdQv9XeMD uQwlo2qB1wcuP2ngGFANJX9RCaGEpsQWh+Z9L8ZexMwlyHZYXPs+sn9KpIFWpybV iAvoN54vbzRrrRG8iDOf6m98jM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=default; bh=SKWm6yC57APzrptjzMFybQ3 DAM8=; b=sq7viGlJaVL+BlA+57iIJJDbYZTwcsVKXlcjV/RRDwjhpO0w8HW+8bT UyyDwI5bo3FGvhfHGQKXbCWNIXJXi8L4YANFAI4BnZYrZpPlsIKOAZ82pIO9nU9s YN8EFFcGpjKfo/k3e6gG5NVxUm2VDW9rsn/8fIl43y60fWzMyR30= Received: (qmail 5565 invoked by alias); 6 Oct 2014 11:53:22 -0000 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 Received: (qmail 5553 invoked by uid 89); 6 Oct 2014 11:53:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 06 Oct 2014 11:53:21 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s96BrKtU013054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 6 Oct 2014 07:53:20 -0400 Received: from redhat.com (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s96BrGCv018409 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Mon, 6 Oct 2014 07:53:19 -0400 Date: Mon, 6 Oct 2014 13:53:16 +0200 From: Marek Polacek To: Jakub Jelinek Cc: GCC Patches Subject: Re: [PATCH] libgomp.c/ cleanup Message-ID: <20141006115316.GS3503@redhat.com> References: <20141006101833.GQ3503@redhat.com> <20141006104651.GY1986@tucnak.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20141006104651.GY1986@tucnak.redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) On Mon, Oct 06, 2014 at 12:46:51PM +0200, Jakub Jelinek wrote: > On Mon, Oct 06, 2014 at 12:18:33PM +0200, Marek Polacek wrote: > > --- gcc/libgomp/testsuite/libgomp.c/affinity-1.c > > +++ gcc/libgomp/testsuite/libgomp.c/affinity-1.c > > @@ -31,6 +31,7 @@ > > > > #ifdef DO_FORK > > #include > > +pid_t waitpid (pid_t, int *, int); > > I'd #include here instead. > > > --- gcc/libgomp/testsuite/libgomp.c/nqueens-1.c > > +++ gcc/libgomp/testsuite/libgomp.c/nqueens-1.c > > @@ -6,6 +6,7 @@ > > #include > > #include > > > > +unsigned long int strtoul(const char *, char **, int); > > and #include here. > > > --- gcc/libgomp/testsuite/libgomp.c/thread-limit-1.c > > +++ gcc/libgomp/testsuite/libgomp.c/thread-limit-1.c > > @@ -4,6 +4,11 @@ > > #include > > #include > > > > +extern int omp_get_thread_limit (void); > > +extern int omp_set_dynamic (int); > > +extern void omp_set_nested (int); > > +extern int omp_get_num_threads (void); > > + > > int > > main () > > { > > diff --git gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c > > index 0fc9dae..ca9ad23 100644 > > --- gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c > > +++ gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c > > @@ -4,6 +4,11 @@ > > #include > > #include > > > > +extern int omp_get_thread_limit (void); > > +extern int omp_set_dynamic (int); > > +extern void omp_set_nested (int); > > +extern int omp_get_num_threads (void); > > Please #include in the above two tests instead. Ok, sorry. I'm fixing those with the following. Applying to trunk. 2014-10-06 Marek Polacek * testsuite/libgomp.c/affinity-1.c: Include . * testsuite/libgomp.c/nqueens-1.c: Include . * testsuite/libgomp.c/thread-limit-1.c: Include * testsuite/libgomp.c/thread-limit-2.c: Likewise. Marek diff --git gcc/libgomp/testsuite/libgomp.c/affinity-1.c gcc/libgomp/testsuite/libgomp.c/affinity-1.c index a1a2a12..21f344c 100644 --- gcc/libgomp/testsuite/libgomp.c/affinity-1.c +++ gcc/libgomp/testsuite/libgomp.c/affinity-1.c @@ -31,7 +31,7 @@ #ifdef DO_FORK #include -pid_t waitpid (pid_t, int *, int); +#include #endif #ifdef HAVE_PTHREAD_AFFINITY_NP #include diff --git gcc/libgomp/testsuite/libgomp.c/nqueens-1.c gcc/libgomp/testsuite/libgomp.c/nqueens-1.c index ed6c179..9742b7a 100644 --- gcc/libgomp/testsuite/libgomp.c/nqueens-1.c +++ gcc/libgomp/testsuite/libgomp.c/nqueens-1.c @@ -5,8 +5,8 @@ #include #include #include +#include -unsigned long int strtoul(const char *, char **, int); int cnt; #pragma omp threadprivate (cnt) diff --git gcc/libgomp/testsuite/libgomp.c/thread-limit-1.c gcc/libgomp/testsuite/libgomp.c/thread-limit-1.c index 7571f23..1d9794a 100644 --- gcc/libgomp/testsuite/libgomp.c/thread-limit-1.c +++ gcc/libgomp/testsuite/libgomp.c/thread-limit-1.c @@ -3,11 +3,7 @@ #include #include - -extern int omp_get_thread_limit (void); -extern int omp_set_dynamic (int); -extern void omp_set_nested (int); -extern int omp_get_num_threads (void); +#include int main () diff --git gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c index ca9ad23..1a97fb6 100644 --- gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c +++ gcc/libgomp/testsuite/libgomp.c/thread-limit-2.c @@ -3,11 +3,7 @@ #include #include - -extern int omp_get_thread_limit (void); -extern int omp_set_dynamic (int); -extern void omp_set_nested (int); -extern int omp_get_num_threads (void); +#include int main ()