Re: [PATCH 1/6] Share gdb/environ.[ch] with gdbserver

Luis Machado
2016-12-26T21:34:51Z

On 12/22/2016 09:39 PM, Sergio Durigan Junior wrote:
> We will need access to the environment functions when we share
> fork_inferior between GDB and gdbserver, therefore we simply make the
> API on gdb/environ.[ch] available on common/. No extra adjustments
> are needed to make it compile on gdbserver.
>
> gdb/ChangeLog:
> 2016-12-22 Sergio Durigan Junior <sergiodj@redhat.com>
>
> * Makefile.in (SFILES): Replace "environ.c" with
> "common/environ.c".
> (HFILES_NO_SRCDIR): Likewise, for "environ.h".
> * environ.c: Include "common-defs.h" instead of "defs.h. Moved
> to...
> * common/environ.c: ... here.
> * environ.h: Moved to...
> * common/environ.h: ... here.
>
> gdb/gdbserver/ChangeLog:
> 2016-12-22 Sergio Durigan Junior <sergiodj@redhat.com>
>
> * Makefile.in (SFILES): Add "common/environ.c".
> (OBJS): Add "common/environ.h".
> ---
> gdb/Makefile.in | 4 ++--
> gdb/{ => common}/environ.c | 2 +-
> gdb/{ => common}/environ.h | 0
> gdb/gdbserver/Makefile.in | 5 +++++
> 4 files changed, 8 insertions(+), 3 deletions(-)
> rename gdb/{ => common}/environ.c (99%)
> rename gdb/{ => common}/environ.h (100%)
>
> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> index 946d440..051f07d 100644
> --- a/gdb/Makefile.in
> +++ b/gdb/Makefile.in
> @@ -1047,7 +1047,6 @@ SFILES = \
> dwarf2loc.c \
> dwarf2read.c \
> elfread.c \
> - environ.c \
> eval.c \
> event-loop.c \
> event-top.c \
> @@ -1192,6 +1191,7 @@ SFILES = \
> common/common-regcache.c \
> common/common-utils.c \
> common/errors.c \
> + common/environ.c \
> common/fileio.c \
> common/filestuff.c \
> common/format.c \
> @@ -1270,7 +1270,6 @@ HFILES_NO_SRCDIR = \
> dwarf2-frame-tailcall.h \
> dwarf2expr.h \
> dwarf2loc.h \
> - environ.h \
> event-loop.h \
> event-top.h \
> exceptions.h \
> @@ -1471,6 +1470,7 @@ HFILES_NO_SRCDIR = \
> common/common-types.h \
> common/common-utils.h \
> common/errors.h \
> + common/environ.h \
> common/fileio.h \
> common/format.h \
> common/gdb_assert.h \
> diff --git a/gdb/environ.c b/gdb/common/environ.c
> similarity index 99%
> rename from gdb/environ.c
> rename to gdb/common/environ.c
> index 5c73757..105f854 100644
> --- a/gdb/environ.c
> +++ b/gdb/common/environ.c
> @@ -15,7 +15,7 @@
> You should have received a copy of the GNU General Public License
> along with this program. If not, see <http://www.gnu.org/licenses/>. */
>
> -#include "defs.h"
> +#include "common-defs.h"
> #include "environ.h"
> #include <algorithm>
> \f
> diff --git a/gdb/environ.h b/gdb/common/environ.h
> similarity index 100%
> rename from gdb/environ.h
> rename to gdb/common/environ.h
> diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
> index e17cf70..fe40842 100644
> --- a/gdb/gdbserver/Makefile.in
> +++ b/gdb/gdbserver/Makefile.in
> @@ -201,6 +201,7 @@ SFILES = \
> $(srcdir)/common/common-regcache.c \
> $(srcdir)/common/common-utils.c \
> $(srcdir)/common/errors.c \
> + $(srcdir)/common/environ.c \
> $(srcdir)/common/fileio.c \
> $(srcdir)/common/filestuff.c \
> $(srcdir)/common/gdb_vecs.c \
> @@ -238,6 +239,7 @@ OBS = \
> debug.o \
> dll.o \
> errors.o \
> + environ.o \
> event-loop.o \
> fileio.o \
> filestuff.o \
> @@ -774,6 +776,9 @@ agent.o: ../common/agent.c
> errors.o: ../common/errors.c
> $(COMPILE) $<
> $(POSTCOMPILE)
> +environ.o: ../common/environ.c
> + $(COMPILE) $<
> + $(POSTCOMPILE)
> common-debug.o: ../common/common-debug.c
> $(COMPILE) $<
> $(POSTCOMPILE)
>

Looks good to me.