On Mar 24, 2021, Uros Bizjak <[email protected]> wrote:
> Other than above, can you please introduce
> check_effectve_target_sysconf to lib/target-supports.exp (similar to
> existing check_effective_target_mmap) and use it instead of target
> selectors?
Here it is. I've tested the affected tests with it. I'll give it a
full regstrap cycle, along with other patches. Ok to install if it
passes?
run sysconf-requiring test on systems that support it
Some gcc.target/i386 tests requires the mmap feature, but that's not
enough for the test to be able to call sysconf.
This patch introduces a sysconf feature, analogous to mmap, and adds
it to tests in gcc.target/i386 that call sysconf.
There are other tests within gcc.dg and g++.dg that call sysconf, but
I haven't added the tag to them, because they already cover it with
target triplets. I was a little nervous about dropping the triplets,
and saw how they implied sysconf, so I left those alone.
for gcc/testsuite/ChangeLog
* lib/target-supports.exp (check_effective_target_sysconf): New.
* gcc/doc/sourcebuild.texi (syconf): Document it.
* gcc.target/i386/pr95443-1.c: Require it.
* gcc.target/i386/pr95443-2.c: Likewise.
* gcc.target/i386/sse2-mmx-maskmovq.c: Likewise.
* gcc.target/i386/strncmp-1.c: Likewise.
---
gcc/doc/sourcebuild.texi | 3 +++
gcc/testsuite/gcc.target/i386/pr95443-1.c | 2 +-
gcc/testsuite/gcc.target/i386/pr95443-2.c | 2 +-
gcc/testsuite/gcc.target/i386/sse2-mmx-maskmovq.c | 2 +-
gcc/testsuite/gcc.target/i386/strncmp-1.c | 2 +-
gcc/testsuite/lib/target-supports.exp | 6 ++++++
6 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 2bc362be4495d..0104916e66031 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -2450,6 +2450,9 @@ all targets.
@item stpcpy
Target provides @code{stpcpy} function.
+@item sysconf
+Target supports @code{sysconf}.
+
@item trampolines
Target supports trampolines.
diff --git a/gcc/testsuite/gcc.target/i386/pr95443-1.c
b/gcc/testsuite/gcc.target/i386/pr95443-1.c
index 698dfa0218968..d846fcbda0a2e 100644
--- a/gcc/testsuite/gcc.target/i386/pr95443-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr95443-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target mmap } } */
+/* { dg-do run { target { sysconf && mmap } } } */
/* { dg-options "-O2 -minline-all-stringops" } */
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/i386/pr95443-2.c
b/gcc/testsuite/gcc.target/i386/pr95443-2.c
index 23bb13ab7ff11..2ab260608bc26 100644
--- a/gcc/testsuite/gcc.target/i386/pr95443-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr95443-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target mmap } } */
+/* { dg-do run { target { sysconf && mmap } } } */
/* { dg-options "-O2 -minline-all-stringops" } */
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/i386/sse2-mmx-maskmovq.c
b/gcc/testsuite/gcc.target/i386/sse2-mmx-maskmovq.c
index 037f665f1178a..87705be3f70d7 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-mmx-maskmovq.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-mmx-maskmovq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target mmap } } */
+/* { dg-do run { target { sysconf && mmap } } } */
/* { dg-options "-O2 -fno-strict-aliasing -msse2" } */
/* { dg-additional-options "-mno-mmx" { target { ! ia32 } } } */
diff --git a/gcc/testsuite/gcc.target/i386/strncmp-1.c
b/gcc/testsuite/gcc.target/i386/strncmp-1.c
index 044fc5cc5fa1b..1ea3e0a57c1de 100644
--- a/gcc/testsuite/gcc.target/i386/strncmp-1.c
+++ b/gcc/testsuite/gcc.target/i386/strncmp-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target mmap } } */
+/* { dg-do run { target { sysconf && mmap } } } */
/* { dg-options "-O2" } */
#include <stdio.h>
diff --git a/gcc/testsuite/lib/target-supports.exp
b/gcc/testsuite/lib/target-supports.exp
index 733b6c8451851..1230d19421544 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1067,6 +1067,12 @@ proc check_effective_target_mmap {} {
return [check_function_available "mmap"]
}
+# Return 1 if the target supports sysconf, 0 otherwise.
+
+proc check_effective_target_sysconf {} {
+ return [check_function_available "sysconf"]
+}
+
# Return 1 if the target supports dlopen, 0 otherwise.
proc check_effective_target_dlopen {} {
return [check_no_compiler_messages dlopen executable {
--
Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/
Free Software Activist GNU Toolchain Engineer
Vim, Vi, Voltei pro Emacs -- GNUlius Caesar
