summaryrefslogtreecommitdiff
path: root/debian/patches/libgomp-omp_h-multilib.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
committerIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
commit8f6c4b0033c72f8ac14694c419a99458339dd6a9 (patch)
tree06c106e622a58100aa85a381b9b65d222b076df4 /debian/patches/libgomp-omp_h-multilib.diff
parent42156b5190f4fa150e1fab6777eb81e69d4db8c9 (diff)
downloadgcc-9-debian.tar.gz
Import gcc-9 (9.2.1-19)debian/9.2.1-19debian
Diffstat (limited to 'debian/patches/libgomp-omp_h-multilib.diff')
-rw-r--r--debian/patches/libgomp-omp_h-multilib.diff12
1 files changed, 8 insertions, 4 deletions
diff --git a/debian/patches/libgomp-omp_h-multilib.diff b/debian/patches/libgomp-omp_h-multilib.diff
index e93f55b..8eb4549 100644
--- a/debian/patches/libgomp-omp_h-multilib.diff
+++ b/debian/patches/libgomp-omp_h-multilib.diff
@@ -8,15 +8,19 @@
* omp.h.in (omp_nest_lock_t): Limit the fix Linux.
-Index: b/src/libgomp/omp.h.in
-===================================================================
--- a/src/libgomp/omp.h.in
+++ b/src/libgomp/omp.h.in
-@@ -40,8 +40,13 @@ typedef struct
+@@ -40,8 +40,19 @@ typedef struct
typedef struct
{
-+#if defined(__linux__)
++ /*
++ Derive OMP_NEST_LOCK_SIZE and OMP_NEST_LOCK_ALIGN, don't hard
++ code the values because the header is used for all multilibs.
++ OMP_NEST_LOCK_SIZE = @OMP_NEST_LOCK_SIZE@
++ OMP_NEST_LOCK_ALIGN = @OMP_NEST_LOCK_ALIGN@
++ */
++#if defined(__linux__) && !(defined(__hppa__) || defined(__alpha__))
+ unsigned char _x[8 + sizeof (void *)]
+ __attribute__((__aligned__(sizeof (void *))));
+#else