aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorRasmus Villemoes <rv@rasmusvillemoes.dk>2020-10-23 09:09:05 +0000
committerOlivier Hainque <hainque@adacore.com>2020-10-23 15:23:33 +0000
commitad1a9afc6022302b31492e16807571f0e191cd0c (patch)
tree66b38ae5cf310815368b6f520eec40e3818bd6d5 /libgcc
parent081dc85073da351470b2851e8a93c769cb74f341 (diff)
downloadgcc-ad1a9afc6022302b31492e16807571f0e191cd0c.zip
gcc-ad1a9afc6022302b31492e16807571f0e191cd0c.tar.gz
gcc-ad1a9afc6022302b31492e16807571f0e191cd0c.tar.bz2
Fix overzealous gthread support inhibition for vxworks
The tests for macros possibly defined in gthr.h needs to be performed after the corresponding #include. This was tested together with the previous updates to gthr-vxworks-thread.c and gthr-vxworks-cond.c and was meant to be squashed with them. 2010-10-23 Rasmus Villemoes <rv@rasmusvillemoes.dk> libgcc/ * config/gthr-vxworks-thread.c: #include gthr.h before testing the guard defined there. * config/gthr-vxworks-cond.c: Likewise.
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/config/gthr-vxworks-cond.c3
-rw-r--r--libgcc/config/gthr-vxworks-thread.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/libgcc/config/gthr-vxworks-cond.c b/libgcc/config/gthr-vxworks-cond.c
index ba384b4..e307bea 100644
--- a/libgcc/config/gthr-vxworks-cond.c
+++ b/libgcc/config/gthr-vxworks-cond.c
@@ -26,9 +26,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
This file implements the GTHREAD_HAS_COND part of the interface
exposed by gthr-vxworks.h. */
+#include "gthr.h"
+
#if __GTHREAD_HAS_COND
-#include "gthr.h"
#include <taskLib.h>
/* --------------------------- Condition Variables ------------------------ */
diff --git a/libgcc/config/gthr-vxworks-thread.c b/libgcc/config/gthr-vxworks-thread.c
index a723005..c87168c 100644
--- a/libgcc/config/gthr-vxworks-thread.c
+++ b/libgcc/config/gthr-vxworks-thread.c
@@ -27,9 +27,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
exposed by gthr-vxworks.h, using APIs exposed by regular (!AE/653)
VxWorks kernels. */
+#include "gthr.h"
+
#if __GTHREAD_CXX0X
-#include "gthr.h"
#include <taskLib.h>
#include <stdlib.h>