libcc1: unify compiler handling

Both libcc1 plugins have nearly identical copies of code to find the
underlying compiler.  This seemed wasteful to me, so this patch
unifies the copies.

Two minor API changes were needed.

First, the old code used a back-link from the compiler object to the
plugin object to check the 'verbose' setting.  This patch adds a
'verbose' setting directly to the compiler object instead.

Second, the 'find' method implicitly knew which compiler base name
("gcc" or "g++") to use.  This patch makes this a parameter that is
passed in by the plugin.

libcc1

	* libcp1.cc (compiler, compiler_triplet_regexp)
	(compiler_driver_filename): Remove.
	(libcp1::libcp1): Update.
	(make_regexp, libcp1::compiler::find)
	(libcp1::compiler_triplet_regexp::find)
	(libcp1::compiler_driver_filename::find): Remove.
	(libcp1_set_verbose, libcp1_set_arguments)
	(libcp1_set_triplet_regexp, libcp1_set_driver_filename): Update.
	* libcc1.cc (compiler, compiler_triplet_regexp)
	(compiler_driver_filename): Remove.
	(libcc1::libcc1): Update.
	(make_regexp, libcc1::compiler::find)
	(libcc1::compiler_triplet_regexp::find)
	(libcc1::compiler_driver_filename::find): Remove.
	(libcc1_set_verbose, libcc1_set_arguments)
	(libcc1_set_triplet_regexp, libcc1_set_driver_filename): Update.
	* compiler.cc: New file.
	* compiler.hh: New file.
	* Makefile.in: Rebuild.
	* Makefile.am (libcc1_la_SOURCES): Add compiler.hh, compiler.cc.

1 files changed, 83 insertions, 0 deletions

diff --git a/libcc1/compiler.hh b/libcc1/compiler.hh
new file mode 100644
index 0000000..638f7c0
--- /dev/null
+++ b/libcc1/compiler.hh
@@ -0,0 +1,83 @@
+/* Compiler handling for plugin
+   Copyright (C) 2014-2020 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef CC1_PLUGIN_COMPILER_HH
+#define CC1_PLUGIN_COMPILER_HH
+
+namespace cc1_plugin
+{
+
+  // Base class for compiler.
+  class compiler
+  {
+  public:
+    explicit compiler (bool v)
+      : verbose (v)
+    {
+    }
+
+    virtual ~compiler () = default;
+
+    // Find the compiler.  BASE is the base name of the compiler, see
+    // compiler-name.hh.  This sets COMPILER to the resulting path.
+    // Returns nullptr on success, or a malloc'd error string on
+    // failure.
+    virtual char *find (const char *base, std::string &compiler) const;
+
+    void set_verbose (bool v)
+    {
+      verbose = v;
+    }
+
+  protected:
+    bool verbose;
+  };
+
+  /* Compiler to set by set_triplet_regexp.  */
+  class compiler_triplet_regexp : public compiler
+  {
+  private:
+    std::string triplet_regexp_;
+  public:
+
+    char *find (const char *base, std::string &compiler) const override;
+
+    compiler_triplet_regexp (bool v, std::string triplet_regexp)
+      : compiler (v), triplet_regexp_ (triplet_regexp)
+    {
+    }
+  };
+
+  /* Compiler to set by set_driver_filename.  */
+  class compiler_driver_filename : public compiler
+  {
+  private:
+    std::string driver_filename_;
+  public:
+    char *find (const char *base, std::string &compiler) const override;
+
+    compiler_driver_filename (bool v, std::string driver_filename)
+      : compiler (v), driver_filename_ (driver_filename)
+    {
+    }
+  };
+
+}
+
+#endif // CC1_PLUGIN_COMPILER_HH