Add code to tolerate sloppy code of libgomp.

mirror · Sep 11, 2015 · 628fdbf · 628fdbf
1 parent 09cee82
commit 628fdbf
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/mingw-w64-libraries/winpthreads/src/mutex.c b/mingw-w64-libraries/winpthreads/src/mutex.c
@@ -55,8 +55,13 @@ typedef struct {
    a mutex_impl_t). */
 static bool
 is_static_initializer(pthread_mutex_t m)
-{ 
-  return (uintptr_t)m >= (uintptr_t)-3;
+{
+  /* Treat 0 as a static initializer as well (for normal mutexes),
+     to tolerate sloppy code in libgomp. (We should rather fix that code!) */
+  intptr_t v = (intptr_t)m;
+  return v >= -3 && v <= 0;
+/* Should be simple:
+  return (uintptr_t)m >= (uintptr_t)-3; */
 }
 
 /* Create and return the implementation part of a mutex from a static