[SYCL][Driver] Improve fat static library support

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -340,6 +340,8 @@ def warn_drv_object_size_disabled_O0 : Warning<
   InGroup<InvalidCommandLineArgument>, DefaultWarnNoWerror;
 def err_invalid_branch_protection: Error <
   "invalid branch protection option '%0' in '%1'">;
+def warn_drv_deprecated_option : Warning<
+  "option '%0' is deprecated, use '%1' directly instead">, InGroup<Deprecated>;
 
 def note_drv_command_failed_diag_msg : Note<
   "diagnostic msg: %0">;

clang/include/clang/Driver/Action.h

@@ -76,6 +76,7 @@ class Action {
     SPIRVTranslatorJobClass,
     SPIRCheckJobClass,
     SYCLPostLinkJobClass,
+    PartialLinkJobClass,
     BackendCompileJobClass,
 
     JobClassFirst = PreprocessJobClass,
@@ -680,6 +681,18 @@ class SYCLPostLinkJobAction : public JobAction {
   }
 };
 
+class PartialLinkJobAction : public JobAction {
+  void anchor() override;
+
+public:
+  PartialLinkJobAction(Action *Input, types::ID OutputType);
+  PartialLinkJobAction(ActionList &Input, types::ID OutputType);
+
+  static bool classof(const Action *A) {
+    return A->getKind() == PartialLinkJobClass;
+  }
+};
+
 class BackendCompileJobAction : public JobAction {
   void anchor() override;
 

clang/include/clang/Driver/Driver.h

@@ -621,6 +621,15 @@ class Driver {
           &CachedResults,
       Action::OffloadKind TargetDeviceOffloadKind) const;
 
+  /// Static offload library seen.
+  bool OffloadStaticLibSeen = false;
+
+  void setOffloadStaticLibSeen() { OffloadStaticLibSeen = true; }
+
+  /// Returns true if an offload static library is found.
+  bool checkForOffloadStaticLib(Compilation &C,
+                                llvm::opt::DerivedArgList &Args) const;
+
 public:
   /// GetReleaseVersion - Parse (([0-9]+)(.([0-9]+)(.([0-9]+)?))?)? and
   /// return the grouped values as integers. Numbers which are not
@@ -642,6 +651,8 @@ class Driver {
                                 MutableArrayRef<unsigned> Digits);
   /// Compute the default -fmodule-cache-path.
   static void getDefaultModuleCachePath(SmallVectorImpl<char> &Result);
+
+  bool getOffloadStaticLibSeen() const { return OffloadStaticLibSeen; };
 };
 
 /// \return True if the last defined optimization level is -Ofast.
@@ -651,6 +662,9 @@ bool isOptimizationLevelFast(const llvm::opt::ArgList &Args);
 /// \return True if the filename has a valid object file extension.
 bool isObjectFile(std::string FileName);
 
+/// \return True if the filename has a static archive/lib extension.
+bool isStaticArchiveFile(const StringRef &FileName);
+
 /// \return True if the argument combination will end up generating remarks.
 bool willEmitRemarks(const llvm::opt::ArgList &Args);
 

clang/include/clang/Driver/ToolChain.h

@@ -145,6 +145,7 @@ class ToolChain {
   mutable std::unique_ptr<Tool> SPIRVTranslator;
   mutable std::unique_ptr<Tool> SPIRCheck;
   mutable std::unique_ptr<Tool> SYCLPostLink;
+  mutable std::unique_ptr<Tool> PartialLink;
   mutable std::unique_ptr<Tool> BackendCompiler;
 
   Tool *getClang() const;
@@ -158,6 +159,7 @@ class ToolChain {
   Tool *getSPIRVTranslator() const;
   Tool *getSPIRCheck() const;
   Tool *getSYCLPostLink() const;
+  Tool *getPartialLink() const;
   Tool *getBackendCompiler() const;
 
   mutable std::unique_ptr<SanitizerArgs> SanitizerArguments;

clang/lib/Driver/Action.cpp

@@ -49,6 +49,8 @@ const char *Action::getClassName(ActionClass AC) {
     return "llvm-no-spir-kernel";
   case SYCLPostLinkJobClass:
     return "sycl-post-link";
+  case PartialLinkJobClass:
+    return "partial-link";
   case BackendCompileJobClass:
     return "backend-compiler";
   }
@@ -454,6 +456,14 @@ void SYCLPostLinkJobAction::anchor() {}
 SYCLPostLinkJobAction::SYCLPostLinkJobAction(Action *Input, types::ID Type)
     : JobAction(SYCLPostLinkJobClass, Input, Type) {}
 
+void PartialLinkJobAction::anchor() {}
+
+PartialLinkJobAction::PartialLinkJobAction(Action *Input, types::ID Type)
+    : JobAction(PartialLinkJobClass, Input, Type) {}
+
+PartialLinkJobAction::PartialLinkJobAction(ActionList &Inputs, types::ID Type)
+    : JobAction(PartialLinkJobClass, Inputs, Type) {}
+
 void BackendCompileJobAction::anchor() {}
 
 BackendCompileJobAction::BackendCompileJobAction(ActionList &Inputs,