This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to use "built-in" and "bit-field" spellings in messages
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 15 Dec 2001 20:33:25 +0000 (GMT)
- Subject: Patch to use "built-in" and "bit-field" spellings in messages
This patch makes messages use the spellings "built-in" and
"bit-field", as described in codingconventions.html. Applied to
mainline.
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 1.12332
diff -u -r1.12332 ChangeLog
--- ChangeLog 2001/12/15 20:06:06 1.12332
+++ ChangeLog 2001/12/15 20:29:06
@@ -1,5 +1,13 @@
2001-12-15 Joseph S. Myers <jsm28@cam.ac.uk>
+ * c-typeck.c, config/i386/i386.h, config/mcore/mcore.h,
+ config/ns32k/ns32k.h, config/rs6000/sysv4.h, fold-const.c,
+ toplev.c, cppinit.c, cppmacro.c, gcc.c: Use "built-in" and
+ "bit-field" spellings in messages.
+ * po/gcc.pot: Regenerate.
+
+2001-12-15 Joseph S. Myers <jsm28@cam.ac.uk>
+
* gcc.c, config/fr30/fr30.c, config/v850/v850-c.c, toplev.c: Use
American spelling in messages.
* po/gcc.pot: Regenerate.
Index: c-typeck.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-typeck.c,v
retrieving revision 1.159
diff -u -r1.159 c-typeck.c
--- c-typeck.c 2001/12/12 19:12:13 1.159
+++ c-typeck.c 2001/12/15 20:29:06
@@ -3393,7 +3393,7 @@
case COMPONENT_REF:
if (DECL_C_BIT_FIELD (TREE_OPERAND (x, 1)))
{
- error ("cannot take address of bitfield `%s'",
+ error ("cannot take address of bit-field `%s'",
IDENTIFIER_POINTER (DECL_NAME (TREE_OPERAND (x, 1))));
return 0;
}
Index: fold-const.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fold-const.c,v
retrieving revision 1.178
diff -u -r1.178 fold-const.c
--- fold-const.c 2001/12/09 20:13:04 1.178
+++ fold-const.c 2001/12/15 20:29:07
@@ -3117,7 +3117,7 @@
convert (unsigned_type, rhs),
size_int (lbitsize), 0)))
{
- warning ("comparison is always %d due to width of bitfield",
+ warning ("comparison is always %d due to width of bit-field",
code == NE_EXPR);
return convert (compare_type,
(code == NE_EXPR
@@ -3130,7 +3130,7 @@
size_int (lbitsize - 1), 0);
if (! integer_zerop (tem) && ! integer_all_onesp (tem))
{
- warning ("comparison is always %d due to width of bitfield",
+ warning ("comparison is always %d due to width of bit-field",
code == NE_EXPR);
return convert (compare_type,
(code == NE_EXPR
Index: toplev.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.c,v
retrieving revision 1.558
diff -u -r1.558 toplev.c
--- toplev.c 2001/12/15 20:06:09 1.558
+++ toplev.c 2001/12/15 20:29:07
@@ -1193,7 +1193,7 @@
{ "-fsigned-bitfields", "" },
{ "-funsigned-bitfields",
- N_("Make bitfields by unsigned by default") },
+ N_("Make bit-fields by unsigned by default") },
{ "-fno-signed-bitfields", "" },
{ "-fno-unsigned-bitfields","" },
{ "-fsigned-char",
Index: cppinit.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cppinit.c,v
retrieving revision 1.193
diff -u -r1.193 cppinit.c
--- cppinit.c 2001/12/03 19:13:21 1.193
+++ cppinit.c 2001/12/15 20:29:08
@@ -1000,7 +1000,7 @@
{
struct pending_option *p;
- _cpp_do_file_change (pfile, LC_RENAME, _("<builtin>"), 1, 0);
+ _cpp_do_file_change (pfile, LC_RENAME, _("<built-in>"), 1, 0);
init_builtins (pfile);
_cpp_do_file_change (pfile, LC_RENAME, _("<command line>"), 1, 0);
for (p = CPP_OPTION (pfile, pending)->directive_head; p; p = p->next)
Index: cppmacro.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cppmacro.c,v
retrieving revision 1.88
diff -u -r1.88 cppmacro.c
--- cppmacro.c 2001/12/01 18:42:36 1.88
+++ cppmacro.c 2001/12/15 20:29:08
@@ -145,7 +145,7 @@
switch (node->value.builtin)
{
default:
- cpp_ice (pfile, "invalid builtin macro \"%s\"", NODE_NAME (node));
+ cpp_ice (pfile, "invalid built-in macro \"%s\"", NODE_NAME (node));
return 0;
case BT_FILE:
Index: gcc.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcc.c,v
retrieving revision 1.279
diff -u -r1.279 gcc.c
--- gcc.c 2001/12/15 20:06:09 1.279
+++ gcc.c 2001/12/15 20:29:08
@@ -1463,7 +1463,7 @@
return; /* Already initialized. */
if (verbose_flag)
- notice ("Using builtin specs.\n");
+ notice ("Using built-in specs.\n");
#ifdef EXTRA_SPECS
extra_specs = (struct spec_list *)
@@ -3053,7 +3053,7 @@
fputs (_(" -save-temps Do not delete intermediate files\n"), stdout);
fputs (_(" -pipe Use pipes rather than intermediate files\n"), stdout);
fputs (_(" -time Time the execution of each subprocess\n"), stdout);
- fputs (_(" -specs=<file> Override builtin specs with the contents of <file>\n"), stdout);
+ fputs (_(" -specs=<file> Override built-in specs with the contents of <file>\n"), stdout);
fputs (_(" -std=<standard> Assume that the input sources are for <standard>\n"), stdout);
fputs (_(" -B <directory> Add <directory> to the compiler's search paths\n"), stdout);
fputs (_(" -b <machine> Run gcc for target <machine>, if installed\n"), stdout);
Index: config/i386/i386.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/i386.h,v
retrieving revision 1.224
diff -u -r1.224 i386.h
--- i386.h 2001/12/14 20:27:05 1.224
+++ i386.h 2001/12/15 20:29:09
@@ -353,25 +353,25 @@
{ "no-accumulate-outgoing-args",MASK_ACCUMULATE_OUTGOING_ARGS_SET, \
N_("Do not use push instructions to save outgoing arguments") }, \
{ "mmx", MASK_MMX | MASK_MMX_SET, \
- N_("Support MMX builtins") }, \
+ N_("Support MMX built-in functions") }, \
{ "no-mmx", -MASK_MMX, \
- N_("Do not support MMX builtins") }, \
+ N_("Do not support MMX built-in functions") }, \
{ "no-mmx", MASK_MMX_SET, N_("") }, \
{ "3dnow", MASK_3DNOW | MASK_3DNOW_SET, \
- N_("Support 3DNow! builtins") }, \
+ N_("Support 3DNow! built-in functions") }, \
{ "no-3dnow", -MASK_3DNOW, N_("") }, \
{ "no-3dnow", MASK_3DNOW_SET, \
- N_("Do not support 3DNow! builtins") }, \
+ N_("Do not support 3DNow! built-in functions") }, \
{ "sse", MASK_SSE | MASK_SSE_SET, \
- N_("Support MMX and SSE builtins and code generation") }, \
+ N_("Support MMX and SSE built-in functions and code generation") }, \
{ "no-sse", -MASK_SSE, N_("") }, \
{ "no-sse", MASK_SSE_SET, \
- N_("Do not support MMX and SSE builtins and code generation") }, \
+ N_("Do not support MMX and SSE built-in functions and code generation") },\
{ "sse2", MASK_SSE2 | MASK_SSE2_SET, \
- N_("Support MMX, SSE and SSE2 builtins and code generation") }, \
+ N_("Support MMX, SSE and SSE2 built-in functions and code generation") }, \
{ "no-sse2", -MASK_SSE2, N_("") }, \
{ "no-sse2", MASK_SSE2_SET, \
- N_("Do not support MMX, SSE and SSE2 builtins and code generation") }, \
+ N_("Do not support MMX, SSE and SSE2 built-in functions and code generation") }, \
{ "128bit-long-double", MASK_128BIT_LONG_DOUBLE, \
N_("sizeof(long double) is 16") }, \
{ "96bit-long-double", -MASK_128BIT_LONG_DOUBLE, \
Index: config/mcore/mcore.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mcore/mcore.h,v
retrieving revision 1.20
diff -u -r1.20 mcore.h
--- mcore.h 2001/12/09 20:13:15 1.20
+++ mcore.h 2001/12/15 20:29:09
@@ -139,7 +139,7 @@
{"no-relax-immediates", - RELAX_IMM_BIT, \
N_("Do not arbitary sized immediates in bit operations") }, \
{"wide-bitfields", W_FIELD_BIT, \
- N_("Always treat bitfield as int-sized") }, \
+ N_("Always treat bit-field as int-sized") }, \
{"no-wide-bitfields", - W_FIELD_BIT, \
"" }, \
{"4byte-functions", OVERALIGN_FUNC_BIT, \
Index: config/ns32k/ns32k.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/ns32k/ns32k.h,v
retrieving revision 1.27
diff -u -r1.27 ns32k.h
--- ns32k.h 2001/11/04 02:51:26 1.27
+++ ns32k.h 2001/12/15 20:29:09
@@ -113,8 +113,8 @@
{ "sb", -32, \
N_("Register sb is zero. Use for absolute addressing")}, \
{ "nosb", 32, N_("Do not use register sb")}, \
- { "bitfield", -64, N_("Do not use bitfield instructions")}, \
- { "nobitfield", 64, N_("Use bitfield instructions")}, \
+ { "bitfield", -64, N_("Do not use bit-field instructions")}, \
+ { "nobitfield", 64, N_("Use bit-field instructions")}, \
{ "himem", 128, N_("Generate code for high memory")}, \
{ "nohimem", -128, N_("Generate code for low memory")}, \
{ "32381", 256, N_("32381 fpu")}, \
Index: config/rs6000/sysv4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/rs6000/sysv4.h,v
retrieving revision 1.76
diff -u -r1.76 sysv4.h
--- sysv4.h 2001/12/03 19:13:36 1.76
+++ sysv4.h 2001/12/15 20:29:10
@@ -101,9 +101,9 @@
#undef SUBTARGET_SWITCHES
#define SUBTARGET_SWITCHES \
{ "bit-align", -MASK_NO_BITFIELD_TYPE, \
- N_("Align to the base type of the bitfield") }, \
+ N_("Align to the base type of the bit-field") }, \
{ "no-bit-align", MASK_NO_BITFIELD_TYPE, \
- N_("Don't align to the base type of the bitfield") }, \
+ N_("Don't align to the base type of the bit-field") }, \
{ "strict-align", MASK_STRICT_ALIGN, \
N_("Don't assume that unaligned accesses are handled by the system") }, \
{ "no-strict-align", -MASK_STRICT_ALIGN, \
@@ -134,7 +134,7 @@
{ "no-eabi", -MASK_EABI, N_("Don't use EABI") }, \
{ "bit-word", -MASK_NO_BITFIELD_WORD, "" }, \
{ "no-bit-word", MASK_NO_BITFIELD_WORD, \
- N_("Do not allow bitfields to cross word boundaries") }, \
+ N_("Do not allow bit-fields to cross word boundaries") }, \
{ "regnames", MASK_REGNAMES, \
N_("Use alternate register names") }, \
{ "no-regnames", -MASK_REGNAMES, \
Index: ch/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ch/ChangeLog,v
retrieving revision 1.136
diff -u -r1.136 ChangeLog
--- ChangeLog 2001/12/15 20:06:10 1.136
+++ ChangeLog 2001/12/15 20:29:12
@@ -1,5 +1,9 @@
2001-12-15 Joseph S. Myers <jsm28@cam.ac.uk>
+ * expr.c: Use "built-in" spelling in messages.
+
+2001-12-15 Joseph S. Myers <jsm28@cam.ac.uk>
+
* decl.c, parse.c, typeck.c: Use American spelling in messages.
2001-12-10 Joseph S. Myers <jsm28@cam.ac.uk>
Index: ch/expr.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ch/expr.c,v
retrieving revision 1.20
diff -u -r1.20 expr.c
--- expr.c 2001/12/03 19:13:23 1.20
+++ expr.c 2001/12/15 20:29:12
@@ -1484,7 +1484,7 @@
/* check for expression is referable */
if (! CH_REFERABLE (expr))
{
- error ("expression for DESCR-builtin must be referable");
+ error ("expression for DESCR-built-in must be referable");
return error_mark_node;
}
@@ -2974,11 +2974,11 @@
case BUILT_IN_EXPIRED:
case BUILT_IN_WAIT:
- sorry ("unimplemented builtin function `%s'",
+ sorry ("unimplemented built-in function `%s'",
IDENTIFIER_POINTER (fnname));
break;
default:
- error ("internal error - bad builtin function `%s'",
+ error ("internal error - bad built-in function `%s'",
IDENTIFIER_POINTER (fnname));
}
}
--
Joseph S. Myers
jsm28@cam.ac.uk