2 files changed, 1 insertions, 26 deletions
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 0ed9c12..21ed8ad 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 9889ba1..7362601 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