* cpplib.c (cpp_init_internal_pragmas): Remove #pragma poison.

	* cppmacro.c (paste_all_tokens): Bad pastes are a hard error.
doc:
	* cpp.texi: Update for removal of obsolete features.
testsuite:
	* gcc.dg/cpp/poison.c: Update.
	* gcc.dg/cpp/20000625-2.c: Remove.
	* gcc.dg/cpp/direct2s.c: Remove final test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53333 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 3 deletions

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index c90224c0b0a..2773ed93e4e 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -1049,7 +1049,6 @@ _cpp_init_internal_pragmas (pfile)
      cpp_reader *pfile;
 {
   /* Pragmas in the global namespace.  */
-  cpp_register_pragma (pfile, 0, "poison", do_pragma_poison);
   cpp_register_pragma (pfile, 0, "once", do_pragma_once);
 
   /* New GCC-specific pragmas should be put in the GCC namespace.  */
@@ -1122,8 +1121,8 @@ do_pragma_once (pfile)
   check_eol (pfile);
 }
 
-/* Handle #pragma poison, to poison one or more identifiers so that
-   the lexer produces a hard error for each subsequent usage.  */
+/* Handle #pragma GCC poison, to poison one or more identifiers so
+   that the lexer produces a hard error for each subsequent usage.  */
 static void
 do_pragma_poison (pfile)
      cpp_reader *pfile;