aboutsummaryrefslogtreecommitdiff
path: root/gcc/cccp.c
diff options
context:
space:
mode:
authorZack Weinberg <zack@wolery.cumb.org>2000-02-28 21:09:54 +0000
committerZack Weinberg <zack@gcc.gnu.org>2000-02-28 21:09:54 +0000
commit0209c3409db623d68cdb98063a40c7ea4ead7d6c (patch)
treef8b9f5609e8a8c18e6cf005e58e55445f517f8c8 /gcc/cccp.c
parent7cb4ce1205d29a7d8c18046f9683f08ffe539378 (diff)
downloadgcc-0209c3409db623d68cdb98063a40c7ea4ead7d6c.zip
gcc-0209c3409db623d68cdb98063a40c7ea4ead7d6c.tar.gz
gcc-0209c3409db623d68cdb98063a40c7ea4ead7d6c.tar.bz2
tm.texi: Document new target switch, NO_BUILTIN_WCHAR_TYPE.
* tm.texi: Document new target switch, NO_BUILTIN_WCHAR_TYPE. * cppinit.c (builtin_array): Define __WCHAR_TYPE__ only if NO_BUILTIN_WCHAR_TYPE is not defined. (CPP_WCHAR_TYPE): Delete. * cccp.c (main): Don't change wchar_type if cplusplus. (special_symbol, initialize_builtins): Honor NO_BUILTIN_WCHAR_TYPE. From-SVN: r32241
Diffstat (limited to 'gcc/cccp.c')
-rw-r--r--gcc/cccp.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/cccp.c b/gcc/cccp.c
index 724298d..901474b 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -1786,11 +1786,6 @@ main (argc, argv)
fp->nominal_fname_len = strlen (in_fname);
fp->lineno = 0;
- /* In C++, wchar_t is a distinct basic type, and we can expect
- __wchar_t to be defined by cc1plus. */
- if (cplusplus)
- wchar_type = "__wchar_t";
-
/* Install __LINE__, etc. Must follow initialize_char_syntax
and option processing. */
initialize_builtins (fp, &outbuf);
@@ -4273,9 +4268,11 @@ special_symbol (hp, op)
break;
#endif
+#ifndef NO_BUILTIN_WCHAR_TYPE
case T_WCHAR_TYPE:
buf = wchar_type;
break;
+#endif
case T_USER_LABEL_PREFIX_TYPE:
buf = user_label_prefix;
@@ -10298,7 +10295,9 @@ initialize_builtins (inp, outp)
#ifndef NO_BUILTIN_PTRDIFF_TYPE
install ((const U_CHAR *) "__PTRDIFF_TYPE__ ", -1, T_PTRDIFF_TYPE, NULL_PTR, -1);
#endif
+#ifndef NO_BUILTIN_WCHAR_TYPE
install ((const U_CHAR *) "__WCHAR_TYPE__", -1, T_WCHAR_TYPE, NULL_PTR, -1);
+#endif
install ((const U_CHAR *) "__USER_LABEL_PREFIX__", -1, T_USER_LABEL_PREFIX_TYPE,
NULL_PTR, -1);
install ((const U_CHAR *) "__REGISTER_PREFIX__", -1, T_REGISTER_PREFIX_TYPE,
@@ -10347,10 +10346,12 @@ initialize_builtins (inp, outp)
outp, dp);
#endif
+#ifndef NO_BUILTIN_WCHAR_TYPE
sprintf (directive, " __WCHAR_TYPE__ %s\n", wchar_type);
output_line_directive (inp, outp, 0, same_file);
pass_thru_directive (udirective, &udirective[strlen (directive)],
outp, dp);
+#endif
sprintf (directive, " __DATE__ \"%s %2d %4d\"\n",
monthnames[timebuf->tm_mon],