From: Peter Stephenson <p.stephenson@samsung.com>
To: zsh-workers@zsh.org
Subject: Re: [PATCH] Use CC to determine if gcc is used
Date: Mon, 27 Apr 2015 09:47:42 +0100 [thread overview]
Message-ID: <20150427094742.27589aca@pwslap01u.europe.root.pri> (raw)
In-Reply-To: <1430070511-9895-1-git-send-email-heirecka@exherbo.org>
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
next prev parent reply other threads:[~2015-04-27 8:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-26 17:48 Heiko Becker
2015-04-27 8:47 ` Peter Stephenson [this message]
2015-04-27 9:07 ` Peter Stephenson
2015-04-27 13:30 ` Daniel Shahaf
2015-04-27 14:11 ` Peter Stephenson
2015-04-27 16:37 ` Heiko Becker
2015-04-27 16:50 ` Peter Stephenson
2015-04-27 16:57 ` Heiko Becker
2015-04-27 17:09 ` Peter Stephenson
2015-04-27 17:26 ` Heiko Becker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150427094742.27589aca@pwslap01u.europe.root.pri \
--to=p.stephenson@samsung.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).