RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

On Windows expansion of regex file name patterns is the responsibility of each

Browse Source 
tool. Fix ar to do that.

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

llvm-svn: 326734
This commit is contained in:
Dmitry Mikulin 2018-03-05 18:54:56 +00:00
parent 7cd25982a1
commit 978265857a
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/tools/llvm-ar/regex-cmd.test Normal file
View File

@ -0,0 +1,7 @@
RUN: yaml2obj %S/Inputs/elf.yaml -o %t.o
RUN: rm -f %t.ar
RUN: llvm-ar crs %t.ar %t.*
RUN: llvm-ar tv %t.ar | FileCheck %s
CHECK: regex-cmd.test{{.*}}.o

14
tools/llvm-ar/llvm-ar.cpp
View File

@ -31,6 +31,7 @@
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/ToolOutputFile.h"
@ -869,7 +870,12 @@ int main(int argc, char **argv) {
Stem.find("lib") != StringRef::npos)
return libDriverMain(makeArrayRef(argv, argc));
for (int i = 1; i < argc; i++) {
SmallVector<const char *, 256> Argv;
SpecificBumpPtrAllocator<char> ArgAllocator;
failIfError(errorCodeToError(sys::Process::GetArgumentVector(
Argv, makeArrayRef(argv, argc), ArgAllocator)));
for (unsigned i = 1; i < Argv.size(); i++) {
// If an argument starts with a dash and only contains chars
// that belong to the options chars set, remove the dash.
// We can't handle it after the command line options parsing
@ -877,10 +883,10 @@ int main(int argc, char **argv) {
// starting with a dash.
// Make sure this doesn't match the actual llvm-ar specific options
// that start with a dash.
StringRef S = argv[i];
StringRef S = Argv[i];
if (S.startswith("-") &&
S.find_first_not_of(OptionChars, 1) == StringRef::npos) {
argv[i]++;
Argv[i]++;
break;
}
if (S == "--")
@ -889,7 +895,7 @@ int main(int argc, char **argv) {
// Have the command line options parsed and handle things
// like --help and --version.
cl::ParseCommandLineOptions(argc, argv,
cl::ParseCommandLineOptions(Argv.size(), Argv.data(),
"LLVM Archiver (llvm-ar)\n\n"
" This program archives bitcode files into single libraries\n"
);