aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog8
-rw-r--r--include/libiberty.h4
-rw-r--r--include/plugin-api.h2
3 files changed, 11 insertions, 3 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