From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 70650 invoked by alias); 23 Apr 2015 20:38:47 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 70570 invoked by uid 89); 23 Apr 2015 20:38:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham 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:38:45 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3NKciQW011524 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 23 Apr 2015 16:38:44 -0400 Received: from host1.jankratochvil.net (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3NKcgnU001404; Thu, 23 Apr 2015 16:38:43 -0400 Subject: [PATCH v2 3/4] libcc1: Add 'set compile-gcc' From: Jan Kratochvil To: gcc-patches@gcc.gnu.org Cc: Phil Muldoon Date: Thu, 23 Apr 2015 20:38:00 -0000 Message-ID: <20150423203841.23973.90252.stgit@host1.jankratochvil.net> In-Reply-To: <20150423203827.23973.72954.stgit@host1.jankratochvil.net> References: <20150423203827.23973.72954.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-04/txt/msg01449.txt.bz2 Hi, already approved, reposting just to keep it a part of the series: https://gcc.gnu.org/ml/gcc-patches/2015-04/msg01299.html 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 one cannot override which one. GDB would provide new option 'set compile-gcc'. This patch does not change the libcc1 API as it overloads the triplet_regexp parameter of GCC's set_arguments according to: + if (access (triplet_regexp, X_OK) == 0) GDB counterpart: [PATCH v2 2/2] compile: Add 'set compile-gcc' https://sourceware.org/ml/gdb-patches/2015-04/msg00910.html Message-ID: <20150423203402.23140.92757.stgit@host1.jankratochvil.net> Jan include/ChangeLog 2015-04-21 Jan Kratochvil * gcc-interface.h (enum gcc_base_api_version): Add comment to GCC_FE_VERSION_1. (struct gcc_base_vtable): Describe triplet_regexp parameter overload for set_arguments. libcc1/ChangeLog 2015-04-21 Jan Kratochvil * libcc1.cc (libcc1_set_arguments): Implement filenames for triplet_regexp. --- include/gcc-interface.h | 7 ++++- libcc1/libcc1.cc | 62 +++++++++++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/include/gcc-interface.h b/include/gcc-interface.h index 21cc403..95b9b12 100644 --- a/include/gcc-interface.h +++ b/include/gcc-interface.h @@ -46,7 +46,9 @@ enum gcc_base_api_version { GCC_FE_VERSION_0 = 0, - /* Parameter verbose has been moved from compile to set_arguments. */ + /* Parameter verbose has been moved from compile to set_arguments. + Parameter triplet_regexp of set_arguments can be also gcc driver + executable. */ GCC_FE_VERSION_1 = 1, }; @@ -104,7 +106,8 @@ struct gcc_base_vtable /* 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. + configury triplet prefix to the compiler; TRIPLET_REGEXP can be + also absolute filename to the computer. 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 diff --git a/libcc1/libcc1.cc b/libcc1/libcc1.cc index 06a91f6..c2a1d5f 100644 --- a/libcc1/libcc1.cc +++ b/libcc1/libcc1.cc @@ -322,38 +322,48 @@ libcc1_set_arguments (struct gcc_base_context *s, 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) + std::string compiler; + if (access (triplet_regexp, X_OK) == 0) { - size_t len = regerror (code, &triplet, NULL, 0); - char err[len]; + compiler = triplet_regexp; + // Simulate fnotice by fprintf. + if (self->verbose) + fprintf (stderr, _("using explicit compiler filename %s\n"), + compiler.c_str()); + } + else + { + std::string rx = make_regexp (triplet_regexp, COMPILER_NAME); + 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) + { + size_t len = regerror (code, &triplet, NULL, 0); + char err[len]; - regerror (code, &triplet, err, len); + regerror (code, &triplet, err, len); - return concat ("Could not compile regexp \"", - rx.c_str (), - "\": ", - err, - (char *) NULL); - } + return concat ("Could not compile regexp \"", + rx.c_str (), + "\": ", + err, + (char *) NULL); + } - std::string compiler; - if (!find_compiler (triplet, &compiler)) - { + if (!find_compiler (triplet, &compiler)) + { + regfree (&triplet); + return concat ("Could not find a compiler matching \"", + rx.c_str (), + "\"", + (char *) NULL); + } regfree (&triplet); - return concat ("Could not find a compiler matching \"", - rx.c_str (), - "\"", - (char *) NULL); + if (self->verbose) + fprintf (stderr, _("found compiler %s\n"), compiler.c_str()); } - regfree (&triplet); - if (self->verbose) - fprintf (stderr, _("found compiler %s\n"), compiler.c_str()); self->args.push_back (compiler);