Author: Richard Barton Date: 2020-08-18T12:17:13+01:00 New Revision: 28a1b6ea4db9e405d563ad36ca4b3bb1916f92ed
URL: https://github.com/llvm/llvm-project/commit/28a1b6ea4db9e405d563ad36ca4b3bb1916f92ed DIFF: https://github.com/llvm/llvm-project/commit/28a1b6ea4db9e405d563ad36ca4b3bb1916f92ed.diff LOG: Revert "[flang] Version information in flang/f18" This reverts commit 844f018114b52325b36e1042c8a8fc0ea82d9c17. Added: Modified: flang/test/Driver/version_test.f90 flang/tools/f18/CMakeLists.txt flang/tools/f18/f18.cpp Removed: flang/test/Preprocessing/compiler_defined_macros.F90 flang/tools/f18/f18_version.h.in ################################################################################ diff --git a/flang/test/Driver/version_test.f90 b/flang/test/Driver/version_test.f90 index 7fe229e2be17..08ea35ba49ea 100644 --- a/flang/test/Driver/version_test.f90 +++ b/flang/test/Driver/version_test.f90 @@ -1,10 +1,7 @@ ! Check that lit configuration works by checking the compiler version +! RUN: %f18 -V 2>&1 | FileCheck -check-prefix=VERSION %s ! VERSION-NOT:{{![[:space:]]}} ! VERSION:{{[[:space:]]}} -! VERSION-SAME:f18 compiler (under development), version {{[1-9][0-9]*.[0-9]*.[0-9]*}} +! VERSION-SAME:f18 compiler (under development) ! VERSION-EMPTY: - -! RUN: %f18 -V 2>&1 | FileCheck -check-prefix=VERSION %s -! RUN: %f18 -v 2>&1 | FileCheck -check-prefix=VERSION %s -! RUN: %f18 --version 2>&1 | FileCheck -check-prefix=VERSION %s diff --git a/flang/test/Preprocessing/compiler_defined_macros.F90 b/flang/test/Preprocessing/compiler_defined_macros.F90 deleted file mode 100644 index 80852cfb4472..000000000000 --- a/flang/test/Preprocessing/compiler_defined_macros.F90 +++ /dev/null @@ -1,12 +0,0 @@ -! Check that the macros that give the verion number are set properly - -!CHECK: flang_major = {{[1-9][0-9]*$}} -!CHECK: flang_minor = {{[0-9]+$}} -!CHECK: flang_patchlevel = {{[0-9]+$}} -!RUN: %f18 -E %s | FileCheck --ignore-case %s - - -integer, parameter :: flang_major = __flang_major__ -integer, parameter :: flang_minor = __flang_minor__ -integer, parameter :: flang_patchlevel = __flang_patchlevel__ - diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt index 3dfce3437948..46c38fa43a2e 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt @@ -64,6 +64,5 @@ file(COPY ${CMAKE_BINARY_DIR}/tools/flang/bin/flang DESTINATION ${CMAKE_BINARY_D # The flang script to be installed needs a diff erent path to the headers. set(FLANG_INTRINSIC_MODULES_DIR ${CMAKE_INSTALL_PREFIX}/include/flang) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${FLANG_BINARY_DIR}/bin/flang-install.sh @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f18_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/f18_version.h @ONLY) install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION bin RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE) diff --git a/flang/tools/f18/f18.cpp b/flang/tools/f18/f18.cpp index 23b104ee520c..03c0f7afe810 100644 --- a/flang/tools/f18/f18.cpp +++ b/flang/tools/f18/f18.cpp @@ -38,8 +38,6 @@ #include <unistd.h> #include <vector> -#include "f18_version.h" - static std::list<std::string> argList(int argc, char *const argv[]) { std::list<std::string> result; for (int j = 0; j < argc; ++j) { @@ -392,13 +390,6 @@ void Link(std::vector<std::string> &liblist, std::vector<std::string> &objects, } } -int printVersion() { - llvm::errs() << "\nf18 compiler (under development), version " - << __FLANG_MAJOR__ << "." << __FLANG_MINOR__ << "." - << __FLANG_PATCHLEVEL__ << "\n"; - return exitStatus; -} - int main(int argc, char *const argv[]) { atexit(CleanUpAtExit); @@ -420,11 +411,6 @@ int main(int argc, char *const argv[]) { options.predefinitions.emplace_back("__F18_MAJOR__", "1"); options.predefinitions.emplace_back("__F18_MINOR__", "1"); options.predefinitions.emplace_back("__F18_PATCHLEVEL__", "1"); - options.predefinitions.emplace_back("__flang__", __FLANG__); - options.predefinitions.emplace_back("__flang_major__", __FLANG_MAJOR__); - options.predefinitions.emplace_back("__flang_minor__", __FLANG_MINOR__); - options.predefinitions.emplace_back( - "__flang_patchlevel__", __FLANG_PATCHLEVEL__); #if __x86_64__ options.predefinitions.emplace_back("__x86_64__", "1"); #endif @@ -665,16 +651,13 @@ int main(int argc, char *const argv[]) { << "Unrecognised options are passed through to the external compiler\n" << "set by F18_FC (see defaults).\n"; return exitStatus; - } else if (arg == "-V" || arg == "--version") { - return printVersion(); + } else if (arg == "-V") { + llvm::errs() << "\nf18 compiler (under development)\n"; + return exitStatus; } else { driver.F18_FCArgs.push_back(arg); if (arg == "-v") { - if (args.size() > 1) { - driver.verbose = true; - } else { - return printVersion(); - } + driver.verbose = true; } else if (arg == "-I") { driver.F18_FCArgs.push_back(args.front()); driver.searchDirectories.push_back(args.front()); diff --git a/flang/tools/f18/f18_version.h.in b/flang/tools/f18/f18_version.h.in deleted file mode 100644 index 0c8d5227cd00..000000000000 --- a/flang/tools/f18/f18_version.h.in +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _F18_H_ -#define _F18_H_ - -#define __FLANG__ "1" -#define __FLANG_MAJOR__ "@LLVM_VERSION_MAJOR@" -#define __FLANG_MINOR__ "@LLVM_VERSION_MINOR@" -#define __FLANG_PATCHLEVEL__ "@LLVM_VERSION_PATCH@" - -#endif // _F18_H_ _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
