From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ONBlI/h0d2CMXgAAWB0awg (envelope-from ) for ; Wed, 14 Apr 2021 19:04:24 -0400 Received: by simark.ca (Postfix, from userid 112) id 8F36E1F0FE; Wed, 14 Apr 2021 19:04:24 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=MAILING_LIST_MULTI, RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 77DC71F106 for ; Wed, 14 Apr 2021 19:04:19 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BBFE2393A40C; Wed, 14 Apr 2021 23:04:18 +0000 (GMT) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2607:f138:0:13::2]) by sourceware.org (Postfix) with ESMTPS id E4EE23858028 for ; Wed, 14 Apr 2021 23:04:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E4EE23858028 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=jhb@FreeBSD.org Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 3108C1A84C5E; Wed, 14 Apr 2021 19:04:12 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH 5/5] sim erc32: Add include path for readline. Date: Wed, 14 Apr 2021 16:02:59 -0700 Message-Id: <20210414230259.19234-6-jhb@FreeBSD.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210414230259.19234-1-jhb@FreeBSD.org> References: <20210414230259.19234-1-jhb@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Wed, 14 Apr 2021 19:04:12 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" 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. --- sim/erc32/ChangeLog | 7 +++++++ sim/erc32/Makefile.in | 6 +++++- sim/erc32/configure | 8 ++++++-- sim/erc32/configure.ac | 3 +++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 3b85c66beeb..223c29c7bc9 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,10 @@ +2021-04-14 John Baldwin + + * 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 * func.c: Include sys/time.h. diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index 0006922904b..be20fb01fb4 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 3f7227b2e7e..548b11cf4ed 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 8b7b688322f..cf7ec5fdb80 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 -- 2.30.1