summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorTobias Burnus <tobias@codesourcery.com>2020-01-30 12:27:17 +0100
committerTobias Burnus <tobias@codesourcery.com>2020-01-30 12:27:17 +0100
commit5ab5d81b364ba500b288d9bcc1232ce7953a3b3f (patch)
treeb74a4d964c9cc2368765843308dbb2714bf945d5 /libgomp
parentb0e9b18ed432c4b7cb9a4b963b65911b4c103cbe (diff)
Skip plugin-{gcn,hsa} for (-m)x32 (PR bootstrap/93409)
PR bootstrap/93409 * plugin/configfrag.ac (enable_offload_targets): Skip HSA and GCN plugin besides -m32 also for -mx32. * configure: Regenerate.
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog7
-rwxr-xr-xlibgomp/configure6
-rw-r--r--libgomp/plugin/configfrag.ac4
3 files changed, 12 insertions, 5 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 05f948b40d3..09707247068 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2020-01-29 Tobias Burnus <tobias@codesourcery.com>
+
+ PR bootstrap/93409
+ * plugin/configfrag.ac (enable_offload_targets): Skip
+ HSA and GCN plugin besides -m32 also for -mx32.
+ * configure: Regenerate.
+
2020-01-29 Frederik Harwath <frederik@codesourcery.com>
* oacc-init.c (name_of_acc_device_t): Handle acc_device_radeon.
diff --git a/libgomp/configure b/libgomp/configure
index 06fb40b7418..b0efd87642e 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -15018,7 +15018,7 @@ fi
# Plugins for offload execution, configure.ac fragment. -*- mode: autoconf -*-
#
-# Copyright (C) 2014-2019 Free Software Foundation, Inc.
+# Copyright (C) 2014-2020 Free Software Foundation, Inc.
#
# Contributed by Mentor Embedded.
#
@@ -15347,7 +15347,7 @@ rm -f core conftest.err conftest.$ac_objext \
case "${target}" in
x86_64-*-*)
case " ${CC} ${CFLAGS} " in
- *" -m32 "*)
+ *" -m32 "*|*" -mx32 "*)
PLUGIN_HSA=0
;;
*)
@@ -15387,7 +15387,7 @@ rm -f core conftest.err conftest.$ac_objext \
case "${target}" in
x86_64-*-*)
case " ${CC} ${CFLAGS} " in
- *" -m32 "*)
+ *" -m32 "*|*" -mx32 "*)
PLUGIN_GCN=0
;;
*)
diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 9a424aa1c9c..fc91702a434 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -211,7 +211,7 @@ if test x"$enable_offload_targets" != x; then
case "${target}" in
x86_64-*-*)
case " ${CC} ${CFLAGS} " in
- *" -m32 "*)
+ *" -m32 "*|*" -mx32 "*)
PLUGIN_HSA=0
;;
*)
@@ -251,7 +251,7 @@ if test x"$enable_offload_targets" != x; then
case "${target}" in
x86_64-*-*)
case " ${CC} ${CFLAGS} " in
- *" -m32 "*)
+ *" -m32 "*|*" -mx32 "*)
PLUGIN_GCN=0
;;
*)