aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/ChangeLog8
-rw-r--r--include/libiberty.h4
-rw-r--r--include/plugin-api.h2
-rw-r--r--libiberty/ChangeLog9
-rw-r--r--libiberty/cp-demangle.c4
-rw-r--r--libiberty/floatformat.c2
-rw-r--r--libiberty/strerror.c2
7 files changed, 24 insertions, 7 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 939eec9..626ed4c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,11 @@
+2019-01-09 Sandra Loosemore <sandra@codesourcery.com>
+
+ Merge from GCC:
+ PR other/16615
+
+ * libiberty.h: Mechanically replace "can not" with "cannot".
+ * plugin-api.h: Likewise.
+
2018-12-25 Yoshinori Sato <ysato@users.sourceforge.jp>
* elf/rx.h (EF_RX_CPU_MASK): Update new bits.
diff --git a/include/libiberty.h b/include/libiberty.h
index d9c0b25..5747613 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -558,7 +558,7 @@ extern FILE *pex_input_file (struct pex_obj *obj, int flags,
extern FILE *pex_input_pipe (struct pex_obj *obj, int binary);
/* Read the standard output of the last program to be executed.
- pex_run can not be called after this. BINARY should be non-zero if
+ pex_run cannot be called after this. BINARY should be non-zero if
the file should be opened in binary mode; this is ignored on Unix.
Returns NULL on error. Don't call fclose on the returned FILE; it
will be closed by pex_free. */
@@ -566,7 +566,7 @@ extern FILE *pex_input_pipe (struct pex_obj *obj, int binary);
extern FILE *pex_read_output (struct pex_obj *, int binary);
/* Read the standard error of the last program to be executed.
- pex_run can not be called after this. BINARY should be non-zero if
+ pex_run cannot be called after this. BINARY should be non-zero if
the file should be opened in binary mode; this is ignored on Unix.
Returns NULL on error. Don't call fclose on the returned FILE; it
will be closed by pex_free. */
diff --git a/include/plugin-api.h b/include/plugin-api.h
index 174f01c..2076bda 100644
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -34,7 +34,7 @@
#include <sys/types.h>
#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && \
!defined(UINT64_MAX) && !defined(uint64_t)
-#error can not find uint64_t type
+#error cannot find uint64_t type
#endif
#ifdef __cplusplus
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"),