libcc1 base API: add set_verbose and new version of compile

for  include/ChangeLog

	* gcc-interface.h (enum gcc_base_api_version): Add comment to
	GCC_FE_VERSION_1.
	(struct gcc_base_vtable): Rename compile to compile_v0.
	Update comment for compile.  New methods set_verbose and
	compile.

for  libcc1/ChangeLog

	* libcc1.cc: Include intl.h.
	(struct libcc1): Add field verbose.
	(libcc1::libcc1): Initialize it.
	(libcc1_set_verbose): New function.
	(libcc1_set_arguments): Print messages for VERBOSE.
	(libcc1_compile): Remove parameter verbose.  Use VERBOSE from
	SELF.
	(libcc1_compile_v0): New function.
	(vtable): Use libcc1_compile_v0 and add libcc1_compile and
	libcc1_set_verbose.

From-SVN: r245048

diff --git a/include/ChangeLog b/include/ChangeLog
index 75a9a599df59fbe3dbd02da758ff5101e2d34314..5284f104523ff371677dbb11f34bb2e129cf5f62 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,5 +1,11 @@
 2017-01-30  Jan Kratochvil <jan.kratochvil@redhat.com>
 
+       * gcc-interface.h (enum gcc_base_api_version): Add comment to
+       GCC_FE_VERSION_1.
+       (struct gcc_base_vtable): Rename compile to compile_v0.
+       Update comment for compile.  New methods set_verbose and
+       compile.
+
        * gcc-interface.h (enum gcc_base_api_version): Add
        GCC_FE_VERSION_1.
 

diff --git a/include/gcc-interface.h b/include/gcc-interface.h
index 4c712d3413036dbf0da9dafc358712bbdc2557a0..c98f078454533c0b5b180b7bfbfe6525db9bd64f 100644 (file)
--- a/include/gcc-interface.h
+++ b/include/gcc-interface.h
@@ -45,6 +45,8 @@ struct gcc_base_context;
 enum gcc_base_api_version
 {
   GCC_FE_VERSION_0 = 0,
+
+  /* Deprecated method compile_v0.  Added method set_verbose and compile.  */
   GCC_FE_VERSION_1 = 1,
 };
 
@@ -94,18 +96,35 @@ struct gcc_base_vtable
                                                      const char *message),
                              void *datum);
 
-  /* Perform the compilation.  FILENAME is the name of the resulting
-     object file.  VERBOSE can be set to cause GCC to print some
-     information as it works.  Returns true on success, false on
-     error.  */
+  /* Deprecated GCC_FE_VERSION_0 variant of the GCC_FE_VERSION_1
+     compile method.  GCC_FE_VERSION_0 version verbose parameter has
+     been replaced by the set_verbose method.  */
 
-  int /* bool */ (*compile) (struct gcc_base_context *self,
-                            const char *filename,
-                            int /* bool */ verbose);
+  int /* bool */ (*compile_v0) (struct gcc_base_context *self,
+                               const char *filename,
+                               int /* bool */ verbose);
 
   /* Destroy this object.  */
 
   void (*destroy) (struct gcc_base_context *self);
+
+  /* VERBOSE can be set to non-zero to cause GCC to print some
+     information as it works.  Calling this method overrides its
+     possible previous calls.
+
+     This method is only available since GCC_FE_VERSION_1.  */
+
+  void (*set_verbose) (struct gcc_base_context *self,
+                      int /* bool */ verbose);
+
+  /* Perform the compilation.  FILENAME is the name of the resulting
+     object file.  Either set_triplet_regexp or set_driver_filename must
+     be called before.  Returns true on success, false on error.
+
+     This method is only available since GCC_FE_VERSION_1.  */
+
+  int /* bool */ (*compile) (struct gcc_base_context *self,
+                            const char *filename);
 };
 
 /* The GCC object.  */

diff --git a/libcc1/ChangeLog b/libcc1/ChangeLog
index e899df37e3a02feff2845f2e1ebe8056572af886..d7c124a0d6d8ff147d4e163e73fd6d476bae52e1 100644 (file)
--- a/libcc1/ChangeLog
+++ b/libcc1/ChangeLog
@@ -1,5 +1,16 @@
 2017-01-30  Jan Kratochvil <jan.kratochvil@redhat.com>
 
+       * libcc1.cc: Include intl.h.
+       (struct libcc1): Add field verbose.
+       (libcc1::libcc1): Initialize it.
+       (libcc1_set_verbose): New function.
+       (libcc1_set_arguments): Print messages for VERBOSE.
+       (libcc1_compile): Remove parameter verbose.  Use VERBOSE from
+       SELF.
+       (libcc1_compile_v0): New function.
+       (vtable): Use libcc1_compile_v0 and add libcc1_compile and
+       libcc1_set_verbose.
+
        * libcc1.cc (vtable): Update to GCC_FE_VERSION_1.
        (gcc_c_fe_context): Accept also GCC_FE_VERSION_1.
 

diff --git a/libcc1/libcc1.cc b/libcc1/libcc1.cc
index 7d339d21aff1e5ca3748aeb6e7ce5c1d10562e9d..20f08cff0cc99a5431209258ae092111d2377e29 100644 (file)
--- a/libcc1/libcc1.cc
+++ b/libcc1/libcc1.cc
@@ -38,6 +38,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "xregex.h"
 #include "findcomp.hh"
 #include "compiler-name.h"
+#include "intl.h"
 
 struct libcc1;
 
@@ -66,6 +67,9 @@ struct libcc1 : public gcc_c_context
 
   std::vector<std::string> args;
   std::string source_file;
+
+  /* Non-zero as an equivalent to gcc driver option "-v".  */
+  bool verbose;
 };
 
 // A local subclass of connection that holds a back-pointer to the
@@ -97,7 +101,8 @@ libcc1::libcc1 (const gcc_base_vtable *v,
     print_function (NULL),
     print_datum (NULL),
     args (),
-    source_file ()
+    source_file (),
+    verbose (false)
 {
   base.ops = v;
   c_ops = cv;
@@ -306,6 +311,14 @@ make_regexp (const char *triplet_regexp, const char *compiler)
   return buf.str ();
 }
 
+static void
+libcc1_set_verbose (struct gcc_base_context *s, int /* bool */ verbose)
+{
+  libcc1 *self = (libcc1 *) s;
+
+  self->verbose = verbose != 0;
+}
+
 static char *
 libcc1_set_arguments (struct gcc_base_context *s,
                      const char *triplet_regexp,
@@ -316,6 +329,10 @@ libcc1_set_arguments (struct gcc_base_context *s,
   int code;
 
   std::string rx = make_regexp (triplet_regexp, COMPILER_NAME);
+  // Simulate fnotice by fprintf.
+  if (self->verbose)
+    fprintf (stderr, _("searching for compiler matching regex %s\n"),
+            rx.c_str());
   code = regcomp (&triplet, rx.c_str (), REG_EXTENDED | REG_NOSUB);
   if (code != 0)
     {
@@ -341,6 +358,8 @@ libcc1_set_arguments (struct gcc_base_context *s,
                     (char *) NULL);
     }
   regfree (&triplet);
+  if (self->verbose)
+    fprintf (stderr, _("found compiler %s\n"), compiler.c_str());
 
   self->args.push_back (compiler);
 
@@ -434,8 +453,7 @@ fork_exec (libcc1 *self, char **argv, int spair_fds[2], int stderr_fds[2])
 
 static int
 libcc1_compile (struct gcc_base_context *s,
-               const char *filename,
-               int verbose)
+               const char *filename)
 {
   libcc1 *self = (libcc1 *) s;
 
@@ -466,7 +484,7 @@ libcc1_compile (struct gcc_base_context *s,
   self->args.push_back ("-c");
   self->args.push_back ("-o");
   self->args.push_back (filename);
-  if (verbose)
+  if (self->verbose)
     self->args.push_back ("-v");
 
   self->connection = new libcc1_connection (fds[0], stderr_fds[0], self);
@@ -494,6 +512,14 @@ libcc1_compile (struct gcc_base_context *s,
   return fork_exec (self, argv, fds, stderr_fds);
 }
 
+static int
+libcc1_compile_v0 (struct gcc_base_context *s, const char *filename,
+                  int verbose)
+{
+  libcc1_set_verbose (s, verbose);
+  return libcc1_compile (s, filename);
+}
+
 static void
 libcc1_destroy (struct gcc_base_context *s)
 {
@@ -508,8 +534,10 @@ static const struct gcc_base_vtable vtable =
   libcc1_set_arguments,
   libcc1_set_source_file,
   libcc1_set_print_callback,
+  libcc1_compile_v0,
+  libcc1_destroy,
+  libcc1_set_verbose,
   libcc1_compile,
-  libcc1_destroy
 };
 
 extern "C" gcc_c_fe_context_function gcc_c_fe_context;