author | Stefan Teleman <stefan.teleman@oracle.com> |
Wed, 16 Dec 2015 20:20:50 -0800 | |
changeset 5205 | eaff9ab86216 |
permissions | -rw-r--r-- |
5205
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# Stefan Teleman <[email protected]> |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# Make sure these structs are always aligned on 8. |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
# Internal patch. Submitted upstream. Status pending. |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
--- libgomp/config/posix/omp-lock.h 2008-06-06 09:01:54.000000000 -0400 |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
+++ libgomp/config/posix/omp-lock.h 2014-11-19 08:34:08.522303786 -0500 |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
@@ -11,13 +11,28 @@ |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
#include <semaphore.h> |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
|
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
typedef pthread_mutex_t omp_lock_25_t; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
-typedef struct { pthread_mutex_t lock; int count; } omp_nest_lock_25_t; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
+ |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
+typedef struct { |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
+ pthread_mutex_t lock; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
+ int count; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
+} omp_nest_lock_25_t __attribute__((__aligned__(8))); |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
+ |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
#ifdef HAVE_BROKEN_POSIX_SEMAPHORES |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
/* If we don't have working semaphores, we'll make all explicit tasks |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
tied to the creating thread. */ |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
typedef pthread_mutex_t omp_lock_t; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
-typedef struct { pthread_mutex_t lock; int count; void *owner; } omp_nest_lock_t; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
+ |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
+typedef struct { |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
+ pthread_mutex_t lock; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
+ int count; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
+ void *owner; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
+} omp_nest_lock_t __attribute__((__aligned__(8))); |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
#else |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
typedef sem_t omp_lock_t; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
-typedef struct { sem_t lock; int count; void *owner; } omp_nest_lock_t; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
+typedef struct { |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
+ sem_t lock; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
+ int count; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
34 |
+ void *owner; |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
35 |
+} omp_nest_lock_t __attribute__((__aligned__(8))); |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
36 |
#endif |
eaff9ab86216
21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
37 |
+ |