diff options
| author | Neil Booth <neilb@earthling.net> | 2000-11-27 19:08:36 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-11-27 19:08:36 +0000 |
| commit | 6a6b162822130013ab558c9bb4dda88874ee48f1 (patch) | |
| tree | 376dab862876e9b09630f6d229b81ba1eeb2fa61 /gcc/cppinit.c | |
| parent | fb6a7b08a80113867aaeaa3d4dc6bcade0a57699 (diff) | |
| download | gcc-6a6b162822130013ab558c9bb4dda88874ee48f1.tar.gz | |
cppinit.c (cpp_reader_init): Remove handling of warn_paste command line options.
* cppinit.c (cpp_reader_init): Remove handling of warn_paste
command line options.
(cpp_handle_option): Similarly.
* cpplib.h (struct cpp_options): Remove warn_paste.
* cppmacro.c (paste_tokens): Apart from assembler, make
unpasteable token warning mandatory.
From-SVN: r37804
Diffstat (limited to 'gcc/cppinit.c')
| -rw-r--r-- | gcc/cppinit.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c index e0b7c4e28ad..daa8a87840d 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -536,7 +536,6 @@ cpp_reader_init (pfile, lang) } CPP_OPTION (pfile, warn_import) = 1; - CPP_OPTION (pfile, warn_paste) = 1; CPP_OPTION (pfile, discard_comments) = 1; CPP_OPTION (pfile, show_column) = 1; CPP_OPTION (pfile, tabstop) = 8; @@ -972,10 +971,6 @@ cpp_start_read (pfile, fname) if (CPP_OPTION (pfile, cplusplus)) CPP_OPTION (pfile, warn_traditional) = 0; - /* Do not warn about invalid token pasting if -lang-asm. */ - if (CPP_OPTION (pfile, lang) == CLK_ASM) - CPP_OPTION (pfile, warn_paste) = 0; - /* Set this if it hasn't been set already. */ if (CPP_OPTION (pfile, user_label_prefix) == NULL) CPP_OPTION (pfile, user_label_prefix) = USER_LABEL_PREFIX; @@ -1690,8 +1685,6 @@ cpp_handle_option (pfile, argc, argv) CPP_OPTION (pfile, warn_undef) = 1; else if (!strcmp (argv[i], "-Wimport")) CPP_OPTION (pfile, warn_import) = 1; - else if (!strcmp (argv[i], "-Wpaste")) - CPP_OPTION (pfile, warn_paste) = 1; else if (!strcmp (argv[i], "-Werror")) CPP_OPTION (pfile, warnings_are_errors) = 1; else if (!strcmp (argv[i], "-Wsystem-headers")) @@ -1708,8 +1701,6 @@ cpp_handle_option (pfile, argc, argv) CPP_OPTION (pfile, warn_undef) = 0; else if (!strcmp (argv[i], "-Wno-import")) CPP_OPTION (pfile, warn_import) = 0; - else if (!strcmp (argv[i], "-Wno-paste")) - CPP_OPTION (pfile, warn_paste) = 0; else if (!strcmp (argv[i], "-Wno-error")) CPP_OPTION (pfile, warnings_are_errors) = 0; else if (!strcmp (argv[i], "-Wno-system-headers")) |