From patchwork Tue Oct 18 13:14:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 16616 Received: (qmail 21773 invoked by alias); 18 Oct 2016 13:14:41 -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 21751 invoked by uid 89); 18 Oct 2016 13:14:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.2 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=no version=3.3.2 spammy=H*r:Sun, Bielefeld, bielefeld, Biotechnology X-HELO: smtp.CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE (HELO smtp.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 18 Oct 2016 13:14:30 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 81E3C96B; Tue, 18 Oct 2016 15:14:27 +0200 (CEST) Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id R3sUox+WNhVK; Tue, 18 Oct 2016 15:14:17 +0200 (CEST) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 54EC596A; Tue, 18 Oct 2016 15:14:17 +0200 (CEST) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.15.2+Sun/8.15.2/Submit) id u9IDEGBR007820; Tue, 18 Oct 2016 15:14:16 +0200 (MEST) From: Rainer Orth To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: Fix gdb 7.12 C++ compilation on Solaris References: <5e1396ea-6599-6b9a-bc8b-f59defaf4c3a@redhat.com> Date: Tue, 18 Oct 2016 15:14:16 +0200 In-Reply-To: <5e1396ea-6599-6b9a-bc8b-f59defaf4c3a@redhat.com> (Pedro Alves's message of "Fri, 14 Oct 2016 16:08:10 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (usg-unix-v) MIME-Version: 1.0 Hi Pedro, > On 10/14/2016 03:45 PM, Rainer Orth wrote: >> gdb 7.12 doesn't compile as C++ (tried with g++ 4.9) on Solaris (tried >> 10 and 12, sparc and x86). The following patch (relative to the 7.12 >> release, though I expect most if not all issues to be present on trunk, >> too) fixes this. >> >> Only a few of the changes bear explanation: >> >> * Initially, compilation failed whereever defs.h. was included: >> >> In file included from /vol/src/gnu/gdb/gdb-7.12/gdb/gdb.c:19:0: >> /vol/src/gnu/gdb/gdb-7.12/gdb/defs.h:630:33: error: 'double atof(const char*)' conflicts with a previous declaration >> extern double atof (const char *); /* X3.159-1989 4.10.1.1 */ >> ^ >> In file included from /usr/include/stdlib.h:17:0, >> from build-gnulib/import/stdlib.h:36, >> from /vol/src/gnu/gdb/gdb-7.12/gdb/common/common-defs.h:32, >> from /vol/src/gnu/gdb/gdb-7.12/gdb/defs.h:28, >> from /vol/src/gnu/gdb/gdb-7.12/gdb/gdb.c:19: >> /vol/gcc-4.9/lib/gcc/i386-pc-solaris2.10/4.9.0/include-fixed/iso/stdlib_iso.h:119:15: note: previous declaration 'double std::atof(const char*)' >> extern double atof(const char *); >> ^ >> >> This is due to this gem in gdb/defs.h which seems to have been present >> like forever: >> >> #ifndef atof >> extern double atof (const char *); /* X3.159-1989 4.10.1.1 */ >> #endif >> >> In the Solaris headers, the appropriate functions are in namespace std, >> thus the conflict. I've wrapped the defs.h declaration in !__cplusplus >> to avoid this; perhaps it can go completely instead. > > master dropped support for building with a C compiler, it's C++-only. > So for master, just delete the thing. > > On both branches, please delete the whole comment above as well: > > /* Global functions from other, non-gdb GNU thingies. > Libiberty thingies are no longer declared here. We include libiberty.h > above, instead. */ > > /* From other system libraries */ > > as it no longer makes any sense afterwards. done in the attached revised patch. >> * All the casts are necessary to appease g++ and should be pretty >> obvious. >> >> * The sol-thread.c changes are here to handle >> >> /vol/src/gnu/gdb/gdb-7.12/gdb/sol-thread.c: In function 'void _initialize_sol_thread()': >> /vol/src/gnu/gdb/gdb-7.12/gdb/sol-thread.c:1252:36: error: invalid conversion from 'void*' to 'void (*)(int)' [-fpermissive] >> if (!(p_##X = dlsym (dlhandle, #X))) \ >> ^ >> /vol/src/gnu/gdb/gdb-7.12/gdb/sol-thread.c:1255:3: note: in expansion of macro 'resolve' >> resolve (td_log); >> ^ >> >> and are modeled after linux-thread-db.c (try_thread_db_load_1). >> >> The patch allowed both 32 and 64-bit C++ builds on sparc-sun-solaris2.10 >> and i386-pc-solaris2.10 to complete. The resulting binary hasn't seen >> more than a smoke test (invoke it on itself, b main, run) yet. >> >> Ok for mainline and 7.12 branch? > > Yes, with the tweak above on master. But, the process for getting Thanks. When investigating the failure to detect -static-libstdc++ support (more below), I found two more issues which only show up with -Werror: /vol/src/gnu/gdb/gdb/local/gdb/procfs.c: In function 'ssd* proc_get_LDT_entry(procinfo*, int)': /vol/src/gnu/gdb/gdb/local/gdb/procfs.c:2487:19: error: variable 'old_chain' set but not used [-Werror=unused-but-set-variable] struct cleanup *old_chain = NULL; ^ Unless I'm mistaken, you need to run do_cleanups on every return from the function. Afterwards, I ran a 32-bit compilation, which (after adding --disable-largefile to avoid In file included from /usr/include/sys/procfs.h:28:0, from /vol/src/gnu/gdb/gdb/local/gdb/i386-sol2-nat.c:23: /usr/include/sys/old_procfs.h:39:2: error: #error "Cannot use procfs in the large file compilation environment" #error "Cannot use procfs in the large file compilation environment" ^ and two more instances) revealed /vol/src/gnu/gdb/gdb/local/gdb/top.c: In function 'void gdb_safe_append_history()': /vol/src/gnu/gdb/gdb/local/gdb/top.c:1170:59: error: format '%d' expects argument of type 'int', but argument 3 has type 'pid_t {aka long int}' [-Werror=format=] = xstrprintf ("%s-gdb%d~", history_filename, getpid ()); ^ Fixed by casting pid_t to long and printing it as such. Still ok for mainline? > fixes into the branch involves filing a PR. The reason is that the > PR's subject is later used to help create the release announcement > (manually). So please file a bug ("gdb 7.12 doesn't build on Solaris" > or some such, and paste an example build error log). Done now (PR build/20712). >> Besides, when I compiled with g++ 4.9 installed into a non-default >> location, gdb wouldn't run initially since libstdc++.so.6 and >> libgcc_s.so.1 weren't found. Maybe it would be good to handle this as >> gcc does and just link with -static-libstdc++ -static-libgcc? > > That's already included in the link line for me on GNU/Linux. > Maybe it's host-specific? I've wondered before about why don't > we use rpath instead though. This turned out to be (sort of) pilot error: since I'd started with building a 64-bit gdb with a 32-bit-default gcc, I had to configure with CFLAGS='-g -O2 -m64' and now added CXXFLAGS='$(CFLAGS)'. However, this didn't work as intended, but passed a literal "$(CFLAGS)" to C++ compilations, breaking/confusing several configure tests like the one for -static-libstdc++ or the -Werror one. Once I duplicated the necessary options in CXXFLAGS, everything went fine and libstdc++ was linked statically as expected. Rainer diff --git a/gdb/defs.h b/gdb/defs.h --- a/gdb/defs.h +++ b/gdb/defs.h @@ -612,16 +612,6 @@ enum gdb_osabi GDB_OSABI_INVALID /* keep this last */ }; -/* Global functions from other, non-gdb GNU thingies. - Libiberty thingies are no longer declared here. We include libiberty.h - above, instead. */ - -/* From other system libraries */ - -#ifndef atof -extern double atof (const char *); /* X3.159-1989 4.10.1.1 */ -#endif - /* Enumerate the requirements a symbol has in order to be evaluated. These are listed in order of "strength" -- a later entry subsumes earlier ones. This fine-grained distinction is important because diff --git a/gdb/procfs.c b/gdb/procfs.c --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -791,7 +791,7 @@ destroy_procinfo (procinfo *pi) static void do_destroy_procinfo_cleanup (void *pi) { - destroy_procinfo (pi); + destroy_procinfo ((procinfo *) pi); } enum { NOKILL, KILL }; @@ -845,7 +845,7 @@ sysset_t_alloc (procinfo * pi) sysset_t *ret; int size = sysset_t_size (pi); - ret = xmalloc (size); + ret = (sysset_t *) xmalloc (size); #ifdef DYNAMIC_SYSCALLS ret->pr_size = ((pi->num_syscalls + (8 * sizeof (uint64_t) - 1)) / (8 * sizeof (uint64_t))); @@ -1675,7 +1675,7 @@ proc_set_traced_sysentry (procinfo *pi, - sizeof (sysset_t) + sysset_t_size (pi); - argp = xmalloc (argp_size); + argp = (struct gdb_proc_ctl_pcsentry *) xmalloc (argp_size); argp->cmd = PCSENTRY; memcpy (&argp->sysset, sysset, sysset_t_size (pi)); @@ -1720,7 +1720,7 @@ proc_set_traced_sysexit (procinfo *pi, s - sizeof (sysset_t) + sysset_t_size (pi); - argp = xmalloc (argp_size); + argp = (struct gdb_proc_ctl_pcsexit *) xmalloc (argp_size); argp->cmd = PCSEXIT; memcpy (&argp->sysset, sysset, sysset_t_size (pi)); @@ -2512,9 +2512,13 @@ proc_get_LDT_entry (procinfo *pi, int ke break; /* end of table */ /* If key matches, return this entry. */ if (ldt_entry->sel == key) - return ldt_entry; + { + do_cleanups (old_chain); + return ldt_entry; + } } /* Loop ended, match not found. */ + do_cleanups (old_chain); return NULL; #else int nldt, i; @@ -2756,7 +2760,7 @@ proc_update_threads (procinfo *pi) static void do_closedir_cleanup (void *dir) { - closedir (dir); + closedir ((DIR *) dir); } static int @@ -3836,7 +3840,7 @@ wait_again: add_thread (temp_ptid); status->kind = TARGET_WAITKIND_STOPPED; - status->value.sig = 0; + status->value.sig = GDB_SIGNAL_0; return retval; } #endif @@ -4567,7 +4571,7 @@ procfs_create_inferior (struct target_op if (path == NULL) path = "/bin:/usr/bin"; - tryname = alloca (strlen (path) + strlen (shell_file) + 2); + tryname = (char *) alloca (strlen (path) + strlen (shell_file) + 2); for (p = path; p != NULL; p = p1 ? p1 + 1: NULL) { p1 = strchr (p, ':'); @@ -5367,7 +5371,8 @@ struct procfs_corefile_thread_data { static int procfs_corefile_thread_callback (procinfo *pi, procinfo *thread, void *data) { - struct procfs_corefile_thread_data *args = data; + struct procfs_corefile_thread_data *args + = (struct procfs_corefile_thread_data *) data; if (pi != NULL) { diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -98,56 +98,82 @@ static void init_sol_thread_ops (void); /* Default definitions: These must be defined in tm.h if they are to be shared with a process module such as procfs. */ +/* Types of the libthread_db functions. */ + +typedef void (td_log_ftype)(const int on_off); +typedef td_err_e (td_ta_new_ftype)(const struct ps_prochandle *ph_p, + td_thragent_t **ta_pp); +typedef td_err_e (td_ta_delete_ftype)(td_thragent_t *ta_p); +typedef td_err_e (td_init_ftype)(void); +typedef td_err_e (td_ta_get_ph_ftype)(const td_thragent_t *ta_p, + struct ps_prochandle **ph_pp); +typedef td_err_e (td_ta_get_nthreads_ftype)(const td_thragent_t *ta_p, + int *nthread_p); +typedef td_err_e (td_ta_tsd_iter_ftype)(const td_thragent_t *ta_p, + td_key_iter_f *cb, void *cbdata_p); +typedef td_err_e (td_ta_thr_iter_ftype)(const td_thragent_t *ta_p, + td_thr_iter_f *cb, void *cbdata_p, + td_thr_state_e state, int ti_pri, + sigset_t *ti_sigmask_p, + unsigned ti_user_flags); +typedef td_err_e (td_thr_validate_ftype)(const td_thrhandle_t *th_p); +typedef td_err_e (td_thr_tsd_ftype)(const td_thrhandle_t * th_p, + const thread_key_t key, void **data_pp); +typedef td_err_e (td_thr_get_info_ftype)(const td_thrhandle_t *th_p, + td_thrinfo_t *ti_p); +typedef td_err_e (td_thr_getfpregs_ftype)(const td_thrhandle_t *th_p, + prfpregset_t *fpregset); +typedef td_err_e (td_thr_getxregsize_ftype)(const td_thrhandle_t *th_p, + int *xregsize); +typedef td_err_e (td_thr_getxregs_ftype)(const td_thrhandle_t *th_p, + const caddr_t xregset); +typedef td_err_e (td_thr_sigsetmask_ftype)(const td_thrhandle_t *th_p, + const sigset_t ti_sigmask); +typedef td_err_e (td_thr_setprio_ftype)(const td_thrhandle_t *th_p, + const int ti_pri); +typedef td_err_e (td_thr_setsigpending_ftype)(const td_thrhandle_t *th_p, + const uchar_t ti_pending_flag, + const sigset_t ti_pending); +typedef td_err_e (td_thr_setfpregs_ftype)(const td_thrhandle_t *th_p, + const prfpregset_t *fpregset); +typedef td_err_e (td_thr_setxregs_ftype)(const td_thrhandle_t *th_p, + const caddr_t xregset); +typedef td_err_e (td_ta_map_id2thr_ftype)(const td_thragent_t *ta_p, + thread_t tid, + td_thrhandle_t *th_p); +typedef td_err_e (td_ta_map_lwp2thr_ftype)(const td_thragent_t *ta_p, + lwpid_t lwpid, + td_thrhandle_t *th_p); +typedef td_err_e (td_thr_getgregs_ftype)(const td_thrhandle_t *th_p, + prgregset_t regset); +typedef td_err_e (td_thr_setgregs_ftype)(const td_thrhandle_t *th_p, + const prgregset_t regset); + /* Pointers to routines from libthread_db resolved by dlopen(). */ -static void (*p_td_log)(const int on_off); -static td_err_e (*p_td_ta_new)(const struct ps_prochandle *ph_p, - td_thragent_t **ta_pp); -static td_err_e (*p_td_ta_delete)(td_thragent_t *ta_p); -static td_err_e (*p_td_init)(void); -static td_err_e (*p_td_ta_get_ph)(const td_thragent_t *ta_p, - struct ps_prochandle **ph_pp); -static td_err_e (*p_td_ta_get_nthreads)(const td_thragent_t *ta_p, - int *nthread_p); -static td_err_e (*p_td_ta_tsd_iter)(const td_thragent_t *ta_p, - td_key_iter_f *cb, void *cbdata_p); -static td_err_e (*p_td_ta_thr_iter)(const td_thragent_t *ta_p, - td_thr_iter_f *cb, void *cbdata_p, - td_thr_state_e state, int ti_pri, - sigset_t *ti_sigmask_p, - unsigned ti_user_flags); -static td_err_e (*p_td_thr_validate)(const td_thrhandle_t *th_p); -static td_err_e (*p_td_thr_tsd)(const td_thrhandle_t * th_p, - const thread_key_t key, void **data_pp); -static td_err_e (*p_td_thr_get_info)(const td_thrhandle_t *th_p, - td_thrinfo_t *ti_p); -static td_err_e (*p_td_thr_getfpregs)(const td_thrhandle_t *th_p, - prfpregset_t *fpregset); -static td_err_e (*p_td_thr_getxregsize)(const td_thrhandle_t *th_p, - int *xregsize); -static td_err_e (*p_td_thr_getxregs)(const td_thrhandle_t *th_p, - const caddr_t xregset); -static td_err_e (*p_td_thr_sigsetmask)(const td_thrhandle_t *th_p, - const sigset_t ti_sigmask); -static td_err_e (*p_td_thr_setprio)(const td_thrhandle_t *th_p, - const int ti_pri); -static td_err_e (*p_td_thr_setsigpending)(const td_thrhandle_t *th_p, - const uchar_t ti_pending_flag, - const sigset_t ti_pending); -static td_err_e (*p_td_thr_setfpregs)(const td_thrhandle_t *th_p, - const prfpregset_t *fpregset); -static td_err_e (*p_td_thr_setxregs)(const td_thrhandle_t *th_p, - const caddr_t xregset); -static td_err_e (*p_td_ta_map_id2thr)(const td_thragent_t *ta_p, - thread_t tid, - td_thrhandle_t *th_p); -static td_err_e (*p_td_ta_map_lwp2thr)(const td_thragent_t *ta_p, - lwpid_t lwpid, - td_thrhandle_t *th_p); -static td_err_e (*p_td_thr_getgregs)(const td_thrhandle_t *th_p, - prgregset_t regset); -static td_err_e (*p_td_thr_setgregs)(const td_thrhandle_t *th_p, - const prgregset_t regset); +static td_log_ftype *p_td_log; +static td_ta_new_ftype *p_td_ta_new; +static td_ta_delete_ftype *p_td_ta_delete; +static td_init_ftype *p_td_init; +static td_ta_get_ph_ftype *p_td_ta_get_ph; +static td_ta_get_nthreads_ftype *p_td_ta_get_nthreads; +static td_ta_tsd_iter_ftype *p_td_ta_tsd_iter; +static td_ta_thr_iter_ftype *p_td_ta_thr_iter; +static td_thr_validate_ftype *p_td_thr_validate; +static td_thr_tsd_ftype *p_td_thr_tsd; +static td_thr_get_info_ftype *p_td_thr_get_info; +static td_thr_getfpregs_ftype *p_td_thr_getfpregs; +static td_thr_getxregsize_ftype *p_td_thr_getxregsize; +static td_thr_getxregs_ftype *p_td_thr_getxregs; +static td_thr_sigsetmask_ftype *p_td_thr_sigsetmask; +static td_thr_setprio_ftype *p_td_thr_setprio; +static td_thr_setsigpending_ftype *p_td_thr_setsigpending; +static td_thr_setfpregs_ftype *p_td_thr_setfpregs; +static td_thr_setxregs_ftype *p_td_thr_setxregs; +static td_ta_map_id2thr_ftype *p_td_ta_map_id2thr; +static td_ta_map_lwp2thr_ftype *p_td_ta_map_lwp2thr; +static td_thr_getgregs_ftype *p_td_thr_getgregs; +static td_thr_setgregs_ftype *p_td_thr_setgregs; /* Return the libthread_db error string associated with ERRCODE. If @@ -818,7 +844,7 @@ ps_err_e ps_pdread (gdb_ps_prochandle_t ph, gdb_ps_addr_t addr, gdb_ps_read_buf_t buf, gdb_ps_size_t size) { - return rw_common (0, ph, addr, buf, size); + return rw_common (0, ph, addr, (gdb_byte *) buf, size); } /* Copies SIZE bytes from debugger memory .data segment to target process. */ @@ -836,7 +862,7 @@ ps_err_e ps_ptread (gdb_ps_prochandle_t ph, gdb_ps_addr_t addr, gdb_ps_read_buf_t buf, gdb_ps_size_t size) { - return rw_common (0, ph, addr, buf, size); + return rw_common (0, ph, addr, (gdb_byte *) buf, size); } /* Copies SIZE bytes from debugger memory .text segment to target process. */ @@ -1249,7 +1275,7 @@ void goto die; #define resolve(X) \ - if (!(p_##X = dlsym (dlhandle, #X))) \ + if (!(p_##X = (X ## _ftype *) dlsym (dlhandle, #X))) \ goto die; resolve (td_log); diff --git a/gdb/top.c b/gdb/top.c --- a/gdb/top.c +++ b/gdb/top.c @@ -1167,7 +1167,7 @@ gdb_safe_append_history (void) struct cleanup *old_chain; local_history_filename - = xstrprintf ("%s-gdb%d~", history_filename, getpid ()); + = xstrprintf ("%s-gdb%ld~", history_filename, (long) getpid ()); old_chain = make_cleanup (xfree, local_history_filename); ret = rename (history_filename, local_history_filename);