summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/c-typeck.c2
-rw-r--r--gcc/ch/ChangeLog4
-rw-r--r--gcc/ch/expr.c6
-rw-r--r--gcc/config/i386/i386.h16
-rw-r--r--gcc/config/mcore/mcore.h2
-rw-r--r--gcc/config/ns32k/ns32k.h4
-rw-r--r--gcc/config/rs6000/sysv4.h6
-rw-r--r--gcc/cppinit.c2
-rw-r--r--gcc/cppmacro.c2
-rw-r--r--gcc/fold-const.c4
-rw-r--r--gcc/gcc.c4
-rw-r--r--gcc/po/gcc.pot50
-rw-r--r--gcc/toplev.c2
14 files changed, 62 insertions, 50 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b93eae92048..abed16bef59 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index f3f7d096964..1c34502e61a 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -3393,7 +3393,7 @@ mark_addressable (exp)
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;
}
diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 2905f87c056..d0d4d95c521 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -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>
diff --git a/gcc/ch/expr.c b/gcc/ch/expr.c
index 9a1ab093ef1..da92ab9614b 100644
--- a/gcc/ch/expr.c
+++ b/gcc/ch/expr.c
@@ -1484,7 +1484,7 @@ build_chill_descr (expr)
/* 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 @@ build_generalized_call (func, args)
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));
}
}
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index cfbb10b18dd..a95a23e7770 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -353,25 +353,25 @@ extern int x86_prefetch_sse;
{ "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, \
diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h
index 09371c47a16..7bced8ea8b5 100644
--- a/gcc/config/mcore/mcore.h
+++ b/gcc/config/mcore/mcore.h
@@ -139,7 +139,7 @@ extern int target_flags;
{"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, \
diff --git a/gcc/config/ns32k/ns32k.h b/gcc/config/ns32k/ns32k.h
index fb2cd4d908d..f4d52b2fc1b 100644
--- a/gcc/config/ns32k/ns32k.h
+++ b/gcc/config/ns32k/ns32k.h
@@ -113,8 +113,8 @@ extern int target_flags;
{ "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")}, \
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index db9458985a3..56e16ba7877 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -101,9 +101,9 @@ extern int g_switch_set; /* Whether -G xx was passed. */
#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 @@ extern int g_switch_set; /* Whether -G xx was passed. */
{ "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, \
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 7c9e79de4b1..374f5c299f6 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -1000,7 +1000,7 @@ cpp_finish_options (pfile)
{
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)
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index d6f021b67b5..8a4a6401b18 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -145,7 +145,7 @@ builtin_macro (pfile, node)
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:
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index edf934db9bc..8ac7f5107b2 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3117,7 +3117,7 @@ optimize_bit_field_compare (code, compare_type, lhs, rhs)
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 @@ optimize_bit_field_compare (code, compare_type, lhs, rhs)
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
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 81d16754b43..2dc7b72af36 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1463,7 +1463,7 @@ init_spec ()
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 @@ display_help ()
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);
diff --git a/gcc/po/gcc.pot b/gcc/po/gcc.pot
index c16b46319d7..82bcea95836 100644
--- a/gcc/po/gcc.pot
+++ b/gcc/po/gcc.pot
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-12-15 19:58+0000\n"
+"POT-Creation-Date: 2001-12-15 20:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2920,7 +2920,7 @@ msgstr ""
#: c-typeck.c:3396
#, c-format
-msgid "cannot take address of bitfield `%s'"
+msgid "cannot take address of bit-field `%s'"
msgstr ""
#: c-typeck.c:3424 ch/typeck.c:3676 ch/xtypeck.c:62
@@ -4021,7 +4021,7 @@ msgid "End of search list.\n"
msgstr ""
#: cppinit.c:1003
-msgid "<builtin>"
+msgid "<built-in>"
msgstr ""
#: cppinit.c:1005
@@ -4605,7 +4605,7 @@ msgstr ""
#: cppmacro.c:148
#, c-format
-msgid "invalid builtin macro \"%s\""
+msgid "invalid built-in macro \"%s\""
msgstr ""
#: cppmacro.c:347
@@ -4953,7 +4953,7 @@ msgstr ""
#: fold-const.c:3120 fold-const.c:3133
#, c-format
-msgid "comparison is always %d due to width of bitfield"
+msgid "comparison is always %d due to width of bit-field"
msgstr ""
#: fold-const.c:4175 fold-const.c:4192
@@ -5014,7 +5014,7 @@ msgid "extraneous argument to `%s' option"
msgstr ""
#: gcc.c:1466
-msgid "Using builtin specs.\n"
+msgid "Using built-in specs.\n"
msgstr ""
#: gcc.c:1640
@@ -5206,7 +5206,7 @@ msgstr ""
#: gcc.c:3056
msgid ""
-" -specs=<file> Override builtin specs with the contents of "
+" -specs=<file> Override built-in specs with the contents of "
"<file>\n"
msgstr ""
@@ -6992,7 +6992,7 @@ msgid "Determine language standard"
msgstr ""
#: toplev.c:1196
-msgid "Make bitfields by unsigned by default"
+msgid "Make bit-fields by unsigned by default"
msgstr ""
#: toplev.c:1200
@@ -10102,35 +10102,35 @@ msgid "Do not use push instructions to save outgoing arguments"
msgstr ""
#: config/i386/i386.h:356
-msgid "Support MMX builtins"
+msgid "Support MMX built-in functions"
msgstr ""
#: config/i386/i386.h:358
-msgid "Do not support MMX builtins"
+msgid "Do not support MMX built-in functions"
msgstr ""
#: config/i386/i386.h:361
-msgid "Support 3DNow! builtins"
+msgid "Support 3DNow! built-in functions"
msgstr ""
#: config/i386/i386.h:364
-msgid "Do not support 3DNow! builtins"
+msgid "Do not support 3DNow! built-in functions"
msgstr ""
#: config/i386/i386.h:366
-msgid "Support MMX and SSE builtins and code generation"
+msgid "Support MMX and SSE built-in functions and code generation"
msgstr ""
#: config/i386/i386.h:369
-msgid "Do not support MMX and SSE builtins and code generation"
+msgid "Do not support MMX and SSE built-in functions and code generation"
msgstr ""
#: config/i386/i386.h:371
-msgid "Support MMX, SSE and SSE2 builtins and code generation"
+msgid "Support MMX, SSE and SSE2 built-in functions and code generation"
msgstr ""
#: config/i386/i386.h:374
-msgid "Do not support MMX, SSE and SSE2 builtins and code generation"
+msgid "Do not support MMX, SSE and SSE2 built-in functions and code generation"
msgstr ""
#: config/i386/i386.h:376
@@ -11038,7 +11038,7 @@ msgid "Do not arbitary sized immediates in bit operations"
msgstr ""
#: config/mcore/mcore.h:142
-msgid "Always treat bitfield as int-sized"
+msgid "Always treat bit-field as int-sized"
msgstr ""
#: config/mcore/mcore.h:146
@@ -11689,11 +11689,11 @@ msgid "Do not use register sb"
msgstr ""
#: config/ns32k/ns32k.h:116
-msgid "Do not use bitfield instructions"
+msgid "Do not use bit-field instructions"
msgstr ""
#: config/ns32k/ns32k.h:117
-msgid "Use bitfield instructions"
+msgid "Use bit-field instructions"
msgstr ""
#: config/ns32k/ns32k.h:118
@@ -12221,11 +12221,11 @@ msgid "Select method for sdata handling"
msgstr ""
#: config/rs6000/sysv4.h:104
-msgid "Align to the base type of the bitfield"
+msgid "Align to the base type of the bit-field"
msgstr ""
#: config/rs6000/sysv4.h:106
-msgid "Don't align to the base type of the bitfield"
+msgid "Don't align to the base type of the bit-field"
msgstr ""
#: config/rs6000/sysv4.h:108
@@ -12270,7 +12270,7 @@ msgid "Don't use EABI"
msgstr ""
#: config/rs6000/sysv4.h:137
-msgid "Do not allow bitfields to cross word boundaries"
+msgid "Do not allow bit-fields to cross word boundaries"
msgstr ""
#: config/rs6000/sysv4.h:139
@@ -13482,7 +13482,7 @@ msgid "CARD argument must be powerset mode"
msgstr ""
#: ch/expr.c:1487
-msgid "expression for DESCR-builtin must be referable"
+msgid "expression for DESCR-built-in must be referable"
msgstr ""
#: ch/expr.c:1535
@@ -13650,12 +13650,12 @@ msgstr ""
#: ch/expr.c:2977
#, c-format
-msgid "unimplemented builtin function `%s'"
+msgid "unimplemented built-in function `%s'"
msgstr ""
#: ch/expr.c:2981
#, c-format
-msgid "internal error - bad builtin function `%s'"
+msgid "internal error - bad built-in function `%s'"
msgstr ""
#: ch/expr.c:2995
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 910296b4d8a..342c6cc1467 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1193,7 +1193,7 @@ documented_lang_options[] =
{ "-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",
View Lorry Controller Status