https://gcc.gnu.org/g:fcf3133716dd7a8a10f6f97fb751cd6a6e1eca77
commit fcf3133716dd7a8a10f6f97fb751cd6a6e1eca77 Author: Tobias Burnus <tbur...@baylibre.com> Date: Sat Mar 22 00:36:44 2025 +0100 libgomp.fortran/get-mapped-ptr-1.f90: Use -6 for non-conf dev number This is a fix for the GOMP_interop commit r15-8654-g99e2906ae255fc that added GOMP_DEVICE_DEFAULT_OMP_61 alias omp_default_device, which is a conforming device number. But that test used -5 as check for a non-conforming device number. libgomp/ChangeLog: * testsuite/libgomp.fortran/get-mapped-ptr-1.f90: Use -6 not -5 as non-conforming device number. (cherry picked from commit c264df142a850b47135c0c4639d3a539b23149c5) Diff: --- libgomp/ChangeLog.omp | 8 ++++++++ libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index fd8be1afc4b5..931c55777fda 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,11 @@ +2025-03-21 Tobias Burnus <tbur...@baylibre.com> + + Backported from master: + 2025-03-21 Tobias Burnus <tbur...@baylibre.com> + + * testsuite/libgomp.fortran/get-mapped-ptr-1.f90: Use -6 + not -5 as non-conforming device number. + 2025-03-21 Tobias Burnus <tbur...@baylibre.com> Backported from master: diff --git a/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 b/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 index 9b6334f50d84..be60accbfecd 100644 --- a/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 @@ -19,7 +19,7 @@ program main if (omp_target_associate_ptr (c_loc (q), p, c_sizeof (q), & 0_c_size_t, d) == 0) then - if(c_associated (omp_get_mapped_ptr (c_loc (q), -5))) & + if(c_associated (omp_get_mapped_ptr (c_loc (q), -6))) & stop 1 if(c_associated (omp_get_mapped_ptr (c_loc (q), &