From: Peter Stephenson <p.stephenson@samsung.com>
To: zsh-workers@zsh.org
Subject: Re: Two issues found with -fsanitize=undefined
Date: Mon, 21 Sep 2015 13:46:46 +0100 [thread overview]
Message-ID: <20150921134646.57c0e6d0@pwslap01u.europe.root.pri> (raw)
In-Reply-To: <20150919205751.5338bddc@ntlworld.com>
On Sat, 19 Sep 2015 20:57:51 +0100
Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> --- a/Src/zsh.h
> +++ b/Src/zsh.h
> @@ -36,6 +36,12 @@
> */
> #ifdef ZSH_64_BIT_TYPE
> typedef ZSH_64_BIT_TYPE zlong;
> +#if defind(ZLONG_IS_LONG_LONG) && defined(LLONG_MAX)
I've fixed this, which broke compilation on 32-bit systems with 64-bit
long long.
Here's a patch to neaten up the case (removing a magic number) where
zlong is a 64-bit long.
pws
diff --git a/Src/zsh.h b/Src/zsh.h
index b98fc5c..dd05961 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -39,9 +39,13 @@ typedef ZSH_64_BIT_TYPE zlong;
#if defined(ZLONG_IS_LONG_LONG) && defined(LLONG_MAX)
#define ZLONG_MAX LLONG_MAX
#else
+#ifdef ZLONG_IS_LONG_64
+#define ZLONG_MAX LONG_MAX
+#else
/* umm... */
#define ZLONG_MAX ((zlong)9223372036854775807)
#endif
+#endif
#ifdef ZSH_64_BIT_UTYPE
typedef ZSH_64_BIT_UTYPE zulong;
#else
diff --git a/configure.ac b/configure.ac
index d7db8ba..c3bd713 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1079,9 +1079,15 @@ main() { return sizeof(ino_t) < 8; }
fi
AH_TEMPLATE([ZLONG_IS_LONG_LONG],
[Define to 1 if the zlong type uses long long int.])
+AH_TEMPLATE([ZLONG_IS_LONG_64],
+[Define to 1 if the zlong type uses 64-bit long int.])
if test "$zsh_cv_64_bit_type" = "long long"; then
dnl Remember this so we can get (s)printf output right.
AC_DEFINE(ZLONG_IS_LONG_LONG)
+else
+ if test "$zsh_cv_64_bit_type" = "long"; then
+ AC_DEFINE(ZLONG_IS_LONG_64)
+ fi
fi
dnl We'll blithely assume (f)printf supports the same types as sprintf.
next prev parent reply other threads:[~2015-09-21 12:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 7:57 Markus Trippelsdorf
2015-09-17 17:16 ` Bart Schaefer
2015-09-17 17:24 ` Markus Trippelsdorf
2015-09-17 17:41 ` Bart Schaefer
2015-09-19 19:57 ` Peter Stephenson
2015-09-19 20:18 ` Markus Trippelsdorf
2015-09-19 22:35 ` Peter Stephenson
2015-09-20 4:09 ` Bart Schaefer
2015-09-21 12:46 ` Peter Stephenson [this message]
2015-09-21 19:13 ` Peter Stephenson
2015-09-21 20:04 ` Markus Trippelsdorf
2015-09-21 20:21 ` Peter Stephenson
2015-09-21 20:34 ` Markus Trippelsdorf
2015-09-21 20:56 ` Bart Schaefer
2015-09-22 0:02 ` Markus Trippelsdorf
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=20150921134646.57c0e6d0@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).