diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp --- a/flang/lib/Frontend/CompilerInvocation.cpp +++ b/flang/lib/Frontend/CompilerInvocation.cpp @@ -784,6 +784,11 @@ Fortran::common::LanguageFeature::OpenMP)) { fortranOptions.predefinitions.emplace_back("_OPENMP", "201511"); } + llvm::Triple targetTriple{llvm::Triple(this->targetOpts.triple)}; + if (targetTriple.getArch() == llvm::Triple::ArchType::x86_64) { + fortranOptions.predefinitions.emplace_back("__x86_64__", "1"); + fortranOptions.predefinitions.emplace_back("__x86_64", "1"); + } } void CompilerInvocation::setFortranOpts() { @@ -837,7 +842,7 @@ void CompilerInvocation::setSemanticsOpts( Fortran::parser::AllCookedSources &allCookedSources) { - const auto &fortranOptions = getFortranOpts(); + auto &fortranOptions = getFortranOpts(); semanticsContext = std::make_unique( getDefaultKinds(), fortranOptions.features, allCookedSources); @@ -851,8 +856,7 @@ llvm::Triple targetTriple{llvm::Triple(this->targetOpts.triple)}; // FIXME: Handle real(3) ? - if (targetTriple.getArch() != llvm::Triple::ArchType::x86 && - targetTriple.getArch() != llvm::Triple::ArchType::x86_64) { + if (targetTriple.getArch() != llvm::Triple::ArchType::x86_64) { semanticsContext->targetCharacteristics().DisableType( Fortran::common::TypeCategory::Real, /*kind=*/10); } diff --git a/flang/test/Driver/predefined-macros-x86.f90 b/flang/test/Driver/predefined-macros-x86.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Driver/predefined-macros-x86.f90 @@ -0,0 +1,16 @@ +! Test predefined macro for 64 bit X86 architecture + +! REQUIRES: x86-registered-target + +! RUN: %flang_fc1 -triple x86_64-unknown-linux-gnu -cpp -E %s | FileCheck %s + +! CHECK: integer :: var1 = 1 +! CHECK: integer :: var2 = 1 + +#if __x86_64__ + integer :: var1 = __x86_64__ +#endif +#if __x86_64__ + integer :: var2 = __x86_64 +#endif +end program diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt @@ -39,7 +39,7 @@ endif() add_custom_command(OUTPUT ${base}.mod COMMAND ${CMAKE_COMMAND} -E make_directory ${FLANG_INTRINSIC_MODULES_DIR} - COMMAND flang-new -fc1 -fsyntax-only -module-dir ${FLANG_INTRINSIC_MODULES_DIR} + COMMAND flang-new -fc1 -cpp -fsyntax-only -module-dir ${FLANG_INTRINSIC_MODULES_DIR} ${FLANG_SOURCE_DIR}/module/${filename}.f90 DEPENDS flang-new ${FLANG_SOURCE_DIR}/module/${filename}.f90 ${depends} )