Skip to content

Our approach to issue #6 #47

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

Open
wants to merge 1 commit into
base: flang_release_50
Choose a base branch
from
Open

Our approach to issue #6 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 28 additions & 9 deletions lib/Driver/ToolChains/Flang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,17 +585,36 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__linux");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__linux__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__NO_MATH_INLINES");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LP64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LONG_MAX__=9223372036854775807L");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__SIZE_TYPE__=unsigned long int");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__PTRDIFF_TYPE__=long int");
switch (getToolChain().getEffectiveTriple().getArch()) {
case llvm::Triple::aarch64:
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LP64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__aarch64");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__aarch64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__ARM_ARCH=8");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__ARM_ARCH__=8");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LONG_MAX__=9223372036854775807L");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__SIZE_TYPE__=unsigned long int");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__PTRDIFF_TYPE__=long int");
break;
case llvm::Triple::x86_64:
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LP64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__amd_64__amd64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__k8");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__k8__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LONG_MAX__=9223372036854775807L");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__SIZE_TYPE__=unsigned long int");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__PTRDIFF_TYPE__=long int");
break;
default: /* generic 64-bit */
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LP64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LONG_MAX__=9223372036854775807L");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__SIZE_TYPE__=unsigned long int");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__PTRDIFF_TYPE__=long int");
}
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__THROW=");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__extension__=");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__amd_64__amd64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__k8");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__k8__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__PGLLVM__");

// Enable preprocessor
Expand Down
15 changes: 15 additions & 0 deletions test/Driver/arch-specific-macros.f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
! RUN: %flang -target aarch64 -v -x f77 -### -c - 2>&1 >/dev/null | FileCheck --check-prefix=AARCH64 %s
! RUN: %flang -target x86_64 -v -x f77 -### -c - 2>&1 >/dev/null | FileCheck --check-prefix=X86_64 %s

! AARCH64: __aarch64__
! AARCH64: __ARM_ARCH=8
! AARCH64: __ARM_ARCH__=8
! AARCH64-NOT: __x86_64__
! AARCH64-NOT: __amd_64__amd64__
! AARCH64-NOT: __k8__

! X86_64: __x86_64__
! X86_64: __amd_64__amd64__
! X86_64: __k8__
! X86_64-NOT: __aarch64__
! X86_64-NOT: __ARM_ARCH