mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-02 23:04:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sim erc32: Add include path for readline.

Browse Source 
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.
This commit is contained in:
John Baldwin 2021-04-15 16:03:15 -07:00
parent 32b14776a0
commit 2694bce941
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/erc32/ChangeLog
View File

@ -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> 2021-04-08 Tom Tromey <tom@tromey.com>
* func.c: Include sys/time.h. * func.c: Include sys/time.h.

6
sim/erc32/Makefile.in
View File

@ -19,10 +19,14 @@
## COMMON_PRE_CONFIG_FRAG ## COMMON_PRE_CONFIG_FRAG
TERMCAP_LIB = @TERMCAP@ TERMCAP_LIB = @TERMCAP@
READLINE_SRC = $(srcroot)/readline/readline
READLINE_LIB = @READLINE@ READLINE_LIB = @READLINE@
READLINE_CFLAGS = @READLINE_CFLAGS@
SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
SIM_RUN_OBJS = sis.o SIM_RUN_OBJS = sis.o
SIM_EXTRA_CFLAGS = $(READLINE_CFLAGS)
SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
SIM_EXTRA_INSTALL = install-sis SIM_EXTRA_INSTALL = install-sis
SIM_EXTRA_CLEAN = clean-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 # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to
# CFLAGS if faster (infinite) UART speed is desired. Might affect the # CFLAGS if faster (infinite) UART speed is desired. Might affect the
# behaviour of UART interrupt routines ... # behaviour of UART interrupt routines ...
SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcroot) SIM_EXTRA_CFLAGS += -DFAST_UART -I$(srcroot)
## COMMON_POST_CONFIG_FRAG ## COMMON_POST_CONFIG_FRAG

8
sim/erc32/configure vendored
View File

@ -642,6 +642,7 @@ sim_endian
sim_bitsize sim_bitsize
sim_alignment sim_alignment
cgen_breaks cgen_breaks
READLINE_CFLAGS
READLINE READLINE
TERMCAP TERMCAP
REPORT_BUGS_TEXI REPORT_BUGS_TEXI
@ -11227,7 +11228,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11230 "configure" #line 11231 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11333,7 +11334,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11336 "configure" #line 11337 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -12071,6 +12072,7 @@ fi
# src/readline (if it's there) is configured before src/sim. # src/readline (if it's there) is configured before src/sim.
if test -r ../../readline/Makefile; then if test -r ../../readline/Makefile; then
READLINE=../../readline/readline/libreadline.a READLINE=../../readline/readline/libreadline.a
READLINE_CFLAGS='-I$(READLINE_SRC)/..'
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; } $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 as_fn_error $? "the required \"readline\" library is missing" "$LINENO" 5
fi fi
READLINE_CFLAGS=
fi fi
cgen_breaks="" cgen_breaks=""
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
cgen_breaks="break cgen_rtx_error"; cgen_breaks="break cgen_rtx_error";

3
sim/erc32/configure.ac
View File

@ -39,9 +39,12 @@ AC_SUBST(TERMCAP)
# src/readline (if it's there) is configured before src/sim. # src/readline (if it's there) is configured before src/sim.
if test -r ../../readline/Makefile; then if test -r ../../readline/Makefile; then
READLINE=../../readline/readline/libreadline.a READLINE=../../readline/readline/libreadline.a
READLINE_CFLAGS='-I$(READLINE_SRC)/..'
else else
AC_CHECK_LIB(readline, readline, READLINE=-lreadline, AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
AC_ERROR([the required "readline" library is missing]), $TERMCAP) AC_ERROR([the required "readline" library is missing]), $TERMCAP)
READLINE_CFLAGS=
fi fi
AC_SUBST(READLINE) AC_SUBST(READLINE)
AC_SUBST(READLINE_CFLAGS)
SIM_AC_OUTPUT SIM_AC_OUTPUT