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.

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 05f948b40d38f9e4d23743289308ddf6a180d0c3..09707247068ad3549cddbef91dd4a6eba39bb05d 100644 (file)
--- 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 06fb40b7418933c841308de01eb6b85b4ee0d95d..b0efd87642e27d860efa28f4519bd89f44e5706e 100755 (executable)
--- 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 9a424aa1c9cbcbdf9c1550016d2df06c66f688c2..fc91702a43443548c4469a4a11b0e946c5b3c992 100644 (file)
--- 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
                ;;
              *)