From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-34969-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 22118 invoked by alias); 27 Apr 2015 08:58:09 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 34969
Received: (qmail 22426 invoked from network); 27 Apr 2015 08:58:07 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
	SPF_HELO_PASS autolearn=ham version=3.3.2
X-AuditID: cbfec7f5-f794b6d000001495-05-553df7c276cc
Date: Mon, 27 Apr 2015 09:47:42 +0100
From: Peter Stephenson <p.stephenson@samsung.com>
To: zsh-workers@zsh.org
Subject: Re: [PATCH] Use CC to determine if gcc is used
Message-id: <20150427094742.27589aca@pwslap01u.europe.root.pri>
In-reply-to: <1430070511-9895-1-git-send-email-heirecka@exherbo.org>
References: <1430070511-9895-1-git-send-email-heirecka@exherbo.org>
Organization: Samsung Cambridge Solution Centre
X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu)
MIME-version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7bit
X-Brightmail-Tracker:
 H4sIAAAAAAAAA+NgFjrCLMWRmVeSWpSXmKPExsVy+t/xq7qHvtuGGlz4Y2JxsPkhkwOjx6qD
	H5gCGKO4bFJSczLLUov07RK4Mv5++8hWcJSn4tXj16wNjM1cXYycHBICJhJdU66wQ9hiEhfu
	rWfrYuTiEBJYyiix8MdCKGcGk8TSHWfYIZxtjBKNPyBaWARUJb4s+8wKYrMJGEpM3TSbEcQW
	ERCXOLv2PAuILSxgLjFpST+YzStgLzHzyyKwXk4BF4mJp/eB9QoJOEs0H9nCDGLzC+hLXP37
	iQniJKD6K2cYIXoFJX5Mvgc2h1lAS2LztiZWCFteYvOat8wQc9QlbtzdzT6BUWgWkpZZSFpm
	IWlZwMi8ilE0tTS5oDgpPddIrzgxt7g0L10vOT93EyMkbL/uYFx6zOoQowAHoxIPr8IM21Ah
	1sSy4srcQ4wSHMxKIrw7PgOFeFMSK6tSi/Lji0pzUosPMUpzsCiJ887c9T5ESCA9sSQ1OzW1
	ILUIJsvEwSnVwJhqVOIx6V/mPNMVB5Z/u6MUdUKM2UB+tttBxyefpxvzPTiYsbv/Xh1f9dSN
	98LjUzhD3108x7Dk582MiQu4pa7wnPzcbdautSrzlt7ppOjVh8UCQ7jXzPGMKv1UsLX/sYSL
	/l2d9lm86hEy1w3TzrTIJGyVzteIVZA8lvVlDednobs1qZ4zliqxFGckGmoxFxUnAgBRJZai
	VwIAAA==

On Sun, 26 Apr 2015 19:48:31 +0200
Heiko Becker <heirecka@exherbo.org> wrote:
> I ran into this with gcc-5.1 and CPP set to x86_64-pc-linux-gnu-cpp
> which isn't catched by the intended case branch and caused zsh to be
> miscompiled in the process.
> ---
>  Src/zsh.mdd | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Src/zsh.mdd b/Src/zsh.mdd
> index 71dd613..3c8c355 100644
> --- a/Src/zsh.mdd
> +++ b/Src/zsh.mdd
> @@ -28,8 +28,8 @@ hdrdeps="zshcurses.h zshterm.h"
>  # on the option to remove them being the same.
>  signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@
>  	$(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c
> -	case "$(CPP)" in \
> -	gcc*) \
> +	case "$(CC)" in \
> +	*gcc*) \
>  	$(CPP) -P sigtmp.c >sigtmp.out;; \
>  	*) \
>  	$(CPP) sigtmp.c >sigtmp.out;; \

That's probably OK, but rather than test CC when using CPP, it might be
simpler just to test if $(CPP) contains "gnu" as an alternative to
"gcc"?

I think signames2.awk could probably be smarter as well.  I haven't seen
the problem myself but presumably it must just be a question of ignoring
lines beginning '#[ 	]*[0-9]'?

diff --git a/Src/zsh.mdd b/Src/zsh.mdd
index 71dd613..3159e18 100644
--- a/Src/zsh.mdd
+++ b/Src/zsh.mdd
@@ -29,7 +29,7 @@ hdrdeps="zshcurses.h zshterm.h"
 signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@
 	$(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c
 	case "$(CPP)" in \
-	gcc*) \
+	gcc*|*gnu*) \
 	$(CPP) -P sigtmp.c >sigtmp.out;; \
 	*) \
 	$(CPP) sigtmp.c >sigtmp.out;; \


pws