From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27508 invoked by alias); 24 Jun 2013 22:06:04 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 27499 invoked by uid 89); 24 Jun 2013 22:06:03 -0000 X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_HOSTKARMA_NO,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.1 Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 24 Jun 2013 22:06:02 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id E3BFD1C680E; Mon, 24 Jun 2013 18:06:00 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 4a68GFikGCIa; Mon, 24 Jun 2013 18:06:00 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id B4D821C67EB; Mon, 24 Jun 2013 18:06:00 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 969F4D5250; Mon, 24 Jun 2013 15:05:58 -0700 (PDT) From: Joel Brobecker To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [commit] Fix host_name and target_name generation by common/create-version.sh. Date: Mon, 24 Jun 2013 22:41:00 -0000 Message-Id: <1372111549-26505-1-git-send-email-brobecker@adacore.com> In-Reply-To: <871u7rwodv.fsf@fleche.redhat.com> References: <871u7rwodv.fsf@fleche.redhat.com> X-SW-Source: 2013-06/txt/msg00678.txt.bz2 Hello, there was a small snafoo in this new script, which prevented the $host_alias and $target_alias from being expanded during the generation of the version.c file. As a result, the version info yields: This GDB was configured as "--host=$host_alias --target=$target_alias". ^^^^^^^^^^^ ^^^^^^^^^^^^^ This patch fixes this issue. gdb/ChangeLog: * common/create-version.sh: Fix expansion of $host_alias and $target_alias in generation of HOST_NAME and TARGET_NAME (resp.). Tested by rebuilding GDB native and cross on x86_64-linux. Checked in. --- gdb/ChangeLog | 6 ++++++ gdb/common/create-version.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b81e33..adaf463 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-06-24 Joel Brobecker + + * common/create-version.sh: Fix expansion of $host_alias + and $target_alias in generation of HOST_NAME and TARGET_NAME + (resp.). + 2013-06-24 Tom Tromey * common/create-version.sh: New file. diff --git a/gdb/common/create-version.sh b/gdb/common/create-version.sh index 2d2bc74..56871bf 100755 --- a/gdb/common/create-version.sh +++ b/gdb/common/create-version.sh @@ -32,7 +32,7 @@ date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' $srcdir/../bfd/version.h` sed -e "s/DATE/$date/" < $srcdir/common/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 +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 -- 1.7.10.4