Skip to content

Commit 5f841a6

Browse files
authored
[flang][OpenMP] Set _OPENMP macro for version 6.0 (#144410)
1 parent 3377b56 commit 5f841a6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

flang/include/flang/Support/OpenMP-features.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ void setOpenMPMacro(int version, FortranPredefinitions &predefinitions) {
4242
case 52:
4343
predefinitions.emplace_back("_OPENMP", "202111");
4444
break;
45+
case 60:
46+
predefinitions.emplace_back("_OPENMP", "202411");
47+
break;
4548
case 11:
4649
default:
4750
predefinitions.emplace_back("_OPENMP", "199911");

flang/test/Driver/flang-openmp-version-macro.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
! RUN: %flang_fc1 -fopenmp -cpp -E %s | FileCheck %s --check-prefix=DEFAULT-OPENMP-VERSION
44
! RUN: %flang_fc1 -fopenmp -fopenmp-version=11 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-11
5-
! RUN: %flang_fc1 -fopenmp -fopenmp-version=11 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-11
65
! RUN: %flang_fc1 -fopenmp -fopenmp-version=20 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-20
76
! RUN: %flang_fc1 -fopenmp -fopenmp-version=25 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-25
87
! RUN: %flang_fc1 -fopenmp -fopenmp-version=30 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-30
@@ -12,6 +11,7 @@
1211
! RUN: %flang_fc1 -fopenmp -fopenmp-version=50 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-50
1312
! RUN: %flang_fc1 -fopenmp -fopenmp-version=51 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-51
1413
! RUN: %flang_fc1 -fopenmp -fopenmp-version=52 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-52
14+
! RUN: %flang_fc1 -fopenmp -fopenmp-version=60 -cpp -E %s | FileCheck %s --check-prefix=OPENMP-VERSION-60
1515

1616
! DEFAULT-OPENMP-VERSION: integer :: var1 = 201107
1717
! OPENMP-VERSION-11: integer :: var1 = 199911
@@ -24,6 +24,7 @@
2424
! OPENMP-VERSION-50: integer :: var1 = 201811
2525
! OPENMP-VERSION-51: integer :: var1 = 202011
2626
! OPENMP-VERSION-52: integer :: var1 = 202111
27+
! OPENMP-VERSION-60: integer :: var1 = 202411
2728

2829
#if _OPENMP
2930
integer :: var1 = _OPENMP

0 commit comments

Comments
 (0)