sim: cris: fix C tests with newer toolchains

Make sure we include unistd.h for getpid prototypes to fix build
warnings/errors with newer compilers & C libraries.

Doing that for close in openpf highlights these were using the
wrong function -- need to use fclose on FILE*, not close.

These tests pass again with a cris-elf toolchain.

diff --git a/sim/testsuite/sim/cris/ChangeLog b/sim/testsuite/sim/cris/ChangeLog
index 76dcec50ea8fef4656960c08202c61f807b74245..641ad7ed976e8193492c3f1507e2f761d60d97d9 100644 (file)
--- a/sim/testsuite/sim/cris/ChangeLog
+++ b/sim/testsuite/sim/cris/ChangeLog
@@ -1,3 +1,11 @@
+2021-01-07  Mike Frysinger  <vapier@gentoo.org>
+
+       * kill2.c: Include unistd.h.
+       * pipe1.c, sched1.c, sched2.c, sched3.c, sched4.c, sig5.c,
+       sig8.c: Likewise.
+       * openpf1.c (main): Change close to fclose.
+       * openpf2.c: Likewise.
+
 2016-01-04  Mike Frysinger  <vapier@gentoo.org>
 
        * asm/opterr1.ms: Update expected output.

diff --git a/sim/testsuite/sim/cris/c/kill2.c b/sim/testsuite/sim/cris/c/kill2.c
index 6b064e782a90f132f050dab3f2c487e8addaa5a0..0a79db0567a7f9227b43cb0612081aded118855f 100644 (file)
--- a/sim/testsuite/sim/cris/c/kill2.c
+++ b/sim/testsuite/sim/cris/c/kill2.c
@@ -7,6 +7,8 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <unistd.h>
+
 int
 main (void)
 {

diff --git a/sim/testsuite/sim/cris/c/openpf1.c b/sim/testsuite/sim/cris/c/openpf1.c
index 1d71e0bddb08cae20851e4006d98f7fb7a4a4331..e0d8e5c91409de22f8d8dc98a109e36a6edd96d3 100644 (file)
--- a/sim/testsuite/sim/cris/c/openpf1.c
+++ b/sim/testsuite/sim/cris/c/openpf1.c
@@ -27,7 +27,7 @@ int main (int argc, char *argv[])
   f = fopen (fnam, "rb");
   if (f == NULL)
     abort ();
-  close (f);
+  fclose (f);
 
   /* Cover another execution path.  */
   if (fopen ("/nonexistent", "rb") != NULL

diff --git a/sim/testsuite/sim/cris/c/openpf2.c b/sim/testsuite/sim/cris/c/openpf2.c
index fe7c265a272677fe63716ade5b0e56e5ac7ce24e..50337b110d4cf786b88d18bfc8abb761a1304bd8 100644 (file)
--- a/sim/testsuite/sim/cris/c/openpf2.c
+++ b/sim/testsuite/sim/cris/c/openpf2.c
@@ -10,7 +10,7 @@ int main (int argc, char *argv[])
   FILE *f = fopen ("openpf2.c", "rb");
   if (f == NULL)
     abort ();
-  close (f);
+  fclose (f);
   printf ("pass\n");
   return 0;
 }

diff --git a/sim/testsuite/sim/cris/c/pipe1.c b/sim/testsuite/sim/cris/c/pipe1.c
index ddc4285e02f4c0b56ca93e99d1f88d573f7d83fb..735974b6cfa0ebb29201df6461f15bd4089d2226 100644 (file)
--- a/sim/testsuite/sim/cris/c/pipe1.c
+++ b/sim/testsuite/sim/cris/c/pipe1.c
@@ -11,6 +11,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <limits.h>
+#include <unistd.h>
 
 int main (void)
 {

diff --git a/sim/testsuite/sim/cris/c/sched1.c b/sim/testsuite/sim/cris/c/sched1.c
index 04dae4bd5dbe92dd54d08cc0c5c20bb6e7d84026..1b778f4a40152927fb308ddbbc324bcf873189d1 100644 (file)
--- a/sim/testsuite/sim/cris/c/sched1.c
+++ b/sim/testsuite/sim/cris/c/sched1.c
@@ -5,6 +5,7 @@
 #include <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 int main (void)
 {

diff --git a/sim/testsuite/sim/cris/c/sched2.c b/sim/testsuite/sim/cris/c/sched2.c
index 5371c787f77293100a32870a21b79cf9ee7ba6d5..f40a19a8085c1f5cd005dcb35cbb25a914bda14f 100644 (file)
--- a/sim/testsuite/sim/cris/c/sched2.c
+++ b/sim/testsuite/sim/cris/c/sched2.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 int main (void)
 {

diff --git a/sim/testsuite/sim/cris/c/sched3.c b/sim/testsuite/sim/cris/c/sched3.c
index 601e7e00eead01e88aa337d930f759c27fc76631..2909a4b6c52f5a664717514e9f43e1429458833b 100644 (file)
--- a/sim/testsuite/sim/cris/c/sched3.c
+++ b/sim/testsuite/sim/cris/c/sched3.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 int main (void)
 {

diff --git a/sim/testsuite/sim/cris/c/sched4.c b/sim/testsuite/sim/cris/c/sched4.c
index 57f761fe535acb6467cd681559f83670b57f4c51..df372f217e8308e333bc67c9ffc9f33c86a41793 100644 (file)
--- a/sim/testsuite/sim/cris/c/sched4.c
+++ b/sim/testsuite/sim/cris/c/sched4.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 int main (void)
 {

diff --git a/sim/testsuite/sim/cris/c/sig5.c b/sim/testsuite/sim/cris/c/sig5.c
index 2748aa52b530a760f3ef3d44413fb0824cd2d726..f80da2b69906825c8394470102fd151ab8af43b8 100644 (file)
--- a/sim/testsuite/sim/cris/c/sig5.c
+++ b/sim/testsuite/sim/cris/c/sig5.c
@@ -8,6 +8,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <unistd.h>
+
 int main (void)
 {
   kill (getpid (), SIGBUS);

diff --git a/sim/testsuite/sim/cris/c/sig8.c b/sim/testsuite/sim/cris/c/sig8.c
index 889892f7f367b0c7b5d11b998bbe299d22f0862b..ea2d7f5dc119a39756d3ee76c36d71c09801f1b4 100644 (file)
--- a/sim/testsuite/sim/cris/c/sig8.c
+++ b/sim/testsuite/sim/cris/c/sig8.c
@@ -10,6 +10,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <unistd.h>
+
 int main (void)
 {
   signal (SIGALRM, SIG_IGN);