From patchwork Thu Feb 2 10:44:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 139106 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 73918B71B1 for ; Thu, 2 Feb 2012 21:45:00 +1100 (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=1328784301; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=7XSM6V1 W7Z9YWNAtwCucffGH6lk=; b=PMHvxjCOhLAT+ot5jRmZB3pio5oh/cZEbWc/98+ pmFx/23HOb8Ihlb8E29bk6eDYf2TBAgGCg5fT6iu8FNJRZApbaVLVxs6pChF59fm riVLyceYUIB02J7bLXoyKvq5r10AhU9Efcv/iois7xTHuKY1FjKvssmoBK8dcewn wiDM= 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:X-Envelope-From:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=WWfLIYXxq/zTU8ttqD4uTKT3ME4ifTcTtjPuDMTLxk7fWCQ0nAbRPS0IXxn5ph nQ+opejq6iodQ5Vn+W6gLytmTxDRd9kg7WWZpE07tlo+tuybh2zVpPOkNv9U4bBK VeHmif27nhC5XHkRdFPPH1kM2i8PlkGCPIIVu2Bk0vjV0=; Received: (qmail 1324 invoked by alias); 2 Feb 2012 10:44:57 -0000 Received: (qmail 1316 invoked by uid 22791); 2 Feb 2012 10:44:57 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 02 Feb 2012 10:44:42 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.42.210] (dslb-088-073-082-234.pools.arcor-ip.net [88.73.82.234]) (authenticated bits=0) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id q12AieQf007780; Thu, 2 Feb 2012 11:44:40 +0100 Message-ID: <4F2A6917.2030309@ubuntu.com> Date: Thu, 02 Feb 2012 11:44:39 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20120130 Thunderbird/10.0 MIME-Version: 1.0 To: GCC Patches CC: Ian Lance Taylor Subject: [patch, libgo] define TIOCNOTTY and TIOCSCTTY constants for sparc-linux-gnu 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 on sparc-linux, the TIOCNOTTY and TIOCSCTTY constants are defined as #define TIOCNOTTY _IO('t', 113) which cannot be parsed by mksysinfo.sh. Just define these as TIOCGWINSZ is defined. This lets the libgo build succeed, but I see the same failures as reported in PR52084 for powerpc-linux-gnu. Matthias Index: libgo/mksysinfo.sh =================================================================== --- libgo/mksysinfo.sh (revision 183830) +++ libgo/mksysinfo.sh (working copy) @@ -101,6 +101,12 @@ #ifdef TIOCGWINSZ TIOCGWINSZ_val = TIOCGWINSZ, #endif +#ifdef TIOCNOTTY + TIOCNOTTY_val = TIOCNOTTY, +#endif +#ifdef TIOCSCTTY + TIOCSCTTY_val = TIOCSCTTY, +#endif }; EOF @@ -615,6 +621,16 @@ echo 'const TIOCGWINSZ = _TIOCGWINSZ_val' >> ${OUT} fi fi +if ! grep '^const TIOCNOTTY' ${OUT} >/dev/null 2>&1; then + if grep '^const _TIOCNOTTY_val' ${OUT} >/dev/null 2>&1; then + echo 'const TIOCNOTTY = _TIOCNOTTY_val' >> ${OUT} + fi +fi +if ! grep '^const TIOCSCTTY' ${OUT} >/dev/null 2>&1; then + if grep '^const _TIOCSCTTY_val' ${OUT} >/dev/null 2>&1; then + echo 'const TIOCSCTTY = _TIOCSCTTY_val' >> ${OUT} + fi +fi # The ioctl flags for terminal control grep '^const _TC[GS]ET' gen-sysinfo.go | \