From: Zhangjin Wu <falcon@tinylab.org>
To: w@1wt.eu
Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org,
thomas@t-8ch.de, "Thomas Weißschuh" <linux@weissschuh.net>
Subject: [PATCH v3 05/12] selftests/nolibc: not include limits.h for nolibc
Date: Sat, 3 Jun 2023 16:06:57 +0800 [thread overview]
Message-ID: <0aa3b57a44b0922a118dda503a9bbb2e49125f96.1685777982.git.falcon@tinylab.org> (raw)
In-Reply-To: <cover.1685777982.git.falcon@tinylab.org>
When compile nolibc-test.c with 2.31 glibc, we got such error:
In file included from /usr/riscv64-linux-gnu/include/sys/cdefs.h:452,
from /usr/riscv64-linux-gnu/include/features.h:461,
from /usr/riscv64-linux-gnu/include/bits/libc-header-start.h:33,
from /usr/riscv64-linux-gnu/include/limits.h:26,
from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/limits.h:194,
from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/syslimits.h:7,
from /usr/lib/gcc-cross/riscv64-linux-gnu/9/include/limits.h:34,
from /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/nolibc-test.c:6:
/usr/riscv64-linux-gnu/include/bits/wordsize.h:28:3: error: #error "rv32i-based targets are not supported"
28 | # error "rv32i-based targets are not supported"
Glibc (>= 2.33) commit 5b6113d62efa ("RISC-V: Support the 32-bit ABI
implementation") fixed up above error.
As suggested by Thomas, defining INT_MIN/INT_MAX for nolibc can remove
the including of limits.h, and therefore no above error. of course, the
other libcs still require limits.h, move it to the right place.
The LONG_MIN/LONG_MAX are also defined too.
Suggested-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/linux-riscv/09d60dc2-e298-4c22-8e2f-8375861bd9be@t-8ch.de/
Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
---
tools/include/nolibc/stdint.h | 14 ++++++++++++++
tools/testing/selftests/nolibc/nolibc-test.c | 4 +---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/include/nolibc/stdint.h b/tools/include/nolibc/stdint.h
index c1ce4f5e0603..31a5264539ae 100644
--- a/tools/include/nolibc/stdint.h
+++ b/tools/include/nolibc/stdint.h
@@ -96,4 +96,18 @@ typedef uint64_t uintmax_t;
#define UINT_FAST32_MAX SIZE_MAX
#define UINT_FAST64_MAX SIZE_MAX
+#ifndef INT_MIN
+#define INT_MIN (-__INT_MAX__ - 1)
+#endif
+#ifndef INT_MAX
+#define INT_MAX __INT_MAX__
+#endif
+
+#ifndef LONG_MIN
+#define LONG_MIN (-__LONG_MAX__ - 1)
+#endif
+#ifndef LONG_MAX
+#define LONG_MAX __LONG_MAX__
+#endif
+
#endif /* _NOLIBC_STDINT_H */
diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
index 403f6255c177..2a2954cb7bef 100644
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@ -2,9 +2,6 @@
#define _GNU_SOURCE
-/* platform-specific include files coming from the compiler */
-#include <limits.h>
-
/* libc-specific include files
* The program may be built in 3 ways:
* $(CC) -nostdlib -include /path/to/nolibc.h => NOLIBC already defined
@@ -39,6 +36,7 @@
#include <stddef.h>
#include <stdint.h>
#include <unistd.h>
+#include <limits.h>
#endif
#endif
--
2.25.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-06-03 8:07 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-03 7:59 [PATCH v3 00/12] nolibc: add generic part1 of prepare for rv32 Zhangjin Wu
2023-06-03 8:00 ` [PATCH v3 01/12] selftests/nolibc: syscall_args: use generic __NR_statx Zhangjin Wu
2023-06-03 8:02 ` [PATCH v3 02/12] tools/nolibc: add missing nanoseconds support for __NR_statx Zhangjin Wu
2023-06-04 11:18 ` Willy Tarreau
2023-06-04 12:00 ` Thomas Weißschuh
2023-06-04 12:53 ` Willy Tarreau
2023-06-03 8:04 ` [PATCH v3 03/12] selftests/nolibc: allow specify extra arguments for qemu Zhangjin Wu
2023-06-03 8:05 ` [PATCH v3 04/12] selftests/nolibc: fix up compile warning with glibc on x86_64 Zhangjin Wu
2023-06-03 8:06 ` Zhangjin Wu [this message]
2023-06-03 8:08 ` [PATCH v3 06/12] selftests/nolibc: use INT_MAX instead of __INT_MAX__ Zhangjin Wu
2023-06-03 8:09 ` [PATCH v3 07/12] tools/nolibc: arm: add missing my_syscall6 Zhangjin Wu
2023-06-03 8:11 ` [PATCH v3 08/12] tools/nolibc: open: fix up compile warning for arm Zhangjin Wu
2023-06-03 8:13 ` [PATCH v3 09/12] selftests/nolibc: support two errnos with EXPECT_SYSER2() Zhangjin Wu
2023-06-03 8:14 ` [PATCH v3 10/12] selftests/nolibc: remove gettimeofday_bad1/2 completely Zhangjin Wu
2023-06-03 8:16 ` [PATCH v3 11/12] selftests/nolibc: add new gettimeofday test cases Zhangjin Wu
2023-06-04 6:46 ` Thomas Weißschuh
[not found] ` <tencent_4668A50A08C3D31E7531619E@qq.com>
2023-06-04 9:24 ` Arnd Bergmann
2023-06-04 11:27 ` Willy Tarreau
2023-06-04 11:38 ` Arnd Bergmann
2023-06-04 11:46 ` Willy Tarreau
2023-06-05 11:12 ` Zhangjin Wu
2023-06-03 8:17 ` [PATCH v3 12/12] selftests/nolibc: test_fork: fix up duplicated print Zhangjin Wu
2023-06-04 6:49 ` [PATCH v3 00/12] nolibc: add generic part1 of prepare for rv32 Thomas Weißschuh
2023-06-04 12:54 ` Willy Tarreau
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=0aa3b57a44b0922a118dda503a9bbb2e49125f96.1685777982.git.falcon@tinylab.org \
--to=falcon@tinylab.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux@weissschuh.net \
--cc=thomas@t-8ch.de \
--cc=w@1wt.eu \
/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 NNTP newsgroup(s).