From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH 2/2] newlib: add AC_CACHE_CHECK sugar around preprocessor checks
Date: Fri, 28 Jan 2022 05:23:55 -0500 [thread overview]
Message-ID: <20220128102355.10213-2-vapier@gentoo.org> (raw)
In-Reply-To: <20220128102355.10213-1-vapier@gentoo.org>
This isn't strictly necessary, but it makes for much clearer logs as
to what the target is doing, and provides cache vars for anyone who
wants to force the test a different way.
---
newlib/libc/configure | 48 ++++++++++++++++++--------
newlib/libc/machine/nds32/acinclude.m4 | 7 ++--
newlib/libc/machine/sh/acinclude.m4 | 7 ++--
newlib/libc/machine/spu/acinclude.m4 | 9 +++--
newlib/libm/configure | 32 ++++++++++++-----
newlib/libm/machine/nds32/acinclude.m4 | 14 ++++----
6 files changed, 78 insertions(+), 39 deletions(-)
diff --git a/newlib/libc/machine/nds32/acinclude.m4 b/newlib/libc/machine/nds32/acinclude.m4
index 35c2afe992bf..ae8ea5d91ecf 100644
--- a/newlib/libc/machine/nds32/acinclude.m4
+++ b/newlib/libc/machine/nds32/acinclude.m4
@@ -1,10 +1,11 @@
if test "${machine_dir}" = "nds32"; then
dnl Use builtin macro to detect if this is for "AndeStar ISA V3m".
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ AC_CACHE_CHECK([for nds32 V3M ISA], newlib_cv_nds32_isa_v3m, [dnl
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
[[#ifdef __NDS32_ISA_V3M__
# error "This is nds32_isa_v3m."
#endif
-]])], [is_nds32_isa_v3m="no"], [is_nds32_isa_v3m="yes"])
+]])], [newlib_cv_nds32_isa_v3m="no"], [newlib_cv_nds32_isa_v3m="yes"])])
fi
-AM_CONDITIONAL(IS_NDS32_ISA_V3M, test "$is_nds32_isa_v3m" = "yes")
+AM_CONDITIONAL(IS_NDS32_ISA_V3M, test "$newlib_cv_nds32_isa_v3m" = "yes")
diff --git a/newlib/libc/machine/sh/acinclude.m4 b/newlib/libc/machine/sh/acinclude.m4
index 60af7b1f1135..66ec3b4e15ff 100644
--- a/newlib/libc/machine/sh/acinclude.m4
+++ b/newlib/libc/machine/sh/acinclude.m4
@@ -1,9 +1,10 @@
if test "${machine_dir}" = "sh"; then
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ AC_CACHE_CHECK([for SH5 (64-bit)], newlib_cv_sh64, [dnl
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
[[#if !defined(__SH5__)
# error "not SH5"
#endif
-]])], [have_sh64=yes], [have_sh64=no])
+]])], [newlib_cv_sh64=yes], [newlib_cv_sh64=no])])
fi
-AM_CONDITIONAL(SH64, [test "$have_sh64" = yes])
+AM_CONDITIONAL(SH64, [test "$newlib_cv_sh64" = yes])
diff --git a/newlib/libc/machine/spu/acinclude.m4 b/newlib/libc/machine/spu/acinclude.m4
index 4e5fb363ce13..bca70e309d1f 100644
--- a/newlib/libc/machine/spu/acinclude.m4
+++ b/newlib/libc/machine/spu/acinclude.m4
@@ -1,10 +1,9 @@
if test "${machine_dir}" = "spu"; then
- AC_MSG_CHECKING([whether the compiler supports __ea])
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ AC_CACHE_CHECK([whether the compiler supports __ea], newlib_cv_spu_compiler_has_ea, [dnl
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
[[#if !defined (__EA32__) && !defined (__EA64__)
# error "__ea not supported"
#endif
-]])], [spu_compiler_has_ea=yes], [spu_compiler_has_ea=no])
- AC_MSG_RESULT($spu_compiler_has_ea)
+]])], [newlib_cv_spu_compiler_has_ea=yes], [newlib_cv_spu_compiler_has_ea=no])])
fi
-AM_CONDITIONAL(HAVE_SPU_EA, test x${spu_compiler_has_ea} != xno)
+AM_CONDITIONAL(HAVE_SPU_EA, test "$newlib_cv_spu_compiler_has_ea" = yes)
diff --git a/newlib/libm/machine/nds32/acinclude.m4 b/newlib/libm/machine/nds32/acinclude.m4
index 6363df8a3c76..781fa914556d 100644
--- a/newlib/libm/machine/nds32/acinclude.m4
+++ b/newlib/libm/machine/nds32/acinclude.m4
@@ -1,17 +1,19 @@
if test "${libm_machine_dir}" = "nds32"; then
dnl Use builtin macro to detect if FPU extension support is on.
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ AC_CACHE_CHECK([for nds32 FPU SP extension], newlib_cv_nds32_fpu_sp, [dnl
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
[[#if (__NDS32_EXT_FPU_SP__)
# error "Has nds32 FPU SP extension support"
#endif
-]])], [has_nds32_fpu_sp="no"], [has_nds32_fpu_sp="yes"])
+]])], [newlib_cv_nds32_fpu_sp="no"], [newlib_cv_nds32_fpu_sp="yes"])])
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ AC_CACHE_CHECK([for nds32 FPU DP extension], newlib_cv_nds32_fpu_dp, [dnl
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
[[#if (__NDS32_EXT_FPU_DP__)
# error "Has nds32 FPU DP extension support"
#endif
-]])], [has_nds32_fpu_dp="no"], [has_nds32_fpu_dp="yes"])
+]])], [newlib_cv_nds32_fpu_dp="no"], [newlib_cv_nds32_fpu_dp="yes"])])
fi
-AM_CONDITIONAL(HAS_NDS32_FPU_SP, test "$has_nds32_fpu_sp" = "yes")
-AM_CONDITIONAL(HAS_NDS32_FPU_DP, test "$has_nds32_fpu_dp" = "yes")
+AM_CONDITIONAL(HAS_NDS32_FPU_SP, test "$newlib_cv_nds32_fpu_sp" = "yes")
+AM_CONDITIONAL(HAS_NDS32_FPU_DP, test "$newlib_cv_nds32_fpu_dp" = "yes")
--
2.34.1
next prev parent reply other threads:[~2022-01-28 10:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <171dc9cb-6b2c-ead3-1c55-27fadb33220f@gmail.com>
2022-01-28 10:23 ` [PATCH 1/2] newlib: fix " Mike Frysinger
2022-01-28 10:23 ` Mike Frysinger [this message]
2022-01-31 14:20 ` [PATCH 2/2] newlib: add AC_CACHE_CHECK sugar around " Corinna Vinschen
2022-01-31 14:18 ` [PATCH 1/2] newlib: fix " Corinna Vinschen
[not found] ` <YfPDA/LVL745V+02@vapier>
2022-01-28 16:36 ` nds broken by recent patches Jeff Law
2022-01-28 21:54 ` Jeff Law
2022-01-28 23:32 ` Stafford Horne
2022-01-29 0:58 ` Jeff Law
2022-01-29 2:12 ` Stafford Horne
2022-01-29 3:28 ` Jeff Law
2022-01-29 5:15 ` Mike Frysinger
2022-01-29 5:12 ` [PATCH/committed] libgloss: update Makefile regen rules for merged arches Mike Frysinger
2022-01-29 5:13 ` nds broken by recent patches Mike Frysinger
2022-01-31 14:34 ` R. Diez
2022-02-01 17:25 ` Jeff Law
2022-02-02 10:23 ` Mike Frysinger
2022-02-02 20:59 ` Jeff Law
2022-02-03 16:11 ` libgloss multilib installs broken [was nds broken by recent patches] Jeff Law
2022-02-04 5:45 ` Mike Frysinger
2022-02-07 15:40 ` Jeff Law
2022-02-04 8:55 ` [PATCH] libgloss: restore multilib settings in subdir makefiles Mike Frysinger
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=20220128102355.10213-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--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).