From patchwork Thu Aug 22 01:15:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Durigan Junior X-Patchwork-Id: 34238 Received: (qmail 65514 invoked by alias); 22 Aug 2019 01:15:48 -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 65506 invoked by uid 89); 22 Aug 2019 01:15:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= 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 ESMTP; Thu, 22 Aug 2019 01:15:40 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0E17307D921; Thu, 22 Aug 2019 01:15:37 +0000 (UTC) Received: from localhost (unused-10-15-17-196.yyz.redhat.com [10.15.17.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id C34026CE40; Thu, 22 Aug 2019 01:15:37 +0000 (UTC) From: Sergio Durigan Junior To: Tom Tromey Cc: GDB Patches Subject: Re: [PATCH] Move gdb-dlfcn.[ch] to gdbsupport/ References: <20190821210820.25919-1-sergiodj@redhat.com> <877e76kx35.fsf@tromey.com> Date: Wed, 21 Aug 2019 21:15:37 -0400 In-Reply-To: <877e76kx35.fsf@tromey.com> (Tom Tromey's message of "Wed, 21 Aug 2019 15:49:50 -0600") Message-ID: <87r25e80g6.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes On Wednesday, August 21 2019, Tom Tromey wrote: >>>>>> "Sergio" == Sergio Durigan Junior writes: > > Sergio> I need to use 'gdb_dlopen' inside 'gdbsupport/', but it's not yet > Sergio> supported there. This commit moves 'gdb-dlfcn.[ch]' to 'gdbsupport/', > Sergio> which makes it available also on gdbserver. > > Thanks for doing this. > It seems like a good idea to me. Thanks for the review, Tom. > Sergio> diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac > Sergio> index 0009aac9f2..8d91f0d0e8 100644 > Sergio> --- a/gdb/gdbserver/configure.ac > Sergio> +++ b/gdb/gdbserver/configure.ac > Sergio> @@ -88,7 +88,8 @@ AC_CHECK_HEADERS(termios.h sys/reg.h string.h dnl > Sergio> proc_service.h sys/procfs.h linux/elf.h dnl > Sergio> fcntl.h signal.h sys/file.h dnl > Sergio> sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl > Sergio> - netinet/tcp.h arpa/inet.h) > Sergio> + netinet/tcp.h arpa/inet.h dnl > Sergio> + dlfcn.h) > > I think it's better to add this check to gdbsupport/common.m4 (and > remove it from gdb's configure.ac). Ah, good point. Here's the updated patch. Thanks, diff --git a/gdb/Makefile.in b/gdb/Makefile.in index d5d095aae4..e7e26a44a0 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -964,6 +964,7 @@ COMMON_SFILES = \ gdbsupport/filestuff.c \ gdbsupport/format.c \ gdbsupport/job-control.c \ + gdbsupport/gdb-dlfcn.c \ gdbsupport/gdb_tilde_expand.c \ gdbsupport/gdb_vecs.c \ gdbsupport/netstuff.c \ @@ -1028,7 +1029,6 @@ COMMON_SFILES = \ frame-unwind.c \ gcore.c \ gdb_bfd.c \ - gdb-dlfcn.c \ gdb_obstack.c \ gdb_regex.c \ gdb_usleep.c \ @@ -1262,7 +1262,6 @@ HFILES_NO_SRCDIR = \ gcore.h \ gdb_bfd.h \ gdb_curses.h \ - gdb-dlfcn.h \ gdb_expat.h \ gdb_obstack.h \ gdb_proc_service.h \ @@ -1460,6 +1459,7 @@ HFILES_NO_SRCDIR = \ gdbsupport/environ.h \ gdbsupport/fileio.h \ gdbsupport/format.h \ + gdbsupport/gdb-dlfcn.h \ gdbsupport/gdb_assert.h \ gdbsupport/gdb_tilde_expand.h \ gdbsupport/gdb_locale.h \ diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c index a6727e83af..9de827a72c 100644 --- a/gdb/compile/compile-c-support.c +++ b/gdb/compile/compile-c-support.c @@ -22,12 +22,12 @@ #include "compile-c.h" #include "compile-cplus.h" #include "compile.h" -#include "gdb-dlfcn.h" #include "c-lang.h" #include "macrotab.h" #include "macroscope.h" #include "regcache.h" #include "gdbsupport/function-view.h" +#include "gdbsupport/gdb-dlfcn.h" #include "gdbsupport/preprocessor.h" #include "gdbarch.h" diff --git a/gdb/configure b/gdb/configure index cb71bbf057..22a5f6051d 100755 --- a/gdb/configure +++ b/gdb/configure @@ -12024,8 +12024,7 @@ for ac_header in nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \ sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \ sys/reg.h sys/debugreg.h sys/select.h \ - termios.h elf_hp.h \ - dlfcn.h + termios.h elf_hp.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -13516,7 +13515,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h fi - for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h + for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h dlfcn.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/gdb/configure.ac b/gdb/configure.ac index 5a18c16405..9da8818fb5 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1308,8 +1308,7 @@ AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \ sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \ sys/reg.h sys/debugreg.h sys/select.h \ - termios.h elf_hp.h \ - dlfcn.h]) + termios.h elf_hp.h]) AC_CHECK_HEADERS(sys/user.h, [], [], [#if HAVE_SYS_PARAM_H # include diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index 3991964f9b..f05e9be48a 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -90,6 +90,9 @@ /* Define to 1 if you have the `dladdr' function. */ #undef HAVE_DLADDR +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + /* Define to 1 if the system has the type `Elf32_auxv_t'. */ #undef HAVE_ELF32_AUXV_T diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 7e5be51cb2..692cb0f308 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -6807,7 +6807,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h fi - for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h + for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h dlfcn.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/gdb/gdbsupport/common.m4 b/gdb/gdbsupport/common.m4 index 5701dd9829..903889463f 100644 --- a/gdb/gdbsupport/common.m4 +++ b/gdb/gdbsupport/common.m4 @@ -29,7 +29,8 @@ AC_DEFUN([GDB_AC_COMMON], [ sys/resource.h sys/socket.h dnl sys/un.h sys/wait.h dnl thread_db.h wait.h dnl - termios.h) + termios.h dnl + dlfcn.h) AC_CHECK_FUNCS([fdwalk getrlimit pipe pipe2 socketpair sigaction]) diff --git a/gdb/gdb-dlfcn.c b/gdb/gdbsupport/gdb-dlfcn.c similarity index 100% rename from gdb/gdb-dlfcn.c rename to gdb/gdbsupport/gdb-dlfcn.c diff --git a/gdb/gdb-dlfcn.h b/gdb/gdbsupport/gdb-dlfcn.h similarity index 100% rename from gdb/gdb-dlfcn.h rename to gdb/gdbsupport/gdb-dlfcn.h diff --git a/gdb/jit.c b/gdb/jit.c index 87f8d8f885..5fef03700c 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -36,7 +36,7 @@ #include "symfile.h" #include "symtab.h" #include "target.h" -#include "gdb-dlfcn.h" +#include "gdbsupport/gdb-dlfcn.h" #include #include "gdb_bfd.h" #include "readline/tilde.h"