Skip to content

[Flang][Driver] Predefine pic/pie macros based on configured level #153449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tblah merged 3 commits into from
Aug 14, 2025
Merged

[Flang][Driver] Predefine pic/pie macros based on configured level #153449

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50ebbb0
[Flang][Driver] Predefine pic/pie macros based on configured level
imciner2 Aug 13, 2025
8994077
fixup! [Flang][Driver] Predefine pic/pie macros based on configured l…
imciner2 Aug 13, 2025
b8d541a
fixup! fixup! [Flang][Driver] Predefine pic/pie macros based on confi…
imciner2 Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions flang/lib/Frontend/CompilerInvocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1696,6 +1696,20 @@ void CompilerInvocation::setDefaultPredefinitions() {
fortranOptions.predefinitions.emplace_back("__flang_patchlevel__",
FLANG_VERSION_PATCHLEVEL_STRING);

// Add predefinitions based on the relocation model
if (unsigned PICLevel = getCodeGenOpts().PICLevel) {
fortranOptions.predefinitions.emplace_back("__PIC__",
std::to_string(PICLevel));
fortranOptions.predefinitions.emplace_back("__pic__",
std::to_string(PICLevel));
if (getCodeGenOpts().IsPIE) {
fortranOptions.predefinitions.emplace_back("__PIE__",
std::to_string(PICLevel));
fortranOptions.predefinitions.emplace_back("__pie__",
std::to_string(PICLevel));
}
}

// Add predefinitions based on extensions enabled
if (frontendOptions.features.IsEnabled(
Fortran::common::LanguageFeature::OpenACC)) {
Expand Down
31 changes: 31 additions & 0 deletions flang/test/Preprocessing/defines_pic_compiler.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
! Check that the pie/pic/PIE/PIC macros are defined properly through the compiler driver

! RUN: %flang -fpic -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIC1 %s
! CHECK-PIC1: #define __PIC__ 1
! CHECK-PIC1-NOT: #define __PIE__
! CHECK-PIC1: #define __pic__ 1
! CHECK-PIC1-NOT: #define __pie__
!
! RUN: %flang -fPIC -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIC2 %s
! CHECK-PIC2: #define __PIC__ 2
! CHECK-PIC2-NOT: #define __PIE__
! CHECK-PIC2: #define __pic__ 2
! CHECK-PIC2-NOT: #define __pie__
!
! RUN: %flang -fpie -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIE1 %s
! CHECK-PIE1: #define __PIC__ 1
! CHECK-PIE1: #define __PIE__ 1
! CHECK-PIE1: #define __pic__ 1
! CHECK-PIE1: #define __pie__ 1
!
! RUN: %flang -fPIE -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIE2 %s
! CHECK-PIE2: #define __PIC__ 2
! CHECK-PIE2: #define __PIE__ 2
! CHECK-PIE2: #define __pic__ 2
! CHECK-PIE2: #define __pie__ 2

integer, parameter :: pic_level = __pic__
38 changes: 38 additions & 0 deletions flang/test/Preprocessing/defines_pic_frontend.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
! Check that the pie/pic/PIE/PIC macros are defined properly through the frontend driver

! RUN: %flang_fc1 -dM -E -o - %s \
! RUN: | FileCheck %s
! CHECK-NOT: #define __PIC__
! CHECK-NOT: #define __PIE__
! CHECK-NOT: #define __pic__
! CHECK-NOT: #define __pie__
!
! RUN: %flang_fc1 -pic-level 1 -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIC1 %s
! CHECK-PIC1: #define __PIC__ 1
! CHECK-PIC1-NOT: #define __PIE__
! CHECK-PIC1: #define __pic__ 1
! CHECK-PIC1-NOT: #define __pie__
!
! RUN: %flang_fc1 -pic-level 2 -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIC2 %s
! CHECK-PIC2: #define __PIC__ 2
! CHECK-PIC2-NOT: #define __PIE__
! CHECK-PIC2: #define __pic__ 2
! CHECK-PIC2-NOT: #define __pie__
!
! RUN: %flang_fc1 -pic-level 1 -pic-is-pie -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIE1 %s
! CHECK-PIE1: #define __PIC__ 1
! CHECK-PIE1: #define __PIE__ 1
! CHECK-PIE1: #define __pic__ 1
! CHECK-PIE1: #define __pie__ 1
!
! RUN: %flang_fc1 -pic-level 2 -pic-is-pie -dM -E -o - %s \
! RUN: | FileCheck --check-prefix=CHECK-PIE2 %s
! CHECK-PIE2: #define __PIC__ 2
! CHECK-PIE2: #define __PIE__ 2
! CHECK-PIE2: #define __pic__ 2
! CHECK-PIE2: #define __pie__ 2

integer, parameter :: pic_level = __pic__
Loading