Merge pull request #171147 from trofi/fix-mingw32-gcc-11

pkgsCross.mingw32.gcc11Stdenv: update mcfgthread patches for gcc-11
main
Sergei Trofimovich 2 years ago committed by GitHub
commit 0fc6476b56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch

@ -222,16 +222,16 @@ index de920d714c6..665fb74bd6b 100644
+#ifdef __USING_MCFGTHREAD__ +#ifdef __USING_MCFGTHREAD__
+ +
+#include <mcfgthread/gthread.h> +#include <mcfgthread/gthread.h>
+ +namespace __cxxabiv1 {
+extern "C" int +extern "C" int
+__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), +__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *),
+ void *obj, void *dso_handle) + void *obj, void *dso_handle)
+ _GLIBCXX_NOTHROW + _GLIBCXX_NOTHROW
+{ +{
+ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; + return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
+ (void)dso_handle; + (void)dso_handle;
+} +}
+ +}
+#else // __USING_MCFGTHREAD__ +#else // __USING_MCFGTHREAD__
+ +
#ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32

Loading…
Cancel
Save