authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-29 23:38:02-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-29 23:38:21-05:00
logc7fa71d233cc16e93674b9f40e5c4c720642fe2c
tree9866baae613fae03d8c9b6772a304506186647f5
parenta95dce15ae4bd95cfd2266da51ba860cc6524a1b
signaturelock-open Commit is signed but in an unrecognized format.

update clang driver to release/10.x branch

upstream commit 967658150edb2cbb860c19ce54ac1e216bdc8461

3 files changed, 11 insertions(+), 11 deletions(-)

src/zig_clang_cc1_main.cpp-1
...@@ -274,4 +274,3 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {...@@ -274,4 +274,3 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
274274
275 return !Success;275 return !Success;
276}276}
277
src/zig_clang_cc1as_main.cpp-1
...@@ -614,4 +614,3 @@ int cc1as_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {...@@ -614,4 +614,3 @@ int cc1as_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
614614
615 return !!Failed;615 return !!Failed;
616}616}
617
src/zig_clang_driver.cpp+11-9
...@@ -239,8 +239,6 @@ static void getCLEnvVarOptions(std::string &EnvValue, llvm::StringSaver &Saver,...@@ -239,8 +239,6 @@ static void getCLEnvVarOptions(std::string &EnvValue, llvm::StringSaver &Saver,
239 *NumberSignPtr = '=';239 *NumberSignPtr = '=';
240}240}
241241
242static int ExecuteCC1Tool(ArrayRef<const char *> argv);
243
244static void SetBackdoorDriverOutputsFromEnvVars(Driver &TheDriver) {242static void SetBackdoorDriverOutputsFromEnvVars(Driver &TheDriver) {
245 // Handle CC_PRINT_OPTIONS and CC_PRINT_OPTIONS_FILE.243 // Handle CC_PRINT_OPTIONS and CC_PRINT_OPTIONS_FILE.
246 TheDriver.CCPrintOptions = !!::getenv("CC_PRINT_OPTIONS");244 TheDriver.CCPrintOptions = !!::getenv("CC_PRINT_OPTIONS");
...@@ -311,19 +309,24 @@ static void SetInstallDir(SmallVectorImpl<const char *> &argv,...@@ -311,19 +309,24 @@ static void SetInstallDir(SmallVectorImpl<const char *> &argv,
311 TheDriver.setInstalledDir(InstalledPathParent);309 TheDriver.setInstalledDir(InstalledPathParent);
312}310}
313311
314static int ExecuteCC1Tool(ArrayRef<const char *> argv) {312static int ExecuteCC1Tool(SmallVectorImpl<const char *> &ArgV) {
315 // If we call the cc1 tool from the clangDriver library (through313 // If we call the cc1 tool from the clangDriver library (through
316 // Driver::CC1Main), we need to clean up the options usage count. The options314 // Driver::CC1Main), we need to clean up the options usage count. The options
317 // are currently global, and they might have been used previously by the315 // are currently global, and they might have been used previously by the
318 // driver.316 // driver.
319 llvm::cl::ResetAllOptionOccurrences();317 llvm::cl::ResetAllOptionOccurrences();
320 StringRef Tool = argv[1];318
321 void *GetExecutablePathVP = (void *)(intptr_t) GetExecutablePath;319 llvm::BumpPtrAllocator A;
320 llvm::StringSaver Saver(A);
321 llvm::cl::ExpandResponseFiles(Saver, &llvm::cl::TokenizeGNUCommandLine, ArgV,
322 /*MarkEOLs=*/false);
323 StringRef Tool = ArgV[1];
324 void *GetExecutablePathVP = (void *)(intptr_t)GetExecutablePath;
322 if (Tool == "-cc1")325 if (Tool == "-cc1")
323 return cc1_main(argv.slice(2), argv[0], GetExecutablePathVP);326 return cc1_main(makeArrayRef(ArgV).slice(2), ArgV[0], GetExecutablePathVP);
324 if (Tool == "-cc1as")327 if (Tool == "-cc1as")
325 return cc1as_main(argv.slice(2), argv[0], GetExecutablePathVP);328 return cc1as_main(makeArrayRef(ArgV).slice(2), ArgV[0],
326329 GetExecutablePathVP);
327 // Reject unknown tools.330 // Reject unknown tools.
328 llvm::errs() << "error: unknown integrated tool '" << Tool << "'. "331 llvm::errs() << "error: unknown integrated tool '" << Tool << "'. "
329 << "Valid tools include '-cc1' and '-cc1as'.\n";332 << "Valid tools include '-cc1' and '-cc1as'.\n";
...@@ -541,4 +544,3 @@ int ZigClang_main(int argc_, const char **argv_) {...@@ -541,4 +544,3 @@ int ZigClang_main(int argc_, const char **argv_) {
541 // failing command.544 // failing command.
542 return Res;545 return Res;
543}546}
544