[og12,committed] Fix bootstrap build of OG12
Commit Message
The following patches have been committed to devel/omp/gcc-12 to fix a
bootstrap build of the branch:
29ba2e4eeff Fix mis-merge of 'dwarf: Multi-register CFI address support'
82a3f9f22f7 Build fixes for OG12 on more recent GCC versions
e9ee746093b Fix string formatting issues
b8ecb83d528 Build fix for 'openmp: allow requires unified_shared_memory'
Kwok
From b8ecb83d52884153c2b9b9c44840f933dfaa4dc7 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Thu, 30 Jun 2022 08:30:48 +0200
Subject: [PATCH 1/5] Build fix for 'openmp: allow requires
unified_shared_memory'
OG12 commit fa65fc45972d27f2fd79a44eaba1978348177ee9 added an
error diagnostic (moved around in later commits); this diagnostic
caused bootstrap fails as %<...%> were missing. This commit adds
them.
gcc/c/
* c-parser.cc (c_parser_omp_requires): Add missing %<...%> in error.
gcc/cp/
* parser.cc (cp_parser_omp_requires): Add missing %<...%> in error.
---
gcc/c/c-parser.cc | 8 ++++----
gcc/cp/parser.cc | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
@@ -22872,8 +22872,8 @@ c_parser_omp_requires (c_parser *parser)
if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
&& flag_offload_memory != OFFLOAD_MEMORY_NONE)
error_at (cloc,
- "unified_address is incompatible with the "
- "selected -foffload-memory option");
+ "%<unified_address%> is incompatible with the "
+ "selected %<-foffload-memory%> option");
flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
}
else if (!strcmp (p, "unified_shared_memory"))
@@ -22883,8 +22883,8 @@ c_parser_omp_requires (c_parser *parser)
if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
&& flag_offload_memory != OFFLOAD_MEMORY_NONE)
error_at (cloc,
- "unified_shared_memory is incompatible with the "
- "selected -foffload-memory option");
+ "%<unified_shared_memory%> is incompatible with the "
+ "selected %<-foffload-memory%> option");
flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
}
else if (!strcmp (p, "dynamic_allocators"))
@@ -47177,8 +47177,8 @@ cp_parser_omp_requires (cp_parser *parser, cp_token *pragma_tok)
if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
&& flag_offload_memory != OFFLOAD_MEMORY_NONE)
error_at (cloc,
- "unified_address is incompatible with the "
- "selected -foffload-memory option");
+ "%<unified_address%> is incompatible with the "
+ "selected %<-foffload-memory%> option");
flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
}
else if (!strcmp (p, "unified_shared_memory"))
@@ -47188,8 +47188,8 @@ cp_parser_omp_requires (cp_parser *parser, cp_token *pragma_tok)
if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
&& flag_offload_memory != OFFLOAD_MEMORY_NONE)
error_at (cloc,
- "unified_shared_memory is incompatible with the "
- "selected -foffload-memory option");
+ "%<unified_shared_memory%> is incompatible with the "
+ "selected %<-foffload-memory%> option");
flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
}
else if (!strcmp (p, "dynamic_allocators"))