From patchwork Wed Jan 21 23:03:44 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: 431633 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 043B514012C for ; Thu, 22 Jan 2015 10:04:01 +1100 (AEDT) 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=JAr2lKW5kcC0PTzFFDjmIOYjP90/58wF3e3YMbGbxWoEYs 05oitAfw9IaXT9ty/1s2Tjp0uzWGow4kuCXFIx6u1Qp9CbAOyV9Tq51+Us44Gcgp fgw6j8PAxYYY3m+CAwR4+LEpC15bHGKn8p0saXql40Rizx6JbETlE6aE6fzwk= 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=hZPSvg70E72gqnFiPanAD+hpA7Y=; b=yPB1bhDKI4dHi/mRfNYd YC4seULEk/TuZ8fPKZsSxvLazmfXfDkhiZ7R/IRCS1d/wIYVXJl4R3IyZa6q3Xn6 Mk3dAIG3Zgunt78hCYl1u2dn5FN6RqrFnz6g2c4yHwtrLHBNHTGFfi6ArLQvpcxV fAJVv6+T/hQS0SAjC823Dtk= Received: (qmail 6578 invoked by alias); 21 Jan 2015 23:03:53 -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 6563 invoked by uid 89); 21 Jan 2015 23:03:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-yk0-f175.google.com Received: from mail-yk0-f175.google.com (HELO mail-yk0-f175.google.com) (209.85.160.175) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 21 Jan 2015 23:03:46 +0000 Received: by mail-yk0-f175.google.com with SMTP id 9so1774197ykp.6 for ; Wed, 21 Jan 2015 15:03:44 -0800 (PST) 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=LacprsjG0xkYDfRiKtz2e1mCfgburuSeeltSfK8+xI4=; b=gHBlkoBGMKQWihncjpSDtnVdZTEc/fzEhce35wT/wQ0UAOQDZU+HQuv04gPjNUn1nw 6L2TRbR9vOVFo1n0+3+ms9BQQCAu2fFwukKhJYMljZQvpULs6/GwUzjBxGugbrjjoj/T KJ8iHFPsWuE3j1I1mA8pYsPW8jmDnh4uuyRrInmynkw9yyTNTAAVfK34nocHY3EGR4da 9kwX89ARmkVgItLVtZ+LwNNhWSXLVr5FQwtC1MI4twKfY9YITKnDYa6VENX4hvx47BBF CS4pYgpVwMxUYkYB4BZyM6J4yOVxxvBV4NK+TXLm4TlGfLnZc/Ky+6BAqsw/cm0sqZyV KrHQ== X-Gm-Message-State: ALoCoQne8qza42oSUtgVulTcqVLoQfcU/03oX8WmKTHvL2Zi6coAxw/17HNJWGL3kz0A+MLH/mYa MIME-Version: 1.0 X-Received: by 10.170.90.68 with SMTP id h65mr16536522yka.94.1421881424686; Wed, 21 Jan 2015 15:03:44 -0800 (PST) Received: by 10.170.57.196 with HTTP; Wed, 21 Jan 2015 15:03:44 -0800 (PST) Date: Wed, 21 Jan 2015 15:03:44 -0800 Message-ID: Subject: libgo patch committed: Put base Go version in runtime.Version From: Ian Lance Taylor To: gcc-patches , "gofrontend-dev@googlegroups.com" This patch by Lynn Boger adds the base Go version to the start of the runtime.Version string. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 00adc946a742 libgo/Makefile.am --- a/libgo/Makefile.am Tue Jan 20 13:28:34 2015 -0800 +++ b/libgo/Makefile.am Wed Jan 21 15:02:30 2015 -0800 @@ -971,7 +971,7 @@ rm -f version.go.tmp echo "package runtime" > version.go.tmp echo 'const defaultGoroot = "$(prefix)"' >> version.go.tmp - echo 'const theVersion = "'`$(GOC) --version | sed 1q`'"' >> version.go.tmp + echo 'const theVersion = "'`cat $(srcdir)/VERSION | sed 1q`' '`$(GOC) --version | sed 1q`'"' >> version.go.tmp echo 'const theGoarch = "'$(GOARCH)'"' >> version.go.tmp echo 'const theGoos = "'$(GOOS)'"' >> version.go.tmp echo 'const theGccgoToolDir = "$(libexecsubdir)"' >> version.go.tmp diff -r 00adc946a742 libgo/VERSION --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgo/VERSION Wed Jan 21 15:02:30 2015 -0800 @@ -0,0 +1,1 @@ +go1.4 \ No newline at end of file diff -r 00adc946a742 libgo/merge.sh --- a/libgo/merge.sh Tue Jan 20 13:28:34 2015 -0800 +++ b/libgo/merge.sh Wed Jan 21 15:02:30 2015 -0800 @@ -136,6 +136,16 @@ fi } +if test -f VERSION; then + if ! cmp -s ${NEWDIR}/VERSION VERSION; then + cp ${NEWDIR}/VERSION . + fi +else + if test -f ${NEWDIR}/VERSION; then + cp ${NEWDIR}/VERSION . + fi +fi + (cd ${NEWDIR}/src && find . -name '*.go' -print) | while read f; do oldfile=${OLDDIR}/src/$f newfile=${NEWDIR}/src/$f