From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id VotJCGYdBGB/ewAAWB0awg (envelope-from ) for ; Sun, 17 Jan 2021 06:20:06 -0500 Received: by simark.ca (Postfix, from userid 112) id 141611EF80; Sun, 17 Jan 2021 06:20:06 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 98CCE1E940 for ; Sun, 17 Jan 2021 06:20:05 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E6584389043A; Sun, 17 Jan 2021 11:20:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E6584389043A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1610882404; bh=HfDg69kZlWuE7qFpiv+fYHHY3HOg4aT1aQiN/cGtbE0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=dGp4YUYTH3bjrLEoxBSbxqJSJ0Op7LbBeik9ndS7X6oKopUGlcD20XIyT587eizyl OdbMKhY1uQi5cNwMQ0UK8aKSnI+PmG5yl6gt5CjJIXhlETf38yUnwZ8dSB3gcm3h9I kmYfAbpT9YigxPRkXJqMOASt+7QaJGdNstgWb8WU= Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id F1454386EC55 for ; Sun, 17 Jan 2021 11:20:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F1454386EC55 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 9FA8E340E0E for ; Sun, 17 Jan 2021 11:20:00 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] sim: common: simplify version script Date: Sun, 17 Jan 2021 06:19:58 -0500 Message-Id: <20210117111958.14040-1-vapier@gentoo.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" We don't the host & target aliases, so don't bother emitting them. --- 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