Message ID | 54F0F3E8.6010005@ericsson.com |
---|---|
State | New, archived |
Headers |
Received: (qmail 61807 invoked by alias); 27 Feb 2015 22:47:09 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 61796 invoked by uid 89); 27 Feb 2015 22:47:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 27 Feb 2015 22:47:07 +0000 Received: from EUSAAHC002.ericsson.se (Unknown_Domain [147.117.188.78]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 34.9B.03307.27F90F45; Fri, 27 Feb 2015 17:46:42 +0100 (CET) Received: from [142.133.110.232] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.80) with Microsoft SMTP Server id 14.3.210.2; Fri, 27 Feb 2015 17:47:04 -0500 Message-ID: <54F0F3E8.6010005@ericsson.com> Date: Fri, 27 Feb 2015 17:47:04 -0500 From: Simon Marchi <simon.marchi@ericsson.com> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Pedro Alves <palves@redhat.com>, <gdb-patches@sourceware.org> Subject: Re: [PATCH 07/36] Make array object extern References: <1423524046-20605-1-git-send-email-palves@redhat.com> <1423524046-20605-8-git-send-email-palves@redhat.com> In-Reply-To: <1423524046-20605-8-git-send-email-palves@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes |
Commit Message
Simon Marchi
Feb. 27, 2015, 10:47 p.m. UTC
On 02/09/2015 06:20 PM, Pedro Alves wrote: > Compiling python.c in C++ mode, we get: > > ...src/gdb/python/python.c: At global scope: > ...src/gdb/python/python.c:106:31: error: storage size of ‘GdbMethods’ isn’t known > static PyMethodDef GdbMethods[]; > ^ > > Fix it by making the affected array objects extern. > > gdb/ChangeLog: > 2015-02-09 Pedro Alves <palves@redhat.com> > > * python/python.c (GdbMethods): Rename to ... > (python_GdbMethods): ... this and make extern. > (GdbModuleDef): Rename to ... > (python_GdbModuleDef): ... this and make extern. > --- > gdb/python/python.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/gdb/python/python.c b/gdb/python/python.c > index 9854c79..a13638f 100644 > --- a/gdb/python/python.c > +++ b/gdb/python/python.c > @@ -103,10 +103,10 @@ const struct extension_language_defn extension_language_python = > > int gdb_python_initialized; > > -static PyMethodDef GdbMethods[]; > +extern PyMethodDef python_GdbMethods[]; > > #ifdef IS_PY3K > -static struct PyModuleDef GdbModuleDef; > +extern struct PyModuleDef python_GdbModuleDef; > #endif > > PyObject *gdb_module; > @@ -1712,11 +1712,11 @@ message == an error message without a stack will be printed."), > PyEval_InitThreads (); > > #ifdef IS_PY3K > - gdb_module = PyModule_Create (&GdbModuleDef); > + gdb_module = PyModule_Create (&python_GdbModuleDef); > /* Add _gdb module to the list of known built-in modules. */ > _PyImport_FixupBuiltin (gdb_module, "_gdb"); > #else > - gdb_module = Py_InitModule ("_gdb", GdbMethods); > + gdb_module = Py_InitModule ("_gdb", python_GdbMethods); > #endif > if (gdb_module == NULL) > goto fail; > @@ -1932,7 +1932,7 @@ gdbpy_initialized (const struct extension_language_defn *extlang) > > #ifdef HAVE_PYTHON > > -static PyMethodDef GdbMethods[] = > +PyMethodDef python_GdbMethods[] = > { > { "history", gdbpy_history, METH_VARARGS, > "Get a value from history" }, > @@ -2044,7 +2044,7 @@ Return a tuple containing all inferiors." }, > }; > > #ifdef IS_PY3K > -static struct PyModuleDef GdbModuleDef = > +struct PyModuleDef python_GdbModuleDef = > { > PyModuleDef_HEAD_INIT, > "_gdb", Hi Pedro, I think you forgot one instance of GdbMethods, used when building with Python 3. This should fix it: From 33c839c7bb4bb201fa20f22e0935831b7e1de27f Mon Sep 17 00:00:00 2001 From: Simon Marchi <simon.marchi@ericsson.com> Date: Fri, 27 Feb 2015 17:40:36 -0500 Subject: [PATCH] Fix Python 3 build Rename forgotten GdbMethods to python_GdbMethods. gdb/ChangeLog: * python/python.c (python_GdbModuleDef): Rename GdbMethods to python_GdbMethods. --- gdb/python/python.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 02/27/2015 10:47 PM, Simon Marchi wrote: > On 02/09/2015 06:20 PM, Pedro Alves wrote: > I think you forgot one instance of GdbMethods, used when building with > Python 3. This should fix it: > > From 33c839c7bb4bb201fa20f22e0935831b7e1de27f Mon Sep 17 00:00:00 2001 > From: Simon Marchi <simon.marchi@ericsson.com> > Date: Fri, 27 Feb 2015 17:40:36 -0500 > Subject: [PATCH] Fix Python 3 build > > Rename forgotten GdbMethods to python_GdbMethods. Whoops, sorry about that. Please push. Thank you.
On 02/27/2015 05:58 PM, Pedro Alves wrote: > On 02/27/2015 10:47 PM, Simon Marchi wrote: >> On 02/09/2015 06:20 PM, Pedro Alves wrote: > >> I think you forgot one instance of GdbMethods, used when building with >> Python 3. This should fix it: >> >> From 33c839c7bb4bb201fa20f22e0935831b7e1de27f Mon Sep 17 00:00:00 2001 >> From: Simon Marchi <simon.marchi@ericsson.com> >> Date: Fri, 27 Feb 2015 17:40:36 -0500 >> Subject: [PATCH] Fix Python 3 build >> >> Rename forgotten GdbMethods to python_GdbMethods. > > Whoops, sorry about that. Please push. > > Thank you. Done!
diff --git a/gdb/python/python.c b/gdb/python/python.c index a13638f..c3ffbae 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -2050,7 +2050,7 @@ struct PyModuleDef python_GdbModuleDef = "_gdb", NULL, -1, - GdbMethods, + python_GdbMethods, NULL, NULL, NULL,