aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2021-04-15 16:03:15 -0700
committerJohn Baldwin <jhb@FreeBSD.org>2021-04-15 16:07:46 -0700
commit2694bce941fcb662ffa2896dc8e886211779ba36 (patch)
tree11164a14a8206c70806391fe5392882adb48d00e
parent32b14776a020a336a574328cabf5a21387dbc180 (diff)
downloadgdb-2694bce941fcb662ffa2896dc8e886211779ba36.zip
gdb-2694bce941fcb662ffa2896dc8e886211779ba36.tar.gz
gdb-2694bce941fcb662ffa2896dc8e886211779ba36.tar.bz2
sim erc32: Add include path for readline.
Add a READLINE_CFLAGS variable which adds the include path to the in-tree readline when using the in-tree readline library. sim/erc32/ChangeLog: * Makefile.in (READLINE_SRC, READLINE_CFLAGS): Add. (SIM_EXTRA_CFLAGS): Add READLINE_CFLAGS. * configure: Rebuild. * configure.ac (READLINE_CFLAGS): Add.
-rw-r--r--sim/erc32/ChangeLog7
-rw-r--r--sim/erc32/Makefile.in6
-rwxr-xr-xsim/erc32/configure8
-rw-r--r--sim/erc32/configure.ac3
4 files changed, 21 insertions, 3 deletions
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 3b85c66..389884b 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,10 @@
+2021-04-15 John Baldwin <jhb@FreeBSD.org>
+
+ * Makefile.in (READLINE_SRC, READLINE_CFLAGS): Add.
+ (SIM_EXTRA_CFLAGS): Add READLINE_CFLAGS.
+ * configure: Rebuild.
+ * configure.ac (READLINE_CFLAGS): Add.
+
2021-04-08 Tom Tromey <tom@tromey.com>
* func.c: Include sys/time.h.
diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index 0006922..f52daf7 100644
--- a/sim/erc32/Makefile.in
+++ b/sim/erc32/Makefile.in
@@ -19,10 +19,14 @@
## COMMON_PRE_CONFIG_FRAG
TERMCAP_LIB = @TERMCAP@
+
+READLINE_SRC = $(srcroot)/readline/readline
READLINE_LIB = @READLINE@
+READLINE_CFLAGS = @READLINE_CFLAGS@
SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
SIM_RUN_OBJS = sis.o
+SIM_EXTRA_CFLAGS = $(READLINE_CFLAGS)
SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
SIM_EXTRA_INSTALL = install-sis
SIM_EXTRA_CLEAN = clean-sis
@@ -30,7 +34,7 @@ SIM_EXTRA_CLEAN = clean-sis
# UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to
# CFLAGS if faster (infinite) UART speed is desired. Might affect the
# behaviour of UART interrupt routines ...
-SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcroot)
+SIM_EXTRA_CFLAGS += -DFAST_UART -I$(srcroot)
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/erc32/configure b/sim/erc32/configure
index 3f7227b..548b11c 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -642,6 +642,7 @@ sim_endian
sim_bitsize
sim_alignment
cgen_breaks
+READLINE_CFLAGS
READLINE
TERMCAP
REPORT_BUGS_TEXI
@@ -11227,7 +11228,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11230 "configure"
+#line 11231 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11333,7 +11334,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11336 "configure"
+#line 11337 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12071,6 +12072,7 @@ fi
# src/readline (if it's there) is configured before src/sim.
if test -r ../../readline/Makefile; then
READLINE=../../readline/readline/libreadline.a
+ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; }
@@ -12114,9 +12116,11 @@ else
as_fn_error $? "the required \"readline\" library is missing" "$LINENO" 5
fi
+ READLINE_CFLAGS=
fi
+
cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error";
diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 8b7b688..cf7ec5f 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -39,9 +39,12 @@ AC_SUBST(TERMCAP)
# src/readline (if it's there) is configured before src/sim.
if test -r ../../readline/Makefile; then
READLINE=../../readline/readline/libreadline.a
+ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
else
AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
AC_ERROR([the required "readline" library is missing]), $TERMCAP)
+ READLINE_CFLAGS=
fi
AC_SUBST(READLINE)
+AC_SUBST(READLINE_CFLAGS)
SIM_AC_OUTPUT