From patchwork Sat Jan 26 04:04:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 31216 Received: (qmail 41571 invoked by alias); 26 Jan 2019 04:04:23 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 41560 invoked by uid 89); 26 Jan 2019 04:04:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=H*Ad:D*ca X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.192.34) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 26 Jan 2019 04:04:21 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway30.websitewelcome.com (Postfix) with ESMTP id C31D14129 for ; Fri, 25 Jan 2019 22:04:19 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id nFCdg8klC2qH7nFCdgkHsk; Fri, 25 Jan 2019 22:04:19 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=kjyIUGF3tr0NjuZQqPUculHCvEXFWP6XEZQm4Qe9H5A=; b=OsC8xVIXdHlZmFkEVJMMje6HIY n/BfVhW9CgsHx79hjvlx40u32DW1WyI2YtRRCm3KKOeUq1g0oa3+8q1dLL4ZrHyZo4KyyEFsEWfoI j6i7cd3s/+jef9heeYuMx1gd6; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:58116 helo=bapiya) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gnFCd-002QDm-FR; Fri, 25 Jan 2019 22:04:19 -0600 From: Tom Tromey To: Tom Tromey Cc: Simon Marchi , gdb-patches@sourceware.org Subject: Re: [PATCH 1/3] Update create-version.sh to use common/version.h References: <20190123172954.24421-1-tom@tromey.com> <20190123172954.24421-2-tom@tromey.com> <6adb597a88e229b7996d156ea8208438@polymtl.ca> <87tvhwm5nr.fsf@tromey.com> Date: Fri, 25 Jan 2019 21:04:18 -0700 In-Reply-To: <87tvhwm5nr.fsf@tromey.com> (Tom Tromey's message of "Fri, 25 Jan 2019 20:58:16 -0700") Message-ID: <87pnskm5dp.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.90 (gnu/linux) MIME-Version: 1.0 >>>>> "Tom" == Tom Tromey writes: Tom> How about just copying create-version.sh to sim/common and having it use Tom> the old #include "version.h"? Then the two scripts can evolve in their Tom> own ways as needed, without worrying. Like this. Tom diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index c05b535237..945a1faba2 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2019-01-25 Tom Tromey + + * Make-common.in (version.c): Use sim's create-version.sh. + * create-version.sh: New file. + 2019-01-16 Pavel I. Kryukov * sim-arange.c (DEFINE_INLINE_P, DEFINE_NON_INLINE_P): Remove. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index b211e16baa..1a3bcc9417 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -289,8 +289,8 @@ stamp-tvals: gentmap $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c touch stamp-tvals -version.c: Makefile $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcroot)/gdb/common/create-version.sh - $(SHELL) $(srcroot)/gdb/common/create-version.sh $(srcroot)/gdb \ +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 # diff --git a/sim/common/create-version.sh b/sim/common/create-version.sh index 6e67a61357..51cffe8db5 100755 --- a/sim/common/create-version.sh +++ b/sim/common/create-version.sh @@ -30,7 +30,7 @@ output="$4" 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 "common/version.h"' >> version.c-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 diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 8ecdab8a77..171546734b 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,7 @@ +2019-01-25 Tom Tromey + + * Makefile.in (version.c): Use sim's create-version.sh. + 2018-05-09 Sebastian Rasmussen * e500_registers.h: Comment typo fix. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 1635e01c49..fb5a6bd21e 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -548,8 +548,8 @@ $(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ) $(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ) $(RANLIB) $(TARGETLIB) -version.c: Makefile $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcroot)/gdb/common/create-version.sh - $(SHELL) $(srcroot)/gdb/common/create-version.sh $(srcroot)/gdb \ +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 version.o: version.c $(version_h)