From 45f9ca0c9df98e008c916fdcb5891d00799724b7 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 11 Feb 2014 18:41:36 +0000 Subject: [PATCH] * winsup.h: Turn off previous workaround but leave a comment. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/winsup.h | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6aacffaba..0cf1196df 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2014-02-11 Christopher Faylor + + * winsup.h: Turn off previous workaround but leave a comment. + 2014-02-11 Corinna Vinschen * ldap.cc (rediscover_thread): Give argument a useful name. diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 654e5b1ed..770d4bb1c 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -285,9 +285,16 @@ extern "C" char _data_start__, _data_end__, _bss_start__, _bss_end__; extern "C" void (*__CTOR_LIST__) (void); extern "C" void (*__DTOR_LIST__) (void); +#ifdef NEEDED +/* This was inexplicably needed after updating a toolchain. + The need disappeared when updating further but I'm keeping + it around temporarily in case the issue crops up again. + This manifests as SEGVs in one of the Interlocked functions below + in kernel32.dll. */ #define InterlockedDecrement _InterlockedDecrement #define InterlockedExchange _InterlockedExchange #define InterlockedIncrement _InterlockedIncrement +#endif /*NEEDED*/ #ifndef NO_GLOBALS_H #define _RDATA /* See globals.h */