diff options
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 18 | ||||
| -rw-r--r-- | clang/test/Driver/opt-record.c | 6 |
2 files changed, 24 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 2b1c24275e3..f5591c48d4e 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5403,6 +5403,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, if (A) { CmdArgs.push_back(A->getValue()); } else { + bool hasMultipleArchs = + Args.getAllArgValues(options::OPT_arch).size() > 1; SmallString<128> F; if (Args.hasArg(options::OPT_c) || Args.hasArg(options::OPT_S)) { @@ -5427,6 +5429,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } } + // If we're having more than one "-arch", we should name the files + // differently so that every cc1 invocation writes to a different file. + // We're doing that by appending "-<arch>" with "<arch>" being the arch + // name from the triple. + if (hasMultipleArchs) { + // First, remember the extension. + SmallString<64> OldExtension = llvm::sys::path::extension(F); + // then, remove it. + llvm::sys::path::replace_extension(F, ""); + // attach -<arch> to it. + F += "-"; + F += Triple.getArchName(); + // put back the extension. + llvm::sys::path::replace_extension(F, OldExtension); + } + std::string Extension = "opt."; if (const Arg *A = Args.getLastArg(options::OPT_fsave_optimization_record_EQ)) diff --git a/clang/test/Driver/opt-record.c b/clang/test/Driver/opt-record.c index 062d0acc17d..d8d2aa53ed4 100644 --- a/clang/test/Driver/opt-record.c +++ b/clang/test/Driver/opt-record.c @@ -18,6 +18,7 @@ // RUN: %clang -### -S -o FOO -fsave-optimization-record -fsave-optimization-record=some-format %s 2>&1 | FileCheck %s -check-prefix=CHECK-EQ-FORMAT // RUN: %clang -### -S -o FOO -fsave-optimization-record=some-format %s 2>&1 | FileCheck %s -check-prefix=CHECK-EQ-FORMAT // RUN: %clang -### -S -o FOO -fsave-optimization-record=some-format -fno-save-optimization-record %s 2>&1 | FileCheck %s --check-prefix=CHECK-FOPT-DISABLE-FORMAT +// RUN: %clang -### -S -o FOO -fsave-optimization-record -arch x86_64 -arch x86_64h %s 2>&1 | FileCheck %s --check-prefix=CHECK-MULTIPLE-ARCH // // CHECK: "-cc1" // CHECK: "-opt-record-file" "FOO.opt.yaml" @@ -41,3 +42,8 @@ // CHECK-EQ-FORMAT: "-opt-record-format" "some-format" // CHECK-FOPT-DISABLE-FORMAT-NOT: "-fno-save-optimization-record" + +// CHECK-MULTIPLE-ARCH: "-cc1" +// CHECK-MULTIPLE-ARCH: "-opt-record-file" "FOO-x86_64.opt.yaml" +// CHECK-MULTIPLE-ARCH: "-cc1" +// CHECK-MULTIPLE-ARCH: "-opt-record-file" "FOO-x86_64h.opt.yaml" |
