@@ -45,6 +45,8 @@ struct gcc_base_context;
enum gcc_base_api_version
{
GCC_FE_VERSION_0 = 0,
+
+ /* Parameter verbose has been moved from compile to set_arguments. */
GCC_FE_VERSION_1 = 1,
};
@@ -65,20 +67,13 @@ struct gcc_base_vtable
unsigned int version;
- /* Set the compiler's command-line options for the next compilation.
- TRIPLET_REGEXP is a regular expression that is used to match the
- configury triplet prefix to the compiler.
- The arguments are copied by GCC. ARGV need not be
- NULL-terminated. The arguments must be set separately for each
- compilation; that is, after a compile is requested, the
- previously-set arguments cannot be reused.
-
- This returns NULL on success. On failure, returns a malloc()d
- error message. The caller is responsible for freeing it. */
+ /* Deprecated GCC_FE_VERSION_0 variant of the GCC_FE_VERSION_1
+ set_arguments method. GCC_FE_VERSION_0 version did not have the
+ verbose parameter. */
- char *(*set_arguments) (struct gcc_base_context *self,
- const char *triplet_regexp,
- int argc, char **argv);
+ char *(*set_arguments_v0) (struct gcc_base_context *self,
+ const char *triplet_regexp,
+ int argc, char **argv);
/* Set the file name of the program to compile. The string is
copied by the method implementation, but the caller must
@@ -95,9 +90,9 @@ struct gcc_base_vtable
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. */
+ object file. VERBOSE should be the same value as passed
+ to gcc_base_vtable::set_arguments. Returns true on success, false
+ on error. */
int /* bool */ (*compile) (struct gcc_base_context *self,
const char *filename,
@@ -106,6 +101,24 @@ struct gcc_base_vtable
/* Destroy this object. */
void (*destroy) (struct gcc_base_context *self);
+
+ /* Set the compiler's command-line options for the next compilation.
+ TRIPLET_REGEXP is a regular expression that is used to match the
+ configury triplet prefix to the compiler.
+ The arguments are copied by GCC. ARGV need not be
+ NULL-terminated. The arguments must be set separately for each
+ compilation; that is, after a compile is requested, the
+ previously-set arguments cannot be reused. VERBOSE can be set
+ to cause GCC to print some information as it works.
+
+ This returns NULL on success. On failure, returns a malloc()d
+ error message. The caller is responsible for freeing it.
+
+ This method is only available since GCC_FE_VERSION_1. */
+
+ char *(*set_arguments) (struct gcc_base_context *self,
+ const char *triplet_regexp,
+ int argc, char **argv, int /* bool */ verbose);
};
/* The GCC object. */
@@ -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;
@@ -309,13 +314,19 @@ make_regexp (const char *triplet_regexp, const char *compiler)
static char *
libcc1_set_arguments (struct gcc_base_context *s,
const char *triplet_regexp,
- int argc, char **argv)
+ int argc, char **argv, int verbose)
{
libcc1 *self = (libcc1 *) s;
regex_t triplet;
int code;
+ self->verbose = verbose != 0;
+
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 +352,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);
@@ -350,6 +363,14 @@ libcc1_set_arguments (struct gcc_base_context *s,
return NULL;
}
+static char *
+libcc1_set_arguments_v0 (struct gcc_base_context *s,
+ const char *triplet_regexp,
+ int argc, char **argv)
+{
+ return libcc1_set_arguments (s, triplet_regexp, argc, argv, false);
+}
+
static void
libcc1_set_source_file (struct gcc_base_context *s,
const char *file)
@@ -439,6 +460,8 @@ libcc1_compile (struct gcc_base_context *s,
{
libcc1 *self = (libcc1 *) s;
+ self->verbose = verbose != 0;
+
int fds[2];
if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) != 0)
{
@@ -466,7 +489,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);
@@ -505,11 +528,12 @@ libcc1_destroy (struct gcc_base_context *s)
static const struct gcc_base_vtable vtable =
{
GCC_FE_VERSION_1,
- libcc1_set_arguments,
+ libcc1_set_arguments_v0,
libcc1_set_source_file,
libcc1_set_print_callback,
libcc1_compile,
- libcc1_destroy
+ libcc1_destroy,
+ libcc1_set_arguments,
};
extern "C" gcc_c_fe_context_function gcc_c_fe_context;