diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fa97ff80ace..a2e13ec0820 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* decl2.c (unsupported_options): Add new-abi.
+	* lang-options.h: Remove no longer supported options.
+
 2001-04-27  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* except.c (can_convert_eh): Don't check template parms,
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index cb7dd5e2a35..9bbfe3db2bb 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -487,6 +487,7 @@ static const char * const unsupported_options[] = {
   "enum-int-equiv",
   "guiding-decls",
   "labels-ok",
+  "new-abi",
   "nonnull-objects",
   "squangle",
   "strict-prototype",
diff --git a/gcc/cp/lang-options.h b/gcc/cp/lang-options.h
index 64fdf2a32e5..01b0fc3b7c2 100644
--- a/gcc/cp/lang-options.h
+++ b/gcc/cp/lang-options.h
@@ -26,8 +26,6 @@ DEFINE_LANG_NAME ("C++")
 
   { "-faccess-control", "" },
   { "-fno-access-control", "Do not obey access control semantics" },
-  { "-fall-virtual", "" },
-  { "-fno-all-virtual", "" },
   { "-falt-external-templates", "Change when template instances are emitted" },
   { "-fno-alt-external-templates", "" },
   { "-fansi-overloading", "" },
@@ -47,14 +45,10 @@ DEFINE_LANG_NAME ("C++")
   { "-fno-elide-constructors", "" },
   { "-fenforce-eh-specs", "" },
   { "-fno-enforce-eh-specs", "Do not generate code to check exception specifications" },
-  { "-fenum-int-equiv", "" },
-  { "-fno-enum-int-equiv", "" },
   { "-fexternal-templates", "" },
   { "-fno-external-templates", "" },
   { "-ffor-scope", "" },
   { "-fno-for-scope", "Scope of for-init-statement vars extends outside" },
-  { "-fguiding-decls", "Implement guiding declarations" },
-  { "-fno-guiding-decls", "" },
   { "-fgnu-keywords", "" },
   { "-fno-gnu-keywords", "Do not recognise GNU defined keywords" },
   { "-fhandle-exceptions", "" },
@@ -71,17 +65,10 @@ DEFINE_LANG_NAME ("C++")
   { "-fno-implicit-inline-templates", "Only emit explicit instatiations of inline templates" },
   { "-finit-priority", "" },
   { "-fno-init-priority", "" },
-  { "-flabels-ok", "Labels can be used as first class objects" },
-  { "-fno-labels-ok", "" },
   { "-fmemoize-lookups", "" },
   { "-fno-memoize-lookups", "" },
   { "-fms-extensions", "Don't pedwarn about uses of Microsoft extensions" },
   { "-fno-ms-extensions", "" },
-  { "-fname-mangling-version-", "" },
-  { "-fnew-abi", "Enable experimental ABI changes" },
-  { "-fno-new-abi", "" },
-  { "-fnonnull-objects", "" },
-  { "-fno-nonnull-objects", "" },
   { "-foperator-names", "Recognise and/bitand/bitor/compl/not/or/xor" },
   { "-fno-operator-names", "" },
   { "-foptional-diags", "" },
@@ -92,15 +79,9 @@ DEFINE_LANG_NAME ("C++")
   { "-fno-repo", "" },
   { "-fsave-memoized", "" },
   { "-fno-save-memoized", "" },
-  { "-fsquangle", "Enable squashed name mangling" },
-  { "-fno-squangle", "" },
   { "-fstats", "Display statistics accumulated during compilation" },
   { "-fno-stats", "" },
-  { "-fstrict-prototype", "" },
-  { "-fno-strict-prototype", "Do not assume that empty prototype means no args" },
   { "-ftemplate-depth-", "Specify maximum template instantiation depth"},
-  { "-fthis-is-variable", ""  },
-  { "-fno-this-is-variable", "" },
   { "-fuse-cxa-atexit", "Use __cxa_atexit to register destructors." },
   { "-fno-use-cxa-atexit", "" },
   { "-fvtable-gc", "Discard unused virtual functions" },
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 00b94a032f9..bc5066725d9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-29  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* g++.old-deja/g++.other/crash14.C: Remove -fnew-abi.
+
 2001-04-27  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* g++.old-deja/g++.eh/crash6.C: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash14.C b/gcc/testsuite/g++.old-deja/g++.other/crash14.C
index 85f093d7cc3..f249a67106a 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash14.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash14.C
@@ -1,5 +1,4 @@
 // Build don't link:
-// Special g++ Options: -fnew-abi
 // Origin: Mark Mitchell <mark@codesourcery.com>
 
 struct S