From patchwork Wed Jul 29 21:42:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 501863 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 9FDD3140785 for ; Thu, 30 Jul 2015 07:42:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=p0TqKIgl; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=I4omzmDGn6jIIa12zU8vNaA6E0EYGf4e+1zJvMBuS5waxK IL7KqsH5lET2/Z/N/7WI1e4IcCzyOouiW1yk2YqxwqTOaqqO0N8DT1UWe6xYt+cQ KPTCeTnYRoF7W0cHRHX7SkqkqTPqhWIF62qff3bN7lj2yR55CHtJExZSE0+k4= 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 :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=nfo49wqJvOHFUK5zMexFP7pOFMw=; b=p0TqKIglMKHu2tLFOFE1 wQzd3/aPO6JEtwq83EWyZdG4iPpkh6MBUKurtfo0xkK4d/xl36K6GadCrtkV//Vd +BpwachCZVx3pElVnpfvxs4vnSUEdZJdEFWbNaJIUMMGYaGNRC/2pk+CE793kLC2 WmcxBIFFQJSudCiO6Yq+jPY= Received: (qmail 106082 invoked by alias); 29 Jul 2015 21:42:51 -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 106072 invoked by uid 89); 29 Jul 2015 21:42:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-ig0-f173.google.com Received: from mail-ig0-f173.google.com (HELO mail-ig0-f173.google.com) (209.85.213.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 29 Jul 2015 21:42:49 +0000 Received: by igk11 with SMTP id 11so145672430igk.1 for ; Wed, 29 Jul 2015 14:42:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=/efub4qj4WmTQ7OCbutup5asfZmJAk0YF1KLHsdO1jA=; b=CtDb4DVEBK1B1BZjc04JQULVBfSNsJhk0wnDgwNtkDNk24T6Cw+n36xbDwPwdFsTKv A4SM9U72RxNZZWQhEoEBrL+t8pM7L6kB81CSZyuWgauMmVgEfX6TOjh95DFVaI5mlxGA vPzChJldzaaZE7I2Wb2NxzTr7/xiCcghavPOcKsuD8jAyzgOD8J1RWfAlcOcntPrfYaM 6PKq/CN7svNNAlvMaSZiq2FljAA4+pJEHI6vaTuX+jWAJ+e5jjCQyiLcQ8QTz2Aq2N2L 87XnYIMhtLQ/Vp6Rk3861vHxjARXmJ4Tc6XpUvDdzoCwn07SXP9BQPvk0/m/7orU7Tzh YJtQ== X-Gm-Message-State: ALoCoQmZo3dn9CgPU19lLAcWvYRU5oeJAAiadWcHlNEwLMcWxcKhf6jFqBx0LlSBUkN0m0/XeWjk MIME-Version: 1.0 X-Received: by 10.50.62.148 with SMTP id y20mr9621622igr.17.1438206167413; Wed, 29 Jul 2015 14:42:47 -0700 (PDT) Received: by 10.79.102.133 with HTTP; Wed, 29 Jul 2015 14:42:47 -0700 (PDT) Date: Wed, 29 Jul 2015 14:42:47 -0700 Message-ID: Subject: libgo patch committed: Add missing spaces to last mksysinfo commit From: Ian Lance Taylor To: gcc-patches , "gofrontend-dev@googlegroups.com" The last change to libgo/mksysinfo.sh was missing some spaces, which apparently causaed mksysinfo to hang on some systems. This is https://golang.org/issue/11924. This patch from Lynn Boger fixes the problem. Bootstrapped on x86_64-unknown-linux-gnu, where it made no difference. Committed to mainline. Ian Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 226196) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -3aa95d96181dc4525b1b8ec189f9104afa6d7609 +9931f2c150e2da4b7d468db332823d8ef4fb8c34 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/mksysinfo.sh =================================================================== --- libgo/mksysinfo.sh (revision 226196) +++ libgo/mksysinfo.sh (working copy) @@ -1026,19 +1026,19 @@ if ! grep '^const TUNDETACHFILTER' ${OUT fi fi -if ! grep '^const TUNGETVNETHDRSZ'${OUT} >/dev/null 2>&1; then +if ! grep '^const TUNGETVNETHDRSZ' ${OUT} >/dev/null 2>&1; then if grep '^const _TUNGETVNETHDRSZ_val' ${OUT} >/dev/null 2>&1; then echo 'const TUNGETVNETHDRSZ = _TUNGETVNETHDRSZ_val' >> ${OUT} fi fi -if ! grep '^const TUNSETVNETHDRSZ'${OUT} >/dev/null 2>&1; then +if ! grep '^const TUNSETVNETHDRSZ' ${OUT} >/dev/null 2>&1; then if grep '^const _TUNSETVNETHDRSZ_val' ${OUT} >/dev/null 2>&1; then echo 'const TUNSETVNETHDRSZ = _TUNSETVNETHDRSZ_val' >> ${OUT} fi fi -if ! grep '^const TUNSETQUEUE'${OUT} >/dev/null 2>&1; then +if ! grep '^const TUNSETQUEUE' ${OUT} >/dev/null 2>&1; then if grep '^const _TUNSETQUEUE_val' ${OUT} >/dev/null 2>&1; then echo 'const TUNSETQUEUE = _TUNSETQUEUE_val' >> ${OUT} fi