From patchwork Sat Apr 16 19:30:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 91493 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 2D6D61007D1 for ; Sun, 17 Apr 2011 05:36:33 +1000 (EST) Received: (qmail 19321 invoked by alias); 16 Apr 2011 19:36:31 -0000 Received: (qmail 19150 invoked by uid 22791); 16 Apr 2011 19:36:30 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,TW_TJ X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 16 Apr 2011 19:36:15 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id EE31BCB0283 for ; Sat, 16 Apr 2011 21:36:13 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3cXBb6X2Td0I for ; Sat, 16 Apr 2011 21:36:11 +0200 (CEST) Received: from [192.168.1.2] (bon31-9-83-155-120-49.fbx.proxad.net [83.155.120.49]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id EB072CB0219 for ; Sat, 16 Apr 2011 21:36:10 +0200 (CEST) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: Fix PR other/48639 Date: Sat, 16 Apr 2011 21:30:39 +0200 User-Agent: KMail/1.9.9 MIME-Version: 1.0 Message-Id: <201104162130.39637.ebotcazou@adacore.com> 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 Merge glitch apparently. Tested on i586-suse-linux, applied on the 4.4 branch as obvious. 2011-04-16 Eric Botcazou PR other/48639 * tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: Move around. Index: tests/base/pthread.h =================================================================== --- tests/base/pthread.h (revision 172588) +++ tests/base/pthread.h (working copy) @@ -96,11 +96,6 @@ #endif /* GLIBC_MUTEX_INIT_CHECK */ -#if defined( PTHREAD_PAGE_SIZE_CHECK ) -extern int __page_size; -#endif /* PTHREAD_PAGE_SIZE_CHECK */ - - #if defined( IRIX_PTHREAD_INIT_CHECK ) #define PTHREAD_MUTEX_INITIALIZER { { 0 } } #define PTHREAD_COND_INITIALIZER { { 0 } } @@ -108,6 +103,11 @@ extern int __page_size; #endif /* IRIX_PTHREAD_INIT_CHECK */ +#if defined( PTHREAD_PAGE_SIZE_CHECK ) +extern int __page_size; +#endif /* PTHREAD_PAGE_SIZE_CHECK */ + + #if defined( PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK ) extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask); #endif /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */