From patchwork Tue Apr 17 12:57:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 153165 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 BE75DB6FC4 for ; Tue, 17 Apr 2012 22:58:24 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1335272305; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:From:Content-Type:Content-Transfer-Encoding:Subject: Date:Message-Id:Cc:To:Mime-Version:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=Qzmqa+VNiaDDnz+t/x99pqH2Dq0=; b=DltOL7H7HvrWzEV O8qywNCopjnlyWZJ2bGfCOt5Raa9aaspmXu3wosvZbnEfDkZonIQ41jVXCK2z/14 B4oorDr9EbhJYozVk0QP/VkLOPKz3eW0x/qS2jN3Z9Dv7js26sw1U9xPLDnI7eIM fvIJwyfT7JbG7eXRqXHszsCVetgg= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:From:Content-Type:Content-Transfer-Encoding:Subject:Date:Message-Id:Cc:To:Mime-Version:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=GfHHiMXUuvmZq2Y6KiKMXJ/NKuR+UIOZHyiOHsaumRDBWEssp91zTAxvl8y6lx Gg3dlq3fJBdrVe0FeG3CXE7aY17laApyU6bJhjTGUEos9EflItTJDB2kgOsCouQC NLdqBhs4nNbNob2PnMOH+F0G3gyDKF1xmSiCl6h9JPR9A=; Received: (qmail 28392 invoked by alias); 17 Apr 2012 12:58:18 -0000 Received: (qmail 28382 invoked by uid 22791); 17 Apr 2012 12:58:17 -0000 X-SWARE-Spam-Status: No, hits=0.2 required=5.0 tests=AWL, BAYES_00, URIBL_BLACK 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; Tue, 17 Apr 2012 12:57:38 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 0B23E290078; Tue, 17 Apr 2012 14:57:44 +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 oQ3HkBcE9hYH; Tue, 17 Apr 2012 14:57:43 +0200 (CEST) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id E8F7C290010; Tue, 17 Apr 2012 14:57:43 +0200 (CEST) From: Tristan Gingold Subject: [Fixinclude]: Fix typo and default to twoprocess on VMS Date: Tue, 17 Apr 2012 14:57:37 +0200 Message-Id: Cc: Bruce Korb To: GCC Patches Mime-Version: 1.0 (Apple Message framework v1257) 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 Hi, one-process methodology cannot be used on VMS because fork/pipe/dup2 aren't fully supported. To avoid a build failure, it is therefore better to build using two-process methodology. But, when twoprocess is selected, gcc emits a warning due to a missing specifier in printf. The patch fixes that. Manually tested on x86_64-darwin by configuring with --enable-twoprocess. I am pretty sure that fixinclude cannot be used as-is on VMS due to the filename convention and missing shell, but at least we can build a cross and a native canadian on UNIX. Ok for trunk ? Tristan. fixincludes/ 2012-04-17 Tristan Gingold * fixincl.c (fix_with_system): Add missing specifier. * configure.ac: Default to twoprocess on vms. * configure: Regenerate. diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac index e7de791..f1fb2ff 100644 --- a/fixincludes/configure.ac +++ b/fixincludes/configure.ac @@ -53,7 +53,8 @@ fi], i?86-*-msdosdjgpp* | \ i?86-*-mingw32* | \ x86_64-*-mingw32* | \ - *-*-beos* ) + *-*-beos* | \ + *-*-*vms*) TARGET=twoprocess ;; diff --git a/fixincludes/fixincl.c b/fixincludes/fixincl.c index 9f399ab..1133534 100644 --- a/fixincludes/fixincl.c +++ b/fixincludes/fixincl.c @@ -829,7 +829,7 @@ fix_with_system (tFixDesc* p_fixd, /* * Now add the fix number and file names that may be needed */ - sprintf (pz_scan, " %ld '%s' '%s'", (long) (p_fixd - fixDescList), + sprintf (pz_scan, " %ld '%s' '%s' '%s'", (long) (p_fixd - fixDescList), pz_fix_file, pz_file_source, pz_temp_file); } else /* NOT an "internal" fix: */