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.
This commit is contained in:
Sandra Loosemore 2019-01-09 13:59:16 -08:00
parent 669e09f609
commit a08da33eb3
7 changed files with 24 additions and 7 deletions

View file

@ -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> 2018-12-25 Yoshinori Sato <ysato@users.sourceforge.jp>
* elf/rx.h (EF_RX_CPU_MASK): Update new bits. * elf/rx.h (EF_RX_CPU_MASK): Update new bits.

View file

@ -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); extern FILE *pex_input_pipe (struct pex_obj *obj, int binary);
/* Read the standard output of the last program to be executed. /* 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. 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 Returns NULL on error. Don't call fclose on the returned FILE; it
will be closed by pex_free. */ 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); extern FILE *pex_read_output (struct pex_obj *, int binary);
/* Read the standard error of the last program to be executed. /* 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. 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 Returns NULL on error. Don't call fclose on the returned FILE; it
will be closed by pex_free. */ will be closed by pex_free. */

View file

@ -34,7 +34,7 @@
#include <sys/types.h> #include <sys/types.h>
#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && \ #if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && \
!defined(UINT64_MAX) && !defined(uint64_t) !defined(UINT64_MAX) && !defined(uint64_t)
#error can not find uint64_t type #error cannot find uint64_t type
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

View file

@ -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> 2018-12-07 Nick Clifton <nickc@redhat.com>
PR 87681 PR 87681

View file

@ -6201,13 +6201,13 @@ cplus_demangle_init_info (const char *mangled, int options, size_t len,
di->n = mangled; 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 the mangled string. Most components correspond directly to
chars, but the ARGLIST types are exceptions. */ chars, but the ARGLIST types are exceptions. */
di->num_comps = 2 * len; di->num_comps = 2 * len;
di->next_comp = 0; 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. */ chars in the mangled string. */
di->num_subs = len; di->num_subs = len;
di->next_sub = 0; di->next_sub = 0;

View file

@ -489,7 +489,7 @@ floatformat_to_double (const struct floatformat *fmt,
int nan = mant_bits_set (fmt, ufrom); int nan = mant_bits_set (fmt, ufrom);
/* On certain systems (such as GNU/Linux), the use of the /* 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 silenced due to a bug in GCC (PR preprocessor/11931). The
preprocessor fails to recognise the __extension__ keyword in preprocessor fails to recognise the __extension__ keyword in
conjunction with the GNU/C99 extension for hexadecimal conjunction with the GNU/C99 extension for hexadecimal

View file

@ -299,7 +299,7 @@ static const struct error_info error_table[] =
ENTRY(EREMCHG, "EREMCHG", "Remote address changed"), ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
#endif #endif
#if defined (ELIBACC) #if defined (ELIBACC)
ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"), ENTRY(ELIBACC, "ELIBACC", "Cannot access a needed shared library"),
#endif #endif
#if defined (ELIBBAD) #if defined (ELIBBAD)
ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"), ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),