From: Christoph Muellner <cmuellner@gcc.gnu.org>
To: newlib@sourceware.org
Cc: Kito Cheng <kito.cheng@sifive.com>,
Christoph Muellner <cmuellner@gcc.gnu.org>
Subject: [PATCH] libc: Fix compilation for new sig2str/str2sig implementation
Date: Mon, 2 Aug 2021 16:00:58 +0200 [thread overview]
Message-ID: <20210802140058.3885657-1-cmuellner@gcc.gnu.org> (raw)
A recent patch introduced new code for sig2str/str2sig.
This code does not properly exclude code that requires
SIGRTMIN/SIGRTMAX to be defined and triggers the following
compile error:
newlib/libc/signal/sig2str.c:199:8: error: 'SIGRTMIN' undeclared
newlib/libc/signal/sig2str.c:200:29: error: 'SIGRTMAX' undeclared
Let's add the missing guards.
Fixes: 2b50ec0cd205 ("libc: Fix compilation for new sig2str/str2sig implementation")
Signed-off-by: Christoph Muellner <cmuellner@gcc.gnu.org>
---
newlib/libc/signal/sig2str.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/newlib/libc/signal/sig2str.c b/newlib/libc/signal/sig2str.c
index 940a5eab9..d3be1ba68 100644
--- a/newlib/libc/signal/sig2str.c
+++ b/newlib/libc/signal/sig2str.c
@@ -194,6 +194,7 @@ sig2str(int signum, char *str)
{
const sig_name_and_num *sptr;
+#if defined (SIGRTMIN) && defined (SIGRTMAX)
/* If signum falls in lower half of the real time signals range, define
* the saved str value as "RTMIN+n" according to the Issue 8 standard */
if ((SIGRTMIN + 1) <= signum &&
@@ -209,6 +210,7 @@ sig2str(int signum, char *str)
sprintf(str, "RTMAX-%d", (SIGRTMAX - signum));
return 0;
}
+#endif
/* Otherwise, search for signal matching signum in sig_array. If found,
* save its string value in str. */
@@ -231,6 +233,7 @@ str2sig(const char *restrict str, int *restrict pnum)
const sig_name_and_num *sptr;
unsigned long is_valid_decimal;
+#if defined (SIGRTMIN) && defined (SIGRTMAX)
/* i686 Cygwin only supports one RT signal. For this case, skip checks
* for "RTMIN+n" and "RTMAX-m". */
if (SIGRTMIN != SIGRTMAX) {
@@ -269,6 +272,7 @@ str2sig(const char *restrict str, int *restrict pnum)
return -1;
}
}
+#endif
/*If str is a valid signal name, save its corresponding number in pnum. */
for (sptr = sig_array; sptr < &sig_array[NUM_OF_SIGS]; sptr++) {
@@ -289,9 +293,10 @@ str2sig(const char *restrict str, int *restrict pnum)
/* If str is a representation of a decimal value, save its integer value
* in pnum. */
if (1 <= is_valid_decimal &&
- is_valid_decimal <= SIGRTMAX) {
+ is_valid_decimal <= (NSIG - 1)) {
*pnum = is_valid_decimal;
return 0;
}
+
return -1;
}
--
2.31.1
next reply other threads:[~2021-08-02 14:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 14:00 Christoph Muellner [this message]
2021-08-02 14:20 ` Joel Sherrill
2021-08-02 14:47 ` Corinna Vinschen
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=20210802140058.3885657-1-cmuellner@gcc.gnu.org \
--to=cmuellner@gcc.gnu.org \
--cc=kito.cheng@sifive.com \
--cc=newlib@sourceware.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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).