From patchwork Tue Apr 21 21:36:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 6372 Received: (qmail 124785 invoked by alias); 21 Apr 2015 21:36:23 -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 124734 invoked by uid 89); 21 Apr 2015 21:36:22 -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; Tue, 21 Apr 2015 21:36:22 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3LLaKSx023588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 21 Apr 2015 17:36:20 -0400 Received: from host1.jankratochvil.net (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3LLaIGO012671; Tue, 21 Apr 2015 17:36:19 -0400 Subject: [PATCH] compile: Use libcc1.so->libcc1.so.0 From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Phil Muldoon Date: Tue, 21 Apr 2015 23:36:18 +0200 Message-ID: <20150421213616.14023.38329.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes Hi, the next [patch 3/4] will change the libcc1.so API. I am not sure if it gets approved in GCC land but for such case: (1) We really need to change GCC_FE_VERSION_0 -> GCC_FE_VERSION_1, this feature is there for this purpose. That is [patch 2/4]. (2) Currently GDB does only dlopen("libcc1.so") and then depending on which libcc1.so version it would find first it would succeed/fail. I guess it is more convenient to do dlopen("libcc1.so.1") instead (where ".1"=".x" corresponds to GCC_FE_VERSION_x). That is this patch (with x=0). (3) Currently there is no backward or forward compatibility although there could be one implemented. Personally I think the 'compile' feature is still in experimental stage so that it is OK to require last releases. At least in Fedora we can keep GDB<->GCC in sync. include/* changes are here only FYI, master repository of those files is GCC. Corresponding GCC part of the patches are going to be sent along to GCC. Jan gdb/ChangeLog 2015-04-21 Jan Kratochvil * compile/compile-c-support.c (load_libcc): Remove STRINGIFY from GCC_C_FE_LIBCC. include/ChangeLog 2015-04-21 Jan Kratochvil * gcc-c-interface.h (GCC_C_FE_LIBCC): Quote it. Append GCC_FE_VERSION_0. --- gdb/compile/compile-c-support.c | 4 ++-- include/gcc-c-interface.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c index 1711cda..e3c01f2 100644 --- a/gdb/compile/compile-c-support.c +++ b/gdb/compile/compile-c-support.c @@ -79,14 +79,14 @@ load_libcc (void) /* gdb_dlopen will call error () on an error, so no need to check value. */ - handle = gdb_dlopen (STRINGIFY (GCC_C_FE_LIBCC)); + handle = gdb_dlopen (GCC_C_FE_LIBCC); func = (gcc_c_fe_context_function *) gdb_dlsym (handle, STRINGIFY (GCC_C_FE_CONTEXT)); if (func == NULL) error (_("could not find symbol %s in library %s"), STRINGIFY (GCC_C_FE_CONTEXT), - STRINGIFY (GCC_C_FE_LIBCC)); + GCC_C_FE_LIBCC); return func; } diff --git a/include/gcc-c-interface.h b/include/gcc-c-interface.h index 95d0fc9..7108952 100644 --- a/include/gcc-c-interface.h +++ b/include/gcc-c-interface.h @@ -197,7 +197,7 @@ struct gcc_c_context /* The name of the .so that the compiler builds. We dlopen this later. */ -#define GCC_C_FE_LIBCC libcc1.so +#define GCC_C_FE_LIBCC "libcc1.so." STRINGIFY (GCC_FE_VERSION_0) /* The compiler exports a single initialization function. This macro holds its name as a symbol. */