From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id D2852389247F for ; Tue, 15 Jun 2021 03:30:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D2852389247F Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id C7F37340E71 for ; Tue, 15 Jun 2021 03:30:45 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed 2/2] sim: erc32: fix build w/out F_{G,S}ETFL Date: Mon, 14 Jun 2021 23:30:42 -0400 Message-Id: <20210615033042.24482-2-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615033042.24482-1-vapier@gentoo.org> References: <20210615033042.24482-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Tue, 15 Jun 2021 03:30:48 -0000 Add conditional logic around fcntl.h F_{G,S}ETFL usage to fix builds on systems that don't have it (e.g. Windows). The code is only used to save & restore limited terminal stdin state. --- sim/erc32/ChangeLog | 6 ++++++ sim/erc32/interf.c | 7 +++++-- sim/erc32/sis.c | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index a5035d058f15..0a82427cb5f4 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,9 @@ +2021-06-14 Mike Frysinger + + * interf.c (sim_open) [F_GETFL]: Only set termsave. + (sim_close) [F_SETFL]: Only call fcntl. + * sis.c (main) [F_GETFL]: Only set termsave. + 2021-06-14 Mike Frysinger * erc32.c [HAVE_TERMIOS_H]: Include termios.h and declare ioc1, diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index 28c981bbb924..0cd655517630 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -241,7 +241,9 @@ sim_open (SIM_OPEN_KIND kind, struct host_callback_struct *callback, } sregs.freq = freq ? freq : 15; +#ifdef F_GETFL termsave = fcntl(0, F_GETFL, 0); +#endif INIT_DISASSEMBLE_INFO(dinfo, stdout,(fprintf_ftype)fprintf); #ifdef HOST_LITTLE_ENDIAN dinfo.endian = BFD_ENDIAN_LITTLE; @@ -263,9 +265,10 @@ sim_close(SIM_DESC sd, int quitting) { exit_sim(); +#ifdef F_SETFL fcntl(0, F_SETFL, termsave); - -}; +#endif +} SIM_RC sim_load(SIM_DESC sd, const char *prog, bfd *abfd, int from_tty) diff --git a/sim/erc32/sis.c b/sim/erc32/sis.c index 749d25620b44..b49e5a606098 100644 --- a/sim/erc32/sis.c +++ b/sim/erc32/sis.c @@ -219,7 +219,9 @@ main(int argc, char **argv) dinfo.endian = BFD_ENDIAN_BIG; #endif +#ifdef F_GETFL termsave = fcntl(0, F_GETFL, 0); +#endif using_history(); init_signals(); ebase.simtime = 0; -- 2.31.1