From 974e3975c5bd14ee8817f892532d1e55492227df Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 13 Oct 2020 15:56:45 -0400
Subject: [PATCH] analyzer: don't use <setjmp.h> in tests [PR97394]

PR analyzer/97394 reports issues with analyzer setjmp results
when testing against MUSL.  This patch fixes up gcc.dg/analyzer
so that it doesn't use <setjmp.h>.

gcc/testsuite/ChangeLog:
	PR analyzer/97394
	* gcc.dg/analyzer/setjmp-pr93378.c: Use test-setjmp.h rather than
	<setjmp.h>.
	* gcc.dg/analyzer/sigsetjmp-5.c: Likewise.
	* gcc.dg/analyzer/sigsetjmp-6.c: Likewise.
	* gcc.dg/analyzer/test-setjmp.h: Don't include <setjmp.h>.
	Provide decls of jmp_buf, sigjmp_buf, setjmp, sigsetjmp,
	longjmp, and siglongjmp.
---
 gcc/testsuite/gcc.dg/analyzer/setjmp-pr93378.c |  2 +-
 gcc/testsuite/gcc.dg/analyzer/sigsetjmp-5.c    |  2 +-
 gcc/testsuite/gcc.dg/analyzer/sigsetjmp-6.c    |  2 +-
 gcc/testsuite/gcc.dg/analyzer/test-setjmp.h    | 15 ++++++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/analyzer/setjmp-pr93378.c b/gcc/testsuite/gcc.dg/analyzer/setjmp-pr93378.c
index 6e2468e701a..e31e127d09d 100644
--- a/gcc/testsuite/gcc.dg/analyzer/setjmp-pr93378.c
+++ b/gcc/testsuite/gcc.dg/analyzer/setjmp-pr93378.c
@@ -1,7 +1,7 @@
 /* { dg-additional-options "-O1 -g" } */
 /* { dg-require-effective-target indirect_jumps } */
 
-#include <setjmp.h>
+#include "test-setjmp.h"
 
 jmp_buf buf;
 
diff --git a/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-5.c b/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-5.c
index 2bc73e80f2d..d6a9910478c 100644
--- a/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-5.c
+++ b/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-5.c
@@ -1,6 +1,6 @@
 /* { dg-require-effective-target sigsetjmp } */
 
-#include <setjmp.h>
+#include "test-setjmp.h"
 #include <stddef.h>
 #include "analyzer-decls.h"
 
diff --git a/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-6.c b/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-6.c
index d45804b951a..f89277efc48 100644
--- a/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-6.c
+++ b/gcc/testsuite/gcc.dg/analyzer/sigsetjmp-6.c
@@ -1,6 +1,6 @@
 /* { dg-require-effective-target sigsetjmp } */
 
-#include <setjmp.h>
+#include "test-setjmp.h"
 #include <stddef.h>
 #include <stdlib.h>
 
diff --git a/gcc/testsuite/gcc.dg/analyzer/test-setjmp.h b/gcc/testsuite/gcc.dg/analyzer/test-setjmp.h
index ee0e1ec7d75..db2422709e2 100644
--- a/gcc/testsuite/gcc.dg/analyzer/test-setjmp.h
+++ b/gcc/testsuite/gcc.dg/analyzer/test-setjmp.h
@@ -7,10 +7,19 @@
 
    setjmp is a function on some systems and a macro on others.
    This header provides a SETJMP macro in a (fake) system header,
-   for consistency of output across such systems.  */
-
-#include <setjmp.h>
+   along with precanned decls of setjmp, for consistency of output across
+   different systems.  */
 
 #pragma GCC system_header
 
+struct __jmp_buf_tag {};
+typedef struct __jmp_buf_tag jmp_buf[1];
+typedef struct __jmp_buf_tag sigjmp_buf[1];
+
+extern int setjmp(jmp_buf env);
+extern int sigsetjmp(sigjmp_buf env, int savesigs);
+
+extern void longjmp(jmp_buf env, int val);
+extern void siglongjmp(sigjmp_buf env, int val);
+
 #define SETJMP(E) setjmp(E)
-- 
2.30.2