From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] gcc: backport omp false positive fix
Date: Wed, 06 Nov 2019 01:08:23 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16166@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
There is a new pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages gcc-omp
https://github.com/void-linux/void-packages/pull/16166
gcc: backport omp false positive fix
This fixes gcc not marking constants emitted into assembly as shared which would result in strange build errors such as:
```
$ gcc -fopenmp test-openmp.c
test-openmp.c: In function âtestfuncâ:
test-openmp.c:10:15: error: â*.LC0â not specified in enclosing âparallelâ
10 | float k[3] = { 0.1f, 0.1f, 0.1f } ;
| ^
test-openmp.c:7:9: error: enclosing âparallelâ
7 | #pragma omp parallel for default(none) shared(f)
| ^~~
```
This happens only sometimes and not on all platforms and seems to mostly come down to luck.
Not bumping crosstoolchains for now, as that would be too intensive on the builders right now. If we encounter this somewhere we should bump cross as well.
A patch file from https://github.com/void-linux/void-packages/pull/16166.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc-omp-16166.patch --]
[-- Type: text/x-diff, Size: 2365 bytes --]
From 64caf6dd1fccdbe53ee47bf8b3a9aee13b6db484 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 31 Oct 2019 23:20:52 +0100
Subject: [PATCH] gcc: backport omp false positive fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This fixes gcc not marking constants emitted into assembly as
shared which would result in strange build errors such as:
```
$ gcc -fopenmp test-openmp.c
test-openmp.c: In function ‘testfunc’:
test-openmp.c:10:15: error: ‘*.LC0’ not specified in enclosing ‘parallel’
10 | float k[3] = { 0.1f, 0.1f, 0.1f } ;
| ^
test-openmp.c:7:9: error: enclosing ‘parallel’
7 | #pragma omp parallel for default(none) shared(f)
| ^~~
```
This happens only sometimes and not on all platforms and seems to
mostly come down to luck.
Not bumping crosstoolchains for now, as that would be too intensive
on the builders right now. If we encounter this somewhere we should
bump cross as well.
[ci skip]
---
srcpkgs/gcc/patches/omp.patch | 17 +++++++++++++++++
srcpkgs/gcc/template | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gcc/patches/omp.patch
diff --git a/srcpkgs/gcc/patches/omp.patch b/srcpkgs/gcc/patches/omp.patch
new file mode 100644
index 00000000000..650cbcb39ff
--- /dev/null
+++ b/srcpkgs/gcc/patches/omp.patch
@@ -0,0 +1,17 @@
+Backport: https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=276211
+
+This fixes potential failures with openmp and constants, such as
+
+error: ‘*.LC0’ not specified in enclosing ‘parallel’
+
+--- gcc/gimplify.c
++++ gcc/gimplify.c
+@@ -7132,6 +7132,8 @@
+ kind = lang_hooks.decls.omp_predetermined_sharing (decl);
+ if (kind != OMP_CLAUSE_DEFAULT_UNSPECIFIED)
+ default_kind = kind;
++ else if (VAR_P (decl) && TREE_STATIC (decl) && DECL_IN_CONSTANT_POOL (decl))
++ default_kind = OMP_CLAUSE_DEFAULT_SHARED;
+
+ switch (default_kind)
+ {
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 6774b8a5826..9ff1282c74e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
pkgname=gcc
version=${_minorver}.0
-revision=1
+revision=2
short_desc="GNU Compiler Collection"
maintainer="Enno Boland <gottox@voidlinux.org>"
homepage="http://gcc.gnu.org"
next reply other threads:[~2019-11-06 0:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 0:08 voidlinux-github [this message]
2019-11-06 6:47 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16166@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).