aboutsummaryrefslogtreecommitdiff
path: root/gcc/c
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2022-03-15 10:13:03 +0100
committerMartin Liska <mliska@suse.cz>2022-03-15 10:13:03 +0100
commitcad2e08f6c249937e10ad5ae0d4a117923979efb (patch)
tree4c111a54b7fa0e5fa26391d417da4ec113007f3e /gcc/c
parent604bf5da51533a218c0393cb5115bae7c8d95282 (diff)
parent49fb0af9bf8f16907980d383c2bbc85e185ec2e0 (diff)
downloadgcc-cad2e08f6c249937e10ad5ae0d4a117923979efb.zip
gcc-cad2e08f6c249937e10ad5ae0d4a117923979efb.tar.gz
gcc-cad2e08f6c249937e10ad5ae0d4a117923979efb.tar.bz2
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/c')
-rw-r--r--gcc/c/ChangeLog7
-rw-r--r--gcc/c/c-typeck.cc4
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index e97a42b..1c0d5ec 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,10 @@
+2022-03-12 Thomas Schwinge <thomas@codesourcery.com>
+
+ PR other/65095
+ * c-typeck.cc (handle_omp_array_sections_1)
+ (c_oacc_check_attachments): Call 'user_omp_clause_code_name'
+ instead of 'c_omp_map_clause_name'.
+
2022-03-09 Joseph Myers <joseph@codesourcery.com>
* c-typeck.cc (function_types_compatible_p): Do not handle C2X
diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 54b0b0d..c0812de 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -13373,7 +13373,7 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types,
{
error_at (OMP_CLAUSE_LOCATION (c),
"expected single pointer in %qs clause",
- c_omp_map_clause_name (c, ort == C_ORT_ACC));
+ user_omp_clause_code_name (c, ort == C_ORT_ACC));
return error_mark_node;
}
}
@@ -14096,7 +14096,7 @@ c_oacc_check_attachments (tree c)
if (TREE_CODE (TREE_TYPE (t)) != POINTER_TYPE)
{
error_at (OMP_CLAUSE_LOCATION (c), "expected pointer in %qs clause",
- c_omp_map_clause_name (c, true));
+ user_omp_clause_code_name (c, true));
return true;
}
}