From patchwork Sat Jan 26 15:53:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 31217 Received: (qmail 14672 invoked by alias); 26 Jan 2019 15:53: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 14538 invoked by uid 89); 26 Jan 2019 15:53:23 -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, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.115) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 26 Jan 2019 15:53:21 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway32.websitewelcome.com (Postfix) with ESMTP id EB9BC52127 for ; Sat, 26 Jan 2019 09:53:19 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id nQGlgbgyk2PzOnQGlgBLCB; Sat, 26 Jan 2019 09:53:19 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version :Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=rlv34d4KQYzvk2HKVFq7EeeWQUiULE3Goy/3SODKeZg=; b=FwlIL+a4FtjIa4g6c9y84ocjfS uAoGep26LQtJDyIkeDWBox0xQfAyZtjupEG+b+Enw1IhfsMD9GxGf0eTcCz9oMK2POReM13Lt1ftn qWUtT39Qkp+sbL2j95eD/55G+; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:49594 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gnQGl-00134T-K1; Sat, 26 Jan 2019 09:53:19 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [FYI] Fix the sim build Date: Sat, 26 Jan 2019 08:53:13 -0700 Message-Id: <20190126155313.24614-1-tom@tromey.com> Simon pointed out that the "common/" include change in gdb broke the sim build. The problem was that the sim was using gdb's create-version.sh, which changed. This patch copies create-version.sh to the sim, so that it can generate "version.c" in a way that works in the sim build. Tested by rebuilding. sim/common/ChangeLog 2019-01-25 Tom Tromey * Make-common.in (version.c): Use sim's create-version.sh. * create-version.sh: New file. sim/ppc/ChangeLog 2019-01-25 Tom Tromey * Makefile.in (version.c): Use sim's create-version.sh. --- sim/common/ChangeLog | 5 +++++ sim/common/Make-common.in | 4 ++-- sim/common/create-version.sh | 38 ++++++++++++++++++++++++++++++++++++ sim/ppc/ChangeLog | 4 ++++ sim/ppc/Makefile.in | 4 ++-- 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100755 sim/common/create-version.sh 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 new file mode 100755 index 0000000000..51cffe8db5 --- /dev/null +++ b/sim/common/create-version.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +# Copyright (C) 1989-2019 Free Software Foundation, Inc. + +# This file is part of GDB. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Create version.c from version.in. +# Usage: +# create-version.sh PATH-TO-GDB-SRCDIR HOST_ALIAS \ +# TARGET_ALIAS OUTPUT-FILE-NAME + +srcdir="$1" +host_alias="$2" +target_alias="$3" +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 "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 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)