Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2215997/?format=api
{ "id": 2215997, "url": "http://patchwork.ozlabs.org/api/patches/2215997/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/patch/27b68266-9365-4072-8f93-9d36d33eb23a@baylibre.com/", "project": { "id": 17, "url": "http://patchwork.ozlabs.org/api/projects/17/?format=api", "name": "GNU Compiler Collection", "link_name": "gcc", "list_id": "gcc-patches.gcc.gnu.org", "list_email": "gcc-patches@gcc.gnu.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<27b68266-9365-4072-8f93-9d36d33eb23a@baylibre.com>", "list_archive_url": null, "date": "2026-03-25T15:56:36", "name": "[OpenMP,OpenACC,testsuite,v2] Allow runtime library use in compiler tests", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b0de34dcb1e05bdbcac91e5295373d72ee71c20d", "submitter": { "id": 87913, "url": "http://patchwork.ozlabs.org/api/people/87913/?format=api", "name": "Chung-Lin Tang", "email": "cltang@baylibre.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/gcc/patch/27b68266-9365-4072-8f93-9d36d33eb23a@baylibre.com/mbox/", "series": [ { "id": 497469, "url": "http://patchwork.ozlabs.org/api/series/497469/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/list/?series=497469", "date": "2026-03-25T15:56:36", "name": "[OpenMP,OpenACC,testsuite,v2] Allow runtime library use in compiler tests", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/497469/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2215997/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2215997/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "gcc-patches@gcc.gnu.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "gcc-patches@gcc.gnu.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=baylibre-com.20230601.gappssmtp.com\n header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256\n header.s=20230601 header.b=C5xYt7Vd;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=2620:52:6:3111::32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)", "sourceware.org;\n\tdkim=pass (2048-bit key,\n unprotected) header.d=baylibre-com.20230601.gappssmtp.com\n header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256\n header.s=20230601 header.b=C5xYt7Vd", "sourceware.org;\n dmarc=none (p=none dis=none) header.from=baylibre.com", "sourceware.org; spf=pass smtp.mailfrom=baylibre.com", "server2.sourceware.org;\n arc=none smtp.remote-ip=209.85.215.174" ], "Received": [ "from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgs3t0kZXz1y1K\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 26 Mar 2026 02:57:14 +1100 (AEDT)", "from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id BB0AD4BB58C6\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 25 Mar 2026 15:57:11 +0000 (GMT)", "from mail-pg1-f174.google.com (mail-pg1-f174.google.com\n [209.85.215.174])\n by sourceware.org (Postfix) with ESMTPS id 33E964BA23C2\n for <gcc-patches@gcc.gnu.org>; Wed, 25 Mar 2026 15:56:41 +0000 (GMT)", "by mail-pg1-f174.google.com with SMTP id\n 41be03b00d2f7-c757a9251faso34076a12.1\n for <gcc-patches@gcc.gnu.org>; Wed, 25 Mar 2026 08:56:41 -0700 (PDT)", "from [192.168.50.226] (112-104-14-82.adsl.dynamic.seed.net.tw.\n [112.104.14.82]) by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b0bc76b92asm2784475ad.15.2026.03.25.08.56.38\n (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n Wed, 25 Mar 2026 08:56:39 -0700 (PDT)" ], "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 sourceware.org BB0AD4BB58C6", "OpenDKIM Filter v2.11.0 sourceware.org 33E964BA23C2" ], "DMARC-Filter": "OpenDMARC Filter v1.4.2 sourceware.org 33E964BA23C2", "ARC-Filter": "OpenARC Filter v1.0.0 sourceware.org 33E964BA23C2", "ARC-Seal": "i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774454201; cv=none;\n b=PhjK8SQCz5Bbl13N3HkZzFB8KJSgkuGmO50zDtnLRrHZW3Cl01fTBwvSuLYdEAFNclsAb00vlFuHoiLb1W97psdv2zZOL6XlklO8MMVieKLqbwUMkKcSTU+Wcfwsyfcd+e2s5NAhDYPLNiqdvObIBwXBePOuK3nOvk6qFlqA0JQ=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1774454201; c=relaxed/simple;\n bh=EwpYNSzNl7tKd5CUohJkJRMnuvxQHwhRiHr0IK4F934=;\n h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From;\n b=P4yAb7dAbuL7enfBcsf9cggC7e8arOMivvuTd5HrBaz0d2HOqlXud91imBbccRTyBbtrv/E1s57kZFhDenEKWVDwesbJ8OjXe2nguon3pCb4QYV/ksKCRA6T3GTLQybLx0daSqSmLBlyV4g6gxJ/ARVTj9JUJI4PYhe+3XKf4mI=", "ARC-Authentication-Results": "i=1; server2.sourceware.org", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1774454200;\n x=1775059000;\n darn=gcc.gnu.org;\n h=in-reply-to:from:content-language:references:to:subject:user-agent\n :mime-version:date:message-id:from:to:cc:subject:date:message-id\n :reply-to; bh=nAZB7rafwKAFHicx4o5EsKjSM4252KHNq9A+kEKujzE=;\n b=C5xYt7VdjVIQUFL+Tnzuu+QbJn6CBqBAqUMAERhuugMV/Dr54Dv3+hPBurFkmWkLBV\n hEIPRCwEWO9JcTkEpf+4bhC7axLNZ7kSfx0DqRCCVxxsmC3XobgmN6H8G/n6GfUrOARO\n YCl1cOAWDmJKyWRd7WXy8Tz1ZF6fXwmsMthg+suTUpvjuU+QaPHValzv1v1xaTTUfCFQ\n FijlboEuZBjJeIZ5+KwQGmNHUH0bCxVfr0MYavYAQoH/SDITXOpRQZOdMgCO8fz8Td6Y\n nEFneKTterl2+ehnQO9n8+Ctr0OX5UtmAbCqTpD3FUvtw9cPOMgW3WWkJyeAvTTSRmmr\n SvOQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1774454200; x=1775059000;\n h=in-reply-to:from:content-language:references:to:subject:user-agent\n :mime-version:date:message-id:x-gm-gg:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=nAZB7rafwKAFHicx4o5EsKjSM4252KHNq9A+kEKujzE=;\n b=e0g3rcTW+Q0Cc2NM1KM6cNhrV6zkRZFlAn8CitTcrd/N6DoXL4nUCiDw7bImd2xFU3\n uGlmhb7Jl8/uQz3k4JZv0K7y2PmO/rmpP75ncAIkDp2gbVgM7U9qwDYo1Ew1P+WMp93B\n 5OLVbpfUJA0Ur/tp9zEulSnBy2w4T+jKdinapixTgGrEx8KV7NWMjC0U5r4cIXTkK6YX\n EuW+FAeUzkW4yG4trTtp1psf4RPQRpl7KYSsX8T44QT+jYBMc8FSV1s9antdU8Xu7wO7\n gTUY7lQ4h/qvCd9YaWduCaNvPf9MG/Sk3YxteenYzoHZO/EY8hCWjAtEp3QHZd0BmXIO\n irCg==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCXjLZefBXcMBYTDdjw8abH+YhoIU9rbcOSpIBqK2gHhq90ioYd/VaZTcRd3bzkldw1SjVj+/p6Sv90VLQ==@gcc.gnu.org", "X-Gm-Message-State": "AOJu0YxKk0vxFTVxhoHwX5UKonzyeZzaLYQQClezUwesZqPlIlpzIPor\n 8TsATCTME0vUseOvQoMV0zNVBLdez5lGCWTjf8dRkMZAmVvfatvfmxSS4hyYIvbCZLY=", "X-Gm-Gg": "ATEYQzybYZ9i0RYYzTgUY8G+2LSGpGeN8/LBziTEAR4YIckS6JzoVC1OuXzWGJmjiIY\n qAg/JZdOQ0O7DMngeWslQbqt1/RVjOtHRZ1LM6IppbM932KU7qPae/HdJrI7mH/Fk+lPA1lD0Ov\n iqlmPL9iMhosI51ib368RGjCXjnrYya9Rs7Hf44D9W/bhINlTZVmiXlVEyMkWkiMa76u7GR+Nor\n 5bob/wIRfC95XxQdCE4XMbM332w9+LU2EbzKkkei/+gdPIVnteVr3aoJJVTGg2bTMc6lOalROze\n mY+RLdkyvNyDapI4n39zlsKxO0kWC2ApDVGrySA/9JG3+JCi5BqxrWRG6vRES86fRmIz/0zeWUP\n N/o7f2shUjvWbuUZumIYXN2cPc9bmMTW1JyLBr08h1Hrw98WT+mTGuS3KTCG5/ZBFldp+uTgfiv\n Cbn4M0JLUzh9AQt3BfD+UKoINSzAAvdeQpgWlDUkcZ94AnOmlZU/TIIkhgXRiYzPh0QIMYAJgVR\n k0w8MFW", "X-Received": "by 2002:a17:902:c412:b0:2b0:5e63:fc45 with SMTP id\n d9443c01a7336-2b0b08791b9mr49202035ad.0.1774454200064;\n Wed, 25 Mar 2026 08:56:40 -0700 (PDT)", "Content-Type": "multipart/mixed; boundary=\"------------4CI1GLXwSsega6YrEwjjxwn7\"", "Message-ID": "<27b68266-9365-4072-8f93-9d36d33eb23a@baylibre.com>", "Date": "Wed, 25 Mar 2026 23:56:36 +0800", "MIME-Version": "1.0", "User-Agent": "Mozilla Thunderbird", "Subject": "[PATCH, OpenMP, OpenACC, testsuite, v2] Allow runtime library use in\n compiler tests", "To": "Tobias Burnus <tburnus@baylibre.com>,\n gcc-patches <gcc-patches@gcc.gnu.org>,\n Thomas Schwinge <tschwinge@baylibre.com>, Jakub Jelinek <jakub@redhat.com>", "References": "<ecc2018f-04d8-4e00-9413-56eb51d0c202@baylibre.com>\n <33011044-95cb-4099-9f9c-7801d0b7ecdc@baylibre.com>", "Content-Language": "en-US", "From": "Chung-Lin Tang <cltang@baylibre.com>", "In-Reply-To": "<33011044-95cb-4099-9f9c-7801d0b7ecdc@baylibre.com>", "X-BeenThere": "gcc-patches@gcc.gnu.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Gcc-patches mailing list <gcc-patches.gcc.gnu.org>", "List-Unsubscribe": "<https://gcc.gnu.org/mailman/options/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>", "List-Archive": "<https://gcc.gnu.org/pipermail/gcc-patches/>", "List-Post": "<mailto:gcc-patches@gcc.gnu.org>", "List-Help": "<mailto:gcc-patches-request@gcc.gnu.org?subject=help>", "List-Subscribe": "<https://gcc.gnu.org/mailman/listinfo/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>", "Errors-To": "gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org" }, "content": "On 11/14/25 6:36 PM, Tobias Burnus wrote:\n> Doesn't this run into multlib issues of 32 vs. 64 bit? For instance,\n\n> tob@tux:~/repos/gcc-trunk/gcc/testsuite/gfortran.dg/gomp> cat -n test.f90\n> 1 use omp_lib\n> 2 implicit none\n> 3 integer(omp_depend_kind) :: obj\n> 4 integer :: ppp\n> 5\n> 6 !$omp depobj(obj) depend(inout: ppp)\n> 7 end\n> \n> tob@tux:~/projects/build-gcc-trunk/gcc> \\\n> make check-fortran RUNTESTFLAGS=\"gomp.exp=test.f90 --target_board=unix\\{-m64,-m32\\}\"\n> \n> ...\n> === gfortran Summary for unix/-m64 ===\n> # of expected passes 1\n> \n> Running target unix/-m32\n> FAIL: gfortran.dg/gomp/test.f90 -O (test for excess errors)\n\nOkay, I've enhanced the patch to take the multilib directory into account.\n\nI'm not completely sure that the way I have extracted {-m32/-m64} from\n$current_target_name is the best approach, but I haven't found any other way to get at\nthe board variant options.\n\nIs this okay?\n\nThanks,\nChung-Lin\n\ngcc/testsuite/ChangeLog:\n\n\t* g++.dg/goacc-gomp/goacc-gomp.exp:\n\tSet $multilib_directory using new gcc-set-multilib-directory function.\n\tAdd -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp to default extra flags.\n\t* g++.dg/goacc/goacc.exp: Likewise.\n\t* g++.dg/gomp/gomp.exp: Likewise.\n\t* gcc.dg/goacc-gomp/goacc-gomp.exp: Likewise.\n\t* gcc.dg/goacc/goacc.exp: Likewise.\n\t* gcc.dg/gomp/gomp.exp: Likewise.\n\t* gfortran.dg/goacc-gomp/goacc-gomp.exp: Likewise.\n\t* gfortran.dg/goacc/goacc.exp: Likewise.\n\t* gfortran.dg/gomp/gomp.exp: Likewise.\n\t* lib/gcc-defs.exp (gcc-set-multilib-directory): New function.", "diff": "diff --git a/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp b/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp\nindex 6b92476a061..486e5bcc00d 100644\n--- a/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp\n+++ b/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp\n@@ -27,10 +27,13 @@ if { ![check_effective_target_fopenacc] \\\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GXX_UNDER_TEST]\n+\n # Main loop.\n g++-dg-runtest [lsort [concat \\\n \t[find $srcdir/$subdir *.C] \\\n-\t[find $srcdir/c-c++-common/goacc-gomp *.c]]] \"\" \"-fopenacc -fopenmp\"\n+\t[find $srcdir/c-c++-common/goacc-gomp *.c]]] \"\" \\\n+\t\"-fopenacc -fopenmp -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/g++.dg/goacc/goacc.exp b/gcc/testsuite/g++.dg/goacc/goacc.exp\nindex 99ab413431d..4eaf8949fcb 100644\n--- a/gcc/testsuite/g++.dg/goacc/goacc.exp\n+++ b/gcc/testsuite/g++.dg/goacc/goacc.exp\n@@ -26,10 +26,13 @@ if ![check_effective_target_fopenacc] {\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GXX_UNDER_TEST]\n+\n # Main loop.\n g++-dg-runtest [lsort [concat \\\n \t[find $srcdir/$subdir *.C] \\\n-\t[find $srcdir/c-c++-common/goacc *.c]]] \"\" \"-fopenacc\"\n+\t[find $srcdir/c-c++-common/goacc *.c]]] \"\" \\\n+\t\"-fopenacc -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/g++.dg/gomp/gomp.exp b/gcc/testsuite/g++.dg/gomp/gomp.exp\nindex b16909d669b..d33a1449b83 100644\n--- a/gcc/testsuite/g++.dg/gomp/gomp.exp\n+++ b/gcc/testsuite/g++.dg/gomp/gomp.exp\n@@ -26,10 +26,13 @@ if ![check_effective_target_fopenmp] {\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GXX_UNDER_TEST]\n+\n # Main loop.\n g++-dg-runtest [lsort [concat \\\n \t[find $srcdir/$subdir *.C] \\\n-\t[find $srcdir/c-c++-common/gomp *.c]]] \"\" \"-fopenmp\"\n+\t[find $srcdir/c-c++-common/gomp *.c]]] \"\" \\\n+\t\"-fopenmp -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp b/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp\nindex c573f95e1d5..afcdfd1cd16 100644\n--- a/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp\n+++ b/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp\n@@ -29,10 +29,13 @@ if { ![check_effective_target_fopenacc] \\\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GCC_UNDER_TEST]\n+\n # Main loop.\n dg-runtest [lsort [concat \\\n \t[find $srcdir/$subdir *.c] \\\n-\t[find $srcdir/c-c++-common/goacc-gomp *.c]]] \"\" \"-fopenacc -fopenmp\"\n+\t[find $srcdir/c-c++-common/goacc-gomp *.c]]] \"\" \\\n+\t\"-fopenacc -fopenmp -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/gcc.dg/goacc/goacc.exp b/gcc/testsuite/gcc.dg/goacc/goacc.exp\nindex d41692a28b9..71ff7fdf5df 100644\n--- a/gcc/testsuite/gcc.dg/goacc/goacc.exp\n+++ b/gcc/testsuite/gcc.dg/goacc/goacc.exp\n@@ -28,10 +28,13 @@ if ![check_effective_target_fopenacc] {\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GCC_UNDER_TEST]\n+\n # Main loop.\n dg-runtest [lsort [concat \\\n \t[find $srcdir/$subdir *.c] \\\n-\t[find $srcdir/c-c++-common/goacc *.c]]] \"\" \"-fopenacc\"\n+\t[find $srcdir/c-c++-common/goacc *.c]]] \"\" \\\n+\t\"-fopenacc -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/gcc.dg/gomp/gomp.exp b/gcc/testsuite/gcc.dg/gomp/gomp.exp\nindex 8d6e1c5fecf..fba1d3d40cc 100644\n--- a/gcc/testsuite/gcc.dg/gomp/gomp.exp\n+++ b/gcc/testsuite/gcc.dg/gomp/gomp.exp\n@@ -28,10 +28,13 @@ if ![check_effective_target_fopenmp] {\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GCC_UNDER_TEST]\n+\n # Main loop.\n dg-runtest [lsort [concat \\\n \t[find $srcdir/$subdir *.c] \\\n-\t[find $srcdir/c-c++-common/gomp *.c]]] \"\" \"-fopenmp\"\n+\t[find $srcdir/c-c++-common/gomp *.c]]] \"\" \\\n+\t\"-fopenmp -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp b/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp\nindex 799da43a4ed..6c16e334755 100644\n--- a/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp\n+++ b/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp\n@@ -29,9 +29,12 @@ if { ![check_effective_target_fopenacc] \\\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GFORTRAN_UNDER_TEST]\n+\n # Main loop.\n gfortran-dg-runtest [lsort \\\n- [find $srcdir/$subdir *.\\[fF\\]{,90,95,03,08} ] ] \"\" \"-fopenacc -fopenmp\"\n+ [find $srcdir/$subdir *.\\[fF\\]{,90,95,03,08} ] ] \"\" \\\n+ \"-fopenacc -fopenmp -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/gfortran.dg/goacc/goacc.exp b/gcc/testsuite/gfortran.dg/goacc/goacc.exp\nindex 16c31600630..d0a949e8f67 100644\n--- a/gcc/testsuite/gfortran.dg/goacc/goacc.exp\n+++ b/gcc/testsuite/gfortran.dg/goacc/goacc.exp\n@@ -53,9 +53,12 @@ proc dg-compile-aux-modules { args } {\n }\n }\n \n+set multilib_directory [gcc-set-multilib-directory $GFORTRAN_UNDER_TEST]\n+\n # Main loop.\n gfortran-dg-runtest [lsort \\\n- [find $srcdir/$subdir *.\\[fF\\]{,90,95,03,08} ] ] \"\" \"-fopenacc\"\n+ [find $srcdir/$subdir *.\\[fF\\]{,90,95,03,08} ] ] \"\" \\\n+ \"-fopenacc -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/gfortran.dg/gomp/gomp.exp b/gcc/testsuite/gfortran.dg/gomp/gomp.exp\nindex f0a37702c89..bc7a9f76e12 100644\n--- a/gcc/testsuite/gfortran.dg/gomp/gomp.exp\n+++ b/gcc/testsuite/gfortran.dg/gomp/gomp.exp\n@@ -28,9 +28,12 @@ if ![check_effective_target_fopenmp] {\n # Initialize `dg'.\n dg-init\n \n+set multilib_directory [gcc-set-multilib-directory $GFORTRAN_UNDER_TEST]\n+\n # Main loop.\n gfortran-dg-runtest [lsort \\\n- [find $srcdir/$subdir *.\\[fF\\]{,90,95,03,08} ] ] \"\" \"-fopenmp\"\n+ [find $srcdir/$subdir *.\\[fF\\]{,90,95,03,08} ] ] \"\" \\\n+ \"-fopenmp -I${objdir}/../../../${target_triplet}/${multilib_directory}/libgomp\"\n \n # All done.\n dg-finish\ndiff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp\nindex 191e2b83fe1..d8da1389fca 100644\n--- a/gcc/testsuite/lib/gcc-defs.exp\n+++ b/gcc/testsuite/lib/gcc-defs.exp\n@@ -519,6 +519,24 @@ proc gcc-set-multilib-library-path { compiler } {\n return $libpath\n }\n \n+# Return the multilib directory for COMPILER\n+\n+proc gcc-set-multilib-directory { compiler } {\n+ set compiler [lindex $compiler 0]\n+ set options [lrange $compiler 1 end]\n+ set variant_options [lindex [split [current_target_name] /] 1 end]\n+\n+ set multi_dir_x [remote_exec host \"$compiler\" \\\n+\t\t \"$options $variant_options -print-multi-directory\"]\n+\n+ if { [lindex $multi_dir_x 0] == 0 } {\n+\tset multi_dir [string trim [lindex $multi_dir_x 1]]\n+\treturn $multi_dir\n+ } else {\n+\terror \"Error executing compiler with -print-multi-directory\"\n+ }\n+}\n+\n # A list of all uses of dg-regexp, each entry of the form:\n # line-number regexp\n # This is cleared at the end of each test by gcc-dg.exp's wrapper for dg-test.\n", "prefixes": [ "OpenMP", "OpenACC", "testsuite", "v2" ] }