From ab5bd6ac68c6d9f870fcaf0de4a73f3dec920db9 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 14 Oct 2024 10:45:06 +0200 Subject: Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device: Revert 'gimple_fold_builtin_acc_on_device' change The motivation of the 'gimple_fold_builtin_acc_on_device' change in commit 3269a722b7a03613e9c4e2862bc5088c4a17cc11 "Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device" is unclear, and it unnecessarily diverges GCC's (default) '--disable-offload-targets' vs. '--enable-offload-targets=[...]' configurations. PR testsuite/82250 gcc/ * gimple-fold.cc (gimple_fold_builtin_acc_on_device): Revert last change. libgomp/ * testsuite/libgomp.oacc-c-c++-common/routine-nohost-1.c: Revert last change. --- gcc/gimple-fold.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc index 3c72cd6..3c0abf2 100644 --- a/gcc/gimple-fold.cc +++ b/gcc/gimple-fold.cc @@ -4231,7 +4231,7 @@ static bool gimple_fold_builtin_acc_on_device (gimple_stmt_iterator *gsi, tree arg0) { /* Defer folding until we know which compiler we're in. */ - if (ENABLE_OFFLOADING && symtab->state != EXPANSION) + if (symtab->state != EXPANSION) return false; unsigned val_host = GOMP_DEVICE_HOST; -- cgit v1.1