Add IAR support.

Author: willson556

doc/manual.adoc

@@ -629,6 +629,8 @@ _<<Using ccache with other compiler wrappers>>_.
     clang-cl.
 *gcc*::
     GCC-based compiler.
+*icc*::
+    IAR compiler.
 *icl*::
     Intel compiler on Windows.
 *icx*::

src/ccache/argprocessing.cpp

@@ -421,6 +421,43 @@ process_option_arg(const Context& ctx,
     return Statistic::called_for_preprocessing;
   }
 
+  if (arg == "-lC" && config.compiler_type() == CompilerType::icc) {
+    if (i == args.size() - 1) {
+      LOG("Expected argument after {}", args[i]);
+      return Statistic::bad_compiler_arguments;
+    }
+
+    // TODO: should the arg to output the preprocessor output
+    // be added to the state?
+
+    ++i;
+    return Statistic::none;
+  }
+
+  if (util::starts_with(arg, "--dependencies")
+      && config.compiler_type() == CompilerType::icc) {
+    if (i == args.size() - 1) {
+      LOG("Expected 1 arguments after {}", args[i]);
+      return Statistic::bad_compiler_arguments;
+    }
+
+    state.found_md_or_mmd_opt = true;
+    state.found_mf_opt = true;
+    args_info.generating_dependencies = true;
+    state.add_compiler_only_arg(args[i]);
+
+    std::string dep_file{args[i+1]};
+    if (state.output_dep_origin <= OutputDepOrigin::mf) {
+      state.output_dep_origin = OutputDepOrigin::mf;
+      args_info.output_dep = core::make_relative_path(ctx, dep_file);
+    }
+
+    state.add_compiler_only_arg(args_info.output_dep);
+
+    i++;
+    return Statistic::none;
+  }
+
   // Handle "@file" argument.
   if (util::starts_with(arg, "@") || util::starts_with(arg, "-@")) {
     const char* argpath = arg.c_str() + 1;
@@ -710,6 +747,7 @@ process_option_arg(const Context& ctx,
       return Statistic::bad_compiler_arguments;
     }
     args_info.output_obj = args[i + 1];
+    LOG("Found output: {}", args_info.output_obj);
     i++;
     return Statistic::none;
   }
@@ -804,6 +842,12 @@ process_option_arg(const Context& ctx,
     return Statistic::none;
   }
 
+  if (arg == "--debug" && config.compiler_type() == CompilerType::icc) {
+    state.add_common_arg(args[i]);
+    args_info.generating_debuginfo = true;
+    return Statistic::none;
+  }
+
   if (config.is_compiler_group_msvc() && !config.is_compiler_group_clang()
       && is_msvc_z_debug_option(arg)) {
     state.last_seen_msvc_z_debug_option = args[i];
@@ -1369,7 +1413,8 @@ process_args(Context& ctx)
 
   const bool is_link =
     !(state.found_c_opt || state.found_dc_opt || state.found_S_opt
-      || state.found_syntax_only || state.found_analyze_opt);
+      || state.found_syntax_only || state.found_analyze_opt
+      || config.compiler_type() == CompilerType::icc);
 
   if (state.input_files.empty()) {
     LOG_RAW("No input file found");

src/ccache/ccache.cpp

@@ -327,6 +327,8 @@ do_guess_compiler(const fs::path& path)
     return CompilerType::gcc;
   } else if (name.find("nvcc") != std::string_view::npos) {
     return CompilerType::nvcc;
+  } else if (name.find("icc") != std::string_view::npos) {
+    return CompilerType::icc;
   } else if (name == "icl") {
     return CompilerType::icl;
   } else if (name == "icx") {
@@ -2825,6 +2827,13 @@ do_cache_compilation(Context& ctx)
     }
   }
 
+  if (ctx.config.compiler_type() == CompilerType::icc
+      && (!ctx.config.depend_mode() || !ctx.config.direct_mode())) {
+      LOG_RAW("IAR icc is only supported when both depend mode and direct mode are "
+              "enabled.");
+      return tl::unexpected(Statistic::disabled);
+  }
+
   if (ctx.config.depend_mode()
       && !(ctx.args_info.generating_dependencies
            || ctx.args_info.generating_includes)) {

src/ccache/compopt.cpp

@@ -56,12 +56,15 @@ const CompOpt compopts[] = {
   {"--compiler-options",      AFFECTS_CPP | TAKES_ARG                                }, // nvcc
   {"--config",                TAKES_ARG                                              }, // Clang
   {"--em-config",             TAKES_ARG                                              }, // emcc
+  {"--f",                     TOO_HARD                                               }, // icc
   {"--gcc-toolchain=",        TAKES_CONCAT_ARG | TAKES_PATH                          }, // Clang
   {"--include",               AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
   {"--libdevice-directory",   AFFECTS_CPP | TAKES_ARG                                }, // nvcc
   {"--offload-compress",      AFFECTS_COMP                                           }, // Clang
   {"--output-directory",      AFFECTS_CPP | TAKES_ARG                                }, // nvcc
   {"--param",                 TAKES_ARG                                              },
+  {"--predef_macros",         TOO_HARD                                               }, // icc
+  {"--preprocess",            TOO_HARD                                               }, // icc
   {"--save-temps",            TOO_HARD                                               },
   {"--save-temps=cwd",        TOO_HARD                                               },
   {"--save-temps=obj",        TOO_HARD                                               },
@@ -124,6 +127,7 @@ const CompOpt compopts[] = {
   {"-emit-pth",               AFFECTS_COMP                                           }, // Clang
   {"-external:I",
    AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH                           }, // msvc
+  {"-f",                      TOO_HARD                                               }, // icc
   {"-fbuild-session-file=",   TAKES_CONCAT_ARG | TAKES_PATH                          },
   {"-fmodule-header",         TOO_HARD                                               },
   {"-fmodule-map-file=",      TAKES_CONCAT_ARG | TAKES_PATH                          },

src/ccache/config.cpp

@@ -287,6 +287,8 @@ parse_compiler_type(const std::string& value)
     return CompilerType::clang_cl;
   } else if (value == "gcc") {
     return CompilerType::gcc;
+  } else if (value == "icc") {
+    return CompilerType::icc;
   } else if (value == "icl") {
     return CompilerType::icl;
   } else if (value == "icx") {
@@ -546,6 +548,7 @@ compiler_type_to_string(CompilerType compiler_type)
 
     CASE(clang);
     CASE(gcc);
+    CASE(icc);
     CASE(icl);
     CASE(icx);
     CASE(msvc);

src/ccache/config.hpp

@@ -40,6 +40,7 @@ enum class CompilerType {
   clang,
   clang_cl,
   gcc,
+  icc,
   icl,
   icx,
   icx_cl,

unittest/test_ccache.cpp

@@ -197,6 +197,8 @@ TEST_CASE("guess_compiler")
     CHECK(guess_compiler("/test/prefix/nvcc") == CompilerType::nvcc);
     CHECK(guess_compiler("/test/prefix/nvcc-10.1.243") == CompilerType::nvcc);
 
+    CHECK(guess_compiler("/test/prefix/iccarm") == CompilerType::icc);
+
     CHECK(guess_compiler("/test/prefix/x") == CompilerType::other);
     CHECK(guess_compiler("/test/prefix/cc") == CompilerType::other);
     CHECK(guess_compiler("/test/prefix/c++") == CompilerType::other);