From: Tobias Burnus <tobias@codesourcery.com>
Date: Wed, 4 May 2022 16:39:28 +0000 (+0200)
Subject: libgomp/plugin/plugin-gcn.c: Use -foffload-options= in err msg
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9070421d9e2110b7e222e48432219043080a2fc;p=thirdparty%2Fgcc.git

libgomp/plugin/plugin-gcn.c: Use -foffload-options= in err msg

While -foffload=-<flag> works (never documented legacy feature),
the documented way is to use -foffload-options=.

libgomp/ChangeLog:

	* plugin/plugin-gcn.c (isa_matches_agent): Suggest -foffload-options.

(cherry picked from commit 4a2061610726becfa5158e418c69800f5634b4c1)
---

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 5c53648f6bee..a8a121e8943e 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,10 @@
+2022-05-04  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backport from master:
+	2022-05-04  Tobias Burnus  <tobias@codesourcery.com>
+
+	* plugin/plugin-gcn.c (isa_matches_agent): Suggest -foffload-options.
+
 2022-05-02  Marcel Vollweiler  <marcel@codesourcery.com>
 
 	Backport from mainline:
diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c
index 89436c51f17d..d246351397e2 100644
--- a/libgomp/plugin/plugin-gcn.c
+++ b/libgomp/plugin/plugin-gcn.c
@@ -2359,7 +2359,7 @@ isa_matches_agent (struct agent_info *agent, Elf64_Ehdr *image)
 
       snprintf (msg, sizeof msg,
 		"GCN code object ISA '%s' does not match GPU ISA '%s'.\n"
-		"Try to recompile with '-foffload=-march=%s'.\n",
+		"Try to recompile with '-foffload-options=-march=%s'.\n",
 		isa_s, agent_isa_s, agent_isa_gcc_s);
 
       hsa_error (msg, HSA_STATUS_ERROR);