FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sim: leverage gnulib

Browse source 
We use getline, so leverage gnulib to provide fallback implementation.
This commit is contained in:
Mike Frysinger 2021-05-01 18:05:49 -04:00
parent 63e47e1072
commit 5c9e84c2d8
8 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2021-05-29 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Add gnulib to configdirs for sim.
* configure: Regenerate.
2021-05-24 Maciej W. Rozycki <macro@orcam.me.uk> 2021-05-24 Maciej W. Rozycki <macro@orcam.me.uk>
* MAINTAINERS: Update path to readline config.{sub,guess} files. * MAINTAINERS: Update path to readline config.{sub,guess} files.

3
configure vendored
View file

@ -7504,6 +7504,9 @@ case " ${configdirs} " in
*\ gdbserver\ *) *\ gdbserver\ *)
configdirs="${configdirs} gnulib gdbsupport" configdirs="${configdirs} gnulib gdbsupport"
;; ;;
*\ sim\ *)
configdirs="${configdirs} gnulib"
;;
esac esac
# Strip out unwanted targets. # Strip out unwanted targets.

3
configure.ac
View file

@ -2812,6 +2812,9 @@ case " ${configdirs} " in
*\ gdbserver\ *) *\ gdbserver\ *)
configdirs="${configdirs} gnulib gdbsupport" configdirs="${configdirs} gnulib gdbsupport"
;; ;;
*\ sim\ *)
configdirs="${configdirs} gnulib"
;;
esac esac
# Strip out unwanted targets. # Strip out unwanted targets.

9
sim/common/ChangeLog
View file

@ -1,3 +1,12 @@
2021-05-29 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (GNULIB_BUILDDIR): Define.
Include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc.
(CSEARCH): Add -I../...
(ALL_CFLAGS): Add $(INCGNU).
(EXTRA_LIBS): Add $(LIBGNU).
* defs.h: Include gnulib/config.h. Undefine PACKAGE* defines.
2021-05-17 Mike Frysinger <vapier@gentoo.org> 2021-05-17 Mike Frysinger <vapier@gentoo.org>
* sim-base.h (SIM_HAVE_COMMON_SIM_STATE): Delete. * sim-base.h (SIM_HAVE_COMMON_SIM_STATE): Delete.

9
sim/common/Make-common.in
View file

@ -40,6 +40,10 @@ srccom = $(srcdir)/../common
srcroot = $(srcdir)/../.. srcroot = $(srcdir)/../..
srcsim = $(srcdir)/.. srcsim = $(srcdir)/..
# Helper code from gnulib.
GNULIB_BUILDDIR = ../../gnulib
include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -232,8 +236,9 @@ CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \
-I../../include -I$(srcroot)/include \ -I../../include -I$(srcroot)/include \
-I../../bfd -I$(srcroot)/bfd \ -I../../bfd -I$(srcroot)/bfd \
-I../../opcodes -I$(srcroot)/opcodes \ -I../../opcodes -I$(srcroot)/opcodes \
-I../.. \
@INCINTL@ @INCINTL@
ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) $(CFLAGS) ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS)
BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH)
COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS)
@ -248,7 +253,7 @@ LIBINTL_DEP = @LIBINTL_DEP@
CONFIG_LIBS = @LIBS@ $(ZLIB) CONFIG_LIBS = @LIBS@ $(ZLIB)
LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB)
EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \
$(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU)
LIB_OBJS = callback.o modules.o syscall.o targ-map.o version.o \ LIB_OBJS = callback.o modules.o syscall.o targ-map.o version.o \
$(SIM_OBJS) $(SIM_OBJS)

12
sim/common/defs.h
View file

@ -22,6 +22,18 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
/* Include gnulib's various configure tests. */
#include "gnulib/config.h"
/* Reset macros that our config.h will provide. */
#undef PACKAGE
#undef PACKAGE_BUGREPORT
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_URL
#undef PACKAGE_VERSION
/* Include sim's various configure tests. */ /* Include sim's various configure tests. */
#include "config.h" #include "config.h"

4
sim/ppc/ChangeLog
View file

@ -1,3 +1,7 @@
2021-05-29 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (INCLUDES): Add -I../..
2021-05-16 Mike Frysinger <vapier@gentoo.org> 2021-05-16 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (gentmap): Pass -DUSE_CONFIG_H. * Makefile.in (gentmap): Pass -DUSE_CONFIG_H.

2
sim/ppc/Makefile.in
View file

@ -147,7 +147,7 @@ LIB_INCLUDES = -I$(srcdir)/../../include
BFD_INCLUDES = -I../../bfd -I$(srcdir)/../../bfd BFD_INCLUDES = -I../../bfd -I$(srcdir)/../../bfd
GDB_INCLUDES = -I../../gdb -I$(srcdir)/../../gdb -I$(srcdir)/../../gdb/config GDB_INCLUDES = -I../../gdb -I$(srcdir)/../../gdb -I$(srcdir)/../../gdb/config
INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) -I../..
LIBIBERTY_LIB = ../../libiberty/libiberty.a LIBIBERTY_LIB = ../../libiberty/libiberty.a
BFD_LIB = ../../bfd/libbfd.a BFD_LIB = ../../bfd/libbfd.a