maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[MinGW] Implement the -v and --version flags for the MinGW driver 

Differential Revision: https://reviews.llvm.org/D62030

llvm-svn: 361016
This commit is contained in:
Martin Storsjo 2019-05-17 11:07:42 +00:00
parent 9ae0d222dc
commit 6863dfaa21
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lld/MinGW/Driver.cpp
View File

@ -30,6 +30,7 @@
#include "lld/Common/Driver.h" #include "lld/Common/Driver.h"
#include "lld/Common/ErrorHandler.h" #include "lld/Common/ErrorHandler.h"
#include "lld/Common/Version.h"
#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h" #include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
@ -139,6 +140,21 @@ bool mingw::link(ArrayRef<const char *> ArgsArr, raw_ostream &Diag) {
return true; return true;
} }
// A note about "compatible with GNU linkers" message: this is a hack for
// scripts generated by GNU Libtool 2.4.6 (released in February 2014 and
// still the newest version in March 2017) or earlier to recognize LLD as
// a GNU compatible linker. As long as an output for the -v option
// contains "GNU" or "with BFD", they recognize us as GNU-compatible.
if (Args.hasArg(OPT_v) || Args.hasArg(OPT_version))
message(getLLDVersion() + " (compatible with GNU linkers)");
// The behavior of -v or --version is a bit strange, but this is
// needed for compatibility with GNU linkers.
if (Args.hasArg(OPT_v) && !Args.hasArg(OPT_INPUT) && !Args.hasArg(OPT_l))
return true;
if (Args.hasArg(OPT_version))
return true;
if (!Args.hasArg(OPT_INPUT) && !Args.hasArg(OPT_l)) if (!Args.hasArg(OPT_INPUT) && !Args.hasArg(OPT_l))
fatal("no input files"); fatal("no input files");

4
lld/MinGW/Options.td
View File

@ -48,7 +48,9 @@ def strip_debug: F<"strip-debug">,
HelpText<"Omit all debug information, but keep symbol information">; HelpText<"Omit all debug information, but keep symbol information">;
def whole_archive: F<"whole-archive">, def whole_archive: F<"whole-archive">,
HelpText<"Include all object files for following archives">; HelpText<"Include all object files for following archives">;
def v: Flag<["-"], "v">, HelpText<"Display the version number">;
def verbose: F<"verbose">, HelpText<"Verbose mode">; def verbose: F<"verbose">, HelpText<"Verbose mode">;
def version: F<"version">, HelpText<"Display the version number and exit">;
def require_defined: S<"require-defined">, def require_defined: S<"require-defined">,
HelpText<"Force symbol to be added to symbol table as an undefined one">; HelpText<"Force symbol to be added to symbol table as an undefined one">;
def require_defined_eq: J<"require-defined=">, Alias<require_defined>; def require_defined_eq: J<"require-defined=">, Alias<require_defined>;
@ -90,5 +92,3 @@ def: J<"plugin-opt=">;
def: J<"sysroot">; def: J<"sysroot">;
def: F<"start-group">; def: F<"start-group">;
def: F<"tsaware">; def: F<"tsaware">;
def: Flag<["-"], "v">;
def: F<"version">;

5
lld/test/MinGW/driver.test
View File

@ -169,3 +169,8 @@ TIMESTAMP-NOT: -timestamp:0
RUN: ld.lld -### -m i386pep foo.o -appcontainer | FileCheck -check-prefix APPCONTAINER %s RUN: ld.lld -### -m i386pep foo.o -appcontainer | FileCheck -check-prefix APPCONTAINER %s
RUN: ld.lld -### -m i386pep foo.o --appcontainer | FileCheck -check-prefix APPCONTAINER %s RUN: ld.lld -### -m i386pep foo.o --appcontainer | FileCheck -check-prefix APPCONTAINER %s
APPCONTAINER: -appcontainer APPCONTAINER: -appcontainer
# RUN: ld.lld -m i386pep --version 2>&1 | FileCheck -check-prefix=VERSION %s
# RUN: ld.lld -m i386pep -v 2>&1 | FileCheck -check-prefix=VERSION %s
# RUN: not ld.lld -m i386pep -v xyz 2>&1 | FileCheck -check-prefix=VERSION %s
# VERSION: LLD {{.*}} (compatible with GNU linkers)