From ad1a9afc6022302b31492e16807571f0e191cd0c Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 23 Oct 2020 09:09:05 +0000 Subject: [PATCH] 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 libgcc/ * config/gthr-vxworks-thread.c: #include gthr.h before testing the guard defined there. * config/gthr-vxworks-cond.c: Likewise. --- libgcc/config/gthr-vxworks-cond.c | 3 ++- libgcc/config/gthr-vxworks-thread.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libgcc/config/gthr-vxworks-cond.c b/libgcc/config/gthr-vxworks-cond.c index ba384b433c4..e307bea0ea7 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 /* --------------------------- Condition Variables ------------------------ */ diff --git a/libgcc/config/gthr-vxworks-thread.c b/libgcc/config/gthr-vxworks-thread.c index a723005e03b..c87168c2271 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 #include -- 2.30.2