diff options
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/ChangeLog | 7 | ||||
| -rw-r--r-- | gdbserver/Makefile.in | 2 | ||||
| -rw-r--r-- | gdbserver/remote-utils.cc | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 2f883e05b5c..379148a15cd 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2021-01-22 Paul E. Murphy <murphyp@linux.ibm.com> + + * Makefile.in (UNDO_GNULIB_CFLAGS): disable + gnulib free replacement too. + * common-defs.h [USE_WIN32API](read, write): undefine + gnulib versions before defining these macros. + 2021-01-20 Simon Marchi <simon.marchi@polymtl.ca> * ax.cc (bytecode_address_table): Make static. diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index a14d3a7bc18..8e174da8dcf 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -490,7 +490,7 @@ UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION # Undo gnulib replacements for the IPA shared library build. # The gnulib headers are still needed, but gnulib is not linked # into the IPA lib so replacement apis don't work. -UNDO_GNULIB_CFLAGS = -Drpl_strerror_r=strerror_r +UNDO_GNULIB_CFLAGS = -Drpl_strerror_r=strerror_r -Drpl_free=free # Note, we only build the IPA if -fvisibility=hidden is supported in # the first place. diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc index cfdf1c1883c..4f63d73785d 100644 --- a/gdbserver/remote-utils.cc +++ b/gdbserver/remote-utils.cc @@ -102,6 +102,10 @@ static int remote_desc = -1; static int listen_desc = -1; #ifdef USE_WIN32API +/* gnulib wraps these as macros, undo them. */ +# undef read +# undef write + # define read(fd, buf, len) recv (fd, (char *) buf, len, 0) # define write(fd, buf, len) send (fd, (char *) buf, len, 0) #endif |