From d347d4c7454cfb69e15d8ea649d312f4336b3592 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.de>
Date: Fri, 4 May 2007 00:08:53 +0000
Subject: [PATCH] invoke.texi (-m386,-m486,-mpentium,-mpentiumpro): Remove.

2007-05-03  Dirk Mueller  <dmueller@suse.de>

        * doc/invoke.texi (-m386,-m486,-mpentium,-mpentiumpro): Remove.

        * config/i386/i386.h (CC1_CPU_SPEC): Remove handling for deprecated
        options.

        * config/i386/i386.opt (m386,m486,mpentium,mpentiumpro): Remove.

From-SVN: r124400
---
 gcc/ChangeLog            |  9 +++++++++
 gcc/config/i386/i386.h   | 11 +----------
 gcc/config/i386/i386.opt | 16 ----------------
 gcc/doc/invoke.texi      | 12 ------------
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a856378ce10..eb93c4bc994 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-03  Dirk Mueller  <dmueller@suse.de>
+
+	* doc/invoke.texi (-m386,-m486,-mpentium,-mpentiumpro): Remove.
+
+	* config/i386/i386.h (CC1_CPU_SPEC): Remove handling for deprecated
+	options.
+
+	* config/i386/i386.opt (m386,m486,mpentium,mpentiumpro): Remove.
+
 2007-05-03  Janis Johnson  <janis187@us.ibm.com>
 
 	* doc/sourcebuild.texi (Test Directives) Clarify dg-excess-errors.
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 0ed9c1245c1..21ed8ad0ff2 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -426,17 +426,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
 
 #ifndef CC1_CPU_SPEC
 #define CC1_CPU_SPEC_1 "\
-%{!mtune*: \
-%{m386:mtune=i386 \
-%n`-m386' is deprecated. Use `-march=i386' or `-mtune=i386' instead.\n} \
-%{m486:-mtune=i486 \
-%n`-m486' is deprecated. Use `-march=i486' or `-mtune=i486' instead.\n} \
-%{mpentium:-mtune=pentium \
-%n`-mpentium' is deprecated. Use `-march=pentium' or `-mtune=pentium' instead.\n} \
-%{mpentiumpro:-mtune=pentiumpro \
-%n`-mpentiumpro' is deprecated. Use `-march=pentiumpro' or `-mtune=pentiumpro' instead.\n} \
 %{mcpu=*:-mtune=%* \
-%n`-mcpu=' is deprecated. Use `-mtune=' or '-march=' instead.\n}} \
+%n`-mcpu=' is deprecated. Use `-mtune=' or '-march=' instead.\n} \
 %<mcpu=* \
 %{mintel-syntax:-masm=intel \
 %n`-mintel-syntax' is deprecated. Use `-masm=intel' instead.\n} \
diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
index 9889ba17580..7362601a562 100644
--- a/gcc/config/i386/i386.opt
+++ b/gcc/config/i386/i386.opt
@@ -27,18 +27,10 @@ m32
 Target RejectNegative Negative(m64) Report InverseMask(64BIT)
 Generate 32bit i386 code
 
-m386
-Target RejectNegative Undocumented
-;; Deprecated
-
 m3dnow
 Target Report Mask(3DNOW)
 Support 3DNow! built-in functions
 
-m486
-Target RejectNegative Undocumented
-;; Deprecated
-
 m64
 Target RejectNegative Negative(m32) Report Mask(64BIT)
 Generate 64bit x86-64 code
@@ -155,14 +147,6 @@ mpc
 Target RejectNegative Report Joined Var(ix87_precision_string)
 Set 80387 floating-point precision (-mpc32, -mpc64, -mpc80)
 
-mpentium
-Target RejectNegative Undocumented
-;; Deprecated
-
-mpentiumpro
-Target RejectNegative Undocumented
-;; Deprecated
-
 mpreferred-stack-boundary=
 Target RejectNegative Joined Var(ix86_preferred_stack_boundary_string)
 Attempt to keep stack aligned to this power of 2
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 07bf9e974a1..1a89c904f71 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -9928,18 +9928,6 @@ specifying @option{-march=@var{cpu-type}} implies @option{-mtune=@var{cpu-type}}
 @opindex mcpu
 A deprecated synonym for @option{-mtune}.
 
-@item -m386
-@itemx -m486
-@itemx -mpentium
-@itemx -mpentiumpro
-@opindex m386
-@opindex m486
-@opindex mpentium
-@opindex mpentiumpro
-These options are synonyms for @option{-mtune=i386}, @option{-mtune=i486},
-@option{-mtune=pentium}, and @option{-mtune=pentiumpro} respectively.
-These synonyms are deprecated.
-
 @item -mfpmath=@var{unit}
 @opindex march
 Generate floating point arithmetics for selected unit @var{unit}.  The choices