From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id W6WiC4xbBWC0GAAAWB0awg (envelope-from ) for ; Mon, 18 Jan 2021 04:57:32 -0500 Received: by simark.ca (Postfix, from userid 112) id 1F3BA1EF80; Mon, 18 Jan 2021 04:57:32 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 511081E590 for ; Mon, 18 Jan 2021 04:57:31 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0511B384A87D; Mon, 18 Jan 2021 09:57:31 +0000 (GMT) Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 7DDB6384A87D for ; Mon, 18 Jan 2021 09:57:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7DDB6384A87D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x435.google.com with SMTP id a9so12354836wrt.5 for ; Mon, 18 Jan 2021 01:57:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=wGsHc5LJ9Qtf637VmAoQLOcT/OyyYkUX9+Efl7rIjH4=; b=GEochngQ/tsP/9PtMwizC7BMvyRsREJDumop+MCfIazYGeurU3myxXQGHTkJY78lUL nHDwjnDfvEXtYam3gGPRcg2cgeoGC7YIbfAhCgN60l2tIfzgVSB/Jphs2DO0PAHQ357e YxsgWJtFq3PyvldS1yfmFcEsCukaNrcjtVnODfzMWSrMnFKCwwCoXkXv4o8WFePvGFn8 HroneSWc3h+DHmDAeHBe6tx430kuiloXcvbggG1QYwY6gwXbj/FtbB1Yi1EQA3Amq+Rh EjwSW3oSp27T3h+jfy9oQmnKr0rfqk52RcOwKIaq4XFL+Z+ZnKSv7oj1u9WhcK9v9xII ZGDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=wGsHc5LJ9Qtf637VmAoQLOcT/OyyYkUX9+Efl7rIjH4=; b=PEKhFZZSKh1AnUo7R4nwH0NeaVCgQ4S2QgAWWobPDAKpjD0xi5yoB3M3nmgh11fPUL NS5vPPltgjXfOIqlE3Wepg0FUUf6lZUjTbkgT9DfOck1+dYD3muRL5u16/jb+DtQw2r4 j3o355UXKrPBsh6aNSiXR13iW+LyIJTpzsIfvUI6lauQZKOxtzcNn0yyCOsbwyhmoUsB lBXvnles9S9MpITtbd4x1wlUEhTD1mCH2DQMNpkgPYSV80tG2Mn1mc11GE2pi+aGfqUw SfZg27W7l0J8PoUF6Cq21wa01CeoIeF6oLUW/TQhPjGPHY4OhW5s9EdeBFRgz2QckR2I lZpQ== X-Gm-Message-State: AOAM530YCY0bDZmylu3OUPHo7YSFwst70qeXKkbV0aTx07rChC2lsnjQ Vi7AOZKP81ddi6EQMg6xbymQa+Hociyjtw== X-Google-Smtp-Source: ABdhPJzi2o3eN2DiUtzCCWP3NxLCW1Bhyn2I/0VQMJkvjmFZmVGdGALp2c3hhOjZ4r9nH7uCI24jBw== X-Received: by 2002:adf:f684:: with SMTP id v4mr25482441wrp.387.1610963847657; Mon, 18 Jan 2021 01:57:27 -0800 (PST) Received: from localhost (host86-166-129-230.range86-166.btcentralplus.com. [86.166.129.230]) by smtp.gmail.com with ESMTPSA id k10sm27028266wrq.38.2021.01.18.01.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 01:57:27 -0800 (PST) Date: Mon, 18 Jan 2021 09:57:26 +0000 From: Andrew Burgess To: Mike Frysinger Subject: Re: [PATCH] sim: common: simplify version script Message-ID: <20210118095726.GO265215@embecosm.com> References: <20210117111958.14040-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210117111958.14040-1-vapier@gentoo.org> X-Operating-System: Linux/5.8.13-100.fc31.x86_64 (x86_64) X-Uptime: 09:54:35 up 40 days, 14:39, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" * Mike Frysinger via Gdb-patches [2021-01-17 06:19:58 -0500]: > We don't the host & target aliases, so don't bother emitting them. Missing words here. I guess "We don't use the ..." Also, those pesky ChangeLog things... Thanks, Andrew > --- > sim/common/Make-common.in | 4 ++-- > sim/common/create-version.sh | 17 ++++++----------- > 2 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in > index 6e7193044305..7de7dabe646f 100644 > --- a/sim/common/Make-common.in > +++ b/sim/common/Make-common.in > @@ -291,8 +291,8 @@ stamp-tvals: gentmap > touch stamp-tvals > > version.c: Makefile $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcroot)/sim/common/create-version.sh > - $(SHELL) $(srcroot)/sim/common/create-version.sh $(srcroot)/gdb \ > - $(host_alias) $(target_alias) version.c > + $(SHELL) $(srcroot)/sim/common/create-version.sh $(srcroot)/gdb $@.tmp > + $(SHELL) $(srcroot)/move-if-change $@.tmp $@ > > # > # Rules for building sim-* components. Triggered by listing the corresponding > diff --git a/sim/common/create-version.sh b/sim/common/create-version.sh > index 5252c3b8bd80..7b35e87e2150 100755 > --- a/sim/common/create-version.sh > +++ b/sim/common/create-version.sh > @@ -23,16 +23,11 @@ > # TARGET_ALIAS OUTPUT-FILE-NAME > > srcdir="$1" > -host_alias="$2" > -target_alias="$3" > -output="$4" > +output="$2" > > -rm -f version.c-tmp $output version.tmp > date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/../bfd/version.h` > -sed -e "s/DATE/$date/" < $srcdir/version.in > version.tmp > -echo '#include "version.h"' >> version.c-tmp > -echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp > -echo 'const char host_name[] = "'"$host_alias"'";' >> version.c-tmp > -echo 'const char target_name[] = "'"$target_alias"'";' >> version.c-tmp > -mv version.c-tmp $output > -rm -f version.tmp > +ver=`sed -e "s/DATE/$date/;q" $srcdir/version.in` > +( > +echo '#include "version.h"' > +echo 'const char version[] = "'"${ver}"'";' > +) >"${output}" > -- > 2.28.0 >