jit.dg: fix issue with compilation of test-threads.c
authorDavid Malcolm <dmalcolm@redhat.com>
Wed, 18 Jan 2017 20:47:12 +0000 (20:47 +0000)
committerDavid Malcolm <dmalcolm@gcc.gnu.org>
Wed, 18 Jan 2017 20:47:12 +0000 (20:47 +0000)
commit551914b748a9bafe51ed7192c3e7b3d4366211bb
tree117c77e302da4a098308991869e1843bde1be954
parentf8a94453adfa8ccf1243c5a388e8bdb12e5decb4
jit.dg: fix issue with compilation of test-threads.c

DejaGnu's <dejagnu.h> provides decls of various inline functions,
of which the jit testsuite uses "pass", "fail" and "note".

The jit testcase test-threads.c jumps through some hoops to make
these functions threadsafe, using macros to rename the implementation
in dejagnu.h, giving them a "dejagnu_" prefix, then reimplementing
the names with wrappers that use a mutex.

The DejaGnu functions gained a "static" modifier in
ad36659ffa984a0541cfc2bd27f393e0d7d173a7, which appears to be in
DejaGnu 1.5.2 onwards.

Unfortunately, jit.dg/test-threads.c has forward decls of
"dejagnu_pass" etc, and these don't have "static", leading to conflicts
with later versions of DejaGnu for which "pass" etc have "static".

This patch fixes things by removing the forward decls of
"dejagnu_pass", moving the usage of them to a point at which dejagnu.h
has been included, which ought to work with both earlier and later
versions of DejaGnu.

Fixes compilation of test-threads.c in jit testsuite.

gcc/testsuite/ChangeLog:
* jit.dg/test-threads.c (dejagnu_pass): Remove decl.
(dejagnu_fail): Likewise.
(dejagnu_note): Likewise.
(pass): Provide forward decl, moving true decl to after #include
of harness.h.
(fail): Likewise.
(note): Likewise.

From-SVN: r244597
gcc/testsuite/ChangeLog
gcc/testsuite/jit.dg/test-threads.c