RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

[ms] [llvm-ml] Add support for INCLUDE environment variable

Browse Source 
Also adds support for the ML.exe command-line flag /X, which ignores the INCLUDE environment variable.
This commit is contained in:
Eric Astor 2021-06-09 14:41:24 -04:00
parent 1ea77f3a1a
commit e4ec17b56e
4 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/tools/llvm-ml/include_by_env_var.asm Normal file
View File

@ -0,0 +1,20 @@
; RUN: INCLUDE=%S llvm-ml -filetype=s %s /Fo - | FileCheck %s
include included.inc
.code
t1:
mov eax, Const
; CHECK-LABEL: t1:
; CHECK-NEXT: mov eax, 8
t2:
push_pop ebx
; CHECK-LABEL: t2:
; CHECK-NEXT: push ebx
; CHECK-NEXT: pop ebx
end

16
test/tools/llvm-ml/include_by_env_var_errors.asm Normal file
View File

@ -0,0 +1,16 @@
; RUN: not llvm-ml -filetype=s %s /Fo - 2>&1 | FileCheck %s --implicit-check-not=error:
; RUN: INCLUDE=%S not llvm-ml -filetype=s %s /X /Fo - 2>&1 | FileCheck %s --implicit-check-not=error:
; CHECK: :[[# @LINE + 1]]:9: error: Could not find include file 'included.inc'
include included.inc
.code
t1:
mov eax, Const
t2:
; CHECK: :[[# @LINE + 1]]:1: error: invalid instruction mnemonic 'push_pop'
push_pop ebx
end

3
tools/llvm-ml/Opts.td
View File

@ -73,6 +73,8 @@ def assembly_file : MLJoinedOrSeparate<"Ta">,
def error_on_warning : MLFlag<"WX">, Alias<fatal_warnings>;
def parse_only : MLFlag<"Zs">, HelpText<"Run a syntax-check only">,
Alias<filetype>, AliasArgs<["null"]>;
def ignore_include_envvar : MLFlag<"X">,
HelpText<"Ignore the INCLUDE environment variable">;
def tiny_model_support : UnsupportedFlag<"AT">, HelpText<"">;
def alternate_linker : UnsupportedJoined<"Bl">, HelpText<"">;
@ -105,7 +107,6 @@ def listing_title : UnsupportedSeparate<"St">, HelpText<"">;
def listing_false_conditionals : UnsupportedFlag<"Sx">, HelpText<"">;
def extra_warnings : UnsupportedFlag<"w">, HelpText<"">;
def warning_level : UnsupportedJoined<"W">, HelpText<"">;
def ignore_include_envvar : UnsupportedFlag<"X">, HelpText<"">;
def line_number_info : UnsupportedFlag<"Zd">, HelpText<"">;
def export_all_symbols : UnsupportedFlag<"Zf">, HelpText<"">;
def codeview_info : UnsupportedFlag<"Zi">, HelpText<"">;

18
tools/llvm-ml/llvm-ml.cpp
View File

@ -36,6 +36,7 @@
#include "llvm/Support/InitLLVM.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/TargetSelect.h"
@ -263,8 +264,21 @@ int main(int Argc, char **Argv) {
SrcMgr.AddNewSourceBuffer(std::move(*BufferPtr), SMLoc());
// Record the location of the include directories so that the lexer can find
// it later.
SrcMgr.setIncludeDirs(InputArgs.getAllArgValues(OPT_include_path));
// included files later.
std::vector<std::string> IncludeDirs =
InputArgs.getAllArgValues(OPT_include_path);
if (!InputArgs.hasArg(OPT_ignore_include_envvar)) {
if (llvm::Optional<std::string> cl_include_dir =
llvm::sys::Process::GetEnv("INCLUDE")) {
SmallVector<StringRef, 8> Dirs;
StringRef(*cl_include_dir)
.split(Dirs, ";", /*MaxSplit=*/-1, /*KeepEmpty=*/false);
IncludeDirs.reserve(IncludeDirs.size() + Dirs.size());
for (StringRef Dir : Dirs)
IncludeDirs.push_back(Dir.str());
}
}
SrcMgr.setIncludeDirs(IncludeDirs);
std::unique_ptr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TripleName));
assert(MRI && "Unable to create target register info!");