[binutils-gdb] sim: erc32: fix build w/out F_{G,S}ETFL
Michael Frysinger
vapier@sourceware.org
Tue Jun 15 03:30:56 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=757b3c2fea905abfd487dd159c7e0550169ed966
commit 757b3c2fea905abfd487dd159c7e0550169ed966
Author: Mike Frysinger <vapier@gentoo.org>
Date: Mon Jun 14 23:25:01 2021 -0400
sim: erc32: fix build w/out F_{G,S}ETFL
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.
Diff:
---
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 a5035d058f1..0a82427cb5f 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-14 Mike Frysinger <vapier@gentoo.org>
+
+ * 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 <vapier@gentoo.org>
* erc32.c [HAVE_TERMIOS_H]: Include termios.h and declare ioc1,
diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index 28c981bbb92..0cd65551763 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 749d25620b4..b49e5a60609 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;
More information about the Gdb-cvs
mailing list