aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorSandra Loosemore <sandra@codesourcery.com>2019-01-09 13:59:16 -0800
committerSandra Loosemore <sandra@codesourcery.com>2019-01-09 13:59:16 -0800
commita08da33eb3f69dec01810440a40c77ed56a79b69 (patch)
treef3aafc631bfdd3154ca7168e359d3a2e724f7344 /libiberty
parent669e09f609d30e070dc26db34d938a0888a01928 (diff)
downloadgdb-a08da33eb3f69dec01810440a40c77ed56a79b69.zip
gdb-a08da33eb3f69dec01810440a40c77ed56a79b69.tar.gz
gdb-a08da33eb3f69dec01810440a40c77ed56a79b69.tar.bz2
Merge from gcc: use "cannot" instead of "can not" in libiberty and include.
2019-01-09 Sandra Loosemore <sandra@codesourcery.com> Merge from GCC: 2019-01-09 Sandra Loosemore <sandra@codesourcery.com> PR other/16615 [2/5] include/ * libiberty.h: Mechanically replace "can not" with "cannot". * plugin-api.h: Likewise. libiberty/ * cp-demangle.c: Mechanically replace "can not" with "cannot". * floatformat.c: Likewise. * strerror.c: Likewise.
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog9
-rw-r--r--libiberty/cp-demangle.c4
-rw-r--r--libiberty/floatformat.c2
-rw-r--r--libiberty/strerror.c2
4 files changed, 13 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6859027..2ada84e 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,12 @@
+2019-01-09 Sandra Loosemore <sandra@codesourcery.com>
+
+ Merge from GCC:
+ PR other/16615
+
+ * cp-demangle.c: Mechanically replace "can not" with "cannot".
+ * floatformat.c: Likewise.
+ * strerror.c: Likewise.
+
2018-12-07 Nick Clifton <nickc@redhat.com>
PR 87681
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 4624cd5..ddcd3be 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -6201,13 +6201,13 @@ cplus_demangle_init_info (const char *mangled, int options, size_t len,
di->n = mangled;
- /* We can not need more components than twice the number of chars in
+ /* We cannot need more components than twice the number of chars in
the mangled string. Most components correspond directly to
chars, but the ARGLIST types are exceptions. */
di->num_comps = 2 * len;
di->next_comp = 0;
- /* Similarly, we can not need more substitutions than there are
+ /* Similarly, we cannot need more substitutions than there are
chars in the mangled string. */
di->num_subs = len;
di->next_sub = 0;
diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c
index 2c6c6ab..8632253 100644
--- a/libiberty/floatformat.c
+++ b/libiberty/floatformat.c
@@ -489,7 +489,7 @@ floatformat_to_double (const struct floatformat *fmt,
int nan = mant_bits_set (fmt, ufrom);
/* On certain systems (such as GNU/Linux), the use of the
- INFINITY macro below may generate a warning that can not be
+ INFINITY macro below may generate a warning that cannot be
silenced due to a bug in GCC (PR preprocessor/11931). The
preprocessor fails to recognise the __extension__ keyword in
conjunction with the GNU/C99 extension for hexadecimal
diff --git a/libiberty/strerror.c b/libiberty/strerror.c
index a8a0bd1..cc7692c 100644
--- a/libiberty/strerror.c
+++ b/libiberty/strerror.c
@@ -299,7 +299,7 @@ static const struct error_info error_table[] =
ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
#endif
#if defined (ELIBACC)
- ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"),
+ ENTRY(ELIBACC, "ELIBACC", "Cannot access a needed shared library"),
#endif
#if defined (ELIBBAD)
ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),