From patchwork Thu Apr 23 20:34:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 6407 Received: (qmail 64639 invoked by alias); 23 Apr 2015 20:34:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 64630 invoked by uid 89); 23 Apr 2015 20:34:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 23 Apr 2015 20:34:10 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3NKY8vZ032674 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 23 Apr 2015 16:34:08 -0400 Received: from host1.jankratochvil.net (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3NKY5LZ016032; Thu, 23 Apr 2015 16:34:05 -0400 Subject: [PATCH v2 1/2] compile: set debug compile: Display GCC driver filename From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Phil Muldoon Date: Thu, 23 Apr 2015 22:34:04 +0200 Message-ID: <20150423203402.23140.92757.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes Hi, in the mail thread https://sourceware.org/ml/gdb-patches/2015-04/msg00804.html the idea of breaking libcc1.so compatibility was rejected. Therefore this patch series implements full backward/forward GCC/GDB ABI compatibility. As discussed in How to use compile & execute function in GDB https://sourceware.org/ml/gdb/2015-04/msg00026.html GDB currently searches for /usr/bin/ARCH-OS-gcc and chooses one but it does not display which one. It cannot, GCC method set_arguments() does not yet know whether 'set debug compile' is enabled or not. Jan gdb/ChangeLog 2015-04-23 Jan Kratochvil * compile/compile.c (compile_to_object): Conditionally pass compile_debug to GCC's set_arguments. include/ChangeLog 2015-04-23 Jan Kratochvil * gcc-interface.h (enum gcc_base_api_version): Add GCC_FE_VERSION_1. (struct gcc_base_vtable): Rename set_arguments to set_arguments_v0. Update comment for compile. New method set_arguments. --- gdb/compile/compile.c | 10 ++++++++-- include/gcc-interface.h | 48 ++++++++++++++++++++++++++++++----------------- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index 90cfc36..7f4c11d 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -492,8 +492,14 @@ compile_to_object (struct command_line *cmd, char *cmd_string, get_args (compiler, gdbarch, &argc, &argv); make_cleanup_freeargv (argv); - error_message = compiler->fe->ops->set_arguments (compiler->fe, triplet_rx, - argc, argv); + if (compiler->fe->ops->version >= GCC_FE_VERSION_1) + error_message = compiler->fe->ops->set_arguments (compiler->fe, triplet_rx, + argc, argv, + compile_debug); + else + error_message = compiler->fe->ops->set_arguments_v0 (compiler->fe, + triplet_rx, argc, + argv); if (error_message != NULL) { make_cleanup (xfree, error_message); diff --git a/include/gcc-interface.h b/include/gcc-interface.h index df7db6e..c11b7a1 100644 --- a/include/gcc-interface.h +++ b/include/gcc-interface.h @@ -44,7 +44,10 @@ struct gcc_base_context; enum gcc_base_api_version { - GCC_FE_VERSION_0 = 0 + GCC_FE_VERSION_0 = 0, + + /* Parameter verbose has been moved from compile to set_arguments. */ + GCC_FE_VERSION_1 = 1, }; /* The operations defined by the GCC base API. This is the vtable for @@ -64,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 @@ -94,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, @@ -105,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. */