From patchwork Mon Nov 19 16:27:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 200042 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 4E2172C0199 for ; Tue, 20 Nov 2012 03:28:36 +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=1353947317; 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=keiyjV4 yby1JsYu+qds65Na+qEk=; b=XV3DeMLoYd6sIsju5Yo9lIWmsXOScxGshzd7MBQ 9pZPjJa5qij096kS/74YQ1bdSlSpRzH2ZpefEDKUeO/Lf5R7H6Vib4r64ivF0Kfo 3FEQBKXxGzb23vBROgvppkAhJeuhfv++wrCge80Kk5ASS2zW/w/0KmqEeepoKmet ix+Y= 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: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=l9/13gMUbtv0taeagG0sU4GjMSeXz0E60pruyqHz/re8SOxxuftWucq1EEPdua JqxE5w/Q7GQm2OoUqTsuAcLWA1v7X18sFPwzD5rf3yR1Ey/Xl2Bt14fQUe1TkpoI YqWcD6p6MCPuJnj66unwlL4YToDNtsOoFX7ry6QdidSVM=; Received: (qmail 2341 invoked by alias); 19 Nov 2012 16:28:14 -0000 Received: (qmail 2231 invoked by uid 22791); 19 Nov 2012 16:28:12 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 19 Nov 2012 16:27:40 +0000 Received: from dslb-088-073-102-073.pools.arcor-ip.net ([88.73.102.73] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TaUCA-0006oI-WD; Mon, 19 Nov 2012 16:27:39 +0000 Message-ID: <50AA5DF7.6020102@ubuntu.com> Date: Mon, 19 Nov 2012 17:27:35 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: GCC Patches CC: Ian Lance Taylor Subject: [patch] libgo - fix build errors and add ARM bits 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 libgo-fix-arm.diff: Work around parse error of struct timex_ on ARM (both trunk and 4.7 branch). libgo-hardening.diff: Avoid compiler warnings in libgo with -D_FORTIFY_SOURCE=2, which let the build fail with -Werror. first chunk for the trunk and 4.7, second chunk for trunk only. libgo-mksysinfo.diff: Fix TIOCNOTTY and TIOCSCTTY definitions, afaicr needed for ARM as well. for trunk and 4.7. I did sign the contributors agreement at http://golang.org/doc/contribute.html#copyright, however I didn't get any feedback or acknowledgement yet. Matthias # DP: libgo: Fix TIOCNOTTY and TIOCSCTTY definitions Index: b/src/libgo/mksysinfo.sh =================================================================== --- a/src/libgo/mksysinfo.sh +++ b/src/libgo/mksysinfo.sh @@ -168,6 +168,12 @@ #ifdef TIOCGWINSZ TIOCGWINSZ_val = TIOCGWINSZ, #endif +#ifdef TIOCNOTTY + TIOCNOTTY_val = TIOCNOTTY, +#endif +#ifdef TIOCSCTTY + TIOCSCTTY_val = TIOCSCTTY, +#endif }; EOF @@ -728,6 +734,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 | \