sim: leverage gnulib

We use getline, so leverage gnulib to provide fallback implementation.

diff --git a/ChangeLog b/ChangeLog
index 26eb827412b1a453b1f85d3bc6bf2e960b1b6053..53ec7cb1524dafa05758215faa45d649e6dfeba2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * MAINTAINERS: Update path to readline config.{sub,guess} files.

diff --git a/configure b/configure
index 544a8d19c76e498858a6c09143c93e1d58d456be..3dd206525a7b723e48d9e67479cfe6c137bc6b65 100755 (executable)
--- a/configure
+++ b/configure
@@ -7504,6 +7504,9 @@ case " ${configdirs} " in
   *\ gdbserver\ *)
     configdirs="${configdirs} gnulib gdbsupport"
     ;;
+  *\ sim\ *)
+    configdirs="${configdirs} gnulib"
+    ;;
 esac
 
 # Strip out unwanted targets.

diff --git a/configure.ac b/configure.ac
index 59b4194fb24e2c6f9c2aa83972a807033c481084..797a624621e459f090028260fd22e664acfc7136 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2812,6 +2812,9 @@ case " ${configdirs} " in
   *\ gdbserver\ *)
     configdirs="${configdirs} gnulib gdbsupport"
     ;;
+  *\ sim\ *)
+    configdirs="${configdirs} gnulib"
+    ;;
 esac
 
 # Strip out unwanted targets.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 76bf134fa378e1178d96e939ecec86a5af19b053..f44e0559e6fc1d581dc4b6aa998a970a4168a1fe 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -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>
 
        * sim-base.h (SIM_HAVE_COMMON_SIM_STATE): Delete.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index d38c849c40d1fa9eb76c25127a1ef660b8d641e4..8f52cf5e53f45f15a280793ec0ef688bc28c5177 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -40,6 +40,10 @@ srccom = $(srcdir)/../common
 srcroot = $(srcdir)/../..
 srcsim = $(srcdir)/..
 
+# Helper code from gnulib.
+GNULIB_BUILDDIR = ../../gnulib
+include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -232,8 +236,9 @@ CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \
   -I../../include -I$(srcroot)/include \
   -I../../bfd -I$(srcroot)/bfd \
   -I../../opcodes -I$(srcroot)/opcodes \
+  -I../.. \
   @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)
 
 COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS)
@@ -248,7 +253,7 @@ LIBINTL_DEP = @LIBINTL_DEP@
 CONFIG_LIBS = @LIBS@ $(ZLIB)
 LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(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 \
        $(SIM_OBJS)

diff --git a/sim/common/defs.h b/sim/common/defs.h
index 3a0737cb9b890199121a524a69b7c930e3a6f313..957e36d3c93c1dc3a4be026224a1b2e181780e24 100644 (file)
--- a/sim/common/defs.h
+++ b/sim/common/defs.h
@@ -22,6 +22,18 @@
 
 #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 "config.h"
 

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 0755fe288b76ad1a3d604e82bc3d850f4bac79d2..15b50ef50d120b73883d25a8615b5f6f7ad90a88 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -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>
 
        * Makefile.in (gentmap): Pass -DUSE_CONFIG_H.

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 5ce511e96b3fb4a3c3ba1cdfd616c3f67e9d36b9..1996e13279c747404b9ce5ff0f5e820ceaab316e 100644 (file)
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -147,7 +147,7 @@ LIB_INCLUDES        = -I$(srcdir)/../../include
 BFD_INCLUDES   = -I../../bfd -I$(srcdir)/../../bfd
 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
 BFD_LIB                = ../../bfd/libbfd.a