diff options
| -rw-r--r-- | gdbserver/ChangeLog | 4 | ||||
| -rw-r--r-- | gdbserver/Makefile.in | 2 | ||||
| -rw-r--r-- | gdbsupport/ChangeLog | 11 | ||||
| -rw-r--r-- | gdbsupport/common-utils.cc | 22 |
4 files changed, 27 insertions, 12 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 700da6e..9756d4c 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-12-11 Andrew Burgess <andrew.burgess@embecosm.com> + + * Makefile.in (IPA_LIB): Include libiberty library. + 2020-11-11 Andrew Burgess <andrew.burgess@embecosm.com> * server.cc (gdbserver_usage): Add missing option to usage text. diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index 1969ed0..e12848c 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -395,7 +395,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ $(CXXFLAGS) \ - -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread + -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY) -ldl -pthread # Put the proper machine-specific files first, so M-. on a machine # specific routine gets the one for the correct machine. diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 6be1f24..cc21b0b 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,14 @@ +2020-12-11 Andrew Burgess <andrew.burgess@embecosm.com> + + * gdbsupport/common-utils.cc: Change 'ctype.h' include to + 'safe-ctype.h'. + (extract_string_maybe_quoted): Use safe-ctype function versions. + (is_digit_in_base): Likewise. + (digit_to_int): Likewise. + (strtoulst): Likewise. + (skip_spaces): Likewise. + (skip_to_space): Likewise. + 2020-12-11 Simon Marchi <simon.marchi@polymtl.ca> * common-debug.h (debug_prefixed_printf_cond): New. diff --git a/gdbsupport/common-utils.cc b/gdbsupport/common-utils.cc index b5e4d29..4f5c26d 100644 --- a/gdbsupport/common-utils.cc +++ b/gdbsupport/common-utils.cc @@ -20,7 +20,7 @@ #include "common-defs.h" #include "common-utils.h" #include "host-defs.h" -#include <ctype.h> +#include "safe-ctype.h" void * xzalloc (size_t size) @@ -177,7 +177,7 @@ extract_string_maybe_quoted (const char **arg) /* Parse p similarly to gdb_argv buildargv function. */ while (*p != '\0') { - if (isspace (*p) && !squote && !dquote && !bsquote) + if (ISSPACE (*p) && !squote && !dquote && !bsquote) break; else { @@ -230,21 +230,21 @@ extract_string_maybe_quoted (const char **arg) static int is_digit_in_base (unsigned char digit, int base) { - if (!isalnum (digit)) + if (!ISALNUM (digit)) return 0; if (base <= 10) - return (isdigit (digit) && digit < base + '0'); + return (ISDIGIT (digit) && digit < base + '0'); else - return (isdigit (digit) || tolower (digit) < base - 10 + 'a'); + return (ISDIGIT (digit) || TOLOWER (digit) < base - 10 + 'a'); } static int digit_to_int (unsigned char c) { - if (isdigit (c)) + if (ISDIGIT (c)) return c - '0'; else - return tolower (c) - 'a' + 10; + return TOLOWER (c) - 'a' + 10; } /* As for strtoul, but for ULONGEST results. */ @@ -258,7 +258,7 @@ strtoulst (const char *num, const char **trailer, int base) int i = 0; /* Skip leading whitespace. */ - while (isspace (num[i])) + while (ISSPACE (num[i])) i++; /* Handle prefixes. */ @@ -325,7 +325,7 @@ skip_spaces (char *chp) { if (chp == NULL) return NULL; - while (*chp && isspace (*chp)) + while (*chp && ISSPACE (*chp)) chp++; return chp; } @@ -337,7 +337,7 @@ skip_spaces (const char *chp) { if (chp == NULL) return NULL; - while (*chp && isspace (*chp)) + while (*chp && ISSPACE (*chp)) chp++; return chp; } @@ -349,7 +349,7 @@ skip_to_space (const char *chp) { if (chp == NULL) return NULL; - while (*chp && !isspace (*chp)) + while (*chp && !ISSPACE (*chp)) chp++; return chp; } |